akkartik
/
teliva
1
1
Fork 0
Code Issues Pull Requests Releases Activity

less confusing name

This commit is contained in:
Kartik K. Agaram 2021-12-21 19:59:15 -08:00
parent 577d47a6a7
commit 7cf65a3bea
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lua.c
View File

@ -817,18 +817,16 @@ static int is_current_definition(lua_State *L, const char *definition_name, int
void draw_definition_name (const char *definition_name) {
/* confusingly, unhighlighted definitions use COLOR_PAIR_HIGHLIGHT */
attron(COLOR_PAIR(COLOR_PAIR_HIGHLIGHT));
attron(COLOR_PAIR(COLOR_PAIR_SELECTABLE));
addstr(" ");
addstr(definition_name);
addstr(" ");
attroff(COLOR_PAIR(COLOR_PAIR_HIGHLIGHT));
attroff(COLOR_PAIR(COLOR_PAIR_SELECTABLE));
addstr(" ");
}
void draw_highlighted_definition_name (const char *definition_name) {
/* confusingly, highlighted definitions don't use COLOR_PAIR_HIGHLIGHT */
attron(A_REVERSE);
addstr(" ");
addstr(definition_name);
@ -1126,7 +1124,7 @@ void developer_mode (lua_State *L) {
/* clobber the app's ncurses colors; we'll restart the app when we rerun it. */
assume_default_colors(COLOR_FOREGROUND, COLOR_BACKGROUND);
init_pair(COLOR_PAIR_NORMAL, COLOR_FOREGROUND, COLOR_BACKGROUND);
init_pair(COLOR_PAIR_HIGHLIGHT, COLOR_HIGHLIGHT_FOREGROUND, COLOR_HIGHLIGHT_BACKGROUND);
init_pair(COLOR_PAIR_SELECTABLE, COLOR_SELECTABLE_FOREGROUND, COLOR_SELECTABLE_BACKGROUND);
init_pair(COLOR_PAIR_FADE, COLOR_FADE, COLOR_BACKGROUND);
init_pair(COLOR_PAIR_MENU_ALTERNATE, COLOR_MENU_ALTERNATE, COLOR_BACKGROUND);
init_pair(COLOR_PAIR_LUA_COMMENT, COLOR_LUA_COMMENT, COLOR_BACKGROUND);

14
src/teliva.h
View File

@ -57,8 +57,8 @@ enum color {
COLOR_BACKGROUND = 253, // almost white
COLOR_FADE = 244, // closer to background
COLOR_MENU_ALTERNATE = 248,
COLOR_HIGHLIGHT_FOREGROUND = 238,
COLOR_HIGHLIGHT_BACKGROUND = 250,
COLOR_SELECTABLE_FOREGROUND = 238,
COLOR_SELECTABLE_BACKGROUND = 250,
COLOR_ERROR_FOREGROUND = COLOR_BACKGROUND,
COLOR_ERROR_BACKGROUND = 124, // deep red
COLOR_LUA_COMMENT = 27, // blue
@ -74,8 +74,8 @@ enum color {
COLOR_BACKGROUND = 238, // almost black
COLOR_FADE = 244, // closer to background
COLOR_MENU_ALTERNATE = 244,
COLOR_HIGHLIGHT_FOREGROUND = 238,
COLOR_HIGHLIGHT_BACKGROUND = 250,
COLOR_SELECTABLE_FOREGROUND = 238,
COLOR_SELECTABLE_BACKGROUND = 250,
COLOR_ERROR_FOREGROUND = COLOR_FOREGROUND,
COLOR_ERROR_BACKGROUND = 124, // deep red
COLOR_LUA_COMMENT = 39, // blue
@ -91,8 +91,8 @@ enum color {
COLOR_BACKGROUND = 24, // dark blue-green
COLOR_FADE = 246, // closer to background
COLOR_MENU_ALTERNATE = 244,
COLOR_HIGHLIGHT_FOREGROUND = 250,
COLOR_HIGHLIGHT_BACKGROUND = 31,
COLOR_SELECTABLE_FOREGROUND = 250,
COLOR_SELECTABLE_BACKGROUND = 31,
COLOR_ERROR_FOREGROUND = 250,
COLOR_ERROR_BACKGROUND = 124, // deep red
COLOR_LUA_COMMENT = 45, // light blue
@ -105,7 +105,7 @@ enum color {
enum color_pair {
COLOR_PAIR_NORMAL = 0,
COLOR_PAIR_HIGHLIGHT = 1,
COLOR_PAIR_SELECTABLE = 1,
COLOR_PAIR_FADE = 2,
COLOR_PAIR_MENU_ALTERNATE = 3,
COLOR_PAIR_LUA_COMMENT = 4,