Compare commits
3 Commits
feat/clipb
...
feat/gruvb
Author | SHA1 | Date | |
---|---|---|---|
3de6ff4faf | |||
aa9d16a41b | |||
71d1f725b3 |
46
config.def.h
46
config.def.h
@ -99,32 +99,24 @@ float alpha = 0.8;
|
|||||||
/* Terminal colors (16 first used in escape sequence) */
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
static const char *colorname[] = {
|
static const char *colorname[] = {
|
||||||
/* 8 normal colors */
|
/* 8 normal colors */
|
||||||
"black",
|
[0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
|
||||||
"red3",
|
[1] = "#cc241d", /* red */
|
||||||
"green3",
|
[2] = "#98971a", /* green */
|
||||||
"yellow3",
|
[3] = "#d79921", /* yellow */
|
||||||
"blue2",
|
[4] = "#458588", /* blue */
|
||||||
"magenta3",
|
[5] = "#b16286", /* magenta */
|
||||||
"cyan3",
|
[6] = "#689d6a", /* cyan */
|
||||||
"gray90",
|
[7] = "#a89984", /* white */
|
||||||
|
|
||||||
/* 8 bright colors */
|
/* 8 bright colors */
|
||||||
"gray50",
|
[8] = "#928374", /* black */
|
||||||
"red",
|
[9] = "#fb4934", /* red */
|
||||||
"green",
|
[10] = "#b8bb26", /* green */
|
||||||
"yellow",
|
[11] = "#fabd2f", /* yellow */
|
||||||
"#5c5cff",
|
[12] = "#83a598", /* blue */
|
||||||
"magenta",
|
[13] = "#d3869b", /* magenta */
|
||||||
"cyan",
|
[14] = "#8ec07c", /* cyan */
|
||||||
"white",
|
[15] = "#ebdbb2", /* white */
|
||||||
|
|
||||||
[255] = 0,
|
|
||||||
|
|
||||||
/* more colors can be added after 255 to use with DefaultXX */
|
|
||||||
"#cccccc",
|
|
||||||
"#555555",
|
|
||||||
"gray90", /* default foreground colour */
|
|
||||||
"black", /* default background colour */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -132,9 +124,9 @@ static const char *colorname[] = {
|
|||||||
* Default colors (colorname index)
|
* Default colors (colorname index)
|
||||||
* foreground, background, cursor, reverse cursor
|
* foreground, background, cursor, reverse cursor
|
||||||
*/
|
*/
|
||||||
unsigned int defaultfg = 258;
|
unsigned int defaultfg = 15;
|
||||||
unsigned int defaultbg = 259;
|
unsigned int defaultbg = 0;
|
||||||
unsigned int defaultcs = 256;
|
unsigned int defaultcs = 15;
|
||||||
static unsigned int defaultrcs = 257;
|
static unsigned int defaultrcs = 257;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
25
x.c
25
x.c
@ -689,6 +689,8 @@ setsel(char *str, Time t)
|
|||||||
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
|
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
|
||||||
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
|
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
|
||||||
selclear();
|
selclear();
|
||||||
|
|
||||||
|
xclipcopy();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -712,7 +714,9 @@ brelease(XEvent *e)
|
|||||||
|
|
||||||
if (mouseaction(e, 1))
|
if (mouseaction(e, 1))
|
||||||
return;
|
return;
|
||||||
if (btn == Button1)
|
if (btn == Button3)
|
||||||
|
selpaste(NULL);
|
||||||
|
else if (btn == Button1)
|
||||||
mousesel(e, 1);
|
mousesel(e, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1537,6 +1541,7 @@ void
|
|||||||
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||||
{
|
{
|
||||||
Color drawcol;
|
Color drawcol;
|
||||||
|
XRenderColor colbg;
|
||||||
|
|
||||||
/* remove the old cursor */
|
/* remove the old cursor */
|
||||||
if (selected(ox, oy))
|
if (selected(ox, oy))
|
||||||
@ -1565,11 +1570,21 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
|||||||
if (selected(cx, cy)) {
|
if (selected(cx, cy)) {
|
||||||
g.fg = defaultfg;
|
g.fg = defaultfg;
|
||||||
g.bg = defaultrcs;
|
g.bg = defaultrcs;
|
||||||
} else {
|
} else if (!(og.mode & ATTR_REVERSE)) {
|
||||||
g.fg = defaultbg;
|
unsigned long col = g.bg;
|
||||||
g.bg = defaultcs;
|
g.bg = g.fg;
|
||||||
|
g.fg = col;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (IS_TRUECOL(g.bg)) {
|
||||||
|
colbg.alpha = 0xffff;
|
||||||
|
colbg.red = TRUERED(g.bg);
|
||||||
|
colbg.green = TRUEGREEN(g.bg);
|
||||||
|
colbg.blue = TRUEBLUE(g.bg);
|
||||||
|
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &drawcol);
|
||||||
|
} else {
|
||||||
|
drawcol = dc.col[g.bg];
|
||||||
}
|
}
|
||||||
drawcol = dc.col[g.bg];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* draw the new one */
|
/* draw the new one */
|
||||||
|
Reference in New Issue
Block a user