# HG changeset patch # User Karl Heuer # Date 836780331 0 # Node ID 909056c81fcf019b751e6f46e4168af2b6b0a3bb # Parent f74c79dcaf8d9b1d278c5e73b5df33e1d997cc01 Undo previous change. (XTread_socket): Better way to avoid sending toolkit-specific events to Emacs. diff -r f74c79dcaf8d -r 909056c81fcf src/xterm.c --- a/src/xterm.c Sun Jul 07 22:46:15 1996 +0000 +++ b/src/xterm.c Sun Jul 07 22:58:51 1996 +0000 @@ -3616,6 +3616,14 @@ unsigned char copy_buffer[81]; int modifiers; + if (lw_window_is_in_menubar (event.xkey.window, + f->output_data.x->menubar_widget + )) + { + XtDispatchEvent (&event); + break; + } + event.xkey.state |= x_emacs_to_x_modifiers (FRAME_X_DISPLAY_INFO (f), extra_keyboard_modifiers); @@ -3651,13 +3659,6 @@ 80, &keysym, &compose_status); #endif -#ifdef USE_X_TOOLKIT - if (lw_toolkit_related_event_p (&event)) - { - XtDispatchEvent (&event); - break; - } -#endif orig_keysym = keysym; if (numchars > 1)