Fix selection: selclear in tputc

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 82b1b09..fdbacfd 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -11,13 +11,15 @@ static int borderpx = 2;
 /*
  * What program is execed by st depends of these precedence rules:
  * 1: program passed with -e
 /*
  * What program is execed by st depends of these precedence rules:
  * 1: program passed with -e

- * 2: utmp option
+ * 2: scroll and/or utmp

  * 3: SHELL environment variable
  * 4: value of shell in /etc/passwd
  * 5: value of shell in config.h
  */
 static char *shell = "/bin/sh";
 char *utmp = NULL;
  * 3: SHELL environment variable
  * 4: value of shell in /etc/passwd
  * 5: value of shell in config.h
  */
 static char *shell = "/bin/sh";
 char *utmp = NULL;

+/* scroll program: to enable use a string like "scroll" */
+char *scroll = NULL;

 char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
 
 /* identification sequence returned in DA and DECID */
 char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
 
 /* identification sequence returned in DA and DECID */


@@ -30,9 +32,9 @@ static float chscale = 1.0;
 /*
  * word delimiter string
  *
 /*
  * word delimiter string
  *

- * More advanced example: " `'\"()[]{}"
+ * More advanced example: L" `'\"()[]{}"

  */
  */

-char *worddelimiters = " ";
+wchar_t *worddelimiters = L" ";

 
 /* selection timeouts (in milliseconds) */
 static unsigned int doubleclicktimeout = 300;
 
 /* selection timeouts (in milliseconds) */
 static unsigned int doubleclicktimeout = 300;


@@ -41,9 +43,14 @@ static unsigned int tripleclicktimeout = 600;
 /* alt screens */
 int allowaltscreen = 1;
 
 /* alt screens */
 int allowaltscreen = 1;
 

-/* frames per second st should at maximum draw to the screen */
-static unsigned int xfps = 120;
-static unsigned int actionfps = 30;
+/*
+ * draw latency range in ms - from new content/keypress/etc until drawing.
+ * within this range, st draws when content stops arriving (idle). mostly it's
+ * near minlatency, but it waits longer for slow updates to avoid partial draw.
+ * low minlatency will tear/flicker more, as it can "detect" idle too early.
+ */
+static double minlatency = 8;
+static double maxlatency = 33;

 
 /*
  * blinking timeout (set to 0 to disable blinking) for the terminal blinking
 
 /*
  * blinking timeout (set to 0 to disable blinking) for the terminal blinking


@@ -150,14 +157,22 @@ static unsigned int mousebg = 0;
  */
 static unsigned int defaultattr = 11;
 
  */
 static unsigned int defaultattr = 11;
 

+/*
+ * Force mouse select/shortcuts 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 forcemousemod = ShiftMask;
+

 /*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {
 /*
  * 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" },
+       /* mask                 button   function        argument       release */
+       { XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
+       { XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
+       { XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },

 };
 
 /* Internal keyboard shortcuts. */
 };
 
 /* Internal keyboard shortcuts. */


@@ -176,8 +191,8 @@ static Shortcut shortcuts[] = {
        { TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
        { TERMMOD,              XK_V,           clippaste,      {.i =  0} },
        { TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
        { TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
        { TERMMOD,              XK_V,           clippaste,      {.i =  0} },
        { TERMMOD,              XK_Y,           selpaste,       {.i =  0} },

+       { ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },

        { TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
        { TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },

-       { TERMMOD,              XK_I,           iso14755,       {.i =  0} },

 };
 
 /*
 };
 
 /*


@@ -195,10 +210,6 @@ static Shortcut shortcuts[] = {
  * * 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

- * 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
  *
  * 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


@@ -217,13 +228,6 @@ static KeySym mappedkeys[] = { -1 };
  */
 static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 
  */
 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.
 /*
  * This is the huge key array which defines all compatibility to the Linux
  * world. Please decide about changes wisely.