From e4e8e3caf45bbe6ba6c2bc19234ab8cdc06fe0a0 Mon Sep 17 00:00:00 2001 From: hybris Date: Sun, 29 Oct 2017 05:34:39 +0100 Subject: [PATCH] test --- config.def.h | 555 +++++----- st.c | 2745 ++++++++++++++++++++++++-------------------------- 2 files changed, 1591 insertions(+), 1709 deletions(-) diff --git a/config.def.h b/config.def.h index 047d735..eae969e 100644 --- a/config.def.h +++ b/config.def.h @@ -5,8 +5,9 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char font[] = "xos4 Terminus:pixelsize=13:antialias=true:autohint=true"; +static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; static int borderpx = 2; +#define histsize 2000 /* * What program is execed by st depends of these precedence rules: @@ -16,7 +17,7 @@ static int borderpx = 2; * 4: value of shell in /etc/passwd * 5: value of shell in config.h */ -static char shell[] = "/bin/zsh'"; +static char shell[] = "/bin/sh"; static char *utmp = NULL; static char stty_args[] = "stty raw pass8 nl -echo -iexten -cstopb 38400"; @@ -38,13 +39,13 @@ static char worddelimiters[] = " "; static unsigned int doubleclicktimeout = 300; static unsigned int tripleclicktimeout = 600; -/* key repeat timeouts (in milliseconds) */ -static unsigned int keyrepeatdelay = 500; -static unsigned int keyrepeatinterval = 25; - /* alt screens */ static int allowaltscreen = 1; +/* frames per second st should at maximum draw to the screen */ +static unsigned int xfps = 120; +static unsigned int actionfps = 30; + /* * blinking timeout (set to 0 to disable blinking) for the terminal blinking * attribute. @@ -60,9 +61,7 @@ static unsigned int cursorthickness = 2; * bell volume. It must be a value between -100 and 100. Use 0 for disabling * it */ -/* XXX: Wayland does not have a bell. - * static int bellvolume = 0; - */ +static int bellvolume = 0; /* default TERM value */ static char termname[] = "st-256color"; @@ -86,23 +85,31 @@ static unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { - /* solarized dark */ - "#073642", /* 0: black */ - "#dc322f", /* 1: red */ - "#859900", /* 2: green */ - "#b58900", /* 3: yellow */ - "#268bd2", /* 4: blue */ - "#d33682", /* 5: magenta */ - "#2aa198", /* 6: cyan */ - "#eee8d5", /* 7: white */ - "#002b36", /* 8: brblack */ - "#cb4b16", /* 9: brred */ - "#586e75", /* 10: brgreen */ - "#657b83", /* 11: bryellow */ - "#839496", /* 12: brblue */ - "#6c71c4", /* 13: brmagenta*/ - "#93a1a1", /* 14: brcyan */ - "#fdf6e3", /* 15: brwhite */ + /* 8 normal colors */ + "black", + "red3", + "green3", + "yellow3", + "blue2", + "magenta3", + "cyan3", + "gray90", + + /* 8 bright colors */ + "gray50", + "red", + "green", + "yellow", + "#5c5cff", + "magenta", + "cyan", + "white", + + [255] = 0, + + /* more colors can be added after 255 to use with DefaultXX */ + "#cccccc", + "#555555", }; @@ -110,10 +117,10 @@ static const char *colorname[] = { * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ -static unsigned int defaultfg = 12; -static unsigned int defaultbg = 8; -static unsigned int defaultcs = 14; -static unsigned int defaultrcs = 15; +static unsigned int defaultfg = 7; +static unsigned int defaultbg = 0; +static unsigned int defaultcs = 256; +static unsigned int defaultrcs = 257; /* * Default shape of cursor @@ -125,22 +132,19 @@ static unsigned int defaultrcs = 15; static unsigned int cursorshape = 2; /* - * Default columns and rows numbers + * Default colour and shape of the mouse cursor */ - -static unsigned int cols = 80; -static unsigned int rows = 24; +static unsigned int mouseshape = XC_xterm; +static unsigned int mousefg = 7; +static unsigned int mousebg = 0; /* - * Default shape of the mouse cursor + * Colors used, when the specific fg == defaultfg. So in reverse mode this + * will reverse too. Another logic would only make the simple feature too + * complex. */ -static char mouseshape[] = "xterm"; - -/* - * Color used to display font attributes when fontconfig selected a font which - * doesn't match the ones requested. - */ -static unsigned int defaultattr = 11; +static unsigned int defaultitalic = 11; +static unsigned int defaultunderline = 7; /* * Internal mouse shortcuts. @@ -148,38 +152,37 @@ static unsigned int defaultattr = 11; */ static MouseShortcut mshortcuts[] = { /* button mask string */ - { -1, MOD_MASK_NONE, "" } -}; - -static Axiskey ashortcuts[] = { - /* axis direction mask string */ - { AXIS_VERTICAL, +1, MOD_MASK_ANY, "\031"}, - { AXIS_VERTICAL, -1, MOD_MASK_ANY, "\005"}, + { Button4, XK_ANY_MOD, "\031" }, + { Button5, XK_ANY_MOD, "\005" }, }; /* Internal keyboard shortcuts. */ -#define MODKEY MOD_MASK_ALT +#define MODKEY Mod1Mask static Shortcut shortcuts[] = { - /* modifier key function argument */ - { MOD_MASK_ANY, XKB_KEY_Break, sendbreak, {.i = 0} }, - { MOD_MASK_CTRL, XKB_KEY_Print, toggleprinter, {.i = 0} }, - { MOD_MASK_SHIFT, XKB_KEY_Print, printscreen, {.i = 0} }, - { MOD_MASK_ANY, XKB_KEY_Print, printsel, {.i = 0} }, - { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Prior, wlzoom, {.f = +1} }, - { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Next, wlzoom, {.f = -1} }, - { MODKEY|MOD_MASK_SHIFT, XKB_KEY_Home, wlzoomreset, {.f = 0} }, - { MOD_MASK_SHIFT, XKB_KEY_Insert, selpaste, {.i = 0} }, - { MODKEY, XKB_KEY_Num_Lock, numlock, {.i = 0} }, - { MODKEY, XKB_KEY_Control_L, iso14755, {.i = 0} }, + /* 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} }, + { MODKEY|ShiftMask, XK_Prior, xzoom, {.f = +1} }, + { MODKEY|ShiftMask, XK_Next, xzoom, {.f = -1} }, + { MODKEY|ShiftMask, XK_Home, xzoomreset, {.f = 0} }, + { ShiftMask, XK_Insert, selpaste, {.i = 0} }, + { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} }, + { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} }, + { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} }, + { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, + { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, + { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, }; /* * Special keys (change & recompile st.info accordingly) * * Mask value: - * * Use MOD_MASK_ANY to match the key no matter modifiers state - * * Use MOD_MASK_NONE to match the key alone (no modifiers) + * * 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 @@ -195,7 +198,7 @@ static Shortcut shortcuts[] = { * * < 0: crlf mode is disabled * * Be careful with the order of the definitions because st searches in - * this table sequentially, so any MOD_MASK_ANY must be in the last + * this table sequentially, so any XK_ANY_MOD must be in the last * position for a key. */ @@ -203,233 +206,223 @@ static Shortcut shortcuts[] = { * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) * to be mapped below, add them to this array. */ -static xkb_keysym_t mappedkeys[] = { -1 }; +static KeySym mappedkeys[] = { -1 }; -/* State bits to ignore when matching key or button events. */ -static uint ignoremod = 0; +/* + * 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 MOD_MASK_SHIFT with selmasks, set this to an - * other modifier, set to 0 to not use it. + * 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 = MOD_MASK_SHIFT; +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 crlf */ - { XKB_KEY_KP_Home, MOD_MASK_SHIFT, "\033[2J", 0, -1, 0}, - { XKB_KEY_KP_Home, MOD_MASK_SHIFT, "\033[1;2H", 0, +1, 0}, - { XKB_KEY_KP_Home, MOD_MASK_ANY, "\033[H", 0, -1, 0}, - { XKB_KEY_KP_Home, MOD_MASK_ANY, "\033[1~", 0, +1, 0}, - { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033Ox", +1, 0, 0}, - { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033[A", 0, -1, 0}, - { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033OA", 0, +1, 0}, - { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033Or", +1, 0, 0}, - { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033[B", 0, -1, 0}, - { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033OB", 0, +1, 0}, - { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033Ot", +1, 0, 0}, - { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033[D", 0, -1, 0}, - { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033OD", 0, +1, 0}, - { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033Ov", +1, 0, 0}, - { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033[C", 0, -1, 0}, - { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033OC", 0, +1, 0}, - { XKB_KEY_KP_Prior, MOD_MASK_SHIFT, "\033[5;2~", 0, 0, 0}, - { XKB_KEY_KP_Prior, MOD_MASK_ANY, "\033[5~", 0, 0, 0}, - { XKB_KEY_KP_Begin, MOD_MASK_ANY, "\033[E", 0, 0, 0}, - { XKB_KEY_KP_End, MOD_MASK_CTRL, "\033[J", -1, 0, 0}, - { XKB_KEY_KP_End, MOD_MASK_CTRL, "\033[1;5F", +1, 0, 0}, - { XKB_KEY_KP_End, MOD_MASK_SHIFT, "\033[K", -1, 0, 0}, - { XKB_KEY_KP_End, MOD_MASK_SHIFT, "\033[1;2F", +1, 0, 0}, - { XKB_KEY_KP_End, MOD_MASK_ANY, "\033[4~", 0, 0, 0}, - { XKB_KEY_KP_Next, MOD_MASK_SHIFT, "\033[6;2~", 0, 0, 0}, - { XKB_KEY_KP_Next, MOD_MASK_ANY, "\033[6~", 0, 0, 0}, - { XKB_KEY_KP_Insert, MOD_MASK_SHIFT, "\033[2;2~", +1, 0, 0}, - { XKB_KEY_KP_Insert, MOD_MASK_SHIFT, "\033[4l", -1, 0, 0}, - { XKB_KEY_KP_Insert, MOD_MASK_CTRL, "\033[L", -1, 0, 0}, - { XKB_KEY_KP_Insert, MOD_MASK_CTRL, "\033[2;5~", +1, 0, 0}, - { XKB_KEY_KP_Insert, MOD_MASK_ANY, "\033[4h", -1, 0, 0}, - { XKB_KEY_KP_Insert, MOD_MASK_ANY, "\033[2~", +1, 0, 0}, - { XKB_KEY_KP_Delete, MOD_MASK_CTRL, "\033[M", -1, 0, 0}, - { XKB_KEY_KP_Delete, MOD_MASK_CTRL, "\033[3;5~", +1, 0, 0}, - { XKB_KEY_KP_Delete, MOD_MASK_SHIFT, "\033[2K", -1, 0, 0}, - { XKB_KEY_KP_Delete, MOD_MASK_SHIFT, "\033[3;2~", +1, 0, 0}, - { XKB_KEY_KP_Delete, MOD_MASK_ANY, "\033[P", -1, 0, 0}, - { XKB_KEY_KP_Delete, MOD_MASK_ANY, "\033[3~", +1, 0, 0}, - { XKB_KEY_KP_Multiply, MOD_MASK_ANY, "\033Oj", +2, 0, 0}, - { XKB_KEY_KP_Add, MOD_MASK_ANY, "\033Ok", +2, 0, 0}, - { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\033OM", +2, 0, 0}, - { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\r", -1, 0, -1}, - { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\r\n", -1, 0, +1}, - { XKB_KEY_KP_Subtract, MOD_MASK_ANY, "\033Om", +2, 0, 0}, - { XKB_KEY_KP_Decimal, MOD_MASK_ANY, "\033On", +2, 0, 0}, - { XKB_KEY_KP_Divide, MOD_MASK_ANY, "\033Oo", +2, 0, 0}, - { XKB_KEY_KP_0, MOD_MASK_ANY, "\033Op", +2, 0, 0}, - { XKB_KEY_KP_1, MOD_MASK_ANY, "\033Oq", +2, 0, 0}, - { XKB_KEY_KP_2, MOD_MASK_ANY, "\033Or", +2, 0, 0}, - { XKB_KEY_KP_3, MOD_MASK_ANY, "\033Os", +2, 0, 0}, - { XKB_KEY_KP_4, MOD_MASK_ANY, "\033Ot", +2, 0, 0}, - { XKB_KEY_KP_5, MOD_MASK_ANY, "\033Ou", +2, 0, 0}, - { XKB_KEY_KP_6, MOD_MASK_ANY, "\033Ov", +2, 0, 0}, - { XKB_KEY_KP_7, MOD_MASK_ANY, "\033Ow", +2, 0, 0}, - { XKB_KEY_KP_8, MOD_MASK_ANY, "\033Ox", +2, 0, 0}, - { XKB_KEY_KP_9, MOD_MASK_ANY, "\033Oy", +2, 0, 0}, - { XKB_KEY_Up, MOD_MASK_SHIFT, "\033[1;2A", 0, 0, 0}, - { XKB_KEY_Up, MOD_MASK_ALT, "\033[1;3A", 0, 0, 0}, - { XKB_KEY_Up, MOD_MASK_SHIFT|MOD_MASK_ALT,"\033[1;4A", 0, 0, 0}, - { XKB_KEY_Up, MOD_MASK_CTRL, "\033[1;5A", 0, 0, 0}, - { XKB_KEY_Up,MOD_MASK_SHIFT|MOD_MASK_CTRL,"\033[1;6A", 0, 0, 0}, - { XKB_KEY_Up, MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;7A", 0, 0, 0}, - { XKB_KEY_Up,MOD_MASK_SHIFT|MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;8A",0,0,0}, - { XKB_KEY_Up, MOD_MASK_ANY, "\033[A", 0, -1, 0}, - { XKB_KEY_Up, MOD_MASK_ANY, "\033OA", 0, +1, 0}, - { XKB_KEY_Down, MOD_MASK_SHIFT, "\033[1;2B", 0, 0, 0}, - { XKB_KEY_Down, MOD_MASK_ALT, "\033[1;3B", 0, 0, 0}, - { XKB_KEY_Down,MOD_MASK_SHIFT|MOD_MASK_ALT,"\033[1;4B", 0, 0, 0}, - { XKB_KEY_Down, MOD_MASK_CTRL, "\033[1;5B", 0, 0, 0}, - { XKB_KEY_Down,MOD_MASK_SHIFT|MOD_MASK_CTRL,"\033[1;6B", 0, 0, 0}, - { XKB_KEY_Down,MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;7B", 0, 0, 0}, - { XKB_KEY_Down,MOD_MASK_SHIFT|MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;8B",0,0,0}, - { XKB_KEY_Down, MOD_MASK_ANY, "\033[B", 0, -1, 0}, - { XKB_KEY_Down, MOD_MASK_ANY, "\033OB", 0, +1, 0}, - { XKB_KEY_Left, MOD_MASK_SHIFT, "\033[1;2D", 0, 0, 0}, - { XKB_KEY_Left, MOD_MASK_ALT, "\033[1;3D", 0, 0, 0}, - { XKB_KEY_Left,MOD_MASK_SHIFT|MOD_MASK_ALT,"\033[1;4D", 0, 0, 0}, - { XKB_KEY_Left, MOD_MASK_CTRL, "\033[1;5D", 0, 0, 0}, - { XKB_KEY_Left,MOD_MASK_SHIFT|MOD_MASK_CTRL,"\033[1;6D", 0, 0, 0}, - { XKB_KEY_Left,MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;7D", 0, 0, 0}, - { XKB_KEY_Left,MOD_MASK_SHIFT|MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;8D",0,0,0}, - { XKB_KEY_Left, MOD_MASK_ANY, "\033[D", 0, -1, 0}, - { XKB_KEY_Left, MOD_MASK_ANY, "\033OD", 0, +1, 0}, - { XKB_KEY_Right, MOD_MASK_SHIFT, "\033[1;2C", 0, 0, 0}, - { XKB_KEY_Right, MOD_MASK_ALT, "\033[1;3C", 0, 0, 0}, - { XKB_KEY_Right,MOD_MASK_SHIFT|MOD_MASK_ALT,"\033[1;4C", 0, 0, 0}, - { XKB_KEY_Right, MOD_MASK_CTRL, "\033[1;5C", 0, 0, 0}, - { XKB_KEY_Right,MOD_MASK_SHIFT|MOD_MASK_CTRL,"\033[1;6C", 0, 0, 0}, - { XKB_KEY_Right,MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;7C", 0, 0, 0}, - { XKB_KEY_Right,MOD_MASK_SHIFT|MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;8C",0,0,0}, - { XKB_KEY_Right, MOD_MASK_ANY, "\033[C", 0, -1, 0}, - { XKB_KEY_Right, MOD_MASK_ANY, "\033OC", 0, +1, 0}, - { XKB_KEY_ISO_Left_Tab, MOD_MASK_SHIFT, "\033[Z", 0, 0, 0}, - { XKB_KEY_Return, MOD_MASK_ALT, "\033\r", 0, 0, -1}, - { XKB_KEY_Return, MOD_MASK_ALT, "\033\r\n", 0, 0, +1}, - { XKB_KEY_Return, MOD_MASK_ANY, "\r", 0, 0, -1}, - { XKB_KEY_Return, MOD_MASK_ANY, "\r\n", 0, 0, +1}, - { XKB_KEY_Insert, MOD_MASK_SHIFT, "\033[4l", -1, 0, 0}, - { XKB_KEY_Insert, MOD_MASK_SHIFT, "\033[2;2~", +1, 0, 0}, - { XKB_KEY_Insert, MOD_MASK_CTRL, "\033[L", -1, 0, 0}, - { XKB_KEY_Insert, MOD_MASK_CTRL, "\033[2;5~", +1, 0, 0}, - { XKB_KEY_Insert, MOD_MASK_ANY, "\033[4h", -1, 0, 0}, - { XKB_KEY_Insert, MOD_MASK_ANY, "\033[2~", +1, 0, 0}, - { XKB_KEY_Delete, MOD_MASK_CTRL, "\033[M", -1, 0, 0}, - { XKB_KEY_Delete, MOD_MASK_CTRL, "\033[3;5~", +1, 0, 0}, - { XKB_KEY_Delete, MOD_MASK_SHIFT, "\033[2K", -1, 0, 0}, - { XKB_KEY_Delete, MOD_MASK_SHIFT, "\033[3;2~", +1, 0, 0}, - { XKB_KEY_Delete, MOD_MASK_ANY, "\033[P", -1, 0, 0}, - { XKB_KEY_Delete, MOD_MASK_ANY, "\033[3~", +1, 0, 0}, - { XKB_KEY_BackSpace, MOD_MASK_NONE, "\177", 0, 0, 0}, - { XKB_KEY_BackSpace, MOD_MASK_CTRL, "\033\177", 0, 0, 0}, - { XKB_KEY_Home, MOD_MASK_SHIFT, "\033[2J", 0, -1, 0}, - { XKB_KEY_Home, MOD_MASK_SHIFT, "\033[1;2H", 0, +1, 0}, - { XKB_KEY_Home, MOD_MASK_ANY, "\033[H", 0, -1, 0}, - { XKB_KEY_Home, MOD_MASK_ANY, "\033[1~", 0, +1, 0}, - { XKB_KEY_End, MOD_MASK_CTRL, "\033[J", -1, 0, 0}, - { XKB_KEY_End, MOD_MASK_CTRL, "\033[1;5F", +1, 0, 0}, - { XKB_KEY_End, MOD_MASK_SHIFT, "\033[K", -1, 0, 0}, - { XKB_KEY_End, MOD_MASK_SHIFT, "\033[1;2F", +1, 0, 0}, - { XKB_KEY_End, MOD_MASK_ANY, "\033[4~", 0, 0, 0}, - { XKB_KEY_Prior, MOD_MASK_CTRL, "\033[5;5~", 0, 0, 0}, - { XKB_KEY_Prior, MOD_MASK_SHIFT, "\033[5;2~", 0, 0, 0}, - { XKB_KEY_Prior, MOD_MASK_ANY, "\033[5~", 0, 0, 0}, - { XKB_KEY_Next, MOD_MASK_CTRL, "\033[6;5~", 0, 0, 0}, - { XKB_KEY_Next, MOD_MASK_SHIFT, "\033[6;2~", 0, 0, 0}, - { XKB_KEY_Next, MOD_MASK_ANY, "\033[6~", 0, 0, 0}, - { XKB_KEY_F1, MOD_MASK_NONE, "\033OP" , 0, 0, 0}, - { XKB_KEY_F1, /* F13 */ MOD_MASK_SHIFT, "\033[1;2P", 0, 0, 0}, - { XKB_KEY_F1, /* F25 */ MOD_MASK_CTRL, "\033[1;5P", 0, 0, 0}, - { XKB_KEY_F1, /* F37 */ MOD_MASK_LOGO, "\033[1;6P", 0, 0, 0}, - { XKB_KEY_F1, /* F49 */ MOD_MASK_ALT, "\033[1;3P", 0, 0, 0}, - { XKB_KEY_F2, MOD_MASK_NONE, "\033OQ" , 0, 0, 0}, - { XKB_KEY_F2, /* F14 */ MOD_MASK_SHIFT, "\033[1;2Q", 0, 0, 0}, - { XKB_KEY_F2, /* F26 */ MOD_MASK_CTRL, "\033[1;5Q", 0, 0, 0}, - { XKB_KEY_F2, /* F38 */ MOD_MASK_LOGO, "\033[1;6Q", 0, 0, 0}, - { XKB_KEY_F2, /* F50 */ MOD_MASK_ALT, "\033[1;3Q", 0, 0, 0}, - { XKB_KEY_F3, MOD_MASK_NONE, "\033OR" , 0, 0, 0}, - { XKB_KEY_F3, /* F15 */ MOD_MASK_SHIFT, "\033[1;2R", 0, 0, 0}, - { XKB_KEY_F3, /* F27 */ MOD_MASK_CTRL, "\033[1;5R", 0, 0, 0}, - { XKB_KEY_F3, /* F39 */ MOD_MASK_LOGO, "\033[1;6R", 0, 0, 0}, - { XKB_KEY_F3, /* F51 */ MOD_MASK_ALT, "\033[1;3R", 0, 0, 0}, - { XKB_KEY_F4, MOD_MASK_NONE, "\033OS" , 0, 0, 0}, - { XKB_KEY_F4, /* F16 */ MOD_MASK_SHIFT, "\033[1;2S", 0, 0, 0}, - { XKB_KEY_F4, /* F28 */ MOD_MASK_CTRL, "\033[1;5S", 0, 0, 0}, - { XKB_KEY_F4, /* F40 */ MOD_MASK_LOGO, "\033[1;6S", 0, 0, 0}, - { XKB_KEY_F4, /* F52 */ MOD_MASK_ALT, "\033[1;3S", 0, 0, 0}, - { XKB_KEY_F5, MOD_MASK_NONE, "\033[15~", 0, 0, 0}, - { XKB_KEY_F5, /* F17 */ MOD_MASK_SHIFT, "\033[15;2~", 0, 0, 0}, - { XKB_KEY_F5, /* F29 */ MOD_MASK_CTRL, "\033[15;5~", 0, 0, 0}, - { XKB_KEY_F5, /* F41 */ MOD_MASK_LOGO, "\033[15;6~", 0, 0, 0}, - { XKB_KEY_F5, /* F53 */ MOD_MASK_ALT, "\033[15;3~", 0, 0, 0}, - { XKB_KEY_F6, MOD_MASK_NONE, "\033[17~", 0, 0, 0}, - { XKB_KEY_F6, /* F18 */ MOD_MASK_SHIFT, "\033[17;2~", 0, 0, 0}, - { XKB_KEY_F6, /* F30 */ MOD_MASK_CTRL, "\033[17;5~", 0, 0, 0}, - { XKB_KEY_F6, /* F42 */ MOD_MASK_LOGO, "\033[17;6~", 0, 0, 0}, - { XKB_KEY_F6, /* F54 */ MOD_MASK_ALT, "\033[17;3~", 0, 0, 0}, - { XKB_KEY_F7, MOD_MASK_NONE, "\033[18~", 0, 0, 0}, - { XKB_KEY_F7, /* F19 */ MOD_MASK_SHIFT, "\033[18;2~", 0, 0, 0}, - { XKB_KEY_F7, /* F31 */ MOD_MASK_CTRL, "\033[18;5~", 0, 0, 0}, - { XKB_KEY_F7, /* F43 */ MOD_MASK_LOGO, "\033[18;6~", 0, 0, 0}, - { XKB_KEY_F7, /* F55 */ MOD_MASK_ALT, "\033[18;3~", 0, 0, 0}, - { XKB_KEY_F8, MOD_MASK_NONE, "\033[19~", 0, 0, 0}, - { XKB_KEY_F8, /* F20 */ MOD_MASK_SHIFT, "\033[19;2~", 0, 0, 0}, - { XKB_KEY_F8, /* F32 */ MOD_MASK_CTRL, "\033[19;5~", 0, 0, 0}, - { XKB_KEY_F8, /* F44 */ MOD_MASK_LOGO, "\033[19;6~", 0, 0, 0}, - { XKB_KEY_F8, /* F56 */ MOD_MASK_ALT, "\033[19;3~", 0, 0, 0}, - { XKB_KEY_F9, MOD_MASK_NONE, "\033[20~", 0, 0, 0}, - { XKB_KEY_F9, /* F21 */ MOD_MASK_SHIFT, "\033[20;2~", 0, 0, 0}, - { XKB_KEY_F9, /* F33 */ MOD_MASK_CTRL, "\033[20;5~", 0, 0, 0}, - { XKB_KEY_F9, /* F45 */ MOD_MASK_LOGO, "\033[20;6~", 0, 0, 0}, - { XKB_KEY_F9, /* F57 */ MOD_MASK_ALT, "\033[20;3~", 0, 0, 0}, - { XKB_KEY_F10, MOD_MASK_NONE, "\033[21~", 0, 0, 0}, - { XKB_KEY_F10, /* F22 */ MOD_MASK_SHIFT, "\033[21;2~", 0, 0, 0}, - { XKB_KEY_F10, /* F34 */ MOD_MASK_CTRL, "\033[21;5~", 0, 0, 0}, - { XKB_KEY_F10, /* F46 */ MOD_MASK_LOGO, "\033[21;6~", 0, 0, 0}, - { XKB_KEY_F10, /* F58 */ MOD_MASK_ALT, "\033[21;3~", 0, 0, 0}, - { XKB_KEY_F11, MOD_MASK_NONE, "\033[23~", 0, 0, 0}, - { XKB_KEY_F11, /* F23 */ MOD_MASK_SHIFT, "\033[23;2~", 0, 0, 0}, - { XKB_KEY_F11, /* F35 */ MOD_MASK_CTRL, "\033[23;5~", 0, 0, 0}, - { XKB_KEY_F11, /* F47 */ MOD_MASK_LOGO, "\033[23;6~", 0, 0, 0}, - { XKB_KEY_F11, /* F59 */ MOD_MASK_ALT, "\033[23;3~", 0, 0, 0}, - { XKB_KEY_F12, MOD_MASK_NONE, "\033[24~", 0, 0, 0}, - { XKB_KEY_F12, /* F24 */ MOD_MASK_SHIFT, "\033[24;2~", 0, 0, 0}, - { XKB_KEY_F12, /* F36 */ MOD_MASK_CTRL, "\033[24;5~", 0, 0, 0}, - { XKB_KEY_F12, /* F48 */ MOD_MASK_LOGO, "\033[24;6~", 0, 0, 0}, - { XKB_KEY_F12, /* F60 */ MOD_MASK_ALT, "\033[24;3~", 0, 0, 0}, - { XKB_KEY_F13, MOD_MASK_NONE, "\033[1;2P", 0, 0, 0}, - { XKB_KEY_F14, MOD_MASK_NONE, "\033[1;2Q", 0, 0, 0}, - { XKB_KEY_F15, MOD_MASK_NONE, "\033[1;2R", 0, 0, 0}, - { XKB_KEY_F16, MOD_MASK_NONE, "\033[1;2S", 0, 0, 0}, - { XKB_KEY_F17, MOD_MASK_NONE, "\033[15;2~", 0, 0, 0}, - { XKB_KEY_F18, MOD_MASK_NONE, "\033[17;2~", 0, 0, 0}, - { XKB_KEY_F19, MOD_MASK_NONE, "\033[18;2~", 0, 0, 0}, - { XKB_KEY_F20, MOD_MASK_NONE, "\033[19;2~", 0, 0, 0}, - { XKB_KEY_F21, MOD_MASK_NONE, "\033[20;2~", 0, 0, 0}, - { XKB_KEY_F22, MOD_MASK_NONE, "\033[21;2~", 0, 0, 0}, - { XKB_KEY_F23, MOD_MASK_NONE, "\033[23;2~", 0, 0, 0}, - { XKB_KEY_F24, MOD_MASK_NONE, "\033[24;2~", 0, 0, 0}, - { XKB_KEY_F25, MOD_MASK_NONE, "\033[1;5P", 0, 0, 0}, - { XKB_KEY_F26, MOD_MASK_NONE, "\033[1;5Q", 0, 0, 0}, - { XKB_KEY_F27, MOD_MASK_NONE, "\033[1;5R", 0, 0, 0}, - { XKB_KEY_F28, MOD_MASK_NONE, "\033[1;5S", 0, 0, 0}, - { XKB_KEY_F29, MOD_MASK_NONE, "\033[15;5~", 0, 0, 0}, - { XKB_KEY_F30, MOD_MASK_NONE, "\033[17;5~", 0, 0, 0}, - { XKB_KEY_F31, MOD_MASK_NONE, "\033[18;5~", 0, 0, 0}, - { XKB_KEY_F32, MOD_MASK_NONE, "\033[19;5~", 0, 0, 0}, - { XKB_KEY_F33, MOD_MASK_NONE, "\033[20;5~", 0, 0, 0}, - { XKB_KEY_F34, MOD_MASK_NONE, "\033[21;5~", 0, 0, 0}, - { XKB_KEY_F35, MOD_MASK_NONE, "\033[23;5~", 0, 0, 0}, + /* keysym mask string appkey appcursor crlf */ + { XK_KP_Home, ShiftMask, "\033[2J", 0, -1, 0}, + { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1, 0}, + { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0}, + { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0}, + { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0, 0}, + { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1, 0}, + { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1, 0}, + { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0, 0}, + { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1, 0}, + { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1, 0}, + { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0, 0}, + { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1, 0}, + { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1, 0}, + { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0, 0}, + { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1, 0}, + { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1, 0}, + { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0, 0}, + { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0}, + { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0, 0}, + { XK_KP_End, ControlMask, "\033[J", -1, 0, 0}, + { XK_KP_End, ControlMask, "\033[1;5F", +1, 0, 0}, + { XK_KP_End, ShiftMask, "\033[K", -1, 0, 0}, + { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0, 0}, + { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0, 0}, + { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0, 0}, + { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0}, + { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0, 0}, + { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0, 0}, + { XK_KP_Insert, ControlMask, "\033[L", -1, 0, 0}, + { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0, 0}, + { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0}, + { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0}, + { XK_KP_Delete, ControlMask, "\033[M", -1, 0, 0}, + { 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_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0}, + { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0}, + { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0}, + { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0, -1}, + { XK_KP_Enter, XK_ANY_MOD, "\r\n", -1, 0, +1}, + { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0, 0}, + { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0, 0}, + { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0, 0}, + { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0, 0}, + { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0, 0}, + { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0, 0}, + { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0, 0}, + { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0, 0}, + { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0, 0}, + { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0, 0}, + { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0, 0}, + { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0, 0}, + { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0, 0}, + { XK_Up, ShiftMask, "\033[1;2A", 0, 0, 0}, + { XK_Up, ControlMask, "\033[1;5A", 0, 0, 0}, + { XK_Up, Mod1Mask, "\033[1;3A", 0, 0, 0}, + { XK_Up, XK_ANY_MOD, "\033[A", 0, -1, 0}, + { XK_Up, XK_ANY_MOD, "\033OA", 0, +1, 0}, + { XK_Down, ShiftMask, "\033[1;2B", 0, 0, 0}, + { XK_Down, ControlMask, "\033[1;5B", 0, 0, 0}, + { XK_Down, Mod1Mask, "\033[1;3B", 0, 0, 0}, + { XK_Down, XK_ANY_MOD, "\033[B", 0, -1, 0}, + { XK_Down, XK_ANY_MOD, "\033OB", 0, +1, 0}, + { XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0}, + { XK_Left, ControlMask, "\033[1;5D", 0, 0, 0}, + { XK_Left, Mod1Mask, "\033[1;3D", 0, 0, 0}, + { XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0}, + { XK_Left, XK_ANY_MOD, "\033OD", 0, +1, 0}, + { XK_Right, ShiftMask, "\033[1;2C", 0, 0, 0}, + { XK_Right, ControlMask, "\033[1;5C", 0, 0, 0}, + { XK_Right, Mod1Mask, "\033[1;3C", 0, 0, 0}, + { XK_Right, XK_ANY_MOD, "\033[C", 0, -1, 0}, + { XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0}, + { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0, 0}, + { XK_Return, Mod1Mask, "\033\r", 0, 0, -1}, + { XK_Return, Mod1Mask, "\033\r\n", 0, 0, +1}, + { XK_Return, XK_ANY_MOD, "\r", 0, 0, -1}, + { XK_Return, XK_ANY_MOD, "\r\n", 0, 0, +1}, + { XK_Insert, ShiftMask, "\033[4l", -1, 0, 0}, + { XK_Insert, ShiftMask, "\033[2;2~", +1, 0, 0}, + { XK_Insert, ControlMask, "\033[L", -1, 0, 0}, + { XK_Insert, ControlMask, "\033[2;5~", +1, 0, 0}, + { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0}, + { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0}, + { XK_Delete, ControlMask, "\033[M", -1, 0, 0}, + { 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_BackSpace, XK_NO_MOD, "\177", 0, 0, 0}, + { XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0}, + { XK_Home, ShiftMask, "\033[2J", 0, -1, 0}, + { XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0}, + { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0}, + { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0}, + { XK_End, ControlMask, "\033[J", -1, 0, 0}, + { XK_End, ControlMask, "\033[1;5F", +1, 0, 0}, + { XK_End, ShiftMask, "\033[K", -1, 0, 0}, + { XK_End, ShiftMask, "\033[1;2F", +1, 0, 0}, + { XK_End, XK_ANY_MOD, "\033[4~", 0, 0, 0}, + { XK_Prior, ControlMask, "\033[5;5~", 0, 0, 0}, + { XK_Prior, ShiftMask, "\033[5;2~", 0, 0, 0}, + { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0}, + { XK_Next, ControlMask, "\033[6;5~", 0, 0, 0}, + { XK_Next, ShiftMask, "\033[6;2~", 0, 0, 0}, + { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0}, + { XK_F1, XK_NO_MOD, "\033OP" , 0, 0, 0}, + { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0, 0}, + { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0, 0}, + { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0, 0}, + { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0, 0}, + { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0, 0}, + { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0, 0}, + { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0, 0}, + { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0, 0}, + { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0, 0}, + { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0, 0}, + { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0, 0}, + { XK_F3, XK_NO_MOD, "\033OR" , 0, 0, 0}, + { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0, 0}, + { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0, 0}, + { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0, 0}, + { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0, 0}, + { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0}, + { XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0}, + { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0}, + { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0, 0}, + { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0}, + { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0}, + { XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0}, + { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0, 0}, + { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0, 0}, + { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0, 0}, + { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0, 0}, + { XK_F6, XK_NO_MOD, "\033[17~", 0, 0, 0}, + { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0, 0}, + { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0, 0}, + { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0, 0}, + { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0, 0}, + { XK_F7, XK_NO_MOD, "\033[18~", 0, 0, 0}, + { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0, 0}, + { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0, 0}, + { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0, 0}, + { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0, 0}, + { XK_F8, XK_NO_MOD, "\033[19~", 0, 0, 0}, + { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0, 0}, + { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0, 0}, + { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0, 0}, + { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0, 0}, + { XK_F9, XK_NO_MOD, "\033[20~", 0, 0, 0}, + { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0, 0}, + { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0, 0}, + { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0, 0}, + { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0, 0}, + { XK_F10, XK_NO_MOD, "\033[21~", 0, 0, 0}, + { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0, 0}, + { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0, 0}, + { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0, 0}, + { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0, 0}, + { XK_F11, XK_NO_MOD, "\033[23~", 0, 0, 0}, + { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0, 0}, + { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0, 0}, + { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0, 0}, + { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0, 0}, + { XK_F12, XK_NO_MOD, "\033[24~", 0, 0, 0}, + { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0, 0}, + { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0, 0}, + { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0, 0}, + { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0, 0}, + { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0, 0}, + { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0, 0}, + { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0, 0}, + { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0, 0}, + { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0, 0}, + { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0, 0}, + { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0, 0}, + { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0, 0}, + { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0, 0}, + { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0, 0}, + { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0, 0}, + { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0, 0}, + { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0, 0}, + { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0, 0}, + { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0, 0}, + { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0, 0}, + { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0, 0}, + { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0, 0}, + { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0, 0}, + { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0, 0}, + { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0, 0}, + { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0, 0}, + { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0, 0}, }; /* @@ -440,7 +433,7 @@ static Key key[] = { * If no match is found, regular selection is used. */ static uint selmasks[] = { - [SEL_RECTANGULAR] = MOD_MASK_ALT, + [SEL_RECTANGULAR] = Mod1Mask, }; /* diff --git a/st.c b/st.c index d905620..233d301 100644 --- a/st.c +++ b/st.c @@ -3,8 +3,6 @@ #include #include #include -/* for BTN_* definitions */ -#include #include #include #include @@ -14,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -24,19 +21,23 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include "arg.h" -#include "xdg-shell-unstable-v6-client-protocol.h" char *argv0; +#define Glyph Glyph_ +#define Font Font_ + #if defined(__linux) #include #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) @@ -46,6 +47,10 @@ char *argv0; #endif +/* XEMBED messages */ +#define XEMBED_FOCUS_IN 4 +#define XEMBED_FOCUS_OUT 5 + /* Arbitrary sizes */ #define UTF_INVALID 0xFFFD #define UTF_SIZ 4 @@ -53,21 +58,10 @@ char *argv0; #define ESC_ARG_SIZ 16 #define STR_BUF_SIZ ESC_BUF_SIZ #define STR_ARG_SIZ ESC_ARG_SIZ -#define DRAW_BUF_SIZ 20*1024 #define XK_ANY_MOD UINT_MAX #define XK_NO_MOD 0 #define XK_SWITCH_MOD (1<<13) -#define MOD_MASK_ANY UINT_MAX -#define MOD_MASK_NONE 0 -#define MOD_MASK_CTRL (1<<0) -#define MOD_MASK_ALT (1<<1) -#define MOD_MASK_SHIFT (1<<2) -#define MOD_MASK_LOGO (1<<3) - -#define AXIS_VERTICAL WL_POINTER_AXIS_VERTICAL_SCROLL -#define AXIS_HORIZONTAL WL_POINTER_AXIS_HORIZONTAL_SCROLL - /* macros */ #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) < (b) ? (b) : (a)) @@ -92,9 +86,9 @@ char *argv0; #define TRUERED(x) (((x) & 0xff0000) >> 8) #define TRUEGREEN(x) (((x) & 0xff00)) #define TRUEBLUE(x) (((x) & 0xff) << 8) +#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - term.scr \ + + histsize + 1) % histsize] : term.line[(y) - term.scr]) -/* constants */ -#define ISO14755CMD "dmenu -p codepoint: 0 && term.line[y][i - 1].u == ' ') + while (i > 0 && TLINE(y)[i - 1].u == ' ') --i; return i; @@ -865,7 +803,7 @@ selsnap(int *x, int *y, int direction) * Snap around if the word wraps around at the end or * beginning of a line. */ - prevgp = &term.line[*y][*x]; + prevgp = &TLINE(*y)[*x]; prevdelim = ISDELIM(prevgp->u); for (;;) { newx = *x + direction; @@ -880,14 +818,14 @@ selsnap(int *x, int *y, int direction) yt = *y, xt = *x; else yt = newy, xt = newx; - if (!(term.line[yt][xt].mode & ATTR_WRAP)) + if (!(TLINE(yt)[xt].mode & ATTR_WRAP)) break; } if (newx >= tlinelen(newy)) break; - gp = &term.line[newy][newx]; + gp = &TLINE(newy)[newx]; delim = ISDELIM(gp->u); if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim || (delim && gp->u != prevgp->u))) @@ -908,14 +846,14 @@ selsnap(int *x, int *y, int direction) *x = (direction < 0) ? 0 : term.col - 1; if (direction < 0) { for (; *y > 0; *y += direction) { - if (!(term.line[*y-1][term.col-1].mode + if (!(TLINE(*y-1)[term.col-1].mode & ATTR_WRAP)) { break; } } } else if (direction > 0) { for (; *y < term.row-1; *y += direction) { - if (!(term.line[*y][term.col-1].mode + if (!(TLINE(*y)[term.col-1].mode & ATTR_WRAP)) { break; } @@ -926,15 +864,15 @@ selsnap(int *x, int *y, int direction) } void -getbuttoninfo(void) +getbuttoninfo(XEvent *e) { int type; - uint state = wl.xkb.mods & ~forceselmod; + uint state = e->xbutton.state & ~(Button1Mask | forceselmod); sel.alt = IS_SET(MODE_ALTSCREEN); - sel.oe.x = x2col(wl.px); - sel.oe.y = y2row(wl.py); + sel.oe.x = x2col(e->xbutton.x); + sel.oe.y = y2row(e->xbutton.y); selnormalize(); sel.type = SEL_REGULAR; @@ -947,20 +885,59 @@ getbuttoninfo(void) } void -wlmousereport(int button, bool release, int x, int y) +mousereport(XEvent *e) { - int len; + int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y), + button = e->xbutton.button, state = e->xbutton.state, + len; char buf[40]; + static int ox, oy; + + /* from urxvt */ + if (e->xbutton.type == MotionNotify) { + if (x == ox && y == oy) + return; + if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY)) + return; + /* MOUSE_MOTION: no reporting if no button is pressed */ + if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3) + return; + + button = oldbutton + 32; + ox = x; + oy = y; + } else { + if (!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) { + button = 3; + } else { + button -= Button1; + if (button >= 3) + button += 64 - 3; + } + if (e->xbutton.type == ButtonPress) { + oldbutton = button; + ox = x; + oy = y; + } else if (e->xbutton.type == ButtonRelease) { + oldbutton = 3; + /* MODE_MOUSEX10: no button release reporting */ + if (IS_SET(MODE_MOUSEX10)) + return; + if (button == 64 || button == 65) + return; + } + } if (!IS_SET(MODE_MOUSEX10)) { - button += ((wl.xkb.mods & MOD_MASK_SHIFT) ? 4 : 0) - + ((wl.xkb.mods & MOD_MASK_LOGO ) ? 8 : 0) - + ((wl.xkb.mods & MOD_MASK_CTRL ) ? 16 : 0); + button += ((state & ShiftMask ) ? 4 : 0) + + ((state & Mod4Mask ) ? 8 : 0) + + ((state & ControlMask) ? 16 : 0); } if (IS_SET(MODE_MOUSESGR)) { len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c", - button, x+1, y+1, release ? 'm' : 'M'); + button, x+1, y+1, + e->xbutton.type == ButtonRelease ? 'm' : 'M'); } else if (x < 223 && y < 223) { len = snprintf(buf, sizeof(buf), "\033[M%c%c%c", 32+button, 32+x+1, 32+y+1); @@ -972,59 +949,53 @@ wlmousereport(int button, bool release, int x, int y) } void -wlmousereportbutton(uint32_t button, uint32_t state) +bpress(XEvent *e) { - bool release = state == WL_POINTER_BUTTON_STATE_RELEASED; + struct timespec now; + MouseShortcut *ms; - if (!IS_SET(MODE_MOUSESGR) && release) { - button = 3; - } else { - switch (button) { - case BTN_LEFT: - button = 0; - break; - case BTN_MIDDLE: - button = 1; - break; - case BTN_RIGHT: - button = 2; - break; + if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { + mousereport(e); + return; + } + + for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { + if (e->xbutton.button == ms->b + && match(ms->mask, e->xbutton.state)) { + ttysend(ms->s, strlen(ms->s)); + return; } } - oldbutton = release ? 3 : button; + if (e->xbutton.button == Button1) { + clock_gettime(CLOCK_MONOTONIC, &now); - /* don't report release events when in X10 mode */ - if (IS_SET(MODE_MOUSEX10) && release) { - return; + /* Clear previous selection, logically and visually. */ + selclear(NULL); + sel.mode = SEL_EMPTY; + sel.type = SEL_REGULAR; + sel.oe.x = sel.ob.x = x2col(e->xbutton.x); + sel.oe.y = sel.ob.y = y2row(e->xbutton.y); + + /* + * If the user clicks below predefined timeouts specific + * snapping behaviour is exposed. + */ + if (TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) { + sel.snap = SNAP_LINE; + } else if (TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) { + sel.snap = SNAP_WORD; + } else { + sel.snap = 0; + } + selnormalize(); + + if (sel.snap != 0) + sel.mode = SEL_READY; + tsetdirt(sel.nb.y, sel.ne.y); + sel.tclick2 = sel.tclick1; + sel.tclick1 = now; } - - wlmousereport(button, release, oldx, oldy); -} - -void -wlmousereportmotion(wl_fixed_t fx, wl_fixed_t fy) -{ - int x = x2col(wl_fixed_to_int(fx)), y = y2row(wl_fixed_to_int(fy)); - - if (x == oldx && y == oldy) - return; - if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY)) - return; - /* MOUSE_MOTION: no reporting if no button is pressed */ - if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3) - return; - - oldx = x; - oldy = y; - wlmousereport(oldbutton + 32, false, x, y); -} - -void -wlmousereportaxis(uint32_t axis, wl_fixed_t amount) -{ - wlmousereport(64 + (axis == AXIS_VERTICAL ? 4 : 6) - + (amount > 0 ? 1 : 0), false, oldx, oldy); } char * @@ -1048,13 +1019,13 @@ getsel(void) } if (sel.type == SEL_RECTANGULAR) { - gp = &term.line[y][sel.nb.x]; + gp = &TLINE(y)[sel.nb.x]; lastx = sel.ne.x; } else { - gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; + gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0]; lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; } - last = &term.line[y][MIN(lastx, linelen-1)]; + last = &TLINE(y)[MIN(lastx, linelen-1)]; while (last >= gp && last->u == ' ') --last; @@ -1082,67 +1053,148 @@ getsel(void) } void -selcopy(uint32_t serial) +selcopy(Time t) { - wlsetsel(getsel(), serial); + xsetsel(getsel(), t); } -static inline void -selwritebuf(char *buf, int len) +void +propnotify(XEvent *e) { - char *repl = buf; + XPropertyEvent *xpev; + Atom clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); + + xpev = &e->xproperty; + if (xpev->state == PropertyNewValue && + (xpev->atom == XA_PRIMARY || + xpev->atom == clipboard)) { + selnotify(e); + } +} + +void +selnotify(XEvent *e) +{ + ulong nitems, ofs, rem; + int format; + uchar *data, *last, *repl; + Atom type, incratom, property; + + incratom = XInternAtom(xw.dpy, "INCR", 0); + + ofs = 0; + if (e->type == SelectionNotify) { + property = e->xselection.property; + } else if(e->type == PropertyNotify) { + property = e->xproperty.atom; + } else { + return; + } + if (property == None) + return; + + do { + if (XGetWindowProperty(xw.dpy, xw.win, property, ofs, + BUFSIZ/4, False, AnyPropertyType, + &type, &format, &nitems, &rem, + &data)) { + fprintf(stderr, "Clipboard allocation failed\n"); + return; + } + + if (e->type == PropertyNotify && nitems == 0 && rem == 0) { + /* + * If there is some PropertyNotify with no data, then + * this is the signal of the selection owner that all + * data has been transferred. We won't need to receive + * PropertyNotify events anymore. + */ + MODBIT(xw.attrs.event_mask, 0, PropertyChangeMask); + XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, + &xw.attrs); + } + + if (type == incratom) { + /* + * Activate the PropertyNotify events so we receive + * when the selection owner does send us the next + * chunk of data. + */ + MODBIT(xw.attrs.event_mask, 1, PropertyChangeMask); + XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, + &xw.attrs); + + /* + * Deleting the property is the transfer start signal. + */ + XDeleteProperty(xw.dpy, xw.win, (int)property); + continue; + } + + /* + * As seen in getsel: + * Line endings are inconsistent in the terminal and GUI world + * copy and pasting. When receiving some selection data, + * replace all '\n' with '\r'. + * FIXME: Fix the computer world. + */ + repl = data; + last = data + nitems * format / 8; + while ((repl = memchr(repl, '\n', last - repl))) { + *repl++ = '\r'; + } + + if (IS_SET(MODE_BRCKTPASTE) && ofs == 0) + ttywrite("\033[200~", 6); + ttysend((char *)data, nitems * format / 8); + if (IS_SET(MODE_BRCKTPASTE) && rem == 0) + ttywrite("\033[201~", 6); + XFree(data); + /* number of 32-bit chunks returned */ + ofs += nitems * format / 32; + } while (rem > 0); /* - * As seen in getsel: - * Line endings are inconsistent in the terminal and GUI world - * copy and pasting. When receiving some selection data, - * replace all '\n' with '\r'. - * FIXME: Fix the computer world. + * Deleting the property again tells the selection owner to send the + * next data chunk in the property. */ - while ((repl = memchr(repl, '\n', len))) { - *repl++ = '\r'; - } - - ttysend(buf, len); + XDeleteProperty(xw.dpy, xw.win, (int)property); } void selpaste(const Arg *dummy) { - int fds[2], len, left; - char buf[BUFSIZ], *str; + XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, + xw.win, CurrentTime); +} - if (wl.seloffer) { - if (IS_SET(MODE_BRCKTPASTE)) - ttywrite("\033[200~", 6); - /* check if we are pasting from ourselves */ - if (sel.source) { - str = sel.primary; - left = strlen(sel.primary); - while (left > 0) { - len = MIN(sizeof buf, left); - memcpy(buf, str, len); - selwritebuf(buf, len); - left -= len; - str += len; - } - } else { - pipe(fds); - wl_data_offer_receive(wl.seloffer, "text/plain", fds[1]); - wl_display_flush(wl.dpy); - close(fds[1]); - while ((len = read(fds[0], buf, sizeof buf)) > 0) { - selwritebuf(buf, len); - } - close(fds[0]); - } - if (IS_SET(MODE_BRCKTPASTE)) - ttywrite("\033[201~", 6); +void +clipcopy(const Arg *dummy) +{ + Atom clipboard; + + if (sel.clipboard != NULL) + free(sel.clipboard); + + if (sel.primary != NULL) { + sel.clipboard = xstrdup(sel.primary); + clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); + XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime); } } void -selclear(void) +clippaste(const Arg *dummy) +{ + Atom clipboard; + + clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); + XConvertSelection(xw.dpy, clipboard, sel.xtarget, clipboard, + xw.win, CurrentTime); +} + +void +selclear(XEvent *e) { if (sel.ob.x == -1) return; @@ -1152,19 +1204,117 @@ selclear(void) } void -wlsetsel(char *str, uint32_t serial) +selrequest(XEvent *e) +{ + XSelectionRequestEvent *xsre; + XSelectionEvent xev; + Atom xa_targets, string, clipboard; + char *seltext; + + xsre = (XSelectionRequestEvent *) e; + xev.type = SelectionNotify; + xev.requestor = xsre->requestor; + xev.selection = xsre->selection; + xev.target = xsre->target; + xev.time = xsre->time; + if (xsre->property == None) + xsre->property = xsre->target; + + /* reject */ + xev.property = None; + + xa_targets = XInternAtom(xw.dpy, "TARGETS", 0); + if (xsre->target == xa_targets) { + /* respond with the supported type */ + string = sel.xtarget; + XChangeProperty(xsre->display, xsre->requestor, xsre->property, + XA_ATOM, 32, PropModeReplace, + (uchar *) &string, 1); + xev.property = xsre->property; + } else if (xsre->target == sel.xtarget || xsre->target == XA_STRING) { + /* + * xith XA_STRING non ascii characters may be incorrect in the + * requestor. It is not our problem, use utf8. + */ + clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); + if (xsre->selection == XA_PRIMARY) { + seltext = sel.primary; + } else if (xsre->selection == clipboard) { + seltext = sel.clipboard; + } else { + fprintf(stderr, + "Unhandled clipboard selection 0x%lx\n", + xsre->selection); + return; + } + if (seltext != NULL) { + XChangeProperty(xsre->display, xsre->requestor, + xsre->property, xsre->target, + 8, PropModeReplace, + (uchar *)seltext, strlen(seltext)); + xev.property = xsre->property; + } + } + + /* all done, send a notification to the listener */ + if (!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev)) + fprintf(stderr, "Error sending SelectionNotify event\n"); +} + +void +xsetsel(char *str, Time t) { free(sel.primary); sel.primary = str; - if (str) { - sel.source = wl_data_device_manager_create_data_source(wl.datadevmanager); - wl_data_source_add_listener(sel.source, &datasrclistener, NULL); - wl_data_source_offer(sel.source, "text/plain; charset=utf-8"); - } else { - sel.source = NULL; + XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); + if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) + selclear(0); +} + +void +brelease(XEvent *e) +{ + if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { + mousereport(e); + return; } - wl_data_device_set_selection(wl.datadev, sel.source, serial); + + if (e->xbutton.button == Button2) { + selpaste(NULL); + } else if (e->xbutton.button == Button1) { + if (sel.mode == SEL_READY) { + getbuttoninfo(e); + selcopy(e->xbutton.time); + } else + selclear(NULL); + sel.mode = SEL_IDLE; + tsetdirt(sel.nb.y, sel.ne.y); + } +} + +void +bmotion(XEvent *e) +{ + int oldey, oldex, oldsby, oldsey; + + if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { + mousereport(e); + return; + } + + if (!sel.mode) + return; + + sel.mode = SEL_READY; + oldey = sel.oe.y; + oldex = sel.oe.x; + oldsby = sel.nb.y; + oldsey = sel.ne.y; + getbuttoninfo(e); + + if (oldey != sel.oe.y || oldex != sel.oe.x) + tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey)); } void @@ -1183,6 +1333,7 @@ execsh(void) { char **args, *sh, *prog; const struct passwd *pw; + char buf[sizeof(long) * 8 + 1]; errno = 0; if ((pw = getpwuid(getuid())) == NULL) { @@ -1203,6 +1354,8 @@ execsh(void) prog = sh; args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL}; + snprintf(buf, sizeof(buf), "%lu", xw.win); + unsetenv("COLUMNS"); unsetenv("LINES"); unsetenv("TERMCAP"); @@ -1211,6 +1364,7 @@ execsh(void) setenv("SHELL", sh, 1); setenv("HOME", pw->pw_dir, 1); setenv("TERM", termname, 1); + setenv("WINDOWID", buf, 1); signal(SIGCHLD, SIG_DFL); signal(SIGHUP, SIG_DFL); @@ -1236,7 +1390,7 @@ sigchld(int a) return; if (!WIFEXITED(stat) || WEXITSTATUS(stat)) - die("child finished with error '%d'\n", WEXITSTATUS(stat)); + die("child finished with error '%d'\n", stat); exit(0); } @@ -1331,31 +1485,21 @@ ttyread(void) if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0) die("Couldn't read from shell: %s\n", strerror(errno)); + /* process every complete utf8 char */ buflen += ret; ptr = buf; - - for (;;) { - if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) { - /* process a complete utf8 char */ - charsize = utf8decode(ptr, &unicodep, buflen); - if (charsize == 0) - break; - tputc(unicodep); - ptr += charsize; - buflen -= charsize; - - } else { - if (buflen <= 0) - break; - tputc(*ptr++ & 0xFF); - buflen--; - } + while ((charsize = utf8decode(ptr, &unicodep, buflen))) { + tputc(unicodep); + ptr += charsize; + buflen -= charsize; } - /* keep any uncomplete utf8 char for the next call */ - if (buflen > 0) - memmove(buf, ptr, buflen); - needdraw = true; + /* keep any uncomplete utf8 char for the next call */ + memmove(buf, ptr, buflen); + + if (term.scr > 0 && term.scr < histsize-1) + term.scr++; + return ret; } @@ -1365,6 +1509,9 @@ ttywrite(const char *s, size_t n) fd_set wfd, rfd; ssize_t r; size_t lim = 256; + Arg arg = (Arg){ .i = term.scr }; + + kscrolldown(&arg); /* * Remember that we are using a pty, which might be a modem line. @@ -1420,26 +1567,15 @@ void ttysend(char *s, size_t n) { int len; - char *t, *lim; Rune u; ttywrite(s, n); - if (!IS_SET(MODE_ECHO)) - return; - - lim = &s[n]; - for (t = s; t < lim; t += len) { - if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) { - len = utf8decode(t, &u, n); - } else { - u = *t & 0xFF; - len = 1; + if (IS_SET(MODE_ECHO)) + while ((len = utf8decode(s, &u, n)) > 0) { + techo(u); + n -= len; + s += len; } - if (len <= 0) - break; - techo(u); - n -= len; - } } void @@ -1449,8 +1585,8 @@ ttyresize(void) w.ws_row = term.row; w.ws_col = term.col; - w.ws_xpixel = wl.tw; - w.ws_ypixel = wl.th; + w.ws_xpixel = xw.tw; + w.ws_ypixel = xw.th; if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0) fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno)); } @@ -1480,8 +1616,6 @@ tsetdirt(int top, int bot) for (i = top; i <= bot; i++) term.dirty[i] = 1; - - needdraw = true; } void @@ -1535,7 +1669,7 @@ treset(void) term.tabs[i] = 1; term.top = 0; term.bot = term.row - 1; - term.mode = MODE_WRAP|MODE_UTF8; + term.mode = MODE_WRAP; memset(term.trantbl, CS_USA, sizeof(term.trantbl)); term.charset = 0; @@ -1569,13 +1703,53 @@ tswapscreen(void) } void -tscrolldown(int orig, int n) +kscrolldown(const Arg* a) +{ + int n = a->i; + + if (n < 0) + n = term.row + n; + + if (n > term.scr) + n = term.scr; + + if (term.scr > 0) { + term.scr -= n; + selscroll(0, -n); + tfulldirt(); + } +} + +void +kscrollup(const Arg* a) +{ + int n = a->i; + + if (n < 0) + n = term.row + n; + + if (term.scr <= histsize - n) { + term.scr += n; + selscroll(0, n); + tfulldirt(); + } +} + +void +tscrolldown(int orig, int n, int copyhist) { int i; Line temp; LIMIT(n, 0, term.bot-orig+1); + if (copyhist) { + term.histi = (term.histi - 1 + histsize) % histsize; + temp = term.hist[term.histi]; + term.hist[term.histi] = term.line[term.bot]; + term.line[term.bot] = temp; + } + tsetdirt(orig, term.bot-n); tclearregion(0, term.bot-n+1, term.col-1, term.bot); @@ -1589,13 +1763,20 @@ tscrolldown(int orig, int n) } void -tscrollup(int orig, int n) +tscrollup(int orig, int n, int copyhist) { int i; Line temp; LIMIT(n, 0, term.bot-orig+1); + if (copyhist) { + term.histi = (term.histi + 1) % histsize; + temp = term.hist[term.histi]; + term.hist[term.histi] = term.line[orig]; + term.line[orig] = temp; + } + tclearregion(0, orig, term.col-1, orig+n-1); tsetdirt(orig+n, term.bot); @@ -1616,7 +1797,7 @@ selscroll(int orig, int n) if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) { if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) { - selclear(); + selclear(NULL); return; } if (sel.type == SEL_RECTANGULAR) { @@ -1644,7 +1825,7 @@ tnewline(int first_col) int y = term.c.y; if (y == term.bot) { - tscrollup(term.top, 1); + tscrollup(term.top, 1, 1); } else { y++; } @@ -1762,7 +1943,7 @@ tclearregion(int x1, int y1, int x2, int y2) for (x = x1; x <= x2; x++) { gp = &term.line[y][x]; if (selected(x, y)) - selclear(); + selclear(NULL); gp->fg = term.c.attr.fg; gp->bg = term.c.attr.bg; gp->mode = 0; @@ -1809,14 +1990,14 @@ void tinsertblankline(int n) { if (BETWEEN(term.c.y, term.top, term.bot)) - tscrolldown(term.c.y, n); + tscrolldown(term.c.y, n, 0); } void tdeleteline(int n) { if (BETWEEN(term.c.y, term.top, term.bot)) - tscrollup(term.c.y, n); + tscrollup(term.c.y, n, 0); } int32_t @@ -2025,18 +2206,22 @@ tsetmode(int priv, int set, int *args, int narg) MODBIT(term.mode, !set, MODE_HIDE); break; case 9: /* X10 mouse compatibility mode */ + xsetpointermotion(0); MODBIT(term.mode, 0, MODE_MOUSE); MODBIT(term.mode, set, MODE_MOUSEX10); break; case 1000: /* 1000: report button press */ + xsetpointermotion(0); MODBIT(term.mode, 0, MODE_MOUSE); MODBIT(term.mode, set, MODE_MOUSEBTN); break; case 1002: /* 1002: report motion on button press */ + xsetpointermotion(0); MODBIT(term.mode, 0, MODE_MOUSE); MODBIT(term.mode, set, MODE_MOUSEMOTION); break; case 1003: /* 1003: enable all mouse motions */ + xsetpointermotion(set); MODBIT(term.mode, 0, MODE_MOUSE); MODBIT(term.mode, set, MODE_MOUSEMANY); break; @@ -2209,7 +2394,7 @@ csihandle(void) tputtab(csiescseq.arg[0]); break; case 'J': /* ED -- Clear screen */ - selclear(); + selclear(NULL); switch (csiescseq.arg[0]) { case 0: /* below */ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); @@ -2246,11 +2431,11 @@ csihandle(void) break; case 'S': /* SU -- Scroll line up */ DEFAULT(csiescseq.arg[0], 1); - tscrollup(term.top, csiescseq.arg[0]); + tscrollup(term.top, csiescseq.arg[0], 0); break; case 'T': /* SD -- Scroll line down */ DEFAULT(csiescseq.arg[0], 1); - tscrolldown(term.top, csiescseq.arg[0]); + tscrolldown(term.top, csiescseq.arg[0], 0); break; case 'L': /* IL -- Insert blank lines */ DEFAULT(csiescseq.arg[0], 1); @@ -2316,7 +2501,7 @@ csihandle(void) if (!BETWEEN(csiescseq.arg[0], 0, 6)) { goto unknown; } - wl.cursor = csiescseq.arg[0]; + xw.cursor = csiescseq.arg[0]; break; default: goto unknown; @@ -2331,22 +2516,22 @@ csidump(void) int i; uint c; - fprintf(stderr, "ESC["); + printf("ESC["); for (i = 0; i < csiescseq.len; i++) { c = csiescseq.buf[i] & 0xff; if (isprint(c)) { - putc(c, stderr); + putchar(c); } else if (c == '\n') { - fprintf(stderr, "(\\n)"); + printf("(\\n)"); } else if (c == '\r') { - fprintf(stderr, "(\\r)"); + printf("(\\r)"); } else if (c == 0x1b) { - fprintf(stderr, "(\\e)"); + printf("(\\e)"); } else { - fprintf(stderr, "(%02x)", c); + printf("(%02x)", c); } } - putc('\n', stderr); + putchar('\n'); } void @@ -2372,7 +2557,7 @@ strhandle(void) case 1: case 2: if (narg > 1) - wlsettitle(strescseq.args[1]); + xsettitle(strescseq.args[1]); return; case 4: /* color set */ if (narg < 3) @@ -2381,7 +2566,7 @@ strhandle(void) /* FALLTHROUGH */ case 104: /* color reset, here p = NULL */ j = (narg > 1) ? atoi(strescseq.args[1]) : -1; - if (wlsetcolorname(j, p)) { + if (xsetcolorname(j, p)) { fprintf(stderr, "erresc: invalid color %s\n", p); } else { /* @@ -2394,10 +2579,9 @@ strhandle(void) } break; case 'k': /* old title set compatibility */ - wlsettitle(strescseq.args[0]); + xsettitle(strescseq.args[0]); return; case 'P': /* DCS -- Device Control String */ - term.mode |= ESC_DCS; case '_': /* APC -- Application Program Command */ case '^': /* PM -- Privacy Message */ return; @@ -2435,25 +2619,24 @@ strdump(void) int i; uint c; - fprintf(stderr, "ESC%c", strescseq.type); + printf("ESC%c", strescseq.type); for (i = 0; i < strescseq.len; i++) { c = strescseq.buf[i] & 0xff; if (c == '\0') { - putc('\n', stderr); return; } else if (isprint(c)) { - putc(c, stderr); + putchar(c); } else if (c == '\n') { - fprintf(stderr, "(\\n)"); + printf("(\\n)"); } else if (c == '\r') { - fprintf(stderr, "(\\r)"); + printf("(\\r)"); } else if (c == 0x1b) { - fprintf(stderr, "(\\e)"); + printf("(\\e)"); } else { - fprintf(stderr, "(%02x)", c); + printf("(%02x)", c); } } - fprintf(stderr, "ESC\\\n"); + printf("ESC\\\n"); } void @@ -2480,28 +2663,6 @@ tprinter(char *s, size_t len) } } -void -iso14755(const Arg *arg) -{ - FILE *p; - char *us, *e, codepoint[9], uc[UTF_SIZ]; - unsigned long utf32; - - if (!(p = popen(ISO14755CMD, "r"))) - return; - - us = fgets(codepoint, sizeof(codepoint), p); - pclose(p); - - if (!us || *us == '\0' || *us == '-' || strlen(us) > 7) - return; - if ((utf32 = strtoul(us, &e, 16)) == ULONG_MAX || - (*e != '\n' && *e != '\0')) - return; - - ttysend(uc, utf8encode(utf32, uc)); -} - void toggleprinter(const Arg *arg) { @@ -2586,16 +2747,6 @@ techo(Rune u) } } tputc(u); - needdraw = true; -} - -void -tdefutf8(char ascii) -{ - if (ascii == 'G') - term.mode |= MODE_UTF8; - else if (ascii == '@') - term.mode &= ~MODE_UTF8; } void @@ -2628,12 +2779,9 @@ tdectest(char c) void tstrsequence(uchar c) { - strreset(); - switch (c) { case 0x90: /* DCS -- Device Control String */ c = 'P'; - term.esc |= ESC_DCS; break; case 0x9f: /* APC -- Application Program Command */ c = '_'; @@ -2645,6 +2793,7 @@ tstrsequence(uchar c) c = ']'; break; } + strreset(); strescseq.type = c; term.esc |= ESC_STR; } @@ -2673,12 +2822,10 @@ tcontrolcode(uchar ascii) /* backwards compatibility to xterm */ strhandle(); } else { - if (!(wl.state & WIN_FOCUSED)) - wlseturgency(1); - /* XXX: No bell on wayland - * if (bellvolume) - * XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL); - */ + if (!(xw.state & WIN_FOCUSED)) + xseturgency(1); + if (bellvolume) + XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL); } break; case '\033': /* ESC */ @@ -2764,9 +2911,6 @@ eschandle(uchar ascii) case '#': term.esc |= ESC_TEST; return 0; - case '%': - term.esc |= ESC_UTF8; - return 0; case 'P': /* DCS -- Device Control String */ case '_': /* APC -- Application Program Command */ case '^': /* PM -- Privacy Message */ @@ -2787,7 +2931,7 @@ eschandle(uchar ascii) return 0; case 'D': /* IND -- Linefeed */ if (term.c.y == term.bot) { - tscrollup(term.top, 1); + tscrollup(term.top, 1, 1); } else { tmoveto(term.c.x, term.c.y+1); } @@ -2800,7 +2944,7 @@ eschandle(uchar ascii) break; case 'M': /* RI -- Reverse index */ if (term.c.y == term.top) { - tscrolldown(term.top, 1); + tscrolldown(term.top, 1, 1); } else { tmoveto(term.c.x, term.c.y-1); } @@ -2810,8 +2954,8 @@ eschandle(uchar ascii) break; case 'c': /* RIS -- Reset to inital state */ treset(); - wlresettitle(); - wlloadcols(); + xresettitle(); + xloadcols(); break; case '=': /* DECPAM -- Application keypad */ term.mode |= MODE_APPKEYPAD; @@ -2846,15 +2990,10 @@ tputc(Rune u) Glyph *gp; control = ISCONTROL(u); - if (!IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) { - c[0] = u; - width = len = 1; - } else { - len = utf8encode(u, c); - if (!control && (width = wcwidth(u)) == -1) { - memcpy(c, "\357\277\275", 4); /* UTF_INVALID */ - width = 1; - } + len = utf8encode(u, c); + if (!control && (width = wcwidth(u)) == -1) { + memcpy(c, "\357\277\275", 4); /* UTF_INVALID */ + width = 1; } if (IS_SET(MODE_PRINT)) @@ -2868,48 +3007,31 @@ tputc(Rune u) */ if (term.esc & ESC_STR) { if (u == '\a' || u == 030 || u == 032 || u == 033 || - ISCONTROLC1(u)) { - term.esc &= ~(ESC_START|ESC_STR|ESC_DCS); - if (IS_SET(MODE_SIXEL)) { - /* TODO: render sixel */; - term.mode &= ~MODE_SIXEL; - return; - } + ISCONTROLC1(u)) { + term.esc &= ~(ESC_START|ESC_STR); term.esc |= ESC_STR_END; - goto check_control_code; - } - - - if (IS_SET(MODE_SIXEL)) { - /* TODO: implement sixel mode */ + } else if (strescseq.len + len < sizeof(strescseq.buf) - 1) { + memmove(&strescseq.buf[strescseq.len], c, len); + strescseq.len += len; + return; + } else { + /* + * Here is a bug in terminals. If the user never sends + * some code to stop the str or esc command, then st + * will stop responding. But this is better than + * silently failing with unknown characters. At least + * then users will report back. + * + * In the case users ever get fixed, here is the code: + */ + /* + * term.esc = 0; + * strhandle(); + */ return; } - if (term.esc&ESC_DCS && strescseq.len == 0 && u == 'q') - term.mode |= MODE_SIXEL; - - if (strescseq.len+len >= sizeof(strescseq.buf)-1) { - /* - * Here is a bug in terminals. If the user never sends - * some code to stop the str or esc command, then st - * will stop responding. But this is better than - * silently failing with unknown characters. At least - * then users will report back. - * - * In the case users ever get fixed, here is the code: - */ - /* - * term.esc = 0; - * strhandle(); - */ - return; - } - - memmove(&strescseq.buf[strescseq.len], c, len); - strescseq.len += len; - return; } -check_control_code: /* * Actions of control codes must be performed as soon they arrive * because they can be embedded inside a control sequence, and @@ -2932,8 +3054,6 @@ check_control_code: csihandle(); } return; - } else if (term.esc & ESC_UTF8) { - tdefutf8(u); } else if (term.esc & ESC_ALTCHARSET) { tdeftran(u); } else if (term.esc & ESC_TEST) { @@ -2951,7 +3071,7 @@ check_control_code: return; } if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y)) - selclear(); + selclear(NULL); gp = &term.line[term.c.y][term.c.x]; if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) { @@ -2987,7 +3107,7 @@ check_control_code: void tresize(int col, int row) { - int i; + int i, j; int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); int *bp; @@ -3018,12 +3138,23 @@ tresize(int col, int row) free(term.alt[i]); } + /* resize to new width */ + term.specbuf = xrealloc(term.specbuf, col * sizeof(XftGlyphFontSpec)); + /* resize to new height */ term.line = xrealloc(term.line, row * sizeof(Line)); term.alt = xrealloc(term.alt, row * sizeof(Line)); term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); + for (i = 0; i < histsize; i++) { + term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); + for (j = mincol; j < col; j++) { + term.hist[i][j] = term.c.attr; + term.hist[i][j].u = ' '; + } + } + /* resize each row to new width, zero-pad if needed */ for (i = 0; i < minrow; i++) { term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); @@ -3067,182 +3198,191 @@ tresize(int col, int row) } void -wlresize(int col, int row) +xresize(int col, int row) { - union wld_object object; + xw.tw = MAX(1, col * xw.cw); + xw.th = MAX(1, row * xw.ch); - wl.tw = MAX(1, col * wl.cw); - wl.th = MAX(1, row * wl.ch); - - wld.oldbuffer = wld.buffer; - wld.buffer = wld_create_buffer(wld.ctx, wl.w, wl.h, - WLD_FORMAT_XRGB8888, 0); - wld_export(wld.buffer, WLD_WAYLAND_OBJECT_BUFFER, &object); - wl.buffer = object.ptr; + XFreePixmap(xw.dpy, xw.buf); + xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, + DefaultDepth(xw.dpy, xw.scr)); + XftDrawChange(xw.draw, xw.buf); + xclear(0, 0, xw.w, xw.h); } -uchar -sixd_to_8bit(int x) +ushort +sixd_to_16bit(int x) { - return x == 0 ? 0 : 0x37 + 0x28 * x; + return x == 0 ? 0 : 0x3737 + 0x2828 * x; } int -wlloadcolor(int i, const char *name, uint32_t *color) +xloadcolor(int i, const char *name, Color *ncolor) { + XRenderColor color = { .alpha = 0xffff }; + if (!name) { if (BETWEEN(i, 16, 255)) { /* 256 color */ if (i < 6*6*6+16) { /* same colors as xterm */ - *color = 0xff << 24 | sixd_to_8bit(((i-16)/36)%6) << 16 - | sixd_to_8bit(((i-16)/6)%6) << 8 - | sixd_to_8bit(((i-16)/1)%6); + color.red = sixd_to_16bit( ((i-16)/36)%6 ); + color.green = sixd_to_16bit( ((i-16)/6) %6 ); + color.blue = sixd_to_16bit( ((i-16)/1) %6 ); } else { /* greyscale */ - *color = 0xff << 24 | (0x8 + 0xa * (i-(6*6*6+16))) * 0x10101; + color.red = 0x0808 + 0x0a0a * (i - (6*6*6+16)); + color.green = color.blue = color.red; } - return true; + return XftColorAllocValue(xw.dpy, xw.vis, + xw.cmap, &color, ncolor); } else name = colorname[i]; } - return wld_lookup_named_color(name, color); + return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor); } void -wlloadcols(void) +xloadcols(void) { int i; + static int loaded; + Color *cp; + + if (loaded) { + for (cp = dc.col; cp < &dc.col[LEN(dc.col)]; ++cp) + XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); + } for (i = 0; i < LEN(dc.col); i++) - if (!wlloadcolor(i, NULL, &dc.col[i])) { + if (!xloadcolor(i, NULL, &dc.col[i])) { if (colorname[i]) die("Could not allocate color '%s'\n", colorname[i]); else die("Could not allocate color %d\n", i); } + loaded = 1; } int -wlsetcolorname(int x, const char *name) +xsetcolorname(int x, const char *name) { - uint32_t color; + Color ncolor; if (!BETWEEN(x, 0, LEN(dc.col))) return 1; - if (!wlloadcolor(x, name, &color)) + + if (!xloadcolor(x, name, &ncolor)) return 1; - dc.col[x] = color; + XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); + dc.col[x] = ncolor; return 0; } -static void wlloadcursor(void) -{ - char *names[] = { mouseshape, "xterm", "ibeam", "text" }; - int i; - - cursor.theme = wl_cursor_theme_load(NULL, 32, wl.shm); - - for (i = 0; !cursor.cursor && i < LEN(names); i++) - cursor.cursor = wl_cursor_theme_get_cursor(cursor.theme, names[i]); - - cursor.surface = wl_compositor_create_surface(wl.cmp); -} - /* * Absolute coordinates. */ void -wlclear(int x1, int y1, int x2, int y2) +xclear(int x1, int y1, int x2, int y2) { - uint32_t color = dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg]; + XftDrawRect(xw.draw, + &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg], + x1, y1, x2-x1, y2-y1); +} - wld_fill_rectangle(wld.renderer, color, x1, y1, x2 - x1, y2 - y1); +void +xhints(void) +{ + XClassHint class = {opt_name ? opt_name : termname, + opt_class ? opt_class : termname}; + XWMHints wm = {.flags = InputHint, .input = 1}; + XSizeHints *sizeh = NULL; + + sizeh = XAllocSizeHints(); + + sizeh->flags = PSize | PResizeInc | PBaseSize; + sizeh->height = xw.h; + sizeh->width = xw.w; + sizeh->height_inc = xw.ch; + sizeh->width_inc = xw.cw; + sizeh->base_height = 2 * borderpx; + sizeh->base_width = 2 * borderpx; + if (xw.isfixed) { + sizeh->flags |= PMaxSize | PMinSize; + sizeh->min_width = sizeh->max_width = xw.w; + sizeh->min_height = sizeh->max_height = xw.h; + } + if (xw.gm & (XValue|YValue)) { + sizeh->flags |= USPosition | PWinGravity; + sizeh->x = xw.l; + sizeh->y = xw.t; + sizeh->win_gravity = xgeommasktogravity(xw.gm); + } + + XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, + &class); + XFree(sizeh); } int -wlloadfont(Font *f, FcPattern *pattern) +xgeommasktogravity(int mask) { - FcPattern *configured; - FcPattern *match; - FcResult result; - struct wld_extents extents; - int wantattr, haveattr; - - /* - * Manually configure instead of calling XftMatchFont - * so that we can use the configured pattern for - * "missing glyph" lookups. - */ - configured = FcPatternDuplicate(pattern); - if (!configured) - return 1; - - FcConfigSubstitute(NULL, configured, FcMatchPattern); - FcDefaultSubstitute(configured); - - match = FcFontMatch(NULL, configured, &result); - if (!match) { - FcPatternDestroy(configured); - return 1; + switch (mask & (XNegative|YNegative)) { + case 0: + return NorthWestGravity; + case XNegative: + return NorthEastGravity; + case YNegative: + return SouthWestGravity; } - if (!(f->match = wld_font_open_pattern(wld.fontctx, match))) { - FcPatternDestroy(configured); + return SouthEastGravity; +} + +int +xloadfont(Font *f, FcPattern *pattern) +{ + FcPattern *match; + FcResult result; + XGlyphInfo extents; + + match = XftFontMatch(xw.dpy, xw.scr, pattern, &result); + if (!match) + return 1; + + if (!(f->match = XftFontOpenPattern(xw.dpy, match))) { FcPatternDestroy(match); return 1; } - if ((FcPatternGetInteger(pattern, "slant", 0, &wantattr) == - FcResultMatch)) { - /* - * Check if xft was unable to find a font with the appropriate - * slant but gave us one anyway. Try to mitigate. - */ - if ((FcPatternGetInteger(match, "slant", 0, - &haveattr) != FcResultMatch) || haveattr < wantattr) { - f->badslant = 1; - fputs("st: font slant does not match\n", stderr); - } - } - - if ((FcPatternGetInteger(pattern, "weight", 0, &wantattr) == - FcResultMatch)) { - if ((FcPatternGetInteger(match, "weight", 0, - &haveattr) != FcResultMatch) || haveattr != wantattr) { - f->badweight = 1; - fputs("st: font weight does not match\n", stderr); - } - } - - - wld_font_text_extents(f->match, ascii_printable, &extents); + XftTextExtentsUtf8(xw.dpy, f->match, + (const FcChar8 *) ascii_printable, + strlen(ascii_printable), &extents); f->set = NULL; - f->pattern = configured; + f->pattern = FcPatternDuplicate(pattern); f->ascent = f->match->ascent; f->descent = f->match->descent; f->lbearing = 0; - f->rbearing = f->match->max_advance; + f->rbearing = f->match->max_advance_width; f->height = f->ascent + f->descent; - f->width = DIVCEIL(extents.advance, strlen(ascii_printable)); + f->width = DIVCEIL(extents.xOff, strlen(ascii_printable)); return 0; } void -wlloadfonts(char *fontstr, double fontsize) +xloadfonts(char *fontstr, double fontsize) { FcPattern *pattern; double fontval; float ceilf(float); if (fontstr[0] == '-') { - /* XXX: need XftXlfdParse equivalent */ - pattern = NULL; + pattern = XftXlfdParse(fontstr, False, False); } else { pattern = FcNameParse((FcChar8 *)fontstr); } @@ -3273,14 +3413,11 @@ wlloadfonts(char *fontstr, double fontsize) defaultfontsize = usedfontsize; } - FcConfigSubstitute(0, pattern, FcMatchPattern); - FcDefaultSubstitute(pattern); - - if (wlloadfont(&dc.font, pattern)) + if (xloadfont(&dc.font, pattern)) die("st: can't open font %s\n", fontstr); if (usedfontsize < 0) { - FcPatternGetDouble(dc.font.pattern, + FcPatternGetDouble(dc.font.match->pattern, FC_PIXEL_SIZE, 0, &fontval); usedfontsize = fontval; if (fontsize == 0) @@ -3288,319 +3425,263 @@ wlloadfonts(char *fontstr, double fontsize) } /* Setting character width and height. */ - wl.cw = ceilf(dc.font.width * cwscale); - wl.ch = ceilf(dc.font.height * chscale); + xw.cw = ceilf(dc.font.width * cwscale); + xw.ch = ceilf(dc.font.height * chscale); FcPatternDel(pattern, FC_SLANT); FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); - if (wlloadfont(&dc.ifont, pattern)) + if (xloadfont(&dc.ifont, pattern)) die("st: can't open font %s\n", fontstr); FcPatternDel(pattern, FC_WEIGHT); FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); - if (wlloadfont(&dc.ibfont, pattern)) + if (xloadfont(&dc.ibfont, pattern)) die("st: can't open font %s\n", fontstr); FcPatternDel(pattern, FC_SLANT); FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); - if (wlloadfont(&dc.bfont, pattern)) + if (xloadfont(&dc.bfont, pattern)) die("st: can't open font %s\n", fontstr); FcPatternDestroy(pattern); } void -wlunloadfont(Font *f) +xunloadfont(Font *f) { - wld_font_close(f->match); + XftFontClose(xw.dpy, f->match); FcPatternDestroy(f->pattern); if (f->set) FcFontSetDestroy(f->set); } void -wlunloadfonts(void) +xunloadfonts(void) { /* Free the loaded fonts in the font cache. */ while (frclen > 0) - wld_font_close(frc[--frclen].font); + XftFontClose(xw.dpy, frc[--frclen].font); - wlunloadfont(&dc.font); - wlunloadfont(&dc.bfont); - wlunloadfont(&dc.ifont); - wlunloadfont(&dc.ibfont); + xunloadfont(&dc.font); + xunloadfont(&dc.bfont); + xunloadfont(&dc.ifont); + xunloadfont(&dc.ibfont); } void -wlzoom(const Arg *arg) +xzoom(const Arg *arg) { Arg larg; larg.f = usedfontsize + arg->f; - wlzoomabs(&larg); + xzoomabs(&larg); } void -wlzoomabs(const Arg *arg) +xzoomabs(const Arg *arg) { - wlunloadfonts(); - wlloadfonts(usedfont, arg->f); + xunloadfonts(); + xloadfonts(usedfont, arg->f); cresize(0, 0); ttyresize(); redraw(); - /* XXX: Should the window size be updated here because wayland doesn't - * have a notion of hints? - * xhints(); - */ + xhints(); } void -wlzoomreset(const Arg *arg) +xzoomreset(const Arg *arg) { Arg larg; if (defaultfontsize > 0) { larg.f = defaultfontsize; - wlzoomabs(&larg); + xzoomabs(&larg); } } void -wlinit(void) +xinit(void) { - struct wl_registry *registry; + XGCValues gcvalues; + Cursor cursor; + Window parent; + pid_t thispid = getpid(); + XColor xmousefg, xmousebg; - if (!(wl.dpy = wl_display_connect(NULL))) + if (!(xw.dpy = XOpenDisplay(NULL))) die("Can't open display\n"); - - registry = wl_display_get_registry(wl.dpy); - wl_registry_add_listener(registry, ®listener, NULL); - wld.ctx = wld_wayland_create_context(wl.dpy, WLD_ANY); - wld.renderer = wld_create_renderer(wld.ctx); - - wl_display_roundtrip(wl.dpy); - - if (!wl.shm) - die("Display has no SHM\n"); - if (!wl.seat) - die("Display has no seat\n"); - if (!wl.datadevmanager) - die("Display has no data device manager\n"); - - wl.keyboard = wl_seat_get_keyboard(wl.seat); - wl_keyboard_add_listener(wl.keyboard, &kbdlistener, NULL); - wl.pointer = wl_seat_get_pointer(wl.seat); - wl_pointer_add_listener(wl.pointer, &ptrlistener, NULL); - wl.datadev = wl_data_device_manager_get_data_device(wl.datadevmanager, - wl.seat); - wl_data_device_add_listener(wl.datadev, &datadevlistener, NULL); + xw.scr = XDefaultScreen(xw.dpy); + xw.vis = XDefaultVisual(xw.dpy, xw.scr); /* font */ if (!FcInit()) die("Could not init fontconfig.\n"); usedfont = (opt_font == NULL)? font : opt_font; - wld.fontctx = wld_font_create_context(); - wlloadfonts(usedfont, 0); + xloadfonts(usedfont, 0); - wlloadcols(); - wlloadcursor(); + /* colors */ + xw.cmap = XDefaultColormap(xw.dpy, xw.scr); + xloadcols(); - wl.vis = 0; - wl.h = 2 * borderpx + term.row * wl.ch; - wl.w = 2 * borderpx + term.col * wl.cw; + /* adjust fixed window geometry */ + xw.w = 2 * borderpx + term.col * xw.cw; + xw.h = 2 * borderpx + term.row * xw.ch; + if (xw.gm & XNegative) + xw.l += DisplayWidth(xw.dpy, xw.scr) - xw.w - 2; + if (xw.gm & YNegative) + xw.t += DisplayHeight(xw.dpy, xw.scr) - xw.h - 2; - wl.surface = wl_compositor_create_surface(wl.cmp); - wl_surface_add_listener(wl.surface, &surflistener, NULL); + /* Events */ + xw.attrs.background_pixel = dc.col[defaultbg].pixel; + xw.attrs.border_pixel = dc.col[defaultbg].pixel; + xw.attrs.bit_gravity = NorthWestGravity; + xw.attrs.event_mask = FocusChangeMask | KeyPressMask + | ExposureMask | VisibilityChangeMask | StructureNotifyMask + | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; + xw.attrs.colormap = xw.cmap; - wl.xdgsurface = zxdg_shell_v6_get_xdg_surface(wl.shell, wl.surface); - zxdg_surface_v6_add_listener(wl.xdgsurface, &xdgsurflistener, NULL); - wl.xdgtoplevel = zxdg_surface_v6_get_toplevel(wl.xdgsurface); - zxdg_toplevel_v6_set_app_id(wl.xdgtoplevel, - opt_class ? opt_class : termname); - zxdg_toplevel_v6_add_listener(wl.xdgtoplevel, &xdgtoplevellistener, - NULL); + if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) + parent = XRootWindow(xw.dpy, xw.scr); + xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t, + xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, + xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity + | CWEventMask | CWColormap, &xw.attrs); - wl.xkb.ctx = xkb_context_new(0); - wlresettitle(); + memset(&gcvalues, 0, sizeof(gcvalues)); + gcvalues.graphics_exposures = False; + dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures, + &gcvalues); + xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h, + DefaultDepth(xw.dpy, xw.scr)); + XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); + XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h); + + /* Xft rendering context */ + xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap); + + /* input methods */ + if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { + XSetLocaleModifiers("@im=local"); + if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { + XSetLocaleModifiers("@im="); + if ((xw.xim = XOpenIM(xw.dpy, + NULL, NULL, NULL)) == NULL) { + die("XOpenIM failed. Could not open input" + " device.\n"); + } + } + } + xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing + | XIMStatusNothing, XNClientWindow, xw.win, + XNFocusWindow, xw.win, NULL); + if (xw.xic == NULL) + die("XCreateIC failed. Could not obtain input method.\n"); + + /* white cursor, black outline */ + cursor = XCreateFontCursor(xw.dpy, mouseshape); + XDefineCursor(xw.dpy, xw.win, cursor); + + if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) { + xmousefg.red = 0xffff; + xmousefg.green = 0xffff; + xmousefg.blue = 0xffff; + } + + if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) { + xmousebg.red = 0x0000; + xmousebg.green = 0x0000; + xmousebg.blue = 0x0000; + } + + XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg); + + xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False); + xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False); + xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False); + XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1); + + xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False); + XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32, + PropModeReplace, (uchar *)&thispid, 1); + + xresettitle(); + XMapWindow(xw.dpy, xw.win); + xhints(); + XSync(xw.dpy, False); } -/* - * TODO: Implement something like XftDrawGlyphFontSpec in wld, and then apply a - * similar patch to ae1923d27533ff46400d93765e971558201ca1ee - */ - -void -wldraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) +int +xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) { - int winx = borderpx + x * wl.cw, winy = borderpx + y * wl.ch, - width = charlen * wl.cw, xp, i; - int frcflags, charexists; - int u8fl, u8fblen, u8cblen, doesexist; - char *u8c, *u8fs; - Rune unicodep; + float winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch, xp, yp; + ushort mode, prevmode = USHRT_MAX; Font *font = &dc.font; + int frcflags = FRC_NORMAL; + float runewidth = xw.cw; + Rune rune; + FT_UInt glyphidx; FcResult fcres; FcPattern *fcpattern, *fontpattern; FcFontSet *fcsets[] = { NULL }; FcCharSet *fccharset; - uint32_t fg, bg, temp; - int oneatatime; + int i, f, numspecs = 0; - frcflags = FRC_NORMAL; + for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) { + /* Fetch rune and mode for current glyph. */ + rune = glyphs[i].u; + mode = glyphs[i].mode; - /* Fallback on color display for attributes not supported by the font */ - if (base.mode & ATTR_ITALIC && base.mode & ATTR_BOLD) { - if (dc.ibfont.badslant || dc.ibfont.badweight) - base.fg = defaultattr; - font = &dc.ibfont; - frcflags = FRC_ITALICBOLD; - } else if (base.mode & ATTR_ITALIC) { - if (dc.ifont.badslant) - base.fg = defaultattr; - font = &dc.ifont; - frcflags = FRC_ITALIC; - } else if (base.mode & ATTR_BOLD) { - if (dc.bfont.badweight) - base.fg = defaultattr; - font = &dc.ifont; - frcflags = FRC_BOLD; - } + /* Skip dummy wide-character spacing. */ + if (mode == ATTR_WDUMMY) + continue; - if (IS_TRUECOL(base.fg)) { - fg = base.fg | 0xff000000; - } else { - fg = dc.col[base.fg]; - } - - if (IS_TRUECOL(base.bg)) { - bg = base.bg | 0xff000000; - } else { - bg = dc.col[base.bg]; - } - - if (base.mode & ATTR_BOLD) { - /* - * change basic system colors [0-7] - * to bright system colors [8-15] - */ - if (BETWEEN(base.fg, 0, 7) && !(base.mode & ATTR_FAINT)) - fg = dc.col[base.fg + 8]; - - if (base.mode & ATTR_ITALIC) { - font = &dc.ibfont; - frcflags = FRC_ITALICBOLD; - } else { - font = &dc.bfont; - frcflags = FRC_BOLD; - } - } - - if (IS_SET(MODE_REVERSE)) { - if (fg == dc.col[defaultfg]) { - fg = dc.col[defaultbg]; - } else { - fg = ~(fg & 0xffffff); - } - - if (bg == dc.col[defaultbg]) { - bg = dc.col[defaultfg]; - } else { - bg = ~(bg & 0xffffff); - } - } - - if (base.mode & ATTR_REVERSE) { - temp = fg; - fg = bg; - bg = temp; - } - - if (base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) { - fg = (fg & (0xff << 24)) - | ((((fg >> 16) & 0xff) / 2) << 16) - | ((((fg >> 8) & 0xff) / 2) << 8) - | ((fg & 0xff) / 2); - } - - if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK) - fg = bg; - - if (base.mode & ATTR_INVISIBLE) - fg = bg; - - /* Intelligent cleaning up of the borders. */ - if (x == 0) { - wlclear(0, (y == 0)? 0 : winy, borderpx, - ((y >= term.row-1)? wl.h : (winy + wl.ch))); - } - if (x + charlen >= term.col) { - wlclear(winx + width, (y == 0)? 0 : winy, wl.w, - ((y >= term.row-1)? wl.h : (winy + wl.ch))); - } - if (y == 0) - wlclear(winx, 0, winx + width, borderpx); - if (y == term.row-1) - wlclear(winx, winy + wl.ch, winx + width, wl.h); - - /* Clean up the region we want to draw to. */ - wld_fill_rectangle(wld.renderer, bg, winx, winy, width, wl.ch); - - for (xp = winx; bytelen > 0;) { - /* - * Search for the range in the to be printed string of glyphs - * that are in the main font. Then print that range. If - * some glyph is found that is not in the font, do the - * fallback dance. - */ - u8fs = s; - u8fblen = 0; - u8fl = 0; - oneatatime = font->width != wl.cw; - for (;;) { - u8c = s; - u8cblen = utf8decode(s, &unicodep, UTF_SIZ); - s += u8cblen; - bytelen -= u8cblen; - - doesexist = wld_font_ensure_char(font->match, unicodep); - if (doesexist) { - u8fl++; - u8fblen += u8cblen; - if (!oneatatime && bytelen > 0) - continue; + /* Determine font for glyph if different from previous glyph. */ + if (prevmode != mode) { + prevmode = mode; + font = &dc.font; + frcflags = FRC_NORMAL; + runewidth = xw.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f); + if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) { + font = &dc.ibfont; + frcflags = FRC_ITALICBOLD; + } else if (mode & ATTR_ITALIC) { + font = &dc.ifont; + frcflags = FRC_ITALIC; + } else if (mode & ATTR_BOLD) { + font = &dc.bfont; + frcflags = FRC_BOLD; } - - if (u8fl > 0) { - wld_draw_text(wld.renderer, - font->match, fg, xp, - winy + font->ascent, - u8fs, u8fblen, NULL); - xp += wl.cw * u8fl; - } - break; - } - if (doesexist) { - if (oneatatime) - continue; - break; + yp = winy + font->ascent; } - /* Search the font cache. */ - for (i = 0; i < frclen; i++) { - charexists = wld_font_ensure_char(frc[i].font, unicodep); + /* Lookup character index with default font. */ + glyphidx = XftCharIndex(xw.dpy, font->match, rune); + if (glyphidx) { + specs[numspecs].font = font->match; + specs[numspecs].glyph = glyphidx; + specs[numspecs].x = (short)xp; + specs[numspecs].y = (short)yp; + xp += runewidth; + numspecs++; + continue; + } + + /* Fallback on font cache, search the font cache for match. */ + for (f = 0; f < frclen; f++) { + glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune); /* Everything correct. */ - if (charexists && frc[i].flags == frcflags) + if (glyphidx && frc[f].flags == frcflags) break; /* We got a default font for a not found glyph. */ - if (!charexists && frc[i].flags == frcflags \ - && frc[i].unicodep == unicodep) { + if (!glyphidx && frc[f].flags == frcflags + && frc[f].unicodep == rune) { break; } } - /* Nothing was found. */ - if (i >= frclen) { + /* Nothing was found. Use fontconfig to find matching font. */ + if (f >= frclen) { if (!font->set) font->set = FcFontSort(0, font->pattern, 1, 0, &fcres); @@ -3616,7 +3697,7 @@ wldraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) fcpattern = FcPatternDuplicate(font->pattern); fccharset = FcCharSetCreate(); - FcCharSetAddChar(fccharset, unicodep); + FcCharSetAddChar(fccharset, rune); FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); FcPatternAddBool(fcpattern, FC_SCALABLE, 1); @@ -3633,58 +3714,187 @@ wldraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) */ if (frclen >= LEN(frc)) { frclen = LEN(frc) - 1; - wld_font_close(frc[frclen].font); + XftFontClose(xw.dpy, frc[frclen].font); frc[frclen].unicodep = 0; } - frc[frclen].font = wld_font_open_pattern(wld.fontctx, + frc[frclen].font = XftFontOpenPattern(xw.dpy, fontpattern); frc[frclen].flags = frcflags; - frc[frclen].unicodep = unicodep; + frc[frclen].unicodep = rune; - i = frclen; + glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune); + + f = frclen; frclen++; FcPatternDestroy(fcpattern); FcCharSetDestroy(fccharset); } - wld_draw_text(wld.renderer, frc[i].font, fg, - xp, winy + frc[i].font->ascent, - u8c, u8cblen, NULL); - - xp += wl.cw * wcwidth(unicodep); + specs[numspecs].font = frc[f].font; + specs[numspecs].glyph = glyphidx; + specs[numspecs].x = (short)xp; + specs[numspecs].y = (short)yp; + xp += runewidth; + numspecs++; } + return numspecs; +} + +void +xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y) +{ + int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1); + int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch, + width = charlen * xw.cw; + Color *fg, *bg, *temp, revfg, revbg, truefg, truebg; + XRenderColor colfg, colbg; + XRectangle r; + + /* Determine foreground and background colors based on mode. */ + if (base.fg == defaultfg) { + if (base.mode & ATTR_ITALIC) + base.fg = defaultitalic; + else if ((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) + base.fg = defaultitalic; + else if (base.mode & ATTR_UNDERLINE) + base.fg = defaultunderline; + } + + if (IS_TRUECOL(base.fg)) { + colfg.alpha = 0xffff; + colfg.red = TRUERED(base.fg); + colfg.green = TRUEGREEN(base.fg); + colfg.blue = TRUEBLUE(base.fg); + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &truefg); + fg = &truefg; + } else { + fg = &dc.col[base.fg]; + } + + if (IS_TRUECOL(base.bg)) { + colbg.alpha = 0xffff; + colbg.green = TRUEGREEN(base.bg); + colbg.red = TRUERED(base.bg); + colbg.blue = TRUEBLUE(base.bg); + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &truebg); + bg = &truebg; + } else { + 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]; + } else { + colfg.red = ~fg->color.red; + colfg.green = ~fg->color.green; + colfg.blue = ~fg->color.blue; + colfg.alpha = fg->color.alpha; + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, + &revfg); + fg = &revfg; + } + + if (bg == &dc.col[defaultbg]) { + bg = &dc.col[defaultfg]; + } else { + colbg.red = ~bg->color.red; + colbg.green = ~bg->color.green; + colbg.blue = ~bg->color.blue; + colbg.alpha = bg->color.alpha; + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, + &revbg); + bg = &revbg; + } + } + + if (base.mode & ATTR_REVERSE) { + temp = fg; + fg = bg; + bg = temp; + } + + if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) { + colfg.red = fg->color.red / 2; + colfg.green = fg->color.green / 2; + colfg.blue = fg->color.blue / 2; + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg); + fg = &revfg; + } + + if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK) + fg = bg; + + if (base.mode & ATTR_INVISIBLE) + fg = bg; + + /* Intelligent cleaning up of the borders. */ + if (x == 0) { + xclear(0, (y == 0)? 0 : winy, borderpx, + winy + xw.ch + ((y >= term.row-1)? xw.h : 0)); + } + if (x + charlen >= term.col) { + xclear(winx + width, (y == 0)? 0 : winy, xw.w, + ((y >= term.row-1)? xw.h : (winy + xw.ch))); + } + if (y == 0) + xclear(winx, 0, winx + width, borderpx); + if (y == term.row-1) + xclear(winx, winy + xw.ch, winx + width, xw.h); + + /* Clean up the region we want to draw to. */ + XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch); + + /* Set the clip region because Xft is sometimes dirty. */ + r.x = 0; + r.y = 0; + r.height = xw.ch; + r.width = width; + XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1); + + /* Render the glyphs. */ + XftDrawGlyphFontSpec(xw.draw, fg, specs, len); + + /* Render underline and strikethrough. */ if (base.mode & ATTR_UNDERLINE) { - wld_fill_rectangle(wld.renderer, fg, winx, winy + font->ascent + 1, + XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, width, 1); } if (base.mode & ATTR_STRUCK) { - wld_fill_rectangle(wld.renderer, fg, winx, winy + 2 * font->ascent / 3, + XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3, width, 1); } + + /* Reset clip to none. */ + XftDrawSetClip(xw.draw, 0); } void -wldrawglyph(Glyph g, int x, int y) +xdrawglyph(Glyph g, int x, int y) { - static char buf[UTF_SIZ]; - size_t len = utf8encode(g.u, buf); - int width = g.mode & ATTR_WIDE ? 2 : 1; + int numspecs; + XftGlyphFontSpec spec; - wldraws(buf, g, x, y, width, len); + numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y); + xdrawglyphfontspecs(&spec, g, numspecs, x, y); } void -wldrawcursor(void) +xdrawcursor(void) { static int oldx = 0, oldy = 0; int curx; Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og; int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); - uint32_t drawcol; + Color drawcol; LIMIT(oldx, 0, term.col-1); LIMIT(oldy, 0, term.row-1); @@ -3701,11 +3911,7 @@ wldrawcursor(void) og = term.line[oldy][oldx]; if (ena_sel && selected(oldx, oldy)) og.mode ^= ATTR_REVERSE; - wldrawglyph(og, oldx, oldy); - if (oldx != curx || oldy != term.c.y) { - wl_surface_damage(wl.surface, borderpx + oldx * wl.cw, - borderpx + oldy * wl.ch, wl.cw, wl.ch); - } + xdrawglyph(og, oldx, oldy); g.u = term.line[term.c.y][term.c.x].u; @@ -3736,152 +3942,199 @@ wldrawcursor(void) return; /* draw the new one */ - if (wl.state & WIN_FOCUSED) { - switch (wl.cursor) { + if (xw.state & WIN_FOCUSED) { + switch (xw.cursor) { case 7: /* st extension: snowman */ utf8decode("☃", &g.u, UTF_SIZ); case 0: /* Blinking Block */ case 1: /* Blinking Block (Default) */ case 2: /* Steady Block */ g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE; - wldrawglyph(g, term.c.x, term.c.y); + xdrawglyph(g, term.c.x, term.c.y); break; case 3: /* Blinking Underline */ case 4: /* Steady Underline */ - wld_fill_rectangle(wld.renderer, drawcol, - borderpx + curx * wl.cw, - borderpx + (term.c.y + 1) * wl.ch - \ + XftDrawRect(xw.draw, &drawcol, + borderpx + curx * xw.cw, + borderpx + (term.c.y + 1) * xw.ch - \ cursorthickness, - wl.cw, cursorthickness); + xw.cw, cursorthickness); break; case 5: /* Blinking bar */ case 6: /* Steady bar */ - wld_fill_rectangle(wld.renderer, drawcol, - borderpx + curx * wl.cw, - borderpx + term.c.y * wl.ch, - cursorthickness, wl.ch); + XftDrawRect(xw.draw, &drawcol, + borderpx + curx * xw.cw, + borderpx + term.c.y * xw.ch, + cursorthickness, xw.ch); break; } } else { - wld_fill_rectangle(wld.renderer, drawcol, - borderpx + curx * wl.cw, - borderpx + term.c.y * wl.ch, - wl.cw - 1, 1); - wld_fill_rectangle(wld.renderer, drawcol, - borderpx + curx * wl.cw, - borderpx + term.c.y * wl.ch, - 1, wl.ch - 1); - wld_fill_rectangle(wld.renderer, drawcol, - borderpx + (curx + 1) * wl.cw - 1, - borderpx + term.c.y * wl.ch, - 1, wl.ch - 1); - wld_fill_rectangle(wld.renderer, drawcol, - borderpx + curx * wl.cw, - borderpx + (term.c.y + 1) * wl.ch - 1, - wl.cw, 1); + XftDrawRect(xw.draw, &drawcol, + borderpx + curx * xw.cw, + borderpx + term.c.y * xw.ch, + xw.cw - 1, 1); + XftDrawRect(xw.draw, &drawcol, + borderpx + curx * xw.cw, + borderpx + term.c.y * xw.ch, + 1, xw.ch - 1); + XftDrawRect(xw.draw, &drawcol, + borderpx + (curx + 1) * xw.cw - 1, + borderpx + term.c.y * xw.ch, + 1, xw.ch - 1); + XftDrawRect(xw.draw, &drawcol, + borderpx + curx * xw.cw, + borderpx + (term.c.y + 1) * xw.ch - 1, + xw.cw, 1); } - wl_surface_damage(wl.surface, borderpx + curx * wl.cw, - borderpx + term.c.y * wl.ch, wl.cw, wl.ch); oldx = curx, oldy = term.c.y; } + void -wlsettitle(char *title) +xsettitle(char *p) { - zxdg_toplevel_v6_set_title(wl.xdgtoplevel, title); + XTextProperty prop; + + Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, + &prop); + XSetWMName(xw.dpy, xw.win, &prop); + XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname); + XFree(prop.value); } void -wlresettitle(void) +xresettitle(void) { - wlsettitle(opt_title ? opt_title : "st"); + xsettitle(opt_title ? opt_title : "st"); } void redraw(void) { tfulldirt(); + draw(); } void draw(void) { - int y, y0; - - for (y = 0; y <= term.bot; ++y) { - if (!term.dirty[y]) - continue; - for (y0 = y; y <= term.bot && term.dirty[y]; ++y); - wl_surface_damage(wl.surface, 0, borderpx + y0 * wl.ch, - wl.w, (y - y0) * wl.ch); - } - - wld_set_target_buffer(wld.renderer, wld.buffer); drawregion(0, 0, term.col, term.row); - wl.framecb = wl_surface_frame(wl.surface); - wl_callback_add_listener(wl.framecb, &framelistener, NULL); - wld_flush(wld.renderer); - wl_surface_attach(wl.surface, wl.buffer, 0, 0); - wl_surface_commit(wl.surface); - /* need to wait to destroy the old buffer until we commit the new - * buffer */ - if (wld.oldbuffer) { - wld_buffer_unreference(wld.oldbuffer); - wld.oldbuffer = 0; - } - needdraw = false; + XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w, + xw.h, 0, 0); + XSetForeground(xw.dpy, dc.gc, + dc.col[IS_SET(MODE_REVERSE)? + defaultfg : defaultbg].pixel); } void drawregion(int x1, int y1, int x2, int y2) { - int ic, ib, x, y, ox; + int i, x, y, ox, numspecs; Glyph base, new; - char buf[DRAW_BUF_SIZ]; + XftGlyphFontSpec *specs; int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); + if (!(xw.state & WIN_VISIBLE)) + return; + for (y = y1; y < y2; y++) { if (!term.dirty[y]) continue; term.dirty[y] = 0; - base = term.line[y][0]; - ic = ib = ox = 0; - for (x = x1; x < x2; x++) { - new = term.line[y][x]; + + specs = term.specbuf; + numspecs = xmakeglyphfontspecs(specs, &TLINE(y)[x1], x2 - x1, x1, y); + + i = ox = 0; + for (x = x1; x < x2 && i < numspecs; x++) { + new = TLINE(y)[x]; if (new.mode == ATTR_WDUMMY) continue; if (ena_sel && selected(x, y)) new.mode ^= ATTR_REVERSE; - if (ib > 0 && (ATTRCMP(base, new) - || ib >= DRAW_BUF_SIZ-UTF_SIZ)) { - wldraws(buf, base, ox, y, ic, ib); - ic = ib = 0; + if (i > 0 && ATTRCMP(base, new)) { + xdrawglyphfontspecs(specs, base, i, ox, y); + specs += i; + numspecs -= i; + i = 0; } - if (ib == 0) { + if (i == 0) { ox = x; base = new; } - - ib += utf8encode(new.u, buf+ib); - ic += (new.mode & ATTR_WIDE)? 2 : 1; + i++; } - if (ib > 0) - wldraws(buf, base, ox, y, ic, ib); + if (i > 0) + xdrawglyphfontspecs(specs, base, i, ox, y); } - wldrawcursor(); + if (term.scr == 0) + xdrawcursor(); } void -wlseturgency(int add) +expose(XEvent *ev) { - /* XXX: no urgency equivalent yet in wayland */ + redraw(); +} + +void +visibility(XEvent *ev) +{ + XVisibilityEvent *e = &ev->xvisibility; + + MODBIT(xw.state, e->state != VisibilityFullyObscured, WIN_VISIBLE); +} + +void +unmap(XEvent *ev) +{ + xw.state &= ~WIN_VISIBLE; +} + +void +xsetpointermotion(int set) +{ + MODBIT(xw.attrs.event_mask, set, PointerMotionMask); + XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs); +} + +void +xseturgency(int add) +{ + XWMHints *h = XGetWMHints(xw.dpy, xw.win); + + MODBIT(h->flags, add, XUrgencyHint); + XSetWMHints(xw.dpy, xw.win, h); + XFree(h); +} + +void +focus(XEvent *ev) +{ + XFocusChangeEvent *e = &ev->xfocus; + + if (e->mode == NotifyGrab) + return; + + if (ev->type == FocusIn) { + XSetICFocus(xw.xic); + xw.state |= WIN_FOCUSED; + xseturgency(0); + if (IS_SET(MODE_FOCUS)) + ttywrite("\033[I", 3); + } else { + XUnsetICFocus(xw.xic); + xw.state &= ~WIN_FOCUSED; + if (IS_SET(MODE_FOCUS)) + ttywrite("\033[O", 3); + } } int match(uint mask, uint state) { - return mask == MOD_MASK_ANY || mask == (state & ~(ignoremod)); + return mask == XK_ANY_MOD || mask == (state & ~ignoremod); } void @@ -3891,7 +4144,7 @@ numlock(const Arg *dummy) } char* -kmap(xkb_keysym_t k, uint state) +kmap(KeySym k, uint state) { Key *kp; int i; @@ -3931,177 +4184,38 @@ kmap(xkb_keysym_t k, uint state) } void -cresize(int width, int height) +kpress(XEvent *ev) { - int col, row; - - if (width != 0) - wl.w = width; - if (height != 0) - wl.h = height; - - col = (wl.w - 2 * borderpx) / wl.cw; - row = (wl.h - 2 * borderpx) / wl.ch; - - tresize(col, row); - wlresize(col, row); -} - -void -regglobal(void *data, struct wl_registry *registry, uint32_t name, - const char *interface, uint32_t version) -{ - if (strcmp(interface, "wl_compositor") == 0) { - wl.cmp = wl_registry_bind(registry, name, - &wl_compositor_interface, 3); - } else if (strcmp(interface, "zxdg_shell_v6") == 0) { - wl.shell = wl_registry_bind(registry, name, - &zxdg_shell_v6_interface, 1); - zxdg_shell_v6_add_listener(wl.shell, &xdgshelllistener, NULL); - } else if (strcmp(interface, "wl_shm") == 0) { - wl.shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); - } else if (strcmp(interface, "wl_seat") == 0) { - wl.seat = wl_registry_bind(registry, name, - &wl_seat_interface, 4); - } else if (strcmp(interface, "wl_data_device_manager") == 0) { - wl.datadevmanager = wl_registry_bind(registry, name, - &wl_data_device_manager_interface, 1); - } else if (strcmp(interface, "wl_output") == 0) { - /* bind to outputs so we can get surface enter events */ - wl_registry_bind(registry, name, &wl_output_interface, 2); - } -} - -void -regglobalremove(void *data, struct wl_registry *registry, uint32_t name) -{ -} - -void -surfenter(void *data, struct wl_surface *surface, struct wl_output *output) -{ - wl.vis++; - if (!(wl.state & WIN_VISIBLE)) - wl.state |= WIN_VISIBLE; -} - -void -surfleave(void *data, struct wl_surface *surface, struct wl_output *output) -{ - if (--wl.vis == 0) - wl.state &= ~WIN_VISIBLE; -} - -void -framedone(void *data, struct wl_callback *callback, uint32_t msecs) -{ - wl_callback_destroy(callback); - wl.framecb = NULL; - if (needdraw && wl.state & WIN_VISIBLE) { - draw(); - } -} - -void -kbdkeymap(void *data, struct wl_keyboard *keyboard, uint32_t format, int32_t fd, - uint32_t size) -{ - char *string; - - if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { - close(fd); - return; - } - - string = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); - - if (string == MAP_FAILED) { - close(fd); - return; - } - - wl.xkb.keymap = xkb_keymap_new_from_string(wl.xkb.ctx, string, - XKB_KEYMAP_FORMAT_TEXT_V1, 0); - munmap(string, size); - close(fd); - wl.xkb.state = xkb_state_new(wl.xkb.keymap); - - wl.xkb.ctrl = xkb_keymap_mod_get_index(wl.xkb.keymap, XKB_MOD_NAME_CTRL); - wl.xkb.alt = xkb_keymap_mod_get_index(wl.xkb.keymap, XKB_MOD_NAME_ALT); - wl.xkb.shift = xkb_keymap_mod_get_index(wl.xkb.keymap, XKB_MOD_NAME_SHIFT); - wl.xkb.logo = xkb_keymap_mod_get_index(wl.xkb.keymap, XKB_MOD_NAME_LOGO); - - wl.xkb.mods = 0; -} - -void -kbdenter(void *data, struct wl_keyboard *keyboard, uint32_t serial, - struct wl_surface *surface, struct wl_array *keys) -{ - wl.state |= WIN_FOCUSED; - if (IS_SET(MODE_FOCUS)) - ttywrite("\033[I", 3); - /* need to redraw the cursor */ - needdraw = true; -} - -void -kbdleave(void *data, struct wl_keyboard *keyboard, uint32_t serial, - struct wl_surface *surface) -{ - /* selection offers are invalidated when we lose keyboard focus */ - wl.seloffer = NULL; - wl.state &= ~WIN_FOCUSED; - if (IS_SET(MODE_FOCUS)) - ttywrite("\033[O", 3); - /* need to redraw the cursor */ - needdraw = true; - /* disable key repeat */ - repeat.len = 0; -} - -void -kbdkey(void *data, struct wl_keyboard *keyboard, uint32_t serial, uint32_t time, - uint32_t key, uint32_t state) -{ - xkb_keysym_t ksym; - char buf[32], *str; + XKeyEvent *e = &ev->xkey; + KeySym ksym; + char buf[32], *customkey; int len; Rune c; + Status status; Shortcut *bp; if (IS_SET(MODE_KBDLOCK)) return; - if (state == WL_KEYBOARD_KEY_STATE_RELEASED) { - if (repeat.key == key) - repeat.len = 0; - return; - } - - ksym = xkb_state_key_get_one_sym(wl.xkb.state, key + 8); - len = xkb_keysym_to_utf8(ksym, buf, sizeof buf); - if (len > 0) - --len; - + len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); /* 1. shortcuts */ for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { - if (ksym == bp->keysym && match(bp->mod, wl.xkb.mods)) { + if (ksym == bp->keysym && match(bp->mod, e->state)) { bp->func(&(bp->arg)); return; } } /* 2. custom keys from config.h */ - if ((str = kmap(ksym, wl.xkb.mods))) { - len = strlen(str); - goto send; + if ((customkey = kmap(ksym, e->state))) { + ttysend(customkey, strlen(customkey)); + return; } /* 3. composed string from input method */ if (len == 0) return; - if (len == 1 && wl.xkb.mods & MOD_MASK_ALT) { + if (len == 1 && e->state & Mod1Mask) { if (IS_SET(MODE_8BIT)) { if (*buf < 0177) { c = *buf | 0x80; @@ -4113,344 +4227,101 @@ kbdkey(void *data, struct wl_keyboard *keyboard, uint32_t serial, uint32_t time, len = 2; } } - /* convert character to control character */ - else if (len == 1 && wl.xkb.mods & MOD_MASK_CTRL) { - if ((*buf >= '@' && *buf < '\177') || *buf == ' ') - *buf &= 0x1F; - else if (*buf == '2') *buf = '\000'; - else if (*buf >= '3' && *buf <= '7') - *buf -= ('3' - '\033'); - else if (*buf == '8') *buf = '\177'; - else if (*buf == '/') *buf = '_' & 0x1F; - } - - str = buf; - -send: - memcpy(repeat.str, str, len); - repeat.key = key; - repeat.len = len; - repeat.started = false; - clock_gettime(CLOCK_MONOTONIC, &repeat.last); - ttysend(str, len); + ttysend(buf, len); } -void -kbdmodifiers(void *data, struct wl_keyboard *keyboard, uint32_t serial, - uint32_t dep, uint32_t lat, uint32_t lck, uint32_t group) -{ - xkb_mod_mask_t mod_mask; - - xkb_state_update_mask(wl.xkb.state, dep, lat, lck, group, 0, 0); - - mod_mask = xkb_state_serialize_mods(wl.xkb.state, XKB_STATE_MODS_EFFECTIVE); - wl.xkb.mods = 0; - - if (mod_mask & (1 << wl.xkb.ctrl)) - wl.xkb.mods |= MOD_MASK_CTRL; - if (mod_mask & (1 << wl.xkb.alt)) - wl.xkb.mods |= MOD_MASK_ALT; - if (mod_mask & (1 << wl.xkb.shift)) - wl.xkb.mods |= MOD_MASK_SHIFT; - if (mod_mask & (1 << wl.xkb.logo)) - wl.xkb.mods |= MOD_MASK_LOGO; -} void -kbdrepeatinfo(void *data, struct wl_keyboard *keyboard, int32_t rate, - int32_t delay) +cmessage(XEvent *e) { - keyrepeatdelay = delay; - keyrepeatinterval = 1000 / rate; -} - -void -ptrenter(void *data, struct wl_pointer *pointer, uint32_t serial, - struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y) -{ - struct wl_cursor_image *img = cursor.cursor->images[0]; - struct wl_buffer *buffer; - - wl_pointer_set_cursor(pointer, serial, cursor.surface, - img->hotspot_x, img->hotspot_y); - buffer = wl_cursor_image_get_buffer(img); - wl_surface_attach(cursor.surface, buffer, 0, 0); - wl_surface_damage(cursor.surface, 0, 0, img->width, img->height); - wl_surface_commit(cursor.surface); -} - -void -ptrleave(void *data, struct wl_pointer *pointer, uint32_t serial, - struct wl_surface *surface) -{ -} - -void -ptrmotion(void *data, struct wl_pointer * pointer, uint32_t serial, - wl_fixed_t x, wl_fixed_t y) -{ - int oldey, oldex, oldsby, oldsey; - - if (IS_SET(MODE_MOUSE)) { - wlmousereportmotion(x, y); - return; - } - - wl.px = wl_fixed_to_int(x); - wl.py = wl_fixed_to_int(y); - - if (!sel.mode) - return; - - sel.mode = SEL_READY; - oldey = sel.oe.y; - oldex = sel.oe.x; - oldsby = sel.nb.y; - oldsey = sel.ne.y; - getbuttoninfo(); - - if (oldey != sel.oe.y || oldex != sel.oe.x) - tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey)); -} - -void -ptrbutton(void * data, struct wl_pointer * pointer, uint32_t serial, - uint32_t time, uint32_t button, uint32_t state) -{ - MouseShortcut *ms; - - if (IS_SET(MODE_MOUSE) && !(wl.xkb.mods & forceselmod)) { - wlmousereportbutton(button, state); - return; - } - - switch (state) { - case WL_POINTER_BUTTON_STATE_RELEASED: - if (button == BTN_MIDDLE) { - selpaste(NULL); - } else if (button == BTN_LEFT) { - if (sel.mode == SEL_READY) { - getbuttoninfo(); - selcopy(serial); - } else - selclear(); - sel.mode = SEL_IDLE; - tsetdirt(sel.nb.y, sel.ne.y); + /* + * See xembed specs + * http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html + */ + if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) { + if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) { + xw.state |= WIN_FOCUSED; + xseturgency(0); + } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) { + xw.state &= ~WIN_FOCUSED; } - break; - - case WL_POINTER_BUTTON_STATE_PRESSED: - for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { - if (button == ms->b && match(ms->mask, wl.xkb.mods)) { - ttysend(ms->s, strlen(ms->s)); - return; - } - } - - if (button == BTN_LEFT) { - /* Clear previous selection, logically and visually. */ - selclear(); - sel.mode = SEL_EMPTY; - sel.type = SEL_REGULAR; - sel.oe.x = sel.ob.x = x2col(wl.px); - sel.oe.y = sel.ob.y = y2row(wl.py); - - /* - * If the user clicks below predefined timeouts - * specific snapping behaviour is exposed. - */ - if (time - sel.tclick2 <= tripleclicktimeout) { - sel.snap = SNAP_LINE; - } else if (time - sel.tclick1 <= doubleclicktimeout) { - sel.snap = SNAP_WORD; - } else { - sel.snap = 0; - } - selnormalize(); - - if (sel.snap != 0) - sel.mode = SEL_READY; - tsetdirt(sel.nb.y, sel.ne.y); - sel.tclick2 = sel.tclick1; - sel.tclick1 = time; - } - break; + } else if (e->xclient.data.l[0] == xw.wmdeletewin) { + /* Send SIGHUP to shell */ + kill(pid, SIGHUP); + exit(0); } } void -ptraxis(void * data, struct wl_pointer * pointer, uint32_t time, uint32_t axis, - wl_fixed_t value) +cresize(int width, int height) { - Axiskey *ak; - int dir = value > 0 ? +1 : -1; + int col, row; - if (IS_SET(MODE_MOUSE) && !(wl.xkb.mods & forceselmod)) { - wlmousereportaxis(axis, value); + if (width != 0) + xw.w = width; + if (height != 0) + xw.h = height; + + col = (xw.w - 2 * borderpx) / xw.cw; + row = (xw.h - 2 * borderpx) / xw.ch; + + tresize(col, row); + xresize(col, row); +} + +void +resize(XEvent *e) +{ + if (e->xconfigure.width == xw.w && e->xconfigure.height == xw.h) return; - } - for (ak = ashortcuts; ak < ashortcuts + LEN(ashortcuts); ak++) { - if (axis == ak->axis && dir == ak->dir - && match(ak->mask, wl.xkb.mods)) { - ttysend(ak->s, strlen(ak->s)); - return; - } - } -} - -void -xdgshellping(void *data, struct zxdg_shell_v6 *shell, uint32_t serial) -{ - zxdg_shell_v6_pong(shell, serial); -} - -void -xdgsurfconfigure(void *data, struct zxdg_surface_v6 *surf, uint32_t serial) -{ - zxdg_surface_v6_ack_configure(surf, serial); -} - -void -xdgtoplevelconfigure(void *data, struct zxdg_toplevel_v6 *toplevel, - int32_t w, int32_t h, struct wl_array *states) -{ - - enum zxdg_toplevel_v6_state *state; - bool visible = 0; - wl_array_for_each(state, states) { - if(*state == ZXDG_TOPLEVEL_V6_STATE_ACTIVATED) visible = 1; - } - - if(visible) - wl.state |= WIN_VISIBLE; - else - wl.state &= ~WIN_VISIBLE; - - if(w == wl.w && h == wl.h) - return; - cresize(w,h); - if(wl.configured) - ttyresize(); - else - wl.configured = true; -} - -void -xdgtoplevelclose(void *data, struct zxdg_toplevel_v6 *toplevel) -{ - /* Send SIGHUP to shell */ - kill(pid, SIGHUP); - exit(0); -} - -void -datadevoffer(void *data, struct wl_data_device *datadev, - struct wl_data_offer *offer) -{ - wl_data_offer_add_listener(offer, &dataofferlistener, NULL); -} - -void -datadeventer(void *data, struct wl_data_device *datadev, uint32_t serial, - struct wl_surface *surf, wl_fixed_t x, wl_fixed_t y, - struct wl_data_offer *offer) -{ -} - -void -datadevleave(void *data, struct wl_data_device *datadev) -{ -} - -void -datadevmotion(void *data, struct wl_data_device *datadev, uint32_t time, - wl_fixed_t x, wl_fixed_t y) -{ -} - -void -datadevdrop(void *data, struct wl_data_device *datadev) -{ -} - -void -datadevselection(void *data, struct wl_data_device *datadev, - struct wl_data_offer *offer) -{ - if (offer && (uintptr_t) wl_data_offer_get_user_data(offer) == 1) - wl.seloffer = offer; - else - wl.seloffer = NULL; -} - -void -dataofferoffer(void *data, struct wl_data_offer *offer, const char *mimetype) -{ - /* mark the offer as usable if it supports plain text */ - if (strncmp(mimetype, "text/plain", 10) == 0) - wl_data_offer_set_user_data(offer, (void *)(uintptr_t) 1); -} - -void -datasrctarget(void *data, struct wl_data_source *source, const char *mimetype) -{ -} - -void -datasrcsend(void *data, struct wl_data_source *source, const char *mimetype, - int32_t fd) -{ - char *buf = sel.primary; - int len = strlen(sel.primary); - ssize_t ret; - while ((ret = write(fd, buf, MIN(len, BUFSIZ))) > 0) { - len -= ret; - buf += ret; - } - close(fd); -} - -void -datasrccancelled(void *data, struct wl_data_source *source) -{ - if (sel.source == source) { - sel.source = NULL; - selclear(); - } - wl_data_source_destroy(source); + cresize(e->xconfigure.width, e->xconfigure.height); + ttyresize(); } void run(void) { + XEvent ev; + int w = xw.w, h = xw.h; fd_set rfd; - int wlfd = wl_display_get_fd(wl.dpy), blinkset = 0; + int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0; struct timespec drawtimeout, *tv = NULL, now, last, lastblink; - ulong msecs; + long deltatime; - /* Look for initial configure. */ - wl_display_roundtrip(wl.dpy); - if (!wl.configured) - cresize(wl.w, wl.h); + /* Waiting for window mapping */ + do { + XNextEvent(xw.dpy, &ev); + /* + * This XFilterEvent call is required because of XOpenIM. It + * does filter out the key event and some client message for + * the input method too. + */ + if (XFilterEvent(&ev, None)) + continue; + if (ev.type == ConfigureNotify) { + w = ev.xconfigure.width; + h = ev.xconfigure.height; + } + } while (ev.type != MapNotify); + + cresize(w, h); ttynew(); ttyresize(); - draw(); clock_gettime(CLOCK_MONOTONIC, &last); lastblink = last; - for (;;) { + for (xev = actionfps;;) { FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); - FD_SET(wlfd, &rfd); + FD_SET(xfd, &rfd); - if (pselect(MAX(wlfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) { + if (pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) { if (errno == EINTR) continue; die("select failed: %s\n", strerror(errno)); } - if (FD_ISSET(cmdfd, &rfd)) { ttyread(); if (blinktimeout) { @@ -4460,54 +4331,60 @@ run(void) } } - if (FD_ISSET(wlfd, &rfd)) { - if (wl_display_dispatch(wl.dpy) == -1) - die("Connection error\n"); - } + if (FD_ISSET(xfd, &rfd)) + xev = actionfps; clock_gettime(CLOCK_MONOTONIC, &now); - msecs = -1; + drawtimeout.tv_sec = 0; + drawtimeout.tv_nsec = (1000 * 1E6)/ xfps; + tv = &drawtimeout; - if (blinkset && blinktimeout) { - if (TIMEDIFF(now, lastblink) >= blinktimeout) { - tsetdirtattr(ATTR_BLINK); - term.mode ^= MODE_BLINK; - lastblink = now; - } else { - msecs = MIN(msecs, blinktimeout - \ - TIMEDIFF(now, lastblink)); + dodraw = 0; + if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) { + tsetdirtattr(ATTR_BLINK); + term.mode ^= MODE_BLINK; + lastblink = now; + dodraw = 1; + } + deltatime = TIMEDIFF(now, last); + if (deltatime > 1000 / (xev ? xfps : actionfps)) { + dodraw = 1; + last = now; + } + + if (dodraw) { + while (XPending(xw.dpy)) { + XNextEvent(xw.dpy, &ev); + if (XFilterEvent(&ev, None)) + continue; + if (handler[ev.type]) + (handler[ev.type])(&ev); + } + + draw(); + XFlush(xw.dpy); + + if (xev && !FD_ISSET(xfd, &rfd)) + xev--; + if (!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) { + if (blinkset) { + if (TIMEDIFF(now, lastblink) \ + > blinktimeout) { + drawtimeout.tv_nsec = 1000; + } else { + drawtimeout.tv_nsec = (1E6 * \ + (blinktimeout - \ + TIMEDIFF(now, + lastblink))); + } + drawtimeout.tv_sec = \ + drawtimeout.tv_nsec / 1E9; + drawtimeout.tv_nsec %= (long)1E9; + } else { + tv = NULL; + } } } - if (repeat.len > 0) { - if (TIMEDIFF(now, repeat.last) >= \ - (repeat.started ? keyrepeatinterval : \ - keyrepeatdelay)) { - repeat.started = true; - repeat.last = now; - ttysend(repeat.str, repeat.len); - } else { - msecs = MIN(msecs, (repeat.started ? \ - keyrepeatinterval : keyrepeatdelay) - \ - TIMEDIFF(now, repeat.last)); - } - } - - if (needdraw && wl.state & WIN_VISIBLE) { - if (!wl.framecb) { - draw(); - } - } - - if (msecs == -1) { - tv = NULL; - } else { - drawtimeout.tv_nsec = 1E6 * msecs; - drawtimeout.tv_sec = 0; - tv = &drawtimeout; - } - - wl_display_dispatch_pending(wl.dpy); - wl_display_flush(wl.dpy); } } @@ -4527,7 +4404,11 @@ usage(void) int main(int argc, char *argv[]) { - wl.cursor = cursorshape; + uint cols = 80, rows = 24; + + xw.l = xw.t = 0; + xw.isfixed = False; + xw.cursor = cursorshape; ARGBEGIN { case 'a': @@ -4543,6 +4424,13 @@ main(int argc, char *argv[]) case 'f': opt_font = EARGF(usage()); break; + case 'g': + xw.gm = XParseGeometry(EARGF(usage()), + &xw.l, &xw.t, &cols, &rows); + break; + case 'i': + xw.isfixed = 1; + break; case 'o': opt_io = EARGF(usage()); break; @@ -4574,8 +4462,9 @@ run: opt_title = basename(xstrdup(argv[0])); } setlocale(LC_CTYPE, ""); + XSetLocaleModifiers(""); tnew(MAX(cols, 1), MAX(rows, 1)); - wlinit(); + xinit(); selinit(); run();