mirror of
https://github.com/alrayyes/st.git
synced 2024-11-25 04:16:23 +00:00
Update readme with details about patches
This commit is contained in:
Shiva
parent
efde1e896e
commit
97e27bc64d
7 changed files with 680 additions and 0 deletions
18
README
18
README
|
|
@ -28,6 +28,24 @@ the st terminfo entry with the following command:
|
||||||
|
|
||||||
See the man page for additional details.
|
See the man page for additional details.
|
||||||
|
|
||||||
|
Applied patches
|
||||||
|
---------------
|
||||||
|
The following patches have been applied, and fixed to co-exist
|
||||||
|
|
||||||
|
1. clipboard support:
|
||||||
|
- st-clipboard-20160727-308bfbf.diff
|
||||||
|
|
||||||
|
2. Scrollback support:
|
||||||
|
- st-scrollback-20170104-c63a87c.diff
|
||||||
|
- st-scrollback-mouse-20161020-6e79e83.diff
|
||||||
|
|
||||||
|
3. Align line vertically:
|
||||||
|
- st-vertcenter-20160819-023225e.diff
|
||||||
|
|
||||||
|
4. support solarized and switch with F6:
|
||||||
|
- st-no_bold_colors-20160727-308bfbf.diff
|
||||||
|
- st-solarized-both-20160727-308bfbf.diff
|
||||||
|
|
||||||
Credits
|
Credits
|
||||||
-------
|
-------
|
||||||
Based on Aurélien APTEL <aurelien dot aptel at gmail dot com> bt source code.
|
Based on Aurélien APTEL <aurelien dot aptel at gmail dot com> bt source code.
|
||||||
|
|
|
||||||
13
patches/st-clipboard-20160727-308bfbf.diff
Normal file
13
patches/st-clipboard-20160727-308bfbf.diff
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/st.c b/st.c
|
||||||
|
index 2594c65..ebdde9f 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -1263,6 +1263,8 @@ xsetsel(char *str, Time t)
|
||||||
|
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
|
||||||
|
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
|
||||||
|
selclear(0);
|
||||||
|
+
|
||||||
|
+ clipcopy(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
13
patches/st-no_bold_colors-20160727-308bfbf.diff
Normal file
13
patches/st-no_bold_colors-20160727-308bfbf.diff
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/st.c b/st.c
|
||||||
|
index 2594c65..f6fe717 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -3719,7 +3719,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||||
|
|
||||||
|
/* Change basic system colors [0-7] to bright system colors [8-15] */
|
||||||
|
if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
|
||||||
|
- fg = &dc.col[base.fg + 8];
|
||||||
|
+ fg = &dc.col[base.fg];
|
||||||
|
|
||||||
|
if (IS_SET(MODE_REVERSE)) {
|
||||||
|
if (fg == &dc.col[defaultfg]) {
|
||||||
341
patches/st-scrollback-20170104-c63a87c.diff
Normal file
341
patches/st-scrollback-20170104-c63a87c.diff
Normal file
|
|
@ -0,0 +1,341 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index a719e36..9b51988 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -178,6 +178,8 @@ static Shortcut shortcuts[] = {
|
||||||
|
{ MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} },
|
||||||
|
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
{ MODKEY, XK_Control_L, iso14755, {.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 fbcd9e0..64bc208 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -61,6 +61,7 @@ char *argv0;
|
||||||
|
#define XK_ANY_MOD UINT_MAX
|
||||||
|
#define XK_NO_MOD 0
|
||||||
|
#define XK_SWITCH_MOD (1<<13)
|
||||||
|
+#define histsize 2000
|
||||||
|
|
||||||
|
/* macros */
|
||||||
|
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||||
|
@@ -87,6 +88,8 @@ char *argv0;
|
||||||
|
#define TRUERED(x) (((x) & 0xff0000) >> 8)
|
||||||
|
#define TRUEGREEN(x) (((x) & 0xff00))
|
||||||
|
#define TRUEBLUE(x) (((x) & 0xff) << 8)
|
||||||
|
+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - term.scr \
|
||||||
|
+ + histsize + 1) % histsize] : term.line[(y) - term.scr])
|
||||||
|
|
||||||
|
/* constants */
|
||||||
|
#define ISO14755CMD "dmenu -w %lu -p codepoint: </dev/null"
|
||||||
|
@@ -241,6 +244,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 */
|
||||||
|
XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */
|
||||||
|
TCursor c; /* cursor */
|
||||||
|
@@ -334,6 +340,8 @@ typedef struct {
|
||||||
|
/* function definitions used in config.h */
|
||||||
|
static void clipcopy(const Arg *);
|
||||||
|
static void clippaste(const Arg *);
|
||||||
|
+static void kscrolldown(const Arg *);
|
||||||
|
+static void kscrollup(const Arg *);
|
||||||
|
static void numlock(const Arg *);
|
||||||
|
static void selpaste(const Arg *);
|
||||||
|
static void xzoom(const Arg *);
|
||||||
|
@@ -409,8 +417,8 @@ static void tputtab(int);
|
||||||
|
static void tputc(Rune);
|
||||||
|
static void treset(void);
|
||||||
|
static void tresize(int, int);
|
||||||
|
-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(int *, int);
|
||||||
|
static void tsetchar(Rune, Glyph *, int, int);
|
||||||
|
static void tsetscroll(int, int);
|
||||||
|
@@ -742,10 +750,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;
|
||||||
|
@@ -807,7 +815,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;
|
||||||
|
@@ -822,14 +830,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)))
|
||||||
|
@@ -850,14 +858,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;
|
||||||
|
}
|
||||||
|
@@ -1023,13 +1031,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;
|
||||||
|
|
||||||
|
@@ -1513,6 +1521,9 @@ ttyread(void)
|
||||||
|
if (buflen > 0)
|
||||||
|
memmove(buf, ptr, buflen);
|
||||||
|
|
||||||
|
+ if (term.scr > 0 && term.scr < histsize-1)
|
||||||
|
+ term.scr++;
|
||||||
|
+
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1522,6 +1533,9 @@ ttywrite(const char *s, size_t n)
|
||||||
|
fd_set wfd, rfd;
|
||||||
|
ssize_t r;
|
||||||
|
size_t lim = 256;
|
||||||
|
+ Arg arg = (Arg) { .i = term.scr };
|
||||||
|
+
|
||||||
|
+ kscrolldown(&arg);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Remember that we are using a pty, which might be a modem line.
|
||||||
|
@@ -1724,13 +1738,53 @@ 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);
|
||||||
|
|
||||||
|
@@ -1744,13 +1798,20 @@ tscrolldown(int orig, int 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;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
tclearregion(0, orig, term.col-1, orig+n-1);
|
||||||
|
tsetdirt(orig+n, term.bot);
|
||||||
|
|
||||||
|
@@ -1799,7 +1860,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++;
|
||||||
|
}
|
||||||
|
@@ -1964,14 +2025,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
|
||||||
|
@@ -2405,11 +2466,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);
|
||||||
|
@@ -2945,7 +3006,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);
|
||||||
|
}
|
||||||
|
@@ -2958,7 +3019,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);
|
||||||
|
}
|
||||||
|
@@ -3145,7 +3206,7 @@ check_control_code:
|
||||||
|
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;
|
||||||
|
@@ -3185,6 +3246,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));
|
||||||
|
@@ -4112,11 +4181,11 @@ drawregion(int x1, int y1, int x2, int y2)
|
||||||
|
term.dirty[y] = 0;
|
||||||
|
|
||||||
|
specs = term.specbuf;
|
||||||
|
- numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y);
|
||||||
|
+ numspecs = xmakeglyphfontspecs(specs, &TLINE(y)[x1], x2 - x1, x1, y);
|
||||||
|
|
||||||
|
i = ox = 0;
|
||||||
|
for (x = x1; x < x2 && i < numspecs; x++) {
|
||||||
|
- new = term.line[y][x];
|
||||||
|
+ new = TLINE(y)[x];
|
||||||
|
if (new.mode == ATTR_WDUMMY)
|
||||||
|
continue;
|
||||||
|
if (ena_sel && selected(x, y))
|
||||||
|
@@ -4136,7 +4205,9 @@ drawregion(int x1, int y1, int x2, int y2)
|
||||||
|
if (i > 0)
|
||||||
|
xdrawglyphfontspecs(specs, base, i, ox, y);
|
||||||
|
}
|
||||||
|
- xdrawcursor();
|
||||||
|
+
|
||||||
|
+ if (term.scr == 0)
|
||||||
|
+ xdrawcursor();
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
62
patches/st-scrollback-mouse-20161020-6e79e83.diff
Normal file
62
patches/st-scrollback-mouse-20161020-6e79e83.diff
Normal file
|
|
@ -0,0 +1,62 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index eae969e..34ebb44 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -152,8 +152,14 @@ static unsigned int defaultunderline = 7;
|
||||||
|
*/
|
||||||
|
static MouseShortcut mshortcuts[] = {
|
||||||
|
/* button mask string */
|
||||||
|
- { Button4, XK_ANY_MOD, "\031" },
|
||||||
|
- { Button5, XK_ANY_MOD, "\005" },
|
||||||
|
+ { Button4, XK_NO_MOD, "\031" },
|
||||||
|
+ { Button5, XK_NO_MOD, "\005" },
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static MouseKey mkeys[] = {
|
||||||
|
+ /* button mask function argument */
|
||||||
|
+ { Button4, ShiftMask, kscrollup, {.i = 1} },
|
||||||
|
+ { Button5, ShiftMask, kscrolldown, {.i = 1} },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Internal keyboard shortcuts. */
|
||||||
|
diff --git a/st.c b/st.c
|
||||||
|
index 233d301..c71b6e7 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -299,6 +299,13 @@ typedef union {
|
||||||
|
const void *v;
|
||||||
|
} Arg;
|
||||||
|
|
||||||
|
+typedef struct {
|
||||||
|
+ uint b;
|
||||||
|
+ uint mask;
|
||||||
|
+ void (*func)(const Arg *);
|
||||||
|
+ const Arg arg;
|
||||||
|
+} MouseKey;
|
||||||
|
+
|
||||||
|
typedef struct {
|
||||||
|
uint mod;
|
||||||
|
KeySym keysym;
|
||||||
|
@@ -953,6 +960,7 @@ bpress(XEvent *e)
|
||||||
|
{
|
||||||
|
struct timespec now;
|
||||||
|
MouseShortcut *ms;
|
||||||
|
+ MouseKey *mk;
|
||||||
|
|
||||||
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
|
||||||
|
mousereport(e);
|
||||||
|
@@ -967,6 +975,14 @@ bpress(XEvent *e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ for (mk = mkeys; mk < mkeys + LEN(mkeys); mk++) {
|
||||||
|
+ if (e->xbutton.button == mk->b
|
||||||
|
+ && match(mk->mask, e->xbutton.state)) {
|
||||||
|
+ mk->func(&mk->arg);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (e->xbutton.button == Button1) {
|
||||||
|
clock_gettime(CLOCK_MONOTONIC, &now);
|
||||||
|
|
||||||
189
patches/st-solarized-both-20160727-308bfbf.diff
Normal file
189
patches/st-solarized-both-20160727-308bfbf.diff
Normal file
|
|
@ -0,0 +1,189 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index b41747f..adaa9b8 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -84,42 +84,54 @@ static unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
|
static const char *colorname[] = {
|
||||||
|
- /* 8 normal colors */
|
||||||
|
- "black",
|
||||||
|
- "red3",
|
||||||
|
- "green3",
|
||||||
|
- "yellow3",
|
||||||
|
- "blue2",
|
||||||
|
- "magenta3",
|
||||||
|
- "cyan3",
|
||||||
|
- "gray90",
|
||||||
|
-
|
||||||
|
- /* 8 bright colors */
|
||||||
|
- "gray50",
|
||||||
|
- "red",
|
||||||
|
- "green",
|
||||||
|
- "yellow",
|
||||||
|
- "#5c5cff",
|
||||||
|
- "magenta",
|
||||||
|
- "cyan",
|
||||||
|
- "white",
|
||||||
|
-
|
||||||
|
- [255] = 0,
|
||||||
|
-
|
||||||
|
- /* more colors can be added after 255 to use with DefaultXX */
|
||||||
|
- "#cccccc",
|
||||||
|
- "#555555",
|
||||||
|
+ /* solarized dark */
|
||||||
|
+ "#073642", /* 0: black */
|
||||||
|
+ "#dc322f", /* 1: red */
|
||||||
|
+ "#859900", /* 2: green */
|
||||||
|
+ "#b58900", /* 3: yellow */
|
||||||
|
+ "#268bd2", /* 4: blue */
|
||||||
|
+ "#d33682", /* 5: magenta */
|
||||||
|
+ "#2aa198", /* 6: cyan */
|
||||||
|
+ "#eee8d5", /* 7: white */
|
||||||
|
+ "#002b36", /* 8: brblack */
|
||||||
|
+ "#cb4b16", /* 9: brred */
|
||||||
|
+ "#586e75", /* 10: brgreen */
|
||||||
|
+ "#657b83", /* 11: bryellow */
|
||||||
|
+ "#839496", /* 12: brblue */
|
||||||
|
+ "#6c71c4", /* 13: brmagenta*/
|
||||||
|
+ "#93a1a1", /* 14: brcyan */
|
||||||
|
+ "#fdf6e3", /* 15: brwhite */
|
||||||
|
};
|
||||||
|
|
||||||
|
+/* Terminal colors for alternate (light) palette */
|
||||||
|
+static const char *altcolorname[] = {
|
||||||
|
+ /* solarized light */
|
||||||
|
+ "#eee8d5", /* 0: black */
|
||||||
|
+ "#dc322f", /* 1: red */
|
||||||
|
+ "#859900", /* 2: green */
|
||||||
|
+ "#b58900", /* 3: yellow */
|
||||||
|
+ "#268bd2", /* 4: blue */
|
||||||
|
+ "#d33682", /* 5: magenta */
|
||||||
|
+ "#2aa198", /* 6: cyan */
|
||||||
|
+ "#073642", /* 7: white */
|
||||||
|
+ "#fdf6e3", /* 8: brblack */
|
||||||
|
+ "#cb4b16", /* 9: brred */
|
||||||
|
+ "#93a1a1", /* 10: brgreen */
|
||||||
|
+ "#839496", /* 11: bryellow */
|
||||||
|
+ "#657b83", /* 12: brblue */
|
||||||
|
+ "#6c71c4", /* 13: brmagenta*/
|
||||||
|
+ "#586e75", /* 14: brcyan */
|
||||||
|
+ "#002b36", /* 15: brwhite */
|
||||||
|
+};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default colors (colorname index)
|
||||||
|
* foreground, background, cursor, reverse cursor
|
||||||
|
*/
|
||||||
|
-static unsigned int defaultfg = 7;
|
||||||
|
-static unsigned int defaultbg = 0;
|
||||||
|
-static unsigned int defaultcs = 256;
|
||||||
|
-static unsigned int defaultrcs = 257;
|
||||||
|
+static unsigned int defaultfg = 12;
|
||||||
|
+static unsigned int defaultbg = 8;
|
||||||
|
+static unsigned int defaultcs = 14;
|
||||||
|
+static unsigned int defaultrcs = 15;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default shape of cursor
|
||||||
|
@@ -172,6 +184,7 @@ static Shortcut shortcuts[] = {
|
||||||
|
{ MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} },
|
||||||
|
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
+ { XK_ANY_MOD, XK_F6, swapcolors, {.i = 0} },
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
diff --git a/st.c b/st.c
|
||||||
|
index 2594c65..b4a3089 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -328,6 +328,7 @@ typedef struct {
|
||||||
|
static void clipcopy(const Arg *);
|
||||||
|
static void clippaste(const Arg *);
|
||||||
|
static void numlock(const Arg *);
|
||||||
|
+static void swapcolors(const Arg *);
|
||||||
|
static void selpaste(const Arg *);
|
||||||
|
static void xzoom(const Arg *);
|
||||||
|
static void xzoomabs(const Arg *);
|
||||||
|
@@ -355,7 +356,7 @@ typedef struct {
|
||||||
|
|
||||||
|
/* Drawing Context */
|
||||||
|
typedef struct {
|
||||||
|
- Color col[MAX(LEN(colorname), 256)];
|
||||||
|
+ Color col[MAX(MAX(LEN(colorname), LEN(altcolorname)), 256)];
|
||||||
|
Font font, bfont, ifont, ibfont;
|
||||||
|
GC gc;
|
||||||
|
} DC;
|
||||||
|
@@ -533,6 +534,8 @@ static char *opt_name = NULL;
|
||||||
|
static char *opt_title = NULL;
|
||||||
|
static int oldbutton = 3; /* button event on startup: 3 = release */
|
||||||
|
|
||||||
|
+static int usealtcolors = 0; /* 1 to use alternate palette */
|
||||||
|
+
|
||||||
|
static char *usedfont = NULL;
|
||||||
|
static double usedfontsize = 0;
|
||||||
|
static double defaultfontsize = 0;
|
||||||
|
@@ -3148,6 +3151,11 @@ sixd_to_16bit(int x)
|
||||||
|
return x == 0 ? 0 : 0x3737 + 0x2828 * x;
|
||||||
|
}
|
||||||
|
|
||||||
|
+const char* getcolorname(int i)
|
||||||
|
+{
|
||||||
|
+ return (usealtcolors) ? altcolorname[i] : colorname[i];
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
xloadcolor(int i, const char *name, Color *ncolor)
|
||||||
|
{
|
||||||
|
@@ -3166,7 +3174,7 @@ xloadcolor(int i, const char *name, Color *ncolor)
|
||||||
|
return XftColorAllocValue(xw.dpy, xw.vis,
|
||||||
|
xw.cmap, &color, ncolor);
|
||||||
|
} else
|
||||||
|
- name = colorname[i];
|
||||||
|
+ name = getcolorname(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
|
||||||
|
@@ -3186,8 +3194,8 @@ xloadcols(void)
|
||||||
|
|
||||||
|
for (i = 0; i < LEN(dc.col); i++)
|
||||||
|
if (!xloadcolor(i, NULL, &dc.col[i])) {
|
||||||
|
- if (colorname[i])
|
||||||
|
- die("Could not allocate color '%s'\n", colorname[i]);
|
||||||
|
+ if (getcolorname(i))
|
||||||
|
+ die("Could not allocate color '%s'\n", getcolorname(i));
|
||||||
|
else
|
||||||
|
die("Could not allocate color %d\n", i);
|
||||||
|
}
|
||||||
|
@@ -3514,13 +3522,13 @@ xinit(void)
|
||||||
|
cursor = XCreateFontCursor(xw.dpy, mouseshape);
|
||||||
|
XDefineCursor(xw.dpy, xw.win, cursor);
|
||||||
|
|
||||||
|
- if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
|
||||||
|
+ if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousefg), &xmousefg) == 0) {
|
||||||
|
xmousefg.red = 0xffff;
|
||||||
|
xmousefg.green = 0xffff;
|
||||||
|
xmousefg.blue = 0xffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
|
||||||
|
+ if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousebg), &xmousebg) == 0) {
|
||||||
|
xmousebg.red = 0x0000;
|
||||||
|
xmousebg.green = 0x0000;
|
||||||
|
xmousebg.blue = 0x0000;
|
||||||
|
@@ -4074,6 +4082,14 @@ numlock(const Arg *dummy)
|
||||||
|
term.numlock ^= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+swapcolors(const Arg *dummy)
|
||||||
|
+{
|
||||||
|
+ usealtcolors = !usealtcolors;
|
||||||
|
+ xloadcols();
|
||||||
|
+ redraw();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
char*
|
||||||
|
kmap(KeySym k, uint state)
|
||||||
|
{
|
||||||
44
patches/st-vertcenter-20160819-023225e.diff
Normal file
44
patches/st-vertcenter-20160819-023225e.diff
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
diff --git a/st.c b/st.c
|
||||||
|
index 2594c65..7285237 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -268,6 +268,7 @@ typedef struct {
|
||||||
|
int w, h; /* window width and height */
|
||||||
|
int ch; /* char height */
|
||||||
|
int cw; /* char width */
|
||||||
|
+ int cyo; /* char y offset */
|
||||||
|
char state; /* focus, redraw, visible */
|
||||||
|
int cursor; /* cursor style */
|
||||||
|
} XWindow;
|
||||||
|
@@ -3359,6 +3360,7 @@ xloadfonts(char *fontstr, double fontsize)
|
||||||
|
/* Setting character width and height. */
|
||||||
|
xw.cw = ceilf(dc.font.width * cwscale);
|
||||||
|
xw.ch = ceilf(dc.font.height * chscale);
|
||||||
|
+ xw.cyo = ceilf(dc.font.height * (chscale - 1) / 2);
|
||||||
|
|
||||||
|
FcPatternDel(pattern, FC_SLANT);
|
||||||
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
|
||||||
|
@@ -3584,7 +3586,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||||
|
font = &dc.bfont;
|
||||||
|
frcflags = FRC_BOLD;
|
||||||
|
}
|
||||||
|
- yp = winy + font->ascent;
|
||||||
|
+ yp = winy + font->ascent + xw.cyo;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Lookup character index with default font. */
|
||||||
|
@@ -3796,12 +3798,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||||
|
|
||||||
|
/* Render underline and strikethrough. */
|
||||||
|
if (base.mode & ATTR_UNDERLINE) {
|
||||||
|
- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
|
||||||
|
+ XftDrawRect(xw.draw, fg, winx, winy + xw.cyo + dc.font.ascent + 1,
|
||||||
|
width, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (base.mode & ATTR_STRUCK) {
|
||||||
|
- XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
|
||||||
|
+ XftDrawRect(xw.draw, fg, winx, winy + xw.cyo + 2 * dc.font.ascent / 3,
|
||||||
|
width, 1);
|
||||||
|
}
|
||||||
|
|
||||||
Loading…
Reference in a new issue