(x_raise_frame): Move setting of _NET_ACTIVE_WINDOW

property ...
(XTframe_raise_lower): ... to here.

diff --git a/src/ChangeLog b/src/ChangeLog
index f6fd4a787372828c16cfe8259d9fc2873ba11be1..c0d78ae74955e69835a67eb74f72509a63ea10e4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-30  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xterm.c (x_raise_frame): Move setting of _NET_ACTIVE_WINDOW
+       property ...
+       (XTframe_raise_lower): ... to here.
+
 2006-11-30  Kenichi Handa  <handa@m17n.org>
 
        * regex.c (regex_compile): Fix previous change.

diff --git a/src/xterm.c b/src/xterm.c
index a266282c6ac907a92be231a4271f2181f6a41e75..75c22a7361f5ff6ba9f8d9e3e1e6b386afb872e2 100644 (file)
--- 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);
 }