diff --git a/config.def.h b/config.def.h index fd2a22d..433cd63 100644 --- a/config.def.h +++ b/config.def.h @@ -5,12 +5,9 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; +static char *font = "monospace:pixelsize=32:antialias=true:autohint=true"; /* Spare fonts */ -static char *font2[] = { -/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */ -/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */ -}; +static char *font2[] = { "NotoColorEmoji:pixelsize=24:antialias=true:autohint=true" }; static int borderpx = 2; @@ -99,6 +96,9 @@ char *termname = "st-256color"; */ unsigned int tabspaces = 8; +/* bg opacity */ +float alpha = 0.8; + /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ @@ -137,8 +137,8 @@ static const char *colorname[] = { */ unsigned int defaultfg = 258; unsigned int defaultbg = 259; -unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; +unsigned int defaultcs = 3; +static unsigned int defaultrcs = 50; /* * Default shape of cursor @@ -202,6 +202,7 @@ ResourcePref resources[] = { { "cursorColor", STRING, &colorname[258] }, { "termname", STRING, &termname }, { "shell", STRING, &shell }, + { "alpha", FLOAT, &alpha }, { "minlatency", INTEGER, &minlatency }, { "maxlatency", INTEGER, &maxlatency }, { "blinktimeout", INTEGER, &blinktimeout }, @@ -235,8 +236,8 @@ static Shortcut shortcuts[] = { { ControlMask, XK_Print, toggleprinter, {.i = 0} }, { ShiftMask, XK_Print, printscreen, {.i = 0} }, { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, - { TERMMOD, XK_Prior, zoom, {.f = +1} }, - { TERMMOD, XK_Next, zoom, {.f = -1} }, + { TERMMOD, XK_K, zoom, {.f = +2} }, + { TERMMOD, XK_J, zoom, {.f = -2} }, { TERMMOD, XK_Home, zoomreset, {.f = 0} }, { TERMMOD, XK_C, clipcopy, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} }, @@ -244,8 +245,10 @@ static Shortcut shortcuts[] = { { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, { TERMMOD, XK_Escape, keyboard_select,{ 0 } }, - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, + { ControlMask, XK_Page_Up, kscrollup, {.i = 10} }, + { ControlMask, XK_Page_Down, kscrolldown, {.i = 10} }, + { ControlMask, XK_k, kscrollup, {.i = 1} }, + { ControlMask, XK_j, kscrolldown, {.i = 1} }, }; /* diff --git a/config.h b/config.h index fd2a22d..433cd63 100644 --- a/config.h +++ b/config.h @@ -5,12 +5,9 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; +static char *font = "monospace:pixelsize=32:antialias=true:autohint=true"; /* Spare fonts */ -static char *font2[] = { -/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */ -/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */ -}; +static char *font2[] = { "NotoColorEmoji:pixelsize=24:antialias=true:autohint=true" }; static int borderpx = 2; @@ -99,6 +96,9 @@ char *termname = "st-256color"; */ unsigned int tabspaces = 8; +/* bg opacity */ +float alpha = 0.8; + /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ @@ -137,8 +137,8 @@ static const char *colorname[] = { */ unsigned int defaultfg = 258; unsigned int defaultbg = 259; -unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; +unsigned int defaultcs = 3; +static unsigned int defaultrcs = 50; /* * Default shape of cursor @@ -202,6 +202,7 @@ ResourcePref resources[] = { { "cursorColor", STRING, &colorname[258] }, { "termname", STRING, &termname }, { "shell", STRING, &shell }, + { "alpha", FLOAT, &alpha }, { "minlatency", INTEGER, &minlatency }, { "maxlatency", INTEGER, &maxlatency }, { "blinktimeout", INTEGER, &blinktimeout }, @@ -235,8 +236,8 @@ static Shortcut shortcuts[] = { { ControlMask, XK_Print, toggleprinter, {.i = 0} }, { ShiftMask, XK_Print, printscreen, {.i = 0} }, { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, - { TERMMOD, XK_Prior, zoom, {.f = +1} }, - { TERMMOD, XK_Next, zoom, {.f = -1} }, + { TERMMOD, XK_K, zoom, {.f = +2} }, + { TERMMOD, XK_J, zoom, {.f = -2} }, { TERMMOD, XK_Home, zoomreset, {.f = 0} }, { TERMMOD, XK_C, clipcopy, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} }, @@ -244,8 +245,10 @@ static Shortcut shortcuts[] = { { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, { TERMMOD, XK_Escape, keyboard_select,{ 0 } }, - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, + { ControlMask, XK_Page_Up, kscrollup, {.i = 10} }, + { ControlMask, XK_Page_Down, kscrolldown, {.i = 10} }, + { ControlMask, XK_k, kscrollup, {.i = 1} }, + { ControlMask, XK_j, kscrolldown, {.i = 1} }, }; /* diff --git a/st b/st new file mode 100755 index 0000000..871b403 Binary files /dev/null and b/st differ diff --git a/x.o b/x.o index 593fee1..b9da6ab 100644 Binary files a/x.o and b/x.o differ