diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0e56cf2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +config.h diff --git a/FAQ b/FAQ index 4defff9..ecf7af8 100644 --- a/FAQ +++ b/FAQ @@ -6,7 +6,7 @@ Use the excellent tool of [utmp](http://git.suckless.org/utmp/) for this task. It means that st doesn’t have any terminfo entry on your system. Chances are you did not `make install`. If you just want to test it without installing it, -you can manualy run `tic -sx st.info`. +you can manually run `tic -sx st.info`. ## Nothing works, and nothing is said about an unknown terminal! @@ -165,3 +165,30 @@ Apply [1]. [1] http://st.suckless.org/patches/delkey +## BadLength X error in Xft when trying to render emoji + +Xft makes st crash when rendering color emojis with the following error: + +"X Error of failed request: BadLength (poly request too large or internal Xlib length error)" + Major opcode of failed request: 139 (RENDER) + Minor opcode of failed request: 20 (RenderAddGlyphs) + Serial number of failed request: 1595 + Current serial number in output stream: 1818" + +This is a known bug in Xft (not st) which happens on some platforms and +combination of particular fonts and fontconfig settings. + +See also: +https://gitlab.freedesktop.org/xorg/lib/libxft/issues/6 +https://bugs.freedesktop.org/show_bug.cgi?id=107534 +https://bugzilla.redhat.com/show_bug.cgi?id=1498269 + +The solution is to remove color emoji fonts or disable this in the fontconfig +XML configuration. As an ugly workaround (which may work only on newer +fontconfig versions (FC_COLOR)), the following code can be used to mask color +fonts: + + FcPatternAddBool(fcpattern, FC_COLOR, FcFalse); + +Please don't bother reporting this bug to st, but notify the upstream Xft +developers about fixing this bug. diff --git a/LICENSE b/LICENSE index fa0c63e..c356c39 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,16 @@ MIT/X Consortium License +© 2014-2018 Hiltjo Posthuma +© 2018 Devin J. Pohly +© 2014-2017 Quentin Rameau © 2009-2012 Aurélien APTEL -© 2009 Anselm R Garbe -© 2012-2016 Roberto E. Vargas Caballero +© 2008-2017 Anselm R Garbe +© 2012-2017 Roberto E. Vargas Caballero © 2012-2016 Christoph Lohmann <20h at r-36 dot net> © 2013 Eon S. Jeon © 2013 Alexander Sedov © 2013 Mark Edgar -© 2013 Eric Pruitt +© 2013-2014 Eric Pruitt © 2013 Michael Forney © 2013-2014 Markus Teich © 2014-2015 Laslo Hunhold diff --git a/Makefile b/Makefile index fb026c4..7eb5c77 100644 --- a/Makefile +++ b/Makefile @@ -1,60 +1,65 @@ # st - simple terminal # See LICENSE file for copyright and license details. +.POSIX: include config.mk -SRC = st.c -OBJ = ${SRC:.c=.o} +SRC = st.c wl.c xdg-shell-protocol.c +OBJ = $(SRC:.c=.o) -all: options st +all: options st-wl options: - @echo st build options: - @echo "CFLAGS = ${CFLAGS}" - @echo "LDFLAGS = ${LDFLAGS}" - @echo "CC = ${CC}" + @echo st-wl build options: + @echo "CFLAGS = $(STCFLAGS)" + @echo "LDFLAGS = $(STLDFLAGS)" + @echo "CC = $(CC)" config.h: cp config.def.h config.h +xdg-shell-protocol.c: + @echo GEN $@ + @wayland-scanner private-code $(XDG_SHELL_PROTO) $@ + +xdg-shell-client-protocol.h: + @echo GEN $@ + @wayland-scanner client-header $(XDG_SHELL_PROTO) $@ + .c.o: - @echo CC $< - @${CC} -c ${CFLAGS} $< + $(CC) $(STCFLAGS) -c $< -${OBJ}: config.h config.mk +st.o: st.h win.h +wl.o: arg.h st.h win.h config.h xdg-shell-client-protocol.h -st: ${OBJ} - @echo CC -o $@ - @${CC} -o $@ ${OBJ} ${LDFLAGS} +$(OBJ): config.h config.mk + +st-wl: $(OBJ) + $(CC) -o $@ $(OBJ) $(STLDFLAGS) clean: - @echo cleaning - @rm -f st ${OBJ} st-${VERSION}.tar.gz + rm -f st-wl $(OBJ) st-wl-$(VERSION).tar.gz xdg-shell-* dist: clean - @echo creating dist tarball - @mkdir -p st-${VERSION} - @cp -R LICENSE Makefile README config.mk config.def.h st.info st.1 arg.h ${SRC} st-${VERSION} - @tar -cf st-${VERSION}.tar st-${VERSION} - @gzip st-${VERSION}.tar - @rm -rf st-${VERSION} - -install: all - @echo installing executable file to ${DESTDIR}${PREFIX}/bin - @mkdir -p ${DESTDIR}${PREFIX}/bin - @cp -f st ${DESTDIR}${PREFIX}/bin - @chmod 755 ${DESTDIR}${PREFIX}/bin/st - @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 - @mkdir -p ${DESTDIR}${MANPREFIX}/man1 - @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1 - @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1 - @echo Please see the README file regarding the terminfo entry of st. - @tic -sx st.info + mkdir -p st-wl-$(VERSION) + cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\ + config.def.h st-wl.info st-wl.1 arg.h st-wl.h win.h $(SRC)\ + st-wl-$(VERSION) + tar -cf - st-wl-$(VERSION) | gzip > st-wl-$(VERSION).tar.gz + rm -rf st-wl-$(VERSION) + +install: st-wl + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp -f st-wl $(DESTDIR)$(PREFIX)/bin + chmod 755 $(DESTDIR)$(PREFIX)/bin/st-wl + mkdir -p $(DESTDIR)$(MANPREFIX)/man1 + sed "s/VERSION/$(VERSION)/g" < st-wl.1 > $(DESTDIR)$(MANPREFIX)/man1/st-wl.1 + chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st-wl.1 + tic -sx st-wl.info + @echo Please see the README file regarding the terminfo entry of st-wl. uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin - @rm -f ${DESTDIR}${PREFIX}/bin/st - @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 - @rm -f ${DESTDIR}${MANPREFIX}/man1/st.1 + rm -f $(DESTDIR)$(PREFIX)/bin/st-wl + rm -f $(DESTDIR)$(MANPREFIX)/man1/st-wl.1 .PHONY: all options clean dist install uninstall diff --git a/arg.h b/arg.h index ba3fb3f..a22e019 100644 --- a/arg.h +++ b/arg.h @@ -21,28 +21,30 @@ extern char *argv0; argc--;\ break;\ }\ - for (brk_ = 0, argv[0]++, argv_ = argv;\ - argv[0][0] && !brk_;\ - argv[0]++) {\ + int i_;\ + for (i_ = 1, brk_ = 0, argv_ = argv;\ + argv[0][i_] && !brk_;\ + i_++) {\ if (argv_ != argv)\ break;\ - argc_ = argv[0][0];\ + argc_ = argv[0][i_];\ switch (argc_) + #define ARGEND }\ } #define ARGC() argc_ -#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\ +#define EARGF(x) ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\ ((x), abort(), (char *)0) :\ - (brk_ = 1, (argv[0][1] != '\0')?\ - (&argv[0][1]) :\ + (brk_ = 1, (argv[0][i_+1] != '\0')?\ + (&argv[0][i_+1]) :\ (argc--, argv++, argv[0]))) -#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\ +#define ARGF() ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\ (char *)0 :\ - (brk_ = 1, (argv[0][1] != '\0')?\ - (&argv[0][1]) :\ + (brk_ = 1, (argv[0][i_+1] != '\0')?\ + (&argv[0][i_+1]) :\ (argc--, argv++, argv[0]))) #endif diff --git a/config.def.h b/config.def.h index a719e36..b4ad8a6 100644 --- a/config.def.h +++ b/config.def.h @@ -5,23 +5,23 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; +static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; static int borderpx = 2; /* - * What program is execed by st depends of these precedence rules: + * What program is execed by st-wl depends of these precedence rules: * 1: program passed with -e * 2: utmp option * 3: SHELL environment variable * 4: value of shell in /etc/passwd * 5: value of shell in config.h */ -static char shell[] = "/bin/sh"; -static char *utmp = NULL; -static char stty_args[] = "stty raw pass8 nl -echo -iexten -cstopb 38400"; +static char *shell = "/bin/sh"; +char *utmp = NULL; +char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; /* identification sequence returned in DA and DECID */ -static char vtiden[] = "\033[?6c"; +char *vtiden = "\033[?6c"; /* Kerning / character bounding-box multipliers */ static float cwscale = 1.0; @@ -30,20 +30,20 @@ static float chscale = 1.0; /* * word delimiter string * - * More advanced example: " `'\"()[]{}" + * More advanced example: L" `'\"()[]{}" */ -static char worddelimiters[] = " "; +wchar_t *worddelimiters = L" "; /* selection timeouts (in milliseconds) */ static unsigned int doubleclicktimeout = 300; static unsigned int tripleclicktimeout = 600; /* alt screens */ -static int allowaltscreen = 1; +int allowaltscreen = 1; -/* frames per second st should at maximum draw to the screen */ -static unsigned int xfps = 120; -static unsigned int actionfps = 30; +/* key repeat timeouts (in milliseconds) */ +static unsigned int keyrepeatdelay = 500; +static unsigned int keyrepeatinterval = 25; /* * blinking timeout (set to 0 to disable blinking) for the terminal blinking @@ -63,52 +63,52 @@ static unsigned int cursorthickness = 2; static int bellvolume = 0; /* default TERM value */ -static char termname[] = "st-256color"; +char *termname = "st-wl-256color"; /* * spaces per tab * * When you are changing this value, don't forget to adapt the »it« value in - * the st.info and appropriately install the st.info in the environment where - * you use this st version. + * the st-wl.info and appropriately install the st-wl.info in the environment + * where you use this st-wl version. * - * it#$tabspaces, + * it#$tabspaces, * * Secondly make sure your kernel is not expanding tabs. When running `stty * -a` »tab0« should appear. You can tell the terminal to not expand tabs by * running following command: * - * stty tabs + * stty tabs */ -static unsigned int tabspaces = 8; +unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { - /* 8 normal colors */ - "black", - "red3", - "green3", - "yellow3", - "blue2", - "magenta3", - "cyan3", - "gray90", - - /* 8 bright colors */ - "gray50", - "red", - "green", - "yellow", - "#5c5cff", - "magenta", - "cyan", - "white", - - [255] = 0, - - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", + /* 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", }; @@ -116,8 +116,8 @@ static const char *colorname[] = { * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ -static unsigned int defaultfg = 7; -static unsigned int defaultbg = 0; +unsigned int defaultfg = 7; +unsigned int defaultbg = 0; static unsigned int defaultcs = 256; static unsigned int defaultrcs = 257; @@ -138,11 +138,9 @@ static unsigned int cols = 80; static unsigned int rows = 24; /* - * Default colour and shape of the mouse cursor + * Default shape of the mouse cursor */ -static unsigned int mouseshape = XC_xterm; -static unsigned int mousefg = 7; -static unsigned int mousebg = 0; +static char mouseshape[] = "xterm"; /* * Color used to display font attributes when fontconfig selected a font which @@ -155,37 +153,42 @@ static unsigned int defaultattr = 11; * Beware that overloading Button1 will disable the selection. */ static MouseShortcut mshortcuts[] = { - /* button mask string */ - { Button4, XK_ANY_MOD, "\031" }, - { Button5, XK_ANY_MOD, "\005" }, + /* 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"}, }; /* Internal keyboard shortcuts. */ -#define MODKEY Mod1Mask +#define MODKEY MOD_MASK_ALT +#define TERMMOD (MOD_MASK_CTRL|MOD_MASK_SHIFT) static Shortcut shortcuts[] = { - /* mask keysym function argument */ - { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, - { ControlMask, XK_Print, toggleprinter, {.i = 0} }, - { ShiftMask, XK_Print, printscreen, {.i = 0} }, - { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, - { 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} }, - { MODKEY, XK_Control_L, iso14755, {.i = 0} }, + /* mask keysym 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} }, + { TERMMOD, XKB_KEY_Prior, zoom, {.f = +1} }, + { TERMMOD, XKB_KEY_Next, zoom, {.f = -1} }, + { TERMMOD, XKB_KEY_Home, zoomreset, {.f = 0} }, + { TERMMOD, XKB_KEY_C, clipcopy, {.i = 0} }, + { TERMMOD, XKB_KEY_V, clippaste, {.i = 0} }, + { TERMMOD, XKB_KEY_Y, selpaste, {.i = 0} }, + { MOD_MASK_SHIFT, XKB_KEY_Insert, selpaste, {.i = 0} }, + { TERMMOD, XKB_KEY_Num_Lock, numlock, {.i = 0} }, }; /* * Special keys (change & recompile st.info accordingly) * * Mask value: - * * Use XK_ANY_MOD to match the key no matter modifiers state - * * Use XK_NO_MOD to match the key alone (no modifiers) + * * Use MOD_MASK_ANY to match the key no matter modifiers state + * * Use MOD_MASK_NONE to match the key alone (no modifiers) * appkey value: * * 0: no value * * > 0: keypad application mode enabled @@ -201,7 +204,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 XK_ANY_MOD must be in the last + * this table sequentially, so any MOD_MASK_ANY must be in the last * position for a key. */ @@ -209,239 +212,233 @@ 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 KeySym mappedkeys[] = { -1 }; +static xkb_keysym_t mappedkeys[] = { -1 }; /* * State bits to ignore when matching key or button events. By default, - * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. + * numlock (Mod2Mask) and keyboard layout (XKB_KEY_SWITCH_MOD) are ignored. */ -static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; +static uint ignoremod = 0; /* * Override mouse-select while mask is active (when MODE_MOUSE is set). - * Note that if you want to use ShiftMask with selmasks, set this to an other + * 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. */ -static uint forceselmod = ShiftMask; +static uint forceselmod = MOD_MASK_SHIFT; /* * 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 */ - { 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, Mod1Mask, "\033[1;3A", 0, 0, 0}, - { XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0, 0}, - { XK_Up, ControlMask, "\033[1;5A", 0, 0, 0}, - { XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0, 0}, - { XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0, 0}, - { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 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, Mod1Mask, "\033[1;3B", 0, 0, 0}, - { XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0, 0}, - { XK_Down, ControlMask, "\033[1;5B", 0, 0, 0}, - { XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0, 0}, - { XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0, 0}, - { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",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, Mod1Mask, "\033[1;3D", 0, 0, 0}, - { XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0, 0}, - { XK_Left, ControlMask, "\033[1;5D", 0, 0, 0}, - { XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0, 0}, - { XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0, 0}, - { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",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, Mod1Mask, "\033[1;3C", 0, 0, 0}, - { XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0, 0}, - { XK_Right, ControlMask, "\033[1;5C", 0, 0, 0}, - { XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0, 0}, - { XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0, 0}, - { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",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}, + /* keysym mask string appkey appcursor */ + { XKB_KEY_KP_Home, MOD_MASK_SHIFT, "\033[2J", 0, -1}, + { XKB_KEY_KP_Home, MOD_MASK_SHIFT, "\033[1;2H", 0, +1}, + { XKB_KEY_KP_Home, MOD_MASK_ANY, "\033[H", 0, -1}, + { XKB_KEY_KP_Home, MOD_MASK_ANY, "\033[1~", 0, +1}, + { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033Ox", +1, 0}, + { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033[A", 0, -1}, + { XKB_KEY_KP_Up, MOD_MASK_ANY, "\033OA", 0, +1}, + { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033Or", +1, 0}, + { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033[B", 0, -1}, + { XKB_KEY_KP_Down, MOD_MASK_ANY, "\033OB", 0, +1}, + { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033Ot", +1, 0}, + { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033[D", 0, -1}, + { XKB_KEY_KP_Left, MOD_MASK_ANY, "\033OD", 0, +1}, + { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033Ov", +1, 0}, + { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033[C", 0, -1}, + { XKB_KEY_KP_Right, MOD_MASK_ANY, "\033OC", 0, +1}, + { XKB_KEY_KP_Prior, MOD_MASK_SHIFT, "\033[5;2~", 0, 0}, + { XKB_KEY_KP_Prior, MOD_MASK_ANY, "\033[5~", 0, 0}, + { XKB_KEY_KP_Begin, MOD_MASK_ANY, "\033[E", 0, 0}, + { XKB_KEY_KP_End, MOD_MASK_CTRL, "\033[J", -1, 0}, + { XKB_KEY_KP_End, MOD_MASK_CTRL, "\033[1;5F", +1, 0}, + { XKB_KEY_KP_End, MOD_MASK_SHIFT, "\033[K", -1, 0}, + { XKB_KEY_KP_End, MOD_MASK_SHIFT, "\033[1;2F", +1, 0}, + { XKB_KEY_KP_End, MOD_MASK_ANY, "\033[4~", 0, 0}, + { XKB_KEY_KP_Next, MOD_MASK_SHIFT, "\033[6;2~", 0, 0}, + { XKB_KEY_KP_Next, MOD_MASK_ANY, "\033[6~", 0, 0}, + { XKB_KEY_KP_Insert, MOD_MASK_SHIFT, "\033[2;2~", +1, 0}, + { XKB_KEY_KP_Insert, MOD_MASK_SHIFT, "\033[4l", -1, 0}, + { XKB_KEY_KP_Insert, MOD_MASK_CTRL, "\033[L", -1, 0}, + { XKB_KEY_KP_Insert, MOD_MASK_CTRL, "\033[2;5~", +1, 0}, + { XKB_KEY_KP_Insert, MOD_MASK_ANY, "\033[4h", -1, 0}, + { XKB_KEY_KP_Insert, MOD_MASK_ANY, "\033[2~", +1, 0}, + { XKB_KEY_KP_Delete, MOD_MASK_CTRL, "\033[M", -1, 0}, + { XKB_KEY_KP_Delete, MOD_MASK_CTRL, "\033[3;5~", +1, 0}, + { XKB_KEY_KP_Delete, MOD_MASK_SHIFT, "\033[2K", -1, 0}, + { XKB_KEY_KP_Delete, MOD_MASK_SHIFT, "\033[3;2~", +1, 0}, + { XKB_KEY_KP_Delete, MOD_MASK_ANY, "\033[P", -1, 0}, + { XKB_KEY_KP_Delete, MOD_MASK_ANY, "\033[3~", +1, 0}, + { XKB_KEY_KP_Multiply, MOD_MASK_ANY, "\033Oj", +2, 0}, + { XKB_KEY_KP_Add, MOD_MASK_ANY, "\033Ok", +2, 0}, + { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\033OM", +2, 0}, + { XKB_KEY_KP_Enter, MOD_MASK_ANY, "\r", -1, 0}, + { XKB_KEY_KP_Subtract, MOD_MASK_ANY, "\033Om", +2, 0}, + { XKB_KEY_KP_Decimal, MOD_MASK_ANY, "\033On", +2, 0}, + { XKB_KEY_KP_Divide, MOD_MASK_ANY, "\033Oo", +2, 0}, + { XKB_KEY_KP_0, MOD_MASK_ANY, "\033Op", +2, 0}, + { XKB_KEY_KP_1, MOD_MASK_ANY, "\033Oq", +2, 0}, + { XKB_KEY_KP_2, MOD_MASK_ANY, "\033Or", +2, 0}, + { XKB_KEY_KP_3, MOD_MASK_ANY, "\033Os", +2, 0}, + { XKB_KEY_KP_4, MOD_MASK_ANY, "\033Ot", +2, 0}, + { XKB_KEY_KP_5, MOD_MASK_ANY, "\033Ou", +2, 0}, + { XKB_KEY_KP_6, MOD_MASK_ANY, "\033Ov", +2, 0}, + { XKB_KEY_KP_7, MOD_MASK_ANY, "\033Ow", +2, 0}, + { XKB_KEY_KP_8, MOD_MASK_ANY, "\033Ox", +2, 0}, + { XKB_KEY_KP_9, MOD_MASK_ANY, "\033Oy", +2, 0}, + { XKB_KEY_Up, MOD_MASK_SHIFT, "\033[1;2A", 0, 0}, + { XKB_KEY_Up, MOD_MASK_ALT, "\033[1;3A", 0, 0}, + { XKB_KEY_Up, MOD_MASK_SHIFT|MOD_MASK_ALT, "\033[1;4A", 0, 0}, + { XKB_KEY_Up, MOD_MASK_CTRL, "\033[1;5A", 0, 0}, + { XKB_KEY_Up, MOD_MASK_SHIFT|MOD_MASK_CTRL,"\033[1;6A", 0, 0}, + { XKB_KEY_Up, MOD_MASK_CTRL|MOD_MASK_ALT, "\033[1;7A", 0, 0}, + { XKB_KEY_Up, MOD_MASK_SHIFT|MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;8A", 0, 0}, + { XKB_KEY_Up, MOD_MASK_ANY, "\033[A", 0, -1}, + { XKB_KEY_Up, MOD_MASK_ANY, "\033OA", 0, +1}, + { XKB_KEY_Down, MOD_MASK_SHIFT, "\033[1;2B", 0, 0}, + { XKB_KEY_Down, MOD_MASK_ALT, "\033[1;3B", 0, 0}, + { XKB_KEY_Down, MOD_MASK_SHIFT|MOD_MASK_ALT,"\033[1;4B", 0, 0}, + { XKB_KEY_Down, MOD_MASK_CTRL, "\033[1;5B", 0, 0}, + { XKB_KEY_Down, MOD_MASK_SHIFT|MOD_MASK_CTRL,"\033[1;6B", 0, 0}, + { XKB_KEY_Down, MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;7B", 0, 0}, + { XKB_KEY_Down, MOD_MASK_SHIFT|MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;8B",0,0}, + { XKB_KEY_Down, MOD_MASK_ANY, "\033[B", 0, -1}, + { XKB_KEY_Down, MOD_MASK_ANY, "\033OB", 0, +1}, + { XKB_KEY_Left, MOD_MASK_SHIFT, "\033[1;2D", 0, 0}, + { XKB_KEY_Left, MOD_MASK_ALT, "\033[1;3D", 0, 0}, + { XKB_KEY_Left, MOD_MASK_SHIFT|MOD_MASK_ALT,"\033[1;4D", 0, 0}, + { XKB_KEY_Left, MOD_MASK_CTRL, "\033[1;5D", 0, 0}, + { XKB_KEY_Left, MOD_MASK_SHIFT|MOD_MASK_CTRL,"\033[1;6D", 0, 0}, + { XKB_KEY_Left, MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;7D", 0, 0}, + { XKB_KEY_Left, MOD_MASK_SHIFT|MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;8D",0,0}, + { XKB_KEY_Left, MOD_MASK_ANY, "\033[D", 0, -1}, + { XKB_KEY_Left, MOD_MASK_ANY, "\033OD", 0, +1}, + { XKB_KEY_Right, MOD_MASK_SHIFT, "\033[1;2C", 0, 0}, + { XKB_KEY_Right, MOD_MASK_ALT, "\033[1;3C", 0, 0}, + { XKB_KEY_Right,MOD_MASK_SHIFT|MOD_MASK_ALT,"\033[1;4C", 0, 0}, + { XKB_KEY_Right, MOD_MASK_CTRL, "\033[1;5C", 0, 0}, + { XKB_KEY_Right,MOD_MASK_SHIFT|MOD_MASK_CTRL,"\033[1;6C", 0, 0}, + { XKB_KEY_Right,MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;7C", 0, 0}, + { XKB_KEY_Right,MOD_MASK_SHIFT|MOD_MASK_CTRL|MOD_MASK_ALT,"\033[1;8C",0,0}, + { XKB_KEY_Right, MOD_MASK_ANY, "\033[C", 0, -1}, + { XKB_KEY_Right, MOD_MASK_ANY, "\033OC", 0, +1}, + { XKB_KEY_ISO_Left_Tab, MOD_MASK_SHIFT, "\033[Z", 0, 0}, + { XKB_KEY_Return, MOD_MASK_ALT, "\033\r", 0, 0}, + { XKB_KEY_Return, MOD_MASK_ANY, "\r", 0, 0}, + { XKB_KEY_Insert, MOD_MASK_SHIFT, "\033[4l", -1, 0}, + { XKB_KEY_Insert, MOD_MASK_SHIFT, "\033[2;2~", +1, 0}, + { XKB_KEY_Insert, MOD_MASK_CTRL, "\033[L", -1, 0}, + { XKB_KEY_Insert, MOD_MASK_CTRL, "\033[2;5~", +1, 0}, + { XKB_KEY_Insert, MOD_MASK_ANY, "\033[4h", -1, 0}, + { XKB_KEY_Insert, MOD_MASK_ANY, "\033[2~", +1, 0}, + { XKB_KEY_Delete, MOD_MASK_CTRL, "\033[M", -1, 0}, + { XKB_KEY_Delete, MOD_MASK_CTRL, "\033[3;5~", +1, 0}, + { XKB_KEY_Delete, MOD_MASK_SHIFT, "\033[2K", -1, 0}, + { XKB_KEY_Delete, MOD_MASK_SHIFT, "\033[3;2~", +1, 0}, + { XKB_KEY_Delete, MOD_MASK_ANY, "\033[P", -1, 0}, + { XKB_KEY_Delete, MOD_MASK_ANY, "\033[3~", +1, 0}, + { XKB_KEY_BackSpace, MOD_MASK_NONE, "\177", 0, 0}, + { XKB_KEY_BackSpace, MOD_MASK_ALT, "\033\177", 0, 0}, + { XKB_KEY_Home, MOD_MASK_SHIFT, "\033[2J", 0, -1}, + { XKB_KEY_Home, MOD_MASK_SHIFT, "\033[1;2H", 0, +1}, + { XKB_KEY_Home, MOD_MASK_ANY, "\033[H", 0, -1}, + { XKB_KEY_Home, MOD_MASK_ANY, "\033[1~", 0, +1}, + { XKB_KEY_End, MOD_MASK_CTRL, "\033[J", -1, 0}, + { XKB_KEY_End, MOD_MASK_CTRL, "\033[1;5F", +1, 0}, + { XKB_KEY_End, MOD_MASK_SHIFT, "\033[K", -1, 0}, + { XKB_KEY_End, MOD_MASK_SHIFT, "\033[1;2F", +1, 0}, + { XKB_KEY_End, MOD_MASK_ANY, "\033[4~", 0, 0}, + { XKB_KEY_Prior, MOD_MASK_CTRL, "\033[5;5~", 0, 0}, + { XKB_KEY_Prior, MOD_MASK_SHIFT, "\033[5;2~", 0, 0}, + { XKB_KEY_Prior, MOD_MASK_ANY, "\033[5~", 0, 0}, + { XKB_KEY_Next, MOD_MASK_CTRL, "\033[6;5~", 0, 0}, + { XKB_KEY_Next, MOD_MASK_SHIFT, "\033[6;2~", 0, 0}, + { XKB_KEY_Next, MOD_MASK_ANY, "\033[6~", 0, 0}, + { XKB_KEY_F1, MOD_MASK_NONE, "\033OP" , 0, 0}, + { XKB_KEY_F1, /* F13 */ MOD_MASK_SHIFT, "\033[1;2P", 0, 0}, + { XKB_KEY_F1, /* F25 */ MOD_MASK_CTRL, "\033[1;5P", 0, 0}, + { XKB_KEY_F1, /* F37 */ MOD_MASK_LOGO, "\033[1;6P", 0, 0}, + { XKB_KEY_F1, /* F49 */ MOD_MASK_ALT, "\033[1;3P", 0, 0}, + { XKB_KEY_F2, MOD_MASK_NONE, "\033OQ" , 0, 0}, + { XKB_KEY_F2, /* F14 */ MOD_MASK_SHIFT, "\033[1;2Q", 0, 0}, + { XKB_KEY_F2, /* F26 */ MOD_MASK_CTRL, "\033[1;5Q", 0, 0}, + { XKB_KEY_F2, /* F38 */ MOD_MASK_LOGO, "\033[1;6Q", 0, 0}, + { XKB_KEY_F2, /* F50 */ MOD_MASK_ALT, "\033[1;3Q", 0, 0}, + { XKB_KEY_F3, MOD_MASK_NONE, "\033OR" , 0, 0}, + { XKB_KEY_F3, /* F15 */ MOD_MASK_SHIFT, "\033[1;2R", 0, 0}, + { XKB_KEY_F3, /* F27 */ MOD_MASK_CTRL, "\033[1;5R", 0, 0}, + { XKB_KEY_F3, /* F39 */ MOD_MASK_LOGO, "\033[1;6R", 0, 0}, + { XKB_KEY_F3, /* F51 */ MOD_MASK_ALT, "\033[1;3R", 0, 0}, + { XKB_KEY_F4, MOD_MASK_NONE, "\033OS" , 0, 0}, + { XKB_KEY_F4, /* F16 */ MOD_MASK_SHIFT, "\033[1;2S", 0, 0}, + { XKB_KEY_F4, /* F28 */ MOD_MASK_CTRL, "\033[1;5S", 0, 0}, + { XKB_KEY_F4, /* F40 */ MOD_MASK_LOGO, "\033[1;6S", 0, 0}, + { XKB_KEY_F4, /* F52 */ MOD_MASK_ALT, "\033[1;3S", 0, 0}, + { XKB_KEY_F5, MOD_MASK_NONE, "\033[15~", 0, 0}, + { XKB_KEY_F5, /* F17 */ MOD_MASK_SHIFT, "\033[15;2~", 0, 0}, + { XKB_KEY_F5, /* F29 */ MOD_MASK_CTRL, "\033[15;5~", 0, 0}, + { XKB_KEY_F5, /* F41 */ MOD_MASK_LOGO, "\033[15;6~", 0, 0}, + { XKB_KEY_F5, /* F53 */ MOD_MASK_ALT, "\033[15;3~", 0, 0}, + { XKB_KEY_F6, MOD_MASK_NONE, "\033[17~", 0, 0}, + { XKB_KEY_F6, /* F18 */ MOD_MASK_SHIFT, "\033[17;2~", 0, 0}, + { XKB_KEY_F6, /* F30 */ MOD_MASK_CTRL, "\033[17;5~", 0, 0}, + { XKB_KEY_F6, /* F42 */ MOD_MASK_LOGO, "\033[17;6~", 0, 0}, + { XKB_KEY_F6, /* F54 */ MOD_MASK_ALT, "\033[17;3~", 0, 0}, + { XKB_KEY_F7, MOD_MASK_NONE, "\033[18~", 0, 0}, + { XKB_KEY_F7, /* F19 */ MOD_MASK_SHIFT, "\033[18;2~", 0, 0}, + { XKB_KEY_F7, /* F31 */ MOD_MASK_CTRL, "\033[18;5~", 0, 0}, + { XKB_KEY_F7, /* F43 */ MOD_MASK_LOGO, "\033[18;6~", 0, 0}, + { XKB_KEY_F7, /* F55 */ MOD_MASK_ALT, "\033[18;3~", 0, 0}, + { XKB_KEY_F8, MOD_MASK_NONE, "\033[19~", 0, 0}, + { XKB_KEY_F8, /* F20 */ MOD_MASK_SHIFT, "\033[19;2~", 0, 0}, + { XKB_KEY_F8, /* F32 */ MOD_MASK_CTRL, "\033[19;5~", 0, 0}, + { XKB_KEY_F8, /* F44 */ MOD_MASK_LOGO, "\033[19;6~", 0, 0}, + { XKB_KEY_F8, /* F56 */ MOD_MASK_ALT, "\033[19;3~", 0, 0}, + { XKB_KEY_F9, MOD_MASK_NONE, "\033[20~", 0, 0}, + { XKB_KEY_F9, /* F21 */ MOD_MASK_SHIFT, "\033[20;2~", 0, 0}, + { XKB_KEY_F9, /* F33 */ MOD_MASK_CTRL, "\033[20;5~", 0, 0}, + { XKB_KEY_F9, /* F45 */ MOD_MASK_LOGO, "\033[20;6~", 0, 0}, + { XKB_KEY_F9, /* F57 */ MOD_MASK_ALT, "\033[20;3~", 0, 0}, + { XKB_KEY_F10, MOD_MASK_NONE, "\033[21~", 0, 0}, + { XKB_KEY_F10, /* F22 */ MOD_MASK_SHIFT, "\033[21;2~", 0, 0}, + { XKB_KEY_F10, /* F34 */ MOD_MASK_CTRL, "\033[21;5~", 0, 0}, + { XKB_KEY_F10, /* F46 */ MOD_MASK_LOGO, "\033[21;6~", 0, 0}, + { XKB_KEY_F10, /* F58 */ MOD_MASK_ALT, "\033[21;3~", 0, 0}, + { XKB_KEY_F11, MOD_MASK_NONE, "\033[23~", 0, 0}, + { XKB_KEY_F11, /* F23 */ MOD_MASK_SHIFT, "\033[23;2~", 0, 0}, + { XKB_KEY_F11, /* F35 */ MOD_MASK_CTRL, "\033[23;5~", 0, 0}, + { XKB_KEY_F11, /* F47 */ MOD_MASK_LOGO, "\033[23;6~", 0, 0}, + { XKB_KEY_F11, /* F59 */ MOD_MASK_ALT, "\033[23;3~", 0, 0}, + { XKB_KEY_F12, MOD_MASK_NONE, "\033[24~", 0, 0}, + { XKB_KEY_F12, /* F24 */ MOD_MASK_SHIFT, "\033[24;2~", 0, 0}, + { XKB_KEY_F12, /* F36 */ MOD_MASK_CTRL, "\033[24;5~", 0, 0}, + { XKB_KEY_F12, /* F48 */ MOD_MASK_LOGO, "\033[24;6~", 0, 0}, + { XKB_KEY_F12, /* F60 */ MOD_MASK_ALT, "\033[24;3~", 0, 0}, + { XKB_KEY_F13, MOD_MASK_NONE, "\033[1;2P", 0, 0}, + { XKB_KEY_F14, MOD_MASK_NONE, "\033[1;2Q", 0, 0}, + { XKB_KEY_F15, MOD_MASK_NONE, "\033[1;2R", 0, 0}, + { XKB_KEY_F16, MOD_MASK_NONE, "\033[1;2S", 0, 0}, + { XKB_KEY_F17, MOD_MASK_NONE, "\033[15;2~", 0, 0}, + { XKB_KEY_F18, MOD_MASK_NONE, "\033[17;2~", 0, 0}, + { XKB_KEY_F19, MOD_MASK_NONE, "\033[18;2~", 0, 0}, + { XKB_KEY_F20, MOD_MASK_NONE, "\033[19;2~", 0, 0}, + { XKB_KEY_F21, MOD_MASK_NONE, "\033[20;2~", 0, 0}, + { XKB_KEY_F22, MOD_MASK_NONE, "\033[21;2~", 0, 0}, + { XKB_KEY_F23, MOD_MASK_NONE, "\033[23;2~", 0, 0}, + { XKB_KEY_F24, MOD_MASK_NONE, "\033[24;2~", 0, 0}, + { XKB_KEY_F25, MOD_MASK_NONE, "\033[1;5P", 0, 0}, + { XKB_KEY_F26, MOD_MASK_NONE, "\033[1;5Q", 0, 0}, + { XKB_KEY_F27, MOD_MASK_NONE, "\033[1;5R", 0, 0}, + { XKB_KEY_F28, MOD_MASK_NONE, "\033[1;5S", 0, 0}, + { XKB_KEY_F29, MOD_MASK_NONE, "\033[15;5~", 0, 0}, + { XKB_KEY_F30, MOD_MASK_NONE, "\033[17;5~", 0, 0}, + { XKB_KEY_F31, MOD_MASK_NONE, "\033[18;5~", 0, 0}, + { XKB_KEY_F32, MOD_MASK_NONE, "\033[19;5~", 0, 0}, + { XKB_KEY_F33, MOD_MASK_NONE, "\033[20;5~", 0, 0}, + { XKB_KEY_F34, MOD_MASK_NONE, "\033[21;5~", 0, 0}, + { XKB_KEY_F35, MOD_MASK_NONE, "\033[23;5~", 0, 0}, }; /* @@ -452,7 +449,7 @@ static Key key[] = { * If no match is found, regular selection is used. */ static uint selmasks[] = { - [SEL_RECTANGULAR] = Mod1Mask, + [SEL_RECTANGULAR] = MOD_MASK_ALT, }; /* @@ -460,7 +457,6 @@ static uint selmasks[] = { * of single wide characters. */ static char ascii_printable[] = - " !\"#$%&'()*+,-./0123456789:;<=>?" - "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" - "`abcdefghijklmnopqrstuvwxyz{|}~"; - + " !\"#$%&'()*+,-./0123456789:;<=>?" + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" + "`abcdefghijklmnopqrstuvwxyz{|}~"; diff --git a/config.mk b/config.mk index c84c5ee..7dc401e 100644 --- a/config.mk +++ b/config.mk @@ -1,28 +1,34 @@ # st version -VERSION = 0.7 +VERSION = 0.8.2 # Customize below to fit your system # paths PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man +MANPREFIX = $(PREFIX)/share/man -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib +PKG_CONFIG = pkg-config +PKGCFG = fontconfig wayland-client wayland-cursor xkbcommon wld +XDG_SHELL_PROTO = `$(PKG_CONFIG) --variable=pkgdatadir wayland-protocols`/stable/xdg-shell/xdg-shell.xml + +PKG_CONFIG = pkg-config # includes and libs -INCS = -I. -I/usr/include -I${X11INC} \ - `pkg-config --cflags fontconfig` \ - `pkg-config --cflags freetype2` -LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXft \ - `pkg-config --libs fontconfig` \ - `pkg-config --libs freetype2` +INCS = -I. -I/usr/include `$(PKG_CONFIG) --cflags ${PKGCFG}` +LIBS = -L/usr/lib -lc -lm -lrt -lutil `$(PKG_CONFIG) --libs ${PKGCFG}` # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS} +CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os LDFLAGS += -g ${LIBS} +STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 +STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) +STLDFLAGS = $(LIBS) $(LDFLAGS) -# compiler and linker -# CC = cc +# OpenBSD: +#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE +#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \ +# `pkg-config --libs fontconfig` \ +# `pkg-config --libs freetype2` +# compiler and linker +# CC = c99 diff --git a/st.1 b/st-wl.1 similarity index 77% rename from st.1 rename to st-wl.1 index c429dcf..f2dbc6e 100644 --- a/st.1 +++ b/st-wl.1 @@ -1,8 +1,8 @@ -.TH ST 1 st\-VERSION +.TH ST 1 st-wl\-VERSION .SH NAME -st \- simple terminal +st-wl \- simple terminal .SH SYNOPSIS -.B st +.B st-wl .RB [ \-aiv ] .RB [ \-c .IR class ] @@ -26,7 +26,7 @@ st \- simple terminal .IR command .RI [ arguments ...]] .PP -.B st +.B st-wl .RB [ \-aiv ] .RB [ \-c .IR class ] @@ -48,7 +48,7 @@ st \- simple terminal .IR line .RI [ stty_args ...] .SH DESCRIPTION -.B st +.B st-wl is a simple terminal emulator. .SH OPTIONS .TP @@ -61,7 +61,7 @@ defines the window class (default $TERM). .BI \-f " font" defines the .I font -to use when st is run. +to use when st-wl is run. .TP .BI \-g " geometry" defines the X11 geometry string. @@ -78,17 +78,17 @@ defines the window instance name (default $TERM). .BI \-o " iofile" writes all the I/O to .I iofile. -This feature is useful when recording st sessions. A value of "-" means +This feature is useful when recording st-wl sessions. A value of "-" means standard output. .TP .BI \-T " title" -defines the window title (default 'st'). +defines the window title (default 'st-wl'). .TP .BI \-t " title" -defines the window title (default 'st'). +defines the window title (default 'st-wl'). .TP .BI \-w " windowid" -embeds st within the window identified by +embeds st-wl within the window identified by .I windowid .TP .BI \-l " line" @@ -101,13 +101,13 @@ should be a (pseudo-)serial device (e.g. /dev/ttyS0 on Linux for serial port When this flag is given remaining arguments are used as flags for .BR stty(1). -By default st initializes the serial line to 8 bits, no parity, 1 stop bit +By default st-wl initializes the serial line to 8 bits, no parity, 1 stop bit and a 38400 baud rate. The speed is set by appending it as last argument -(e.g. 'st -l /dev/ttyS0 115200'). Arguments before the last one are +(e.g. 'st-wl -l /dev/ttyS0 115200'). Arguments before the last one are .BR stty(1) -flags. If you want to set odd parity on 115200 baud use for example 'st -l +flags. If you want to set odd parity on 115200 baud use for example 'st-wl -l /dev/ttyS0 parenb parodd 115200'. Set the number of bits by using for -example 'st -l /dev/ttyS0 cs7 115200'. See +example 'st-wl -l /dev/ttyS0 cs7 115200'. See .BR stty(1) for more arguments and cases. .TP @@ -115,12 +115,12 @@ for more arguments and cases. prints version information to stderr, then exits. .TP .BI \-e " command " [ " arguments " "... ]" -st executes +st-wl executes .I command instead of the shell. If this is used it .B must be the last option on the command line, as in xterm / rxvt. -This option is only intended for compability, +This option is only intended for compatibility, and all the remaining arguments are used as a command even without it. .SH SHORTCUTS @@ -131,7 +131,7 @@ Break key is obtained in PC keyboards pressing at the same time control and pause. .TP .B Ctrl-Print Screen -Toggle if st should print to the +Toggle if st-wl should print to the .I iofile. .TP .B Shift-Print Screen @@ -142,32 +142,25 @@ Print the full screen to the Print the selection to the .I iofile. .TP -.B Alt-Shift-Page Up +.B Ctrl-Shift-Page Up Increase font size. .TP -.B Alt-Shift-Page Down +.B Ctrl-Shift-Page Down Decrease font size. .TP -.B Alt-Shift-Home +.B Ctrl-Shift-Home Reset to default font size. .TP -.B Shift-Insert +.B Ctrl-Shift-y Paste from primary selection (middle mouse button). .TP -.B Alt-Shift-Insert -Paste from clipboard selection. -.TP -.B Alt-Shift-c +.B Ctrl-Shift-c Copy the selected text to the clipboard selection. .TP -.B Alt-Shift-v +.B Ctrl-Shift-v Paste from the clipboard selection. -.TP -.B Alt-Ctrl -Launch dmenu to enter a unicode codepoint and send the corresponding glyph -to st. .SH CUSTOMIZATION -.B st +.B st-wl can be customized by creating a custom config.h and (re)compiling the source code. This keeps it fast, secure and simple. .SH AUTHORS diff --git a/st.info b/st-wl.info similarity index 87% rename from st.info rename to st-wl.info index 13cc8eb..560440d 100644 --- a/st.info +++ b/st-wl.info @@ -1,4 +1,4 @@ -st| simpleterm, +st-wl| simpleterm, acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, am, bce, @@ -25,6 +25,7 @@ st| simpleterm, cuu=\E[%p1%dA, dch=\E[%p1%dP, dch1=\E[P, + dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, @@ -142,7 +143,6 @@ st| simpleterm, khome=\E[1~, kil1=\E[2;5~, krmir=\E[2;2~, - kich1=\E[2~, knp=\E[6~, kmous=\E[M, kpp=\E[5~, @@ -185,29 +185,35 @@ st| simpleterm, tsl=\E]0;, xenl, vpa=\E[%i%p1%dd, -# Tmux unofficial extensions, see TERMINFO EXTENSIONS in tmux(1) +# XTerm extensions + rmxx=\E[29m, + smxx=\E[9m, +# tmux extensions, see TERMINFO EXTENSIONS in tmux(1) Se, Ss, Tc, + Ms=\E]52;%p1%s;%p2%s\007, -st-256color| simpleterm with 256 colors, - use=st, +st-wl-256color| simpleterm with 256 colors, + use=st-wl, colors#256, + oc=\E]104\007, pairs#32767, # Nicked from xterm-256color + initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\, setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m, setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, -st-meta| simpleterm with meta key, - use=st, +st-wl-meta| simpleterm with meta key, + use=st-wl, km, rmm=\E[?1034l, smm=\E[?1034h, rs2=\E[4l\E>\E[?1034h, is2=\E[4l\E>\E[?1034h, -st-meta-256color| simpleterm with meta key and 256 colors, - use=st-256color, +st-wl-meta-256color| simpleterm with meta key and 256 colors, + use=st-wl-256color, km, rmm=\E[?1034l, smm=\E[?1034h, diff --git a/st.c b/st.c index fbcd9e0..08adef1 100644 --- a/st.c +++ b/st.c @@ -3,40 +3,22 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include -#include -#include #include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include "arg.h" - -char *argv0; - -#define Glyph Glyph_ -#define Font Font_ +#include "st.h" +#include "win.h" #if defined(__linux) #include @@ -46,65 +28,28 @@ char *argv0; #include #endif - -/* XEMBED messages */ -#define XEMBED_FOCUS_IN 4 -#define XEMBED_FOCUS_OUT 5 - /* Arbitrary sizes */ #define UTF_INVALID 0xFFFD -#define UTF_SIZ 4 -#define ESC_BUF_SIZ (128*UTF_SIZ) #define ESC_ARG_SIZ 16 #define STR_BUF_SIZ ESC_BUF_SIZ #define STR_ARG_SIZ ESC_ARG_SIZ -#define XK_ANY_MOD UINT_MAX -#define XK_NO_MOD 0 -#define XK_SWITCH_MOD (1<<13) /* macros */ -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define MAX(a, b) ((a) < (b) ? (b) : (a)) -#define LEN(a) (sizeof(a) / sizeof(a)[0]) -#define NUMMAXLEN(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1) -#define DEFAULT(a, b) (a) = (a) ? (a) : (b) -#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) -#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d)) +#define IS_SET(flag) ((term.mode & (flag)) != 0) #define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177') #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) -#define ISDELIM(u) (utf8strchr(worddelimiters, u) != NULL) -#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) -#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \ - (a).bg != (b).bg) -#define IS_SET(flag) ((term.mode & (flag)) != 0) -#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \ - (t1.tv_nsec-t2.tv_nsec)/1E6) -#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit))) - -#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b)) -#define IS_TRUECOL(x) (1 << 24 & (x)) -#define TRUERED(x) (((x) & 0xff0000) >> 8) -#define TRUEGREEN(x) (((x) & 0xff00)) -#define TRUEBLUE(x) (((x) & 0xff) << 8) - -/* constants */ -#define ISO14755CMD "dmenu -w %lu -p codepoint: ] [;]] []] */ typedef struct { - char buf[ESC_BUF_SIZ]; /* raw string */ - int len; /* raw string length */ - char priv; - int arg[ESC_ARG_SIZ]; - int narg; /* nb of args */ - char mode[2]; -} CSIEscape; + int mode; + int type; + int snap; + /* + * Selection variables: + * nb – normalized coordinates of the beginning of the selection + * ne – normalized coordinates of the end of the selection + * ob – original coordinates of the beginning of the selection + * oe – original coordinates of the end of the selection + */ + struct { + int x, y; + } nb, ne, ob, oe; -/* STR Escape sequence structs */ -/* ESC type [[ [] [;]] ] ESC '\' */ -typedef struct { - char type; /* ESC type ... */ - char buf[STR_BUF_SIZ]; /* raw string */ - int len; /* raw string length */ - char *args[STR_ARG_SIZ]; - int narg; /* nb of args */ -} STREscape; + int alt; +} Selection; /* Internal representation of the screen */ typedef struct { @@ -241,9 +115,10 @@ typedef struct { int col; /* nb col */ Line *line; /* screen */ Line *alt; /* alternate screen */ - int *dirty; /* dirtyness of lines */ - XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */ + int *dirty; /* dirtyness of lines */ TCursor c; /* cursor */ + int ocx; /* old cursor col */ + int ocy; /* old cursor row */ int top; /* top scroll limit */ int bot; /* bottom scroll limit */ int mode; /* terminal mode flags */ @@ -251,133 +126,34 @@ typedef struct { char trantbl[4]; /* charset table translation */ int charset; /* current charset */ int icharset; /* selected charset for sequence */ - int numlock; /* lock numbers in keyboard */ int *tabs; } Term; -/* Purely graphic info */ -typedef struct { - Display *dpy; - Colormap cmap; - Window win; - Drawable buf; - Atom xembed, wmdeletewin, netwmname, netwmpid; - XIM xim; - XIC xic; - Draw draw; - Visual *vis; - XSetWindowAttributes attrs; - int scr; - int isfixed; /* is fixed geometry? */ - int l, t; /* left and top offset */ - int gm; /* geometry mask */ - int tw, th; /* tty width and height */ - int w, h; /* window width and height */ - int ch; /* char height */ - int cw; /* char width */ - char state; /* focus, redraw, visible */ - int cursor; /* cursor style */ -} XWindow; - -typedef struct { - uint b; - uint mask; - char *s; -} MouseShortcut; - +/* CSI Escape sequence structs */ +/* ESC '[' [[ [] [;]] []] */ typedef struct { - KeySym k; - uint mask; - char *s; - /* three valued logic variables: 0 indifferent, 1 on, -1 off */ - signed char appkey; /* application keypad */ - signed char appcursor; /* application cursor */ - signed char crlf; /* crlf mode */ -} Key; + char buf[ESC_BUF_SIZ]; /* raw string */ + int len; /* raw string length */ + char priv; + int arg[ESC_ARG_SIZ]; + int narg; /* nb of args */ + char mode[2]; +} CSIEscape; +/* STR Escape sequence structs */ +/* ESC type [[ [] [;]] ] ESC '\' */ typedef struct { - int mode; - int type; - int snap; - /* - * Selection variables: - * nb – normalized coordinates of the beginning of the selection - * ne – normalized coordinates of the end of the selection - * ob – original coordinates of the beginning of the selection - * oe – original coordinates of the end of the selection - */ - struct { - int x, y; - } nb, ne, ob, oe; - - char *primary, *clipboard; - Atom xtarget; - int alt; - struct timespec tclick1; - struct timespec tclick2; -} Selection; - -typedef union { - int i; - uint ui; - float f; - const void *v; -} Arg; + char type; /* ESC type ... */ + char buf[STR_BUF_SIZ]; /* raw string */ + int len; /* raw string length */ + char *args[STR_ARG_SIZ]; + int narg; /* nb of args */ +} STREscape; -typedef struct { - uint mod; - KeySym keysym; - void (*func)(const Arg *); - const Arg arg; -} Shortcut; - -/* function definitions used in config.h */ -static void clipcopy(const Arg *); -static void clippaste(const Arg *); -static void numlock(const Arg *); -static void selpaste(const Arg *); -static void xzoom(const Arg *); -static void xzoomabs(const Arg *); -static void xzoomreset(const Arg *); -static void printsel(const Arg *); -static void printscreen(const Arg *) ; -static void iso14755(const Arg *); -static void toggleprinter(const Arg *); -static void sendbreak(const Arg *); - -/* Config.h for applying patches and the configuration. */ -#include "config.h" - -/* Font structure */ -typedef struct { - int height; - int width; - int ascent; - int descent; - int badslant; - int badweight; - short lbearing; - short rbearing; - XftFont *match; - FcFontSet *set; - FcPattern *pattern; -} Font; - -/* Drawing Context */ -typedef struct { - Color col[MAX(LEN(colorname), 256)]; - Font font, bfont, ifont, ibfont; - GC gc; -} DC; - -static void die(const char *, ...); -static void draw(void); -static void redraw(void); -static void drawregion(int, int, int, int); -static void execsh(void); -static void stty(void); +static void execsh(char *, char **); +static void stty(char **); static void sigchld(int); -static void run(void); +static void ttywriteraw(const char *, size_t); static void csidump(void); static void csihandle(void); @@ -389,7 +165,6 @@ static void strhandle(void); static void strparse(void); static void strreset(void); -static int tattrset(int); static void tprinter(char *, size_t); static void tdumpsel(void); static void tdumpline(int); @@ -403,174 +178,56 @@ static void tinsertblankline(int); static int tlinelen(int); static void tmoveto(int, int); static void tmoveato(int, int); -static void tnew(int, int); static void tnewline(int); static void tputtab(int); static void tputc(Rune); static void treset(void); -static void tresize(int, int); static void tscrollup(int, int); static void tscrolldown(int, int); static void tsetattr(int *, int); static void tsetchar(Rune, Glyph *, int, int); +static void tsetdirt(int, int); static void tsetscroll(int, int); static void tswapscreen(void); -static void tsetdirt(int, int); -static void tsetdirtattr(int); static void tsetmode(int, int, int *, int); +static int twrite(const char *, int, int); static void tfulldirt(void); -static void techo(Rune); static void tcontrolcode(uchar ); static void tdectest(char ); static void tdefutf8(char); static int32_t tdefcolor(int *, int *, int); static void tdeftran(char); -static inline int match(uint, uint); -static void ttynew(void); -static size_t ttyread(void); -static void ttyresize(void); -static void ttysend(char *, size_t); -static void ttywrite(const char *, size_t); static void tstrsequence(uchar); -static inline ushort sixd_to_16bit(int); -static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int); -static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int); -static void xdrawglyph(Glyph, int, int); -static void xhints(void); -static void xclear(int, int, int, int); -static void xdrawcursor(void); -static void xinit(void); -static void xloadcols(void); -static int xsetcolorname(int, const char *); -static int xgeommasktogravity(int); -static int xloadfont(Font *, FcPattern *); -static void xloadfonts(char *, double); -static void xsettitle(char *); -static void xresettitle(void); -static void xsetpointermotion(int); -static void xseturgency(int); -static void xsetsel(char *, Time); -static void xunloadfont(Font *); -static void xunloadfonts(void); -static void xresize(int, int); - -static void expose(XEvent *); -static void visibility(XEvent *); -static void unmap(XEvent *); -static char *kmap(KeySym, uint); -static void kpress(XEvent *); -static void cmessage(XEvent *); -static void cresize(int, int); -static void resize(XEvent *); -static void focus(XEvent *); -static void brelease(XEvent *); -static void bpress(XEvent *); -static void bmotion(XEvent *); -static void propnotify(XEvent *); -static void selnotify(XEvent *); -static void selclear(XEvent *); -static void selrequest(XEvent *); - -static void selinit(void); +static void drawregion(int, int, int, int); + static void selnormalize(void); -static inline int selected(int, int); -static char *getsel(void); -static void selcopy(Time); static void selscroll(int, int); static void selsnap(int *, int *, int); -static int x2col(int); -static int y2row(int); -static void getbuttoninfo(XEvent *); -static void mousereport(XEvent *); -static size_t utf8decode(char *, Rune *, size_t); static Rune utf8decodebyte(char, size_t *); -static size_t utf8encode(Rune, char *); static char utf8encodebyte(Rune, size_t); -static char *utf8strchr(char *s, Rune u); static size_t utf8validate(Rune *, size_t); +static char *base64dec(const char *); +static char base64dec_getc(const char **); + static ssize_t xwrite(int, const char *, size_t); -static void *xmalloc(size_t); -static void *xrealloc(void *, size_t); -static char *xstrdup(char *); - -static void usage(void); - -static void (*handler[LASTEvent])(XEvent *) = { - [KeyPress] = kpress, - [ClientMessage] = cmessage, - [ConfigureNotify] = resize, - [VisibilityNotify] = visibility, - [UnmapNotify] = unmap, - [Expose] = expose, - [FocusIn] = focus, - [FocusOut] = focus, - [MotionNotify] = bmotion, - [ButtonPress] = bpress, - [ButtonRelease] = brelease, -/* - * Uncomment if you want the selection to disappear when you select something - * different in another window. - */ -/* [SelectionClear] = selclear, */ - [SelectionNotify] = selnotify, -/* - * PropertyNotify is only turned on when there is some INCR transfer happening - * for the selection retrieval. - */ - [PropertyNotify] = propnotify, - [SelectionRequest] = selrequest, -}; /* Globals */ -static DC dc; -static XWindow xw; static Term term; +static Selection sel; static CSIEscape csiescseq; static STREscape strescseq; +static int iofd = 1; static int cmdfd; static pid_t pid; -static Selection sel; -static int iofd = 1; -static char **opt_cmd = NULL; -static char *opt_class = NULL; -static char *opt_embed = NULL; -static char *opt_font = NULL; -static char *opt_io = NULL; -static char *opt_line = NULL; -static char *opt_name = NULL; -static char *opt_title = NULL; -static int oldbutton = 3; /* button event on startup: 3 = release */ - -static char *usedfont = NULL; -static double usedfontsize = 0; -static double defaultfontsize = 0; static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; -/* Font Ring Cache */ -enum { - FRC_NORMAL, - FRC_ITALIC, - FRC_BOLD, - FRC_ITALICBOLD -}; - -typedef struct { - XftFont *font; - int flags; - Rune unicodep; -} Fontcache; - -/* Fontcache is an array now. A new font will be appended to the array. */ -static Fontcache frc[16]; -static int frclen = 0; - ssize_t xwrite(int fd, const char *s, size_t len) { @@ -591,10 +248,10 @@ xwrite(int fd, const char *s, size_t len) void * xmalloc(size_t len) { - void *p = malloc(len); + void *p; - if (!p) - die("Out of memory\n"); + if (!(p = malloc(len))) + die("malloc: %s\n", strerror(errno)); return p; } @@ -603,7 +260,7 @@ void * xrealloc(void *p, size_t len) { if ((p = realloc(p, len)) == NULL) - die("Out of memory\n"); + die("realloc: %s\n", strerror(errno)); return p; } @@ -612,13 +269,13 @@ char * xstrdup(char *s) { if ((s = strdup(s)) == NULL) - die("Out of memory\n"); + die("strdup: %s\n", strerror(errno)); return s; } size_t -utf8decode(char *c, Rune *u, size_t clen) +utf8decode(const char *c, Rune *u, size_t clen) { size_t i, j, len, type; Rune udecoded; @@ -676,23 +333,6 @@ utf8encodebyte(Rune u, size_t i) return utfbyte[i] | (u & ~utfmask[i]); } -char * -utf8strchr(char *s, Rune u) -{ - Rune r; - size_t i, j, len; - - len = strlen(s); - for (i = 0, j = 0; i < len; i += j) { - if (!(j = utf8decode(&s[i], &r, len - i))) - break; - if (r == u) - return &(s[i]); - } - - return NULL; -} - size_t utf8validate(Rune *u, size_t i) { @@ -704,51 +344,121 @@ utf8validate(Rune *u, size_t i) return i; } +static const char base64_digits[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, + 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, 0, -1, 0, 0, 0, 0, 1, + 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 0, 0, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +char +base64dec_getc(const char **src) +{ + while (**src && !isprint(**src)) (*src)++; + return *((*src)++); +} + +char * +base64dec(const char *src) +{ + size_t in_len = strlen(src); + char *result, *dst; + + if (in_len % 4) + in_len += 4 - (in_len % 4); + result = dst = xmalloc(in_len / 4 * 3 + 1); + while (*src) { + int a = base64_digits[(unsigned char) base64dec_getc(&src)]; + int b = base64_digits[(unsigned char) base64dec_getc(&src)]; + int c = base64_digits[(unsigned char) base64dec_getc(&src)]; + int d = base64_digits[(unsigned char) base64dec_getc(&src)]; + + *dst++ = (a << 2) | ((b & 0x30) >> 4); + if (c == -1) + break; + *dst++ = ((b & 0x0f) << 4) | ((c & 0x3c) >> 2); + if (d == -1) + break; + *dst++ = ((c & 0x03) << 6) | d; + } + *dst = '\0'; + return result; +} + void selinit(void) { - clock_gettime(CLOCK_MONOTONIC, &sel.tclick1); - clock_gettime(CLOCK_MONOTONIC, &sel.tclick2); sel.mode = SEL_IDLE; sel.snap = 0; sel.ob.x = -1; - sel.primary = NULL; - sel.clipboard = NULL; - sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); - if (sel.xtarget == None) - sel.xtarget = XA_STRING; } int -x2col(int x) +tlinelen(int y) { - x -= borderpx; - x /= xw.cw; + int i = term.col; + + if (term.line[y][i - 1].mode & ATTR_WRAP) + return i; + + while (i > 0 && term.line[y][i - 1].u == ' ') + --i; - return LIMIT(x, 0, term.col-1); + return i; } -int -y2row(int y) +void +selstart(int col, int row, int snap) { - y -= borderpx; - y /= xw.ch; + selclear(); + sel.mode = SEL_EMPTY; + sel.type = SEL_REGULAR; + sel.alt = IS_SET(MODE_ALTSCREEN); + sel.snap = snap; + sel.oe.x = sel.ob.x = col; + sel.oe.y = sel.ob.y = row; + selnormalize(); - return LIMIT(y, 0, term.row-1); + if (sel.snap != 0) + sel.mode = SEL_READY; + tsetdirt(sel.nb.y, sel.ne.y); } -int -tlinelen(int y) +void +selextend(int col, int row, int type, int done) { - int i = term.col; + int oldey, oldex, oldsby, oldsey, oldtype; - if (term.line[y][i - 1].mode & ATTR_WRAP) - return i; + if (sel.mode == SEL_IDLE) + return; + if (done && sel.mode == SEL_EMPTY) { + selclear(); + return; + } - while (i > 0 && term.line[y][i - 1].u == ' ') - --i; + oldey = sel.oe.y; + oldex = sel.oe.x; + oldsby = sel.nb.y; + oldsey = sel.ne.y; + oldtype = sel.type; - return i; + sel.oe.x = col; + sel.oe.y = row; + selnormalize(); + sel.type = type; + + if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY) + tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey)); + + sel.mode = done ? SEL_IDLE : SEL_READY; } void @@ -782,7 +492,8 @@ selnormalize(void) int selected(int x, int y) { - if (sel.mode == SEL_EMPTY) + if (sel.mode == SEL_EMPTY || sel.ob.x == -1 || + sel.alt != IS_SET(MODE_ALTSCREEN)) return 0; if (sel.type == SEL_RECTANGULAR) @@ -867,141 +578,6 @@ selsnap(int *x, int *y, int direction) } } -void -getbuttoninfo(XEvent *e) -{ - int type; - uint state = e->xbutton.state & ~(Button1Mask | forceselmod); - - sel.alt = IS_SET(MODE_ALTSCREEN); - - sel.oe.x = x2col(e->xbutton.x); - sel.oe.y = y2row(e->xbutton.y); - selnormalize(); - - sel.type = SEL_REGULAR; - for (type = 1; type < LEN(selmasks); ++type) { - if (match(selmasks[type], state)) { - sel.type = type; - break; - } - } -} - -void -mousereport(XEvent *e) -{ - 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 += ((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, - 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); - } else { - return; - } - - ttywrite(buf, len); -} - -void -bpress(XEvent *e) -{ - struct timespec now; - MouseShortcut *ms; - - 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; - } - } - - if (e->xbutton.button == Button1) { - clock_gettime(CLOCK_MONOTONIC, &now); - - /* 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; - } -} - char * getsel(void) { @@ -1057,308 +633,50 @@ getsel(void) } void -selcopy(Time t) +selclear(void) { - xsetsel(getsel(), t); + if (sel.ob.x == -1) + return; + sel.mode = SEL_IDLE; + sel.ob.x = -1; + tsetdirt(sel.nb.y, sel.ne.y); } void -propnotify(XEvent *e) +die(const char *errstr, ...) { - 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); - } + va_list ap; + + va_start(ap, errstr); + vfprintf(stderr, errstr, ap); + va_end(ap); + exit(1); } void -selnotify(XEvent *e) +execsh(char *cmd, char **args) { - 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); - - /* - * Deleting the property again tells the selection owner to send the - * next data chunk in the property. - */ - XDeleteProperty(xw.dpy, xw.win, (int)property); -} - -void -selpaste(const Arg *dummy) -{ - XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, - xw.win, CurrentTime); -} - -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 -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; - sel.mode = SEL_IDLE; - sel.ob.x = -1; - tsetdirt(sel.nb.y, sel.ne.y); -} - -void -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; - - 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; - } - - 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 -die(const char *errstr, ...) -{ - va_list ap; - - va_start(ap, errstr); - vfprintf(stderr, errstr, ap); - va_end(ap); - exit(1); -} - -void -execsh(void) -{ - char **args, *sh, *prog; - const struct passwd *pw; - char buf[sizeof(long) * 8 + 1]; + char *sh, *prog; + const struct passwd *pw; errno = 0; if ((pw = getpwuid(getuid())) == NULL) { if (errno) - die("getpwuid:%s\n", strerror(errno)); + die("getpwuid: %s\n", strerror(errno)); else die("who are you?\n"); } if ((sh = getenv("SHELL")) == NULL) - sh = (pw->pw_shell[0]) ? pw->pw_shell : shell; + sh = (pw->pw_shell[0]) ? pw->pw_shell : cmd; - if (opt_cmd) - prog = opt_cmd[0]; + if (args) + prog = args[0]; else if (utmp) prog = utmp; else prog = sh; - args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL}; - - snprintf(buf, sizeof(buf), "%lu", xw.win); + DEFAULT(args, ((char *[]) {prog, NULL})); unsetenv("COLUMNS"); unsetenv("LINES"); @@ -1368,7 +686,6 @@ 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); @@ -1388,19 +705,20 @@ sigchld(int a) pid_t p; if ((p = waitpid(pid, &stat, WNOHANG)) < 0) - die("Waiting for pid %hd failed: %s\n", pid, strerror(errno)); + die("waiting for pid %hd failed: %s\n", pid, strerror(errno)); if (pid != p) return; - if (!WIFEXITED(stat) || WEXITSTATUS(stat)) - die("child finished with error '%d'\n", stat); + if (WIFEXITED(stat) && WEXITSTATUS(stat)) + die("child exited with status %d\n", WEXITSTATUS(stat)); + else if (WIFSIGNALED(stat)) + die("child terminated due to signal %d\n", WTERMSIG(stat)); exit(0); } - void -stty(void) +stty(char **args) { char cmd[_POSIX_ARG_MAX], **p, *q, *s; size_t n, siz; @@ -1410,7 +728,7 @@ stty(void) memcpy(cmd, stty_args, n); q = cmd + n; siz = sizeof(cmd) - n; - for (p = opt_cmd; p && (s = *p); ++p) { + for (p = args; p && (s = *p); ++p) { if ((n = strlen(s)) > siz-1) die("stty parameter length too long\n"); *q++ = ' '; @@ -1420,40 +738,40 @@ stty(void) } *q = '\0'; if (system(cmd) != 0) - perror("Couldn't call stty"); + perror("Couldn't call stty"); } -void -ttynew(void) +int +ttynew(char *line, char *cmd, char *out, char **args) { int m, s; - struct winsize w = {term.row, term.col, 0, 0}; - if (opt_io) { + if (out) { term.mode |= MODE_PRINT; - iofd = (!strcmp(opt_io, "-")) ? - 1 : open(opt_io, O_WRONLY | O_CREAT, 0666); + iofd = (!strcmp(out, "-")) ? + 1 : open(out, O_WRONLY | O_CREAT, 0666); if (iofd < 0) { fprintf(stderr, "Error opening %s:%s\n", - opt_io, strerror(errno)); + out, strerror(errno)); } } - if (opt_line) { - if ((cmdfd = open(opt_line, O_RDWR)) < 0) - die("open line failed: %s\n", strerror(errno)); + if (line) { + if ((cmdfd = open(line, O_RDWR)) < 0) + die("open line '%s' failed: %s\n", + line, strerror(errno)); dup2(cmdfd, 0); - stty(); - return; + stty(args); + return cmdfd; } /* seems to work fine on linux, openbsd and freebsd */ - if (openpty(&m, &s, NULL, NULL, &w) < 0) + if (openpty(&m, &s, NULL, NULL, NULL) < 0) die("openpty failed: %s\n", strerror(errno)); switch (pid = fork()) { case -1: - die("fork failed\n"); + die("fork failed: %s\n", strerror(errno)); break; case 0: close(iofd); @@ -1465,14 +783,23 @@ ttynew(void) die("ioctl TIOCSCTTY failed: %s\n", strerror(errno)); close(s); close(m); - execsh(); +#ifdef __OpenBSD__ + if (pledge("stdio getpw proc exec", NULL) == -1) + die("pledge\n"); +#endif + execsh(cmd, args); break; default: +#ifdef __OpenBSD__ + if (pledge("stdio rpath tty proc", NULL) == -1) + die("pledge\n"); +#endif close(s); cmdfd = m; signal(SIGCHLD, sigchld); break; } + return cmdfd; } size_t @@ -1480,44 +807,54 @@ ttyread(void) { static char buf[BUFSIZ]; static int buflen = 0; - char *ptr; - int charsize; /* size of utf8 char in bytes */ - Rune unicodep; + int written; int ret; /* append read bytes to unprocessed bytes */ if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0) - die("Couldn't read from shell: %s\n", strerror(errno)); - + die("couldn't read from shell: %s\n", strerror(errno)); 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--; - } - } + written = twrite(buf, buflen, 0); + buflen -= written; /* keep any uncomplete utf8 char for the next call */ if (buflen > 0) - memmove(buf, ptr, buflen); + memmove(buf, buf + written, buflen); + wlneeddraw(); return ret; } void -ttywrite(const char *s, size_t n) +ttywrite(const char *s, size_t n, int may_echo) +{ + const char *next; + + if (may_echo && IS_SET(MODE_ECHO)) + twrite(s, n, 1); + + if (!IS_SET(MODE_CRLF)) { + ttywriteraw(s, n); + return; + } + + /* This is similar to how the kernel handles ONLCR for ttys */ + while (n > 0) { + if (*s == '\r') { + next = s + 1; + ttywriteraw("\r\n", 2); + } else { + next = memchr(s, '\r', n); + DEFAULT(next, s + n); + ttywriteraw(s, next - s); + } + n -= next - s; + s = next; + } +} + +void +ttywriteraw(const char *s, size_t n) { fd_set wfd, rfd; ssize_t r; @@ -1574,44 +911,25 @@ ttywrite(const char *s, size_t n) } 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 (len <= 0) - break; - techo(u); - n -= len; - } -} - -void -ttyresize(void) +ttyresize(int tw, int th) { struct winsize w; w.ws_row = term.row; w.ws_col = term.col; - w.ws_xpixel = xw.tw; - w.ws_ypixel = xw.th; + w.ws_xpixel = tw; + w.ws_ypixel = th; if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0) fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno)); } +void +ttyhangup() +{ + /* Send SIGHUP to shell */ + kill(pid, SIGHUP); +} + int tattrset(int attr) { @@ -1637,6 +955,8 @@ tsetdirt(int top, int bot) for (i = top; i <= bot; i++) term.dirty[i] = 1; + + wlneeddraw(); } void @@ -1707,8 +1027,6 @@ tnew(int col, int row) { term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } }; tresize(col, row); - term.numlock = 1; - treset(); } @@ -1771,7 +1089,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(NULL); + selclear(); return; } if (sel.type == SEL_RECTANGULAR) { @@ -1917,7 +1235,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(NULL); + selclear(); gp->fg = term.c.attr.fg; gp->bg = term.c.attr.bg; gp->mode = 0; @@ -2118,7 +1436,8 @@ tsetattr(int *attr, int l) } else { fprintf(stderr, "erresc(default): gfx attr %d unknown\n", - attr[i]), csidump(); + attr[i]); + csidump(); } break; } @@ -2144,20 +1463,16 @@ tsetscroll(int t, int b) void tsetmode(int priv, int set, int *args, int narg) { - int *lim, mode; - int alt; + int alt, *lim; for (lim = args + narg; args < lim; ++args) { if (priv) { switch (*args) { case 1: /* DECCKM -- Cursor key */ - MODBIT(term.mode, set, MODE_APPCURSOR); + xsetmode(set, MODE_APPCURSOR); break; case 5: /* DECSCNM -- Reverse video */ - mode = term.mode; - MODBIT(term.mode, set, MODE_REVERSE); - if (mode != term.mode) - redraw(); + xsetmode(set, MODE_REVERSE); break; case 6: /* DECOM -- Origin */ MODBIT(term.c.state, set, CURSOR_ORIGIN); @@ -2177,36 +1492,36 @@ tsetmode(int priv, int set, int *args, int narg) case 12: /* att610 -- Start blinking cursor (IGNORED) */ break; case 25: /* DECTCEM -- Text Cursor Enable Mode */ - MODBIT(term.mode, !set, MODE_HIDE); + xsetmode(!set, MODE_HIDE); break; case 9: /* X10 mouse compatibility mode */ xsetpointermotion(0); - MODBIT(term.mode, 0, MODE_MOUSE); - MODBIT(term.mode, set, MODE_MOUSEX10); + xsetmode(0, MODE_MOUSE); + xsetmode(set, MODE_MOUSEX10); break; case 1000: /* 1000: report button press */ xsetpointermotion(0); - MODBIT(term.mode, 0, MODE_MOUSE); - MODBIT(term.mode, set, MODE_MOUSEBTN); + xsetmode(0, MODE_MOUSE); + xsetmode(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); + xsetmode(0, MODE_MOUSE); + xsetmode(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); + xsetmode(0, MODE_MOUSE); + xsetmode(set, MODE_MOUSEMANY); break; case 1004: /* 1004: send focus events to tty */ - MODBIT(term.mode, set, MODE_FOCUS); + xsetmode(set, MODE_FOCUS); break; case 1006: /* 1006: extended reporting mode */ - MODBIT(term.mode, set, MODE_MOUSESGR); + xsetmode(set, MODE_MOUSESGR); break; case 1034: - MODBIT(term.mode, set, MODE_8BIT); + xsetmode(set, MODE_8BIT); break; case 1049: /* swap screen & set/restore cursor as xterm */ if (!allowaltscreen) @@ -2231,7 +1546,7 @@ tsetmode(int priv, int set, int *args, int narg) tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); break; case 2004: /* 2004: bracketed paste mode */ - MODBIT(term.mode, set, MODE_BRCKTPASTE); + xsetmode(set, MODE_BRCKTPASTE); break; /* Not implemented mouse modes. See comments there. */ case 1001: /* mouse highlight mode; can hang the @@ -2242,6 +1557,7 @@ tsetmode(int priv, int set, int *args, int narg) case 1015: /* urxvt mangled mouse mode; incompatible and can be mistaken for other control codes. */ + break; default: fprintf(stderr, "erresc: unknown private set/reset mode %d\n", @@ -2252,8 +1568,8 @@ tsetmode(int priv, int set, int *args, int narg) switch (*args) { case 0: /* Error (IGNORED) */ break; - case 2: /* KAM -- keyboard action */ - MODBIT(term.mode, set, MODE_KBDLOCK); + case 2: + xsetmode(set, MODE_KBDLOCK); break; case 4: /* IRM -- Insertion-replacement */ MODBIT(term.mode, set, MODE_INSERT); @@ -2321,7 +1637,7 @@ csihandle(void) break; case 'c': /* DA -- Device Attributes */ if (csiescseq.arg[0] == 0) - ttywrite(vtiden, sizeof(vtiden) - 1); + ttywrite(vtiden, strlen(vtiden), 0); break; case 'C': /* CUF -- Cursor Forward */ case 'a': /* HPR -- Cursor Forward */ @@ -2368,7 +1684,6 @@ csihandle(void) tputtab(csiescseq.arg[0]); break; case 'J': /* ED -- Clear screen */ - selclear(NULL); switch (csiescseq.arg[0]) { case 0: /* below */ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); @@ -2449,7 +1764,7 @@ csihandle(void) if (csiescseq.arg[0] == 6) { len = snprintf(buf, sizeof(buf),"\033[%i;%iR", term.c.y+1, term.c.x+1); - ttywrite(buf, len); + ttywrite(buf, len, 0); } break; case 'r': /* DECSTBM -- Set Scrolling Region */ @@ -2471,11 +1786,8 @@ csihandle(void) case ' ': switch (csiescseq.mode[1]) { case 'q': /* DECSCUSR -- Set Cursor Style */ - DEFAULT(csiescseq.arg[0], 1); - if (!BETWEEN(csiescseq.arg[0], 0, 6)) { + if (xsetcursor(csiescseq.arg[0])) goto unknown; - } - xw.cursor = csiescseq.arg[0]; break; default: goto unknown; @@ -2517,7 +1829,7 @@ csireset(void) void strhandle(void) { - char *p = NULL; + char *p = NULL, *dec; int j, narg, par; term.esc &= ~(ESC_STR_END|ESC_STR); @@ -2533,6 +1845,17 @@ strhandle(void) if (narg > 1) xsettitle(strescseq.args[1]); return; + case 52: + if (narg > 2) { + dec = base64dec(strescseq.args[2]); + if (dec) { + xsetsel(dec); + xclipcopy(); + } else { + fprintf(stderr, "erresc: invalid base64\n"); + } + } + return; case 4: /* color set */ if (narg < 3) break; @@ -2541,7 +1864,10 @@ strhandle(void) case 104: /* color reset, here p = NULL */ j = (narg > 1) ? atoi(strescseq.args[1]) : -1; if (xsetcolorname(j, p)) { - fprintf(stderr, "erresc: invalid color %s\n", p); + if (par == 104 && narg <= 1) + return; /* color reset without parameter */ + fprintf(stderr, "erresc: invalid color j=%d, p=%s\n", + j, p ? p : "(null)"); } else { /* * TODO if defaultbg color is changed, borders @@ -2632,37 +1958,12 @@ void tprinter(char *s, size_t len) { if (iofd != -1 && xwrite(iofd, s, len) < 0) { - fprintf(stderr, "Error writing in %s:%s\n", - opt_io, strerror(errno)); + perror("Error writing to output file"); close(iofd); iofd = -1; } } -void -iso14755(const Arg *arg) -{ - char cmd[sizeof(ISO14755CMD) + NUMMAXLEN(xw.win)]; - FILE *p; - char *us, *e, codepoint[9], uc[UTF_SIZ]; - unsigned long utf32; - - snprintf(cmd, sizeof(cmd), ISO14755CMD, xw.win); - if (!(p = popen(cmd, "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) { @@ -2733,22 +2034,6 @@ tputtab(int n) term.c.x = LIMIT(x, 0, term.col-1); } -void -techo(Rune u) -{ - if (ISCONTROL(u)) { /* control code */ - if (u & 0x80) { - u &= 0x7f; - tputc('^'); - tputc('['); - } else if (u != '\n' && u != '\r' && u != '\t') { - u ^= 0x40; - tputc('^'); - } - } - tputc(u); -} - void tdefutf8(char ascii) { @@ -2833,10 +2118,7 @@ tcontrolcode(uchar ascii) /* backwards compatibility to xterm */ strhandle(); } else { - if (!(xw.state & WIN_FOCUSED)) - xseturgency(1); - if (bellvolume) - XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL); + xbell(); } break; case '\033': /* ESC */ @@ -2892,7 +2174,7 @@ tcontrolcode(uchar ascii) case 0x99: /* TODO: SGCI */ break; case 0x9a: /* DECID -- Identify Terminal */ - ttywrite(vtiden, sizeof(vtiden) - 1); + ttywrite(vtiden, strlen(vtiden), 0); break; case 0x9b: /* TODO: CSI */ case 0x9c: /* TODO: ST */ @@ -2964,18 +2246,18 @@ eschandle(uchar ascii) } break; case 'Z': /* DECID -- Identify Terminal */ - ttywrite(vtiden, sizeof(vtiden) - 1); + ttywrite(vtiden, strlen(vtiden), 0); break; - case 'c': /* RIS -- Reset to inital state */ + case 'c': /* RIS -- Reset to initial state */ treset(); - xresettitle(); + resettitle(); xloadcols(); break; case '=': /* DECPAM -- Application keypad */ - term.mode |= MODE_APPKEYPAD; + xsetmode(1, MODE_APPKEYPAD); break; case '>': /* DECPNM -- Normal keypad */ - term.mode &= ~MODE_APPKEYPAD; + xsetmode(0, MODE_APPKEYPAD); break; case '7': /* DECSC -- Save Cursor */ tcursor(CURSOR_SAVE); @@ -3037,7 +2319,6 @@ tputc(Rune u) goto check_control_code; } - if (IS_SET(MODE_SIXEL)) { /* TODO: implement sixel mode */ return; @@ -3109,7 +2390,7 @@ tputc(Rune u) return; } if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y)) - selclear(NULL); + selclear(); gp = &term.line[term.c.y][term.c.x]; if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) { @@ -3142,6 +2423,38 @@ tputc(Rune u) } } +int +twrite(const char *buf, int buflen, int show_ctrl) +{ + int charsize; + Rune u; + int n; + + for (n = 0; n < buflen; n += charsize) { + if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) { + /* process a complete utf8 char */ + charsize = utf8decode(buf + n, &u, buflen - n); + if (charsize == 0) + break; + } else { + u = buf[n] & 0xFF; + charsize = 1; + } + if (show_ctrl && ISCONTROL(u)) { + if (u & 0x80) { + u &= 0x7f; + tputc('^'); + tputc('['); + } else if (u != '\n' && u != '\r' && u != '\t') { + u ^= 0x40; + tputc('^'); + } + } + tputc(u); + } + return n; +} + void tresize(int col, int row) { @@ -3176,9 +2489,6 @@ 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)); @@ -3192,7 +2502,7 @@ tresize(int col, int row) } /* allocate any new rows */ - for (/* i == minrow */; i < row; i++) { + for (/* i = minrow */; i < row; i++) { term.line[i] = xmalloc(col * sizeof(Glyph)); term.alt[i] = xmalloc(col * sizeof(Glyph)); } @@ -3228,1311 +2538,51 @@ tresize(int col, int row) } void -xresize(int col, int row) -{ - xw.tw = MAX(1, col * xw.cw); - xw.th = MAX(1, row * xw.ch); - - 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); -} - -ushort -sixd_to_16bit(int x) -{ - return x == 0 ? 0 : 0x3737 + 0x2828 * x; -} - -int -xloadcolor(int i, const char *name, Color *ncolor) +resettitle(void) { - XRenderColor color = { .alpha = 0xffff }; - - if (!name) { - if (BETWEEN(i, 16, 255)) { /* 256 color */ - if (i < 6*6*6+16) { /* same colors as xterm */ - 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.red = 0x0808 + 0x0a0a * (i - (6*6*6+16)); - color.green = color.blue = color.red; - } - return XftColorAllocValue(xw.dpy, xw.vis, - xw.cmap, &color, ncolor); - } else - name = colorname[i]; - } - - return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor); + xsettitle(NULL); } void -xloadcols(void) +drawregion(int x1, int y1, int x2, int y2) { - int i; - static int loaded; - Color *cp; + int y; + for (y = y1; y < y2; y++) { + if (!term.dirty[y]) + continue; - if (loaded) { - for (cp = dc.col; cp < &dc.col[LEN(dc.col)]; ++cp) - XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); + term.dirty[y] = 0; + xdrawline(term.line[y], x1, y, x2); } - - for (i = 0; i < LEN(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 -xsetcolorname(int x, const char *name) +void +draw(void) { - Color ncolor; - - if (!BETWEEN(x, 0, LEN(dc.col))) - return 1; - + int cx = term.c.x; - if (!xloadcolor(x, name, &ncolor)) - return 1; - - XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); - dc.col[x] = ncolor; + if (!xstartdraw()) + return; - return 0; -} + /* adjust cursor position */ + LIMIT(term.ocx, 0, term.col-1); + LIMIT(term.ocy, 0, term.row-1); + if (term.line[term.ocy][term.ocx].mode & ATTR_WDUMMY) + term.ocx--; + if (term.line[term.c.y][cx].mode & ATTR_WDUMMY) + cx--; -/* - * Absolute coordinates. - */ -void -xclear(int x1, int y1, int x2, int y2) -{ - XftDrawRect(xw.draw, - &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg], - x1, y1, x2-x1, y2-y1); + drawregion(0, 0, term.col, term.row); + xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], + term.ocx, term.ocy, term.line[term.ocy][term.ocx]); + term.ocx = cx, term.ocy = term.c.y; + xfinishdraw(); + /* xximspot(term.ocx, term.ocy); */ /* disabled in wayland brach */ } 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 -xgeommasktogravity(int mask) +redraw(void) { - switch (mask & (XNegative|YNegative)) { - case 0: - return NorthWestGravity; - case XNegative: - return NorthEastGravity; - case YNegative: - return SouthWestGravity; - } - - return SouthEastGravity; + tfulldirt(); + /* draw();*/ /* Disabled in wayland */ } - -int -xloadfont(Font *f, FcPattern *pattern) -{ - FcPattern *configured; - FcPattern *match; - FcResult result; - XGlyphInfo 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); - XftDefaultSubstitute(xw.dpy, xw.scr, configured); - - match = FcFontMatch(NULL, configured, &result); - if (!match) { - FcPatternDestroy(configured); - return 1; - } - - if (!(f->match = XftFontOpenPattern(xw.dpy, match))) { - FcPatternDestroy(configured); - FcPatternDestroy(match); - return 1; - } - - if ((XftPatternGetInteger(pattern, "slant", 0, &wantattr) == - XftResultMatch)) { - /* - * Check if xft was unable to find a font with the appropriate - * slant but gave us one anyway. Try to mitigate. - */ - if ((XftPatternGetInteger(f->match->pattern, "slant", 0, - &haveattr) != XftResultMatch) || haveattr < wantattr) { - f->badslant = 1; - fputs("st: font slant does not match\n", stderr); - } - } - - if ((XftPatternGetInteger(pattern, "weight", 0, &wantattr) == - XftResultMatch)) { - if ((XftPatternGetInteger(f->match->pattern, "weight", 0, - &haveattr) != XftResultMatch) || haveattr != wantattr) { - f->badweight = 1; - fputs("st: font weight does not match\n", stderr); - } - } - - XftTextExtentsUtf8(xw.dpy, f->match, - (const FcChar8 *) ascii_printable, - strlen(ascii_printable), &extents); - - f->set = NULL; - f->pattern = configured; - - f->ascent = f->match->ascent; - f->descent = f->match->descent; - f->lbearing = 0; - f->rbearing = f->match->max_advance_width; - - f->height = f->ascent + f->descent; - f->width = DIVCEIL(extents.xOff, strlen(ascii_printable)); - - return 0; -} - -void -xloadfonts(char *fontstr, double fontsize) -{ - FcPattern *pattern; - double fontval; - float ceilf(float); - - if (fontstr[0] == '-') { - pattern = XftXlfdParse(fontstr, False, False); - } else { - pattern = FcNameParse((FcChar8 *)fontstr); - } - - if (!pattern) - die("st: can't open font %s\n", fontstr); - - if (fontsize > 1) { - FcPatternDel(pattern, FC_PIXEL_SIZE); - FcPatternDel(pattern, FC_SIZE); - FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize); - usedfontsize = fontsize; - } else { - if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == - FcResultMatch) { - usedfontsize = fontval; - } else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) == - FcResultMatch) { - usedfontsize = -1; - } else { - /* - * Default font size is 12, if none given. This is to - * have a known usedfontsize value. - */ - FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12); - usedfontsize = 12; - } - defaultfontsize = usedfontsize; - } - - if (xloadfont(&dc.font, pattern)) - die("st: can't open font %s\n", fontstr); - - if (usedfontsize < 0) { - FcPatternGetDouble(dc.font.match->pattern, - FC_PIXEL_SIZE, 0, &fontval); - usedfontsize = fontval; - if (fontsize == 0) - defaultfontsize = fontval; - } - - /* Setting character width and height. */ - 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 (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 (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 (xloadfont(&dc.bfont, pattern)) - die("st: can't open font %s\n", fontstr); - - FcPatternDestroy(pattern); -} - -void -xunloadfont(Font *f) -{ - XftFontClose(xw.dpy, f->match); - FcPatternDestroy(f->pattern); - if (f->set) - FcFontSetDestroy(f->set); -} - -void -xunloadfonts(void) -{ - /* Free the loaded fonts in the font cache. */ - while (frclen > 0) - XftFontClose(xw.dpy, frc[--frclen].font); - - xunloadfont(&dc.font); - xunloadfont(&dc.bfont); - xunloadfont(&dc.ifont); - xunloadfont(&dc.ibfont); -} - -void -xzoom(const Arg *arg) -{ - Arg larg; - - larg.f = usedfontsize + arg->f; - xzoomabs(&larg); -} - -void -xzoomabs(const Arg *arg) -{ - xunloadfonts(); - xloadfonts(usedfont, arg->f); - cresize(0, 0); - ttyresize(); - redraw(); - xhints(); -} - -void -xzoomreset(const Arg *arg) -{ - Arg larg; - - if (defaultfontsize > 0) { - larg.f = defaultfontsize; - xzoomabs(&larg); - } -} - -void -xinit(void) -{ - XGCValues gcvalues; - Cursor cursor; - Window parent; - pid_t thispid = getpid(); - XColor xmousefg, xmousebg; - - if (!(xw.dpy = XOpenDisplay(NULL))) - die("Can't open display\n"); - 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; - xloadfonts(usedfont, 0); - - /* colors */ - xw.cmap = XDefaultColormap(xw.dpy, xw.scr); - xloadcols(); - - /* 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; - - /* 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; - - 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); - - 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); -} - -int -xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) -{ - 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; - int i, f, numspecs = 0; - - 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; - - /* Skip dummy wide-character spacing. */ - if (mode == ATTR_WDUMMY) - 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; - } - yp = winy + font->ascent; - } - - /* 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 (glyphidx && frc[f].flags == frcflags) - break; - /* We got a default font for a not found glyph. */ - if (!glyphidx && frc[f].flags == frcflags - && frc[f].unicodep == rune) { - break; - } - } - - /* Nothing was found. Use fontconfig to find matching font. */ - if (f >= frclen) { - if (!font->set) - font->set = FcFontSort(0, font->pattern, - 1, 0, &fcres); - fcsets[0] = font->set; - - /* - * Nothing was found in the cache. Now use - * some dozen of Fontconfig calls to get the - * font for one single character. - * - * Xft and fontconfig are design failures. - */ - fcpattern = FcPatternDuplicate(font->pattern); - fccharset = FcCharSetCreate(); - - FcCharSetAddChar(fccharset, rune); - FcPatternAddCharSet(fcpattern, FC_CHARSET, - fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, 1); - - FcConfigSubstitute(0, fcpattern, - FcMatchPattern); - FcDefaultSubstitute(fcpattern); - - fontpattern = FcFontSetMatch(0, fcsets, 1, - fcpattern, &fcres); - - /* - * Overwrite or create the new cache entry. - */ - if (frclen >= LEN(frc)) { - frclen = LEN(frc) - 1; - XftFontClose(xw.dpy, frc[frclen].font); - frc[frclen].unicodep = 0; - } - - frc[frclen].font = XftFontOpenPattern(xw.dpy, - fontpattern); - frc[frclen].flags = frcflags; - frc[frclen].unicodep = rune; - - glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune); - - f = frclen; - frclen++; - - FcPatternDestroy(fcpattern); - FcCharSetDestroy(fccharset); - } - - 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; - - /* 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; - } else if ((base.mode & ATTR_ITALIC && dc.ifont.badslant) || - (base.mode & ATTR_BOLD && dc.bfont.badweight)) { - base.fg = defaultattr; - } - - 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) { - XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, - width, 1); - } - - if (base.mode & ATTR_STRUCK) { - XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3, - width, 1); - } - - /* Reset clip to none. */ - XftDrawSetClip(xw.draw, 0); -} - -void -xdrawglyph(Glyph g, int x, int y) -{ - int numspecs; - XftGlyphFontSpec spec; - - numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y); - xdrawglyphfontspecs(&spec, g, numspecs, x, y); -} - -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); - Color drawcol; - - LIMIT(oldx, 0, term.col-1); - LIMIT(oldy, 0, term.row-1); - - curx = term.c.x; - - /* adjust position if in dummy */ - if (term.line[oldy][oldx].mode & ATTR_WDUMMY) - oldx--; - if (term.line[term.c.y][curx].mode & ATTR_WDUMMY) - curx--; - - /* remove the old cursor */ - og = term.line[oldy][oldx]; - if (ena_sel && selected(oldx, oldy)) - og.mode ^= ATTR_REVERSE; - xdrawglyph(og, oldx, oldy); - - g.u = term.line[term.c.y][term.c.x].u; - - /* - * Select the right color for the right mode. - */ - if (IS_SET(MODE_REVERSE)) { - g.mode |= ATTR_REVERSE; - g.bg = defaultfg; - if (ena_sel && selected(term.c.x, term.c.y)) { - drawcol = dc.col[defaultcs]; - g.fg = defaultrcs; - } else { - drawcol = dc.col[defaultrcs]; - g.fg = defaultcs; - } - } else { - if (ena_sel && selected(term.c.x, term.c.y)) { - drawcol = dc.col[defaultrcs]; - g.fg = defaultfg; - g.bg = defaultrcs; - } else { - drawcol = dc.col[defaultcs]; - } - } - - if (IS_SET(MODE_HIDE)) - return; - - /* draw the new one */ - 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; - xdrawglyph(g, term.c.x, term.c.y); - break; - case 3: /* Blinking Underline */ - case 4: /* Steady Underline */ - XftDrawRect(xw.draw, &drawcol, - borderpx + curx * xw.cw, - borderpx + (term.c.y + 1) * xw.ch - \ - cursorthickness, - xw.cw, cursorthickness); - break; - case 5: /* Blinking bar */ - case 6: /* Steady bar */ - XftDrawRect(xw.draw, &drawcol, - borderpx + curx * xw.cw, - borderpx + term.c.y * xw.ch, - cursorthickness, xw.ch); - break; - } - } else { - 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); - } - oldx = curx, oldy = term.c.y; -} - - -void -xsettitle(char *p) -{ - 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 -xresettitle(void) -{ - xsettitle(opt_title ? opt_title : "st"); -} - -void -redraw(void) -{ - tfulldirt(); - draw(); -} - -void -draw(void) -{ - drawregion(0, 0, term.col, term.row); - 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 i, x, y, ox, numspecs; - Glyph base, new; - 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; - - specs = term.specbuf; - numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y); - - i = ox = 0; - for (x = x1; x < x2 && i < numspecs; x++) { - new = term.line[y][x]; - if (new.mode == ATTR_WDUMMY) - continue; - if (ena_sel && selected(x, y)) - new.mode ^= ATTR_REVERSE; - if (i > 0 && ATTRCMP(base, new)) { - xdrawglyphfontspecs(specs, base, i, ox, y); - specs += i; - numspecs -= i; - i = 0; - } - if (i == 0) { - ox = x; - base = new; - } - i++; - } - if (i > 0) - xdrawglyphfontspecs(specs, base, i, ox, y); - } - xdrawcursor(); -} - -void -expose(XEvent *ev) -{ - 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 == XK_ANY_MOD || mask == (state & ~ignoremod); -} - -void -numlock(const Arg *dummy) -{ - term.numlock ^= 1; -} - -char* -kmap(KeySym k, uint state) -{ - Key *kp; - int i; - - /* Check for mapped keys out of X11 function keys. */ - for (i = 0; i < LEN(mappedkeys); i++) { - if (mappedkeys[i] == k) - break; - } - if (i == LEN(mappedkeys)) { - if ((k & 0xFFFF) < 0xFD00) - return NULL; - } - - for (kp = key; kp < key + LEN(key); kp++) { - if (kp->k != k) - continue; - - if (!match(kp->mask, state)) - continue; - - if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0) - continue; - if (term.numlock && kp->appkey == 2) - continue; - - if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0) - continue; - - if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0) - continue; - - return kp->s; - } - - return NULL; -} - -void -kpress(XEvent *ev) -{ - XKeyEvent *e = &ev->xkey; - KeySym ksym; - char buf[32], *customkey; - int len; - Rune c; - Status status; - Shortcut *bp; - - if (IS_SET(MODE_KBDLOCK)) - return; - - 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, e->state)) { - bp->func(&(bp->arg)); - return; - } - } - - /* 2. custom keys from config.h */ - if ((customkey = kmap(ksym, e->state))) { - ttysend(customkey, strlen(customkey)); - return; - } - - /* 3. composed string from input method */ - if (len == 0) - return; - if (len == 1 && e->state & Mod1Mask) { - if (IS_SET(MODE_8BIT)) { - if (*buf < 0177) { - c = *buf | 0x80; - len = utf8encode(c, buf); - } - } else { - buf[1] = buf[0]; - buf[0] = '\033'; - len = 2; - } - } - ttysend(buf, len); -} - - -void -cmessage(XEvent *e) -{ - /* - * 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; - } - } else if (e->xclient.data.l[0] == xw.wmdeletewin) { - /* Send SIGHUP to shell */ - kill(pid, SIGHUP); - exit(0); - } -} - -void -cresize(int width, int height) -{ - int col, row; - - 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; - - cresize(e->xconfigure.width, e->xconfigure.height); - ttyresize(); -} - -void -run(void) -{ - XEvent ev; - int w = xw.w, h = xw.h; - fd_set rfd; - int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0; - struct timespec drawtimeout, *tv = NULL, now, last, lastblink; - long deltatime; - - /* 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(); - - clock_gettime(CLOCK_MONOTONIC, &last); - lastblink = last; - - for (xev = actionfps;;) { - FD_ZERO(&rfd); - FD_SET(cmdfd, &rfd); - FD_SET(xfd, &rfd); - - 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) { - blinkset = tattrset(ATTR_BLINK); - if (!blinkset) - MODBIT(term.mode, 0, MODE_BLINK); - } - } - - if (FD_ISSET(xfd, &rfd)) - xev = actionfps; - - clock_gettime(CLOCK_MONOTONIC, &now); - drawtimeout.tv_sec = 0; - drawtimeout.tv_nsec = (1000 * 1E6)/ xfps; - tv = &drawtimeout; - - 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; - } - } - } - } -} - -void -usage(void) -{ - die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]" - " [-n name] [-o file]\n" - " [-T title] [-t title] [-w windowid]" - " [[-e] command [args ...]]\n" - " %s [-aiv] [-c class] [-f font] [-g geometry]" - " [-n name] [-o file]\n" - " [-T title] [-t title] [-w windowid] -l line" - " [stty_args ...]\n", argv0, argv0); -} - -int -main(int argc, char *argv[]) -{ - xw.l = xw.t = 0; - xw.isfixed = False; - xw.cursor = cursorshape; - - ARGBEGIN { - case 'a': - allowaltscreen = 0; - break; - case 'c': - opt_class = EARGF(usage()); - break; - case 'e': - if (argc > 0) - --argc, ++argv; - goto run; - 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; - case 'l': - opt_line = EARGF(usage()); - break; - case 'n': - opt_name = EARGF(usage()); - break; - case 't': - case 'T': - opt_title = EARGF(usage()); - break; - case 'w': - opt_embed = EARGF(usage()); - break; - case 'v': - die("%s " VERSION " (c) 2010-2016 st engineers\n", argv0); - break; - default: - usage(); - } ARGEND; - -run: - if (argc > 0) { - /* eat all remaining arguments */ - opt_cmd = argv; - if (!opt_title && !opt_line) - opt_title = basename(xstrdup(argv[0])); - } - setlocale(LC_CTYPE, ""); - XSetLocaleModifiers(""); - tnew(MAX(cols, 1), MAX(rows, 1)); - xinit(); - selinit(); - run(); - - return 0; -} - diff --git a/st.h b/st.h new file mode 100644 index 0000000..38b5980 --- /dev/null +++ b/st.h @@ -0,0 +1,126 @@ +/* See LICENSE for license details. */ + +#include +#include + +/* Arbitrary sizes */ +#define UTF_SIZ 4 +#define ESC_BUF_SIZ (128*UTF_SIZ) + +/* macros */ +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) < (b) ? (b) : (a)) +#define LEN(a) (sizeof(a) / sizeof(a)[0]) +#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) +#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d)) +#define DEFAULT(a, b) (a) = (a) ? (a) : (b) +#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) +#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \ + (a).bg != (b).bg) +#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \ + (t1.tv_nsec-t2.tv_nsec)/1E6) +#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit))) + +#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b)) +#define IS_TRUECOL(x) (1 << 24 & (x)) + +enum glyph_attribute { + ATTR_NULL = 0, + ATTR_BOLD = 1 << 0, + ATTR_FAINT = 1 << 1, + ATTR_ITALIC = 1 << 2, + ATTR_UNDERLINE = 1 << 3, + ATTR_BLINK = 1 << 4, + ATTR_REVERSE = 1 << 5, + ATTR_INVISIBLE = 1 << 6, + ATTR_STRUCK = 1 << 7, + ATTR_WRAP = 1 << 8, + ATTR_WIDE = 1 << 9, + ATTR_WDUMMY = 1 << 10, + ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, +}; + +enum selection_mode { + SEL_IDLE = 0, + SEL_EMPTY = 1, + SEL_READY = 2 +}; + +enum selection_type { + SEL_REGULAR = 1, + SEL_RECTANGULAR = 2 +}; + +enum selection_snap { + SNAP_WORD = 1, + SNAP_LINE = 2 +}; + +typedef unsigned char uchar; +typedef unsigned int uint; +typedef unsigned long ulong; +typedef unsigned short ushort; + +typedef uint_least32_t Rune; + +typedef struct { + Rune u; /* character code */ + ushort mode; /* attribute flags */ + uint32_t fg; /* foreground */ + uint32_t bg; /* background */ +} Glyph; + +typedef Glyph *Line; + +typedef union { + int i; + uint ui; + float f; + const void *v; +} Arg; + +void die(const char *, ...); +void redraw(void); +void draw(void); + +void printscreen(const Arg *); +void printsel(const Arg *); +void sendbreak(const Arg *); +void toggleprinter(const Arg *); + +int tattrset(int); +void tnew(int, int); +void tresize(int, int); +void tsetdirtattr(int); +void ttyhangup(void); +int ttynew(char *, char *, char *, char **); +size_t ttyread(void); +void ttyresize(int, int); +void ttywrite(const char *, size_t, int); + +void resettitle(void); + +void selclear(void); +void selinit(void); +void selstart(int, int, int); +void selextend(int, int, int, int); +int selected(int, int); +char *getsel(void); + +size_t utf8decode(const char *, Rune *, size_t); +size_t utf8encode(Rune, char *); + +void *xmalloc(size_t); +void *xrealloc(void *, size_t); +char *xstrdup(char *); + +/* config.h globals */ +extern char *utmp; +extern char *stty_args; +extern char *vtiden; +extern wchar_t *worddelimiters; +extern int allowaltscreen; +extern char *termname; +extern unsigned int tabspaces; +extern unsigned int defaultfg; +extern unsigned int defaultbg; diff --git a/win.h b/win.h new file mode 100644 index 0000000..877048c --- /dev/null +++ b/win.h @@ -0,0 +1,39 @@ +/* See LICENSE for license details. */ + +enum win_mode { + MODE_VISIBLE = 1 << 0, + MODE_FOCUSED = 1 << 1, + MODE_APPKEYPAD = 1 << 2, + MODE_MOUSEBTN = 1 << 3, + MODE_MOUSEMOTION = 1 << 4, + MODE_REVERSE = 1 << 5, + MODE_KBDLOCK = 1 << 6, + MODE_HIDE = 1 << 7, + MODE_APPCURSOR = 1 << 8, + MODE_MOUSESGR = 1 << 9, + MODE_8BIT = 1 << 10, + MODE_BLINK = 1 << 11, + MODE_FBLINK = 1 << 12, + MODE_FOCUS = 1 << 13, + MODE_MOUSEX10 = 1 << 14, + MODE_MOUSEMANY = 1 << 15, + MODE_BRCKTPASTE = 1 << 16, + MODE_NUMLOCK = 1 << 17, + MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\ + |MODE_MOUSEMANY, +}; + +void xbell(void); +void xclipcopy(void); +void xdrawcursor(int, int, Glyph, int, int, Glyph); +void xdrawline(Line, int, int, int); +void xfinishdraw(void); +void xloadcols(void); +int xsetcolorname(int, const char *); +void xsettitle(char *); +int xsetcursor(int); +void xsetmode(int, unsigned int); +void xsetpointermotion(int); +void xsetsel(char *); +int xstartdraw(void); +void wlneeddraw(void); diff --git a/wl.c b/wl.c new file mode 100644 index 0000000..e1d4840 --- /dev/null +++ b/wl.c @@ -0,0 +1,2025 @@ +/* See LICENSE for license details. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/* for BTN_* definitions */ +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +static char *argv0; +#include "arg.h" +#include "st.h" +#include "win.h" +#include "xdg-shell-client-protocol.h" + +#define DRAW_BUF_SIZ 20*1024 + +/* types used in config.h */ +typedef struct { + uint mod; + xkb_keysym_t keysym; + void (*func)(const Arg *); + const Arg arg; +} Shortcut; + +typedef struct { + uint b; + uint mask; + char *s; +} MouseShortcut; + +typedef struct { + xkb_keysym_t k; + uint mask; + char *s; + /* three valued logic variables: 0 indifferent, 1 on, -1 off */ + signed char appkey; /* application keypad */ + signed char appcursor; /* application cursor */ +} Key; + +typedef struct { + int axis; + int dir; + uint mask; + char s[ESC_BUF_SIZ]; +} Axiskey; + +/* Key modifiers */ +#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 + +/* function definitions used in config.h */ +static void clipcopy(const Arg *); +static void clippaste(const Arg *); +static void numlock(const Arg *); +static void selpaste(const Arg *); +static void zoom(const Arg *); +static void zoomabs(const Arg *); +static void zoomreset(const Arg *); + +/* config.h for applying patches and the configuration. */ +#include "config.h" + +/* Macros */ +#define IS_SET(flag) ((win.mode & (flag)) != 0) + +/* Purely graphic info */ +typedef struct { + int tw, th; /* tty width and height */ + int w, h; /* window width and height */ + int ch; /* char height */ + int cw; /* char width */ + int mode; /* window state/mode flags */ + int cursor; /* cursor style */ +} TermWindow; + +typedef struct { + struct xkb_context *ctx; + struct xkb_keymap *keymap; + struct xkb_state *state; + xkb_mod_index_t ctrl, alt, shift, logo; + unsigned int mods; +} XKB; + +typedef struct { + struct wl_display *dpy; + struct wl_compositor *cmp; + struct wl_shm *shm; + struct wl_seat *seat; + struct wl_keyboard *keyboard; + struct wl_pointer *pointer; + struct wl_data_device_manager *datadevmanager; + struct wl_data_device *datadev; + struct wl_data_offer *seloffer; + struct wl_surface *surface; + struct wl_buffer *buffer; + struct xdg_wm_base *wm; + struct xdg_surface *xdgsurface; + struct xdg_toplevel *xdgtoplevel; + XKB xkb; + bool configured; + int px, py; /* pointer x and y */ + struct wl_callback * framecb; + uint32_t globalserial; /* global event serial */ + bool needdraw; +} Wayland; + +typedef struct { + struct wl_data_source *source; + char *primary; + uint32_t tclick1; + uint32_t tclick2; +} WlSelection; + +typedef struct { + int height; + int width; + int ascent; + int descent; + int badslant; + int badweight; + short lbearing; + short rbearing; + struct wld_font *match; + FcFontSet *set; + FcPattern *pattern; +} Font; + +/* Drawing Context */ +typedef struct { + uint32_t *col; + size_t collen; + Font font, bfont, ifont, ibfont; +} DC; + +typedef struct { + struct wl_cursor_theme *theme; + struct wl_cursor *cursor; + struct wl_surface *surface; +} Cursor; + +typedef struct { + struct wld_context *ctx; + struct wld_font_context *fontctx; + struct wld_renderer *renderer; + struct wld_buffer *buffer, *oldbuffer; +} WLD; + +typedef struct { + char str[32]; + uint32_t key; + int len; + bool started; + struct timespec last; +} Repeat; + +static int evcol(int); +static int evrow(int); + +static void wlmousereport(int, bool, int, int); +static void wlmousereportbutton(uint32_t, uint32_t); +static void wlmousereportmotion(wl_fixed_t, wl_fixed_t); +static void wlmousereportaxis(uint32_t, wl_fixed_t); +static void ptrenter(void *, struct wl_pointer *, uint32_t, + struct wl_surface *, wl_fixed_t, wl_fixed_t); +static void ptrleave(void *, struct wl_pointer *, uint32_t, + struct wl_surface *); +static void ptrmotion(void *, struct wl_pointer *, uint32_t, + wl_fixed_t, wl_fixed_t); +static void ptrbutton(void *, struct wl_pointer *, uint32_t, uint32_t, + uint32_t, uint32_t); +static void ptraxis(void *, struct wl_pointer *, uint32_t, uint32_t, + wl_fixed_t); +static void mousesel(int); +static void wlselpaste(void); +static void setsel(char*, uint32_t); +static inline void selwritebuf(char *, int); + +static int match(uint, uint); +static char *kmap(xkb_keysym_t, uint); +static void kbdkeymap(void *, struct wl_keyboard *, uint32_t, int32_t, + uint32_t); +static void kbdenter(void *, struct wl_keyboard *, uint32_t, + struct wl_surface *, struct wl_array *); +static void kbdleave(void *, struct wl_keyboard *, uint32_t, + struct wl_surface *); +static void kbdkey(void *, struct wl_keyboard *, uint32_t, uint32_t, uint32_t, + uint32_t); +static void kbdmodifiers(void *, struct wl_keyboard *, uint32_t, uint32_t, + uint32_t, uint32_t, uint32_t); +static void kbdrepeatinfo(void *, struct wl_keyboard *, int32_t, int32_t); + +static void wlresize(int, int); +static void cresize(int, int); +static void surfenter(void *, struct wl_surface *, struct wl_output *); +static void surfleave(void *, struct wl_surface *, struct wl_output *); +static void framedone(void *, struct wl_callback *, uint32_t); +static void xdgsurfconfigure(void *, struct xdg_surface *, uint32_t); +static void xdgtoplevelconfigure(void *, struct xdg_toplevel *, + int32_t, int32_t, struct wl_array *); +static void xdgtoplevelclose(void *, struct xdg_toplevel *); +static void wmping(void *, struct xdg_wm_base *, uint32_t); + +static inline uchar sixd_to_8bit(int); +static int wlloadfont(Font *, FcPattern *); +static void wlunloadfont(Font *f); +static void wlloadfonts(char *, double); +static void wlunloadfonts(void); + +static void wlclear(int, int, int, int); +static void wldraws(char *, Glyph, int, int, int, int); +static void wldrawglyph(Glyph, int, int); +static void wlloadcursor(void); + +static void regglobal(void *, struct wl_registry *, uint32_t, const char *, + uint32_t); +static void regglobalremove(void *, struct wl_registry *, uint32_t); +static void datadevoffer(void *, struct wl_data_device *, + struct wl_data_offer *); +static void datadeventer(void *, struct wl_data_device *, uint32_t, + struct wl_surface *, wl_fixed_t, wl_fixed_t, struct wl_data_offer *); +static void datadevleave(void *, struct wl_data_device *); +static void datadevmotion(void *, struct wl_data_device *, uint32_t, + wl_fixed_t x, wl_fixed_t y); +static void datadevdrop(void *, struct wl_data_device *); +static void datadevselection(void *, struct wl_data_device *, + struct wl_data_offer *); +static void dataofferoffer(void *, struct wl_data_offer *, const char *); +static void datasrctarget(void *, struct wl_data_source *, const char *); +static void datasrcsend(void *, struct wl_data_source *, const char *, + int32_t); +static void datasrccancelled(void *, struct wl_data_source *); + +static void wlinit(int, int); +static void run(void); +static void usage(void); + +/* Globals */ +static DC dc; +static Wayland wl; +static WlSelection wlsel; +static TermWindow win; +static WLD wld; +static Cursor cursor; +static Repeat repeat; +static int oldx, oldy; + +static struct wl_callback_listener framelistener = { framedone }; +static struct wl_registry_listener reglistener = { regglobal, + regglobalremove }; +static struct wl_surface_listener surflistener = { surfenter, surfleave }; +static struct wl_keyboard_listener kbdlistener = { kbdkeymap, kbdenter, + kbdleave, kbdkey, kbdmodifiers, kbdrepeatinfo }; +static struct wl_pointer_listener ptrlistener = { ptrenter, ptrleave, + ptrmotion, ptrbutton, ptraxis }; +static struct xdg_wm_base_listener wmlistener = { wmping }; +static struct xdg_surface_listener xdgsurflistener = { xdgsurfconfigure }; +static struct xdg_toplevel_listener xdgtoplevellistener = { + xdgtoplevelconfigure, xdgtoplevelclose }; +static struct wl_data_device_listener datadevlistener = { datadevoffer, + datadeventer, datadevleave, datadevmotion, datadevdrop, datadevselection }; +static struct wl_data_source_listener datasrclistener = { datasrctarget, + datasrcsend, datasrccancelled }; +static struct wl_data_offer_listener dataofferlistener = { dataofferoffer }; + +/* Font Ring Cache */ +enum { + FRC_NORMAL, + FRC_ITALIC, + FRC_BOLD, + FRC_ITALICBOLD +}; + +typedef struct { + struct wld_font *font; + int flags; + Rune unicodep; +} Fontcache; + +/* Fontcache is an array now. A new font will be appended to the array. */ +static Fontcache *frc = NULL; +static int frclen = 0; +static int frccap = 0; +static char *usedfont = NULL; +static double usedfontsize = 0; +static double defaultfontsize = 0; + +static char *opt_class = NULL; +static char **opt_cmd = NULL; +static char *opt_embed = NULL; +static char *opt_font = NULL; +static char *opt_io = NULL; +static char *opt_line = NULL; +static char *opt_name = NULL; +static char *opt_title = NULL; + +static int oldbutton = 3; /* button event on startup: 3 = release */ + +void +xbell(void) +{ + /* Do nothing, no bell in wayland. */ +} + +void +xsetpointermotion(int dummy) +{ + /* Do nothing, not required under wayland. */ +} + +void +xsetmode(int set, unsigned int flags) +{ + int mode = win.mode; + MODBIT(win.mode, set, flags); + if ((win.mode & MODE_REVERSE) != (mode & MODE_REVERSE)) + redraw(); +} + +void +numlock(const Arg *dummy) +{ + win.mode ^= MODE_NUMLOCK; +} + +int +xsetcursor(int cursor) +{ + DEFAULT(cursor, 1); + if (!BETWEEN(cursor, 0, 6)) + return 1; + win.cursor = cursor; + return 0; +} + +int +evcol(int x) +{ + x -= borderpx; + LIMIT(x, 0, win.tw - 1); + return x / win.cw; +} + +int +evrow(int y) +{ + y -= borderpx; + LIMIT(y, 0, win.th - 1); + return y / win.ch; +} + +void +wlmousereport(int button, bool release, int x, int y) +{ + int len; + char buf[40]; + + 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); + } + + if (IS_SET(MODE_MOUSESGR)) { + len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c", + button, x+1, y+1, release ? '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); + } else { + return; + } + + ttywrite(buf, len, 0); +} + +void +wlmousereportbutton(uint32_t button, uint32_t state) +{ + bool release = state == WL_POINTER_BUTTON_STATE_RELEASED; + + 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; + } + } + + oldbutton = release ? 3 : button; + + /* don't report release events when in X10 mode */ + if (IS_SET(MODE_MOUSEX10) && release) { + return; + } + + wlmousereport(button, release, oldx, oldy); +} + +void +wlmousereportmotion(wl_fixed_t fx, wl_fixed_t fy) +{ + int x = evcol(wl_fixed_to_int(fx)), y = evrow(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); +} + +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) +{ + if (IS_SET(MODE_MOUSE)) { + wlmousereportmotion(x, y); + return; + } + + wl.px = wl_fixed_to_int(x); + wl.py = wl_fixed_to_int(y); + + mousesel(0); +} + +void +ptrbutton(void * data, struct wl_pointer * pointer, uint32_t serial, + uint32_t time, uint32_t button, uint32_t state) +{ + MouseShortcut *ms; + int snap; + + 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) { + wlselpaste(); + } else if (button == BTN_LEFT) { + wl.globalserial = serial; + mousesel(1); + } + 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)) { + ttywrite(ms->s, strlen(ms->s), 1); + return; + } + } + + if (button == BTN_LEFT) { + /* + * If the user clicks below predefined timeouts + * specific snapping behaviour is exposed. + */ + if (time - wlsel.tclick2 <= tripleclicktimeout) { + snap = SNAP_LINE; + } else if (time - wlsel.tclick1 <= doubleclicktimeout) { + snap = SNAP_WORD; + } else { + snap = 0; + } + wlsel.tclick2 = wlsel.tclick1; + wlsel.tclick1 = time; + + selstart(evcol(wl.px), evrow(wl.py), snap); + } + break; + } +} + +void +ptraxis(void * data, struct wl_pointer * pointer, uint32_t time, uint32_t axis, + wl_fixed_t value) +{ + Axiskey *ak; + int dir = value > 0 ? +1 : -1; + + if (IS_SET(MODE_MOUSE) && !(wl.xkb.mods & forceselmod)) { + wlmousereportaxis(axis, value); + return; + } + + for (ak = ashortcuts; ak < ashortcuts + LEN(ashortcuts); ak++) { + if (axis == ak->axis && dir == ak->dir + && match(ak->mask, wl.xkb.mods)) { + ttywrite(ak->s, strlen(ak->s), 1); + return; + } + } +} + +void +mousesel(int done) +{ + int type, seltype = SEL_REGULAR; + uint state = wl.xkb.mods & ~forceselmod; + + for (type = 1; type < LEN(selmasks); ++type) { + if (match(selmasks[type], state)) { + seltype = type; + break; + } + } + + selextend(evcol(wl.px), evrow(wl.py), seltype, done); + if (done) + setsel(getsel(), wl.globalserial); +} + + +void +setsel(char *str, uint32_t serial) +{ + if (!str) + return; + + free(wlsel.primary); + wlsel.primary = str; + + if (str) { + wlsel.source = wl_data_device_manager_create_data_source(wl.datadevmanager); + wl_data_source_add_listener(wlsel.source, &datasrclistener, NULL); + wl_data_source_offer(wlsel.source, "text/plain; charset=utf-8"); + } else { + wlsel.source = NULL; + } + wl_data_device_set_selection(wl.datadev, wlsel.source, serial); +} + +void +selwritebuf(char *buf, int len) +{ + char *repl = buf; + + /* + * 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. + */ + while ((repl = memchr(repl, '\n', len))) { + *repl++ = '\r'; + } + + ttywrite(buf, len, 1); +} + +void +wlselpaste(void) +{ + int fds[2], len, left; + char buf[BUFSIZ], *str; + + if (wl.seloffer) { + if (IS_SET(MODE_BRCKTPASTE)) + ttywrite("\033[200~", 6, 0); + /* check if we are pasting from ourselves */ + if (wlsel.source) { + str = wlsel.primary; + left = strlen(wlsel.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, 0); + } +} + +void +xclipcopy(void) +{ + clipcopy(NULL); +} + +void +clipcopy(const Arg * dummy) +{ + setsel(getsel(), wl.globalserial); +} + +void +clippaste(const Arg * dummy) +{ + wlselpaste(); +} + +void +selpaste(const Arg * dummy) +{ + wlselpaste(); +} + +void +xsetsel(char * buf) +{ + setsel(buf, wl.globalserial); +} + +int +match(uint mask, uint state) +{ + return mask == MOD_MASK_ANY || mask == (state & ~ignoremod); +} + +char* +kmap(xkb_keysym_t k, uint state) +{ + Key *kp; + int i; + + /* Check for mapped keys out of X11 function keys. */ + for (i = 0; i < LEN(mappedkeys); i++) { + if (mappedkeys[i] == k) + break; + } + if (i == LEN(mappedkeys)) { + if ((k & 0xFFFF) < 0xFD00) + return NULL; + } + + for (kp = key; kp < key + LEN(key); kp++) { + if (kp->k != k) + continue; + + if (!match(kp->mask, state)) + continue; + + if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0) + continue; + if (IS_SET(MODE_NUMLOCK) && kp->appkey == 2) + continue; + + if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0) + continue; + + return kp->s; + } + + return NULL; +} + + +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) +{ + win.mode |= MODE_FOCUSED; + if (IS_SET(MODE_FOCUS)) + ttywrite("\033[I", 3, 0); + /* need to redraw the cursor */ + wlneeddraw(); +} + +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; + win.mode &= ~MODE_FOCUSED; + if (IS_SET(MODE_FOCUS)) + ttywrite("\033[O", 3, 0); + /* need to redraw the cursor */ + wlneeddraw(); + /* 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; + int len; + Rune c; + Shortcut *bp; + + if (IS_SET(MODE_KBDLOCK)) + return; + + if (state == WL_KEYBOARD_KEY_STATE_RELEASED) { + if (repeat.key == key) + repeat.len = 0; + return; + } + + wl.globalserial = serial; + 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; + + /* 1. shortcuts */ + for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { + if (ksym == bp->keysym && match(bp->mod, wl.xkb.mods)) { + bp->func(&(bp->arg)); + return; + } + } + + /* 2. custom keys from config.h */ + if ((str = kmap(ksym, wl.xkb.mods))) { + len = strlen(str); + goto send; + } + + /* 3. composed string from input method */ + if (len == 0) + return; + if (len == 1 && wl.xkb.mods & MOD_MASK_ALT) { + if (IS_SET(MODE_8BIT)) { + if (*buf < 0177) { + c = *buf | 0x80; + len = utf8encode(c, buf); + } + } else { + buf[1] = buf[0]; + buf[0] = '\033'; + 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); + ttywrite(str, len, 1); +} + +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) +{ + keyrepeatdelay = delay; + keyrepeatinterval = 1000 / rate; +} + +void +cresize(int width, int height) +{ + int col, row; + + if (width != 0) + win.w = width; + if (height != 0) + win.h = height; + + col = (win.w - 2 * borderpx) / win.cw; + row = (win.h - 2 * borderpx) / win.ch; + col = MAX(1, col); + row = MAX(1, row); + + tresize(col, row); + wlresize(col, row); + ttyresize(win.tw, win.th); +} + +void +zoom(const Arg *arg) +{ + Arg larg; + + larg.f = usedfontsize + arg->f; + zoomabs(&larg); +} + +void +zoomabs(const Arg *arg) +{ + wlunloadfonts(); + wlloadfonts(usedfont, arg->f); + cresize(0, 0); + redraw(); + /* XXX: Should the window size be updated here because wayland doesn't + * * have a notion of hints? + * * xhints(); */ +} + +void +zoomreset(const Arg *arg) +{ + Arg larg; + if (defaultfontsize > 0) { + larg.f = defaultfontsize; + zoomabs(&larg); + } +} + + +void +wlresize(int col, int row) +{ + union wld_object object; + + win.tw = col * win.cw; + win.th = row * win.ch; + + wld.oldbuffer = wld.buffer; + wld.buffer = wld_create_buffer(wld.ctx, win.w, win.h, + WLD_FORMAT_XRGB8888, 0); + wld_export(wld.buffer, WLD_WAYLAND_OBJECT_BUFFER, &object); + wl.buffer = object.ptr; +} + +void +xsettitle(char *title) +{ + DEFAULT(title, opt_title); + xdg_toplevel_set_title(wl.xdgtoplevel, title); +} + +void +surfenter(void *data, struct wl_surface *surface, struct wl_output *output) +{ + if (!(IS_SET(MODE_VISIBLE))) + win.mode |= MODE_VISIBLE; +} + +void +surfleave(void *data, struct wl_surface *surface, struct wl_output *output) +{ + if(IS_SET(MODE_VISIBLE)) + win.mode &= ~MODE_VISIBLE; +} + +void +framedone(void *data, struct wl_callback *callback, uint32_t msecs) +{ + wl_callback_destroy(callback); + wl.framecb = NULL; + if (wl.needdraw && IS_SET(MODE_VISIBLE)) { + draw(); + } +} + +void +xdgsurfconfigure(void *data, struct xdg_surface *surf, uint32_t serial) +{ + xdg_surface_ack_configure(surf, serial); +} + +void +xdgtoplevelconfigure(void *data, struct xdg_toplevel *toplevel, + int32_t w, int32_t h, struct wl_array *states) +{ + if (w == win.w && h == win.h) + return; + + cresize(w, h); + if (!wl.configured) + wl.configured = true; +} + +void +xdgtoplevelclose(void *data, struct xdg_toplevel *toplevel) +{ + /* Send SIGHUP to shell */ + pid_t thispid = getpid(); + kill(thispid, SIGHUP); + exit(0); +} + +void +wmping(void *data, struct xdg_wm_base *wm, uint32_t serial) +{ + xdg_wm_base_pong(wm, serial); +} + +uchar +sixd_to_8bit(int x) +{ + return x == 0 ? 0 : 0x37 + 0x28 * x; +} + +int +wlloadcolor(int i, const char *name, uint32_t *color) +{ + 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); + } else { /* greyscale */ + *color = 0xff << 24 | (0x8 + 0xa * (i-(6*6*6+16))) * 0x10101; + } + return true; + } else + name = colorname[i]; + } + + return wld_lookup_named_color(name, color); +} + +void +xloadcols(void) +{ + int i; + static int loaded; + + if(!loaded) { + dc.collen = MAX(LEN(colorname), 256); + dc.col = xmalloc(dc.collen * sizeof(uint32_t)); + } + + for (i = 0; i < dc.collen; i++) + if (!wlloadcolor(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 +xsetcolorname(int x, const char *name) +{ + uint32_t color; + + if (!BETWEEN(x, 0, dc.collen)) + return 1; + + + if (!wlloadcolor(x, name, &color)) + return 1; + + dc.col[x] = color; + + return 0; +} + +int +wlloadfont(Font *f, FcPattern *pattern) +{ + 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; + } + + if (!(f->match = wld_font_open_pattern(wld.fontctx, match))) { + FcPatternDestroy(configured); + 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("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("font weight does not match\n", stderr); + } + } + + + wld_font_text_extents(f->match, ascii_printable, &extents); + + f->set = NULL; + f->pattern = configured; + + f->ascent = f->match->ascent; + f->descent = f->match->descent; + f->lbearing = 0; + f->rbearing = f->match->max_advance; + + f->height = f->ascent + f->descent; + f->width = DIVCEIL(extents.advance, strlen(ascii_printable)); + + return 0; +} + +void +wlloadfonts(char *fontstr, double fontsize) +{ + FcPattern *pattern; + double fontval; + + if (fontstr[0] == '-') { + /* XXX: need XftXlfdParse equivalent */ + pattern = NULL; + } else { + pattern = FcNameParse((FcChar8 *)fontstr); + } + + if (!pattern) + die("can't open font %s\n", fontstr); + + if (fontsize > 1) { + FcPatternDel(pattern, FC_PIXEL_SIZE); + FcPatternDel(pattern, FC_SIZE); + FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize); + usedfontsize = fontsize; + } else { + if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == + FcResultMatch) { + usedfontsize = fontval; + } else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) == + FcResultMatch) { + usedfontsize = -1; + } else { + /* + * Default font size is 12, if none given. This is to + * have a known usedfontsize value. + */ + FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12); + usedfontsize = 12; + } + defaultfontsize = usedfontsize; + } + + FcConfigSubstitute(0, pattern, FcMatchPattern); + FcDefaultSubstitute(pattern); + + if (wlloadfont(&dc.font, pattern)) + die("can't open font %s\n", fontstr); + + if (usedfontsize < 0) { + FcPatternGetDouble(dc.font.pattern, + FC_PIXEL_SIZE, 0, &fontval); + usedfontsize = fontval; + if (fontsize == 0) + defaultfontsize = fontval; + } + + /* Setting character width and height. */ + win.cw = ceilf(dc.font.width * cwscale); + win.ch = ceilf(dc.font.height * chscale); + + FcPatternDel(pattern, FC_SLANT); + FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); + if (wlloadfont(&dc.ifont, pattern)) + die("can't open font %s\n", fontstr); + + FcPatternDel(pattern, FC_WEIGHT); + FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); + if (wlloadfont(&dc.ibfont, pattern)) + die("can't open font %s\n", fontstr); + + FcPatternDel(pattern, FC_SLANT); + FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); + if (wlloadfont(&dc.bfont, pattern)) + die("can't open font %s\n", fontstr); + + FcPatternDestroy(pattern); +} + +void +wlunloadfont(Font *f) +{ + wld_font_close(f->match); + FcPatternDestroy(f->pattern); + if (f->set) + FcFontSetDestroy(f->set); +} + +void +wlunloadfonts(void) +{ + /* Free the loaded fonts in the font cache. */ + while (frclen > 0) + wld_font_close(frc[--frclen].font); + + wlunloadfont(&dc.font); + wlunloadfont(&dc.bfont); + wlunloadfont(&dc.ifont); + wlunloadfont(&dc.ibfont); +} + +void +wlneeddraw(void) +{ + wl.needdraw = true; +} + +int +xstartdraw(void) +{ + if(IS_SET(MODE_VISIBLE)) + wld_set_target_buffer(wld.renderer, wld.buffer); + return IS_SET(MODE_VISIBLE); +} + +void +xdrawline(Line line, int x1, int y, int x2) +{ + int ic, ib, x, ox; + Glyph base, new; + char buf[DRAW_BUF_SIZ]; + + base = line[0]; + ic = ib = ox = 0; + for (x = x1; x < x2; x++) { + new = line[x]; + if (new.mode == ATTR_WDUMMY) + continue; + if (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 (ib == 0) { + ox = x; + base = new; + } + + ib += utf8encode(new.u, buf+ib); + ic += (new.mode & ATTR_WIDE)? 2 : 1; + } + if (ib > 0) + wldraws(buf, base, ox, y, ic, ib); + + wl_surface_damage(wl.surface, 0, borderpx + y * win.ch, win.w, win.ch); +} + +void +xfinishdraw(void) +{ + 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; + } + wl.needdraw = false; +} + +/* + * Absolute coordinates. + */ +void +wlclear(int x1, int y1, int x2, int y2) +{ + uint32_t color = dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg]; + + wld_fill_rectangle(wld.renderer, color, x1, y1, x2 - x1, y2 - y1); +} + +/* + * 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 winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, + width = charlen * win.cw, xp, i; + int frcflags, charexists; + int u8fl, u8fblen, u8cblen, doesexist; + char *u8c, *u8fs; + Rune unicodep; + Font *font = &dc.font; + FcResult fcres; + FcPattern *fcpattern, *fontpattern; + FcFontSet *fcsets[] = { NULL }; + FcCharSet *fccharset; + uint32_t fg, bg, temp; + int oneatatime; + + frcflags = FRC_NORMAL; + + /* 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; + } + + 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 && win.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, + ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch))); + } + if (winx + width >= borderpx + win.tw) { + wlclear(winx + width, (y == 0)? 0 : winy, win.w, + ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch))); + } + if (y == 0) + wlclear(winx, 0, winx + width, borderpx); + if (winy + win.ch >= borderpx + win.th) + wlclear(winx, winy + win.ch, winx + width, win.h); + + /* Clean up the region we want to draw to. */ + wld_fill_rectangle(wld.renderer, bg, winx, winy, width, win.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 != win.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; + } + + if (u8fl > 0) { + wld_draw_text(wld.renderer, + font->match, fg, xp, + winy + font->ascent, + u8fs, u8fblen, NULL); + xp += win.cw * u8fl; + } + break; + } + if (doesexist) { + if (oneatatime) + continue; + break; + } + + /* Search the font cache. */ + for (i = 0; i < frclen; i++) { + charexists = wld_font_ensure_char(frc[i].font, unicodep); + /* Everything correct. */ + if (charexists && frc[i].flags == frcflags) + break; + /* We got a default font for a not found glyph. */ + if (!charexists && frc[i].flags == frcflags \ + && frc[i].unicodep == unicodep) { + break; + } + } + + /* Nothing was found. */ + if (i >= frclen) { + if (!font->set) + font->set = FcFontSort(0, font->pattern, + 1, 0, &fcres); + fcsets[0] = font->set; + + /* + * Nothing was found in the cache. Now use + * some dozen of Fontconfig calls to get the + * font for one single character. + * + * Xft and fontconfig are design failures. + */ + fcpattern = FcPatternDuplicate(font->pattern); + fccharset = FcCharSetCreate(); + + FcCharSetAddChar(fccharset, unicodep); + FcPatternAddCharSet(fcpattern, FC_CHARSET, + fccharset); + FcPatternAddBool(fcpattern, FC_SCALABLE, 1); + + FcConfigSubstitute(0, fcpattern, + FcMatchPattern); + FcDefaultSubstitute(fcpattern); + + fontpattern = FcFontSetMatch(0, fcsets, 1, + fcpattern, &fcres); + + /* + * Overwrite or create the new cache entry. + */ + if (frclen >= frccap) { + frccap += 16; + frc = xrealloc(frc, frccap * sizeof(Fontcache)); + } + + frc[frclen].font = wld_font_open_pattern(wld.fontctx, + fontpattern); + frc[frclen].flags = frcflags; + frc[frclen].unicodep = unicodep; + + i = 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 += win.cw * wcwidth(unicodep); + } + + if (base.mode & ATTR_UNDERLINE) { + wld_fill_rectangle(wld.renderer, fg, winx, winy + font->ascent + 1, + width, 1); + } + + if (base.mode & ATTR_STRUCK) { + wld_fill_rectangle(wld.renderer, fg, winx, winy + 2 * font->ascent / 3, + width, 1); + } +} + +void +wldrawglyph(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; + + wldraws(buf, g, x, y, width, len); +} + +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); +} + +void +xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) +{ + uint32_t drawcol; + + /* remove the old cursor */ + if (selected(ox, oy)) + og.mode ^= ATTR_REVERSE; + wldrawglyph(og, ox, oy); + + if (IS_SET(MODE_HIDE)) + return; + + /* + * Select the right color for the right mode. + */ + g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE; + + if (ox != cx || oy != cy) { + wl_surface_damage(wl.surface, borderpx + ox * win.cw, + borderpx + oy * win.ch, win.cw, win.ch); + } + + if (IS_SET(MODE_REVERSE)) { + g.mode |= ATTR_REVERSE; + g.bg = defaultfg; + if (selected(cx, cy)) { + drawcol = dc.col[defaultcs]; + g.fg = defaultrcs; + } else { + drawcol = dc.col[defaultrcs]; + g.fg = defaultcs; + } + } else { + if (selected(cx, cy)) { + g.fg = defaultfg; + g.bg = defaultrcs; + } else { + g.fg = defaultbg; + g.bg = defaultrcs; + } + drawcol = dc.col[g.bg]; + } + + /* draw the new one */ + if (IS_SET(MODE_FOCUSED)) { + switch (win.cursor) { + case 7: /* st-wl extension: snowman */ + g.u = 0x2603; + case 0: /* Blinking Block */ + case 1: /* Blinking Block (Default) */ + case 2: /* Steady Block */ + wldrawglyph(g, cx, cy); + break; + case 3: /* Blinking Underline */ + case 4: /* Steady Underline */ + wld_fill_rectangle(wld.renderer, drawcol, + borderpx + cx * win.cw, + borderpx + (cy + 1) * win.ch - cursorthickness, + win.cw, cursorthickness); + break; + case 5: /* Blinking bar */ + case 6: /* Steady bar */ + wld_fill_rectangle(wld.renderer, drawcol, + borderpx + cx * win.cw, + borderpx + cy * win.ch, + cursorthickness, win.ch); + break; + } + } else { + wld_fill_rectangle(wld.renderer, drawcol, + borderpx + cx * win.cw, + borderpx + cy * win.ch, + win.cw - 1, 1); + wld_fill_rectangle(wld.renderer, drawcol, + borderpx + cx * win.cw, + borderpx + cy * win.ch, + 1, win.ch - 1); + wld_fill_rectangle(wld.renderer, drawcol, + borderpx + (cx + 1) * win.cw - 1, + borderpx + cy * win.ch, + 1, win.ch - 1); + wld_fill_rectangle(wld.renderer, drawcol, + borderpx + cx * win.cw, + borderpx + (cy + 1) * win.ch - 1, + win.cw, 1); + } + wl_surface_damage(wl.surface, borderpx + cx * win.cw, + borderpx + cy * win.ch, win.cw, win.ch); +} + +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, "xdg_wm_base") == 0) { + wl.wm = wl_registry_bind(registry, name, &xdg_wm_base_interface, 1); + xdg_wm_base_add_listener(wl.wm, &wmlistener, 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 +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 = wlsel.primary; + int len = strlen(wlsel.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 (wlsel.source == source) { + wlsel.source = NULL; + selclear(); + } + wl_data_source_destroy(source); +} + +void +wlinit(int cols, int rows) +{ + struct wl_registry *registry; + + if (!(wl.dpy = wl_display_connect(NULL))) + die("Can't open display\n"); + + wl.needdraw = true; + 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"); + if (!wl.wm) + die("Display has no window 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); + + /* 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); + + xloadcols(); + wlloadcursor(); + + win.h = 2 * borderpx + rows * win.ch; + win.w = 2 * borderpx + cols * win.cw; + + wl.surface = wl_compositor_create_surface(wl.cmp); + wl_surface_add_listener(wl.surface, &surflistener, NULL); + + wl.xdgsurface = xdg_wm_base_get_xdg_surface(wl.wm, wl.surface); + xdg_surface_add_listener(wl.xdgsurface, &xdgsurflistener, NULL); + wl.xdgtoplevel = xdg_surface_get_toplevel(wl.xdgsurface); + xdg_toplevel_add_listener(wl.xdgtoplevel, &xdgtoplevellistener, NULL); + xdg_toplevel_set_app_id(wl.xdgtoplevel, opt_class ? opt_class : termname); + + wl_surface_commit(wl.surface); + + wl.xkb.ctx = xkb_context_new(0); + + win.mode = MODE_NUMLOCK; + resettitle(); + + wlsel.tclick1 = 0; + wlsel.tclick2 = 0; + wlsel.primary = NULL; + wlsel.source = NULL; +} + +void +run(void) +{ + fd_set rfd; + int wlfd = wl_display_get_fd(wl.dpy), blinkset = 0; + int ttyfd; + struct timespec drawtimeout, *tv = NULL, now, last, lastblink; + ulong msecs; + + /* Look for initial configure. */ + wl_display_roundtrip(wl.dpy); + ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd); + cresize(win.w, win.h); + + if (!(IS_SET(MODE_VISIBLE))) + win.mode |= MODE_VISIBLE; + + draw(); + + clock_gettime(CLOCK_MONOTONIC, &last); + lastblink = last; + + for (;;) { + FD_ZERO(&rfd); + FD_SET(ttyfd, &rfd); + FD_SET(wlfd, &rfd); + + if (pselect(MAX(wlfd, ttyfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) { + if (errno == EINTR) + continue; + die("select failed: %s\n", strerror(errno)); + } + + if (FD_ISSET(ttyfd, &rfd)) { + ttyread(); + if (blinktimeout) { + blinkset = tattrset(ATTR_BLINK); + if (!blinkset) + MODBIT(win.mode, 0, MODE_BLINK); + } + } + + if (FD_ISSET(wlfd, &rfd)) { + if (wl_display_dispatch(wl.dpy) == -1) + die("Connection error\n"); + } + + clock_gettime(CLOCK_MONOTONIC, &now); + msecs = -1; + + if (blinkset && blinktimeout) { + if (TIMEDIFF(now, lastblink) >= blinktimeout) { + tsetdirtattr(ATTR_BLINK); + win.mode ^= MODE_BLINK; + lastblink = now; + } else { + msecs = MIN(msecs, blinktimeout - \ + TIMEDIFF(now, lastblink)); + } + } + if (repeat.len > 0) { + if (TIMEDIFF(now, repeat.last) >= \ + (repeat.started ? keyrepeatinterval : \ + keyrepeatdelay)) { + repeat.started = true; + repeat.last = now; + ttywrite(repeat.str, repeat.len, 1); + } else { + msecs = MIN(msecs, (repeat.started ? \ + keyrepeatinterval : keyrepeatdelay) - \ + TIMEDIFF(now, repeat.last)); + } + } + + if (wl.needdraw && IS_SET(MODE_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); + } +} + +void +usage(void) +{ + die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]" + " [-n name] [-o file]\n" + " [-T title] [-t title] [-w windowid]" + " [[-e] command [args ...]]\n" + " %s [-aiv] [-c class] [-f font] [-g geometry]" + " [-n name] [-o file]\n" + " [-T title] [-t title] [-w windowid] -l line" + " [stty_args ...]\n", argv0, argv0); +} + +int +main(int argc, char *argv[]) +{ + win.cursor = cursorshape; + + ARGBEGIN { + case 'a': + allowaltscreen = 0; + break; + case 'c': + opt_class = EARGF(usage()); + break; + case 'e': + if (argc > 0) + --argc, ++argv; + goto run; + case 'f': + opt_font = EARGF(usage()); + break; + case 'o': + opt_io = EARGF(usage()); + break; + case 'l': + opt_line = EARGF(usage()); + break; + case 'n': + opt_name = EARGF(usage()); + break; + case 't': + case 'T': + opt_title = EARGF(usage()); + break; + case 'w': + opt_embed = EARGF(usage()); + break; + case 'v': + die("%s " VERSION "\n", argv0); + break; + default: + usage(); + } ARGEND; + +run: + if (argc > 0) /* eat all remaining arguments */ + opt_cmd = argv; + + if (!opt_title) + opt_title = (opt_line || !opt_cmd) ? "st-wl" : opt_cmd[0]; + + setlocale(LC_CTYPE, ""); + cols = MAX(cols, 1); + rows = MAX(rows, 1); + tnew(cols, rows); + wlinit(cols, rows); + selinit(); + run(); + + return 0; +}