diff --git a/win/curses/cursdial.c b/win/curses/cursdial.c index 8f7c068bf..be75e68e6 100644 --- a/win/curses/cursdial.c +++ b/win/curses/cursdial.c @@ -1175,7 +1175,7 @@ menu_display_page( int count, curletter, entry_cols, start_col, num_lines; char *tmpstr; boolean first_accel = TRUE; - int color = NO_COLOR, attr = A_NORMAL; + int color = NO_COLOR, attr; /* letters assigned to entries on current page */ if (selectors) @@ -1280,14 +1280,12 @@ menu_display_page( start_col += 2; } #endif - if (color != NO_COLOR) - color = menu_item_ptr->color; - + color = menu_item_ptr->color; if (color == NO_COLOR) color = NONE; - attr = menu_item_ptr->attr; - attr = curses_convert_attr(attr); - if (color != NONE || attr != A_NORMAL) + attr = menu_item_ptr->attr; + /* attr is already a curses attr (A_ not ATR_) */ + if (color != NONE || attr != A_NORMAL) curses_menu_color_attr(win, color, attr, ON); num_lines = curses_num_lines(menu_item_ptr->str, entry_cols); diff --git a/win/curses/cursinvt.c b/win/curses/cursinvt.c index 83f831e16..3b0749d5c 100644 --- a/win/curses/cursinvt.c +++ b/win/curses/cursinvt.c @@ -375,7 +375,7 @@ curs_show_invt(WINDOW *win) for (lineno = pi.rowoffset; lineno < pi.inuseindx; ++lineno) { str = pi.array[lineno].invtxt; accelerator = pi.array[lineno].letter; - attr = curses_convert_attr(pi.array[lineno].c_attr); + attr = pi.array[lineno].c_attr; /* already converted when stored */ color = pi.array[lineno].color; if (color == NO_COLOR) color = NONE; diff --git a/win/curses/cursmisc.c b/win/curses/cursmisc.c index 1f70385ab..18536d08c 100644 --- a/win/curses/cursmisc.c +++ b/win/curses/cursmisc.c @@ -80,8 +80,7 @@ curses_toggle_color_attr(WINDOW *win, int color, int attr, int onoff) { if (color == NO_COLOR) color = NONE; - if (attr == ATR_NONE) - attr = NONE; + #ifdef TEXTCOLOR int curses_color;