[wiki] [sites] [st] hidecursor: Add 0.8.1 patch || Klemens Nanni

From: <git_AT_suckless.org>
Date: Fri, 08 Jun 2018 19:00:22 +0200

commit e026233425b3709be018094054f048d16435592d
Author: Klemens Nanni <klemens_AT_posteo.de>
Date: Fri Jun 8 18:57:53 2018 +0200

    [st] hidecursor: Add 0.8.1 patch
    
    st-hidecursor-0.8.diff 0.8 applies to 0.8.1 but a separate file allows
    automated fetching of patches, e.g. in an OpenBSD port.

diff --git a/st.suckless.org/patches/hidecursor/st-hidecursor-0.8.1.diff b/st.suckless.org/patches/hidecursor/st-hidecursor-0.8.1.diff
new file mode 100644
index 00000000..d27267c7
--- /dev/null
+++ b/st.suckless.org/patches/hidecursor/st-hidecursor-0.8.1.diff
_AT_@ -0,0 +1,88 @@
+diff --git a/x.c b/x.c
+index c343ba2..a40de8c 100644
+--- a/x.c
++++ b/x.c
+_AT_@ -96,6 +96,11 @@ typedef struct {
+ Draw draw;
+ Visual *vis;
+ XSetWindowAttributes attrs;
++ /* Here, we use the term *pointer* to differentiate the cursor
++ * one sees when hovering the mouse over the terminal from, e.g.,
++ * a green rectangle where text would be entered. */
++ Cursor vpointer, bpointer; /* visible and hidden pointers */
++ int pointerisvisible;
+ int scr;
+ int isfixed; /* is fixed geometry? */
+ int l, t; /* left and top offset */
+_AT_@ -652,6 +657,13 @@ brelease(XEvent *e)
+ void
+ bmotion(XEvent *e)
+ {
++ if (!xw.pointerisvisible) {
++ XDefineCursor(xw.dpy, xw.win, xw.vpointer);
++ xw.pointerisvisible = 1;
++ if (!IS_SET(MODE_MOUSEMANY))
++ xsetpointermotion(0);
++ }
++
+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+ mousereport(e);
+ return;
+_AT_@ -997,10 +1009,10 @@ void
+ xinit(int cols, int rows)
+ {
+ XGCValues gcvalues;
+- Cursor cursor;
+ Window parent;
+ pid_t thispid = getpid();
+ XColor xmousefg, xmousebg;
++ Pixmap blankpm;
+
+ if (!(xw.dpy = XOpenDisplay(NULL)))
+ die("Can't open display
");
+_AT_@ -1076,8 +1088,9 @@ xinit(int cols, int rows)
+ die("XCreateIC failed. Could not obtain input method.
");
+
+ /* white cursor, black outline */
+- cursor = XCreateFontCursor(xw.dpy, mouseshape);
+- XDefineCursor(xw.dpy, xw.win, cursor);
++ xw.pointerisvisible = 1;
++ xw.vpointer = XCreateFontCursor(xw.dpy, mouseshape);
++ XDefineCursor(xw.dpy, xw.win, xw.vpointer);
+
+ if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
+ xmousefg.red = 0xffff;
+_AT_@ -1091,7 +1104,10 @@ xinit(int cols, int rows)
+ xmousebg.blue = 0x0000;
+ }
+
+- XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
++ XRecolorCursor(xw.dpy, xw.vpointer, &xmousefg, &xmousebg);
++ blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1);
++ xw.bpointer = XCreatePixmapCursor(xw.dpy, blankpm, blankpm,
++ &xmousefg, &xmousebg, 0, 0);
+
+ xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+ xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+_AT_@ -1574,6 +1590,8 @@ unmap(XEvent *ev)
+ void
+ xsetpointermotion(int set)
+ {
++ if (!set && !xw.pointerisvisible)
++ return;
+ MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
+ XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
+ }
+_AT_@ -1692,6 +1710,12 @@ kpress(XEvent *ev)
+ Status status;
+ Shortcut *bp;
+
++ if (xw.pointerisvisible) {
++ XDefineCursor(xw.dpy, xw.win, xw.bpointer);
++ xsetpointermotion(1);
++ xw.pointerisvisible = 0;
++ }
++
+ if (IS_SET(MODE_KBDLOCK))
+ return;
+
Received on Fri Jun 08 2018 - 19:00:22 CEST