Avoid some union buffered_input_event uses

Simplify by using separate local vars for struct input_event and
struct selection_input_event, rather than a single local var that
is the union of the two.  This makes the code easier to follow by
the human reader, and should help avoid GCC bug 117423
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117423> and
therefore work around Emacs bug 76559 <https://bugs.gnu.org/76559>.
* src/androidterm.c (handle_one_android_event):
* src/gtkutil.c (xg_widget_key_press_event_cb):
* src/pgtkterm.c (evq_flush):
* src/xterm.c (handle_one_xevent): Use struct input_event and
kbd_buffer_store_event_hold, or struct selection_input_event and
kbd_buffer_store_selection_event_hold, rather than union
buffered_input_event and union buffered_input_event.
* src/keyboard.c (beware_long_paste, maybe_quit_while_no_input):
New functions, broken out from kbd_buffer_store_buffered_event.
(kbd_buffer_store_event_hold): Define here, with a simplified
version of the body of the old kbd_buffer_store_buffered_event,
rather than defining in keyboard.h.  Specialize to struct
input_event.
(kbd_buffer_store_selection_event_hold): New function; it is
a simplified version of the old kbd_buffer_store_buffered_event,
specialized to struct selection_input_event.
(is_ignored_event_kind): Accept enum event_kind instead of
union buffered_input_event.  All callers changed.
* src/keyboard.h (kbd_buffer_store_event_hold):
Remove definition, as keyboard.c now defines it.
* src/pgtkterm.c (evq_grow_if_needed): New function.
(evq_enqueue, evq_selection_enqueue): Two functions now,
not one.  Args are now struct input_event const * or
struct selection_input_event const *, not
union buffered_input_event *.  All callers changed.
This lets us simplify the callers so that they need
not use the union.

1 files changed, 84 insertions, 87 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index 3cb9eab3606..79ee374f2ca 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -827,7 +827,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
   union android_event configureEvent;
   struct frame *f, *any, *mouse_frame;
   Mouse_HLInfo *hlinfo;
-  union buffered_input_event inev;
+  struct input_event inev;
   int modifiers, count, do_help;
   struct android_touch_point *touchpoint, **last;
   Lisp_Object window;
@@ -851,7 +851,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
   if (any && any->wait_event_type == event->type)
     any->wait_event_type = 0; /* Indicates we got it.  */
 
-  EVENT_INIT (inev.ie);
+  EVENT_INIT (inev);
 
   switch (event->type)
     {
@@ -922,8 +922,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
         if (!FRAME_TOOLTIP_P (f)
             && (old_left != f->left_pos || old_top != f->top_pos))
           {
-            inev.ie.kind = MOVE_FRAME_EVENT;
-            XSETFRAME (inev.ie.frame_or_window, f);
+            inev.kind = MOVE_FRAME_EVENT;
+            XSETFRAME (inev.frame_or_window, f);
           }
 
         if (f && FRAME_OUTPUT_DATA (f)->need_cursor_updates)
@@ -982,10 +982,10 @@ handle_one_android_event (struct android_display_info *dpyinfo,
         memset (&compose_status, 0, sizeof (compose_status));
 
       /* Common for all keysym input events.  */
-      XSETFRAME (inev.ie.frame_or_window, any);
-      inev.ie.modifiers
+      XSETFRAME (inev.frame_or_window, any);
+      inev.modifiers
         = android_android_to_emacs_modifiers (dpyinfo, modifiers);
-      inev.ie.timestamp = event->xkey.time;
+      inev.timestamp = event->xkey.time;
 
       keysym = event->xkey.keycode;
 
@@ -1019,8 +1019,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
 
         if (event->xkey.keycode == (uint32_t) -1)
           {
-            inev.ie.kind = PREEDIT_TEXT_EVENT;
-            inev.ie.arg = Qnil;
+            inev.kind = PREEDIT_TEXT_EVENT;
+            inev.arg = Qnil;
 
             /* If text was looked up, decode it and make it the
                preedit text.  */
@@ -1028,7 +1028,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
             if (status_return == ANDROID_LOOKUP_CHARS && nchars)
               {
                 copy_bufptr[nchars] = 0;
-                inev.ie.arg = from_unicode_buffer (copy_bufptr);
+                inev.arg = from_unicode_buffer (copy_bufptr);
               }
 
             goto done_keysym;
@@ -1047,11 +1047,11 @@ handle_one_android_event (struct android_display_info *dpyinfo,
           /* Deal with characters.  */
 
           if (copy_bufptr[0] < 128)
-            inev.ie.kind = ASCII_KEYSTROKE_EVENT;
+            inev.kind = ASCII_KEYSTROKE_EVENT;
           else
-            inev.ie.kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT;
+            inev.kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT;
 
-          inev.ie.code = copy_bufptr[0];
+          inev.code = copy_bufptr[0];
         }
       else if (nchars < 2 && keysym)
         {
@@ -1061,8 +1061,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
 
           /* Next, deal with special ``characters'' by giving the
              keycode to keyboard.c.  */
-          inev.ie.kind = NON_ASCII_KEYSTROKE_EVENT;
-          inev.ie.code = keysym;
+          inev.kind = NON_ASCII_KEYSTROKE_EVENT;
+          inev.code = keysym;
         }
       else
         {
@@ -1070,25 +1070,25 @@ handle_one_android_event (struct android_display_info *dpyinfo,
 
           for (i = 0; i < nchars; ++i)
             {
-              inev.ie.kind = (SINGLE_BYTE_CHAR_P (copy_bufptr[i])
-                              ? ASCII_KEYSTROKE_EVENT
-                              : MULTIBYTE_CHAR_KEYSTROKE_EVENT);
-              inev.ie.code = copy_bufptr[i];
+              inev.kind = (SINGLE_BYTE_CHAR_P (copy_bufptr[i])
+                           ? ASCII_KEYSTROKE_EVENT
+                           : MULTIBYTE_CHAR_KEYSTROKE_EVENT);
+              inev.code = copy_bufptr[i];
 
               /* If the character is actually '\n', then change this
                  to RET.  */
 
               if (copy_bufptr[i] == '\n')
                 {
-                  inev.ie.kind = NON_ASCII_KEYSTROKE_EVENT;
-                  inev.ie.code = 66;
+                  inev.kind = NON_ASCII_KEYSTROKE_EVENT;
+                  inev.code = 66;
                 }
 
-              kbd_buffer_store_buffered_event (&inev, hold_quit);
+              kbd_buffer_store_event_hold (&inev, hold_quit);
             }
 
           count += nchars;
-          inev.ie.kind = NO_EVENT;  /* Already stored above.  */
+          inev.kind = NO_EVENT;  /* Already stored above.  */
         }
 
       goto done_keysym;
@@ -1108,7 +1108,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
 
     case ANDROID_FOCUS_IN:
     case ANDROID_FOCUS_OUT:
-      android_detect_focus_change (dpyinfo, any, event, &inev.ie);
+      android_detect_focus_change (dpyinfo, any, event, &inev);
       goto OTHER;
 
     case ANDROID_WINDOW_ACTION:
@@ -1136,8 +1136,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
               if (!f)
                 goto OTHER;
 
-              inev.ie.kind = DELETE_WINDOW_EVENT;
-              XSETFRAME (inev.ie.frame_or_window, f);
+              inev.kind = DELETE_WINDOW_EVENT;
+              XSETFRAME (inev.frame_or_window, f);
             }
         }
 
@@ -1196,8 +1196,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
                   && !EQ (window, last_mouse_window)
                   && !EQ (window, selected_window))
                 {
-                  inev.ie.kind = SELECT_WINDOW_EVENT;
-                  inev.ie.frame_or_window = window;
+                  inev.kind = SELECT_WINDOW_EVENT;
+                  inev.frame_or_window = window;
                 }
 
               /* Remember the last window where we saw the mouse.  */
@@ -1378,10 +1378,10 @@ handle_one_android_event (struct android_display_info *dpyinfo,
           if (!(tab_bar_p && NILP (tab_bar_arg)) && !tool_bar_p)
             if (! popup_activated ())
               {
-                android_construct_mouse_click (&inev.ie, &event->xbutton, f);
+                android_construct_mouse_click (&inev, &event->xbutton, f);
 
                 if (!NILP (tab_bar_arg))
-                  inev.ie.arg = tab_bar_arg;
+                  inev.arg = tab_bar_arg;
               }
         }
 
@@ -1424,8 +1424,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
           /* Simply update the tool position and send an update.  */
           touchpoint->x = event->touch.x;
           touchpoint->y = event->touch.y;
-          android_update_tools (any, &inev.ie);
-          inev.ie.timestamp = event->touch.time;
+          android_update_tools (any, &inev);
+          inev.timestamp = event->touch.time;
 
           goto OTHER;
         }
@@ -1498,12 +1498,12 @@ handle_one_android_event (struct android_display_info *dpyinfo,
         }
 
       /* Now generate the Emacs event.  */
-      inev.ie.kind = TOUCHSCREEN_BEGIN_EVENT;
-      inev.ie.timestamp = event->touch.time;
-      XSETFRAME (inev.ie.frame_or_window, any);
-      XSETINT (inev.ie.x, event->touch.x);
-      XSETINT (inev.ie.y, event->touch.y);
-      XSETINT (inev.ie.arg, event->touch.pointer_id);
+      inev.kind = TOUCHSCREEN_BEGIN_EVENT;
+      inev.timestamp = event->touch.time;
+      XSETFRAME (inev.frame_or_window, any);
+      XSETINT (inev.x, event->touch.x);
+      XSETINT (inev.y, event->touch.y);
+      XSETINT (inev.arg, event->touch.pointer_id);
 
       goto OTHER;
 
@@ -1526,8 +1526,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
 
       touchpoint->x = event->touch.x;
       touchpoint->y = event->touch.y;
-      android_update_tools (any, &inev.ie);
-      inev.ie.timestamp = event->touch.time;
+      android_update_tools (any, &inev);
+      inev.timestamp = event->touch.time;
 
       goto OTHER;
 
@@ -1569,18 +1569,18 @@ handle_one_android_event (struct android_display_info *dpyinfo,
                  grabbed by the tool bar).  */
               xfree (touchpoint);
 
-              inev.ie.kind = TOUCHSCREEN_END_EVENT;
-              inev.ie.timestamp = event->touch.time;
+              inev.kind = TOUCHSCREEN_END_EVENT;
+              inev.timestamp = event->touch.time;
 
               /* Report whether the sequence has been canceled.  */
 
               if (event->touch.flags & ANDROID_TOUCH_SEQUENCE_CANCELED)
-                inev.ie.modifiers = 1;
+                inev.modifiers = 1;
 
-              XSETFRAME (inev.ie.frame_or_window, any);
-              XSETINT (inev.ie.x, event->touch.x);
-              XSETINT (inev.ie.y, event->touch.y);
-              XSETINT (inev.ie.arg, event->touch.pointer_id);
+              XSETFRAME (inev.frame_or_window, any);
+              XSETINT (inev.x, event->touch.x);
+              XSETINT (inev.y, event->touch.y);
+              XSETINT (inev.arg, event->touch.pointer_id);
 
               /* Break out of the loop.  */
               goto OTHER;
@@ -1629,24 +1629,24 @@ handle_one_android_event (struct android_display_info *dpyinfo,
             }
 
           /* Determine what kind of event to send.  */
-          inev.ie.kind = ((fabs (wheel_event_y)
+          inev.kind = ((fabs (wheel_event_y)
                            >= fabs (wheel_event_x))
                           ? WHEEL_EVENT : HORIZ_WHEEL_EVENT);
-          inev.ie.timestamp = event->wheel.time;
+          inev.timestamp = event->wheel.time;
 
           /* Set the event coordinates.  */
-          XSETINT (inev.ie.x, event->wheel.x);
-          XSETINT (inev.ie.y, event->wheel.y);
+          XSETINT (inev.x, event->wheel.x);
+          XSETINT (inev.y, event->wheel.y);
 
           /* Set the frame.  */
-          XSETFRAME (inev.ie.frame_or_window, any);
+          XSETFRAME (inev.frame_or_window, any);
 
           /* Figure out the scroll direction.  */
-          inev.ie.modifiers = (signbit ((fabs (wheel_event_x)
-                                         >= fabs (wheel_event_y))
-                                        ? wheel_event_x
-                                        : wheel_event_y)
-                               ? down_modifier : up_modifier);
+          inev.modifiers = (signbit ((fabs (wheel_event_x)
+                                      >= fabs (wheel_event_y))
+                                     ? wheel_event_x
+                                     : wheel_event_y)
+                            ? down_modifier : up_modifier);
 
           /* Figure out how much to scale the deltas by.  */
           window = window_from_coordinates (any, event->wheel.x,
@@ -1664,16 +1664,14 @@ handle_one_android_event (struct android_display_info *dpyinfo,
           scroll_unit = pow (scroll_height, 2.0 / 3.0);
 
           /* Add the keyboard modifiers.  */
-          inev.ie.modifiers
+          inev.modifiers
             |= android_android_to_emacs_modifiers (dpyinfo,
                                                    event->wheel.state);
 
           /* Finally include the scroll deltas.  */
-          inev.ie.arg = list3 (Qnil,
-                               make_float (wheel_event_x
-                                           * scroll_unit),
-                               make_float (wheel_event_y
-                                           * scroll_unit));
+          inev.arg = list3 (Qnil,
+                            make_float (wheel_event_x * scroll_unit),
+                            make_float (wheel_event_y * scroll_unit));
 
           wheel_event_x = 0.0;
           wheel_event_y = 0.0;
@@ -1693,8 +1691,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
       SET_FRAME_VISIBLE (any, false);
       SET_FRAME_ICONIFIED (any, true);
 
-      inev.ie.kind = ICONIFY_EVENT;
-      XSETFRAME (inev.ie.frame_or_window, any);
+      inev.kind = ICONIFY_EVENT;
+      XSETFRAME (inev.frame_or_window, any);
       goto OTHER;
 
     case ANDROID_DEICONIFIED:
@@ -1708,8 +1706,8 @@ handle_one_android_event (struct android_display_info *dpyinfo,
       SET_FRAME_VISIBLE (any, true);
       SET_FRAME_ICONIFIED (any, false);
 
-      inev.ie.kind = DEICONIFY_EVENT;
-      XSETFRAME (inev.ie.frame_or_window, any);
+      inev.kind = DEICONIFY_EVENT;
+      XSETFRAME (inev.frame_or_window, any);
       goto OTHER;
 
       /* Context menu handling.  */
@@ -1757,12 +1755,12 @@ handle_one_android_event (struct android_display_info *dpyinfo,
         goto OTHER;
 
       /* Generate a drag and drop event to convey its position.  */
-      inev.ie.kind = DRAG_N_DROP_EVENT;
-      XSETFRAME (inev.ie.frame_or_window, any);
-      inev.ie.timestamp = ANDROID_CURRENT_TIME;
-      XSETINT (inev.ie.x, event->dnd.x);
-      XSETINT (inev.ie.y, event->dnd.y);
-      inev.ie.arg = Fcons (inev.ie.x, inev.ie.y);
+      inev.kind = DRAG_N_DROP_EVENT;
+      XSETFRAME (inev.frame_or_window, any);
+      inev.timestamp = ANDROID_CURRENT_TIME;
+      XSETINT (inev.x, event->dnd.x);
+      XSETINT (inev.y, event->dnd.y);
+      inev.arg = Fcons (inev.x, inev.y);
       goto OTHER;
 
     case ANDROID_DND_URI_EVENT:
@@ -1778,15 +1776,15 @@ handle_one_android_event (struct android_display_info *dpyinfo,
          content or file URI or a string to be inserted.  Generate an
          event with this information.  */
 
-      inev.ie.kind = DRAG_N_DROP_EVENT;
-      XSETFRAME (inev.ie.frame_or_window, any);
-      inev.ie.timestamp = ANDROID_CURRENT_TIME;
-      XSETINT (inev.ie.x, event->dnd.x);
-      XSETINT (inev.ie.y, event->dnd.y);
-      inev.ie.arg = Fcons ((event->type == ANDROID_DND_TEXT_EVENT
-                            ? Qtext : Quri),
-                           android_decode_utf16 (event->dnd.uri_or_string,
-                                                 event->dnd.length));
+      inev.kind = DRAG_N_DROP_EVENT;
+      XSETFRAME (inev.frame_or_window, any);
+      inev.timestamp = ANDROID_CURRENT_TIME;
+      XSETINT (inev.x, event->dnd.x);
+      XSETINT (inev.y, event->dnd.y);
+      inev.arg = Fcons ((event->type == ANDROID_DND_TEXT_EVENT
+                         ? Qtext : Quri),
+                        android_decode_utf16 (event->dnd.uri_or_string,
+                                              event->dnd.length));
       free (event->dnd.uri_or_string);
       goto OTHER;
 
@@ -1794,15 +1792,14 @@ handle_one_android_event (struct android_display_info *dpyinfo,
     case ANDROID_NOTIFICATION_ACTION:
 
       if (event->notification.type == ANDROID_NOTIFICATION_DELETED)
-        android_notification_deleted (&event->notification, &inev.ie);
+        android_notification_deleted (&event->notification, &inev);
       else
         {
           Lisp_Object action;
 
           action = android_decode_utf16 (event->notification.action,
                                          event->notification.length);
-          android_notification_action (&event->notification, &inev.ie,
-                                       action);
+          android_notification_action (&event->notification, &inev, action);
         }
 
       /* Free dynamically allocated data.  */
@@ -1815,9 +1812,9 @@ handle_one_android_event (struct android_display_info *dpyinfo,
     }
 
  OTHER:
-  if (inev.ie.kind != NO_EVENT)
+  if (inev.kind != NO_EVENT)
     {
-      kbd_buffer_store_buffered_event (&inev, hold_quit);
+      kbd_buffer_store_event_hold (&inev, hold_quit);
       count++;
     }