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 17:35:58 +0300 Message-ID: <87y3h8vhrl.fsf@gmail.com> References: <87lgd8kcrv.fsf@gmail.com> <83wowsu45h.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1524839706 10385 195.159.176.226 (27 Apr 2018 14:35:06 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 27 Apr 2018 14:35:06 +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 16:35:01 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 1fC4Sj-0002WH-I5 for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Apr 2018 16:35:01 +0200 Original-Received: from localhost ([::1]:48516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC4Uq-0006eP-8Q for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Apr 2018 10:37:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC4Uk-0006eJ-5q for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 10:37:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC4Ug-000292-3q for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 10:37:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33448) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fC4Uf-00028l-Vm for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 10:37:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fC4Uf-0004YR-LT for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 10:37: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: Fri, 27 Apr 2018 14:37: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-submit@debbugs.gnu.org id=B31288.152483976817441 (code B ref 31288); Fri, 27 Apr 2018 14:37:01 +0000 Original-Received: (at 31288) by debbugs.gnu.org; 27 Apr 2018 14:36:08 +0000 Original-Received: from localhost ([127.0.0.1]:41345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fC4To-0004XF-HO for submit@debbugs.gnu.org; Fri, 27 Apr 2018 10:36:08 -0400 Original-Received: from mail-lf0-f49.google.com ([209.85.215.49]:35745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fC4Tm-0004Wp-LQ for 31288@debbugs.gnu.org; Fri, 27 Apr 2018 10:36:07 -0400 Original-Received: by mail-lf0-f49.google.com with SMTP id r125-v6so3036059lfe.2 for <31288@debbugs.gnu.org>; Fri, 27 Apr 2018 07:36:06 -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=baa39yPge86/9yTtpl5I0pVwhmZCg9biMtYtkdCwuIY=; b=PYweRw1NHIvnAwg0+xBtHUkZMR8PdOCALf+RDORgnvrfWySgb4wW8J3ChIB9tEccTn BqbqJvTJC+PBCYLbozG9s8Oljq1gbWBvcOW/p3CdyCy/dEHjAUeeLvXdEQiQkMN23/ij UyKdOCrrCfTPmee5QzGhCUsfqnMvBfnXEfEfG6UWFVHGaWLsQyA86/SGcVQiWkdBTtn+ CxS0JWkqrvsNdkpEg4YZj5joDCYehczpHv2MzBYpyx3buJwGjUxHs/S1omtZFQlq0SG2 01yY2R6PsB7wImZJIwWJ7vNOt16jIheTrU7ADWJPWdPeWsKflHFOz3sjnkDxdZiJTMRX G5dw== 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=baa39yPge86/9yTtpl5I0pVwhmZCg9biMtYtkdCwuIY=; b=I9p7WGmOtsmkMqOOQzsxrC37meuoVukxfcg1tzK1u7UQPiD7DP7arjYowKGgqbV1ah g4YQa4pLLzgU6/AUQnsws+EOyiHcC1pEeJ6i7dxNglePMAd1ECd/kVIgs278GGZmVGew 5J+t2ovTy6lWwcSG7OL6i7VT1gI1fRl2Horkop5zD/3ABi2wraw60nHOsLwPEIHwfQFG kHuEftO8dfUj2nTqKQZ9D1cuczXLf52Hhti7UQgLfL78wFh6qpK14vzdb+s8h3NABZQS AM2rga5pjWeDsSWCfxlBamFor5IsL3qx4VzG/6GO/CXRRMBCg9AkMR5fcnTkqsiVzb7B 7mgQ== X-Gm-Message-State: ALQs6tAPt3x9evoKvXTixsiZoyvXyuKjb/E80BU4mgBkKhfcC09FmxVv iY/O+Hs980uEgLqIE+8vCBlQBXWpnQ== X-Google-Smtp-Source: AB8JxZpoP37t0p3FoAQ0kxyqb617+QJzWVGH/PrECdrA3KBIYVZni8NTpGhOCswlXC2dN1Eaem8HjA== X-Received: by 2002:a19:d91c:: with SMTP id q28-v6mr1648911lfg.143.1524839760482; Fri, 27 Apr 2018 07:36:00 -0700 (PDT) Original-Received: from arirop ([2001:2003:f7af:fd00:b80b:342a:bead:3c5b]) by smtp.gmail.com with ESMTPSA id k14-v6sm285844ljh.28.2018.04.27.07.35.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Apr 2018 07:35:59 -0700 (PDT) In-Reply-To: <83wowsu45h.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 27 Apr 2018 17:15:22 +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:145789 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: > > Please allow me a couple of minor comments on the changes: > >> @@ -1236,7 +1231,8 @@ x_update_end (struct frame *f) >> { >> cairo_t *cr = 0; >> block_input(); >> -#if defined (USE_GTK) && defined (HAVE_GTK3) >> + /* FIXME */ >> +#if 0 && defined (USE_GTK) && defined (HAVE_GTK3) >> if (FRAME_GTK_WIDGET (f)) >> { >> GdkWindow *w = gtk_widget_get_window (FRAME_GTK_WIDGET (f)); > > This hunk doesn't look right. If the code in question causes some > trouble to a Cairo build, please ifdef it out only when USE_CAIRO is > defined, not unconditionally. And if that still needs a FIXME > comment, please add some description of what needs to be fixed and > why. > That hunk is inside #ifdef USE_CAIRO, like almost the whole body of x_update_end. >> + cairo_surface_destroy (s); >> + } else { >> + SET_FRAME_GARBAGED (f); > > Please use GNU style of braces. > Done. New patch attached. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-cairo-problems.patch >From dd7b085d569be5f1eb4412e28ac73f3f304eeb0f 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]: Disable GTK3-specific code for now. (x_scroll_run) [USE_CAIRO]: Implement scrolling. --- src/xterm.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 6ab4a03002..2a1c7e9edc 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); @@ -1236,7 +1231,8 @@ x_update_end (struct frame *f) { cairo_t *cr = 0; block_input(); -#if defined (USE_GTK) && defined (HAVE_GTK3) + /* FIXME */ +#if 0 && defined (USE_GTK) && defined (HAVE_GTK3) if (FRAME_GTK_WIDGET (f)) { GdkWindow *w = gtk_widget_get_window (FRAME_GTK_WIDGET (f)); @@ -4271,7 +4267,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 --=-=-=--