removed XINERAMA from config.mk and fixed a segfault when st is started without a display. (thx Hiltjo Posthuma)
Aurélien Aptel aurelien.aptel@gmail.com
M
config.mk
→
config.mk
@@ -10,16 +10,12 @@
X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib -# Xinerama, comment if you don't want it -#XINERAMALIBS = -L${X11LIB} -lXinerama -#XINERAMAFLAGS = -DXINERAMA - # includes and libs INCS = -I. -I/usr/include -I${X11INC} -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} +LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +CPPFLAGS = -DVERSION=\"${VERSION}\" CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS}
M
st.c
→
st.c
@@ -1078,10 +1078,9 @@ }
void xinit(void) { - xw.dis = XOpenDisplay(NULL); + if(!(xw.dis = XOpenDisplay(NULL))) + die("Can't open display\n"); xw.scr = XDefaultScreen(xw.dis); - if(!xw.dis) - die("Can't open display\n"); /* font */ if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))