aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2006-11-03 08:58:39 +0000
committerJan Djärv2006-11-03 08:58:39 +0000
commit45a26c427907f9f055b94ceebae8ae8f6d0646a2 (patch)
tree3c9f2808fcaee00735c5700d2e1ab6a4de845cc3 /src
parente101e71804c0f978562c3a99aa4f0ddc47728233 (diff)
downloademacs-45a26c427907f9f055b94ceebae8ae8f6d0646a2.tar.gz
emacs-45a26c427907f9f055b94ceebae8ae8f6d0646a2.zip
* xterm.c (x_raise_frame): Send _NET_ACTIVE_WINDOW when raising the
window.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c24
2 files changed, 23 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 01d3a9430d1..73b654b920b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-11-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xterm.c (x_raise_frame): Send _NET_ACTIVE_WINDOW when raising the
4 window.
5
12006-11-02 Juanma Barranquero <lekktu@gmail.com> 62006-11-02 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * emacs.c (Fkill_emacs): Fix typo in docstring. 8 * emacs.c (Fkill_emacs): Fix typo in docstring.
diff --git a/src/xterm.c b/src/xterm.c
index 574e8eb4f15..564da0d876c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8607,13 +8607,25 @@ void
8607x_raise_frame (f) 8607x_raise_frame (f)
8608 struct frame *f; 8608 struct frame *f;
8609{ 8609{
8610 Lisp_Object frame;
8611 const char *atom = "_NET_ACTIVE_WINDOW";
8612
8613 BLOCK_INPUT;
8610 if (f->async_visible) 8614 if (f->async_visible)
8611 { 8615 XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
8612 BLOCK_INPUT; 8616
8613 XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f)); 8617 XSETFRAME (frame, f);
8614 XFlush (FRAME_X_DISPLAY (f)); 8618 /* See Window Manager Specification/Extended Window Manager Hints at
8615 UNBLOCK_INPUT; 8619 http://freedesktop.org/wiki/Standards_2fwm_2dspec */
8616 } 8620
8621 Fx_send_client_event (frame, make_number (0), frame,
8622 make_unibyte_string (atom, strlen (atom)),
8623 make_number (32),
8624 Fcons (make_number (1),
8625 Fcons (make_number (time (NULL) * 1000),
8626 Qnil)));
8627 XFlush (FRAME_X_DISPLAY (f));
8628 UNBLOCK_INPUT;
8617} 8629}
8618 8630
8619/* Lower frame F. */ 8631/* Lower frame F. */