st-meta-vim-full: change currentBg, introduce currentFg, update shortcuts

This commit is contained in:
2026-01-22 09:19:59 +01:00
parent 02739346a8
commit 4f4ef6c0da
2 changed files with 4 additions and 5 deletions

View File

@@ -175,15 +175,14 @@ unsigned int defaultfg = 258;
unsigned int defaultbg = 259; unsigned int defaultbg = 259;
unsigned int defaultcs = 256; unsigned int defaultcs = 256;
static unsigned int defaultrcs = 257; static unsigned int defaultrcs = 257;
unsigned int const currentBg = 6, buffSize = 2048; unsigned int const currentBg = 179, currentFg = 0, buffSize = 2048;
/// Enable double / triple click yanking / selection of word / line. /// Enable double / triple click yanking / selection of word / line.
int const mouseYank = 1, mouseSelect = 0; int const mouseYank = 1, mouseSelect = 0;
/// [Vim Browse] Colors for search results currently on screen. /// [Vim Browse] Colors for search results currently on screen.
unsigned int const highlightBg = 160, highlightFg = 15; unsigned int const highlightBg = 160, highlightFg = 15;
char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t"; char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t";
char *nmKeys [] = { ///< Shortcusts executed in normal mode char *nmKeys [] = { ///< Shortcusts executed in normal mode
"R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n", "P/lupan@\nN", "F/: error:\nN", "f/: error:\n", "DQf"
"Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf"
}; };
unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys); unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys);
/// Style of the {command, search} string shown in the right corner (y,v,V,/) /// Style of the {command, search} string shown in the right corner (y,v,V,/)

View File

@@ -6,7 +6,7 @@
extern Glyph const styleSearch, style[]; extern Glyph const styleSearch, style[];
extern char const wDelS[], wDelL[], *nmKeys[]; extern char const wDelS[], wDelL[], *nmKeys[];
extern unsigned int bg[], fg, currentBg, highlightBg, highlightFg, amountNmKeys; extern unsigned int bg[], fg, currentBg, currentFg, highlightBg, highlightFg, amountNmKeys;
typedef struct { int p[3]; } Pos; typedef struct { int p[3]; } Pos;
@@ -264,7 +264,7 @@ void historyOverlay(int x, int y, Glyph* g) {
else if (x > term.col - 7) g->u = (Rune)(posBuffer[x - term.col + 7]); else if (x > term.col - 7) g->u = (Rune)(posBuffer[x - term.col + 7]);
else getChar(size(&cCmd) ?&cCmd :&lCmd, g, term.row-1, term.col-7, term.col/3-6, x); else getChar(size(&cCmd) ?&cCmd :&lCmd, g, term.row-1, term.col-7, term.col/3-6, x);
} else if (highlighted(x, y)) g->bg = highlightBg, g->fg = highlightFg; } else if (highlighted(x, y)) g->bg = highlightBg, g->fg = highlightFg;
else if ((x==cHist->x) ^ (y==cHist->y)) g->bg = currentBg; else if ((x==cHist->x) ^ (y==cHist->y)) { g->bg = currentBg; g->fg = currentFg; }
else if (x==cHist->x) g->mode^=ATTR_REVERSE; else if (x==cHist->x) g->mode^=ATTR_REVERSE;
} }
void historyPreDraw() { void historyPreDraw() {