st

commit b3eaee6eac8736473210bd5e72883e9d764527df
parent 8af98d9222ca978867e8c8dfd6e8053e634a262f
Author: Jake Koroman <jakekoroman@proton.me>
Date:   Fri,  7 Mar 2025 11:01:36 -0500

added themed_cursor patch.

Diffstat:
M
README
 | 
2
+-
M
config.def.h
 | 
6
++----
M
config.mk
 | 
2
+-
M
manifest.scm
 | 
2
+-
M
x.c
 | 
25
++++---------------------

5 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/README b/README
@@ -10,7 +10,7 @@ bold is not bright - https://st.suckless.org/patches/bold-is-not-bright/
 boxdraw - https://st.suckless.org/patches/boxdraw/
 glyph wide support - https://st.suckless.org/patches/glyph_wide_support/
 scrollback (with mouse) - https://st.suckless.org/patches/scrollback/
-
+themed_cursor - https://st.suckless.org/patches/themed_cursor/
 
 Requirements
 ------------
diff --git a/config.def.h b/config.def.h
@@ -309,11 +309,9 @@ static unsigned int cols = 80;
 static unsigned int rows = 24;
 
 /*
- * Default colour and shape of the mouse cursor
+ * Default shape of the mouse cursor
  */
-static unsigned int mouseshape = XC_xterm;
-static unsigned int mousefg = 7;
-static unsigned int mousebg = 0;
+static unsigned char *mouseshape = "xterm";
 
 /*
  * Color used to display font attributes when fontconfig selected a font which
diff --git 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 -lXcursor \
        `$(PKG_CONFIG) --libs fontconfig` \
        `$(PKG_CONFIG) --libs freetype2`
 
diff --git a/manifest.scm b/manifest.scm
@@ -1 +1 @@
-(specifications->manifest '("make" "gcc-toolchain" "pkg-config" "libx11" "libxft" "ncurses"))
+(specifications->manifest '("make" "gcc-toolchain" "pkg-config" "libx11" "libxft" "libxcursor" "ncurses"))
diff --git a/x.c b/x.c
@@ -10,10 +10,11 @@
 #include <libgen.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include <X11/cursorfont.h>
+/* #include <X11/cursorfont.h> */
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
+#include <X11/Xcursor/Xcursor.h>
 
 char *argv0;
 #include "arg.h"
@@ -1224,23 +1225,9 @@ xinit(int cols, int rows)
 	}
 
 	/* white cursor, black outline */
-	cursor = XCreateFontCursor(xw.dpy, mouseshape);
+	cursor = XcursorLibraryLoadCursor(xw.dpy, mouseshape);
 	XDefineCursor(xw.dpy, xw.win, cursor);
 
-	if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
-		xmousefg.red   = 0xffff;
-		xmousefg.green = 0xffff;
-		xmousefg.blue  = 0xffff;
-	}
-
-	if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
-		xmousebg.red   = 0x0000;
-		xmousebg.green = 0x0000;
-		xmousebg.blue  = 0x0000;
-	}
-
-	XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
-
 	xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
 	xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
 	xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
@@ -2058,11 +2045,7 @@ usage(void)
 	die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
 	    " [-n name] [-o file]\n"
 	    "          [-T title] [-t title] [-w windowid]"
-	    " [[-e] command [args ...]]\n"
-	    "       %s [-aiv] [-c class] [-f font] [-g geometry]"
-	    " [-n name] [-o file]\n"
-	    "          [-T title] [-t title] [-w windowid] -l line"
-	    " [stty_args ...]\n", argv0, argv0);
+	    " [[-e] command [args ...]]\n" , argv0, argv0);
 }
 
 int