Merge branch 'mr-st'
This commit is contained in:
mrsu
commit
7fa191c767
3
Makefile
3
Makefile
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
include config.mk
|
include config.mk
|
||||||
|
|
||||||
SRC = st.c x.c
|
SRC = st.c x.c boxdraw.c
|
||||||
OBJ = $(SRC:.c=.o)
|
OBJ = $(SRC:.c=.o)
|
||||||
|
|
||||||
all: st
|
all: st
|
||||||
|
|
@ -17,6 +17,7 @@ config.h:
|
||||||
|
|
||||||
st.o: config.h st.h win.h
|
st.o: config.h st.h win.h
|
||||||
x.o: arg.h 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
|
$(OBJ): config.h config.mk
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -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) */
|
||||||
|
};
|
||||||
76
config.def.h
76
config.def.h
|
|
@ -5,7 +5,10 @@
|
||||||
*
|
*
|
||||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
*/
|
*/
|
||||||
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
static char *font = "monospace:pixelsize=32:antialias=true:autohint=true";
|
||||||
|
/* Spare fonts */
|
||||||
|
static char *font2[] = { "NotoColorEmoji:pixelsize=24:antialias=true:autohint=true" };
|
||||||
|
|
||||||
static int borderpx = 2;
|
static int borderpx = 2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -67,6 +70,18 @@ static unsigned int blinktimeout = 800;
|
||||||
*/
|
*/
|
||||||
static unsigned int cursorthickness = 2;
|
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 = 1;
|
||||||
|
const int boxdraw_bold = 0;
|
||||||
|
|
||||||
|
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
||||||
|
const int boxdraw_braille = 1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
||||||
* it
|
* it
|
||||||
|
|
@ -93,6 +108,12 @@ char *termname = "st-256color";
|
||||||
*/
|
*/
|
||||||
unsigned int tabspaces = 8;
|
unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
/* bg opacity */
|
||||||
|
float alpha = 0.8;
|
||||||
|
|
||||||
|
/* Background opacity */
|
||||||
|
float alpha_def;
|
||||||
|
|
||||||
/* Terminal colors (16 first used in escape sequence) */
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
static const char *colorname[] = {
|
static const char *colorname[] = {
|
||||||
/* 8 normal colors */
|
/* 8 normal colors */
|
||||||
|
|
@ -131,8 +152,8 @@ static const char *colorname[] = {
|
||||||
*/
|
*/
|
||||||
unsigned int defaultfg = 258;
|
unsigned int defaultfg = 258;
|
||||||
unsigned int defaultbg = 259;
|
unsigned int defaultbg = 259;
|
||||||
unsigned int defaultcs = 256;
|
unsigned int defaultcs = 3;
|
||||||
static unsigned int defaultrcs = 257;
|
static unsigned int defaultrcs = 50;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Default shape of cursor
|
* Default shape of cursor
|
||||||
|
|
@ -170,6 +191,43 @@ static unsigned int defaultattr = 11;
|
||||||
*/
|
*/
|
||||||
static uint forcemousemod = ShiftMask;
|
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[256] },
|
||||||
|
{ "foreground", STRING, &colorname[257] },
|
||||||
|
{ "cursorColor", STRING, &colorname[258] },
|
||||||
|
{ "termname", STRING, &termname },
|
||||||
|
{ "shell", STRING, &shell },
|
||||||
|
{ "alpha", FLOAT, &alpha },
|
||||||
|
{ "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.
|
* Internal mouse shortcuts.
|
||||||
* Beware that overloading Button1 will disable the selection.
|
* Beware that overloading Button1 will disable the selection.
|
||||||
|
|
@ -193,14 +251,22 @@ static Shortcut shortcuts[] = {
|
||||||
{ ControlMask, XK_Print, toggleprinter, {.i = 0} },
|
{ ControlMask, XK_Print, toggleprinter, {.i = 0} },
|
||||||
{ ShiftMask, XK_Print, printscreen, {.i = 0} },
|
{ ShiftMask, XK_Print, printscreen, {.i = 0} },
|
||||||
{ XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
|
{ XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
|
||||||
{ TERMMOD, XK_Prior, zoom, {.f = +1} },
|
{ TERMMOD, XK_K, zoom, {.f = +2} },
|
||||||
{ TERMMOD, XK_Next, zoom, {.f = -1} },
|
{ TERMMOD, XK_J, zoom, {.f = -2} },
|
||||||
{ TERMMOD, XK_Home, zoomreset, {.f = 0} },
|
{ TERMMOD, XK_Home, zoomreset, {.f = 0} },
|
||||||
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
||||||
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
{ TERMMOD, XK_Escape, keyboard_select,{ 0 } },
|
||||||
|
{ ControlMask, XK_Page_Up, kscrollup, {.i = 10} },
|
||||||
|
{ ControlMask, XK_Page_Down, kscrolldown, {.i = 10} },
|
||||||
|
{ ControlMask, XK_k, kscrollup, {.i = 1} },
|
||||||
|
{ ControlMask, XK_j, kscrolldown, {.i = 1} },
|
||||||
|
{ TERMMOD, XK_N, chgalpha, {.f = -1} }, /* Decrease opacity */
|
||||||
|
{ TERMMOD, XK_M, chgalpha, {.f = +1} }, /* Increase opacity */
|
||||||
|
{ TERMMOD, XK_B, chgalpha, {.f = 0} }, /* Reset opacity */
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,540 @@
|
||||||
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* appearance
|
||||||
|
*
|
||||||
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
|
*/
|
||||||
|
static char *font = "monospace:pixelsize=32:antialias=true:autohint=true";
|
||||||
|
/* Spare fonts */
|
||||||
|
static char *font2[] = { "NotoColorEmoji:pixelsize=24: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 = 1;
|
||||||
|
const int boxdraw_bold = 0;
|
||||||
|
|
||||||
|
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
||||||
|
const int boxdraw_braille = 1;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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;
|
||||||
|
|
||||||
|
/* bg opacity */
|
||||||
|
float alpha = 0.8;
|
||||||
|
|
||||||
|
/* Background opacity */
|
||||||
|
float alpha_def;
|
||||||
|
|
||||||
|
/* 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 = 3;
|
||||||
|
static unsigned int defaultrcs = 50;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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[256] },
|
||||||
|
{ "foreground", STRING, &colorname[257] },
|
||||||
|
{ "cursorColor", STRING, &colorname[258] },
|
||||||
|
{ "termname", STRING, &termname },
|
||||||
|
{ "shell", STRING, &shell },
|
||||||
|
{ "alpha", FLOAT, &alpha },
|
||||||
|
{ "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, 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_K, zoom, {.f = +2} },
|
||||||
|
{ TERMMOD, XK_J, zoom, {.f = -2} },
|
||||||
|
{ 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} },
|
||||||
|
{ TERMMOD, XK_Escape, keyboard_select,{ 0 } },
|
||||||
|
{ ControlMask, XK_Page_Up, kscrollup, {.i = 10} },
|
||||||
|
{ ControlMask, XK_Page_Down, kscrolldown, {.i = 10} },
|
||||||
|
{ ControlMask, XK_k, kscrollup, {.i = 1} },
|
||||||
|
{ ControlMask, XK_j, kscrolldown, {.i = 1} },
|
||||||
|
{ TERMMOD, XK_N, chgalpha, {.f = -1} }, /* Decrease opacity */
|
||||||
|
{ TERMMOD, XK_M, chgalpha, {.f = +1} }, /* Increase opacity */
|
||||||
|
{ TERMMOD, XK_B, chgalpha, {.f = 0} }, /* Reset opacity */
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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{|}~";
|
||||||
|
|
@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config
|
||||||
INCS = -I$(X11INC) \
|
INCS = -I$(X11INC) \
|
||||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||||
`$(PKG_CONFIG) --cflags freetype2`
|
`$(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 fontconfig` \
|
||||||
`$(PKG_CONFIG) --libs freetype2`
|
`$(PKG_CONFIG) --libs freetype2`
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,146 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 91ab8ca..6af616e 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -93,6 +93,9 @@ char *termname = "st-256color";
|
||||||
|
*/
|
||||||
|
unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
+/* bg opacity */
|
||||||
|
+float alpha = 0.8;
|
||||||
|
+
|
||||||
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
|
static const char *colorname[] = {
|
||||||
|
/* 8 normal colors */
|
||||||
|
diff --git a/config.mk b/config.mk
|
||||||
|
index 4c4c5d5..0114bad 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.h b/st.h
|
||||||
|
index 519b9bd..8bb533d 100644
|
||||||
|
--- a/st.h
|
||||||
|
+++ b/st.h
|
||||||
|
@@ -126,3 +126,4 @@ extern unsigned int tabspaces;
|
||||||
|
extern unsigned int defaultfg;
|
||||||
|
extern unsigned int defaultbg;
|
||||||
|
extern unsigned int defaultcs;
|
||||||
|
+extern float alpha;
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index 8a16faa..ddf4178 100644
|
||||||
|
--- a/x.c
|
||||||
|
+++ b/x.c
|
||||||
|
@@ -105,6 +105,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;
|
||||||
|
@@ -243,6 +244,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;
|
||||||
|
@@ -736,7 +738,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,6 +798,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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1118,11 +1127,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())
|
||||||
|
@@ -1132,7 +1153,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 */
|
||||||
|
@@ -1152,19 +1173,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);
|
||||||
|
|
||||||
|
@@ -2019,6 +2036,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;
|
||||||
|
|
@ -0,0 +1,583 @@
|
||||||
|
From 46a1124957b8de5e7f827656b64bfc3baeaa097f Mon Sep 17 00:00:00 2001
|
||||||
|
From: wael <40663@protonmail.com>
|
||||||
|
Date: Mon, 11 Apr 2022 17:04:30 +0300
|
||||||
|
Subject: [PATCH] [st][patch][boxdraw] update to 0.8.5
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile | 3 +-
|
||||||
|
boxdraw.c | 194 ++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
boxdraw_data.h | 214 +++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
config.def.h | 12 +++
|
||||||
|
st.c | 3 +
|
||||||
|
st.h | 10 +++
|
||||||
|
x.c | 21 +++--
|
||||||
|
7 files changed, 451 insertions(+), 6 deletions(-)
|
||||||
|
create mode 100644 boxdraw.c
|
||||||
|
create mode 100644 boxdraw_data.h
|
||||||
|
|
||||||
|
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 f43cfd3..baa2bed 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -1214,6 +1214,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 519b9bd..07a7c66 100644
|
||||||
|
--- a/st.h
|
||||||
|
+++ b/st.h
|
||||||
|
@@ -33,6 +33,7 @@ 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,
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -113,6 +114,14 @@ char *xstrdup(const char *);
|
||||||
|
|
||||||
|
int xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b);
|
||||||
|
|
||||||
|
+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;
|
||||||
|
@@ -126,3 +135,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..bf6bbf9 100644
|
||||||
|
--- a/x.c
|
||||||
|
+++ b/x.c
|
||||||
|
@@ -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;
|
||||||
|
@@ -1488,8 +1495,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||||
|
r.width = width;
|
||||||
|
XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
|
||||||
|
|
||||||
|
- /* Render the glyphs. */
|
||||||
|
- XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
|
||||||
|
+ 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);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* Render underline and strikethrough. */
|
||||||
|
if (base.mode & ATTR_UNDERLINE) {
|
||||||
|
@@ -1532,7 +1543,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;
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,80 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 91ab8ca..8a06176 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -93,6 +93,9 @@ char *termname = "st-256color";
|
||||||
|
*/
|
||||||
|
unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
+/* Background opacity */
|
||||||
|
+float alpha_def;
|
||||||
|
+
|
||||||
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
|
static const char *colorname[] = {
|
||||||
|
/* 8 normal colors */
|
||||||
|
@@ -201,6 +204,9 @@ static Shortcut shortcuts[] = {
|
||||||
|
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||||
|
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||||
|
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
+ { MODKEY, XK_bracketleft, chgalpha, {.f = -1} }, /* Decrease opacity */
|
||||||
|
+ { MODKEY|ShiftMask, XK_braceright, chgalpha, {.f = +1} }, /* Increase opacity */
|
||||||
|
+ { MODKEY, XK_bracketright,chgalpha, {.f = 0} }, /* Reset opacity */
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
diff --git a/st.h b/st.h
|
||||||
|
index fd3b0d8..3bb587e 100644
|
||||||
|
--- a/st.h
|
||||||
|
+++ b/st.h
|
||||||
|
@@ -124,3 +124,4 @@ extern unsigned int tabspaces;
|
||||||
|
extern unsigned int defaultfg;
|
||||||
|
extern unsigned int defaultbg;
|
||||||
|
extern unsigned int defaultcs;
|
||||||
|
+extern float alpha_def;
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index aa09997..f8c8c1a 100644
|
||||||
|
--- a/x.c
|
||||||
|
+++ b/x.c
|
||||||
|
@@ -59,6 +59,7 @@ static void zoom(const Arg *);
|
||||||
|
static void zoomabs(const Arg *);
|
||||||
|
static void zoomreset(const Arg *);
|
||||||
|
static void ttysend(const Arg *);
|
||||||
|
+static void chgalpha(const Arg *);
|
||||||
|
|
||||||
|
/* config.h for applying patches and the configuration. */
|
||||||
|
#include "config.h"
|
||||||
|
@@ -1147,6 +1148,9 @@ xinit(int cols, int rows)
|
||||||
|
usedfont = (opt_font == NULL)? font : opt_font;
|
||||||
|
xloadfonts(usedfont, 0);
|
||||||
|
|
||||||
|
+ /* Backup default alpha value */
|
||||||
|
+ alpha_def = alpha;
|
||||||
|
+
|
||||||
|
/* colors */
|
||||||
|
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
||||||
|
xloadcols();
|
||||||
|
@@ -1371,6 +1375,24 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||||
|
return numspecs;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+chgalpha(const Arg *arg)
|
||||||
|
+{
|
||||||
|
+ if (arg->f == -1.0f && alpha >= 0.1f)
|
||||||
|
+ alpha -= 0.1f;
|
||||||
|
+ else if (arg->f == 1.0f && alpha < 1.0f)
|
||||||
|
+ alpha += 0.1f;
|
||||||
|
+ else if (arg->f == 0.0f)
|
||||||
|
+ alpha = alpha_def;
|
||||||
|
+ else
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ dc.col[defaultbg].color.alpha = (unsigned short)(0xFFFF * alpha);
|
||||||
|
+ /* Required to remove artifacting from borderpx */
|
||||||
|
+ cresize(0, 0);
|
||||||
|
+ redraw();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
||||||
|
{
|
||||||
|
|
@ -0,0 +1,163 @@
|
||||||
|
From 1635e04d3643dd4caa0c7c2043b585c6d7e4705f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rizqi Nur Assyaufi <bandithijo@gmail.com>
|
||||||
|
Date: Mon, 18 Jul 2022 01:15:45 +0800
|
||||||
|
Subject: [PATCH] [st][patch][font2] Add patch for st-0.8.5
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 6 +++
|
||||||
|
x.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 107 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 91ab8ca..717b2f0 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -6,6 +6,12 @@
|
||||||
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
|
*/
|
||||||
|
static char *font = "Liberation Mono:pixelsize=12: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;
|
||||||
|
|
||||||
|
/*
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index 8a16faa..220fc4f 100644
|
||||||
|
--- a/x.c
|
||||||
|
+++ b/x.c
|
||||||
|
@@ -157,6 +157,8 @@ static void xhints(void);
|
||||||
|
static int xloadcolor(int, const char *, Color *);
|
||||||
|
static int xloadfont(Font *, FcPattern *);
|
||||||
|
static void xloadfonts(const char *, double);
|
||||||
|
+static int xloadsparefont(FcPattern *, int);
|
||||||
|
+static void xloadsparefonts(void);
|
||||||
|
static void xunloadfont(Font *);
|
||||||
|
static void xunloadfonts(void);
|
||||||
|
static void xsetenv(void);
|
||||||
|
@@ -306,6 +308,7 @@ zoomabs(const Arg *arg)
|
||||||
|
{
|
||||||
|
xunloadfonts();
|
||||||
|
xloadfonts(usedfont, arg->f);
|
||||||
|
+ xloadsparefonts();
|
||||||
|
cresize(0, 0);
|
||||||
|
redraw();
|
||||||
|
xhints();
|
||||||
|
@@ -1034,6 +1037,101 @@ xloadfonts(const char *fontstr, double fontsize)
|
||||||
|
FcPatternDestroy(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
+int
|
||||||
|
+xloadsparefont(FcPattern *pattern, int flags)
|
||||||
|
+{
|
||||||
|
+ FcPattern *match;
|
||||||
|
+ FcResult result;
|
||||||
|
+
|
||||||
|
+ match = FcFontMatch(NULL, pattern, &result);
|
||||||
|
+ if (!match) {
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) {
|
||||||
|
+ FcPatternDestroy(match);
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ frc[frclen].flags = flags;
|
||||||
|
+ /* Believe U+0000 glyph will present in each default font */
|
||||||
|
+ frc[frclen].unicodep = 0;
|
||||||
|
+ frclen++;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+xloadsparefonts(void)
|
||||||
|
+{
|
||||||
|
+ FcPattern *pattern;
|
||||||
|
+ double sizeshift, fontval;
|
||||||
|
+ int fc;
|
||||||
|
+ char **fp;
|
||||||
|
+
|
||||||
|
+ if (frclen != 0)
|
||||||
|
+ die("can't embed spare fonts. cache isn't empty");
|
||||||
|
+
|
||||||
|
+ /* Calculate count of spare fonts */
|
||||||
|
+ fc = sizeof(font2) / sizeof(*font2);
|
||||||
|
+ if (fc == 0)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ /* Allocate memory for cache entries. */
|
||||||
|
+ if (frccap < 4 * fc) {
|
||||||
|
+ frccap += 4 * fc - frccap;
|
||||||
|
+ frc = xrealloc(frc, frccap * sizeof(Fontcache));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (fp = font2; fp - font2 < fc; ++fp) {
|
||||||
|
+
|
||||||
|
+ if (**fp == '-')
|
||||||
|
+ pattern = XftXlfdParse(*fp, False, False);
|
||||||
|
+ else
|
||||||
|
+ pattern = FcNameParse((FcChar8 *)*fp);
|
||||||
|
+
|
||||||
|
+ if (!pattern)
|
||||||
|
+ die("can't open spare font %s\n", *fp);
|
||||||
|
+
|
||||||
|
+ if (defaultfontsize > 0) {
|
||||||
|
+ sizeshift = usedfontsize - defaultfontsize;
|
||||||
|
+ if (sizeshift != 0 &&
|
||||||
|
+ FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
|
||||||
|
+ FcResultMatch) {
|
||||||
|
+ fontval += sizeshift;
|
||||||
|
+ FcPatternDel(pattern, FC_PIXEL_SIZE);
|
||||||
|
+ FcPatternDel(pattern, FC_SIZE);
|
||||||
|
+ FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ FcPatternAddBool(pattern, FC_SCALABLE, 1);
|
||||||
|
+
|
||||||
|
+ FcConfigSubstitute(NULL, pattern, FcMatchPattern);
|
||||||
|
+ XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
|
||||||
|
+
|
||||||
|
+ if (xloadsparefont(pattern, FRC_NORMAL))
|
||||||
|
+ die("can't open spare font %s\n", *fp);
|
||||||
|
+
|
||||||
|
+ FcPatternDel(pattern, FC_SLANT);
|
||||||
|
+ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
|
||||||
|
+ if (xloadsparefont(pattern, FRC_ITALIC))
|
||||||
|
+ die("can't open spare font %s\n", *fp);
|
||||||
|
+
|
||||||
|
+ FcPatternDel(pattern, FC_WEIGHT);
|
||||||
|
+ FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
|
||||||
|
+ if (xloadsparefont(pattern, FRC_ITALICBOLD))
|
||||||
|
+ die("can't open spare font %s\n", *fp);
|
||||||
|
+
|
||||||
|
+ FcPatternDel(pattern, FC_SLANT);
|
||||||
|
+ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
|
||||||
|
+ if (xloadsparefont(pattern, FRC_BOLD))
|
||||||
|
+ die("can't open spare font %s\n", *fp);
|
||||||
|
+
|
||||||
|
+ FcPatternDestroy(pattern);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
xunloadfont(Font *f)
|
||||||
|
{
|
||||||
|
@@ -1131,6 +1229,9 @@ xinit(int cols, int rows)
|
||||||
|
usedfont = (opt_font == NULL)? font : opt_font;
|
||||||
|
xloadfonts(usedfont, 0);
|
||||||
|
|
||||||
|
+ /* spare fonts */
|
||||||
|
+ xloadsparefonts();
|
||||||
|
+
|
||||||
|
/* colors */
|
||||||
|
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
||||||
|
xloadcols();
|
||||||
|
--
|
||||||
|
2.37.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,206 @@
|
||||||
|
From 68de38fadd04f2f454bceccea0fccc8276b635cb Mon Sep 17 00:00:00 2001
|
||||||
|
From: wael <40663@protonmail.com>
|
||||||
|
Date: Mon, 11 Apr 2022 16:45:49 +0300
|
||||||
|
Subject: [PATCH] add glyph wide support patch
|
||||||
|
|
||||||
|
---
|
||||||
|
st.h | 6 +++
|
||||||
|
x.c | 134 +++++++++++++++++++++++++++++------------------------------
|
||||||
|
2 files changed, 73 insertions(+), 67 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/st.h b/st.h
|
||||||
|
index 519b9bd..4f74621 100644
|
||||||
|
--- a/st.h
|
||||||
|
+++ b/st.h
|
||||||
|
@@ -36,6 +36,12 @@ enum glyph_attribute {
|
||||||
|
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,
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index 2a3bd38..d60df52 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);
|
||||||
|
@@ -1372,7 +1372,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 +1463,40 @@ 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 (base.mode & ATTR_STRUCK) {
|
||||||
|
- XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
|
||||||
|
- width, 1);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- /* Reset clip to none. */
|
||||||
|
- XftDrawSetClip(xw.draw, 0);
|
||||||
|
+ 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) {
|
||||||
|
+ /* 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 + 1,
|
||||||
|
+ width, 1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (base.mode & ATTR_STRUCK) {
|
||||||
|
+ XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
|
||||||
|
+ width, 1);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -1513,7 +1506,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
|
||||||
|
@@ -1648,32 +1641,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
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,336 @@
|
||||||
|
From 45cadc1ce5d8d9dd3493c2e9979e8958d87e8bc5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bartosz Sosna <brtsos@gmail.com>
|
||||||
|
Date: Sat, 4 May 2019 00:28:24 +0200
|
||||||
|
Subject: [PATCH] Adjust patch to version st-0.8.2
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 1 +
|
||||||
|
st.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
st.h | 1 +
|
||||||
|
win.h | 3 +
|
||||||
|
x.c | 15 ++++
|
||||||
|
5 files changed, 242 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 482901e..c1e9cce 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -178,6 +178,7 @@ static Shortcut shortcuts[] = {
|
||||||
|
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||||
|
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||||
|
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
+ { TERMMOD, XK_Escape, keyboard_select,{ 0 } },
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
diff --git a/st.c b/st.c
|
||||||
|
index ede7ae6..c2116b2 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -16,6 +16,8 @@
|
||||||
|
#include <termios.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <wchar.h>
|
||||||
|
+#include <X11/keysym.h>
|
||||||
|
+#include <X11/X.h>
|
||||||
|
|
||||||
|
#include "st.h"
|
||||||
|
#include "win.h"
|
||||||
|
@@ -2464,6 +2466,9 @@ tresize(int col, int row)
|
||||||
|
int *bp;
|
||||||
|
TCursor c;
|
||||||
|
|
||||||
|
+ if ( row < term.row || col < term.col )
|
||||||
|
+ toggle_winmode(trt_kbdselect(XK_Escape, NULL, 0));
|
||||||
|
+
|
||||||
|
if (col < 1 || row < 1) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"tresize: error resizing to %dx%d\n", col, row);
|
||||||
|
@@ -2586,3 +2591,220 @@ redraw(void)
|
||||||
|
tfulldirt();
|
||||||
|
draw();
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+void set_notifmode(int type, KeySym ksym) {
|
||||||
|
+ static char *lib[] = { " MOVE ", " SEL "};
|
||||||
|
+ static Glyph *g, *deb, *fin;
|
||||||
|
+ static int col, bot;
|
||||||
|
+
|
||||||
|
+ if ( ksym == -1 ) {
|
||||||
|
+ free(g);
|
||||||
|
+ col = term.col, bot = term.bot;
|
||||||
|
+ g = xmalloc(col * sizeof(Glyph));
|
||||||
|
+ memcpy(g, term.line[bot], col * sizeof(Glyph));
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == -2 )
|
||||||
|
+ memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
+
|
||||||
|
+ if ( type < 2 ) {
|
||||||
|
+ char *z = lib[type];
|
||||||
|
+ for (deb = &term.line[bot][col - 6], fin = &term.line[bot][col]; deb < fin; z++, deb++)
|
||||||
|
+ deb->mode = ATTR_REVERSE,
|
||||||
|
+ deb->u = *z,
|
||||||
|
+ deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
+ }
|
||||||
|
+ else if ( type < 5 )
|
||||||
|
+ memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
+ else {
|
||||||
|
+ for (deb = &term.line[bot][0], fin = &term.line[bot][col]; deb < fin; deb++)
|
||||||
|
+ deb->mode = ATTR_REVERSE,
|
||||||
|
+ deb->u = ' ',
|
||||||
|
+ deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
+ term.line[bot][0].u = ksym;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ term.dirty[bot] = 1;
|
||||||
|
+ drawregion(0, bot, col, bot + 1);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void select_or_drawcursor(int selectsearch_mode, int type) {
|
||||||
|
+ int done = 0;
|
||||||
|
+
|
||||||
|
+ if ( selectsearch_mode & 1 ) {
|
||||||
|
+ selextend(term.c.x, term.c.y, type, done);
|
||||||
|
+ xsetsel(getsel());
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x],
|
||||||
|
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void search(int selectsearch_mode, Rune *target, int ptarget, int incr, int type, TCursor *cu) {
|
||||||
|
+ Rune *r;
|
||||||
|
+ int i, bound = (term.col * cu->y + cu->x) * (incr > 0) + incr;
|
||||||
|
+
|
||||||
|
+ for (i = term.col * term.c.y + term.c.x + incr; i != bound; i += incr) {
|
||||||
|
+ for (r = target; r - target < ptarget; r++) {
|
||||||
|
+ if ( *r == term.line[(i + r - target) / term.col][(i + r - target) % term.col].u ) {
|
||||||
|
+ if ( r - target == ptarget - 1 ) break;
|
||||||
|
+ } else {
|
||||||
|
+ r = NULL;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if ( r != NULL ) break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ( i != bound ) {
|
||||||
|
+ term.c.y = i / term.col, term.c.x = i % term.col;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int trt_kbdselect(KeySym ksym, char *buf, int len) {
|
||||||
|
+ static TCursor cu;
|
||||||
|
+ static Rune target[64];
|
||||||
|
+ static int type = 1, ptarget, in_use;
|
||||||
|
+ static int sens, quant;
|
||||||
|
+ static char selectsearch_mode;
|
||||||
|
+ int i, bound, *xy;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ if ( selectsearch_mode & 2 ) {
|
||||||
|
+ if ( ksym == XK_Return ) {
|
||||||
|
+ selectsearch_mode ^= 2;
|
||||||
|
+ set_notifmode(selectsearch_mode, -2);
|
||||||
|
+ if ( ksym == XK_Escape ) ptarget = 0;
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == XK_BackSpace ) {
|
||||||
|
+ if ( !ptarget ) return 0;
|
||||||
|
+ term.line[term.bot][ptarget--].u = ' ';
|
||||||
|
+ }
|
||||||
|
+ else if ( len < 1 ) {
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ptarget == term.col || ksym == XK_Escape ) {
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ utf8decode(buf, &target[ptarget++], len);
|
||||||
|
+ term.line[term.bot][ptarget].u = target[ptarget - 1];
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ( ksym != XK_BackSpace )
|
||||||
|
+ search(selectsearch_mode, &target[0], ptarget, sens, type, &cu);
|
||||||
|
+
|
||||||
|
+ term.dirty[term.bot] = 1;
|
||||||
|
+ drawregion(0, term.bot, term.col, term.bot + 1);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ switch ( ksym ) {
|
||||||
|
+ case -1 :
|
||||||
|
+ in_use = 1;
|
||||||
|
+ cu.x = term.c.x, cu.y = term.c.y;
|
||||||
|
+ set_notifmode(0, ksym);
|
||||||
|
+ return MODE_KBDSELECT;
|
||||||
|
+ case XK_s :
|
||||||
|
+ if ( selectsearch_mode & 1 )
|
||||||
|
+ selclear();
|
||||||
|
+ else
|
||||||
|
+ selstart(term.c.x, term.c.y, 0);
|
||||||
|
+ set_notifmode(selectsearch_mode ^= 1, ksym);
|
||||||
|
+ break;
|
||||||
|
+ case XK_t :
|
||||||
|
+ selextend(term.c.x, term.c.y, type ^= 3, i = 0); /* 2 fois */
|
||||||
|
+ selextend(term.c.x, term.c.y, type, i = 0);
|
||||||
|
+ break;
|
||||||
|
+ case XK_slash :
|
||||||
|
+ case XK_KP_Divide :
|
||||||
|
+ case XK_question :
|
||||||
|
+ ksym &= XK_question; /* Divide to slash */
|
||||||
|
+ sens = (ksym == XK_slash) ? -1 : 1;
|
||||||
|
+ ptarget = 0;
|
||||||
|
+ set_notifmode(15, ksym);
|
||||||
|
+ selectsearch_mode ^= 2;
|
||||||
|
+ break;
|
||||||
|
+ case XK_Escape :
|
||||||
|
+ if ( !in_use ) break;
|
||||||
|
+ selclear();
|
||||||
|
+ case XK_Return :
|
||||||
|
+ set_notifmode(4, ksym);
|
||||||
|
+ term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode = 0, type);
|
||||||
|
+ in_use = quant = 0;
|
||||||
|
+ return MODE_KBDSELECT;
|
||||||
|
+ case XK_n :
|
||||||
|
+ case XK_N :
|
||||||
|
+ if ( ptarget )
|
||||||
|
+ search(selectsearch_mode, &target[0], ptarget, (ksym == XK_n) ? -1 : 1, type, &cu);
|
||||||
|
+ break;
|
||||||
|
+ case XK_BackSpace :
|
||||||
|
+ term.c.x = 0;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_dollar :
|
||||||
|
+ term.c.x = term.col - 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_Home :
|
||||||
|
+ term.c.x = 0, term.c.y = 0;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_End :
|
||||||
|
+ term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_Page_Up :
|
||||||
|
+ case XK_Page_Down :
|
||||||
|
+ term.c.y = (ksym == XK_Prior ) ? 0 : cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_exclam :
|
||||||
|
+ term.c.x = term.col >> 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_asterisk :
|
||||||
|
+ case XK_KP_Multiply :
|
||||||
|
+ term.c.x = term.col >> 1;
|
||||||
|
+ case XK_underscore :
|
||||||
|
+ term.c.y = cu.y >> 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ default :
|
||||||
|
+ if ( ksym >= XK_0 && ksym <= XK_9 ) { /* 0-9 keyboard */
|
||||||
|
+ quant = (quant * 10) + (ksym ^ XK_0);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym >= XK_KP_0 && ksym <= XK_KP_9 ) { /* 0-9 numpad */
|
||||||
|
+ quant = (quant * 10) + (ksym ^ XK_KP_0);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == XK_k || ksym == XK_h )
|
||||||
|
+ i = ksym & 1;
|
||||||
|
+ else if ( ksym == XK_l || ksym == XK_j )
|
||||||
|
+ i = ((ksym & 6) | 4) >> 1;
|
||||||
|
+ else if ( (XK_Home & ksym) != XK_Home || (i = (ksym ^ XK_Home) - 1) > 3 )
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ xy = (i & 1) ? &term.c.y : &term.c.x;
|
||||||
|
+ sens = (i & 2) ? 1 : -1;
|
||||||
|
+ bound = (i >> 1 ^ 1) ? 0 : (i ^ 3) ? term.col - 1 : term.bot;
|
||||||
|
+
|
||||||
|
+ if ( quant == 0 )
|
||||||
|
+ quant++;
|
||||||
|
+
|
||||||
|
+ if ( *xy == bound && ((sens < 0 && bound == 0) || (sens > 0 && bound > 0)) )
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ *xy += quant * sens;
|
||||||
|
+ if ( *xy < 0 || ( bound > 0 && *xy > bound) )
|
||||||
|
+ *xy = bound;
|
||||||
|
+
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ }
|
||||||
|
+ quant = 0;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
diff --git a/st.h b/st.h
|
||||||
|
index 4da3051..22125e4 100644
|
||||||
|
--- a/st.h
|
||||||
|
+++ b/st.h
|
||||||
|
@@ -109,6 +109,7 @@ size_t utf8encode(Rune, char *);
|
||||||
|
void *xmalloc(size_t);
|
||||||
|
void *xrealloc(void *, size_t);
|
||||||
|
char *xstrdup(char *);
|
||||||
|
+int trt_kbdselect(KeySym, char *, int);
|
||||||
|
|
||||||
|
/* config.h globals */
|
||||||
|
extern char *utmp;
|
||||||
|
diff --git a/win.h b/win.h
|
||||||
|
index a6ef1b9..a240783 100644
|
||||||
|
--- a/win.h
|
||||||
|
+++ b/win.h
|
||||||
|
@@ -21,6 +21,7 @@ enum win_mode {
|
||||||
|
MODE_NUMLOCK = 1 << 17,
|
||||||
|
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
||||||
|
|MODE_MOUSEMANY,
|
||||||
|
+ MODE_KBDSELECT = 1 << 18,
|
||||||
|
};
|
||||||
|
|
||||||
|
void xbell(void);
|
||||||
|
@@ -36,4 +37,6 @@ void xsetmode(int, unsigned int);
|
||||||
|
void xsetpointermotion(int);
|
||||||
|
void xsetsel(char *);
|
||||||
|
int xstartdraw(void);
|
||||||
|
+void toggle_winmode(int);
|
||||||
|
+void keyboard_select(const Arg *);
|
||||||
|
void xximspot(int, int);
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index 5828a3b..5221641 100644
|
||||||
|
--- a/x.c
|
||||||
|
+++ b/x.c
|
||||||
|
@@ -1731,6 +1731,13 @@ kpress(XEvent *ev)
|
||||||
|
return;
|
||||||
|
|
||||||
|
len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
|
||||||
|
+ if ( IS_SET(MODE_KBDSELECT) ) {
|
||||||
|
+ if ( match(XK_NO_MOD, e->state) ||
|
||||||
|
+ (XK_Shift_L | XK_Shift_R) & e->state )
|
||||||
|
+ win.mode ^= trt_kbdselect(ksym, buf, len);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* 1. shortcuts */
|
||||||
|
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
||||||
|
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
||||||
|
@@ -1914,6 +1921,14 @@ usage(void)
|
||||||
|
" [stty_args ...]\n", argv0, argv0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void toggle_winmode(int flag) {
|
||||||
|
+ win.mode ^= flag;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void keyboard_select(const Arg *dummy) {
|
||||||
|
+ win.mode ^= trt_kbdselect(-1, NULL, 0);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,319 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 6f05dce..54612d1 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -199,6 +199,7 @@ static Shortcut shortcuts[] = {
|
||||||
|
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||||
|
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||||
|
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
+ { TERMMOD, XK_Escape, keyboard_select,{.i = 0} },
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
diff --git a/st.c b/st.c
|
||||||
|
index ef8abd5..0c6c6ca 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -16,6 +16,8 @@
|
||||||
|
#include <termios.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <wchar.h>
|
||||||
|
+#include <X11/keysym.h>
|
||||||
|
+#include <X11/X.h>
|
||||||
|
|
||||||
|
#include "st.h"
|
||||||
|
#include "win.h"
|
||||||
|
@@ -2487,6 +2489,9 @@ tresize(int col, int row)
|
||||||
|
int *bp;
|
||||||
|
TCursor c;
|
||||||
|
|
||||||
|
+ if ( row < term.row || col < term.col )
|
||||||
|
+ toggle_winmode(trt_kbdselect(XK_Escape, NULL, 0));
|
||||||
|
+
|
||||||
|
if (col < 1 || row < 1) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"tresize: error resizing to %dx%d\n", col, row);
|
||||||
|
@@ -2612,3 +2617,220 @@ redraw(void)
|
||||||
|
tfulldirt();
|
||||||
|
draw();
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+void set_notifmode(int type, KeySym ksym) {
|
||||||
|
+ static char *lib[] = { " MOVE ", " SEL "};
|
||||||
|
+ static Glyph *g, *deb, *fin;
|
||||||
|
+ static int col, bot;
|
||||||
|
+
|
||||||
|
+ if ( ksym == -1 ) {
|
||||||
|
+ free(g);
|
||||||
|
+ col = term.col, bot = term.bot;
|
||||||
|
+ g = xmalloc(col * sizeof(Glyph));
|
||||||
|
+ memcpy(g, term.line[bot], col * sizeof(Glyph));
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == -2 )
|
||||||
|
+ memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
+
|
||||||
|
+ if ( type < 2 ) {
|
||||||
|
+ char *z = lib[type];
|
||||||
|
+ for (deb = &term.line[bot][col - 6], fin = &term.line[bot][col]; deb < fin; z++, deb++)
|
||||||
|
+ deb->mode = ATTR_REVERSE,
|
||||||
|
+ deb->u = *z,
|
||||||
|
+ deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
+ }
|
||||||
|
+ else if ( type < 5 )
|
||||||
|
+ memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
+ else {
|
||||||
|
+ for (deb = &term.line[bot][0], fin = &term.line[bot][col]; deb < fin; deb++)
|
||||||
|
+ deb->mode = ATTR_REVERSE,
|
||||||
|
+ deb->u = ' ',
|
||||||
|
+ deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
+ term.line[bot][0].u = ksym;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ term.dirty[bot] = 1;
|
||||||
|
+ drawregion(0, bot, col, bot + 1);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void select_or_drawcursor(int selectsearch_mode, int type) {
|
||||||
|
+ int done = 0;
|
||||||
|
+
|
||||||
|
+ if ( selectsearch_mode & 1 ) {
|
||||||
|
+ selextend(term.c.x, term.c.y, type, done);
|
||||||
|
+ xsetsel(getsel());
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x],
|
||||||
|
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void search(int selectsearch_mode, Rune *target, int ptarget, int incr, int type, TCursor *cu) {
|
||||||
|
+ Rune *r;
|
||||||
|
+ int i, bound = (term.col * cu->y + cu->x) * (incr > 0) + incr;
|
||||||
|
+
|
||||||
|
+ for (i = term.col * term.c.y + term.c.x + incr; i != bound; i += incr) {
|
||||||
|
+ for (r = target; r - target < ptarget; r++) {
|
||||||
|
+ if ( *r == term.line[(i + r - target) / term.col][(i + r - target) % term.col].u ) {
|
||||||
|
+ if ( r - target == ptarget - 1 ) break;
|
||||||
|
+ } else {
|
||||||
|
+ r = NULL;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if ( r != NULL ) break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ( i != bound ) {
|
||||||
|
+ term.c.y = i / term.col, term.c.x = i % term.col;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int trt_kbdselect(KeySym ksym, char *buf, int len) {
|
||||||
|
+ static TCursor cu;
|
||||||
|
+ static Rune target[64];
|
||||||
|
+ static int type = 1, ptarget, in_use;
|
||||||
|
+ static int sens, quant;
|
||||||
|
+ static char selectsearch_mode;
|
||||||
|
+ int i, bound, *xy;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ if ( selectsearch_mode & 2 ) {
|
||||||
|
+ if ( ksym == XK_Return ) {
|
||||||
|
+ selectsearch_mode ^= 2;
|
||||||
|
+ set_notifmode(selectsearch_mode, -2);
|
||||||
|
+ if ( ksym == XK_Escape ) ptarget = 0;
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == XK_BackSpace ) {
|
||||||
|
+ if ( !ptarget ) return 0;
|
||||||
|
+ term.line[term.bot][ptarget--].u = ' ';
|
||||||
|
+ }
|
||||||
|
+ else if ( len < 1 ) {
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ptarget == term.col || ksym == XK_Escape ) {
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ utf8decode(buf, &target[ptarget++], len);
|
||||||
|
+ term.line[term.bot][ptarget].u = target[ptarget - 1];
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ( ksym != XK_BackSpace )
|
||||||
|
+ search(selectsearch_mode, &target[0], ptarget, sens, type, &cu);
|
||||||
|
+
|
||||||
|
+ term.dirty[term.bot] = 1;
|
||||||
|
+ drawregion(0, term.bot, term.col, term.bot + 1);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ switch ( ksym ) {
|
||||||
|
+ case -1 :
|
||||||
|
+ in_use = 1;
|
||||||
|
+ cu.x = term.c.x, cu.y = term.c.y;
|
||||||
|
+ set_notifmode(0, ksym);
|
||||||
|
+ return MODE_KBDSELECT;
|
||||||
|
+ case XK_s :
|
||||||
|
+ if ( selectsearch_mode & 1 )
|
||||||
|
+ selclear();
|
||||||
|
+ else
|
||||||
|
+ selstart(term.c.x, term.c.y, 0);
|
||||||
|
+ set_notifmode(selectsearch_mode ^= 1, ksym);
|
||||||
|
+ break;
|
||||||
|
+ case XK_t :
|
||||||
|
+ selextend(term.c.x, term.c.y, type ^= 3, i = 0); /* 2 fois */
|
||||||
|
+ selextend(term.c.x, term.c.y, type, i = 0);
|
||||||
|
+ break;
|
||||||
|
+ case XK_slash :
|
||||||
|
+ case XK_KP_Divide :
|
||||||
|
+ case XK_question :
|
||||||
|
+ ksym &= XK_question; /* Divide to slash */
|
||||||
|
+ sens = (ksym == XK_slash) ? -1 : 1;
|
||||||
|
+ ptarget = 0;
|
||||||
|
+ set_notifmode(15, ksym);
|
||||||
|
+ selectsearch_mode ^= 2;
|
||||||
|
+ break;
|
||||||
|
+ case XK_Escape :
|
||||||
|
+ if ( !in_use ) break;
|
||||||
|
+ selclear();
|
||||||
|
+ case XK_Return :
|
||||||
|
+ set_notifmode(4, ksym);
|
||||||
|
+ term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode = 0, type);
|
||||||
|
+ in_use = quant = 0;
|
||||||
|
+ return MODE_KBDSELECT;
|
||||||
|
+ case XK_n :
|
||||||
|
+ case XK_N :
|
||||||
|
+ if ( ptarget )
|
||||||
|
+ search(selectsearch_mode, &target[0], ptarget, (ksym == XK_n) ? -1 : 1, type, &cu);
|
||||||
|
+ break;
|
||||||
|
+ case XK_BackSpace :
|
||||||
|
+ term.c.x = 0;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_dollar :
|
||||||
|
+ term.c.x = term.col - 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_Home :
|
||||||
|
+ term.c.x = 0, term.c.y = 0;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_End :
|
||||||
|
+ term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_Page_Up :
|
||||||
|
+ case XK_Page_Down :
|
||||||
|
+ term.c.y = (ksym == XK_Prior ) ? 0 : cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_exclam :
|
||||||
|
+ term.c.x = term.col >> 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_asterisk :
|
||||||
|
+ case XK_KP_Multiply :
|
||||||
|
+ term.c.x = term.col >> 1;
|
||||||
|
+ case XK_underscore :
|
||||||
|
+ term.c.y = cu.y >> 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ default :
|
||||||
|
+ if ( ksym >= XK_0 && ksym <= XK_9 ) { /* 0-9 keyboard */
|
||||||
|
+ quant = (quant * 10) + (ksym ^ XK_0);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym >= XK_KP_0 && ksym <= XK_KP_9 ) { /* 0-9 numpad */
|
||||||
|
+ quant = (quant * 10) + (ksym ^ XK_KP_0);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == XK_k || ksym == XK_h )
|
||||||
|
+ i = ksym & 1;
|
||||||
|
+ else if ( ksym == XK_l || ksym == XK_j )
|
||||||
|
+ i = ((ksym & 6) | 4) >> 1;
|
||||||
|
+ else if ( (XK_Home & ksym) != XK_Home || (i = (ksym ^ XK_Home) - 1) > 3 )
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ xy = (i & 1) ? &term.c.y : &term.c.x;
|
||||||
|
+ sens = (i & 2) ? 1 : -1;
|
||||||
|
+ bound = (i >> 1 ^ 1) ? 0 : (i ^ 3) ? term.col - 1 : term.bot;
|
||||||
|
+
|
||||||
|
+ if ( quant == 0 )
|
||||||
|
+ quant++;
|
||||||
|
+
|
||||||
|
+ if ( *xy == bound && ((sens < 0 && bound == 0) || (sens > 0 && bound > 0)) )
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ *xy += quant * sens;
|
||||||
|
+ if ( *xy < 0 || ( bound > 0 && *xy > bound) )
|
||||||
|
+ *xy = bound;
|
||||||
|
+
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ }
|
||||||
|
+ quant = 0;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
diff --git a/st.h b/st.h
|
||||||
|
index 3d351b6..2d1a11b 100644
|
||||||
|
--- a/st.h
|
||||||
|
+++ b/st.h
|
||||||
|
@@ -110,6 +110,7 @@ size_t utf8encode(Rune, char *);
|
||||||
|
void *xmalloc(size_t);
|
||||||
|
void *xrealloc(void *, size_t);
|
||||||
|
char *xstrdup(char *);
|
||||||
|
+int trt_kbdselect(KeySym, char *, int);
|
||||||
|
|
||||||
|
/* config.h globals */
|
||||||
|
extern char *utmp;
|
||||||
|
diff --git a/win.h b/win.h
|
||||||
|
index a6ef1b9..9a47fbb 100644
|
||||||
|
--- a/win.h
|
||||||
|
+++ b/win.h
|
||||||
|
@@ -21,6 +21,7 @@ enum win_mode {
|
||||||
|
MODE_NUMLOCK = 1 << 17,
|
||||||
|
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
||||||
|
|MODE_MOUSEMANY,
|
||||||
|
+ MODE_KBDSELECT = 1 << 18,
|
||||||
|
};
|
||||||
|
|
||||||
|
void xbell(void);
|
||||||
|
@@ -36,4 +37,6 @@ void xsetmode(int, unsigned int);
|
||||||
|
void xsetpointermotion(int);
|
||||||
|
void xsetsel(char *);
|
||||||
|
int xstartdraw(void);
|
||||||
|
+void toggle_winmode(int);
|
||||||
|
+void keyboard_select(const Arg *);
|
||||||
|
void xximspot(int, int);
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index 210f184..b77ce54 100644
|
||||||
|
--- a/x.c
|
||||||
|
+++ b/x.c
|
||||||
|
@@ -1800,6 +1800,12 @@ kpress(XEvent *ev)
|
||||||
|
len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status);
|
||||||
|
else
|
||||||
|
len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
|
||||||
|
+ if ( IS_SET(MODE_KBDSELECT) ) {
|
||||||
|
+ if ( match(XK_NO_MOD, e->state) ||
|
||||||
|
+ (XK_Shift_L | XK_Shift_R) & e->state )
|
||||||
|
+ win.mode ^= trt_kbdselect(ksym, buf, len);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
/* 1. shortcuts */
|
||||||
|
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
||||||
|
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
||||||
|
@@ -1977,6 +1983,14 @@ usage(void)
|
||||||
|
" [stty_args ...]\n", argv0, argv0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void toggle_winmode(int flag) {
|
||||||
|
+ win.mode ^= flag;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void keyboard_select(const Arg *dummy) {
|
||||||
|
+ win.mode ^= trt_kbdselect(-1, NULL, 0);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
|
@ -0,0 +1,350 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 91ab8ca..e3b469b 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -201,6 +201,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 51049ba..cd750f2 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 */
|
||||||
|
@@ -184,8 +191,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);
|
||||||
|
@@ -416,10 +423,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;
|
||||||
|
@@ -528,7 +535,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;
|
||||||
|
@@ -543,14 +550,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)))
|
||||||
|
@@ -571,14 +578,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;
|
||||||
|
}
|
||||||
|
@@ -609,13 +616,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;
|
||||||
|
|
||||||
|
@@ -851,6 +858,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);
|
||||||
|
@@ -1062,12 +1072,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);
|
||||||
|
@@ -1078,17 +1128,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);
|
||||||
|
|
||||||
|
@@ -1098,7 +1159,8 @@ tscrollup(int orig, int n)
|
||||||
|
term.line[i+n] = temp;
|
||||||
|
}
|
||||||
|
|
||||||
|
- selscroll(orig, -n);
|
||||||
|
+ if (term.scr == 0)
|
||||||
|
+ selscroll(orig, -n);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -1127,7 +1189,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++;
|
||||||
|
}
|
||||||
|
@@ -1292,14 +1354,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
|
||||||
|
@@ -1736,11 +1798,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);
|
||||||
|
@@ -2330,7 +2392,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);
|
||||||
|
}
|
||||||
|
@@ -2343,7 +2405,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);
|
||||||
|
}
|
||||||
|
@@ -2557,7 +2619,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;
|
||||||
|
@@ -2594,6 +2656,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));
|
||||||
|
@@ -2652,7 +2722,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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2673,8 +2743,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 519b9bd..da36b34 100644
|
||||||
|
--- a/st.h
|
||||||
|
+++ b/st.h
|
||||||
|
@@ -81,6 +81,8 @@ 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 *);
|
||||||
|
|
@ -0,0 +1,184 @@
|
||||||
|
From 2752a599ee01305a435729bfacf43b1dde7cf0ef Mon Sep 17 00:00:00 2001
|
||||||
|
From: Benji Encalada Mora <benji@encalada.dev>
|
||||||
|
Date: Thu, 4 Jun 2020 00:41:10 -0500
|
||||||
|
Subject: [PATCH] fix: replace xfps and actionfps variables
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 36 ++++++++++++++++++++++++
|
||||||
|
x.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++---
|
||||||
|
2 files changed, 110 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 6f05dce..9b99782 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -168,6 +168,42 @@ static unsigned int defaultattr = 11;
|
||||||
|
*/
|
||||||
|
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[256] },
|
||||||
|
+ { "foreground", STRING, &colorname[257] },
|
||||||
|
+ { "cursorColor", STRING, &colorname[258] },
|
||||||
|
+ { "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.
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index 210f184..76f167f 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/Xresource.h>
|
||||||
|
|
||||||
|
char *argv0;
|
||||||
|
#include "arg.h"
|
||||||
|
@@ -45,6 +46,19 @@ typedef struct {
|
||||||
|
signed char appcursor; /* application cursor */
|
||||||
|
} Key;
|
||||||
|
|
||||||
|
+/* Xresources preferences */
|
||||||
|
+enum resource_type {
|
||||||
|
+ STRING = 0,
|
||||||
|
+ INTEGER = 1,
|
||||||
|
+ FLOAT = 2
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+typedef struct {
|
||||||
|
+ char *name;
|
||||||
|
+ enum resource_type type;
|
||||||
|
+ void *dst;
|
||||||
|
+} ResourcePref;
|
||||||
|
+
|
||||||
|
/* X modifiers */
|
||||||
|
#define XK_ANY_MOD UINT_MAX
|
||||||
|
#define XK_NO_MOD 0
|
||||||
|
@@ -828,8 +842,8 @@ xclear(int x1, int y1, int x2, int y2)
|
||||||
|
void
|
||||||
|
xhints(void)
|
||||||
|
{
|
||||||
|
- XClassHint class = {opt_name ? opt_name : termname,
|
||||||
|
- opt_class ? opt_class : termname};
|
||||||
|
+ XClassHint class = {opt_name ? opt_name : "st",
|
||||||
|
+ opt_class ? opt_class : "St"};
|
||||||
|
XWMHints wm = {.flags = InputHint, .input = 1};
|
||||||
|
XSizeHints *sizeh;
|
||||||
|
|
||||||
|
@@ -1104,8 +1118,6 @@ xinit(int cols, int rows)
|
||||||
|
pid_t thispid = getpid();
|
||||||
|
XColor xmousefg, xmousebg;
|
||||||
|
|
||||||
|
- if (!(xw.dpy = XOpenDisplay(NULL)))
|
||||||
|
- die("can't open display\n");
|
||||||
|
xw.scr = XDefaultScreen(xw.dpy);
|
||||||
|
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
||||||
|
|
||||||
|
@@ -1964,6 +1976,59 @@ run(void)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+int
|
||||||
|
+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
|
||||||
|
+{
|
||||||
|
+ char **sdst = dst;
|
||||||
|
+ int *idst = dst;
|
||||||
|
+ float *fdst = dst;
|
||||||
|
+
|
||||||
|
+ char fullname[256];
|
||||||
|
+ char fullclass[256];
|
||||||
|
+ char *type;
|
||||||
|
+ XrmValue ret;
|
||||||
|
+
|
||||||
|
+ snprintf(fullname, sizeof(fullname), "%s.%s",
|
||||||
|
+ opt_name ? opt_name : "st", name);
|
||||||
|
+ snprintf(fullclass, sizeof(fullclass), "%s.%s",
|
||||||
|
+ opt_class ? opt_class : "St", name);
|
||||||
|
+ fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
|
||||||
|
+
|
||||||
|
+ XrmGetResource(db, fullname, fullclass, &type, &ret);
|
||||||
|
+ if (ret.addr == NULL || strncmp("String", type, 64))
|
||||||
|
+ return 1;
|
||||||
|
+
|
||||||
|
+ switch (rtype) {
|
||||||
|
+ case STRING:
|
||||||
|
+ *sdst = ret.addr;
|
||||||
|
+ break;
|
||||||
|
+ case INTEGER:
|
||||||
|
+ *idst = strtoul(ret.addr, NULL, 10);
|
||||||
|
+ break;
|
||||||
|
+ case FLOAT:
|
||||||
|
+ *fdst = strtof(ret.addr, NULL);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+config_init(void)
|
||||||
|
+{
|
||||||
|
+ char *resm;
|
||||||
|
+ XrmDatabase db;
|
||||||
|
+ ResourcePref *p;
|
||||||
|
+
|
||||||
|
+ XrmInitialize();
|
||||||
|
+ resm = XResourceManagerString(xw.dpy);
|
||||||
|
+ if (!resm)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ db = XrmGetStringDatabase(resm);
|
||||||
|
+ for (p = resources; p < resources + LEN(resources); p++)
|
||||||
|
+ resource_load(db, p->name, p->type, p->dst);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
usage(void)
|
||||||
|
{
|
||||||
|
@@ -2037,6 +2102,11 @@ run:
|
||||||
|
|
||||||
|
setlocale(LC_CTYPE, "");
|
||||||
|
XSetLocaleModifiers("");
|
||||||
|
+
|
||||||
|
+ if(!(xw.dpy = XOpenDisplay(NULL)))
|
||||||
|
+ die("Can't open display\n");
|
||||||
|
+
|
||||||
|
+ config_init();
|
||||||
|
cols = MAX(cols, 1);
|
||||||
|
rows = MAX(rows, 1);
|
||||||
|
tnew(cols, rows);
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
||||||
350
st.c
350
st.c
|
|
@ -16,6 +16,8 @@
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
|
#include <X11/keysym.h>
|
||||||
|
#include <X11/X.h>
|
||||||
|
|
||||||
#include "st.h"
|
#include "st.h"
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
|
@ -35,6 +37,7 @@
|
||||||
#define ESC_ARG_SIZ 16
|
#define ESC_ARG_SIZ 16
|
||||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||||
|
#define HISTSIZE 2000
|
||||||
|
|
||||||
/* macros */
|
/* macros */
|
||||||
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
||||||
|
|
@ -42,6 +45,9 @@
|
||||||
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
||||||
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
||||||
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
|
#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 {
|
enum term_mode {
|
||||||
MODE_WRAP = 1 << 0,
|
MODE_WRAP = 1 << 0,
|
||||||
|
|
@ -115,6 +121,9 @@ typedef struct {
|
||||||
int col; /* nb col */
|
int col; /* nb col */
|
||||||
Line *line; /* screen */
|
Line *line; /* screen */
|
||||||
Line *alt; /* alternate screen */
|
Line *alt; /* alternate screen */
|
||||||
|
Line hist[HISTSIZE]; /* history buffer */
|
||||||
|
int histi; /* history index */
|
||||||
|
int scr; /* scroll back */
|
||||||
int *dirty; /* dirtyness of lines */
|
int *dirty; /* dirtyness of lines */
|
||||||
TCursor c; /* cursor */
|
TCursor c; /* cursor */
|
||||||
int ocx; /* old cursor col */
|
int ocx; /* old cursor col */
|
||||||
|
|
@ -185,8 +194,8 @@ static void tnewline(int);
|
||||||
static void tputtab(int);
|
static void tputtab(int);
|
||||||
static void tputc(Rune);
|
static void tputc(Rune);
|
||||||
static void treset(void);
|
static void treset(void);
|
||||||
static void tscrollup(int, int);
|
static void tscrollup(int, int, int);
|
||||||
static void tscrolldown(int, int);
|
static void tscrolldown(int, int, int);
|
||||||
static void tsetattr(const int *, int);
|
static void tsetattr(const int *, int);
|
||||||
static void tsetchar(Rune, const Glyph *, int, int);
|
static void tsetchar(Rune, const Glyph *, int, int);
|
||||||
static void tsetdirt(int, int);
|
static void tsetdirt(int, int);
|
||||||
|
|
@ -409,10 +418,10 @@ tlinelen(int y)
|
||||||
{
|
{
|
||||||
int i = term.col;
|
int i = term.col;
|
||||||
|
|
||||||
if (term.line[y][i - 1].mode & ATTR_WRAP)
|
if (TLINE(y)[i - 1].mode & ATTR_WRAP)
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
while (i > 0 && term.line[y][i - 1].u == ' ')
|
while (i > 0 && TLINE(y)[i - 1].u == ' ')
|
||||||
--i;
|
--i;
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
|
|
@ -521,7 +530,7 @@ selsnap(int *x, int *y, int direction)
|
||||||
* Snap around if the word wraps around at the end or
|
* Snap around if the word wraps around at the end or
|
||||||
* beginning of a line.
|
* beginning of a line.
|
||||||
*/
|
*/
|
||||||
prevgp = &term.line[*y][*x];
|
prevgp = &TLINE(*y)[*x];
|
||||||
prevdelim = ISDELIM(prevgp->u);
|
prevdelim = ISDELIM(prevgp->u);
|
||||||
for (;;) {
|
for (;;) {
|
||||||
newx = *x + direction;
|
newx = *x + direction;
|
||||||
|
|
@ -536,14 +545,14 @@ selsnap(int *x, int *y, int direction)
|
||||||
yt = *y, xt = *x;
|
yt = *y, xt = *x;
|
||||||
else
|
else
|
||||||
yt = newy, xt = newx;
|
yt = newy, xt = newx;
|
||||||
if (!(term.line[yt][xt].mode & ATTR_WRAP))
|
if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newx >= tlinelen(newy))
|
if (newx >= tlinelen(newy))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
gp = &term.line[newy][newx];
|
gp = &TLINE(newy)[newx];
|
||||||
delim = ISDELIM(gp->u);
|
delim = ISDELIM(gp->u);
|
||||||
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
||||||
|| (delim && gp->u != prevgp->u)))
|
|| (delim && gp->u != prevgp->u)))
|
||||||
|
|
@ -564,14 +573,14 @@ selsnap(int *x, int *y, int direction)
|
||||||
*x = (direction < 0) ? 0 : term.col - 1;
|
*x = (direction < 0) ? 0 : term.col - 1;
|
||||||
if (direction < 0) {
|
if (direction < 0) {
|
||||||
for (; *y > 0; *y += direction) {
|
for (; *y > 0; *y += direction) {
|
||||||
if (!(term.line[*y-1][term.col-1].mode
|
if (!(TLINE(*y-1)[term.col-1].mode
|
||||||
& ATTR_WRAP)) {
|
& ATTR_WRAP)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (direction > 0) {
|
} else if (direction > 0) {
|
||||||
for (; *y < term.row-1; *y += direction) {
|
for (; *y < term.row-1; *y += direction) {
|
||||||
if (!(term.line[*y][term.col-1].mode
|
if (!(TLINE(*y)[term.col-1].mode
|
||||||
& ATTR_WRAP)) {
|
& ATTR_WRAP)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -602,13 +611,13 @@ getsel(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sel.type == SEL_RECTANGULAR) {
|
if (sel.type == SEL_RECTANGULAR) {
|
||||||
gp = &term.line[y][sel.nb.x];
|
gp = &TLINE(y)[sel.nb.x];
|
||||||
lastx = sel.ne.x;
|
lastx = sel.ne.x;
|
||||||
} else {
|
} 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;
|
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 == ' ')
|
while (last >= gp && last->u == ' ')
|
||||||
--last;
|
--last;
|
||||||
|
|
||||||
|
|
@ -844,6 +853,9 @@ void
|
||||||
ttywrite(const char *s, size_t n, int may_echo)
|
ttywrite(const char *s, size_t n, int may_echo)
|
||||||
{
|
{
|
||||||
const char *next;
|
const char *next;
|
||||||
|
Arg arg = (Arg) { .i = term.scr };
|
||||||
|
|
||||||
|
kscrolldown(&arg);
|
||||||
|
|
||||||
if (may_echo && IS_SET(MODE_ECHO))
|
if (may_echo && IS_SET(MODE_ECHO))
|
||||||
twrite(s, n, 1);
|
twrite(s, n, 1);
|
||||||
|
|
@ -1055,12 +1067,52 @@ tswapscreen(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
int i;
|
||||||
Line temp;
|
Line temp;
|
||||||
|
|
||||||
LIMIT(n, 0, term.bot-orig+1);
|
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);
|
tsetdirt(orig, term.bot-n);
|
||||||
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
||||||
|
|
@ -1071,17 +1123,28 @@ tscrolldown(int orig, int n)
|
||||||
term.line[i-n] = temp;
|
term.line[i-n] = temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
selscroll(orig, n);
|
if (term.scr == 0)
|
||||||
|
selscroll(orig, n);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
tscrollup(int orig, int n)
|
tscrollup(int orig, int n, int copyhist)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
Line temp;
|
Line temp;
|
||||||
|
|
||||||
LIMIT(n, 0, term.bot-orig+1);
|
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);
|
tclearregion(0, orig, term.col-1, orig+n-1);
|
||||||
tsetdirt(orig+n, term.bot);
|
tsetdirt(orig+n, term.bot);
|
||||||
|
|
||||||
|
|
@ -1091,7 +1154,8 @@ tscrollup(int orig, int n)
|
||||||
term.line[i+n] = temp;
|
term.line[i+n] = temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
selscroll(orig, -n);
|
if (term.scr == 0)
|
||||||
|
selscroll(orig, -n);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
@ -1120,7 +1184,7 @@ tnewline(int first_col)
|
||||||
int y = term.c.y;
|
int y = term.c.y;
|
||||||
|
|
||||||
if (y == term.bot) {
|
if (y == term.bot) {
|
||||||
tscrollup(term.top, 1);
|
tscrollup(term.top, 1, 1);
|
||||||
} else {
|
} else {
|
||||||
y++;
|
y++;
|
||||||
}
|
}
|
||||||
|
|
@ -1218,6 +1282,9 @@ tsetchar(Rune u, const Glyph *attr, int x, int y)
|
||||||
term.dirty[y] = 1;
|
term.dirty[y] = 1;
|
||||||
term.line[y][x] = *attr;
|
term.line[y][x] = *attr;
|
||||||
term.line[y][x].u = u;
|
term.line[y][x].u = u;
|
||||||
|
|
||||||
|
if (isboxdraw(u))
|
||||||
|
term.line[y][x].mode |= ATTR_BOXDRAW;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
@ -1288,14 +1355,14 @@ void
|
||||||
tinsertblankline(int n)
|
tinsertblankline(int n)
|
||||||
{
|
{
|
||||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||||
tscrolldown(term.c.y, n);
|
tscrolldown(term.c.y, n, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
tdeleteline(int n)
|
tdeleteline(int n)
|
||||||
{
|
{
|
||||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||||
tscrollup(term.c.y, n);
|
tscrollup(term.c.y, n, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t
|
int32_t
|
||||||
|
|
@ -1733,11 +1800,11 @@ csihandle(void)
|
||||||
case 'S': /* SU -- Scroll <n> line up */
|
case 'S': /* SU -- Scroll <n> line up */
|
||||||
if (csiescseq.priv) break;
|
if (csiescseq.priv) break;
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
DEFAULT(csiescseq.arg[0], 1);
|
||||||
tscrollup(term.top, csiescseq.arg[0]);
|
tscrollup(term.top, csiescseq.arg[0], 0);
|
||||||
break;
|
break;
|
||||||
case 'T': /* SD -- Scroll <n> line down */
|
case 'T': /* SD -- Scroll <n> line down */
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
DEFAULT(csiescseq.arg[0], 1);
|
||||||
tscrolldown(term.top, csiescseq.arg[0]);
|
tscrolldown(term.top, csiescseq.arg[0], 0);
|
||||||
break;
|
break;
|
||||||
case 'L': /* IL -- Insert <n> blank lines */
|
case 'L': /* IL -- Insert <n> blank lines */
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
DEFAULT(csiescseq.arg[0], 1);
|
||||||
|
|
@ -2309,7 +2376,7 @@ eschandle(uchar ascii)
|
||||||
return 0;
|
return 0;
|
||||||
case 'D': /* IND -- Linefeed */
|
case 'D': /* IND -- Linefeed */
|
||||||
if (term.c.y == term.bot) {
|
if (term.c.y == term.bot) {
|
||||||
tscrollup(term.top, 1);
|
tscrollup(term.top, 1, 1);
|
||||||
} else {
|
} else {
|
||||||
tmoveto(term.c.x, term.c.y+1);
|
tmoveto(term.c.x, term.c.y+1);
|
||||||
}
|
}
|
||||||
|
|
@ -2322,7 +2389,7 @@ eschandle(uchar ascii)
|
||||||
break;
|
break;
|
||||||
case 'M': /* RI -- Reverse index */
|
case 'M': /* RI -- Reverse index */
|
||||||
if (term.c.y == term.top) {
|
if (term.c.y == term.top) {
|
||||||
tscrolldown(term.top, 1);
|
tscrolldown(term.top, 1, 1);
|
||||||
} else {
|
} else {
|
||||||
tmoveto(term.c.x, term.c.y-1);
|
tmoveto(term.c.x, term.c.y-1);
|
||||||
}
|
}
|
||||||
|
|
@ -2545,12 +2612,15 @@ twrite(const char *buf, int buflen, int show_ctrl)
|
||||||
void
|
void
|
||||||
tresize(int col, int row)
|
tresize(int col, int row)
|
||||||
{
|
{
|
||||||
int i;
|
int i, j;
|
||||||
int minrow = MIN(row, term.row);
|
int minrow = MIN(row, term.row);
|
||||||
int mincol = MIN(col, term.col);
|
int mincol = MIN(col, term.col);
|
||||||
int *bp;
|
int *bp;
|
||||||
TCursor c;
|
TCursor c;
|
||||||
|
|
||||||
|
if ( row < term.row || col < term.col )
|
||||||
|
toggle_winmode(trt_kbdselect(XK_Escape, NULL, 0));
|
||||||
|
|
||||||
if (col < 1 || row < 1) {
|
if (col < 1 || row < 1) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"tresize: error resizing to %dx%d\n", col, row);
|
"tresize: error resizing to %dx%d\n", col, row);
|
||||||
|
|
@ -2582,6 +2652,14 @@ tresize(int col, int row)
|
||||||
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
||||||
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
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 */
|
/* resize each row to new width, zero-pad if needed */
|
||||||
for (i = 0; i < minrow; i++) {
|
for (i = 0; i < minrow; i++) {
|
||||||
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
||||||
|
|
@ -2640,7 +2718,7 @@ drawregion(int x1, int y1, int x2, int y2)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
term.dirty[y] = 0;
|
term.dirty[y] = 0;
|
||||||
xdrawline(term.line[y], x1, y, x2);
|
xdrawline(TLINE(y), x1, y, x2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2661,8 +2739,9 @@ draw(void)
|
||||||
cx--;
|
cx--;
|
||||||
|
|
||||||
drawregion(0, 0, term.col, term.row);
|
drawregion(0, 0, term.col, term.row);
|
||||||
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
if (term.scr == 0)
|
||||||
term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
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.ocx = cx;
|
||||||
term.ocy = term.c.y;
|
term.ocy = term.c.y;
|
||||||
xfinishdraw();
|
xfinishdraw();
|
||||||
|
|
@ -2676,3 +2755,220 @@ redraw(void)
|
||||||
tfulldirt();
|
tfulldirt();
|
||||||
draw();
|
draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void set_notifmode(int type, KeySym ksym) {
|
||||||
|
static char *lib[] = { " MOVE ", " SEL "};
|
||||||
|
static Glyph *g, *deb, *fin;
|
||||||
|
static int col, bot;
|
||||||
|
|
||||||
|
if ( ksym == -1 ) {
|
||||||
|
free(g);
|
||||||
|
col = term.col, bot = term.bot;
|
||||||
|
g = xmalloc(col * sizeof(Glyph));
|
||||||
|
memcpy(g, term.line[bot], col * sizeof(Glyph));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if ( ksym == -2 )
|
||||||
|
memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
|
||||||
|
if ( type < 2 ) {
|
||||||
|
char *z = lib[type];
|
||||||
|
for (deb = &term.line[bot][col - 6], fin = &term.line[bot][col]; deb < fin; z++, deb++)
|
||||||
|
deb->mode = ATTR_REVERSE,
|
||||||
|
deb->u = *z,
|
||||||
|
deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
}
|
||||||
|
else if ( type < 5 )
|
||||||
|
memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
else {
|
||||||
|
for (deb = &term.line[bot][0], fin = &term.line[bot][col]; deb < fin; deb++)
|
||||||
|
deb->mode = ATTR_REVERSE,
|
||||||
|
deb->u = ' ',
|
||||||
|
deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
term.line[bot][0].u = ksym;
|
||||||
|
}
|
||||||
|
|
||||||
|
term.dirty[bot] = 1;
|
||||||
|
drawregion(0, bot, col, bot + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void select_or_drawcursor(int selectsearch_mode, int type) {
|
||||||
|
int done = 0;
|
||||||
|
|
||||||
|
if ( selectsearch_mode & 1 ) {
|
||||||
|
selextend(term.c.x, term.c.y, type, done);
|
||||||
|
xsetsel(getsel());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x],
|
||||||
|
term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
void search(int selectsearch_mode, Rune *target, int ptarget, int incr, int type, TCursor *cu) {
|
||||||
|
Rune *r;
|
||||||
|
int i, bound = (term.col * cu->y + cu->x) * (incr > 0) + incr;
|
||||||
|
|
||||||
|
for (i = term.col * term.c.y + term.c.x + incr; i != bound; i += incr) {
|
||||||
|
for (r = target; r - target < ptarget; r++) {
|
||||||
|
if ( *r == term.line[(i + r - target) / term.col][(i + r - target) % term.col].u ) {
|
||||||
|
if ( r - target == ptarget - 1 ) break;
|
||||||
|
} else {
|
||||||
|
r = NULL;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ( r != NULL ) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( i != bound ) {
|
||||||
|
term.c.y = i / term.col, term.c.x = i % term.col;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int trt_kbdselect(KeySym ksym, char *buf, int len) {
|
||||||
|
static TCursor cu;
|
||||||
|
static Rune target[64];
|
||||||
|
static int type = 1, ptarget, in_use;
|
||||||
|
static int sens, quant;
|
||||||
|
static char selectsearch_mode;
|
||||||
|
int i, bound, *xy;
|
||||||
|
|
||||||
|
|
||||||
|
if ( selectsearch_mode & 2 ) {
|
||||||
|
if ( ksym == XK_Return ) {
|
||||||
|
selectsearch_mode ^= 2;
|
||||||
|
set_notifmode(selectsearch_mode, -2);
|
||||||
|
if ( ksym == XK_Escape ) ptarget = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if ( ksym == XK_BackSpace ) {
|
||||||
|
if ( !ptarget ) return 0;
|
||||||
|
term.line[term.bot][ptarget--].u = ' ';
|
||||||
|
}
|
||||||
|
else if ( len < 1 ) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if ( ptarget == term.col || ksym == XK_Escape ) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
utf8decode(buf, &target[ptarget++], len);
|
||||||
|
term.line[term.bot][ptarget].u = target[ptarget - 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( ksym != XK_BackSpace )
|
||||||
|
search(selectsearch_mode, &target[0], ptarget, sens, type, &cu);
|
||||||
|
|
||||||
|
term.dirty[term.bot] = 1;
|
||||||
|
drawregion(0, term.bot, term.col, term.bot + 1);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch ( ksym ) {
|
||||||
|
case -1 :
|
||||||
|
in_use = 1;
|
||||||
|
cu.x = term.c.x, cu.y = term.c.y;
|
||||||
|
set_notifmode(0, ksym);
|
||||||
|
return MODE_KBDSELECT;
|
||||||
|
case XK_s :
|
||||||
|
if ( selectsearch_mode & 1 )
|
||||||
|
selclear();
|
||||||
|
else
|
||||||
|
selstart(term.c.x, term.c.y, 0);
|
||||||
|
set_notifmode(selectsearch_mode ^= 1, ksym);
|
||||||
|
break;
|
||||||
|
case XK_t :
|
||||||
|
selextend(term.c.x, term.c.y, type ^= 3, i = 0); /* 2 fois */
|
||||||
|
selextend(term.c.x, term.c.y, type, i = 0);
|
||||||
|
break;
|
||||||
|
case XK_slash :
|
||||||
|
case XK_KP_Divide :
|
||||||
|
case XK_question :
|
||||||
|
ksym &= XK_question; /* Divide to slash */
|
||||||
|
sens = (ksym == XK_slash) ? -1 : 1;
|
||||||
|
ptarget = 0;
|
||||||
|
set_notifmode(15, ksym);
|
||||||
|
selectsearch_mode ^= 2;
|
||||||
|
break;
|
||||||
|
case XK_Escape :
|
||||||
|
if ( !in_use ) break;
|
||||||
|
selclear();
|
||||||
|
case XK_Return :
|
||||||
|
set_notifmode(4, ksym);
|
||||||
|
term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
select_or_drawcursor(selectsearch_mode = 0, type);
|
||||||
|
in_use = quant = 0;
|
||||||
|
return MODE_KBDSELECT;
|
||||||
|
case XK_n :
|
||||||
|
case XK_N :
|
||||||
|
if ( ptarget )
|
||||||
|
search(selectsearch_mode, &target[0], ptarget, (ksym == XK_n) ? -1 : 1, type, &cu);
|
||||||
|
break;
|
||||||
|
case XK_BackSpace :
|
||||||
|
term.c.x = 0;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_dollar :
|
||||||
|
term.c.x = term.col - 1;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_Home :
|
||||||
|
term.c.x = 0, term.c.y = 0;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_End :
|
||||||
|
term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_Page_Up :
|
||||||
|
case XK_Page_Down :
|
||||||
|
term.c.y = (ksym == XK_Prior ) ? 0 : cu.y;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_exclam :
|
||||||
|
term.c.x = term.col >> 1;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_asterisk :
|
||||||
|
case XK_KP_Multiply :
|
||||||
|
term.c.x = term.col >> 1;
|
||||||
|
case XK_underscore :
|
||||||
|
term.c.y = cu.y >> 1;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
default :
|
||||||
|
if ( ksym >= XK_0 && ksym <= XK_9 ) { /* 0-9 keyboard */
|
||||||
|
quant = (quant * 10) + (ksym ^ XK_0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if ( ksym >= XK_KP_0 && ksym <= XK_KP_9 ) { /* 0-9 numpad */
|
||||||
|
quant = (quant * 10) + (ksym ^ XK_KP_0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if ( ksym == XK_k || ksym == XK_h )
|
||||||
|
i = ksym & 1;
|
||||||
|
else if ( ksym == XK_l || ksym == XK_j )
|
||||||
|
i = ((ksym & 6) | 4) >> 1;
|
||||||
|
else if ( (XK_Home & ksym) != XK_Home || (i = (ksym ^ XK_Home) - 1) > 3 )
|
||||||
|
break;
|
||||||
|
|
||||||
|
xy = (i & 1) ? &term.c.y : &term.c.x;
|
||||||
|
sens = (i & 2) ? 1 : -1;
|
||||||
|
bound = (i >> 1 ^ 1) ? 0 : (i ^ 3) ? term.col - 1 : term.bot;
|
||||||
|
|
||||||
|
if ( quant == 0 )
|
||||||
|
quant++;
|
||||||
|
|
||||||
|
if ( *xy == bound && ((sens < 0 && bound == 0) || (sens > 0 && bound > 0)) )
|
||||||
|
break;
|
||||||
|
|
||||||
|
*xy += quant * sens;
|
||||||
|
if ( *xy < 0 || ( bound > 0 && *xy > bound) )
|
||||||
|
*xy = bound;
|
||||||
|
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
}
|
||||||
|
quant = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
||||||
21
st.h
21
st.h
|
|
@ -33,9 +33,16 @@ enum glyph_attribute {
|
||||||
ATTR_WRAP = 1 << 8,
|
ATTR_WRAP = 1 << 8,
|
||||||
ATTR_WIDE = 1 << 9,
|
ATTR_WIDE = 1 << 9,
|
||||||
ATTR_WDUMMY = 1 << 10,
|
ATTR_WDUMMY = 1 << 10,
|
||||||
|
ATTR_BOXDRAW = 1 << 11,
|
||||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum drawing_mode {
|
||||||
|
DRAW_NONE = 0,
|
||||||
|
DRAW_BG = 1 << 0,
|
||||||
|
DRAW_FG = 1 << 1,
|
||||||
|
};
|
||||||
|
|
||||||
enum selection_mode {
|
enum selection_mode {
|
||||||
SEL_IDLE = 0,
|
SEL_IDLE = 0,
|
||||||
SEL_EMPTY = 1,
|
SEL_EMPTY = 1,
|
||||||
|
|
@ -81,6 +88,8 @@ void die(const char *, ...);
|
||||||
void redraw(void);
|
void redraw(void);
|
||||||
void draw(void);
|
void draw(void);
|
||||||
|
|
||||||
|
void kscrolldown(const Arg *);
|
||||||
|
void kscrollup(const Arg *);
|
||||||
void printscreen(const Arg *);
|
void printscreen(const Arg *);
|
||||||
void printsel(const Arg *);
|
void printsel(const Arg *);
|
||||||
void sendbreak(const Arg *);
|
void sendbreak(const Arg *);
|
||||||
|
|
@ -110,6 +119,15 @@ size_t utf8encode(Rune, char *);
|
||||||
void *xmalloc(size_t);
|
void *xmalloc(size_t);
|
||||||
void *xrealloc(void *, size_t);
|
void *xrealloc(void *, size_t);
|
||||||
char *xstrdup(const char *);
|
char *xstrdup(const char *);
|
||||||
|
int trt_kbdselect(KeySym, char *, int);
|
||||||
|
|
||||||
|
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 */
|
/* config.h globals */
|
||||||
extern char *utmp;
|
extern char *utmp;
|
||||||
|
|
@ -124,3 +142,6 @@ extern unsigned int tabspaces;
|
||||||
extern unsigned int defaultfg;
|
extern unsigned int defaultfg;
|
||||||
extern unsigned int defaultbg;
|
extern unsigned int defaultbg;
|
||||||
extern unsigned int defaultcs;
|
extern unsigned int defaultcs;
|
||||||
|
extern const int boxdraw, boxdraw_bold, boxdraw_braille;
|
||||||
|
extern float alpha;
|
||||||
|
extern float alpha_def;
|
||||||
|
|
|
||||||
3
win.h
3
win.h
|
|
@ -21,6 +21,7 @@ enum win_mode {
|
||||||
MODE_NUMLOCK = 1 << 17,
|
MODE_NUMLOCK = 1 << 17,
|
||||||
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
||||||
|MODE_MOUSEMANY,
|
|MODE_MOUSEMANY,
|
||||||
|
MODE_KBDSELECT = 1 << 18,
|
||||||
};
|
};
|
||||||
|
|
||||||
void xbell(void);
|
void xbell(void);
|
||||||
|
|
@ -38,4 +39,6 @@ void xsetmode(int, unsigned int);
|
||||||
void xsetpointermotion(int);
|
void xsetpointermotion(int);
|
||||||
void xsetsel(char *);
|
void xsetsel(char *);
|
||||||
int xstartdraw(void);
|
int xstartdraw(void);
|
||||||
|
void toggle_winmode(int);
|
||||||
|
void keyboard_select(const Arg *);
|
||||||
void xximspot(int, int);
|
void xximspot(int, int);
|
||||||
|
|
|
||||||
399
x.c
399
x.c
|
|
@ -14,6 +14,7 @@
|
||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
#include <X11/Xft/Xft.h>
|
#include <X11/Xft/Xft.h>
|
||||||
#include <X11/XKBlib.h>
|
#include <X11/XKBlib.h>
|
||||||
|
#include <X11/Xresource.h>
|
||||||
|
|
||||||
char *argv0;
|
char *argv0;
|
||||||
#include "arg.h"
|
#include "arg.h"
|
||||||
|
|
@ -45,6 +46,19 @@ typedef struct {
|
||||||
signed char appcursor; /* application cursor */
|
signed char appcursor; /* application cursor */
|
||||||
} Key;
|
} Key;
|
||||||
|
|
||||||
|
/* Xresources preferences */
|
||||||
|
enum resource_type {
|
||||||
|
STRING = 0,
|
||||||
|
INTEGER = 1,
|
||||||
|
FLOAT = 2
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
char *name;
|
||||||
|
enum resource_type type;
|
||||||
|
void *dst;
|
||||||
|
} ResourcePref;
|
||||||
|
|
||||||
/* X modifiers */
|
/* X modifiers */
|
||||||
#define XK_ANY_MOD UINT_MAX
|
#define XK_ANY_MOD UINT_MAX
|
||||||
#define XK_NO_MOD 0
|
#define XK_NO_MOD 0
|
||||||
|
|
@ -59,6 +73,7 @@ static void zoom(const Arg *);
|
||||||
static void zoomabs(const Arg *);
|
static void zoomabs(const Arg *);
|
||||||
static void zoomreset(const Arg *);
|
static void zoomreset(const Arg *);
|
||||||
static void ttysend(const Arg *);
|
static void ttysend(const Arg *);
|
||||||
|
static void chgalpha(const Arg *);
|
||||||
|
|
||||||
/* config.h for applying patches and the configuration. */
|
/* config.h for applying patches and the configuration. */
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
@ -105,6 +120,7 @@ typedef struct {
|
||||||
XSetWindowAttributes attrs;
|
XSetWindowAttributes attrs;
|
||||||
int scr;
|
int scr;
|
||||||
int isfixed; /* is fixed geometry? */
|
int isfixed; /* is fixed geometry? */
|
||||||
|
int depth; /* bit depth */
|
||||||
int l, t; /* left and top offset */
|
int l, t; /* left and top offset */
|
||||||
int gm; /* geometry mask */
|
int gm; /* geometry mask */
|
||||||
} XWindow;
|
} XWindow;
|
||||||
|
|
@ -142,7 +158,7 @@ typedef struct {
|
||||||
|
|
||||||
static inline ushort sixd_to_16bit(int);
|
static inline ushort sixd_to_16bit(int);
|
||||||
static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, 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 xdrawglyph(Glyph, int, int);
|
||||||
static void xclear(int, int, int, int);
|
static void xclear(int, int, int, int);
|
||||||
static int xgeommasktogravity(int);
|
static int xgeommasktogravity(int);
|
||||||
|
|
@ -157,6 +173,8 @@ static void xhints(void);
|
||||||
static int xloadcolor(int, const char *, Color *);
|
static int xloadcolor(int, const char *, Color *);
|
||||||
static int xloadfont(Font *, FcPattern *);
|
static int xloadfont(Font *, FcPattern *);
|
||||||
static void xloadfonts(const char *, double);
|
static void xloadfonts(const char *, double);
|
||||||
|
static int xloadsparefont(FcPattern *, int);
|
||||||
|
static void xloadsparefonts(void);
|
||||||
static void xunloadfont(Font *);
|
static void xunloadfont(Font *);
|
||||||
static void xunloadfonts(void);
|
static void xunloadfonts(void);
|
||||||
static void xsetenv(void);
|
static void xsetenv(void);
|
||||||
|
|
@ -243,6 +261,7 @@ static char *usedfont = NULL;
|
||||||
static double usedfontsize = 0;
|
static double usedfontsize = 0;
|
||||||
static double defaultfontsize = 0;
|
static double defaultfontsize = 0;
|
||||||
|
|
||||||
|
static char *opt_alpha = NULL;
|
||||||
static char *opt_class = NULL;
|
static char *opt_class = NULL;
|
||||||
static char **opt_cmd = NULL;
|
static char **opt_cmd = NULL;
|
||||||
static char *opt_embed = NULL;
|
static char *opt_embed = NULL;
|
||||||
|
|
@ -306,6 +325,7 @@ zoomabs(const Arg *arg)
|
||||||
{
|
{
|
||||||
xunloadfonts();
|
xunloadfonts();
|
||||||
xloadfonts(usedfont, arg->f);
|
xloadfonts(usedfont, arg->f);
|
||||||
|
xloadsparefonts();
|
||||||
cresize(0, 0);
|
cresize(0, 0);
|
||||||
redraw();
|
redraw();
|
||||||
xhints();
|
xhints();
|
||||||
|
|
@ -752,7 +772,7 @@ xresize(int col, int row)
|
||||||
|
|
||||||
XFreePixmap(xw.dpy, xw.buf);
|
XFreePixmap(xw.dpy, xw.buf);
|
||||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||||
DefaultDepth(xw.dpy, xw.scr));
|
xw.depth);
|
||||||
XftDrawChange(xw.draw, xw.buf);
|
XftDrawChange(xw.draw, xw.buf);
|
||||||
xclear(0, 0, win.w, win.h);
|
xclear(0, 0, win.w, win.h);
|
||||||
|
|
||||||
|
|
@ -812,6 +832,13 @@ xloadcols(void)
|
||||||
else
|
else
|
||||||
die("could not allocate color %d\n", i);
|
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;
|
loaded = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -859,8 +886,8 @@ xclear(int x1, int y1, int x2, int y2)
|
||||||
void
|
void
|
||||||
xhints(void)
|
xhints(void)
|
||||||
{
|
{
|
||||||
XClassHint class = {opt_name ? opt_name : termname,
|
XClassHint class = {opt_name ? opt_name : "st",
|
||||||
opt_class ? opt_class : termname};
|
opt_class ? opt_class : "St"};
|
||||||
XWMHints wm = {.flags = InputHint, .input = 1};
|
XWMHints wm = {.flags = InputHint, .input = 1};
|
||||||
XSizeHints *sizeh;
|
XSizeHints *sizeh;
|
||||||
|
|
||||||
|
|
@ -1050,6 +1077,101 @@ xloadfonts(const char *fontstr, double fontsize)
|
||||||
FcPatternDestroy(pattern);
|
FcPatternDestroy(pattern);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
xloadsparefont(FcPattern *pattern, int flags)
|
||||||
|
{
|
||||||
|
FcPattern *match;
|
||||||
|
FcResult result;
|
||||||
|
|
||||||
|
match = FcFontMatch(NULL, pattern, &result);
|
||||||
|
if (!match) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) {
|
||||||
|
FcPatternDestroy(match);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
frc[frclen].flags = flags;
|
||||||
|
/* Believe U+0000 glyph will present in each default font */
|
||||||
|
frc[frclen].unicodep = 0;
|
||||||
|
frclen++;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
xloadsparefonts(void)
|
||||||
|
{
|
||||||
|
FcPattern *pattern;
|
||||||
|
double sizeshift, fontval;
|
||||||
|
int fc;
|
||||||
|
char **fp;
|
||||||
|
|
||||||
|
if (frclen != 0)
|
||||||
|
die("can't embed spare fonts. cache isn't empty");
|
||||||
|
|
||||||
|
/* Calculate count of spare fonts */
|
||||||
|
fc = sizeof(font2) / sizeof(*font2);
|
||||||
|
if (fc == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* Allocate memory for cache entries. */
|
||||||
|
if (frccap < 4 * fc) {
|
||||||
|
frccap += 4 * fc - frccap;
|
||||||
|
frc = xrealloc(frc, frccap * sizeof(Fontcache));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (fp = font2; fp - font2 < fc; ++fp) {
|
||||||
|
|
||||||
|
if (**fp == '-')
|
||||||
|
pattern = XftXlfdParse(*fp, False, False);
|
||||||
|
else
|
||||||
|
pattern = FcNameParse((FcChar8 *)*fp);
|
||||||
|
|
||||||
|
if (!pattern)
|
||||||
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
|
if (defaultfontsize > 0) {
|
||||||
|
sizeshift = usedfontsize - defaultfontsize;
|
||||||
|
if (sizeshift != 0 &&
|
||||||
|
FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
|
||||||
|
FcResultMatch) {
|
||||||
|
fontval += sizeshift;
|
||||||
|
FcPatternDel(pattern, FC_PIXEL_SIZE);
|
||||||
|
FcPatternDel(pattern, FC_SIZE);
|
||||||
|
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FcPatternAddBool(pattern, FC_SCALABLE, 1);
|
||||||
|
|
||||||
|
FcConfigSubstitute(NULL, pattern, FcMatchPattern);
|
||||||
|
XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
|
||||||
|
|
||||||
|
if (xloadsparefont(pattern, FRC_NORMAL))
|
||||||
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
|
FcPatternDel(pattern, FC_SLANT);
|
||||||
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
|
||||||
|
if (xloadsparefont(pattern, FRC_ITALIC))
|
||||||
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
|
FcPatternDel(pattern, FC_WEIGHT);
|
||||||
|
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
|
||||||
|
if (xloadsparefont(pattern, FRC_ITALICBOLD))
|
||||||
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
|
FcPatternDel(pattern, FC_SLANT);
|
||||||
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
|
||||||
|
if (xloadsparefont(pattern, FRC_BOLD))
|
||||||
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
|
FcPatternDestroy(pattern);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
xunloadfont(Font *f)
|
xunloadfont(Font *f)
|
||||||
{
|
{
|
||||||
|
|
@ -1134,11 +1256,21 @@ xinit(int cols, int rows)
|
||||||
Window parent;
|
Window parent;
|
||||||
pid_t thispid = getpid();
|
pid_t thispid = getpid();
|
||||||
XColor xmousefg, xmousebg;
|
XColor xmousefg, xmousebg;
|
||||||
|
XWindowAttributes attr;
|
||||||
|
XVisualInfo vis;
|
||||||
|
|
||||||
if (!(xw.dpy = XOpenDisplay(NULL)))
|
|
||||||
die("can't open display\n");
|
|
||||||
xw.scr = XDefaultScreen(xw.dpy);
|
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 */
|
/* font */
|
||||||
if (!FcInit())
|
if (!FcInit())
|
||||||
|
|
@ -1147,8 +1279,14 @@ xinit(int cols, int rows)
|
||||||
usedfont = (opt_font == NULL)? font : opt_font;
|
usedfont = (opt_font == NULL)? font : opt_font;
|
||||||
xloadfonts(usedfont, 0);
|
xloadfonts(usedfont, 0);
|
||||||
|
|
||||||
|
/* spare fonts */
|
||||||
|
xloadsparefonts();
|
||||||
|
|
||||||
|
/* Backup default alpha value */
|
||||||
|
alpha_def = alpha;
|
||||||
|
|
||||||
/* colors */
|
/* colors */
|
||||||
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
|
||||||
xloadcols();
|
xloadcols();
|
||||||
|
|
||||||
/* adjust fixed window geometry */
|
/* adjust fixed window geometry */
|
||||||
|
|
@ -1168,19 +1306,15 @@ xinit(int cols, int rows)
|
||||||
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
||||||
xw.attrs.colormap = xw.cmap;
|
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,
|
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
|
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
|
||||||
| CWEventMask | CWColormap, &xw.attrs);
|
| CWEventMask | CWColormap, &xw.attrs);
|
||||||
|
|
||||||
memset(&gcvalues, 0, sizeof(gcvalues));
|
memset(&gcvalues, 0, sizeof(gcvalues));
|
||||||
gcvalues.graphics_exposures = False;
|
gcvalues.graphics_exposures = False;
|
||||||
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
|
||||||
&gcvalues);
|
dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
|
||||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
||||||
DefaultDepth(xw.dpy, xw.scr));
|
|
||||||
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
||||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
||||||
|
|
||||||
|
|
@ -1237,6 +1371,8 @@ xinit(int cols, int rows)
|
||||||
xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
|
xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
|
||||||
if (xsel.xtarget == None)
|
if (xsel.xtarget == None)
|
||||||
xsel.xtarget = XA_STRING;
|
xsel.xtarget = XA_STRING;
|
||||||
|
|
||||||
|
boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
@ -1283,8 +1419,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||||
yp = winy + font->ascent;
|
yp = winy + font->ascent;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Lookup character index with default font. */
|
if (mode & ATTR_BOXDRAW) {
|
||||||
glyphidx = XftCharIndex(xw.dpy, font->match, rune);
|
/* 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) {
|
if (glyphidx) {
|
||||||
specs[numspecs].font = font->match;
|
specs[numspecs].font = font->match;
|
||||||
specs[numspecs].glyph = glyphidx;
|
specs[numspecs].glyph = glyphidx;
|
||||||
|
|
@ -1372,7 +1513,25 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
chgalpha(const Arg *arg)
|
||||||
|
{
|
||||||
|
if (arg->f == -1.0f && alpha >= 0.1f)
|
||||||
|
alpha -= 0.1f;
|
||||||
|
else if (arg->f == 1.0f && alpha < 1.0f)
|
||||||
|
alpha += 0.1f;
|
||||||
|
else if (arg->f == 0.0f)
|
||||||
|
alpha = alpha_def;
|
||||||
|
else
|
||||||
|
return;
|
||||||
|
|
||||||
|
dc.col[defaultbg].color.alpha = (unsigned short)(0xFFFF * alpha);
|
||||||
|
/* Required to remove artifacting from borderpx */
|
||||||
|
cresize(0, 0);
|
||||||
|
redraw();
|
||||||
|
}
|
||||||
|
|
||||||
|
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 charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
||||||
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
||||||
|
|
@ -1463,47 +1622,44 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||||
if (base.mode & ATTR_INVISIBLE)
|
if (base.mode & ATTR_INVISIBLE)
|
||||||
fg = bg;
|
fg = bg;
|
||||||
|
|
||||||
/* Intelligent cleaning up of the borders. */
|
if (dmode & DRAW_BG) {
|
||||||
if (x == 0) {
|
/* Intelligent cleaning up of the borders. */
|
||||||
xclear(0, (y == 0)? 0 : winy, borderpx,
|
if (x == 0) {
|
||||||
winy + win.ch +
|
xclear(0, (y == 0)? 0 : winy, borderpx,
|
||||||
((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
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,
|
if (winx + width >= borderpx + win.tw) {
|
||||||
((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
|
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 (y == 0)
|
||||||
if (winy + win.ch >= borderpx + win.th)
|
xclear(winx, 0, winx + width, borderpx);
|
||||||
xclear(winx, winy + win.ch, winx + width, win.h);
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
/* Clean up the region we want to draw to. */
|
if (dmode & DRAW_FG) {
|
||||||
XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
/* Set the clip region because Xft is sometimes dirty. */
|
/* Render underline and strikethrough. */
|
||||||
r.x = 0;
|
if (base.mode & ATTR_UNDERLINE) {
|
||||||
r.y = 0;
|
XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
|
||||||
r.height = win.ch;
|
width, 1);
|
||||||
r.width = width;
|
}
|
||||||
XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
|
|
||||||
|
|
||||||
/* Render the glyphs. */
|
if (base.mode & ATTR_STRUCK) {
|
||||||
XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
|
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
|
||||||
|
width, 1);
|
||||||
/* Render underline and strikethrough. */
|
}
|
||||||
if (base.mode & ATTR_UNDERLINE) {
|
}
|
||||||
XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
|
|
||||||
width, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (base.mode & ATTR_STRUCK) {
|
|
||||||
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
|
|
||||||
width, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset clip to none. */
|
|
||||||
XftDrawSetClip(xw.draw, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
@ -1513,7 +1669,7 @@ xdrawglyph(Glyph g, int x, int y)
|
||||||
XftGlyphFontSpec spec;
|
XftGlyphFontSpec spec;
|
||||||
|
|
||||||
numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
|
numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
|
||||||
xdrawglyphfontspecs(&spec, g, numspecs, x, y);
|
xdrawglyphfontspecs(&spec, g, numspecs, x, y, DRAW_BG | DRAW_FG);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
@ -1532,7 +1688,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||||
/*
|
/*
|
||||||
* Select the right color for the right mode.
|
* 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)) {
|
if (IS_SET(MODE_REVERSE)) {
|
||||||
g.mode |= ATTR_REVERSE;
|
g.mode |= ATTR_REVERSE;
|
||||||
|
|
@ -1654,32 +1810,39 @@ xstartdraw(void)
|
||||||
void
|
void
|
||||||
xdrawline(Line line, int x1, int y1, int x2)
|
xdrawline(Line line, int x1, int y1, int x2)
|
||||||
{
|
{
|
||||||
int i, x, ox, numspecs;
|
int i, x, ox, numspecs, numspecs_cached;
|
||||||
Glyph base, new;
|
Glyph base, new;
|
||||||
XftGlyphFontSpec *specs = xw.specbuf;
|
XftGlyphFontSpec *specs;
|
||||||
|
|
||||||
numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
|
numspecs_cached = xmakeglyphfontspecs(xw.specbuf, &line[x1], x2 - x1, x1, y1);
|
||||||
i = ox = 0;
|
|
||||||
for (x = x1; x < x2 && i < numspecs; x++) {
|
/* Draw line in 2 passes: background and foreground. This way wide glyphs
|
||||||
new = line[x];
|
won't get truncated (#223) */
|
||||||
if (new.mode == ATTR_WDUMMY)
|
for (int dmode = DRAW_BG; dmode <= DRAW_FG; dmode <<= 1) {
|
||||||
continue;
|
specs = xw.specbuf;
|
||||||
if (selected(x, y1))
|
numspecs = numspecs_cached;
|
||||||
new.mode ^= ATTR_REVERSE;
|
i = ox = 0;
|
||||||
if (i > 0 && ATTRCMP(base, new)) {
|
for (x = x1; x < x2 && i < numspecs; x++) {
|
||||||
xdrawglyphfontspecs(specs, base, i, ox, y1);
|
new = line[x];
|
||||||
specs += i;
|
if (new.mode == ATTR_WDUMMY)
|
||||||
numspecs -= i;
|
continue;
|
||||||
i = 0;
|
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++;
|
||||||
}
|
}
|
||||||
if (i == 0) {
|
if (i > 0)
|
||||||
ox = x;
|
xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
|
||||||
base = new;
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
if (i > 0)
|
|
||||||
xdrawglyphfontspecs(specs, base, i, ox, y1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
@ -1856,6 +2019,13 @@ kpress(XEvent *ev)
|
||||||
} else {
|
} else {
|
||||||
len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
|
len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
|
||||||
}
|
}
|
||||||
|
if ( IS_SET(MODE_KBDSELECT) ) {
|
||||||
|
if ( match(XK_NO_MOD, e->state) ||
|
||||||
|
(XK_Shift_L | XK_Shift_R) & e->state )
|
||||||
|
win.mode ^= trt_kbdselect(ksym, buf, len);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* 1. shortcuts */
|
/* 1. shortcuts */
|
||||||
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
||||||
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
||||||
|
|
@ -2020,6 +2190,59 @@ run(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
|
||||||
|
{
|
||||||
|
char **sdst = dst;
|
||||||
|
int *idst = dst;
|
||||||
|
float *fdst = dst;
|
||||||
|
|
||||||
|
char fullname[256];
|
||||||
|
char fullclass[256];
|
||||||
|
char *type;
|
||||||
|
XrmValue ret;
|
||||||
|
|
||||||
|
snprintf(fullname, sizeof(fullname), "%s.%s",
|
||||||
|
opt_name ? opt_name : "st", name);
|
||||||
|
snprintf(fullclass, sizeof(fullclass), "%s.%s",
|
||||||
|
opt_class ? opt_class : "St", name);
|
||||||
|
fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
|
||||||
|
|
||||||
|
XrmGetResource(db, fullname, fullclass, &type, &ret);
|
||||||
|
if (ret.addr == NULL || strncmp("String", type, 64))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
switch (rtype) {
|
||||||
|
case STRING:
|
||||||
|
*sdst = ret.addr;
|
||||||
|
break;
|
||||||
|
case INTEGER:
|
||||||
|
*idst = strtoul(ret.addr, NULL, 10);
|
||||||
|
break;
|
||||||
|
case FLOAT:
|
||||||
|
*fdst = strtof(ret.addr, NULL);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
config_init(void)
|
||||||
|
{
|
||||||
|
char *resm;
|
||||||
|
XrmDatabase db;
|
||||||
|
ResourcePref *p;
|
||||||
|
|
||||||
|
XrmInitialize();
|
||||||
|
resm = XResourceManagerString(xw.dpy);
|
||||||
|
if (!resm)
|
||||||
|
return;
|
||||||
|
|
||||||
|
db = XrmGetStringDatabase(resm);
|
||||||
|
for (p = resources; p < resources + LEN(resources); p++)
|
||||||
|
resource_load(db, p->name, p->type, p->dst);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
usage(void)
|
usage(void)
|
||||||
{
|
{
|
||||||
|
|
@ -2033,6 +2256,14 @@ usage(void)
|
||||||
" [stty_args ...]\n", argv0, argv0);
|
" [stty_args ...]\n", argv0, argv0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void toggle_winmode(int flag) {
|
||||||
|
win.mode ^= flag;
|
||||||
|
}
|
||||||
|
|
||||||
|
void keyboard_select(const Arg *dummy) {
|
||||||
|
win.mode ^= trt_kbdselect(-1, NULL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
|
@ -2044,6 +2275,9 @@ main(int argc, char *argv[])
|
||||||
case 'a':
|
case 'a':
|
||||||
allowaltscreen = 0;
|
allowaltscreen = 0;
|
||||||
break;
|
break;
|
||||||
|
case 'A':
|
||||||
|
opt_alpha = EARGF(usage());
|
||||||
|
break;
|
||||||
case 'c':
|
case 'c':
|
||||||
opt_class = EARGF(usage());
|
opt_class = EARGF(usage());
|
||||||
break;
|
break;
|
||||||
|
|
@ -2093,6 +2327,11 @@ run:
|
||||||
|
|
||||||
setlocale(LC_CTYPE, "");
|
setlocale(LC_CTYPE, "");
|
||||||
XSetLocaleModifiers("");
|
XSetLocaleModifiers("");
|
||||||
|
|
||||||
|
if(!(xw.dpy = XOpenDisplay(NULL)))
|
||||||
|
die("Can't open display\n");
|
||||||
|
|
||||||
|
config_init();
|
||||||
cols = MAX(cols, 1);
|
cols = MAX(cols, 1);
|
||||||
rows = MAX(rows, 1);
|
rows = MAX(rows, 1);
|
||||||
tnew(cols, rows);
|
tnew(cols, rows);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue