tThe style inquisition was here again. - st - [fork] customized build of st, th… | |
git clone git://src.adamsgaard.dk/st | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 7474a2fc3785eb1aad00f8cf2b50711bbe1fff0b | |
parent 620e3bb39ebe617b69b5cb1323b4f47c2f699527 | |
Author: Christoph Lohmann <[email protected]> | |
Date: Tue, 13 Nov 2012 20:13:39 +0100 | |
The style inquisition was here again. | |
Diffstat: | |
M config.def.h | 2 +- | |
M config.mk | 1 + | |
M st.c | 16 +++++++++++----- | |
3 files changed, 13 insertions(+), 6 deletions(-) | |
--- | |
diff --git a/config.def.h b/config.def.h | |
t@@ -131,7 +131,7 @@ static Key key[] = { | |
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0, 0}, | |
{ XK_Down, ControlMask, "\033[1;5B", 0, 0, 0}, | |
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0, 0}, | |
- { XK_Left, XK_NO_MOD, "\033[D", 0, -1, … | |
+ { XK_Left, XK_NO_MOD, "\033[D", 0, -1, 0}, | |
{ XK_Left, XK_NO_MOD, "\033OD", 0, +1, 0}, | |
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0}, | |
{ XK_Left, ControlMask, "\033[1;5D", 0, 0, 0}, | |
diff --git a/config.mk b/config.mk | |
t@@ -21,3 +21,4 @@ LDFLAGS += -g ${LIBS} | |
# compiler and linker | |
CC ?= cc | |
+ | |
diff --git a/st.c b/st.c | |
t@@ -2700,17 +2700,21 @@ kmap(KeySym k, uint state) { | |
if(kp->k != k) | |
continue; | |
if((state & mask) != mask && | |
- (mask == XK_NO_MOD && state)) | |
+ (mask == XK_NO_MOD && state)) { | |
continue; | |
+ } | |
if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) || | |
- (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) | |
+ (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) { | |
continue; | |
+ } | |
if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) || | |
- (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) | |
+ (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))… | |
continue; | |
+ } | |
if((kp->crlf < 0 && IS_SET(MODE_CRLF)) || | |
- (kp->crlf > 0 && !IS_SET(MODE_CRLF))) | |
+ (kp->crlf > 0 && !IS_SET(MODE_CRLF))) { | |
continue; | |
+ } | |
return kp->s; | |
} | |
t@@ -2755,6 +2759,7 @@ kpress(XEvent *ev) { | |
memcpy(cp, xstr, len); | |
len = cp - buf + len; | |
} | |
+ | |
ttywrite(buf, len); | |
if(IS_SET(MODE_ECHO)) | |
techo(buf, len); | |
t@@ -2869,7 +2874,7 @@ main(int argc, char *argv[]) { | |
opt_class = argv[i]; | |
break; | |
case 'e': | |
- /* eat every remaining arguments */ | |
+ /* eat all remaining arguments */ | |
if(++i < argc) | |
opt_cmd = &argv[i]; | |
goto run; | |
t@@ -2924,6 +2929,7 @@ run: | |
ttynew(); | |
selinit(); | |
run(); | |
+ | |
return 0; | |
} | |