Merge remote-tracking branch 'upstream/master'

Conflicts:
	st.c
	st.info

diff --git a/config.h b/config.h
new file mode 100644 (file)
index 0000000..12b0fe4
--- /dev/null
+++ b/config.h
@@ -0,0 +1,378 @@
+/* See LICENSE file for copyright and license details. */
+
+/*
+ * appearance
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */
+static char font[] = "Fantasque Sans Mono:pixelsize=16:antialias=true:autohint=false";
+static int borderpx = 1;
+static char shell[] = "/bin/sh";
+static char *utmp = NULL;
+
+/* identification sequence returned in DA and DECID */
+static 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: " `'\"()[]{}"
+ */
+static char worddelimiters[] = " ";
+
+/* selection timeouts (in milliseconds) */
+static unsigned int doubleclicktimeout = 300;
+static unsigned int tripleclicktimeout = 600;
+
+/* alt screens */
+static bool allowaltscreen = true;
+
+/* 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 = 250;
+
+/*
+ * bell volume. It must be a value between -100 and 100. Use 0 for disabling
+ * it
+ */
+static int bellvolume = 0;
+
+/* TERM value */
+//static char termname[] = "vt220";
+static char termname[] = "st-256color";
+
+static unsigned int tabspaces = 4;
+
+
+/* Terminal colors (16 first used in escape sequence) */
+static const char *colorname[] = {
+       /* 8 normal colors */
+       "#2e3436",
+       "#cc0000",
+       "#4e9a06",
+       "#c4a000",
+       "#3465a4",
+       "#75507b",
+       "#06989a",
+       "#d3d7cf",
+
+       /* 8 bright colors */
+       "#555753",
+       "#ef2929",
+       "#8ae234",
+       "#fce94f",
+       "#729fcf",
+       "#ad7fa8",
+       "#34e2e2",
+       "#eeeeec",
+
+       [255] = 0,
+
+       /* more colors can be added after 255 to use with DefaultXX */
+       "#cccccc",
+};
+
+
+/*
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+static unsigned int defaultfg = 7;
+static unsigned int defaultbg = 0;
+static unsigned int defaultcs = 256;
+
+/*
+ * Colors used, when the specific fg == defaultfg. So in reverse mode this
+ * will reverse too. Another logic would only make the simple feature too
+ * complex.
+ */
+static unsigned int defaultitalic = 11;
+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\031\031" },
+       { Button5,              XK_ANY_MOD,     "\005\005\005" },
+};
+
+/* Internal keyboard shortcuts. */
+#define MODKEY Mod1Mask
+
+static Shortcut shortcuts[] = {
+       /* 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} },
+       { MODKEY|ShiftMask,     XK_Home,        xzoomreset,     {.i =  0} },
+       { ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
+       { MODKEY|ShiftMask,     XK_Insert,      clippaste,      {.i =  0} },
+       { MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
+};
+
+/*
+ * Special keys (change & recompile st.info accordingly)
+ *
+ * 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)
+ * appkey value:
+ * * 0: no value
+ * * > 0: keypad application mode enabled
+ * *   = 2: term.numlock = 1
+ * * < 0: keypad application mode disabled
+ * appcursor value:
+ * * 0: no value
+ * * > 0: cursor application mode enabled
+ * * < 0: cursor application mode disabled
+ * crlf value
+ * * 0: no value
+ * * > 0: crlf mode is enabled
+ * * < 0: crlf mode is disabled
+ *
+ * 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.
+ */
+
+/*
+ * 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 };
+
+/*
+ * 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;
+
+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[3~",      -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[3~",      -1,    0,    0},
+       { XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},
+       { XK_BackSpace,     XK_ANY_MOD,     "\177",         -1,    0,    0},
+       { XK_BackSpace,     XK_ANY_MOD,     "\177",         +1,    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},
+};
+
+/*
+ * 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,
+};
+

diff --git a/config.mk b/config.mk
index 3026d87..3efb1d9 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -4,7 +4,7 @@ VERSION = 0.5
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
+PREFIX = /home/jasonwoof/software/virt
 MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include

diff --git a/st.c b/st.c
index 39d3fee..ce8c5c9 100644 (file)
--- a/st.c
+++ b/st.c
@@ -3954,15 +3954,16 @@ run(void) {
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
-                       if(blinktimeout) {
-                               blinkset = tattrset(ATTR_BLINK);
-                               if(!blinkset)
-                                       MODBIT(term.mode, 0, MODE_BLINK);
-                       }
                }
 
-               if(FD_ISSET(xfd, &rfd))
+               if(FD_ISSET(xfd, &rfd)) {
                        xev = actionfps;
+                       if(blinktimeout) {
+                               lastblink = now;
+                               MODBIT(term.mode, 1, MODE_BLINK);
+                               blinkset = 1;
+                       }
+               }
 
                clock_gettime(CLOCK_MONOTONIC, &now);
                drawtimeout.tv_sec = 0;