diff --git a/config.def.h b/config.def.h index bb5596e..ada0639 100644 --- a/config.def.h +++ b/config.def.h @@ -5,9 +5,9 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false"; +static char font[] = "Input:size=12:antialias=true"; static int borderpx = 2; -static char shell[] = "/bin/sh"; +static char shell[] = "/bin/bash"; static char *utmp = NULL; static char stty_args[] = "stty raw -echo -iexten echonl"; @@ -40,7 +40,7 @@ static unsigned int actionfps = 30; * blinking timeout (set to 0 to disable blinking) for the terminal blinking * attribute. */ -static unsigned int blinktimeout = 800; +static unsigned int blinktimeout = 0; /* * thickness of underline and bar cursors @@ -61,30 +61,27 @@ static unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { - /* 8 normal colors */ - "black", - "red3", - "green3", - "yellow3", - "blue2", - "magenta3", - "cyan3", - "gray90", - - /* 8 bright colors */ - "gray50", - "red", - "green", - "yellow", - "#5c5cff", - "magenta", - "cyan", - "white", + "#202020", /* black dark */ + "#b03030", /* red dark */ + "#00b000", /* green dark */ + "#b08040", /* yellow dark */ + "#0070c4", /* blue dark */ + "#b000b0", /* magenta dark */ + "#00b0b0", /* cyan dark */ + "#b0b0b0", /* white dark */ + "#505050", /* black light */ + "#ff4040", /* red light */ + "#28ff28", /* green light */ + "#ffff28", /* yellow light */ + "#40a0ff", /* blue light */ + "#ff50ff", /* magenta light */ + "#30ffff", /* cyan light */ + "#ffffff", /* white light */ [255] = 0, /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", + "#505050", }; @@ -101,7 +98,7 @@ static unsigned int defaultcs = 256; * will reverse too. Another logic would only make the simple feature too * complex. */ -static unsigned int defaultitalic = 11; +static unsigned int defaultitalic = 7; static unsigned int defaultunderline = 7; /* Internal mouse shortcuts. */ @@ -113,21 +110,13 @@ static Mousekey mshortcuts[] = { }; /* Internal keyboard shortcuts. */ -#define MODKEY Mod1Mask +#define MODKEY ControlMask 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_Home, xzoomreset, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} }, + { MODKEY|ShiftMask, XK_Insert, selpaste, {.i = 0} }, { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} }, { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} }, - { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, }; /* @@ -210,7 +199,7 @@ static Key key[] = { { 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, XK_ANY_MOD, "\033[P", -1, 0, 0}, + { XK_KP_Delete, XK_ANY_MOD, "\033[3~", -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_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0}, @@ -265,7 +254,7 @@ static Key key[] = { { 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, XK_ANY_MOD, "\033[P", -1, 0, 0}, + { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0}, { XK_Home, ShiftMask, "\033[2J", 0, -1, 0}, diff --git a/config.mk b/config.mk index 3026d87..0067132 100644 --- a/config.mk +++ b/config.mk @@ -19,8 +19,8 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \ `pkg-config --libs freetype2` # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS} +CPPFLAGS += -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 +CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -O0 ${INCS} ${CPPFLAGS} LDFLAGS += -g ${LIBS} # compiler and linker