mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 08:53:56 -05:00
finished configuring st
This commit is contained in:
ISnortPennies
parent
f353281d6b
commit
f543cd8e23
31 changed files with 10156 additions and 11 deletions
732
suckless/st-patches/1-boxdraw-wide-glyphs.diff
Normal file
732
suckless/st-patches/1-boxdraw-wide-glyphs.diff
Normal file
|
|
@ -0,0 +1,732 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 470ac86..6dfa212 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
include config.mk
|
||||
|
||||
-SRC = st.c x.c
|
||||
+SRC = st.c x.c boxdraw.c
|
||||
OBJ = $(SRC:.c=.o)
|
||||
|
||||
all: options st
|
||||
@@ -23,6 +23,7 @@ config.h:
|
||||
|
||||
st.o: config.h st.h win.h
|
||||
x.o: arg.h config.h st.h win.h
|
||||
+boxdraw.o: config.h st.h boxdraw_data.h
|
||||
|
||||
$(OBJ): config.h config.mk
|
||||
|
||||
diff --git a/boxdraw.c b/boxdraw.c
|
||||
new file mode 100644
|
||||
index 0000000..28a92d0
|
||||
--- /dev/null
|
||||
+++ b/boxdraw.c
|
||||
@@ -0,0 +1,194 @@
|
||||
+/*
|
||||
+ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
|
||||
+ * MIT/X Consortium License
|
||||
+ */
|
||||
+
|
||||
+#include <X11/Xft/Xft.h>
|
||||
+#include "st.h"
|
||||
+#include "boxdraw_data.h"
|
||||
+
|
||||
+/* Rounded non-negative integers division of n / d */
|
||||
+#define DIV(n, d) (((n) + (d) / 2) / (d))
|
||||
+
|
||||
+static Display *xdpy;
|
||||
+static Colormap xcmap;
|
||||
+static XftDraw *xd;
|
||||
+static Visual *xvis;
|
||||
+
|
||||
+static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort);
|
||||
+static void drawboxlines(int, int, int, int, XftColor *, ushort);
|
||||
+
|
||||
+/* public API */
|
||||
+
|
||||
+void
|
||||
+boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis)
|
||||
+{
|
||||
+ xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis;
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+isboxdraw(Rune u)
|
||||
+{
|
||||
+ Rune block = u & ~0xff;
|
||||
+ return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) ||
|
||||
+ (boxdraw_braille && block == 0x2800);
|
||||
+}
|
||||
+
|
||||
+/* the "index" is actually the entire shape data encoded as ushort */
|
||||
+ushort
|
||||
+boxdrawindex(const Glyph *g)
|
||||
+{
|
||||
+ if (boxdraw_braille && (g->u & ~0xff) == 0x2800)
|
||||
+ return BRL | (uint8_t)g->u;
|
||||
+ if (boxdraw_bold && (g->mode & ATTR_BOLD))
|
||||
+ return BDB | boxdata[(uint8_t)g->u];
|
||||
+ return boxdata[(uint8_t)g->u];
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg,
|
||||
+ const XftGlyphFontSpec *specs, int len)
|
||||
+{
|
||||
+ for ( ; len-- > 0; x += cw, specs++)
|
||||
+ drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph);
|
||||
+}
|
||||
+
|
||||
+/* implementation */
|
||||
+
|
||||
+void
|
||||
+drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd)
|
||||
+{
|
||||
+ ushort cat = bd & ~(BDB | 0xff); /* mask out bold and data */
|
||||
+ if (bd & (BDL | BDA)) {
|
||||
+ /* lines (light/double/heavy/arcs) */
|
||||
+ drawboxlines(x, y, w, h, fg, bd);
|
||||
+
|
||||
+ } else if (cat == BBD) {
|
||||
+ /* lower (8-X)/8 block */
|
||||
+ int d = DIV((uint8_t)bd * h, 8);
|
||||
+ XftDrawRect(xd, fg, x, y + d, w, h - d);
|
||||
+
|
||||
+ } else if (cat == BBU) {
|
||||
+ /* upper X/8 block */
|
||||
+ XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8));
|
||||
+
|
||||
+ } else if (cat == BBL) {
|
||||
+ /* left X/8 block */
|
||||
+ XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h);
|
||||
+
|
||||
+ } else if (cat == BBR) {
|
||||
+ /* right (8-X)/8 block */
|
||||
+ int d = DIV((uint8_t)bd * w, 8);
|
||||
+ XftDrawRect(xd, fg, x + d, y, w - d, h);
|
||||
+
|
||||
+ } else if (cat == BBQ) {
|
||||
+ /* Quadrants */
|
||||
+ int w2 = DIV(w, 2), h2 = DIV(h, 2);
|
||||
+ if (bd & TL)
|
||||
+ XftDrawRect(xd, fg, x, y, w2, h2);
|
||||
+ if (bd & TR)
|
||||
+ XftDrawRect(xd, fg, x + w2, y, w - w2, h2);
|
||||
+ if (bd & BL)
|
||||
+ XftDrawRect(xd, fg, x, y + h2, w2, h - h2);
|
||||
+ if (bd & BR)
|
||||
+ XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2);
|
||||
+
|
||||
+ } else if (bd & BBS) {
|
||||
+ /* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */
|
||||
+ int d = (uint8_t)bd;
|
||||
+ XftColor xfc;
|
||||
+ XRenderColor xrc = { .alpha = 0xffff };
|
||||
+
|
||||
+ xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4);
|
||||
+ xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4);
|
||||
+ xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4);
|
||||
+
|
||||
+ XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc);
|
||||
+ XftDrawRect(xd, &xfc, x, y, w, h);
|
||||
+ XftColorFree(xdpy, xvis, xcmap, &xfc);
|
||||
+
|
||||
+ } else if (cat == BRL) {
|
||||
+ /* braille, each data bit corresponds to one dot at 2x4 grid */
|
||||
+ int w1 = DIV(w, 2);
|
||||
+ int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4);
|
||||
+
|
||||
+ if (bd & 1) XftDrawRect(xd, fg, x, y, w1, h1);
|
||||
+ if (bd & 2) XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1);
|
||||
+ if (bd & 4) XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2);
|
||||
+ if (bd & 8) XftDrawRect(xd, fg, x + w1, y, w - w1, h1);
|
||||
+ if (bd & 16) XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1);
|
||||
+ if (bd & 32) XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2);
|
||||
+ if (bd & 64) XftDrawRect(xd, fg, x, y + h3, w1, h - h3);
|
||||
+ if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3);
|
||||
+
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd)
|
||||
+{
|
||||
+ /* s: stem thickness. width/8 roughly matches underscore thickness. */
|
||||
+ /* We draw bold as 1.5 * normal-stem and at least 1px thicker. */
|
||||
+ /* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */
|
||||
+ int mwh = MIN(w, h);
|
||||
+ int base_s = MAX(1, DIV(mwh, 8));
|
||||
+ int bold = (bd & BDB) && mwh >= 6; /* possibly ignore boldness */
|
||||
+ int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s;
|
||||
+ int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2);
|
||||
+ /* the s-by-s square (x + w2, y + h2, s, s) is the center texel. */
|
||||
+ /* The base length (per direction till edge) includes this square. */
|
||||
+
|
||||
+ int light = bd & (LL | LU | LR | LD);
|
||||
+ int double_ = bd & (DL | DU | DR | DD);
|
||||
+
|
||||
+ if (light) {
|
||||
+ /* d: additional (negative) length to not-draw the center */
|
||||
+ /* texel - at arcs and avoid drawing inside (some) doubles */
|
||||
+ int arc = bd & BDA;
|
||||
+ int multi_light = light & (light - 1);
|
||||
+ int multi_double = double_ & (double_ - 1);
|
||||
+ /* light crosses double only at DH+LV, DV+LH (ref. shapes) */
|
||||
+ int d = arc || (multi_double && !multi_light) ? -s : 0;
|
||||
+
|
||||
+ if (bd & LL)
|
||||
+ XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s);
|
||||
+ if (bd & LU)
|
||||
+ XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d);
|
||||
+ if (bd & LR)
|
||||
+ XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s);
|
||||
+ if (bd & LD)
|
||||
+ XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d);
|
||||
+ }
|
||||
+
|
||||
+ /* double lines - also align with light to form heavy when combined */
|
||||
+ if (double_) {
|
||||
+ /*
|
||||
+ * going clockwise, for each double-ray: p is additional length
|
||||
+ * to the single-ray nearer to the previous direction, and n to
|
||||
+ * the next. p and n adjust from the base length to lengths
|
||||
+ * which consider other doubles - shorter to avoid intersections
|
||||
+ * (p, n), or longer to draw the far-corner texel (n).
|
||||
+ */
|
||||
+ int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD;
|
||||
+ if (dl) {
|
||||
+ int p = dd ? -s : 0, n = du ? -s : dd ? s : 0;
|
||||
+ XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s);
|
||||
+ XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s);
|
||||
+ }
|
||||
+ if (du) {
|
||||
+ int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0;
|
||||
+ XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p);
|
||||
+ XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n);
|
||||
+ }
|
||||
+ if (dr) {
|
||||
+ int p = du ? -s : 0, n = dd ? -s : du ? s : 0;
|
||||
+ XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s);
|
||||
+ XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s);
|
||||
+ }
|
||||
+ if (dd) {
|
||||
+ int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0;
|
||||
+ XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p);
|
||||
+ XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/boxdraw_data.h b/boxdraw_data.h
|
||||
new file mode 100644
|
||||
index 0000000..7890500
|
||||
--- /dev/null
|
||||
+++ b/boxdraw_data.h
|
||||
@@ -0,0 +1,214 @@
|
||||
+/*
|
||||
+ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
|
||||
+ * MIT/X Consortium License
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * U+25XX codepoints data
|
||||
+ *
|
||||
+ * References:
|
||||
+ * http://www.unicode.org/charts/PDF/U2500.pdf
|
||||
+ * http://www.unicode.org/charts/PDF/U2580.pdf
|
||||
+ *
|
||||
+ * Test page:
|
||||
+ * https://github.com/GNOME/vte/blob/master/doc/boxes.txt
|
||||
+ */
|
||||
+
|
||||
+/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */
|
||||
+/* Categories (mutually exclusive except BDB): */
|
||||
+/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */
|
||||
+#define BDL (1<<8) /* Box Draw Lines (light/double/heavy) */
|
||||
+#define BDA (1<<9) /* Box Draw Arc (light) */
|
||||
+
|
||||
+#define BBD (1<<10) /* Box Block Down (lower) X/8 */
|
||||
+#define BBL (2<<10) /* Box Block Left X/8 */
|
||||
+#define BBU (3<<10) /* Box Block Upper X/8 */
|
||||
+#define BBR (4<<10) /* Box Block Right X/8 */
|
||||
+#define BBQ (5<<10) /* Box Block Quadrants */
|
||||
+#define BRL (6<<10) /* Box Braille (data is lower byte of U28XX) */
|
||||
+
|
||||
+#define BBS (1<<14) /* Box Block Shades */
|
||||
+#define BDB (1<<15) /* Box Draw is Bold */
|
||||
+
|
||||
+/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical */
|
||||
+/* Heavy is light+double (literally drawing light+double align to form heavy) */
|
||||
+#define LL (1<<0)
|
||||
+#define LU (1<<1)
|
||||
+#define LR (1<<2)
|
||||
+#define LD (1<<3)
|
||||
+#define LH (LL+LR)
|
||||
+#define LV (LU+LD)
|
||||
+
|
||||
+#define DL (1<<4)
|
||||
+#define DU (1<<5)
|
||||
+#define DR (1<<6)
|
||||
+#define DD (1<<7)
|
||||
+#define DH (DL+DR)
|
||||
+#define DV (DU+DD)
|
||||
+
|
||||
+#define HL (LL+DL)
|
||||
+#define HU (LU+DU)
|
||||
+#define HR (LR+DR)
|
||||
+#define HD (LD+DD)
|
||||
+#define HH (HL+HR)
|
||||
+#define HV (HU+HD)
|
||||
+
|
||||
+/* (BBQ) Quadrants Top/Bottom x Left/Right */
|
||||
+#define TL (1<<0)
|
||||
+#define TR (1<<1)
|
||||
+#define BL (1<<2)
|
||||
+#define BR (1<<3)
|
||||
+
|
||||
+/* Data for U+2500 - U+259F except dashes/diagonals */
|
||||
+static const unsigned short boxdata[256] = {
|
||||
+ /* light lines */
|
||||
+ [0x00] = BDL + LH, /* light horizontal */
|
||||
+ [0x02] = BDL + LV, /* light vertical */
|
||||
+ [0x0c] = BDL + LD + LR, /* light down and right */
|
||||
+ [0x10] = BDL + LD + LL, /* light down and left */
|
||||
+ [0x14] = BDL + LU + LR, /* light up and right */
|
||||
+ [0x18] = BDL + LU + LL, /* light up and left */
|
||||
+ [0x1c] = BDL + LV + LR, /* light vertical and right */
|
||||
+ [0x24] = BDL + LV + LL, /* light vertical and left */
|
||||
+ [0x2c] = BDL + LH + LD, /* light horizontal and down */
|
||||
+ [0x34] = BDL + LH + LU, /* light horizontal and up */
|
||||
+ [0x3c] = BDL + LV + LH, /* light vertical and horizontal */
|
||||
+ [0x74] = BDL + LL, /* light left */
|
||||
+ [0x75] = BDL + LU, /* light up */
|
||||
+ [0x76] = BDL + LR, /* light right */
|
||||
+ [0x77] = BDL + LD, /* light down */
|
||||
+
|
||||
+ /* heavy [+light] lines */
|
||||
+ [0x01] = BDL + HH,
|
||||
+ [0x03] = BDL + HV,
|
||||
+ [0x0d] = BDL + HR + LD,
|
||||
+ [0x0e] = BDL + HD + LR,
|
||||
+ [0x0f] = BDL + HD + HR,
|
||||
+ [0x11] = BDL + HL + LD,
|
||||
+ [0x12] = BDL + HD + LL,
|
||||
+ [0x13] = BDL + HD + HL,
|
||||
+ [0x15] = BDL + HR + LU,
|
||||
+ [0x16] = BDL + HU + LR,
|
||||
+ [0x17] = BDL + HU + HR,
|
||||
+ [0x19] = BDL + HL + LU,
|
||||
+ [0x1a] = BDL + HU + LL,
|
||||
+ [0x1b] = BDL + HU + HL,
|
||||
+ [0x1d] = BDL + HR + LV,
|
||||
+ [0x1e] = BDL + HU + LD + LR,
|
||||
+ [0x1f] = BDL + HD + LR + LU,
|
||||
+ [0x20] = BDL + HV + LR,
|
||||
+ [0x21] = BDL + HU + HR + LD,
|
||||
+ [0x22] = BDL + HD + HR + LU,
|
||||
+ [0x23] = BDL + HV + HR,
|
||||
+ [0x25] = BDL + HL + LV,
|
||||
+ [0x26] = BDL + HU + LD + LL,
|
||||
+ [0x27] = BDL + HD + LU + LL,
|
||||
+ [0x28] = BDL + HV + LL,
|
||||
+ [0x29] = BDL + HU + HL + LD,
|
||||
+ [0x2a] = BDL + HD + HL + LU,
|
||||
+ [0x2b] = BDL + HV + HL,
|
||||
+ [0x2d] = BDL + HL + LD + LR,
|
||||
+ [0x2e] = BDL + HR + LL + LD,
|
||||
+ [0x2f] = BDL + HH + LD,
|
||||
+ [0x30] = BDL + HD + LH,
|
||||
+ [0x31] = BDL + HD + HL + LR,
|
||||
+ [0x32] = BDL + HR + HD + LL,
|
||||
+ [0x33] = BDL + HH + HD,
|
||||
+ [0x35] = BDL + HL + LU + LR,
|
||||
+ [0x36] = BDL + HR + LU + LL,
|
||||
+ [0x37] = BDL + HH + LU,
|
||||
+ [0x38] = BDL + HU + LH,
|
||||
+ [0x39] = BDL + HU + HL + LR,
|
||||
+ [0x3a] = BDL + HU + HR + LL,
|
||||
+ [0x3b] = BDL + HH + HU,
|
||||
+ [0x3d] = BDL + HL + LV + LR,
|
||||
+ [0x3e] = BDL + HR + LV + LL,
|
||||
+ [0x3f] = BDL + HH + LV,
|
||||
+ [0x40] = BDL + HU + LH + LD,
|
||||
+ [0x41] = BDL + HD + LH + LU,
|
||||
+ [0x42] = BDL + HV + LH,
|
||||
+ [0x43] = BDL + HU + HL + LD + LR,
|
||||
+ [0x44] = BDL + HU + HR + LD + LL,
|
||||
+ [0x45] = BDL + HD + HL + LU + LR,
|
||||
+ [0x46] = BDL + HD + HR + LU + LL,
|
||||
+ [0x47] = BDL + HH + HU + LD,
|
||||
+ [0x48] = BDL + HH + HD + LU,
|
||||
+ [0x49] = BDL + HV + HL + LR,
|
||||
+ [0x4a] = BDL + HV + HR + LL,
|
||||
+ [0x4b] = BDL + HV + HH,
|
||||
+ [0x78] = BDL + HL,
|
||||
+ [0x79] = BDL + HU,
|
||||
+ [0x7a] = BDL + HR,
|
||||
+ [0x7b] = BDL + HD,
|
||||
+ [0x7c] = BDL + HR + LL,
|
||||
+ [0x7d] = BDL + HD + LU,
|
||||
+ [0x7e] = BDL + HL + LR,
|
||||
+ [0x7f] = BDL + HU + LD,
|
||||
+
|
||||
+ /* double [+light] lines */
|
||||
+ [0x50] = BDL + DH,
|
||||
+ [0x51] = BDL + DV,
|
||||
+ [0x52] = BDL + DR + LD,
|
||||
+ [0x53] = BDL + DD + LR,
|
||||
+ [0x54] = BDL + DR + DD,
|
||||
+ [0x55] = BDL + DL + LD,
|
||||
+ [0x56] = BDL + DD + LL,
|
||||
+ [0x57] = BDL + DL + DD,
|
||||
+ [0x58] = BDL + DR + LU,
|
||||
+ [0x59] = BDL + DU + LR,
|
||||
+ [0x5a] = BDL + DU + DR,
|
||||
+ [0x5b] = BDL + DL + LU,
|
||||
+ [0x5c] = BDL + DU + LL,
|
||||
+ [0x5d] = BDL + DL + DU,
|
||||
+ [0x5e] = BDL + DR + LV,
|
||||
+ [0x5f] = BDL + DV + LR,
|
||||
+ [0x60] = BDL + DV + DR,
|
||||
+ [0x61] = BDL + DL + LV,
|
||||
+ [0x62] = BDL + DV + LL,
|
||||
+ [0x63] = BDL + DV + DL,
|
||||
+ [0x64] = BDL + DH + LD,
|
||||
+ [0x65] = BDL + DD + LH,
|
||||
+ [0x66] = BDL + DD + DH,
|
||||
+ [0x67] = BDL + DH + LU,
|
||||
+ [0x68] = BDL + DU + LH,
|
||||
+ [0x69] = BDL + DH + DU,
|
||||
+ [0x6a] = BDL + DH + LV,
|
||||
+ [0x6b] = BDL + DV + LH,
|
||||
+ [0x6c] = BDL + DH + DV,
|
||||
+
|
||||
+ /* (light) arcs */
|
||||
+ [0x6d] = BDA + LD + LR,
|
||||
+ [0x6e] = BDA + LD + LL,
|
||||
+ [0x6f] = BDA + LU + LL,
|
||||
+ [0x70] = BDA + LU + LR,
|
||||
+
|
||||
+ /* Lower (Down) X/8 block (data is 8 - X) */
|
||||
+ [0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4,
|
||||
+ [0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0,
|
||||
+
|
||||
+ /* Left X/8 block (data is X) */
|
||||
+ [0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4,
|
||||
+ [0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1,
|
||||
+
|
||||
+ /* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */
|
||||
+ [0x80] = BBU + 4, [0x94] = BBU + 1,
|
||||
+ [0x90] = BBR + 4, [0x95] = BBR + 7,
|
||||
+
|
||||
+ /* Quadrants */
|
||||
+ [0x96] = BBQ + BL,
|
||||
+ [0x97] = BBQ + BR,
|
||||
+ [0x98] = BBQ + TL,
|
||||
+ [0x99] = BBQ + TL + BL + BR,
|
||||
+ [0x9a] = BBQ + TL + BR,
|
||||
+ [0x9b] = BBQ + TL + TR + BL,
|
||||
+ [0x9c] = BBQ + TL + TR + BR,
|
||||
+ [0x9d] = BBQ + TR,
|
||||
+ [0x9e] = BBQ + BL + TR,
|
||||
+ [0x9f] = BBQ + BL + TR + BR,
|
||||
+
|
||||
+ /* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */
|
||||
+ [0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3,
|
||||
+
|
||||
+ /* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */
|
||||
+ /* U+2571 - U+2573: unsupported (diagonals) */
|
||||
+};
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 91ab8ca..7bb3ff7 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -67,6 +67,18 @@ static unsigned int blinktimeout = 800;
|
||||
*/
|
||||
static unsigned int cursorthickness = 2;
|
||||
|
||||
+/*
|
||||
+ * 1: render most of the lines/blocks characters without using the font for
|
||||
+ * perfect alignment between cells (U2500 - U259F except dashes/diagonals).
|
||||
+ * Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
||||
+ * 0: disable (render all U25XX glyphs normally from the font).
|
||||
+ */
|
||||
+const int boxdraw = 0;
|
||||
+const int boxdraw_bold = 0;
|
||||
+
|
||||
+/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
||||
+const int boxdraw_braille = 0;
|
||||
+
|
||||
/*
|
||||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
||||
* it
|
||||
diff --git a/st.c b/st.c
|
||||
index 62def59..41d5ace 100644
|
||||
--- a/st.c
|
||||
+++ b/st.c
|
||||
@@ -1215,6 +1215,9 @@ tsetchar(Rune u, const Glyph *attr, int x, int y)
|
||||
term.dirty[y] = 1;
|
||||
term.line[y][x] = *attr;
|
||||
term.line[y][x].u = u;
|
||||
+
|
||||
+ if (isboxdraw(u))
|
||||
+ term.line[y][x].mode |= ATTR_BOXDRAW;
|
||||
}
|
||||
|
||||
void
|
||||
diff --git a/st.h b/st.h
|
||||
index fd3b0d8..c44dc5d 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -33,9 +33,16 @@ enum glyph_attribute {
|
||||
ATTR_WRAP = 1 << 8,
|
||||
ATTR_WIDE = 1 << 9,
|
||||
ATTR_WDUMMY = 1 << 10,
|
||||
+ ATTR_BOXDRAW = 1 << 11,
|
||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||
};
|
||||
|
||||
+enum drawing_mode {
|
||||
+ DRAW_NONE = 0,
|
||||
+ DRAW_BG = 1 << 0,
|
||||
+ DRAW_FG = 1 << 1,
|
||||
+};
|
||||
+
|
||||
enum selection_mode {
|
||||
SEL_IDLE = 0,
|
||||
SEL_EMPTY = 1,
|
||||
@@ -111,6 +118,14 @@ void *xmalloc(size_t);
|
||||
void *xrealloc(void *, size_t);
|
||||
char *xstrdup(const char *);
|
||||
|
||||
+int isboxdraw(Rune);
|
||||
+ushort boxdrawindex(const Glyph *);
|
||||
+#ifdef XFT_VERSION
|
||||
+/* only exposed to x.c, otherwise we'll need Xft.h for the types */
|
||||
+void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *);
|
||||
+void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int);
|
||||
+#endif
|
||||
+
|
||||
/* config.h globals */
|
||||
extern char *utmp;
|
||||
extern char *scroll;
|
||||
@@ -124,3 +139,4 @@ extern unsigned int tabspaces;
|
||||
extern unsigned int defaultfg;
|
||||
extern unsigned int defaultbg;
|
||||
extern unsigned int defaultcs;
|
||||
+extern const int boxdraw, boxdraw_bold, boxdraw_braille;
|
||||
diff --git a/x.c b/x.c
|
||||
index 2a3bd38..1311c0d 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -142,7 +142,7 @@ typedef struct {
|
||||
|
||||
static inline ushort sixd_to_16bit(int);
|
||||
static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
|
||||
-static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
|
||||
+static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int);
|
||||
static void xdrawglyph(Glyph, int, int);
|
||||
static void xclear(int, int, int, int);
|
||||
static int xgeommasktogravity(int);
|
||||
@@ -1237,6 +1237,8 @@ xinit(int cols, int rows)
|
||||
xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
|
||||
if (xsel.xtarget == None)
|
||||
xsel.xtarget = XA_STRING;
|
||||
+
|
||||
+ boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
|
||||
}
|
||||
|
||||
int
|
||||
@@ -1283,8 +1285,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||
yp = winy + font->ascent;
|
||||
}
|
||||
|
||||
- /* Lookup character index with default font. */
|
||||
- glyphidx = XftCharIndex(xw.dpy, font->match, rune);
|
||||
+ if (mode & ATTR_BOXDRAW) {
|
||||
+ /* minor shoehorning: boxdraw uses only this ushort */
|
||||
+ glyphidx = boxdrawindex(&glyphs[i]);
|
||||
+ } else {
|
||||
+ /* Lookup character index with default font. */
|
||||
+ glyphidx = XftCharIndex(xw.dpy, font->match, rune);
|
||||
+ }
|
||||
if (glyphidx) {
|
||||
specs[numspecs].font = font->match;
|
||||
specs[numspecs].glyph = glyphidx;
|
||||
@@ -1372,7 +1379,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||
}
|
||||
|
||||
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 dmode)
|
||||
{
|
||||
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
||||
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
||||
@@ -1463,47 +1470,45 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
if (base.mode & ATTR_INVISIBLE)
|
||||
fg = bg;
|
||||
|
||||
- /* Intelligent cleaning up of the borders. */
|
||||
- if (x == 0) {
|
||||
- xclear(0, (y == 0)? 0 : winy, borderpx,
|
||||
- winy + win.ch +
|
||||
- ((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
||||
- }
|
||||
- if (winx + width >= borderpx + win.tw) {
|
||||
- xclear(winx + width, (y == 0)? 0 : winy, win.w,
|
||||
- ((winy + win.ch >= borderpx + 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, winy + win.ch, winx + width, win.h);
|
||||
-
|
||||
- /* Clean up the region we want to draw to. */
|
||||
- XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
|
||||
-
|
||||
- /* Set the clip region because Xft is sometimes dirty. */
|
||||
- r.x = 0;
|
||||
- r.y = 0;
|
||||
- r.height = win.ch;
|
||||
- r.width = width;
|
||||
- XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
|
||||
-
|
||||
- /* Render the glyphs. */
|
||||
- XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
|
||||
-
|
||||
- /* Render underline and strikethrough. */
|
||||
- if (base.mode & ATTR_UNDERLINE) {
|
||||
- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
|
||||
- width, 1);
|
||||
- }
|
||||
+ if (dmode & DRAW_BG) {
|
||||
+ /* Intelligent cleaning up of the borders. */
|
||||
+ if (x == 0) {
|
||||
+ xclear(0, (y == 0)? 0 : winy, borderpx,
|
||||
+ winy + win.ch +
|
||||
+ ((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
||||
+ }
|
||||
+ if (winx + width >= borderpx + win.tw) {
|
||||
+ xclear(winx + width, (y == 0)? 0 : winy, win.w,
|
||||
+ ((winy + win.ch >= borderpx + 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, winy + win.ch, winx + width, win.h);
|
||||
+ /* Fill the background */
|
||||
+ XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ if (dmode & DRAW_FG) {
|
||||
+ if (base.mode & ATTR_BOXDRAW) {
|
||||
+ drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
|
||||
+ } else {
|
||||
+ /* Render the glyphs. */
|
||||
+ XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
|
||||
+ }
|
||||
|
||||
- if (base.mode & ATTR_STRUCK) {
|
||||
- XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
|
||||
- width, 1);
|
||||
- }
|
||||
+ /* Render underline and strikethrough. */
|
||||
+ if (base.mode & ATTR_UNDERLINE) {
|
||||
+ XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
|
||||
+ width, 1);
|
||||
+ }
|
||||
|
||||
- /* Reset clip to none. */
|
||||
- XftDrawSetClip(xw.draw, 0);
|
||||
+ if (base.mode & ATTR_STRUCK) {
|
||||
+ XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
|
||||
+ width, 1);
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1513,7 +1518,7 @@ xdrawglyph(Glyph g, int x, int y)
|
||||
XftGlyphFontSpec spec;
|
||||
|
||||
numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
|
||||
- xdrawglyphfontspecs(&spec, g, numspecs, x, y);
|
||||
+ xdrawglyphfontspecs(&spec, g, numspecs, x, y, DRAW_BG | DRAW_FG);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1532,7 +1537,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
/*
|
||||
* Select the right color for the right mode.
|
||||
*/
|
||||
- g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
|
||||
+ g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW;
|
||||
|
||||
if (IS_SET(MODE_REVERSE)) {
|
||||
g.mode |= ATTR_REVERSE;
|
||||
@@ -1648,32 +1653,39 @@ xstartdraw(void)
|
||||
void
|
||||
xdrawline(Line line, int x1, int y1, int x2)
|
||||
{
|
||||
- int i, x, ox, numspecs;
|
||||
+ int i, x, ox, numspecs, numspecs_cached;
|
||||
Glyph base, new;
|
||||
- XftGlyphFontSpec *specs = xw.specbuf;
|
||||
-
|
||||
- numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
|
||||
- i = ox = 0;
|
||||
- for (x = x1; x < x2 && i < numspecs; x++) {
|
||||
- new = line[x];
|
||||
- if (new.mode == ATTR_WDUMMY)
|
||||
- continue;
|
||||
- if (selected(x, y1))
|
||||
- new.mode ^= ATTR_REVERSE;
|
||||
- if (i > 0 && ATTRCMP(base, new)) {
|
||||
- xdrawglyphfontspecs(specs, base, i, ox, y1);
|
||||
- specs += i;
|
||||
- numspecs -= i;
|
||||
- i = 0;
|
||||
- }
|
||||
- if (i == 0) {
|
||||
- ox = x;
|
||||
- base = new;
|
||||
+ XftGlyphFontSpec *specs;
|
||||
+
|
||||
+ numspecs_cached = xmakeglyphfontspecs(xw.specbuf, &line[x1], x2 - x1, x1, y1);
|
||||
+
|
||||
+ /* Draw line in 2 passes: background and foreground. This way wide glyphs
|
||||
+ won't get truncated (#223) */
|
||||
+ for (int dmode = DRAW_BG; dmode <= DRAW_FG; dmode <<= 1) {
|
||||
+ specs = xw.specbuf;
|
||||
+ numspecs = numspecs_cached;
|
||||
+ i = ox = 0;
|
||||
+ for (x = x1; x < x2 && i < numspecs; x++) {
|
||||
+ new = line[x];
|
||||
+ if (new.mode == ATTR_WDUMMY)
|
||||
+ continue;
|
||||
+ if (selected(x, y1))
|
||||
+ new.mode ^= ATTR_REVERSE;
|
||||
+ if (i > 0 && ATTRCMP(base, new)) {
|
||||
+ xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
|
||||
+ specs += i;
|
||||
+ numspecs -= i;
|
||||
+ i = 0;
|
||||
+ }
|
||||
+ if (i == 0) {
|
||||
+ ox = x;
|
||||
+ base = new;
|
||||
+ }
|
||||
+ i++;
|
||||
}
|
||||
- i++;
|
||||
+ if (i > 0)
|
||||
+ xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
|
||||
}
|
||||
- if (i > 0)
|
||||
- xdrawglyphfontspecs(specs, base, i, ox, y1);
|
||||
}
|
||||
|
||||
void
|
||||
607
suckless/st-patches/10-undercurl.diff
Normal file
607
suckless/st-patches/10-undercurl.diff
Normal file
|
|
@ -0,0 +1,607 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index 0771ad8..9c0870c 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -497,3 +497,27 @@ static char ascii_printable[] =
|
||||
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
||||
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
||||
"`abcdefghijklmnopqrstuvwxyz{|}~";
|
||||
+
|
||||
+/**
|
||||
+ * Undercurl style. Set UNDERCURL_STYLE to one of the available styles.
|
||||
+ *
|
||||
+ * Curly: Dunno how to draw it *shrug*
|
||||
+ * _ _ _ _
|
||||
+ * ( ) ( ) ( ) ( )
|
||||
+ * (_) (_) (_) (_)
|
||||
+ *
|
||||
+ * Spiky:
|
||||
+ * /\ /\ /\ /\
|
||||
+ * \/ \/ \/
|
||||
+ *
|
||||
+ * Capped:
|
||||
+ * _ _ _
|
||||
+ * / \ / \ / \
|
||||
+ * \_/ \_/
|
||||
+ */
|
||||
+// Available styles
|
||||
+#define UNDERCURL_CURLY 0
|
||||
+#define UNDERCURL_SPIKY 1
|
||||
+#define UNDERCURL_CAPPED 2
|
||||
+// Active style
|
||||
+#define UNDERCURL_STYLE UNDERCURL_SPIKY
|
||||
diff --git a/st.c b/st.c
|
||||
index cfedcb6..23dd567 100644
|
||||
--- a/st.c
|
||||
+++ b/st.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#define UTF_SIZ 4
|
||||
#define ESC_BUF_SIZ (128*UTF_SIZ)
|
||||
#define ESC_ARG_SIZ 16
|
||||
+#define CAR_PER_ARG 4
|
||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||
#define HISTSIZE 2000
|
||||
@@ -146,6 +147,7 @@ typedef struct {
|
||||
int arg[ESC_ARG_SIZ];
|
||||
int narg; /* nb of args */
|
||||
char mode[2];
|
||||
+ int carg[ESC_ARG_SIZ][CAR_PER_ARG]; /* colon args */
|
||||
} CSIEscape;
|
||||
|
||||
/* STR Escape sequence structs */
|
||||
@@ -166,6 +168,7 @@ static void ttywriteraw(const char *, size_t);
|
||||
|
||||
static void csidump(void);
|
||||
static void csihandle(void);
|
||||
+static void readcolonargs(char **, int, int[][CAR_PER_ARG]);
|
||||
static void csiparse(void);
|
||||
static void csireset(void);
|
||||
static void osc_color_response(int, int, int);
|
||||
@@ -1193,6 +1196,28 @@ tnewline(int first_col)
|
||||
tmoveto(first_col ? 0 : term.c.x, y);
|
||||
}
|
||||
|
||||
+void
|
||||
+readcolonargs(char **p, int cursor, int params[][CAR_PER_ARG])
|
||||
+{
|
||||
+ int i = 0;
|
||||
+ for (; i < CAR_PER_ARG; i++)
|
||||
+ params[cursor][i] = -1;
|
||||
+
|
||||
+ if (**p != ':')
|
||||
+ return;
|
||||
+
|
||||
+ char *np = NULL;
|
||||
+ i = 0;
|
||||
+
|
||||
+ while (**p == ':' && i < CAR_PER_ARG) {
|
||||
+ while (**p == ':')
|
||||
+ (*p)++;
|
||||
+ params[cursor][i] = strtol(*p, &np, 10);
|
||||
+ *p = np;
|
||||
+ i++;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void
|
||||
csiparse(void)
|
||||
{
|
||||
@@ -1215,6 +1240,7 @@ csiparse(void)
|
||||
v = -1;
|
||||
csiescseq.arg[csiescseq.narg++] = v;
|
||||
p = np;
|
||||
+ readcolonargs(&p, csiescseq.narg-1, csiescseq.carg);
|
||||
if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
|
||||
break;
|
||||
p++;
|
||||
@@ -1434,6 +1460,10 @@ tsetattr(const int *attr, int l)
|
||||
ATTR_STRUCK );
|
||||
term.c.attr.fg = defaultfg;
|
||||
term.c.attr.bg = defaultbg;
|
||||
+ term.c.attr.ustyle = -1;
|
||||
+ term.c.attr.ucolor[0] = -1;
|
||||
+ term.c.attr.ucolor[1] = -1;
|
||||
+ term.c.attr.ucolor[2] = -1;
|
||||
break;
|
||||
case 1:
|
||||
term.c.attr.mode |= ATTR_BOLD;
|
||||
@@ -1445,7 +1475,14 @@ tsetattr(const int *attr, int l)
|
||||
term.c.attr.mode |= ATTR_ITALIC;
|
||||
break;
|
||||
case 4:
|
||||
- term.c.attr.mode |= ATTR_UNDERLINE;
|
||||
+ term.c.attr.ustyle = csiescseq.carg[i][0];
|
||||
+
|
||||
+ if (term.c.attr.ustyle != 0)
|
||||
+ term.c.attr.mode |= ATTR_UNDERLINE;
|
||||
+ else
|
||||
+ term.c.attr.mode &= ~ATTR_UNDERLINE;
|
||||
+
|
||||
+ term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
|
||||
break;
|
||||
case 5: /* slow blink */
|
||||
/* FALLTHROUGH */
|
||||
@@ -1496,6 +1533,18 @@ tsetattr(const int *attr, int l)
|
||||
case 49:
|
||||
term.c.attr.bg = defaultbg;
|
||||
break;
|
||||
+ case 58:
|
||||
+ term.c.attr.ucolor[0] = csiescseq.carg[i][1];
|
||||
+ term.c.attr.ucolor[1] = csiescseq.carg[i][2];
|
||||
+ term.c.attr.ucolor[2] = csiescseq.carg[i][3];
|
||||
+ term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
|
||||
+ break;
|
||||
+ case 59:
|
||||
+ term.c.attr.ucolor[0] = -1;
|
||||
+ term.c.attr.ucolor[1] = -1;
|
||||
+ term.c.attr.ucolor[2] = -1;
|
||||
+ term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
|
||||
+ break;
|
||||
default:
|
||||
if (BETWEEN(attr[i], 30, 37)) {
|
||||
term.c.attr.fg = attr[i] - 30;
|
||||
diff --git a/st.h b/st.h
|
||||
index c102ceb..27ebe52 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -35,6 +35,7 @@ enum glyph_attribute {
|
||||
ATTR_WDUMMY = 1 << 10,
|
||||
ATTR_BOXDRAW = 1 << 11,
|
||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||
+ ATTR_DIRTYUNDERLINE = 1 << 15,
|
||||
};
|
||||
|
||||
enum drawing_mode {
|
||||
@@ -72,6 +73,8 @@ typedef struct {
|
||||
ushort mode; /* attribute flags */
|
||||
uint32_t fg; /* foreground */
|
||||
uint32_t bg; /* background */
|
||||
+ int ustyle; /* underline style */
|
||||
+ int ucolor[3]; /* underline color */
|
||||
} Glyph;
|
||||
|
||||
typedef Glyph *Line;
|
||||
diff --git a/st.info b/st.info
|
||||
index 8201ad6..659878c 100644
|
||||
--- a/st.info
|
||||
+++ b/st.info
|
||||
@@ -1,4 +1,5 @@
|
||||
st-mono| simpleterm monocolor,
|
||||
+ Su,
|
||||
acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
||||
am,
|
||||
bce,
|
||||
diff --git a/x.c b/x.c
|
||||
index e99388a..cb7950d 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -47,6 +47,14 @@ typedef struct {
|
||||
signed char appcursor; /* application cursor */
|
||||
} Key;
|
||||
|
||||
+/* Undercurl slope types */
|
||||
+enum undercurl_slope_type {
|
||||
+ UNDERCURL_SLOPE_ASCENDING = 0,
|
||||
+ UNDERCURL_SLOPE_TOP_CAP = 1,
|
||||
+ UNDERCURL_SLOPE_DESCENDING = 2,
|
||||
+ UNDERCURL_SLOPE_BOTTOM_CAP = 3
|
||||
+};
|
||||
+
|
||||
/* X modifiers */
|
||||
#define XK_ANY_MOD UINT_MAX
|
||||
#define XK_NO_MOD 0
|
||||
@@ -1393,6 +1401,51 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||
return numspecs;
|
||||
}
|
||||
|
||||
+static int isSlopeRising (int x, int iPoint, int waveWidth)
|
||||
+{
|
||||
+ // . . . .
|
||||
+ // / \ / \ / \ / \
|
||||
+ // / \ / \ / \ / \
|
||||
+ // . . . . .
|
||||
+
|
||||
+ // Find absolute `x` of point
|
||||
+ x += iPoint * (waveWidth/2);
|
||||
+
|
||||
+ // Find index of absolute wave
|
||||
+ int absSlope = x / ((float)waveWidth/2);
|
||||
+
|
||||
+ return (absSlope % 2);
|
||||
+}
|
||||
+
|
||||
+static int getSlope (int x, int iPoint, int waveWidth)
|
||||
+{
|
||||
+ // Sizes: Caps are half width of slopes
|
||||
+ // 1_2 1_2 1_2 1_2
|
||||
+ // / \ / \ / \ / \
|
||||
+ // / \ / \ / \ / \
|
||||
+ // 0 3_0 3_0 3_0 3_
|
||||
+ // <2-> <1> <---6---->
|
||||
+
|
||||
+ // Find type of first point
|
||||
+ int firstType;
|
||||
+ x -= (x / waveWidth) * waveWidth;
|
||||
+ if (x < (waveWidth * (2.f/6.f)))
|
||||
+ firstType = UNDERCURL_SLOPE_ASCENDING;
|
||||
+ else if (x < (waveWidth * (3.f/6.f)))
|
||||
+ firstType = UNDERCURL_SLOPE_TOP_CAP;
|
||||
+ else if (x < (waveWidth * (5.f/6.f)))
|
||||
+ firstType = UNDERCURL_SLOPE_DESCENDING;
|
||||
+ else
|
||||
+ firstType = UNDERCURL_SLOPE_BOTTOM_CAP;
|
||||
+
|
||||
+ // Find type of given point
|
||||
+ int pointType = (iPoint % 4);
|
||||
+ pointType += firstType;
|
||||
+ pointType %= 4;
|
||||
+
|
||||
+ return pointType;
|
||||
+}
|
||||
+
|
||||
void
|
||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int dmode)
|
||||
{
|
||||
@@ -1511,10 +1564,358 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
|
||||
/* Render underline and strikethrough. */
|
||||
if (base.mode & ATTR_UNDERLINE) {
|
||||
- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
|
||||
- width, 1);
|
||||
- }
|
||||
+ // Underline Color
|
||||
+ const int widthThreshold = 28; // +1 width every widthThreshold px of font
|
||||
+ int wlw = (win.ch / widthThreshold) + 1; // Wave Line Width
|
||||
+ int linecolor;
|
||||
+ if ((base.ucolor[0] >= 0) &&
|
||||
+ !(base.mode & ATTR_BLINK && win.mode & MODE_BLINK) &&
|
||||
+ !(base.mode & ATTR_INVISIBLE)
|
||||
+ ) {
|
||||
+ // Special color for underline
|
||||
+ // Index
|
||||
+ if (base.ucolor[1] < 0) {
|
||||
+ linecolor = dc.col[base.ucolor[0]].pixel;
|
||||
+ }
|
||||
+ // RGB
|
||||
+ else {
|
||||
+ XColor lcolor;
|
||||
+ lcolor.red = base.ucolor[0] * 257;
|
||||
+ lcolor.green = base.ucolor[1] * 257;
|
||||
+ lcolor.blue = base.ucolor[2] * 257;
|
||||
+ lcolor.flags = DoRed | DoGreen | DoBlue;
|
||||
+ XAllocColor(xw.dpy, xw.cmap, &lcolor);
|
||||
+ linecolor = lcolor.pixel;
|
||||
+ }
|
||||
+ } else {
|
||||
+ // Foreground color for underline
|
||||
+ linecolor = fg->pixel;
|
||||
+ }
|
||||
+
|
||||
+ XGCValues ugcv = {
|
||||
+ .foreground = linecolor,
|
||||
+ .line_width = wlw,
|
||||
+ .line_style = LineSolid,
|
||||
+ .cap_style = CapNotLast
|
||||
+ };
|
||||
+
|
||||
+ GC ugc = XCreateGC(xw.dpy, XftDrawDrawable(xw.draw),
|
||||
+ GCForeground | GCLineWidth | GCLineStyle | GCCapStyle,
|
||||
+ &ugcv);
|
||||
+
|
||||
+ // Underline Style
|
||||
+ if (base.ustyle != 3) {
|
||||
+ //XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, width, 1);
|
||||
+ XFillRectangle(xw.dpy, XftDrawDrawable(xw.draw), ugc, winx,
|
||||
+ winy + dc.font.ascent + 1, width, wlw);
|
||||
+ } else if (base.ustyle == 3) {
|
||||
+ int ww = win.cw;//width;
|
||||
+ int wh = dc.font.descent - wlw/2 - 1;//r.height/7;
|
||||
+ int wx = winx;
|
||||
+ int wy = winy + win.ch - dc.font.descent;
|
||||
+
|
||||
+#if UNDERCURL_STYLE == UNDERCURL_CURLY
|
||||
+ // Draw waves
|
||||
+ int narcs = charlen * 2 + 1;
|
||||
+ XArc *arcs = xmalloc(sizeof(XArc) * narcs);
|
||||
+
|
||||
+ int i = 0;
|
||||
+ for (i = 0; i < charlen-1; i++) {
|
||||
+ arcs[i*2] = (XArc) {
|
||||
+ .x = wx + win.cw * i + ww / 4,
|
||||
+ .y = wy,
|
||||
+ .width = win.cw / 2,
|
||||
+ .height = wh,
|
||||
+ .angle1 = 0,
|
||||
+ .angle2 = 180 * 64
|
||||
+ };
|
||||
+ arcs[i*2+1] = (XArc) {
|
||||
+ .x = wx + win.cw * i + ww * 0.75,
|
||||
+ .y = wy,
|
||||
+ .width = win.cw/2,
|
||||
+ .height = wh,
|
||||
+ .angle1 = 180 * 64,
|
||||
+ .angle2 = 180 * 64
|
||||
+ };
|
||||
+ }
|
||||
+ // Last wave
|
||||
+ arcs[i*2] = (XArc) {wx + ww * i + ww / 4, wy, ww / 2, wh,
|
||||
+ 0, 180 * 64 };
|
||||
+ // Last wave tail
|
||||
+ arcs[i*2+1] = (XArc) {wx + ww * i + ww * 0.75, wy, ceil(ww / 2.),
|
||||
+ wh, 180 * 64, 90 * 64};
|
||||
+ // First wave tail
|
||||
+ i++;
|
||||
+ arcs[i*2] = (XArc) {wx - ww/4 - 1, wy, ceil(ww / 2.), wh, 270 * 64,
|
||||
+ 90 * 64 };
|
||||
+
|
||||
+ XDrawArcs(xw.dpy, XftDrawDrawable(xw.draw), ugc, arcs, narcs);
|
||||
+
|
||||
+ free(arcs);
|
||||
+#elif UNDERCURL_STYLE == UNDERCURL_SPIKY
|
||||
+ // Make the underline corridor larger
|
||||
+ /*
|
||||
+ wy -= wh;
|
||||
+ */
|
||||
+ wh *= 2;
|
||||
+
|
||||
+ // Set the angle of the slope to 45°
|
||||
+ ww = wh;
|
||||
+
|
||||
+ // Position of wave is independent of word, it's absolute
|
||||
+ wx = (wx / (ww/2)) * (ww/2);
|
||||
+
|
||||
+ int marginStart = winx - wx;
|
||||
+
|
||||
+ // Calculate number of points with floating precision
|
||||
+ float n = width; // Width of word in pixels
|
||||
+ n = (n / ww) * 2; // Number of slopes (/ or \)
|
||||
+ n += 2; // Add two last points
|
||||
+ int npoints = n; // Convert to int
|
||||
+
|
||||
+ // Total length of underline
|
||||
+ float waveLength = 0;
|
||||
+
|
||||
+ if (npoints >= 3) {
|
||||
+ // We add an aditional slot in case we use a bonus point
|
||||
+ XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1));
|
||||
+
|
||||
+ // First point (Starts with the word bounds)
|
||||
+ points[0] = (XPoint) {
|
||||
+ .x = wx + marginStart,
|
||||
+ .y = (isSlopeRising(wx, 0, ww))
|
||||
+ ? (wy - marginStart + ww/2.f)
|
||||
+ : (wy + marginStart)
|
||||
+ };
|
||||
+
|
||||
+ // Second point (Goes back to the absolute point coordinates)
|
||||
+ points[1] = (XPoint) {
|
||||
+ .x = (ww/2.f) - marginStart,
|
||||
+ .y = (isSlopeRising(wx, 1, ww))
|
||||
+ ? (ww/2.f - marginStart)
|
||||
+ : (-ww/2.f + marginStart)
|
||||
+ };
|
||||
+ waveLength += (ww/2.f) - marginStart;
|
||||
+
|
||||
+ // The rest of the points
|
||||
+ for (int i = 2; i < npoints-1; i++) {
|
||||
+ points[i] = (XPoint) {
|
||||
+ .x = ww/2,
|
||||
+ .y = (isSlopeRising(wx, i, ww))
|
||||
+ ? wh/2
|
||||
+ : -wh/2
|
||||
+ };
|
||||
+ waveLength += ww/2;
|
||||
+ }
|
||||
+
|
||||
+ // Last point
|
||||
+ points[npoints-1] = (XPoint) {
|
||||
+ .x = ww/2,
|
||||
+ .y = (isSlopeRising(wx, npoints-1, ww))
|
||||
+ ? wh/2
|
||||
+ : -wh/2
|
||||
+ };
|
||||
+ waveLength += ww/2;
|
||||
+
|
||||
+ // End
|
||||
+ if (waveLength < width) { // Add a bonus point?
|
||||
+ int marginEnd = width - waveLength;
|
||||
+ points[npoints] = (XPoint) {
|
||||
+ .x = marginEnd,
|
||||
+ .y = (isSlopeRising(wx, npoints, ww))
|
||||
+ ? (marginEnd)
|
||||
+ : (-marginEnd)
|
||||
+ };
|
||||
+
|
||||
+ npoints++;
|
||||
+ } else if (waveLength > width) { // Is last point too far?
|
||||
+ int marginEnd = waveLength - width;
|
||||
+ points[npoints-1].x -= marginEnd;
|
||||
+ if (isSlopeRising(wx, npoints-1, ww))
|
||||
+ points[npoints-1].y -= (marginEnd);
|
||||
+ else
|
||||
+ points[npoints-1].y += (marginEnd);
|
||||
+ }
|
||||
+
|
||||
+ // Draw the lines
|
||||
+ XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints,
|
||||
+ CoordModePrevious);
|
||||
+
|
||||
+ // Draw a second underline with an offset of 1 pixel
|
||||
+ if ( ((win.ch / (widthThreshold/2)) % 2)) {
|
||||
+ points[0].x++;
|
||||
+
|
||||
+ XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points,
|
||||
+ npoints, CoordModePrevious);
|
||||
+ }
|
||||
+
|
||||
+ // Free resources
|
||||
+ free(points);
|
||||
+ }
|
||||
+#else // UNDERCURL_CAPPED
|
||||
+ // Cap is half of wave width
|
||||
+ float capRatio = 0.5f;
|
||||
+
|
||||
+ // Make the underline corridor larger
|
||||
+ wh *= 2;
|
||||
+
|
||||
+ // Set the angle of the slope to 45°
|
||||
+ ww = wh;
|
||||
+ ww *= 1 + capRatio; // Add a bit of width for the cap
|
||||
+
|
||||
+ // Position of wave is independent of word, it's absolute
|
||||
+ wx = (wx / ww) * ww;
|
||||
+
|
||||
+ float marginStart;
|
||||
+ switch(getSlope(winx, 0, ww)) {
|
||||
+ case UNDERCURL_SLOPE_ASCENDING:
|
||||
+ marginStart = winx - wx;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_TOP_CAP:
|
||||
+ marginStart = winx - (wx + (ww * (2.f/6.f)));
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_DESCENDING:
|
||||
+ marginStart = winx - (wx + (ww * (3.f/6.f)));
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||
+ marginStart = winx - (wx + (ww * (5.f/6.f)));
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ // Calculate number of points with floating precision
|
||||
+ float n = width; // Width of word in pixels
|
||||
+ // ._.
|
||||
+ n = (n / ww) * 4; // Number of points (./ \.)
|
||||
+ n += 2; // Add two last points
|
||||
+ int npoints = n; // Convert to int
|
||||
+
|
||||
+ // Position of the pen to draw the lines
|
||||
+ float penX = 0;
|
||||
+ float penY = 0;
|
||||
+
|
||||
+ if (npoints >= 3) {
|
||||
+ XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1));
|
||||
+
|
||||
+ // First point (Starts with the word bounds)
|
||||
+ penX = winx;
|
||||
+ switch (getSlope(winx, 0, ww)) {
|
||||
+ case UNDERCURL_SLOPE_ASCENDING:
|
||||
+ penY = wy + wh/2.f - marginStart;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_TOP_CAP:
|
||||
+ penY = wy;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_DESCENDING:
|
||||
+ penY = wy + marginStart;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||
+ penY = wy + wh/2.f;
|
||||
+ break;
|
||||
+ }
|
||||
+ points[0].x = penX;
|
||||
+ points[0].y = penY;
|
||||
+
|
||||
+ // Second point (Goes back to the absolute point coordinates)
|
||||
+ switch (getSlope(winx, 1, ww)) {
|
||||
+ case UNDERCURL_SLOPE_ASCENDING:
|
||||
+ penX += ww * (1.f/6.f) - marginStart;
|
||||
+ penY += 0;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_TOP_CAP:
|
||||
+ penX += ww * (2.f/6.f) - marginStart;
|
||||
+ penY += -wh/2.f + marginStart;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_DESCENDING:
|
||||
+ penX += ww * (1.f/6.f) - marginStart;
|
||||
+ penY += 0;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||
+ penX += ww * (2.f/6.f) - marginStart;
|
||||
+ penY += -marginStart + wh/2.f;
|
||||
+ break;
|
||||
+ }
|
||||
+ points[1].x = penX;
|
||||
+ points[1].y = penY;
|
||||
+
|
||||
+ // The rest of the points
|
||||
+ for (int i = 2; i < npoints; i++) {
|
||||
+ switch (getSlope(winx, i, ww)) {
|
||||
+ case UNDERCURL_SLOPE_ASCENDING:
|
||||
+ case UNDERCURL_SLOPE_DESCENDING:
|
||||
+ penX += ww * (1.f/6.f);
|
||||
+ penY += 0;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_TOP_CAP:
|
||||
+ penX += ww * (2.f/6.f);
|
||||
+ penY += -wh / 2.f;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||
+ penX += ww * (2.f/6.f);
|
||||
+ penY += wh / 2.f;
|
||||
+ break;
|
||||
+ }
|
||||
+ points[i].x = penX;
|
||||
+ points[i].y = penY;
|
||||
+ }
|
||||
+
|
||||
+ // End
|
||||
+ float waveLength = penX - winx;
|
||||
+ if (waveLength < width) { // Add a bonus point?
|
||||
+ int marginEnd = width - waveLength;
|
||||
+ penX += marginEnd;
|
||||
+ switch(getSlope(winx, npoints, ww)) {
|
||||
+ case UNDERCURL_SLOPE_ASCENDING:
|
||||
+ case UNDERCURL_SLOPE_DESCENDING:
|
||||
+ //penY += 0;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_TOP_CAP:
|
||||
+ penY += -marginEnd;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||
+ penY += marginEnd;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ points[npoints].x = penX;
|
||||
+ points[npoints].y = penY;
|
||||
+
|
||||
+ npoints++;
|
||||
+ } else if (waveLength > width) { // Is last point too far?
|
||||
+ int marginEnd = waveLength - width;
|
||||
+ points[npoints-1].x -= marginEnd;
|
||||
+ switch(getSlope(winx, npoints-1, ww)) {
|
||||
+ case UNDERCURL_SLOPE_TOP_CAP:
|
||||
+ points[npoints-1].y += marginEnd;
|
||||
+ break;
|
||||
+ case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||
+ points[npoints-1].y -= marginEnd;
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // Draw the lines
|
||||
+ XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints,
|
||||
+ CoordModeOrigin);
|
||||
+
|
||||
+ // Draw a second underline with an offset of 1 pixel
|
||||
+ if ( ((win.ch / (widthThreshold/2)) % 2)) {
|
||||
+ for (int i = 0; i < npoints; i++)
|
||||
+ points[i].x++;
|
||||
+
|
||||
+ XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points,
|
||||
+ npoints, CoordModeOrigin);
|
||||
+ }
|
||||
+
|
||||
+ // Free resources
|
||||
+ free(points);
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
|
||||
+ XFreeGC(xw.dpy, ugc);
|
||||
+ }
|
||||
if (base.mode & ATTR_STRUCK) {
|
||||
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
|
||||
width, 1);
|
||||
209
suckless/st-patches/11-csi-22-23.diff
Normal file
209
suckless/st-patches/11-csi-22-23.diff
Normal file
|
|
@ -0,0 +1,209 @@
|
|||
From c90af45228c1100377d64ad021fa3f0cff9a1df4 Mon Sep 17 00:00:00 2001
|
||||
From: wael <40663@protonmail.com>
|
||||
Date: Mon, 11 Apr 2022 21:28:43 +0300
|
||||
Subject: [PATCH] [st][patch][csi 22 23] update to 0.8.5
|
||||
|
||||
---
|
||||
st.c | 36 ++++++++++++++++++++++++++++++++----
|
||||
st.info | 4 ++--
|
||||
win.h | 4 +++-
|
||||
x.c | 41 ++++++++++++++++++++++++++++++++++++++---
|
||||
4 files changed, 75 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/st.c b/st.c
|
||||
index f43cfd3..2802381 100644
|
||||
--- a/st.c
|
||||
+++ b/st.c
|
||||
@@ -1801,6 +1801,33 @@ csihandle(void)
|
||||
goto unknown;
|
||||
}
|
||||
break;
|
||||
+ case 't': /* title stack operations */
|
||||
+ switch (csiescseq.arg[0]) {
|
||||
+ case 22: /* pust current title on stack */
|
||||
+ switch (csiescseq.arg[1]) {
|
||||
+ case 0:
|
||||
+ case 1:
|
||||
+ case 2:
|
||||
+ xpushtitle();
|
||||
+ break;
|
||||
+ default:
|
||||
+ goto unknown;
|
||||
+ }
|
||||
+ break;
|
||||
+ case 23: /* pop last title from stack */
|
||||
+ switch (csiescseq.arg[1]) {
|
||||
+ case 0:
|
||||
+ case 1:
|
||||
+ case 2:
|
||||
+ xsettitle(NULL, 1);
|
||||
+ break;
|
||||
+ default:
|
||||
+ goto unknown;
|
||||
+ }
|
||||
+ break;
|
||||
+ default:
|
||||
+ goto unknown;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1885,7 +1912,7 @@ strhandle(void)
|
||||
switch (par) {
|
||||
case 0:
|
||||
if (narg > 1) {
|
||||
- xsettitle(strescseq.args[1]);
|
||||
+ xsettitle(strescseq.args[1], 0);
|
||||
xseticontitle(strescseq.args[1]);
|
||||
}
|
||||
return;
|
||||
@@ -1895,7 +1922,7 @@ strhandle(void)
|
||||
return;
|
||||
case 2:
|
||||
if (narg > 1)
|
||||
- xsettitle(strescseq.args[1]);
|
||||
+ xsettitle(strescseq.args[1], 0);
|
||||
return;
|
||||
case 52:
|
||||
if (narg > 2 && allowwindowops) {
|
||||
@@ -1973,7 +2000,7 @@ strhandle(void)
|
||||
}
|
||||
break;
|
||||
case 'k': /* old title set compatibility */
|
||||
- xsettitle(strescseq.args[0]);
|
||||
+ xsettitle(strescseq.args[0], 0);
|
||||
return;
|
||||
case 'P': /* DCS -- Device Control String */
|
||||
case '_': /* APC -- Application Program Command */
|
||||
@@ -2345,6 +2372,7 @@ eschandle(uchar ascii)
|
||||
break;
|
||||
case 'c': /* RIS -- Reset to initial state */
|
||||
treset();
|
||||
+ xfreetitlestack();
|
||||
resettitle();
|
||||
xloadcols();
|
||||
break;
|
||||
@@ -2631,7 +2659,7 @@ tresize(int col, int row)
|
||||
void
|
||||
resettitle(void)
|
||||
{
|
||||
- xsettitle(NULL);
|
||||
+ xsettitle(NULL, 0);
|
||||
}
|
||||
|
||||
void
|
||||
diff --git a/st.info b/st.info
|
||||
index 8201ad6..aeef606 100644
|
||||
--- a/st.info
|
||||
+++ b/st.info
|
||||
@@ -161,7 +161,7 @@ st-mono| simpleterm monocolor,
|
||||
rin=\E[%p1%dT,
|
||||
ritm=\E[23m,
|
||||
rmacs=\E(B,
|
||||
- rmcup=\E[?1049l,
|
||||
+ rmcup=\E[?1049l\E[23;0;0t,
|
||||
rmir=\E[4l,
|
||||
rmkx=\E[?1l\E>,
|
||||
rmso=\E[27m,
|
||||
@@ -172,7 +172,7 @@ st-mono| simpleterm monocolor,
|
||||
sitm=\E[3m,
|
||||
sgr0=\E[0m,
|
||||
smacs=\E(0,
|
||||
- smcup=\E[?1049h,
|
||||
+ smcup=\E[?1049h\E[22;0;0t,
|
||||
smir=\E[4h,
|
||||
smkx=\E[?1h\E=,
|
||||
smso=\E[7m,
|
||||
diff --git a/win.h b/win.h
|
||||
index e6e4369..ef67fd6 100644
|
||||
--- a/win.h
|
||||
+++ b/win.h
|
||||
@@ -31,7 +31,9 @@ void xfinishdraw(void);
|
||||
void xloadcols(void);
|
||||
int xsetcolorname(int, const char *);
|
||||
void xseticontitle(char *);
|
||||
-void xsettitle(char *);
|
||||
+void xfreetitlestack(void);
|
||||
+void xsettitle(char *, int);
|
||||
+void xpushtitle(void);
|
||||
int xsetcursor(int);
|
||||
void xsetmode(int, unsigned int);
|
||||
void xsetpointermotion(int);
|
||||
diff --git a/x.c b/x.c
|
||||
index 2a3bd38..babb04c 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -63,6 +63,9 @@ static void ttysend(const Arg *);
|
||||
/* config.h for applying patches and the configuration. */
|
||||
#include "config.h"
|
||||
|
||||
+/* size of title stack */
|
||||
+#define TITLESTACKSIZE 8
|
||||
+
|
||||
/* XEMBED messages */
|
||||
#define XEMBED_FOCUS_IN 4
|
||||
#define XEMBED_FOCUS_OUT 5
|
||||
@@ -220,6 +223,8 @@ static DC dc;
|
||||
static XWindow xw;
|
||||
static XSelection xsel;
|
||||
static TermWindow win;
|
||||
+static int tstki; /* title stack index */
|
||||
+static char *titlestack[TITLESTACKSIZE]; /* title stack */
|
||||
|
||||
/* Font Ring Cache */
|
||||
enum {
|
||||
@@ -1626,10 +1631,30 @@ xseticontitle(char *p)
|
||||
}
|
||||
|
||||
void
|
||||
-xsettitle(char *p)
|
||||
+xfreetitlestack(void)
|
||||
{
|
||||
- XTextProperty prop;
|
||||
- DEFAULT(p, opt_title);
|
||||
+ for (int i = 0; i < LEN(titlestack); i++) {
|
||||
+ free(titlestack[i]);
|
||||
+ titlestack[i] = NULL;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+xsettitle(char *p, int pop)
|
||||
+{
|
||||
+ XTextProperty prop;
|
||||
+
|
||||
+ free(titlestack[tstki]);
|
||||
+ if (pop) {
|
||||
+ titlestack[tstki] = NULL;
|
||||
+ tstki = (tstki - 1 + TITLESTACKSIZE) % TITLESTACKSIZE;
|
||||
+ p = titlestack[tstki] ? titlestack[tstki] : opt_title;
|
||||
+ } else if (p) {
|
||||
+ titlestack[tstki] = xstrdup(p);
|
||||
+ } else {
|
||||
+ titlestack[tstki] = NULL;
|
||||
+ p = opt_title;
|
||||
+ }
|
||||
|
||||
if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
|
||||
&prop) != Success)
|
||||
@@ -1639,6 +1664,16 @@ xsettitle(char *p)
|
||||
XFree(prop.value);
|
||||
}
|
||||
|
||||
+void
|
||||
+xpushtitle(void)
|
||||
+{
|
||||
+ int tstkin = (tstki + 1) % TITLESTACKSIZE;
|
||||
+
|
||||
+ free(titlestack[tstkin]);
|
||||
+ titlestack[tstkin] = titlestack[tstki] ? xstrdup(titlestack[tstki]) : NULL;
|
||||
+ tstki = tstkin;
|
||||
+}
|
||||
+
|
||||
int
|
||||
xstartdraw(void)
|
||||
{
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
69
suckless/st-patches/2-moonfly.diff
Normal file
69
suckless/st-patches/2-moonfly.diff
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index 91ab8ca..65a4f66 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -96,32 +96,32 @@ unsigned int tabspaces = 8;
|
||||
/* Terminal colors (16 first used in escape sequence) */
|
||||
static const char *colorname[] = {
|
||||
/* 8 normal colors */
|
||||
- "black",
|
||||
- "red3",
|
||||
- "green3",
|
||||
- "yellow3",
|
||||
- "blue2",
|
||||
- "magenta3",
|
||||
- "cyan3",
|
||||
- "gray90",
|
||||
+ [0] = "#323437",
|
||||
+ [1] = "#ff5454",
|
||||
+ [2] = "#8cc85f",
|
||||
+ [3] = "#e3c78a",
|
||||
+ [4] = "#80a0ff",
|
||||
+ [5] = "#d183e8",
|
||||
+ [6] = "#79dac8",
|
||||
+ [7] = "#a1aab8",
|
||||
|
||||
/* 8 bright colors */
|
||||
- "gray50",
|
||||
- "red",
|
||||
- "green",
|
||||
- "yellow",
|
||||
- "#5c5cff",
|
||||
- "magenta",
|
||||
- "cyan",
|
||||
- "white",
|
||||
-
|
||||
+ [8] = "#7c8f8f",
|
||||
+ [9] = "#ff5189",
|
||||
+ [10] = "#36c692",
|
||||
+ [11] = "#bfbf97",
|
||||
+ [12] = "#74b2ff",
|
||||
+ [13] = "#ae81ff",
|
||||
+ [14] = "#85dc85",
|
||||
+ [15] = "#e2637f",
|
||||
+
|
||||
[255] = 0,
|
||||
|
||||
/* more colors can be added after 255 to use with DefaultXX */
|
||||
- "#cccccc",
|
||||
- "#555555",
|
||||
- "gray90", /* default foreground colour */
|
||||
- "black", /* default background colour */
|
||||
+ [256] = "#282a36",
|
||||
+ [257] = "#f8f8f2",
|
||||
+ [258] = "#eeeeee",
|
||||
+ [259] = "#080808",
|
||||
};
|
||||
|
||||
|
||||
@@ -131,8 +131,8 @@ static const char *colorname[] = {
|
||||
*/
|
||||
unsigned int defaultfg = 258;
|
||||
unsigned int defaultbg = 259;
|
||||
-unsigned int defaultcs = 256;
|
||||
-static unsigned int defaultrcs = 257;
|
||||
+unsigned int defaultcs = 257;
|
||||
+static unsigned int defaultrcs = 256;
|
||||
|
||||
/*
|
||||
* Default shape of cursor
|
||||
403
suckless/st-patches/3-scrollback.diff
Normal file
403
suckless/st-patches/3-scrollback.diff
Normal file
|
|
@ -0,0 +1,403 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index 7bb3ff7..3f55d5f 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -186,8 +186,13 @@ static uint forcemousemod = ShiftMask;
|
||||
* Internal mouse shortcuts.
|
||||
* Beware that overloading Button1 will disable the selection.
|
||||
*/
|
||||
+
|
||||
+const unsigned int mousescrollincrement = 1;
|
||||
+
|
||||
static MouseShortcut mshortcuts[] = {
|
||||
/* mask button function argument release */
|
||||
+ { XK_ANY_MOD, Button4, kscrollup, {.i = mousescrollincrement}, 0, /* !alt */ -1 },
|
||||
+ { XK_ANY_MOD, Button5, kscrolldown, {.i = mousescrollincrement}, 0, /* !alt */ -1 },
|
||||
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
||||
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
||||
@@ -213,6 +218,8 @@ static Shortcut shortcuts[] = {
|
||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||
+ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
|
||||
+ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
|
||||
};
|
||||
|
||||
/*
|
||||
diff --git a/st.c b/st.c
|
||||
index 41d5ace..185557b 100644
|
||||
--- a/st.c
|
||||
+++ b/st.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#define ESC_ARG_SIZ 16
|
||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||
+#define HISTSIZE 2000
|
||||
|
||||
/* macros */
|
||||
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
||||
@@ -42,6 +43,9 @@
|
||||
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
||||
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
||||
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
|
||||
+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
||||
+ term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
||||
+ term.line[(y) - term.scr])
|
||||
|
||||
enum term_mode {
|
||||
MODE_WRAP = 1 << 0,
|
||||
@@ -115,6 +119,9 @@ typedef struct {
|
||||
int col; /* nb col */
|
||||
Line *line; /* screen */
|
||||
Line *alt; /* alternate screen */
|
||||
+ Line hist[HISTSIZE]; /* history buffer */
|
||||
+ int histi; /* history index */
|
||||
+ int scr; /* scroll back */
|
||||
int *dirty; /* dirtyness of lines */
|
||||
TCursor c; /* cursor */
|
||||
int ocx; /* old cursor col */
|
||||
@@ -185,8 +192,8 @@ static void tnewline(int);
|
||||
static void tputtab(int);
|
||||
static void tputc(Rune);
|
||||
static void treset(void);
|
||||
-static void tscrollup(int, int);
|
||||
-static void tscrolldown(int, int);
|
||||
+static void tscrollup(int, int, int);
|
||||
+static void tscrolldown(int, int, int);
|
||||
static void tsetattr(const int *, int);
|
||||
static void tsetchar(Rune, const Glyph *, int, int);
|
||||
static void tsetdirt(int, int);
|
||||
@@ -409,10 +416,10 @@ tlinelen(int y)
|
||||
{
|
||||
int i = term.col;
|
||||
|
||||
- if (term.line[y][i - 1].mode & ATTR_WRAP)
|
||||
+ if (TLINE(y)[i - 1].mode & ATTR_WRAP)
|
||||
return i;
|
||||
|
||||
- while (i > 0 && term.line[y][i - 1].u == ' ')
|
||||
+ while (i > 0 && TLINE(y)[i - 1].u == ' ')
|
||||
--i;
|
||||
|
||||
return i;
|
||||
@@ -521,7 +528,7 @@ selsnap(int *x, int *y, int direction)
|
||||
* Snap around if the word wraps around at the end or
|
||||
* beginning of a line.
|
||||
*/
|
||||
- prevgp = &term.line[*y][*x];
|
||||
+ prevgp = &TLINE(*y)[*x];
|
||||
prevdelim = ISDELIM(prevgp->u);
|
||||
for (;;) {
|
||||
newx = *x + direction;
|
||||
@@ -536,14 +543,14 @@ selsnap(int *x, int *y, int direction)
|
||||
yt = *y, xt = *x;
|
||||
else
|
||||
yt = newy, xt = newx;
|
||||
- if (!(term.line[yt][xt].mode & ATTR_WRAP))
|
||||
+ if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
|
||||
break;
|
||||
}
|
||||
|
||||
if (newx >= tlinelen(newy))
|
||||
break;
|
||||
|
||||
- gp = &term.line[newy][newx];
|
||||
+ gp = &TLINE(newy)[newx];
|
||||
delim = ISDELIM(gp->u);
|
||||
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
||||
|| (delim && gp->u != prevgp->u)))
|
||||
@@ -564,14 +571,14 @@ selsnap(int *x, int *y, int direction)
|
||||
*x = (direction < 0) ? 0 : term.col - 1;
|
||||
if (direction < 0) {
|
||||
for (; *y > 0; *y += direction) {
|
||||
- if (!(term.line[*y-1][term.col-1].mode
|
||||
+ if (!(TLINE(*y-1)[term.col-1].mode
|
||||
& ATTR_WRAP)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else if (direction > 0) {
|
||||
for (; *y < term.row-1; *y += direction) {
|
||||
- if (!(term.line[*y][term.col-1].mode
|
||||
+ if (!(TLINE(*y)[term.col-1].mode
|
||||
& ATTR_WRAP)) {
|
||||
break;
|
||||
}
|
||||
@@ -602,13 +609,13 @@ getsel(void)
|
||||
}
|
||||
|
||||
if (sel.type == SEL_RECTANGULAR) {
|
||||
- gp = &term.line[y][sel.nb.x];
|
||||
+ gp = &TLINE(y)[sel.nb.x];
|
||||
lastx = sel.ne.x;
|
||||
} else {
|
||||
- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
|
||||
+ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
|
||||
lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
|
||||
}
|
||||
- last = &term.line[y][MIN(lastx, linelen-1)];
|
||||
+ last = &TLINE(y)[MIN(lastx, linelen-1)];
|
||||
while (last >= gp && last->u == ' ')
|
||||
--last;
|
||||
|
||||
@@ -844,6 +851,9 @@ void
|
||||
ttywrite(const char *s, size_t n, int may_echo)
|
||||
{
|
||||
const char *next;
|
||||
+ Arg arg = (Arg) { .i = term.scr };
|
||||
+
|
||||
+ kscrolldown(&arg);
|
||||
|
||||
if (may_echo && IS_SET(MODE_ECHO))
|
||||
twrite(s, n, 1);
|
||||
@@ -1043,6 +1053,11 @@ tnew(int col, int row)
|
||||
treset();
|
||||
}
|
||||
|
||||
+int tisaltscr(void)
|
||||
+{
|
||||
+ return IS_SET(MODE_ALTSCREEN);
|
||||
+}
|
||||
+
|
||||
void
|
||||
tswapscreen(void)
|
||||
{
|
||||
@@ -1055,12 +1070,52 @@ tswapscreen(void)
|
||||
}
|
||||
|
||||
void
|
||||
-tscrolldown(int orig, int n)
|
||||
+kscrolldown(const Arg* a)
|
||||
+{
|
||||
+ int n = a->i;
|
||||
+
|
||||
+ if (n < 0)
|
||||
+ n = term.row + n;
|
||||
+
|
||||
+ if (n > term.scr)
|
||||
+ n = term.scr;
|
||||
+
|
||||
+ if (term.scr > 0) {
|
||||
+ term.scr -= n;
|
||||
+ selscroll(0, -n);
|
||||
+ tfulldirt();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+kscrollup(const Arg* a)
|
||||
+{
|
||||
+ int n = a->i;
|
||||
+
|
||||
+ if (n < 0)
|
||||
+ n = term.row + n;
|
||||
+
|
||||
+ if (term.scr <= HISTSIZE-n) {
|
||||
+ term.scr += n;
|
||||
+ selscroll(0, n);
|
||||
+ tfulldirt();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+tscrolldown(int orig, int n, int copyhist)
|
||||
{
|
||||
int i;
|
||||
Line temp;
|
||||
|
||||
LIMIT(n, 0, term.bot-orig+1);
|
||||
+ if (copyhist) {
|
||||
+ term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
|
||||
+ temp = term.hist[term.histi];
|
||||
+ term.hist[term.histi] = term.line[term.bot];
|
||||
+ term.line[term.bot] = temp;
|
||||
+ }
|
||||
+
|
||||
|
||||
tsetdirt(orig, term.bot-n);
|
||||
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
||||
@@ -1071,17 +1126,28 @@ tscrolldown(int orig, int n)
|
||||
term.line[i-n] = temp;
|
||||
}
|
||||
|
||||
- selscroll(orig, n);
|
||||
+ if (term.scr == 0)
|
||||
+ selscroll(orig, n);
|
||||
}
|
||||
|
||||
void
|
||||
-tscrollup(int orig, int n)
|
||||
+tscrollup(int orig, int n, int copyhist)
|
||||
{
|
||||
int i;
|
||||
Line temp;
|
||||
|
||||
LIMIT(n, 0, term.bot-orig+1);
|
||||
|
||||
+ if (copyhist) {
|
||||
+ term.histi = (term.histi + 1) % HISTSIZE;
|
||||
+ temp = term.hist[term.histi];
|
||||
+ term.hist[term.histi] = term.line[orig];
|
||||
+ term.line[orig] = temp;
|
||||
+ }
|
||||
+
|
||||
+ if (term.scr > 0 && term.scr < HISTSIZE)
|
||||
+ term.scr = MIN(term.scr + n, HISTSIZE-1);
|
||||
+
|
||||
tclearregion(0, orig, term.col-1, orig+n-1);
|
||||
tsetdirt(orig+n, term.bot);
|
||||
|
||||
@@ -1091,7 +1157,8 @@ tscrollup(int orig, int n)
|
||||
term.line[i+n] = temp;
|
||||
}
|
||||
|
||||
- selscroll(orig, -n);
|
||||
+ if (term.scr == 0)
|
||||
+ selscroll(orig, -n);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1120,7 +1187,7 @@ tnewline(int first_col)
|
||||
int y = term.c.y;
|
||||
|
||||
if (y == term.bot) {
|
||||
- tscrollup(term.top, 1);
|
||||
+ tscrollup(term.top, 1, 1);
|
||||
} else {
|
||||
y++;
|
||||
}
|
||||
@@ -1288,14 +1355,14 @@ void
|
||||
tinsertblankline(int n)
|
||||
{
|
||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||
- tscrolldown(term.c.y, n);
|
||||
+ tscrolldown(term.c.y, n, 0);
|
||||
}
|
||||
|
||||
void
|
||||
tdeleteline(int n)
|
||||
{
|
||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||
- tscrollup(term.c.y, n);
|
||||
+ tscrollup(term.c.y, n, 0);
|
||||
}
|
||||
|
||||
int32_t
|
||||
@@ -1732,11 +1799,11 @@ csihandle(void)
|
||||
break;
|
||||
case 'S': /* SU -- Scroll <n> line up */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
- tscrollup(term.top, csiescseq.arg[0]);
|
||||
+ tscrollup(term.top, csiescseq.arg[0], 0);
|
||||
break;
|
||||
case 'T': /* SD -- Scroll <n> line down */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
- tscrolldown(term.top, csiescseq.arg[0]);
|
||||
+ tscrolldown(term.top, csiescseq.arg[0], 0);
|
||||
break;
|
||||
case 'L': /* IL -- Insert <n> blank lines */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
@@ -2299,7 +2366,7 @@ eschandle(uchar ascii)
|
||||
return 0;
|
||||
case 'D': /* IND -- Linefeed */
|
||||
if (term.c.y == term.bot) {
|
||||
- tscrollup(term.top, 1);
|
||||
+ tscrollup(term.top, 1, 1);
|
||||
} else {
|
||||
tmoveto(term.c.x, term.c.y+1);
|
||||
}
|
||||
@@ -2312,7 +2379,7 @@ eschandle(uchar ascii)
|
||||
break;
|
||||
case 'M': /* RI -- Reverse index */
|
||||
if (term.c.y == term.top) {
|
||||
- tscrolldown(term.top, 1);
|
||||
+ tscrolldown(term.top, 1, 1);
|
||||
} else {
|
||||
tmoveto(term.c.x, term.c.y-1);
|
||||
}
|
||||
@@ -2526,7 +2593,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
|
||||
void
|
||||
tresize(int col, int row)
|
||||
{
|
||||
- int i;
|
||||
+ int i, j;
|
||||
int minrow = MIN(row, term.row);
|
||||
int mincol = MIN(col, term.col);
|
||||
int *bp;
|
||||
@@ -2563,6 +2630,14 @@ tresize(int col, int row)
|
||||
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
||||
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
||||
|
||||
+ for (i = 0; i < HISTSIZE; i++) {
|
||||
+ term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
|
||||
+ for (j = mincol; j < col; j++) {
|
||||
+ term.hist[i][j] = term.c.attr;
|
||||
+ term.hist[i][j].u = ' ';
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/* resize each row to new width, zero-pad if needed */
|
||||
for (i = 0; i < minrow; i++) {
|
||||
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
||||
@@ -2621,7 +2696,7 @@ drawregion(int x1, int y1, int x2, int y2)
|
||||
continue;
|
||||
|
||||
term.dirty[y] = 0;
|
||||
- xdrawline(term.line[y], x1, y, x2);
|
||||
+ xdrawline(TLINE(y), x1, y, x2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2642,8 +2717,9 @@ draw(void)
|
||||
cx--;
|
||||
|
||||
drawregion(0, 0, term.col, term.row);
|
||||
- xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||
- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||
+ if (term.scr == 0)
|
||||
+ xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||
term.ocx = cx;
|
||||
term.ocy = term.c.y;
|
||||
xfinishdraw();
|
||||
diff --git a/st.h b/st.h
|
||||
index c44dc5d..fbd6f1d 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -88,12 +88,15 @@ void die(const char *, ...);
|
||||
void redraw(void);
|
||||
void draw(void);
|
||||
|
||||
+void kscrolldown(const Arg *);
|
||||
+void kscrollup(const Arg *);
|
||||
void printscreen(const Arg *);
|
||||
void printsel(const Arg *);
|
||||
void sendbreak(const Arg *);
|
||||
void toggleprinter(const Arg *);
|
||||
|
||||
int tattrset(int);
|
||||
+int tisaltscr(void);
|
||||
void tnew(int, int);
|
||||
void tresize(int, int);
|
||||
void tsetdirtattr(int);
|
||||
diff --git a/x.c b/x.c
|
||||
index 1311c0d..9428dd3 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -34,6 +34,7 @@ typedef struct {
|
||||
void (*func)(const Arg *);
|
||||
const Arg arg;
|
||||
uint release;
|
||||
+ int altscrn; /* 0: don't care, -1: not alt screen, 1: alt screen */
|
||||
} MouseShortcut;
|
||||
|
||||
typedef struct {
|
||||
@@ -455,6 +456,7 @@ mouseaction(XEvent *e, uint release)
|
||||
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
|
||||
if (ms->release == release &&
|
||||
ms->button == e->xbutton.button &&
|
||||
+ (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) &&
|
||||
(match(ms->mod, state) || /* exact or forced */
|
||||
match(ms->mod, state & ~forcemousemod))) {
|
||||
ms->func(&(ms->arg));
|
||||
69
suckless/st-patches/4-desktop-entry.diff
Normal file
69
suckless/st-patches/4-desktop-entry.diff
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
From af28f9df9b0194311c25d60a22d1ecd98bfad2e7 Mon Sep 17 00:00:00 2001
|
||||
From: aleks <aleks.stier@icloud.com>
|
||||
Date: Tue, 31 May 2022 00:33:38 +0200
|
||||
Subject: [PATCH] Create a desktop-entry for st
|
||||
|
||||
Enables to find st in a graphical menu and to display it with a nice
|
||||
icon.
|
||||
|
||||
If some applications still are not displaying an icon for st try the patch
|
||||
[netwmicon](../netwmicon/). Programs like tint2 and alttab rely on a hardcoded
|
||||
icon which has to be stored by st in the \_NET\_WM\_ICON window-property.
|
||||
---
|
||||
Makefile | 3 +++
|
||||
config.mk | 1 +
|
||||
st.desktop | 12 ++++++++++++
|
||||
3 files changed, 16 insertions(+)
|
||||
create mode 100644 st.desktop
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 470ac86..2121877 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -49,9 +49,12 @@ install: st
|
||||
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
|
||||
tic -sx st.info
|
||||
@echo Please see the README file regarding the terminfo entry of st.
|
||||
+ mkdir -p $(DESTDIR)$(APPPREFIX)
|
||||
+ cp -f st.desktop $(DESTDIR)$(APPPREFIX)
|
||||
|
||||
uninstall:
|
||||
rm -f $(DESTDIR)$(PREFIX)/bin/st
|
||||
+ rm -f $(DESTDIR)$(APPPREFIX)/st.desktop
|
||||
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
|
||||
|
||||
.PHONY: all options clean dist install uninstall
|
||||
diff --git a/config.mk b/config.mk
|
||||
index 4c4c5d5..b79c517 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -5,6 +5,7 @@ VERSION = 0.8.5
|
||||
|
||||
# paths
|
||||
PREFIX = /usr/local
|
||||
+APPPREFIX = $(PREFIX)/share/applications
|
||||
MANPREFIX = $(PREFIX)/share/man
|
||||
|
||||
X11INC = /usr/X11R6/include
|
||||
diff --git a/st.desktop b/st.desktop
|
||||
new file mode 100644
|
||||
index 0000000..2d2b76f
|
||||
--- /dev/null
|
||||
+++ b/st.desktop
|
||||
@@ -0,0 +1,12 @@
|
||||
+[Desktop Entry]
|
||||
+Type=Application
|
||||
+Exec=st
|
||||
+TryExec=st
|
||||
+Icon=utilities-terminal
|
||||
+Terminal=false
|
||||
+Categories=System;TerminalEmulator;
|
||||
+
|
||||
+Name=st
|
||||
+GenericName=Terminal
|
||||
+Comment=st is a simple terminal implementation for X
|
||||
+StartupWMClass=st-256color
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
||||
152
suckless/st-patches/5-anysize.diff
Normal file
152
suckless/st-patches/5-anysize.diff
Normal file
|
|
@ -0,0 +1,152 @@
|
|||
diff --git a/x.c b/x.c
|
||||
index 9428dd3..f454e5c 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -82,6 +82,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 */
|
||||
@@ -332,7 +333,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;
|
||||
}
|
||||
@@ -340,7 +341,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;
|
||||
}
|
||||
@@ -741,6 +742,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);
|
||||
@@ -871,8 +875,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;
|
||||
@@ -1154,8 +1158,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)
|
||||
@@ -1246,7 +1250,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;
|
||||
@@ -1384,7 +1388,7 @@ void
|
||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int dmode)
|
||||
{
|
||||
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;
|
||||
@@ -1475,17 +1479,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
if (dmode & DRAW_BG) {
|
||||
/* Intelligent cleaning up of the borders. */
|
||||
if (x == 0) {
|
||||
- xclear(0, (y == 0)? 0 : winy, borderpx,
|
||||
+ xclear(0, (y == 0)? 0 : winy, win.vborderpx,
|
||||
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);
|
||||
/* Fill the background */
|
||||
XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
|
||||
@@ -1576,35 +1580,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);
|
||||
}
|
||||
}
|
||||
257
suckless/st-patches/6-alpha-focus.diff
Normal file
257
suckless/st-patches/6-alpha-focus.diff
Normal file
|
|
@ -0,0 +1,257 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index cb64966..0c24f28 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -105,6 +105,9 @@ char *termname = "st-256color";
|
||||
*/
|
||||
unsigned int tabspaces = 8;
|
||||
|
||||
+/* bg opacity */
|
||||
+float alpha = 0.8, alphaUnfocused = 0.6;
|
||||
+
|
||||
/* Terminal colors (16 first used in escape sequence) */
|
||||
static const char *colorname[] = {
|
||||
/* 8 normal colors */
|
||||
@@ -134,6 +137,7 @@ static const char *colorname[] = {
|
||||
[257] = "#f8f8f2",
|
||||
[258] = "#eeeeee",
|
||||
[259] = "#080808",
|
||||
+ "black",
|
||||
};
|
||||
|
||||
|
||||
@@ -145,7 +149,7 @@ unsigned int defaultfg = 258;
|
||||
unsigned int defaultbg = 259;
|
||||
unsigned int defaultcs = 257;
|
||||
static unsigned int defaultrcs = 256;
|
||||
-
|
||||
+unsigned int bg = 17, bgUnfocused = 16;
|
||||
/*
|
||||
* Default shape of cursor
|
||||
* 2: Block ("█")
|
||||
diff --git a/config.mk b/config.mk
|
||||
index 69d3ea2..55d0008 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -17,7 +17,7 @@ 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`
|
||||
|
||||
diff --git a/st.c b/st.c
|
||||
index 185557b..cfedcb6 100644
|
||||
--- a/st.c
|
||||
+++ b/st.c
|
||||
@@ -201,7 +201,6 @@ static void tsetscroll(int, int);
|
||||
static void tswapscreen(void);
|
||||
static void tsetmode(int, int, const int *, int);
|
||||
static int twrite(const char *, int, int);
|
||||
-static void tfulldirt(void);
|
||||
static void tcontrolcode(uchar );
|
||||
static void tdectest(char );
|
||||
static void tdefutf8(char);
|
||||
diff --git a/st.h b/st.h
|
||||
index fbd6f1d..c102ceb 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -86,6 +86,7 @@ typedef union {
|
||||
|
||||
void die(const char *, ...);
|
||||
void redraw(void);
|
||||
+void tfulldirt(void);
|
||||
void draw(void);
|
||||
|
||||
void kscrolldown(const Arg *);
|
||||
@@ -142,4 +143,5 @@ extern unsigned int tabspaces;
|
||||
extern unsigned int defaultfg;
|
||||
extern unsigned int defaultbg;
|
||||
extern unsigned int defaultcs;
|
||||
+extern float alpha, alphaUnfocused;
|
||||
extern const int boxdraw, boxdraw_bold, boxdraw_braille;
|
||||
diff --git a/x.c b/x.c
|
||||
index f454e5c..6587e1e 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -107,6 +107,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;
|
||||
@@ -245,6 +246,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;
|
||||
@@ -254,6 +256,8 @@ static char *opt_line = NULL;
|
||||
static char *opt_name = NULL;
|
||||
static char *opt_title = NULL;
|
||||
|
||||
+static int focused = 0;
|
||||
+
|
||||
static uint buttons; /* bit field of pressed buttons */
|
||||
|
||||
void
|
||||
@@ -758,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);
|
||||
|
||||
@@ -796,28 +800,38 @@ xloadcolor(int i, const char *name, Color *ncolor)
|
||||
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
|
||||
}
|
||||
|
||||
+void
|
||||
+xloadalpha(void)
|
||||
+{
|
||||
+ float const usedAlpha = focused ? alpha : alphaUnfocused;
|
||||
+ if (opt_alpha) alpha = strtof(opt_alpha, NULL);
|
||||
+ dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * usedAlpha);
|
||||
+ dc.col[defaultbg].pixel &= 0x00FFFFFF;
|
||||
+ dc.col[defaultbg].pixel |= (unsigned char)(0xff * usedAlpha) << 24;
|
||||
+}
|
||||
+
|
||||
void
|
||||
xloadcols(void)
|
||||
{
|
||||
- int i;
|
||||
static int loaded;
|
||||
Color *cp;
|
||||
|
||||
- if (loaded) {
|
||||
- for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
|
||||
- XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
|
||||
- } else {
|
||||
- dc.collen = MAX(LEN(colorname), 256);
|
||||
- dc.col = xmalloc(dc.collen * sizeof(Color));
|
||||
+ if (!loaded) {
|
||||
+ dc.collen = 1 + (defaultbg = MAX(LEN(colorname), 256));
|
||||
+ dc.col = xmalloc((dc.collen) * sizeof(Color));
|
||||
}
|
||||
|
||||
- for (i = 0; i < dc.collen; i++)
|
||||
+ for (int i = 0; i+1 < dc.collen; ++i)
|
||||
if (!xloadcolor(i, NULL, &dc.col[i])) {
|
||||
if (colorname[i])
|
||||
die("could not allocate color '%s'\n", colorname[i]);
|
||||
else
|
||||
die("could not allocate color %d\n", i);
|
||||
}
|
||||
+ if (dc.collen) // cannot die, as the color is already loaded.
|
||||
+ xloadcolor(focused ?bg :bgUnfocused, NULL, &dc.col[defaultbg]);
|
||||
+
|
||||
+ xloadalpha();
|
||||
loaded = 1;
|
||||
}
|
||||
|
||||
@@ -1140,11 +1154,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())
|
||||
@@ -1154,7 +1180,7 @@ 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 */
|
||||
@@ -1174,19 +1200,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);
|
||||
|
||||
@@ -1795,12 +1817,22 @@ focus(XEvent *ev)
|
||||
xseturgency(0);
|
||||
if (IS_SET(MODE_FOCUS))
|
||||
ttywrite("\033[I", 3, 0);
|
||||
+ if (!focused) {
|
||||
+ focused = 1;
|
||||
+ xloadcols();
|
||||
+ tfulldirt();
|
||||
+ }
|
||||
} else {
|
||||
if (xw.ime.xic)
|
||||
XUnsetICFocus(xw.ime.xic);
|
||||
win.mode &= ~MODE_FOCUSED;
|
||||
if (IS_SET(MODE_FOCUS))
|
||||
ttywrite("\033[O", 3, 0);
|
||||
+ if (focused) {
|
||||
+ focused = 0;
|
||||
+ xloadcols();
|
||||
+ tfulldirt();
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2053,6 +2085,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;
|
||||
@@ -2104,6 +2139,7 @@ run:
|
||||
XSetLocaleModifiers("");
|
||||
cols = MAX(cols, 1);
|
||||
rows = MAX(rows, 1);
|
||||
+ defaultbg = MAX(LEN(colorname), 256);
|
||||
tnew(cols, rows);
|
||||
xinit(cols, rows);
|
||||
xsetenv();
|
||||
26
suckless/st-patches/7-bold-not-bright.diff
Normal file
26
suckless/st-patches/7-bold-not-bright.diff
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
From e8f3c86d93613eef5af187dfd2dba9ae9919a2ee Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= <code@bnwr.net>
|
||||
Date: Sun, 27 Jan 2019 13:31:28 +0800
|
||||
Subject: [PATCH] Show bold not as bright
|
||||
|
||||
---
|
||||
x.c | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/x.c b/x.c
|
||||
index 0422421..904e1dc 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -1296,10 +1296,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];
|
||||
--
|
||||
2.20.1
|
||||
44
suckless/st-patches/8-charoffsets.diff
Normal file
44
suckless/st-patches/8-charoffsets.diff
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
From 944b234710e2fc00ea6e9ce9d925dc85514ac9c3 Mon Sep 17 00:00:00 2001
|
||||
From: Zacchary Dempsey-Plante <zacc@ztdp.ca>
|
||||
Date: Fri, 11 Mar 2022 01:33:05 -0500
|
||||
Subject: [PATCH] Added character rendering offsets for correcting different
|
||||
font dimensions.
|
||||
|
||||
---
|
||||
config.def.h | 3 +++
|
||||
x.c | 4 ++--
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 91ab8ca..8877e5c 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -28,6 +28,9 @@ char *vtiden = "\033[?6c";
|
||||
/* Kerning / character bounding-box multipliers */
|
||||
static float cwscale = 1.0;
|
||||
static float chscale = 1.0;
|
||||
+/* Character rendering offsets in pixels */
|
||||
+static short cxoffset = 0;
|
||||
+static short cyoffset = 0;
|
||||
|
||||
/*
|
||||
* word delimiter string
|
||||
diff --git a/x.c b/x.c
|
||||
index cd96575..6983743 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -1288,8 +1288,8 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||
if (glyphidx) {
|
||||
specs[numspecs].font = font->match;
|
||||
specs[numspecs].glyph = glyphidx;
|
||||
- specs[numspecs].x = (short)xp;
|
||||
- specs[numspecs].y = (short)yp;
|
||||
+ specs[numspecs].x = (short)xp + cxoffset;
|
||||
+ specs[numspecs].y = (short)yp + cyoffset;
|
||||
xp += runewidth;
|
||||
numspecs++;
|
||||
continue;
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
69
suckless/st-patches/9-themed_cursor.diff
Normal file
69
suckless/st-patches/9-themed_cursor.diff
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index 818a4da..0771ad8 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -170,11 +170,10 @@ static unsigned int cols = 80;
|
||||
static unsigned int rows = 24;
|
||||
|
||||
/*
|
||||
- * Default colour and shape of the mouse cursor
|
||||
+ * Default shape of the mouse cursor
|
||||
*/
|
||||
-static unsigned int mouseshape = XC_xterm;
|
||||
-static unsigned int mousefg = 7;
|
||||
-static unsigned int mousebg = 0;
|
||||
+
|
||||
+static char* mouseshape = "xterm";
|
||||
|
||||
/*
|
||||
* Color used to display font attributes when fontconfig selected a font which
|
||||
diff --git a/config.mk b/config.mk
|
||||
index 55d0008..e795277 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -17,7 +17,7 @@ PKG_CONFIG = pkg-config
|
||||
INCS = -I$(X11INC) \
|
||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||
`$(PKG_CONFIG) --cflags freetype2`
|
||||
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
|
||||
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender -lXcursor\
|
||||
`$(PKG_CONFIG) --libs fontconfig` \
|
||||
`$(PKG_CONFIG) --libs freetype2`
|
||||
|
||||
diff --git a/x.c b/x.c
|
||||
index d56db85..e99388a 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <X11/keysym.h>
|
||||
#include <X11/Xft/Xft.h>
|
||||
#include <X11/XKBlib.h>
|
||||
+#include <X11/Xcursor/Xcursor.h>
|
||||
|
||||
char *argv0;
|
||||
#include "arg.h"
|
||||
@@ -1225,23 +1226,9 @@ xinit(int cols, int rows)
|
||||
}
|
||||
|
||||
/* white cursor, black outline */
|
||||
- cursor = XCreateFontCursor(xw.dpy, mouseshape);
|
||||
+ cursor = XcursorLibraryLoadCursor(xw.dpy, mouseshape);
|
||||
XDefineCursor(xw.dpy, xw.win, cursor);
|
||||
|
||||
- if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
|
||||
- xmousefg.red = 0xffff;
|
||||
- xmousefg.green = 0xffff;
|
||||
- xmousefg.blue = 0xffff;
|
||||
- }
|
||||
-
|
||||
- if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
|
||||
- xmousebg.red = 0x0000;
|
||||
- xmousebg.green = 0x0000;
|
||||
- xmousebg.blue = 0x0000;
|
||||
- }
|
||||
-
|
||||
- XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
|
||||
-
|
||||
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
|
||||
xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
|
||||
xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
|
||||
Loading…
Add table
Add a link
Reference in a new issue