From 75bf7c1975714310cdd0912f61638481030e897a Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 30 Nov 2018 15:26:38 +0200 Subject: [PATCH] X11: Disable menucolors when showing text files --- include/winX.h | 1 + win/X11/winX.c | 1 + win/X11/winmenu.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/winX.h b/include/winX.h index 1a061fa14..a1a560528 100644 --- a/include/winX.h +++ b/include/winX.h @@ -165,6 +165,7 @@ struct menu_info_t { boolean cancelled; /* Menu has been explicitly cancelled. */ boolean counting; /* true when menu_count has a valid value */ boolean permi; + boolean disable_mcolors; /* disable menucolors */ int permi_x, permi_y; /* perm_invent window x,y */ int permi_w, permi_h; /* perm_invent window wid, hei */ diff --git a/win/X11/winX.c b/win/X11/winX.c index 7337e6f04..09d5c7a50 100644 --- a/win/X11/winX.c +++ b/win/X11/winX.c @@ -1962,6 +1962,7 @@ boolean complain; wp->title = dupstr(str); wp->menu_information->permi = FALSE; + wp->menu_information->disable_mcolors = TRUE; (void) X11_select_menu(newwin, PICK_NONE, &menu_list); X11_destroy_nhwindow(newwin); } diff --git a/win/X11/winmenu.c b/win/X11/winmenu.c index 04d75e77f..7ac8d2491 100644 --- a/win/X11/winmenu.c +++ b/win/X11/winmenu.c @@ -1162,7 +1162,7 @@ struct menu *curr_menu; XtSetArg(args[num_args], nhStr(XtNborderWidth), 0); num_args++; XtSetArg(args[num_args], nhStr(XtNvertDistance), 0); num_args++; - if (!iflags.use_menu_color + if (!iflags.use_menu_color || wp->menu_information->disable_mcolors || !get_menu_coloring(curr->str, &color, &attr)) attr = curr->attr;