Merge remote-tracking branch 'origin/master' into feature/pgtk

5 files changed, 92 insertions, 54 deletions

diff --git a/src/haikufns.c b/src/haikufns.c
index 868fc71f979..737b0338994 100644
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -1970,7 +1970,8 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
   try_window (window, pos, TRY_WINDOW_IGNORE_FONTS_CHANGE);
   /* Calculate size of tooltip window.  */
   size = Fwindow_text_pixel_size (window, Qnil, Qnil, Qnil,
-                                  make_fixnum (w->pixel_height), Qnil);
+                                  make_fixnum (w->pixel_height), Qnil,
+                                  Qnil);
   /* Add the frame's internal border to calculated size.  */
   width = XFIXNUM (Fcar (size)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (tip_f);
   height = XFIXNUM (Fcdr (size)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (tip_f);
diff --git a/src/w32fns.c b/src/w32fns.c
index 65463b52616..02a6d78b51c 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7525,7 +7525,8 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
   try_window (window, pos, TRY_WINDOW_IGNORE_FONTS_CHANGE);
   /* Calculate size of tooltip window.  */
   size = Fwindow_text_pixel_size (window, Qnil, Qnil, Qnil,
-                                  make_fixnum (w->pixel_height), Qnil);
+                                  make_fixnum (w->pixel_height), Qnil,
+                                  Qnil);
   /* Add the frame's internal border to calculated size.  */
   width = XFIXNUM (Fcar (size)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (tip_f);
   height = XFIXNUM (Fcdr (size)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (tip_f);
diff --git a/src/xdisp.c b/src/xdisp.c
index 2d45a8d6b9f..3a1bc1613f7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5361,9 +5361,6 @@ handle_display_prop (struct it *it)
   if (!it->string_from_display_prop_p)
     it->area = TEXT_AREA;
 
-  if (!STRINGP (it->string))
-    object = it->w->contents;
-
   propval = get_char_property_and_overlay (make_fixnum (position->charpos),
                                            Qdisplay, object, &overlay);
 
@@ -5377,6 +5374,9 @@ handle_display_prop (struct it *it)
   /* Now OVERLAY is the overlay that gave us this property, or nil
      if it was a text property.  */
 
+  if (!STRINGP (it->string))
+    object = it->w->contents;
+
   display_replaced = handle_display_spec (it, propval, object, overlay,
                                           position, bufpos,
                                           FRAME_WINDOW_P (it->f));
@@ -10832,8 +10832,9 @@ in_display_vector_p (struct it *it)
    set WINDOW's buffer to the buffer specified by its BUFFER_OR_NAME
    argument.  */
 static Lisp_Object
-window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, Lisp_Object x_limit,
-                        Lisp_Object y_limit, Lisp_Object mode_lines)
+window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to,
+                        Lisp_Object x_limit, Lisp_Object y_limit,
+                        Lisp_Object mode_lines, Lisp_Object ignore_line_at_end)
 {
   struct window *w = decode_live_window (window);
   struct it it;
@@ -10841,6 +10842,7 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, Li
   struct text_pos startp;
   void *itdata = NULL;
   int c, max_x = 0, max_y = 0, x = 0, y = 0;
+  int doff = 0;
 
   if (NILP (from))
     {
@@ -10969,8 +10971,16 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, Li
       if (IT_CHARPOS (it) == end)
         {
           x += it.pixel_width;
-          it.max_ascent = max (it.max_ascent, it.ascent);
-          it.max_descent = max (it.max_descent, it.descent);
+
+          /* DTRT if ignore_line_at_end is t.  */
+          if (!NILP (ignore_line_at_end))
+            doff = (max (it.max_ascent, it.ascent)
+                    + max (it.max_descent, it.descent));
+          else
+            {
+              it.max_ascent = max (it.max_ascent, it.ascent);
+              it.max_descent = max (it.max_descent, it.descent);
+            }
         }
     }
   else
@@ -10991,8 +11001,14 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, Li
 
   /* Subtract height of header-line and tab-line which was counted
      automatically by start_display.  */
-  y = it.current_y + it.max_ascent + it.max_descent
-    - WINDOW_TAB_LINE_HEIGHT (w) - WINDOW_HEADER_LINE_HEIGHT (w);
+  if (!NILP (ignore_line_at_end))
+    y = (it.current_y + doff
+         - WINDOW_TAB_LINE_HEIGHT (w)
+         - WINDOW_HEADER_LINE_HEIGHT (w));
+  else
+    y = (it.current_y + it.max_ascent + it.max_descent + doff
+         - WINDOW_TAB_LINE_HEIGHT (w) - WINDOW_HEADER_LINE_HEIGHT (w));
+
   /* Don't return more than Y-LIMIT.  */
   if (y > max_y)
     y = max_y;
@@ -11039,7 +11055,7 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, Li
   return Fcons (make_fixnum (x - start_x), make_fixnum (y));
 }
 
-DEFUN ("window-text-pixel-size", Fwindow_text_pixel_size, Swindow_text_pixel_size, 0, 6, 0,
+DEFUN ("window-text-pixel-size", Fwindow_text_pixel_size, Swindow_text_pixel_size, 0, 7, 0,
        doc: /* Return the size of the text of WINDOW's buffer in pixels.
 WINDOW must be a live window and defaults to the selected one.  The
 return value is a cons of the maximum pixel-width of any text line
@@ -11086,9 +11102,12 @@ Optional argument MODE-LINES nil or omitted means do not include the
 height of the mode-, tab- or header-line of WINDOW in the return value.
 If it is the symbol `mode-line', 'tab-line' or `header-line', include
 only the height of that line, if present, in the return value.  If t,
-include the height of any of these, if present, in the return value.  */)
+include the height of any of these, if present, in the return value.
+
+IGNORE-LINE-AT-END, if non-nil, means to not add the height of the
+screen line that includes TO to the returned height of the text.  */)
   (Lisp_Object window, Lisp_Object from, Lisp_Object to, Lisp_Object x_limit,
-   Lisp_Object y_limit, Lisp_Object mode_lines)
+   Lisp_Object y_limit, Lisp_Object mode_lines, Lisp_Object ignore_line_at_end)
 {
   struct window *w = decode_live_window (window);
   struct buffer *b = XBUFFER (w->contents);
@@ -11101,7 +11120,8 @@ include the height of any of these, if present, in the return value.  */)
       set_buffer_internal_1 (b);
     }
 
-  value = window_text_pixel_size (window, from, to, x_limit, y_limit, mode_lines);
+  value = window_text_pixel_size (window, from, to, x_limit, y_limit, mode_lines,
+                                  ignore_line_at_end);
 
   if (old_b)
     set_buffer_internal_1 (old_b);
@@ -11151,7 +11171,8 @@ WINDOW.  */)
       set_marker_both (w->old_pointm, buffer, BEG, BEG_BYTE);
     }
 
-  value = window_text_pixel_size (window, Qnil, Qnil, x_limit, y_limit, Qnil);
+  value = window_text_pixel_size (window, Qnil, Qnil, x_limit, y_limit, Qnil,
+                                  Qnil);
 
   unbind_to (count, Qnil);
 
diff --git a/src/xfns.c b/src/xfns.c
index dc25d7bfca2..30ed358fb28 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -7169,7 +7169,8 @@ Text larger than the specified size is clipped.  */)
   try_window (window, pos, TRY_WINDOW_IGNORE_FONTS_CHANGE);
   /* Calculate size of tooltip window.  */
   size = Fwindow_text_pixel_size (window, Qnil, Qnil, Qnil,
-                                  make_fixnum (w->pixel_height), Qnil);
+                                  make_fixnum (w->pixel_height), Qnil,
+                                  Qnil);
   /* Add the frame's internal border to calculated size.  */
   width = XFIXNUM (Fcar (size)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (tip_f);
   height = XFIXNUM (Fcdr (size)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (tip_f);
diff --git a/src/xterm.c b/src/xterm.c
index 03f509ba868..7456b3b6beb 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -579,7 +579,7 @@ xi_link_touch_point (struct xi_device_t *device,
   device->touchpoints = touchpoint;
 }
 
-static void
+static bool
 xi_unlink_touch_point (int detail,
                        struct xi_device_t *device)
 {
@@ -596,9 +596,11 @@ xi_unlink_touch_point (int detail,
             last->next = tem->next;
 
           xfree (tem);
-          return;
+          return true;
         }
     }
+
+  return false;
 }
 
 static struct xi_touch_point_t *
@@ -10887,37 +10889,45 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
               if (f && device->direct_p)
                 {
-                  xi_link_touch_point (device, xev->detail, xev->event_x,
-                                       xev->event_y);
+                  x_catch_errors (dpyinfo->display);
+                  XIAllowTouchEvents (dpyinfo->display, xev->deviceid,
+                                      xev->detail, xev->event, XIAcceptTouch);
+                  if (!x_had_errors_p (dpyinfo->display))
+                    {
+                      xi_link_touch_point (device, xev->detail, xev->event_x,
+                                           xev->event_y);
 
 #ifdef HAVE_GTK3
-                  if (FRAME_X_OUTPUT (f)->menubar_widget
-                      && xg_event_is_for_menubar (f, event))
-                    {
-                      bool was_waiting_for_input = waiting_for_input;
-                      /* This hack was adopted from the NS port.  Whether
-                         or not it is actually safe is a different story
-                         altogether.  */
-                      if (waiting_for_input)
-                        waiting_for_input = 0;
-                      set_frame_menubar (f, true);
-                      waiting_for_input = was_waiting_for_input;
-                    }
+                      if (FRAME_X_OUTPUT (f)->menubar_widget
+                          && xg_event_is_for_menubar (f, event))
+                        {
+                          bool was_waiting_for_input = waiting_for_input;
+                          /* This hack was adopted from the NS port.  Whether
+                             or not it is actually safe is a different story
+                             altogether.  */
+                          if (waiting_for_input)
+                            waiting_for_input = 0;
+                          set_frame_menubar (f, true);
+                          waiting_for_input = was_waiting_for_input;
+                        }
 #endif
 
-                  inev.ie.kind = TOUCHSCREEN_BEGIN_EVENT;
-                  inev.ie.timestamp = xev->time;
-                  XSETFRAME (inev.ie.frame_or_window, f);
-                  XSETINT (inev.ie.x, lrint (xev->event_x));
-                  XSETINT (inev.ie.y, lrint (xev->event_y));
-                  XSETINT (inev.ie.arg, xev->detail);
-
-                  XIAllowTouchEvents (dpyinfo->display, xev->deviceid,
-                                      xev->detail, xev->event, XIAcceptTouch);
+                      inev.ie.kind = TOUCHSCREEN_BEGIN_EVENT;
+                      inev.ie.timestamp = xev->time;
+                      XSETFRAME (inev.ie.frame_or_window, f);
+                      XSETINT (inev.ie.x, lrint (xev->event_x));
+                      XSETINT (inev.ie.y, lrint (xev->event_y));
+                      XSETINT (inev.ie.arg, xev->detail);
+                    }
+                  x_uncatch_errors_after_check ();
                 }
               else
-                XIAllowTouchEvents (dpyinfo->display, xev->deviceid,
-                                    xev->detail, xev->event, XIRejectTouch);
+                {
+                  x_catch_errors (dpyinfo->display);
+                  XIAllowTouchEvents (dpyinfo->display, xev->deviceid,
+                                      xev->detail, xev->event, XIRejectTouch);
+                  x_uncatch_errors ();
+                }
 
               goto XI_OTHER;
             }
@@ -10965,24 +10975,28 @@ handle_one_xevent (struct x_display_info *dpyinfo,
           case XI_TouchEnd:
             {
               struct xi_device_t *device;
+              bool unlinked_p;
 
               device = xi_device_from_id (dpyinfo, xev->deviceid);
 
               if (!device)
                 goto XI_OTHER;
 
-              xi_unlink_touch_point (xev->detail, device);
-
-              f = x_any_window_to_frame (dpyinfo, xev->event);
+              unlinked_p = xi_unlink_touch_point (xev->detail, device);
 
-              if (f && device->direct_p)
+              if (unlinked_p)
                 {
-                  inev.ie.kind = TOUCHSCREEN_END_EVENT;
-                  inev.ie.timestamp = xev->time;
-                  XSETFRAME (inev.ie.frame_or_window, f);
-                  XSETINT (inev.ie.x, lrint (xev->event_x));
-                  XSETINT (inev.ie.y, lrint (xev->event_y));
-                  XSETINT (inev.ie.arg, xev->detail);
+                  f = x_any_window_to_frame (dpyinfo, xev->event);
+
+                  if (f && device->direct_p)
+                    {
+                      inev.ie.kind = TOUCHSCREEN_END_EVENT;
+                      inev.ie.timestamp = xev->time;
+                      XSETFRAME (inev.ie.frame_or_window, f);
+                      XSETINT (inev.ie.x, lrint (xev->event_x));
+                      XSETINT (inev.ie.y, lrint (xev->event_y));
+                      XSETINT (inev.ie.arg, xev->detail);
+                    }
                 }
 
               goto XI_OTHER;