Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (61f7b269f4be0521135f892176e59d41f9519572)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (61f7b269f4be0521135f892176e59d41f9519572)
  • Date: Tue, 17 Apr 2018 19:05:33 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

shell-term-fm/st/DETAILS | 8 -
shell-term-fm/st/HISTORY | 6
shell-term-fm/st/PRE_BUILD | 2
shell-term-fm/st/patches/st-hidecursor-0.8.diff | 88
+++++++++++
shell-term-fm/st/patches/st-hidecursor-20160727-308bfbf.diff | 87
----------
5 files changed, 99 insertions(+), 92 deletions(-)

New commits:
commit 61f7b269f4be0521135f892176e59d41f9519572
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

shell-term-fm/st: version 0.8.1

diff --git a/shell-term-fm/st/DETAILS b/shell-term-fm/st/DETAILS
index baeeec1..7209e27 100755
--- a/shell-term-fm/st/DETAILS
+++ b/shell-term-fm/st/DETAILS
@@ -1,10 +1,10 @@
SPELL=st
- VERSION=0.7
+ VERSION=0.8.1
+
SOURCE_HASH=sha512:787d35b0cc8b1435dad7809e9995bed3c7f781e012a4a43dd5ae3d670ebc0e4bc03a56ba3872ff8a3bdba316a41ba771c626adc8de0559296457a59170756c6b
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://dl.suckless.org/st/$SOURCE
-
SOURCE_HASH=sha512:9384820d373bfaaef1887290351d8c34abeef26cd7d50ddbae56ffb865864bcca9be798c6238bf1ce595ba7c317f2c1d97653055da0aa302e322eeee822768d4
- WEB_SITE=http://st.suckless.org/
+ SOURCE_URL[0]=https://dl.suckless.org/st/$SOURCE
+ WEB_SITE=https://st.suckless.org/
ENTERED=20130208
LICENSE[0]=MIT
KEYWORDS="simple terminal"
diff --git a/shell-term-fm/st/HISTORY b/shell-term-fm/st/HISTORY
index fd24237..cebcd9b 100644
--- a/shell-term-fm/st/HISTORY
+++ b/shell-term-fm/st/HISTORY
@@ -1,3 +1,9 @@
+2018-04-17 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.8.1, http -> https
+ * PRE_BUILD: sedit -> sed, added compiler fix to that sed
+ * patches/st-hidecursor-20160727-308bfbf.diff,
+ patches/st-hidecursor-0.8.diff: Updated patch
+
2018-04-16 Pavel Vinogradov <public AT sourcemage.org>
* CONFIGURE, INSTALL, PRE_BUILD: added ability to edit/store custom
configuration
diff --git a/shell-term-fm/st/PRE_BUILD b/shell-term-fm/st/PRE_BUILD
index b89bebe..13e39be 100755
--- a/shell-term-fm/st/PRE_BUILD
+++ b/shell-term-fm/st/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-sedit "s:/local::" config.mk &&
+sed -e "s:/local::" -e "/CC/c CC = gcc --std=c99" -i config.mk &&

for i in "$SPELL_DIRECTORY"/patches/*; do
desc="$(sed -nr '/^Subject: /!d;s@[^ ]* *(\[[A-Za-z0-9 ]*\] *)*@@;p;q'
"$i")" &&
diff --git a/shell-term-fm/st/patches/st-hidecursor-0.8.diff
b/shell-term-fm/st/patches/st-hidecursor-0.8.diff
new file mode 100644
index 0000000..94e9781
--- /dev/null
+++ b/shell-term-fm/st/patches/st-hidecursor-0.8.diff
@@ -0,0 +1,88 @@
+diff --git a/x.c b/x.c
+index d43a529..599696f 100644
+--- a/x.c
++++ b/x.c
+@@ -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 */
+@@ -649,6 +654,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;
+@@ -994,10 +1006,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");
+@@ -1073,8 +1085,9 @@ xinit(int cols, int rows)
+ die("XCreateIC failed. Could not obtain input method.\n");
+
+ /* 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;
+@@ -1088,7 +1101,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);
+@@ -1571,6 +1587,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);
+ }
+@@ -1689,6 +1707,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;
+
diff --git a/shell-term-fm/st/patches/st-hidecursor-20160727-308bfbf.diff
b/shell-term-fm/st/patches/st-hidecursor-20160727-308bfbf.diff
deleted file mode 100644
index 3b731aa..0000000
--- a/shell-term-fm/st/patches/st-hidecursor-20160727-308bfbf.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/st.c b/st.c
-index 2594c65..2a031f0 100644
---- a/st.c
-+++ b/st.c
-@@ -260,6 +260,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 */
-@@ -1291,6 +1296,13 @@ bmotion(XEvent *e)
- {
- int oldey, oldex, oldsby, oldsey;
-
-+ 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;
-@@ -3435,10 +3447,10 @@ void
- xinit(void)
- {
- 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");
-@@ -3511,8 +3523,9 @@ xinit(void)
- die("XCreateIC failed. Could not obtain input method.\n");
-
- /* 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;
-@@ -3526,7 +3539,10 @@ xinit(void)
- 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);
-@@ -4026,6 +4042,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);
- }
-@@ -4125,6 +4143,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;



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (61f7b269f4be0521135f892176e59d41f9519572), Pavel Vinogradov, 04/17/2018

Archive powered by MHonArc 2.6.24.

Top of Page