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: 27.0.50; [PATCH] Make cairo build somewhat usable Date: Fri, 27 Apr 2018 18:51:52 +0300 Message-ID: <87r2n0ve93.fsf@gmail.com> References: <87lgd8kcrv.fsf@gmail.com> <83wowsu45h.fsf@gnu.org> <87y3h8vhrl.fsf@gmail.com> <83r2n0u29u.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1524844279 17675 195.159.176.226 (27 Apr 2018 15:51:19 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 27 Apr 2018 15:51:19 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 31288@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Apr 27 17:51:15 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 1fC5eV-0004V2-9a for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Apr 2018 17:51:15 +0200 Original-Received: from localhost ([::1]:48840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC5gc-00057n-41 for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Apr 2018 11:53:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC5gH-0004xe-TM for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 11:53:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC5gE-0000ma-PO for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 11:53:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33467) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fC5gE-0000mV-J7 for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 11:53:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fC5gE-0006K7-6J for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 11:53:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ari Roponen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 27 Apr 2018 15:53:02 +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-submit@debbugs.gnu.org id=B31288.152484432324241 (code B ref 31288); Fri, 27 Apr 2018 15:53:02 +0000 Original-Received: (at 31288) by debbugs.gnu.org; 27 Apr 2018 15:52:03 +0000 Original-Received: from localhost ([127.0.0.1]:41363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fC5fG-0006It-Q7 for submit@debbugs.gnu.org; Fri, 27 Apr 2018 11:52:03 -0400 Original-Received: from mail-lf0-f42.google.com ([209.85.215.42]:37421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fC5fE-0006IQ-VY for 31288@debbugs.gnu.org; Fri, 27 Apr 2018 11:52:01 -0400 Original-Received: by mail-lf0-f42.google.com with SMTP id b23-v6so3375092lfg.4 for <31288@debbugs.gnu.org>; Fri, 27 Apr 2018 08:52:00 -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=tfa5h+YG1kGQYgFvLgKxwDwFvNdVe6AhVgdow/Gue/w=; b=ZjLP1osHfNDSiBaMsJsA0BFHStvBv1EoT1N96/2NKKDoozPuHq0+T1ry20wO2AGyOQ cY4mBboEspgypifp+RKjZJZeLuUBKm3lsysNO2mPnkjM4A25UOo1Eeb6VvKCqDRHMBGS bMq2QDXiIIcfKpo7/t9IKgkkxrCYLI/jagP6R1TdnngDNloVET005lCae/2dXLaTGmZT fix8BCMDFZKEipyPD/kmu3VHPVsnQySN8xBsEO3dGAajPw/cPazmmAaBnGjzjXqQj0J6 cvWKgSE8LgAjDsXJ5NsO5Vu1oJEr3qrAJmH+UOjn/jVSyWW0paJEkuxxAI9cKR3k3q94 mXGQ== 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=tfa5h+YG1kGQYgFvLgKxwDwFvNdVe6AhVgdow/Gue/w=; b=LnP0ILo2k7omaGTKM2wjXFuNB3WzgBU+N8deg9RyJfjfgaX2BO8gWreozbxAds8KQA I/mDC/UpKZoW6v9Bosw8StSIYXz2HULxUvwnTZ2744AG0tyPtOIHQo4KqubrNyLdhybE BvBCtajLne13xLbblEA8OE8Y6/YmU2A6Uo96+6YVkVmklcmBgJiyUmjQe8g5sh5f+xdp pLWwLnVoANRyDMBlnnJ2wmbkiNqQggPxbXj7YZy1rB3I9pJ+puW+j71X4T+qRydFQYvP zZCSqdJF+pXdf626WNMEi+BQ4IRkje3aHQfHkIXiGqJTZH11Necb2QPJx2Xzb/VopR1Q Gx7A== X-Gm-Message-State: ALQs6tBElucK3oGWZAt1CGp4QD0E8jprTZPULgmU3eIw8s9oFWhrLKLt BNpYgthR1P36MfLO4X6Dl5SLbFS0iQ== X-Google-Smtp-Source: AB8JxZrur/JhtDPeP1Rxd/JfRUCCo8CyrNTQYP9/nWdpxcttUAso5ijM+Sf9liH1FwLvhQeH8JfNLw== X-Received: by 2002:a2e:6a07:: with SMTP id f7-v6mr1987713ljc.145.1524844314429; Fri, 27 Apr 2018 08:51:54 -0700 (PDT) Original-Received: from arirop ([2001:2003:f7af:fd00:b80b:342a:bead:3c5b]) by smtp.gmail.com with ESMTPSA id k5-v6sm304085lji.66.2018.04.27.08.51.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Apr 2018 08:51:53 -0700 (PDT) In-Reply-To: <83r2n0u29u.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 27 Apr 2018 17:55:57 +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:145792 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: > Ah, sorry I missed that. Still, what is the FIXME there? why not > simply remove that part? Ok. Now it's removed. New patch attached. Thank you for your comments. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-cairo-problems.patch >From d54819cb834fddce7488e8f6ebb392a53978b421 Mon Sep 17 00:00:00 2001 From: Ari Roponen Date: Fri, 27 Apr 2018 15:13:12 +0300 Subject: [PATCH 1/2] Fix cairo problems * src/xterm.c (x_begin_cr_clip): Create image surface. (x_update_end) [USE_CAIRO]: Remove GTK3-specific code. (x_scroll_run) [USE_CAIRO]: Implement scrolling. --- src/xterm.c | 83 +++++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 6ab4a03002..2f3fe58c2a 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -360,17 +360,12 @@ x_begin_cr_clip (struct frame *f, GC gc) if (! FRAME_CR_SURFACE (f)) { - cairo_surface_t *surface; - surface = cairo_xlib_surface_create (FRAME_X_DISPLAY (f), - FRAME_X_DRAWABLE (f), - FRAME_DISPLAY_INFO (f)->visual, - FRAME_PIXEL_WIDTH (f), - FRAME_PIXEL_HEIGHT (f)); - cr = cairo_create (surface); - cairo_surface_destroy (surface); - } - else - cr = cairo_create (FRAME_CR_SURFACE (f)); + FRAME_CR_SURFACE (f) = + cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + FRAME_PIXEL_WIDTH (f), + FRAME_PIXEL_HEIGHT (f)); + } + cr = cairo_create (FRAME_CR_SURFACE (f)); FRAME_CR_CONTEXT (f) = cr; } cairo_save (cr); @@ -1232,40 +1227,31 @@ x_update_end (struct frame *f) MOUSE_HL_INFO (f)->mouse_face_defer = false; #ifdef USE_CAIRO + block_input(); + if (FRAME_CR_SURFACE (f)) { cairo_t *cr = 0; - block_input(); -#if defined (USE_GTK) && defined (HAVE_GTK3) - if (FRAME_GTK_WIDGET (f)) - { - GdkWindow *w = gtk_widget_get_window (FRAME_GTK_WIDGET (f)); - cr = gdk_cairo_create (w); - } - else -#endif - { - cairo_surface_t *surface; - int width = FRAME_PIXEL_WIDTH (f); - int height = FRAME_PIXEL_HEIGHT (f); - if (! FRAME_EXTERNAL_TOOL_BAR (f)) - height += FRAME_TOOL_BAR_HEIGHT (f); - if (! FRAME_EXTERNAL_MENU_BAR (f)) - height += FRAME_MENU_BAR_HEIGHT (f); - surface = cairo_xlib_surface_create (FRAME_X_DISPLAY (f), - FRAME_X_DRAWABLE (f), - FRAME_DISPLAY_INFO (f)->visual, - width, - height); - cr = cairo_create (surface); - cairo_surface_destroy (surface); - } + cairo_surface_t *surface; + int width = FRAME_PIXEL_WIDTH (f); + int height = FRAME_PIXEL_HEIGHT (f); + if (! FRAME_EXTERNAL_TOOL_BAR (f)) + height += FRAME_TOOL_BAR_HEIGHT (f); + if (! FRAME_EXTERNAL_MENU_BAR (f)) + height += FRAME_MENU_BAR_HEIGHT (f); + surface = cairo_xlib_surface_create (FRAME_X_DISPLAY (f), + FRAME_X_DRAWABLE (f), + FRAME_DISPLAY_INFO (f)->visual, + width, + height); + cr = cairo_create (surface); + cairo_surface_destroy (surface); cairo_set_source_surface (cr, FRAME_CR_SURFACE (f), 0, 0); cairo_paint (cr); cairo_destroy (cr); - unblock_input (); } + unblock_input (); #endif #ifndef XFlush @@ -4271,7 +4257,28 @@ x_scroll_run (struct window *w, struct run *run) x_clear_cursor (w); #ifdef USE_CAIRO - SET_FRAME_GARBAGED (f); + if (FRAME_CR_CONTEXT (f)) + { + cairo_surface_t *s = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + width, height); + cairo_t *cr = cairo_create (s); + cairo_set_source_surface (cr, cairo_get_target (FRAME_CR_CONTEXT (f)), + -x, -from_y); + cairo_paint (cr); + cairo_destroy (cr); + + 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_fill (cr); + cairo_restore (cr); + cairo_surface_destroy (s); + } + else + { + SET_FRAME_GARBAGED (f); + } #else XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_DRAWABLE (f), FRAME_X_DRAWABLE (f), -- 2.17.0 --=-=-=--