procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xterm.c (event_handler_gdk): Block input (Bug#5037).

Browse source
This commit is contained in:
Chong Yidong 2010-01-16 15:20:32 -05:00
parent 82b52e0dfd
commit 617364feb7
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2010-01-16 Stefan Monnier <monnier@iro.umontreal.ca>
* xterm.c (event_handler_gdk): Block input (Bug#5037).
2010-01-16 Chong Yidong <cyd@stupidchicken.com>
* emacs.c (standard_args): Adjust arg priorities to reflect how

21
src/xterm.c
View file

@ -5797,6 +5797,7 @@ event_handler_gdk (gxev, ev, data)
{
XEvent *xev = (XEvent *) gxev;
BLOCK_INPUT;
if (current_count >= 0)
{
struct x_display_info *dpyinfo;
@ -5807,23 +5808,27 @@ event_handler_gdk (gxev, ev, data)
/* Filter events for the current X input method.
GTK calls XFilterEvent but not for key press and release,
so we do it here. */
if (xev->type == KeyPress || xev->type == KeyRelease)
if (dpyinfo && x_filter_event (dpyinfo, xev))
return GDK_FILTER_REMOVE;
if ((xev->type == KeyPress || xev->type == KeyRelease)
&& dpyinfo
&& x_filter_event (dpyinfo, xev))
{
UNBLOCK_INPUT;
return GDK_FILTER_REMOVE;
}
#endif
if (! dpyinfo)
current_finish = X_EVENT_NORMAL;
else
{
current_count +=
handle_one_xevent (dpyinfo, xev, &current_finish,
current_hold_quit);
}
current_count +=
handle_one_xevent (dpyinfo, xev, &current_finish,
current_hold_quit);
}
else
current_finish = x_dispatch_event (xev, xev->xany.display);
UNBLOCK_INPUT;
if (current_finish == X_EVENT_GOTO_OUT || current_finish == X_EVENT_DROP)
return GDK_FILTER_REMOVE;