commit b82688ff68ebd0b3403e205cbdbcc685356fcb0e
Author: Ivan Delalande <[email protected]>
Date: Sun May 31 12:32:43 2020 -0700
[st][patch][hidecursor] add patch version for 0.8.3 and later
Remove patch for 0.8.1 as the 0.8 version works fine up to 0.8.2, add a
version for 0.8.3 that also works up to current st git master (0.8 patch
breaks after the forcemousemod rename in commit b6d280d).
diff --git a/st.suckless.org/patches/hidecursor/index.md
b/st.suckless.org/patches/hidecursor/index.md
index 488f43b4..d53ccda2 100644
--- a/st.suckless.org/patches/hidecursor/index.md
+++ b/st.suckless.org/patches/hidecursor/index.md
@@ -14,7 +14,7 @@ Download
* [st-hidecursor-0.6.diff](st-hidecursor-0.6.diff)
* [st-hidecursor-0.7.diff](st-hidecursor-0.7.diff)
* [st-hidecursor-0.8.diff](st-hidecursor-0.8.diff)
-* [st-hidecursor-0.8.1.diff](st-hidecursor-0.8.1.diff)
+* [st-hidecursor-0.8.3.diff](st-hidecursor-0.8.3.diff)
Authors
-------
diff --git a/st.suckless.org/patches/hidecursor/st-hidecursor-0.8.1.diff
b/st.suckless.org/patches/hidecursor/st-hidecursor-0.8.3.diff
similarity index 81%
rename from st.suckless.org/patches/hidecursor/st-hidecursor-0.8.1.diff
rename to st.suckless.org/patches/hidecursor/st-hidecursor-0.8.3.diff
index d27267c7..4895a663 100644
--- a/st.suckless.org/patches/hidecursor/st-hidecursor-0.8.1.diff
+++ b/st.suckless.org/patches/hidecursor/st-hidecursor-0.8.3.diff
@@ -1,8 +1,8 @@
diff --git a/x.c b/x.c
-index c343ba2..a40de8c 100644
+index e5f1737..7e759b0 100644
--- a/x.c
+++ b/x.c
-@@ -96,6 +96,11 @@ typedef struct {
+@@ -103,6 +103,11 @@ typedef struct {
Draw draw;
Visual *vis;
XSetWindowAttributes attrs;
@@ -14,7 +14,7 @@ index c343ba2..a40de8c 100644
int scr;
int isfixed; /* is fixed geometry? */
int l, t; /* left and top offset */
-@@ -652,6 +657,13 @@ brelease(XEvent *e)
+@@ -698,6 +703,13 @@ brelease(XEvent *e)
void
bmotion(XEvent *e)
{
@@ -25,10 +25,10 @@ index c343ba2..a40de8c 100644
+ xsetpointermotion(0);
+ }
+
- if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
mousereport(e);
return;
-@@ -997,10 +1009,10 @@ void
+@@ -1099,10 +1111,10 @@ void
xinit(int cols, int rows)
{
XGCValues gcvalues;
@@ -39,9 +39,9 @@ index c343ba2..a40de8c 100644
+ Pixmap blankpm;
if (!(xw.dpy = XOpenDisplay(NULL)))
- die("Can't open display
");
-@@ -1076,8 +1088,9 @@ xinit(int cols, int rows)
- die("XCreateIC failed. Could not obtain input method.
");
+ die("can't open display
");
+@@ -1166,8 +1178,9 @@ xinit(int cols, int rows)
+ }
/* white cursor, black outline */
- cursor = XCreateFontCursor(xw.dpy, mouseshape);
@@ -52,7 +52,7 @@ index c343ba2..a40de8c 100644
if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
xmousefg.red = 0xffff;
-@@ -1091,7 +1104,10 @@ xinit(int cols, int rows)
+@@ -1181,7 +1194,10 @@ xinit(int cols, int rows)
xmousebg.blue = 0x0000;
}
@@ -64,7 +64,7 @@ index c343ba2..a40de8c 100644
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
-@@ -1574,6 +1590,8 @@ unmap(XEvent *ev)
+@@ -1673,6 +1689,8 @@ unmap(XEvent *ev)
void
xsetpointermotion(int set)
{
@@ -73,7 +73,7 @@ index c343ba2..a40de8c 100644
MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
}
-@@ -1692,6 +1710,12 @@ kpress(XEvent *ev)
+@@ -1793,6 +1811,12 @@ kpress(XEvent *ev)
Status status;
Shortcut *bp;
