diff options
Diffstat (limited to 'config.def.h')
| -rw-r--r-- | config.def.h | 97 |
1 files changed, 76 insertions, 21 deletions
diff --git a/config.def.h b/config.def.h index 2cd740a..c535ee0 100644 --- a/config.def.h +++ b/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 = "JetBrainsMonoNL Nerd Font Mono:pixelsize=12:antialias=true:autohint=true"; static int borderpx = 2; /* @@ -68,6 +68,18 @@ static unsigned int blinktimeout = 800; static unsigned int cursorthickness = 2; /* + * 1: render most of the lines/blocks characters without using the font for + * perfect alignment between cells (U2500 - U259F except dashes/diagonals). + * Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored. + * 0: disable (render all U25XX glyphs normally from the font). + */ +const int boxdraw = 1; +const int boxdraw_bold = 1; + +/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */ +const int boxdraw_braille = 1; + +/* * bell volume. It must be a value between -100 and 100. Use 0 for disabling * it */ @@ -91,37 +103,35 @@ char *termname = "st-256color"; * * stty tabs */ -unsigned int tabspaces = 8; +unsigned int tabspaces = 8; // TODO change to 4 /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ - "black", - "red3", - "green3", - "yellow3", - "blue2", - "magenta3", - "cyan3", - "gray90", + "#101010", + "#ed1207", + "#2bb500", + "#fc9700", + "#1578c1", + "#b14ff7", + "#00c4a3", + "white", /* 8 bright colors */ "gray50", - "red", - "green", - "yellow", - "#5c5cff", - "magenta", - "cyan", + "#ed1207", + "#2bb500", + "#fc9700", + "#1578c1", + "#b14ff7", + "#00c4a3", "white", [255] = 0, - /* more colors can be added after 255 to use with DefaultXX */ + /* more colors can be added after 255 to use with defaultxx */ "#cccccc", "#555555", - "gray90", /* default foreground colour */ - "black", /* default background colour */ }; @@ -129,8 +139,8 @@ static const char *colorname[] = { * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ -unsigned int defaultfg = 258; -unsigned int defaultbg = 259; +unsigned int defaultfg = 7; +unsigned int defaultbg = 0; unsigned int defaultcs = 256; static unsigned int defaultrcs = 257; @@ -144,6 +154,12 @@ static unsigned int defaultrcs = 257; static unsigned int cursorshape = 2; /* + * Whether to use pixel geometry or cell geometry + */ + +static Geometry geometry = CellGeometry; + +/* * Default columns and rows numbers */ @@ -151,6 +167,13 @@ static unsigned int cols = 80; static unsigned int rows = 24; /* + * Default width and height (including borders!) + */ + +static unsigned int width = 564; +static unsigned int height = 364; + +/* * Default colour and shape of the mouse cursor */ static unsigned int mouseshape = XC_xterm; @@ -176,6 +199,10 @@ static uint forcemousemod = ShiftMask; */ static MouseShortcut mshortcuts[] = { /* mask button function argument release */ + { ControlMask, Button4, zoom, {.f = +1}, 0 }, + { ControlMask, Button5, zoom, {.f = -1}, 0 }, + { XK_ANY_MOD, Button4, kscrollup, {.i = 3}, 0 }, + { XK_ANY_MOD, Button5, kscrolldown, {.i = 3}, 0 }, { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, @@ -195,12 +222,16 @@ static Shortcut shortcuts[] = { { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, { TERMMOD, XK_Prior, zoom, {.f = +1} }, { TERMMOD, XK_Next, zoom, {.f = -1} }, + { ControlMask, XK_equal, zoom, {.f = +1} }, + { ControlMask, XK_minus, zoom, {.f = -1} }, { TERMMOD, XK_Home, zoomreset, {.f = 0} }, { TERMMOD, XK_C, clipcopy, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} }, { TERMMOD, XK_Y, selpaste, {.i = 0} }, { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, + { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, + { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, }; /* @@ -472,3 +503,27 @@ static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?" "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" "`abcdefghijklmnopqrstuvwxyz{|}~"; + +/** + * Undercurl style. Set UNDERCURL_STYLE to one of the available styles. + * + * Curly: Dunno how to draw it *shrug* + * _ _ _ _ + * ( ) ( ) ( ) ( ) + * (_) (_) (_) (_) + * + * Spiky: + * /\ /\ /\ /\ + * \/ \/ \/ + * + * Capped: + * _ _ _ + * / \ / \ / \ + * \_/ \_/ + */ +// Available styles +#define UNDERCURL_CURLY 0 +#define UNDERCURL_SPIKY 1 +#define UNDERCURL_CAPPED 2 +// Active style +#define UNDERCURL_STYLE UNDERCURL_SPIKY |