Move config.h include from st.c to x.c

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index a3e87e2..1c181ab 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -5,19 +5,82 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */

-static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";

 static int borderpx = 2;
 static int borderpx = 2;

-static char shell[] = "/bin/sh";

 
 

-/* double-click timeout (in milliseconds) between clicks for selection */
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: utmp option
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
+char *shell = "/bin/sh";
+char *utmp = NULL;
+char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
+
+/* identification sequence returned in DA and DECID */
+char *vtiden = "\033[?6c";
+
+/* Kerning / character bounding-box multipliers */
+static float cwscale = 1.0;
+static float chscale = 1.0;
+
+/*
+ * word delimiter string
+ *
+ * More advanced example: " `'\"()[]{}"
+ */
+char *worddelimiters = " ";
+
+/* selection timeouts (in milliseconds) */

 static unsigned int doubleclicktimeout = 300;
 static unsigned int tripleclicktimeout = 600;
 
 static unsigned int doubleclicktimeout = 300;
 static unsigned int tripleclicktimeout = 600;
 

-/* TERM value */
-static char termname[] = "st-256color";
+/* alt screens */
+int allowaltscreen = 1;

 
 

-static unsigned int tabspaces = 8;
+/* frames per second st should at maximum draw to the screen */
+static unsigned int xfps = 120;
+static unsigned int actionfps = 30;

 
 

+/*
+ * blinking timeout (set to 0 to disable blinking) for the terminal blinking
+ * attribute.
+ */
+static unsigned int blinktimeout = 800;
+
+/*
+ * thickness of underline and bar cursors
+ */
+static unsigned int cursorthickness = 2;
+
+/*
+ * bell volume. It must be a value between -100 and 100. Use 0 for disabling
+ * it
+ */
+static int bellvolume = 0;
+
+/* default TERM value */
+char *termname = "st-256color";
+
+/*
+ * spaces per tab
+ *
+ * When you are changing this value, don't forget to adapt the »it« value in
+ * the st.info and appropriately install the st.info in the environment where
+ * you use this st version.
+ *
+ *     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
+ */
+unsigned int tabspaces = 8;

 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {


@@ -45,28 +108,76 @@ static const char *colorname[] = {
 
        /* more colors can be added after 255 to use with DefaultXX */
        "#cccccc",
 
        /* more colors can be added after 255 to use with DefaultXX */
        "#cccccc",

-       "#333333",
+       "#555555",

 };
 
 
 /*
  * Default colors (colorname index)
 };
 
 
 /*
  * Default colors (colorname index)

- * foreground, background, cursor, unfocused cursor
+ * foreground, background, cursor, reverse cursor

  */
  */

-static unsigned int defaultfg = 7;
-static unsigned int defaultbg = 0;
+unsigned int defaultfg = 7;
+unsigned int defaultbg = 0;

 static unsigned int defaultcs = 256;
 static unsigned int defaultcs = 256;

-static unsigned int defaultucs = 257;
+static unsigned int defaultrcs = 257;
+
+/*
+ * Default shape of cursor
+ * 2: Block ("█")
+ * 4: Underline ("_")
+ * 6: Bar ("|")
+ * 7: Snowman ("☃")
+ */
+static unsigned int cursorshape = 2;
+
+/*
+ * Default columns and rows numbers
+ */
+
+static unsigned int cols = 80;
+static unsigned int rows = 24;
+
+/*
+ * Default colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
+
+/*
+ * Color used to display font attributes when fontconfig selected a font which
+ * doesn't match the ones requested.
+ */
+static unsigned int defaultattr = 11;
+
+/*
+ * Internal mouse shortcuts.
+ * Beware that overloading Button1 will disable the selection.
+ */
+static MouseShortcut mshortcuts[] = {
+       /* button               mask            string */
+       { Button4,              XK_ANY_MOD,     "\031" },
+       { Button5,              XK_ANY_MOD,     "\005" },
+};

 
 

-/* Internal shortcuts. */
+/* Internal keyboard shortcuts. */

 #define MODKEY Mod1Mask
 #define MODKEY Mod1Mask

+#define TERMMOD (ControlMask|ShiftMask)

 
 static Shortcut shortcuts[] = {
 
 static Shortcut shortcuts[] = {

-       /* modifier             key             function        argument */
-       { MODKEY|ShiftMask,     XK_Prior,       xzoom,          {.i = +1} },
-       { MODKEY|ShiftMask,     XK_Next,        xzoom,          {.i = -1} },
-       { ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
-       { MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
+       /* 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} },
+       { TERMMOD,              XK_Prior,       zoom,           {.f = +1} },
+       { TERMMOD,              XK_Next,        zoom,           {.f = -1} },
+       { TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
+       { TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
+       { TERMMOD,              XK_V,           clippaste,      {.i =  0} },
+       { TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
+       { TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
+       { TERMMOD,              XK_I,           iso14755,       {.i =  0} },

 };
 
 /*
 };
 
 /*


@@ -75,12 +186,12 @@ static Shortcut shortcuts[] = {
  * Mask value:
  * * Use XK_ANY_MOD to match the key no matter modifiers state
  * * Use XK_NO_MOD to match the key alone (no modifiers)
  * Mask value:
  * * Use XK_ANY_MOD to match the key no matter modifiers state
  * * Use XK_NO_MOD to match the key alone (no modifiers)

- * keypad value:
+ * appkey value:

  * * 0: no value
  * * > 0: keypad application mode enabled
  * *   = 2: term.numlock = 1
  * * < 0: keypad application mode disabled
  * * 0: no value
  * * > 0: keypad application mode enabled
  * *   = 2: term.numlock = 1
  * * < 0: keypad application mode disabled

- * cursor value:
+ * appcursor value:

  * * 0: no value
  * * > 0: cursor application mode enabled
  * * < 0: cursor application mode disabled
  * * 0: no value
  * * > 0: cursor application mode enabled
  * * < 0: cursor application mode disabled


@@ -89,21 +200,38 @@ static Shortcut shortcuts[] = {
  * * > 0: crlf mode is enabled
  * * < 0: crlf mode is disabled
  *
  * * > 0: crlf mode is enabled
  * * < 0: crlf mode is disabled
  *

- * Be careful with the order of the definitons because st searchs in
- * this table sequencially, so any XK_ANY_MOD must be in the last
+ * Be careful with the order of the definitions because st searches in
+ * this table sequentially, so any XK_ANY_MOD must be in the last

  * position for a key.
  */
 
 /*
  * position for a key.
  */
 
 /*

- * If you want something else but the function keys of X11 (0xFF00 - 0xFFFF)
- * mapped below, add them to this array.
+ * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
+ * to be mapped below, add them to this array.

  */
 static KeySym mappedkeys[] = { -1 };
 
  */
 static KeySym mappedkeys[] = { -1 };
 

-/* key, mask, output, keypad, cursor, crlf */
+/*
+ * State bits to ignore when matching key or button events.  By default,
+ * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
+ */
+static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
+
+/*
+ * Override mouse-select while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forceselmod = ShiftMask;
+
+/*
+ * This is the huge key array which defines all compatibility to the Linux
+ * world. Please decide about changes wisely.
+ */

 static Key key[] = {
 static Key key[] = {

-       /* keysym             mask         string         keypad cursor crlf */
-       { XK_KP_Home,       ShiftMask,      "\033[1;2H",     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_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},


@@ -119,9 +247,12 @@ static Key key[] = {
        { 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_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_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0,    0},

        { XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        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},


@@ -131,8 +262,12 @@ 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_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,     ShiftMask,      "\033[3;2~",     0,    0,    0},
-       { XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",       0,    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_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},


@@ -151,25 +286,40 @@ 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_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,            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,            Mod1Mask,       "\033[1;3A",     0,    0,    0},

+       { XK_Up,         ShiftMask|Mod1Mask,"\033[1;4A",     0,    0,    0},
+       { XK_Up,            ControlMask,    "\033[1;5A",     0,    0,    0},
+       { XK_Up,      ShiftMask|ControlMask,"\033[1;6A",     0,    0,    0},
+       { XK_Up,       ControlMask|Mod1Mask,"\033[1;7A",     0,    0,    0},
+       { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A",  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_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,          Mod1Mask,       "\033[1;3B",     0,    0,    0},

+       { XK_Down,       ShiftMask|Mod1Mask,"\033[1;4B",     0,    0,    0},
+       { XK_Down,          ControlMask,    "\033[1;5B",     0,    0,    0},
+       { XK_Down,    ShiftMask|ControlMask,"\033[1;6B",     0,    0,    0},
+       { XK_Down,     ControlMask|Mod1Mask,"\033[1;7B",     0,    0,    0},
+       { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",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_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,          Mod1Mask,       "\033[1;3D",     0,    0,    0},

-       { XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1,    0},
+       { XK_Left,       ShiftMask|Mod1Mask,"\033[1;4D",     0,    0,    0},
+       { XK_Left,          ControlMask,    "\033[1;5D",     0,    0,    0},
+       { XK_Left,    ShiftMask|ControlMask,"\033[1;6D",     0,    0,    0},
+       { XK_Left,     ControlMask|Mod1Mask,"\033[1;7D",     0,    0,    0},
+       { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",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_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,         Mod1Mask,       "\033[1;3C",     0,    0,    0},

+       { XK_Right,      ShiftMask|Mod1Mask,"\033[1;4C",     0,    0,    0},
+       { XK_Right,         ControlMask,    "\033[1;5C",     0,    0,    0},
+       { XK_Right,   ShiftMask|ControlMask,"\033[1;6C",     0,    0,    0},
+       { XK_Right,    ControlMask|Mod1Mask,"\033[1;7C",     0,    0,    0},
+       { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",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_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},


@@ -183,14 +333,27 @@ 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_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,        ShiftMask,      "\033[3;2~",     0,    0,    0},
-       { XK_Delete,        XK_ANY_MOD,     "\033[3~",       0,    0,    0},
-       { XK_Home,          ShiftMask,      "\033[1;2H",     0,    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_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_End,           XK_ANY_MOD,     "\033[4~",       0,    0,    0},

-       { XK_Prior,         XK_NO_MOD,      "\033[5~",       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_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},


@@ -213,7 +376,7 @@ static Key key[] = {
        { 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_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 */  ShiftMask,      "\033[1;5S",     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_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},


@@ -281,3 +444,22 @@ static Key key[] = {
        { XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0,    0},
 };
 
        { XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0,    0},
 };
 

+/*
+ * Selection types' masks.
+ * Use the same masks as usual.
+ * Button1Mask is always unset, to make masks match between ButtonPress.
+ * ButtonRelease and MotionNotify.
+ * If no match is found, regular selection is used.
+ */
+static uint selmasks[] = {
+       [SEL_RECTANGULAR] = Mod1Mask,
+};
+
+/*
+ * Printable characters in ASCII, used to estimate the advance width
+ * of single wide characters.
+ */
+static char ascii_printable[] =
+       " !\"#$%&'()*+,-./0123456789:;<=>?"
+       "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+       "`abcdefghijklmnopqrstuvwxyz{|}~";