diff options
| author | Christoph Lohmann <20h@r-36.net> | 2012-11-15 16:26:50 +0100 |
|---|---|---|
| committer | Christoph Lohmann <20h@r-36.net> | 2012-11-15 16:26:50 +0100 |
| commit | d5640c772998de7bccd76c3f8e934fa685cb2bb4 (patch) | |
| tree | c367fc895dbad1d5baa3be94c6c23d0b59993bd9 | |
| parent | 801ea034b652025dc22d26f6e1b802de932346da (diff) | |
| download | st-d5640c772998de7bccd76c3f8e934fa685cb2bb4.tar.gz st-d5640c772998de7bccd76c3f8e934fa685cb2bb4.tar.bz2 st-d5640c772998de7bccd76c3f8e934fa685cb2bb4.zip | |
Fixing the return and keypad enter sent characters. Terminals produce \r. And
some minor style changes.
| -rw-r--r-- | config.def.h | 6 | ||||
| -rw-r--r-- | st.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/config.def.h b/config.def.h index e02bc29..da1191c 100644 --- 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}, @@ -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 |