diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-11-19 19:52:07 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-12-03 05:43:24 +0100 |
| commit | fe9045d82e1c7ee6478e668f59757adec1e8b07f (patch) | |
| tree | 26896be2d12d25d14e9e021756c6f23e2cf00c93 /gdk/x11/gdkdisplay-x11.c | |
| parent | a5ab9a9671a3ef7b34e88fdaab55736de4d2ee7c (diff) | |
| download | gtk+-fe9045d82e1c7ee6478e668f59757adec1e8b07f.tar.gz | |
x11: Various clipboard cleanups
(1) Turn X11 clipboard event handling into a regular filter function
(2) Maintain a timestamp in the clipboard, so we can pass it when
querying selections.
Diffstat (limited to 'gdk/x11/gdkdisplay-x11.c')
| -rw-r--r-- | gdk/x11/gdkdisplay-x11.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 4c4da88776..1aecc75753 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1142,24 +1142,16 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator, gdk_display_set_composited (display, composited); } - if (gdk_x11_clipboard_handle_selection_notify (GDK_X11_CLIPBOARD (display->clipboard), xevent) || - gdk_x11_clipboard_handle_selection_notify (GDK_X11_CLIPBOARD (display->primary_clipboard), xevent)) - { - return_val = FALSE; - } - else - { - event->owner_change.type = GDK_OWNER_CHANGE; - event->owner_change.window = window; - event->owner_change.reason = selection_notify->subtype; - event->owner_change.selection = - gdk_x11_xatom_to_atom_for_display (display, - selection_notify->selection); - event->owner_change.time = selection_notify->timestamp; - event->owner_change.selection_time = selection_notify->selection_timestamp; - - return_val = TRUE; - } + event->owner_change.type = GDK_OWNER_CHANGE; + event->owner_change.window = window; + event->owner_change.reason = selection_notify->subtype; + event->owner_change.selection = + gdk_x11_xatom_to_atom_for_display (display, + selection_notify->selection); + event->owner_change.time = selection_notify->timestamp; + event->owner_change.selection_time = selection_notify->selection_timestamp; + + return_val = TRUE; } else #endif |