applied st solarized-both patch with one manually applied hunk to config.def.h

diff --git a/patches/st-solarized-both-20160727-308bfbf.diff b/patches/st-solarized-both-20160727-308bfbf.diff
new file mode 100644 (file)
index 0000000..c966579
--- /dev/null
+++ b/patches/st-solarized-both-20160727-308bfbf.diff
@@ -0,0 +1,189 @@
+diff --git a/config.def.h b/config.def.h
+index b41747f..adaa9b8 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -84,42 +84,54 @@ static unsigned int tabspaces = 8;
+ 
+ /* Terminal colors (16 first used in escape sequence) */
+ static const char *colorname[] = {
+-      /* 8 normal colors */
+-      "black",
+-      "red3",
+-      "green3",
+-      "yellow3",
+-      "blue2",
+-      "magenta3",
+-      "cyan3",
+-      "gray90",
+-
+-      /* 8 bright colors */
+-      "gray50",
+-      "red",
+-      "green",
+-      "yellow",
+-      "#5c5cff",
+-      "magenta",
+-      "cyan",
+-      "white",
+-
+-      [255] = 0,
+-
+-      /* more colors can be added after 255 to use with DefaultXX */
+-      "#cccccc",
+-      "#555555",
++      /* solarized dark */
++      "#073642",  /*  0: black    */
++      "#dc322f",  /*  1: red      */
++      "#859900",  /*  2: green    */
++      "#b58900",  /*  3: yellow   */
++      "#268bd2",  /*  4: blue     */
++      "#d33682",  /*  5: magenta  */
++      "#2aa198",  /*  6: cyan     */
++      "#eee8d5",  /*  7: white    */
++      "#002b36",  /*  8: brblack  */
++      "#cb4b16",  /*  9: brred    */
++      "#586e75",  /* 10: brgreen  */
++      "#657b83",  /* 11: bryellow */
++      "#839496",  /* 12: brblue   */
++      "#6c71c4",  /* 13: brmagenta*/
++      "#93a1a1",  /* 14: brcyan   */
++      "#fdf6e3",  /* 15: brwhite  */
+ };
+ 
++/* Terminal colors for alternate (light) palette */
++static const char *altcolorname[] = {
++      /* solarized light */
++      "#eee8d5",  /*  0: black    */
++      "#dc322f",  /*  1: red      */
++      "#859900",  /*  2: green    */
++      "#b58900",  /*  3: yellow   */
++      "#268bd2",  /*  4: blue     */
++      "#d33682",  /*  5: magenta  */
++      "#2aa198",  /*  6: cyan     */
++      "#073642",  /*  7: white    */
++      "#fdf6e3",  /*  8: brblack  */
++      "#cb4b16",  /*  9: brred    */
++      "#93a1a1",  /* 10: brgreen  */
++      "#839496",  /* 11: bryellow */
++      "#657b83",  /* 12: brblue   */
++      "#6c71c4",  /* 13: brmagenta*/
++      "#586e75",  /* 14: brcyan   */
++      "#002b36",  /* 15: brwhite  */
++};
+ 
+ /*
+  * Default colors (colorname index)
+  * foreground, background, cursor, reverse cursor
+  */
+-static unsigned int defaultfg = 7;
+-static unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
+-static unsigned int defaultrcs = 257;
++static unsigned int defaultfg = 12;
++static unsigned int defaultbg = 8;
++static unsigned int defaultcs = 14;
++static unsigned int defaultrcs = 15;
+ 
+ /*
+  * Default shape of cursor
+@@ -172,6 +184,7 @@ static Shortcut shortcuts[] = {
+       { MODKEY|ShiftMask,     XK_C,           clipcopy,       {.i =  0} },
+       { MODKEY|ShiftMask,     XK_V,           clippaste,      {.i =  0} },
+       { MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
++      { XK_ANY_MOD,           XK_F6,          swapcolors,     {.i =  0} },
+ };
+ 
+ /*
+diff --git a/st.c b/st.c
+index 2594c65..b4a3089 100644
+--- a/st.c
++++ b/st.c
+@@ -328,6 +328,7 @@ typedef struct {
+ static void clipcopy(const Arg *);
+ static void clippaste(const Arg *);
+ static void numlock(const Arg *);
++static void swapcolors(const Arg *);
+ static void selpaste(const Arg *);
+ static void xzoom(const Arg *);
+ static void xzoomabs(const Arg *);
+@@ -355,7 +356,7 @@ typedef struct {
+ 
+ /* Drawing Context */
+ typedef struct {
+-      Color col[MAX(LEN(colorname), 256)];
++      Color col[MAX(MAX(LEN(colorname), LEN(altcolorname)), 256)];
+       Font font, bfont, ifont, ibfont;
+       GC gc;
+ } DC;
+@@ -533,6 +534,8 @@ static char *opt_name  = NULL;
+ static char *opt_title = NULL;
+ static int oldbutton   = 3; /* button event on startup: 3 = release */
+ 
++static int usealtcolors = 0; /* 1 to use alternate palette */
++
+ static char *usedfont = NULL;
+ static double usedfontsize = 0;
+ static double defaultfontsize = 0;
+@@ -3148,6 +3151,11 @@ sixd_to_16bit(int x)
+       return x == 0 ? 0 : 0x3737 + 0x2828 * x;
+ }
+ 
++const char* getcolorname(int i)
++{
++    return (usealtcolors) ?  altcolorname[i] : colorname[i];
++}
++
+ int
+ xloadcolor(int i, const char *name, Color *ncolor)
+ {
+@@ -3166,7 +3174,7 @@ xloadcolor(int i, const char *name, Color *ncolor)
+                       return XftColorAllocValue(xw.dpy, xw.vis,
+                                                 xw.cmap, &color, ncolor);
+               } else
+-                      name = colorname[i];
++                      name = getcolorname(i);
+       }
+ 
+       return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
+@@ -3186,8 +3194,8 @@ xloadcols(void)
+ 
+       for (i = 0; i < LEN(dc.col); i++)
+               if (!xloadcolor(i, NULL, &dc.col[i])) {
+-                      if (colorname[i])
+-                              die("Could not allocate color '%s'\n", colorname[i]);
++                      if (getcolorname(i))
++                              die("Could not allocate color '%s'\n", getcolorname(i));
+                       else
+                               die("Could not allocate color %d\n", i);
+               }
+@@ -3514,13 +3522,13 @@ xinit(void)
+       cursor = XCreateFontCursor(xw.dpy, mouseshape);
+       XDefineCursor(xw.dpy, xw.win, cursor);
+ 
+-      if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
++      if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousefg), &xmousefg) == 0) {
+               xmousefg.red   = 0xffff;
+               xmousefg.green = 0xffff;
+               xmousefg.blue  = 0xffff;
+       }
+ 
+-      if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
++      if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousebg), &xmousebg) == 0) {
+               xmousebg.red   = 0x0000;
+               xmousebg.green = 0x0000;
+               xmousebg.blue  = 0x0000;
+@@ -4074,6 +4082,14 @@ numlock(const Arg *dummy)
+       term.numlock ^= 1;
+ }
+ 
++void
++swapcolors(const Arg *dummy)
++{
++      usealtcolors = !usealtcolors;
++      xloadcols();
++      redraw();
++}
++
+ char*
+ kmap(KeySym k, uint state)
+ {

diff --git a/st/config.def.h b/st/config.def.h
index eae969e62abdcb9650e15abd06681b45f6dbc317..2da445e73688e627a9515f50a95629db3008d9d2 100644 (file)
--- a/st/config.def.h
+++ b/st/config.def.h
@@ -73,54 +73,66 @@ static char termname[] = "st-256color";
  * the st.info and appropriately install the st.info in the environment where
  * you use this st version.
  *
- *     it#$tabspaces,
+ *  it#$tabspaces,
  *
  * Secondly make sure your kernel is not expanding tabs. When running `stty
  * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
  *  running following command:
  *
- *     stty tabs
+ *  stty tabs
  */
 static unsigned int tabspaces = 8;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-       /* 8 normal colors */
-       "black",
-       "red3",
-       "green3",
-       "yellow3",
-       "blue2",
-       "magenta3",
-       "cyan3",
-       "gray90",
-
-       /* 8 bright colors */
-       "gray50",
-       "red",
-       "green",
-       "yellow",
-       "#5c5cff",
-       "magenta",
-       "cyan",
-       "white",
-
-       [255] = 0,
-
-       /* more colors can be added after 255 to use with DefaultXX */
-       "#cccccc",
-       "#555555",
+    /* solarized dark */
+    "#073642",  /*  0: black    */
+    "#dc322f",  /*  1: red      */
+    "#859900",  /*  2: green    */
+    "#b58900",  /*  3: yellow   */
+    "#268bd2",  /*  4: blue     */
+    "#d33682",  /*  5: magenta  */
+    "#2aa198",  /*  6: cyan     */
+    "#eee8d5",  /*  7: white    */
+    "#002b36",  /*  8: brblack  */
+    "#cb4b16",  /*  9: brred    */
+    "#586e75",  /* 10: brgreen  */
+    "#657b83",  /* 11: bryellow */
+    "#839496",  /* 12: brblue   */
+    "#6c71c4",  /* 13: brmagenta*/
+    "#93a1a1",  /* 14: brcyan   */
+    "#fdf6e3",  /* 15: brwhite  */
 };
 
+/* Terminal colors for alternate (light) palette */
+static const char *altcolorname[] = {
+    /* solarized light */
+    "#eee8d5",  /*  0: black    */
+    "#dc322f",  /*  1: red      */
+    "#859900",  /*  2: green    */
+    "#b58900",  /*  3: yellow   */
+    "#268bd2",  /*  4: blue     */
+    "#d33682",  /*  5: magenta  */
+    "#2aa198",  /*  6: cyan     */
+    "#073642",  /*  7: white    */
+    "#fdf6e3",  /*  8: brblack  */
+    "#cb4b16",  /*  9: brred    */
+    "#93a1a1",  /* 10: brgreen  */
+    "#839496",  /* 11: bryellow */
+    "#657b83",  /* 12: brblue   */
+    "#6c71c4",  /* 13: brmagenta*/
+    "#586e75",  /* 14: brcyan   */
+    "#002b36",  /* 15: brwhite  */
+};
 
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-static unsigned int defaultfg = 7;
-static unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
+static unsigned int defaultfg = 12;
+static unsigned int defaultbg = 8;
+static unsigned int defaultcs = 14;
+static unsigned int defaultrcs = 15;
 
 /*
  * Default shape of cursor
@@ -151,30 +163,31 @@ static unsigned int defaultunderline = 7;
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut 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 */
-       { XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
-       { 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,          {.f = +1} },
-       { MODKEY|ShiftMask,     XK_Next,        xzoom,          {.f = -1} },
-       { MODKEY|ShiftMask,     XK_Home,        xzoomreset,     {.f =  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} },
-       { ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-       { ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
+    /* mask                 keysym          function        argument */
+    { XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
+    { 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,          {.f = +1} },
+    { MODKEY|ShiftMask,     XK_Next,        xzoom,          {.f = -1} },
+    { MODKEY|ShiftMask,     XK_Home,        xzoomreset,     {.f =  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} },
+    { ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
+    { ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
+    { XK_ANY_MOD,           XK_F6,          swapcolors,     {.i =  0} },
 };
 
 /*
@@ -226,203 +239,203 @@ static uint forceselmod = ShiftMask;
  * world. Please decide about changes wisely.
  */
 static Key key[] = {
-       /* keysym           mask            string      appkey appcursor crlf */
-       { 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},
-       { XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1,    0},
-       { XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1,    0},
-       { XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0,    0},
-       { XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1,    0},
-       { XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1,    0},
-       { XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0,    0},
-       { XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1,    0},
-       { XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1,    0},
-       { XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0,    0},
-       { XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1,    0},
-       { XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1,    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,        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_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[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,     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_Enter,      XK_ANY_MOD,     "\r",           -1,    0,   -1},
-       { XK_KP_Enter,      XK_ANY_MOD,     "\r\n",         -1,    0,   +1},
-       { XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0,    0},
-       { XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0,    0},
-       { XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0,    0},
-       { XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0,    0},
-       { XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0,    0},
-       { XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0,    0},
-       { XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0,    0},
-       { XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0,    0},
-       { XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0,    0},
-       { XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0,    0},
-       { 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_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},
-       { XK_Up,            XK_ANY_MOD,     "\033[A",        0,   -1,    0},
-       { XK_Up,            XK_ANY_MOD,     "\033OA",        0,   +1,    0},
-       { XK_Down,          ShiftMask,      "\033[1;2B",     0,    0,    0},
-       { XK_Down,          ControlMask,    "\033[1;5B",     0,    0,    0},
-       { XK_Down,          Mod1Mask,       "\033[1;3B",     0,    0,    0},
-       { XK_Down,          XK_ANY_MOD,     "\033[B",        0,   -1,    0},
-       { XK_Down,          XK_ANY_MOD,     "\033OB",        0,   +1,    0},
-       { XK_Left,          ShiftMask,      "\033[1;2D",     0,    0,    0},
-       { XK_Left,          ControlMask,    "\033[1;5D",     0,    0,    0},
-       { XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0,    0},
-       { XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1,    0},
-       { XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1,    0},
-       { XK_Right,         ShiftMask,      "\033[1;2C",     0,    0,    0},
-       { XK_Right,         ControlMask,    "\033[1;5C",     0,    0,    0},
-       { XK_Right,         Mod1Mask,       "\033[1;3C",     0,    0,    0},
-       { XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1,    0},
-       { XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1,    0},
-       { XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0,    0},
-       { XK_Return,        Mod1Mask,       "\033\r",        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[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[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,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},
-       { XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0,    0},
-       { XK_BackSpace,     Mod1Mask,       "\033\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},
-       { XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1,    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,         ControlMask,    "\033[5;5~",     0,    0,    0},
-       { XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0,    0},
-       { XK_Prior,         XK_ANY_MOD,     "\033[5~",       0,    0,    0},
-       { XK_Next,          ControlMask,    "\033[6;5~",     0,    0,    0},
-       { XK_Next,          ShiftMask,      "\033[6;2~",     0,    0,    0},
-       { XK_Next,          XK_ANY_MOD,     "\033[6~",       0,    0,    0},
-       { XK_F1,            XK_NO_MOD,      "\033OP" ,       0,    0,    0},
-       { XK_F1, /* F13 */  ShiftMask,      "\033[1;2P",     0,    0,    0},
-       { XK_F1, /* F25 */  ControlMask,    "\033[1;5P",     0,    0,    0},
-       { XK_F1, /* F37 */  Mod4Mask,       "\033[1;6P",     0,    0,    0},
-       { XK_F1, /* F49 */  Mod1Mask,       "\033[1;3P",     0,    0,    0},
-       { XK_F1, /* F61 */  Mod3Mask,       "\033[1;4P",     0,    0,    0},
-       { XK_F2,            XK_NO_MOD,      "\033OQ" ,       0,    0,    0},
-       { XK_F2, /* F14 */  ShiftMask,      "\033[1;2Q",     0,    0,    0},
-       { XK_F2, /* F26 */  ControlMask,    "\033[1;5Q",     0,    0,    0},
-       { XK_F2, /* F38 */  Mod4Mask,       "\033[1;6Q",     0,    0,    0},
-       { XK_F2, /* F50 */  Mod1Mask,       "\033[1;3Q",     0,    0,    0},
-       { XK_F2, /* F62 */  Mod3Mask,       "\033[1;4Q",     0,    0,    0},
-       { XK_F3,            XK_NO_MOD,      "\033OR" ,       0,    0,    0},
-       { XK_F3, /* F15 */  ShiftMask,      "\033[1;2R",     0,    0,    0},
-       { XK_F3, /* F27 */  ControlMask,    "\033[1;5R",     0,    0,    0},
-       { XK_F3, /* F39 */  Mod4Mask,       "\033[1;6R",     0,    0,    0},
-       { XK_F3, /* F51 */  Mod1Mask,       "\033[1;3R",     0,    0,    0},
-       { XK_F3, /* F63 */  Mod3Mask,       "\033[1;4R",     0,    0,    0},
-       { XK_F4,            XK_NO_MOD,      "\033OS" ,       0,    0,    0},
-       { XK_F4, /* F16 */  ShiftMask,      "\033[1;2S",     0,    0,    0},
-       { XK_F4, /* F28 */  ControlMask,    "\033[1;5S",     0,    0,    0},
-       { XK_F4, /* F40 */  Mod4Mask,       "\033[1;6S",     0,    0,    0},
-       { XK_F4, /* F52 */  Mod1Mask,       "\033[1;3S",     0,    0,    0},
-       { XK_F5,            XK_NO_MOD,      "\033[15~",      0,    0,    0},
-       { XK_F5, /* F17 */  ShiftMask,      "\033[15;2~",    0,    0,    0},
-       { XK_F5, /* F29 */  ControlMask,    "\033[15;5~",    0,    0,    0},
-       { XK_F5, /* F41 */  Mod4Mask,       "\033[15;6~",    0,    0,    0},
-       { XK_F5, /* F53 */  Mod1Mask,       "\033[15;3~",    0,    0,    0},
-       { XK_F6,            XK_NO_MOD,      "\033[17~",      0,    0,    0},
-       { XK_F6, /* F18 */  ShiftMask,      "\033[17;2~",    0,    0,    0},
-       { XK_F6, /* F30 */  ControlMask,    "\033[17;5~",    0,    0,    0},
-       { XK_F6, /* F42 */  Mod4Mask,       "\033[17;6~",    0,    0,    0},
-       { XK_F6, /* F54 */  Mod1Mask,       "\033[17;3~",    0,    0,    0},
-       { XK_F7,            XK_NO_MOD,      "\033[18~",      0,    0,    0},
-       { XK_F7, /* F19 */  ShiftMask,      "\033[18;2~",    0,    0,    0},
-       { XK_F7, /* F31 */  ControlMask,    "\033[18;5~",    0,    0,    0},
-       { XK_F7, /* F43 */  Mod4Mask,       "\033[18;6~",    0,    0,    0},
-       { XK_F7, /* F55 */  Mod1Mask,       "\033[18;3~",    0,    0,    0},
-       { XK_F8,            XK_NO_MOD,      "\033[19~",      0,    0,    0},
-       { XK_F8, /* F20 */  ShiftMask,      "\033[19;2~",    0,    0,    0},
-       { XK_F8, /* F32 */  ControlMask,    "\033[19;5~",    0,    0,    0},
-       { XK_F8, /* F44 */  Mod4Mask,       "\033[19;6~",    0,    0,    0},
-       { XK_F8, /* F56 */  Mod1Mask,       "\033[19;3~",    0,    0,    0},
-       { XK_F9,            XK_NO_MOD,      "\033[20~",      0,    0,    0},
-       { XK_F9, /* F21 */  ShiftMask,      "\033[20;2~",    0,    0,    0},
-       { XK_F9, /* F33 */  ControlMask,    "\033[20;5~",    0,    0,    0},
-       { XK_F9, /* F45 */  Mod4Mask,       "\033[20;6~",    0,    0,    0},
-       { XK_F9, /* F57 */  Mod1Mask,       "\033[20;3~",    0,    0,    0},
-       { XK_F10,           XK_NO_MOD,      "\033[21~",      0,    0,    0},
-       { XK_F10, /* F22 */ ShiftMask,      "\033[21;2~",    0,    0,    0},
-       { XK_F10, /* F34 */ ControlMask,    "\033[21;5~",    0,    0,    0},
-       { XK_F10, /* F46 */ Mod4Mask,       "\033[21;6~",    0,    0,    0},
-       { XK_F10, /* F58 */ Mod1Mask,       "\033[21;3~",    0,    0,    0},
-       { XK_F11,           XK_NO_MOD,      "\033[23~",      0,    0,    0},
-       { XK_F11, /* F23 */ ShiftMask,      "\033[23;2~",    0,    0,    0},
-       { XK_F11, /* F35 */ ControlMask,    "\033[23;5~",    0,    0,    0},
-       { XK_F11, /* F47 */ Mod4Mask,       "\033[23;6~",    0,    0,    0},
-       { XK_F11, /* F59 */ Mod1Mask,       "\033[23;3~",    0,    0,    0},
-       { XK_F12,           XK_NO_MOD,      "\033[24~",      0,    0,    0},
-       { XK_F12, /* F24 */ ShiftMask,      "\033[24;2~",    0,    0,    0},
-       { XK_F12, /* F36 */ ControlMask,    "\033[24;5~",    0,    0,    0},
-       { XK_F12, /* F48 */ Mod4Mask,       "\033[24;6~",    0,    0,    0},
-       { XK_F12, /* F60 */ Mod1Mask,       "\033[24;3~",    0,    0,    0},
-       { XK_F13,           XK_NO_MOD,      "\033[1;2P",     0,    0,    0},
-       { XK_F14,           XK_NO_MOD,      "\033[1;2Q",     0,    0,    0},
-       { XK_F15,           XK_NO_MOD,      "\033[1;2R",     0,    0,    0},
-       { XK_F16,           XK_NO_MOD,      "\033[1;2S",     0,    0,    0},
-       { XK_F17,           XK_NO_MOD,      "\033[15;2~",    0,    0,    0},
-       { XK_F18,           XK_NO_MOD,      "\033[17;2~",    0,    0,    0},
-       { XK_F19,           XK_NO_MOD,      "\033[18;2~",    0,    0,    0},
-       { XK_F20,           XK_NO_MOD,      "\033[19;2~",    0,    0,    0},
-       { XK_F21,           XK_NO_MOD,      "\033[20;2~",    0,    0,    0},
-       { XK_F22,           XK_NO_MOD,      "\033[21;2~",    0,    0,    0},
-       { XK_F23,           XK_NO_MOD,      "\033[23;2~",    0,    0,    0},
-       { XK_F24,           XK_NO_MOD,      "\033[24;2~",    0,    0,    0},
-       { XK_F25,           XK_NO_MOD,      "\033[1;5P",     0,    0,    0},
-       { XK_F26,           XK_NO_MOD,      "\033[1;5Q",     0,    0,    0},
-       { XK_F27,           XK_NO_MOD,      "\033[1;5R",     0,    0,    0},
-       { XK_F28,           XK_NO_MOD,      "\033[1;5S",     0,    0,    0},
-       { XK_F29,           XK_NO_MOD,      "\033[15;5~",    0,    0,    0},
-       { XK_F30,           XK_NO_MOD,      "\033[17;5~",    0,    0,    0},
-       { XK_F31,           XK_NO_MOD,      "\033[18;5~",    0,    0,    0},
-       { XK_F32,           XK_NO_MOD,      "\033[19;5~",    0,    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},
+    /* keysym           mask            string      appkey appcursor crlf */
+    { 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},
+    { XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1,    0},
+    { XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1,    0},
+    { XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0,    0},
+    { XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1,    0},
+    { XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1,    0},
+    { XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0,    0},
+    { XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1,    0},
+    { XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1,    0},
+    { XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0,    0},
+    { XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1,    0},
+    { XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1,    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,        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_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[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,     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_Enter,      XK_ANY_MOD,     "\r",           -1,    0,   -1},
+    { XK_KP_Enter,      XK_ANY_MOD,     "\r\n",         -1,    0,   +1},
+    { XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0,    0},
+    { XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0,    0},
+    { XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0,    0},
+    { XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0,    0},
+    { XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0,    0},
+    { XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0,    0},
+    { XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0,    0},
+    { XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0,    0},
+    { XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0,    0},
+    { XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0,    0},
+    { 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_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},
+    { XK_Up,            XK_ANY_MOD,     "\033[A",        0,   -1,    0},
+    { XK_Up,            XK_ANY_MOD,     "\033OA",        0,   +1,    0},
+    { XK_Down,          ShiftMask,      "\033[1;2B",     0,    0,    0},
+    { XK_Down,          ControlMask,    "\033[1;5B",     0,    0,    0},
+    { XK_Down,          Mod1Mask,       "\033[1;3B",     0,    0,    0},
+    { XK_Down,          XK_ANY_MOD,     "\033[B",        0,   -1,    0},
+    { XK_Down,          XK_ANY_MOD,     "\033OB",        0,   +1,    0},
+    { XK_Left,          ShiftMask,      "\033[1;2D",     0,    0,    0},
+    { XK_Left,          ControlMask,    "\033[1;5D",     0,    0,    0},
+    { XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0,    0},
+    { XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1,    0},
+    { XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1,    0},
+    { XK_Right,         ShiftMask,      "\033[1;2C",     0,    0,    0},
+    { XK_Right,         ControlMask,    "\033[1;5C",     0,    0,    0},
+    { XK_Right,         Mod1Mask,       "\033[1;3C",     0,    0,    0},
+    { XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1,    0},
+    { XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1,    0},
+    { XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0,    0},
+    { XK_Return,        Mod1Mask,       "\033\r",        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[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[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,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},
+    { XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0,    0},
+    { XK_BackSpace,     Mod1Mask,       "\033\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},
+    { XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1,    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,         ControlMask,    "\033[5;5~",     0,    0,    0},
+    { XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0,    0},
+    { XK_Prior,         XK_ANY_MOD,     "\033[5~",       0,    0,    0},
+    { XK_Next,          ControlMask,    "\033[6;5~",     0,    0,    0},
+    { XK_Next,          ShiftMask,      "\033[6;2~",     0,    0,    0},
+    { XK_Next,          XK_ANY_MOD,     "\033[6~",       0,    0,    0},
+    { XK_F1,            XK_NO_MOD,      "\033OP" ,       0,    0,    0},
+    { XK_F1, /* F13 */  ShiftMask,      "\033[1;2P",     0,    0,    0},
+    { XK_F1, /* F25 */  ControlMask,    "\033[1;5P",     0,    0,    0},
+    { XK_F1, /* F37 */  Mod4Mask,       "\033[1;6P",     0,    0,    0},
+    { XK_F1, /* F49 */  Mod1Mask,       "\033[1;3P",     0,    0,    0},
+    { XK_F1, /* F61 */  Mod3Mask,       "\033[1;4P",     0,    0,    0},
+    { XK_F2,            XK_NO_MOD,      "\033OQ" ,       0,    0,    0},
+    { XK_F2, /* F14 */  ShiftMask,      "\033[1;2Q",     0,    0,    0},
+    { XK_F2, /* F26 */  ControlMask,    "\033[1;5Q",     0,    0,    0},
+    { XK_F2, /* F38 */  Mod4Mask,       "\033[1;6Q",     0,    0,    0},
+    { XK_F2, /* F50 */  Mod1Mask,       "\033[1;3Q",     0,    0,    0},
+    { XK_F2, /* F62 */  Mod3Mask,       "\033[1;4Q",     0,    0,    0},
+    { XK_F3,            XK_NO_MOD,      "\033OR" ,       0,    0,    0},
+    { XK_F3, /* F15 */  ShiftMask,      "\033[1;2R",     0,    0,    0},
+    { XK_F3, /* F27 */  ControlMask,    "\033[1;5R",     0,    0,    0},
+    { XK_F3, /* F39 */  Mod4Mask,       "\033[1;6R",     0,    0,    0},
+    { XK_F3, /* F51 */  Mod1Mask,       "\033[1;3R",     0,    0,    0},
+    { XK_F3, /* F63 */  Mod3Mask,       "\033[1;4R",     0,    0,    0},
+    { XK_F4,            XK_NO_MOD,      "\033OS" ,       0,    0,    0},
+    { XK_F4, /* F16 */  ShiftMask,      "\033[1;2S",     0,    0,    0},
+    { XK_F4, /* F28 */  ControlMask,    "\033[1;5S",     0,    0,    0},
+    { XK_F4, /* F40 */  Mod4Mask,       "\033[1;6S",     0,    0,    0},
+    { XK_F4, /* F52 */  Mod1Mask,       "\033[1;3S",     0,    0,    0},
+    { XK_F5,            XK_NO_MOD,      "\033[15~",      0,    0,    0},
+    { XK_F5, /* F17 */  ShiftMask,      "\033[15;2~",    0,    0,    0},
+    { XK_F5, /* F29 */  ControlMask,    "\033[15;5~",    0,    0,    0},
+    { XK_F5, /* F41 */  Mod4Mask,       "\033[15;6~",    0,    0,    0},
+    { XK_F5, /* F53 */  Mod1Mask,       "\033[15;3~",    0,    0,    0},
+    { XK_F6,            XK_NO_MOD,      "\033[17~",      0,    0,    0},
+    { XK_F6, /* F18 */  ShiftMask,      "\033[17;2~",    0,    0,    0},
+    { XK_F6, /* F30 */  ControlMask,    "\033[17;5~",    0,    0,    0},
+    { XK_F6, /* F42 */  Mod4Mask,       "\033[17;6~",    0,    0,    0},
+    { XK_F6, /* F54 */  Mod1Mask,       "\033[17;3~",    0,    0,    0},
+    { XK_F7,            XK_NO_MOD,      "\033[18~",      0,    0,    0},
+    { XK_F7, /* F19 */  ShiftMask,      "\033[18;2~",    0,    0,    0},
+    { XK_F7, /* F31 */  ControlMask,    "\033[18;5~",    0,    0,    0},
+    { XK_F7, /* F43 */  Mod4Mask,       "\033[18;6~",    0,    0,    0},
+    { XK_F7, /* F55 */  Mod1Mask,       "\033[18;3~",    0,    0,    0},
+    { XK_F8,            XK_NO_MOD,      "\033[19~",      0,    0,    0},
+    { XK_F8, /* F20 */  ShiftMask,      "\033[19;2~",    0,    0,    0},
+    { XK_F8, /* F32 */  ControlMask,    "\033[19;5~",    0,    0,    0},
+    { XK_F8, /* F44 */  Mod4Mask,       "\033[19;6~",    0,    0,    0},
+    { XK_F8, /* F56 */  Mod1Mask,       "\033[19;3~",    0,    0,    0},
+    { XK_F9,            XK_NO_MOD,      "\033[20~",      0,    0,    0},
+    { XK_F9, /* F21 */  ShiftMask,      "\033[20;2~",    0,    0,    0},
+    { XK_F9, /* F33 */  ControlMask,    "\033[20;5~",    0,    0,    0},
+    { XK_F9, /* F45 */  Mod4Mask,       "\033[20;6~",    0,    0,    0},
+    { XK_F9, /* F57 */  Mod1Mask,       "\033[20;3~",    0,    0,    0},
+    { XK_F10,           XK_NO_MOD,      "\033[21~",      0,    0,    0},
+    { XK_F10, /* F22 */ ShiftMask,      "\033[21;2~",    0,    0,    0},
+    { XK_F10, /* F34 */ ControlMask,    "\033[21;5~",    0,    0,    0},
+    { XK_F10, /* F46 */ Mod4Mask,       "\033[21;6~",    0,    0,    0},
+    { XK_F10, /* F58 */ Mod1Mask,       "\033[21;3~",    0,    0,    0},
+    { XK_F11,           XK_NO_MOD,      "\033[23~",      0,    0,    0},
+    { XK_F11, /* F23 */ ShiftMask,      "\033[23;2~",    0,    0,    0},
+    { XK_F11, /* F35 */ ControlMask,    "\033[23;5~",    0,    0,    0},
+    { XK_F11, /* F47 */ Mod4Mask,       "\033[23;6~",    0,    0,    0},
+    { XK_F11, /* F59 */ Mod1Mask,       "\033[23;3~",    0,    0,    0},
+    { XK_F12,           XK_NO_MOD,      "\033[24~",      0,    0,    0},
+    { XK_F12, /* F24 */ ShiftMask,      "\033[24;2~",    0,    0,    0},
+    { XK_F12, /* F36 */ ControlMask,    "\033[24;5~",    0,    0,    0},
+    { XK_F12, /* F48 */ Mod4Mask,       "\033[24;6~",    0,    0,    0},
+    { XK_F12, /* F60 */ Mod1Mask,       "\033[24;3~",    0,    0,    0},
+    { XK_F13,           XK_NO_MOD,      "\033[1;2P",     0,    0,    0},
+    { XK_F14,           XK_NO_MOD,      "\033[1;2Q",     0,    0,    0},
+    { XK_F15,           XK_NO_MOD,      "\033[1;2R",     0,    0,    0},
+    { XK_F16,           XK_NO_MOD,      "\033[1;2S",     0,    0,    0},
+    { XK_F17,           XK_NO_MOD,      "\033[15;2~",    0,    0,    0},
+    { XK_F18,           XK_NO_MOD,      "\033[17;2~",    0,    0,    0},
+    { XK_F19,           XK_NO_MOD,      "\033[18;2~",    0,    0,    0},
+    { XK_F20,           XK_NO_MOD,      "\033[19;2~",    0,    0,    0},
+    { XK_F21,           XK_NO_MOD,      "\033[20;2~",    0,    0,    0},
+    { XK_F22,           XK_NO_MOD,      "\033[21;2~",    0,    0,    0},
+    { XK_F23,           XK_NO_MOD,      "\033[23;2~",    0,    0,    0},
+    { XK_F24,           XK_NO_MOD,      "\033[24;2~",    0,    0,    0},
+    { XK_F25,           XK_NO_MOD,      "\033[1;5P",     0,    0,    0},
+    { XK_F26,           XK_NO_MOD,      "\033[1;5Q",     0,    0,    0},
+    { XK_F27,           XK_NO_MOD,      "\033[1;5R",     0,    0,    0},
+    { XK_F28,           XK_NO_MOD,      "\033[1;5S",     0,    0,    0},
+    { XK_F29,           XK_NO_MOD,      "\033[15;5~",    0,    0,    0},
+    { XK_F30,           XK_NO_MOD,      "\033[17;5~",    0,    0,    0},
+    { XK_F31,           XK_NO_MOD,      "\033[18;5~",    0,    0,    0},
+    { XK_F32,           XK_NO_MOD,      "\033[19;5~",    0,    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},
 };
 
 /*
@@ -433,7 +446,7 @@ static Key key[] = {
  * If no match is found, regular selection is used.
  */
 static uint selmasks[] = {
-       [SEL_RECTANGULAR] = Mod1Mask,
+    [SEL_RECTANGULAR] = Mod1Mask,
 };
 
 /*
@@ -441,7 +454,7 @@ static uint selmasks[] = {
  * of single wide characters.
  */
 static char ascii_printable[] =
-       " !\"#$%&'()*+,-./0123456789:;<=>?"
-       "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-       "`abcdefghijklmnopqrstuvwxyz{|}~";
+    " !\"#$%&'()*+,-./0123456789:;<=>?"
+    "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+    "`abcdefghijklmnopqrstuvwxyz{|}~";
 

diff --git a/st/st.c b/st/st.c
index 58d25d2bba9cc25d77f9c75e19f239438e557618..69d7b98f1da031bae0e92c8664ed120727f1c5b6 100644 (file)
--- a/st/st.c
+++ b/st/st.c
@@ -312,6 +312,7 @@ static void clippaste(const Arg *);
 static void kscrolldown(const Arg *);
 static void kscrollup(const Arg *);
 static void numlock(const Arg *);
+static void swapcolors(const Arg *);
 static void selpaste(const Arg *);
 static void xzoom(const Arg *);
 static void xzoomabs(const Arg *);
@@ -362,7 +363,7 @@ typedef struct {
 
 /* Drawing Context */
 typedef struct {
-       Color col[MAX(LEN(colorname), 256)];
+       Color col[MAX(MAX(LEN(colorname), LEN(altcolorname)), 256)];
        Font font, bfont, ifont, ibfont;
        GC gc;
 } DC;
@@ -540,6 +541,8 @@ static char *opt_name  = NULL;
 static char *opt_title = NULL;
 static int oldbutton   = 3; /* button event on startup: 3 = release */
 
+static int usealtcolors = 0; /* 1 to use alternate palette */
+
 static char *usedfont = NULL;
 static double usedfontsize = 0;
 static double defaultfontsize = 0;
@@ -3218,6 +3221,11 @@ sixd_to_16bit(int x)
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 
+const char* getcolorname(int i)
+{
+    return (usealtcolors) ?  altcolorname[i] : colorname[i];
+}
+
 int
 xloadcolor(int i, const char *name, Color *ncolor)
 {
@@ -3236,7 +3244,7 @@ xloadcolor(int i, const char *name, Color *ncolor)
                        return XftColorAllocValue(xw.dpy, xw.vis,
                                                  xw.cmap, &color, ncolor);
                } else
-                       name = colorname[i];
+                       name = getcolorname(i);
        }
 
        return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
@@ -3256,8 +3264,8 @@ xloadcols(void)
 
        for (i = 0; i < LEN(dc.col); i++)
                if (!xloadcolor(i, NULL, &dc.col[i])) {
-                       if (colorname[i])
-                               die("Could not allocate color '%s'\n", colorname[i]);
+                       if (getcolorname(i))
+                               die("Could not allocate color '%s'\n", getcolorname(i));
                        else
                                die("Could not allocate color %d\n", i);
                }
@@ -3584,13 +3592,13 @@ xinit(void)
        cursor = XCreateFontCursor(xw.dpy, mouseshape);
        XDefineCursor(xw.dpy, xw.win, cursor);
 
-       if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
+       if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousefg), &xmousefg) == 0) {
                xmousefg.red   = 0xffff;
                xmousefg.green = 0xffff;
                xmousefg.blue  = 0xffff;
        }
 
-       if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
+       if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousebg), &xmousebg) == 0) {
                xmousebg.red   = 0x0000;
                xmousebg.green = 0x0000;
                xmousebg.blue  = 0x0000;
@@ -4145,6 +4153,14 @@ numlock(const Arg *dummy)
        term.numlock ^= 1;
 }
 
+void
+swapcolors(const Arg *dummy)
+{
+       usealtcolors = !usealtcolors;
+       xloadcols();
+       redraw();
+}
+
 char*
 kmap(KeySym k, uint state)
 {