Merge remote-tracking branch 'origin/master' into feature/package+vc

9 files changed, 501 insertions, 181 deletions

diff --git a/src/comp.c b/src/comp.c
index b7541c5d9f7..14012634ccc 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5868,8 +5868,21 @@ The last directory of this list is assumed to be the system one.  */);
   Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil);
 
   DEFVAR_BOOL ("comp-enable-subr-trampolines", comp_enable_subr_trampolines,
-               doc: /* If non-nil enable primitive trampoline synthesis.
-This makes primitive functions redefinable or advisable effectively.  */);
+               doc: /* If non-nil, enable primitive trampoline synthesis.
+This makes Emacs respect redefinition or advises of primitive functions
+when they are called from Lisp code natively-compiled at `native-comp-speed'
+of 2.
+
+By default, this is enabled, and when Emacs sees a redefined or advised
+primitive called from natively-compiled Lisp, it generates a trampoline
+for it on-the-fly.
+
+Disabling this, when a trampoline for a redefined or advised primitive is
+not available from previous compilations, means that such redefinition
+or advise will not have effect on calls from natively-compiled Lisp code.
+That is, calls to primitives without existing trampolines from
+natively-compiled Lisp will behave as if the primitive was called
+directly from C.  */);
 
   DEFVAR_LISP ("comp-installed-trampolines-h", Vcomp_installed_trampolines_h,
                doc: /* Hash table subr-name -> installed trampoline.
diff --git a/src/dispnew.c b/src/dispnew.c
index 2568ba1086a..5a9ba8909e3 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3152,10 +3152,19 @@ redraw_frame (struct frame *f)
   update_begin (f);
   if (FRAME_MSDOS_P (f))
     FRAME_TERMINAL (f)->set_terminal_modes_hook (FRAME_TERMINAL (f));
+
+  if (FRAME_WINDOW_P (f))
+    /* Garbage the frame now.  Otherwise, platforms that support
+       double buffering will display the blank contents of the frame
+       even though the frame should be redrawn at some point in the
+       future.  */
+    SET_FRAME_GARBAGED (f);
+
   clear_frame (f);
   clear_current_matrices (f);
   update_end (f);
   fset_redisplay (f);
+
   /* Mark all windows as inaccurate, so that every window will have
      its redisplay done.  */
   mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0);
diff --git a/src/haikuterm.c b/src/haikuterm.c
index 838eb128fa6..4e32b747160 100644
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -232,6 +232,9 @@ haiku_frame_up_to_date (struct frame *f)
       be_evict_font_cache ();
       up_to_date_count = 0;
     }
+
+  /* Mark the frame as complete.  */
+  FRAME_COMPLETE_P (f) = true;
   unblock_input ();
 }
 
@@ -265,6 +268,8 @@ haiku_clear_frame (struct frame *f)
 
   mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f)));
 
+  FRAME_COMPLETE_P (f) = false;
+
   block_input ();
   BView_draw_lock (view, true, 0, 0, FRAME_PIXEL_WIDTH (f),
                    FRAME_PIXEL_HEIGHT (f));
@@ -1436,6 +1441,9 @@ haiku_clip_to_row (struct window *w, struct glyph_row *row,
 static void
 haiku_update_begin (struct frame *f)
 {
+  /* Mark the frame as incomplete so it is not flushed upon handling
+     input.  */
+  FRAME_COMPLETE_P (f) = false;
 }
 
 static void
@@ -2959,6 +2967,10 @@ haiku_flush (struct frame *f)
   if (FRAME_DIRTY_P (f) && !buffer_flipping_blocked_p ())
     haiku_flip_buffers (f);
 
+  /* The frame is complete again as its contents were just
+     flushed.  */
+  FRAME_COMPLETE_P (f) = true;
+
   if (FRAME_VISIBLE_P (f) && !FRAME_TOOLTIP_P (f))
     BWindow_Flush (FRAME_HAIKU_WINDOW (f));
 }
@@ -3086,10 +3098,15 @@ haiku_make_fullscreen_consistent (struct frame *f)
 static void
 haiku_flush_dirty_back_buffer_on (struct frame *f)
 {
-  if (!FRAME_GARBAGED_P (f)
-      && !buffer_flipping_blocked_p ()
-      && FRAME_DIRTY_P (f))
-    haiku_flip_buffers (f);
+  if (FRAME_GARBAGED_P (f)
+      || buffer_flipping_blocked_p ()
+      /* If the frame is not already up to date, do not flush buffers
+         on input, as that will result in flicker.  */
+      || !FRAME_COMPLETE_P (f)
+      || !FRAME_DIRTY_P (f))
+    return;
+
+  haiku_flip_buffers (f);
 }
 
 /* N.B. that support for TYPE must be explicitly added to
@@ -3135,6 +3152,7 @@ haiku_read_socket (struct terminal *terminal, struct input_event *hold_quit)
   int button_or_motion_p, do_help;
   enum haiku_event_type type;
   struct input_event inev, inev2;
+  struct frame *mouse_frame;
 
   message_count = 0;
   button_or_motion_p = 0;
@@ -3252,9 +3270,13 @@ haiku_read_socket (struct terminal *terminal, struct input_event *hold_quit)
                     || !EQ (f->tool_bar_window, hlinfo->mouse_face_window)
                     || !EQ (f->tab_bar_window, hlinfo->mouse_face_window)))
               {
+                mouse_frame = hlinfo->mouse_face_mouse_frame;
+
                 clear_mouse_face (hlinfo);
                 hlinfo->mouse_face_hidden = true;
-                haiku_flush_dirty_back_buffer_on (f);
+
+                if (mouse_frame)
+                  haiku_flush_dirty_back_buffer_on (mouse_frame);
               }
 
             inev.code = b->keysym ? b->keysym : b->multibyte_char;
diff --git a/src/haikuterm.h b/src/haikuterm.h
index 86274fd42a3..70e8cf948bf 100644
--- a/src/haikuterm.h
+++ b/src/haikuterm.h
@@ -174,6 +174,10 @@ struct haiku_output
      displayed yet.  */
   bool_bf dirty_p : 1;
 
+  /* Whether or not the frame is complete, i.e. safe to flush on
+     input.  */
+  bool_bf complete_p : 1;
+
   struct font *font;
 
   /* The pending position we're waiting for. */
@@ -275,6 +279,7 @@ struct scroll_bar
 #define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec))
 
 #define FRAME_DIRTY_P(f)                (FRAME_OUTPUT_DATA (f)->dirty_p)
+#define FRAME_COMPLETE_P(f)             (FRAME_OUTPUT_DATA (f)->complete_p)
 #define MAKE_FRAME_DIRTY(f)             (FRAME_DIRTY_P (f) = 1)
 #define FRAME_OUTPUT_DATA(f)            ((f)->output_data.haiku)
 #define FRAME_HAIKU_WINDOW(f)           (FRAME_OUTPUT_DATA (f)->window)
diff --git a/src/xfns.c b/src/xfns.c
index 91124488994..e8732986eb9 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -8443,7 +8443,17 @@ compute_tip_xy (struct frame *f, Lisp_Object parms, Lisp_Object dx,
       unblock_input ();
 
       XSETFRAME (frame, f);
-      attributes = Fx_display_monitor_attributes_list (frame);
+
+#if defined HAVE_XRANDR || defined USE_GTK
+      if (!NILP (FRAME_DISPLAY_INFO (f)->last_monitor_attributes_list))
+        /* Use cached values if available to avoid fetching the
+           monitor list from the X server.  If XRandR is not
+           available, then fetching the attributes will probably not
+           sync anyway, and will thus be relatively harmless.  */
+        attributes = FRAME_DISPLAY_INFO (f)->last_monitor_attributes_list;
+      else
+#endif
+        attributes = Fx_display_monitor_attributes_list (frame);
 
       /* Try to determine the monitor where the mouse pointer is and
          its geometry.  See bug#22549.  */
@@ -8693,9 +8703,6 @@ Text larger than the specified size is clipped.  */)
   int old_windows_or_buffers_changed = windows_or_buffers_changed;
   specpdl_ref count = SPECPDL_INDEX ();
   Lisp_Object window, size, tip_buf;
-  Window child;
-  XWindowAttributes child_attrs;
-  int dest_x_return, dest_y_return;
   bool displayed;
 #ifdef ENABLE_CHECKING
   struct glyph_row *row, *end;
@@ -8946,41 +8953,6 @@ Text larger than the specified size is clipped.  */)
 
   /* Show tooltip frame.  */
   block_input ();
-  /* If the display is composited, then WM_TRANSIENT_FOR must be set
-     as well, or else the compositing manager won't display
-     decorations correctly, even though the tooltip window is override
-     redirect. See
-     https://specifications.freedesktop.org/wm-spec/1.4/ar01s08.html
-
-     Perhaps WM_TRANSIENT_FOR should be used in place of
-     override-redirect anyway.  The ICCCM only recommends
-     override-redirect if the pointer will be grabbed.  */
-
-  if (XTranslateCoordinates (FRAME_X_DISPLAY (f),
-                             FRAME_DISPLAY_INFO (f)->root_window,
-                             FRAME_DISPLAY_INFO (f)->root_window,
-                             root_x, root_y, &dest_x_return,
-                             &dest_y_return, &child)
-      && child != None)
-    {
-      /* But only if the child is not override-redirect, which can
-         happen if the pointer is above a menu.  */
-
-      if (XGetWindowAttributes (FRAME_X_DISPLAY (f),
-                                child, &child_attrs)
-          || child_attrs.override_redirect)
-        XDeleteProperty (FRAME_X_DISPLAY (tip_f),
-                         FRAME_X_WINDOW (tip_f),
-                         FRAME_DISPLAY_INFO (tip_f)->Xatom_wm_transient_for);
-      else
-        XSetTransientForHint (FRAME_X_DISPLAY (tip_f),
-                              FRAME_X_WINDOW (tip_f), child);
-    }
-  else
-    XDeleteProperty (FRAME_X_DISPLAY (tip_f),
-                     FRAME_X_WINDOW (tip_f),
-                     FRAME_DISPLAY_INFO (tip_f)->Xatom_wm_transient_for);
-
 #ifndef USE_XCB
   XMoveResizeWindow (FRAME_X_DISPLAY (tip_f), FRAME_X_WINDOW (tip_f),
                      root_x, root_y, width, height);
@@ -9452,13 +9424,21 @@ usual X keysyms.  Value is `lambda' if we cannot determine if both keys are
 present and mapped to the usual X keysyms.  */)
   (Lisp_Object frame)
 {
+#ifdef HAVE_XKB
+  XkbDescPtr kb;
+  struct frame *f;
+  Display *dpy;
+  Lisp_Object have_keys;
+  int delete_keycode, backspace_keycode, i;
+#endif
+
 #ifndef HAVE_XKB
   return Qlambda;
 #else
-  XkbDescPtr kb;
-  struct frame *f = decode_window_system_frame (frame);
-  Display *dpy = FRAME_X_DISPLAY (f);
-  Lisp_Object have_keys;
+  delete_keycode = 0;
+  backspace_keycode = 0;
+  f = decode_window_system_frame (frame);
+  dpy = FRAME_X_DISPLAY (f);
 
   if (!FRAME_DISPLAY_INFO (f)->supports_xkb)
     return Qlambda;
@@ -9474,50 +9454,39 @@ present and mapped to the usual X keysyms.  */)
      XK_Delete are mapped to any key.  But if any of those are mapped to
      some non-intuitive key combination (Meta-Shift-Ctrl-whatever) and the
      user doesn't know about it, it is better to return false here.
-     It is more obvious to the user what to do if she/he has two keys
+     It is more obvious to the user what to do if there are two keys
      clearly marked with names/symbols and one key does something not
-     expected (i.e. she/he then tries the other).
+     expected (and the user then tries the other).
      The cases where Backspace/Delete is mapped to some other key combination
      are rare, and in those cases, normal-erase-is-backspace can be turned on
      manually.  */
 
   have_keys = Qnil;
-  kb = XkbGetMap (dpy, XkbAllMapComponentsMask, XkbUseCoreKbd);
-  if (kb)
+  kb = FRAME_DISPLAY_INFO (f)->xkb_desc;
+  if (kb && kb->names)
     {
-      int delete_keycode = 0, backspace_keycode = 0, i;
-
-      if (XkbGetNames (dpy, XkbAllNamesMask, kb) == Success)
+      for (i = kb->min_key_code; (i < kb->max_key_code
+                                  && (delete_keycode == 0
+                                      || backspace_keycode == 0));
+           ++i)
         {
-          for (i = kb->min_key_code;
-               (i < kb->max_key_code
-                && (delete_keycode == 0 || backspace_keycode == 0));
-               ++i)
-            {
-              /* The XKB symbolic key names can be seen most easily in
-                 the PS file generated by `xkbprint -label name
-                 $DISPLAY'.  */
-              if (memcmp ("DELE", kb->names->keys[i].name, 4) == 0)
-                delete_keycode = i;
-              else if (memcmp ("BKSP", kb->names->keys[i].name, 4) == 0)
-                backspace_keycode = i;
-            }
-
-          XkbFreeNames (kb, 0, True);
+          /* The XKB symbolic key names can be seen most easily in
+             the PS file generated by `xkbprint -label name
+             $DISPLAY'.  */
+          if (!memcmp ("DELE", kb->names->keys[i].name, 4))
+            delete_keycode = i;
+          else if (!memcmp ("BKSP", kb->names->keys[i].name, 4))
+            backspace_keycode = i;
         }
 
-      /* As of libX11-1.6.2, XkbGetMap manual says that you should use
-         XkbFreeClientMap to free the data returned by XkbGetMap.  But
-         this function just frees the data referenced from KB and not
-         KB itself.  To free KB as well, call XkbFreeKeyboard.  */
-      XkbFreeKeyboard (kb, XkbAllMapComponentsMask, True);
-
-      if (delete_keycode
-          && backspace_keycode
+      if (delete_keycode && backspace_keycode
           && XKeysymToKeycode (dpy, XK_Delete) == delete_keycode
           && XKeysymToKeycode (dpy, XK_BackSpace) == backspace_keycode)
         have_keys = Qt;
     }
+  else
+    /* The keyboard names couldn't be obtained for some reason.  */
+    have_keys = Qlambda;
   unblock_input ();
   return have_keys;
 #endif
diff --git a/src/xmenu.c b/src/xmenu.c
index 1452b3c6d12..9d35e3529fb 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1521,26 +1521,15 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv,
 
   if (use_pos_func)
     {
-      Window dummy_window;
-
       /* Not invoked by a click.  pop up at x/y.  */
       pos_func = menu_position_func;
 
       /* Adjust coordinates to be root-window-relative.  */
       block_input ();
-      XTranslateCoordinates (FRAME_X_DISPLAY (f),
-
-                             /* From-window, to-window.  */
-                             FRAME_X_WINDOW (f),
-                             FRAME_DISPLAY_INFO (f)->root_window,
-
-                             /* From-position, to-position.  */
-                             x, y, &x, &y,
-
-                             /* Child of win.  */
-                             &dummy_window);
+      x_translate_coordinates_to_root (f, x, y, &x, &y);
 #ifdef HAVE_GTK3
-      /* Use window scaling factor to adjust position for hidpi screens. */
+      /* Use window scaling factor to adjust position for scaled
+         outputs.  */
       x /= xg_get_scale (f);
       y /= xg_get_scale (f);
 #endif
@@ -1743,7 +1732,6 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv,
   XButtonPressedEvent *event = &(dummy.xbutton);
   LWLIB_ID menu_id;
   Widget menu;
-  Window dummy_window;
 #if defined HAVE_XINPUT2 && defined USE_MOTIF
   XEvent property_dummy;
   Atom property_atom;
@@ -1775,17 +1763,7 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv,
   /* Adjust coordinates to be root-window-relative.  */
   block_input ();
   x += FRAME_LEFT_SCROLL_BAR_AREA_WIDTH (f);
-  XTranslateCoordinates (FRAME_X_DISPLAY (f),
-
-                         /* From-window, to-window.  */
-                         FRAME_X_WINDOW (f),
-                         FRAME_DISPLAY_INFO (f)->root_window,
-
-                         /* From-position, to-position.  */
-                         x, y, &x, &y,
-
-                         /* Child of win.  */
-                         &dummy_window);
+  x_translate_coordinates_to_root (f, x, y, &x, &y);
   unblock_input ();
 
   event->x_root = x;
@@ -2569,9 +2547,6 @@ Lisp_Object
 x_menu_show (struct frame *f, int x, int y, int menuflags,
              Lisp_Object title, const char **error_name)
 {
-#ifdef HAVE_X_WINDOWS
-  Window dummy_window;
-#endif
   Window root;
   XMenu *menu;
   int pane, selidx, lpane, status;
@@ -2620,17 +2595,7 @@ x_menu_show (struct frame *f, int x, int y, int menuflags,
   inhibit_garbage_collection ();
 
 #ifdef HAVE_X_WINDOWS
-  XTranslateCoordinates (FRAME_X_DISPLAY (f),
-
-                         /* From-window, to-window.  */
-                         FRAME_X_WINDOW (f),
-                         FRAME_DISPLAY_INFO (f)->root_window,
-
-                         /* From-position, to-position.  */
-                         x, y, &x, &y,
-
-                         /* Child of win.  */
-                         &dummy_window);
+  x_translate_coordinates_to_root (f, x, y, &x, &y);
 #else
   /* MSDOS without X support.  */
   x += f->left_pos;
diff --git a/src/xselect.c b/src/xselect.c
index 66782d41723..498c28af536 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2376,12 +2376,19 @@ On Nextstep, TERMINAL is unused.  */)
 {
   Window owner;
   Atom atom;
+#ifdef HAVE_XFIXES
+  Window temp_owner;
+#endif
   struct frame *f = frame_for_x_selection (terminal);
   struct x_display_info *dpyinfo;
 
   CHECK_SYMBOL (selection);
-  if (NILP (selection)) selection = QPRIMARY;
-  if (EQ (selection, Qt)) selection = QSECONDARY;
+
+  if (NILP (selection))
+    selection = QPRIMARY;
+
+  if (EQ (selection, Qt))
+    selection = QSECONDARY;
 
   if (!f)
     return Qnil;
@@ -2392,10 +2399,22 @@ On Nextstep, TERMINAL is unused.  */)
     return Qt;
 
   atom = symbol_to_x_atom (dpyinfo, selection);
-  if (atom == 0) return Qnil;
+
+  if (!atom)
+    return Qnil;
+
+#ifdef HAVE_XFIXES
+  /* See if this information can be obtained without a roundtrip.  */
+  temp_owner = x_find_selection_owner (dpyinfo, atom);
+
+  if (temp_owner != X_INVALID_WINDOW)
+    return (temp_owner != None ? Qt : Qnil);
+#endif
+
   block_input ();
   owner = XGetSelectionOwner (dpyinfo->display, atom);
   unblock_input ();
+
   return (owner ? Qt : Qnil);
 }
 
diff --git a/src/xterm.c b/src/xterm.c
index d35af7a8de2..7c3ab87e87b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7044,6 +7044,13 @@ x_update_begin (struct frame *f)
 #else
   /* Nothing to do.  */
 #endif
+
+#ifdef HAVE_XDBE
+  if (FRAME_X_DOUBLE_BUFFERED_P (f))
+    /* The frame is no longer complete, as it is in the midst of an
+       update.  */
+    FRAME_X_COMPLETE_P (f) = false;
+#endif
 }
 
 /* Draw a vertical window border from (x,y0) to (x,y1)  */
@@ -7190,6 +7197,10 @@ x_flip_and_flush (struct frame *f)
 #ifdef HAVE_XDBE
   if (FRAME_X_NEED_BUFFER_FLIP (f))
     show_back_buffer (f);
+
+  /* The frame is complete again as its contents were just
+     flushed.  */
+  FRAME_X_COMPLETE_P (f) = true;
 #endif
   x_flush (f);
   unblock_input ();
@@ -7240,6 +7251,9 @@ XTframe_up_to_date (struct frame *f)
   if (!buffer_flipping_blocked_p ()
       && FRAME_X_NEED_BUFFER_FLIP (f))
     show_back_buffer (f);
+
+  /* The frame is now complete, as its contents have been drawn.  */
+  FRAME_X_COMPLETE_P (f) = true;
 #endif
 
 #ifdef HAVE_XSYNC
@@ -10806,6 +10820,7 @@ x_clear_frame (struct frame *f)
   /* We have to clear the scroll bars.  If we have changed colors or
      something like that, then they should be notified.  */
   x_scroll_bar_clear (f);
+
   unblock_input ();
 }
 
@@ -10857,7 +10872,7 @@ x_show_hourglass (struct frame *f)
                                 (xcb_window_t) x->hourglass_window,
                                 parent, 0, 0, FRAME_PIXEL_WIDTH (f),
                                 FRAME_PIXEL_HEIGHT (f), 0,
-                                XCB_WINDOW_CLASS_INPUT_OUTPUT,
+                                XCB_WINDOW_CLASS_INPUT_ONLY,
                                 XCB_COPY_FROM_PARENT, XCB_CW_CURSOR,
                                 &cursor);
 #endif
@@ -13644,6 +13659,43 @@ x_translate_coordinates (struct frame *f, int root_x, int root_y,
     }
 }
 
+/* Translate the given coordinates from the edit window of FRAME,
+   taking into account any cached root window offsets.  This is mainly
+   used from the popup menu code.  */
+
+void
+x_translate_coordinates_to_root (struct frame *f, int x, int y,
+                                 int *x_out, int *y_out)
+{
+  struct x_output *output;
+  Window dummy;
+
+  output = FRAME_X_OUTPUT (f);
+
+  if (output->window_offset_certain_p)
+    {
+      /* Use the cached root window offset.  */
+      *x_out = x + output->root_x;
+      *y_out = y + output->root_y;
+
+      return;
+    }
+
+  /* Otherwise, do the transform manually and compute and cache the
+     root window position.  */
+  if (!XTranslateCoordinates (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+                              FRAME_DISPLAY_INFO (f)->root_window,
+                              x, y, x_out, y_out, &dummy))
+    *x_out = 0, *y_out = 0;
+  else
+    {
+      /* Cache the root window offset of the edit window.  */
+      output->window_offset_certain_p = true;
+      output->root_x = *x_out - x;
+      output->root_y = *y_out - y;
+    }
+}
+
 /* The same, but for an XIDeviceEvent.  */
 
 #ifdef HAVE_XINPUT2
@@ -17033,18 +17085,21 @@ x_net_wm_state (struct frame *f, Window window)
 
 /* Flip back buffers on F if it has undrawn content.  */
 
-#ifdef HAVE_XDBE
 static void
-flush_dirty_back_buffer_on (struct frame *f)
+x_flush_dirty_back_buffer_on (struct frame *f)
 {
-  block_input ();
-  if (!FRAME_GARBAGED_P (f)
-      && !buffer_flipping_blocked_p ()
-      && FRAME_X_NEED_BUFFER_FLIP (f))
-    show_back_buffer (f);
-  unblock_input ();
-}
+#ifdef HAVE_XDBE
+  if (FRAME_GARBAGED_P (f)
+      || buffer_flipping_blocked_p ()
+      /* If the frame is not already up to date, do not flush buffers
+         on input, as that will result in flicker.  */
+      || !FRAME_X_COMPLETE_P (f)
+      || !FRAME_X_NEED_BUFFER_FLIP (f))
+    return;
+
+  show_back_buffer (f);
 #endif
+}
 
 #ifdef HAVE_GTK3
 void
@@ -17798,6 +17853,46 @@ x_handle_wm_state (struct frame *f, struct input_event *ie)
   XFree (data);
 }
 
+#ifdef HAVE_XFIXES
+
+static bool
+x_handle_selection_monitor_event (struct x_display_info *dpyinfo,
+                                  XEvent *event)
+{
+  XFixesSelectionNotifyEvent *notify;
+  int i;
+
+  notify = (XFixesSelectionNotifyEvent *) event;
+
+  if (notify->window != dpyinfo->selection_tracking_window)
+    return false;
+
+  for (i = 0; i < dpyinfo->n_monitored_selections; ++i)
+    {
+      /* We don't have to keep track of timestamps here.  */
+      if (notify->selection == dpyinfo->monitored_selections[i].name)
+        dpyinfo->monitored_selections[i].owner = notify->owner;
+    }
+
+  return true;
+}
+
+Window
+x_find_selection_owner (struct x_display_info *dpyinfo, Atom selection)
+{
+  int i;
+
+  for (i = 0; i < dpyinfo->n_monitored_selections; ++i)
+    {
+      if (selection == dpyinfo->monitored_selections[i].name)
+        return dpyinfo->monitored_selections[i].owner;
+    }
+
+  return X_INVALID_WINDOW;
+}
+
+#endif
+
 /* Handles the XEvent EVENT on display DPYINFO.
 
    *FINISH is X_EVENT_GOTO_OUT if caller should stop reading events.
@@ -17824,7 +17919,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
   Time gen_help_time UNINIT;
 #endif
   ptrdiff_t nbytes = 0;
-  struct frame *any, *f = NULL;
+  struct frame *any, *f = NULL, *mouse_frame;
   Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
   /* This holds the state XLookupString needs to implement dead keys
      and other tricks known as "compose processing".  _X Window System_
@@ -19148,9 +19243,14 @@ handle_one_xevent (struct x_display_info *dpyinfo,
               || !EQ (f->tab_bar_window, hlinfo->mouse_face_window))
           )
         {
-          clear_mouse_face (hlinfo);
-          hlinfo->mouse_face_hidden = true;
-        }
+          mouse_frame = hlinfo->mouse_face_mouse_frame;
+
+          clear_mouse_face (hlinfo);
+          hlinfo->mouse_face_hidden = true;
+
+          if (mouse_frame)
+            x_flush_dirty_back_buffer_on (mouse_frame);
+        }
 
 #if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS
       if (f == 0)
@@ -19630,6 +19730,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
               {
                 clear_mouse_face (hlinfo);
                 hlinfo->mouse_face_mouse_frame = 0;
+                x_flush_dirty_back_buffer_on (xvw->frame);
               }
 
             if (any_help_event_p)
@@ -19783,6 +19884,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                  certainly no longer on any text in the frame.  */
               clear_mouse_face (hlinfo);
               hlinfo->mouse_face_mouse_frame = 0;
+              x_flush_dirty_back_buffer_on (f);
             }
 
           /* Generate a nil HELP_EVENT to cancel a help-echo.
@@ -19840,7 +19942,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
         help_echo_string = Qnil;
 
         if (hlinfo->mouse_face_hidden)
-          {
+          {
             hlinfo->mouse_face_hidden = false;
             clear_mouse_face (hlinfo);
           }
@@ -20171,6 +20273,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
         if (!NILP (help_echo_string)
             || !NILP (previous_help_echo_string))
           do_help = 1;
+
+        if (f)
+          x_flush_dirty_back_buffer_on (f);
         goto OTHER;
       }
 
@@ -20467,7 +20572,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
             {
               int old_left = f->left_pos;
               int old_top = f->top_pos;
-              Lisp_Object frame = Qnil;
+              Lisp_Object frame;
 
               XSETFRAME (frame, f);
 
@@ -20837,9 +20942,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                 tab_bar_p = EQ (window, f->tab_bar_window);
 
                 if (tab_bar_p)
-                  tab_bar_arg = handle_tab_bar_click
-                    (f, x, y, event->xbutton.type == ButtonPress,
-                     x_x_to_emacs_modifiers (dpyinfo, event->xbutton.state));
+                  {
+                    tab_bar_arg = handle_tab_bar_click
+                      (f, x, y, event->xbutton.type == ButtonPress,
+                       x_x_to_emacs_modifiers (dpyinfo, event->xbutton.state));
+                    x_flush_dirty_back_buffer_on (f);
+                  }
               }
 
 #if ! defined (USE_GTK)
@@ -20857,9 +20965,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                                   || f->last_tool_bar_item != -1));
 
                 if (tool_bar_p && event->xbutton.button < 4)
-                  handle_tool_bar_click
-                    (f, x, y, event->xbutton.type == ButtonPress,
-                     x_x_to_emacs_modifiers (dpyinfo, event->xbutton.state));
+                  {
+                    handle_tool_bar_click
+                      (f, x, y, event->xbutton.type == ButtonPress,
+                       x_x_to_emacs_modifiers (dpyinfo, event->xbutton.state));
+                    x_flush_dirty_back_buffer_on (f);
+                  }
               }
 #endif /* !USE_GTK */
 
@@ -21398,6 +21509,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                          certainly no longer on any text in the frame.  */
                       clear_mouse_face (hlinfo);
                       hlinfo->mouse_face_mouse_frame = 0;
+                      x_flush_dirty_back_buffer_on (f);
                     }
 
                   /* Generate a nil HELP_EVENT to cancel a help-echo.
@@ -22073,6 +22185,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
                   do_help = 1;
                 }
+
+              if (f)
+                x_flush_dirty_back_buffer_on (f);
               goto XI_OTHER;
             }
 
@@ -22592,9 +22707,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                       tab_bar_p = EQ (window, f->tab_bar_window);
 
                       if (tab_bar_p)
-                        tab_bar_arg = handle_tab_bar_click
-                          (f, x, y, xev->evtype == XI_ButtonPress,
-                           x_x_to_emacs_modifiers (dpyinfo, bv.state));
+                        {
+                          tab_bar_arg = handle_tab_bar_click
+                            (f, x, y, xev->evtype == XI_ButtonPress,
+                             x_x_to_emacs_modifiers (dpyinfo, bv.state));
+                          x_flush_dirty_back_buffer_on (f);
+                        }
                     }
 
 #if ! defined (USE_GTK)
@@ -22619,10 +22737,13 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                                         || f->last_tool_bar_item != -1));
 
                       if (tool_bar_p && xev->detail < 4)
-                        handle_tool_bar_click_with_device
-                          (f, x, y, xev->evtype == XI_ButtonPress,
-                           x_x_to_emacs_modifiers (dpyinfo, bv.state),
-                           source ? source->name : Qt);
+                        {
+                          handle_tool_bar_click_with_device
+                            (f, x, y, xev->evtype == XI_ButtonPress,
+                             x_x_to_emacs_modifiers (dpyinfo, bv.state),
+                             source ? source->name : Qt);
+                          x_flush_dirty_back_buffer_on (f);
+                        }
                     }
 #endif /* !USE_GTK */
 
@@ -22919,8 +23040,13 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                       || !EQ (f->tab_bar_window, hlinfo->mouse_face_window))
                   )
                 {
+                  mouse_frame = hlinfo->mouse_face_mouse_frame;
+
                   clear_mouse_face (hlinfo);
                   hlinfo->mouse_face_hidden = true;
+
+                  if (mouse_frame)
+                    x_flush_dirty_back_buffer_on (mouse_frame);
                 }
 
               if (f != 0)
@@ -23299,7 +23425,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                       /* Handle all disabled devices now, to prevent
                          things happening out-of-order later.  */
 
-                      if (ndevices)
+                      if (n_disabled)
                         {
                           xi_disable_devices (dpyinfo, disabled, n_disabled);
                           n_disabled = 0;
@@ -23704,12 +23830,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                                          | XkbModifierMapMask
                                          | XkbVirtualModsMask),
                                         dpyinfo->xkb_desc) == Success)
-                    XkbGetNames (dpyinfo->display,
-                                 XkbGroupNamesMask | XkbVirtualModNamesMask,
+                    XkbGetNames (dpyinfo->display, XkbAllNamesMask,
                                  dpyinfo->xkb_desc);
                   else
                     {
-                      XkbFreeKeyboard (dpyinfo->xkb_desc, XkbAllComponentsMask, True);
+                      XkbFreeKeyboard (dpyinfo->xkb_desc,
+                                       XkbAllComponentsMask, True);
                       dpyinfo->xkb_desc = NULL;
                     }
                 }
@@ -23723,8 +23849,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                                                  XkbUseCoreKbd);
 
                   if (dpyinfo->xkb_desc)
-                    XkbGetNames (dpyinfo->display,
-                                 XkbGroupNamesMask | XkbVirtualModNamesMask,
+                    XkbGetNames (dpyinfo->display, XkbAllNamesMask,
                                  dpyinfo->xkb_desc);
                 }
 
@@ -24015,6 +24140,17 @@ handle_one_xevent (struct x_display_info *dpyinfo,
             x_dnd_update_tooltip_now ();
         }
 #endif
+#ifdef HAVE_XFIXES
+      if (dpyinfo->xfixes_supported_p
+          && event->type == (dpyinfo->xfixes_event_base
+                             + XFixesSelectionNotify)
+          && x_handle_selection_monitor_event (dpyinfo, event))
+        /* GTK 3 crashes if an XFixesSelectionNotify arrives with a
+           window other than the root window, because it wants to know
+           the screen in order to determine the compositing manager
+           selection name.  (bug#58584) */
+        *finish = X_EVENT_DROP;
+#endif
     OTHER:
 #ifdef USE_X_TOOLKIT
       if (*finish != X_EVENT_DROP)
@@ -24084,18 +24220,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
       count++;
     }
 
-  /* Sometimes event processing draws to either F or ANY outside
-     redisplay.  To ensure that these changes become visible, draw
-     them here.  */
-
-#ifdef HAVE_XDBE
-  if (f)
-    flush_dirty_back_buffer_on (f);
-
-  if (any && any != f)
-    flush_dirty_back_buffer_on (any);
-#endif
-
   SAFE_FREE ();
   return count;
 }
@@ -28527,6 +28651,27 @@ xi_check_toolkit (Display *display)
 
 #endif
 
+#ifdef HAVE_XFIXES
+
+/* Create and return a special window for receiving events such as
+   selection notify events.  The window is an 1x1 unmapped
+   override-redirect InputOnly window at -1, -1, which should prevent
+   it from doing anything.  */
+
+static Window
+x_create_special_window (struct x_display_info *dpyinfo)
+{
+  XSetWindowAttributes attrs;
+
+  attrs.override_redirect = True;
+
+  return XCreateWindow (dpyinfo->display, dpyinfo->root_window,
+                        -1, -1, 1, 1, 0, CopyFromParent, InputOnly,
+                        CopyFromParent, CWOverrideRedirect, &attrs);
+}
+
+#endif
+
 /* Open a connection to X display DISPLAY_NAME, and return the
    structure that describes the open display.  If obtaining the XCB
    connection or toolkit-specific display fails, return NULL.  Signal
@@ -28548,6 +28693,22 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
   GdkDisplay *gdpy;
   GdkScreen *gscr;
 #endif
+#ifdef HAVE_XFIXES
+  Lisp_Object tem, lisp_name;
+  int num_fast_selections;
+  Atom selection_name;
+#ifdef USE_XCB
+  xcb_get_selection_owner_cookie_t *selection_cookies;
+  xcb_get_selection_owner_reply_t *selection_reply;
+  xcb_generic_error_t *selection_error;
+#endif
+#endif
+  int i;
+
+  USE_SAFE_ALLOCA;
+
+  /* Avoid warnings when SAFE_ALLOCA is not actually used.  */
+  ((void) SAFE_ALLOCA (0));
 
   block_input ();
 
@@ -28700,12 +28861,14 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 #endif
 
       unblock_input ();
+
+      SAFE_FREE ();
       return 0;
     }
 
 #ifdef USE_XCB
   xcb_conn = XGetXCBConnection (dpy);
-  if (xcb_conn == 0)
+  if (!xcb_conn)
     {
 #ifdef USE_GTK
       xg_display_close (dpy);
@@ -28718,6 +28881,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 #endif /* ! USE_GTK */
 
       unblock_input ();
+
+      SAFE_FREE ();
       return 0;
     }
 #endif
@@ -29270,8 +29435,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
                                      XkbUseCoreKbd);
 
       if (dpyinfo->xkb_desc)
-        XkbGetNames (dpyinfo->display,
-                     XkbGroupNamesMask | XkbVirtualModNamesMask,
+        XkbGetNames (dpyinfo->display, XkbAllNamesMask,
                      dpyinfo->xkb_desc);
 
       XkbSelectEvents (dpyinfo->display, XkbUseCoreKbd,
@@ -29281,9 +29445,10 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 #endif
 
 #ifdef HAVE_XFIXES
-  int xfixes_event_base, xfixes_error_base;
+  int xfixes_error_base;
   dpyinfo->xfixes_supported_p
-    = XFixesQueryExtension (dpyinfo->display, &xfixes_event_base,
+    = XFixesQueryExtension (dpyinfo->display,
+                            &dpyinfo->xfixes_event_base,
                             &xfixes_error_base);
 
   if (dpyinfo->xfixes_supported_p)
@@ -29334,7 +29499,6 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
            XScreenNumberOfScreen (dpyinfo->screen));
 
   {
-    int i;
     enum { atom_count = ARRAYELTS (x_atom_refs) };
     /* 1 for _XSETTINGS_SN.  */
     enum { total_atom_count = 2 + atom_count };
@@ -29502,8 +29666,100 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
   dpyinfo->protected_windows_max = 256;
 #endif
 
+#ifdef HAVE_XFIXES
+  /* Initialize selection tracking for the selections in
+     x-fast-selection-list.  */
+
+  if (CONSP (Vx_fast_selection_list)
+      && dpyinfo->xfixes_supported_p
+      && dpyinfo->xfixes_major >= 1)
+    {
+      num_fast_selections = 0;
+      tem = Vx_fast_selection_list;
+
+      FOR_EACH_TAIL_SAFE (tem)
+        {
+          if (!SYMBOLP (XCAR (tem)))
+            continue;
+
+          num_fast_selections++;
+        }
+
+      dpyinfo->n_monitored_selections = num_fast_selections;
+      dpyinfo->selection_tracking_window
+        = x_create_special_window (dpyinfo);
+      dpyinfo->monitored_selections
+        = xmalloc (num_fast_selections
+                   * sizeof *dpyinfo->monitored_selections);
+
+      num_fast_selections = 0;
+      tem = Vx_fast_selection_list;
+
+      FOR_EACH_TAIL_SAFE (tem)
+        {
+          lisp_name = XCAR (tem);
+
+          if (!SYMBOLP (lisp_name))
+            continue;
+
+          selection_name = symbol_to_x_atom (dpyinfo, lisp_name);
+          dpyinfo->monitored_selections[num_fast_selections++].name
+            = selection_name;
+          dpyinfo->monitored_selections[num_fast_selections - 1].owner
+            = X_INVALID_WINDOW;
+
+          /* Select for selection input.  */
+          XFixesSelectSelectionInput (dpyinfo->display,
+                                      dpyinfo->selection_tracking_window,
+                                      selection_name,
+                                      (XFixesSetSelectionOwnerNotifyMask
+                                       | XFixesSetSelectionOwnerNotifyMask
+                                       | XFixesSelectionClientCloseNotifyMask));
+        }
+
+#ifdef USE_XCB
+      selection_cookies = SAFE_ALLOCA (sizeof *selection_cookies
+                                       * num_fast_selections);
+#endif
+
+      /* Now, ask for the current owners of all those selections.  */
+      for (i = 0; i < num_fast_selections; ++i)
+        {
+#ifdef USE_XCB
+          selection_cookies[i]
+            = xcb_get_selection_owner (dpyinfo->xcb_connection,
+                                       dpyinfo->monitored_selections[i].name);
+#else
+          dpyinfo->monitored_selections[i].owner
+            = XGetSelectionOwner (dpyinfo->display,
+                                  dpyinfo->monitored_selections[i].name);
+#endif
+        }
+
+#ifdef USE_XCB
+      for (i = 0; i < num_fast_selections; ++i)
+        {
+          selection_reply
+            = xcb_get_selection_owner_reply (dpyinfo->xcb_connection,
+                                             selection_cookies[i],
+                                             &selection_error);
+
+          if (selection_reply)
+            {
+              dpyinfo->monitored_selections[i].owner
+                = selection_reply->owner;
+              free (selection_reply);
+            }
+          else if (selection_error)
+            free (selection_error);
+        }
+#endif
+    }
+#endif
+
   unblock_input ();
 
+  SAFE_FREE ();
   return dpyinfo;
 }
 
@@ -29639,6 +29895,10 @@ x_delete_display (struct x_display_info *dpyinfo)
   xfree (dpyinfo->x_id_name);
   xfree (dpyinfo->x_dnd_atoms);
   xfree (dpyinfo->color_cells);
+#ifdef HAVE_XFIXES
+  if (dpyinfo->monitored_selections)
+    xfree (dpyinfo->monitored_selections);
+#endif
 #ifdef USE_TOOLKIT_SCROLL_BARS
   xfree (dpyinfo->protected_windows);
 #endif
@@ -30606,4 +30866,17 @@ It should accept a single argument, a string describing the locale of
 the input method, and return a coding system that can decode keyboard
 input generated by said input method.  */);
   Vx_input_coding_function = Qnil;
+
+  DEFVAR_LISP ("x-fast-selection-list", Vx_fast_selection_list,
+    doc: /* List of selections for which `x-selection-exists-p' should be fast.
+
+List of selection names as atoms that will be monitored by Emacs for
+ownership changes when the X server supports the XFIXES extension.
+The result of the monitoring is then used by `x-selection-exists-p' to
+avoid a server round trip, which is important as it is called while
+updating the tool bar.  The value of this variable is only read upon
+connection setup.  */);
+  /* The default value of this variable is chosen so that updating the
+     tool bar does not require a call to _XReply.  */
+  Vx_fast_selection_list = list1 (QCLIPBOARD);
 }
diff --git a/src/xterm.h b/src/xterm.h
index b68a234faa5..0f00dc42f79 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -308,6 +308,22 @@ struct x_failable_request
   unsigned long end;
 };
 
+#ifdef HAVE_XFIXES
+
+struct x_monitored_selection
+{
+  /* The name of the selection.  */
+  Atom name;
+
+  /* The current owner of the selection.  */
+  Window owner;
+};
+
+/* An invalid window.  */
+#define X_INVALID_WINDOW 0xffffffff
+
+#endif
+
 
 /* For each X display, we have a structure that records
    information about it.  */
@@ -778,6 +794,7 @@ struct x_display_info
   bool xfixes_supported_p;
   int xfixes_major;
   int xfixes_minor;
+  int xfixes_event_base;
 #endif
 
 #ifdef HAVE_XSYNC
@@ -828,6 +845,17 @@ struct x_display_info
   /* Pointer to the next request in `failable_requests'.  */
   struct x_failable_request *next_failable_request;
 
+#ifdef HAVE_XFIXES
+  /* Array of selections being monitored and their owners.  */
+  struct x_monitored_selection *monitored_selections;
+
+  /* Window used to monitor those selections.  */
+  Window selection_tracking_window;
+
+  /* The number of those selections.  */
+  int n_monitored_selections;
+#endif
+
   /* The pending drag-and-drop time for middle-click based
      drag-and-drop emulation.  */
   Time pending_dnd_time;
@@ -916,11 +944,6 @@ struct x_output
   Picture picture;
 #endif
 
-  /* Flag that indicates whether we've modified the back buffer and
-     need to publish our modifications to the front buffer at a
-     convenient time.  */
-  bool need_buffer_flip;
-
   /* The X window used for the bitmap icon;
      or 0 if we don't have a bitmap icon.  */
   Window icon_desc;
@@ -1091,6 +1114,18 @@ struct x_output
      and inactive states.  */
   bool_bf alpha_identical_p : 1;
 
+#ifdef HAVE_XDBE
+  /* Flag that indicates whether we've modified the back buffer and
+     need to publish our modifications to the front buffer at a
+     convenient time.  */
+  bool_bf need_buffer_flip : 1;
+
+  /* Flag that indicates whether or not the frame contents are
+     complete and can be safely flushed while handling async
+     input.  */
+  bool_bf complete : 1;
+#endif
+
 #ifdef HAVE_X_I18N
   /* Input context (currently, this means Compose key handler setup).  */
   XIC xic;
@@ -1248,6 +1283,10 @@ extern void x_mark_frame_dirty (struct frame *f);
 
 /* Return the need-buffer-flip flag for frame F.  */
 #define FRAME_X_NEED_BUFFER_FLIP(f) ((f)->output_data.x->need_buffer_flip)
+
+/* Return whether or not the frame F has been completely drawn.  Used
+   while handling async input.  */
+#define FRAME_X_COMPLETE_P(f) ((f)->output_data.x->complete)
 #endif
 
 /* Return the outermost X window associated with the frame F.  */
@@ -1645,6 +1684,10 @@ extern void x_cr_draw_frame (cairo_t *, struct frame *);
 extern Lisp_Object x_cr_export_frames (Lisp_Object, cairo_surface_type_t);
 #endif
 
+#ifdef HAVE_XFIXES
+extern Window x_find_selection_owner (struct x_display_info *, Atom);
+#endif
+
 #ifdef HAVE_XRENDER
 extern void x_xrender_color_from_gc_background (struct frame *, GC,
                                                 XRenderColor *, bool);
@@ -1653,6 +1696,8 @@ extern void x_xr_apply_ext_clip (struct frame *, GC);
 extern void x_xr_reset_ext_clip (struct frame *);
 #endif
 
+extern void x_translate_coordinates_to_root (struct frame *, int, int,
+                                             int *, int *);
 extern Bool x_query_pointer (Display *, Window, Window *, Window *, int *,
                              int *, int *, int *, unsigned int *);