summaryrefslogtreecommitdiff
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-02-02 18:55:39 +0000
committerRichard M. Stallman <rms@gnu.org>1995-02-02 18:55:39 +0000
commit8049eda69ecd7e7a2896fbe643860df34b441847 (patch)
tree0dbd48331a581f14b509d31d45fd01f7d957834b /src/keyboard.c
parent3c870f0b97d1f10abb65fa403ff5d5bbda699a23 (diff)
downloademacs-8049eda69ecd7e7a2896fbe643860df34b441847.tar.gz
(kbd_buffer_get_event, swallow_events): Remove selection_request event
from input queue before processing it.
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index ea0f10bd110..fca3d3a1599 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2142,8 +2142,12 @@ kbd_buffer_get_event ()
if (event->kind == selection_request_event)
{
#ifdef HAVE_X11
- x_handle_selection_request (event);
+ struct input_event copy = *event;
+ /* Remove it from the buffer before processing it,
+ since otherwise swallow_events will see it
+ and process it again. */
perd->kbd_fetch_ptr = event + 1;
+ x_handle_selection_request (&copy);
#else
/* We're getting selection request events, but we don't have
a window system. */
@@ -2319,8 +2323,10 @@ swallow_events ()
if (event->kind == selection_request_event)
{
#ifdef HAVE_X11
- x_handle_selection_request (event);
+ struct input_event copy;
+ copy = *event;
perd->kbd_fetch_ptr = event + 1;
+ x_handle_selection_request (&copy);
#else
/* We're getting selection request events, but we don't have
a window system. */