* xterm.c (handle_one_xevent): Do not pass key press events to

  GTK.

diff --git a/src/ChangeLog b/src/ChangeLog
index 924df0cde7a1a5e400dd646fc2b3f24d5e2c0d52..22a1851db70cbca8a4675789a802149493af95b3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-20  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xterm.c (handle_one_xevent): Do not pass key press events to
+       GTK.
+
 2004-03-19  Richard M. Stallman  <rms@gnu.org>
 
        * s/sol2-6.h: Delete previous change.

diff --git a/src/xterm.c b/src/xterm.c
index 9e34d988b91161f9c34439baad948d935204cf4a..2fadc156ff368fd042676e8c9301941220fce7e0 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6217,6 +6217,14 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           Lisp_Object coding_system = Qlatin_1;
          Lisp_Object c;
 
+#ifdef USE_GTK
+          /* Don't pass keys to GTK.  A Tab will shift focus to the
+             tool bar in GTK 2.4.  Keys will still go to menus and
+             dialogs because in that case popup_activated is TRUE
+             (see above).  */
+          *finish = X_EVENT_DROP;
+#endif
+
           event.xkey.state
             |= x_emacs_to_x_modifiers (FRAME_X_DISPLAY_INFO (f),
                                        extra_keyboard_modifiers);