@ -0,0 +1,480 @@ | |||
/* See LICENSE file for copyright and license details. */ | |||
/* | |||
* appearance | |||
* | |||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html | |||
*/ | |||
static char *font = "xos4 Terminus:bold:pixelsize=14"; | |||
static int borderpx = 1; | |||
/* disable bold and italic font styles */ | |||
int disablebold = 1; | |||
int disableitalic = 1; | |||
/* | |||
* What program is execed by st depends of these precedence rules: | |||
* 1: program passed with -e | |||
* 2: utmp option | |||
* 3: SHELL environment variable | |||
* 4: value of shell in /etc/passwd | |||
* 5: value of shell in config.h | |||
*/ | |||
static char *shell = "/bin/sh"; | |||
char *utmp = NULL; | |||
char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; | |||
/* identification sequence returned in DA and DECID */ | |||
char *vtiden = "\033[?6c"; | |||
/* Kerning / character bounding-box multipliers */ | |||
static float cwscale = 1.0; | |||
static float chscale = 1.0; | |||
/* | |||
* word delimiter string | |||
* | |||
* More advanced example: " `'\"()[]{}" | |||
*/ | |||
char *worddelimiters = " `'\"()[]{};|"; | |||
/* selection timeouts (in milliseconds) */ | |||
static unsigned int doubleclicktimeout = 300; | |||
static unsigned int tripleclicktimeout = 600; | |||
/* alt screens */ | |||
int allowaltscreen = 1; | |||
/* frames per second st should at maximum draw to the screen */ | |||
static unsigned int xfps = 60; | |||
static unsigned int actionfps = 30; | |||
/* | |||
* blinking timeout (set to 0 to disable blinking) for the terminal blinking | |||
* attribute. | |||
*/ | |||
static unsigned int blinktimeout = 0; | |||
/* | |||
* thickness of underline and bar cursors | |||
*/ | |||
static unsigned int cursorthickness = 1; | |||
/* | |||
* 1: custom-draw (without using the font) most of the lines/blocks characters | |||
* for gapless alignment between cells. This includes all the codepoints at | |||
* U+2500 - U+259F except dashes, diagonals and shades. | |||
* 0: disable (render all glyphs normally from the font). | |||
*/ | |||
const int boxdraw = 1; | |||
/* | |||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling | |||
* it | |||
*/ | |||
static int bellvolume = 0; | |||
/* default TERM value */ | |||
char *termname = "st-256color"; | |||
/* | |||
* spaces per tab | |||
* | |||
* When you are changing this value, don't forget to adapt the »it« value in | |||
* the st.info and appropriately install the st.info in the environment where | |||
* you use this st version. | |||
* | |||
* it#$tabspaces, | |||
* | |||
* Secondly make sure your kernel is not expanding tabs. When running `stty | |||
* -a` »tab0« should appear. You can tell the terminal to not expand tabs by | |||
* running following command: | |||
* | |||
* stty tabs | |||
*/ | |||
unsigned int tabspaces = 8; | |||
/* Terminal colors (16 first used in escape sequence) */ | |||
static const char *colorname[] = { | |||
/* 8 normal colors */ | |||
"#073642", /* 0: black */ | |||
"#dc322f", /* 1: red */ | |||
"#859900", /* 2: green */ | |||
"#b58900", /* 3: yellow */ | |||
"#268bd2", /* 4: blue */ | |||
"#d33682", /* 5: magenta */ | |||
"#2aa198", /* 6: cyan */ | |||
"#eee8d5", /* 7: white */ | |||
/* 8 bright colors */ | |||
"#002b36", /* 8: brblack */ | |||
"#cb4b16", /* 9: brred */ | |||
"#586e75", /* 10: brgreen */ | |||
"#657b83", /* 11: bryellow */ | |||
"#839496", /* 12: brblue */ | |||
"#6c71c4", /* 13: brmagenta*/ | |||
"#93a1a1", /* 14: brcyan */ | |||
"#fdf6e3", /* 15: brwhite */ | |||
[255] = 0, | |||
}; | |||
/* | |||
* Default colors (colorname index) | |||
* foreground, default color for bold text, background, cursor, reverse cursor | |||
*/ | |||
/* solarized dark */ | |||
/* | |||
unsigned int defaultfg = 12; | |||
unsigned int defaultbd = 15; | |||
unsigned int defaultbg = 8; | |||
*/ | |||
/* solarized light */ | |||
unsigned int defaultfg = 11; | |||
unsigned int defaultbd = 0; | |||
unsigned int defaultbg = 15; | |||
static unsigned int defaultcs = 9; | |||
static unsigned int defaultrcs = 11; | |||
/* | |||
* Default shape of cursor | |||
* 2: Block ("█") | |||
* 4: Underline ("_") | |||
* 6: Bar ("|") | |||
* 7: Snowman ("☃") | |||
*/ | |||
static unsigned int cursorshape = 2; | |||
/* | |||
* Default columns and rows numbers | |||
*/ | |||
static unsigned int cols = 80; | |||
static unsigned int rows = 24; | |||
/* | |||
* Default colour and shape of the mouse cursor | |||
*/ | |||
static unsigned int mouseshape = XC_arrow; | |||
static unsigned int mousefg = 7; | |||
static unsigned int mousebg = 0; | |||
/* | |||
* Color used to display font attributes when fontconfig selected a font which | |||
* doesn't match the ones requested. | |||
*/ | |||
static unsigned int defaultattr = 11; | |||
/* | |||
* Internal mouse shortcuts. | |||
* Beware that overloading Button1 will disable the selection. | |||
*/ | |||
static MouseShortcut mshortcuts[] = { | |||
/* button mask string */ | |||
{ Button4, XK_ANY_MOD, "\031" }, | |||
{ Button5, XK_ANY_MOD, "\005" }, | |||
}; | |||
/* Internal keyboard shortcuts. */ | |||
#define MODKEY Mod1Mask | |||
#define TERMMOD (ControlMask|ShiftMask) | |||
static Shortcut shortcuts[] = { | |||
/* mask keysym function argument */ | |||
{ XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, | |||
{ 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_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} }, | |||
}; | |||
/* | |||
* Special keys (change & recompile st.info accordingly) | |||
* | |||
* Mask value: | |||
* * Use XK_ANY_MOD to match the key no matter modifiers state | |||
* * Use XK_NO_MOD to match the key alone (no modifiers) | |||
* appkey value: | |||
* * 0: no value | |||
* * > 0: keypad application mode enabled | |||
* * = 2: term.numlock = 1 | |||
* * < 0: keypad application mode disabled | |||
* appcursor value: | |||
* * 0: no value | |||
* * > 0: cursor application mode enabled | |||
* * < 0: cursor application mode disabled | |||
* crlf value | |||
* * 0: no value | |||
* * > 0: crlf mode is enabled | |||
* * < 0: crlf mode is disabled | |||
* | |||
* Be careful with the order of the definitions because st searches in | |||
* this table sequentially, so any XK_ANY_MOD must be in the last | |||
* position for a key. | |||
*/ | |||
/* | |||
* If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) | |||
* to be mapped below, add them to this array. | |||
*/ | |||
static KeySym mappedkeys[] = { -1 }; | |||
/* | |||
* State bits to ignore when matching key or button events. By default, | |||
* numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. | |||
*/ | |||
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; | |||
/* | |||
* Override mouse-select while mask is active (when MODE_MOUSE is set). | |||
* Note that if you want to use ShiftMask with selmasks, set this to an other | |||
* modifier, set to 0 to not use it. | |||
*/ | |||
static uint forceselmod = ShiftMask; | |||
/* | |||
* This is the huge key array which defines all compatibility to the Linux | |||
* world. Please decide about changes wisely. | |||
*/ | |||
static Key key[] = { | |||
/* keysym mask string appkey appcursor */ | |||
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1}, | |||
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, | |||
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1}, | |||
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1}, | |||
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0}, | |||
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1}, | |||
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1}, | |||
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0}, | |||
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1}, | |||
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1}, | |||
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0}, | |||
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1}, | |||
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1}, | |||
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0}, | |||
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1}, | |||
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1}, | |||
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, | |||
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, | |||
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0}, | |||
{ XK_KP_End, ControlMask, "\033[J", -1, 0}, | |||
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0}, | |||
{ XK_KP_End, ShiftMask, "\033[K", -1, 0}, | |||
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0}, | |||
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0}, | |||
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, | |||
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0}, | |||
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, | |||
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0}, | |||
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0}, | |||
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, | |||
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, | |||
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, | |||
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0}, | |||
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, | |||
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, | |||
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, | |||
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, | |||
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, | |||
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, | |||
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, | |||
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0}, | |||
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0}, | |||
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0}, | |||
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0}, | |||
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0}, | |||
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0}, | |||
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0}, | |||
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0}, | |||
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0}, | |||
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0}, | |||
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0}, | |||
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0}, | |||
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0}, | |||
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0}, | |||
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0}, | |||
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0}, | |||
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0}, | |||
{ XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0}, | |||
{ XK_Up, ControlMask, "\033[1;5A", 0, 0}, | |||
{ XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0}, | |||
{ XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0}, | |||
{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0}, | |||
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1}, | |||
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1}, | |||
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0}, | |||
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0}, | |||
{ XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0}, | |||
{ XK_Down, ControlMask, "\033[1;5B", 0, 0}, | |||
{ XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0}, | |||
{ XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0}, | |||
{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0}, | |||
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1}, | |||
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1}, | |||
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0}, | |||
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0}, | |||
{ XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0}, | |||
{ XK_Left, ControlMask, "\033[1;5D", 0, 0}, | |||
{ XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0}, | |||
{ XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0}, | |||
{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0}, | |||
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1}, | |||
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1}, | |||
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0}, | |||
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0}, | |||
{ XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0}, | |||
{ XK_Right, ControlMask, "\033[1;5C", 0, 0}, | |||
{ XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0}, | |||
{ XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0}, | |||
{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0}, | |||
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1}, | |||
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1}, | |||
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, | |||
{ XK_Return, Mod1Mask, "\033\r", 0, 0}, | |||
{ XK_Return, XK_ANY_MOD, "\r", 0, 0}, | |||
{ XK_Insert, ShiftMask, "\033[4l", -1, 0}, | |||
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0}, | |||
{ XK_Insert, ControlMask, "\033[L", -1, 0}, | |||
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0}, | |||
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, | |||
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, | |||
{ XK_Delete, ControlMask, "\033[M", -1, 0}, | |||
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0}, | |||
{ XK_Delete, ShiftMask, "\033[2K", -1, 0}, | |||
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0}, | |||
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, | |||
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, | |||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, | |||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, | |||
{ XK_Home, ShiftMask, "\033[2J", 0, -1}, | |||
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1}, | |||
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1}, | |||
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1}, | |||
{ XK_End, ControlMask, "\033[J", -1, 0}, | |||
{ XK_End, ControlMask, "\033[1;5F", +1, 0}, | |||
{ XK_End, ShiftMask, "\033[K", -1, 0}, | |||
{ XK_End, ShiftMask, "\033[1;2F", +1, 0}, | |||
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0}, | |||
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0}, | |||
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, | |||
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, | |||
{ XK_Next, ControlMask, "\033[6;5~", 0, 0}, | |||
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0}, | |||
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0}, | |||
{ XK_F1, XK_NO_MOD, "\033OP" , 0, 0}, | |||
{ XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, | |||
{ XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, | |||
{ XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, | |||
{ XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, | |||
{ XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, | |||
{ XK_F2, XK_NO_MOD, "\033OQ" , 0, 0}, | |||
{ XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, | |||
{ XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, | |||
{ XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, | |||
{ XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, | |||
{ XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, | |||
{ XK_F3, XK_NO_MOD, "\033OR" , 0, 0}, | |||
{ XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, | |||
{ XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, | |||
{ XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, | |||
{ XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, | |||
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, | |||
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0}, | |||
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, | |||
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, | |||
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, | |||
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, | |||
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0}, | |||
{ XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, | |||
{ XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, | |||
{ XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, | |||
{ XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, | |||
{ XK_F6, XK_NO_MOD, "\033[17~", 0, 0}, | |||
{ XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, | |||
{ XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, | |||
{ XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, | |||
{ XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, | |||
{ XK_F7, XK_NO_MOD, "\033[18~", 0, 0}, | |||
{ XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, | |||
{ XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, | |||
{ XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, | |||
{ XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, | |||
{ XK_F8, XK_NO_MOD, "\033[19~", 0, 0}, | |||
{ XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, | |||
{ XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, | |||
{ XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, | |||
{ XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, | |||
{ XK_F9, XK_NO_MOD, "\033[20~", 0, 0}, | |||
{ XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, | |||
{ XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, | |||
{ XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, | |||
{ XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, | |||
{ XK_F10, XK_NO_MOD, "\033[21~", 0, 0}, | |||
{ XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, | |||
{ XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, | |||
{ XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, | |||
{ XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, | |||
{ XK_F11, XK_NO_MOD, "\033[23~", 0, 0}, | |||
{ XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, | |||
{ XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, | |||
{ XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, | |||
{ XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, | |||
{ XK_F12, XK_NO_MOD, "\033[24~", 0, 0}, | |||
{ XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, | |||
{ XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, | |||
{ XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, | |||
{ XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, | |||
{ XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0}, | |||
{ XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0}, | |||
{ XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0}, | |||
{ XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0}, | |||
{ XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0}, | |||
{ XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0}, | |||
{ XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0}, | |||
{ XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0}, | |||
{ XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0}, | |||
{ XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0}, | |||
{ XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0}, | |||
{ XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0}, | |||
{ XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0}, | |||
{ XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0}, | |||
{ XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0}, | |||
{ XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0}, | |||
{ XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0}, | |||
{ XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0}, | |||
{ XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0}, | |||
{ XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0}, | |||
{ XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0}, | |||
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, | |||
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, | |||
}; | |||
/* | |||
* Selection types' masks. | |||
* Use the same masks as usual. | |||
* Button1Mask is always unset, to make masks match between ButtonPress. | |||
* ButtonRelease and MotionNotify. | |||
* If no match is found, regular selection is used. | |||
*/ | |||
static uint selmasks[] = { | |||
[SEL_RECTANGULAR] = Mod1Mask, | |||
}; | |||
/* | |||
* Printable characters in ASCII, used to estimate the advance width | |||
* of single wide characters. | |||
*/ | |||
static char ascii_printable[] = | |||
" !\"#$%&'()*+,-./0123456789:;<=>?" | |||
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" | |||
"`abcdefghijklmnopqrstuvwxyz{|}~"; |
@ -0,0 +1,30 @@ | |||
#!/usr/bin/env zsh | |||
ST_REPO=https://git.suckless.org/st | |||
ST_SRC=$PWD/st | |||
ST_CFG=$PWD/config.h | |||
PATCHLIST=( | |||
st-boxdraw.patch | |||
st-bright-bold-text.patch | |||
st-config-mk.patch | |||
st-disable-bold-italic-fonts.patch | |||
st-disable-intensity-styles.patch | |||
st-fix-argv.patch | |||
) | |||
if [[ ! -r $ST_SRC/.git/config ]]; then | |||
git clone $ST_REPO $ST_SRC | |||
cd $ST_SRC | |||
else | |||
cd $ST_SRC | |||
git reset --hard | |||
git clean -fd | |||
git pull | |||
fi | |||
cp $ST_CFG . | |||
for patch in $PATCHLIST; do | |||
patch -p1 -i ../$patch | |||
done | |||
make $* |
@ -0,0 +1,517 @@ | |||
From 1630b7016d26c266d004f38ecfef2c4b708aa9a6 Mon Sep 17 00:00:00 2001 | |||
From: "Avi Halachmi (:avih)" <avihpit@yahoo.com> | |||
Date: Fri, 26 Oct 2018 13:11:20 +0300 | |||
Subject: [PATCH] boxdraw: custom-draw U+25XX lines/blocks to align seamlessly | |||
It seems impossible to ensure that blocks and line drawing glyphs | |||
align without visible gaps for all combinations of arbitrary font, | |||
size and width/height scale factor. | |||
This commit adds an option to custom-draw (without using the font) | |||
most of the lines/blocks codepoints such that they're rendered | |||
identically (per size) and align perfectly regardless of font, size | |||
or chscale/cwscale configuration values. | |||
138 shapes are supported (U+2500 - U+259F except dashes, diagonals | |||
and shades), composited as 16-bit values at boxdraw_data.h . | |||
See links and references at boxdraw_data.h | |||
--- | |||
Makefile | 3 +- | |||
boxdraw.c | 141 ++++++++++++++++++++++++++++++++++ | |||
boxdraw_data.h | 202 +++++++++++++++++++++++++++++++++++++++++++++++++ | |||
config.def.h | 8 ++ | |||
st.c | 3 + | |||
st.h | 9 +++ | |||
x.c | 19 +++-- | |||
7 files changed, 379 insertions(+), 6 deletions(-) | |||
create mode 100644 boxdraw.c | |||
create mode 100644 boxdraw_data.h | |||
diff --git a/Makefile b/Makefile | |||
index 0b3cecd..8d3af33 100644 | |||
--- a/Makefile | |||
+++ b/Makefile | |||
@@ -4,7 +4,7 @@ | |||
include config.mk | |||
-SRC = st.c x.c | |||
+SRC = st.c x.c boxdraw.c | |||
OBJ = $(SRC:.c=.o) | |||
all: options st | |||
@@ -23,6 +23,7 @@ config.h: | |||
st.o: config.h st.h win.h | |||
x.o: arg.h st.h win.h | |||
+boxdraw.o: config.h st.h boxdraw_data.h | |||
$(OBJ): config.h config.mk | |||
diff --git a/boxdraw.c b/boxdraw.c | |||
new file mode 100644 | |||
index 0000000..357250f | |||
--- /dev/null | |||
+++ b/boxdraw.c | |||
@@ -0,0 +1,141 @@ | |||
+#include <X11/Xft/Xft.h> | |||
+#include "st.h" | |||
+#include "boxdraw_data.h" | |||
+ | |||
+static void drawbox(XftDraw *, int, int, int, int, XftColor *, ushort); | |||
+static void drawboxlines(XftDraw *, int, int, int, int, XftColor *, ushort); | |||
+ | |||
+/* public API */ | |||
+ | |||
+int | |||
+isboxdraw(const Glyph *g) | |||
+{ | |||
+ return (g->u & ~0xff) == 0x2500 && | |||
+ boxdata[(uint8_t)g->u] != 0 && | |||
+ (g->mode & ATTR_ITALIC) == 0; | |||
+} | |||
+ | |||
+/* the "index" is actually the entire shape data encoded as ushort */ | |||
+ushort | |||
+boxdrawindex(const Glyph *g) | |||
+{ | |||
+ return boxdata[(uint8_t)g->u] | ((g->mode & ATTR_BOLD) ? BDB : 0); | |||
+} | |||
+ | |||
+void | |||
+drawboxes(XftDraw *xd, int x, int y, int cw, int ch, XftColor *fg, | |||
+ const XftGlyphFontSpec *specs, int len) | |||
+{ | |||
+ for ( ; len-- > 0; x += cw, specs++) | |||
+ drawbox(xd, x, y, cw, ch, fg, (ushort)specs->glyph); | |||
+} | |||
+ | |||
+/* implementation */ | |||
+ | |||
+void | |||
+drawbox(XftDraw *xd, int x, int y, int w, int h, XftColor *fg, ushort bd) | |||
+{ | |||
+ if (bd & (BDL | BDA)) { | |||
+ /* lines (light/double/heavy/arcs) */ | |||
+ drawboxlines(xd, x, y, w, h, fg, bd); | |||
+ | |||
+ } else if (bd & BBD) { | |||
+ /* lower (8-X)/8 block */ | |||
+ int d = ((uint8_t)bd * h + 4) / 8; | |||
+ XftDrawRect(xd, fg, x, y + d, w, h - d); | |||
+ | |||
+ } else if (bd & BBU) { | |||
+ /* upper X/8 block */ | |||
+ XftDrawRect(xd, fg, x, y, w, ((uint8_t)bd * h + 4) / 8); | |||
+ | |||
+ } else if (bd & BBL) { | |||
+ /* left X/8 block */ | |||
+ XftDrawRect(xd, fg, x, y, ((uint8_t)bd * w + 4) / 8, h); | |||
+ | |||
+ } else if (bd & BBR) { | |||
+ /* right (8-X)/8 block */ | |||
+ int d = ((uint8_t)bd * w + 4) / 8; | |||
+ XftDrawRect(xd, fg, x + d, y, w - d, h); | |||
+ | |||
+ } else if (bd & BBQ) { | |||
+ /* Quadrants */ | |||
+ int w2 = (w + 1) / 2, h2 = (h + 1) / 2; | |||
+ if (bd & TL) | |||
+ XftDrawRect(xd, fg, x, y, w2, h2); | |||
+ if (bd & TR) | |||
+ XftDrawRect(xd, fg, x + w2, y, w - w2, h2); | |||
+ if (bd & BL) | |||
+ XftDrawRect(xd, fg, x, y + h2, w2, h - h2); | |||
+ if (bd & BR) | |||
+ XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2); | |||
+ } | |||
+} | |||
+ | |||
+void | |||
+drawboxlines(XftDraw *xd, int x, int y, int w, int h, XftColor *fg, ushort bd) | |||
+{ | |||
+ /* s: stem thickness. width/8 roughly matches underscore thickness. */ | |||
+ /* We draw bold as 1.5 * normal-stem and at least 1px thicker. */ | |||
+ /* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */ | |||
+ int mwh = MIN(w, h); | |||
+ int base_s = MAX(1, (mwh + 4) / 8); | |||
+ int bold = (bd & BDB) && mwh >= 6; /* possibly ignore boldness */ | |||
+ int s = bold ? MAX(base_s + 1, (3 * base_s + 1) / 2) : base_s; | |||
+ int w2 = (w - s + 1) / 2, h2 = (h - s + 1) / 2; | |||
+ /* the s-by-s square (x + w2, y + h2, s, s) is the center texel. */ | |||
+ /* The base length (per direction till edge) includes this square. */ | |||
+ | |||
+ int light = bd & (LL | LU | LR | LD); | |||
+ int double_ = bd & (DL | DU | DR | DD); | |||
+ | |||
+ if (light) { | |||
+ /* d: additional (negative) length to not-draw the center */ | |||
+ /* texel - at arcs and avoid drawing inside (some) doubles */ | |||
+ int arc = bd & BDA; | |||
+ int multi_light = light & (light - 1); | |||
+ int multi_double = double_ & (double_ - 1); | |||
+ /* light crosses double only at DH+LV, DV+LH (ref. shapes) */ | |||
+ int d = arc || (multi_double && !multi_light) ? -s : 0; | |||
+ | |||
+ if (bd & LL) | |||
+ XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s); | |||
+ if (bd & LU) | |||
+ XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d); | |||
+ if (bd & LR) | |||
+ XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s); | |||
+ if (bd & LD) | |||
+ XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d); | |||
+ } | |||
+ | |||
+ /* double lines - also align with light to form heavy when combined */ | |||
+ if (double_) { | |||
+ /* | |||
+ * going clockwise, for each double-ray: p is additional length | |||
+ * to the single-ray nearer to the previous direction, and n to | |||
+ * the next. p and n adjust from the base length to lengths | |||
+ * which consider other doubles - shorter to avoid intersections | |||
+ * (p, n), or longer to draw the far-corner texel (n). | |||
+ */ | |||
+ int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD; | |||
+ if (dl) { | |||
+ int p = dd ? -s : 0, n = du ? -s : dd ? s : 0; | |||
+ XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s); | |||
+ XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s); | |||
+ } | |||
+ if (du) { | |||
+ int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0; | |||
+ XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p); | |||
+ XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n); | |||
+ } | |||
+ if (dr) { | |||
+ int p = du ? -s : 0, n = dd ? -s : du ? s : 0; | |||
+ XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s); | |||
+ XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s); | |||
+ } | |||
+ if (dd) { | |||
+ int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0; | |||
+ XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p); | |||
+ XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n); | |||
+ } | |||
+ } | |||
+} | |||
diff --git a/boxdraw_data.h b/boxdraw_data.h | |||
new file mode 100644 | |||
index 0000000..ee78cdc | |||
--- /dev/null | |||
+++ b/boxdraw_data.h | |||
@@ -0,0 +1,202 @@ | |||
+/* | |||
+ * U+25XX codepoints data | |||
+ * | |||
+ * References: | |||
+ * http://www.unicode.org/charts/PDF/U2500.pdf | |||
+ * http://www.unicode.org/charts/PDF/U2580.pdf | |||
+ * | |||
+ * Test page: | |||
+ * https://github.com/GNOME/vte/blob/master/doc/boxes.txt | |||
+ */ | |||
+ | |||
+/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */ | |||
+/* Categories (mutually exclusive except BDB): */ | |||
+#define BDL (1<<8) /* Box Draw Lines (light/double/heavy) */ | |||
+#define BDA (1<<9) /* Box Draw Arc (light) */ | |||
+#define BBD (1<<10) /* Box Block Down (lower) X/8 */ | |||
+#define BBL (1<<11) /* Box Block Left X/8 */ | |||
+#define BBU (1<<12) /* Box Block Upper X/8 */ | |||
+#define BBR (1<<13) /* Box Block Right X/8 */ | |||
+#define BBQ (1<<14) /* Box Block Quadrants */ | |||
+#define BDB (1<<15) /* Box Draw is Bold */ | |||
+ | |||
+/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical */ | |||
+/* Heavy is light+double (literally drawing light+double align to form heavy) */ | |||
+#define LL (1<<0) | |||
+#define LU (1<<1) | |||
+#define LR (1<<2) | |||
+#define LD (1<<3) | |||
+#define LH (LL+LR) | |||
+#define LV (LU+LD) | |||
+ | |||
+#define DL (1<<4) | |||
+#define DU (1<<5) | |||
+#define DR (1<<6) | |||
+#define DD (1<<7) | |||
+#define DH (DL+DR) | |||
+#define DV (DU+DD) | |||
+ | |||
+#define HL (LL+DL) | |||
+#define HU (LU+DU) | |||
+#define HR (LR+DR) | |||
+#define HD (LD+DD) | |||
+#define HH (HL+HR) | |||
+#define HV (HU+HD) | |||
+ | |||
+/* (BBQ) Quadrants Top/Bottom x Left/Right */ | |||
+#define TL (1<<0) | |||
+#define TR (1<<1) | |||
+#define BL (1<<2) | |||
+#define BR (1<<3) | |||
+ | |||
+/* 138 shapes are supported: U+2500 - U+259F except dashes/diagonals/shades */ | |||
+static const unsigned short boxdata[256] = { | |||
+ /* light lines */ | |||
+ [0x00] = BDL + LH, /* light horizontal */ | |||
+ [0x02] = BDL + LV, /* light vertical */ | |||
+ [0x0c] = BDL + LD + LR, /* light down and right */ | |||
+ [0x10] = BDL + LD + LL, /* light down and left */ | |||
+ [0x14] = BDL + LU + LR, /* light up and right */ | |||
+ [0x18] = BDL + LU + LL, /* light up and left */ | |||
+ [0x1c] = BDL + LV + LR, /* light vertical and right */ | |||
+ [0x24] = BDL + LV + LL, /* light vertical and left */ | |||
+ [0x2c] = BDL + LH + LD, /* light horizontal and down */ | |||
+ [0x34] = BDL + LH + LU, /* light horizontal and up */ | |||
+ [0x3c] = BDL + LV + LH, /* light vertical and horizontal */ | |||
+ [0x74] = BDL + LL, /* light left */ | |||
+ [0x75] = BDL + LU, /* light up */ | |||
+ [0x76] = BDL + LR, /* light right */ | |||
+ [0x77] = BDL + LD, /* light down */ | |||
+ | |||
+ /* heavy [+light] lines */ | |||
+ [0x01] = BDL + HH, | |||
+ [0x03] = BDL + HV, | |||
+ [0x0d] = BDL + HR + LD, | |||
+ [0x0e] = BDL + HD + LR, | |||
+ [0x0f] = BDL + HD + HR, | |||
+ [0x11] = BDL + HL + LD, | |||
+ [0x12] = BDL + HD + LL, | |||
+ [0x13] = BDL + HD + HL, | |||
+ [0x15] = BDL + HR + LU, | |||
+ [0x16] = BDL + HU + LR, | |||
+ [0x17] = BDL + HU + HR, | |||
+ [0x19] = BDL + HL + LU, | |||
+ [0x1a] = BDL + HU + LL, | |||
+ [0x1b] = BDL + HU + HL, | |||
+ [0x1d] = BDL + HR + LV, | |||
+ [0x1e] = BDL + HU + LD + LR, | |||
+ [0x1f] = BDL + HD + LR + LU, | |||
+ [0x20] = BDL + HV + LR, | |||
+ [0x21] = BDL + HU + HR + LD, | |||
+ [0x22] = BDL + HD + HR + LU, | |||
+ [0x23] = BDL + HV + HR, | |||
+ [0x25] = BDL + HL + LV, | |||
+ [0x26] = BDL + HU + LD + LL, | |||
+ [0x27] = BDL + HD + LU + LL, | |||
+ [0x28] = BDL + HV + LL, | |||
+ [0x29] = BDL + HU + HL + LD, | |||
+ [0x2a] = BDL + HD + HL + LU, | |||
+ [0x2b] = BDL + HV + HL, | |||
+ [0x2d] = BDL + HL + LD + LR, | |||
+ [0x2e] = BDL + HR + LL + LD, | |||
+ [0x2f] = BDL + HH + LD, | |||
+ [0x30] = BDL + HD + LH, | |||
+ [0x31] = BDL + HD + HL + LR, | |||
+ [0x32] = BDL + HR + HD + LL, | |||
+ [0x33] = BDL + HH + HD, | |||
+ [0x35] = BDL + HL + LU + LR, | |||
+ [0x36] = BDL + HR + LU + LL, | |||
+ [0x37] = BDL + HH + LU, | |||
+ [0x38] = BDL + HU + LH, | |||
+ [0x39] = BDL + HU + HL + LR, | |||
+ [0x3a] = BDL + HU + HR + LL, | |||
+ [0x3b] = BDL + HH + HU, | |||
+ [0x3d] = BDL + HL + LV + LR, | |||
+ [0x3e] = BDL + HR + LV + LL, | |||
+ [0x3f] = BDL + HH + LV, | |||
+ [0x40] = BDL + HU + LH + LD, | |||
+ [0x41] = BDL + HD + LH + LU, | |||
+ [0x42] = BDL + HV + LH, | |||
+ [0x43] = BDL + HU + HL + LD + LR, | |||
+ [0x44] = BDL + HU + HR + LD + LL, | |||
+ [0x45] = BDL + HD + HL + LU + LR, | |||
+ [0x46] = BDL + HD + HR + LU + LL, | |||
+ [0x47] = BDL + HH + HU + LD, | |||
+ [0x48] = BDL + HH + HD + LU, | |||
+ [0x49] = BDL + HV + HL + LR, | |||
+ [0x4a] = BDL + HV + HR + LL, | |||
+ [0x4b] = BDL + HV + HH, | |||
+ [0x78] = BDL + HL, | |||
+ [0x79] = BDL + HU, | |||
+ [0x7a] = BDL + HR, | |||
+ [0x7b] = BDL + HD, | |||
+ [0x7c] = BDL + HR + LL, | |||
+ [0x7d] = BDL + HD + LU, | |||
+ [0x7e] = BDL + HL + LR, | |||
+ [0x7f] = BDL + HU + LD, | |||
+ | |||
+ /* double [+light] lines */ | |||
+ [0x50] = BDL + DH, | |||
+ [0x51] = BDL + DV, | |||
+ [0x52] = BDL + DR + LD, | |||
+ [0x53] = BDL + DD + LR, | |||
+ [0x54] = BDL + DR + DD, | |||
+ [0x55] = BDL + DL + LD, | |||
+ [0x56] = BDL + DD + LL, | |||
+ [0x57] = BDL + DL + DD, | |||
+ [0x58] = BDL + DR + LU, | |||
+ [0x59] = BDL + DU + LR, | |||
+ [0x5a] = BDL + DU + DR, | |||
+ [0x5b] = BDL + DL + LU, | |||
+ [0x5c] = BDL + DU + LL, | |||
+ [0x5d] = BDL + DL + DU, | |||
+ [0x5e] = BDL + DR + LV, | |||
+ [0x5f] = BDL + DV + LR, | |||
+ [0x60] = BDL + DV + DR, | |||
+ [0x61] = BDL + DL + LV, | |||
+ [0x62] = BDL + DV + LL, | |||
+ [0x63] = BDL + DV + DL, | |||
+ [0x64] = BDL + DH + LD, | |||
+ [0x65] = BDL + DD + LH, | |||
+ [0x66] = BDL + DD + DH, | |||
+ [0x67] = BDL + DH + LU, | |||
+ [0x68] = BDL + DU + LH, | |||
+ [0x69] = BDL + DH + DU, | |||
+ [0x6a] = BDL + DH + LV, | |||
+ [0x6b] = BDL + DV + LH, | |||
+ [0x6c] = BDL + DH + DV, | |||
+ | |||
+ /* (light) arcs */ | |||
+ [0x6d] = BDA + LD + LR, | |||
+ [0x6e] = BDA + LD + LL, | |||
+ [0x6f] = BDA + LU + LL, | |||
+ [0x70] = BDA + LU + LR, | |||
+ | |||
+ /* Lower (Down) X/8 block (data is 8 - X) */ | |||
+ [0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4, | |||
+ [0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0, | |||
+ | |||
+ /* Left X/8 block (data is X) */ | |||
+ [0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4, | |||
+ [0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1, | |||
+ | |||
+ /* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */ | |||
+ [0x80] = BBU + 4, [0x94] = BBU + 1, | |||
+ [0x90] = BBR + 4, [0x95] = BBR + 7, | |||
+ | |||
+ /* Quadrants */ | |||
+ [0x96] = BBQ + BL, | |||
+ [0x97] = BBQ + BR, | |||
+ [0x98] = BBQ + TL, | |||
+ [0x99] = BBQ + TL + BL + BR, | |||
+ [0x9a] = BBQ + TL + BR, | |||
+ [0x9b] = BBQ + TL + TR + BL, | |||
+ [0x9c] = BBQ + TL + TR + BR, | |||
+ [0x9d] = BBQ + TR, | |||
+ [0x9e] = BBQ + BL + TR, | |||
+ [0x9f] = BBQ + BL + TR + BR, | |||
+ | |||
+ /* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */ | |||
+ /* U+2571 - U+2573: unsupported (diagonals) */ | |||
+ /* U+2591 - U+2593: unsupported (shades) */ | |||
+}; | |||
diff --git a/config.def.h b/config.def.h | |||
index 823e79f..018cbe4 100644 | |||
--- a/config.def.h | |||
+++ b/config.def.h | |||
@@ -56,6 +56,14 @@ static unsigned int blinktimeout = 800; | |||
*/ | |||
static unsigned int cursorthickness = 2; | |||
+/* | |||
+ * 1: custom-draw (without using the font) most of the lines/blocks characters | |||
+ * for gapless alignment between cells. This includes all the codepoints at | |||
+ * U+2500 - U+259F except dashes, diagonals and shades. | |||
+ * 0: disable (render all glyphs normally from the font). | |||
+ */ | |||
+const int boxdraw = 0; | |||
+ | |||
/* | |||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling | |||
* it | |||
diff --git a/st.c b/st.c | |||
index 46cf2da..7ee136a 100644 | |||
--- a/st.c | |||
+++ b/st.c | |||
@@ -1228,6 +1228,9 @@ tsetchar(Rune u, Glyph *attr, int x, int y) | |||
term.dirty[y] = 1; | |||
term.line[y][x] = *attr; | |||
term.line[y][x].u = u; | |||
+ | |||
+ if (boxdraw && isboxdraw(&term.line[y][x])) | |||
+ term.line[y][x].mode |= ATTR_BOXDRAW; | |||
} | |||
void | |||
diff --git a/st.h b/st.h | |||
index 38c61c4..fc68c3b 100644 | |||
--- a/st.h | |||
+++ b/st.h | |||
@@ -33,6 +33,7 @@ enum glyph_attribute { | |||
ATTR_WRAP = 1 << 8, | |||
ATTR_WIDE = 1 << 9, | |||
ATTR_WDUMMY = 1 << 10, | |||
+ ATTR_BOXDRAW = 1 << 11, | |||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, | |||
}; | |||
@@ -110,6 +111,13 @@ void *xmalloc(size_t); | |||
void *xrealloc(void *, size_t); | |||
char *xstrdup(char *); | |||
+int isboxdraw(const Glyph *); | |||
+ushort boxdrawindex(const Glyph *); | |||
+#ifdef XFT_VERSION | |||
+/* only exposed to x.c, otherwise we'll need Xft.h for the types */ | |||
+void drawboxes(XftDraw *, int, int, int, int, XftColor *, const XftGlyphFontSpec *, int); | |||
+#endif | |||
+ | |||
/* config.h globals */ | |||
extern char *utmp; | |||
extern char *stty_args; | |||
@@ -120,3 +128,4 @@ extern char *termname; | |||
extern unsigned int tabspaces; | |||
extern unsigned int defaultfg; | |||
extern unsigned int defaultbg; | |||
+extern const int boxdraw; | |||
diff --git a/x.c b/x.c | |||
index 00cb6b1..730f525 100644 | |||
--- a/x.c | |||
+++ b/x.c | |||
@@ -1164,8 +1164,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x | |||
yp = winy + font->ascent; | |||
} | |||
- /* Lookup character index with default font. */ | |||
- glyphidx = XftCharIndex(xw.dpy, font->match, rune); | |||
+ if (mode & ATTR_BOXDRAW) { | |||
+ /* minor shoehorning: boxdraw uses only this ushort */ | |||
+ glyphidx = boxdrawindex(&glyphs[i]); | |||
+ } else { | |||
+ /* Lookup character index with default font. */ | |||
+ glyphidx = XftCharIndex(xw.dpy, font->match, rune); | |||
+ } | |||
if (glyphidx) { | |||
specs[numspecs].font = font->match; | |||
specs[numspecs].glyph = glyphidx; | |||
@@ -1372,8 +1377,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i | |||
r.width = width; | |||
XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1); | |||
- /* Render the glyphs. */ | |||
- XftDrawGlyphFontSpec(xw.draw, fg, specs, len); | |||
+ if (base.mode & ATTR_BOXDRAW) { | |||
+ drawboxes(xw.draw, winx, winy, width / len, win.ch, fg, specs, len); | |||
+ } else { | |||
+ /* Render the glyphs. */ | |||
+ XftDrawGlyphFontSpec(xw.draw, fg, specs, len); | |||
+ } | |||
/* Render underline and strikethrough. */ | |||
if (base.mode & ATTR_UNDERLINE) { | |||
@@ -1416,7 +1425,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) | |||
/* | |||
* Select the right color for the right mode. | |||
*/ | |||
- g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE; | |||
+ g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW; | |||
if (IS_SET(MODE_REVERSE)) { | |||
g.mode |= ATTR_REVERSE; | |||
-- | |||
2.19.1 | |||
@ -0,0 +1,74 @@ | |||
--- a/config.def.h | |||
+++ b/config.def.h | |||
@@ -114,9 +114,10 @@ static const char *colorname[] = { | |||
/* | |||
* Default colors (colorname index) | |||
- * foreground, background, cursor, reverse cursor | |||
+ * foreground, default color for bold text, background, cursor, reverse cursor | |||
*/ | |||
unsigned int defaultfg = 7; | |||
+unsigned int defaultbd = 7; | |||
unsigned int defaultbg = 0; | |||
static unsigned int defaultcs = 256; | |||
static unsigned int defaultrcs = 257; | |||
--- a/st.c | |||
+++ b/st.c | |||
@@ -1378,9 +1378,12 @@ tsetattr(int *attr, int l) | |||
ATTR_STRUCK ); | |||
term.c.attr.fg = defaultfg; | |||
term.c.attr.bg = defaultbg; | |||
+ term.c.attr.colored = 0; | |||
break; | |||
case 1: | |||
term.c.attr.mode |= ATTR_BOLD; | |||
+ if (!term.c.attr.colored) | |||
+ term.c.attr.fg = defaultbd; | |||
break; | |||
case 2: | |||
term.c.attr.mode |= ATTR_FAINT; | |||
@@ -1427,11 +1430,14 @@ tsetattr(int *attr, int l) | |||
term.c.attr.mode &= ~ATTR_STRUCK; | |||
break; | |||
case 38: | |||
- if ((idx = tdefcolor(attr, &i, l)) >= 0) | |||
+ if ((idx = tdefcolor(attr, &i, l)) >= 0) { | |||
term.c.attr.fg = idx; | |||
+ term.c.attr.colored = 1; | |||
+ } | |||
break; | |||
case 39: | |||
term.c.attr.fg = defaultfg; | |||
+ term.c.attr.colored = 0; | |||
break; | |||
case 48: | |||
if ((idx = tdefcolor(attr, &i, l)) >= 0) | |||
@@ -1443,10 +1449,12 @@ tsetattr(int *attr, int l) | |||
default: | |||
if (BETWEEN(attr[i], 30, 37)) { | |||
term.c.attr.fg = attr[i] - 30; | |||
+ term.c.attr.colored = 1; | |||
} else if (BETWEEN(attr[i], 40, 47)) { | |||
term.c.attr.bg = attr[i] - 40; | |||
} else if (BETWEEN(attr[i], 90, 97)) { | |||
term.c.attr.fg = attr[i] - 90 + 8; | |||
+ term.c.attr.colored = 1; | |||
} else if (BETWEEN(attr[i], 100, 107)) { | |||
term.c.attr.bg = attr[i] - 100 + 8; | |||
} else { | |||
--- a/st.h | |||
+++ b/st.h | |||
@@ -65,6 +65,7 @@ typedef struct { | |||
ushort mode; /* attribute flags */ | |||
uint32_t fg; /* foreground */ | |||
uint32_t bg; /* background */ | |||
+ int colored; /* tell if the text color set explicitly */ | |||
} Glyph; | |||
typedef Glyph *Line; | |||
@@ -119,4 +120,5 @@ extern int allowaltscreen; | |||
extern char *termname; | |||
extern unsigned int tabspaces; | |||
extern unsigned int defaultfg; | |||
+extern unsigned int defaultbd; | |||
extern unsigned int defaultbg; |
@ -0,0 +1,17 @@ | |||
--- a/config.mk | |||
+++ b/config.mk | |||
@@ -4,7 +4,7 @@ | |||
# Customize below to fit your system | |||
# paths | |||
-PREFIX = /usr/local | |||
+PREFIX = $(HOME)/.local | |||
MANPREFIX = $(PREFIX)/share/man | |||
X11INC = /usr/X11R6/include | |||
@@ -30,4 +30,4 @@ | |||
# `pkg-config --libs freetype2` | |||
# compiler and linker | |||
-# CC = c99 | |||
+CC = tcc |
@ -0,0 +1,45 @@ | |||
--- a/config.def.h | |||
+++ b/config.def.h | |||
@@ -8,6 +8,10 @@ | |||
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; | |||
static int borderpx = 2; | |||
+/* disable bold and italic font styles */ | |||
+int disablebold = 0; | |||
+int disableitalic = 0; | |||
+ | |||
/* | |||
* What program is execed by st depends of these precedence rules: | |||
* 1: program passed with -e | |||
--- a/x.c | |||
+++ b/x.c | |||
@@ -240,6 +240,10 @@ static char *opt_title = NULL; | |||
static int oldbutton = 3; /* button event on startup: 3 = release */ | |||
+/* declared in config.h */ | |||
+extern int disablebold; | |||
+extern int disableitalic; | |||
+ | |||
void | |||
clipcopy(const Arg *dummy) | |||
{ | |||
@@ -1152,13 +1156,15 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x | |||
frcflags = FRC_NORMAL; | |||
runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f); | |||
if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) { | |||
- font = &dc.ibfont; | |||
+ if (!disableitalic && !disablebold) font = &dc.ibfont; | |||
+ if (disableitalic && !disablebold) font = &dc.bfont; | |||
+ if (!disableitalic && disablebold) font = &dc.ifont; | |||
frcflags = FRC_ITALICBOLD; | |||
} else if (mode & ATTR_ITALIC) { | |||
- font = &dc.ifont; | |||
+ if (!disableitalic) font = &dc.ifont; | |||
frcflags = FRC_ITALIC; | |||
} else if (mode & ATTR_BOLD) { | |||
- font = &dc.bfont; | |||
+ if (!disablebold) font = &dc.bfont; | |||
frcflags = FRC_BOLD; | |||
} | |||
yp = winy + font->ascent; |
@ -0,0 +1,13 @@ | |||
--- a/x.c | |||
+++ b/x.c | |||
@@ -1296,10 +1296,6 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i | |||
bg = &dc.col[base.bg]; | |||
} | |||
- /* Change basic system colors [0-7] to bright system colors [8-15] */ | |||
- if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7)) | |||
- fg = &dc.col[base.fg + 8]; | |||
- | |||
if (IS_SET(MODE_REVERSE)) { | |||
if (fg == &dc.col[defaultfg]) { | |||
fg = &dc.col[defaultbg]; |
@ -0,0 +1,11 @@ | |||
--- a/arg.h | |||
+++ b/arg.h | |||
@@ -6,7 +6,7 @@ | |||
#ifndef ARG_H__ | |||
#define ARG_H__ | |||
-extern char *argv0; | |||
+static char *argv0; | |||
/* use main(int argc, char *argv[]) */ | |||
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ |