Rewrite PGTK selection code from scratch

* src/frame.c (delete_frame): Clear selections and swallow
special events.

* src/keyboard.c (kbd_buffer_get_event, process_special_events):
Also handle selection events on PGTK.

* src/keyboard.h (union buffered_input_event): Include selection
events on PGTK.

* src/pgtkselect.c (symbol_to_gtk_clipboard, LOCAL_SELECTION):
New functions and macros.
(selection_type_to_quarks, get_func, clear_func): Delete
functions.
(pgtk_selection_init, pgtk_selection_lost):
(pgtk_selection_usable): New functions.
(Fpgtk_own_selection_internal, Fpgtk_disown_selection_internal)
(Fpgtk_selection_exists_p, Fpgtk_selection_owner_p)
(Fpgtk_get_selection_internal): Complete rewrite.
(syms_of_pgtkselect): Update defsyms and add more hooks.

* src/pgtkselect.h: Delete file.

* src/pgtkterm.c (evq_enqueue): Set last user time based on the
event.
(pgtk_any_window_to_frame, button_event): Fix coding style.
(pgtk_set_event_handler): Add selection events.
(pgtk_find_selection_owner, pgtk_selection_event): New
functions.
(pgtk_term_init): Remove call to `pgtk_selection_init'.

* src/pgtkterm.h (struct pgtk_display_info): New field
`display'.
(enum selection_input_event): New struct.  New macros for
accessing its fields.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index c41727d6c6e..6bc2afd40ac 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4003,15 +4003,20 @@ kbd_buffer_get_event (KBOARD **kbp,
       case SELECTION_REQUEST_EVENT:
       case SELECTION_CLEAR_EVENT:
         {
-#ifdef HAVE_X11
+#if defined HAVE_X11 || HAVE_PGTK
           /* Remove it from the buffer before processing it,
              since otherwise swallow_events will see it
              and process it again.  */
           struct selection_input_event copy = event->sie;
           kbd_fetch_ptr = next_kbd_event (event);
           input_pending = readable_events (0);
+
+#ifdef HAVE_X11
           x_handle_selection_event (&copy);
 #else
+          pgtk_handle_selection_event (&copy);
+#endif
+#else
           /* We're getting selection request events, but we don't have
              a window system.  */
           emacs_abort ();
@@ -4381,7 +4386,7 @@ process_special_events (void)
       if (event->kind == SELECTION_REQUEST_EVENT
           || event->kind == SELECTION_CLEAR_EVENT)
         {
-#ifdef HAVE_X11
+#if defined HAVE_X11 || defined HAVE_PGTK
 
           /* Remove the event from the fifo buffer before processing;
              otherwise swallow_events called recursively could see it
@@ -4406,8 +4411,13 @@ process_special_events (void)
                    moved_events * sizeof *kbd_fetch_ptr);
           kbd_fetch_ptr = next_kbd_event (kbd_fetch_ptr);
           input_pending = readable_events (0);
+
+#ifdef HAVE_X11
           x_handle_selection_event (&copy);
 #else
+          pgtk_handle_selection_event (&copy);
+#endif
+#else
           /* We're getting selection request events, but we don't have
              a window system.  */
           emacs_abort ();