config: added config branch and added config.def.h

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 = "mono:pixelsize=16:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -96,32 +96,27 @@ unsigned int tabspaces = 8;
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
 	/* 8 normal colors */
-	"black",
+	"#1e1e1e",
-	"red3",
+	"#f44747",
-	"green3",
+	"#608b4e",
-	"yellow3",
+	"#dcdcaa",
-	"blue2",
+	"#569cd6",
-	"magenta3",
+	"#c678dd",
-	"cyan3",
+	"#56b6c2",
-	"gray90",
+	"#d4d4d4",
-
+	"#808080",
-	/* 8 bright colors */
+	"#f44747",
-	"gray50",
+	"#608b4e",
-	"red",
+	"#dcdcaa",
-	"green",
+	"#569cd6",
-	"yellow",
+	"#c678dd",
-	"#5c5cff",
+	"#56b6c2",
-	"magenta",
+	"#d4d4d4",
-	"cyan",
-	"white",
-
 	[255] = 0,
-
 	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
+	"#1e1e1e",   /* 256 -> bg */
-	"#555555",
+	"#d4d4d4",   /* 257 -> fg */
-	"gray90", /* default foreground colour */
+	"#d4d4d4", /* 258 -> cursor */
-	"black", /* default background colour */
 };
 
 
@@ -129,10 +124,10 @@ static const char *colorname[] = {
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 258;
+unsigned int defaultfg = 257;
-unsigned int defaultbg = 259;
+unsigned int defaultbg = 256;
-unsigned int defaultcs = 256;
+unsigned int defaultcs = 258;
-static unsigned int defaultrcs = 257;
+static unsigned int defaultrcs = 0;
 
 /*
  * Default shape of cursor
@@ -176,11 +171,10 @@ static uint forcemousemod = ShiftMask;
  */
 static MouseShortcut mshortcuts[] = {
 	/* mask                 button      function    argument    release */
-	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
+	{ Button4,              XK_NO_MOD,  "\031" },
-	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
+	{ Button5,              XK_NO_MOD,  "\005" },
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
+        { XK_NO_MOD,            Button4,    kscrollup,  {.i = 1} },
-	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
+        { XK_NO_MOD,            Button5,    kscrolldown,{.i = 1} },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
 };
 
 /* Internal keyboard shortcuts. */
@@ -189,18 +183,19 @@ static MouseShortcut mshortcuts[] = {
 
 static Shortcut shortcuts[] = {
 	/* mask                 keysym          function        argument */
-	{ XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
+	{ MODKEY,		XK_Break,       sendbreak,      {.i =  0} },
-	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
+	{ MODKEY,		XK_Print,       toggleprinter,  {.i =  0} },
-	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
+	{ MODKEY,		XK_Print,       printscreen,    {.i =  0} },
-	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
+	{ ShiftMask,            XK_Insert,      clippaste,      {.i =  0} },
-	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1} },
+	{ MODKEY,               XK_c,           clipcopy,       {.i =  0} },
-	{ TERMMOD,              XK_Next,        zoom,           {.f = -1} },
+	{ MODKEY,               XK_v,           clippaste,      {.i =  0} },
-	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
+	{ MODKEY,               XK_p,           selpaste,       {.i =  0} },
-	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
+	{ MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
-	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
+	{ MODKEY,	        XK_k,           kscrollup,	{.i =  1} },
-	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
+	{ MODKEY,	        XK_j,           kscrolldown,	{.i =  1} },
-	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
+	{ MODKEY,		XK_U,           zoom,           {.f = +1} },
-	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
+	{ MODKEY|ShiftMask,	XK_U,           zoom,           {.f = +1} },
+	{ MODKEY|ShiftMask,	XK_I,           zoom,           {.f = -1} },
 };
 
 /*