Fixing a off-by-one error in the penultimate row drawing.

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 7c55ef2..684adf7 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,6 +1,10 @@
 /* See LICENSE file for copyright and license details. */
 
 /* See LICENSE file for copyright and license details. */
 

-/* appearance */
+/*
+ * appearance
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */

 static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
 static int borderpx = 2;
 static char shell[] = "/bin/sh";
 static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
 static int borderpx = 2;
 static char shell[] = "/bin/sh";


@@ -117,14 +121,25 @@ static Key key[] = {
        { XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0,    0},
        { XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0,    0},
        { XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0,    0},
        { XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0,    0},
        { XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0,    0},
        { XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0,    0},

-       { XK_KP_End,        ShiftMask,      "\033[1;2F",     0,    0,    0},
+       { XK_KP_End,        ControlMask,    "\033[J",       -1,    0,    0},
+       { XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0,    0},
+       { XK_KP_End,        ShiftMask,      "\033[K",       -1,    0,    0},
+       { XK_KP_End,        ShiftMask,      "\033[1;2F",    +1,    0,    0},

        { XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0,    0},
        { XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0,    0},
        { XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0,    0},
        { XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0,    0},
        { XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0,    0},
        { XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0,    0},

-       { XK_KP_Insert,     ShiftMask,      "\033[2;2~",     0,    0,    0},
-       { XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",       0,    0,    0},
-       { XK_KP_Delete,     ShiftMask,      "\033[3;2~",     0,    0,    0},
-       { XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",       0,    0,    0},
+       { XK_KP_Insert,     ShiftMask,      "\033[2;2~",    +1,    0,    0},
+       { XK_KP_Insert,     ShiftMask,      "\033[4l",      -1,    0,    0},
+       { XK_KP_Insert,     ControlMask,    "\033[L",       -1,    0,    0},
+       { XK_KP_Insert,     ControlMask,    "\033[2;5~",    +1,    0,    0},
+       { XK_KP_Insert,     XK_ANY_MOD,     "\033[4h",      -1,    0,    0},
+       { XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",      +1,    0,    0},
+       { XK_KP_Delete,     ControlMask,    "\033[2J",      -1,    0,    0},
+       { XK_KP_Delete,     ControlMask,    "\033[3;5~",    +1,    0,    0},
+       { XK_KP_Delete,     ShiftMask,      "\033[2K",      +1,    0,    0},
+       { XK_KP_Delete,     ShiftMask,      "\033[3;2~",    -1,    0,    0},
+       { XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0,    0},
+       { XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      +1,    0,    0},

        { XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0,    0},
        { XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0,    0},
        { XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0,    0},
        { XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0,    0},
        { XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0,    0},
        { XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0,    0},


@@ -169,14 +184,25 @@ static Key key[] = {
        { XK_Return,        Mod1Mask,       "\033\r\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,        Mod1Mask,       "\033\r\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},
-       { XK_Delete,        ShiftMask,      "\033[3;2~",     0,    0,    0},
-       { XK_Delete,        XK_ANY_MOD,     "\033[3~",       0,    0,    0},
+       { XK_Insert,        ShiftMask,      "\033[4l",      -1,    0,    0},
+       { XK_Insert,        ShiftMask,      "\033[2;2~",    +1,    0,    0},
+       { XK_Insert,        ControlMask,    "\033[L",       -1,    0,    0},
+       { XK_Insert,        ControlMask,    "\033[2;5~",    +1,    0,    0},
+       { XK_Insert,        XK_ANY_MOD,     "\033[4h",      -1,    0,    0},
+       { XK_Insert,        XK_ANY_MOD,     "\033[2~",      +1,    0,    0},
+       { XK_Delete,        ControlMask,    "\033[2J",      -1,    0,    0},
+       { XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0,    0},
+       { XK_Delete,        ShiftMask,      "\033[2K",      +1,    0,    0},
+       { XK_Delete,        ShiftMask,      "\033[3;2~",    -1,    0,    0},
+       { XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0,    0},
+       { XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},

        { XK_Home,          ShiftMask,      "\033[1;2H",     0,    0,    0},
        { XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1,    0},
        { XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1,    0},
        { XK_Home,          ShiftMask,      "\033[1;2H",     0,    0,    0},
        { XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1,    0},
        { XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1,    0},

-       { XK_End,           ShiftMask,      "\033[1;2F",     0,    0,    0},
+       { XK_End,           ControlMask,    "\033[J",       -1,    0,    0},
+       { XK_End,           ControlMask,    "\033[1;5F",    +1,    0,    0},
+       { XK_End,           ShiftMask,      "\033[K",       -1,    0,    0},
+       { XK_End,           ShiftMask,      "\033[1;2F",    +1,    0,    0},

        { XK_End,           XK_ANY_MOD,     "\033[4~",       0,    0,    0},
        { XK_Prior,         XK_NO_MOD,      "\033[5~",       0,    0,    0},
        { XK_Next,          ShiftMask,      "\033[6;2~",     0,    0,    0},
        { XK_End,           XK_ANY_MOD,     "\033[4~",       0,    0,    0},
        { XK_Prior,         XK_NO_MOD,      "\033[5~",       0,    0,    0},
        { XK_Next,          ShiftMask,      "\033[6;2~",     0,    0,    0},