~petersanchez/st

7474a2fc3785eb1aad00f8cf2b50711bbe1fff0b — Christoph Lohmann 11 years ago 620e3bb
The style inquisition was here again.
3 files changed, 13 insertions(+), 6 deletions(-)

M config.def.h
M config.mk
M st.c
M config.def.h => config.def.h +1 -1
@@ 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,    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},

M config.mk => config.mk +1 -0
@@ 21,3 21,4 @@ LDFLAGS += -g ${LIBS}

# compiler and linker
CC ?= cc


M st.c => st.c +11 -5
@@ 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;
	}


@@ 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);


@@ 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;


@@ 2924,6 2929,7 @@ run:
	ttynew();
	selinit();
	run();

	return 0;
}