From 3e7d76eb13cd67edefe6362557926b567f812c6f Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Thu, 11 Nov 2010 14:05:34 +0300 Subject: [PATCH] Ticket #2197: added new color for status bar ...and added missed colors for button bar. Updated EN and RU man pages. Signed-off-by: Andrew Borodin --- doc/man/mc.1.in | 5 +-- doc/man/ru/mc.1.in | 17 +++++---- lib/skin.h | 70 +++++++++++++++++++------------------ lib/skin/colors-old.c | 7 ++-- lib/skin/colors.c | 8 +++-- lib/skin/hc-skins.c | 1 + misc/skins/darkfar.ini | 3 ++ misc/skins/default.ini | 3 ++ misc/skins/double-lines.ini | 7 ++++ misc/skins/featured.ini | 3 ++ misc/skins/gotar.ini | 11 +++--- misc/skins/nicedark.ini | 3 ++ src/args.c | 1 + src/diffviewer/ydiff.c | 2 +- src/editor/editdraw.c | 2 +- src/viewer/display.c | 2 +- 16 files changed, 91 insertions(+), 54 deletions(-) diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index 30f469b57..b64f59880 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -3422,12 +3422,13 @@ The format for the color definition is: .PP The colors are optional, and the keywords are: normal, selected, disabled, marked, markselect, errors, input, inputmark, inputunchanged, commandlinemark, -reverse, gauge, header, inputhistory, commandhistory. Menu colors are: menunormal, +reverse, gauge, header, inputhistory, commandhistory. Button bar colors are: +bbarhotkey, bbarbutton. Status bar color: statusbar. Menu colors are: menunormal, menusel, menuhot, menuhotsel, menuinactive. Dialog colors are: dnormal, dfocus, dhotnormal, dhotfocus, dtitle. Error dialog colors are: errdfocus, errdhotnormal, errdhotfocus, errdtitle. Help colors are: helpnormal, helpitalic, helpbold, helplink, helpslink, helptitle. Viewer color are: viewbold, viewunderline, viewselected. -Editor colors are: editnormal, editbold, editmarked. +Editor colors are: editnormal, editbold, editmarked, editwhitespace, editlinestate. .PP .I input determines the color of input lines used in query dialogs. diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index 6a1de7e83..5fe543790 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -3681,12 +3681,15 @@ xterm=menu=magenta:marked=,magenta:markselect=,red Цвета не являются обязательными, а в качестве ключевых слов (keywords) могут использоваться: для задания цветовой палитры в панелях: normal, selected, disabled, marked, markselect, errors, input, inputmark, inputunchanged, -commandlinemark, reverse, gauge. Цвета пунктов меню: menunormal, menusel, -menuhot, menuhotsel, menuinactive. Цвета в окне диалога: dnormal, dfocus, -dhotnormal, dhotfocus. Цвета в окне подсказки: helpnormal, helpitalic, -helpbold, helplink, helpslink. Цвета в окне программы просмотра: -viewunderline. Специальные подсветки: executable, directory, link, device, -special, core. Цвета в редакторе: editnormal, editbold, editmarked. +commandlinemark, reverse, gauge, header, inputhistory, commandhistory. Цвета +строки горячих клавиш F1\-F10: bbarhotkey, bbarbutton. Цвет строки статуса +редактора и программ просмотра и сравнения файлов: statusbar. Цвета пунктов меню: +menunormal, menusel, menuhot, menuhotsel, menuinactive. Цвета в окне диалога: +dnormal, dfocus, dhotnormal, dhotfocus. Цвета в диалоге\-сообщении об ошибке: +errdfocus, errdhotnormal, errdhotfocus, errdtitle. Цвета в окне встроенной +помощи: helpnormal, helpitalic, helpbold, helplink, helpslink. Цвета в окне +программы просмотра: viewbold, viewunderline, viewselected. Цвета в редакторе: +editnormal, editbold, editmarked, editwhitespace, editlinestate. .PP Цвета задавать не обязательно. Цвет какого именно поля определяется каждым ключевым словом, можно понять из перевода этого ключевого слова. @@ -3893,7 +3896,7 @@ base_color=normal=white,default:marked=magenta,default .PP Секция .BR [error] -содержит описания элементов диалога об ошибках. +содержит описания элементов диалога\-сообщения об ошибках. .TP .I _default_ Цвет по умолчанию для данной секции. Если не указан, то используется [core]._default_ diff --git a/lib/skin.h b/lib/skin.h index ce2287dac..dc3147b90 100644 --- a/lib/skin.h +++ b/lib/skin.h @@ -44,57 +44,59 @@ #define MENU_HOTSEL_COLOR mc_skin_color__cache[22] #define MENU_INACTIVE_COLOR mc_skin_color__cache[23] +#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[24] +#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[25] + +#define STATUSBAR_COLOR mc_skin_color__cache[26] + /* * This should be selectable independently. Default has to be black background * foreground does not matter at all. */ -#define GAUGE_COLOR mc_skin_color__cache[24] -#define INPUT_COLOR mc_skin_color__cache[25] -#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[26] -#define INPUT_MARK_COLOR mc_skin_color__cache[27] -#define INPUT_HISTORY_COLOR mc_skin_color__cache[28] -#define COMMAND_HISTORY_COLOR mc_skin_color__cache[29] +#define GAUGE_COLOR mc_skin_color__cache[27] +#define INPUT_COLOR mc_skin_color__cache[28] +#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[29] +#define INPUT_MARK_COLOR mc_skin_color__cache[30] +#define INPUT_HISTORY_COLOR mc_skin_color__cache[31] +#define COMMAND_HISTORY_COLOR mc_skin_color__cache[32] -#define HELP_NORMAL_COLOR mc_skin_color__cache[30] -#define HELP_ITALIC_COLOR mc_skin_color__cache[31] -#define HELP_BOLD_COLOR mc_skin_color__cache[32] -#define HELP_LINK_COLOR mc_skin_color__cache[33] -#define HELP_SLINK_COLOR mc_skin_color__cache[34] -#define HELP_TITLE_COLOR mc_skin_color__cache[35] +#define HELP_NORMAL_COLOR mc_skin_color__cache[33] +#define HELP_ITALIC_COLOR mc_skin_color__cache[34] +#define HELP_BOLD_COLOR mc_skin_color__cache[35] +#define HELP_LINK_COLOR mc_skin_color__cache[36] +#define HELP_SLINK_COLOR mc_skin_color__cache[37] +#define HELP_TITLE_COLOR mc_skin_color__cache[38] -#define VIEW_BOLD_COLOR mc_skin_color__cache[36] -#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[37] -#define VIEW_SELECTED_COLOR mc_skin_color__cache[38] +#define VIEW_BOLD_COLOR mc_skin_color__cache[39] +#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[40] +#define VIEW_SELECTED_COLOR mc_skin_color__cache[41] /* * editor colors - only 4 for normal, search->found, select, and whitespace * respectively * Last is defined to view color. */ -#define EDITOR_NORMAL_COLOR mc_skin_color__cache[39] -#define EDITOR_BOLD_COLOR mc_skin_color__cache[40] -#define EDITOR_MARKED_COLOR mc_skin_color__cache[41] -#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[42] -#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[43] +#define EDITOR_NORMAL_COLOR mc_skin_color__cache[42] +#define EDITOR_BOLD_COLOR mc_skin_color__cache[43] +#define EDITOR_MARKED_COLOR mc_skin_color__cache[44] +#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[45] +#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[46] /* color of left 8 char status per line */ -#define LINE_STATE_COLOR mc_skin_color__cache[44] -#define BOOK_MARK_COLOR mc_skin_color__cache[45] -#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[46] - -#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[47] -#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[48] +#define LINE_STATE_COLOR mc_skin_color__cache[47] +#define BOOK_MARK_COLOR mc_skin_color__cache[48] +#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[49] /* Diff colors */ -#define DFF_ADD_COLOR mc_skin_color__cache[49] -#define DFF_CHG_COLOR mc_skin_color__cache[50] -#define DFF_CHH_COLOR mc_skin_color__cache[51] -#define DFF_CHD_COLOR mc_skin_color__cache[52] -#define DFF_DEL_COLOR mc_skin_color__cache[53] -#define DFF_FOLDER_COLOR mc_skin_color__cache[54] -#define DFF_ERROR_COLOR mc_skin_color__cache[55] +#define DFF_ADD_COLOR mc_skin_color__cache[50] +#define DFF_CHG_COLOR mc_skin_color__cache[51] +#define DFF_CHH_COLOR mc_skin_color__cache[52] +#define DFF_CHD_COLOR mc_skin_color__cache[53] +#define DFF_DEL_COLOR mc_skin_color__cache[54] +#define DFF_FOLDER_COLOR mc_skin_color__cache[55] +#define DFF_ERROR_COLOR mc_skin_color__cache[56] -#define MC_SKIN_COLOR_CACHE_COUNT 56 +#define MC_SKIN_COLOR_CACHE_COUNT 57 /*** enums ***************************************************************************************/ diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c index d0150e3aa..624424bd2 100644 --- a/lib/skin/colors-old.c +++ b/lib/skin/colors-old.c @@ -28,12 +28,12 @@ #include #include #include /* size_t */ -#include "lib/tty/color.h" #include "internal.h" -#include "src/setup.h" +#include "lib/tty/color.h" +#include "src/setup.h" /*** global variables ****************************************************************************/ @@ -69,6 +69,9 @@ static const mc_skin_colors_old_t old_colors[] = { {"menusel", "menu", "menusel"}, {"menuhotsel", "menu", "menuhotsel"}, {"menuinactive", "menu", "menuinactive"}, + {"bbarhotkey", "buttonbar", "hotkey"}, + {"bbarbutton", "buttonbar", "button"}, + {"statusbar", "statusbar", "_default_"}, {"gauge", "core", "gauge"}, {"input", "core", "input"}, {"inputmark", "core", "inputmark"}, diff --git a/lib/skin/colors.c b/lib/skin/colors.c index 752692c81..cb7780b67 100644 --- a/lib/skin/colors.c +++ b/lib/skin/colors.c @@ -29,6 +29,7 @@ #include #include "internal.h" + #include "lib/tty/color.h" #include "src/args.h" @@ -225,6 +226,11 @@ mc_skin_color_cache_init (void) MENU_HOTSEL_COLOR = mc_skin_color_get ("menu", "menuhotsel"); MENU_INACTIVE_COLOR = mc_skin_color_get ("menu", "menuinactive"); + BUTTONBAR_HOTKEY_COLOR = mc_skin_color_get ("buttonbar", "hotkey"); + BUTTONBAR_BUTTON_COLOR = mc_skin_color_get ("buttonbar", "button"); + + STATUSBAR_COLOR = mc_skin_color_get ("statusbar", "_default_"); + GAUGE_COLOR = mc_skin_color_get ("core", "gauge"); INPUT_COLOR = mc_skin_color_get ("core", "input"); INPUT_HISTORY_COLOR = mc_skin_color_get ("core", "inputhistory"); @@ -252,8 +258,6 @@ mc_skin_color_cache_init (void) BOOK_MARK_COLOR = mc_skin_color_get ("editor", "bookmark"); BOOK_MARK_FOUND_COLOR = mc_skin_color_get ("editor", "bookmarkfound"); - BUTTONBAR_HOTKEY_COLOR = mc_skin_color_get ("buttonbar", "hotkey"); - BUTTONBAR_BUTTON_COLOR = mc_skin_color_get ("buttonbar", "button"); DFF_ADD_COLOR = mc_skin_color_get ("diffviewer", "added"); DFF_CHG_COLOR = mc_skin_color_get ("diffviewer", "changedline"); diff --git a/lib/skin/hc-skins.c b/lib/skin/hc-skins.c index f836f53bc..2e830cf46 100644 --- a/lib/skin/hc-skins.c +++ b/lib/skin/hc-skins.c @@ -66,6 +66,7 @@ mc_skin_hardcoded_blackwhite_colors (mc_skin_t * mc_skin) mc_config_set_string (mc_skin->config, "menu", "menusel", "default"); mc_config_set_string (mc_skin->config, "menu", "menuhotsel", "A_UNDERLINE"); mc_config_set_string (mc_skin->config, "menu", "menuinactive", "A_REVERSE"); + mc_config_set_string (mc_skin->config, "statusbar", "_default_", "A_REVERSE"); mc_config_set_string (mc_skin->config, "help", "_default_", "A_REVERSE"); mc_config_set_string (mc_skin->config, "help", "helpitalic", "A_REVERSE"); mc_config_set_string (mc_skin->config, "help", "helpbold", "A_REVERSE"); diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini index 20da2ece9..416c1d813 100644 --- a/misc/skins/darkfar.ini +++ b/misc/skins/darkfar.ini @@ -113,6 +113,9 @@ hotkey=red;white button=black;white +[statusbar] + _default_=black;white + [widget-common] sort-sign-up=↑ sort-sign-down=↓ diff --git a/misc/skins/default.ini b/misc/skins/default.ini index 6e03a2689..2dfb22c21 100644 --- a/misc/skins/default.ini +++ b/misc/skins/default.ini @@ -82,6 +82,9 @@ hotkey=white;black button=black;cyan +[statusbar] + _default_=black;cyan + [help] _default_=black;lightgray helpitalic=red;lightgray diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini index 3ec4c03fa..26cb65c53 100644 --- a/misc/skins/double-lines.ini +++ b/misc/skins/double-lines.ini @@ -77,6 +77,13 @@ menuhotsel=yellow;black menuinactive=lightgray;blue +[buttonbar] + hotkey=lightgray;blue + button=lightgray;blue + +[statusbar] + _default_=black;cyan + [help] _default_=black;lightgray helpitalic=red;lightgray diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini index 04bc49fa8..076e8d1ca 100644 --- a/misc/skins/featured.ini +++ b/misc/skins/featured.ini @@ -83,6 +83,9 @@ hotkey=white;black button=black;cyan +[statusbar] + _default_=black;cyan + [help] _default_=black;lightgray helpitalic=red;lightgray diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini index 8fd07c42a..2d85f99f4 100644 --- a/misc/skins/gotar.ini +++ b/misc/skins/gotar.ini @@ -74,6 +74,13 @@ menuhotsel=yellow; menuinactive=lightgray; +[buttonbar] + hotkey=lightgray;black + button=white;blue + +[statusbar] + _default_=white;blue + [help] _default_=brightred;black helpitalic=brightcyan; @@ -106,7 +113,3 @@ removed=;blue folder=brightblue; error=white;red - -[buttonbar] - hotkey=lightgray;black - button=white;blue diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini index 6477a1819..3c47b4fc6 100644 --- a/misc/skins/nicedark.ini +++ b/misc/skins/nicedark.ini @@ -71,6 +71,9 @@ hotkey=lightgray;blue button=lightgray;black +[statusbar] + _default_=lightgray;black + [help] _default_=lightgray;darkgray helpitalic=red;darkgray diff --git a/src/args.c b/src/args.c index 75fb62cc8..80e88bdee 100644 --- a/src/args.c +++ b/src/args.c @@ -329,6 +329,7 @@ mc_args_new_color_group (void) "\n" "Keywords:\n" " Global: errors, disabled, reverse, gauge, viewunderline\n" " input, inputmark, inputunchanged, commandlinemark\n" + " bbarhotkey, bbarbutton, statusbar\n" " File display: normal, selected, marked, markselect\n" " Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" " errdhotfocus\n" diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c index 343faf850..5d2d1a4dc 100644 --- a/src/diffviewer/ydiff.c +++ b/src/diffviewer/ydiff.c @@ -2706,7 +2706,7 @@ dview_status (const WDiff * dview, int ord, int width, int c) int filename_width; int linenum, lineofs; - tty_setcolor (SELECTED_COLOR); + tty_setcolor (STATUSBAR_COLOR); tty_gotoyx (0, c); get_line_numbers (dview->a[ord], skip_rows, &linenum, &lineofs); diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c index 966510580..72c942a23 100644 --- a/src/editor/editdraw.c +++ b/src/editor/editdraw.c @@ -193,7 +193,7 @@ edit_status (WEdit * edit) } widget_move (edit, 0, 0); - tty_setcolor (SELECTED_COLOR); + tty_setcolor (STATUSBAR_COLOR); printwstr (fname, fname_len + gap); printwstr (status, w - (fname_len + gap)); diff --git a/src/viewer/display.c b/src/viewer/display.c index d43173268..0f4eb5ab1 100644 --- a/src/viewer/display.c +++ b/src/viewer/display.c @@ -138,7 +138,7 @@ mcview_display_status (mcview_t * view) if (height < 1) return; - tty_setcolor (SELECTED_COLOR); + tty_setcolor (STATUSBAR_COLOR); widget_move (view, top, left); tty_draw_hline (-1, -1, ' ', width);