Revert "Optimize memory footprint of line buffers"

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 986f6e2..bb5596e 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -8,10 +8,15 @@
 static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
 static int borderpx = 2;
 static char shell[] = "/bin/sh";
 static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
 static int borderpx = 2;
 static char shell[] = "/bin/sh";

+static char *utmp = NULL;
+static char stty_args[] = "stty raw -echo -iexten echonl";

 
 

-/* Kerning / character bounding-box mutlipliers */
-float cwscale = 1.0;
-float chscale = 1.0;
+/* 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
 
 /*
  * word delimiter string


@@ -37,6 +42,11 @@ static unsigned int actionfps = 30;
  */
 static unsigned int blinktimeout = 800;
 
  */
 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
 /*
  * bell volume. It must be a value between -100 and 100. Use 0 for disabling
  * it


@@ -107,10 +117,16 @@ static Mousekey mshortcuts[] = {
 
 static Shortcut shortcuts[] = {
        /* mask                 keysym          function        argument */
 
 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_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} },
        { 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} },
 };
 
        { MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
 };
 


@@ -134,7 +150,7 @@ 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
+ * 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.
  */
  * this table sequentially, so any XK_ANY_MOD must be in the last
  * position for a key.
  */


@@ -151,9 +167,15 @@ 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;
+

 static Key key[] = {
        /* keysym           mask            string      appkey appcursor crlf */
 static Key key[] = {
        /* keysym           mask            string      appkey appcursor crlf */

-       { XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,    0,    0},
+       { 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},


@@ -184,10 +206,10 @@ 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,     ControlMask,    "\033[2J",      -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,     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,     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_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},


@@ -208,7 +230,6 @@ 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,            ControlMask,    "\033[1;5A",     0,    0,    0},
        { XK_Up,            Mod1Mask,       "\033[1;3A",     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},


@@ -240,13 +261,15 @@ 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,        ControlMask,    "\033[2J",      -1,    0,    0},
+       { XK_Delete,        ControlMask,    "\033[M",       -1,    0,    0},

        { XK_Delete,        ControlMask,    "\033[3;5~",    +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,        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_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0,    0},
        { XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},

-       { XK_Home,          ShiftMask,      "\033[1;2H",     0,    0,    0},
+       { XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0,    0},
+       { XK_Home,          ShiftMask,      "\033[2J",       0,   -1,    0},
+       { XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1,    0},

        { XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1,    0},
        { XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1,    0},
        { XK_End,           ControlMask,    "\033[J",       -1,    0,    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},


@@ -355,7 +378,6 @@ static Key key[] = {
  * ButtonRelease and MotionNotify.
  * If no match is found, regular selection is used.
  */
  * ButtonRelease and MotionNotify.
  * If no match is found, regular selection is used.
  */

-

 static uint selmasks[] = {
        [SEL_RECTANGULAR] = Mod1Mask,
 };
 static uint selmasks[] = {
        [SEL_RECTANGULAR] = Mod1Mask,
 };