diff options
Diffstat (limited to 'st')
| -rw-r--r-- | st/davidovski.patch | 1192 |
1 files changed, 155 insertions, 1037 deletions
diff --git a/st/davidovski.patch b/st/davidovski.patch index ee263b2..f2634d8 100644 --- a/st/davidovski.patch +++ b/st/davidovski.patch @@ -1,26 +1,3 @@ -From d71723fb393211ce03bae41e26d962b25e3dae98 Mon Sep 17 00:00:00 2001 -From: davidovski <david@davidovski.xyz> -Date: Mon, 4 Dec 2023 23:42:07 +0000 -Subject: [PATCH] davidovski - ---- - Makefile | 6 +- - boxdraw.c | 194 ++++++++++++++++++ - boxdraw_data.h | 214 ++++++++++++++++++++ - config.def.h | 60 +++++- - config.h | 532 +++++++++++++++++++++++++++++++++++++++++++++++++ - st.c | 164 ++++++++++++--- - st.desktop | 8 + - st.h | 12 ++ - st.info | 4 +- - win.h | 4 +- - x.c | 243 ++++++++++++++++++++-- - 11 files changed, 1393 insertions(+), 48 deletions(-) - create mode 100644 boxdraw.c - create mode 100644 boxdraw_data.h - create mode 100644 config.h - create mode 100644 st.desktop - diff --git a/Makefile b/Makefile index 15db421..bc75c1d 100644 --- a/Makefile @@ -55,428 +32,8 @@ index 15db421..bc75c1d 100644 + rm -f $(DESTDIR)$(PREFIX)/share/applications/st.desktop .PHONY: all clean dist install uninstall -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..b55e689 100644 +index 91ab8ca..805e09d 100644 --- a/config.def.h +++ b/config.def.h @@ -5,7 +5,13 @@ @@ -513,7 +70,17 @@ index 91ab8ca..b55e689 100644 /* * bell volume. It must be a value between -100 and 100. Use 0 for disabling * it -@@ -170,12 +188,50 @@ static unsigned int defaultattr = 11; +@@ -93,6 +111,9 @@ char *termname = "st-256color"; + */ + unsigned int tabspaces = 8; + ++/* bg opacity */ ++float alpha = 0.8; ++ + /* Terminal colors (16 first used in escape sequence) */ + static const char *colorname[] = { + /* 8 normal colors */ +@@ -170,12 +191,50 @@ static unsigned int defaultattr = 11; */ static uint forcemousemod = ShiftMask; @@ -564,7 +131,7 @@ index 91ab8ca..b55e689 100644 { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, -@@ -201,6 +257,8 @@ static Shortcut shortcuts[] = { +@@ -201,6 +260,8 @@ static Shortcut shortcuts[] = { { TERMMOD, XK_Y, selpaste, {.i = 0} }, { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, @@ -573,546 +140,21 @@ index 91ab8ca..b55e689 100644 }; /* -diff --git a/config.h b/config.h -new file mode 100644 -index 0000000..b55e689 ---- /dev/null -+++ b/config.h -@@ -0,0 +1,532 @@ -+/* See LICENSE file for copyright and license details. */ -+ -+/* -+ * appearance -+ * -+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html -+ */ -+static char *font = "Liberation Mono:pixelsize=10:antialias=true:autohint=true"; -+/* Spare fonts */ -+static char *font2[] = { -+/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */ -+/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */ -+}; -+ -+static int borderpx = 2; -+ -+/* -+ * What program is execed by st depends of these precedence rules: -+ * 1: program passed with -e -+ * 2: scroll and/or utmp -+ * 3: SHELL environment variable -+ * 4: value of shell in /etc/passwd -+ * 5: value of shell in config.h -+ */ -+static char *shell = "/bin/sh"; -+char *utmp = NULL; -+/* scroll program: to enable use a string like "scroll" */ -+char *scroll = NULL; -+char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; -+ -+/* identification sequence returned in DA and DECID */ -+char *vtiden = "\033[?6c"; -+ -+/* Kerning / character bounding-box multipliers */ -+static float cwscale = 1.0; -+static float chscale = 1.0; -+ -+/* -+ * word delimiter string -+ * -+ * More advanced example: L" `'\"()[]{}" -+ */ -+wchar_t *worddelimiters = L" "; -+ -+/* selection timeouts (in milliseconds) */ -+static unsigned int doubleclicktimeout = 300; -+static unsigned int tripleclicktimeout = 600; -+ -+/* alt screens */ -+int allowaltscreen = 1; -+ -+/* allow certain non-interactive (insecure) window operations such as: -+ setting the clipboard text */ -+int allowwindowops = 0; -+ -+/* -+ * draw latency range in ms - from new content/keypress/etc until drawing. -+ * within this range, st draws when content stops arriving (idle). mostly it's -+ * near minlatency, but it waits longer for slow updates to avoid partial draw. -+ * low minlatency will tear/flicker more, as it can "detect" idle too early. -+ */ -+static double minlatency = 8; -+static double maxlatency = 33; -+ -+/* -+ * blinking timeout (set to 0 to disable blinking) for the terminal blinking -+ * attribute. -+ */ -+static unsigned int blinktimeout = 800; -+ -+/* -+ * thickness of underline and bar cursors -+ */ -+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 -+ */ -+static int bellvolume = 0; -+ -+/* default TERM value */ -+char *termname = "st-256color"; -+ -+/* -+ * spaces per tab -+ * -+ * When you are changing this value, don't forget to adapt the »it« value in -+ * the st.info and appropriately install the st.info in the environment where -+ * you use this st version. -+ * -+ * it#$tabspaces, -+ * -+ * Secondly make sure your kernel is not expanding tabs. When running `stty -+ * -a` »tab0« should appear. You can tell the terminal to not expand tabs by -+ * running following command: -+ * -+ * stty tabs -+ */ -+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", -+ -+ /* 8 bright colors */ -+ "gray50", -+ "red", -+ "green", -+ "yellow", -+ "#5c5cff", -+ "magenta", -+ "cyan", -+ "white", -+ -+ [255] = 0, -+ -+ /* more colors can be added after 255 to use with DefaultXX */ -+ "#cccccc", -+ "#555555", -+ "gray90", /* default foreground colour */ -+ "black", /* default background colour */ -+}; -+ -+ -+/* -+ * Default colors (colorname index) -+ * foreground, background, cursor, reverse cursor -+ */ -+unsigned int defaultfg = 258; -+unsigned int defaultbg = 259; -+unsigned int defaultcs = 256; -+static unsigned int defaultrcs = 257; -+ -+/* -+ * Default shape of cursor -+ * 2: Block ("█") -+ * 4: Underline ("_") -+ * 6: Bar ("|") -+ * 7: Snowman ("☃") -+ */ -+static unsigned int cursorshape = 2; -+ -+/* -+ * Default columns and rows numbers -+ */ -+ -+static unsigned int cols = 80; -+static unsigned int rows = 24; -+ -+/* -+ * Default colour and shape of the mouse cursor -+ */ -+static unsigned int mouseshape = XC_xterm; -+static unsigned int mousefg = 7; -+static unsigned int mousebg = 0; -+ -+/* -+ * Color used to display font attributes when fontconfig selected a font which -+ * doesn't match the ones requested. -+ */ -+static unsigned int defaultattr = 11; -+ -+/* -+ * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set). -+ * Note that if you want to use ShiftMask with selmasks, set this to an other -+ * modifier, set to 0 to not use it. -+ */ -+static uint forcemousemod = ShiftMask; -+ -+/* -+ * Xresources preferences to load at startup -+ */ -+ResourcePref resources[] = { -+ { "font", STRING, &font }, -+ { "color0", STRING, &colorname[0] }, -+ { "color1", STRING, &colorname[1] }, -+ { "color2", STRING, &colorname[2] }, -+ { "color3", STRING, &colorname[3] }, -+ { "color4", STRING, &colorname[4] }, -+ { "color5", STRING, &colorname[5] }, -+ { "color6", STRING, &colorname[6] }, -+ { "color7", STRING, &colorname[7] }, -+ { "color8", STRING, &colorname[8] }, -+ { "color9", STRING, &colorname[9] }, -+ { "color10", STRING, &colorname[10] }, -+ { "color11", STRING, &colorname[11] }, -+ { "color12", STRING, &colorname[12] }, -+ { "color13", STRING, &colorname[13] }, -+ { "color14", STRING, &colorname[14] }, -+ { "color15", STRING, &colorname[15] }, -+ { "background", STRING, &colorname[259] }, -+ { "foreground", STRING, &colorname[258] }, -+ { "cursorColor", STRING, &colorname[256] }, -+ { "termname", STRING, &termname }, -+ { "shell", STRING, &shell }, -+ { "minlatency", INTEGER, &minlatency }, -+ { "maxlatency", INTEGER, &maxlatency }, -+ { "blinktimeout", INTEGER, &blinktimeout }, -+ { "bellvolume", INTEGER, &bellvolume }, -+ { "tabspaces", INTEGER, &tabspaces }, -+ { "borderpx", INTEGER, &borderpx }, -+ { "cwscale", FLOAT, &cwscale }, -+ { "chscale", FLOAT, &chscale }, -+}; -+ -+/* -+ * Internal mouse shortcuts. -+ * Beware that overloading Button1 will disable the selection. -+ */ -+static MouseShortcut mshortcuts[] = { -+ /* mask button function argument release */ -+ { XK_ANY_MOD, Button4, kscrollup, {.i = 5} }, -+ { XK_ANY_MOD, Button5, kscrolldown, {.i = 5} }, -+ { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, -+ { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, -+ { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, -+ { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, -+ { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, -+}; -+ -+/* Internal keyboard shortcuts. */ -+#define MODKEY Mod1Mask -+#define TERMMOD (ControlMask|ShiftMask) -+ -+static Shortcut shortcuts[] = { -+ /* mask keysym function argument */ -+ { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, -+ { ControlMask, XK_Print, toggleprinter, {.i = 0} }, -+ { ShiftMask, XK_Print, printscreen, {.i = 0} }, -+ { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, -+ { TERMMOD, XK_Prior, zoom, {.f = +1} }, -+ { TERMMOD, XK_Next, zoom, {.f = -1} }, -+ { TERMMOD, XK_Home, zoomreset, {.f = 0} }, -+ { TERMMOD, XK_C, clipcopy, {.i = 0} }, -+ { TERMMOD, XK_V, clippaste, {.i = 0} }, -+ { 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} }, -+}; -+ -+/* -+ * Special keys (change & recompile st.info accordingly) -+ * -+ * Mask value: -+ * * Use XK_ANY_MOD to match the key no matter modifiers state -+ * * Use XK_NO_MOD to match the key alone (no modifiers) -+ * appkey value: -+ * * 0: no value -+ * * > 0: keypad application mode enabled -+ * * = 2: term.numlock = 1 -+ * * < 0: keypad application mode disabled -+ * appcursor value: -+ * * 0: no value -+ * * > 0: cursor application mode enabled -+ * * < 0: cursor application mode disabled -+ * -+ * Be careful with the order of the definitions because st searches in -+ * this table sequentially, so any XK_ANY_MOD must be in the last -+ * position for a key. -+ */ -+ -+/* -+ * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) -+ * to be mapped below, add them to this array. -+ */ -+static KeySym mappedkeys[] = { -1 }; -+ -+/* -+ * State bits to ignore when matching key or button events. By default, -+ * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. -+ */ -+static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; -+ -+/* -+ * This is the huge key array which defines all compatibility to the Linux -+ * world. Please decide about changes wisely. -+ */ -+static Key key[] = { -+ /* keysym mask string appkey appcursor */ -+ { XK_KP_Home, ShiftMask, "\033[2J", 0, -1}, -+ { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, -+ { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1}, -+ { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1}, -+ { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0}, -+ { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1}, -+ { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1}, -+ { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0}, -+ { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1}, -+ { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1}, -+ { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0}, -+ { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1}, -+ { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1}, -+ { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0}, -+ { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1}, -+ { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1}, -+ { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, -+ { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, -+ { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0}, -+ { XK_KP_End, ControlMask, "\033[J", -1, 0}, -+ { XK_KP_End, ControlMask, "\033[1;5F", +1, 0}, -+ { XK_KP_End, ShiftMask, "\033[K", -1, 0}, -+ { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0}, -+ { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0}, -+ { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, -+ { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0}, -+ { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, -+ { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0}, -+ { XK_KP_Insert, ControlMask, "\033[L", -1, 0}, -+ { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, -+ { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, -+ { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, -+ { XK_KP_Delete, ControlMask, "\033[M", -1, 0}, -+ { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, -+ { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, -+ { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, -+ { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, -+ { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, -+ { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, -+ { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, -+ { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0}, -+ { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0}, -+ { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0}, -+ { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0}, -+ { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0}, -+ { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0}, -+ { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0}, -+ { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0}, -+ { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0}, -+ { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0}, -+ { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0}, -+ { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0}, -+ { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0}, -+ { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0}, -+ { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0}, -+ { XK_Up, ShiftMask, "\033[1;2A", 0, 0}, -+ { XK_Up, Mod1Mask, "\033[1;3A", 0, 0}, -+ { XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0}, -+ { XK_Up, ControlMask, "\033[1;5A", 0, 0}, -+ { XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0}, -+ { XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0}, -+ { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0}, -+ { XK_Up, XK_ANY_MOD, "\033[A", 0, -1}, -+ { XK_Up, XK_ANY_MOD, "\033OA", 0, +1}, -+ { XK_Down, ShiftMask, "\033[1;2B", 0, 0}, -+ { XK_Down, Mod1Mask, "\033[1;3B", 0, 0}, -+ { XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0}, -+ { XK_Down, ControlMask, "\033[1;5B", 0, 0}, -+ { XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0}, -+ { XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0}, -+ { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0}, -+ { XK_Down, XK_ANY_MOD, "\033[B", 0, -1}, -+ { XK_Down, XK_ANY_MOD, "\033OB", 0, +1}, -+ { XK_Left, ShiftMask, "\033[1;2D", 0, 0}, -+ { XK_Left, Mod1Mask, "\033[1;3D", 0, 0}, -+ { XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0}, -+ { XK_Left, ControlMask, "\033[1;5D", 0, 0}, -+ { XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0}, -+ { XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0}, -+ { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0}, -+ { XK_Left, XK_ANY_MOD, "\033[D", 0, -1}, -+ { XK_Left, XK_ANY_MOD, "\033OD", 0, +1}, -+ { XK_Right, ShiftMask, "\033[1;2C", 0, 0}, -+ { XK_Right, Mod1Mask, "\033[1;3C", 0, 0}, -+ { XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0}, -+ { XK_Right, ControlMask, "\033[1;5C", 0, 0}, -+ { XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0}, -+ { XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0}, -+ { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0}, -+ { XK_Right, XK_ANY_MOD, "\033[C", 0, -1}, -+ { XK_Right, XK_ANY_MOD, "\033OC", 0, +1}, -+ { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, -+ { XK_Return, Mod1Mask, "\033\r", 0, 0}, -+ { XK_Return, XK_ANY_MOD, "\r", 0, 0}, -+ { XK_Insert, ShiftMask, "\033[4l", -1, 0}, -+ { XK_Insert, ShiftMask, "\033[2;2~", +1, 0}, -+ { XK_Insert, ControlMask, "\033[L", -1, 0}, -+ { XK_Insert, ControlMask, "\033[2;5~", +1, 0}, -+ { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, -+ { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, -+ { XK_Delete, ControlMask, "\033[M", -1, 0}, -+ { XK_Delete, ControlMask, "\033[3;5~", +1, 0}, -+ { XK_Delete, ShiftMask, "\033[2K", -1, 0}, -+ { XK_Delete, ShiftMask, "\033[3;2~", +1, 0}, -+ { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, -+ { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, -+ { XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, -+ { XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, -+ { XK_Home, ShiftMask, "\033[2J", 0, -1}, -+ { XK_Home, ShiftMask, "\033[1;2H", 0, +1}, -+ { XK_Home, XK_ANY_MOD, "\033[H", 0, -1}, -+ { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1}, -+ { XK_End, ControlMask, "\033[J", -1, 0}, -+ { XK_End, ControlMask, "\033[1;5F", +1, 0}, -+ { XK_End, ShiftMask, "\033[K", -1, 0}, -+ { XK_End, ShiftMask, "\033[1;2F", +1, 0}, -+ { XK_End, XK_ANY_MOD, "\033[4~", 0, 0}, -+ { XK_Prior, ControlMask, "\033[5;5~", 0, 0}, -+ { XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, -+ { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, -+ { XK_Next, ControlMask, "\033[6;5~", 0, 0}, -+ { XK_Next, ShiftMask, "\033[6;2~", 0, 0}, -+ { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0}, -+ { XK_F1, XK_NO_MOD, "\033OP" , 0, 0}, -+ { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, -+ { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, -+ { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, -+ { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, -+ { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, -+ { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0}, -+ { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, -+ { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, -+ { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, -+ { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, -+ { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, -+ { XK_F3, XK_NO_MOD, "\033OR" , 0, 0}, -+ { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, -+ { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, -+ { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, -+ { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, -+ { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, -+ { XK_F4, XK_NO_MOD, "\033OS" , 0, 0}, -+ { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, -+ { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, -+ { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, -+ { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, -+ { XK_F5, XK_NO_MOD, "\033[15~", 0, 0}, -+ { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, -+ { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, -+ { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, -+ { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, -+ { XK_F6, XK_NO_MOD, "\033[17~", 0, 0}, -+ { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, -+ { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, -+ { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, -+ { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, -+ { XK_F7, XK_NO_MOD, "\033[18~", 0, 0}, -+ { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, -+ { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, -+ { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, -+ { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, -+ { XK_F8, XK_NO_MOD, "\033[19~", 0, 0}, -+ { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, -+ { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, -+ { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, -+ { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, -+ { XK_F9, XK_NO_MOD, "\033[20~", 0, 0}, -+ { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, -+ { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, -+ { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, -+ { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, -+ { XK_F10, XK_NO_MOD, "\033[21~", 0, 0}, -+ { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, -+ { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, -+ { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, -+ { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, -+ { XK_F11, XK_NO_MOD, "\033[23~", 0, 0}, -+ { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, -+ { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, -+ { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, -+ { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, -+ { XK_F12, XK_NO_MOD, "\033[24~", 0, 0}, -+ { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, -+ { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, -+ { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, -+ { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, -+ { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0}, -+ { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0}, -+ { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0}, -+ { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0}, -+ { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0}, -+ { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0}, -+ { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0}, -+ { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0}, -+ { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0}, -+ { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0}, -+ { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0}, -+ { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0}, -+ { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0}, -+ { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0}, -+ { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0}, -+ { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0}, -+ { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0}, -+ { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0}, -+ { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0}, -+ { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0}, -+ { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0}, -+ { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, -+ { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, -+}; -+ -+/* -+ * Selection types' masks. -+ * Use the same masks as usual. -+ * Button1Mask is always unset, to make masks match between ButtonPress. -+ * ButtonRelease and MotionNotify. -+ * If no match is found, regular selection is used. -+ */ -+static uint selmasks[] = { -+ [SEL_RECTANGULAR] = Mod1Mask, -+}; -+ -+/* -+ * Printable characters in ASCII, used to estimate the advance width -+ * of single wide characters. -+ */ -+static char ascii_printable[] = -+ " !\"#$%&'()*+,-./0123456789:;<=>?" -+ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" -+ "`abcdefghijklmnopqrstuvwxyz{|}~"; +diff --git a/config.mk b/config.mk +index 1e306f8..47c615e 100644 +--- a/config.mk ++++ b/config.mk +@@ -16,7 +16,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 d6478f5..1fd732e 100644 +index 77c3e8a..df6d4c9 100644 --- a/st.c +++ b/st.c @@ -35,6 +35,7 @@ @@ -1369,9 +411,9 @@ index d6478f5..1fd732e 100644 } int32_t -@@ -1729,11 +1794,11 @@ csihandle(void) - break; +@@ -1730,11 +1795,11 @@ csihandle(void) case 'S': /* SU -- Scroll <n> line up */ + if (csiescseq.priv) break; DEFAULT(csiescseq.arg[0], 1); - tscrollup(term.top, csiescseq.arg[0]); + tscrollup(term.top, csiescseq.arg[0], 0); @@ -1383,7 +425,7 @@ index d6478f5..1fd732e 100644 break; case 'L': /* IL -- Insert <n> blank lines */ DEFAULT(csiescseq.arg[0], 1); -@@ -1809,6 +1874,33 @@ csihandle(void) +@@ -1810,6 +1875,33 @@ csihandle(void) goto unknown; } break; @@ -1417,7 +459,7 @@ index d6478f5..1fd732e 100644 } } -@@ -1887,7 +1979,7 @@ strhandle(void) +@@ -1888,7 +1980,7 @@ strhandle(void) switch (par) { case 0: if (narg > 1) { @@ -1426,7 +468,7 @@ index d6478f5..1fd732e 100644 xseticontitle(strescseq.args[1]); } return; -@@ -1897,7 +1989,7 @@ strhandle(void) +@@ -1898,7 +1990,7 @@ strhandle(void) return; case 2: if (narg > 1) @@ -1435,7 +477,7 @@ index d6478f5..1fd732e 100644 return; case 52: if (narg > 2 && allowwindowops) { -@@ -1956,7 +2048,7 @@ strhandle(void) +@@ -1957,7 +2049,7 @@ strhandle(void) } break; case 'k': /* old title set compatibility */ @@ -1444,7 +486,7 @@ index d6478f5..1fd732e 100644 return; case 'P': /* DCS -- Device Control String */ case '_': /* APC -- Application Program Command */ -@@ -2305,7 +2397,7 @@ eschandle(uchar ascii) +@@ -2310,7 +2402,7 @@ eschandle(uchar ascii) return 0; case 'D': /* IND -- Linefeed */ if (term.c.y == term.bot) { @@ -1453,7 +495,7 @@ index d6478f5..1fd732e 100644 } else { tmoveto(term.c.x, term.c.y+1); } -@@ -2318,7 +2410,7 @@ eschandle(uchar ascii) +@@ -2323,7 +2415,7 @@ eschandle(uchar ascii) break; case 'M': /* RI -- Reverse index */ if (term.c.y == term.top) { @@ -1462,7 +504,7 @@ index d6478f5..1fd732e 100644 } else { tmoveto(term.c.x, term.c.y-1); } -@@ -2328,6 +2420,7 @@ eschandle(uchar ascii) +@@ -2333,6 +2425,7 @@ eschandle(uchar ascii) break; case 'c': /* RIS -- Reset to initial state */ treset(); @@ -1470,7 +512,7 @@ index d6478f5..1fd732e 100644 resettitle(); xloadcols(); xsetmode(0, MODE_HIDE); -@@ -2541,7 +2634,7 @@ twrite(const char *buf, int buflen, int show_ctrl) +@@ -2546,7 +2639,7 @@ twrite(const char *buf, int buflen, int show_ctrl) void tresize(int col, int row) { @@ -1479,7 +521,7 @@ index d6478f5..1fd732e 100644 int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); int *bp; -@@ -2578,6 +2671,14 @@ tresize(int col, int row) +@@ -2583,6 +2676,14 @@ tresize(int col, int row) term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); @@ -1494,7 +536,7 @@ index d6478f5..1fd732e 100644 /* 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)); -@@ -2623,7 +2724,7 @@ tresize(int col, int row) +@@ -2628,7 +2729,7 @@ tresize(int col, int row) void resettitle(void) { @@ -1503,7 +545,7 @@ index d6478f5..1fd732e 100644 } void -@@ -2636,7 +2737,7 @@ drawregion(int x1, int y1, int x2, int y2) +@@ -2641,7 +2742,7 @@ drawregion(int x1, int y1, int x2, int y2) continue; term.dirty[y] = 0; @@ -1512,7 +554,7 @@ index d6478f5..1fd732e 100644 } } -@@ -2657,8 +2758,9 @@ draw(void) +@@ -2662,8 +2763,9 @@ draw(void) cx--; drawregion(0, 0, term.col, term.row); @@ -1524,22 +566,8 @@ index d6478f5..1fd732e 100644 term.ocx = cx; term.ocy = term.c.y; xfinishdraw(); -diff --git a/st.desktop b/st.desktop -new file mode 100644 -index 0000000..49029d8 ---- /dev/null -+++ b/st.desktop -@@ -0,0 +1,8 @@ -+[Desktop Entry] -+Name=st -+Comment=st is a simple terminal implementation for X -+Exec=st -+Icon=utilities-terminal -+Terminal=false -+Type=Application -+Categories=System;TerminalEmulator; diff --git a/st.h b/st.h -index fd3b0d8..f6bd3b4 100644 +index fd3b0d8..c248ec6 100644 --- a/st.h +++ b/st.h @@ -33,6 +33,7 @@ enum glyph_attribute { @@ -1574,10 +602,11 @@ index fd3b0d8..f6bd3b4 100644 /* config.h globals */ extern char *utmp; extern char *scroll; -@@ -124,3 +135,4 @@ extern unsigned int tabspaces; +@@ -124,3 +135,5 @@ extern unsigned int tabspaces; extern unsigned int defaultfg; extern unsigned int defaultbg; extern unsigned int defaultcs; ++extern float alpha; +extern const int boxdraw, boxdraw_bold, boxdraw_braille; diff --git a/st.info b/st.info index efab2cf..24dfc7d 100644 @@ -1617,7 +646,7 @@ index 6de960d..2a40aa0 100644 void xsetmode(int, unsigned int); void xsetpointermotion(int); diff --git a/x.c b/x.c -index b36fb8c..ccfb7e7 100644 +index b36fb8c..458e4af 100644 --- a/x.c +++ b/x.c @@ -14,6 +14,7 @@ @@ -1658,7 +687,15 @@ index b36fb8c..ccfb7e7 100644 /* XEMBED messages */ #define XEMBED_FOCUS_IN 4 #define XEMBED_FOCUS_OUT 5 -@@ -157,6 +174,8 @@ static void xhints(void); +@@ -105,6 +122,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; +@@ -157,6 +175,8 @@ static void xhints(void); static int xloadcolor(int, const char *, Color *); static int xloadfont(Font *, FcPattern *); static void xloadfonts(const char *, double); @@ -1667,7 +704,7 @@ index b36fb8c..ccfb7e7 100644 static void xunloadfont(Font *); static void xunloadfonts(void); static void xsetenv(void); -@@ -220,6 +239,8 @@ static DC dc; +@@ -220,6 +240,8 @@ static DC dc; static XWindow xw; static XSelection xsel; static TermWindow win; @@ -1676,7 +713,15 @@ index b36fb8c..ccfb7e7 100644 /* Font Ring Cache */ enum { -@@ -306,6 +327,7 @@ zoomabs(const Arg *arg) +@@ -243,6 +265,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; +@@ -306,6 +329,7 @@ zoomabs(const Arg *arg) { xunloadfonts(); xloadfonts(usedfont, arg->f); @@ -1684,7 +729,7 @@ index b36fb8c..ccfb7e7 100644 cresize(0, 0); redraw(); xhints(); -@@ -686,6 +708,8 @@ setsel(char *str, Time t) +@@ -686,6 +710,8 @@ setsel(char *str, Time t) XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) selclear(); @@ -1693,7 +738,30 @@ index b36fb8c..ccfb7e7 100644 } void -@@ -859,8 +883,8 @@ xclear(int x1, int y1, int x2, int y2) +@@ -752,7 +778,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); + +@@ -812,6 +838,13 @@ xloadcols(void) + else + die("could not allocate color %d\n", i); + } ++ ++ /* set alpha value of bg color */ ++ if (opt_alpha) ++ alpha = strtof(opt_alpha, NULL); ++ dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha); ++ dc.col[defaultbg].pixel &= 0x00FFFFFF; ++ dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24; + loaded = 1; + } + +@@ -859,8 +892,8 @@ xclear(int x1, int y1, int x2, int y2) void xhints(void) { @@ -1704,7 +772,7 @@ index b36fb8c..ccfb7e7 100644 XWMHints wm = {.flags = InputHint, .input = 1}; XSizeHints *sizeh; -@@ -1050,6 +1074,101 @@ xloadfonts(const char *fontstr, double fontsize) +@@ -1050,6 +1083,101 @@ xloadfonts(const char *fontstr, double fontsize) FcPatternDestroy(pattern); } @@ -1806,16 +874,33 @@ index b36fb8c..ccfb7e7 100644 void xunloadfont(Font *f) { -@@ -1135,8 +1254,6 @@ xinit(int cols, int rows) +@@ -1134,11 +1262,22 @@ 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); +- 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; -@@ -1147,6 +1264,9 @@ xinit(int cols, int rows) + /* font */ + if (!FcInit()) +@@ -1147,8 +1286,11 @@ xinit(int cols, int rows) usedfont = (opt_font == NULL)? font : opt_font; xloadfonts(usedfont, 0); @@ -1823,9 +908,35 @@ index b36fb8c..ccfb7e7 100644 + xloadsparefonts(); + /* colors */ - xw.cmap = XDefaultColormap(xw.dpy, xw.scr); +- xw.cmap = XDefaultColormap(xw.dpy, xw.scr); ++ xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None); xloadcols(); -@@ -1237,6 +1357,8 @@ xinit(int cols, int rows) + + /* adjust fixed window geometry */ +@@ -1168,19 +1310,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); + +@@ -1237,6 +1375,8 @@ xinit(int cols, int rows) xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); if (xsel.xtarget == None) xsel.xtarget = XA_STRING; @@ -1834,7 +945,7 @@ index b36fb8c..ccfb7e7 100644 } int -@@ -1283,8 +1405,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x +@@ -1283,8 +1423,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x yp = winy + font->ascent; } @@ -1850,7 +961,7 @@ index b36fb8c..ccfb7e7 100644 if (glyphidx) { specs[numspecs].font = font->match; specs[numspecs].glyph = glyphidx; -@@ -1488,8 +1615,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i +@@ -1488,8 +1633,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i r.width = width; XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1); @@ -1865,7 +976,7 @@ index b36fb8c..ccfb7e7 100644 /* Render underline and strikethrough. */ if (base.mode & ATTR_UNDERLINE) { -@@ -1532,7 +1663,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) +@@ -1532,7 +1681,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) /* * Select the right color for the right mode. */ @@ -1874,7 +985,7 @@ index b36fb8c..ccfb7e7 100644 if (IS_SET(MODE_REVERSE)) { g.mode |= ATTR_REVERSE; -@@ -1626,10 +1757,30 @@ xseticontitle(char *p) +@@ -1626,10 +1775,30 @@ xseticontitle(char *p) } void @@ -1908,7 +1019,7 @@ index b36fb8c..ccfb7e7 100644 if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, &prop) != Success) -@@ -1639,6 +1790,16 @@ xsettitle(char *p) +@@ -1639,6 +1808,16 @@ xsettitle(char *p) XFree(prop.value); } @@ -1925,7 +1036,7 @@ index b36fb8c..ccfb7e7 100644 int xstartdraw(void) { -@@ -2014,6 +2175,59 @@ run(void) +@@ -2014,6 +2193,59 @@ run(void) } } @@ -1985,7 +1096,17 @@ index b36fb8c..ccfb7e7 100644 void usage(void) { -@@ -2087,6 +2301,11 @@ run: +@@ -2038,6 +2270,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; +@@ -2087,6 +2322,11 @@ run: setlocale(LC_CTYPE, ""); XSetLocaleModifiers(""); @@ -1997,6 +1118,3 @@ index b36fb8c..ccfb7e7 100644 cols = MAX(cols, 1); rows = MAX(rows, 1); tnew(cols, rows); --- -2.43.0 - |