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 16:19:16 +0300 Message-ID: <87lgd8kcrv.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1524835157 4274 195.159.176.226 (27 Apr 2018 13:19:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 27 Apr 2018 13:19:17 +0000 (UTC) To: 31288@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Apr 27 15:19:13 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 1fC3HJ-0000w5-R8 for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Apr 2018 15:19:10 +0200 Original-Received: from localhost ([::1]:48093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC3JQ-0004pF-KP for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Apr 2018 09:21:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC3IC-000471-F1 for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 09:20:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC3IB-0004cx-2F for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 09:20:04 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33130) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fC3IA-0004cU-Sa for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 09:20:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fC3IA-0002jT-Lk for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 09:20: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 13:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31288 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.152483517210462 (code B ref -1); Fri, 27 Apr 2018 13:20:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Apr 2018 13:19:32 +0000 Original-Received: from localhost ([127.0.0.1]:41027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fC3Hf-0002if-Se for submit@debbugs.gnu.org; Fri, 27 Apr 2018 09:19:32 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:34309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fC3He-0002iQ-I3 for submit@debbugs.gnu.org; Fri, 27 Apr 2018 09:19:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC3HX-0004Kn-LB for submit@debbugs.gnu.org; Fri, 27 Apr 2018 09:19:24 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:53623) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fC3HX-0004Kg-Ge for submit@debbugs.gnu.org; Fri, 27 Apr 2018 09:19:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC3HW-00041U-1Y for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 09:19:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC3HU-0004KJ-NN for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 09:19:21 -0400 Original-Received: from mail-lf0-x235.google.com ([2a00:1450:4010:c07::235]:46667) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fC3HU-0004K5-8J for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 09:19:20 -0400 Original-Received: by mail-lf0-x235.google.com with SMTP id v85-v6so2633295lfa.13 for ; Fri, 27 Apr 2018 06:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=J4Ji6rWafmJTsNdjxb+BQ58i9qrLJf9PVMPAP2vW4i8=; b=uelrgAb/XgpjmEZGi/Fy2pQ9wp2h57CVSlLT83xm6xzC4uJPl9gJLPoVaD07YPkgHE LE/OdbQJ2V8Cf9ZJZ6YY+2C4tLShow9UiMtaILowb4VL3RLY4uYM4blNvfpne+xPRtrb hzpGGRh3vdI1tttu4zj4qMFFBHtZnPEo9xAZzi5+r24XjLXBP4G4Djs/5itiFFnB6okG 40wpMa+5y3+rCRlYrXcZgaW58uM30H/FIivEbOXzum3zY8lOftLzb+7GjAxErihymjsE wQBxBmXX7SThBLuQ9F9u02+58DP23xAWCsRv8EimHPXu0568KQEOQzGm7mw5hGoC4+6l SOmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=J4Ji6rWafmJTsNdjxb+BQ58i9qrLJf9PVMPAP2vW4i8=; b=CBf2YO96zoA2t4b2kcEMa+lPWWyKDqSBubrvnVukD5Z6DhuOLzmSte6+zK95Q2QdAb xmg5eEOUAaPaL0xYNzb4p2+m+1WTQMVoN8tjnbp1cjUhEWPgzvlpBgxZf/SInse9f3JL eT8suvX2LpvE3UTRbvUZ4QA6nsGM7089ZuCxLQY6hTAPbDNXdVrgL2UTs+NWsmRdYLUH wPl7U1sfcdjLk+YCT+51EQGmdVzx3/fnajxhbOVjfJBmY9Yp98Pc8NYs0ZAa8mydjmMj ddcNevO6BbNf83+7HUf6iK+KFmT4W9BwuZqyGvMr3BYLcJ81ROuUzaXIC99+FxcbJox1 Z6vg== X-Gm-Message-State: ALQs6tAP4cYGZTdppMcIHNQXLochfQb6UcJswGmTg64Kk6kTG2ByuKqI MHc82+Ys6pnUY8DoRcuczMithb8= X-Google-Smtp-Source: AB8JxZqornjNxt3bandJQlS10ccKU+2GpVOdGmkZzFDOXDpEyD7J2lCG53FUFeaqDm2VtaOhhroO7A== X-Received: by 2002:a2e:9b89:: with SMTP id z9-v6mr1665366lji.121.1524835158547; Fri, 27 Apr 2018 06:19:18 -0700 (PDT) Original-Received: from arirop ([2001:2003:f7af:fd00:b80b:342a:bead:3c5b]) by smtp.gmail.com with ESMTPSA id b15-v6sm258681lji.25.2018.04.27.06.19.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Apr 2018 06:19:17 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:145782 Archived-At: --=-=-= Content-Type: text/plain Attached are two patches to make --with-cairo builds more usable. First patch tries to fix screen corruption, and the second patch allows cairo builds to display images. These patches are only slightly tested, but I hope they will be useful. In GNU Emacs 27.0.50 (build 10, x86_64-pc-linux-gnu, GTK+ Version 3.22.30) of 2018-04-27 built on arirop Repository revision: caa93364d47bd28633cc065e31dd5972a1e916d5 Windowing system distributor 'Fedora Project', version 11.0.11906000 System Description: Fedora 28 (Twenty Eight) --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-cairo-problems.patch >From 3e93c1a5290bbed7a9b923e1a16f930ec0fbd74a 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 | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 6ab4a03002..52fe24e0fb 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,26 @@ 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-Add-partial-image-support-for-cairo-builds.patch >From 6a379d983544b3e1b241860854646ca039724151 Mon Sep 17 00:00:00 2001 From: Ari Roponen Date: Fri, 27 Apr 2018 15:14:36 +0300 Subject: [PATCH 2/2] Add partial image support for cairo builds * src/image.c (lookup_rgb_color): Add cairo support. (jpeg_load_body): Fix preprocessor symbol. Move colors definition into non-cairo part. (imagemagick_load_image) [USE_CAIRO]: Add partial support for cairo. --- src/image.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/image.c b/src/image.c index 37416c1616..4c3f6c5ab0 100644 --- a/src/image.c +++ b/src/image.c @@ -4629,6 +4629,8 @@ lookup_rgb_color (struct frame *f, int r, int g, int b) return PALETTERGB (r >> 8, g >> 8, b >> 8); #elif defined HAVE_NS return RGB_TO_ULONG (r >> 8, g >> 8, b >> 8); +#elif defined USE_CAIRO + return (0xffu << 24) | (r << 16) | (g << 8) | b; #else xsignal1 (Qfile_error, build_string ("This Emacs mishandles this image file type")); @@ -6702,10 +6704,10 @@ jpeg_load_body (struct frame *f, struct image *img, FILE *volatile fp = NULL; JSAMPARRAY buffer; int row_stride, x, y; - unsigned long *colors; int width, height; int i, ir, ig, ib; #ifndef USE_CAIRO + unsigned long *colors; XImagePtr ximg = NULL; #endif @@ -6823,7 +6825,7 @@ jpeg_load_body (struct frame *f, struct image *img, else ir = 0, ig = 0, ib = 0; -#ifndef CAIRO +#ifndef USE_CAIRO /* Use the color table mechanism because it handles colors that cannot be allocated nicely. Such colors will be replaced with a default color, and we don't have to care about which colors @@ -8551,6 +8553,9 @@ imagemagick_load_image (struct frame *f, struct image *img, double rotation; char hint_buffer[MaxTextExtent]; char *filename_hint = NULL; +#ifdef USE_CAIRO + void *data; +#endif /* Initialize the ImageMagick environment. */ static bool imagemagick_initialized; @@ -8751,6 +8756,19 @@ imagemagick_load_image (struct frame *f, struct image *img, /* We can now get a valid pixel buffer from the imagemagick file, if all went ok. */ +#ifdef USE_CAIRO + data = xmalloc (width * height * 4); +#ifdef HAVE_MAGICKEXPORTIMAGEPIXELS + MagickExportImagePixels (image_wand, 0, 0, width, height, + "BGRA", CharPixel, data); +#else + /* FIXME: Implement this. For now, make it white. */ + memset(data, 0xff, width * height * 4); +#endif + create_cairo_image_surface (img, data, width, height); + goto done; +#endif /* USE_CAIRO */ + init_color_table (); #if defined (HAVE_MAGICKEXPORTIMAGEPIXELS) && ! defined (HAVE_NS) @@ -8861,6 +8879,9 @@ imagemagick_load_image (struct frame *f, struct image *img, /* Put ximg into the image. */ image_put_x_image (f, img, ximg, 0); +#ifdef USE_CAIRO + done: +#endif /* Final cleanup. image_wand should be the only resource left. */ DestroyMagickWand (image_wand); if (bg_wand) DestroyPixelWand (bg_wand); -- 2.17.0 --=-=-=--