[hackers] [st] The style inquisition was here again. || Christoph Lohmann
changeset: 405:bde502880fc0
tag: tip
user: Christoph Lohmann <20h_AT_r-36.net>
date: Tue Nov 13 20:13:39 2012 +0100
files: config.def.h config.mk st.c
description:
The style inquisition was here again.
diff -r 587688afe038 -r bde502880fc0 config.def.h
--- a/config.def.h Tue Nov 13 20:05:02 2012 +0100
+++ b/config.def.h Tue Nov 13 20:13:39 2012 +0100
_AT_@ -131,7 +131,7 @@
{ 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, 0},
+ { 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 -r 587688afe038 -r bde502880fc0 config.mk
--- a/config.mk Tue Nov 13 20:05:02 2012 +0100
+++ b/config.mk Tue Nov 13 20:13:39 2012 +0100
_AT_@ -21,3 +21,4 @@
# compiler and linker
CC ?= cc
+
diff -r 587688afe038 -r bde502880fc0 st.c
--- a/st.c Tue Nov 13 20:05:02 2012 +0100
+++ b/st.c Tue Nov 13 20:13:39 2012 +0100
_AT_@ -2700,17 +2700,21 @@
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;
}
_AT_@ -2755,6 +2759,7 @@
memcpy(cp, xstr, len);
len = cp - buf + len;
}
+
ttywrite(buf, len);
if(IS_SET(MODE_ECHO))
techo(buf, len);
_AT_@ -2869,7 +2874,7 @@
opt_class = argv[i];
break;
case 'e':
- /* eat every remaining arguments */
+ /* eat all remaining arguments */
if(++i < argc)
opt_cmd = &argv[i];
goto run;
_AT_@ -2924,6 +2929,7 @@
ttynew();
selinit();
run();
+
return 0;
}
Received on Tue Nov 13 2012 - 20:15:41 CET
This archive was generated by hypermail 2.3.0
: Tue Nov 13 2012 - 20:24:08 CET