92 lines
2.0 KiB
Diff
92 lines
2.0 KiB
Diff
From 8272b9992269dcdb066b99f3d8abb49d07faa48e Mon Sep 17 00:00:00 2001
|
|
From: Out Of Ideas <vehementham@Oink-a-tron.Home>
|
|
Date: Fri, 10 Nov 2023 18:31:05 -0600
|
|
Subject: [PATCH] ST Patch
|
|
|
|
---
|
|
config.def.h | 40 ++++++++++++++++++++--------------------
|
|
x.c | 5 ++---
|
|
2 files changed, 22 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index 91ab8ca..9a73dba 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -96,32 +96,32 @@ unsigned int tabspaces = 8;
|
|
/* Terminal colors (16 first used in escape sequence) */
|
|
static const char *colorname[] = {
|
|
/* 8 normal colors */
|
|
- "black",
|
|
- "red3",
|
|
- "green3",
|
|
- "yellow3",
|
|
- "blue2",
|
|
- "magenta3",
|
|
- "cyan3",
|
|
- "gray90",
|
|
+ "#361f24",
|
|
+ "#832f01",
|
|
+ "#fb9756",
|
|
+ "#ffde6e",
|
|
+ "#6b789b",
|
|
+ "#7c6a8e",
|
|
+ "#94b5ea",
|
|
+ "#fef9cd",
|
|
|
|
/* 8 bright colors */
|
|
- "gray50",
|
|
- "red",
|
|
- "green",
|
|
- "yellow",
|
|
- "#5c5cff",
|
|
- "magenta",
|
|
- "cyan",
|
|
- "white",
|
|
+ "#270e05",
|
|
+ "#6b290f",
|
|
+ "#bd4307",
|
|
+ "#ffba51",
|
|
+ "#5376ae",
|
|
+ "#654d86",
|
|
+ "#97aee4",
|
|
+ "#ffffff",
|
|
|
|
[255] = 0,
|
|
|
|
/* more colors can be added after 255 to use with DefaultXX */
|
|
- "#cccccc",
|
|
- "#555555",
|
|
- "gray90", /* default foreground colour */
|
|
- "black", /* default background colour */
|
|
+ "#ffffff",
|
|
+ "#ffffff",
|
|
+ "#fef9cd", /* default foreground colour */
|
|
+ "#361f24", /* default background colour */
|
|
};
|
|
|
|
|
|
diff --git a/x.c b/x.c
|
|
index b36fb8c..1e7bc31 100644
|
|
--- a/x.c
|
|
+++ b/x.c
|
|
@@ -1377,7 +1377,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
|
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
|
width = charlen * win.cw;
|
|
- Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
|
|
+ Color *fg, *bg, revfg, revbg, truefg, truebg;
|
|
XRenderColor colfg, colbg;
|
|
XRectangle r;
|
|
|
|
@@ -1452,9 +1452,8 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|
}
|
|
|
|
if (base.mode & ATTR_REVERSE) {
|
|
- temp = fg;
|
|
fg = bg;
|
|
- bg = temp;
|
|
+ bg = &dc.col[defaultcs];;
|
|
}
|
|
|
|
if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)
|