X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=b013bca0464a1f850ce8a014a6876415990d70b7;hb=ba1e9daeef0d7e6e52a9889d8f7eb61d74480cf0;hp=fe2b9221fe4011e11cddf7a0f3977a7ecc01c2ad;hpb=fe2ba95b3d81127b98a5dc6fa0341a90beabd1a0;p=st.git

diff --git a/st.c b/st.c
index fe2b922..b013bca 100644
--- a/st.c
+++ b/st.c
@@ -240,7 +240,7 @@ typedef struct {
 		short lbearing;
 		short rbearing;
 		XFontSet set;
-	} font, bfont, ifont;
+	} font, bfont, ifont, ibfont;
 } DC;
 
 static void die(const char*, ...);
@@ -774,6 +774,13 @@ execsh(void) {
 	unsetenv("LINES");
 	unsetenv("TERMCAP");
 
+	signal(SIGCHLD, SIG_DFL);
+	signal(SIGHUP, SIG_DFL);
+	signal(SIGINT, SIG_DFL);
+	signal(SIGQUIT, SIG_DFL);
+	signal(SIGTERM, SIG_DFL);
+	signal(SIGALRM, SIG_DFL);
+
 	DEFAULT(envshell, SHELL);
 	putenv("TERM="TNAME);
 	args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
@@ -1716,6 +1723,8 @@ tputc(char *c) {
 		if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
 			sel.bx = -1;
 		switch(ascii) {
+		case '\0': /* padding character, do nothing */
+			break;
 		case '\t':
 			tputtab(1);
 			break;
@@ -1936,13 +1945,15 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
 }
 
 void
-initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
+initfonts(char *fontstr, char *bfontstr, char *ifontstr, char *ibfontstr) {
 	if((dc.font.set = xinitfont(fontstr)) == NULL)
 		die("Can't load font %s\n", fontstr);
 	if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
 		die("Can't load bfont %s\n", bfontstr);
 	if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
 		die("Can't load ifont %s\n", ifontstr);
+	if((dc.ibfont.set = xinitfont(ibfontstr)) == NULL)
+		die("Can't load ibfont %s\n", ibfontstr);
 
 	xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
 	    &dc.font.lbearing, &dc.font.rbearing);
@@ -1950,6 +1961,8 @@ initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
 	    &dc.bfont.lbearing, &dc.bfont.rbearing);
 	xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
 	    &dc.ifont.lbearing, &dc.ifont.rbearing);
+	xgetfontinfo(dc.ibfont.set, &dc.ibfont.ascent, &dc.ibfont.descent,
+	    &dc.ibfont.lbearing, &dc.ibfont.rbearing);
 }
 
 void
@@ -1957,14 +1970,14 @@ xinit(void) {
 	XSetWindowAttributes attrs;
 	Cursor cursor;
 	Window parent;
-	int sw, sh;
+	int sw, sh, major, minor;
 
 	if(!(xw.dpy = XOpenDisplay(NULL)))
 		die("Can't open display\n");
 	xw.scr = XDefaultScreen(xw.dpy);
 
 	/* font */
-	initfonts(FONT, BOLDFONT, ITALICFONT);
+	initfonts(FONT, BOLDFONT, ITALICFONT, ITALICBOLDFONT);
 
 	/* XXX: Assuming same size for bold font */
 	xw.cw = dc.font.rbearing - dc.font.lbearing;
@@ -2008,9 +2021,10 @@ xinit(void) {
 			CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
 			| CWColormap,
 			&attrs);
+	if(!XdbeQueryExtension(xw.dpy, &major, &minor))
+		die("Xdbe extension is not present\n");
 	xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
 
-
 	/* input methods */
 	xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
 	xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
@@ -2059,6 +2073,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
 	if(base.mode & ATTR_ITALIC)
 		fontset = dc.ifont.set;
+	if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
+		fontset = dc.ibfont.set;
 
 	XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
 	XSetForeground(xw.dpy, dc.gc, dc.col[fg]);