X11: Don't hilite the help ext menu entry

Both the "help" button at top and the "help" extended menu command
were hilighted by the X resources. Make the top buttons have
"btn_" prefix, so they're easily distinguished in the resources.

diff --git a/win/X11/NetHack.ad b/win/X11/NetHack.ad
index 2e89e5617ce6e2756a367884ef57ed2b606e8d33..0e5ca8b1f7670f3f1652ee56a5b8f5cd39197342 100644 (file)
--- a/win/X11/NetHack.ad
+++ b/win/X11/NetHack.ad
@@ -174,80 +174,80 @@ NetHack*player_selection_dialog*play.cornerRoundPercent: NETHACK_BTN_ROUND
 
 
 ! role selection window  (OPTIONS=player_selection:prompts)
-NetHack*player_selection*random.foreground:   NETHACK_CLR_RANDOM
-NetHack*player_selection*random.background:   black
-NetHack*player_selection*random.borderColor:  NETHACK_CLR_RANDOM
-NetHack*player_selection*random.borderWidth:  1
-NetHack*player_selection*random.shapeStyle: NETHACK_BTN_SHAPE
-NetHack*player_selection*random.cornerRoundPercent: NETHACK_BTN_ROUND
-NetHack*player_selection*quit.foreground:     NETHACK_CLR_QUIT
-NetHack*player_selection*quit.borderColor:    NETHACK_CLR_QUIT
-NetHack*player_selection*quit.borderWidth:    1
-NetHack*player_selection*quit.shapeStyle: NETHACK_BTN_SHAPE
-NetHack*player_selection*quit.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*player_selection*btn_random.foreground:   NETHACK_CLR_RANDOM
+NetHack*player_selection*btn_random.background:   black
+NetHack*player_selection*btn_random.borderColor:  NETHACK_CLR_RANDOM
+NetHack*player_selection*btn_random.borderWidth:  1
+NetHack*player_selection*btn_random.shapeStyle: NETHACK_BTN_SHAPE
+NetHack*player_selection*btn_random.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*player_selection*btn_quit.foreground:     NETHACK_CLR_QUIT
+NetHack*player_selection*btn_quit.borderColor:    NETHACK_CLR_QUIT
+NetHack*player_selection*btn_quit.borderWidth:    1
+NetHack*player_selection*btn_quit.shapeStyle: NETHACK_BTN_SHAPE
+NetHack*player_selection*btn_quit.cornerRoundPercent: NETHACK_BTN_ROUND
 NetHack*player_selection*Command.foreground:  NETHACK_CLR_FG
 NetHack*player_selection*Command.borderColor: NETHACK_CLR_FG
 NetHack*player_selection*Command.borderWidth: NETHACK_CMD_BORDER
 
 ! race selection window
-NetHack*race_selection*random.foreground:   NETHACK_CLR_RANDOM
-NetHack*race_selection*random.background:   black
-NetHack*race_selection*random.borderColor:  NETHACK_CLR_RANDOM
-NetHack*race_selection*random.borderWidth:  1
-NetHack*race_selection*random.shapeStyle:   NETHACK_BTN_SHAPE
-NetHack*race_selection*random.cornerRoundPercent: NETHACK_BTN_ROUND
-NetHack*race_selection*quit.foreground:     NETHACK_CLR_QUIT
-NetHack*race_selection*quit.borderColor:    NETHACK_CLR_QUIT
-NetHack*race_selection*quit.borderWidth:    1
-NetHack*race_selection*quit.shapeStyle:     NETHACK_BTN_SHAPE
-NetHack*race_selection*quit.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*race_selection*btn_random.foreground:   NETHACK_CLR_RANDOM
+NetHack*race_selection*btn_random.background:   black
+NetHack*race_selection*btn_random.borderColor:  NETHACK_CLR_RANDOM
+NetHack*race_selection*btn_random.borderWidth:  1
+NetHack*race_selection*btn_random.shapeStyle:   NETHACK_BTN_SHAPE
+NetHack*race_selection*btn_random.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*race_selection*btn_quit.foreground:     NETHACK_CLR_QUIT
+NetHack*race_selection*btn_quit.borderColor:    NETHACK_CLR_QUIT
+NetHack*race_selection*btn_quit.borderWidth:    1
+NetHack*race_selection*btn_quit.shapeStyle:     NETHACK_BTN_SHAPE
+NetHack*race_selection*btn_quit.cornerRoundPercent: NETHACK_BTN_ROUND
 NetHack*race_selection*Command.foreground:  NETHACK_CLR_FG
 NetHack*race_selection*Command.borderColor: NETHACK_CLR_FG
 NetHack*race_selection*Command.borderWidth: NETHACK_CMD_BORDER
 
 ! gender selection window
-NetHack*gender_selection*random.foreground:   NETHACK_CLR_RANDOM
-NetHack*gender_selection*random.background:   black
-NetHack*gender_selection*random.borderColor:  NETHACK_CLR_RANDOM
-NetHack*gender_selection*random.borderWidth:  1
-NetHack*gender_selection*random.shapeStyle:   NETHACK_BTN_SHAPE
-NetHack*gender_selection*random.cornerRoundPercent: NETHACK_BTN_ROUND
-NetHack*gender_selection*quit.foreground:     NETHACK_CLR_QUIT
-NetHack*gender_selection*quit.borderColor:    NETHACK_CLR_QUIT
-NetHack*gender_selection*quit.borderWidth:    1
-NetHack*gender_selection*quit.shapeStyle:     NETHACK_BTN_SHAPE
-NetHack*gender_selection*quit.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*gender_selection*btn_random.foreground:   NETHACK_CLR_RANDOM
+NetHack*gender_selection*btn_random.background:   black
+NetHack*gender_selection*btn_random.borderColor:  NETHACK_CLR_RANDOM
+NetHack*gender_selection*btn_random.borderWidth:  1
+NetHack*gender_selection*btn_random.shapeStyle:   NETHACK_BTN_SHAPE
+NetHack*gender_selection*btn_random.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*gender_selection*btn_quit.foreground:     NETHACK_CLR_QUIT
+NetHack*gender_selection*btn_quit.borderColor:    NETHACK_CLR_QUIT
+NetHack*gender_selection*btn_quit.borderWidth:    1
+NetHack*gender_selection*btn_quit.shapeStyle:     NETHACK_BTN_SHAPE
+NetHack*gender_selection*btn_quit.cornerRoundPercent: NETHACK_BTN_ROUND
 NetHack*gender_selection*Command.foreground:  NETHACK_CLR_FG
 NetHack*gender_selection*Command.borderColor: NETHACK_CLR_FG
 NetHack*gender_selection*Command.borderWidth: NETHACK_CMD_BORDER
 
 ! alignment selection window
-NetHack*alignment_selection*random.foreground:   NETHACK_CLR_RANDOM
-NetHack*alignment_selection*random.background:   black
-NetHack*alignment_selection*random.borderColor:  NETHACK_CLR_RANDOM
-NetHack*alignment_selection*random.borderWidth:  1
-NetHack*alignment_selection*random.shapeStyle:   NETHACK_BTN_SHAPE
-NetHack*alignment_selection*random.cornerRoundPercent: NETHACK_BTN_ROUND
-NetHack*alignment_selection*quit.foreground:     NETHACK_CLR_QUIT
-NetHack*alignment_selection*quit.borderColor:    NETHACK_CLR_QUIT
-NetHack*alignment_selection*quit.borderWidth:    1
-NetHack*alignment_selection*quit.shapeStyle:     NETHACK_BTN_SHAPE
-NetHack*alignment_selection*quit.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*alignment_selection*btn_random.foreground:   NETHACK_CLR_RANDOM
+NetHack*alignment_selection*btn_random.background:   black
+NetHack*alignment_selection*btn_random.borderColor:  NETHACK_CLR_RANDOM
+NetHack*alignment_selection*btn_random.borderWidth:  1
+NetHack*alignment_selection*btn_random.shapeStyle:   NETHACK_BTN_SHAPE
+NetHack*alignment_selection*btn_random.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*alignment_selection*btn_quit.foreground:     NETHACK_CLR_QUIT
+NetHack*alignment_selection*btn_quit.borderColor:    NETHACK_CLR_QUIT
+NetHack*alignment_selection*btn_quit.borderWidth:    1
+NetHack*alignment_selection*btn_quit.shapeStyle:     NETHACK_BTN_SHAPE
+NetHack*alignment_selection*btn_quit.cornerRoundPercent: NETHACK_BTN_ROUND
 NetHack*alignment_selection*Command.foreground:  NETHACK_CLR_FG
 NetHack*alignment_selection*Command.borderColor: NETHACK_CLR_FG
 NetHack*alignment_selection*Command.borderWidth: NETHACK_CMD_BORDER
 
 ! extended commands window
-NetHack*extended_commands*dismiss.foreground:  NETHACK_CLR_QUIT
-NetHack*extended_commands*dismiss.borderColor: NETHACK_CLR_QUIT
-NetHack*extended_commands*dismiss.borderWidth: 1
-NetHack*extended_commands*dismiss.shapeStyle:  NETHACK_BTN_SHAPE
-NetHack*extended_commands*dismiss.cornerRoundPercent: NETHACK_BTN_ROUND
-NetHack*extended_commands*help.foreground:     NETHACK_CLR_HELP
-NetHack*extended_commands*help.borderColor:    NETHACK_CLR_HELP
-NetHack*extended_commands*help.borderWidth:    1
-NetHack*extended_commands*help.shapeStyle:     NETHACK_BTN_SHAPE
-NetHack*extended_commands*help.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*extended_commands*btn_dismiss.foreground:  NETHACK_CLR_QUIT
+NetHack*extended_commands*btn_dismiss.borderColor: NETHACK_CLR_QUIT
+NetHack*extended_commands*btn_dismiss.borderWidth: 1
+NetHack*extended_commands*btn_dismiss.shapeStyle:  NETHACK_BTN_SHAPE
+NetHack*extended_commands*btn_dismiss.cornerRoundPercent: NETHACK_BTN_ROUND
+NetHack*extended_commands*btn_help.foreground:     NETHACK_CLR_HELP
+NetHack*extended_commands*btn_help.borderColor:    NETHACK_CLR_HELP
+NetHack*extended_commands*btn_help.borderWidth:    1
+NetHack*extended_commands*btn_help.shapeStyle:     NETHACK_BTN_SHAPE
+NetHack*extended_commands*btn_help.cornerRoundPercent: NETHACK_BTN_ROUND
 NetHack*extended_commands*Command.foreground:  NETHACK_CLR_FG
 NetHack*extended_commands*Command.borderColor: NETHACK_CLR_FG
 NetHack*extended_commands*Command.borderWidth: NETHACK_CMD_BORDER

diff --git a/win/X11/winmisc.c b/win/X11/winmisc.c
index 757e5df4cc8647d3d2b4bf38f81e56778aaea0c8..567f2ba847c7ed8902ad0d400e672fc3cdcdad10 100644 (file)
--- a/win/X11/winmisc.c
+++ b/win/X11/winmisc.c
@@ -1998,6 +1998,7 @@ Widget *formp; /* return */
     Dimension width, other_width, max_width, border_width,
               height, cumulative_height, screen_height;
     int distance, skip;
+    char btnname[BUFSZ];
 
     commands = (Widget *) alloc((unsigned) num_names * sizeof (Widget));
 
@@ -2072,11 +2073,13 @@ Widget *formp; /* return */
      */
     num_args = 0;
     XtSetArg(args[num_args], nhStr(XtNfromVert), label); num_args++;
+    XtSetArg(args[num_args], nhStr(XtNlabel), left_name); num_args++;
 #if 0
     XtSetArg(args[num_args], nhStr(XtNshapeStyle),
                               XmuShapeRoundedRectangle); num_args++;
 #endif
-    left = XtCreateManagedWidget(left_name, commandWidgetClass, form, args,
+    Sprintf(btnname, "btn_%s", left_name);
+    left = XtCreateManagedWidget(btnname, commandWidgetClass, form, args,
                                  num_args);
     XtAddCallback(left, XtNcallback, left_callback, (XtPointer) 0);
     skip = (distance < 4) ? 8 : 2 * distance;
@@ -2093,11 +2096,13 @@ Widget *formp; /* return */
     XtSetArg(args[num_args], nhStr(XtNfromHoriz), left); num_args++;
     XtSetArg(args[num_args], nhStr(XtNhorizDistance), skip); num_args++;
     XtSetArg(args[num_args], nhStr(XtNfromVert), label); num_args++;
+    XtSetArg(args[num_args], nhStr(XtNlabel), right_name); num_args++;
 #if 0
     XtSetArg(args[num_args], nhStr(XtNshapeStyle),
                               XmuShapeRoundedRectangle); num_args++;
 #endif
-    right = XtCreateManagedWidget(right_name, commandWidgetClass, form, args,
+    Sprintf(btnname, "btn_%s", right_name);
+    right = XtCreateManagedWidget(btnname, commandWidgetClass, form, args,
                                   num_args);
     XtAddCallback(right, XtNcallback, right_callback, (XtPointer) 0);