feat(st): 添加自动调整内边框
By default, st's window size always snaps to the nearest multiple of the character size plus a fixed inner border (set with borderpx in config.h). When the size of st does not perfectly match the space allocated to it (when using a tiling WM, for example), unsightly gaps will appear between st and other apps, or between instances of st. This patch allows st to resize to any pixel size, makes the inner border size dynamic, and centers the content of the terminal so that the left/right and top/bottom borders are balanced. With this patch, st on a tiling WM will always fill the entire space allocated to it.
This commit is contained in:
parent
4c7d6e242c
commit
d82014aa4b
164
st/patches/st-anysize-20220718-baa9357.diff
Normal file
164
st/patches/st-anysize-20220718-baa9357.diff
Normal file
@ -0,0 +1,164 @@
|
|||||||
|
From 8dcdc4b21a73268e167d98aa30f24315c7f3b7ff Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bakkeby <bakkeby@gmail.com>
|
||||||
|
Date: Mon, 18 Jul 2022 16:52:03 +0200
|
||||||
|
Subject: [PATCH] Adding anysize patch
|
||||||
|
|
||||||
|
---
|
||||||
|
x.c | 56 ++++++++++++++++++++++++++++++--------------------------
|
||||||
|
1 file changed, 30 insertions(+), 26 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index 2a3bd38..f534347 100644
|
||||||
|
--- a/x.c
|
||||||
|
+++ b/x.c
|
||||||
|
@@ -81,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 */
|
||||||
|
@@ -331,7 +332,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;
|
||||||
|
}
|
||||||
|
@@ -339,7 +340,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;
|
||||||
|
}
|
||||||
|
@@ -739,6 +740,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);
|
||||||
|
@@ -869,8 +873,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;
|
||||||
|
@@ -1152,8 +1156,8 @@ xinit(int cols, int rows)
|
||||||
|
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)
|
||||||
|
@@ -1242,7 +1246,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;
|
||||||
|
@@ -1375,7 +1379,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;
|
||||||
|
@@ -1465,17 +1469,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. */
|
||||||
|
@@ -1569,35 +1573,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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.37.1
|
||||||
|
|
52
st/x.c
52
st/x.c
@ -86,6 +86,7 @@ typedef XftGlyphFontSpec GlyphFontSpec;
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
int tw, th; /* tty width and height */
|
int tw, th; /* tty width and height */
|
||||||
int w, h; /* window width and height */
|
int w, h; /* window width and height */
|
||||||
|
int hborderpx, vborderpx;
|
||||||
int ch; /* char height */
|
int ch; /* char height */
|
||||||
int cw; /* char width */
|
int cw; /* char width */
|
||||||
int mode; /* window state/mode flags */
|
int mode; /* window state/mode flags */
|
||||||
@ -340,7 +341,7 @@ ttysend(const Arg *arg)
|
|||||||
int
|
int
|
||||||
evcol(XEvent *e)
|
evcol(XEvent *e)
|
||||||
{
|
{
|
||||||
int x = e->xbutton.x - borderpx;
|
int x = e->xbutton.x - win.hborderpx;
|
||||||
LIMIT(x, 0, win.tw - 1);
|
LIMIT(x, 0, win.tw - 1);
|
||||||
return x / win.cw;
|
return x / win.cw;
|
||||||
}
|
}
|
||||||
@ -348,7 +349,7 @@ evcol(XEvent *e)
|
|||||||
int
|
int
|
||||||
evrow(XEvent *e)
|
evrow(XEvent *e)
|
||||||
{
|
{
|
||||||
int y = e->xbutton.y - borderpx;
|
int y = e->xbutton.y - win.vborderpx;
|
||||||
LIMIT(y, 0, win.th - 1);
|
LIMIT(y, 0, win.th - 1);
|
||||||
return y / win.ch;
|
return y / win.ch;
|
||||||
}
|
}
|
||||||
@ -748,6 +749,9 @@ cresize(int width, int height)
|
|||||||
col = MAX(1, col);
|
col = MAX(1, col);
|
||||||
row = MAX(1, row);
|
row = MAX(1, row);
|
||||||
|
|
||||||
|
win.hborderpx = (win.w - col * win.cw) / 2;
|
||||||
|
win.vborderpx = (win.h - row * win.ch) / 2;
|
||||||
|
|
||||||
tresize(col, row);
|
tresize(col, row);
|
||||||
xresize(col, row);
|
xresize(col, row);
|
||||||
ttyresize(win.tw, win.th);
|
ttyresize(win.tw, win.th);
|
||||||
@ -888,8 +892,8 @@ xhints(void)
|
|||||||
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
|
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
|
||||||
sizeh->height = win.h;
|
sizeh->height = win.h;
|
||||||
sizeh->width = win.w;
|
sizeh->width = win.w;
|
||||||
sizeh->height_inc = win.ch;
|
sizeh->height_inc = 1;
|
||||||
sizeh->width_inc = win.cw;
|
sizeh->width_inc = 1;
|
||||||
sizeh->base_height = 2 * borderpx;
|
sizeh->base_height = 2 * borderpx;
|
||||||
sizeh->base_width = 2 * borderpx;
|
sizeh->base_width = 2 * borderpx;
|
||||||
sizeh->min_height = win.ch + 2 * borderpx;
|
sizeh->min_height = win.ch + 2 * borderpx;
|
||||||
@ -1277,7 +1281,7 @@ xinit(int w, int h)
|
|||||||
int
|
int
|
||||||
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
|
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;
|
ushort mode, prevmode = USHRT_MAX;
|
||||||
Font *font = &dc.font;
|
Font *font = &dc.font;
|
||||||
int frcflags = FRC_NORMAL;
|
int frcflags = FRC_NORMAL;
|
||||||
@ -1410,7 +1414,7 @@ void
|
|||||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
||||||
{
|
{
|
||||||
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
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;
|
width = charlen * win.cw;
|
||||||
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
|
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
|
||||||
XRenderColor colfg, colbg;
|
XRenderColor colfg, colbg;
|
||||||
@ -1500,17 +1504,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|||||||
|
|
||||||
/* Intelligent cleaning up of the borders. */
|
/* Intelligent cleaning up of the borders. */
|
||||||
if (x == 0) {
|
if (x == 0) {
|
||||||
xclear(0, (y == 0)? 0 : winy, borderpx,
|
xclear(0, (y == 0)? 0 : winy, win.hborderpx,
|
||||||
winy + win.ch +
|
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,
|
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)
|
if (y == 0)
|
||||||
xclear(winx, 0, winx + width, borderpx);
|
xclear(winx, 0, winx + width, win.vborderpx);
|
||||||
if (winy + win.ch >= borderpx + win.th)
|
if (winy + win.ch >= win.vborderpx + win.th)
|
||||||
xclear(winx, winy + win.ch, winx + width, win.h);
|
xclear(winx, winy + win.ch, winx + width, win.h);
|
||||||
|
|
||||||
/* Clean up the region we want to draw to. */
|
/* Clean up the region we want to draw to. */
|
||||||
@ -1604,35 +1608,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
|||||||
case 3: /* Blinking Underline */
|
case 3: /* Blinking Underline */
|
||||||
case 4: /* Steady Underline */
|
case 4: /* Steady Underline */
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
borderpx + cx * win.cw,
|
win.hborderpx + cx * win.cw,
|
||||||
borderpx + (cy + 1) * win.ch - \
|
win.vborderpx + (cy + 1) * win.ch - \
|
||||||
cursorthickness,
|
cursorthickness,
|
||||||
win.cw, cursorthickness);
|
win.cw, cursorthickness);
|
||||||
break;
|
break;
|
||||||
case 5: /* Blinking bar */
|
case 5: /* Blinking bar */
|
||||||
case 6: /* Steady bar */
|
case 6: /* Steady bar */
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
borderpx + cx * win.cw,
|
win.hborderpx + cx * win.cw,
|
||||||
borderpx + cy * win.ch,
|
win.vborderpx + cy * win.ch,
|
||||||
cursorthickness, win.ch);
|
cursorthickness, win.ch);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
borderpx + cx * win.cw,
|
win.hborderpx + cx * win.cw,
|
||||||
borderpx + cy * win.ch,
|
win.vborderpx + cy * win.ch,
|
||||||
win.cw - 1, 1);
|
win.cw - 1, 1);
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
borderpx + cx * win.cw,
|
win.hborderpx + cx * win.cw,
|
||||||
borderpx + cy * win.ch,
|
win.vborderpx + cy * win.ch,
|
||||||
1, win.ch - 1);
|
1, win.ch - 1);
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
borderpx + (cx + 1) * win.cw - 1,
|
win.hborderpx + (cx + 1) * win.cw - 1,
|
||||||
borderpx + cy * win.ch,
|
win.vborderpx + cy * win.ch,
|
||||||
1, win.ch - 1);
|
1, win.ch - 1);
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
borderpx + cx * win.cw,
|
win.hborderpx + cx * win.cw,
|
||||||
borderpx + (cy + 1) * win.ch - 1,
|
win.vborderpx + (cy + 1) * win.ch - 1,
|
||||||
win.cw, 1);
|
win.cw, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user