Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
617364fe
Commit
617364fe
authored
Jan 16, 2010
by
Chong Yidong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* xterm.c (event_handler_gdk): Block input (Bug#5037).
parent
82b52e0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
src/ChangeLog
src/ChangeLog
+4
-0
src/xterm.c
src/xterm.c
+13
-8
No files found.
src/ChangeLog
View file @
617364fe
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
...
...
src/xterm.c
View file @
617364fe
...
...
@@ -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, ¤t_finish,
current_hold_quit);
}
current_count +=
handle_one_xevent (dpyinfo, xev, ¤t_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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment