From: pancake Date: Mon, 30 Aug 2010 21:49:15 +0000 (+0200) Subject: fix build X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=596bb133a55a6aba13b55795a9a38e29fcf1b38b;p=st.git fix build use config.def.h mechanism add SHELL in config.h --- diff --git a/Makefile b/Makefile index 2fb13ae..5267411 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,15 @@ OBJ = ${SRC:.c=.o} all: options st -options: +options: options @echo st build options: @echo "CFLAGS = ${CFLAGS}" @echo "LDFLAGS = ${LDFLAGS}" @echo "CC = ${CC}" +config.h: + cp config.def.h config.h + .c.o: @echo CC $< @${CC} -c ${CFLAGS} $< diff --git a/config.h b/config.def.h similarity index 89% rename from config.h rename to config.def.h index 8c37b16..9506bc6 100644 --- a/config.h +++ b/config.def.h @@ -3,6 +3,7 @@ #define FONT "6x13" #define BOLDFONT "6x13bold" #define BORDER 2 +#define SHELL "/bin/sh" /* Terminal colors */ static const char *colorname[] = { @@ -33,11 +34,11 @@ static const char *colorname[] = { /* special keys */ static Key key[] = { { XK_BackSpace, "\177" }, - { XK_Delete, "\033[3~" }, - { XK_Home, "\033[1~" }, - { XK_End, "\033[4~" }, - { XK_Prior, "\033[5~" }, - { XK_Next, "\033[6~" }, + { XK_Delete, "\033[3~" }, + { XK_Home, "\033[1~" }, + { XK_End, "\033[4~" }, + { XK_Prior, "\033[5~" }, + { XK_Next, "\033[6~" }, { XK_F1, "\033OP" }, { XK_F2, "\033OQ" }, { XK_F3, "\033OR" }, diff --git a/st.c b/st.c index 864dfc7..0b21404 100644 --- a/st.c +++ b/st.c @@ -213,10 +213,10 @@ static inline int selected(int x, int y) { if ((seley==y && selby==y)) { int bx = MIN(selbx, selex); int ex = MAX(selbx, selex); - return if(x>=bx && x<=ex) + return (x>=bx && x<=ex); } return (((y>sb[1] && y=sb[0] && (x<=se[0] || sb[1]!=se[1]))) + (y==sb[1] && x>=sb[0] && (x<=se[0] || sb[1]!=se[1]))); } static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) { @@ -331,7 +331,7 @@ die(const char *errstr, ...) { void execsh(void) { char *args[3] = {getenv("SHELL"), "-i", NULL}; - DEFAULT(args[0], "/bin/sh"); /* if getenv() failed */ + DEFAULT(args[0], SHELL); /* if getenv() failed */ putenv("TERM=" TNAME); execvp(args[0], args); }