Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/filehighlight/get-color.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ mc_fhl_get_color (const mc_fhl_t *fhl, const file_entry_t *fe)
int ret;

if (fhl == NULL)
return NORMAL_COLOR;
return CORE_NORMAL_COLOR;

for (i = 0; i < fhl->filters->len; i++)
{
Expand All @@ -306,7 +306,7 @@ mc_fhl_get_color (const mc_fhl_t *fhl, const file_entry_t *fe)
break;
}
}
return NORMAL_COLOR;
return CORE_NORMAL_COLOR;
}

/* --------------------------------------------------------------------------------------------- */
155 changes: 81 additions & 74 deletions lib/skin.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,104 +13,111 @@
See color-slang.h (A_*) */

/* cache often used colors */
#define DEFAULT_COLOR mc_skin_color__cache[0]
#define NORMAL_COLOR mc_skin_color__cache[1]
#define MARKED_COLOR mc_skin_color__cache[2]
#define SELECTED_COLOR mc_skin_color__cache[3]
#define MARKED_SELECTED_COLOR mc_skin_color__cache[4]
#define DISABLED_COLOR mc_skin_color__cache[5]
#define REVERSE_COLOR mc_skin_color__cache[6]
#define COMMAND_MARK_COLOR mc_skin_color__cache[7]
#define HEADER_COLOR mc_skin_color__cache[8]
#define SHADOW_COLOR mc_skin_color__cache[9]
#define CORE_DEFAULT_COLOR mc_skin_color__cache[0]
#define CORE_NORMAL_COLOR mc_skin_color__cache[1]
#define CORE_MARKED_COLOR mc_skin_color__cache[2]
#define CORE_SELECTED_COLOR mc_skin_color__cache[3]
#define CORE_MARKED_SELECTED_COLOR mc_skin_color__cache[4]
#define CORE_DISABLED_COLOR mc_skin_color__cache[5]
#define CORE_REVERSE_COLOR mc_skin_color__cache[6]
#define CORE_COMMAND_MARK_COLOR mc_skin_color__cache[7]
#define CORE_HEADER_COLOR mc_skin_color__cache[8]
#define CORE_SHADOW_COLOR mc_skin_color__cache[9]
#define CORE_FRAME_COLOR mc_skin_color__cache[10]

/* Dialog colors */
#define COLOR_NORMAL mc_skin_color__cache[10]
#define COLOR_FOCUS mc_skin_color__cache[11]
#define COLOR_HOT_NORMAL mc_skin_color__cache[12]
#define COLOR_HOT_FOCUS mc_skin_color__cache[13]
#define COLOR_SELECTED_NORMAL mc_skin_color__cache[14]
#define COLOR_SELECTED_FOCUS mc_skin_color__cache[15]
#define COLOR_TITLE mc_skin_color__cache[16]
#define DIALOG_NORMAL_COLOR mc_skin_color__cache[11]
#define DIALOG_FOCUS_COLOR mc_skin_color__cache[12]
#define DIALOG_HOT_NORMAL_COLOR mc_skin_color__cache[13]
#define DIALOG_HOT_FOCUS_COLOR mc_skin_color__cache[14]
#define DIALOG_SELECTED_NORMAL_COLOR mc_skin_color__cache[15]
#define DIALOG_SELECTED_FOCUS_COLOR mc_skin_color__cache[16]
#define DIALOG_TITLE_COLOR mc_skin_color__cache[17]
#define DIALOG_FRAME_COLOR mc_skin_color__cache[18]

/* Error dialog colors */
#define ERROR_COLOR mc_skin_color__cache[17]
#define ERROR_FOCUS mc_skin_color__cache[18]
#define ERROR_HOT_NORMAL mc_skin_color__cache[19]
#define ERROR_HOT_FOCUS mc_skin_color__cache[20]
#define ERROR_TITLE mc_skin_color__cache[21]
#define ERROR_NORMAL_COLOR mc_skin_color__cache[19]
#define ERROR_FOCUS_COLOR mc_skin_color__cache[20]
#define ERROR_HOT_NORMAL_COLOR mc_skin_color__cache[21]
#define ERROR_HOT_FOCUS_COLOR mc_skin_color__cache[22]
#define ERROR_TITLE_COLOR mc_skin_color__cache[23]
#define ERROR_FRAME_COLOR mc_skin_color__cache[24]

/* Menu colors */
#define MENU_ENTRY_COLOR mc_skin_color__cache[22]
#define MENU_SELECTED_COLOR mc_skin_color__cache[23]
#define MENU_HOT_COLOR mc_skin_color__cache[24]
#define MENU_HOTSEL_COLOR mc_skin_color__cache[25]
#define MENU_INACTIVE_COLOR mc_skin_color__cache[26]
#define MENU_ENTRY_COLOR mc_skin_color__cache[25]
#define MENU_SELECTED_COLOR mc_skin_color__cache[26]
#define MENU_HOT_COLOR mc_skin_color__cache[27]
#define MENU_HOTSEL_COLOR mc_skin_color__cache[28]
#define MENU_INACTIVE_COLOR mc_skin_color__cache[29]
#define MENU_FRAME_COLOR mc_skin_color__cache[30]

/* Popup menu colors */
#define PMENU_ENTRY_COLOR mc_skin_color__cache[27]
#define PMENU_SELECTED_COLOR mc_skin_color__cache[28]
#define PMENU_HOT_COLOR mc_skin_color__cache[29] // unused: not implemented yet
#define PMENU_HOTSEL_COLOR mc_skin_color__cache[30] // unused: not implemented yet
#define PMENU_TITLE_COLOR mc_skin_color__cache[31]
#define PMENU_ENTRY_COLOR mc_skin_color__cache[31]
#define PMENU_SELECTED_COLOR mc_skin_color__cache[32]
#define PMENU_HOT_COLOR mc_skin_color__cache[33] // unused: not implemented yet
#define PMENU_HOTSEL_COLOR mc_skin_color__cache[34] // unused: not implemented yet
#define PMENU_TITLE_COLOR mc_skin_color__cache[35]
#define PMENU_FRAME_COLOR mc_skin_color__cache[36]

#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[32]
#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[33]
#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[37]
#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[38]

#define STATUSBAR_COLOR mc_skin_color__cache[34]
#define STATUSBAR_COLOR mc_skin_color__cache[39]

/*
* This should be selectable independently. Default has to be black background
* foreground does not matter at all.
*/
#define GAUGE_COLOR mc_skin_color__cache[35]
#define INPUT_COLOR mc_skin_color__cache[36]
#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[37]
#define INPUT_MARK_COLOR mc_skin_color__cache[38]
#define INPUT_HISTORY_COLOR mc_skin_color__cache[39]
#define COMMAND_HISTORY_COLOR mc_skin_color__cache[40]

#define HELP_NORMAL_COLOR mc_skin_color__cache[41]
#define HELP_ITALIC_COLOR mc_skin_color__cache[42]
#define HELP_BOLD_COLOR mc_skin_color__cache[43]
#define HELP_LINK_COLOR mc_skin_color__cache[44]
#define HELP_SLINK_COLOR mc_skin_color__cache[45]
#define HELP_TITLE_COLOR mc_skin_color__cache[46]

#define VIEW_NORMAL_COLOR mc_skin_color__cache[47]
#define VIEW_BOLD_COLOR mc_skin_color__cache[48]
#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[49]
#define VIEW_SELECTED_COLOR mc_skin_color__cache[50]
#define CORE_GAUGE_COLOR mc_skin_color__cache[40]
#define CORE_INPUT_COLOR mc_skin_color__cache[41]
#define CORE_INPUT_UNCHANGED_COLOR mc_skin_color__cache[42]
#define CORE_INPUT_MARK_COLOR mc_skin_color__cache[43]
#define CORE_INPUT_HISTORY_COLOR mc_skin_color__cache[44]
#define CORE_COMMAND_HISTORY_COLOR mc_skin_color__cache[45]

#define HELP_NORMAL_COLOR mc_skin_color__cache[46]
#define HELP_ITALIC_COLOR mc_skin_color__cache[47]
#define HELP_BOLD_COLOR mc_skin_color__cache[48]
#define HELP_LINK_COLOR mc_skin_color__cache[49]
#define HELP_SLINK_COLOR mc_skin_color__cache[50]
#define HELP_TITLE_COLOR mc_skin_color__cache[51]
#define HELP_FRAME_COLOR mc_skin_color__cache[52]

#define VIEWER_NORMAL_COLOR mc_skin_color__cache[53]
#define VIEWER_BOLD_COLOR mc_skin_color__cache[54]
#define VIEWER_UNDERLINED_COLOR mc_skin_color__cache[55]
#define VIEWER_SELECTED_COLOR mc_skin_color__cache[56]
#define VIEWER_FRAME_COLOR mc_skin_color__cache[57]

/*
* 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[51]
#define EDITOR_NONPRINTABLE_COLOR mc_skin_color__cache[52]
#define EDITOR_BOLD_COLOR mc_skin_color__cache[53]
#define EDITOR_MARKED_COLOR mc_skin_color__cache[54]
#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[55]
#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[56]
#define EDITOR_BACKGROUND mc_skin_color__cache[57]
#define EDITOR_FRAME mc_skin_color__cache[58]
#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[59]
#define EDITOR_FRAME_DRAG mc_skin_color__cache[60]
#define EDITOR_NORMAL_COLOR mc_skin_color__cache[58]
#define EDITOR_NONPRINTABLE_COLOR mc_skin_color__cache[59]
#define EDITOR_BOLD_COLOR mc_skin_color__cache[60]
#define EDITOR_MARKED_COLOR mc_skin_color__cache[61]
#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[62]
#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[63]
#define EDITOR_BACKGROUND_COLOR mc_skin_color__cache[64]
#define EDITOR_FRAME_COLOR mc_skin_color__cache[65]
#define EDITOR_FRAME_ACTIVE_COLOR mc_skin_color__cache[66]
#define EDITOR_FRAME_DRAG_COLOR mc_skin_color__cache[67]
/* color of left 8 char status per line */
#define LINE_STATE_COLOR mc_skin_color__cache[61]
#define BOOK_MARK_COLOR mc_skin_color__cache[62]
#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[63]
#define EDITOR_LINE_STATE_COLOR mc_skin_color__cache[68]
#define EDITOR_BOOKMARK_COLOR mc_skin_color__cache[69]
#define EDITOR_BOOKMARK_FOUND_COLOR mc_skin_color__cache[70]

/* Diff colors */
#define DFF_ADD_COLOR mc_skin_color__cache[64]
#define DFF_CHG_COLOR mc_skin_color__cache[65]
#define DFF_CHH_COLOR mc_skin_color__cache[66]
#define DFF_CHD_COLOR mc_skin_color__cache[67]
#define DFF_DEL_COLOR mc_skin_color__cache[68]
#define DFF_ERROR_COLOR mc_skin_color__cache[69]

#define MC_SKIN_COLOR_CACHE_COUNT 70
#define DIFFVIEWER_ADDED_COLOR mc_skin_color__cache[71]
#define DIFFVIEWER_CHANGEDLINE_COLOR mc_skin_color__cache[72]
#define DIFFVIEWER_CHANGEDNEW_COLOR mc_skin_color__cache[73]
#define DIFFVIEWER_CHANGED_COLOR mc_skin_color__cache[74]
#define DIFFVIEWER_REMOVED_COLOR mc_skin_color__cache[75]
#define DIFFVIEWER_ERROR_COLOR mc_skin_color__cache[76]

#define MC_SKIN_COLOR_CACHE_COUNT 77

/*** enums ***************************************************************************************/

Expand Down
105 changes: 56 additions & 49 deletions lib/skin/colors.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,86 +244,93 @@ mc_skin_color_set_default_for_terminal (mc_skin_t *mc_skin)
static void
mc_skin_color_cache_init (void)
{
DEFAULT_COLOR = mc_skin_color_get ("skin", "terminal_default_color");
NORMAL_COLOR = mc_skin_color_get ("core", "_default_");
MARKED_COLOR = mc_skin_color_get ("core", "marked");
SELECTED_COLOR = mc_skin_color_get ("core", "selected");
MARKED_SELECTED_COLOR = mc_skin_color_get ("core", "markselect");
DISABLED_COLOR = mc_skin_color_get ("core", "disabled");
REVERSE_COLOR = mc_skin_color_get ("core", "reverse");
HEADER_COLOR = mc_skin_color_get ("core", "header");
COMMAND_MARK_COLOR = mc_skin_color_get ("core", "commandlinemark");
SHADOW_COLOR = mc_skin_color_get ("core", "shadow");

COLOR_NORMAL = mc_skin_color_get ("dialog", "_default_");
COLOR_FOCUS = mc_skin_color_get ("dialog", "dfocus");
COLOR_HOT_NORMAL = mc_skin_color_get ("dialog", "dhotnormal");
COLOR_HOT_FOCUS = mc_skin_color_get ("dialog", "dhotfocus");
COLOR_SELECTED_NORMAL = mc_skin_color_get ("dialog", "dselnormal");
COLOR_SELECTED_FOCUS = mc_skin_color_get ("dialog", "dselfocus");
COLOR_TITLE = mc_skin_color_get ("dialog", "dtitle");

ERROR_COLOR = mc_skin_color_get ("error", "_default_");
ERROR_FOCUS = mc_skin_color_get ("error", "errdfocus");
ERROR_HOT_NORMAL = mc_skin_color_get ("error", "errdhotnormal");
ERROR_HOT_FOCUS = mc_skin_color_get ("error", "errdhotfocus");
ERROR_TITLE = mc_skin_color_get ("error", "errdtitle");
CORE_DEFAULT_COLOR = mc_skin_color_get ("skin", "terminal_default_color");
CORE_NORMAL_COLOR = mc_skin_color_get ("core", "_default_");
CORE_MARKED_COLOR = mc_skin_color_get ("core", "marked");
CORE_SELECTED_COLOR = mc_skin_color_get ("core", "selected");
CORE_MARKED_SELECTED_COLOR = mc_skin_color_get ("core", "markselect");
CORE_DISABLED_COLOR = mc_skin_color_get ("core", "disabled");
CORE_REVERSE_COLOR = mc_skin_color_get ("core", "reverse");
CORE_HEADER_COLOR = mc_skin_color_get ("core", "header");
CORE_COMMAND_MARK_COLOR = mc_skin_color_get ("core", "commandlinemark");
CORE_SHADOW_COLOR = mc_skin_color_get ("core", "shadow");
CORE_FRAME_COLOR = mc_skin_color_get ("core", "frame");

DIALOG_NORMAL_COLOR = mc_skin_color_get ("dialog", "_default_");
DIALOG_FOCUS_COLOR = mc_skin_color_get ("dialog", "dfocus");
DIALOG_HOT_NORMAL_COLOR = mc_skin_color_get ("dialog", "dhotnormal");
DIALOG_HOT_FOCUS_COLOR = mc_skin_color_get ("dialog", "dhotfocus");
DIALOG_SELECTED_NORMAL_COLOR = mc_skin_color_get ("dialog", "dselnormal");
DIALOG_SELECTED_FOCUS_COLOR = mc_skin_color_get ("dialog", "dselfocus");
DIALOG_TITLE_COLOR = mc_skin_color_get ("dialog", "dtitle");
DIALOG_FRAME_COLOR = mc_skin_color_get ("dialog", "dframe");

ERROR_NORMAL_COLOR = mc_skin_color_get ("error", "_default_");
ERROR_FOCUS_COLOR = mc_skin_color_get ("error", "errdfocus");
ERROR_HOT_NORMAL_COLOR = mc_skin_color_get ("error", "errdhotnormal");
ERROR_HOT_FOCUS_COLOR = mc_skin_color_get ("error", "errdhotfocus");
ERROR_TITLE_COLOR = mc_skin_color_get ("error", "errdtitle");
ERROR_FRAME_COLOR = mc_skin_color_get ("error", "errdframe");

MENU_ENTRY_COLOR = mc_skin_color_get ("menu", "_default_");
MENU_SELECTED_COLOR = mc_skin_color_get ("menu", "menusel");
MENU_HOT_COLOR = mc_skin_color_get ("menu", "menuhot");
MENU_HOTSEL_COLOR = mc_skin_color_get ("menu", "menuhotsel");
MENU_INACTIVE_COLOR = mc_skin_color_get ("menu", "menuinactive");
MENU_FRAME_COLOR = mc_skin_color_get ("menu", "menuframe");

PMENU_ENTRY_COLOR = mc_skin_color_get ("popupmenu", "_default_");
PMENU_SELECTED_COLOR = mc_skin_color_get ("popupmenu", "menusel");
PMENU_TITLE_COLOR = mc_skin_color_get ("popupmenu", "menutitle");
PMENU_FRAME_COLOR = mc_skin_color_get ("popupmenu", "menuframe");

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");
COMMAND_HISTORY_COLOR = mc_skin_color_get ("core", "commandhistory");
INPUT_MARK_COLOR = mc_skin_color_get ("core", "inputmark");
INPUT_UNCHANGED_COLOR = mc_skin_color_get ("core", "inputunchanged");
CORE_GAUGE_COLOR = mc_skin_color_get ("core", "gauge");
CORE_INPUT_COLOR = mc_skin_color_get ("core", "input");
CORE_INPUT_HISTORY_COLOR = mc_skin_color_get ("core", "inputhistory");
CORE_COMMAND_HISTORY_COLOR = mc_skin_color_get ("core", "commandhistory");
CORE_INPUT_MARK_COLOR = mc_skin_color_get ("core", "inputmark");
CORE_INPUT_UNCHANGED_COLOR = mc_skin_color_get ("core", "inputunchanged");

HELP_NORMAL_COLOR = mc_skin_color_get ("help", "_default_");
HELP_ITALIC_COLOR = mc_skin_color_get ("help", "helpitalic");
HELP_BOLD_COLOR = mc_skin_color_get ("help", "helpbold");
HELP_LINK_COLOR = mc_skin_color_get ("help", "helplink");
HELP_SLINK_COLOR = mc_skin_color_get ("help", "helpslink");
HELP_TITLE_COLOR = mc_skin_color_get ("help", "helptitle");
HELP_FRAME_COLOR = mc_skin_color_get ("help", "helpframe");

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");
VIEWER_NORMAL_COLOR = mc_skin_color_get ("viewer", "_default_");
VIEWER_BOLD_COLOR = mc_skin_color_get ("viewer", "viewbold");
VIEWER_UNDERLINED_COLOR = mc_skin_color_get ("viewer", "viewunderline");
VIEWER_SELECTED_COLOR = mc_skin_color_get ("viewer", "viewselected");
VIEWER_FRAME_COLOR = mc_skin_color_get ("viewer", "viewframe");

EDITOR_NORMAL_COLOR = mc_skin_color_get ("editor", "_default_");
EDITOR_BOLD_COLOR = mc_skin_color_get ("editor", "editbold");
EDITOR_MARKED_COLOR = mc_skin_color_get ("editor", "editmarked");
EDITOR_WHITESPACE_COLOR = mc_skin_color_get ("editor", "editwhitespace");
EDITOR_NONPRINTABLE_COLOR = mc_skin_color_get ("editor", "editnonprintable");
EDITOR_RIGHT_MARGIN_COLOR = mc_skin_color_get ("editor", "editrightmargin");
LINE_STATE_COLOR = mc_skin_color_get ("editor", "editlinestate");
EDITOR_BACKGROUND = mc_skin_color_get ("editor", "editbg");
EDITOR_FRAME = mc_skin_color_get ("editor", "editframe");
EDITOR_FRAME_ACTIVE = mc_skin_color_get ("editor", "editframeactive");
EDITOR_FRAME_DRAG = mc_skin_color_get ("editor", "editframedrag");

BOOK_MARK_COLOR = mc_skin_color_get ("editor", "bookmark");
BOOK_MARK_FOUND_COLOR = mc_skin_color_get ("editor", "bookmarkfound");

DFF_ADD_COLOR = mc_skin_color_get ("diffviewer", "added");
DFF_CHG_COLOR = mc_skin_color_get ("diffviewer", "changedline");
DFF_CHH_COLOR = mc_skin_color_get ("diffviewer", "changednew");
DFF_CHD_COLOR = mc_skin_color_get ("diffviewer", "changed");
DFF_DEL_COLOR = mc_skin_color_get ("diffviewer", "removed");
DFF_ERROR_COLOR = mc_skin_color_get ("diffviewer", "error");
EDITOR_LINE_STATE_COLOR = mc_skin_color_get ("editor", "editlinestate");
EDITOR_BACKGROUND_COLOR = mc_skin_color_get ("editor", "editbg");
EDITOR_FRAME_COLOR = mc_skin_color_get ("editor", "editframe");
EDITOR_FRAME_ACTIVE_COLOR = mc_skin_color_get ("editor", "editframeactive");
EDITOR_FRAME_DRAG_COLOR = mc_skin_color_get ("editor", "editframedrag");

EDITOR_BOOKMARK_COLOR = mc_skin_color_get ("editor", "bookmark");
EDITOR_BOOKMARK_FOUND_COLOR = mc_skin_color_get ("editor", "bookmarkfound");

DIFFVIEWER_ADDED_COLOR = mc_skin_color_get ("diffviewer", "added");
DIFFVIEWER_CHANGEDLINE_COLOR = mc_skin_color_get ("diffviewer", "changedline");
DIFFVIEWER_CHANGEDNEW_COLOR = mc_skin_color_get ("diffviewer", "changednew");
DIFFVIEWER_CHANGED_COLOR = mc_skin_color_get ("diffviewer", "changed");
DIFFVIEWER_REMOVED_COLOR = mc_skin_color_get ("diffviewer", "removed");
DIFFVIEWER_ERROR_COLOR = mc_skin_color_get ("diffviewer", "error");
}

/* --------------------------------------------------------------------------------------------- */
Expand Down
2 changes: 1 addition & 1 deletion lib/widget/buttonbar.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ buttonbar_callback (Widget *w, Widget *sender, widget_msg_t msg, int parm, void
{
buttonbar_init_button_positions (bb);
widget_gotoyx (w, 0, 0);
tty_setcolor (DEFAULT_COLOR);
tty_setcolor (CORE_DEFAULT_COLOR);
tty_printf ("%-*s", w->rect.cols, "");
widget_gotoyx (w, 0, 0);

Expand Down
Loading
Loading