Also clears ESC_START on interrupt characters during sequences.

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 4c26ef5..646a88a 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -10,8 +10,8 @@ static int borderpx = 2;
 static char shell[] = "/bin/sh";
 
 /* Kerning / character bounding-box mutlipliers */
-float cwscale = 1.0;
-float chscale = 1.0;
+static float cwscale = 1.0;
+static float chscale = 1.0;
 
 /*
  * word delimiter string
@@ -97,21 +97,24 @@ static unsigned int defaultunderline = 7;
 /* Internal mouse shortcuts. */
 /* Beware that overloading Button1 will disable the selection. */
 static Mousekey mshortcuts[] = {
-       /* button               mask            string */
-       { Button4,              XK_ANY_MOD,     "\031"},
-       { Button5,              XK_ANY_MOD,     "\005"},
+       /* button               mask            string */
+       { Button4,              XK_ANY_MOD,     "\031" },
+       { Button5,              XK_ANY_MOD,     "\005" },
 };
 
 /* Internal keyboard shortcuts. */
 #define MODKEY Mod1Mask
 
 static Shortcut shortcuts[] = {
-       /* mask                 keysym          function        argument */
-       { MODKEY|ShiftMask,     XK_Prior,       xzoom,          {.i = +1} },
-       { MODKEY|ShiftMask,     XK_Next,        xzoom,          {.i = -1} },
-       { ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
-       { MODKEY|ShiftMask,     XK_Insert,      clippaste,      {.i =  0} },
-       { MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
+       /* mask                 keysym          function        argument */
+       { ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
+       { ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
+       { XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
+       { MODKEY|ShiftMask,     XK_Prior,       xzoom,          {.i = +1} },
+       { MODKEY|ShiftMask,     XK_Next,        xzoom,          {.i = -1} },
+       { ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
+       { MODKEY|ShiftMask,     XK_Insert,      clippaste,      {.i =  0} },
+       { MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
 };
 
 /*
@@ -153,7 +156,8 @@ static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 
 static Key key[] = {
        /* keysym           mask            string      appkey appcursor crlf */
-       { XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,    0,    0},
+       { XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1,    0},
+       { XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,   +1,    0},
        { XK_KP_Home,       XK_ANY_MOD,     "\033[H",        0,   -1,    0},
        { XK_KP_Home,       XK_ANY_MOD,     "\033[1~",       0,   +1,    0},
        { XK_KP_Up,         XK_ANY_MOD,     "\033Ox",       +1,    0,    0},
@@ -184,11 +188,10 @@ static Key key[] = {
        { 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[M",       -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,     ShiftMask,      "\033[2K",      -1,    0,    0},
+       { XK_KP_Delete,     ShiftMask,      "\033[3;2~",    +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},
@@ -208,7 +211,6 @@ static Key key[] = {
        { XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0,    0},
        { XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0,    0},
        { XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0,    0},
-       { XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0,    0},
        { XK_Up,            ShiftMask,      "\033[1;2A",     0,    0,    0},
        { XK_Up,            ControlMask,    "\033[1;5A",     0,    0,    0},
        { XK_Up,            Mod1Mask,       "\033[1;3A",     0,    0,    0},
@@ -240,13 +242,13 @@ static Key key[] = {
        { 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[M",       -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,        ShiftMask,      "\033[2K",      -1,    0,    0},
+       { XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0,    0},
        { XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},
-       { XK_Home,          ShiftMask,      "\033[1;2H",     0,    0,    0},
+       { XK_Home,          ShiftMask,      "\033[2J",       0,   -1,    0},
+       { XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1,    0},
        { XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1,    0},
        { XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1,    0},
        { XK_End,           ControlMask,    "\033[J",       -1,    0,    0},