diff options
| author | Stefan Monnier | 2010-11-17 10:12:02 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-11-17 10:12:02 -0500 |
| commit | fad0d5651923be042a38d89dfbd67c97dfd92a56 (patch) | |
| tree | ca9b15fdd02ff955b82d4213965f21d61857a52b /src/xterm.c | |
| parent | 25f38310f93c47bc71ea84044d58dfcddf9a6401 (diff) | |
| download | emacs-fad0d5651923be042a38d89dfbd67c97dfd92a56.tar.gz emacs-fad0d5651923be042a38d89dfbd67c97dfd92a56.zip | |
* src/xterm.c (get_current_wm_state): Rename from get_current_vm_state.
(do_ewmh_fullscreen, x_handle_net_wm_state): Update callers.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index eaa19523970..ed3e5dcae45 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -8403,7 +8403,7 @@ x_set_sticky (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) | |||
| 8403 | STICKY is set to 1 if the sticky state is set, 0 if not. */ | 8403 | STICKY is set to 1 if the sticky state is set, 0 if not. */ |
| 8404 | 8404 | ||
| 8405 | static void | 8405 | static void |
| 8406 | get_current_vm_state (struct frame *f, | 8406 | get_current_wm_state (struct frame *f, |
| 8407 | Window window, | 8407 | Window window, |
| 8408 | int *size_state, | 8408 | int *size_state, |
| 8409 | int *sticky) | 8409 | int *sticky) |
| @@ -8474,7 +8474,7 @@ do_ewmh_fullscreen (struct frame *f) | |||
| 8474 | Lisp_Object lval = get_frame_param (f, Qfullscreen); | 8474 | Lisp_Object lval = get_frame_param (f, Qfullscreen); |
| 8475 | int cur, dummy; | 8475 | int cur, dummy; |
| 8476 | 8476 | ||
| 8477 | get_current_vm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy); | 8477 | get_current_wm_state (f, FRAME_OUTER_WINDOW (f), &cur, &dummy); |
| 8478 | 8478 | ||
| 8479 | /* Some window managers don't say they support _NET_WM_STATE, but they do say | 8479 | /* Some window managers don't say they support _NET_WM_STATE, but they do say |
| 8480 | they support _NET_WM_STATE_FULLSCREEN. Try that also. */ | 8480 | they support _NET_WM_STATE_FULLSCREEN. Try that also. */ |
| @@ -8556,7 +8556,7 @@ x_handle_net_wm_state (struct frame *f, XPropertyEvent *event) | |||
| 8556 | Lisp_Object lval; | 8556 | Lisp_Object lval; |
| 8557 | int sticky = 0; | 8557 | int sticky = 0; |
| 8558 | 8558 | ||
| 8559 | get_current_vm_state (f, event->window, &value, &sticky); | 8559 | get_current_wm_state (f, event->window, &value, &sticky); |
| 8560 | lval = Qnil; | 8560 | lval = Qnil; |
| 8561 | switch (value) | 8561 | switch (value) |
| 8562 | { | 8562 | { |