From: Ari Roponen <ari.roponen@gmail.com>
Date: Sun, 6 May 2018 12:29:28 +0000 (+0300)
Subject: Fix cairo scrolling for side-by-side windows
X-Git-Tag: emacs-26.1.91~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0220391c0015bdec0e658c7ab206c6226bb335ca;p=emacs.git

Fix cairo scrolling for side-by-side windows

Backport: Fixes Bug#33442.

* src/xterm.c (x_scroll_run) [USE_CAIRO]: Fix scrolling for
side-by-side split windows.  (Bug#31288)

(cherry picked from commit 6e362a32bc9d21f73a0f29ca6f45481edeea6f29)
---

diff --git a/src/xterm.c b/src/xterm.c
index 577c87a93b1..97a0d97de70 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4251,6 +4251,7 @@ x_scroll_run (struct window *w, struct run *run)
 #ifdef USE_CAIRO
   if (FRAME_CR_CONTEXT (f))
     {
+      int wx = WINDOW_LEFT_EDGE_X (w);
       cairo_surface_t *s = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
 						       width, height);
       cairo_t *cr = cairo_create (s);
@@ -4261,8 +4262,8 @@ x_scroll_run (struct window *w, struct run *run)
 
       cr = FRAME_CR_CONTEXT (f);
       cairo_save (cr);
-      cairo_set_source_surface (cr, s, 0, to_y);
-      cairo_rectangle (cr, x, to_y, width, height);
+      cairo_set_source_surface (cr, s, wx, to_y);
+      cairo_rectangle (cr, wx, to_y, width, height);
       cairo_fill (cr);
       cairo_restore (cr);
       cairo_surface_destroy (s);