st: update configuration

3 files changed, 38 insertions, 14 deletions

diff --git a/st-custom/0001-Add-transparency.patch b/st-custom/0001-Add-transparency.patch
index 08d4b91..5f36d18 100644
--- a/st-custom/0001-Add-transparency.patch
+++ b/st-custom/0001-Add-transparency.patch
@@ -1,22 +1,30 @@
-From f4519f34fbdc1eaa2787396f76ce99743d8e2dfb Mon Sep 17 00:00:00 2001
+From ac4449f9ddf196b4430f0d8ec1c83e26a7507416 Mon Sep 17 00:00:00 2001
 From: Tharre <tharre3@gmail.com>
 Date: Mon, 13 Jul 2015 18:32:13 +0200
-Subject: [PATCH] Add transparency
+Subject: [PATCH 1/1] Add transparency
 
 ---
- config.def.h |  3 +++
+ config.def.h |  4 +++-
  config.mk    |  2 +-
  st.c         | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
- 3 files changed, 57 insertions(+), 9 deletions(-)
+ 3 files changed, 57 insertions(+), 10 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
-index e246e3c..1f8c524 100644
+index 930e468..21eea31 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -96,6 +96,9 @@ static unsigned int defaultfg = 7;
+@@ -105,7 +105,6 @@ static unsigned int defaultfg = 7;
  static unsigned int defaultbg = 0;
  static unsigned int defaultcs = 256;
  
+-
+ /*
+  * Default colour and shape of the mouse cursor
+  */
+@@ -113,6 +112,9 @@ static unsigned int mouseshape = XC_xterm;
+ static unsigned int mousefg = 7;
+ static unsigned int mousebg = 0;
+ 
 +/* background opacity */
 +static const int alpha = 0xed;
 +
@@ -37,7 +45,7 @@ index 67844dc..ce5753a 100644
         `pkg-config --libs freetype2`
  
 diff --git a/st.c b/st.c
-index 64e2cec..11025b2 100644
+index 1df4fde..338c176 100644
 --- a/st.c
 +++ b/st.c
 @@ -60,6 +60,7 @@ char *argv0;
@@ -89,7 +97,7 @@ index 64e2cec..11025b2 100644
  	loaded = 1;
  }
  
-@@ -3415,7 +3425,38 @@ xinit(void)
+@@ -3416,7 +3426,38 @@ xinit(void)
  	if (!(xw.dpy = XOpenDisplay(NULL)))
  		die("Can't open display\n");
  	xw.scr = XDefaultScreen(xw.dpy);
@@ -129,7 +137,7 @@ index 64e2cec..11025b2 100644
  
  	/* font */
  	if (!FcInit())
-@@ -3425,7 +3466,10 @@ xinit(void)
+@@ -3426,7 +3467,10 @@ xinit(void)
  	xloadfonts(usedfont, 0);
  
  	/* colors */
@@ -141,7 +149,7 @@ index 64e2cec..11025b2 100644
  	xloadcols();
  
  	/* adjust fixed window geometry */
-@@ -3448,16 +3492,17 @@ xinit(void)
+@@ -3449,16 +3493,17 @@ xinit(void)
  	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
  		parent = XRootWindow(xw.dpy, xw.scr);
  	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
@@ -164,5 +172,5 @@ index 64e2cec..11025b2 100644
  	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
  
 -- 
-2.4.5
+2.5.0
 
diff --git a/st-custom/PKGBUILD b/st-custom/PKGBUILD
index 7e2b10a..46fbeb4 100644
--- a/st-custom/PKGBUILD
+++ b/st-custom/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=st-custom
 _pkgname=st
-pkgver=0.6.r13.gd032b61
+pkgver=0.6.r19.gee5cad4
 pkgrel=1
 pkgdesc='Simple virtual terminal emulator for X'
 url='http://git.suckless.org/st/'
@@ -13,9 +13,9 @@ makedepends=('ncurses' 'libxext' 'git')
 source=('git://git.suckless.org/st' 'config.h' 'st-terminal.desktop'
         '0001-Add-transparency.patch')
 md5sums=('SKIP'
-         'af42baee3a52e354a5b7a308047dde70'
+         'd5c73780a8cfc8df4133653dfd99ecc2'
          'bbe3714218145d39b6920961f27692e6'
-         '71961029aa5cf2b9e01bc7bea7e5b757')
+         '2fb7d75cac7ebf49dbdd43eeed955020')
 
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
diff --git a/st-custom/config.h b/st-custom/config.h
index 248a84f..96a81f4 100644
--- a/st-custom/config.h
+++ b/st-custom/config.h
@@ -7,6 +7,15 @@
  */
 static char font[] = "monospace:size=14:antialias=true:autohint=true";
 static int borderpx = 2;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: utmp option
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
 static char shell[] = "/bin/sh";
 static char *utmp = NULL;
 static char stty_args[] = "stty raw -echo -iexten echonl";
@@ -96,6 +105,13 @@ static unsigned int defaultfg = 7;
 static unsigned int defaultbg = 0;
 static unsigned int defaultcs = 256;
 
+/*
+ * Default colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
+
 /* background opacity */
 static const int alpha = 0xCC; /* 80% alpha */