Compare commits
3 Commits
feat/bold-
...
8444a15bc9
Author | SHA1 | Date | |
---|---|---|---|
8444a15bc9 | |||
71d1f725b3 | |||
fb7383d52f |
29
x.c
29
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1433,10 +1437,6 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|||||||
bg = &dc.col[base.bg];
|
bg = &dc.col[base.bg];
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 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];
|
|
||||||
|
|
||||||
if (IS_SET(MODE_REVERSE)) {
|
if (IS_SET(MODE_REVERSE)) {
|
||||||
if (fg == &dc.col[defaultfg]) {
|
if (fg == &dc.col[defaultfg]) {
|
||||||
fg = &dc.col[defaultbg];
|
fg = &dc.col[defaultbg];
|
||||||
@ -1541,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))
|
||||||
@ -1569,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