st

commit 209040c022c346886b9e9fae8e3800fd0ae67f68
parent 6aec9907d5a198997f0a241b326f889449c248ae
Author: Matthew Carlson <matt@mcarlson.xyz>
Date:   Sun, 11 Jul 2021 21:50:11 +0000

hidecursor

Diffstat:
M
x.c
 | 
32
++++++++++++++++++++++++++++----

1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/x.c b/x.c
@@ -103,6 +103,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 */
@@ -700,6 +705,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 & forcemousemod)) {
 		mousereport(e);
 		return;
@@ -1101,10 +1113,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\n");
@@ -1168,8 +1180,9 @@ xinit(int cols, int rows)
 	}
 
 	/* 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;
@@ -1183,7 +1196,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);
@@ -1690,6 +1706,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);
 }
@@ -1809,6 +1827,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;