From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Ari Roponen Newsgroups: gmane.emacs.bugs Subject: bug#31288: [PATCH v2] Make cairo build usable Date: Sun, 06 May 2018 15:36:55 +0300 Message-ID: <87a7td6jvc.fsf@gmail.com> References: <87h8nv23aj.fsf@gmail.com> <83in82sawn.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1525610172 512 195.159.176.226 (6 May 2018 12:36:12 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 6 May 2018 12:36:12 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 31288-done@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun May 06 14:36:08 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFItW-0008Ks-RK for geb-bug-gnu-emacs@m.gmane.org; Sun, 06 May 2018 14:36:03 +0200 Original-Received: from localhost ([::1]:42043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFIvc-000094-3h for geb-bug-gnu-emacs@m.gmane.org; Sun, 06 May 2018 08:38:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFIvV-00008q-JE for bug-gnu-emacs@gnu.org; Sun, 06 May 2018 08:38:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFIvS-00087Q-FL for bug-gnu-emacs@gnu.org; Sun, 06 May 2018 08:38:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:43162) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fFIvS-00086z-Aj for bug-gnu-emacs@gnu.org; Sun, 06 May 2018 08:38:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fFIvR-0003fw-UV for bug-gnu-emacs@gnu.org; Sun, 06 May 2018 08:38:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ari Roponen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 06 May 2018 12:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31288 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 31288-done@debbugs.gnu.org id=D31288.152561022514064 (code D ref 31288); Sun, 06 May 2018 12:38:01 +0000 Original-Received: (at 31288-done) by debbugs.gnu.org; 6 May 2018 12:37:05 +0000 Original-Received: from localhost ([127.0.0.1]:51059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFIuX-0003el-Ir for submit@debbugs.gnu.org; Sun, 06 May 2018 08:37:05 -0400 Original-Received: from mail-lf0-f50.google.com ([209.85.215.50]:40096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fFIuV-0003eH-RO for 31288-done@debbugs.gnu.org; Sun, 06 May 2018 08:37:04 -0400 Original-Received: by mail-lf0-f50.google.com with SMTP id p85-v6so1402797lfg.7 for <31288-done@debbugs.gnu.org>; Sun, 06 May 2018 05:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=dExg3TB31KLoPD/hnNkWHCr6FK1a5Sdfxl7MyUjrSJo=; b=gsNe+mFLG92RWqbn4ouA5vlr5cIGRvgD1xf+5JRHjw5vGzcIawPiAkgRpd2SI/1l7M acdpBOboJyUToj0SikyfRSfjcNQNYe6VflaxqDArdGH9zVxxSHAzIReFLTrpfDMw1/c2 YLZp9wYPNuwfrDzEsPv/vl4iHxzWoAUCogb9FtRfrCb50Q0hAyPGePalsCb69/bXxZW7 QSkAzXA6V9CNBbUVzW41lyHWnnZRCpo0dCHlTCiJu6nwpHiLaLK3tsVFaku5hmIjT6hw Soulq40p+UwTYvCp6z8fCCv7YNjwHowDpeL4P/LTHlYpRBZmw6LOMhK7kywUJTl/M3tH aupA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=dExg3TB31KLoPD/hnNkWHCr6FK1a5Sdfxl7MyUjrSJo=; b=gOUp4nGHNTPxD5TN0lavaQPmY2oGTaVANiAaoD0AHUBpG3R6vDEEYRA/FrqLLJj8uX El28C7kNFaKk/M2LCJmd4GQML7qb699YrHjBRh0ViXQjkMvRYOZMk4uVxQg1bBI8wslq eG8dX+WQbYgD/zaR2iRbpWlWBq9iboCe0rAcsVZPtMCt4Cp/4Ig7OsrAbDkguZUIlFk+ BGzpojamhZoOTk00OHR55zbSqMmckx1mN3g6A+jnf05bCBFNN3P/nvzluwdh8RtOhl3j Z+IrRrmwEDrVz4EsDxM9PmwmQuXRlfB7PgYhhC/VENo8eQQTqrrNWQ3mqlA1CrLrrSoU TnwQ== X-Gm-Message-State: ALKqPwdxniHEy9JsMqT33Kr8g4ogKKbGnZpZMDBzYZP9zF/34/UI11J7 iIPIMWbkdfYoJBo16Zii6skPZgs= X-Google-Smtp-Source: AB8JxZrisyUmWR38w5rZmR2/gk7/whBNvy4OG+nZqylAHuuyzinnbgxLp+62lBR3MUv4jQQOZoKAGQ== X-Received: by 2002:a2e:650a:: with SMTP id z10-v6mr3565718ljb.41.1525610217421; Sun, 06 May 2018 05:36:57 -0700 (PDT) Original-Received: from arirop ([2001:2003:f7af:fd00:6103:b50a:7868:afe1]) by smtp.gmail.com with ESMTPSA id m18-v6sm4388418lfj.34.2018.05.06.05.36.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 06 May 2018 05:36:56 -0700 (PDT) In-Reply-To: <83in82sawn.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 05 May 2018 12:35:04 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:146039 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: > Thanks, pushed to the master branch. Thank you very much. However, I just noticed that my patch doesn't work with side-by-side split windows. The following patch should fix that. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-cairo-scrolling-for-side-by-side-windows.patch >From 788f0fc62881152b03043057fe98178d77a6bb3a Mon Sep 17 00:00:00 2001 From: Ari Roponen Date: Sun, 6 May 2018 15:29:28 +0300 Subject: [PATCH] Fix cairo scrolling for side-by-side windows * src/xterm.c (x_scroll_run) [USE_CAIRO]: Fix scrolling for side-by-side split windows. --- src/xterm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 35e10568fa..3f956d950d 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -4260,6 +4260,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); @@ -4270,8 +4271,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); -- 2.17.0 --=-=-=--