aclindsa/st
1
0
Fork 0
Code Releases Activity

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

Browse Source 
some minor style changes.
This commit is contained in:
Christoph Lohmann
2012-11-15 16:26:50 +01:00
parent 801ea034b6
commit d5640c7729
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.def.h
View File

@@ -109,7 +109,7 @@ static Key key[] = {
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +1, 0, 0}, { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +1, 0, 0},
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +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, "\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_Enter, XK_ANY_MOD, "\r\n", -1, 0, +1},
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +1, 0, 0}, { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +1, 0, 0},
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +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, "\033[C", 0, -1, 0},
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0}, { XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0, 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, 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_Return, XK_ANY_MOD, "\r\n", 0, 0, +1},
{ XK_Insert, ShiftMask, "\033[2;2~", 0, 0, 0}, { XK_Insert, ShiftMask, "\033[2;2~", 0, 0, 0},
{ XK_Insert, XK_ANY_MOD, "\033[2~", 0, 0, 0}, { XK_Insert, XK_ANY_MOD, "\033[2~", 0, 0, 0},

10
st.c
View File

@@ -2100,15 +2100,19 @@ tputc(char *c, int len) {
sel.bx = -1; sel.bx = -1;
if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT) if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
tnewline(1); /* always go to first col */ 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], memmove(&term.line[term.c.y][term.c.x+1],
&term.line[term.c.y][term.c.x], &term.line[term.c.y][term.c.x],
(term.col - term.c.x - 1) * sizeof(Glyph)); (term.col - term.c.x - 1) * sizeof(Glyph));
}
tsetchar(c, &term.c.attr, term.c.x, term.c.y); 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); tmoveto(term.c.x+1, term.c.y);
else } else {
term.c.state |= CURSOR_WRAPNEXT; term.c.state |= CURSOR_WRAPNEXT;
}
} }
int int