5 Commits

Author SHA1 Message Date
8444a15bc9 Added dynamic-cursor-color v0.9 patch 2023-06-27 22:31:03 +02:00
71d1f725b3 feat/clipboard (#6)
Reviewed-on: #6
2023-06-27 22:30:31 +02:00
fb7383d52f Added bold-is-not-bright v2019-01-27 patch (#3)
Reviewed-on: #3
2023-06-27 21:59:07 +02:00
3a32e68b82 Added anysize v.2022-07-18 patch (#2)
Reviewed-on: #2
2023-06-27 21:57:51 +02:00
a8d62fe07b Added alpha patch v0.8.5 (#1)
Reviewed-on: #1
2023-06-27 21:56:48 +02:00
4 changed files with 85 additions and 254 deletions

View File

@ -8,20 +8,6 @@
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
static int borderpx = 2;
/*
* Override/adjust fontsize of choosen monitors:
*/
MonitorConfig monitors_config[] = {
// skip = fixed relative points size (monitor dpi)
// =0 : fixed absolute pixel size (default screen dpi)
// >0 : auto absolute pixel size (monitor dpi)
// <0 : auto relative points size (monitor dpi)
// {"DP-1", 0}, // BUG:(size=0): not restored to default after back'n'forth
{"HDMI-0~1", -20}, // BUG:(ignored DPI=220): = 20 is eqv to 10pt (DPI=110)
{"HDMI-0~2", -14},
};
float winmovethreshold = 0.6;
/*
* What program is execed by st depends of these precedence rules:
* 1: program passed with -e
@ -107,6 +93,9 @@ char *termname = "st-256color";
*/
unsigned int tabspaces = 8;
/* bg opacity */
float alpha = 0.8;
/* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = {
/* 8 normal colors */
@ -210,7 +199,6 @@ static Shortcut shortcuts[] = {
{ TERMMOD, XK_Prior, zoom, {.f = +1} },
{ TERMMOD, XK_Next, zoom, {.f = -1} },
{ TERMMOD, XK_Home, zoomreset, {.f = 0} },
{ TERMMOD, XK_End, refreshxrandr, {.i = 0} },
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
{ TERMMOD, XK_V, clippaste, {.i = 0} },
{ TERMMOD, XK_Y, selpaste, {.i = 0} },

View File

@ -16,12 +16,10 @@ PKG_CONFIG = pkg-config
INCS = -I$(X11INC) \
`$(PKG_CONFIG) --cflags fontconfig` \
`$(PKG_CONFIG) --cflags freetype2`
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
`$(PKG_CONFIG) --libs fontconfig` \
`$(PKG_CONFIG) --libs freetype2`
LIBS += -lXrandr
# flags
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)

1
st.h
View File

@ -124,3 +124,4 @@ extern unsigned int tabspaces;
extern unsigned int defaultfg;
extern unsigned int defaultbg;
extern unsigned int defaultcs;
extern float alpha;

316
x.c
View File

@ -14,7 +14,6 @@
#include <X11/keysym.h>
#include <X11/Xft/Xft.h>
#include <X11/XKBlib.h>
#include <X11/extensions/Xrandr.h>
char *argv0;
#include "arg.h"
@ -46,19 +45,6 @@ typedef struct {
signed char appcursor; /* application cursor */
} Key;
typedef struct {
const char *name;
float defaultfontsize;
} MonitorConfig;
typedef struct {
Atom name;
int x, y, w, h;
float defaultfontsize, usedfontsize;
} MonitorInfo;
static void refreshxrandr(const Arg *dummy);
/* X modifiers */
#define XK_ANY_MOD UINT_MAX
#define XK_NO_MOD 0
@ -95,6 +81,7 @@ typedef XftGlyphFontSpec GlyphFontSpec;
typedef struct {
int tw, th; /* tty width and height */
int w, h; /* window width and height */
int hborderpx, vborderpx;
int ch; /* char height */
int cw; /* char width */
int mode; /* window state/mode flags */
@ -119,6 +106,7 @@ typedef struct {
XSetWindowAttributes attrs;
int scr;
int isfixed; /* is fixed geometry? */
int depth; /* bit depth */
int l, t; /* left and top offset */
int gm; /* geometry mask */
} XWindow;
@ -229,11 +217,6 @@ static void (*handler[LASTEvent])(XEvent *) = {
[SelectionRequest] = selrequest,
};
static double defaultrelfontsize = 0;
static MonitorInfo *monitors_info = NULL;
static int monitors_num = 0;
static int prev_mindex = -1;
/* Globals */
static DC dc;
static XWindow xw;
@ -262,6 +245,7 @@ static char *usedfont = NULL;
static double usedfontsize = 0;
static double defaultfontsize = 0;
static char *opt_alpha = NULL;
static char *opt_class = NULL;
static char **opt_cmd = NULL;
static char *opt_embed = NULL;
@ -350,7 +334,7 @@ ttysend(const Arg *arg)
int
evcol(XEvent *e)
{
int x = e->xbutton.x - borderpx;
int x = e->xbutton.x - win.hborderpx;
LIMIT(x, 0, win.tw - 1);
return x / win.cw;
}
@ -358,7 +342,7 @@ evcol(XEvent *e)
int
evrow(XEvent *e)
{
int y = e->xbutton.y - borderpx;
int y = e->xbutton.y - win.vborderpx;
LIMIT(y, 0, win.th - 1);
return y / win.ch;
}
@ -705,6 +689,8 @@ setsel(char *str, Time t)
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
selclear();
xclipcopy();
}
void
@ -728,7 +714,9 @@ brelease(XEvent *e)
if (mouseaction(e, 1))
return;
if (btn == Button1)
if (btn == Button3)
selpaste(NULL);
else if (btn == Button1)
mousesel(e, 1);
}
@ -758,6 +746,9 @@ cresize(int width, int height)
col = MAX(1, col);
row = MAX(1, row);
win.hborderpx = (win.w - col * win.cw) / 2;
win.vborderpx = (win.h - row * win.ch) / 2;
tresize(col, row);
xresize(col, row);
ttyresize(win.tw, win.th);
@ -771,7 +762,7 @@ xresize(int col, int row)
XFreePixmap(xw.dpy, xw.buf);
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
DefaultDepth(xw.dpy, xw.scr));
xw.depth);
XftDrawChange(xw.draw, xw.buf);
xclear(0, 0, win.w, win.h);
@ -831,6 +822,13 @@ xloadcols(void)
else
die("could not allocate color %d\n", i);
}
/* set alpha value of bg color */
if (opt_alpha)
alpha = strtof(opt_alpha, NULL);
dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
dc.col[defaultbg].pixel &= 0x00FFFFFF;
dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
loaded = 1;
}
@ -888,8 +886,8 @@ xhints(void)
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
sizeh->height = win.h;
sizeh->width = win.w;
sizeh->height_inc = win.ch;
sizeh->width_inc = win.cw;
sizeh->height_inc = 1;
sizeh->width_inc = 1;
sizeh->base_height = 2 * borderpx;
sizeh->base_width = 2 * borderpx;
sizeh->min_height = win.ch + 2 * borderpx;
@ -1153,11 +1151,23 @@ xinit(int cols, int rows)
Window parent;
pid_t thispid = getpid();
XColor xmousefg, xmousebg;
XWindowAttributes attr;
XVisualInfo vis;
if (!(xw.dpy = XOpenDisplay(NULL)))
die("can't open display\n");
xw.scr = XDefaultScreen(xw.dpy);
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
parent = XRootWindow(xw.dpy, xw.scr);
xw.depth = 32;
} else {
XGetWindowAttributes(xw.dpy, parent, &attr);
xw.depth = attr.depth;
}
XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
xw.vis = vis.visual;
/* font */
if (!FcInit())
@ -1167,12 +1177,12 @@ xinit(int cols, int rows)
xloadfonts(usedfont, 0);
/* colors */
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
xloadcols();
/* adjust fixed window geometry */
win.w = 2 * borderpx + cols * win.cw;
win.h = 2 * borderpx + rows * win.ch;
win.w = 2 * win.hborderpx + 2 * borderpx + cols * win.cw;
win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch;
if (xw.gm & XNegative)
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
if (xw.gm & YNegative)
@ -1187,19 +1197,15 @@ xinit(int cols, int rows)
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
xw.attrs.colormap = xw.cmap;
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
parent = XRootWindow(xw.dpy, xw.scr);
xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
win.w, win.h, 0, xw.depth, InputOutput,
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
| CWEventMask | CWColormap, &xw.attrs);
memset(&gcvalues, 0, sizeof(gcvalues));
gcvalues.graphics_exposures = False;
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
&gcvalues);
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
DefaultDepth(xw.dpy, xw.scr));
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
@ -1261,7 +1267,7 @@ xinit(int cols, int rows)
int
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
{
float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
ushort mode, prevmode = USHRT_MAX;
Font *font = &dc.font;
int frcflags = FRC_NORMAL;
@ -1394,7 +1400,7 @@ void
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
{
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
width = charlen * win.cw;
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
XRenderColor colfg, colbg;
@ -1431,10 +1437,6 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
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 (fg == &dc.col[defaultfg]) {
fg = &dc.col[defaultbg];
@ -1484,17 +1486,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
/* Intelligent cleaning up of the borders. */
if (x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
xclear(0, (y == 0)? 0 : winy, win.hborderpx,
winy + win.ch +
((winy + win.ch >= borderpx + win.th)? win.h : 0));
((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
}
if (winx + width >= borderpx + win.tw) {
if (winx + width >= win.hborderpx + win.tw) {
xclear(winx + width, (y == 0)? 0 : winy, win.w,
((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
}
if (y == 0)
xclear(winx, 0, winx + width, borderpx);
if (winy + win.ch >= borderpx + win.th)
xclear(winx, 0, winx + width, win.vborderpx);
if (winy + win.ch >= win.vborderpx + win.th)
xclear(winx, winy + win.ch, winx + width, win.h);
/* Clean up the region we want to draw to. */
@ -1539,6 +1541,7 @@ void
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
{
Color drawcol;
XRenderColor colbg;
/* remove the old cursor */
if (selected(ox, oy))
@ -1567,11 +1570,21 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
if (selected(cx, cy)) {
g.fg = defaultfg;
g.bg = defaultrcs;
} else {
g.fg = defaultbg;
g.bg = defaultcs;
} else if (!(og.mode & ATTR_REVERSE)) {
unsigned long col = g.bg;
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 */
@ -1588,35 +1601,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
case 3: /* Blinking Underline */
case 4: /* Steady Underline */
XftDrawRect(xw.draw, &drawcol,
borderpx + cx * win.cw,
borderpx + (cy + 1) * win.ch - \
win.hborderpx + cx * win.cw,
win.vborderpx + (cy + 1) * win.ch - \
cursorthickness,
win.cw, cursorthickness);
break;
case 5: /* Blinking bar */
case 6: /* Steady bar */
XftDrawRect(xw.draw, &drawcol,
borderpx + cx * win.cw,
borderpx + cy * win.ch,
win.hborderpx + cx * win.cw,
win.vborderpx + cy * win.ch,
cursorthickness, win.ch);
break;
}
} else {
XftDrawRect(xw.draw, &drawcol,
borderpx + cx * win.cw,
borderpx + cy * win.ch,
win.hborderpx + cx * win.cw,
win.vborderpx + cy * win.ch,
win.cw - 1, 1);
XftDrawRect(xw.draw, &drawcol,
borderpx + cx * win.cw,
borderpx + cy * win.ch,
win.hborderpx + cx * win.cw,
win.vborderpx + cy * win.ch,
1, win.ch - 1);
XftDrawRect(xw.draw, &drawcol,
borderpx + (cx + 1) * win.cw - 1,
borderpx + cy * win.ch,
win.hborderpx + (cx + 1) * win.cw - 1,
win.vborderpx + cy * win.ch,
1, win.ch - 1);
XftDrawRect(xw.draw, &drawcol,
borderpx + cx * win.cw,
borderpx + (cy + 1) * win.ch - 1,
win.hborderpx + cx * win.cw,
win.vborderpx + (cy + 1) * win.ch - 1,
win.cw, 1);
}
}
@ -1772,144 +1785,6 @@ xseturgency(int add)
XFree(h);
}
static void
cachemonitorinfo()
{
int prev_num = monitors_num;
MonitorInfo *prev_info = monitors_info;
XRRMonitorInfo *xmonitors = XRRGetMonitors(xw.dpy, XRootWindow(xw.dpy, xw.scr), 1, &monitors_num);
if (!monitors_num)
die("xrandr found no monitors");
monitors_info = xmalloc(monitors_num * sizeof(MonitorInfo));
for (int i = 0; i < monitors_num; ++i) {
XRRMonitorInfo *xm = &xmonitors[i];
MonitorInfo *m = &monitors_info[i];
m->name = xm->name;
m->x = xm->x;
m->y = xm->y;
m->w = xm->width;
m->h = xm->height;
float px_mm = ((float)m->w / xm->mwidth + (float)m->h / xm->mheight) / 2;
float px_pt = 25.4 * px_mm / 72;
m->defaultfontsize = defaultrelfontsize * px_pt;
// Override defaultfontsize (dpi) by user config
char *name = XGetAtomName(xw.dpy, xm->name);
for (int j = 0; j < LEN(monitors_config); ++j)
if (!strcmp(name, monitors_config[j].name)) {
m->defaultfontsize = monitors_config[j].defaultfontsize;
if (m->defaultfontsize < 0)
m->defaultfontsize *= -px_pt;
break;
}
// fprintf(stderr, "%s: %fpx, %f\n", name, m->defaultfontsize, m->usedfontsize);
XFree(name);
// Restore usedfontsize (zoom) after re-cache for monitors with the same name
m->usedfontsize = m->defaultfontsize;
for (int j = 0; j < prev_num; ++j)
if (prev_info[j].name == m->name) {
m->usedfontsize = prev_info[j].usedfontsize;
break;
}
}
XRRFreeMonitors(xmonitors);
free(prev_info);
}
static int
getmonitorindex_threshold(int w, int h, int x, int y)
{
int mindex = -1;
float fontsize = 0;
int thresholdarea = winmovethreshold * w * h;
for (int i = 0; i < monitors_num; ++i) {
MonitorInfo *m = &monitors_info[i];
int overlap_w = MAX(0, MIN(x + w, m->x + m->w) - MAX(x, m->x));
int overlap_h = MAX(0, MIN(y + h, m->y + m->h) - MAX(y, m->y));
int area = overlap_w * overlap_h;
// Choose monitor with largest dpi (defaultfontsize)
// from all "mirrored"/overlapped (e.g. projector)
if (area >= thresholdarea && fontsize < m->defaultfontsize) {
fontsize = m->defaultfontsize;
mindex = i;
}
}
return mindex;
}
static int
getmonitorindex_nearest(int w, int h, int x, int y)
{
int mindex = -1;
float fontsize = 0;
int overlaparea = 0;
for (int i = 0; i < monitors_num; ++i) {
MonitorInfo *m = &monitors_info[i];
int overlap_w = MAX(0, MIN(x + w, m->x + m->w) - MAX(x, m->x));
int overlap_h = MAX(0, MIN(y + h, m->y + m->h) - MAX(y, m->y));
int area = overlap_w * overlap_h;
// Choose monitor with largest overlapping area
// e.g. when "st" is initially spawned in-between monitors
if (area > overlaparea) {
overlaparea = area;
mindex = i;
}
}
return mindex;
}
static void
adjustmonitorfontsize(int mindex)
{
if (mindex < 0 || prev_mindex == mindex)
return;
// Save zoom of current monitor before switching
if (prev_mindex >= 0)
monitors_info[prev_mindex].usedfontsize = usedfontsize;
defaultfontsize = monitors_info[mindex].defaultfontsize;
// fprintf(stderr, "Crossing: %fpx\n", defaultfontsize);
// NOTE: do nothing if font size differs by less than 1%
double fontsize = monitors_info[mindex].usedfontsize;
double delta = 0.01 * usedfontsize;
if (!BETWEEN(fontsize - usedfontsize, -delta, delta)) {
// fprintf(stderr, "Adjusted: %fpx\n", fontsize);
xunloadfonts();
xloadfonts(usedfont, fontsize);
}
prev_mindex = mindex;
}
void
refreshxrandr(const Arg *dummy)
{
// Reset index to detect change of window association on "xrandr ... --primary"
// otherwise: zoom won't be saved on switching and new font size won't be loaded
// CRIT!!! event from xrandr may place another monitor into same index
if (prev_mindex >= 0)
monitors_info[prev_mindex].usedfontsize = usedfontsize;
prev_mindex = -1;
XWindowAttributes xattr = {0};
cachemonitorinfo();
XGetWindowAttributes(xw.dpy, xw.win, &xattr);
int mindex = getmonitorindex_threshold(xattr.width, xattr.height, xattr.x, xattr.y);
if (mindex < 0)
mindex = getmonitorindex_nearest(xattr.width, xattr.height, xattr.x, xattr.y);
adjustmonitorfontsize(mindex);
}
void
xbell(void)
{
@ -2062,14 +1937,6 @@ cmessage(XEvent *e)
void
resize(XEvent *e)
{
// BAD: no resize on monitor plug/unplug/reconfigure -- until window itself is kept in the same place
// NOTE: no resize event on zoomabs()
// fprintf(stderr, "Resize: %dx%d+%d+%d\n",
// e->xconfigure.width, e->xconfigure.height, e->xconfigure.x, e->xconfigure.y);
adjustmonitorfontsize(getmonitorindex_threshold(
e->xconfigure.width, e->xconfigure.height, e->xconfigure.x, e->xconfigure.y));
if (e->xconfigure.width == win.w && e->xconfigure.height == win.h)
return;
@ -2102,22 +1969,6 @@ run(void)
}
} while (ev.type != MapNotify);
int rr_event_base, rr_error_base, rr_major, rr_minor;
if (!XRRQueryExtension (xw.dpy, &rr_event_base, &rr_error_base) ||
!XRRQueryVersion (xw.dpy, &rr_major, &rr_minor) ||
rr_major < 1 || (rr_major == 1 && rr_minor < 5))
{
die("RandR 1.5 extension isn't available\n");
}
XRRSelectInput(xw.dpy, xw.win, RRCrtcChangeNotifyMask);
// WARN: can query actual window size/pos only after window is mapped and its width/height are adjusted by WM
// * x/y are WM-dependent and can't be determined beforehand anyway
// * defaultfontsize isn't available until font is loaded and actual Fc*() size queried
// BAD: fonts on startup are always reloaded -- how to specify their size beforehand ?
FcPatternGetDouble(dc.font.match->pattern, FC_SIZE, 0, &defaultrelfontsize);
refreshxrandr(0);
ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd);
cresize(w, h);
@ -2149,16 +2000,6 @@ run(void)
XNextEvent(xw.dpy, &ev);
if (XFilterEvent(&ev, None))
continue;
if (LASTEvent <= ev.type) {
if (rr_event_base + RRNotify == ev.type &&
RRNotify_CrtcChange == ((XRRNotifyEvent *)&ev)->subtype)
{
XRRUpdateConfiguration(&ev);
// fprintf(stderr, "Monitor change: %d > %d\n", rr_event_base, LASTEvent);
refreshxrandr(0);
}
continue;
}
if (handler[ev.type])
(handler[ev.type])(&ev);
}
@ -2229,6 +2070,9 @@ main(int argc, char *argv[])
case 'a':
allowaltscreen = 0;
break;
case 'A':
opt_alpha = EARGF(usage());
break;
case 'c':
opt_class = EARGF(usage());
break;