diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in index b9848d188..aa497db43 100644 --- a/doc/man/es/mc.1.in +++ b/doc/man/es/mc.1.in @@ -3374,10 +3374,10 @@ menusel, menuhot, menuhotsel, menuinactive; los colores de los diálogos: dnormal, dfocus, dhotnormal, dhotfocus, dtitle; los colores de los diálogos de error: errdfocus, errdhotnormal, errdhotfocus, errdtitle; los colores de la ayuda: helpnormal, helpitalic, helpbold, helplink, helpslink, -helptitle; los colores del visor: viewbold, viewunderline, viewselected; -loc colores del editor: editnormal, editbold, editmarked, editwhitespace, -editlinestate; los colores de los menús desplegables: pmenunormal, pmenusel, -pmenutitle. +helptitle; los colores del visor: viewnormal, viewbold, viewunderline, +viewselected; loc colores del editor: editnormal, editbold, editmarked, +editwhitespace, editlinestate; los colores de los menús desplegables: +pmenunormal, pmenusel, pmenutitle. .PP .I header determina el color del encabezado de los paneles, la línea con los diff --git a/doc/man/hu/mc.1.in b/doc/man/hu/mc.1.in index 1e040c3e5..61fc20788 100644 --- a/doc/man/hu/mc.1.in +++ b/doc/man/hu/mc.1.in @@ -2948,6 +2948,7 @@ menusel, menuhot, menuhotsel, menuinactive; A dialog színek: dnormal, dfocus, dhotnormal, dhotfocus; Súgó színek: helpnormal, helpitalic, helpbold, helplink, helpslink; Fájlnéző színek: viewunderline; Speciális kijelölés színei: executable, directory, link, stalelink, device, special, core; +Viewer colors are: viewnormal, viewbold, viewunderline, viewselected. Szerkesztő színei: editnormal, editbold, editmarked. .PP .I input diff --git a/doc/man/it/mc.1.in b/doc/man/it/mc.1.in index e8fedb4be..e3715c81a 100644 --- a/doc/man/it/mc.1.in +++ b/doc/man/it/mc.1.in @@ -2958,6 +2958,7 @@ sono: helpnormal, helpitalic, helpbold, helplink, helpslink. Il colore del visualizzatore è: viewunderline. Colori speciali di evidenziazione: executable, directory, link, device, special, core. +I colori dell'viewer sono: viewnormal, viewbold, viewunderline, viewselected. I colori dell'editor sono: editnormal, editbold, editmarked. .PP .I input diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index d1ca8c14a..b890e059a 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -3541,9 +3541,10 @@ 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, editwhitespace, editlinestate. -Popup menu colors are: pmenunormal, pmenusel, pmenutitle. +helplink, helpslink, helptitle. Viewer colors are: viewnormal, viewbold, +viewunderline, viewselected. Editor colors are: editnormal, editbold, editmarked, +editwhitespace, editlinestate. Popup menu colors are: pmenunormal, pmenusel, +pmenutitle. .PP .I header determines the color of panel header, the line that contains column titles diff --git a/doc/man/pl/mc.1.in b/doc/man/pl/mc.1.in index 4660a6a15..9d9fadc5f 100644 --- a/doc/man/pl/mc.1.in +++ b/doc/man/pl/mc.1.in @@ -2621,7 +2621,10 @@ marked, markselect, errors, input, reverse menunormal, menusel, menuhot, menuhot menuinactive, gauge; kolory okien dialogowych: dnormal, dfocus, dhotnormal, dhotfocus; Kolory pomocy: helpnormal, helpitalic, helpbold, helplink, helpslink; Kolory podglądu: viewunderline; Specjalne tryby podświetlenia: -executable, directory, link, device, special. +executable, directory, link, device, special. Viewer colors are: viewnormal, +viewbold, viewunderline, viewselected. Editor colors are: editnormal, editbold, +editmarked, editwhitespace, editlinestate. Popup menu colors are: pmenunormal, +pmenusel, pmenutitle. [nie tłumaczyłem nazw z racji tego, że trzeba je stosować w ich angielskim brzmieniu \- jeśli jesteś aż tak zaawansowany, użyj słownika]. .PP diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index c3e51aa37..4b6769191 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -3916,8 +3916,8 @@ 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. +программы просмотра: viewnormal, viewbold, viewunderline, viewselected. Цвета в +редакторе: editnormal, editbold, editmarked, editwhitespace, editlinestate. Цвета окна всплывающего меню: pmenunormal, pmenusel, pmenutitle. .PP Цвета задавать не обязательно. Цвет какого именно поля определяется diff --git a/doc/man/sr/mc.1.in b/doc/man/sr/mc.1.in index 2a6bf181d..3952b15a5 100644 --- a/doc/man/sr/mc.1.in +++ b/doc/man/sr/mc.1.in @@ -2972,8 +2972,8 @@ menunormal, menusel, menuhot, menuhotsel, menuinactive. Боје дијалог dnormal, dfocus, dhotnormal, dhotfocus. Боје помоћи су: helpnormal, helpitalic, helpbold, helplink, helpslink. Боја прегледача је: viewunderline. Посебне боје за истицање су: executable, directory, link, stalelink, -device, special, core. Боје уређивача су: editnormal, editbold, -editmarked. +device, special, core. Viewer colors are: viewnormal, viewbold, viewunderline, +viewselected. Боје уређивача су: editnormal, editbold, editmarked. .PP .I input одређује боју редова за унос који се користе у дијалозима упита. diff --git a/lib/skin.h b/lib/skin.h index 904266bfe..8d3218072 100644 --- a/lib/skin.h +++ b/lib/skin.h @@ -75,38 +75,39 @@ #define HELP_TITLE_COLOR mc_skin_color__cache[43] -#define VIEW_BOLD_COLOR mc_skin_color__cache[44] -#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[45] -#define VIEW_SELECTED_COLOR mc_skin_color__cache[46] +#define VIEW_NORMAL_COLOR mc_skin_color__cache[44] +#define VIEW_BOLD_COLOR mc_skin_color__cache[45] +#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[46] +#define VIEW_SELECTED_COLOR mc_skin_color__cache[47] /* * 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[47] -#define EDITOR_BOLD_COLOR mc_skin_color__cache[48] -#define EDITOR_MARKED_COLOR mc_skin_color__cache[49] -#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[50] -#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[51] -#define EDITOR_BACKGROUND mc_skin_color__cache[52] -#define EDITOR_FRAME mc_skin_color__cache[53] -#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[54] -#define EDITOR_FRAME_DRAG mc_skin_color__cache[55] +#define EDITOR_NORMAL_COLOR mc_skin_color__cache[48] +#define EDITOR_BOLD_COLOR mc_skin_color__cache[49] +#define EDITOR_MARKED_COLOR mc_skin_color__cache[50] +#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[51] +#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[52] +#define EDITOR_BACKGROUND mc_skin_color__cache[53] +#define EDITOR_FRAME mc_skin_color__cache[54] +#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[55] +#define EDITOR_FRAME_DRAG mc_skin_color__cache[56] /* color of left 8 char status per line */ -#define LINE_STATE_COLOR mc_skin_color__cache[56] -#define BOOK_MARK_COLOR mc_skin_color__cache[57] -#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[58] +#define LINE_STATE_COLOR mc_skin_color__cache[57] +#define BOOK_MARK_COLOR mc_skin_color__cache[58] +#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[59] /* Diff colors */ -#define DFF_ADD_COLOR mc_skin_color__cache[59] -#define DFF_CHG_COLOR mc_skin_color__cache[60] -#define DFF_CHH_COLOR mc_skin_color__cache[61] -#define DFF_CHD_COLOR mc_skin_color__cache[62] -#define DFF_DEL_COLOR mc_skin_color__cache[63] -#define DFF_ERROR_COLOR mc_skin_color__cache[64] +#define DFF_ADD_COLOR mc_skin_color__cache[60] +#define DFF_CHG_COLOR mc_skin_color__cache[61] +#define DFF_CHH_COLOR mc_skin_color__cache[62] +#define DFF_CHD_COLOR mc_skin_color__cache[63] +#define DFF_DEL_COLOR mc_skin_color__cache[64] +#define DFF_ERROR_COLOR mc_skin_color__cache[65] -#define MC_SKIN_COLOR_CACHE_COUNT 65 +#define MC_SKIN_COLOR_CACHE_COUNT 66 /*** enums ***************************************************************************************/ diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c index 5826e06db..3b1dafabc 100644 --- a/lib/skin/colors-old.c +++ b/lib/skin/colors-old.c @@ -96,6 +96,7 @@ static const mc_skin_colors_old_t old_colors[] = { {"reverse", "core", "reverse"}, {"selected", "core", "selected"}, {"statusbar", "statusbar", "_default_"}, + {"viewnormal", "viewer", "_default_"}, {"viewbold", "viewer", "viewbold"}, {"viewselected", "viewer", "viewselected"}, {"viewunderline", "viewer", "viewunderline"} diff --git a/lib/skin/colors.c b/lib/skin/colors.c index 7ca9d4742..228f1d2c2 100644 --- a/lib/skin/colors.c +++ b/lib/skin/colors.c @@ -233,6 +233,7 @@ mc_skin_color_cache_init (void) HELP_SLINK_COLOR = mc_skin_color_get ("help", "helpslink"); HELP_TITLE_COLOR = mc_skin_color_get ("help", "helptitle"); + VIEW_NORMAL_COLOR = mc_skin_color_get ("viewer", "_default_"); VIEW_BOLD_COLOR = mc_skin_color_get ("viewer", "viewbold"); VIEW_UNDERLINED_COLOR = mc_skin_color_get ("viewer", "viewunderline"); VIEW_SELECTED_COLOR = mc_skin_color_get ("viewer", "viewselected"); diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini index f586b84c8..d3717d5df 100644 --- a/misc/skins/dark.ini +++ b/misc/skins/dark.ini @@ -115,6 +115,7 @@ window-close-char = ✕ [viewer] + _default_ = lightgray;black viewbold = yellow;black viewunderline = brightred;black viewselected = yellow;cyan diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini index 1f05f6b57..a34de677f 100644 --- a/misc/skins/darkfar.ini +++ b/misc/skins/darkfar.ini @@ -115,6 +115,7 @@ window-close-char = × [viewer] + _default_ = lightgray;black viewbold = yellow;black viewunderline = brightred;black viewselected = yellow;cyan diff --git a/misc/skins/default.ini b/misc/skins/default.ini index 117b4dbb0..625188e8e 100644 --- a/misc/skins/default.ini +++ b/misc/skins/default.ini @@ -115,6 +115,7 @@ window-close-char = X [viewer] + _default_ = lightgray;blue viewbold = yellow;blue viewunderline = brightred;blue viewselected = yellow;cyan diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini index 7a2f7c91f..172442e68 100644 --- a/misc/skins/double-lines.ini +++ b/misc/skins/double-lines.ini @@ -115,6 +115,7 @@ window-close-char = X [viewer] + _default_ = lightgray;blue viewbold = yellow;blue viewunderline = brightred;blue viewselected = yellow;cyan diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini index b986f6efe..47a1a23c2 100644 --- a/misc/skins/featured.ini +++ b/misc/skins/featured.ini @@ -117,6 +117,7 @@ window-close-char = ✕ [viewer] + _default_ = lightgray;blue viewbold = yellow;blue viewunderline = brightred;blue viewselected = yellow;cyan diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini index c0aa35b88..fc65bb2cf 100644 --- a/misc/skins/gotar.ini +++ b/misc/skins/gotar.ini @@ -112,6 +112,7 @@ window-close-char = X [viewer] + _default_ = lightgray;black viewbold = brightred;black viewunderline = brightgreen;black viewselected = yellow;black diff --git a/misc/skins/gray-green-purple256.ini b/misc/skins/gray-green-purple256.ini index a90bf242d..2794d53c5 100644 --- a/misc/skins/gray-green-purple256.ini +++ b/misc/skins/gray-green-purple256.ini @@ -114,6 +114,7 @@ window-close-char = ✕ [viewer] + _default_ = black;gray22 viewunderline = ;;underline [diffviewer] diff --git a/misc/skins/gray-orange-blue256.ini b/misc/skins/gray-orange-blue256.ini index 0440c4647..7f778c0dd 100644 --- a/misc/skins/gray-orange-blue256.ini +++ b/misc/skins/gray-orange-blue256.ini @@ -114,6 +114,7 @@ window-close-char = ✕ [viewer] + _default_ = black;gray22 viewunderline = ;;underline [diffviewer] diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini index ed8053579..39e436354 100644 --- a/misc/skins/mc46.ini +++ b/misc/skins/mc46.ini @@ -106,6 +106,7 @@ window-close-char = X [viewer] + _default_ = lightgray;blue viewbold = yellow;blue viewunderline = brightred;blue viewselected = yellow;cyan diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini index 22a60fa8a..a40e561b1 100644 --- a/misc/skins/nicedark.ini +++ b/misc/skins/nicedark.ini @@ -115,6 +115,7 @@ window-close-char = ✕ [viewer] + _default_ = lightgray;black viewbold = brown;blue viewunderline = brightred;blue viewselected = brown;cyan diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini index 456f7c80e..70e0a4c93 100644 --- a/misc/skins/sand256.ini +++ b/misc/skins/sand256.ini @@ -168,6 +168,7 @@ window-close-char = ✕ [viewer] + _default_ = black;rgb554 viewunderline = ;;underline [diffviewer] diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini index 656f996a2..d2585566b 100644 --- a/misc/skins/xoria256.ini +++ b/misc/skins/xoria256.ini @@ -157,6 +157,7 @@ window-close-char = ✕ [viewer] + _default_ = color250;color234 viewunderline = ;;underline [diffviewer] diff --git a/src/args.c b/src/args.c index a1f0eae14..19da645da 100644 --- a/src/args.c +++ b/src/args.c @@ -366,7 +366,7 @@ mc_args_new_color_group (void) " Editor: editnormal, editbold, editmarked, editwhitespace,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" - " Viewer: viewbold, viewunderline, viewselected\n" + " Viewer: viewnormal,viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n"), /* TRANSLATORS: don't translate color names and attributes */ _("Standard Colors:\n" diff --git a/src/viewer/display.c b/src/viewer/display.c index 24d0eeabb..fafeba179 100644 --- a/src/viewer/display.c +++ b/src/viewer/display.c @@ -344,7 +344,7 @@ mcview_display_clean (mcview_t * view) { Widget *w = WIDGET (view); - tty_setcolor (NORMAL_COLOR); + tty_setcolor (VIEW_NORMAL_COLOR); widget_erase (w); if (view->dpy_frame_size != 0) tty_draw_box (w->y, w->x, w->lines, w->cols, FALSE); @@ -390,7 +390,7 @@ mcview_display_ruler (mcview_t * view) } } } - tty_setcolor (NORMAL_COLOR); + tty_setcolor (VIEW_NORMAL_COLOR); } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/viewer/hex.c b/src/viewer/hex.c index 284f4d759..ff7d501f1 100644 --- a/src/viewer/hex.c +++ b/src/viewer/hex.c @@ -182,7 +182,7 @@ mcview_display_hex (mcview_t * view) /* tty_print_char(hex_buff[i]); */ col += 1; } - tty_setcolor (NORMAL_COLOR); + tty_setcolor (VIEW_NORMAL_COLOR); for (bytes = 0; bytes < view->bytes_per_line; bytes++, from++) { @@ -243,7 +243,7 @@ mcview_display_hex (mcview_t * view) } /* Select the color for the hex number */ - tty_setcolor (boldflag == MARK_NORMAL ? NORMAL_COLOR : + tty_setcolor (boldflag == MARK_NORMAL ? VIEW_NORMAL_COLOR : boldflag == MARK_SELECTED ? VIEW_BOLD_COLOR : boldflag == MARK_CHANGED ? VIEW_UNDERLINED_COLOR : /* boldflag == MARK_CURSOR */ @@ -263,7 +263,7 @@ mcview_display_hex (mcview_t * view) } /* Print the separator */ - tty_setcolor (NORMAL_COLOR); + tty_setcolor (VIEW_NORMAL_COLOR); if (bytes != view->bytes_per_line - 1) { if (col < width) @@ -290,7 +290,7 @@ mcview_display_hex (mcview_t * view) /* Select the color for the character; this differs from the * hex color when boldflag == MARK_CURSOR */ - tty_setcolor (boldflag == MARK_NORMAL ? NORMAL_COLOR : + tty_setcolor (boldflag == MARK_NORMAL ? VIEW_NORMAL_COLOR : boldflag == MARK_SELECTED ? VIEW_BOLD_COLOR : boldflag == MARK_CHANGED ? VIEW_UNDERLINED_COLOR : /* boldflag == MARK_CURSOR */ @@ -342,7 +342,7 @@ mcview_display_hex (mcview_t * view) } /* Be polite to the other functions */ - tty_setcolor (NORMAL_COLOR); + tty_setcolor (VIEW_NORMAL_COLOR); mcview_place_cursor (view); view->dpy_end = from; diff --git a/src/viewer/nroff.c b/src/viewer/nroff.c index 58bb85c78..eb3a4869f 100644 --- a/src/viewer/nroff.c +++ b/src/viewer/nroff.c @@ -116,7 +116,7 @@ mcview_display_nroff (mcview_t * view) curr = curr->next; } - tty_setcolor (NORMAL_COLOR); + tty_setcolor (VIEW_NORMAL_COLOR); for (row = 0, col = 0; row < height;) { #ifdef HAVE_CHARSET @@ -245,7 +245,7 @@ mcview_display_nroff (mcview_t * view) col--; } #endif - tty_setcolor (NORMAL_COLOR); + tty_setcolor (VIEW_NORMAL_COLOR); } view->dpy_end = from; } diff --git a/src/viewer/plain.c b/src/viewer/plain.c index eba730ee4..3970f1770 100644 --- a/src/viewer/plain.c +++ b/src/viewer/plain.c @@ -86,7 +86,7 @@ mcview_display_text (mcview_t * view) while (TRUE) { - tty_setcolor (NORMAL_COLOR); + tty_setcolor (VIEW_NORMAL_COLOR); if (row >= height) break;