config

diff --combined config.def.h
index 47591cc,d326cc0..399ef1f
--- 1/config.def.h
--- 2/config.def.h
+++ b/config.def.h
@@@ -127,40 -127,19 +127,40 @@@ static const char *colorname[] = 
   * Default colors (colorname index)
   * foreground, background, cursor, reverse cursor
   */
- unsigned int defaultfg = 15;
+ unsigned int defaultfg = 7;
  unsigned int defaultbg = 0;
- static unsigned int defaultcs = 256;
+ static unsigned int defaultcs = 15;
  static unsigned int defaultrcs = 257;
  
 +unsigned int const currentBg = 0, buffSize = 2048;
 +/// [Vim Browse] Colors for search results currently on screen.
 +unsigned int const highlightBg = 9, highlightFg = 15;
 +char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t";
 +char *nmKeys [] = {              ///< Shortcusts executed in normal mode
 +  "R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n",
 +  "Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf"
 +};
 +unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys);
 +/// Style of the {command, search} string shown in the right corner (y,v,V,/)
 +Glyph styleSearch = {' ', ATTR_ITALIC | ATTR_BOLD_FAINT, 7, 16};
 +Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11},
 +                 {' ', ATTR_ITALIC, 232, 4}, {' ', ATTR_ITALIC, 232, 12}};
 +
  /*
 - * Default shape of cursor
 - * 2: Block ("█")
 - * 4: Underline ("_")
 - * 6: Bar ("|")
 - * 7: Snowman ("☃")
 + * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Functions-using-CSI-_-ordered-by-the-final-character-lparen-s-rparen:CSI-Ps-SP-q.1D81
 + * Default style of cursor
 + * 0: Blinking block
 + * 1: Blinking block (default)
 + * 2: Steady block ("█")
 + * 3: Blinking underline
 + * 4: Steady underline ("_")
 + * 5: Blinking bar
 + * 6: Steady bar ("|")
 + * 7: Blinking st cursor
 + * 8: Steady st cursor
   */
 -static unsigned int cursorshape = 2;
 +static unsigned int cursorstyle = 1;
 +static Rune stcursor = 0x2603; /* snowman (U+2603) */
  
  /*
   * Default columns and rows numbers
@@@ -189,42 -168,6 +189,42 @@@ static unsigned int defaultattr = 11
   */
  static uint forcemousemod = ShiftMask;
  
 +/*
 + * Xresources preferences to load at startup
 + */
 +ResourcePref resources[] = {
 +              { "font",         STRING,  &font },
 +              { "color0",       STRING,  &colorname[0] },
 +              { "color1",       STRING,  &colorname[1] },
 +              { "color2",       STRING,  &colorname[2] },
 +              { "color3",       STRING,  &colorname[3] },
 +              { "color4",       STRING,  &colorname[4] },
 +              { "color5",       STRING,  &colorname[5] },
 +              { "color6",       STRING,  &colorname[6] },
 +              { "color7",       STRING,  &colorname[7] },
 +              { "color8",       STRING,  &colorname[8] },
 +              { "color9",       STRING,  &colorname[9] },
 +              { "color10",      STRING,  &colorname[10] },
 +              { "color11",      STRING,  &colorname[11] },
 +              { "color12",      STRING,  &colorname[12] },
 +              { "color13",      STRING,  &colorname[13] },
 +              { "color14",      STRING,  &colorname[14] },
 +              { "color15",      STRING,  &colorname[15] },
 +              { "background",   STRING,  &colorname[256] },
 +              { "foreground",   STRING,  &colorname[257] },
 +              { "cursorColor",  STRING,  &colorname[258] },
 +              { "termname",     STRING,  &termname },
 +              { "shell",        STRING,  &shell },
 +              { "minlatency",   INTEGER, &minlatency },
 +              { "maxlatency",   INTEGER, &maxlatency },
 +              { "blinktimeout", INTEGER, &blinktimeout },
 +              { "bellvolume",   INTEGER, &bellvolume },
 +              { "tabspaces",    INTEGER, &tabspaces },
 +              { "borderpx",     INTEGER, &borderpx },
 +              { "cwscale",      FLOAT,   &cwscale },
 +              { "chscale",      FLOAT,   &chscale },
 +};
 +
  /*
   * Internal mouse shortcuts.
   * Beware that overloading Button1 will disable the selection.
@@@ -256,7 -199,6 +256,7 @@@ static Shortcut shortcuts[] = 
        { TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
        { ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
        { TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
 +      { MODKEY,               XK_c,           normalMode,     {.i =  0} },
  };
  
  /*