bug#52052: [PATCH] Re-enable the disabledForeground X resource

[Gregory Heytings <gregory@heytings.org>]

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]


The disabledForeground X resource is defined in the code, it is read and 
allocated, but it is overwritten before being used with the value of the 
foreground X resource.  I attach a patch which re-enables that resource.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-diff; name=Re-enable-the-disabledForeground-X-resource.patch, Size: 2034 bytes --]

From fd8aa00b17057a13e9af3723b10a092bdf3c58c1 Mon Sep 17 00:00:00 2001
From: Gregory Heytings <gregory@heytings.org>
Date: Tue, 23 Nov 2021 09:51:04 +0000
Subject: [PATCH] Re-enable the disabledForeground X resource.

* lwlib/xlwmenu.c (make_drawing_gcs): Re-enable the use of the
disabledForeground resource.  The use of this X resource was disabled
without reason in commit ef93458b2f8 by overwriting its value with the
value of the foreground resource.

* doc/emacs/xresources.texi (Lucid Resources): Document the resource.
Also document the 'cursor' resource.
---
 doc/emacs/xresources.texi | 5 +++++
 lwlib/xlwmenu.c           | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 0e0070829c..a7bd006df4 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -395,6 +395,8 @@ Lucid Resources
 Foreground color for a selected item.
 @item foreground
 Foreground color.
+@item disabledForeground
+Foreground color for a disabled menu item.
 @ifnottex
 @item horizontalSpacing
 Horizontal spacing in pixels between items.  Default is 3.
@@ -409,6 +411,9 @@ Lucid Resources
 @item borderThickness
 Thickness of the external borders of the menu bars and pop-up menus.
 Default is 1.
+@item cursor
+Name of the cursor to use in the menu bars and pop-up menus.  Default
+is @code{"right_ptr"}.
 @end ifnottex
 @item margin
 Margin of the menu bar, in characters.  Default is 1.
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 5f8832bb36..a0a10d13db 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1657,7 +1657,6 @@ make_drawing_gcs (XlwMenuWidget mw)
 #define BRIGHTNESS(color) (((color) & 0xff) + (((color) >> 8) & 0xff) + (((color) >> 16) & 0xff))
 
   /* Allocate color for disabled menu-items.  */
-  mw->menu.disabled_foreground = mw->menu.foreground;
   if (BRIGHTNESS(mw->menu.foreground) < BRIGHTNESS(mw->core.background_pixel))
     scale = 2.3;
   else
-- 
2.33.0