fix build use config.def.h mechanism add SHELL in config.h
pancake pancake@nopcode.org
3 files changed,
13 insertions(+),
9 deletions(-)
M
config.h
→
config.def.h
@@ -3,6 +3,7 @@ #define TNAME "st-256color"
#define FONT "6x13" #define BOLDFONT "6x13bold" #define BORDER 2 +#define SHELL "/bin/sh" /* Terminal colors */ static const char *colorname[] = {@@ -33,11 +34,11 @@
/* 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" },
M
st.c
→
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<se[1]) || (y==se[1] && x<=se[0])) || \ - (y==sb[1] && x>=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 @@
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); }