mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ticket #4490: code cleanup before 4.8.31 release. 

tty: refactoring of color pairs definition.

Rename structure tty_color_pair_t -> tty_color_lib_pair_t. Rename members.
Rename tty_color_try_alloc_pair_lib() -> tty_color_try_alloc_lib_pair().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-09-10 12:22:26 +03:00
parent cf7846cd62
commit 2c01bd53cb
4 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tty/color-internal.h
View File

@ -31,14 +31,15 @@ typedef enum {
/*** structures declarations (and typedefs of structures)*****************************************/ /*** structures declarations (and typedefs of structures)*****************************************/
typedef struct mc_color_pair_struct /* Screen library specific color pair */
typedef struct
{ {
int ifg; int fg;
int ibg; int bg;
int attr; int attr;
size_t pair_index; size_t pair_index;
gboolean is_temp; gboolean is_temp;
} tty_color_pair_t; } tty_color_lib_pair_t;
/*** global variables defined in .c file *********************************************************/ /*** global variables defined in .c file *********************************************************/
@ -54,7 +55,7 @@ int tty_attr_get_bits (const char *attrs);
void tty_color_init_lib (gboolean disable, gboolean force); void tty_color_init_lib (gboolean disable, gboolean force);
void tty_color_deinit_lib (void); void tty_color_deinit_lib (void);
void tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair); void tty_color_try_alloc_lib_pair (tty_color_lib_pair_t * mc_color_pair);
/*** inline functions ****************************************************************************/ /*** inline functions ****************************************************************************/

12
lib/tty/color-ncurses.c
View File

@ -103,7 +103,7 @@ color_get_attr (int color_pair)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
mc_tty_color_pair_init_special (tty_color_pair_t * mc_color_pair, mc_tty_color_pair_init_special (tty_color_lib_pair_t * mc_color_pair,
int fg1, int bg1, int fg2, int bg2, int attr) int fg1, int bg1, int fg2, int bg2, int attr)
{ {
if (has_colors () && !mc_tty_color_disable) if (has_colors () && !mc_tty_color_disable)
@ -145,11 +145,11 @@ tty_color_deinit_lib (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
void void
tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair) tty_color_try_alloc_lib_pair (tty_color_lib_pair_t * mc_color_pair)
{ {
if (mc_color_pair->ifg <= (int) SPEC_A_REVERSE) if (mc_color_pair->fg <= (int) SPEC_A_REVERSE)
{ {
switch (mc_color_pair->ifg) switch (mc_color_pair->fg)
{ {
case SPEC_A_REVERSE: case SPEC_A_REVERSE:
mc_tty_color_pair_init_special (mc_color_pair, mc_tty_color_pair_init_special (mc_color_pair,
@ -179,8 +179,8 @@ tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair)
{ {
int ifg, ibg, attr; int ifg, ibg, attr;
ifg = mc_color_pair->ifg; ifg = mc_color_pair->fg;
ibg = mc_color_pair->ibg; ibg = mc_color_pair->bg;
attr = mc_color_pair->attr; attr = mc_color_pair->attr;
/* In legacy color mode, change bright colors into bold */ /* In legacy color mode, change bright colors into bold */

12
lib/tty/color-slang.c
View File

@ -99,7 +99,7 @@ has_colors (gboolean disable, gboolean force)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
mc_tty_color_pair_init_special (tty_color_pair_t * mc_color_pair, mc_tty_color_pair_init_special (tty_color_lib_pair_t * mc_color_pair,
const char *fg1, const char *bg1, const char *fg1, const char *bg1,
const char *fg2, const char *bg2, SLtt_Char_Type mask) const char *fg2, const char *bg2, SLtt_Char_Type mask)
{ {
@ -145,11 +145,11 @@ tty_color_deinit_lib (void)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
void void
tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair) tty_color_try_alloc_lib_pair (tty_color_lib_pair_t * mc_color_pair)
{ {
if (mc_color_pair->ifg <= (int) SPEC_A_REVERSE) if (mc_color_pair->fg <= (int) SPEC_A_REVERSE)
{ {
switch (mc_color_pair->ifg) switch (mc_color_pair->fg)
{ {
case SPEC_A_REVERSE: case SPEC_A_REVERSE:
mc_tty_color_pair_init_special (mc_color_pair, mc_tty_color_pair_init_special (mc_color_pair,
@ -176,8 +176,8 @@ tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair)
{ {
const char *fg, *bg; const char *fg, *bg;
fg = tty_color_get_name_by_index (mc_color_pair->ifg); fg = tty_color_get_name_by_index (mc_color_pair->fg);
bg = tty_color_get_name_by_index (mc_color_pair->ibg); bg = tty_color_get_name_by_index (mc_color_pair->bg);
SLtt_set_color (mc_color_pair->pair_index, (char *) "", (char *) fg, (char *) bg); SLtt_set_color (mc_color_pair->pair_index, (char *) "", (char *) fg, (char *) bg);
SLtt_add_color_attribute (mc_color_pair->pair_index, mc_color_pair->attr); SLtt_add_color_attribute (mc_color_pair->pair_index, mc_color_pair->attr);
} }

17
lib/tty/color.c
View File

@ -70,7 +70,7 @@ static GHashTable *mc_tty_color__hashtable = NULL;
static gboolean static gboolean
tty_color_free_condition_cb (gpointer key, gpointer value, gpointer user_data) tty_color_free_condition_cb (gpointer key, gpointer value, gpointer user_data)
{ {
tty_color_pair_t *mc_color_pair = (tty_color_pair_t *) value; tty_color_lib_pair_t *mc_color_pair = (tty_color_lib_pair_t *) value;
gboolean is_temp_color; gboolean is_temp_color;
(void) key; (void) key;
@ -93,7 +93,7 @@ tty_color_free_all (gboolean is_temp_color)
static gboolean static gboolean
tty_color_get_next_cpn_cb (gpointer key, gpointer value, gpointer user_data) tty_color_get_next_cpn_cb (gpointer key, gpointer value, gpointer user_data)
{ {
tty_color_pair_t *mc_color_pair = (tty_color_pair_t *) value; tty_color_lib_pair_t *mc_color_pair = (tty_color_lib_pair_t *) value;
size_t cp = GPOINTER_TO_SIZE (user_data); size_t cp = GPOINTER_TO_SIZE (user_data);
(void) key; (void) key;
@ -156,7 +156,7 @@ tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs,
gboolean is_temp_color) gboolean is_temp_color)
{ {
gchar *color_pair; gchar *color_pair;
tty_color_pair_t *mc_color_pair; tty_color_lib_pair_t *mc_color_pair;
int ifg, ibg, attr; int ifg, ibg, attr;
if (fg == NULL || strcmp (fg, "base") == 0) if (fg == NULL || strcmp (fg, "base") == 0)
@ -175,7 +175,8 @@ tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs,
return 0; return 0;
mc_color_pair = mc_color_pair =
(tty_color_pair_t *) g_hash_table_lookup (mc_tty_color__hashtable, (gpointer) color_pair); (tty_color_lib_pair_t *) g_hash_table_lookup (mc_tty_color__hashtable,
(gpointer) color_pair);
if (mc_color_pair != NULL) if (mc_color_pair != NULL)
{ {
@ -183,7 +184,7 @@ tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs,
return mc_color_pair->pair_index; return mc_color_pair->pair_index;
} }
mc_color_pair = g_try_new0 (tty_color_pair_t, 1); mc_color_pair = g_try_new0 (tty_color_lib_pair_t, 1);
if (mc_color_pair == NULL) if (mc_color_pair == NULL)
{ {
g_free (color_pair); g_free (color_pair);
@ -191,12 +192,12 @@ tty_try_alloc_color_pair2 (const char *fg, const char *bg, const char *attrs,
} }
mc_color_pair->is_temp = is_temp_color; mc_color_pair->is_temp = is_temp_color;
mc_color_pair->ifg = ifg; mc_color_pair->fg = ifg;
mc_color_pair->ibg = ibg; mc_color_pair->bg = ibg;
mc_color_pair->attr = attr; mc_color_pair->attr = attr;
mc_color_pair->pair_index = tty_color_get_next__color_pair_number (); mc_color_pair->pair_index = tty_color_get_next__color_pair_number ();
tty_color_try_alloc_pair_lib (mc_color_pair); tty_color_try_alloc_lib_pair (mc_color_pair);
g_hash_table_insert (mc_tty_color__hashtable, (gpointer) color_pair, (gpointer) mc_color_pair); g_hash_table_insert (mc_tty_color__hashtable, (gpointer) color_pair, (gpointer) mc_color_pair);