Merge from origin/emacs-26

908af9d Indexing followup to recent changes
505ac9a Improve documentation of cursor-sensor.el (bug#33664)
d817d2c * doc/lispref/commands.texi (Adjusting Point): Bug#33662
18442da Tramp multi-hop methods must be inline
1e3e24d ; * src/xterm.c (x_update_begin): Fix whitespace.
1d743d2 Fix scaling problem in Cairo builds
2b9e993 ; * doc/lispref/text.texi (Special Properties): Fix wording. ...
e568202 * lisp/simple.el (next-line-or-history-element): Use current-...
c7897c2 A few further fixes of window internals description

# Conflicts:
#	doc/misc/tramp.texi

1 files changed, 10 insertions, 4 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 3a7e31e7129..943f4c3b3d8 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -360,10 +360,15 @@ x_begin_cr_clip (struct frame *f, GC gc)
 
       if (! FRAME_CR_SURFACE (f))
         {
+          int scale = 1;
+#ifdef USE_GTK
+          scale = xg_get_scale (f);
+#endif
+
           FRAME_CR_SURFACE (f) =
             cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                        FRAME_PIXEL_WIDTH (f),
-                                        FRAME_PIXEL_HEIGHT (f));
+                                        scale * FRAME_PIXEL_WIDTH (f),
+                                        scale * FRAME_PIXEL_HEIGHT (f));
         }
       cr = cairo_create (FRAME_CR_SURFACE (f));
       FRAME_CR_CONTEXT (f) = cr;
@@ -999,8 +1004,9 @@ x_update_begin (struct frame *f)
       if (FRAME_GTK_WIDGET (f))
         {
           GdkWindow *w = gtk_widget_get_window (FRAME_GTK_WIDGET (f));
-          width = gdk_window_get_width (w);
-          height = gdk_window_get_height (w);
+          int scale = xg_get_scale (f);
+          width = scale * gdk_window_get_width (w);
+          height = scale * gdk_window_get_height (w);
         }
       else
 #endif