Move CRLF input processing into ttywrite
This also allows us to remove the crlf field from the Key struct, since the only difference it made was converting "\r" to "\r\n" (which is now done automatically in ttywrite). In addition, MODE_CRLF is no longer referenced from x.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
This commit is contained in:
Devin J. Pohly
parent
52d6fb1ab1
commit
33201ac65f
423
config.def.h
423
config.def.h
|
|
@ -229,219 +229,216 @@ static uint forceselmod = ShiftMask;
|
||||||
* world. Please decide about changes wisely.
|
* world. Please decide about changes wisely.
|
||||||
*/
|
*/
|
||||||
static Key key[] = {
|
static Key key[] = {
|
||||||
/* keysym mask string appkey appcursor crlf */
|
/* keysym mask string appkey appcursor */
|
||||||
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1, 0},
|
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
|
||||||
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
|
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||||
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
|
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||||
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
|
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0, 0},
|
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
|
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
|
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0, 0},
|
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
|
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
|
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0, 0},
|
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
|
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
|
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0, 0},
|
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
|
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
|
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||||
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
|
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||||
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
|
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||||
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0, 0},
|
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
|
||||||
{ XK_KP_End, ControlMask, "\033[J", -1, 0, 0},
|
{ XK_KP_End, ControlMask, "\033[J", -1, 0},
|
||||||
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0, 0},
|
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
|
||||||
{ XK_KP_End, ShiftMask, "\033[K", -1, 0, 0},
|
{ XK_KP_End, ShiftMask, "\033[K", -1, 0},
|
||||||
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0, 0},
|
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||||
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
|
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||||
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
|
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||||
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
|
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||||
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
|
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0, 0},
|
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0, 0},
|
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
|
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||||
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
|
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||||
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
|
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||||
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0, 0},
|
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0},
|
||||||
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
|
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0, 0},
|
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
|
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||||
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
|
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||||
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
|
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||||
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
|
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
|
||||||
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
|
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
|
||||||
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
|
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
|
||||||
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0, -1},
|
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
|
||||||
{ XK_KP_Enter, XK_ANY_MOD, "\r\n", -1, 0, +1},
|
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
|
||||||
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0, 0},
|
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
|
||||||
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0, 0},
|
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
|
||||||
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0, 0},
|
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
|
||||||
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0, 0},
|
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
|
||||||
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0, 0},
|
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
|
||||||
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0, 0},
|
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
|
||||||
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0, 0},
|
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
|
||||||
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0, 0},
|
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
|
||||||
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0, 0},
|
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
|
||||||
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0, 0},
|
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
|
||||||
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0, 0},
|
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
|
||||||
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0, 0},
|
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
|
||||||
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0, 0},
|
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0},
|
||||||
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0, 0},
|
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
|
||||||
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0, 0},
|
{ XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0},
|
||||||
{ XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0, 0},
|
{ XK_Up, ControlMask, "\033[1;5A", 0, 0},
|
||||||
{ XK_Up, ControlMask, "\033[1;5A", 0, 0, 0},
|
{ XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0},
|
||||||
{ XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0, 0},
|
{ XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0},
|
||||||
{ XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0, 0},
|
{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0},
|
||||||
{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0, 0},
|
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||||
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
|
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||||
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
|
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0},
|
||||||
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0, 0},
|
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
|
||||||
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0, 0},
|
{ XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0},
|
||||||
{ XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0, 0},
|
{ XK_Down, ControlMask, "\033[1;5B", 0, 0},
|
||||||
{ XK_Down, ControlMask, "\033[1;5B", 0, 0, 0},
|
{ XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0},
|
||||||
{ XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0, 0},
|
{ XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0},
|
||||||
{ XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0, 0},
|
{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0},
|
||||||
{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0, 0},
|
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||||
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
|
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||||
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
|
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0},
|
||||||
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0},
|
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
|
||||||
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0, 0},
|
{ XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0},
|
||||||
{ XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0, 0},
|
{ XK_Left, ControlMask, "\033[1;5D", 0, 0},
|
||||||
{ XK_Left, ControlMask, "\033[1;5D", 0, 0, 0},
|
{ XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0},
|
||||||
{ XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0, 0},
|
{ XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0},
|
||||||
{ XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0, 0},
|
{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0},
|
||||||
{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0, 0},
|
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||||
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
|
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||||
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
|
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0},
|
||||||
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0, 0},
|
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
|
||||||
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0, 0},
|
{ XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0},
|
||||||
{ XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0, 0},
|
{ XK_Right, ControlMask, "\033[1;5C", 0, 0},
|
||||||
{ XK_Right, ControlMask, "\033[1;5C", 0, 0, 0},
|
{ XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0},
|
||||||
{ XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0, 0},
|
{ XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0},
|
||||||
{ XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0, 0},
|
{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0},
|
||||||
{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0, 0},
|
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||||
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
|
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||||
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
|
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
|
||||||
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0, 0},
|
{ XK_Return, Mod1Mask, "\033\r", 0, 0},
|
||||||
{ XK_Return, Mod1Mask, "\033\r", 0, 0, -1},
|
{ XK_Return, XK_ANY_MOD, "\r", 0, 0},
|
||||||
{ XK_Return, Mod1Mask, "\033\r\n", 0, 0, +1},
|
{ XK_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
{ XK_Return, XK_ANY_MOD, "\r", 0, 0, -1},
|
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
{ XK_Return, XK_ANY_MOD, "\r\n", 0, 0, +1},
|
{ XK_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
{ XK_Insert, ShiftMask, "\033[4l", -1, 0, 0},
|
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||||
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
|
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||||
{ XK_Insert, ControlMask, "\033[L", -1, 0, 0},
|
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||||
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
|
{ XK_Delete, ControlMask, "\033[M", -1, 0},
|
||||||
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
|
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
|
{ XK_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
{ XK_Delete, ControlMask, "\033[M", -1, 0, 0},
|
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||||
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
|
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||||
{ XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
|
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||||
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
|
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
|
||||||
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
|
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
|
||||||
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
|
{ XK_Home, ShiftMask, "\033[2J", 0, -1},
|
||||||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
|
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0},
|
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||||
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
|
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||||
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
|
{ XK_End, ControlMask, "\033[J", -1, 0},
|
||||||
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
|
{ XK_End, ControlMask, "\033[1;5F", +1, 0},
|
||||||
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
|
{ XK_End, ShiftMask, "\033[K", -1, 0},
|
||||||
{ XK_End, ControlMask, "\033[J", -1, 0, 0},
|
{ XK_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||||
{ XK_End, ControlMask, "\033[1;5F", +1, 0, 0},
|
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||||
{ XK_End, ShiftMask, "\033[K", -1, 0, 0},
|
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0},
|
||||||
{ XK_End, ShiftMask, "\033[1;2F", +1, 0, 0},
|
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||||
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
|
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||||
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0, 0},
|
{ XK_Next, ControlMask, "\033[6;5~", 0, 0},
|
||||||
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
|
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||||
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
|
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||||
{ XK_Next, ControlMask, "\033[6;5~", 0, 0, 0},
|
{ XK_F1, XK_NO_MOD, "\033OP" , 0, 0},
|
||||||
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
|
{ XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
|
||||||
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
|
{ XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
|
||||||
{ XK_F1, XK_NO_MOD, "\033OP" , 0, 0, 0},
|
{ XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
|
||||||
{ XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0, 0},
|
{ XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
|
||||||
{ XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0, 0},
|
{ XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
|
||||||
{ XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0, 0},
|
{ XK_F2, XK_NO_MOD, "\033OQ" , 0, 0},
|
||||||
{ XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0, 0},
|
{ XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
|
||||||
{ XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0, 0},
|
{ XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
|
||||||
{ XK_F2, XK_NO_MOD, "\033OQ" , 0, 0, 0},
|
{ XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
|
||||||
{ XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0, 0},
|
{ XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
|
||||||
{ XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0, 0},
|
{ XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
|
||||||
{ XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0, 0},
|
{ XK_F3, XK_NO_MOD, "\033OR" , 0, 0},
|
||||||
{ XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0, 0},
|
{ XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
|
||||||
{ XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0, 0},
|
{ XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
|
||||||
{ XK_F3, XK_NO_MOD, "\033OR" , 0, 0, 0},
|
{ XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
|
||||||
{ XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0, 0},
|
{ XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
|
||||||
{ XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0, 0},
|
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
|
||||||
{ XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0, 0},
|
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0},
|
||||||
{ XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0, 0},
|
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
|
||||||
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0},
|
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
|
||||||
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0},
|
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
|
||||||
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0},
|
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
|
||||||
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0, 0},
|
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
|
||||||
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0},
|
{ XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
|
||||||
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0},
|
{ XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
|
||||||
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0},
|
{ XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
|
||||||
{ XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0, 0},
|
{ XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
|
||||||
{ XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0, 0},
|
{ XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
|
||||||
{ XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0, 0},
|
{ XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
|
||||||
{ XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0, 0},
|
{ XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
|
||||||
{ XK_F6, XK_NO_MOD, "\033[17~", 0, 0, 0},
|
{ XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
|
||||||
{ XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0, 0},
|
{ XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
|
||||||
{ XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0, 0},
|
{ XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
|
||||||
{ XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0, 0},
|
{ XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
|
||||||
{ XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0, 0},
|
{ XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
|
||||||
{ XK_F7, XK_NO_MOD, "\033[18~", 0, 0, 0},
|
{ XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
|
||||||
{ XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0, 0},
|
{ XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
|
||||||
{ XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0, 0},
|
{ XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
|
||||||
{ XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0, 0},
|
{ XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
|
||||||
{ XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0, 0},
|
{ XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
|
||||||
{ XK_F8, XK_NO_MOD, "\033[19~", 0, 0, 0},
|
{ XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
|
||||||
{ XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0, 0},
|
{ XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
|
||||||
{ XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0, 0},
|
{ XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
|
||||||
{ XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0, 0},
|
{ XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
|
||||||
{ XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0, 0},
|
{ XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
|
||||||
{ XK_F9, XK_NO_MOD, "\033[20~", 0, 0, 0},
|
{ XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
|
||||||
{ XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0, 0},
|
{ XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
|
||||||
{ XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0, 0},
|
{ XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
|
||||||
{ XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0, 0},
|
{ XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
|
||||||
{ XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0, 0},
|
{ XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
|
||||||
{ XK_F10, XK_NO_MOD, "\033[21~", 0, 0, 0},
|
{ XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
|
||||||
{ XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0, 0},
|
{ XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
|
||||||
{ XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0, 0},
|
{ XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
|
||||||
{ XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0, 0},
|
{ XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
|
||||||
{ XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0, 0},
|
{ XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
|
||||||
{ XK_F11, XK_NO_MOD, "\033[23~", 0, 0, 0},
|
{ XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
|
||||||
{ XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0, 0},
|
{ XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
|
||||||
{ XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0, 0},
|
{ XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
|
||||||
{ XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0, 0},
|
{ XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
|
||||||
{ XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0, 0},
|
{ XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
|
||||||
{ XK_F12, XK_NO_MOD, "\033[24~", 0, 0, 0},
|
{ XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
|
||||||
{ XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0, 0},
|
{ XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
|
||||||
{ XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0, 0},
|
{ XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
|
||||||
{ XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0, 0},
|
{ XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
|
||||||
{ XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0, 0},
|
{ XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
|
||||||
{ XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0, 0},
|
{ XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
|
||||||
{ XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0, 0},
|
{ XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
|
||||||
{ XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0, 0},
|
{ XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
|
||||||
{ XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0, 0},
|
{ XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
|
||||||
{ XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0, 0},
|
{ XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
|
||||||
{ XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0, 0},
|
{ XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
|
||||||
{ XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0, 0},
|
{ XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
|
||||||
{ XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0, 0},
|
{ XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
|
||||||
{ XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0, 0},
|
{ XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
|
||||||
{ XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0, 0},
|
{ XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
|
||||||
{ XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0, 0},
|
{ XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
|
||||||
{ XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0, 0},
|
{ XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
|
||||||
{ XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0, 0},
|
{ XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
|
||||||
{ XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0, 0},
|
{ XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
|
||||||
{ XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0, 0},
|
{ XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
|
||||||
{ XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0, 0},
|
{ XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
|
||||||
{ XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0, 0},
|
{ XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
|
||||||
{ XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0, 0},
|
{ XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
|
||||||
{ XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0, 0},
|
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
|
||||||
{ XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0, 0},
|
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
|
||||||
{ XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0, 0},
|
|
||||||
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0, 0},
|
|
||||||
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0, 0},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
32
st.c
32
st.c
|
|
@ -108,6 +108,7 @@ typedef struct {
|
||||||
static void execsh(char **);
|
static void execsh(char **);
|
||||||
static void stty(char **);
|
static void stty(char **);
|
||||||
static void sigchld(int);
|
static void sigchld(int);
|
||||||
|
static void ttywriteraw(const char *, size_t);
|
||||||
|
|
||||||
static void csidump(void);
|
static void csidump(void);
|
||||||
static void csihandle(void);
|
static void csihandle(void);
|
||||||
|
|
@ -786,13 +787,38 @@ ttyread(void)
|
||||||
void
|
void
|
||||||
ttywrite(const char *s, size_t n, int may_echo)
|
ttywrite(const char *s, size_t n, int may_echo)
|
||||||
{
|
{
|
||||||
fd_set wfd, rfd;
|
const char *next;
|
||||||
ssize_t r;
|
|
||||||
size_t lim = 256;
|
|
||||||
|
|
||||||
if (may_echo && IS_SET(MODE_ECHO))
|
if (may_echo && IS_SET(MODE_ECHO))
|
||||||
twrite(s, n, 1);
|
twrite(s, n, 1);
|
||||||
|
|
||||||
|
if (!IS_SET(MODE_CRLF)) {
|
||||||
|
ttywriteraw(s, n);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This is similar to how the kernel handles ONLCR for ttys */
|
||||||
|
while (n > 0) {
|
||||||
|
if (*s == '\r') {
|
||||||
|
next = s + 1;
|
||||||
|
ttywriteraw("\r\n", 2);
|
||||||
|
} else {
|
||||||
|
next = memchr(s, '\r', n);
|
||||||
|
DEFAULT(next, s + n);
|
||||||
|
ttywriteraw(s, next - s);
|
||||||
|
}
|
||||||
|
n -= next - s;
|
||||||
|
s = next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ttywriteraw(const char *s, size_t n)
|
||||||
|
{
|
||||||
|
fd_set wfd, rfd;
|
||||||
|
ssize_t r;
|
||||||
|
size_t lim = 256;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Remember that we are using a pty, which might be a modem line.
|
* Remember that we are using a pty, which might be a modem line.
|
||||||
* Writing too much will clog the line. That's why we are doing this
|
* Writing too much will clog the line. That's why we are doing this
|
||||||
|
|
|
||||||
6
x.c
6
x.c
|
|
@ -38,10 +38,9 @@ typedef struct {
|
||||||
KeySym k;
|
KeySym k;
|
||||||
uint mask;
|
uint mask;
|
||||||
char *s;
|
char *s;
|
||||||
/* three valued logic variables: 0 indifferent, 1 on, -1 off */
|
/* three-valued logic variables: 0 indifferent, 1 on, -1 off */
|
||||||
signed char appkey; /* application keypad */
|
signed char appkey; /* application keypad */
|
||||||
signed char appcursor; /* application cursor */
|
signed char appcursor; /* application cursor */
|
||||||
signed char crlf; /* crlf mode */
|
|
||||||
} Key;
|
} Key;
|
||||||
|
|
||||||
/* X modifiers */
|
/* X modifiers */
|
||||||
|
|
@ -1680,9 +1679,6 @@ kmap(KeySym k, uint state)
|
||||||
if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
|
if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
return kp->s;
|
return kp->s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue