From 2c85b5da910b54305fd27f7aeea0d82ee2a7dab7 Mon Sep 17 00:00:00 2001 From: bakkeby Date: Wed, 10 Jun 2020 21:02:22 +0200 Subject: [PATCH] FAQ: fix single-buffer patch (249ef9) rebase against master --- FAQ | 23 ++++++++++++----------- README.md | 4 +++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/FAQ b/FAQ index 6467d80..0f9609d 100644 --- a/FAQ +++ b/FAQ @@ -189,18 +189,18 @@ buffer. diff --git a/x.c b/x.c --- a/x.c +++ b/x.c -@@ -561,10 +561,6 @@ xresize(int col, int row) - win.tw = MAX(1, col * win.cw); - win.th = MAX(1, row * win.ch); - +@@ -732,10 +732,6 @@ xresize(int col, int row) + win.tw = col * win.cw; + win.th = row * win.ch; + - XFreePixmap(xw.dpy, xw.buf); - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, - DefaultDepth(xw.dpy, xw.scr)); - XftDrawChange(xw.draw, xw.buf); xclear(0, 0, win.w, win.h); - } - -@@ -921,8 +917,7 @@ xinit(void) + + /* resize to new width */ +@@ -1148,8 +1144,7 @@ xinit(int cols, int rows) gcvalues.graphics_exposures = False; dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures, &gcvalues); @@ -209,17 +209,18 @@ diff --git a/x.c b/x.c + xw.buf = xw.win; XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); - -@@ -1386,8 +1381,6 @@ void - draw(void) + +@@ -1632,8 +1627,6 @@ xdrawline(Line line, int x1, int y1, int x2) + void + xfinishdraw(void) { - drawregion(0, 0, term.col, term.row); - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w, - win.h, 0, 0); XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg].pixel); + ## BadLength X error in Xft when trying to render emoji Xft makes st crash when rendering color emojis with the following error: diff --git a/README.md b/README.md index 42a025a..3972e10 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.8.3 (3c8b75, 2020-05-20) project has a different take on st patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more. +Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.8.3 (249ef9, 2020-06-01) project has a different take on st patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more. For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/st-flexipatch/blob/master/patches.def.h): ```c @@ -15,6 +15,8 @@ Refer to [https://st.suckless.org/](https://st.suckless.org/) for details on the ### Changelog: +2020-06-10 - Upgrade to 249ef9, 2020-06-01 + 2020-06-05 - Added the ligatures patch 2020-05-20 - Upgrade to 222876, 2020-05-09, and removed visualbell 1, 2, 3 patches and force redraw after keypress due to incompatibility. Refer to tag [371878](https://github.com/bakkeby/st-flexipatch/tree/371878) if you want to try these out.