bug#45502: [PATCH] Prettier key bindings in NS menu entries

["Mattias Engdegård" <mattiase@acm.org>]

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

29 dec. 2020 kl. 16.50 skrev Alan Third <alan@idiocy.org>:

> As far as I'm aware GNUstep is able to display the bindings correctly
> no matter how many characters they have, so we don't need the
> work-around. And I'm hoping that we'll be able to get GNUstep menus
> working again in the future.

All right, I've done what I think you meant and pushed to master; please tell me if I'm on the wrong track.

Here is a proof-of-concept patch for using fancy symbols instead of <right> etc.
Not production quality because (1) it's obviously ugly code, (2) I'm unsure about the PgUp/PgDn/Home/End symbols and (3) it only works with modifiers if the patch in bug#45536 is applied (which of course I think it should), but at least it gives a feeling for whether it's a good thing to do or not.

There is also the question whether to follow the platform convention of always using upper case letters, with an explicit Shift modifier if necessary.


[-- Attachment #2: key-symbols.diff --]
[-- Type: application/octet-stream, Size: 4796 bytes --]

diff --git a/src/nsmenu.m b/src/nsmenu.m
index d5321dcdc6..36566e9a11 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -552,9 +552,76 @@ - (void)fillWithWidgetValue: (void *)wvptr
         maxNameWidth = MAX(maxNameWidth, nameSize.width);
         if (wv->key)
           {
-            NSString *key = [NSString stringWithUTF8String: skipspc (wv->key)];
+            NSMutableString *key =
+              [NSMutableString stringWithUTF8String: skipspc (wv->key)];
+            [key replaceOccurrencesOfString: @"<backspace>"
+                                 withString: @"⌫"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"DEL"
+                                 withString: @"⌫"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<deletechar>"
+                                 withString: @"⌦"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<return>"
+                                 withString: @"↩"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"RET"
+                                 withString: @"↩"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<left>"
+                                 withString: @"←"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<right>"
+                                 withString: @"→"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<up>"
+                                 withString: @"↑"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<down>"
+                                 withString: @"↓"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<prior>"
+                                 withString: @"⇞"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<next>"
+                                 withString: @"⇟"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<home>"
+                                 withString: @"↖"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<end>"
+                                 withString: @"↘"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<tab>"
+                                 withString: @"⇥"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"TAB"
+                                 withString: @"⇥"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
+            [key replaceOccurrencesOfString: @"<backtab>"
+                                 withString: @"⇤"
+                                    options: NSLiteralSearch
+                                      range: NSMakeRange (0, [key length])];
             NSSize keySize = [key sizeWithAttributes: font_attribs];
             maxKeyWidth = MAX(maxKeyWidth, keySize.width);
+            Lisp_Object newkey = build_string ([key UTF8String]);
+            wv->key = SSDATA (newkey);
           }
       }