From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?H=C3=A5kon?= Flatval Newsgroups: gmane.emacs.devel Subject: Re: Sv: Sv: Sv: Support for background transparency Date: Sun, 23 Jan 2022 14:48:57 +0100 Message-ID: References: <87wnlnptf2.fsf@gnus.org> <83h7bwybeg.fsf@gnu.org> <87y24t1ed1.fsf@gnus.org> <87wniv2pp8.fsf@yahoo.com> <874k5x29be.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3971"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.6.10; emacs 27.2 Cc: "emacs-devel@gnu.org" To: Po Lu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Jan 23 17:39:44 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nBfu4-0000q2-GE for ged-emacs-devel@m.gmane-mx.org; Sun, 23 Jan 2022 17:39:44 +0100 Original-Received: from localhost ([::1]:53206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nBfu3-0007tj-2p for ged-emacs-devel@m.gmane-mx.org; Sun, 23 Jan 2022 11:39:43 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:51950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBft5-0006sC-4j for emacs-devel@gnu.org; Sun, 23 Jan 2022 11:38:43 -0500 Original-Received: from mail-oln040092074105.outbound.protection.outlook.com ([40.92.74.105]:16641 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBft0-0008V3-PI for emacs-devel@gnu.org; Sun, 23 Jan 2022 11:38:42 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bQxBXYF4mrlKA8oDJG7il6AEcL5q8c1AKI/5WfN1tW3I1E9rkMiXZmfJDNlY08ZojVpOfNT/zV/dIEdrM2HuQG8rXCDX/eC/UtKzzyt4zR82/lyaZzDcJU0+zLk16bUbkawNLgy/9+ZmgGY6Xn4n4TW+t6fchnV+NMC6h6DNwWSIJTQEHLnFF36UxFDBZHkkbLO//fDlYpQJ0lThqlPpyhJrUzT+35CSZOjRTSzVPFy+WfdKl+fwQssT2mUObBlstCgDQFI7RjriH+0qS6LsfakaRtaqAhpqroIX9y/gz3Y9mhLdsqU/ue/BrnSZl+2rfYPwM/KrigVOQCURV5rieg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hhR25yd0Lxch59st8Dl86e2tf+cxNxlTLep3awyzJdo=; b=PhZWgzRIBHXq6I7cqxqAagiPRpZ1vX6cLWHomJsoQg2ugeGixud6BK2uzKf/YSidRJadssy4UVdxlAUwQgx0ML4UTMreJxT9s3pNgIBd7G+RRndWyKv5t/e0Wk5zB2nTRf2676Q7XzmaN0Tw+BfL3FOTvo+goLZ9Zpc7j48FZzHYvyVTLrKzC4UOmzmk/zxWuCEKw3zaQs2DncOmxRJ8VDUrknhCwxlz5h60KdwZkTlkCnrinZNuIcuRENJnLaGm7rJ1QmTXJLSWIIc3/XI1V4Zr5n3EMdl02jKUES1ulavFRHREBExH2RDGgCFCHN/59AHjuAAg1oQgWuWsZ/e7mA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hhR25yd0Lxch59st8Dl86e2tf+cxNxlTLep3awyzJdo=; b=jVjIl4yfb86arKfN63UtIun4KPthJ0hZc0PL3fCBnljfGdKygj5WxtgoTwAhDmfytB+pvGXMkXQ1JyM0fmcM8MSx6I+8rCKGiGCNRehfRgyZhFh2ymexAU/R6eVXJNEEI7TfoIIxCPdpzVsufxKl+g3sEeT2XaEW5mwfBVs7Ee6oG8Fqt/2cHwWnfsUyTbvID+z5wtgzpVfIi4w3SE+XvuNNcAckD+ZQeTPmaYuLoRCyFkstSvzPiBX+GDF3niZWIA4YOqPkSrwwx2lZOu3YtdZ0Hle3/Q8+bz0IWKD+dSxST5HeE92iEaSHdThR9PwpHwloGpyhKk2EhRwWWjf/Yg== Original-Received: from PRAP251MB0688.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:293::21) by AS1P251MB0584.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:48d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Sun, 23 Jan 2022 16:17:59 +0000 Original-Received: from PRAP251MB0688.EURP251.PROD.OUTLOOK.COM ([fe80::15ff:34d8:e4d9:a23f]) by PRAP251MB0688.EURP251.PROD.OUTLOOK.COM ([fe80::15ff:34d8:e4d9:a23f%5]) with mapi id 15.20.4909.007; Sun, 23 Jan 2022 16:17:59 +0000 In-reply-to: <874k5x29be.fsf@yahoo.com> X-TMN: [W1/wvFMQgvF6iLiGK9fKWyCO5x1Ut/S0] X-ClientProxiedBy: OL1P279CA0049.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:14::18) To PRAP251MB0688.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:293::21) X-Microsoft-Original-Message-ID: <87sftes75p.fsf@hotmail.com> X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8cb8d92e-ce62-4f5f-8a1d-08d9de8bec17 X-MS-TrafficTypeDiagnostic: AS1P251MB0584:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pC9d3WaPBi7iLLLpMeKFJWbIMequsQ2BZsTMBixwuarRDkRmQ5hPrh2z4R1dNSyi/I6+XebqTxcFIwovDSIw3GN6ey0K7vbg8Do0KtZFsqhyeC6aWlYjC65cdy0wP8kz67rrlzc3KxrJcM/01qqzuQNsc6yQBTAH4tZH1bjNV2CwiKJa+kv6w345931UoogN3zidmGusu3BQJ5Sy8LlPfBEA292zLqqCanuX2o+dTtQQWCquwSP9eOKVXLSowJqIbiPEZoFqlFP4rQKYLku7smta8ofSNxZf9igTjA5XVVgyw8Ld1rDoWBptC47fWDqQ34Eg4wi7KMR7tKNBkPSBYbblQDSpdkNP0uzmjG2I5PehVVycHa08ymsqQ80Qm5aRmQ07JoiTyiftCT1t9KKsMd2S+wA7/i2mHylPqW+de9TkNq8Su/AlQl7M8hgjAsOARXXkFj2tlvlw2uUA3Mvoe68D/G5xnkqxmfpAXG4pf5mkiNHqQ8VlEmSKMz639T17lZtnGkcqigmFHWzfwyGjVrzucwl6mUqEl8cPW6d4vanUKzXI9BU05RGHMayi3KhKZqFZA9zVc33alKdYspC1Tw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?emN6aG9rWEZ0aXo1Y3N6azc1SXVhbW9OUHJlK2RwZ1Zrb2dYcnZKYjkvamxu?= =?utf-8?B?QUxGTjlOYWtoL203SmM4cWtlLy9aeUVGN1Bzblk1YW5Hc3NuZUdpNWI1Ryti?= =?utf-8?B?eUFGWVU3TmdQRFhiQ1l1clErY3Q0dGxLOGZLVmZjRWZTN0p5YnlCQjhOUVdk?= =?utf-8?B?bDhyaG5LN2kzTWVUL1Zyc3FobmZobzNpSjlLTHZIcDAxcXduc1JEWlJ0VTZq?= =?utf-8?B?MVVPUVBQYWhORjc5ZGJKR2l4N1hOekZUbVhrbEtDbjVvcmJLVmZDZktndFZ6?= =?utf-8?B?OHUvNEorQzdDUzJKZ3VRVVVsTm05Z3lyMXI2SUpPRDR2L01QSVNkcisxR3Zk?= =?utf-8?B?a2NUbndMcEgzVjZPYnB0Tnc3b1MvenZCSEdnSXpQWi9lbjU0cnBsMFF0Tjhn?= =?utf-8?B?UysxcnR4bWlOSmF3RGhPc012cVdRcFJiWnd0ODZIRVk3Ui9SQ2h5NzF6cm85?= =?utf-8?B?dkZJWjk0TW0wZXBCbkJRK3NKa09uQ25SSHg1aTlVNTUvb0lrdUFVV1ZqM2dX?= =?utf-8?B?OUkyOXpHREFjU3ZMV09JMW9tZm1KcnJ1bjd2SUVoT3NLVmhDNzlpVXF1SmVR?= =?utf-8?B?djdQUEtVOVkvMlJ0eUc1ZnNNMG1GSjNMREg3VmVKcFYvZ3FCcDcrRnRWM2VD?= =?utf-8?B?UFNpUjgydXVSQjBuWVVoajdWQk0ycFVnc0lZLz X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-00b75.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 8cb8d92e-ce62-4f5f-8a1d-08d9de8bec17 X-MS-Exchange-CrossTenant-AuthSource: PRAP251MB0688.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2022 16:17:59.4453 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1P251MB0584 Received-SPF: pass client-ip=40.92.74.105; envelope-from=hkon20@hotmail.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:285264 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > This coding style is not what we use in Emacs. Seems like I was in a bit of a rush with the formatting. It should be in order now. > You could just check dpyinfo->n_planes, I was not aware of that one - simplifies things a bit. I have removed my custom depth querying function and opted for that one instead. > Which preprocessor statements are you referring to? Sorry for not being specific - I was talking about the section with >> #if defined (USE_GTK) && defined (USE_CAIRO) that you mentioned in your previous mail. Its purpose is just to avoid using 32-bit visuals in build configurations I have not considered, as I know that at least some of those configurations display artifacts when they are run with 32-bit visuals. > Would you mind if I implemented that support instead? I would be grateful if you would do that, as I doubt I will be able to work on this consistently going forward. Again, thanks for the feedback. - H=C3=A5kon --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=gdk-cairo-background-transparency-006.patch diff --git a/src/frame.c b/src/frame.c index 8aaff949ba..c331cff32b 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3907,6 +3907,7 @@ DEFUN ("frame-scale-factor", Fframe_scale_factor, Sframe_scale_factor, {"z-group", SYMBOL_INDEX (Qz_group)}, {"override-redirect", SYMBOL_INDEX (Qoverride_redirect)}, {"no-special-glyphs", SYMBOL_INDEX (Qno_special_glyphs)}, + {"alpha-background", SYMBOL_INDEX (Qalpha_background)}, #ifdef NS_IMPL_COCOA {"ns-appearance", SYMBOL_INDEX (Qns_appearance)}, {"ns-transparent-titlebar", SYMBOL_INDEX (Qns_transparent_titlebar)}, @@ -5024,6 +5025,33 @@ gui_set_alpha (struct frame *f, Lisp_Object arg, Lisp_Object oldval) } } +void +gui_set_alpha_background (struct frame *f, Lisp_Object arg, Lisp_Object oldval) +{ + double alpha = 1.0; + + if (NILP (arg)) + alpha = 1.0; + else if (FLOATP (arg)) + { + alpha = XFLOAT_DATA (arg); + if (! (0 <= alpha && alpha <= 1.0)) + args_out_of_range (make_float (0.0), make_float (1.0)); + } + else if (FIXNUMP (arg)) + { + EMACS_INT ialpha = XFIXNUM (arg); + if (! (0 <= ialpha && ialpha <= 100)) + args_out_of_range (make_fixnum (0), make_fixnum (100)); + alpha = ialpha / 100.0; + } + else + wrong_type_argument (Qnumberp, arg); + + f->alpha_background = alpha; + + SET_FRAME_GARBAGED (f); +} /** * gui_set_no_special_glyphs: @@ -6100,6 +6128,7 @@ syms_of_frame (void) #endif DEFSYM (Qalpha, "alpha"); + DEFSYM (Qalpha_background, "alpha-background"); DEFSYM (Qauto_lower, "auto-lower"); DEFSYM (Qauto_raise, "auto-raise"); DEFSYM (Qborder_color, "border-color"); diff --git a/src/frame.h b/src/frame.h index cb2f58e261..5d5f2122fb 100644 --- a/src/frame.h +++ b/src/frame.h @@ -637,6 +637,9 @@ #define EMACS_FRAME_H Negative values mean not to change alpha. */ double alpha[2]; + /* Background opacity */ + double alpha_background; + /* Exponent for gamma correction of colors. 1/(VIEWING_GAMMA * SCREEN_GAMMA) where viewing_gamma is 0.4545 and SCREEN_GAMMA is a frame parameter. 0 means don't do gamma correction. */ @@ -1669,6 +1672,7 @@ #define EMACS_CLASS "Emacs" extern long gui_figure_window_size (struct frame *, Lisp_Object, bool, bool); extern void gui_set_alpha (struct frame *, Lisp_Object, Lisp_Object); +extern void gui_set_alpha_background (struct frame *, Lisp_Object, Lisp_Object); extern void gui_set_no_special_glyphs (struct frame *, Lisp_Object, Lisp_Object); extern void validate_x_resource_name (void); diff --git a/src/gtkutil.c b/src/gtkutil.c index eb14856062..19dd04523e 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1467,6 +1467,10 @@ xg_create_frame_widgets (struct frame *f) } wtop = gtk_window_new (type); gtk_widget_add_events (wtop, GDK_ALL_EVENTS_MASK); + + /* This prevents GTK from painting the window's background, which + would interfere with transparent background in some environments */ + gtk_widget_set_app_paintable (wtop, TRUE); #endif /* gtk_window_set_has_resize_grip is a Gtk+ 3.0 function but Ubuntu @@ -1587,6 +1591,15 @@ xg_create_frame_widgets (struct frame *f) #endif | GDK_VISIBILITY_NOTIFY_MASK); + GdkScreen *screen = gtk_widget_get_screen (wtop); + + if (FRAME_DISPLAY_INFO (f)->n_planes == 32) + { + GdkVisual *visual = gdk_screen_get_rgba_visual (screen); + gtk_widget_set_visual (wtop, visual); + gtk_widget_set_visual (wfixed, visual); + } + #ifndef HAVE_PGTK /* Must realize the windows so the X window gets created. It is used by callers of this function. */ @@ -1651,7 +1664,6 @@ xg_create_frame_widgets (struct frame *f) #endif { - GdkScreen *screen = gtk_widget_get_screen (wtop); GtkSettings *gs = gtk_settings_get_for_screen (screen); /* Only connect this signal once per screen. */ if (! g_signal_handler_find (G_OBJECT (gs), diff --git a/src/haikufns.c b/src/haikufns.c index 58a2e1d464..7117296a73 100644 --- a/src/haikufns.c +++ b/src/haikufns.c @@ -2609,7 +2609,8 @@ DEFUN ("haiku-frame-restack", Fhaiku_frame_restack, Shaiku_frame_restack, 2, 3, haiku_set_no_accept_focus, NULL, /* set z group */ haiku_set_override_redirect, - gui_set_no_special_glyphs + gui_set_no_special_glyphs, + gui_set_alpha_background, }; void diff --git a/src/nsfns.m b/src/nsfns.m index 11132a294a..a4f3f091fc 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1004,6 +1004,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side. ns_set_z_group, 0, /* x_set_override_redirect */ gui_set_no_special_glyphs, + gui_set_alpha_background, #ifdef NS_IMPL_COCOA ns_set_appearance, ns_set_transparent_titlebar, diff --git a/src/pgtkfns.c b/src/pgtkfns.c index 9c37c04810..b46429379e 100644 --- a/src/pgtkfns.c +++ b/src/pgtkfns.c @@ -1043,6 +1043,7 @@ frames (each of which corresponds to one page). Each frame should be x_set_z_group, x_set_override_redirect, gui_set_no_special_glyphs, + gui_set_alpha_background, }; diff --git a/src/w32fns.c b/src/w32fns.c index 37f9b813c6..a360faefa8 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -10436,6 +10436,7 @@ w32_get_resource (const char *key, const char *name, LPDWORD lpdwtype) w32_set_z_group, 0, /* x_set_override_redirect */ gui_set_no_special_glyphs, + gui_set_alpha_background, }; void diff --git a/src/xfns.c b/src/xfns.c index 7123198724..a79462b125 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4569,6 +4569,8 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, RES_TYPE_NUMBER); gui_default_parameter (f, parms, Qalpha, Qnil, "alpha", "Alpha", RES_TYPE_NUMBER); + gui_default_parameter (f, parms, Qalpha_background, Qnil, + "alpha_background", "AlphaBackground", RES_TYPE_NUMBER); if (!NILP (parent_frame)) { @@ -6342,10 +6344,29 @@ select_visual (struct x_display_info *dpyinfo) int n_visuals; XVisualInfo *vinfo, vinfo_template; - dpyinfo->visual = DefaultVisualOfScreen (screen); + vinfo_template.screen = XScreenNumberOfScreen (screen); + +#if defined (USE_GTK) && defined (USE_CAIRO) + /* First attempt to use 32-bit visual if available */ + + vinfo_template.depth = 32; + + vinfo = XGetVisualInfo (dpy, VisualScreenMask | VisualDepthMask, + &vinfo_template, &n_visuals); + if (n_visuals > 0) + { + dpyinfo->n_planes = vinfo->depth; + dpyinfo->visual = vinfo->visual; + XFree (vinfo); + return; + } + +#endif // defined (USE_GTK) && defined (USE_CAIRO) + + /* 32-bit visual not available, fallback to default visual */ + dpyinfo->visual = DefaultVisualOfScreen (screen); vinfo_template.visualid = XVisualIDFromVisual (dpyinfo->visual); - vinfo_template.screen = XScreenNumberOfScreen (screen); vinfo = XGetVisualInfo (dpy, VisualIDMask | VisualScreenMask, &vinfo_template, &n_visuals); if (n_visuals <= 0) @@ -7203,6 +7224,8 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms) "cursorType", "CursorType", RES_TYPE_SYMBOL); gui_default_parameter (f, parms, Qalpha, Qnil, "alpha", "Alpha", RES_TYPE_NUMBER); + gui_default_parameter (f, parms, Qalpha_background, Qnil, + "alpha_background", "AlphaBackground", RES_TYPE_NUMBER); /* Add `tooltip' frame parameter's default value. */ if (NILP (Fframe_parameter (frame, Qtooltip))) @@ -8531,6 +8554,7 @@ DEFUN ("x-gtk-debug", Fx_gtk_debug, Sx_gtk_debug, 1, 1, 0, x_set_z_group, x_set_override_redirect, gui_set_no_special_glyphs, + gui_set_alpha_background, }; void diff --git a/src/xterm.c b/src/xterm.c index 2a4ea883bc..08f6369ca7 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -840,12 +840,26 @@ x_set_cr_source_with_gc_background (struct frame *f, GC gc) { XGCValues xgcv; XColor color; + unsigned int depth; XGetGCValues (FRAME_X_DISPLAY (f), gc, GCBackground, &xgcv); color.pixel = xgcv.background; + x_query_colors (f, &color, 1); - cairo_set_source_rgb (FRAME_CR_CONTEXT (f), color.red / 65535.0, - color.green / 65535.0, color.blue / 65535.0); + + depth = FRAME_DISPLAY_INFO (f)->n_planes; + + if (f->alpha_background < 1.0 && depth == 32) + { + cairo_set_source_rgba (FRAME_CR_CONTEXT (f), color.red / 65535.0, + color.green / 65535.0, color.blue / 65535.0, f->alpha_background); + + cairo_set_operator (FRAME_CR_CONTEXT (f), CAIRO_OPERATOR_SOURCE); + } + else + cairo_set_source_rgb (FRAME_CR_CONTEXT (f), color.red / 65535.0, + color.green / 65535.0, color.blue / 65535.0); + } static const cairo_user_data_key_t xlib_surface_key, saved_drawable_key; @@ -1258,6 +1272,29 @@ x_fill_rectangle (struct frame *f, GC gc, int x, int y, int width, int height) #endif } + +static void +x_clear_rectangle (struct frame *f, GC gc, int x, int y, int width, int height) +{ +#ifdef USE_CAIRO + cairo_t *cr; + + cr = x_begin_cr_clip (f, gc); + x_set_cr_source_with_gc_background (f, gc); + cairo_rectangle (cr, x, y, width, height); + cairo_fill (cr); + x_end_cr_clip (f); +#else + XGCValues xgcv; + Display *dpy = FRAME_X_DISPLAY (f); + XGetGCValues (dpy, gc, GCBackground | GCForeground, &xgcv); + XSetForeground (dpy, gc, xgcv.background); + XFillRectangle (dpy, FRAME_X_DRAWABLE (f), + gc, x, y, width, height); + XSetForeground (dpy, gc, xgcv.foreground); +#endif +} + static void x_draw_rectangle (struct frame *f, GC gc, int x, int y, int width, int height) { @@ -1838,9 +1875,9 @@ x_draw_fringe_bitmap (struct window *w, struct glyph_row *row, struct draw_fring if (face->stipple) XSetFillStyle (display, face->gc, FillOpaqueStippled); else - XSetForeground (display, face->gc, face->background); + XSetBackground (display, face->gc, face->background); - x_fill_rectangle (f, face->gc, p->bx, p->by, p->nx, p->ny); + x_clear_rectangle (f, face->gc, p->bx, p->by, p->nx, p->ny); if (!face->stipple) XSetForeground (display, face->gc, face->foreground); @@ -2141,12 +2178,7 @@ x_compute_glyph_string_overhangs (struct glyph_string *s) static void x_clear_glyph_string_rect (struct glyph_string *s, int x, int y, int w, int h) { - Display *display = FRAME_X_DISPLAY (s->f); - XGCValues xgcv; - XGetGCValues (display, s->gc, GCForeground | GCBackground, &xgcv); - XSetForeground (display, s->gc, xgcv.background); - x_fill_rectangle (s->f, s->gc, x, y, w, h); - XSetForeground (display, s->gc, xgcv.foreground); + x_clear_rectangle (s->f, s->gc, x, y, w, h); } --=-=-=--