st

suckless terminal - with my changes
git clone https://pi.duncano.de/git/st.git
Log | Files | Refs | README | LICENSE

commit 596bb133a55a6aba13b55795a9a38e29fcf1b38b
parent 0ba53e48c76a2a2668dfa270cfd0227461c3a91b
Author: pancake <pancake@nopcode.org>
Date:   Mon, 30 Aug 2010 23:49:15 +0200

fix build

use config.def.h mechanism
add SHELL in config.h
Diffstat:
Makefile | 5++++-
config.def.h | 90+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
config.h | 89-------------------------------------------------------------------------------
st.c | 6+++---
4 files changed, 97 insertions(+), 93 deletions(-)

diff --git 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.def.h b/config.def.h @@ -0,0 +1,90 @@ +#define TAB 8 +#define TNAME "st-256color" +#define FONT "6x13" +#define BOLDFONT "6x13bold" +#define BORDER 2 +#define SHELL "/bin/sh" + +/* Terminal colors */ +static const char *colorname[] = { + "black", + "#CC0000", + "#4E9A06", + "#C4A000", + "#3465A4", + "#75507B", + "#06989A", + "#888a85", + "#555753", + "#EF2929", + "#8AE234", + "#FCE94F", + "#729FCF", + "#AD7FA8", + "#34E2E2", + "#EEEEEC" +}; + +/* Default colors (colorname index) */ +/* foreground, background, cursor, visual bell */ +#define DefaultFG 7 +#define DefaultBG 0 +#define DefaultCS 1 + +/* 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_F1, "\033OP" }, + { XK_F2, "\033OQ" }, + { XK_F3, "\033OR" }, + { XK_F4, "\033OS" }, + { XK_F5, "\033[15~" }, + { XK_F6, "\033[17~" }, + { XK_F7, "\033[18~" }, + { XK_F8, "\033[19~" }, + { XK_F9, "\033[20~" }, + { XK_F10, "\033[21~" }, + { XK_F11, "\033[23~" }, + { XK_F12, "\033[24~" }, +}; + +static char gfx[] = { + ['}'] = 'f', + ['.'] = 'v', + [','] = '<', + ['+'] = '>', + ['-'] = '^', + ['h'] = '#', + ['~'] = 'o', + ['a'] = ':', + ['f'] = '\\', + ['`'] = '+', + ['z'] = '>', + ['{'] = '*', + ['q'] = '-', + ['i'] = '#', + ['n'] = '+', + ['y'] = '<', + ['m'] = '+', + ['j'] = '+', + ['|'] = '!', + ['g'] = '#', + ['o'] = '~', + ['p'] = '-', + ['r'] = '-', + ['s'] = '_', + ['0'] = '#', + ['w'] = '+', + ['u'] = '+', + ['t'] = '+', + ['v'] = '+', + ['l'] = '+', + ['k'] = '+', + ['x'] = '|', + [255] = 0, +}; diff --git a/config.h b/config.h @@ -1,89 +0,0 @@ -#define TAB 8 -#define TNAME "st-256color" -#define FONT "6x13" -#define BOLDFONT "6x13bold" -#define BORDER 2 - -/* Terminal colors */ -static const char *colorname[] = { - "black", - "#CC0000", - "#4E9A06", - "#C4A000", - "#3465A4", - "#75507B", - "#06989A", - "#888a85", - "#555753", - "#EF2929", - "#8AE234", - "#FCE94F", - "#729FCF", - "#AD7FA8", - "#34E2E2", - "#EEEEEC" -}; - -/* Default colors (colorname index) */ -/* foreground, background, cursor, visual bell */ -#define DefaultFG 7 -#define DefaultBG 0 -#define DefaultCS 1 - -/* 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_F1, "\033OP" }, - { XK_F2, "\033OQ" }, - { XK_F3, "\033OR" }, - { XK_F4, "\033OS" }, - { XK_F5, "\033[15~" }, - { XK_F6, "\033[17~" }, - { XK_F7, "\033[18~" }, - { XK_F8, "\033[19~" }, - { XK_F9, "\033[20~" }, - { XK_F10, "\033[21~" }, - { XK_F11, "\033[23~" }, - { XK_F12, "\033[24~" }, -}; - -static char gfx[] = { - ['}'] = 'f', - ['.'] = 'v', - [','] = '<', - ['+'] = '>', - ['-'] = '^', - ['h'] = '#', - ['~'] = 'o', - ['a'] = ':', - ['f'] = '\\', - ['`'] = '+', - ['z'] = '>', - ['{'] = '*', - ['q'] = '-', - ['i'] = '#', - ['n'] = '+', - ['y'] = '<', - ['m'] = '+', - ['j'] = '+', - ['|'] = '!', - ['g'] = '#', - ['o'] = '~', - ['p'] = '-', - ['r'] = '-', - ['s'] = '_', - ['0'] = '#', - ['w'] = '+', - ['u'] = '+', - ['t'] = '+', - ['v'] = '+', - ['l'] = '+', - ['k'] = '+', - ['x'] = '|', - [255] = 0, -}; diff --git 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<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 @@ 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); }