st: update version

3 files changed, 29 insertions, 27 deletions

diff --git a/st-custom/0001-Add-transparency.patch b/st-custom/0001-Add-transparency.patch
index 5f36d18..c91240b 100644
--- a/st-custom/0001-Add-transparency.patch
+++ b/st-custom/0001-Add-transparency.patch
@@ -1,27 +1,19 @@
-From ac4449f9ddf196b4430f0d8ec1c83e26a7507416 Mon Sep 17 00:00:00 2001
+From 3b5d1f8a61bfd7167151ca8ab66fc59d43b91fc7 Mon Sep 17 00:00:00 2001
 From: Tharre <tharre3@gmail.com>
 Date: Mon, 13 Jul 2015 18:32:13 +0200
 Subject: [PATCH 1/1] Add transparency
 
 ---
- config.def.h |  4 +++-
+ config.def.h |  3 +++
  config.mk    |  2 +-
  st.c         | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
- 3 files changed, 57 insertions(+), 10 deletions(-)
+ 3 files changed, 57 insertions(+), 9 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
-index 930e468..21eea31 100644
+index 52bf3a4..3cf10cb 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -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;
+@@ -122,6 +122,9 @@ static unsigned int mouseshape = XC_xterm;
  static unsigned int mousefg = 7;
  static unsigned int mousebg = 0;
  
@@ -45,10 +37,10 @@ index 67844dc..ce5753a 100644
         `pkg-config --libs freetype2`
  
 diff --git a/st.c b/st.c
-index 1df4fde..338c176 100644
+index bd8b815..d89551e 100644
 --- a/st.c
 +++ b/st.c
-@@ -60,6 +60,7 @@ char *argv0;
+@@ -61,6 +61,7 @@ char *argv0;
  #define XK_ANY_MOD    UINT_MAX
  #define XK_NO_MOD     0
  #define XK_SWITCH_MOD (1<<13)
@@ -56,7 +48,7 @@ index 1df4fde..338c176 100644
  
  /* macros */
  #define MIN(a, b)		((a) < (b) ? (a) : (b))
-@@ -84,6 +85,7 @@ char *argv0;
+@@ -85,6 +86,7 @@ char *argv0;
  #define TRUERED(x)		(((x) & 0xff0000) >> 8)
  #define TRUEGREEN(x)		(((x) & 0xff00))
  #define TRUEBLUE(x)		(((x) & 0xff) << 8)
@@ -64,7 +56,7 @@ index 1df4fde..338c176 100644
  
  
  enum glyph_attribute {
-@@ -266,6 +268,7 @@ typedef struct {
+@@ -267,6 +269,7 @@ typedef struct {
  	int w, h; /* window width and height */
  	int ch; /* char height */
  	int cw; /* char width  */
@@ -72,7 +64,7 @@ index 1df4fde..338c176 100644
  	char state; /* focus, redraw, visible */
  	int cursor; /* cursor style */
  } XWindow;
-@@ -3102,8 +3105,7 @@ xresize(int col, int row)
+@@ -3134,8 +3137,7 @@ xresize(int col, int row)
  	xw.th = MAX(1, row * xw.ch);
  
  	XFreePixmap(xw.dpy, xw.buf);
@@ -82,7 +74,7 @@ index 1df4fde..338c176 100644
  	XftDrawChange(xw.draw, xw.buf);
  	xclear(0, 0, xw.w, xw.h);
  }
-@@ -3157,6 +3159,14 @@ xloadcols(void)
+@@ -3189,6 +3191,14 @@ xloadcols(void)
  			else
  				die("Could not allocate color %d\n", i);
  		}
@@ -97,7 +89,7 @@ index 1df4fde..338c176 100644
  	loaded = 1;
  }
  
-@@ -3416,7 +3426,38 @@ xinit(void)
+@@ -3448,7 +3458,38 @@ xinit(void)
  	if (!(xw.dpy = XOpenDisplay(NULL)))
  		die("Can't open display\n");
  	xw.scr = XDefaultScreen(xw.dpy);
@@ -137,7 +129,7 @@ index 1df4fde..338c176 100644
  
  	/* font */
  	if (!FcInit())
-@@ -3426,7 +3467,10 @@ xinit(void)
+@@ -3458,7 +3499,10 @@ xinit(void)
  	xloadfonts(usedfont, 0);
  
  	/* colors */
@@ -149,7 +141,7 @@ index 1df4fde..338c176 100644
  	xloadcols();
  
  	/* adjust fixed window geometry */
-@@ -3449,16 +3493,17 @@ xinit(void)
+@@ -3481,16 +3525,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,
@@ -172,5 +164,5 @@ index 1df4fde..338c176 100644
  	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
  
 -- 
-2.5.0
+2.5.1
 
diff --git a/st-custom/PKGBUILD b/st-custom/PKGBUILD
index 46fbeb4..a18ba47 100644
--- a/st-custom/PKGBUILD
+++ b/st-custom/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=st-custom
 _pkgname=st
-pkgver=0.6.r19.gee5cad4
+pkgver=0.6.r31.g5d2d9d5
 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'
-         'd5c73780a8cfc8df4133653dfd99ecc2'
+         '103434eb772b2db7bb51da2e692e1422'
          'bbe3714218145d39b6920961f27692e6'
-         '2fb7d75cac7ebf49dbdd43eeed955020')
+         '3f642b61510b14fe233a082a98b1ea6f')
 
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
diff --git a/st-custom/config.h b/st-custom/config.h
index 96a81f4..8dd96e9 100644
--- a/st-custom/config.h
+++ b/st-custom/config.h
@@ -18,7 +18,7 @@ static int borderpx = 2;
  */
 static char shell[] = "/bin/sh";
 static char *utmp = NULL;
-static char stty_args[] = "stty raw -echo -iexten echonl";
+static char stty_args[] = "stty raw pass8 nl -echo -iexten -cstopb 38400";
 
 /* identification sequence returned in DA and DECID */
 static char vtiden[] = "\033[?6c";
@@ -106,6 +106,16 @@ static unsigned int defaultbg = 0;
 static unsigned int defaultcs = 256;
 
 /*
+ * Default shape of cursor
+ * 2: Block
+ * 4: Underline
+ * 6: IBeam
+ */
+
+static unsigned int cursorshape = 2;
+
+
+/*
  * Default colour and shape of the mouse cursor
  */
 static unsigned int mouseshape = XC_xterm;