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: Support for background transparency Date: Sat, 29 Jan 2022 16:17:05 +0100 Message-ID: References: <87wnlnptf2.fsf@gnus.org> <83h7bwybeg.fsf@gnu.org> <87y24t1ed1.fsf@gnus.org> <87k0eulqhx.fsf@gmail.com> <87lez5jy0j.fsf@gmail.com> <87v8y7has0.fsf@gmail.com> <87r18qhm70.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="29575"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.6.10; emacs 27.2 Cc: Robert Pluim , "emacs-devel@gnu.org" To: Po Lu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Jan 29 15:45:06 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 1nDoyP-0007QS-4z for ged-emacs-devel@m.gmane-mx.org; Sat, 29 Jan 2022 15:45:05 +0100 Original-Received: from localhost ([::1]:42772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDoyN-000172-GY for ged-emacs-devel@m.gmane-mx.org; Sat, 29 Jan 2022 09:45:03 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:57720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDowZ-0000Nt-CT for emacs-devel@gnu.org; Sat, 29 Jan 2022 09:43:11 -0500 Original-Received: from mail-oln040092071069.outbound.protection.outlook.com ([40.92.71.69]:45305 helo=EUR03-DB5-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 1nDowW-0004Le-Ck for emacs-devel@gnu.org; Sat, 29 Jan 2022 09:43:10 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XFSFVhvYB2k42kfTaHSoYpBltJNGq3Hhhx1RSwcDLzWkeFk4P3oE9jmKWXTD5miuvbbSQA2ZmrP0EpFC/7xjKIGBheQCIXRTcyb7vtzNRZ6NUC/VtXQS/evJ91iaAPl+Zz7zvWSfHmUdYAcY+HzupYZQhmF7q8HJ8YsgA9PD4QDDz2pKx2W55O0O9oHygXDB0aRqQ2T4/PPaccUBXba8fexfRRtyaDFfFcq+CgIlIctpME4gurKji8KrEH9dyxQGVQe/ww2FEXoRJ6E9hyjoIb384uM7kxcGXVsomO/2kW2E84dxXh+V3V6aZKw1vOV8abZeuVn7V3E10X2bacYBkw== 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=mPdE7ro4JbhMuNrnPrRWjGha0qKw5d9zlYGiUf/fvmI=; b=RSb8q87CcQBdAcSPfRirOpvswrBkILmGF25r5FUWqQfmx0Ihn09mNi/dqkht7JFFr5qtUXjsNi1lJWu8WLQ3XhLv5/uXo7AeQywfMjgQiHEKET31Cay+yAe9LU/ntddXo7m29PizyDSRwdN4Q4lzTlNUJCJOuQ7Ddohhv1gCgdNdSKqAvsLaJWTsWVosLTjlJLACt90th/HmHRx1LKPnqAxV0+wjIaEOvZ+JLK8SzkZ5rMbmrfAjv7WGFLg6j1+yAJ2euc5zdnHwhi5dgwHJn4q/qulz+YRJaOGMSMFXAQ/b9AntFxAYz7c7N95cL2UgLjlC9bYlo4TNEnio6jPx8w== 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=mPdE7ro4JbhMuNrnPrRWjGha0qKw5d9zlYGiUf/fvmI=; b=r9JgWnrn0ueSm64yON9oOqkXSDpXejScVp327QQ8RI6cREWtQM/XYFxtS4UpF2HnX6Ozfdu7rkkoPf17UPaGkAKp2EDHt1qln7ANnkCFxWOCJNOkpkrrBN37ThVchmKEuTUnITeK/9dfgMIORWf5Vj8kIdlRYjziZYCION8kGTg6t4UHC4MCZkUxv8ZSvoF9Jsj2+JU7jy40RUbWuONGSY9dOaRB8nXj6uT47zNMqpyLxhGBGDgQc3Z+KqZA7D+ob8Bw7ZU8SDqpRRPzzxIoHIUu8QDqdWrqp3OkDqvCnz7hKBjdZq5erjw2mbN3b3p9THx1oI4AwaufinDA4hWnag== Original-Received: from PRAP251MB0688.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:293::21) by AS4P251MB0585.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:4bc::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sat, 29 Jan 2022 14:23:32 +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.4930.019; Sat, 29 Jan 2022 14:23:32 +0000 In-reply-to: <87r18qhm70.fsf@yahoo.com> X-TMN: [XucU9lXx6wSB9u1x1nDGpZ4+PcqlFKYenPh58l+xO3sg7uVomsDVSBEcrK4PFpl0] X-ClientProxiedBy: OL1P279CA0029.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:13::16) To PRAP251MB0688.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:293::21) X-Microsoft-Original-Message-ID: <87fsp6k1lk.fsf@hotmail.com> X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 560ecc27-a7f5-4eb1-16da-08d9e332ed9a X-MS-TrafficTypeDiagnostic: AS4P251MB0585:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DWAZmHUMHnA3GoRNI+376M7tKf+3svcwO/wlLc1xalN/4KWHXlvBQPVKTyb4LWFp7xkDJN3h0ostPVJsi949cLx4xztGaimYbb7fiyitcsXIkV53fvqDL8JlwNcA1euVfeU0rerrJdz8TUZi50HflAo4aLZHQcO9Aw69/ZDXpfs3t9Uo1GsuAUPojQ4GW3txs2Nx+Ft0Ah7Z+dH2XV7QFtGPDuNuCF3sn8F86NA2AyaJGCZs2RL7Rv3kF40A92ctBcv2GesLDhX4C9Qqa7cQbaJS9R9tROB4kI1LzGXx/mweyU90wu4rTLrlE540/pClpJzsWgkM926fDp2StOLArzmVGhy/iZh+qIiNv8fD2SJBvKVm864agp6O96n5S/EPmG9qDlqEYAFc/C9PNxdE3wrZYHDx+LYMiuI2Dqhi6gKNY+TxL1Dfbk3EiCAnASugCiWoKvPziatoD5QMTw08kpVo2rCkBQt7OzxHF1krDhwe+5wmme56wcshwe2JwUaXRNHJ15NFVVx8f5U1xLEfyHSAI300tKFhJrNbu+9p8XHrIW3OcynPSjO8cC++hiUj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Tmg0WlFlcUlTMFdleElYRDZwU21ic3IzeHNxRW9hQlNZNEZ4N3dpemFUb3cx?= =?utf-8?B?SGNHS0pNWEJoY0NRSUlEN3JlaUFCbTNYa2hsUE5sY2hhN05mQ2oyQ2xmTlY2?= =?utf-8?B?bEZxWXAwaGNDL3Zrb0dNZXZLS0phVms3dHFjRFJhL3pBTTBlNFpZMG9oZ2xZ?= =?utf-8?B?WHBsY2FpMDRBRXY1MFlTZ0xZNy9HV3gwR2ozVHE2UmVoV0p3STNNYmlueWYv?= =?utf-8?B?bHBMYmZvU3JJei9saG5ZRFU0SzI1TVQyRk5NVjhBZlRUeGNhSmovNko1Ly9y?= =?utf-8?B?ZVc5Y0xBY1ZDQ2ZIeHhOUUptVHA1QndKSHpYS3BhWmU3SjdJVzdoUndrZDEy?= =?utf-8?B?U2ZEUFBWcGxPUlY0cndVeGJjeUtsNXIwcjhSRGdLUGRlRlFQYzV2Ry80Z0dz?= =?utf-8?B?aVpmVklWWHVNZUZqZ2M4MlFTVlROaWZUTVlCWUhwY1c4alEzMDVMVjFHQlp1?= =?utf-8?B?UUdnMjVpeUJvZlZOczJENytnSkJmcHJuQmxpRzA0YmFPQkV3YVZMcUM0bFVo?= =?utf-8?B?L1N2TUlSQjY5SVFraU5tRXFwVnhEL0tsQ2hJemVZR01nVGNkUXc4Q0hWV1Jn?= =?utf-8?B?blVaOUZjQ1hUbms2OGxONlVaRS9SM1ZxOG1JRjV6bDE4VWwrYnR6a1Z6L21y?= =?utf-8?B?TGlxZHA0UEFERmlacWg0cEVTaE9jTHhRNVI2bW X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-00b75.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 560ecc27-a7f5-4eb1-16da-08d9e332ed9a X-MS-Exchange-CrossTenant-AuthSource: PRAP251MB0688.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2022 14:23:32.5210 (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: AS4P251MB0585 Received-SPF: pass client-ip=40.92.71.69; envelope-from=hkon20@hotmail.com; helo=EUR03-DB5-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, T_SCC_BODY_TEXT_LINE=-0.01 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:285561 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > Hakon, do you have a good commit message somewhere? Yes, sorry - I should have created the last patch with `format-patch` instead of just a normal `diff`. I have included a formatted patch now. Thanks for all your feedback throughout this effort. - H=C3=A5kon --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-background-transparency-support-for-GTK-Cairo.patch >From e9f4a8b111e31b73873e56beaf43a3dcab1c72b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Flatval?= Date: Sat, 29 Jan 2022 16:13:06 +0100 Subject: [PATCH] Add background transparency support for GTK+Cairo --- doc/emacs/xresources.texi | 9 +++++++ doc/lispref/frames.texi | 10 ++++++++ src/frame.c | 29 +++++++++++++++++++++ src/frame.h | 4 +++ src/gtkutil.c | 14 ++++++++++- src/haikufns.c | 7 +++++- src/nsfns.m | 3 +++ src/pgtkfns.c | 5 ++++ src/w32fns.c | 8 ++++++ src/xfns.c | 28 +++++++++++++++++++-- src/xterm.c | 53 +++++++++++++++++++++++++++++++-------- 11 files changed, 156 insertions(+), 14 deletions(-) diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index ccf7e35eee..bb362ca3ea 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -149,6 +149,15 @@ Table of Resources is the case. @table @asis +@item @code{alpha} (class @code{Alpha}) +Sets the @samp{alpha} frame parameter, determining frame transparency +(@pxref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}). + +@item @code{alphaBackground} (class @code{AlphaBackground}) +Sets the @samp{alpha-background} frame parameter, determining background +transparency +(@pxref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}). + @item @code{background} (class @code{Background}) Background color (@pxref{Colors}). diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 7d3ce9d74e..f8188708e5 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -2433,6 +2433,16 @@ Font and Color Parameters Some window systems do not support the @code{alpha} parameter for child frames (@pxref{Child Frames}). + +@vindex alpha-background@r{, a frame parameter} +@item alpha-background +@cindex opacity, frame +@cindex transparency, frame +Sets the background transparency of the frame. Unlike the @code{alpha} +frame parameter, this only controls the transparency of the background +while keeping foreground elements such as text fully opaque. It +should be an integer between 0 and 100, where 0 means +completely transparent and 100 means completely opaque (default). @end table The following frame parameters are semi-obsolete in that they are 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 98907bf022..8b8123c807 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..0e0cffea72 100644 --- a/src/haikufns.c +++ b/src/haikufns.c @@ -830,6 +830,8 @@ #define ASSIGN_CURSOR(cursor, be_cursor) \ RES_TYPE_NUMBER); gui_default_parameter (f, parms, Qalpha, Qnil, "alpha", "Alpha", RES_TYPE_NUMBER); + gui_default_parameter (f, parms, Qalpha_background, Qnil, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); gui_default_parameter (f, parms, Qfullscreen, Qnil, "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); @@ -1043,6 +1045,8 @@ haiku_create_tip_frame (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, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); initial_setup_back_buffer (f); @@ -2609,7 +2613,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..467e56ece4 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, @@ -1436,6 +1437,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side. RES_TYPE_NUMBER); gui_default_parameter (f, parms, Qalpha, Qnil, "alpha", "Alpha", RES_TYPE_NUMBER); + gui_default_parameter (f, parms, Qalpha_background, Qnil, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); gui_default_parameter (f, parms, Qfullscreen, Qnil, "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); diff --git a/src/pgtkfns.c b/src/pgtkfns.c index 9c37c04810..5980b31d6e 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, }; @@ -1667,6 +1668,8 @@ #define INSTALL_CURSOR(FIELD, NAME) \ RES_TYPE_NUMBER); gui_default_parameter (f, parms, Qalpha, Qnil, "alpha", "Alpha", RES_TYPE_NUMBER); + gui_default_parameter (f, parms, Qalpha, Qnil, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); if (!NILP (parent_frame)) { @@ -2936,6 +2939,8 @@ x_create_tip_frame (struct pgtk_display_info *dpyinfo, Lisp_Object parms, struct "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, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); /* Add `tooltip' frame parameter's default value. */ if (NILP (Fframe_parameter (frame, Qtooltip))) diff --git a/src/w32fns.c b/src/w32fns.c index 1ea685d194..009855602e 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6018,6 +6018,8 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, NULL, NULL, RES_TYPE_BOOLEAN); gui_default_parameter (f, parameters, Qno_special_glyphs, Qnil, NULL, NULL, RES_TYPE_BOOLEAN); + gui_default_parameter (f, parameters, Qalpha_background, Qnil, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); /* Process alpha here (Bug#16619). On XP this fails with child frames. For `no-focus-on-map' frames delay processing of alpha @@ -6155,6 +6157,9 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, gui_default_parameter (f, parameters, Qz_group, Qnil, NULL, NULL, RES_TYPE_SYMBOL); + gui_default_parameter (f, parameters, Qalpha_background, Qnil, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); + /* Make the window appear on the frame and enable display, unless the caller says not to. However, with explicit parent, Emacs cannot control visibility, so don't try. */ @@ -7089,6 +7094,8 @@ w32_create_tip_frame (struct w32_display_info *dpyinfo, Lisp_Object parms) /* Process alpha here (Bug#17344). */ gui_default_parameter (f, parms, Qalpha, Qnil, "alpha", "Alpha", RES_TYPE_NUMBER); + gui_default_parameter (f, parms, Qalpha_background, Qnil, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); /* Add `tooltip' frame parameter's default value. */ if (NILP (Fframe_parameter (frame, Qtooltip))) @@ -10436,6 +10443,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 faab1b1158..2f2e33fa69 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4598,6 +4598,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, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); if (!NILP (parent_frame)) { @@ -6371,10 +6373,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) + /* 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) */ + + /* 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) @@ -7232,6 +7253,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, + "alphaBackground", "AlphaBackground", RES_TYPE_NUMBER); /* Add `tooltip' frame parameter's default value. */ if (NILP (Fframe_parameter (frame, Qtooltip))) @@ -8560,6 +8583,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 3f277c5b87..ab5fd46c4c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -874,12 +874,27 @@ 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; @@ -1318,6 +1333,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) { @@ -1898,9 +1936,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); @@ -2201,12 +2239,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); } -- 2.34.1 --=-=-=--