minor update for patch xresources

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 133d853..7b3e208 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -173,6 +173,44 @@ 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] },
+               { "foreground",   STRING,  &colorname[258] },
+               { "background",   STRING,  &colorname[259] },
+               { "cursorColor",  STRING,  &colorname[256] },
+               { "recursorColor",STRING,  &colorname[257] },
+               { "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 },
+               { "alpha",        FLOAT,   &alpha },
+};
+
 /*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
@@ -188,7 +226,7 @@ static MouseShortcut mshortcuts[] = {
 
 /* Internal keyboard shortcuts. */
 #define MODKEY Mod1Mask
-#define TERMMOD (ControlMask|ShiftMask)
+#define TERMMOD (MODKEY|ShiftMask)
 
 static Shortcut shortcuts[] = {
        /* mask                 keysym          function        argument */
@@ -204,6 +242,8 @@ static Shortcut shortcuts[] = {
        { TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
        { ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
        { TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
+       { TERMMOD,              XK_K,           zoom,           {.f = +1} },
+       { TERMMOD,              XK_J,           zoom,           {.f = -1} },
 };
 
 /*