Ticket #2170: mc-4.7.0.6-separate-colors.patch

File mc-4.7.0.6-separate-colors.patch, 30.5 KB (added by egmont, 9 years ago)

update (whitespace/indent changes only)

  • lib/skin/colors.c

    diff -ur mc-4.7.0.6.orig/lib/skin/colors.c mc-4.7.0.6/lib/skin/colors.c
    old new  
    181181    SELECTED_COLOR = mc_skin_color_get ("core", "selected"); 
    182182    MARKED_SELECTED_COLOR = mc_skin_color_get ("core", "markselect"); 
    183183    REVERSE_COLOR = mc_skin_color_get ("core", "reverse"); 
     184    HEADER_COLOR = mc_skin_color_get ("core", "header"); 
    184185 
    185186    COLOR_NORMAL = mc_skin_color_get ("dialog", "_default_"); 
    186187    COLOR_FOCUS = mc_skin_color_get ("dialog", "dfocus"); 
    187188    COLOR_HOT_NORMAL = mc_skin_color_get ("dialog", "dhotnormal"); 
    188189    COLOR_HOT_FOCUS = mc_skin_color_get ("dialog", "dhotfocus"); 
     190    COLOR_TITLE = mc_skin_color_get ("dialog", "dtitle"); 
    189191 
    190192    ERROR_COLOR = mc_skin_color_get ("error", "_default_"); 
     193    ERROR_FOCUS = mc_skin_color_get ("error", "errdfocus"); 
    191194    ERROR_HOT_NORMAL = mc_skin_color_get ("error", "errdhotnormal"); 
    192195    ERROR_HOT_FOCUS = mc_skin_color_get ("error", "errdhotfocus"); 
     196    ERROR_TITLE = mc_skin_color_get ("error", "errdtitle"); 
    193197 
    194198    MENU_ENTRY_COLOR = mc_skin_color_get ("menu", "_default_"); 
    195199    MENU_SELECTED_COLOR = mc_skin_color_get ("menu", "menusel"); 
     
    199203 
    200204    GAUGE_COLOR = mc_skin_color_get ("core", "gauge"); 
    201205    INPUT_COLOR = mc_skin_color_get ("core", "input"); 
     206    INPUT_HISTORY_COLOR = mc_skin_color_get ("core", "inputhistory"); 
     207    COMMAND_HISTORY_COLOR = mc_skin_color_get ("core", "commandhistory"); 
    202208 
    203209    HELP_NORMAL_COLOR = mc_skin_color_get ("help", "_default_"); 
    204210    HELP_ITALIC_COLOR = mc_skin_color_get ("help", "helpitalic"); 
    205211    HELP_BOLD_COLOR = mc_skin_color_get ("help", "helpbold"); 
    206212    HELP_LINK_COLOR = mc_skin_color_get ("help", "helplink"); 
    207213    HELP_SLINK_COLOR = mc_skin_color_get ("help", "helpslink"); 
     214    HELP_TITLE_COLOR = mc_skin_color_get ("help", "helptitle"); 
    208215 
     216    VIEW_BOLD_COLOR = mc_skin_color_get ("viewer", "viewbold"); 
    209217    VIEW_UNDERLINED_COLOR = mc_skin_color_get ("viewer", "viewunderline"); 
     218    VIEW_SELECTED_COLOR = mc_skin_color_get ("viewer", "viewselected"); 
    210219 
    211220    EDITOR_NORMAL_COLOR = mc_skin_color_get ("editor", "_default_"); 
    212221    EDITOR_BOLD_COLOR = mc_skin_color_get ("editor", "editbold"); 
  • lib/skin.h

    diff -ur mc-4.7.0.6.orig/lib/skin.h mc-4.7.0.6/lib/skin.h
    old new  
    1919#define SELECTED_COLOR          mc_skin_color__cache[3] 
    2020#define MARKED_SELECTED_COLOR   mc_skin_color__cache[4] 
    2121#define REVERSE_COLOR           mc_skin_color__cache[5] 
     22#define HEADER_COLOR            mc_skin_color__cache[6] 
    2223 
    2324/* Dialog colors */ 
    24 #define COLOR_NORMAL            mc_skin_color__cache[6] 
    25 #define COLOR_FOCUS             mc_skin_color__cache[7] 
    26 #define COLOR_HOT_NORMAL        mc_skin_color__cache[8] 
    27 #define COLOR_HOT_FOCUS         mc_skin_color__cache[9] 
     25#define COLOR_NORMAL            mc_skin_color__cache[7] 
     26#define COLOR_FOCUS             mc_skin_color__cache[8] 
     27#define COLOR_HOT_NORMAL        mc_skin_color__cache[9] 
     28#define COLOR_HOT_FOCUS         mc_skin_color__cache[10] 
     29#define COLOR_TITLE             mc_skin_color__cache[11] 
    2830 
    2931/* Error dialog colors */ 
    30 #define ERROR_COLOR             mc_skin_color__cache[10] 
    31 #define ERROR_HOT_NORMAL        mc_skin_color__cache[11] 
    32 #define ERROR_HOT_FOCUS         mc_skin_color__cache[12] 
     32#define ERROR_COLOR             mc_skin_color__cache[12] 
     33#define ERROR_FOCUS             mc_skin_color__cache[13] 
     34#define ERROR_HOT_NORMAL        mc_skin_color__cache[14] 
     35#define ERROR_HOT_FOCUS         mc_skin_color__cache[15] 
     36#define ERROR_TITLE             mc_skin_color__cache[16] 
    3337 
    3438/* Menu colors */ 
    35 #define MENU_ENTRY_COLOR        mc_skin_color__cache[13] 
    36 #define MENU_SELECTED_COLOR     mc_skin_color__cache[14] 
    37 #define MENU_HOT_COLOR          mc_skin_color__cache[15] 
    38 #define MENU_HOTSEL_COLOR       mc_skin_color__cache[16] 
    39 #define MENU_INACTIVE_COLOR     mc_skin_color__cache[17] 
     39#define MENU_ENTRY_COLOR        mc_skin_color__cache[17] 
     40#define MENU_SELECTED_COLOR     mc_skin_color__cache[18] 
     41#define MENU_HOT_COLOR          mc_skin_color__cache[19] 
     42#define MENU_HOTSEL_COLOR       mc_skin_color__cache[20] 
     43#define MENU_INACTIVE_COLOR     mc_skin_color__cache[21] 
    4044 
    4145/* 
    4246 * This should be selectable independently. Default has to be black background 
    4347 * foreground does not matter at all. 
    4448 */ 
    45 #define GAUGE_COLOR             mc_skin_color__cache[18] 
    46 #define INPUT_COLOR             mc_skin_color__cache[19] 
    47  
    48 #define HELP_NORMAL_COLOR       mc_skin_color__cache[20] 
    49 #define HELP_ITALIC_COLOR       mc_skin_color__cache[21] 
    50 #define HELP_BOLD_COLOR         mc_skin_color__cache[22] 
    51 #define HELP_LINK_COLOR         mc_skin_color__cache[23] 
    52 #define HELP_SLINK_COLOR        mc_skin_color__cache[24] 
    53  
    54 #define VIEW_UNDERLINED_COLOR   mc_skin_color__cache[25] 
     49#define GAUGE_COLOR             mc_skin_color__cache[22] 
     50#define INPUT_COLOR             mc_skin_color__cache[23] 
     51#define INPUT_HISTORY_COLOR     mc_skin_color__cache[24] 
     52#define COMMAND_HISTORY_COLOR   mc_skin_color__cache[25] 
     53 
     54#define HELP_NORMAL_COLOR       mc_skin_color__cache[26] 
     55#define HELP_ITALIC_COLOR       mc_skin_color__cache[27] 
     56#define HELP_BOLD_COLOR         mc_skin_color__cache[28] 
     57#define HELP_LINK_COLOR         mc_skin_color__cache[29] 
     58#define HELP_SLINK_COLOR        mc_skin_color__cache[30] 
     59#define HELP_TITLE_COLOR        mc_skin_color__cache[31] 
     60 
     61#define VIEW_BOLD_COLOR         mc_skin_color__cache[32] 
     62#define VIEW_UNDERLINED_COLOR   mc_skin_color__cache[33] 
     63#define VIEW_SELECTED_COLOR     mc_skin_color__cache[34] 
    5564 
    5665/* 
    5766 * editor colors - only 4 for normal, search->found, select, and whitespace 
    5867 * respectively 
    5968 * Last is defined to view color. 
    6069 */ 
    61 #define EDITOR_NORMAL_COLOR     mc_skin_color__cache[26] 
    62 #define EDITOR_BOLD_COLOR       mc_skin_color__cache[27] 
    63 #define EDITOR_MARKED_COLOR     mc_skin_color__cache[28] 
    64 #define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[29] 
     70#define EDITOR_NORMAL_COLOR     mc_skin_color__cache[35] 
     71#define EDITOR_BOLD_COLOR       mc_skin_color__cache[36] 
     72#define EDITOR_MARKED_COLOR     mc_skin_color__cache[37] 
     73#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[38] 
    6574/* color of left 8 char status per line */ 
    66 #define LINE_STATE_COLOR        mc_skin_color__cache[30] 
    67 #define BOOK_MARK_COLOR         mc_skin_color__cache[31] 
    68 #define BOOK_MARK_FOUND_COLOR   mc_skin_color__cache[32] 
     75#define LINE_STATE_COLOR        mc_skin_color__cache[39] 
     76#define BOOK_MARK_COLOR         mc_skin_color__cache[40] 
     77#define BOOK_MARK_FOUND_COLOR   mc_skin_color__cache[41] 
    6978 
    70 #define BUTTONBAR_HOTKEY_COLOR   mc_skin_color__cache[33] 
    71 #define BUTTONBAR_BUTTON_COLOR   mc_skin_color__cache[34] 
     79#define BUTTONBAR_HOTKEY_COLOR   mc_skin_color__cache[42] 
     80#define BUTTONBAR_BUTTON_COLOR   mc_skin_color__cache[43] 
    7281 
    73 #define MC_SKIN_COLOR_CACHE_COUNT 35 
     82#define MC_SKIN_COLOR_CACHE_COUNT 44 
    7483 
    7584 
    7685/*** enums ***************************************************************************************/ 
  • misc/skins/darkfar.ini

    diff -ur mc-4.7.0.6.orig/misc/skins/darkfar.ini mc-4.7.0.6/misc/skins/darkfar.ini
    old new  
    2424    gauge=white;black 
    2525    input=black;cyan 
    2626    reverse=black;lightgray 
     27    header=yellow;black 
     28    inputhistory= 
     29    commandhistory= 
    2730 
    2831[dialog] 
    2932    _default_=brightcyan;blue 
    3033    dfocus=blue;cyan 
    3134    dhotnormal=white; 
    3235    dhotfocus=white;cyan 
     36    dtitle=white; 
    3337 
    3438[error] 
    3539    _default_=white;red 
     40    errdfocus=black;lightgray 
    3641    errdhotnormal=yellow;red 
    3742    errdhotfocus=yellow;lightgray 
     43    errdtitle=yellow;red 
    3844 
    3945[filehighlight] 
    4046    directory=white; 
     
    6571    helpbold=blue;lightgray 
    6672    helplink=black;cyan 
    6773    helpslink=yellow;blue 
     74    helptitle=blue;lightgray 
    6875 
    6976[editor] 
    7077    _default_=lightgray;black 
     
    7683    bookmarkfound=black;green 
    7784 
    7885[viewer] 
     86    viewbold=yellow;black 
    7987    viewunderline=brightred;black 
     88    viewselected=yellow;cyan 
    8089 
    8190[buttonbar] 
    8291    hotkey=red;white 
  • misc/skins/default.ini

    diff -ur mc-4.7.0.6.orig/misc/skins/default.ini mc-4.7.0.6/misc/skins/default.ini
    old new  
    2424    gauge=white;black 
    2525    input=black;cyan 
    2626    reverse=black;lightgray 
     27    header=yellow;blue 
     28    inputhistory= 
     29    commandhistory= 
    2730 
    2831[dialog] 
    2932    _default_=black;lightgray 
    3033    dfocus=black;cyan 
    3134    dhotnormal=blue;lightgray 
    3235    dhotfocus=blue;cyan 
     36    dtitle=blue;lightgray 
    3337 
    3438[error] 
    3539    _default_=white;red 
     40    errdfocus=black;lightgray 
    3641    errdhotnormal=yellow;red 
    3742    errdhotfocus=yellow;lightgray 
     43    errdtitle=yellow;red 
    3844 
    3945 
    4046[filehighlight] 
     
    7076    helpbold=blue;lightgray 
    7177    helplink=black;cyan 
    7278    helpslink=yellow;blue 
     79    helptitle=blue;lightgray 
    7380 
    7481[editor] 
    7582    _default_=lightgray;blue 
     
    8188    bookmarkfound=black;green 
    8289 
    8390[viewer] 
     91    viewbold=yellow;blue 
    8492    viewunderline=brightred;blue 
     93    viewselected=yellow;cyan 
    8594 
    8695[widget-common] 
    8796    sort-sign-up = ' 
  • misc/skins/double-lines.ini

    diff -ur mc-4.7.0.6.orig/misc/skins/double-lines.ini mc-4.7.0.6/misc/skins/double-lines.ini
    old new  
    2424    gauge=white;black 
    2525    input=black;cyan 
    2626    reverse=black;lightgray 
     27    header=yellow;blue 
     28    inputhistory= 
     29    commandhistory= 
    2730 
    2831[dialog] 
    2932    _default_=black;lightgray 
    3033    dfocus=black;cyan 
    3134    dhotnormal=blue;lightgray 
    3235    dhotfocus=blue;cyan 
     36    dtitle=blue;lightgray 
    3337 
    3438[error] 
    3539    _default_=white;red 
     40    errdfocus=black;lightgray 
    3641    errdhotnormal=yellow;red 
    3742    errdhotfocus=yellow;lightgray 
     43    errdtitle=yellow;red 
    3844 
    3945 
    4046[filehighlight] 
     
    6672    helpbold=blue;lightgray 
    6773    helplink=black;cyan 
    6874    helpslink=yellow;blue 
     75    helptitle=blue;lightgray 
    6976 
    7077[editor] 
    7178    _default_=lightgray;blue 
     
    7784    bookmarkfound=black;green 
    7885 
    7986[viewer] 
     87    viewbold=yellow;blue 
    8088    viewunderline=brightred;blue 
     89    viewselected=yellow;cyan 
    8190 
    8291[widget-common] 
    8392    sort-sign-up = ' 
  • misc/skins/featured.ini

    diff -ur mc-4.7.0.6.orig/misc/skins/featured.ini mc-4.7.0.6/misc/skins/featured.ini
    old new  
    2626    gauge=white;black 
    2727    input=black;cyan 
    2828    reverse=black;lightgray 
     29    header=yellow;blue 
     30    inputhistory= 
     31    commandhistory= 
    2932 
    3033[dialog] 
    3134    _default_=black;lightgray 
    3235    dfocus=black;cyan 
    3336    dhotnormal=blue;lightgray 
    3437    dhotfocus=blue;cyan 
     38    dtitle=blue;lightgray 
    3539 
    3640[error] 
    3741    _default_=white;red 
     42    errdfocus=black;lightgray 
    3843    errdhotnormal=yellow;red 
    3944    errdhotfocus=yellow;lightgray 
     45    errdtitle=yellow;red 
    4046 
    4147 
    4248[filehighlight] 
     
    7278    helpbold=blue;lightgray 
    7379    helplink=black;cyan 
    7480    helpslink=yellow;blue 
     81    helptitle=blue;lightgray 
    7582 
    7683[editor] 
    7784    _default_=lightgray;blue 
     
    8390    bookmarkfound=black;green 
    8491 
    8592[viewer] 
     93    viewbold=yellow;blue 
    8694    viewunderline=brightred;blue 
     95    viewselected=yellow;cyan 
    8796 
    8897[widget-common] 
    8998    sort-sign-up = ↓ 
  • misc/skins/gotar.ini

    diff -ur mc-4.7.0.6.orig/misc/skins/gotar.ini mc-4.7.0.6/misc/skins/gotar.ini
    old new  
    2424        gauge=;yellow 
    2525        input=brightgreen; 
    2626        reverse=brightgreen;blue 
     27        header=brightred; 
     28        inputhistory= 
     29        commandhistory= 
    2730 
    2831[dialog] 
    2932        _default_=brightcyan;blue 
    3033        dfocus=brightred;black 
    3134        dhotnormal=brightred; 
    3235        dhotfocus=yellow;black 
     36        dtitle=brightred; 
    3337 
    3438[error] 
    3539        _default_=white;red 
     40        errdfocus=brightgreen;blue 
    3641        errdhotnormal=yellow; 
    3742        errdhotfocus=yellow;blue 
     43        errdtitle=yellow; 
    3844 
    3945[filehighlight] 
    4046        directory=brightcyan; 
     
    6571        helpbold=brightgreen; 
    6672        helplink=white; 
    6773        helpslink=yellow;blue 
     74        helptitle=brightgreen; 
    6875 
    6976[editor] 
    7077        _default_=lightgray;black 
     
    7683        bookmarkfound=black;green 
    7784 
    7885[viewer] 
     86        viewbold=brightred;black 
    7987        viewunderline=brightgreen;black 
     88        viewselected=yellow;black 
    8089 
    8190[buttonbar] 
    8291        hotkey=lightgray;black 
  • misc/skins/sand256.ini

    diff -ur mc-4.7.0.6.orig/misc/skins/sand256.ini mc-4.7.0.6/misc/skins/sand256.ini
    old new  
    7272[core] 
    7373    _default_=black;rgb554 
    7474    selected=;rgb452 
    75     marked=rgb400 
    76     markselect=rgb400;rgb452 
     75    marked=rgb400;;bold 
     76    markselect=rgb400;rgb452;bold 
    7777    gauge=;rgb452 
    7878    input=;rgb452 
    7979    reverse=;rgb452 
     80    header=red 
     81    inputhistory=;rgb452 
     82    commandhistory=default;default 
    8083 
    8184[dialog] 
    8285    _default_=black;rgb553 
    8386    dfocus=;rgb452 
    8487    dhotnormal=;;underline 
    8588    dhotfocus=;rgb452;underline 
     89    dtitle=red 
    8690 
    8791[error] 
    8892    _default_=rgb554;rgb320;bold 
     93    errdfocus=black;rgb452;bold 
    8994    errdhotnormal=;;bold+underline 
    90     errdhotfocus=black;rgb452;underline 
     95    errdhotfocus=black;rgb452;bold+underline 
     96    errdtitle= 
    9197 
    9298[filehighlight] 
    9399    directory= 
     
    123129    helpbold=red 
    124130    helplink=blue;;underline 
    125131    helpslink=blue;;reverse 
     132    helptitle=red 
    126133 
    127134[editor] 
    128135    _default_=black;rgb554 
     
    134141    bookmarkfound=;rgb530 
    135142 
    136143[viewer] 
     144    viewbold=red 
    137145    viewunderline=;;underline 
     146    viewselected=;rgb452 
    138147 
    139148[widget-common] 
    140149    sort-sign-up = ↓ 
  • src/boxes.c

    diff -ur mc-4.7.0.6.orig/src/boxes.c mc-4.7.0.6/src/boxes.c
    old new  
    201201    add_widget (dd, cancel_button); 
    202202    add_widget (dd, ok_button); 
    203203 
    204     display_mini_status = input_new (10, 8, INPUT_COLOR, dlg_width - 12, _status[radio_sel], 
     204    display_mini_status = input_new (10, 8, INPUT_COLOR, INPUT_HISTORY_COLOR, dlg_width - 12, _status[radio_sel], 
    205205                                     "mini-input", INPUT_COMPLETE_DEFAULT); 
    206206    add_widget (dd, display_mini_status); 
    207207    input_set_point (display_mini_status, 0); 
     
    209209    display_check_status = check_new (9, 4, _check_status, user_mini_status); 
    210210    add_widget (dd, display_check_status); 
    211211 
    212     display_user_format = input_new (7, 8, INPUT_COLOR, dlg_width - 12, init_text, 
     212    display_user_format = input_new (7, 8, INPUT_COLOR, INPUT_HISTORY_COLOR, dlg_width - 12, init_text, 
    213213                                     "user-fmt-input", INPUT_COMPLETE_DEFAULT); 
    214214    add_widget (dd, display_user_format); 
    215215    input_set_point (display_user_format, 0); 
     
    10551055 
    10561056    g_free (title); 
    10571057 
    1058     in_user = input_new (5, istart, INPUT_COLOR, ilen, user, "auth_name", INPUT_COMPLETE_DEFAULT); 
     1058    in_user = input_new (5, istart, INPUT_COLOR, INPUT_HISTORY_COLOR, ilen, user, "auth_name", INPUT_COMPLETE_DEFAULT); 
    10591059    add_widget (auth_dlg, in_user); 
    10601060 
    10611061    in_domain = 
    1062         input_new (3, istart, INPUT_COLOR, ilen, domain, "auth_domain", INPUT_COMPLETE_DEFAULT); 
     1062        input_new (3, istart, INPUT_COLOR, INPUT_HISTORY_COLOR, ilen, domain, "auth_domain", INPUT_COMPLETE_DEFAULT); 
    10631063    add_widget (auth_dlg, in_domain); 
    10641064    add_widget (auth_dlg, button_new (9, b2, B_CANCEL, NORMAL_BUTTON, buts[1], 0)); 
    10651065    add_widget (auth_dlg, button_new (9, b0, B_ENTER, DEFPUSH_BUTTON, buts[0], 0)); 
    10661066 
    10671067    in_password = 
    1068         input_new (7, istart, INPUT_COLOR, ilen, "", "auth_password", INPUT_COMPLETE_DEFAULT); 
     1068        input_new (7, istart, INPUT_COLOR, INPUT_HISTORY_COLOR, ilen, "", "auth_password", INPUT_COMPLETE_DEFAULT); 
    10691069    in_password->completion_flags = 0; 
    10701070    in_password->is_password = 1; 
    10711071    add_widget (auth_dlg, in_password); 
  • src/chmod.c

    diff -ur mc-4.7.0.6.orig/src/chmod.c mc-4.7.0.6/src/chmod.c
    old new  
    152152    dlg_move (h, TY + 3, TX); 
    153153    tty_print_string (_("and T or INS to mark")); 
    154154 
    155     tty_setcolor (COLOR_HOT_NORMAL); 
     155    tty_setcolor (COLOR_TITLE); 
    156156 
    157157    dlg_move (h, PY, PX + 1); 
    158158    tty_print_string (_(" Permission ")); 
  • src/chown.c

    diff -ur mc-4.7.0.6.orig/src/chown.c mc-4.7.0.6/src/chown.c
    old new  
    128128    dlg_move (h, TY + 9, TX + 1); 
    129129    tty_print_string (_(" Permission ")); 
    130130 
    131     tty_setcolor (COLOR_HOT_NORMAL); 
     131    tty_setcolor (COLOR_TITLE); 
    132132    dlg_move (h, UY, UX + 1); 
    133133    tty_print_string (_(" User name ")); 
    134134    dlg_move (h, GY, GX + 1); 
  • src/command.c

    diff -ur mc-4.7.0.6.orig/src/command.c mc-4.7.0.6/src/command.c
    old new  
    306306{ 
    307307    WInput *cmd; 
    308308 
    309     cmd = input_new (y, x, DEFAULT_COLOR, cols, "", "cmdline", 
     309    cmd = input_new (y, x, DEFAULT_COLOR, COMMAND_HISTORY_COLOR, cols, "", "cmdline", 
    310310        INPUT_COMPLETE_DEFAULT | INPUT_COMPLETE_CD | INPUT_COMPLETE_COMMANDS | INPUT_COMPLETE_SHELL_ESC); 
    311311 
    312312    /* Add our hooks */ 
  • src/dialog.c

    diff -ur mc-4.7.0.6.orig/src/dialog.c mc-4.7.0.6/src/dialog.c
    old new  
    4545#include "setup.h"      /* mouse_close_dialog */ 
    4646 
    4747/* Color styles for normal and error dialogs */ 
    48 int dialog_colors [4]; 
    49 int alarm_colors [4]; 
     48int dialog_colors [DLG_COLOR_NUM]; 
     49int alarm_colors [DLG_COLOR_NUM]; 
    5050 
    5151/* Primitive way to check if the the current dialog is our dialog */ 
    5252/* This is needed by async routines like load_prompt */ 
     
    110110    draw_box (h, space, space, h->lines - 2 * space, h->cols - 2 * space); 
    111111 
    112112    if (h->title) { 
    113         tty_setcolor (DLG_HOT_NORMALC (h)); 
     113        tty_setcolor (DLG_TITLEC (h)); 
    114114        dlg_move (h, space, (h->cols - str_term_width1 (h->title)) / 2); 
    115115        tty_print_string (h->title); 
    116116    } 
     
    281281    dialog_colors [1] = COLOR_FOCUS; 
    282282    dialog_colors [2] = COLOR_HOT_NORMAL; 
    283283    dialog_colors [3] = COLOR_HOT_FOCUS; 
     284    dialog_colors [4] = COLOR_TITLE; 
    284285 
    285286    alarm_colors [0] = ERROR_COLOR; 
    286     alarm_colors [1] = REVERSE_COLOR; 
     287    alarm_colors [1] = ERROR_FOCUS; 
    287288    alarm_colors [2] = ERROR_HOT_NORMAL; 
    288289    alarm_colors [3] = ERROR_HOT_FOCUS; 
     290    alarm_colors [4] = ERROR_TITLE; 
    289291} 
    290292 
    291293void 
  • src/dialog.h

    diff -ur mc-4.7.0.6.orig/src/dialog.h mc-4.7.0.6/src/dialog.h
    old new  
    9191typedef char * (*dlg_shortcut_str) (unsigned long command); 
    9292 
    9393/* Dialog color constants */ 
    94 #define DLG_COLOR_NUM           4 
     94#define DLG_COLOR_NUM           5 
    9595#define DLG_NORMALC(h)          ((h)->color[0]) 
    9696#define DLG_FOCUSC(h)           ((h)->color[1]) 
    9797#define DLG_HOT_NORMALC(h)      ((h)->color[2]) 
    9898#define DLG_HOT_FOCUSC(h)       ((h)->color[3]) 
     99#define DLG_TITLEC(h)           ((h)->color[4]) 
    99100 
    100101struct Dlg_head { 
    101102    /* Set by the user */ 
     
    126127}; 
    127128 
    128129/* Color styles for normal and error dialogs */ 
    129 extern int dialog_colors[4]; 
    130 extern int alarm_colors[4]; 
     130extern int dialog_colors[DLG_COLOR_NUM]; 
     131extern int alarm_colors[DLG_COLOR_NUM]; 
    131132 
    132133 
    133134/* Widget callback */ 
  • src/editor/editcmd_dialogs.c

    diff -ur mc-4.7.0.6.orig/src/editor/editcmd_dialogs.c mc-4.7.0.6/src/editor/editcmd_dialogs.c
    old new  
    316316        create_dlg (0, 0, 7, w, dialog_colors, editcmd_dialog_raw_key_query_cb, 
    317317                    NULL, heading, DLG_CENTER | DLG_TRYUP | DLG_WANT_TAB); 
    318318    add_widget (raw_dlg, 
    319                 input_new (3 - cancel, w - 5, INPUT_COLOR, 2, "", 0, INPUT_COMPLETE_DEFAULT)); 
     319                input_new (3 - cancel, w - 5, INPUT_COLOR, INPUT_HISTORY_COLOR, 2, "", 0, INPUT_COMPLETE_DEFAULT)); 
    320320    add_widget (raw_dlg, label_new (3 - cancel, 2, query)); 
    321321    if (cancel) 
    322322        add_widget (raw_dlg, button_new (4, w / 2 - 5, B_CANCEL, NORMAL_BUTTON, _("Cancel"), 0)); 
  • src/find.c

    diff -ur mc-4.7.0.6.orig/src/find.c mc-4.7.0.6/src/find.c
    old new  
    373373    file_case_sens_cbox = check_new (7, 3, file_case_sens_flag, file_case_label); 
    374374    add_widget (find_dlg, file_case_sens_cbox); 
    375375 
    376     in_with = input_new (6, FIND_X / 2 + 1, INPUT_COLOR, FIND_X / 2 - 4, INPUT_LAST_TEXT, 
     376    in_with = input_new (6, FIND_X / 2 + 1, INPUT_COLOR, INPUT_HISTORY_COLOR, FIND_X / 2 - 4, INPUT_LAST_TEXT, 
    377377                         MC_HISTORY_SHARED_SEARCH, INPUT_COMPLETE_DEFAULT); 
    378378    add_widget (find_dlg, in_with); 
    379379    add_widget (find_dlg, label_new (5, FIND_X / 2 + 1, _("Content:"))); 
    380380 
    381     in_name = input_new (6, 3, INPUT_COLOR, FIND_X / 2 - 4, INPUT_LAST_TEXT, "name", 
     381    in_name = input_new (6, 3, INPUT_COLOR, INPUT_HISTORY_COLOR, FIND_X / 2 - 4, INPUT_LAST_TEXT, "name", 
    382382                         INPUT_COMPLETE_DEFAULT); 
    383383    add_widget (find_dlg, in_name); 
    384384    add_widget (find_dlg, label_new (5, 3, _("File name:"))); 
     
    386386    add_widget (find_dlg, 
    387387                button_new (3, FIND_X - b2 - 2, B_TREE, NORMAL_BUTTON, buts[2], 0)); 
    388388 
    389     in_start = input_new (3, 3, INPUT_COLOR, FIND_X - b2 - 6, in_start_dir, "start", 
     389    in_start = input_new (3, 3, INPUT_COLOR, INPUT_HISTORY_COLOR, FIND_X - b2 - 6, in_start_dir, "start", 
    390390                          INPUT_COMPLETE_DEFAULT); 
    391391    add_widget (find_dlg, in_start); 
    392392    add_widget (find_dlg, label_new (2, 3, _("Start at:"))); 
  • src/help.c

    diff -ur mc-4.7.0.6.orig/src/help.c mc-4.7.0.6/src/help.c
    old new  
    892892        HELP_NORMAL_COLOR,      /* common text color */ 
    893893        0,                      /* unused in help */ 
    894894        HELP_BOLD_COLOR,        /* title color */ 
    895         0                       /* unused in help */ 
     895        0,                      /* unused in help */ 
     896        HELP_TITLE_COLOR, 
    896897    }; 
    897898 
    898899    WButtonBar *help_bar; 
  • src/layout.c

    diff -ur mc-4.7.0.6.orig/src/layout.c mc-4.7.0.6/src/layout.c
    old new  
    300300        old_horizontal_split = -1; 
    301301        old_output_lines     = -1; 
    302302 
    303         tty_setcolor (COLOR_HOT_NORMAL); 
    304303        update_split (); 
     304        tty_setcolor (COLOR_NORMAL); 
    305305        dlg_move (h, 6, 13); 
    306306        tty_print_char ('='); 
    307307        if (console_flag){ 
  • src/main.c

    diff -ur mc-4.7.0.6.orig/src/main.c mc-4.7.0.6/src/main.c
    old new  
    18321832    midnight_colors[1] = mc_skin_color_get("dialog", "focus"); 
    18331833    midnight_colors[2] = mc_skin_color_get("dialog", "hotnormal"); 
    18341834    midnight_colors[3] = mc_skin_color_get("dialog", "hotfocus"); 
     1835    midnight_colors[4] = 0;  /* unused on the main screen */ 
    18351836 
    18361837    panel_init (); 
    18371838 
  • src/panelize.c

    diff -ur mc-4.7.0.6.orig/src/panelize.c mc-4.7.0.6/src/panelize.c
    old new  
    170170                                panelize_but[i].text, 0)); 
    171171 
    172172    pname = 
    173         input_new (UY + 14, UX, INPUT_COLOR, panelize_dlg->cols - 10, "", 
     173        input_new (UY + 14, UX, INPUT_COLOR, INPUT_HISTORY_COLOR, panelize_dlg->cols - 10, "", 
    174174                   "in", INPUT_COMPLETE_DEFAULT); 
    175175    add_widget (panelize_dlg, pname); 
    176176 
  • src/screen.c

    diff -ur mc-4.7.0.6.orig/src/screen.c mc-4.7.0.6/src/screen.c
    old new  
    15241524                    g_string_append (format_txt, "]"); 
    15251525                } 
    15261526 
    1527                 tty_setcolor (MARKED_COLOR); 
     1527                tty_setcolor (HEADER_COLOR); 
    15281528                tty_print_string (str_fit_to_term (format_txt->str, format->field_len, 
    15291529                                                   J_CENTER_LEFT)); 
    15301530                width -= format->field_len; 
  • src/viewer/display.c

    diff -ur mc-4.7.0.6.orig/src/viewer/display.c mc-4.7.0.6/src/viewer/display.c
    old new  
    389389    if (ruler == RULER_NONE || height < 1) 
    390390        return; 
    391391 
    392     tty_setcolor (MARKED_COLOR); 
     392    tty_setcolor (VIEW_BOLD_COLOR); 
    393393    for (c = 0; c < width; c++) 
    394394    { 
    395395        cl = view->dpy_text_column + c; 
  • src/viewer/hex.c

    diff -ur mc-4.7.0.6.orig/src/viewer/hex.c mc-4.7.0.6/src/viewer/hex.c
    old new  
    118118        g_snprintf (hex_buff, sizeof (hex_buff), "%08" OFFSETTYPE_PRIX " ", 
    119119                    (long unsigned int) from); 
    120120        widget_move (view, top + row, left); 
    121         tty_setcolor (MARKED_COLOR); 
     121        tty_setcolor (VIEW_BOLD_COLOR); 
    122122        for (i = 0; col < width && hex_buff[i] != '\0'; i++) 
    123123        { 
    124124            tty_print_char (hex_buff[i]); 
     
    166166 
    167167            /* Select the color for the hex number */ 
    168168            tty_setcolor (boldflag == MARK_NORMAL ? NORMAL_COLOR : 
    169                           boldflag == MARK_SELECTED ? MARKED_COLOR : 
     169                          boldflag == MARK_SELECTED ? VIEW_BOLD_COLOR : 
    170170                          boldflag == MARK_CHANGED ? VIEW_UNDERLINED_COLOR : 
    171171                          /* boldflag == MARK_CURSOR */ 
    172                           view->hexview_in_text ? MARKED_SELECTED_COLOR : VIEW_UNDERLINED_COLOR); 
     172                          view->hexview_in_text ? VIEW_SELECTED_COLOR : VIEW_UNDERLINED_COLOR); 
    173173 
    174174            /* Print the hex number */ 
    175175            widget_move (view, top + row, left + col); 
     
    213213            /* Select the color for the character; this differs from the 
    214214             * hex color when boldflag == MARK_CURSOR */ 
    215215            tty_setcolor (boldflag == MARK_NORMAL ? NORMAL_COLOR : 
    216                           boldflag == MARK_SELECTED ? MARKED_COLOR : 
     216                          boldflag == MARK_SELECTED ? VIEW_BOLD_COLOR : 
    217217                          boldflag == MARK_CHANGED ? VIEW_UNDERLINED_COLOR : 
    218218                          /* boldflag == MARK_CURSOR */ 
    219                           view->hexview_in_text ? VIEW_UNDERLINED_COLOR : MARKED_SELECTED_COLOR); 
     219                          view->hexview_in_text ? VIEW_UNDERLINED_COLOR : VIEW_SELECTED_COLOR); 
    220220 
    221221#ifdef HAVE_CHARSET 
    222222            if (utf8_display) 
  • src/viewer/nroff.c

    diff -ur mc-4.7.0.6.orig/src/viewer/nroff.c mc-4.7.0.6/src/viewer/nroff.c
    old new  
    132132                    && (c_next != '_' || mcview_count_backspaces (view, from + 1) == 1)) 
    133133                    tty_setcolor (VIEW_UNDERLINED_COLOR); 
    134134                else 
    135                     tty_setcolor (MARKED_COLOR); 
     135                    tty_setcolor (VIEW_BOLD_COLOR); 
    136136                continue; 
    137137            } 
    138138        } 
  • src/widget.c

    diff -ur mc-4.7.0.6.orig/src/widget.c mc-4.7.0.6/src/widget.c
    old new  
    893893    char c; 
    894894    c = in->history->next ? (in->history->prev ? '|' : 'v') : '^'; 
    895895    widget_move (&in->widget, 0, in->field_width - HISTORY_BUTTON_WIDTH); 
     896    tty_setcolor (in->history_color); 
    896897#ifdef LARGE_HISTORY_BUTTON 
    897898    { 
    898899        Dlg_head *h; 
    899900        h = in->widget.parent; 
    900         tty_setcolor (NORMAL_COLOR); 
    901901        tty_print_string ("[ ]"); 
    902         /* Too distracting: tty_setcolor (MARKED_COLOR); */ 
    903902        widget_move (&in->widget, 0, in->field_width - HISTORY_BUTTON_WIDTH + 1); 
    904         tty_print_char (c); 
    905903    } 
    906 #else 
    907     tty_setcolor (MARKED_COLOR); 
    908     tty_print_char (c); 
    909904#endif 
     905    tty_print_char (c); 
    910906} 
    911907 
    912908/* }}} history button */ 
     
    19971993} 
    19981994 
    19991995WInput * 
    2000 input_new (int y, int x, int color, int width, const char *def_text, 
     1996input_new (int y, int x, int color, int history_color, int width, const char *def_text, 
    20011997           const char *histname, INPUT_COMPLETE_FLAGS completion_flags) 
    20021998{ 
    20031999    WInput *in = g_new (WInput, 1); 
     
    20312027    in->current_max_size = initial_buffer_len; 
    20322028    in->buffer = g_new (char, initial_buffer_len); 
    20332029    in->color = color; 
     2030    in->history_color = history_color; 
    20342031    in->field_width = width; 
    20352032    in->first = 1; 
    20362033    in->term_first_shown = 0; 
     
    28252822                  g->widget.x - g->widget.parent->x, g->widget.lines, 
    28262823                  g->widget.cols); 
    28272824 
    2828         tty_setcolor (COLOR_HOT_NORMAL); 
     2825        tty_setcolor (COLOR_TITLE); 
    28292826        dlg_move (g->widget.parent, g->widget.y - g->widget.parent->y, 
    28302827                  g->widget.x - g->widget.parent->x + 1); 
    28312828        tty_print_string (g->title); 
  • src/widget.h

    diff -ur mc-4.7.0.6.orig/src/widget.h mc-4.7.0.6/src/widget.h
    old new  
    105105    size_t current_max_size;    /* Maximum length of input line (bytes) */ 
    106106    int  field_width;           /* width of the editing field */ 
    107107    int  color;                 /* color used */ 
     108    int  history_color;         /* color of the history button */ 
    108109    int  first;                 /* Is first keystroke? */ 
    109110    int  disable_update;        /* Do we want to skip updates? */ 
    110111    int  is_password;           /* Is this a password input line? */ 
     
    187188                      bcback callback); 
    188189WRadio  *radio_new    (int y, int x, int count, const char **text); 
    189190WCheck  *check_new    (int y, int x, int state,  const char *text); 
    190 WInput  *input_new    (int y, int x, int color, int len, const char *text, const char *histname, INPUT_COMPLETE_FLAGS completion_flags); 
     191WInput  *input_new    (int y, int x, int color, int history_color, int len, const char *text, const char *histname, INPUT_COMPLETE_FLAGS completion_flags); 
    191192WLabel  *label_new    (int y, int x, const char *text); 
    192193WGauge  *gauge_new    (int y, int x, int shown, int max, int current); 
    193194WListbox *listbox_new (int y, int x, int height, int width, lcback callback); 
  • src/wtools.c

    diff -ur mc-4.7.0.6.orig/src/wtools.c mc-4.7.0.6/src/wtools.c
    old new  
    5555        COLOR_FOCUS, 
    5656        COLOR_HOT_NORMAL, 
    5757        COLOR_HOT_FOCUS, 
     58        COLOR_TITLE, 
    5859    }; 
    5960 
    6061    const int space = 4; 
     
    397398            break; 
    398399 
    399400        case quick_input: 
    400             in = input_new (ypos, xpos, INPUT_COLOR, qw->u.input.len, 
     401            in = input_new (ypos, xpos, INPUT_COLOR, INPUT_HISTORY_COLOR, qw->u.input.len, 
    401402                            qw->u.input.text, qw->u.input.histname, INPUT_COMPLETE_DEFAULT); 
    402403            in->is_password = (qw->u.input.flags == 1); 
    403404            in->point = 0;