Merge remote-tracking branch 'upstream/master'

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 1667ed6..56bae2d 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -119,6 +119,8 @@ static Shortcut shortcuts[] = {
        { MODKEY|ShiftMask,     XK_Home,        xzoomreset,     {.i =  0} },
        { ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
        { MODKEY|ShiftMask,     XK_Insert,      clippaste,      {.i =  0} },
+       { MODKEY|ShiftMask,     XK_C,           clipcopy,       {.i =  0} },
+       { MODKEY|ShiftMask,     XK_V,           clippaste,      {.i =  0} },
        { MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
 };
 
@@ -203,7 +205,7 @@ static Key key[] = {
        { 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,     "\177",         +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},
@@ -258,7 +260,8 @@ static Key key[] = {
        { 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,     "\177",         +1,    0,    0},
+       { XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},
+       { XK_BackSpace,     XK_NO_MOD,      "\177",          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},