diff options
Diffstat (limited to 'st.c')
| -rw-r--r-- | st.c | 30 |
1 files changed, 23 insertions, 7 deletions
@@ -351,6 +351,7 @@ static void clippaste(const Arg *); static void kscrolldown(const Arg *); static void kscrollup(const Arg *); static void numlock(const Arg *); +static void swapcolors(const Arg *); static void selpaste(const Arg *); static void xzoom(const Arg *); static void xzoomabs(const Arg *); @@ -381,7 +382,7 @@ typedef struct { /* Drawing Context */ typedef struct { - Color col[MAX(LEN(colorname), 256)]; + Color col[MAX(MAX(LEN(colorname), LEN(altcolorname)), 256)]; Font font, bfont, ifont, ibfont; GC gc; } DC; @@ -560,6 +561,8 @@ static char *opt_name = NULL; static char *opt_title = NULL; static int oldbutton = 3; /* button event on startup: 3 = release */ +static int usealtcolors = 0; /* 1 to use alternate palette */ + static char *usedfont = NULL; static double usedfontsize = 0; static double defaultfontsize = 0; @@ -3334,6 +3337,11 @@ sixd_to_16bit(int x) return x == 0 ? 0 : 0x3737 + 0x2828 * x; } +const char* getcolorname(int i) +{ + return (usealtcolors) ? altcolorname[i] : colorname[i]; +} + int xloadcolor(int i, const char *name, Color *ncolor) { @@ -3352,7 +3360,7 @@ xloadcolor(int i, const char *name, Color *ncolor) return XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, ncolor); } else - name = colorname[i]; + name = getcolorname(i); } return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor); @@ -3372,8 +3380,8 @@ xloadcols(void) for (i = 0; i < LEN(dc.col); i++) if (!xloadcolor(i, NULL, &dc.col[i])) { - if (colorname[i]) - die("Could not allocate color '%s'\n", colorname[i]); + if (getcolorname(i)) + die("Could not allocate color '%s'\n", getcolorname(i)); else die("Could not allocate color %d\n", i); } @@ -3740,13 +3748,13 @@ xinit(void) cursor = XCreateFontCursor(xw.dpy, mouseshape); XDefineCursor(xw.dpy, xw.win, cursor); - if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) { + if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousefg), &xmousefg) == 0) { xmousefg.red = 0xffff; xmousefg.green = 0xffff; xmousefg.blue = 0xffff; } - if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) { + if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousebg), &xmousebg) == 0) { xmousebg.red = 0x0000; xmousebg.green = 0x0000; xmousebg.blue = 0x0000; @@ -3944,7 +3952,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i /* Change basic system colors [0-7] to bright system colors [8-15] */ if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7)) - fg = &dc.col[base.fg + 8]; + fg = &dc.col[base.fg]; if (IS_SET(MODE_REVERSE)) { if (fg == &dc.col[defaultfg]) { @@ -4301,6 +4309,14 @@ numlock(const Arg *dummy) term.numlock ^= 1; } +void +swapcolors(const Arg *dummy) +{ + usealtcolors = !usealtcolors; + xloadcols(); + redraw(); +} + char* kmap(KeySym k, uint state) { |