kske
/
st
1
Fork 0
Code Issues Pull Requests Releases Activity

fix build 

use config.def.h mechanism
add SHELL in config.h
This commit is contained in:
pancake 2010-08-30 23:49:15 +02:00
parent 0ba53e48c7
commit 596bb133a5
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -8,12 +8,15 @@ OBJ = ${SRC:.c=.o}
all: options st all: options st
options: options: options
@echo st build options: @echo st build options:
@echo "CFLAGS = ${CFLAGS}" @echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}" @echo "LDFLAGS = ${LDFLAGS}"
@echo "CC = ${CC}" @echo "CC = ${CC}"
config.h:
cp config.def.h config.h
.c.o: .c.o:
@echo CC $< @echo CC $<
@${CC} -c ${CFLAGS} $< @${CC} -c ${CFLAGS} $<

11
config.h → config.def.h
View File

@ -3,6 +3,7 @@
#define FONT "6x13" #define FONT "6x13"
#define BOLDFONT "6x13bold" #define BOLDFONT "6x13bold"
#define BORDER 2 #define BORDER 2
#define SHELL "/bin/sh"
/* Terminal colors */ /* Terminal colors */
static const char *colorname[] = { static const char *colorname[] = {
@ -33,11 +34,11 @@ static const char *colorname[] = {
/* special keys */ /* special keys */
static Key key[] = { static Key key[] = {
{ XK_BackSpace, "\177" }, { XK_BackSpace, "\177" },
{ XK_Delete, "\033[3~" }, { XK_Delete, "\033[3~" },
{ XK_Home, "\033[1~" }, { XK_Home, "\033[1~" },
{ XK_End, "\033[4~" }, { XK_End, "\033[4~" },
{ XK_Prior, "\033[5~" }, { XK_Prior, "\033[5~" },
{ XK_Next, "\033[6~" }, { XK_Next, "\033[6~" },
{ XK_F1, "\033OP" }, { XK_F1, "\033OP" },
{ XK_F2, "\033OQ" }, { XK_F2, "\033OQ" },
{ XK_F3, "\033OR" }, { XK_F3, "\033OR" },

6
st.c
View File

@ -213,10 +213,10 @@ static inline int selected(int x, int y) {
if ((seley==y && selby==y)) { if ((seley==y && selby==y)) {
int bx = MIN(selbx, selex); int bx = MIN(selbx, selex);
int ex = MAX(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])) || \ 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) { static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@ -331,7 +331,7 @@ die(const char *errstr, ...) {
void void
execsh(void) { execsh(void) {
char *args[3] = {getenv("SHELL"), "-i", NULL}; 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); putenv("TERM=" TNAME);
execvp(args[0], args); execvp(args[0], args);
} }