Have selected() check whether selection exists

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 32d107d..1c181ab 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
+static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -16,12 +16,12 @@ static int borderpx = 2;
  * 4: value of shell in /etc/passwd
  * 5: value of shell in config.h
  */
-static char shell[] = "/bin/sh";
-static char *utmp = NULL;
-static char stty_args[] = "stty raw pass8 nl -echo -iexten -cstopb 38400";
+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 */
-static char vtiden[] = "\033[?6c";
+char *vtiden = "\033[?6c";
 
 /* Kerning / character bounding-box multipliers */
 static float cwscale = 1.0;
@@ -32,14 +32,14 @@ static float chscale = 1.0;
  *
  * More advanced example: " `'\"()[]{}"
  */
-static char worddelimiters[] = " ";
+char *worddelimiters = " ";
 
 /* selection timeouts (in milliseconds) */
 static unsigned int doubleclicktimeout = 300;
 static unsigned int tripleclicktimeout = 600;
 
 /* alt screens */
-static int allowaltscreen = 1;
+int allowaltscreen = 1;
 
 /* frames per second st should at maximum draw to the screen */
 static unsigned int xfps = 120;
@@ -63,7 +63,7 @@ static unsigned int cursorthickness = 2;
 static int bellvolume = 0;
 
 /* default TERM value */
-static char termname[] = "st-256color";
+char *termname = "st-256color";
 
 /*
  * spaces per tab
@@ -80,7 +80,7 @@ static char termname[] = "st-256color";
  *
  *     stty tabs
  */
-static unsigned int tabspaces = 8;
+unsigned int tabspaces = 8;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
@@ -116,8 +116,8 @@ static const char *colorname[] = {
  * Default colors (colorname index)
  * 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 defaultrcs = 257;
 
@@ -130,6 +130,13 @@ static unsigned int defaultrcs = 257;
  */
 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
  */
@@ -155,6 +162,7 @@ static MouseShortcut mshortcuts[] = {
 
 /* Internal keyboard shortcuts. */
 #define MODKEY Mod1Mask
+#define TERMMOD (ControlMask|ShiftMask)
 
 static Shortcut shortcuts[] = {
        /* mask                 keysym          function        argument */
@@ -162,15 +170,14 @@ static Shortcut shortcuts[] = {
        { 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} },
-       { MODKEY,               XK_Control_L,   iso14755,       {.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} },
 };
 
 /*
@@ -456,4 +463,3 @@ static char ascii_printable[] =
        " !\"#$%&'()*+,-./0123456789:;<=>?"
        "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
        "`abcdefghijklmnopqrstuvwxyz{|}~";
-