aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2004-03-20 16:11:23 +0000
committerJan Djärv2004-03-20 16:11:23 +0000
commite8a84b6c3a220110ea9a9209782ccc674918e49d (patch)
treede76c35afa5aa4adcb021ea5f9dac1b3bc0b38fb /src
parente4aaf69c6a160fbe3e7a98006c23432403218185 (diff)
downloademacs-e8a84b6c3a220110ea9a9209782ccc674918e49d.tar.gz
emacs-e8a84b6c3a220110ea9a9209782ccc674918e49d.zip
* xterm.c (handle_one_xevent): Do not pass key press events to
GTK.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 924df0cde7a..22a1851db70 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-03-20 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xterm.c (handle_one_xevent): Do not pass key press events to
4 GTK.
5
12004-03-19 Richard M. Stallman <rms@gnu.org> 62004-03-19 Richard M. Stallman <rms@gnu.org>
2 7
3 * s/sol2-6.h: Delete previous change. 8 * s/sol2-6.h: Delete previous change.
diff --git a/src/xterm.c b/src/xterm.c
index 9e34d988b91..2fadc156ff3 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6217,6 +6217,14 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
6217 Lisp_Object coding_system = Qlatin_1; 6217 Lisp_Object coding_system = Qlatin_1;
6218 Lisp_Object c; 6218 Lisp_Object c;
6219 6219
6220#ifdef USE_GTK
6221 /* Don't pass keys to GTK. A Tab will shift focus to the
6222 tool bar in GTK 2.4. Keys will still go to menus and
6223 dialogs because in that case popup_activated is TRUE
6224 (see above). */
6225 *finish = X_EVENT_DROP;
6226#endif
6227
6220 event.xkey.state 6228 event.xkey.state
6221 |= x_emacs_to_x_modifiers (FRAME_X_DISPLAY_INFO (f), 6229 |= x_emacs_to_x_modifiers (FRAME_X_DISPLAY_INFO (f),
6222 extra_keyboard_modifiers); 6230 extra_keyboard_modifiers);