st: update patch for new version

3 files changed, 21 insertions, 19 deletions

diff --git a/st-custom/PKGBUILD b/st-custom/PKGBUILD
index b65dbad..81c0600 100644
--- a/st-custom/PKGBUILD
+++ b/st-custom/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=st-custom
 _pkgname=st
-pkgver=0.5.r194.g56abffb
+pkgver=0.5.r203.g89807ed
 pkgrel=1
 pkgdesc='Simple virtual terminal emulator for X'
 url='http://git.suckless.org/st/'
@@ -12,9 +12,9 @@ depends=('libxft')
 makedepends=('ncurses' 'libxext' 'git')
 source=('git://git.suckless.org/st' 'config.h' 'st-terminal.desktop' 'transparency.diff')
 md5sums=('SKIP'
-         'dbb887ab1c18fd059db9db1f2ba3668b'
+         'fd9020a68f91031b9b8438d6b0d083f4'
          'bbe3714218145d39b6920961f27692e6'
-         '97e7829670ad6aff4e57e611390c753a')
+         '672fe6866133f10ab4d61d7f17fc6aca')
 
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
diff --git a/st-custom/config.h b/st-custom/config.h
index b99292c..1b8ba9b 100644
--- a/st-custom/config.h
+++ b/st-custom/config.h
@@ -9,6 +9,7 @@ static char font[] = "monospace:size=14:antialias=true:autohint=true";
 static int borderpx = 2;
 static char shell[] = "/bin/sh";
 static char *utmp = NULL;
+static char stty_args[] = "stty raw -echo -iexten echonl";
 
 /* identification sequence returned in DA and DECID */
 static char vtiden[] = "\033[?6c";
diff --git a/st-custom/transparency.diff b/st-custom/transparency.diff
index b0cbf49..4e3c3e8 100644
--- a/st-custom/transparency.diff
+++ b/st-custom/transparency.diff
@@ -1,8 +1,8 @@
 diff --git a/config.def.h b/config.def.h
-index 56bae2d..0b73d9b 100644
+index bb5596e..0cd0af0 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -90,6 +90,9 @@ static unsigned int defaultfg = 7;
+@@ -96,6 +96,9 @@ static unsigned int defaultfg = 7;
  static unsigned int defaultbg = 0;
  static unsigned int defaultcs = 256;
  
@@ -13,7 +13,7 @@ index 56bae2d..0b73d9b 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 7ae510e..83cdaf2 100644
+index 3026d87..827def2 100644
 --- a/config.mk
 +++ b/config.mk
 @@ -14,7 +14,7 @@ X11LIB = /usr/X11R6/lib
@@ -26,7 +26,7 @@ index 7ae510e..83cdaf2 100644
         `pkg-config --libs freetype2`
  
 diff --git a/st.c b/st.c
-index aa4185c..b21c0c7 100644
+index 0204b2e..5a3bea9 100644
 --- a/st.c
 +++ b/st.c
 @@ -62,6 +62,7 @@ char *argv0;
@@ -45,15 +45,15 @@ index aa4185c..b21c0c7 100644
  
  
  enum glyph_attribute {
-@@ -256,6 +258,7 @@ typedef struct {
+@@ -255,6 +257,7 @@ typedef struct {
  	int w, h; /* window width and height */
  	int ch; /* char height */
  	int cw; /* char width  */
 +	int depth; /* bit depth */
  	char state; /* focus, redraw, visible */
+ 	int cursor; /* cursor style */
  } XWindow;
- 
-@@ -2824,8 +2827,7 @@ xresize(int col, int row) {
+@@ -2887,8 +2890,7 @@ xresize(int col, int row) {
  	xw.th = MAX(1, row * xw.ch);
  
  	XFreePixmap(xw.dpy, xw.buf);
@@ -63,10 +63,11 @@ index aa4185c..b21c0c7 100644
  	XftDrawChange(xw.draw, xw.buf);
  	xclear(0, 0, xw.w, xw.h);
  }
-@@ -2856,6 +2858,13 @@ xloadcols(void) {
+@@ -2938,6 +2940,14 @@ xloadcols(void) {
+ 			else
+ 				die("Could not allocate color %d\n", i);
  		}
- 	}
- 
++
 +	/* set alpha value of bg color */
 +	if (USE_ARGB) {
 +		dc.col[defaultbg].color.alpha = (0xffff * alpha) / OPAQUE; //0xcccc;
@@ -74,10 +75,10 @@ index aa4185c..b21c0c7 100644
 +		dc.col[defaultbg].pixel |= alpha << 24; // 0xcc000000;
 +	}
 +
- 	/* load colors [16-231] ; same colors as xterm */
- 	for(i = 16; i < 6*6*6+16; i++) {
- 		color.red   = sixd_to_16bit( ((i-16)/36)%6 );
-@@ -3152,7 +3161,38 @@ xinit(void) {
+ 	loaded = true;
+ }
+ 
+@@ -3182,7 +3192,38 @@ xinit(void) {
  	if(!(xw.dpy = XOpenDisplay(NULL)))
  		die("Can't open display\n");
  	xw.scr = XDefaultScreen(xw.dpy);
@@ -117,7 +118,7 @@ index aa4185c..b21c0c7 100644
  
  	/* font */
  	if(!FcInit())
-@@ -3162,7 +3202,10 @@ xinit(void) {
+@@ -3192,7 +3233,10 @@ xinit(void) {
  	xloadfonts(usedfont, 0);
  
  	/* colors */
@@ -129,7 +130,7 @@ index aa4185c..b21c0c7 100644
  	xloadcols();
  
  	/* adjust fixed window geometry */
-@@ -3185,16 +3228,17 @@ xinit(void) {
+@@ -3215,16 +3259,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,