# st

Unnamed repository; edit this file 'description' to name the repository.

| Log | Files | Refs | README | LICENSE

    commit d5640c772998de7bccd76c3f8e934fa685cb2bb4
    parent 801ea034b652025dc22d26f6e1b802de932346da
    Author: Christoph Lohmann <20h@r-36.net>
    Date:   Thu, 15 Nov 2012 16:26:50 +0100

    Fixing the return and keypad enter sent characters. Terminals produce \r. And

    some minor style changes.
    Diffstat:
    Mconfig.def.h | 6+++---
    Mst.c | 10+++++++---

    2 files changed, 10 insertions(+), 6 deletions(-)
    diff --git a/config.def.h b/config.def.h
    @@ -109,7 +109,7 @@ static Key key[] = {
     	{ XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +1,    0,    0},
     	{ XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +1,    0,    0},
     	{ XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +1,    0,    0},
    -	{ XK_KP_Enter,      XK_ANY_MOD,     "\n",           -1,    0,   -1},
    +	{ XK_KP_Enter,      XK_ANY_MOD,     "\r",           -1,    0,   -1},
     	{ XK_KP_Enter,      XK_ANY_MOD,     "\r\n",         -1,    0,   +1},
     	{ XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +1,    0,    0},
     	{ XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +1,    0,    0},
    @@ -146,9 +146,9 @@ static Key key[] = {
     	{ XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1,    0},
     	{ XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1,    0},
     	{ XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0,    0},
    -	{ XK_Return,        Mod1Mask,       "\033\n",        0,    0,   -1},
    +	{ XK_Return,        Mod1Mask,       "\033\r",        0,    0,   -1},
     	{ XK_Return,        Mod1Mask,       "\033\r\n",      0,    0,   +1},
    -	{ XK_Return,        XK_ANY_MOD,     "\n",            0,    0,   -1},
    +	{ XK_Return,        XK_ANY_MOD,     "\r",            0,    0,   -1},
     	{ XK_Return,        XK_ANY_MOD,     "\r\n",          0,    0,   +1},
     	{ XK_Insert,        ShiftMask,      "\033[2;2~",     0,    0,    0},
     	{ XK_Insert,        XK_ANY_MOD,     "\033[2~",       0,    0,    0},
    diff --git a/st.c b/st.c
    @@ -2100,15 +2100,19 @@ tputc(char *c, int len) {
     		sel.bx = -1;
     	if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
     		tnewline(1); /* always go to first col */
    -	if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col)
    +
    +	if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
     		memmove(&term.line[term.c.y][term.c.x+1],
     			&term.line[term.c.y][term.c.x],
     			(term.col - term.c.x - 1) * sizeof(Glyph));
    +	}
    +
     	tsetchar(c, &term.c.attr, term.c.x, term.c.y);
    -	if(term.c.x+1 < term.col)
    +	if(term.c.x+1 < term.col) {
     		tmoveto(term.c.x+1, term.c.y);
    -	else
    +	} else {
     		term.c.state |= CURSOR_WRAPNEXT;
    +	}
     }

     int