Skip to content

Ticket #4974: Skinnable hint bar, prompt and cmdline; plus other cleanups #4976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
egmontkob wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Ticket #4974: Skinnable hint bar, prompt and cmdline; plus other cleanups #4976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4251504
Rename the input widget's color enums to be consistent with dialog wi…
egmontkob Jan 28, 2026
742de5e
Refactor color handling
egmontkob Jan 29, 2026
a54c51b
Ticket #4974: Make the hint bar, shell prompt and command line skinnable
egmontkob Jan 28, 2026
5e1152a
Ticket #4974: Use buttonbar hotkey color for unused areas of buttonbar
egmontkob Jan 28, 2026
2e89dad
Ticket #4950, #4951: Remove "base" color and "terminal_default_color"…
egmontkob Jan 28, 2026
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
8 changes: 4 additions & 4 deletions lib/filehighlight/get-color.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,14 @@ mc_fhl_get_color (const mc_fhl_t *fhl, const file_entry_t *fe)
{
case MC_FLHGH_T_FTYPE:
ret = mc_fhl_get_color_filetype (mc_filter, fhl, fe);
if (ret > 0)
return -ret;
if (ret >= 0)
return ret;
break;
case MC_FLHGH_T_EXT:
case MC_FLHGH_T_FREGEXP:
ret = mc_fhl_get_color_regexp (mc_filter, fhl, fe);
if (ret > 0)
return -ret;
if (ret >= 0)
return ret;
break;
default:
break;
Expand Down
114 changes: 0 additions & 114 deletions lib/skin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,119 +9,6 @@

/*** typedefs(not structures) and defined constants **********************************************/

/* Beware! When using Slang with color, not all the indexes are free.
See color-slang.h (A_*) */

/* cache often used colors */
#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 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_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[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[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[37]
#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[38]

#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 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_BOLD_UNDERLINED_COLOR mc_skin_color__cache[56]
#define VIEWER_SELECTED_COLOR mc_skin_color__cache[57]
#define VIEWER_FRAME_COLOR mc_skin_color__cache[58]

/*
* 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[59]
#define EDITOR_NONPRINTABLE_COLOR mc_skin_color__cache[60]
#define EDITOR_BOLD_COLOR mc_skin_color__cache[61]
#define EDITOR_MARKED_COLOR mc_skin_color__cache[62]
#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[63]
#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[64]
#define EDITOR_BACKGROUND_COLOR mc_skin_color__cache[65]
#define EDITOR_FRAME_COLOR mc_skin_color__cache[66]
#define EDITOR_FRAME_ACTIVE_COLOR mc_skin_color__cache[67]
#define EDITOR_FRAME_DRAG_COLOR mc_skin_color__cache[68]
/* color of left 8 char status per line */
#define EDITOR_LINE_STATE_COLOR mc_skin_color__cache[69]
#define EDITOR_BOOKMARK_COLOR mc_skin_color__cache[70]
#define EDITOR_BOOKMARK_FOUND_COLOR mc_skin_color__cache[71]

/* Diff colors */
#define DIFFVIEWER_ADDED_COLOR mc_skin_color__cache[72]
#define DIFFVIEWER_CHANGEDLINE_COLOR mc_skin_color__cache[73]
#define DIFFVIEWER_CHANGEDNEW_COLOR mc_skin_color__cache[74]
#define DIFFVIEWER_CHANGED_COLOR mc_skin_color__cache[75]
#define DIFFVIEWER_REMOVED_COLOR mc_skin_color__cache[76]
#define DIFFVIEWER_ERROR_COLOR mc_skin_color__cache[77]

#define FILEHIGHLIGHT_DEFAULT_COLOR mc_skin_color__cache[78]

#define MC_SKIN_COLOR_CACHE_COUNT 79

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

/*** structures declarations (and typedefs of structures)*****************************************/
Expand All @@ -138,7 +25,6 @@ typedef struct mc_skin_struct

/*** global variables defined in .c file *********************************************************/

extern int mc_skin_color__cache[];
extern mc_skin_t mc_skin__default;

/*** declarations of public functions ************************************************************/
Expand Down
Loading
Loading