From 65dc67a94fd2e59d06ac2b9b693844dd5fa2c237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 30 Nov 2006 09:18:25 +0000 Subject: (x_raise_frame): Move setting of _NET_ACTIVE_WINDOW property ... (XTframe_raise_lower): ... to here. --- src/xterm.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'src/xterm.c') diff --git a/src/xterm.c b/src/xterm.c index a266282c6ac..75c22a7361f 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8723,23 +8723,10 @@ void x_raise_frame (f) struct frame *f; { - Lisp_Object frame; - const char *atom = "_NET_ACTIVE_WINDOW"; - BLOCK_INPUT; if (f->async_visible) XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f)); - XSETFRAME (frame, f); - /* See Window Manager Specification/Extended Window Manager Hints at - http://freedesktop.org/wiki/Standards_2fwm_2dspec */ - - Fx_send_client_event (frame, make_number (0), frame, - make_unibyte_string (atom, strlen (atom)), - make_number (32), - Fcons (make_number (1), - Fcons (make_number (time (NULL) * 1000), - Qnil))); XFlush (FRAME_X_DISPLAY (f)); UNBLOCK_INPUT; } @@ -8765,7 +8752,22 @@ XTframe_raise_lower (f, raise_flag) int raise_flag; { if (raise_flag) - x_raise_frame (f); + { + Lisp_Object frame; + const char *atom = "_NET_ACTIVE_WINDOW"; + + x_raise_frame (f); + /* See Window Manager Specification/Extended Window Manager Hints at + http://freedesktop.org/wiki/Standards_2fwm_2dspec */ + + XSETFRAME (frame, f); + Fx_send_client_event (frame, make_number (0), frame, + make_unibyte_string (atom, strlen (atom)), + make_number (32), + Fcons (make_number (1), + Fcons (make_number (time (NULL) * 1000), + Qnil))); + } else x_lower_frame (f); } -- cgit v1.2.1