st: update to 0.6

3 files changed, 39 insertions, 24 deletions

diff --git a/st-custom/transparency.diff b/st-custom/0001-Add-transparency.patch
index 4e3c3e8..08d4b91 100644
--- a/st-custom/transparency.diff
+++ b/st-custom/0001-Add-transparency.patch
@@ -1,5 +1,16 @@
+From f4519f34fbdc1eaa2787396f76ce99743d8e2dfb 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
+
+---
+ config.def.h |  3 +++
+ config.mk    |  2 +-
+ st.c         | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 3 files changed, 57 insertions(+), 9 deletions(-)
+
 diff --git a/config.def.h b/config.def.h
-index bb5596e..0cd0af0 100644
+index e246e3c..1f8c524 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -96,6 +96,9 @@ static unsigned int defaultfg = 7;
@@ -13,7 +24,7 @@ index bb5596e..0cd0af0 100644
   * Colors used, when the specific fg == defaultfg. So in reverse mode this
   * will reverse too. Another logic would only make the simple feature too
 diff --git a/config.mk b/config.mk
-index 3026d87..827def2 100644
+index 67844dc..ce5753a 100644
 --- a/config.mk
 +++ b/config.mk
 @@ -14,7 +14,7 @@ X11LIB = /usr/X11R6/lib
@@ -26,26 +37,26 @@ index 3026d87..827def2 100644
         `pkg-config --libs freetype2`
  
 diff --git a/st.c b/st.c
-index 0204b2e..5a3bea9 100644
+index 64e2cec..11025b2 100644
 --- a/st.c
 +++ b/st.c
-@@ -62,6 +62,7 @@ char *argv0;
+@@ -60,6 +60,7 @@ char *argv0;
  #define XK_ANY_MOD    UINT_MAX
  #define XK_NO_MOD     0
  #define XK_SWITCH_MOD (1<<13)
 +#define OPAQUE 0xff
  
  /* macros */
- #define MIN(a, b)  ((a) < (b) ? (a) : (b))
-@@ -83,6 +84,7 @@ char *argv0;
- #define TRUERED(x)       (((x) & 0xff0000) >> 8)
- #define TRUEGREEN(x)     (((x) & 0xff00))
- #define TRUEBLUE(x)      (((x) & 0xff) << 8)
+ #define MIN(a, b)		((a) < (b) ? (a) : (b))
+@@ -84,6 +85,7 @@ char *argv0;
+ #define TRUERED(x)		(((x) & 0xff0000) >> 8)
+ #define TRUEGREEN(x)		(((x) & 0xff00))
+ #define TRUEBLUE(x)		(((x) & 0xff) << 8)
 +#define USE_ARGB (alpha != OPAQUE && opt_embed == NULL)
  
  
  enum glyph_attribute {
-@@ -255,6 +257,7 @@ typedef struct {
+@@ -266,6 +268,7 @@ typedef struct {
  	int w, h; /* window width and height */
  	int ch; /* char height */
  	int cw; /* char width  */
@@ -53,7 +64,7 @@ index 0204b2e..5a3bea9 100644
  	char state; /* focus, redraw, visible */
  	int cursor; /* cursor style */
  } XWindow;
-@@ -2887,8 +2890,7 @@ xresize(int col, int row) {
+@@ -3102,8 +3105,7 @@ xresize(int col, int row)
  	xw.th = MAX(1, row * xw.ch);
  
  	XFreePixmap(xw.dpy, xw.buf);
@@ -63,7 +74,7 @@ index 0204b2e..5a3bea9 100644
  	XftDrawChange(xw.draw, xw.buf);
  	xclear(0, 0, xw.w, xw.h);
  }
-@@ -2938,6 +2940,14 @@ xloadcols(void) {
+@@ -3157,6 +3159,14 @@ xloadcols(void)
  			else
  				die("Could not allocate color %d\n", i);
  		}
@@ -75,11 +86,11 @@ index 0204b2e..5a3bea9 100644
 +		dc.col[defaultbg].pixel |= alpha << 24; // 0xcc000000;
 +	}
 +
- 	loaded = true;
+ 	loaded = 1;
  }
  
-@@ -3182,7 +3192,38 @@ xinit(void) {
- 	if(!(xw.dpy = XOpenDisplay(NULL)))
+@@ -3415,7 +3425,38 @@ xinit(void)
+ 	if (!(xw.dpy = XOpenDisplay(NULL)))
  		die("Can't open display\n");
  	xw.scr = XDefaultScreen(xw.dpy);
 -	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
@@ -117,8 +128,8 @@ index 0204b2e..5a3bea9 100644
 +	}
  
  	/* font */
- 	if(!FcInit())
-@@ -3192,7 +3233,10 @@ xinit(void) {
+ 	if (!FcInit())
+@@ -3425,7 +3466,10 @@ xinit(void)
  	xloadfonts(usedfont, 0);
  
  	/* colors */
@@ -130,7 +141,7 @@ index 0204b2e..5a3bea9 100644
  	xloadcols();
  
  	/* adjust fixed window geometry */
-@@ -3215,16 +3259,17 @@ xinit(void) {
+@@ -3448,16 +3492,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,
@@ -152,3 +163,6 @@ index 0204b2e..5a3bea9 100644
  	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
  	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
  
+-- 
+2.4.5
+
diff --git a/st-custom/PKGBUILD b/st-custom/PKGBUILD
index 7ca63ff..7e2b10a 100644
--- a/st-custom/PKGBUILD
+++ b/st-custom/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=st-custom
 _pkgname=st
-pkgver=0.5.r229.gc035487
+pkgver=0.6.r13.gd032b61
 pkgrel=1
 pkgdesc='Simple virtual terminal emulator for X'
 url='http://git.suckless.org/st/'
@@ -10,11 +10,12 @@ arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
 depends=('libxft')
 makedepends=('ncurses' 'libxext' 'git')
-source=('git://git.suckless.org/st' 'config.h' 'st-terminal.desktop' 'transparency.diff')
+source=('git://git.suckless.org/st' 'config.h' 'st-terminal.desktop'
+        '0001-Add-transparency.patch')
 md5sums=('SKIP'
-         'fd9020a68f91031b9b8438d6b0d083f4'
+         'af42baee3a52e354a5b7a308047dde70'
          'bbe3714218145d39b6920961f27692e6'
-         '672fe6866133f10ab4d61d7f17fc6aca')
+         '71961029aa5cf2b9e01bc7bea7e5b757')
 
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
@@ -26,7 +27,7 @@ pkgver() {
 
 prepare() {
 	cd "${srcdir}/${_pkgname}"
-	patch < ../transparency.diff
+	patch < ../0001-Add-transparency.patch
 	ln -sf "${srcdir}/config.h" config.h
 }
 
diff --git a/st-custom/config.h b/st-custom/config.h
index 1b8ba9b..248a84f 100644
--- a/st-custom/config.h
+++ b/st-custom/config.h
@@ -30,7 +30,7 @@ static unsigned int doubleclicktimeout = 300;
 static unsigned int tripleclicktimeout = 600;
 
 /* alt screens */
-static bool allowaltscreen = true;
+static int allowaltscreen = 1;
 
 /* frames per second st should at maximum draw to the screen */
 static unsigned int xfps = 120;