From a65d43a265bb0cb8e20bf3a75aabe62f6f1ed7d0 Mon Sep 17 00:00:00 2001 From: CoolnsX Date: Sun, 5 Dec 2021 23:05:30 +0530 Subject: [PATCH] removed st --- st-0.8.4/FAQ | 250 --- st-0.8.4/LEGACY | 17 - st-0.8.4/LICENSE | 34 - st-0.8.4/Makefile | 60 - st-0.8.4/README | 34 - st-0.8.4/TODO | 28 - st-0.8.4/arg.h | 50 - st-0.8.4/config.def.h | 482 ---- st-0.8.4/config.def.h.orig | 485 ---- st-0.8.4/config.def.h.rej | 15 - st-0.8.4/config.mk | 35 - st-0.8.4/st | Bin 102304 -> 0 bytes st-0.8.4/st-font2-20190416-ba72400.diff | 167 -- st-0.8.4/st.1 | 177 -- st-0.8.4/st.c | 2668 ----------------------- st-0.8.4/st.c.orig | 2597 ---------------------- st-0.8.4/st.c.rej | 13 - st-0.8.4/st.desktop | 8 - st-0.8.4/st.h | 128 -- st-0.8.4/st.h.orig | 125 -- st-0.8.4/st.info | 239 -- st-0.8.4/st.o | Bin 77144 -> 0 bytes st-0.8.4/win.h | 39 - st-0.8.4/x.c | 2070 ------------------ st-0.8.4/x.c.orig | 2171 ------------------ st-0.8.4/x.o | Bin 75632 -> 0 bytes 26 files changed, 11892 deletions(-) delete mode 100644 st-0.8.4/FAQ delete mode 100644 st-0.8.4/LEGACY delete mode 100644 st-0.8.4/LICENSE delete mode 100644 st-0.8.4/Makefile delete mode 100644 st-0.8.4/README delete mode 100644 st-0.8.4/TODO delete mode 100644 st-0.8.4/arg.h delete mode 100644 st-0.8.4/config.def.h delete mode 100644 st-0.8.4/config.def.h.orig delete mode 100644 st-0.8.4/config.def.h.rej delete mode 100644 st-0.8.4/config.mk delete mode 100755 st-0.8.4/st delete mode 100644 st-0.8.4/st-font2-20190416-ba72400.diff delete mode 100644 st-0.8.4/st.1 delete mode 100644 st-0.8.4/st.c delete mode 100644 st-0.8.4/st.c.orig delete mode 100644 st-0.8.4/st.c.rej delete mode 100644 st-0.8.4/st.desktop delete mode 100644 st-0.8.4/st.h delete mode 100644 st-0.8.4/st.h.orig delete mode 100644 st-0.8.4/st.info delete mode 100644 st-0.8.4/st.o delete mode 100644 st-0.8.4/win.h delete mode 100644 st-0.8.4/x.c delete mode 100644 st-0.8.4/x.c.orig delete mode 100644 st-0.8.4/x.o diff --git a/st-0.8.4/FAQ b/st-0.8.4/FAQ deleted file mode 100644 index 0f9609d..0000000 --- a/st-0.8.4/FAQ +++ /dev/null @@ -1,250 +0,0 @@ -## Why does st not handle utmp entries? - -Use the excellent tool of [utmp](https://git.suckless.org/utmp/) for this task. - - -## Some _random program_ complains that st is unknown/not recognised/unsupported/whatever! - -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 manually run `tic -sx st.info`. - - -## Nothing works, and nothing is said about an unknown terminal! - -* Some programs just assume they’re running in xterm i.e. they don’t rely on - terminfo. What you see is the current state of the “xterm compliance”. -* Some programs don’t complain about the lacking st description and default to - another terminal. In that case see the question about terminfo. - - -## How do I scroll back up? - -* Using a terminal multiplexer. - * `st -e tmux` using C-b [ - * `st -e screen` using C-a ESC -* Using the excellent tool of [scroll](https://git.suckless.org/scroll/). -* Using the scrollback [patch](https://st.suckless.org/patches/scrollback/). - - -## I would like to have utmp and/or scroll functionality by default - -You can add the absolute patch of both programs in your config.h -file. You only have to modify the value of utmp and scroll variables. - - -## Why doesn't the Del key work in some programs? - -Taken from the terminfo manpage: - - If the terminal has a keypad that transmits codes when the keys - are pressed, this information can be given. Note that it is not - possible to handle terminals where the keypad only works in - local (this applies, for example, to the unshifted HP 2621 keys). - If the keypad can be set to transmit or not transmit, give these - codes as smkx and rmkx. Otherwise the keypad is assumed to - always transmit. - -In the st case smkx=E[?1hE= and rmkx=E[?1lE>, so it is mandatory that -applications which want to test against keypad keys send these -sequences. - -But buggy applications (like bash and irssi, for example) don't do this. A fast -solution for them is to use the following command: - - $ printf '\033[?1h\033=' >/dev/tty - -or - $ tput smkx - -In the case of bash, readline is used. Readline has a different note in its -manpage about this issue: - - enable-keypad (Off) - When set to On, readline will try to enable the - application keypad when it is called. Some systems - need this to enable arrow keys. - -Adding this option to your .inputrc will fix the keypad problem for all -applications using readline. - -If you are using zsh, then read the zsh FAQ -: - - It should be noted that the O / [ confusion can occur with other keys - such as Home and End. Some systems let you query the key sequences - sent by these keys from the system's terminal database, terminfo. - Unfortunately, the key sequences given there typically apply to the - mode that is not the one zsh uses by default (it's the "application" - mode rather than the "raw" mode). Explaining the use of terminfo is - outside of the scope of this FAQ, but if you wish to use the key - sequences given there you can tell the line editor to turn on - "application" mode when it starts and turn it off when it stops: - - function zle-line-init () { echoti smkx } - function zle-line-finish () { echoti rmkx } - zle -N zle-line-init - zle -N zle-line-finish - -Putting these lines into your .zshrc will fix the problems. - - -## How can I use meta in 8bit mode? - -St supports meta in 8bit mode, but the default terminfo entry doesn't -use this capability. If you want it, you have to use the 'st-meta' value -in TERM. - - -## I cannot compile st in OpenBSD - -OpenBSD lacks librt, despite it being mandatory in POSIX -. -If you want to compile st for OpenBSD you have to remove -lrt from config.mk, and -st will compile without any loss of functionality, because all the functions are -included in libc on this platform. - - -## The Backspace Case - -St is emulating the Linux way of handling backspace being delete and delete being -backspace. - -This is an issue that was discussed in suckless mailing list -. Here is why some old grumpy -terminal users wants its backspace to be how he feels it: - - Well, I am going to comment why I want to change the behaviour - of this key. When ASCII was defined in 1968, communication - with computers was done using punched cards, or hardcopy - terminals (basically a typewriter machine connected with the - computer using a serial port). ASCII defines DELETE as 7F, - because, in punched-card terms, it means all the holes of the - card punched; it is thus a kind of 'physical delete'. In the - same way, the BACKSPACE key was a non-destructive backspace, - as on a typewriter. So, if you wanted to delete a character, - you had to BACKSPACE and then DELETE. Another use of BACKSPACE - was to type accented characters, for example 'a BACKSPACE `'. - The VT100 had no BACKSPACE key; it was generated using the - CONTROL key as another control character (CONTROL key sets to - 0 b7 b6 b5, so it converts H (code 0x48) into BACKSPACE (code - 0x08)), but it had a DELETE key in a similar position where - the BACKSPACE key is located today on common PC keyboards. - All the terminal emulators emulated the difference between - these keys correctly: the backspace key generated a BACKSPACE - (^H) and delete key generated a DELETE (^?). - - But a problem arose when Linus Torvalds wrote Linux. Unlike - earlier terminals, the Linux virtual terminal (the terminal - emulator integrated in the kernel) returned a DELETE when - backspace was pressed, due to the VT100 having a DELETE key in - the same position. This created a lot of problems (see [1] - and [2]). Since Linux has become the king, a lot of terminal - emulators today generate a DELETE when the backspace key is - pressed in order to avoid problems with Linux. The result is - that the only way of generating a BACKSPACE on these systems - is by using CONTROL + H. (I also think that emacs had an - important point here because the CONTROL + H prefix is used - in emacs in some commands (help commands).) - - From point of view of the kernel, you can change the key - for deleting a previous character with stty erase. When you - connect a real terminal into a machine you describe the type - of terminal, so getty configures the correct value of stty - erase for this terminal. In the case of terminal emulators, - however, you don't have any getty that can set the correct - value of stty erase, so you always get the default value. - For this reason, it is necessary to add 'stty erase ^H' to your - profile if you have changed the value of the backspace key. - Of course, another solution is for st itself to modify the - value of stty erase. I usually have the inverse problem: - when I connect to non-Unix machines, I have to press CONTROL + - h to get a BACKSPACE. The inverse problem occurs when a user - connects to my Unix machines from a different system with a - correct backspace key. - - [1] http://www.ibb.net/~anne/keyboard.html - [2] http://www.tldp.org/HOWTO/Keyboard-and-Console-HOWTO-5.html - - -## But I really want the old grumpy behaviour of my terminal - -Apply [1]. - -[1] https://st.suckless.org/patches/delkey - - -## Why do images not work in st using the w3m image hack? - -w3mimg uses a hack that draws an image on top of the terminal emulator Drawable -window. The hack relies on the terminal to use a single buffer to draw its -contents directly. - -st uses double-buffered drawing so the image is quickly replaced and may show a -short flicker effect. - -Below is a patch example to change st double-buffering to a single Drawable -buffer. - -diff --git a/x.c b/x.c ---- a/x.c -+++ b/x.c -@@ -732,10 +732,6 @@ xresize(int col, int row) - win.tw = col * win.cw; - win.th = row * win.ch; - -- XFreePixmap(xw.dpy, xw.buf); -- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, -- DefaultDepth(xw.dpy, xw.scr)); -- XftDrawChange(xw.draw, xw.buf); - xclear(0, 0, win.w, win.h); - - /* resize to new width */ -@@ -1148,8 +1144,7 @@ xinit(int cols, int rows) - gcvalues.graphics_exposures = False; - dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures, - &gcvalues); -- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, -- DefaultDepth(xw.dpy, xw.scr)); -+ xw.buf = xw.win; - XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); - XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); - -@@ -1632,8 +1627,6 @@ xdrawline(Line line, int x1, int y1, int x2) - void - xfinishdraw(void) - { -- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w, -- win.h, 0, 0); - XSetForeground(xw.dpy, dc.gc, - dc.col[IS_SET(MODE_REVERSE)? - defaultfg : defaultbg].pixel); - - -## 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/st-0.8.4/LEGACY b/st-0.8.4/LEGACY deleted file mode 100644 index bf28b1e..0000000 --- a/st-0.8.4/LEGACY +++ /dev/null @@ -1,17 +0,0 @@ -A STATEMENT ON LEGACY SUPPORT - -In the terminal world there is much cruft that comes from old and unsup‐ -ported terminals that inherit incompatible modes and escape sequences -which noone is able to know, except when he/she comes from that time and -developed a graphical vt100 emulator at that time. - -One goal of st is to only support what is really needed. When you en‐ -counter a sequence which you really need, implement it. But while you -are at it, do not add the other cruft you might encounter while sneek‐ -ing at other terminal emulators. History has bloated them and there is -no real evidence that most of the sequences are used today. - - -Christoph Lohmann <20h@r-36.net> -2012-09-13T07:00:36.081271045+02:00 - diff --git a/st-0.8.4/LICENSE b/st-0.8.4/LICENSE deleted file mode 100644 index d80eb47..0000000 --- a/st-0.8.4/LICENSE +++ /dev/null @@ -1,34 +0,0 @@ -MIT/X Consortium License - -© 2014-2020 Hiltjo Posthuma -© 2018 Devin J. Pohly -© 2014-2017 Quentin Rameau -© 2009-2012 Aurélien APTEL -© 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-2014 Eric Pruitt -© 2013 Michael Forney -© 2013-2014 Markus Teich -© 2014-2015 Laslo Hunhold - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/st-0.8.4/Makefile b/st-0.8.4/Makefile deleted file mode 100644 index 5152b8b..0000000 --- a/st-0.8.4/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# st - simple terminal -# See LICENSE file for copyright and license details. -.POSIX: - -include config.mk - -SRC = st.c x.c -OBJ = $(SRC:.c=.o) - -all: options st - -options: - @echo st build options: - @echo "CFLAGS = $(STCFLAGS)" - @echo "LDFLAGS = $(STLDFLAGS)" - @echo "CC = $(CC)" - -config.h: - cp config.def.h config.h - -.c.o: - $(CC) $(STCFLAGS) -c $< - -st.o: config.h st.h win.h -x.o: arg.h config.h st.h win.h - -$(OBJ): config.h config.mk - -st: $(OBJ) - $(CC) -o $@ $(OBJ) $(STLDFLAGS) - -clean: - rm -f st $(OBJ) st-$(VERSION).tar.gz - -dist: clean - mkdir -p st-$(VERSION) - cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\ - config.def.h st.info st.1 arg.h st.h win.h $(SRC)\ - st-$(VERSION) - tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz - rm -rf st-$(VERSION) - -install: st - mkdir -p $(DESTDIR)$(PREFIX)/bin - cp -f st $(DESTDIR)$(PREFIX)/bin - chmod 755 $(DESTDIR)$(PREFIX)/bin/st - mkdir -p $(DESTDIR)$(MANPREFIX)/man1 - sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1 - tic -sx st.info - @echo Please see the README file regarding the terminfo entry of st. - mkdir -p $(DESTDIR)$(PREFIX)/share/applications - cp -f st.desktop $(DESTDIR)$(PREFIX)/share/applications - -uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/st - rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1 - rm -f $(DESTDIR)$(PREFIX)/share/applications/st.desktop - -.PHONY: all options clean dist install uninstall diff --git a/st-0.8.4/README b/st-0.8.4/README deleted file mode 100644 index 6a846ed..0000000 --- a/st-0.8.4/README +++ /dev/null @@ -1,34 +0,0 @@ -st - simple terminal --------------------- -st is a simple terminal emulator for X which sucks less. - - -Requirements ------------- -In order to build st you need the Xlib header files. - - -Installation ------------- -Edit config.mk to match your local setup (st is installed into -the /usr/local namespace by default). - -Afterwards enter the following command to build and install st (if -necessary as root): - - make clean install - - -Running st ----------- -If you did not install st with make clean install, you must compile -the st terminfo entry with the following command: - - tic -sx st.info - -See the man page for additional details. - -Credits -------- -Based on Aurélien APTEL bt source code. - diff --git a/st-0.8.4/TODO b/st-0.8.4/TODO deleted file mode 100644 index 5f74cd5..0000000 --- a/st-0.8.4/TODO +++ /dev/null @@ -1,28 +0,0 @@ -vt emulation ------------- - -* double-height support - -code & interface ----------------- - -* add a simple way to do multiplexing - -drawing -------- -* add diacritics support to xdraws() - * switch to a suckless font drawing library -* make the font cache simpler -* add better support for brightening of the upper colors - -bugs ----- - -* fix shift up/down (shift selection in emacs) -* remove DEC test sequence when appropriate - -misc ----- - - $ grep -nE 'XXX|TODO' st.c - diff --git a/st-0.8.4/arg.h b/st-0.8.4/arg.h deleted file mode 100644 index a22e019..0000000 --- a/st-0.8.4/arg.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copy me if you can. - * by 20h - */ - -#ifndef ARG_H__ -#define ARG_H__ - -extern char *argv0; - -/* use main(int argc, char *argv[]) */ -#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ - argv[0] && argv[0][0] == '-'\ - && argv[0][1];\ - argc--, argv++) {\ - char argc_;\ - char **argv_;\ - int brk_;\ - if (argv[0][1] == '-' && argv[0][2] == '\0') {\ - argv++;\ - argc--;\ - break;\ - }\ - int i_;\ - for (i_ = 1, brk_ = 0, argv_ = argv;\ - argv[0][i_] && !brk_;\ - i_++) {\ - if (argv_ != argv)\ - break;\ - argc_ = argv[0][i_];\ - switch (argc_) - -#define ARGEND }\ - } - -#define ARGC() argc_ - -#define EARGF(x) ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\ - ((x), abort(), (char *)0) :\ - (brk_ = 1, (argv[0][i_+1] != '\0')?\ - (&argv[0][i_+1]) :\ - (argc--, argv++, argv[0]))) - -#define ARGF() ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\ - (char *)0 :\ - (brk_ = 1, (argv[0][i_+1] != '\0')?\ - (&argv[0][i_+1]) :\ - (argc--, argv++, argv[0]))) - -#endif diff --git a/st-0.8.4/config.def.h b/st-0.8.4/config.def.h deleted file mode 100644 index f94bbf7..0000000 --- a/st-0.8.4/config.def.h +++ /dev/null @@ -1,482 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* - * appearance - * - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ -static char *font = "JetBrains Mono:style=Bold:pixelsize=17:antialias=true:autohint=true"; - -static int borderpx = 0; - -/* - * What program is execed by st depends of these precedence rules: - * 1: program passed with -e - * 2: scroll and/or utmp - * 3: SHELL environment variable - * 4: value of shell in /etc/passwd - * 5: value of shell in config.h - */ -static char *shell = "/bin/sh"; -char *utmp = NULL; -/* scroll program: to enable use a string like "scroll" */ -char *scroll = NULL; -char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; - -/* identification sequence returned in DA and DECID */ -char *vtiden = "\033[?6c"; - -/* Kerning / character bounding-box multipliers */ -static float cwscale = 0.9; -static float chscale = 0.9; - -/* - * word delimiter string - * - * More advanced example: L" `'\"()[]{}" - */ -wchar_t *worddelimiters = L" "; - -/* selection timeouts (in milliseconds) */ -static unsigned int doubleclicktimeout = 300; -static unsigned int tripleclicktimeout = 600; - -/* alt screens */ -int allowaltscreen = 1; - -/* allow certain non-interactive (insecure) window operations such as: - setting the clipboard text */ -int allowwindowops = 0; - -/* - * draw latency range in ms - from new content/keypress/etc until drawing. - * within this range, st draws when content stops arriving (idle). mostly it's - * near minlatency, but it waits longer for slow updates to avoid partial draw. - * low minlatency will tear/flicker more, as it can "detect" idle too early. - */ -static double minlatency = 8; -static double maxlatency = 33; - -/* - * blinking timeout (set to 0 to disable blinking) for the terminal blinking - * attribute. - */ -static unsigned int blinktimeout = 800; - -/* - * thickness of underline and bar cursors - */ -static unsigned int cursorthickness = 2; - -/* - * bell volume. It must be a value between -100 and 100. Use 0 for disabling - * it - */ -static int bellvolume = 0; - -/* default TERM value */ -char *termname = "st-256color"; - -/* - * spaces per tab - * - * When you are changing this value, don't forget to adapt the »it« value in - * the st.info and appropriately install the st.info in the environment where - * you use this st version. - * - * it#$tabspaces, - * - * Secondly make sure your kernel is not expanding tabs. When running `stty - * -a` »tab0« should appear. You can tell the terminal to not expand tabs by - * running following command: - * - * stty tabs - */ -unsigned int tabspaces = 4; - -/* bg opacity */ -float alpha = 0.85; - -/* 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", - "black", - "#FF9F12", -}; - - -/* - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ -unsigned int defaultfg = 15; -unsigned int defaultbg = 258; -static unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; - -/* - * Default shape of cursor - * 2: Block ("█") - * 4: Underline ("_") - * 6: Bar ("|") - * 7: Snowman ("☃") - */ -static unsigned int cursorshape = 4; - -/* - * Default columns and rows numbers - */ - -static unsigned int cols = 80; -static unsigned int rows = 24; - -/* - * Default colour and shape of the mouse cursor - */ -static unsigned int mouseshape = XC_xterm; -static unsigned int mousefg = 7; -static unsigned int mousebg = 0; - -/* - * Color used to display font attributes when fontconfig selected a font which - * doesn't match the ones requested. - */ -static unsigned int defaultattr = 11; - -/* - * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set). - * Note that if you want to use ShiftMask with selmasks, set this to an other - * modifier, set to 0 to not use it. - */ -static uint forcemousemod = ShiftMask; - -/* - * Internal mouse shortcuts. - * Beware that overloading Button1 will disable the selection. - */ -static MouseShortcut mshortcuts[] = { - /* mask button function argument release */ - { ShiftMask, Button4, kscrollup, {.i = 1} }, - { ShiftMask, Button5, kscrolldown, {.i = 1} }, - { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, - { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, - { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, -}; - -/* Internal keyboard shortcuts. */ -#define MODKEY Mod1Mask -#define TERMMOD (ControlMask|ShiftMask) - -static Shortcut shortcuts[] = { - /* mask keysym function argument */ - { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, - { ControlMask, XK_Print, toggleprinter, {.i = 0} }, - { ShiftMask, XK_Print, printscreen, {.i = 0} }, - { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, - { TERMMOD, XK_Prior, zoom, {.f = +1} }, - { TERMMOD, XK_Next, zoom, {.f = -1} }, - { TERMMOD, XK_Home, zoomreset, {.f = 0} }, - { TERMMOD, XK_C, clipcopy, {.i = 0} }, - { TERMMOD, XK_V, clippaste, {.i = 0} }, - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, -}; - -/* - * Special keys (change & recompile st.info accordingly) - * - * Mask value: - * * Use XK_ANY_MOD to match the key no matter modifiers state - * * Use XK_NO_MOD to match the key alone (no modifiers) - * appkey value: - * * 0: no value - * * > 0: keypad application mode enabled - * * = 2: term.numlock = 1 - * * < 0: keypad application mode disabled - * appcursor value: - * * 0: no value - * * > 0: cursor application mode enabled - * * < 0: cursor application mode disabled - * - * Be careful with the order of the definitions because st searches in - * this table sequentially, so any XK_ANY_MOD must be in the last - * position for a key. - */ - -/* - * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) - * to be mapped below, add them to this array. - */ -static KeySym mappedkeys[] = { -1 }; - -/* - * State bits to ignore when matching key or button events. By default, - * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. - */ -static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; - -/* - * This is the huge key array which defines all compatibility to the Linux - * world. Please decide about changes wisely. - */ -static Key key[] = { - /* keysym mask string appkey appcursor */ - { XK_KP_Home, ShiftMask, "\033[2J", 0, -1}, - { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, - { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1}, - { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1}, - { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0}, - { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1}, - { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1}, - { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0}, - { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1}, - { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1}, - { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0}, - { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1}, - { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1}, - { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0}, - { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1}, - { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1}, - { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, - { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0}, - { XK_KP_End, ControlMask, "\033[J", -1, 0}, - { XK_KP_End, ControlMask, "\033[1;5F", +1, 0}, - { XK_KP_End, ShiftMask, "\033[K", -1, 0}, - { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0}, - { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0}, - { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, - { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0}, - { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, - { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0}, - { XK_KP_Insert, ControlMask, "\033[L", -1, 0}, - { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, - { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, - { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, - { XK_KP_Delete, ControlMask, "\033[M", -1, 0}, - { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, - { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, - { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, - { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, - { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, - { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0}, - { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0}, - { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0}, - { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0}, - { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0}, - { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0}, - { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0}, - { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0}, - { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0}, - { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0}, - { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0}, - { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0}, - { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0}, - { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0}, - { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0}, - { XK_Up, ShiftMask, "\033[1;2A", 0, 0}, - { XK_Up, Mod1Mask, "\033[1;3A", 0, 0}, - { XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0}, - { XK_Up, ControlMask, "\033[1;5A", 0, 0}, - { XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0}, - { XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0}, - { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0}, - { XK_Up, XK_ANY_MOD, "\033[A", 0, -1}, - { XK_Up, XK_ANY_MOD, "\033OA", 0, +1}, - { XK_Down, ShiftMask, "\033[1;2B", 0, 0}, - { XK_Down, Mod1Mask, "\033[1;3B", 0, 0}, - { XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0}, - { XK_Down, ControlMask, "\033[1;5B", 0, 0}, - { XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0}, - { XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0}, - { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0}, - { XK_Down, XK_ANY_MOD, "\033[B", 0, -1}, - { XK_Down, XK_ANY_MOD, "\033OB", 0, +1}, - { XK_Left, ShiftMask, "\033[1;2D", 0, 0}, - { XK_Left, Mod1Mask, "\033[1;3D", 0, 0}, - { XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0}, - { XK_Left, ControlMask, "\033[1;5D", 0, 0}, - { XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0}, - { XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0}, - { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0}, - { XK_Left, XK_ANY_MOD, "\033[D", 0, -1}, - { XK_Left, XK_ANY_MOD, "\033OD", 0, +1}, - { XK_Right, ShiftMask, "\033[1;2C", 0, 0}, - { XK_Right, Mod1Mask, "\033[1;3C", 0, 0}, - { XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0}, - { XK_Right, ControlMask, "\033[1;5C", 0, 0}, - { XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0}, - { XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0}, - { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0}, - { XK_Right, XK_ANY_MOD, "\033[C", 0, -1}, - { XK_Right, XK_ANY_MOD, "\033OC", 0, +1}, - { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, - { XK_Return, Mod1Mask, "\033\r", 0, 0}, - { XK_Return, XK_ANY_MOD, "\r", 0, 0}, - { XK_Insert, ShiftMask, "\033[4l", -1, 0}, - { XK_Insert, ShiftMask, "\033[2;2~", +1, 0}, - { XK_Insert, ControlMask, "\033[L", -1, 0}, - { XK_Insert, ControlMask, "\033[2;5~", +1, 0}, - { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, - { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, - { XK_Delete, ControlMask, "\033[M", -1, 0}, - { XK_Delete, ControlMask, "\033[3;5~", +1, 0}, - { XK_Delete, ShiftMask, "\033[2K", -1, 0}, - { XK_Delete, ShiftMask, "\033[3;2~", +1, 0}, - { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, - { XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, - { XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, - { XK_Home, ShiftMask, "\033[2J", 0, -1}, - { XK_Home, ShiftMask, "\033[1;2H", 0, +1}, - { XK_Home, XK_ANY_MOD, "\033[H", 0, -1}, - { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1}, - { XK_End, ControlMask, "\033[J", -1, 0}, - { XK_End, ControlMask, "\033[1;5F", +1, 0}, - { XK_End, ShiftMask, "\033[K", -1, 0}, - { XK_End, ShiftMask, "\033[1;2F", +1, 0}, - { XK_End, XK_ANY_MOD, "\033[4~", 0, 0}, - { XK_Prior, ControlMask, "\033[5;5~", 0, 0}, - { XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, - { XK_Next, ControlMask, "\033[6;5~", 0, 0}, - { XK_Next, ShiftMask, "\033[6;2~", 0, 0}, - { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0}, - { XK_F1, XK_NO_MOD, "\033OP" , 0, 0}, - { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, - { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, - { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, - { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, - { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, - { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0}, - { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, - { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, - { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, - { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, - { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, - { XK_F3, XK_NO_MOD, "\033OR" , 0, 0}, - { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, - { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, - { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, - { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, - { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, - { XK_F4, XK_NO_MOD, "\033OS" , 0, 0}, - { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, - { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, - { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, - { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, - { XK_F5, XK_NO_MOD, "\033[15~", 0, 0}, - { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, - { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, - { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, - { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, - { XK_F6, XK_NO_MOD, "\033[17~", 0, 0}, - { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, - { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, - { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, - { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, - { XK_F7, XK_NO_MOD, "\033[18~", 0, 0}, - { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, - { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, - { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, - { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, - { XK_F8, XK_NO_MOD, "\033[19~", 0, 0}, - { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, - { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, - { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, - { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, - { XK_F9, XK_NO_MOD, "\033[20~", 0, 0}, - { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, - { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, - { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, - { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, - { XK_F10, XK_NO_MOD, "\033[21~", 0, 0}, - { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, - { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, - { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, - { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, - { XK_F11, XK_NO_MOD, "\033[23~", 0, 0}, - { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, - { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, - { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, - { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, - { XK_F12, XK_NO_MOD, "\033[24~", 0, 0}, - { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, - { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, - { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, - { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, - { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0}, - { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0}, - { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0}, - { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0}, - { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0}, - { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0}, - { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0}, - { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0}, - { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0}, - { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0}, - { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0}, - { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0}, - { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0}, - { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0}, - { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0}, - { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0}, - { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0}, - { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0}, - { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0}, - { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0}, - { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0}, - { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, - { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, -}; - -/* - * Selection types' masks. - * Use the same masks as usual. - * Button1Mask is always unset, to make masks match between ButtonPress. - * ButtonRelease and MotionNotify. - * If no match is found, regular selection is used. - */ -static uint selmasks[] = { - [SEL_RECTANGULAR] = Mod1Mask, -}; - -/* - * Printable characters in ASCII, used to estimate the advance width - * of single wide characters. - */ -static char ascii_printable[] = - " !\"#$%&'()*+,-./0123456789:;<=>?" - "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" - "`abcdefghijklmnopqrstuvwxyz{|}~"; diff --git a/st-0.8.4/config.def.h.orig b/st-0.8.4/config.def.h.orig deleted file mode 100644 index 5317c0c..0000000 --- a/st-0.8.4/config.def.h.orig +++ /dev/null @@ -1,485 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* - * appearance - * - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ -static char *font = "JetBrains Mono:style=Bold:pixelsize=14:antialias=true:autohint=true"; -/* Spare fonts */ - static char *font2[] = { - "Symbols Nerd Font:pixelsize=14","Noto Color Emoji:style=Regular:pixelsize=14" -}; - -static int borderpx = 0; - -/* - * What program is execed by st depends of these precedence rules: - * 1: program passed with -e - * 2: scroll and/or utmp - * 3: SHELL environment variable - * 4: value of shell in /etc/passwd - * 5: value of shell in config.h - */ -static char *shell = "/bin/sh"; -char *utmp = NULL; -/* scroll program: to enable use a string like "scroll" */ -char *scroll = NULL; -char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; - -/* identification sequence returned in DA and DECID */ -char *vtiden = "\033[?6c"; - -/* Kerning / character bounding-box multipliers */ -static float cwscale = 0.9; -static float chscale = 0.9; - -/* - * word delimiter string - * - * More advanced example: L" `'\"()[]{}" - */ -wchar_t *worddelimiters = L" "; - -/* selection timeouts (in milliseconds) */ -static unsigned int doubleclicktimeout = 300; -static unsigned int tripleclicktimeout = 600; - -/* alt screens */ -int allowaltscreen = 1; - -/* allow certain non-interactive (insecure) window operations such as: - setting the clipboard text */ -int allowwindowops = 0; - -/* - * draw latency range in ms - from new content/keypress/etc until drawing. - * within this range, st draws when content stops arriving (idle). mostly it's - * near minlatency, but it waits longer for slow updates to avoid partial draw. - * low minlatency will tear/flicker more, as it can "detect" idle too early. - */ -static double minlatency = 8; -static double maxlatency = 33; - -/* - * blinking timeout (set to 0 to disable blinking) for the terminal blinking - * attribute. - */ -static unsigned int blinktimeout = 800; - -/* - * thickness of underline and bar cursors - */ -static unsigned int cursorthickness = 2; - -/* - * bell volume. It must be a value between -100 and 100. Use 0 for disabling - * it - */ -static int bellvolume = 0; - -/* default TERM value */ -char *termname = "st-256color"; - -/* - * spaces per tab - * - * When you are changing this value, don't forget to adapt the »it« value in - * the st.info and appropriately install the st.info in the environment where - * you use this st version. - * - * it#$tabspaces, - * - * Secondly make sure your kernel is not expanding tabs. When running `stty - * -a` »tab0« should appear. You can tell the terminal to not expand tabs by - * running following command: - * - * stty tabs - */ -unsigned int tabspaces = 8; - -/* bg opacity */ -float alpha = 0.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", - "black", -}; - - -/* - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ -unsigned int defaultfg = 15; -unsigned int defaultbg = 258; -static unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; - -/* - * Default shape of cursor - * 2: Block ("█") - * 4: Underline ("_") - * 6: Bar ("|") - * 7: Snowman ("☃") - */ -static unsigned int cursorshape = 4; - -/* - * Default columns and rows numbers - */ - -static unsigned int cols = 80; -static unsigned int rows = 24; - -/* - * Default colour and shape of the mouse cursor - */ -static unsigned int mouseshape = XC_xterm; -static unsigned int mousefg = 7; -static unsigned int mousebg = 0; - -/* - * Color used to display font attributes when fontconfig selected a font which - * doesn't match the ones requested. - */ -static unsigned int defaultattr = 11; - -/* - * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set). - * Note that if you want to use ShiftMask with selmasks, set this to an other - * modifier, set to 0 to not use it. - */ -static uint forcemousemod = ShiftMask; - -/* - * Internal mouse shortcuts. - * Beware that overloading Button1 will disable the selection. - */ -static MouseShortcut mshortcuts[] = { - /* mask button function argument release */ - { ShiftMask, Button4, kscrollup, {.i = 1} }, - { ShiftMask, Button5, kscrolldown, {.i = 1} }, - { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, - { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, - { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, -}; - -/* Internal keyboard shortcuts. */ -#define MODKEY Mod1Mask -#define TERMMOD (ControlMask|ShiftMask) - -static Shortcut shortcuts[] = { - /* mask keysym function argument */ - { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, - { ControlMask, XK_Print, toggleprinter, {.i = 0} }, - { ShiftMask, XK_Print, printscreen, {.i = 0} }, - { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, - { TERMMOD, XK_Prior, zoom, {.f = +1} }, - { TERMMOD, XK_Next, zoom, {.f = -1} }, - { TERMMOD, XK_Home, zoomreset, {.f = 0} }, - { TERMMOD, XK_C, clipcopy, {.i = 0} }, - { TERMMOD, XK_V, clippaste, {.i = 0} }, - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, -}; - -/* - * Special keys (change & recompile st.info accordingly) - * - * Mask value: - * * Use XK_ANY_MOD to match the key no matter modifiers state - * * Use XK_NO_MOD to match the key alone (no modifiers) - * appkey value: - * * 0: no value - * * > 0: keypad application mode enabled - * * = 2: term.numlock = 1 - * * < 0: keypad application mode disabled - * appcursor value: - * * 0: no value - * * > 0: cursor application mode enabled - * * < 0: cursor application mode disabled - * - * Be careful with the order of the definitions because st searches in - * this table sequentially, so any XK_ANY_MOD must be in the last - * position for a key. - */ - -/* - * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) - * to be mapped below, add them to this array. - */ -static KeySym mappedkeys[] = { -1 }; - -/* - * State bits to ignore when matching key or button events. By default, - * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. - */ -static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; - -/* - * This is the huge key array which defines all compatibility to the Linux - * world. Please decide about changes wisely. - */ -static Key key[] = { - /* keysym mask string appkey appcursor */ - { XK_KP_Home, ShiftMask, "\033[2J", 0, -1}, - { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, - { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1}, - { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1}, - { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0}, - { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1}, - { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1}, - { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0}, - { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1}, - { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1}, - { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0}, - { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1}, - { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1}, - { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0}, - { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1}, - { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1}, - { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, - { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0}, - { XK_KP_End, ControlMask, "\033[J", -1, 0}, - { XK_KP_End, ControlMask, "\033[1;5F", +1, 0}, - { XK_KP_End, ShiftMask, "\033[K", -1, 0}, - { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0}, - { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0}, - { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, - { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0}, - { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, - { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0}, - { XK_KP_Insert, ControlMask, "\033[L", -1, 0}, - { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, - { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, - { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, - { XK_KP_Delete, ControlMask, "\033[M", -1, 0}, - { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, - { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, - { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, - { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, - { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, - { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0}, - { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0}, - { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0}, - { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0}, - { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0}, - { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0}, - { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0}, - { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0}, - { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0}, - { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0}, - { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0}, - { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0}, - { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0}, - { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0}, - { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0}, - { XK_Up, ShiftMask, "\033[1;2A", 0, 0}, - { XK_Up, Mod1Mask, "\033[1;3A", 0, 0}, - { XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0}, - { XK_Up, ControlMask, "\033[1;5A", 0, 0}, - { XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0}, - { XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0}, - { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0}, - { XK_Up, XK_ANY_MOD, "\033[A", 0, -1}, - { XK_Up, XK_ANY_MOD, "\033OA", 0, +1}, - { XK_Down, ShiftMask, "\033[1;2B", 0, 0}, - { XK_Down, Mod1Mask, "\033[1;3B", 0, 0}, - { XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0}, - { XK_Down, ControlMask, "\033[1;5B", 0, 0}, - { XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0}, - { XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0}, - { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0}, - { XK_Down, XK_ANY_MOD, "\033[B", 0, -1}, - { XK_Down, XK_ANY_MOD, "\033OB", 0, +1}, - { XK_Left, ShiftMask, "\033[1;2D", 0, 0}, - { XK_Left, Mod1Mask, "\033[1;3D", 0, 0}, - { XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0}, - { XK_Left, ControlMask, "\033[1;5D", 0, 0}, - { XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0}, - { XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0}, - { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0}, - { XK_Left, XK_ANY_MOD, "\033[D", 0, -1}, - { XK_Left, XK_ANY_MOD, "\033OD", 0, +1}, - { XK_Right, ShiftMask, "\033[1;2C", 0, 0}, - { XK_Right, Mod1Mask, "\033[1;3C", 0, 0}, - { XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0}, - { XK_Right, ControlMask, "\033[1;5C", 0, 0}, - { XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0}, - { XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0}, - { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0}, - { XK_Right, XK_ANY_MOD, "\033[C", 0, -1}, - { XK_Right, XK_ANY_MOD, "\033OC", 0, +1}, - { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, - { XK_Return, Mod1Mask, "\033\r", 0, 0}, - { XK_Return, XK_ANY_MOD, "\r", 0, 0}, - { XK_Insert, ShiftMask, "\033[4l", -1, 0}, - { XK_Insert, ShiftMask, "\033[2;2~", +1, 0}, - { XK_Insert, ControlMask, "\033[L", -1, 0}, - { XK_Insert, ControlMask, "\033[2;5~", +1, 0}, - { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, - { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, - { XK_Delete, ControlMask, "\033[M", -1, 0}, - { XK_Delete, ControlMask, "\033[3;5~", +1, 0}, - { XK_Delete, ShiftMask, "\033[2K", -1, 0}, - { XK_Delete, ShiftMask, "\033[3;2~", +1, 0}, - { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, - { XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, - { XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, - { XK_Home, ShiftMask, "\033[2J", 0, -1}, - { XK_Home, ShiftMask, "\033[1;2H", 0, +1}, - { XK_Home, XK_ANY_MOD, "\033[H", 0, -1}, - { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1}, - { XK_End, ControlMask, "\033[J", -1, 0}, - { XK_End, ControlMask, "\033[1;5F", +1, 0}, - { XK_End, ShiftMask, "\033[K", -1, 0}, - { XK_End, ShiftMask, "\033[1;2F", +1, 0}, - { XK_End, XK_ANY_MOD, "\033[4~", 0, 0}, - { XK_Prior, ControlMask, "\033[5;5~", 0, 0}, - { XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, - { XK_Next, ControlMask, "\033[6;5~", 0, 0}, - { XK_Next, ShiftMask, "\033[6;2~", 0, 0}, - { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0}, - { XK_F1, XK_NO_MOD, "\033OP" , 0, 0}, - { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, - { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, - { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, - { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, - { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, - { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0}, - { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, - { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, - { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, - { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, - { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, - { XK_F3, XK_NO_MOD, "\033OR" , 0, 0}, - { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, - { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, - { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, - { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, - { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, - { XK_F4, XK_NO_MOD, "\033OS" , 0, 0}, - { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, - { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, - { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, - { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, - { XK_F5, XK_NO_MOD, "\033[15~", 0, 0}, - { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, - { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, - { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, - { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, - { XK_F6, XK_NO_MOD, "\033[17~", 0, 0}, - { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, - { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, - { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, - { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, - { XK_F7, XK_NO_MOD, "\033[18~", 0, 0}, - { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, - { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, - { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, - { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, - { XK_F8, XK_NO_MOD, "\033[19~", 0, 0}, - { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, - { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, - { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, - { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, - { XK_F9, XK_NO_MOD, "\033[20~", 0, 0}, - { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, - { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, - { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, - { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, - { XK_F10, XK_NO_MOD, "\033[21~", 0, 0}, - { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, - { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, - { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, - { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, - { XK_F11, XK_NO_MOD, "\033[23~", 0, 0}, - { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, - { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, - { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, - { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, - { XK_F12, XK_NO_MOD, "\033[24~", 0, 0}, - { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, - { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, - { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, - { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, - { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0}, - { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0}, - { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0}, - { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0}, - { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0}, - { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0}, - { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0}, - { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0}, - { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0}, - { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0}, - { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0}, - { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0}, - { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0}, - { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0}, - { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0}, - { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0}, - { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0}, - { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0}, - { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0}, - { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0}, - { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0}, - { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, - { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, -}; - -/* - * Selection types' masks. - * Use the same masks as usual. - * Button1Mask is always unset, to make masks match between ButtonPress. - * ButtonRelease and MotionNotify. - * If no match is found, regular selection is used. - */ -static uint selmasks[] = { - [SEL_RECTANGULAR] = Mod1Mask, -}; - -/* - * Printable characters in ASCII, used to estimate the advance width - * of single wide characters. - */ -static char ascii_printable[] = - " !\"#$%&'()*+,-./0123456789:;<=>?" - "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" - "`abcdefghijklmnopqrstuvwxyz{|}~"; diff --git a/st-0.8.4/config.def.h.rej b/st-0.8.4/config.def.h.rej deleted file mode 100644 index a092951..0000000 --- a/st-0.8.4/config.def.h.rej +++ /dev/null @@ -1,15 +0,0 @@ ---- config.def.h -+++ config.def.h -@@ -6,12 +6,6 @@ - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ - static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; --/* Spare fonts */ --static char *font2[] = { --/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */ --/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */ --}; -- - static int borderpx = 2; - - /* diff --git a/st-0.8.4/config.mk b/st-0.8.4/config.mk deleted file mode 100644 index aaa54ff..0000000 --- a/st-0.8.4/config.mk +++ /dev/null @@ -1,35 +0,0 @@ -# st version -VERSION = 0.8.4 - -# Customize below to fit your system - -# paths -PREFIX = /usr/local -MANPREFIX = $(PREFIX)/share/man - -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib - -PKG_CONFIG = pkg-config - -# includes and libs -INCS = -I$(X11INC) \ - `$(PKG_CONFIG) --cflags fontconfig` \ - `$(PKG_CONFIG) --cflags freetype2` -LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\ - `$(PKG_CONFIG) --libs fontconfig` \ - `$(PKG_CONFIG) --libs freetype2` - -# flags -STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) -STLDFLAGS = $(LIBS) $(LDFLAGS) - -# 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-0.8.4/st b/st-0.8.4/st deleted file mode 100755 index 440e71d73e9d8790ad6f94a2046bf43b81e19af5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102304 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%0DL;(*L5z5^hCj{;`m*>!nZgyHjn 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 diff --git a/st-0.8.4/st-font2-20190416-ba72400.diff b/st-0.8.4/st-font2-20190416-ba72400.diff deleted file mode 100644 index c7a2950..0000000 --- a/st-0.8.4/st-font2-20190416-ba72400.diff +++ /dev/null @@ -1,167 +0,0 @@ -From ba724004c6a368e452114f7dc147a9978fe0f3b4 Mon Sep 17 00:00:00 2001 -From: Kirill Bugaev -Date: Tue, 16 Apr 2019 04:31:30 +0800 -Subject: [PATCH] This patch allows to add spare font besides default. Some - glyphs can be not present in default font. For this glyphs st uses - font-config and try to find them in font cache first. This patch append fonts - defined in font2 variable to the beginning of font cache. So they will be - used first for glyphs that absent in default font. - ---- - config.def.h | 6 +++ - x.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 107 insertions(+) - -diff --git a/config.def.h b/config.def.h -index 482901e..676719e 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -6,6 +6,12 @@ - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ - static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; -+/* Spare fonts */ -+static char *font2[] = { -+/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */ -+/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */ -+}; -+ - static int borderpx = 2; - - /* -diff --git a/x.c b/x.c -index 5828a3b..d37e59d 100644 ---- a/x.c -+++ b/x.c -@@ -149,6 +149,8 @@ static void xhints(void); - static int xloadcolor(int, const char *, Color *); - static int xloadfont(Font *, FcPattern *); - static void xloadfonts(char *, double); -+static int xloadsparefont(FcPattern *, int); -+static void xloadsparefonts(void); - static void xunloadfont(Font *); - static void xunloadfonts(void); - static void xsetenv(void); -@@ -296,6 +298,7 @@ zoomabs(const Arg *arg) - { - xunloadfonts(); - xloadfonts(usedfont, arg->f); -+ xloadsparefonts(); - cresize(0, 0); - redraw(); - xhints(); -@@ -977,6 +980,101 @@ xloadfonts(char *fontstr, double fontsize) - FcPatternDestroy(pattern); - } - -+int -+xloadsparefont(FcPattern *pattern, int flags) -+{ -+ FcPattern *match; -+ FcResult result; -+ -+ match = FcFontMatch(NULL, pattern, &result); -+ if (!match) { -+ return 1; -+ } -+ -+ if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) { -+ FcPatternDestroy(match); -+ return 1; -+ } -+ -+ frc[frclen].flags = flags; -+ /* Believe U+0000 glyph will present in each default font */ -+ frc[frclen].unicodep = 0; -+ frclen++; -+ -+ return 0; -+} -+ -+void -+xloadsparefonts(void) -+{ -+ FcPattern *pattern; -+ double sizeshift, fontval; -+ int fc; -+ char **fp; -+ -+ if (frclen != 0) -+ die("can't embed spare fonts. cache isn't empty"); -+ -+ /* Calculate count of spare fonts */ -+ fc = sizeof(font2) / sizeof(*font2); -+ if (fc == 0) -+ return; -+ -+ /* Allocate memory for cache entries. */ -+ if (frccap < 4 * fc) { -+ frccap += 4 * fc - frccap; -+ frc = xrealloc(frc, frccap * sizeof(Fontcache)); -+ } -+ -+ for (fp = font2; fp - font2 < fc; ++fp) { -+ -+ if (**fp == '-') -+ pattern = XftXlfdParse(*fp, False, False); -+ else -+ pattern = FcNameParse((FcChar8 *)*fp); -+ -+ if (!pattern) -+ die("can't open spare font %s\n", *fp); -+ -+ if (defaultfontsize > 0) { -+ sizeshift = usedfontsize - defaultfontsize; -+ if (sizeshift != 0 && -+ FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == -+ FcResultMatch) { -+ fontval += sizeshift; -+ FcPatternDel(pattern, FC_PIXEL_SIZE); -+ FcPatternDel(pattern, FC_SIZE); -+ FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval); -+ } -+ } -+ -+ FcPatternAddBool(pattern, FC_SCALABLE, 1); -+ -+ FcConfigSubstitute(NULL, pattern, FcMatchPattern); -+ XftDefaultSubstitute(xw.dpy, xw.scr, pattern); -+ -+ if (xloadsparefont(pattern, FRC_NORMAL)) -+ die("can't open spare font %s\n", *fp); -+ -+ FcPatternDel(pattern, FC_SLANT); -+ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); -+ if (xloadsparefont(pattern, FRC_ITALIC)) -+ die("can't open spare font %s\n", *fp); -+ -+ FcPatternDel(pattern, FC_WEIGHT); -+ FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); -+ if (xloadsparefont(pattern, FRC_ITALICBOLD)) -+ die("can't open spare font %s\n", *fp); -+ -+ FcPatternDel(pattern, FC_SLANT); -+ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); -+ if (xloadsparefont(pattern, FRC_BOLD)) -+ die("can't open spare font %s\n", *fp); -+ -+ FcPatternDestroy(pattern); -+ } -+} -+ - void - xunloadfont(Font *f) - { -@@ -1057,6 +1155,9 @@ xinit(int cols, int rows) - usedfont = (opt_font == NULL)? font : opt_font; - xloadfonts(usedfont, 0); - -+ /* spare fonts */ -+ xloadsparefonts(); -+ - /* colors */ - xw.cmap = XDefaultColormap(xw.dpy, xw.scr); - xloadcols(); --- -2.21.0 - diff --git a/st-0.8.4/st.1 b/st-0.8.4/st.1 deleted file mode 100644 index 39120b4..0000000 --- a/st-0.8.4/st.1 +++ /dev/null @@ -1,177 +0,0 @@ -.TH ST 1 st\-VERSION -.SH NAME -st \- simple terminal -.SH SYNOPSIS -.B st -.RB [ \-aiv ] -.RB [ \-c -.IR class ] -.RB [ \-f -.IR font ] -.RB [ \-g -.IR geometry ] -.RB [ \-n -.IR name ] -.RB [ \-o -.IR iofile ] -.RB [ \-T -.IR title ] -.RB [ \-t -.IR title ] -.RB [ \-l -.IR line ] -.RB [ \-w -.IR windowid ] -.RB [[ \-e ] -.IR command -.RI [ arguments ...]] -.PP -.B st -.RB [ \-aiv ] -.RB [ \-c -.IR class ] -.RB [ \-f -.IR font ] -.RB [ \-g -.IR geometry ] -.RB [ \-n -.IR name ] -.RB [ \-o -.IR iofile ] -.RB [ \-T -.IR title ] -.RB [ \-t -.IR title ] -.RB [ \-w -.IR windowid ] -.RB \-l -.IR line -.RI [ stty_args ...] -.SH DESCRIPTION -.B st -is a simple terminal emulator. -.SH OPTIONS -.TP -.B \-a -disable alternate screens in terminal -.TP -.BI \-c " class" -defines the window class (default $TERM). -.TP -.BI \-f " font" -defines the -.I font -to use when st is run. -.TP -.BI \-g " geometry" -defines the X11 geometry string. -The form is [=][{xX}][{+-}{+-}]. See -.BR XParseGeometry (3) -for further details. -.TP -.B \-i -will fixate the position given with the -g option. -.TP -.BI \-n " name" -defines the window instance name (default $TERM). -.TP -.BI \-o " iofile" -writes all the I/O to -.I iofile. -This feature is useful when recording st sessions. A value of "-" means -standard output. -.TP -.BI \-T " title" -defines the window title (default 'st'). -.TP -.BI \-t " title" -defines the window title (default 'st'). -.TP -.BI \-w " windowid" -embeds st within the window identified by -.I windowid -.TP -.BI \-l " line" -use a tty -.I line -instead of a pseudo terminal. -.I line -should be a (pseudo-)serial device (e.g. /dev/ttyS0 on Linux for serial port -0). -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 -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 -.BR stty(1) -flags. If you want to set odd parity on 115200 baud use for example 'st -l -/dev/ttyS0 parenb parodd 115200'. Set the number of bits by using for -example 'st -l /dev/ttyS0 cs7 115200'. See -.BR stty(1) -for more arguments and cases. -.TP -.B \-v -prints version information to stderr, then exits. -.TP -.BI \-e " command " [ " arguments " "... ]" -st 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 compatibility, -and all the remaining arguments are used as a command -even without it. -.SH SHORTCUTS -.TP -.B Break -Send a break in the serial line. -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 -.I iofile. -.TP -.B Shift-Print Screen -Print the full screen to the -.I iofile. -.TP -.B Print Screen -Print the selection to the -.I iofile. -.TP -.B Ctrl-Shift-Page Up -Increase font size. -.TP -.B Ctrl-Shift-Page Down -Decrease font size. -.TP -.B Ctrl-Shift-Home -Reset to default font size. -.TP -.B Ctrl-Shift-y -Paste from primary selection (middle mouse button). -.TP -.B Ctrl-Shift-c -Copy the selected text to the clipboard selection. -.TP -.B Ctrl-Shift-v -Paste from the clipboard selection. -.SH CUSTOMIZATION -.B st -can be customized by creating a custom config.h and (re)compiling the source -code. This keeps it fast, secure and simple. -.SH AUTHORS -See the LICENSE file for the authors. -.SH LICENSE -See the LICENSE file for the terms of redistribution. -.SH SEE ALSO -.BR tabbed (1), -.BR utmp (1), -.BR stty (1), -.BR scroll (1) -.SH BUGS -See the TODO file in the distribution. - diff --git a/st-0.8.4/st.c b/st-0.8.4/st.c deleted file mode 100644 index edec064..0000000 --- a/st-0.8.4/st.c +++ /dev/null @@ -1,2668 +0,0 @@ -/* See LICENSE for license details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "st.h" -#include "win.h" - -#if defined(__linux) - #include -#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) - #include -#elif defined(__FreeBSD__) || defined(__DragonFly__) - #include -#endif - -/* 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 HISTSIZE 2000 - -/* macros */ -#define IS_SET(flag) ((term.mode & (flag)) != 0) -#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == 0x7f) -#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) -#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) -#define ISDELIM(u) (u && wcschr(worddelimiters, u)) -#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \ - term.scr + HISTSIZE + 1) % HISTSIZE] : \ - term.line[(y) - term.scr]) - -enum term_mode { - MODE_WRAP = 1 << 0, - MODE_INSERT = 1 << 1, - MODE_ALTSCREEN = 1 << 2, - MODE_CRLF = 1 << 3, - MODE_ECHO = 1 << 4, - MODE_PRINT = 1 << 5, - MODE_UTF8 = 1 << 6, -}; - -enum cursor_movement { - CURSOR_SAVE, - CURSOR_LOAD -}; - -enum cursor_state { - CURSOR_DEFAULT = 0, - CURSOR_WRAPNEXT = 1, - CURSOR_ORIGIN = 2 -}; - -enum charset { - CS_GRAPHIC0, - CS_GRAPHIC1, - CS_UK, - CS_USA, - CS_MULTI, - CS_GER, - CS_FIN -}; - -enum escape_state { - ESC_START = 1, - ESC_CSI = 2, - ESC_STR = 4, /* DCS, OSC, PM, APC */ - ESC_ALTCHARSET = 8, - ESC_STR_END = 16, /* a final string was encountered */ - ESC_TEST = 32, /* Enter in test mode */ - ESC_UTF8 = 64, -}; - -typedef struct { - Glyph attr; /* current char attributes */ - int x; - int y; - char state; -} TCursor; - -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; - - int alt; -} Selection; - -/* Internal representation of the screen */ -typedef struct { - int row; /* nb row */ - int col; /* nb col */ - Line *line; /* screen */ - Line *alt; /* alternate screen */ - Line hist[HISTSIZE]; /* history buffer */ - int histi; /* history index */ - int scr; /* scroll back */ - 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 */ - int esc; /* escape state flags */ - char trantbl[4]; /* charset table translation */ - int charset; /* current charset */ - int icharset; /* selected charset for sequence */ - int *tabs; - Rune lastc; /* last printed char outside of sequence, 0 if control */ -} Term; - -/* CSI Escape sequence structs */ -/* ESC '[' [[ [] [;]] []] */ -typedef struct { - char buf[ESC_BUF_SIZ]; /* raw string */ - size_t 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 { - char type; /* ESC type ... */ - char *buf; /* allocated raw string */ - size_t siz; /* allocation size */ - size_t len; /* raw string length */ - char *args[STR_ARG_SIZ]; - int narg; /* nb of args */ -} STREscape; - -static void execsh(char *, char **); -static void stty(char **); -static void sigchld(int); -static void ttywriteraw(const char *, size_t); - -static void csidump(void); -static void csihandle(void); -static void csiparse(void); -static void csireset(void); -static int eschandle(uchar); -static void strdump(void); -static void strhandle(void); -static void strparse(void); -static void strreset(void); - -static void tprinter(char *, size_t); -static void tdumpsel(void); -static void tdumpline(int); -static void tdump(void); -static void tclearregion(int, int, int, int); -static void tcursor(int); -static void tdeletechar(int); -static void tdeleteline(int); -static void tinsertblank(int); -static void tinsertblankline(int); -static int tlinelen(int); -static void tmoveto(int, int); -static void tmoveato(int, int); -static void tnewline(int); -static void tputtab(int); -static void tputc(Rune); -static void treset(void); -static void tscrollup(int, int, int); -static void tscrolldown(int, 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 tsetmode(int, int, int *, int); -static int twrite(const char *, int, int); -static void tfulldirt(void); -static void tcontrolcode(uchar ); -static void tdectest(char ); -static void tdefutf8(char); -static int32_t tdefcolor(int *, int *, int); -static void tdeftran(char); -static void tstrsequence(uchar); - -static void drawregion(int, int, int, int); - -static void selnormalize(void); -static void selscroll(int, int); -static void selsnap(int *, int *, int); - -static size_t utf8decode(const char *, Rune *, size_t); -static Rune utf8decodebyte(char, size_t *); -static char utf8encodebyte(Rune, size_t); -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); - -/* Globals */ -static Term term; -static Selection sel; -static CSIEscape csiescseq; -static STREscape strescseq; -static int iofd = 1; -static int cmdfd; -static pid_t pid; - -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}; - -ssize_t -xwrite(int fd, const char *s, size_t len) -{ - size_t aux = len; - ssize_t r; - - while (len > 0) { - r = write(fd, s, len); - if (r < 0) - return r; - len -= r; - s += r; - } - - return aux; -} - -void * -xmalloc(size_t len) -{ - void *p; - - if (!(p = malloc(len))) - die("malloc: %s\n", strerror(errno)); - - return p; -} - -void * -xrealloc(void *p, size_t len) -{ - if ((p = realloc(p, len)) == NULL) - die("realloc: %s\n", strerror(errno)); - - return p; -} - -char * -xstrdup(char *s) -{ - if ((s = strdup(s)) == NULL) - die("strdup: %s\n", strerror(errno)); - - return s; -} - -size_t -utf8decode(const char *c, Rune *u, size_t clen) -{ - size_t i, j, len, type; - Rune udecoded; - - *u = UTF_INVALID; - if (!clen) - return 0; - udecoded = utf8decodebyte(c[0], &len); - if (!BETWEEN(len, 1, UTF_SIZ)) - return 1; - for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { - udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); - if (type != 0) - return j; - } - if (j < len) - return 0; - *u = udecoded; - utf8validate(u, len); - - return len; -} - -Rune -utf8decodebyte(char c, size_t *i) -{ - for (*i = 0; *i < LEN(utfmask); ++(*i)) - if (((uchar)c & utfmask[*i]) == utfbyte[*i]) - return (uchar)c & ~utfmask[*i]; - - return 0; -} - -size_t -utf8encode(Rune u, char *c) -{ - size_t len, i; - - len = utf8validate(&u, 0); - if (len > UTF_SIZ) - return 0; - - for (i = len - 1; i != 0; --i) { - c[i] = utf8encodebyte(u, 0); - u >>= 6; - } - c[0] = utf8encodebyte(u, len); - - return len; -} - -char -utf8encodebyte(Rune u, size_t i) -{ - return utfbyte[i] | (u & ~utfmask[i]); -} - -size_t -utf8validate(Rune *u, size_t i) -{ - if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) - *u = UTF_INVALID; - for (i = 1; *u > utfmax[i]; ++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 ? *((*src)++) : '='; /* emulate padding if string ends */ -} - -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)]; - - /* invalid input. 'a' can be -1, e.g. if src is "\n" (c-str) */ - if (a == -1 || b == -1) - break; - - *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) -{ - sel.mode = SEL_IDLE; - sel.snap = 0; - sel.ob.x = -1; -} - -int -tlinelen(int y) -{ - int i = term.col; - - if (TLINE(y)[i - 1].mode & ATTR_WRAP) - return i; - - while (i > 0 && TLINE(y)[i - 1].u == ' ') - --i; - - return i; -} - -void -selstart(int col, int row, int snap) -{ - 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(); - - if (sel.snap != 0) - sel.mode = SEL_READY; - tsetdirt(sel.nb.y, sel.ne.y); -} - -void -selextend(int col, int row, int type, int done) -{ - int oldey, oldex, oldsby, oldsey, oldtype; - - if (sel.mode == SEL_IDLE) - return; - if (done && sel.mode == SEL_EMPTY) { - selclear(); - return; - } - - oldey = sel.oe.y; - oldex = sel.oe.x; - oldsby = sel.nb.y; - oldsey = sel.ne.y; - oldtype = sel.type; - - 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 -selnormalize(void) -{ - int i; - - if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { - sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x; - sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x; - } else { - sel.nb.x = MIN(sel.ob.x, sel.oe.x); - sel.ne.x = MAX(sel.ob.x, sel.oe.x); - } - sel.nb.y = MIN(sel.ob.y, sel.oe.y); - sel.ne.y = MAX(sel.ob.y, sel.oe.y); - - selsnap(&sel.nb.x, &sel.nb.y, -1); - selsnap(&sel.ne.x, &sel.ne.y, +1); - - /* expand selection over line breaks */ - if (sel.type == SEL_RECTANGULAR) - return; - i = tlinelen(sel.nb.y); - if (i < sel.nb.x) - sel.nb.x = i; - if (tlinelen(sel.ne.y) <= sel.ne.x) - sel.ne.x = term.col - 1; -} - -int -selected(int x, int y) -{ - if (sel.mode == SEL_EMPTY || sel.ob.x == -1 || - sel.alt != IS_SET(MODE_ALTSCREEN)) - return 0; - - if (sel.type == SEL_RECTANGULAR) - return BETWEEN(y, sel.nb.y, sel.ne.y) - && BETWEEN(x, sel.nb.x, sel.ne.x); - - return BETWEEN(y, sel.nb.y, sel.ne.y) - && (y != sel.nb.y || x >= sel.nb.x) - && (y != sel.ne.y || x <= sel.ne.x); -} - -void -selsnap(int *x, int *y, int direction) -{ - int newx, newy, xt, yt; - int delim, prevdelim; - Glyph *gp, *prevgp; - - switch (sel.snap) { - case SNAP_WORD: - /* - * Snap around if the word wraps around at the end or - * beginning of a line. - */ - prevgp = &TLINE(*y)[*x]; - prevdelim = ISDELIM(prevgp->u); - for (;;) { - newx = *x + direction; - newy = *y; - if (!BETWEEN(newx, 0, term.col - 1)) { - newy += direction; - newx = (newx + term.col) % term.col; - if (!BETWEEN(newy, 0, term.row - 1)) - break; - - if (direction > 0) - yt = *y, xt = *x; - else - yt = newy, xt = newx; - if (!(TLINE(yt)[xt].mode & ATTR_WRAP)) - break; - } - - if (newx >= tlinelen(newy)) - break; - - gp = &TLINE(newy)[newx]; - delim = ISDELIM(gp->u); - if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim - || (delim && gp->u != prevgp->u))) - break; - - *x = newx; - *y = newy; - prevgp = gp; - prevdelim = delim; - } - break; - case SNAP_LINE: - /* - * Snap around if the the previous line or the current one - * has set ATTR_WRAP at its end. Then the whole next or - * previous line will be selected. - */ - *x = (direction < 0) ? 0 : term.col - 1; - if (direction < 0) { - for (; *y > 0; *y += direction) { - if (!(TLINE(*y-1)[term.col-1].mode - & ATTR_WRAP)) { - break; - } - } - } else if (direction > 0) { - for (; *y < term.row-1; *y += direction) { - if (!(TLINE(*y)[term.col-1].mode - & ATTR_WRAP)) { - break; - } - } - } - break; - } -} - -char * -getsel(void) -{ - char *str, *ptr; - int y, bufsize, lastx, linelen; - Glyph *gp, *last; - - if (sel.ob.x == -1) - return NULL; - - bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ; - ptr = str = xmalloc(bufsize); - - /* append every set & selected glyph to the selection */ - for (y = sel.nb.y; y <= sel.ne.y; y++) { - if ((linelen = tlinelen(y)) == 0) { - *ptr++ = '\n'; - continue; - } - - if (sel.type == SEL_RECTANGULAR) { - gp = &TLINE(y)[sel.nb.x]; - lastx = sel.ne.x; - } else { - gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0]; - lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; - } - last = &TLINE(y)[MIN(lastx, linelen-1)]; - while (last >= gp && last->u == ' ') - --last; - - for ( ; gp <= last; ++gp) { - if (gp->mode & ATTR_WDUMMY) - continue; - - ptr += utf8encode(gp->u, ptr); - } - - /* - * Copy and pasting of line endings is inconsistent - * in the inconsistent terminal and GUI world. - * The best solution seems like to produce '\n' when - * something is copied from st and convert '\n' to - * '\r', when something to be pasted is received by - * st. - * FIXME: Fix the computer world. - */ - if ((y < sel.ne.y || lastx >= linelen) && - (!(last->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR)) - *ptr++ = '\n'; - } - *ptr = 0; - return str; -} - -void -selclear(void) -{ - if (sel.ob.x == -1) - return; - sel.mode = SEL_IDLE; - sel.ob.x = -1; - tsetdirt(sel.nb.y, sel.ne.y); -} - -void -die(const char *errstr, ...) -{ - va_list ap; - - va_start(ap, errstr); - vfprintf(stderr, errstr, ap); - va_end(ap); - exit(1); -} - -void -execsh(char *cmd, char **args) -{ - char *sh, *prog, *arg; - const struct passwd *pw; - - errno = 0; - if ((pw = getpwuid(getuid())) == NULL) { - if (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 : cmd; - - if (args) { - prog = args[0]; - arg = NULL; - } else if (scroll) { - prog = scroll; - arg = utmp ? utmp : sh; - } else if (utmp) { - prog = utmp; - arg = NULL; - } else { - prog = sh; - arg = NULL; - } - DEFAULT(args, ((char *[]) {prog, arg, NULL})); - - unsetenv("COLUMNS"); - unsetenv("LINES"); - unsetenv("TERMCAP"); - setenv("LOGNAME", pw->pw_name, 1); - setenv("USER", pw->pw_name, 1); - setenv("SHELL", sh, 1); - setenv("HOME", pw->pw_dir, 1); - setenv("TERM", termname, 1); - - signal(SIGCHLD, SIG_DFL); - signal(SIGHUP, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGALRM, SIG_DFL); - - execvp(prog, args); - _exit(1); -} - -void -sigchld(int a) -{ - int stat; - pid_t p; - - if ((p = waitpid(pid, &stat, WNOHANG)) < 0) - die("waiting for pid %hd failed: %s\n", pid, strerror(errno)); - - if (pid != p) - return; - - 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(char **args) -{ - char cmd[_POSIX_ARG_MAX], **p, *q, *s; - size_t n, siz; - - if ((n = strlen(stty_args)) > sizeof(cmd)-1) - die("incorrect stty parameters\n"); - memcpy(cmd, stty_args, n); - q = cmd + n; - siz = sizeof(cmd) - n; - for (p = args; p && (s = *p); ++p) { - if ((n = strlen(s)) > siz-1) - die("stty parameter length too long\n"); - *q++ = ' '; - memcpy(q, s, n); - q += n; - siz -= n + 1; - } - *q = '\0'; - if (system(cmd) != 0) - perror("Couldn't call stty"); -} - -int -ttynew(char *line, char *cmd, char *out, char **args) -{ - int m, s; - - if (out) { - term.mode |= MODE_PRINT; - iofd = (!strcmp(out, "-")) ? - 1 : open(out, O_WRONLY | O_CREAT, 0666); - if (iofd < 0) { - fprintf(stderr, "Error opening %s:%s\n", - out, 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(args); - return cmdfd; - } - - /* seems to work fine on linux, openbsd and freebsd */ - if (openpty(&m, &s, NULL, NULL, NULL) < 0) - die("openpty failed: %s\n", strerror(errno)); - - switch (pid = fork()) { - case -1: - die("fork failed: %s\n", strerror(errno)); - break; - case 0: - close(iofd); - setsid(); /* create a new process group */ - dup2(s, 0); - dup2(s, 1); - dup2(s, 2); - if (ioctl(s, TIOCSCTTY, NULL) < 0) - die("ioctl TIOCSCTTY failed: %s\n", strerror(errno)); - close(s); - close(m); -#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 -ttyread(void) -{ - static char buf[BUFSIZ]; - static int buflen = 0; - int ret, written; - - /* append read bytes to unprocessed bytes */ - ret = read(cmdfd, buf+buflen, LEN(buf)-buflen); - - switch (ret) { - case 0: - exit(0); - case -1: - die("couldn't read from shell: %s\n", strerror(errno)); - default: - buflen += ret; - written = twrite(buf, buflen, 0); - buflen -= written; - /* keep any incomplete UTF-8 byte sequence for the next call */ - if (buflen > 0) - memmove(buf, buf + written, buflen); - return ret; - } -} - -void -ttywrite(const char *s, size_t n, int may_echo) -{ - const char *next; - Arg arg = (Arg) { .i = term.scr }; - - kscrolldown(&arg); - - 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; - size_t lim = 256; - - /* - * Remember that we are using a pty, which might be a modem line. - * Writing too much will clog the line. That's why we are doing this - * dance. - * FIXME: Migrate the world to Plan 9. - */ - while (n > 0) { - FD_ZERO(&wfd); - FD_ZERO(&rfd); - FD_SET(cmdfd, &wfd); - FD_SET(cmdfd, &rfd); - - /* Check if we can write. */ - if (pselect(cmdfd+1, &rfd, &wfd, NULL, NULL, NULL) < 0) { - if (errno == EINTR) - continue; - die("select failed: %s\n", strerror(errno)); - } - if (FD_ISSET(cmdfd, &wfd)) { - /* - * Only write the bytes written by ttywrite() or the - * default of 256. This seems to be a reasonable value - * for a serial line. Bigger values might clog the I/O. - */ - if ((r = write(cmdfd, s, (n < lim)? n : lim)) < 0) - goto write_error; - if (r < n) { - /* - * We weren't able to write out everything. - * This means the buffer is getting full - * again. Empty it. - */ - if (n < lim) - lim = ttyread(); - n -= r; - s += r; - } else { - /* All bytes have been written. */ - break; - } - } - if (FD_ISSET(cmdfd, &rfd)) - lim = ttyread(); - } - return; - -write_error: - die("write error on tty: %s\n", strerror(errno)); -} - -void -ttyresize(int tw, int th) -{ - struct winsize w; - - w.ws_row = term.row; - w.ws_col = term.col; - 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) -{ - int i, j; - - for (i = 0; i < term.row-1; i++) { - for (j = 0; j < term.col-1; j++) { - if (term.line[i][j].mode & attr) - return 1; - } - } - - return 0; -} - -void -tsetdirt(int top, int bot) -{ - int i; - - LIMIT(top, 0, term.row-1); - LIMIT(bot, 0, term.row-1); - - for (i = top; i <= bot; i++) - term.dirty[i] = 1; -} - -void -tsetdirtattr(int attr) -{ - int i, j; - - for (i = 0; i < term.row-1; i++) { - for (j = 0; j < term.col-1; j++) { - if (term.line[i][j].mode & attr) { - tsetdirt(i, i); - break; - } - } - } -} - -void -tfulldirt(void) -{ - tsetdirt(0, term.row-1); -} - -void -tcursor(int mode) -{ - static TCursor c[2]; - int alt = IS_SET(MODE_ALTSCREEN); - - if (mode == CURSOR_SAVE) { - c[alt] = term.c; - } else if (mode == CURSOR_LOAD) { - term.c = c[alt]; - tmoveto(c[alt].x, c[alt].y); - } -} - -void -treset(void) -{ - uint i; - - term.c = (TCursor){{ - .mode = ATTR_NULL, - .fg = defaultfg, - .bg = defaultbg - }, .x = 0, .y = 0, .state = CURSOR_DEFAULT}; - - memset(term.tabs, 0, term.col * sizeof(*term.tabs)); - for (i = tabspaces; i < term.col; i += tabspaces) - term.tabs[i] = 1; - term.top = 0; - term.bot = term.row - 1; - term.mode = MODE_WRAP|MODE_UTF8; - memset(term.trantbl, CS_USA, sizeof(term.trantbl)); - term.charset = 0; - - for (i = 0; i < 2; i++) { - tmoveto(0, 0); - tcursor(CURSOR_SAVE); - tclearregion(0, 0, term.col-1, term.row-1); - tswapscreen(); - } -} - -void -tnew(int col, int row) -{ - term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } }; - tresize(col, row); - treset(); -} - -void -tswapscreen(void) -{ - Line *tmp = term.line; - - term.line = term.alt; - term.alt = tmp; - term.mode ^= MODE_ALTSCREEN; - tfulldirt(); -} - -void -kscrolldown(const Arg* a) -{ - int n = a->i; - - if (n < 0) - n = term.row + n; - - if (n > term.scr) - n = term.scr; - - if (term.scr > 0) { - term.scr -= n; - selscroll(0, -n); - tfulldirt(); - } -} - -void -kscrollup(const Arg* a) -{ - int n = a->i; - - if (n < 0) - n = term.row + n; - - if (term.scr <= HISTSIZE-n) { - term.scr += n; - selscroll(0, n); - tfulldirt(); - } -} - -void -tscrolldown(int orig, int n, int copyhist) -{ - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - - if (copyhist) { - term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE; - temp = term.hist[term.histi]; - term.hist[term.histi] = term.line[term.bot]; - term.line[term.bot] = temp; - } - - tsetdirt(orig, term.bot-n); - tclearregion(0, term.bot-n+1, term.col-1, term.bot); - - for (i = term.bot; i >= orig+n; i--) { - temp = term.line[i]; - term.line[i] = term.line[i-n]; - term.line[i-n] = temp; - } - - if (term.scr == 0) - selscroll(orig, n); -} - -void -tscrollup(int orig, int n, int copyhist) -{ - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - - if (copyhist) { - term.histi = (term.histi + 1) % HISTSIZE; - temp = term.hist[term.histi]; - term.hist[term.histi] = term.line[orig]; - term.line[orig] = temp; - } - - if (term.scr > 0 && term.scr < HISTSIZE) - term.scr = MIN(term.scr + n, HISTSIZE-1); - - tclearregion(0, orig, term.col-1, orig+n-1); - tsetdirt(orig+n, term.bot); - - for (i = orig; i <= term.bot-n; i++) { - temp = term.line[i]; - term.line[i] = term.line[i+n]; - term.line[i+n] = temp; - } - - if (term.scr == 0) - selscroll(orig, -n); -} - -void -selscroll(int orig, int n) -{ - if (sel.ob.x == -1) - return; - - if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) { - selclear(); - } else if (BETWEEN(sel.nb.y, orig, term.bot)) { - sel.ob.y += n; - sel.oe.y += n; - if (sel.ob.y < term.top || sel.ob.y > term.bot || - sel.oe.y < term.top || sel.oe.y > term.bot) { - selclear(); - } else { - selnormalize(); - } - } -} - -void -tnewline(int first_col) -{ - int y = term.c.y; - - if (y == term.bot) { - tscrollup(term.top, 1, 1); - } else { - y++; - } - tmoveto(first_col ? 0 : term.c.x, y); -} - -void -csiparse(void) -{ - char *p = csiescseq.buf, *np; - long int v; - - csiescseq.narg = 0; - if (*p == '?') { - csiescseq.priv = 1; - p++; - } - - csiescseq.buf[csiescseq.len] = '\0'; - while (p < csiescseq.buf+csiescseq.len) { - np = NULL; - v = strtol(p, &np, 10); - if (np == p) - v = 0; - if (v == LONG_MAX || v == LONG_MIN) - v = -1; - csiescseq.arg[csiescseq.narg++] = v; - p = np; - if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ) - break; - p++; - } - csiescseq.mode[0] = *p++; - csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0'; -} - -/* for absolute user moves, when decom is set */ -void -tmoveato(int x, int y) -{ - tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0)); -} - -void -tmoveto(int x, int y) -{ - int miny, maxy; - - if (term.c.state & CURSOR_ORIGIN) { - miny = term.top; - maxy = term.bot; - } else { - miny = 0; - maxy = term.row - 1; - } - term.c.state &= ~CURSOR_WRAPNEXT; - term.c.x = LIMIT(x, 0, term.col-1); - term.c.y = LIMIT(y, miny, maxy); -} - -void -tsetchar(Rune u, Glyph *attr, int x, int y) -{ - static char *vt100_0[62] = { /* 0x41 - 0x7e */ - "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */ - 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */ - 0, 0, 0, 0, 0, 0, 0, 0, /* P - W */ - 0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */ - "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */ - "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */ - "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */ - "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */ - }; - - /* - * The table is proudly stolen from rxvt. - */ - if (term.trantbl[term.charset] == CS_GRAPHIC0 && - BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41]) - utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ); - - if (term.line[y][x].mode & ATTR_WIDE) { - if (x+1 < term.col) { - term.line[y][x+1].u = ' '; - term.line[y][x+1].mode &= ~ATTR_WDUMMY; - } - } else if (term.line[y][x].mode & ATTR_WDUMMY) { - term.line[y][x-1].u = ' '; - term.line[y][x-1].mode &= ~ATTR_WIDE; - } - - term.dirty[y] = 1; - term.line[y][x] = *attr; - term.line[y][x].u = u; -} - -void -tclearregion(int x1, int y1, int x2, int y2) -{ - int x, y, temp; - Glyph *gp; - - if (x1 > x2) - temp = x1, x1 = x2, x2 = temp; - if (y1 > y2) - temp = y1, y1 = y2, y2 = temp; - - LIMIT(x1, 0, term.col-1); - LIMIT(x2, 0, term.col-1); - LIMIT(y1, 0, term.row-1); - LIMIT(y2, 0, term.row-1); - - for (y = y1; y <= y2; y++) { - term.dirty[y] = 1; - for (x = x1; x <= x2; x++) { - gp = &term.line[y][x]; - if (selected(x, y)) - selclear(); - gp->fg = term.c.attr.fg; - gp->bg = term.c.attr.bg; - gp->mode = 0; - gp->u = ' '; - } - } -} - -void -tdeletechar(int n) -{ - int dst, src, size; - Glyph *line; - - LIMIT(n, 0, term.col - term.c.x); - - dst = term.c.x; - src = term.c.x + n; - size = term.col - src; - line = term.line[term.c.y]; - - memmove(&line[dst], &line[src], size * sizeof(Glyph)); - tclearregion(term.col-n, term.c.y, term.col-1, term.c.y); -} - -void -tinsertblank(int n) -{ - int dst, src, size; - Glyph *line; - - LIMIT(n, 0, term.col - term.c.x); - - dst = term.c.x + n; - src = term.c.x; - size = term.col - dst; - line = term.line[term.c.y]; - - memmove(&line[dst], &line[src], size * sizeof(Glyph)); - tclearregion(src, term.c.y, dst - 1, term.c.y); -} - -void -tinsertblankline(int n) -{ - if (BETWEEN(term.c.y, term.top, term.bot)) - tscrolldown(term.c.y, n, 0); -} - -void -tdeleteline(int n) -{ - if (BETWEEN(term.c.y, term.top, term.bot)) - tscrollup(term.c.y, n, 0); -} - -int32_t -tdefcolor(int *attr, int *npar, int l) -{ - int32_t idx = -1; - uint r, g, b; - - switch (attr[*npar + 1]) { - case 2: /* direct color in RGB space */ - if (*npar + 4 >= l) { - fprintf(stderr, - "erresc(38): Incorrect number of parameters (%d)\n", - *npar); - break; - } - r = attr[*npar + 2]; - g = attr[*npar + 3]; - b = attr[*npar + 4]; - *npar += 4; - if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255)) - fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n", - r, g, b); - else - idx = TRUECOLOR(r, g, b); - break; - case 5: /* indexed color */ - if (*npar + 2 >= l) { - fprintf(stderr, - "erresc(38): Incorrect number of parameters (%d)\n", - *npar); - break; - } - *npar += 2; - if (!BETWEEN(attr[*npar], 0, 255)) - fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]); - else - idx = attr[*npar]; - break; - case 0: /* implemented defined (only foreground) */ - case 1: /* transparent */ - case 3: /* direct color in CMY space */ - case 4: /* direct color in CMYK space */ - default: - fprintf(stderr, - "erresc(38): gfx attr %d unknown\n", attr[*npar]); - break; - } - - return idx; -} - -void -tsetattr(int *attr, int l) -{ - int i; - int32_t idx; - - for (i = 0; i < l; i++) { - switch (attr[i]) { - case 0: - term.c.attr.mode &= ~( - ATTR_BOLD | - ATTR_FAINT | - ATTR_ITALIC | - ATTR_UNDERLINE | - ATTR_BLINK | - ATTR_REVERSE | - ATTR_INVISIBLE | - ATTR_STRUCK ); - term.c.attr.fg = defaultfg; - term.c.attr.bg = defaultbg; - break; - case 1: - term.c.attr.mode |= ATTR_BOLD; - break; - case 2: - term.c.attr.mode |= ATTR_FAINT; - break; - case 3: - term.c.attr.mode |= ATTR_ITALIC; - break; - case 4: - term.c.attr.mode |= ATTR_UNDERLINE; - break; - case 5: /* slow blink */ - /* FALLTHROUGH */ - case 6: /* rapid blink */ - term.c.attr.mode |= ATTR_BLINK; - break; - case 7: - term.c.attr.mode |= ATTR_REVERSE; - break; - case 8: - term.c.attr.mode |= ATTR_INVISIBLE; - break; - case 9: - term.c.attr.mode |= ATTR_STRUCK; - break; - case 22: - term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT); - break; - case 23: - term.c.attr.mode &= ~ATTR_ITALIC; - break; - case 24: - term.c.attr.mode &= ~ATTR_UNDERLINE; - break; - case 25: - term.c.attr.mode &= ~ATTR_BLINK; - break; - case 27: - term.c.attr.mode &= ~ATTR_REVERSE; - break; - case 28: - term.c.attr.mode &= ~ATTR_INVISIBLE; - break; - case 29: - term.c.attr.mode &= ~ATTR_STRUCK; - break; - case 38: - if ((idx = tdefcolor(attr, &i, l)) >= 0) - term.c.attr.fg = idx; - break; - case 39: - term.c.attr.fg = defaultfg; - break; - case 48: - if ((idx = tdefcolor(attr, &i, l)) >= 0) - term.c.attr.bg = idx; - break; - case 49: - term.c.attr.bg = defaultbg; - break; - default: - if (BETWEEN(attr[i], 30, 37)) { - term.c.attr.fg = attr[i] - 30; - } else if (BETWEEN(attr[i], 40, 47)) { - term.c.attr.bg = attr[i] - 40; - } else if (BETWEEN(attr[i], 90, 97)) { - term.c.attr.fg = attr[i] - 90 + 8; - } else if (BETWEEN(attr[i], 100, 107)) { - term.c.attr.bg = attr[i] - 100 + 8; - } else { - fprintf(stderr, - "erresc(default): gfx attr %d unknown\n", - attr[i]); - csidump(); - } - break; - } - } -} - -void -tsetscroll(int t, int b) -{ - int temp; - - LIMIT(t, 0, term.row-1); - LIMIT(b, 0, term.row-1); - if (t > b) { - temp = t; - t = b; - b = temp; - } - term.top = t; - term.bot = b; -} - -void -tsetmode(int priv, int set, int *args, int narg) -{ - int alt, *lim; - - for (lim = args + narg; args < lim; ++args) { - if (priv) { - switch (*args) { - case 1: /* DECCKM -- Cursor key */ - xsetmode(set, MODE_APPCURSOR); - break; - case 5: /* DECSCNM -- Reverse video */ - xsetmode(set, MODE_REVERSE); - break; - case 6: /* DECOM -- Origin */ - MODBIT(term.c.state, set, CURSOR_ORIGIN); - tmoveato(0, 0); - break; - case 7: /* DECAWM -- Auto wrap */ - MODBIT(term.mode, set, MODE_WRAP); - break; - case 0: /* Error (IGNORED) */ - case 2: /* DECANM -- ANSI/VT52 (IGNORED) */ - case 3: /* DECCOLM -- Column (IGNORED) */ - case 4: /* DECSCLM -- Scroll (IGNORED) */ - case 8: /* DECARM -- Auto repeat (IGNORED) */ - case 18: /* DECPFF -- Printer feed (IGNORED) */ - case 19: /* DECPEX -- Printer extent (IGNORED) */ - case 42: /* DECNRCM -- National characters (IGNORED) */ - case 12: /* att610 -- Start blinking cursor (IGNORED) */ - break; - case 25: /* DECTCEM -- Text Cursor Enable Mode */ - xsetmode(!set, MODE_HIDE); - break; - case 9: /* X10 mouse compatibility mode */ - xsetpointermotion(0); - xsetmode(0, MODE_MOUSE); - xsetmode(set, MODE_MOUSEX10); - break; - case 1000: /* 1000: report button press */ - xsetpointermotion(0); - xsetmode(0, MODE_MOUSE); - xsetmode(set, MODE_MOUSEBTN); - break; - case 1002: /* 1002: report motion on button press */ - xsetpointermotion(0); - xsetmode(0, MODE_MOUSE); - xsetmode(set, MODE_MOUSEMOTION); - break; - case 1003: /* 1003: enable all mouse motions */ - xsetpointermotion(set); - xsetmode(0, MODE_MOUSE); - xsetmode(set, MODE_MOUSEMANY); - break; - case 1004: /* 1004: send focus events to tty */ - xsetmode(set, MODE_FOCUS); - break; - case 1006: /* 1006: extended reporting mode */ - xsetmode(set, MODE_MOUSESGR); - break; - case 1034: - xsetmode(set, MODE_8BIT); - break; - case 1049: /* swap screen & set/restore cursor as xterm */ - if (!allowaltscreen) - break; - tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); - /* FALLTHROUGH */ - case 47: /* swap screen */ - case 1047: - if (!allowaltscreen) - break; - alt = IS_SET(MODE_ALTSCREEN); - if (alt) { - tclearregion(0, 0, term.col-1, - term.row-1); - } - if (set ^ alt) /* set is always 1 or 0 */ - tswapscreen(); - if (*args != 1049) - break; - /* FALLTHROUGH */ - case 1048: - tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); - break; - case 2004: /* 2004: bracketed paste mode */ - xsetmode(set, MODE_BRCKTPASTE); - break; - /* Not implemented mouse modes. See comments there. */ - case 1001: /* mouse highlight mode; can hang the - terminal by design when implemented. */ - case 1005: /* UTF-8 mouse mode; will confuse - applications not supporting UTF-8 - and luit. */ - 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", - *args); - break; - } - } else { - switch (*args) { - case 0: /* Error (IGNORED) */ - break; - case 2: - xsetmode(set, MODE_KBDLOCK); - break; - case 4: /* IRM -- Insertion-replacement */ - MODBIT(term.mode, set, MODE_INSERT); - break; - case 12: /* SRM -- Send/Receive */ - MODBIT(term.mode, !set, MODE_ECHO); - break; - case 20: /* LNM -- Linefeed/new line */ - MODBIT(term.mode, set, MODE_CRLF); - break; - default: - fprintf(stderr, - "erresc: unknown set/reset mode %d\n", - *args); - break; - } - } - } -} - -void -csihandle(void) -{ - char buf[40]; - int len; - - switch (csiescseq.mode[0]) { - default: - unknown: - fprintf(stderr, "erresc: unknown csi "); - csidump(); - /* die(""); */ - break; - case '@': /* ICH -- Insert blank char */ - DEFAULT(csiescseq.arg[0], 1); - tinsertblank(csiescseq.arg[0]); - break; - case 'A': /* CUU -- Cursor Up */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x, term.c.y-csiescseq.arg[0]); - break; - case 'B': /* CUD -- Cursor Down */ - case 'e': /* VPR --Cursor Down */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x, term.c.y+csiescseq.arg[0]); - break; - case 'i': /* MC -- Media Copy */ - switch (csiescseq.arg[0]) { - case 0: - tdump(); - break; - case 1: - tdumpline(term.c.y); - break; - case 2: - tdumpsel(); - break; - case 4: - term.mode &= ~MODE_PRINT; - break; - case 5: - term.mode |= MODE_PRINT; - break; - } - break; - case 'c': /* DA -- Device Attributes */ - if (csiescseq.arg[0] == 0) - ttywrite(vtiden, strlen(vtiden), 0); - break; - case 'b': /* REP -- if last char is printable print it more times */ - DEFAULT(csiescseq.arg[0], 1); - if (term.lastc) - while (csiescseq.arg[0]-- > 0) - tputc(term.lastc); - break; - case 'C': /* CUF -- Cursor Forward */ - case 'a': /* HPR -- Cursor Forward */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x+csiescseq.arg[0], term.c.y); - break; - case 'D': /* CUB -- Cursor Backward */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x-csiescseq.arg[0], term.c.y); - break; - case 'E': /* CNL -- Cursor Down and first col */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(0, term.c.y+csiescseq.arg[0]); - break; - case 'F': /* CPL -- Cursor Up and first col */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(0, term.c.y-csiescseq.arg[0]); - break; - case 'g': /* TBC -- Tabulation clear */ - switch (csiescseq.arg[0]) { - case 0: /* clear current tab stop */ - term.tabs[term.c.x] = 0; - break; - case 3: /* clear all the tabs */ - memset(term.tabs, 0, term.col * sizeof(*term.tabs)); - break; - default: - goto unknown; - } - break; - case 'G': /* CHA -- Move to */ - case '`': /* HPA */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(csiescseq.arg[0]-1, term.c.y); - break; - case 'H': /* CUP -- Move to */ - case 'f': /* HVP */ - DEFAULT(csiescseq.arg[0], 1); - DEFAULT(csiescseq.arg[1], 1); - tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1); - break; - case 'I': /* CHT -- Cursor Forward Tabulation tab stops */ - DEFAULT(csiescseq.arg[0], 1); - tputtab(csiescseq.arg[0]); - break; - case 'J': /* ED -- Clear screen */ - switch (csiescseq.arg[0]) { - case 0: /* below */ - tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); - if (term.c.y < term.row-1) { - tclearregion(0, term.c.y+1, term.col-1, - term.row-1); - } - break; - case 1: /* above */ - if (term.c.y > 1) - tclearregion(0, 0, term.col-1, term.c.y-1); - tclearregion(0, term.c.y, term.c.x, term.c.y); - break; - case 2: /* all */ - tclearregion(0, 0, term.col-1, term.row-1); - break; - default: - goto unknown; - } - break; - case 'K': /* EL -- Clear line */ - switch (csiescseq.arg[0]) { - case 0: /* right */ - tclearregion(term.c.x, term.c.y, term.col-1, - term.c.y); - break; - case 1: /* left */ - tclearregion(0, term.c.y, term.c.x, term.c.y); - break; - case 2: /* all */ - tclearregion(0, term.c.y, term.col-1, term.c.y); - break; - } - break; - case 'S': /* SU -- Scroll line up */ - DEFAULT(csiescseq.arg[0], 1); - tscrollup(term.top, csiescseq.arg[0], 0); - break; - case 'T': /* SD -- Scroll line down */ - DEFAULT(csiescseq.arg[0], 1); - tscrolldown(term.top, csiescseq.arg[0], 0); - break; - case 'L': /* IL -- Insert blank lines */ - DEFAULT(csiescseq.arg[0], 1); - tinsertblankline(csiescseq.arg[0]); - break; - case 'l': /* RM -- Reset Mode */ - tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg); - break; - case 'M': /* DL -- Delete lines */ - DEFAULT(csiescseq.arg[0], 1); - tdeleteline(csiescseq.arg[0]); - break; - case 'X': /* ECH -- Erase char */ - DEFAULT(csiescseq.arg[0], 1); - tclearregion(term.c.x, term.c.y, - term.c.x + csiescseq.arg[0] - 1, term.c.y); - break; - case 'P': /* DCH -- Delete char */ - DEFAULT(csiescseq.arg[0], 1); - tdeletechar(csiescseq.arg[0]); - break; - case 'Z': /* CBT -- Cursor Backward Tabulation tab stops */ - DEFAULT(csiescseq.arg[0], 1); - tputtab(-csiescseq.arg[0]); - break; - case 'd': /* VPA -- Move to */ - DEFAULT(csiescseq.arg[0], 1); - tmoveato(term.c.x, csiescseq.arg[0]-1); - break; - case 'h': /* SM -- Set terminal mode */ - tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg); - break; - case 'm': /* SGR -- Terminal attribute (color) */ - tsetattr(csiescseq.arg, csiescseq.narg); - break; - case 'n': /* DSR – Device Status Report (cursor position) */ - if (csiescseq.arg[0] == 6) { - len = snprintf(buf, sizeof(buf), "\033[%i;%iR", - term.c.y+1, term.c.x+1); - ttywrite(buf, len, 0); - } - break; - case 'r': /* DECSTBM -- Set Scrolling Region */ - if (csiescseq.priv) { - goto unknown; - } else { - DEFAULT(csiescseq.arg[0], 1); - DEFAULT(csiescseq.arg[1], term.row); - tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1); - tmoveato(0, 0); - } - break; - case 's': /* DECSC -- Save cursor position (ANSI.SYS) */ - tcursor(CURSOR_SAVE); - break; - case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */ - tcursor(CURSOR_LOAD); - break; - case ' ': - switch (csiescseq.mode[1]) { - case 'q': /* DECSCUSR -- Set Cursor Style */ - if (xsetcursor(csiescseq.arg[0])) - goto unknown; - break; - default: - goto unknown; - } - break; - } -} - -void -csidump(void) -{ - size_t i; - uint c; - - fprintf(stderr, "ESC["); - for (i = 0; i < csiescseq.len; i++) { - c = csiescseq.buf[i] & 0xff; - if (isprint(c)) { - putc(c, stderr); - } else if (c == '\n') { - fprintf(stderr, "(\\n)"); - } else if (c == '\r') { - fprintf(stderr, "(\\r)"); - } else if (c == 0x1b) { - fprintf(stderr, "(\\e)"); - } else { - fprintf(stderr, "(%02x)", c); - } - } - putc('\n', stderr); -} - -void -csireset(void) -{ - memset(&csiescseq, 0, sizeof(csiescseq)); -} - -void -strhandle(void) -{ - char *p = NULL, *dec; - int j, narg, par; - - term.esc &= ~(ESC_STR_END|ESC_STR); - strparse(); - par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0; - - switch (strescseq.type) { - case ']': /* OSC -- Operating System Command */ - switch (par) { - case 0: - case 1: - case 2: - if (narg > 1) - xsettitle(strescseq.args[1]); - return; - case 52: - if (narg > 2 && allowwindowops) { - 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; - p = strescseq.args[2]; - /* FALLTHROUGH */ - case 104: /* color reset, here p = NULL */ - j = (narg > 1) ? atoi(strescseq.args[1]) : -1; - if (xsetcolorname(j, 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 - * are dirty - */ - redraw(); - } - return; - } - break; - case 'k': /* old title set compatibility */ - xsettitle(strescseq.args[0]); - return; - case 'P': /* DCS -- Device Control String */ - case '_': /* APC -- Application Program Command */ - case '^': /* PM -- Privacy Message */ - return; - } - - fprintf(stderr, "erresc: unknown str "); - strdump(); -} - -void -strparse(void) -{ - int c; - char *p = strescseq.buf; - - strescseq.narg = 0; - strescseq.buf[strescseq.len] = '\0'; - - if (*p == '\0') - return; - - while (strescseq.narg < STR_ARG_SIZ) { - strescseq.args[strescseq.narg++] = p; - while ((c = *p) != ';' && c != '\0') - ++p; - if (c == '\0') - return; - *p++ = '\0'; - } -} - -void -strdump(void) -{ - size_t i; - uint c; - - fprintf(stderr, "ESC%c", strescseq.type); - for (i = 0; i < strescseq.len; i++) { - c = strescseq.buf[i] & 0xff; - if (c == '\0') { - putc('\n', stderr); - return; - } else if (isprint(c)) { - putc(c, stderr); - } else if (c == '\n') { - fprintf(stderr, "(\\n)"); - } else if (c == '\r') { - fprintf(stderr, "(\\r)"); - } else if (c == 0x1b) { - fprintf(stderr, "(\\e)"); - } else { - fprintf(stderr, "(%02x)", c); - } - } - fprintf(stderr, "ESC\\\n"); -} - -void -strreset(void) -{ - strescseq = (STREscape){ - .buf = xrealloc(strescseq.buf, STR_BUF_SIZ), - .siz = STR_BUF_SIZ, - }; -} - -void -sendbreak(const Arg *arg) -{ - if (tcsendbreak(cmdfd, 0)) - perror("Error sending break"); -} - -void -tprinter(char *s, size_t len) -{ - if (iofd != -1 && xwrite(iofd, s, len) < 0) { - perror("Error writing to output file"); - close(iofd); - iofd = -1; - } -} - -void -toggleprinter(const Arg *arg) -{ - term.mode ^= MODE_PRINT; -} - -void -printscreen(const Arg *arg) -{ - tdump(); -} - -void -printsel(const Arg *arg) -{ - tdumpsel(); -} - -void -tdumpsel(void) -{ - char *ptr; - - if ((ptr = getsel())) { - tprinter(ptr, strlen(ptr)); - free(ptr); - } -} - -void -tdumpline(int n) -{ - char buf[UTF_SIZ]; - Glyph *bp, *end; - - bp = &term.line[n][0]; - end = &bp[MIN(tlinelen(n), term.col) - 1]; - if (bp != end || bp->u != ' ') { - for ( ; bp <= end; ++bp) - tprinter(buf, utf8encode(bp->u, buf)); - } - tprinter("\n", 1); -} - -void -tdump(void) -{ - int i; - - for (i = 0; i < term.row; ++i) - tdumpline(i); -} - -void -tputtab(int n) -{ - uint x = term.c.x; - - if (n > 0) { - while (x < term.col && n--) - for (++x; x < term.col && !term.tabs[x]; ++x) - /* nothing */ ; - } else if (n < 0) { - while (x > 0 && n++) - for (--x; x > 0 && !term.tabs[x]; --x) - /* nothing */ ; - } - term.c.x = LIMIT(x, 0, term.col-1); -} - -void -tdefutf8(char ascii) -{ - if (ascii == 'G') - term.mode |= MODE_UTF8; - else if (ascii == '@') - term.mode &= ~MODE_UTF8; -} - -void -tdeftran(char ascii) -{ - static char cs[] = "0B"; - static int vcs[] = {CS_GRAPHIC0, CS_USA}; - char *p; - - if ((p = strchr(cs, ascii)) == NULL) { - fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii); - } else { - term.trantbl[term.icharset] = vcs[p - cs]; - } -} - -void -tdectest(char c) -{ - int x, y; - - if (c == '8') { /* DEC screen alignment test. */ - for (x = 0; x < term.col; ++x) { - for (y = 0; y < term.row; ++y) - tsetchar('E', &term.c.attr, x, y); - } - } -} - -void -tstrsequence(uchar c) -{ - switch (c) { - case 0x90: /* DCS -- Device Control String */ - c = 'P'; - break; - case 0x9f: /* APC -- Application Program Command */ - c = '_'; - break; - case 0x9e: /* PM -- Privacy Message */ - c = '^'; - break; - case 0x9d: /* OSC -- Operating System Command */ - c = ']'; - break; - } - strreset(); - strescseq.type = c; - term.esc |= ESC_STR; -} - -void -tcontrolcode(uchar ascii) -{ - switch (ascii) { - case '\t': /* HT */ - tputtab(1); - return; - case '\b': /* BS */ - tmoveto(term.c.x-1, term.c.y); - return; - case '\r': /* CR */ - tmoveto(0, term.c.y); - return; - case '\f': /* LF */ - case '\v': /* VT */ - case '\n': /* LF */ - /* go to first col if the mode is set */ - tnewline(IS_SET(MODE_CRLF)); - return; - case '\a': /* BEL */ - if (term.esc & ESC_STR_END) { - /* backwards compatibility to xterm */ - strhandle(); - } else { - xbell(); - } - break; - case '\033': /* ESC */ - csireset(); - term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST); - term.esc |= ESC_START; - return; - case '\016': /* SO (LS1 -- Locking shift 1) */ - case '\017': /* SI (LS0 -- Locking shift 0) */ - term.charset = 1 - (ascii - '\016'); - return; - case '\032': /* SUB */ - tsetchar('?', &term.c.attr, term.c.x, term.c.y); - /* FALLTHROUGH */ - case '\030': /* CAN */ - csireset(); - break; - case '\005': /* ENQ (IGNORED) */ - case '\000': /* NUL (IGNORED) */ - case '\021': /* XON (IGNORED) */ - case '\023': /* XOFF (IGNORED) */ - case 0177: /* DEL (IGNORED) */ - return; - case 0x80: /* TODO: PAD */ - case 0x81: /* TODO: HOP */ - case 0x82: /* TODO: BPH */ - case 0x83: /* TODO: NBH */ - case 0x84: /* TODO: IND */ - break; - case 0x85: /* NEL -- Next line */ - tnewline(1); /* always go to first col */ - break; - case 0x86: /* TODO: SSA */ - case 0x87: /* TODO: ESA */ - break; - case 0x88: /* HTS -- Horizontal tab stop */ - term.tabs[term.c.x] = 1; - break; - case 0x89: /* TODO: HTJ */ - case 0x8a: /* TODO: VTS */ - case 0x8b: /* TODO: PLD */ - case 0x8c: /* TODO: PLU */ - case 0x8d: /* TODO: RI */ - case 0x8e: /* TODO: SS2 */ - case 0x8f: /* TODO: SS3 */ - case 0x91: /* TODO: PU1 */ - case 0x92: /* TODO: PU2 */ - case 0x93: /* TODO: STS */ - case 0x94: /* TODO: CCH */ - case 0x95: /* TODO: MW */ - case 0x96: /* TODO: SPA */ - case 0x97: /* TODO: EPA */ - case 0x98: /* TODO: SOS */ - case 0x99: /* TODO: SGCI */ - break; - case 0x9a: /* DECID -- Identify Terminal */ - ttywrite(vtiden, strlen(vtiden), 0); - break; - case 0x9b: /* TODO: CSI */ - case 0x9c: /* TODO: ST */ - break; - case 0x90: /* DCS -- Device Control String */ - case 0x9d: /* OSC -- Operating System Command */ - case 0x9e: /* PM -- Privacy Message */ - case 0x9f: /* APC -- Application Program Command */ - tstrsequence(ascii); - return; - } - /* only CAN, SUB, \a and C1 chars interrupt a sequence */ - term.esc &= ~(ESC_STR_END|ESC_STR); -} - -/* - * returns 1 when the sequence is finished and it hasn't to read - * more characters for this sequence, otherwise 0 - */ -int -eschandle(uchar ascii) -{ - switch (ascii) { - case '[': - term.esc |= ESC_CSI; - return 0; - case '#': - term.esc |= ESC_TEST; - return 0; - case '%': - term.esc |= ESC_UTF8; - return 0; - case 'P': /* DCS -- Device Control String */ - case '_': /* APC -- Application Program Command */ - case '^': /* PM -- Privacy Message */ - case ']': /* OSC -- Operating System Command */ - case 'k': /* old title set compatibility */ - tstrsequence(ascii); - return 0; - case 'n': /* LS2 -- Locking shift 2 */ - case 'o': /* LS3 -- Locking shift 3 */ - term.charset = 2 + (ascii - 'n'); - break; - case '(': /* GZD4 -- set primary charset G0 */ - case ')': /* G1D4 -- set secondary charset G1 */ - case '*': /* G2D4 -- set tertiary charset G2 */ - case '+': /* G3D4 -- set quaternary charset G3 */ - term.icharset = ascii - '('; - term.esc |= ESC_ALTCHARSET; - return 0; - case 'D': /* IND -- Linefeed */ - if (term.c.y == term.bot) { - tscrollup(term.top, 1, 1); - } else { - tmoveto(term.c.x, term.c.y+1); - } - break; - case 'E': /* NEL -- Next line */ - tnewline(1); /* always go to first col */ - break; - case 'H': /* HTS -- Horizontal tab stop */ - term.tabs[term.c.x] = 1; - break; - case 'M': /* RI -- Reverse index */ - if (term.c.y == term.top) { - tscrolldown(term.top, 1, 1); - } else { - tmoveto(term.c.x, term.c.y-1); - } - break; - case 'Z': /* DECID -- Identify Terminal */ - ttywrite(vtiden, strlen(vtiden), 0); - break; - case 'c': /* RIS -- Reset to initial state */ - treset(); - resettitle(); - xloadcols(); - break; - case '=': /* DECPAM -- Application keypad */ - xsetmode(1, MODE_APPKEYPAD); - break; - case '>': /* DECPNM -- Normal keypad */ - xsetmode(0, MODE_APPKEYPAD); - break; - case '7': /* DECSC -- Save Cursor */ - tcursor(CURSOR_SAVE); - break; - case '8': /* DECRC -- Restore Cursor */ - tcursor(CURSOR_LOAD); - break; - case '\\': /* ST -- String Terminator */ - if (term.esc & ESC_STR_END) - strhandle(); - break; - default: - fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", - (uchar) ascii, isprint(ascii)? ascii:'.'); - break; - } - return 1; -} - -void -tputc(Rune u) -{ - char c[UTF_SIZ]; - int control; - int width, len; - Glyph *gp; - - control = ISCONTROL(u); - if (u < 127 || !IS_SET(MODE_UTF8)) { - c[0] = u; - width = len = 1; - } else { - len = utf8encode(u, c); - if (!control && (width = wcwidth(u)) == -1) - width = 1; - } - - if (IS_SET(MODE_PRINT)) - tprinter(c, len); - - /* - * STR sequence must be checked before anything else - * because it uses all following characters until it - * receives a ESC, a SUB, a ST or any other C1 control - * character. - */ - if (term.esc & ESC_STR) { - if (u == '\a' || u == 030 || u == 032 || u == 033 || - ISCONTROLC1(u)) { - term.esc &= ~(ESC_START|ESC_STR); - term.esc |= ESC_STR_END; - goto check_control_code; - } - - if (strescseq.len+len >= strescseq.siz) { - /* - * Here is a bug in terminals. If the user never sends - * some code to stop the str or esc command, then st - * will stop responding. But this is better than - * silently failing with unknown characters. At least - * then users will report back. - * - * In the case users ever get fixed, here is the code: - */ - /* - * term.esc = 0; - * strhandle(); - */ - if (strescseq.siz > (SIZE_MAX - UTF_SIZ) / 2) - return; - strescseq.siz *= 2; - strescseq.buf = xrealloc(strescseq.buf, strescseq.siz); - } - - memmove(&strescseq.buf[strescseq.len], c, len); - strescseq.len += len; - return; - } - -check_control_code: - /* - * Actions of control codes must be performed as soon they arrive - * because they can be embedded inside a control sequence, and - * they must not cause conflicts with sequences. - */ - if (control) { - tcontrolcode(u); - /* - * control codes are not shown ever - */ - if (!term.esc) - term.lastc = 0; - return; - } else if (term.esc & ESC_START) { - if (term.esc & ESC_CSI) { - csiescseq.buf[csiescseq.len++] = u; - if (BETWEEN(u, 0x40, 0x7E) - || csiescseq.len >= \ - sizeof(csiescseq.buf)-1) { - term.esc = 0; - csiparse(); - csihandle(); - } - return; - } else if (term.esc & ESC_UTF8) { - tdefutf8(u); - } else if (term.esc & ESC_ALTCHARSET) { - tdeftran(u); - } else if (term.esc & ESC_TEST) { - tdectest(u); - } else { - if (!eschandle(u)) - return; - /* sequence already finished */ - } - term.esc = 0; - /* - * All characters which form part of a sequence are not - * printed - */ - return; - } - if (selected(term.c.x, term.c.y)) - selclear(); - - gp = &term.line[term.c.y][term.c.x]; - if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) { - gp->mode |= ATTR_WRAP; - tnewline(1); - gp = &term.line[term.c.y][term.c.x]; - } - - if (IS_SET(MODE_INSERT) && term.c.x+width < term.col) - memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph)); - - if (term.c.x+width > term.col) { - tnewline(1); - gp = &term.line[term.c.y][term.c.x]; - } - - tsetchar(u, &term.c.attr, term.c.x, term.c.y); - term.lastc = u; - - if (width == 2) { - gp->mode |= ATTR_WIDE; - if (term.c.x+1 < term.col) { - gp[1].u = '\0'; - gp[1].mode = ATTR_WDUMMY; - } - } - if (term.c.x+width < term.col) { - tmoveto(term.c.x+width, term.c.y); - } else { - term.c.state |= CURSOR_WRAPNEXT; - } -} - -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)) { - /* 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) -{ - int i, j; - int minrow = MIN(row, term.row); - int mincol = MIN(col, term.col); - int *bp; - TCursor c; - - if (col < 1 || row < 1) { - fprintf(stderr, - "tresize: error resizing to %dx%d\n", col, row); - return; - } - - /* - * slide screen to keep cursor where we expect it - - * tscrollup would work here, but we can optimize to - * memmove because we're freeing the earlier lines - */ - for (i = 0; i <= term.c.y - row; i++) { - free(term.line[i]); - free(term.alt[i]); - } - /* ensure that both src and dst are not NULL */ - if (i > 0) { - memmove(term.line, term.line + i, row * sizeof(Line)); - memmove(term.alt, term.alt + i, row * sizeof(Line)); - } - for (i += row; i < term.row; i++) { - free(term.line[i]); - free(term.alt[i]); - } - - /* resize to new height */ - term.line = xrealloc(term.line, row * sizeof(Line)); - term.alt = xrealloc(term.alt, row * sizeof(Line)); - term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); - term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); - - for (i = 0; i < HISTSIZE; i++) { - term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); - for (j = mincol; j < col; j++) { - term.hist[i][j] = term.c.attr; - term.hist[i][j].u = ' '; - } - } - - /* resize each row to new width, zero-pad if needed */ - for (i = 0; i < minrow; i++) { - term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); - term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph)); - } - - /* allocate any new rows */ - for (/* i = minrow */; i < row; i++) { - term.line[i] = xmalloc(col * sizeof(Glyph)); - term.alt[i] = xmalloc(col * sizeof(Glyph)); - } - if (col > term.col) { - bp = term.tabs + term.col; - - memset(bp, 0, sizeof(*term.tabs) * (col - term.col)); - while (--bp > term.tabs && !*bp) - /* nothing */ ; - for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces) - *bp = 1; - } - /* update terminal size */ - term.col = col; - term.row = row; - /* reset scrolling region */ - tsetscroll(0, row-1); - /* make use of the LIMIT in tmoveto */ - tmoveto(term.c.x, term.c.y); - /* Clearing both screens (it makes dirty all lines) */ - c = term.c; - for (i = 0; i < 2; i++) { - if (mincol < col && 0 < minrow) { - tclearregion(mincol, 0, col - 1, minrow - 1); - } - if (0 < col && minrow < row) { - tclearregion(0, minrow, col - 1, row - 1); - } - tswapscreen(); - tcursor(CURSOR_LOAD); - } - term.c = c; -} - -void -resettitle(void) -{ - xsettitle(NULL); -} - -void -drawregion(int x1, int y1, int x2, int y2) -{ - int y; - - for (y = y1; y < y2; y++) { - if (!term.dirty[y]) - continue; - - term.dirty[y] = 0; - xdrawline(TLINE(y), x1, y, x2); - } -} - -void -draw(void) -{ - int cx = term.c.x, ocx = term.ocx, ocy = term.ocy; - - if (!xstartdraw()) - return; - - /* 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--; - - drawregion(0, 0, term.col, term.row); - if (term.scr == 0) - 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(); - if (ocx != term.ocx || ocy != term.ocy) - xximspot(term.ocx, term.ocy); -} - -void -redraw(void) -{ - tfulldirt(); - draw(); -} diff --git a/st-0.8.4/st.c.orig b/st-0.8.4/st.c.orig deleted file mode 100644 index 76b7e0d..0000000 --- a/st-0.8.4/st.c.orig +++ /dev/null @@ -1,2597 +0,0 @@ -/* See LICENSE for license details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "st.h" -#include "win.h" - -#if defined(__linux) - #include -#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) - #include -#elif defined(__FreeBSD__) || defined(__DragonFly__) - #include -#endif - -/* 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 - -/* macros */ -#define IS_SET(flag) ((term.mode & (flag)) != 0) -#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == 0x7f) -#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) -#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) -#define ISDELIM(u) (u && wcschr(worddelimiters, u)) - -enum term_mode { - MODE_WRAP = 1 << 0, - MODE_INSERT = 1 << 1, - MODE_ALTSCREEN = 1 << 2, - MODE_CRLF = 1 << 3, - MODE_ECHO = 1 << 4, - MODE_PRINT = 1 << 5, - MODE_UTF8 = 1 << 6, -}; - -enum cursor_movement { - CURSOR_SAVE, - CURSOR_LOAD -}; - -enum cursor_state { - CURSOR_DEFAULT = 0, - CURSOR_WRAPNEXT = 1, - CURSOR_ORIGIN = 2 -}; - -enum charset { - CS_GRAPHIC0, - CS_GRAPHIC1, - CS_UK, - CS_USA, - CS_MULTI, - CS_GER, - CS_FIN -}; - -enum escape_state { - ESC_START = 1, - ESC_CSI = 2, - ESC_STR = 4, /* DCS, OSC, PM, APC */ - ESC_ALTCHARSET = 8, - ESC_STR_END = 16, /* a final string was encountered */ - ESC_TEST = 32, /* Enter in test mode */ - ESC_UTF8 = 64, -}; - -typedef struct { - Glyph attr; /* current char attributes */ - int x; - int y; - char state; -} TCursor; - -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; - - int alt; -} Selection; - -/* Internal representation of the screen */ -typedef struct { - int row; /* nb row */ - int col; /* nb col */ - Line *line; /* screen */ - Line *alt; /* alternate screen */ - 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 */ - int esc; /* escape state flags */ - char trantbl[4]; /* charset table translation */ - int charset; /* current charset */ - int icharset; /* selected charset for sequence */ - int *tabs; - Rune lastc; /* last printed char outside of sequence, 0 if control */ -} Term; - -/* CSI Escape sequence structs */ -/* ESC '[' [[ [] [;]] []] */ -typedef struct { - char buf[ESC_BUF_SIZ]; /* raw string */ - size_t 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 { - char type; /* ESC type ... */ - char *buf; /* allocated raw string */ - size_t siz; /* allocation size */ - size_t len; /* raw string length */ - char *args[STR_ARG_SIZ]; - int narg; /* nb of args */ -} STREscape; - -static void execsh(char *, char **); -static void stty(char **); -static void sigchld(int); -static void ttywriteraw(const char *, size_t); - -static void csidump(void); -static void csihandle(void); -static void csiparse(void); -static void csireset(void); -static int eschandle(uchar); -static void strdump(void); -static void strhandle(void); -static void strparse(void); -static void strreset(void); - -static void tprinter(char *, size_t); -static void tdumpsel(void); -static void tdumpline(int); -static void tdump(void); -static void tclearregion(int, int, int, int); -static void tcursor(int); -static void tdeletechar(int); -static void tdeleteline(int); -static void tinsertblank(int); -static void tinsertblankline(int); -static int tlinelen(int); -static void tmoveto(int, int); -static void tmoveato(int, int); -static void tnewline(int); -static void tputtab(int); -static void tputc(Rune); -static void treset(void); -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 tsetmode(int, int, int *, int); -static int twrite(const char *, int, int); -static void tfulldirt(void); -static void tcontrolcode(uchar ); -static void tdectest(char ); -static void tdefutf8(char); -static int32_t tdefcolor(int *, int *, int); -static void tdeftran(char); -static void tstrsequence(uchar); - -static void drawregion(int, int, int, int); - -static void selnormalize(void); -static void selscroll(int, int); -static void selsnap(int *, int *, int); - -static size_t utf8decode(const char *, Rune *, size_t); -static Rune utf8decodebyte(char, size_t *); -static char utf8encodebyte(Rune, size_t); -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); - -/* Globals */ -static Term term; -static Selection sel; -static CSIEscape csiescseq; -static STREscape strescseq; -static int iofd = 1; -static int cmdfd; -static pid_t pid; - -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}; - -ssize_t -xwrite(int fd, const char *s, size_t len) -{ - size_t aux = len; - ssize_t r; - - while (len > 0) { - r = write(fd, s, len); - if (r < 0) - return r; - len -= r; - s += r; - } - - return aux; -} - -void * -xmalloc(size_t len) -{ - void *p; - - if (!(p = malloc(len))) - die("malloc: %s\n", strerror(errno)); - - return p; -} - -void * -xrealloc(void *p, size_t len) -{ - if ((p = realloc(p, len)) == NULL) - die("realloc: %s\n", strerror(errno)); - - return p; -} - -char * -xstrdup(char *s) -{ - if ((s = strdup(s)) == NULL) - die("strdup: %s\n", strerror(errno)); - - return s; -} - -size_t -utf8decode(const char *c, Rune *u, size_t clen) -{ - size_t i, j, len, type; - Rune udecoded; - - *u = UTF_INVALID; - if (!clen) - return 0; - udecoded = utf8decodebyte(c[0], &len); - if (!BETWEEN(len, 1, UTF_SIZ)) - return 1; - for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { - udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); - if (type != 0) - return j; - } - if (j < len) - return 0; - *u = udecoded; - utf8validate(u, len); - - return len; -} - -Rune -utf8decodebyte(char c, size_t *i) -{ - for (*i = 0; *i < LEN(utfmask); ++(*i)) - if (((uchar)c & utfmask[*i]) == utfbyte[*i]) - return (uchar)c & ~utfmask[*i]; - - return 0; -} - -size_t -utf8encode(Rune u, char *c) -{ - size_t len, i; - - len = utf8validate(&u, 0); - if (len > UTF_SIZ) - return 0; - - for (i = len - 1; i != 0; --i) { - c[i] = utf8encodebyte(u, 0); - u >>= 6; - } - c[0] = utf8encodebyte(u, len); - - return len; -} - -char -utf8encodebyte(Rune u, size_t i) -{ - return utfbyte[i] | (u & ~utfmask[i]); -} - -size_t -utf8validate(Rune *u, size_t i) -{ - if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) - *u = UTF_INVALID; - for (i = 1; *u > utfmax[i]; ++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 ? *((*src)++) : '='; /* emulate padding if string ends */ -} - -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)]; - - /* invalid input. 'a' can be -1, e.g. if src is "\n" (c-str) */ - if (a == -1 || b == -1) - break; - - *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) -{ - sel.mode = SEL_IDLE; - sel.snap = 0; - sel.ob.x = -1; -} - -int -tlinelen(int y) -{ - 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 i; -} - -void -selstart(int col, int row, int snap) -{ - 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(); - - if (sel.snap != 0) - sel.mode = SEL_READY; - tsetdirt(sel.nb.y, sel.ne.y); -} - -void -selextend(int col, int row, int type, int done) -{ - int oldey, oldex, oldsby, oldsey, oldtype; - - if (sel.mode == SEL_IDLE) - return; - if (done && sel.mode == SEL_EMPTY) { - selclear(); - return; - } - - oldey = sel.oe.y; - oldex = sel.oe.x; - oldsby = sel.nb.y; - oldsey = sel.ne.y; - oldtype = sel.type; - - 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 -selnormalize(void) -{ - int i; - - if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { - sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x; - sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x; - } else { - sel.nb.x = MIN(sel.ob.x, sel.oe.x); - sel.ne.x = MAX(sel.ob.x, sel.oe.x); - } - sel.nb.y = MIN(sel.ob.y, sel.oe.y); - sel.ne.y = MAX(sel.ob.y, sel.oe.y); - - selsnap(&sel.nb.x, &sel.nb.y, -1); - selsnap(&sel.ne.x, &sel.ne.y, +1); - - /* expand selection over line breaks */ - if (sel.type == SEL_RECTANGULAR) - return; - i = tlinelen(sel.nb.y); - if (i < sel.nb.x) - sel.nb.x = i; - if (tlinelen(sel.ne.y) <= sel.ne.x) - sel.ne.x = term.col - 1; -} - -int -selected(int x, int y) -{ - if (sel.mode == SEL_EMPTY || sel.ob.x == -1 || - sel.alt != IS_SET(MODE_ALTSCREEN)) - return 0; - - if (sel.type == SEL_RECTANGULAR) - return BETWEEN(y, sel.nb.y, sel.ne.y) - && BETWEEN(x, sel.nb.x, sel.ne.x); - - return BETWEEN(y, sel.nb.y, sel.ne.y) - && (y != sel.nb.y || x >= sel.nb.x) - && (y != sel.ne.y || x <= sel.ne.x); -} - -void -selsnap(int *x, int *y, int direction) -{ - int newx, newy, xt, yt; - int delim, prevdelim; - Glyph *gp, *prevgp; - - switch (sel.snap) { - case SNAP_WORD: - /* - * Snap around if the word wraps around at the end or - * beginning of a line. - */ - prevgp = &term.line[*y][*x]; - prevdelim = ISDELIM(prevgp->u); - for (;;) { - newx = *x + direction; - newy = *y; - if (!BETWEEN(newx, 0, term.col - 1)) { - newy += direction; - newx = (newx + term.col) % term.col; - if (!BETWEEN(newy, 0, term.row - 1)) - break; - - if (direction > 0) - yt = *y, xt = *x; - else - yt = newy, xt = newx; - if (!(term.line[yt][xt].mode & ATTR_WRAP)) - break; - } - - if (newx >= tlinelen(newy)) - break; - - gp = &term.line[newy][newx]; - delim = ISDELIM(gp->u); - if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim - || (delim && gp->u != prevgp->u))) - break; - - *x = newx; - *y = newy; - prevgp = gp; - prevdelim = delim; - } - break; - case SNAP_LINE: - /* - * Snap around if the the previous line or the current one - * has set ATTR_WRAP at its end. Then the whole next or - * previous line will be selected. - */ - *x = (direction < 0) ? 0 : term.col - 1; - if (direction < 0) { - for (; *y > 0; *y += direction) { - if (!(term.line[*y-1][term.col-1].mode - & ATTR_WRAP)) { - break; - } - } - } else if (direction > 0) { - for (; *y < term.row-1; *y += direction) { - if (!(term.line[*y][term.col-1].mode - & ATTR_WRAP)) { - break; - } - } - } - break; - } -} - -char * -getsel(void) -{ - char *str, *ptr; - int y, bufsize, lastx, linelen; - Glyph *gp, *last; - - if (sel.ob.x == -1) - return NULL; - - bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ; - ptr = str = xmalloc(bufsize); - - /* append every set & selected glyph to the selection */ - for (y = sel.nb.y; y <= sel.ne.y; y++) { - if ((linelen = tlinelen(y)) == 0) { - *ptr++ = '\n'; - continue; - } - - if (sel.type == SEL_RECTANGULAR) { - gp = &term.line[y][sel.nb.x]; - lastx = sel.ne.x; - } else { - gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; - lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; - } - last = &term.line[y][MIN(lastx, linelen-1)]; - while (last >= gp && last->u == ' ') - --last; - - for ( ; gp <= last; ++gp) { - if (gp->mode & ATTR_WDUMMY) - continue; - - ptr += utf8encode(gp->u, ptr); - } - - /* - * Copy and pasting of line endings is inconsistent - * in the inconsistent terminal and GUI world. - * The best solution seems like to produce '\n' when - * something is copied from st and convert '\n' to - * '\r', when something to be pasted is received by - * st. - * FIXME: Fix the computer world. - */ - if ((y < sel.ne.y || lastx >= linelen) && - (!(last->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR)) - *ptr++ = '\n'; - } - *ptr = 0; - return str; -} - -void -selclear(void) -{ - if (sel.ob.x == -1) - return; - sel.mode = SEL_IDLE; - sel.ob.x = -1; - tsetdirt(sel.nb.y, sel.ne.y); -} - -void -die(const char *errstr, ...) -{ - va_list ap; - - va_start(ap, errstr); - vfprintf(stderr, errstr, ap); - va_end(ap); - exit(1); -} - -void -execsh(char *cmd, char **args) -{ - char *sh, *prog, *arg; - const struct passwd *pw; - - errno = 0; - if ((pw = getpwuid(getuid())) == NULL) { - if (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 : cmd; - - if (args) { - prog = args[0]; - arg = NULL; - } else if (scroll) { - prog = scroll; - arg = utmp ? utmp : sh; - } else if (utmp) { - prog = utmp; - arg = NULL; - } else { - prog = sh; - arg = NULL; - } - DEFAULT(args, ((char *[]) {prog, arg, NULL})); - - unsetenv("COLUMNS"); - unsetenv("LINES"); - unsetenv("TERMCAP"); - setenv("LOGNAME", pw->pw_name, 1); - setenv("USER", pw->pw_name, 1); - setenv("SHELL", sh, 1); - setenv("HOME", pw->pw_dir, 1); - setenv("TERM", termname, 1); - - signal(SIGCHLD, SIG_DFL); - signal(SIGHUP, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGALRM, SIG_DFL); - - execvp(prog, args); - _exit(1); -} - -void -sigchld(int a) -{ - int stat; - pid_t p; - - if ((p = waitpid(pid, &stat, WNOHANG)) < 0) - die("waiting for pid %hd failed: %s\n", pid, strerror(errno)); - - if (pid != p) - return; - - 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(char **args) -{ - char cmd[_POSIX_ARG_MAX], **p, *q, *s; - size_t n, siz; - - if ((n = strlen(stty_args)) > sizeof(cmd)-1) - die("incorrect stty parameters\n"); - memcpy(cmd, stty_args, n); - q = cmd + n; - siz = sizeof(cmd) - n; - for (p = args; p && (s = *p); ++p) { - if ((n = strlen(s)) > siz-1) - die("stty parameter length too long\n"); - *q++ = ' '; - memcpy(q, s, n); - q += n; - siz -= n + 1; - } - *q = '\0'; - if (system(cmd) != 0) - perror("Couldn't call stty"); -} - -int -ttynew(char *line, char *cmd, char *out, char **args) -{ - int m, s; - - if (out) { - term.mode |= MODE_PRINT; - iofd = (!strcmp(out, "-")) ? - 1 : open(out, O_WRONLY | O_CREAT, 0666); - if (iofd < 0) { - fprintf(stderr, "Error opening %s:%s\n", - out, 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(args); - return cmdfd; - } - - /* seems to work fine on linux, openbsd and freebsd */ - if (openpty(&m, &s, NULL, NULL, NULL) < 0) - die("openpty failed: %s\n", strerror(errno)); - - switch (pid = fork()) { - case -1: - die("fork failed: %s\n", strerror(errno)); - break; - case 0: - close(iofd); - setsid(); /* create a new process group */ - dup2(s, 0); - dup2(s, 1); - dup2(s, 2); - if (ioctl(s, TIOCSCTTY, NULL) < 0) - die("ioctl TIOCSCTTY failed: %s\n", strerror(errno)); - close(s); - close(m); -#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 -ttyread(void) -{ - static char buf[BUFSIZ]; - static int buflen = 0; - int ret, written; - - /* append read bytes to unprocessed bytes */ - ret = read(cmdfd, buf+buflen, LEN(buf)-buflen); - - switch (ret) { - case 0: - exit(0); - case -1: - die("couldn't read from shell: %s\n", strerror(errno)); - default: - buflen += ret; - written = twrite(buf, buflen, 0); - buflen -= written; - /* keep any incomplete UTF-8 byte sequence for the next call */ - if (buflen > 0) - memmove(buf, buf + written, buflen); - return ret; - } -} - -void -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; - size_t lim = 256; - - /* - * Remember that we are using a pty, which might be a modem line. - * Writing too much will clog the line. That's why we are doing this - * dance. - * FIXME: Migrate the world to Plan 9. - */ - while (n > 0) { - FD_ZERO(&wfd); - FD_ZERO(&rfd); - FD_SET(cmdfd, &wfd); - FD_SET(cmdfd, &rfd); - - /* Check if we can write. */ - if (pselect(cmdfd+1, &rfd, &wfd, NULL, NULL, NULL) < 0) { - if (errno == EINTR) - continue; - die("select failed: %s\n", strerror(errno)); - } - if (FD_ISSET(cmdfd, &wfd)) { - /* - * Only write the bytes written by ttywrite() or the - * default of 256. This seems to be a reasonable value - * for a serial line. Bigger values might clog the I/O. - */ - if ((r = write(cmdfd, s, (n < lim)? n : lim)) < 0) - goto write_error; - if (r < n) { - /* - * We weren't able to write out everything. - * This means the buffer is getting full - * again. Empty it. - */ - if (n < lim) - lim = ttyread(); - n -= r; - s += r; - } else { - /* All bytes have been written. */ - break; - } - } - if (FD_ISSET(cmdfd, &rfd)) - lim = ttyread(); - } - return; - -write_error: - die("write error on tty: %s\n", strerror(errno)); -} - -void -ttyresize(int tw, int th) -{ - struct winsize w; - - w.ws_row = term.row; - w.ws_col = term.col; - 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) -{ - int i, j; - - for (i = 0; i < term.row-1; i++) { - for (j = 0; j < term.col-1; j++) { - if (term.line[i][j].mode & attr) - return 1; - } - } - - return 0; -} - -void -tsetdirt(int top, int bot) -{ - int i; - - LIMIT(top, 0, term.row-1); - LIMIT(bot, 0, term.row-1); - - for (i = top; i <= bot; i++) - term.dirty[i] = 1; -} - -void -tsetdirtattr(int attr) -{ - int i, j; - - for (i = 0; i < term.row-1; i++) { - for (j = 0; j < term.col-1; j++) { - if (term.line[i][j].mode & attr) { - tsetdirt(i, i); - break; - } - } - } -} - -void -tfulldirt(void) -{ - tsetdirt(0, term.row-1); -} - -void -tcursor(int mode) -{ - static TCursor c[2]; - int alt = IS_SET(MODE_ALTSCREEN); - - if (mode == CURSOR_SAVE) { - c[alt] = term.c; - } else if (mode == CURSOR_LOAD) { - term.c = c[alt]; - tmoveto(c[alt].x, c[alt].y); - } -} - -void -treset(void) -{ - uint i; - - term.c = (TCursor){{ - .mode = ATTR_NULL, - .fg = defaultfg, - .bg = defaultbg - }, .x = 0, .y = 0, .state = CURSOR_DEFAULT}; - - memset(term.tabs, 0, term.col * sizeof(*term.tabs)); - for (i = tabspaces; i < term.col; i += tabspaces) - term.tabs[i] = 1; - term.top = 0; - term.bot = term.row - 1; - term.mode = MODE_WRAP|MODE_UTF8; - memset(term.trantbl, CS_USA, sizeof(term.trantbl)); - term.charset = 0; - - for (i = 0; i < 2; i++) { - tmoveto(0, 0); - tcursor(CURSOR_SAVE); - tclearregion(0, 0, term.col-1, term.row-1); - tswapscreen(); - } -} - -void -tnew(int col, int row) -{ - term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } }; - tresize(col, row); - treset(); -} - -void -tswapscreen(void) -{ - Line *tmp = term.line; - - term.line = term.alt; - term.alt = tmp; - term.mode ^= MODE_ALTSCREEN; - tfulldirt(); -} - -void -tscrolldown(int orig, int n) -{ - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - - tsetdirt(orig, term.bot-n); - tclearregion(0, term.bot-n+1, term.col-1, term.bot); - - for (i = term.bot; i >= orig+n; i--) { - temp = term.line[i]; - term.line[i] = term.line[i-n]; - term.line[i-n] = temp; - } - - selscroll(orig, n); -} - -void -tscrollup(int orig, int n) -{ - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - - tclearregion(0, orig, term.col-1, orig+n-1); - tsetdirt(orig+n, term.bot); - - for (i = orig; i <= term.bot-n; i++) { - temp = term.line[i]; - term.line[i] = term.line[i+n]; - term.line[i+n] = temp; - } - - selscroll(orig, -n); -} - -void -selscroll(int orig, int n) -{ - if (sel.ob.x == -1) - return; - - if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) { - selclear(); - } else if (BETWEEN(sel.nb.y, orig, term.bot)) { - sel.ob.y += n; - sel.oe.y += n; - if (sel.ob.y < term.top || sel.ob.y > term.bot || - sel.oe.y < term.top || sel.oe.y > term.bot) { - selclear(); - } else { - selnormalize(); - } - } -} - -void -tnewline(int first_col) -{ - int y = term.c.y; - - if (y == term.bot) { - tscrollup(term.top, 1); - } else { - y++; - } - tmoveto(first_col ? 0 : term.c.x, y); -} - -void -csiparse(void) -{ - char *p = csiescseq.buf, *np; - long int v; - - csiescseq.narg = 0; - if (*p == '?') { - csiescseq.priv = 1; - p++; - } - - csiescseq.buf[csiescseq.len] = '\0'; - while (p < csiescseq.buf+csiescseq.len) { - np = NULL; - v = strtol(p, &np, 10); - if (np == p) - v = 0; - if (v == LONG_MAX || v == LONG_MIN) - v = -1; - csiescseq.arg[csiescseq.narg++] = v; - p = np; - if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ) - break; - p++; - } - csiescseq.mode[0] = *p++; - csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0'; -} - -/* for absolute user moves, when decom is set */ -void -tmoveato(int x, int y) -{ - tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0)); -} - -void -tmoveto(int x, int y) -{ - int miny, maxy; - - if (term.c.state & CURSOR_ORIGIN) { - miny = term.top; - maxy = term.bot; - } else { - miny = 0; - maxy = term.row - 1; - } - term.c.state &= ~CURSOR_WRAPNEXT; - term.c.x = LIMIT(x, 0, term.col-1); - term.c.y = LIMIT(y, miny, maxy); -} - -void -tsetchar(Rune u, Glyph *attr, int x, int y) -{ - static char *vt100_0[62] = { /* 0x41 - 0x7e */ - "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */ - 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */ - 0, 0, 0, 0, 0, 0, 0, 0, /* P - W */ - 0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */ - "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */ - "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */ - "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */ - "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */ - }; - - /* - * The table is proudly stolen from rxvt. - */ - if (term.trantbl[term.charset] == CS_GRAPHIC0 && - BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41]) - utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ); - - if (term.line[y][x].mode & ATTR_WIDE) { - if (x+1 < term.col) { - term.line[y][x+1].u = ' '; - term.line[y][x+1].mode &= ~ATTR_WDUMMY; - } - } else if (term.line[y][x].mode & ATTR_WDUMMY) { - term.line[y][x-1].u = ' '; - term.line[y][x-1].mode &= ~ATTR_WIDE; - } - - term.dirty[y] = 1; - term.line[y][x] = *attr; - term.line[y][x].u = u; -} - -void -tclearregion(int x1, int y1, int x2, int y2) -{ - int x, y, temp; - Glyph *gp; - - if (x1 > x2) - temp = x1, x1 = x2, x2 = temp; - if (y1 > y2) - temp = y1, y1 = y2, y2 = temp; - - LIMIT(x1, 0, term.col-1); - LIMIT(x2, 0, term.col-1); - LIMIT(y1, 0, term.row-1); - LIMIT(y2, 0, term.row-1); - - for (y = y1; y <= y2; y++) { - term.dirty[y] = 1; - for (x = x1; x <= x2; x++) { - gp = &term.line[y][x]; - if (selected(x, y)) - selclear(); - gp->fg = term.c.attr.fg; - gp->bg = term.c.attr.bg; - gp->mode = 0; - gp->u = ' '; - } - } -} - -void -tdeletechar(int n) -{ - int dst, src, size; - Glyph *line; - - LIMIT(n, 0, term.col - term.c.x); - - dst = term.c.x; - src = term.c.x + n; - size = term.col - src; - line = term.line[term.c.y]; - - memmove(&line[dst], &line[src], size * sizeof(Glyph)); - tclearregion(term.col-n, term.c.y, term.col-1, term.c.y); -} - -void -tinsertblank(int n) -{ - int dst, src, size; - Glyph *line; - - LIMIT(n, 0, term.col - term.c.x); - - dst = term.c.x + n; - src = term.c.x; - size = term.col - dst; - line = term.line[term.c.y]; - - memmove(&line[dst], &line[src], size * sizeof(Glyph)); - tclearregion(src, term.c.y, dst - 1, term.c.y); -} - -void -tinsertblankline(int n) -{ - if (BETWEEN(term.c.y, term.top, term.bot)) - tscrolldown(term.c.y, n); -} - -void -tdeleteline(int n) -{ - if (BETWEEN(term.c.y, term.top, term.bot)) - tscrollup(term.c.y, n); -} - -int32_t -tdefcolor(int *attr, int *npar, int l) -{ - int32_t idx = -1; - uint r, g, b; - - switch (attr[*npar + 1]) { - case 2: /* direct color in RGB space */ - if (*npar + 4 >= l) { - fprintf(stderr, - "erresc(38): Incorrect number of parameters (%d)\n", - *npar); - break; - } - r = attr[*npar + 2]; - g = attr[*npar + 3]; - b = attr[*npar + 4]; - *npar += 4; - if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255)) - fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n", - r, g, b); - else - idx = TRUECOLOR(r, g, b); - break; - case 5: /* indexed color */ - if (*npar + 2 >= l) { - fprintf(stderr, - "erresc(38): Incorrect number of parameters (%d)\n", - *npar); - break; - } - *npar += 2; - if (!BETWEEN(attr[*npar], 0, 255)) - fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]); - else - idx = attr[*npar]; - break; - case 0: /* implemented defined (only foreground) */ - case 1: /* transparent */ - case 3: /* direct color in CMY space */ - case 4: /* direct color in CMYK space */ - default: - fprintf(stderr, - "erresc(38): gfx attr %d unknown\n", attr[*npar]); - break; - } - - return idx; -} - -void -tsetattr(int *attr, int l) -{ - int i; - int32_t idx; - - for (i = 0; i < l; i++) { - switch (attr[i]) { - case 0: - term.c.attr.mode &= ~( - ATTR_BOLD | - ATTR_FAINT | - ATTR_ITALIC | - ATTR_UNDERLINE | - ATTR_BLINK | - ATTR_REVERSE | - ATTR_INVISIBLE | - ATTR_STRUCK ); - term.c.attr.fg = defaultfg; - term.c.attr.bg = defaultbg; - break; - case 1: - term.c.attr.mode |= ATTR_BOLD; - break; - case 2: - term.c.attr.mode |= ATTR_FAINT; - break; - case 3: - term.c.attr.mode |= ATTR_ITALIC; - break; - case 4: - term.c.attr.mode |= ATTR_UNDERLINE; - break; - case 5: /* slow blink */ - /* FALLTHROUGH */ - case 6: /* rapid blink */ - term.c.attr.mode |= ATTR_BLINK; - break; - case 7: - term.c.attr.mode |= ATTR_REVERSE; - break; - case 8: - term.c.attr.mode |= ATTR_INVISIBLE; - break; - case 9: - term.c.attr.mode |= ATTR_STRUCK; - break; - case 22: - term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT); - break; - case 23: - term.c.attr.mode &= ~ATTR_ITALIC; - break; - case 24: - term.c.attr.mode &= ~ATTR_UNDERLINE; - break; - case 25: - term.c.attr.mode &= ~ATTR_BLINK; - break; - case 27: - term.c.attr.mode &= ~ATTR_REVERSE; - break; - case 28: - term.c.attr.mode &= ~ATTR_INVISIBLE; - break; - case 29: - term.c.attr.mode &= ~ATTR_STRUCK; - break; - case 38: - if ((idx = tdefcolor(attr, &i, l)) >= 0) - term.c.attr.fg = idx; - break; - case 39: - term.c.attr.fg = defaultfg; - break; - case 48: - if ((idx = tdefcolor(attr, &i, l)) >= 0) - term.c.attr.bg = idx; - break; - case 49: - term.c.attr.bg = defaultbg; - break; - default: - if (BETWEEN(attr[i], 30, 37)) { - term.c.attr.fg = attr[i] - 30; - } else if (BETWEEN(attr[i], 40, 47)) { - term.c.attr.bg = attr[i] - 40; - } else if (BETWEEN(attr[i], 90, 97)) { - term.c.attr.fg = attr[i] - 90 + 8; - } else if (BETWEEN(attr[i], 100, 107)) { - term.c.attr.bg = attr[i] - 100 + 8; - } else { - fprintf(stderr, - "erresc(default): gfx attr %d unknown\n", - attr[i]); - csidump(); - } - break; - } - } -} - -void -tsetscroll(int t, int b) -{ - int temp; - - LIMIT(t, 0, term.row-1); - LIMIT(b, 0, term.row-1); - if (t > b) { - temp = t; - t = b; - b = temp; - } - term.top = t; - term.bot = b; -} - -void -tsetmode(int priv, int set, int *args, int narg) -{ - int alt, *lim; - - for (lim = args + narg; args < lim; ++args) { - if (priv) { - switch (*args) { - case 1: /* DECCKM -- Cursor key */ - xsetmode(set, MODE_APPCURSOR); - break; - case 5: /* DECSCNM -- Reverse video */ - xsetmode(set, MODE_REVERSE); - break; - case 6: /* DECOM -- Origin */ - MODBIT(term.c.state, set, CURSOR_ORIGIN); - tmoveato(0, 0); - break; - case 7: /* DECAWM -- Auto wrap */ - MODBIT(term.mode, set, MODE_WRAP); - break; - case 0: /* Error (IGNORED) */ - case 2: /* DECANM -- ANSI/VT52 (IGNORED) */ - case 3: /* DECCOLM -- Column (IGNORED) */ - case 4: /* DECSCLM -- Scroll (IGNORED) */ - case 8: /* DECARM -- Auto repeat (IGNORED) */ - case 18: /* DECPFF -- Printer feed (IGNORED) */ - case 19: /* DECPEX -- Printer extent (IGNORED) */ - case 42: /* DECNRCM -- National characters (IGNORED) */ - case 12: /* att610 -- Start blinking cursor (IGNORED) */ - break; - case 25: /* DECTCEM -- Text Cursor Enable Mode */ - xsetmode(!set, MODE_HIDE); - break; - case 9: /* X10 mouse compatibility mode */ - xsetpointermotion(0); - xsetmode(0, MODE_MOUSE); - xsetmode(set, MODE_MOUSEX10); - break; - case 1000: /* 1000: report button press */ - xsetpointermotion(0); - xsetmode(0, MODE_MOUSE); - xsetmode(set, MODE_MOUSEBTN); - break; - case 1002: /* 1002: report motion on button press */ - xsetpointermotion(0); - xsetmode(0, MODE_MOUSE); - xsetmode(set, MODE_MOUSEMOTION); - break; - case 1003: /* 1003: enable all mouse motions */ - xsetpointermotion(set); - xsetmode(0, MODE_MOUSE); - xsetmode(set, MODE_MOUSEMANY); - break; - case 1004: /* 1004: send focus events to tty */ - xsetmode(set, MODE_FOCUS); - break; - case 1006: /* 1006: extended reporting mode */ - xsetmode(set, MODE_MOUSESGR); - break; - case 1034: - xsetmode(set, MODE_8BIT); - break; - case 1049: /* swap screen & set/restore cursor as xterm */ - if (!allowaltscreen) - break; - tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); - /* FALLTHROUGH */ - case 47: /* swap screen */ - case 1047: - if (!allowaltscreen) - break; - alt = IS_SET(MODE_ALTSCREEN); - if (alt) { - tclearregion(0, 0, term.col-1, - term.row-1); - } - if (set ^ alt) /* set is always 1 or 0 */ - tswapscreen(); - if (*args != 1049) - break; - /* FALLTHROUGH */ - case 1048: - tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); - break; - case 2004: /* 2004: bracketed paste mode */ - xsetmode(set, MODE_BRCKTPASTE); - break; - /* Not implemented mouse modes. See comments there. */ - case 1001: /* mouse highlight mode; can hang the - terminal by design when implemented. */ - case 1005: /* UTF-8 mouse mode; will confuse - applications not supporting UTF-8 - and luit. */ - 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", - *args); - break; - } - } else { - switch (*args) { - case 0: /* Error (IGNORED) */ - break; - case 2: - xsetmode(set, MODE_KBDLOCK); - break; - case 4: /* IRM -- Insertion-replacement */ - MODBIT(term.mode, set, MODE_INSERT); - break; - case 12: /* SRM -- Send/Receive */ - MODBIT(term.mode, !set, MODE_ECHO); - break; - case 20: /* LNM -- Linefeed/new line */ - MODBIT(term.mode, set, MODE_CRLF); - break; - default: - fprintf(stderr, - "erresc: unknown set/reset mode %d\n", - *args); - break; - } - } - } -} - -void -csihandle(void) -{ - char buf[40]; - int len; - - switch (csiescseq.mode[0]) { - default: - unknown: - fprintf(stderr, "erresc: unknown csi "); - csidump(); - /* die(""); */ - break; - case '@': /* ICH -- Insert blank char */ - DEFAULT(csiescseq.arg[0], 1); - tinsertblank(csiescseq.arg[0]); - break; - case 'A': /* CUU -- Cursor Up */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x, term.c.y-csiescseq.arg[0]); - break; - case 'B': /* CUD -- Cursor Down */ - case 'e': /* VPR --Cursor Down */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x, term.c.y+csiescseq.arg[0]); - break; - case 'i': /* MC -- Media Copy */ - switch (csiescseq.arg[0]) { - case 0: - tdump(); - break; - case 1: - tdumpline(term.c.y); - break; - case 2: - tdumpsel(); - break; - case 4: - term.mode &= ~MODE_PRINT; - break; - case 5: - term.mode |= MODE_PRINT; - break; - } - break; - case 'c': /* DA -- Device Attributes */ - if (csiescseq.arg[0] == 0) - ttywrite(vtiden, strlen(vtiden), 0); - break; - case 'b': /* REP -- if last char is printable print it more times */ - DEFAULT(csiescseq.arg[0], 1); - if (term.lastc) - while (csiescseq.arg[0]-- > 0) - tputc(term.lastc); - break; - case 'C': /* CUF -- Cursor Forward */ - case 'a': /* HPR -- Cursor Forward */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x+csiescseq.arg[0], term.c.y); - break; - case 'D': /* CUB -- Cursor Backward */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x-csiescseq.arg[0], term.c.y); - break; - case 'E': /* CNL -- Cursor Down and first col */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(0, term.c.y+csiescseq.arg[0]); - break; - case 'F': /* CPL -- Cursor Up and first col */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(0, term.c.y-csiescseq.arg[0]); - break; - case 'g': /* TBC -- Tabulation clear */ - switch (csiescseq.arg[0]) { - case 0: /* clear current tab stop */ - term.tabs[term.c.x] = 0; - break; - case 3: /* clear all the tabs */ - memset(term.tabs, 0, term.col * sizeof(*term.tabs)); - break; - default: - goto unknown; - } - break; - case 'G': /* CHA -- Move to */ - case '`': /* HPA */ - DEFAULT(csiescseq.arg[0], 1); - tmoveto(csiescseq.arg[0]-1, term.c.y); - break; - case 'H': /* CUP -- Move to */ - case 'f': /* HVP */ - DEFAULT(csiescseq.arg[0], 1); - DEFAULT(csiescseq.arg[1], 1); - tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1); - break; - case 'I': /* CHT -- Cursor Forward Tabulation tab stops */ - DEFAULT(csiescseq.arg[0], 1); - tputtab(csiescseq.arg[0]); - break; - case 'J': /* ED -- Clear screen */ - switch (csiescseq.arg[0]) { - case 0: /* below */ - tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); - if (term.c.y < term.row-1) { - tclearregion(0, term.c.y+1, term.col-1, - term.row-1); - } - break; - case 1: /* above */ - if (term.c.y > 1) - tclearregion(0, 0, term.col-1, term.c.y-1); - tclearregion(0, term.c.y, term.c.x, term.c.y); - break; - case 2: /* all */ - tclearregion(0, 0, term.col-1, term.row-1); - break; - default: - goto unknown; - } - break; - case 'K': /* EL -- Clear line */ - switch (csiescseq.arg[0]) { - case 0: /* right */ - tclearregion(term.c.x, term.c.y, term.col-1, - term.c.y); - break; - case 1: /* left */ - tclearregion(0, term.c.y, term.c.x, term.c.y); - break; - case 2: /* all */ - tclearregion(0, term.c.y, term.col-1, term.c.y); - break; - } - break; - case 'S': /* SU -- Scroll line up */ - DEFAULT(csiescseq.arg[0], 1); - tscrollup(term.top, csiescseq.arg[0]); - break; - case 'T': /* SD -- Scroll line down */ - DEFAULT(csiescseq.arg[0], 1); - tscrolldown(term.top, csiescseq.arg[0]); - break; - case 'L': /* IL -- Insert blank lines */ - DEFAULT(csiescseq.arg[0], 1); - tinsertblankline(csiescseq.arg[0]); - break; - case 'l': /* RM -- Reset Mode */ - tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg); - break; - case 'M': /* DL -- Delete lines */ - DEFAULT(csiescseq.arg[0], 1); - tdeleteline(csiescseq.arg[0]); - break; - case 'X': /* ECH -- Erase char */ - DEFAULT(csiescseq.arg[0], 1); - tclearregion(term.c.x, term.c.y, - term.c.x + csiescseq.arg[0] - 1, term.c.y); - break; - case 'P': /* DCH -- Delete char */ - DEFAULT(csiescseq.arg[0], 1); - tdeletechar(csiescseq.arg[0]); - break; - case 'Z': /* CBT -- Cursor Backward Tabulation tab stops */ - DEFAULT(csiescseq.arg[0], 1); - tputtab(-csiescseq.arg[0]); - break; - case 'd': /* VPA -- Move to */ - DEFAULT(csiescseq.arg[0], 1); - tmoveato(term.c.x, csiescseq.arg[0]-1); - break; - case 'h': /* SM -- Set terminal mode */ - tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg); - break; - case 'm': /* SGR -- Terminal attribute (color) */ - tsetattr(csiescseq.arg, csiescseq.narg); - break; - case 'n': /* DSR – Device Status Report (cursor position) */ - if (csiescseq.arg[0] == 6) { - len = snprintf(buf, sizeof(buf), "\033[%i;%iR", - term.c.y+1, term.c.x+1); - ttywrite(buf, len, 0); - } - break; - case 'r': /* DECSTBM -- Set Scrolling Region */ - if (csiescseq.priv) { - goto unknown; - } else { - DEFAULT(csiescseq.arg[0], 1); - DEFAULT(csiescseq.arg[1], term.row); - tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1); - tmoveato(0, 0); - } - break; - case 's': /* DECSC -- Save cursor position (ANSI.SYS) */ - tcursor(CURSOR_SAVE); - break; - case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */ - tcursor(CURSOR_LOAD); - break; - case ' ': - switch (csiescseq.mode[1]) { - case 'q': /* DECSCUSR -- Set Cursor Style */ - if (xsetcursor(csiescseq.arg[0])) - goto unknown; - break; - default: - goto unknown; - } - break; - } -} - -void -csidump(void) -{ - size_t i; - uint c; - - fprintf(stderr, "ESC["); - for (i = 0; i < csiescseq.len; i++) { - c = csiescseq.buf[i] & 0xff; - if (isprint(c)) { - putc(c, stderr); - } else if (c == '\n') { - fprintf(stderr, "(\\n)"); - } else if (c == '\r') { - fprintf(stderr, "(\\r)"); - } else if (c == 0x1b) { - fprintf(stderr, "(\\e)"); - } else { - fprintf(stderr, "(%02x)", c); - } - } - putc('\n', stderr); -} - -void -csireset(void) -{ - memset(&csiescseq, 0, sizeof(csiescseq)); -} - -void -strhandle(void) -{ - char *p = NULL, *dec; - int j, narg, par; - - term.esc &= ~(ESC_STR_END|ESC_STR); - strparse(); - par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0; - - switch (strescseq.type) { - case ']': /* OSC -- Operating System Command */ - switch (par) { - case 0: - case 1: - case 2: - if (narg > 1) - xsettitle(strescseq.args[1]); - return; - case 52: - if (narg > 2 && allowwindowops) { - 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; - p = strescseq.args[2]; - /* FALLTHROUGH */ - case 104: /* color reset, here p = NULL */ - j = (narg > 1) ? atoi(strescseq.args[1]) : -1; - if (xsetcolorname(j, 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 - * are dirty - */ - redraw(); - } - return; - } - break; - case 'k': /* old title set compatibility */ - xsettitle(strescseq.args[0]); - return; - case 'P': /* DCS -- Device Control String */ - case '_': /* APC -- Application Program Command */ - case '^': /* PM -- Privacy Message */ - return; - } - - fprintf(stderr, "erresc: unknown str "); - strdump(); -} - -void -strparse(void) -{ - int c; - char *p = strescseq.buf; - - strescseq.narg = 0; - strescseq.buf[strescseq.len] = '\0'; - - if (*p == '\0') - return; - - while (strescseq.narg < STR_ARG_SIZ) { - strescseq.args[strescseq.narg++] = p; - while ((c = *p) != ';' && c != '\0') - ++p; - if (c == '\0') - return; - *p++ = '\0'; - } -} - -void -strdump(void) -{ - size_t i; - uint c; - - fprintf(stderr, "ESC%c", strescseq.type); - for (i = 0; i < strescseq.len; i++) { - c = strescseq.buf[i] & 0xff; - if (c == '\0') { - putc('\n', stderr); - return; - } else if (isprint(c)) { - putc(c, stderr); - } else if (c == '\n') { - fprintf(stderr, "(\\n)"); - } else if (c == '\r') { - fprintf(stderr, "(\\r)"); - } else if (c == 0x1b) { - fprintf(stderr, "(\\e)"); - } else { - fprintf(stderr, "(%02x)", c); - } - } - fprintf(stderr, "ESC\\\n"); -} - -void -strreset(void) -{ - strescseq = (STREscape){ - .buf = xrealloc(strescseq.buf, STR_BUF_SIZ), - .siz = STR_BUF_SIZ, - }; -} - -void -sendbreak(const Arg *arg) -{ - if (tcsendbreak(cmdfd, 0)) - perror("Error sending break"); -} - -void -tprinter(char *s, size_t len) -{ - if (iofd != -1 && xwrite(iofd, s, len) < 0) { - perror("Error writing to output file"); - close(iofd); - iofd = -1; - } -} - -void -toggleprinter(const Arg *arg) -{ - term.mode ^= MODE_PRINT; -} - -void -printscreen(const Arg *arg) -{ - tdump(); -} - -void -printsel(const Arg *arg) -{ - tdumpsel(); -} - -void -tdumpsel(void) -{ - char *ptr; - - if ((ptr = getsel())) { - tprinter(ptr, strlen(ptr)); - free(ptr); - } -} - -void -tdumpline(int n) -{ - char buf[UTF_SIZ]; - Glyph *bp, *end; - - bp = &term.line[n][0]; - end = &bp[MIN(tlinelen(n), term.col) - 1]; - if (bp != end || bp->u != ' ') { - for ( ; bp <= end; ++bp) - tprinter(buf, utf8encode(bp->u, buf)); - } - tprinter("\n", 1); -} - -void -tdump(void) -{ - int i; - - for (i = 0; i < term.row; ++i) - tdumpline(i); -} - -void -tputtab(int n) -{ - uint x = term.c.x; - - if (n > 0) { - while (x < term.col && n--) - for (++x; x < term.col && !term.tabs[x]; ++x) - /* nothing */ ; - } else if (n < 0) { - while (x > 0 && n++) - for (--x; x > 0 && !term.tabs[x]; --x) - /* nothing */ ; - } - term.c.x = LIMIT(x, 0, term.col-1); -} - -void -tdefutf8(char ascii) -{ - if (ascii == 'G') - term.mode |= MODE_UTF8; - else if (ascii == '@') - term.mode &= ~MODE_UTF8; -} - -void -tdeftran(char ascii) -{ - static char cs[] = "0B"; - static int vcs[] = {CS_GRAPHIC0, CS_USA}; - char *p; - - if ((p = strchr(cs, ascii)) == NULL) { - fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii); - } else { - term.trantbl[term.icharset] = vcs[p - cs]; - } -} - -void -tdectest(char c) -{ - int x, y; - - if (c == '8') { /* DEC screen alignment test. */ - for (x = 0; x < term.col; ++x) { - for (y = 0; y < term.row; ++y) - tsetchar('E', &term.c.attr, x, y); - } - } -} - -void -tstrsequence(uchar c) -{ - switch (c) { - case 0x90: /* DCS -- Device Control String */ - c = 'P'; - break; - case 0x9f: /* APC -- Application Program Command */ - c = '_'; - break; - case 0x9e: /* PM -- Privacy Message */ - c = '^'; - break; - case 0x9d: /* OSC -- Operating System Command */ - c = ']'; - break; - } - strreset(); - strescseq.type = c; - term.esc |= ESC_STR; -} - -void -tcontrolcode(uchar ascii) -{ - switch (ascii) { - case '\t': /* HT */ - tputtab(1); - return; - case '\b': /* BS */ - tmoveto(term.c.x-1, term.c.y); - return; - case '\r': /* CR */ - tmoveto(0, term.c.y); - return; - case '\f': /* LF */ - case '\v': /* VT */ - case '\n': /* LF */ - /* go to first col if the mode is set */ - tnewline(IS_SET(MODE_CRLF)); - return; - case '\a': /* BEL */ - if (term.esc & ESC_STR_END) { - /* backwards compatibility to xterm */ - strhandle(); - } else { - xbell(); - } - break; - case '\033': /* ESC */ - csireset(); - term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST); - term.esc |= ESC_START; - return; - case '\016': /* SO (LS1 -- Locking shift 1) */ - case '\017': /* SI (LS0 -- Locking shift 0) */ - term.charset = 1 - (ascii - '\016'); - return; - case '\032': /* SUB */ - tsetchar('?', &term.c.attr, term.c.x, term.c.y); - /* FALLTHROUGH */ - case '\030': /* CAN */ - csireset(); - break; - case '\005': /* ENQ (IGNORED) */ - case '\000': /* NUL (IGNORED) */ - case '\021': /* XON (IGNORED) */ - case '\023': /* XOFF (IGNORED) */ - case 0177: /* DEL (IGNORED) */ - return; - case 0x80: /* TODO: PAD */ - case 0x81: /* TODO: HOP */ - case 0x82: /* TODO: BPH */ - case 0x83: /* TODO: NBH */ - case 0x84: /* TODO: IND */ - break; - case 0x85: /* NEL -- Next line */ - tnewline(1); /* always go to first col */ - break; - case 0x86: /* TODO: SSA */ - case 0x87: /* TODO: ESA */ - break; - case 0x88: /* HTS -- Horizontal tab stop */ - term.tabs[term.c.x] = 1; - break; - case 0x89: /* TODO: HTJ */ - case 0x8a: /* TODO: VTS */ - case 0x8b: /* TODO: PLD */ - case 0x8c: /* TODO: PLU */ - case 0x8d: /* TODO: RI */ - case 0x8e: /* TODO: SS2 */ - case 0x8f: /* TODO: SS3 */ - case 0x91: /* TODO: PU1 */ - case 0x92: /* TODO: PU2 */ - case 0x93: /* TODO: STS */ - case 0x94: /* TODO: CCH */ - case 0x95: /* TODO: MW */ - case 0x96: /* TODO: SPA */ - case 0x97: /* TODO: EPA */ - case 0x98: /* TODO: SOS */ - case 0x99: /* TODO: SGCI */ - break; - case 0x9a: /* DECID -- Identify Terminal */ - ttywrite(vtiden, strlen(vtiden), 0); - break; - case 0x9b: /* TODO: CSI */ - case 0x9c: /* TODO: ST */ - break; - case 0x90: /* DCS -- Device Control String */ - case 0x9d: /* OSC -- Operating System Command */ - case 0x9e: /* PM -- Privacy Message */ - case 0x9f: /* APC -- Application Program Command */ - tstrsequence(ascii); - return; - } - /* only CAN, SUB, \a and C1 chars interrupt a sequence */ - term.esc &= ~(ESC_STR_END|ESC_STR); -} - -/* - * returns 1 when the sequence is finished and it hasn't to read - * more characters for this sequence, otherwise 0 - */ -int -eschandle(uchar ascii) -{ - switch (ascii) { - case '[': - term.esc |= ESC_CSI; - return 0; - case '#': - term.esc |= ESC_TEST; - return 0; - case '%': - term.esc |= ESC_UTF8; - return 0; - case 'P': /* DCS -- Device Control String */ - case '_': /* APC -- Application Program Command */ - case '^': /* PM -- Privacy Message */ - case ']': /* OSC -- Operating System Command */ - case 'k': /* old title set compatibility */ - tstrsequence(ascii); - return 0; - case 'n': /* LS2 -- Locking shift 2 */ - case 'o': /* LS3 -- Locking shift 3 */ - term.charset = 2 + (ascii - 'n'); - break; - case '(': /* GZD4 -- set primary charset G0 */ - case ')': /* G1D4 -- set secondary charset G1 */ - case '*': /* G2D4 -- set tertiary charset G2 */ - case '+': /* G3D4 -- set quaternary charset G3 */ - term.icharset = ascii - '('; - term.esc |= ESC_ALTCHARSET; - return 0; - case 'D': /* IND -- Linefeed */ - if (term.c.y == term.bot) { - tscrollup(term.top, 1); - } else { - tmoveto(term.c.x, term.c.y+1); - } - break; - case 'E': /* NEL -- Next line */ - tnewline(1); /* always go to first col */ - break; - case 'H': /* HTS -- Horizontal tab stop */ - term.tabs[term.c.x] = 1; - break; - case 'M': /* RI -- Reverse index */ - if (term.c.y == term.top) { - tscrolldown(term.top, 1); - } else { - tmoveto(term.c.x, term.c.y-1); - } - break; - case 'Z': /* DECID -- Identify Terminal */ - ttywrite(vtiden, strlen(vtiden), 0); - break; - case 'c': /* RIS -- Reset to initial state */ - treset(); - resettitle(); - xloadcols(); - break; - case '=': /* DECPAM -- Application keypad */ - xsetmode(1, MODE_APPKEYPAD); - break; - case '>': /* DECPNM -- Normal keypad */ - xsetmode(0, MODE_APPKEYPAD); - break; - case '7': /* DECSC -- Save Cursor */ - tcursor(CURSOR_SAVE); - break; - case '8': /* DECRC -- Restore Cursor */ - tcursor(CURSOR_LOAD); - break; - case '\\': /* ST -- String Terminator */ - if (term.esc & ESC_STR_END) - strhandle(); - break; - default: - fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", - (uchar) ascii, isprint(ascii)? ascii:'.'); - break; - } - return 1; -} - -void -tputc(Rune u) -{ - char c[UTF_SIZ]; - int control; - int width, len; - Glyph *gp; - - control = ISCONTROL(u); - if (u < 127 || !IS_SET(MODE_UTF8)) { - c[0] = u; - width = len = 1; - } else { - len = utf8encode(u, c); - if (!control && (width = wcwidth(u)) == -1) - width = 1; - } - - if (IS_SET(MODE_PRINT)) - tprinter(c, len); - - /* - * STR sequence must be checked before anything else - * because it uses all following characters until it - * receives a ESC, a SUB, a ST or any other C1 control - * character. - */ - if (term.esc & ESC_STR) { - if (u == '\a' || u == 030 || u == 032 || u == 033 || - ISCONTROLC1(u)) { - term.esc &= ~(ESC_START|ESC_STR); - term.esc |= ESC_STR_END; - goto check_control_code; - } - - if (strescseq.len+len >= strescseq.siz) { - /* - * Here is a bug in terminals. If the user never sends - * some code to stop the str or esc command, then st - * will stop responding. But this is better than - * silently failing with unknown characters. At least - * then users will report back. - * - * In the case users ever get fixed, here is the code: - */ - /* - * term.esc = 0; - * strhandle(); - */ - if (strescseq.siz > (SIZE_MAX - UTF_SIZ) / 2) - return; - strescseq.siz *= 2; - strescseq.buf = xrealloc(strescseq.buf, strescseq.siz); - } - - memmove(&strescseq.buf[strescseq.len], c, len); - strescseq.len += len; - return; - } - -check_control_code: - /* - * Actions of control codes must be performed as soon they arrive - * because they can be embedded inside a control sequence, and - * they must not cause conflicts with sequences. - */ - if (control) { - tcontrolcode(u); - /* - * control codes are not shown ever - */ - if (!term.esc) - term.lastc = 0; - return; - } else if (term.esc & ESC_START) { - if (term.esc & ESC_CSI) { - csiescseq.buf[csiescseq.len++] = u; - if (BETWEEN(u, 0x40, 0x7E) - || csiescseq.len >= \ - sizeof(csiescseq.buf)-1) { - term.esc = 0; - csiparse(); - csihandle(); - } - return; - } else if (term.esc & ESC_UTF8) { - tdefutf8(u); - } else if (term.esc & ESC_ALTCHARSET) { - tdeftran(u); - } else if (term.esc & ESC_TEST) { - tdectest(u); - } else { - if (!eschandle(u)) - return; - /* sequence already finished */ - } - term.esc = 0; - /* - * All characters which form part of a sequence are not - * printed - */ - return; - } - if (selected(term.c.x, term.c.y)) - selclear(); - - gp = &term.line[term.c.y][term.c.x]; - if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) { - gp->mode |= ATTR_WRAP; - tnewline(1); - gp = &term.line[term.c.y][term.c.x]; - } - - if (IS_SET(MODE_INSERT) && term.c.x+width < term.col) - memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph)); - - if (term.c.x+width > term.col) { - tnewline(1); - gp = &term.line[term.c.y][term.c.x]; - } - - tsetchar(u, &term.c.attr, term.c.x, term.c.y); - term.lastc = u; - - if (width == 2) { - gp->mode |= ATTR_WIDE; - if (term.c.x+1 < term.col) { - gp[1].u = '\0'; - gp[1].mode = ATTR_WDUMMY; - } - } - if (term.c.x+width < term.col) { - tmoveto(term.c.x+width, term.c.y); - } else { - term.c.state |= CURSOR_WRAPNEXT; - } -} - -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)) { - /* 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) -{ - int i; - int minrow = MIN(row, term.row); - int mincol = MIN(col, term.col); - int *bp; - TCursor c; - - if (col < 1 || row < 1) { - fprintf(stderr, - "tresize: error resizing to %dx%d\n", col, row); - return; - } - - /* - * slide screen to keep cursor where we expect it - - * tscrollup would work here, but we can optimize to - * memmove because we're freeing the earlier lines - */ - for (i = 0; i <= term.c.y - row; i++) { - free(term.line[i]); - free(term.alt[i]); - } - /* ensure that both src and dst are not NULL */ - if (i > 0) { - memmove(term.line, term.line + i, row * sizeof(Line)); - memmove(term.alt, term.alt + i, row * sizeof(Line)); - } - for (i += row; i < term.row; i++) { - free(term.line[i]); - free(term.alt[i]); - } - - /* resize to new height */ - term.line = xrealloc(term.line, row * sizeof(Line)); - term.alt = xrealloc(term.alt, row * sizeof(Line)); - term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); - term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); - - /* resize each row to new width, zero-pad if needed */ - for (i = 0; i < minrow; i++) { - term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); - term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph)); - } - - /* allocate any new rows */ - for (/* i = minrow */; i < row; i++) { - term.line[i] = xmalloc(col * sizeof(Glyph)); - term.alt[i] = xmalloc(col * sizeof(Glyph)); - } - if (col > term.col) { - bp = term.tabs + term.col; - - memset(bp, 0, sizeof(*term.tabs) * (col - term.col)); - while (--bp > term.tabs && !*bp) - /* nothing */ ; - for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces) - *bp = 1; - } - /* update terminal size */ - term.col = col; - term.row = row; - /* reset scrolling region */ - tsetscroll(0, row-1); - /* make use of the LIMIT in tmoveto */ - tmoveto(term.c.x, term.c.y); - /* Clearing both screens (it makes dirty all lines) */ - c = term.c; - for (i = 0; i < 2; i++) { - if (mincol < col && 0 < minrow) { - tclearregion(mincol, 0, col - 1, minrow - 1); - } - if (0 < col && minrow < row) { - tclearregion(0, minrow, col - 1, row - 1); - } - tswapscreen(); - tcursor(CURSOR_LOAD); - } - term.c = c; -} - -void -resettitle(void) -{ - xsettitle(NULL); -} - -void -drawregion(int x1, int y1, int x2, int y2) -{ - int y; - - for (y = y1; y < y2; y++) { - if (!term.dirty[y]) - continue; - - term.dirty[y] = 0; - xdrawline(term.line[y], x1, y, x2); - } -} - -void -draw(void) -{ - int cx = term.c.x, ocx = term.ocx, ocy = term.ocy; - - if (!xstartdraw()) - return; - - /* 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--; - - 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(); - if (ocx != term.ocx || ocy != term.ocy) - xximspot(term.ocx, term.ocy); -} - -void -redraw(void) -{ - tfulldirt(); - draw(); -} diff --git a/st-0.8.4/st.c.rej b/st-0.8.4/st.c.rej deleted file mode 100644 index b2053b8..0000000 --- a/st-0.8.4/st.c.rej +++ /dev/null @@ -1,13 +0,0 @@ ---- st.c -+++ st.c -@@ -191,8 +198,8 @@ static void tnewline(int); - static void tputtab(int); - static void tputc(Rune); - static void treset(void); --static void tscrollup(int, int); --static void tscrolldown(int, int); -+static void tscrollup(int, int, int); -+static void tscrolldown(int, int, int); - static void tsetattr(const int *, int); - static void tsetchar(Rune, const Glyph *, int, int); - static void tsetdirt(int, int); diff --git a/st-0.8.4/st.desktop b/st-0.8.4/st.desktop deleted file mode 100644 index 49029d8..0000000 --- a/st-0.8.4/st.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=st -Comment=st is a simple terminal implementation for X -Exec=st -Icon=utilities-terminal -Terminal=false -Type=Application -Categories=System;TerminalEmulator; diff --git a/st-0.8.4/st.h b/st-0.8.4/st.h deleted file mode 100644 index 7ea2fd3..0000000 --- a/st-0.8.4/st.h +++ /dev/null @@ -1,128 +0,0 @@ -/* See LICENSE for license details. */ - -#include -#include - -/* 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; - -#define Glyph Glyph_ -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; - const char *s; -} Arg; - -void die(const char *, ...); -void redraw(void); -void draw(void); - -void kscrolldown(const Arg *); -void kscrollup(const Arg *); -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 utf8encode(Rune, char *); - -void *xmalloc(size_t); -void *xrealloc(void *, size_t); -char *xstrdup(char *); - -/* config.h globals */ -extern char *utmp; -extern char *scroll; -extern char *stty_args; -extern char *vtiden; -extern wchar_t *worddelimiters; -extern int allowaltscreen; -extern int allowwindowops; -extern char *termname; -extern unsigned int tabspaces; -extern unsigned int defaultfg; -extern unsigned int defaultbg; -extern float alpha; diff --git a/st-0.8.4/st.h.orig b/st-0.8.4/st.h.orig deleted file mode 100644 index 3d351b6..0000000 --- a/st-0.8.4/st.h.orig +++ /dev/null @@ -1,125 +0,0 @@ -/* See LICENSE for license details. */ - -#include -#include - -/* 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; - -#define Glyph Glyph_ -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; - const char *s; -} 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 utf8encode(Rune, char *); - -void *xmalloc(size_t); -void *xrealloc(void *, size_t); -char *xstrdup(char *); - -/* config.h globals */ -extern char *utmp; -extern char *scroll; -extern char *stty_args; -extern char *vtiden; -extern wchar_t *worddelimiters; -extern int allowaltscreen; -extern int allowwindowops; -extern char *termname; -extern unsigned int tabspaces; -extern unsigned int defaultfg; -extern unsigned int defaultbg; diff --git a/st-0.8.4/st.info b/st-0.8.4/st.info deleted file mode 100644 index 8201ad6..0000000 --- a/st-0.8.4/st.info +++ /dev/null @@ -1,239 +0,0 @@ -st-mono| simpleterm monocolor, - acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - am, - bce, - bel=^G, - blink=\E[5m, - bold=\E[1m, - cbt=\E[Z, - cvvis=\E[?25h, - civis=\E[?25l, - clear=\E[H\E[2J, - cnorm=\E[?12l\E[?25h, - colors#2, - cols#80, - cr=^M, - csr=\E[%i%p1%d;%p2%dr, - cub=\E[%p1%dD, - cub1=^H, - cud1=^J, - cud=\E[%p1%dB, - cuf1=\E[C, - cuf=\E[%p1%dC, - cup=\E[%i%p1%d;%p2%dH, - cuu1=\E[A, - 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, - ed=\E[J, - el=\E[K, - el1=\E[1K, - enacs=\E)0, - flash=\E[?5h$<80/>\E[?5l, - fsl=^G, - home=\E[H, - hpa=\E[%i%p1%dG, - hs, - ht=^I, - hts=\EH, - ich=\E[%p1%d@, - il1=\E[L, - il=\E[%p1%dL, - ind=^J, - indn=\E[%p1%dS, - invis=\E[8m, - is2=\E[4l\E>\E[?1034l, - it#8, - kel=\E[1;2F, - ked=\E[1;5F, - ka1=\E[1~, - ka3=\E[5~, - kc1=\E[4~, - kc3=\E[6~, - kbs=\177, - kcbt=\E[Z, - kb2=\EOu, - kcub1=\EOD, - kcud1=\EOB, - kcuf1=\EOC, - kcuu1=\EOA, - kDC=\E[3;2~, - kent=\EOM, - kEND=\E[1;2F, - kIC=\E[2;2~, - kNXT=\E[6;2~, - kPRV=\E[5;2~, - kHOM=\E[1;2H, - kLFT=\E[1;2D, - kRIT=\E[1;2C, - kind=\E[1;2B, - kri=\E[1;2A, - kclr=\E[3;5~, - kdl1=\E[3;2~, - kdch1=\E[3~, - kich1=\E[2~, - kend=\E[4~, - kf1=\EOP, - kf2=\EOQ, - kf3=\EOR, - kf4=\EOS, - kf5=\E[15~, - kf6=\E[17~, - kf7=\E[18~, - kf8=\E[19~, - kf9=\E[20~, - kf10=\E[21~, - kf11=\E[23~, - kf12=\E[24~, - kf13=\E[1;2P, - kf14=\E[1;2Q, - kf15=\E[1;2R, - kf16=\E[1;2S, - kf17=\E[15;2~, - kf18=\E[17;2~, - kf19=\E[18;2~, - kf20=\E[19;2~, - kf21=\E[20;2~, - kf22=\E[21;2~, - kf23=\E[23;2~, - kf24=\E[24;2~, - kf25=\E[1;5P, - kf26=\E[1;5Q, - kf27=\E[1;5R, - kf28=\E[1;5S, - kf29=\E[15;5~, - kf30=\E[17;5~, - kf31=\E[18;5~, - kf32=\E[19;5~, - kf33=\E[20;5~, - kf34=\E[21;5~, - kf35=\E[23;5~, - kf36=\E[24;5~, - kf37=\E[1;6P, - kf38=\E[1;6Q, - kf39=\E[1;6R, - kf40=\E[1;6S, - kf41=\E[15;6~, - kf42=\E[17;6~, - kf43=\E[18;6~, - kf44=\E[19;6~, - kf45=\E[20;6~, - kf46=\E[21;6~, - kf47=\E[23;6~, - kf48=\E[24;6~, - kf49=\E[1;3P, - kf50=\E[1;3Q, - kf51=\E[1;3R, - kf52=\E[1;3S, - kf53=\E[15;3~, - kf54=\E[17;3~, - kf55=\E[18;3~, - kf56=\E[19;3~, - kf57=\E[20;3~, - kf58=\E[21;3~, - kf59=\E[23;3~, - kf60=\E[24;3~, - kf61=\E[1;4P, - kf62=\E[1;4Q, - kf63=\E[1;4R, - khome=\E[1~, - kil1=\E[2;5~, - krmir=\E[2;2~, - knp=\E[6~, - kmous=\E[M, - kpp=\E[5~, - lines#24, - mir, - msgr, - npc, - op=\E[39;49m, - pairs#64, - mc0=\E[i, - mc4=\E[4i, - mc5=\E[5i, - rc=\E8, - rev=\E[7m, - ri=\EM, - rin=\E[%p1%dT, - ritm=\E[23m, - rmacs=\E(B, - rmcup=\E[?1049l, - rmir=\E[4l, - rmkx=\E[?1l\E>, - rmso=\E[27m, - rmul=\E[24m, - rs1=\Ec, - rs2=\E[4l\E>\E[?1034l, - sc=\E7, - sitm=\E[3m, - sgr0=\E[0m, - smacs=\E(0, - smcup=\E[?1049h, - smir=\E[4h, - smkx=\E[?1h\E=, - smso=\E[7m, - smul=\E[4m, - tbc=\E[3g, - tsl=\E]0;, - xenl, - vpa=\E[%i%p1%dd, -# XTerm extensions - rmxx=\E[29m, - smxx=\E[9m, -# disabled rep for now: causes some issues with older ncurses versions. -# rep=%p1%c\E[%p2%{1}%-%db, -# tmux extensions, see TERMINFO EXTENSIONS in tmux(1) - Tc, - Ms=\E]52;%p1%s;%p2%s\007, - Se=\E[2 q, - Ss=\E[%p1%d q, - -st| simpleterm, - use=st-mono, - colors#8, - setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, - setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, - setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, - sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, - -st-256color| simpleterm with 256 colors, - use=st, - ccc, - 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, - 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, - km, - rmm=\E[?1034l, - smm=\E[?1034h, - rs2=\E[4l\E>\E[?1034h, - is2=\E[4l\E>\E[?1034h, - -st-bs| simpleterm with backspace as backspace, - use=st, - kbs=\010, - kdch1=\177, - -st-bs-256color| simpleterm with backspace as backspace and 256colors, - use=st-256color, - kbs=\010, - kdch1=\177, diff --git a/st-0.8.4/st.o b/st-0.8.4/st.o deleted file mode 100644 index e3f7921ae5d6e6ee52e966ff6aef227589a6845a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77144 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 diff --git a/st-0.8.4/win.h b/st-0.8.4/win.h deleted file mode 100644 index a6ef1b9..0000000 --- a/st-0.8.4/win.h +++ /dev/null @@ -1,39 +0,0 @@ -/* 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 xximspot(int, int); diff --git a/st-0.8.4/x.c b/st-0.8.4/x.c deleted file mode 100644 index 8c478f9..0000000 --- a/st-0.8.4/x.c +++ /dev/null @@ -1,2070 +0,0 @@ -/* See LICENSE for license details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -char *argv0; -#include "arg.h" -#include "st.h" -#include "win.h" - -/* types used in config.h */ -typedef struct { - uint mod; - KeySym keysym; - void (*func)(const Arg *); - const Arg arg; -} Shortcut; - -typedef struct { - uint mod; - uint button; - void (*func)(const Arg *); - const Arg arg; - uint release; -} MouseShortcut; - -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 */ -} Key; - -/* X modifiers */ -#define XK_ANY_MOD UINT_MAX -#define XK_NO_MOD 0 -#define XK_SWITCH_MOD (1<<13) - -/* 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 *); -static void ttysend(const Arg *); - -/* config.h for applying patches and the configuration. */ -#include "config.h" - -/* XEMBED messages */ -#define XEMBED_FOCUS_IN 4 -#define XEMBED_FOCUS_OUT 5 - -/* macros */ -#define IS_SET(flag) ((win.mode & (flag)) != 0) -#define TRUERED(x) (((x) & 0xff0000) >> 8) -#define TRUEGREEN(x) (((x) & 0xff00)) -#define TRUEBLUE(x) (((x) & 0xff) << 8) - -typedef XftDraw *Draw; -typedef XftColor Color; -typedef XftGlyphFontSpec GlyphFontSpec; - -/* 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 { - Display *dpy; - Colormap cmap; - Window win; - Drawable buf; - GlyphFontSpec *specbuf; /* font spec buffer used for rendering */ - Atom xembed, wmdeletewin, netwmname, netwmpid; - struct { - XIM xim; - XIC xic; - XPoint spot; - XVaNestedList spotlist; - } ime; - Draw draw; - Visual *vis; - XSetWindowAttributes attrs; - int scr; - int isfixed; /* is fixed geometry? */ - int depth; /* bit depth */ - int l, t; /* left and top offset */ - int gm; /* geometry mask */ -} XWindow; - -typedef struct { - Atom xtarget; - char *primary, *clipboard; - struct timespec tclick1; - struct timespec tclick2; -} XSelection; - -/* Font structure */ -#define Font Font_ -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; - size_t collen; - Font font, bfont, ifont, ibfont; - GC gc; -} DC; - -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 xclear(int, int, int, int); -static int xgeommasktogravity(int); -static int ximopen(Display *); -static void ximinstantiate(Display *, XPointer, XPointer); -static void ximdestroy(XIM, XPointer, XPointer); -static int xicdestroy(XIC, XPointer, XPointer); -static void xinit(int, int); -static void cresize(int, int); -static void xresize(int, int); -static void xhints(void); -static int xloadcolor(int, const char *, Color *); -static int xloadfont(Font *, FcPattern *); -static void xloadfonts(char *, double); -static void xunloadfont(Font *); -static void xunloadfonts(void); -static void xsetenv(void); -static void xseturgency(int); -static int evcol(XEvent *); -static int evrow(XEvent *); - -static void expose(XEvent *); -static void visibility(XEvent *); -static void unmap(XEvent *); -static void kpress(XEvent *); -static void cmessage(XEvent *); -static void resize(XEvent *); -static void focus(XEvent *); -static uint buttonmask(uint); -static int mouseaction(XEvent *, uint); -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 setsel(char *, Time); -static void mousesel(XEvent *, int); -static void mousereport(XEvent *); -static char *kmap(KeySym, uint); -static int match(uint, uint); - -static void run(void); -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 XSelection xsel; -static TermWindow win; - -/* 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 = NULL; -static int frclen = 0; -static int frccap = 0; -static char *usedfont = NULL; -static double usedfontsize = 0; -static double defaultfontsize = 0; - -static char *opt_alpha = NULL; -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 -clipcopy(const Arg *dummy) -{ - Atom clipboard; - - free(xsel.clipboard); - xsel.clipboard = NULL; - - if (xsel.primary != NULL) { - xsel.clipboard = xstrdup(xsel.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, xsel.xtarget, clipboard, - xw.win, CurrentTime); -} - -void -selpaste(const Arg *dummy) -{ - XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY, - xw.win, CurrentTime); -} - -void -numlock(const Arg *dummy) -{ - win.mode ^= MODE_NUMLOCK; -} - -void -zoom(const Arg *arg) -{ - Arg larg; - - larg.f = usedfontsize + arg->f; - zoomabs(&larg); -} - -void -zoomabs(const Arg *arg) -{ - xunloadfonts(); - xloadfonts(usedfont, arg->f); - cresize(0, 0); - redraw(); - xhints(); -} - -void -zoomreset(const Arg *arg) -{ - Arg larg; - - if (defaultfontsize > 0) { - larg.f = defaultfontsize; - zoomabs(&larg); - } -} - -void -ttysend(const Arg *arg) -{ - ttywrite(arg->s, strlen(arg->s), 1); -} - -int -evcol(XEvent *e) -{ - int x = e->xbutton.x - borderpx; - LIMIT(x, 0, win.tw - 1); - return x / win.cw; -} - -int -evrow(XEvent *e) -{ - int y = e->xbutton.y - borderpx; - LIMIT(y, 0, win.th - 1); - return y / win.ch; -} - -void -mousesel(XEvent *e, int done) -{ - int type, seltype = SEL_REGULAR; - uint state = e->xbutton.state & ~(Button1Mask | forcemousemod); - - for (type = 1; type < LEN(selmasks); ++type) { - if (match(selmasks[type], state)) { - seltype = type; - break; - } - } - selextend(evcol(e), evrow(e), seltype, done); - if (done) - setsel(getsel(), e->xbutton.time); -} - -void -mousereport(XEvent *e) -{ - int len, x = evcol(e), y = evrow(e), - button = e->xbutton.button, state = e->xbutton.state; - 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, 0); -} - -uint -buttonmask(uint button) -{ - return button == Button1 ? Button1Mask - : button == Button2 ? Button2Mask - : button == Button3 ? Button3Mask - : button == Button4 ? Button4Mask - : button == Button5 ? Button5Mask - : 0; -} - -int -mouseaction(XEvent *e, uint release) -{ - MouseShortcut *ms; - - /* ignore Buttonmask for Button - it's set on release */ - uint state = e->xbutton.state & ~buttonmask(e->xbutton.button); - - for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { - if (ms->release == release && - ms->button == e->xbutton.button && - (match(ms->mod, state) || /* exact or forced */ - match(ms->mod, state & ~forcemousemod))) { - ms->func(&(ms->arg)); - return 1; - } - } - - return 0; -} - -void -bpress(XEvent *e) -{ - struct timespec now; - int snap; - - if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { - mousereport(e); - return; - } - - if (mouseaction(e, 0)) - return; - - if (e->xbutton.button == Button1) { - /* - * If the user clicks below predefined timeouts specific - * snapping behaviour is exposed. - */ - clock_gettime(CLOCK_MONOTONIC, &now); - if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) { - snap = SNAP_LINE; - } else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) { - snap = SNAP_WORD; - } else { - snap = 0; - } - xsel.tclick2 = xsel.tclick1; - xsel.tclick1 = now; - - selstart(evcol(e), evrow(e), snap); - } -} - -void -propnotify(XEvent *e) -{ - XPropertyEvent *xpev; - Atom clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); - - xpev = &e->xproperty; - if (xpev->state == PropertyNewValue && - (xpev->atom == XA_PRIMARY || - xpev->atom == clipboard)) { - selnotify(e); - } -} - -void -selnotify(XEvent *e) -{ - ulong nitems, ofs, rem; - int format; - uchar *data, *last, *repl; - Atom type, incratom, property = None; - - 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; - - 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, 0); - ttywrite((char *)data, nitems * format / 8, 1); - if (IS_SET(MODE_BRCKTPASTE) && rem == 0) - ttywrite("\033[201~", 6, 0); - 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 -xclipcopy(void) -{ - clipcopy(NULL); -} - -void -selclear_(XEvent *e) -{ - selclear(); -} - -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 = xsel.xtarget; - XChangeProperty(xsre->display, xsre->requestor, xsre->property, - XA_ATOM, 32, PropModeReplace, - (uchar *) &string, 1); - xev.property = xsre->property; - } else if (xsre->target == xsel.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 = xsel.primary; - } else if (xsre->selection == clipboard) { - seltext = xsel.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 -setsel(char *str, Time t) -{ - if (!str) - return; - - free(xsel.primary); - xsel.primary = str; - - XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); - if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) - selclear(); - clipcopy(NULL); -} - -void -xsetsel(char *str) -{ - setsel(str, CurrentTime); -} - -void -brelease(XEvent *e) -{ - if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { - mousereport(e); - return; - } - - if (mouseaction(e, 1)) - return; - if (e->xbutton.button == Button1) - mousesel(e, 1); -} - -void -bmotion(XEvent *e) -{ - if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { - mousereport(e); - return; - } - - mousesel(e, 0); -} - -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); - xresize(col, row); - ttyresize(win.tw, win.th); -} - -void -xresize(int col, int row) -{ - win.tw = col * win.cw; - win.th = row * win.ch; - - XFreePixmap(xw.dpy, xw.buf); - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, - xw.depth); - XftDrawChange(xw.draw, xw.buf); - xclear(0, 0, win.w, win.h); - - /* resize to new width */ - xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec)); -} - -ushort -sixd_to_16bit(int x) -{ - return x == 0 ? 0 : 0x3737 + 0x2828 * x; -} - -int -xloadcolor(int i, const char *name, Color *ncolor) -{ - XRenderColor color = { .alpha = 0xffff }; - - if (!name) { - if (BETWEEN(i, 16, 255)) { /* 256 color */ - if (i < 6*6*6+16) { /* same colors as xterm */ - color.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); -} - -void -xloadcols(void) -{ - int i; - static int loaded; - Color *cp; - - if (loaded) { - for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp) - XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); - } else { - dc.collen = MAX(LEN(colorname), 256); - dc.col = xmalloc(dc.collen * sizeof(Color)); - } - - for (i = 0; i < dc.collen; 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); - } - - /* set alpha value of bg color */ - if (opt_alpha) - alpha = strtof(opt_alpha, NULL); - dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha); - dc.col[defaultbg].pixel &= 0x00FFFFFF; - dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24; - loaded = 1; -} - -int -xsetcolorname(int x, const char *name) -{ - Color ncolor; - - if (!BETWEEN(x, 0, dc.collen)) - return 1; - - if (!xloadcolor(x, name, &ncolor)) - return 1; - - XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); - dc.col[x] = ncolor; - - return 0; -} - -/* - * 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); -} - -void -xhints(void) -{ - XClassHint class = {opt_name ? opt_name : termname, - opt_class ? opt_class : termname}; - XWMHints wm = {.flags = InputHint, .input = 1}; - XSizeHints *sizeh; - - sizeh = XAllocSizeHints(); - - sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize; - sizeh->height = win.h; - sizeh->width = win.w; - sizeh->height_inc = win.ch; - sizeh->width_inc = win.cw; - sizeh->base_height = 2 * borderpx; - sizeh->base_width = 2 * borderpx; - sizeh->min_height = win.ch + 2 * borderpx; - sizeh->min_width = win.cw + 2 * borderpx; - if (xw.isfixed) { - sizeh->flags |= PMaxSize; - sizeh->min_width = sizeh->max_width = win.w; - sizeh->min_height = sizeh->max_height = win.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) -{ - switch (mask & (XNegative|YNegative)) { - case 0: - return NorthWestGravity; - case XNegative: - return NorthEastGravity; - case YNegative: - return SouthWestGravity; - } - - return SouthEastGravity; -} - -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("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("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; - - if (fontstr[0] == '-') - pattern = XftXlfdParse(fontstr, False, False); - 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; - } - - if (xloadfont(&dc.font, pattern)) - die("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. */ - 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 (xloadfont(&dc.ifont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDel(pattern, FC_WEIGHT); - FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); - if (xloadfont(&dc.ibfont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDel(pattern, FC_SLANT); - FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); - if (xloadfont(&dc.bfont, pattern)) - die("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); -} - -int -ximopen(Display *dpy) -{ - XIMCallback imdestroy = { .client_data = NULL, .callback = ximdestroy }; - XICCallback icdestroy = { .client_data = NULL, .callback = xicdestroy }; - - xw.ime.xim = XOpenIM(xw.dpy, NULL, NULL, NULL); - if (xw.ime.xim == NULL) - return 0; - - if (XSetIMValues(xw.ime.xim, XNDestroyCallback, &imdestroy, NULL)) - fprintf(stderr, "XSetIMValues: " - "Could not set XNDestroyCallback.\n"); - - xw.ime.spotlist = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot, - NULL); - - if (xw.ime.xic == NULL) { - xw.ime.xic = XCreateIC(xw.ime.xim, XNInputStyle, - XIMPreeditNothing | XIMStatusNothing, - XNClientWindow, xw.win, - XNDestroyCallback, &icdestroy, - NULL); - } - if (xw.ime.xic == NULL) - fprintf(stderr, "XCreateIC: Could not create input context.\n"); - - return 1; -} - -void -ximinstantiate(Display *dpy, XPointer client, XPointer call) -{ - if (ximopen(dpy)) - XUnregisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL, - ximinstantiate, NULL); -} - -void -ximdestroy(XIM xim, XPointer client, XPointer call) -{ - xw.ime.xim = NULL; - XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL, - ximinstantiate, NULL); - XFree(xw.ime.spotlist); -} - -int -xicdestroy(XIC xim, XPointer client, XPointer call) -{ - xw.ime.xic = NULL; - return 1; -} - -void -xinit(int cols, int rows) -{ - XGCValues gcvalues; - Cursor cursor; - Window parent; - pid_t thispid = getpid(); - XColor xmousefg, xmousebg; - XWindowAttributes attr; - XVisualInfo vis; - - if (!(xw.dpy = XOpenDisplay(NULL))) - die("can't open display\n"); - xw.scr = XDefaultScreen(xw.dpy); - - if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) { - parent = XRootWindow(xw.dpy, xw.scr); - xw.depth = 32; - } else { - XGetWindowAttributes(xw.dpy, parent, &attr); - xw.depth = attr.depth; - } - - XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis); - xw.vis = vis.visual; - - /* font */ - if (!FcInit()) - die("could not init fontconfig.\n"); - - usedfont = (opt_font == NULL)? font : opt_font; - xloadfonts(usedfont, 0); - - /* colors */ - xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None); - xloadcols(); - - /* adjust fixed window geometry */ - win.w = 2 * borderpx + cols * win.cw; - win.h = 2 * borderpx + rows * win.ch; - if (xw.gm & XNegative) - xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2; - if (xw.gm & YNegative) - xw.t += DisplayHeight(xw.dpy, xw.scr) - win.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 | KeyReleaseMask - | ExposureMask | VisibilityChangeMask | StructureNotifyMask - | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; - xw.attrs.colormap = xw.cmap; - - xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t, - win.w, win.h, 0, xw.depth, InputOutput, - xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity - | CWEventMask | CWColormap, &xw.attrs); - - memset(&gcvalues, 0, sizeof(gcvalues)); - gcvalues.graphics_exposures = False; - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth); - dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues); - XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); - XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); - - /* font spec buffer */ - xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec)); - - /* Xft rendering context */ - xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap); - - /* input methods */ - if (!ximopen(xw.dpy)) { - XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL, - ximinstantiate, NULL); - } - - /* 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); - - win.mode = MODE_NUMLOCK; - resettitle(); - xhints(); - XMapWindow(xw.dpy, xw.win); - XSync(xw.dpy, False); - - clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1); - clock_gettime(CLOCK_MONOTONIC, &xsel.tclick2); - xsel.primary = NULL; - xsel.clipboard = NULL; - xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); - if (xsel.xtarget == None) - xsel.xtarget = XA_STRING; -} - -int -xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) -{ - float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp; - ushort mode, prevmode = USHRT_MAX; - Font *font = &dc.font; - int frcflags = FRC_NORMAL; - float runewidth = win.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 = win.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); - - /* Allocate memory for the new cache entry. */ - if (frclen >= frccap) { - frccap += 16; - frc = xrealloc(frc, frccap * sizeof(Fontcache)); - } - - frc[frclen].font = XftFontOpenPattern(xw.dpy, - fontpattern); - if (!frc[frclen].font) - die("XftFontOpenPattern failed seeking fallback font: %s\n", - strerror(errno)); - 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 * win.cw, winy = borderpx + y * win.ch, - width = charlen * win.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_BOLD_FAINT) == ATTR_FAINT) { - colfg.red = fg->color.red / 2; - colfg.green = fg->color.green / 2; - colfg.blue = fg->color.blue / 2; - colfg.alpha = fg->color.alpha; - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg); - fg = &revfg; - } - - if (base.mode & ATTR_REVERSE) { - temp = fg; - fg = bg; - bg = temp; - } - - 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) { - xclear(0, (y == 0)? 0 : winy, borderpx, - winy + win.ch + - ((winy + win.ch >= borderpx + win.th)? win.h : 0)); - } - if (winx + width >= borderpx + win.tw) { - xclear(winx + width, (y == 0)? 0 : winy, win.w, - ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch))); - } - if (y == 0) - xclear(winx, 0, winx + width, borderpx); - if (winy + win.ch >= borderpx + win.th) - xclear(winx, winy + win.ch, winx + width, win.h); - - /* Clean up the region we want to draw to. */ - XftDrawRect(xw.draw, bg, winx, winy, width, win.ch); - - /* Set the clip region because Xft is sometimes dirty. */ - r.x = 0; - r.y = 0; - r.height = win.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(int cx, int cy, Glyph g, int ox, int oy, Glyph og) -{ - Color drawcol; - - /* remove the old cursor */ - if (selected(ox, oy)) - og.mode ^= ATTR_REVERSE; - xdrawglyph(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 (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 = defaultcs; - } - drawcol = dc.col[g.bg]; - } - - /* draw the new one */ - if (IS_SET(MODE_FOCUSED)) { - switch (win.cursor) { - case 7: /* st extension */ - g.u = 0x2603; /* snowman (U+2603) */ - /* FALLTHROUGH */ - case 0: /* Blinking Block */ - case 1: /* Blinking Block (Default) */ - case 2: /* Steady Block */ - xdrawglyph(g, cx, cy); - break; - case 3: /* Blinking Underline */ - case 4: /* Steady Underline */ - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - \ - cursorthickness, - win.cw, cursorthickness); - break; - case 5: /* Blinking bar */ - case 6: /* Steady bar */ - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, - cursorthickness, win.ch); - break; - } - } else { - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, - win.cw - 1, 1); - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, - 1, win.ch - 1); - XftDrawRect(xw.draw, &drawcol, - borderpx + (cx + 1) * win.cw - 1, - borderpx + cy * win.ch, - 1, win.ch - 1); - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - 1, - win.cw, 1); - } -} - -void -xsetenv(void) -{ - char buf[sizeof(long) * 8 + 1]; - - snprintf(buf, sizeof(buf), "%lu", xw.win); - setenv("WINDOWID", buf, 1); -} - -void -xsettitle(char *p) -{ - XTextProperty prop; - DEFAULT(p, opt_title); - - Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, - &prop); - XSetWMName(xw.dpy, xw.win, &prop); - XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname); - XFree(prop.value); -} - -int -xstartdraw(void) -{ - return IS_SET(MODE_VISIBLE); -} - -void -xdrawline(Line line, int x1, int y1, int x2) -{ - int i, x, ox, numspecs; - Glyph base, new; - XftGlyphFontSpec *specs = xw.specbuf; - - numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1); - i = ox = 0; - for (x = x1; x < x2 && i < numspecs; x++) { - new = line[x]; - if (new.mode == ATTR_WDUMMY) - continue; - if (selected(x, y1)) - new.mode ^= ATTR_REVERSE; - if (i > 0 && ATTRCMP(base, new)) { - xdrawglyphfontspecs(specs, base, i, ox, y1); - specs += i; - numspecs -= i; - i = 0; - } - if (i == 0) { - ox = x; - base = new; - } - i++; - } - if (i > 0) - xdrawglyphfontspecs(specs, base, i, ox, y1); -} - -void -xfinishdraw(void) -{ - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w, - win.h, 0, 0); - XSetForeground(xw.dpy, dc.gc, - dc.col[IS_SET(MODE_REVERSE)? - defaultfg : defaultbg].pixel); -} - -void -xximspot(int x, int y) -{ - if (xw.ime.xic == NULL) - return; - - xw.ime.spot.x = borderpx + x * win.cw; - xw.ime.spot.y = borderpx + (y + 1) * win.ch; - - XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.spotlist, NULL); -} - -void -expose(XEvent *ev) -{ - redraw(); -} - -void -visibility(XEvent *ev) -{ - XVisibilityEvent *e = &ev->xvisibility; - - MODBIT(win.mode, e->state != VisibilityFullyObscured, MODE_VISIBLE); -} - -void -unmap(XEvent *ev) -{ - win.mode &= ~MODE_VISIBLE; -} - -void -xsetpointermotion(int set) -{ - MODBIT(xw.attrs.event_mask, set, PointerMotionMask); - XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs); -} - -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(); -} - -int -xsetcursor(int cursor) -{ - if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */ - return 1; - win.cursor = cursor; - return 0; -} - -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 -xbell(void) -{ - if (!(IS_SET(MODE_FOCUSED))) - xseturgency(1); - if (bellvolume) - XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL); -} - -void -focus(XEvent *ev) -{ - XFocusChangeEvent *e = &ev->xfocus; - - if (e->mode == NotifyGrab) - return; - - if (ev->type == FocusIn) { - if (xw.ime.xic) - XSetICFocus(xw.ime.xic); - win.mode |= MODE_FOCUSED; - xseturgency(0); - if (IS_SET(MODE_FOCUS)) - ttywrite("\033[I", 3, 0); - } else { - if (xw.ime.xic) - XUnsetICFocus(xw.ime.xic); - win.mode &= ~MODE_FOCUSED; - if (IS_SET(MODE_FOCUS)) - ttywrite("\033[O", 3, 0); - } -} - -int -match(uint mask, uint state) -{ - return mask == XK_ANY_MOD || mask == (state & ~ignoremod); -} - -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 (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 -kpress(XEvent *ev) -{ - XKeyEvent *e = &ev->xkey; - KeySym ksym; - char buf[64], *customkey; - int len; - Rune c; - Status status; - Shortcut *bp; - - if (IS_SET(MODE_KBDLOCK)) - return; - - if (xw.ime.xic) - len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status); - else - len = XLookupString(e, buf, sizeof buf, &ksym, NULL); - /* 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))) { - ttywrite(customkey, strlen(customkey), 1); - 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; - } - } - ttywrite(buf, len, 1); -} - -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) { - win.mode |= MODE_FOCUSED; - xseturgency(0); - } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) { - win.mode &= ~MODE_FOCUSED; - } - } else if (e->xclient.data.l[0] == xw.wmdeletewin) { - ttyhangup(); - exit(0); - } -} - -void -resize(XEvent *e) -{ - if (e->xconfigure.width == win.w && e->xconfigure.height == win.h) - return; - - cresize(e->xconfigure.width, e->xconfigure.height); -} - -void -run(void) -{ - XEvent ev; - int w = win.w, h = win.h; - fd_set rfd; - int xfd = XConnectionNumber(xw.dpy), ttyfd, xev, drawing; - struct timespec seltv, *tv, now, lastblink, trigger; - double timeout; - - /* 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); - - ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd); - cresize(w, h); - - for (timeout = -1, drawing = 0, lastblink = (struct timespec){0};;) { - FD_ZERO(&rfd); - FD_SET(ttyfd, &rfd); - FD_SET(xfd, &rfd); - - if (XPending(xw.dpy)) - timeout = 0; /* existing events might not set xfd */ - - seltv.tv_sec = timeout / 1E3; - seltv.tv_nsec = 1E6 * (timeout - 1E3 * seltv.tv_sec); - tv = timeout >= 0 ? &seltv : NULL; - - if (pselect(MAX(xfd, ttyfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) { - if (errno == EINTR) - continue; - die("select failed: %s\n", strerror(errno)); - } - clock_gettime(CLOCK_MONOTONIC, &now); - - if (FD_ISSET(ttyfd, &rfd)) - ttyread(); - - xev = 0; - while (XPending(xw.dpy)) { - xev = 1; - XNextEvent(xw.dpy, &ev); - if (XFilterEvent(&ev, None)) - continue; - if (handler[ev.type]) - (handler[ev.type])(&ev); - } - - /* - * To reduce flicker and tearing, when new content or event - * triggers drawing, we first wait a bit to ensure we got - * everything, and if nothing new arrives - we draw. - * We start with trying to wait minlatency ms. If more content - * arrives sooner, we retry with shorter and shorter periods, - * and eventually draw even without idle after maxlatency ms. - * Typically this results in low latency while interacting, - * maximum latency intervals during `cat huge.txt`, and perfect - * sync with periodic updates from animations/key-repeats/etc. - */ - if (FD_ISSET(ttyfd, &rfd) || xev) { - if (!drawing) { - trigger = now; - drawing = 1; - } - timeout = (maxlatency - TIMEDIFF(now, trigger)) \ - / maxlatency * minlatency; - if (timeout > 0) - continue; /* we have time, try to find idle */ - } - - /* idle detected or maxlatency exhausted -> draw */ - timeout = -1; - if (blinktimeout && tattrset(ATTR_BLINK)) { - timeout = blinktimeout - TIMEDIFF(now, lastblink); - if (timeout <= 0) { - if (-timeout > blinktimeout) /* start visible */ - win.mode |= MODE_BLINK; - win.mode ^= MODE_BLINK; - tsetdirtattr(ATTR_BLINK); - lastblink = now; - timeout = blinktimeout; - } - } - - draw(); - XFlush(xw.dpy); - drawing = 0; - } -} - -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; - xsetcursor(cursorshape); - - ARGBEGIN { - case 'a': - allowaltscreen = 0; - break; - case 'A': - opt_alpha = EARGF(usage()); - 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 "\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" : opt_cmd[0]; - - setlocale(LC_CTYPE, ""); - XSetLocaleModifiers(""); - cols = MAX(cols, 1); - rows = MAX(rows, 1); - tnew(cols, rows); - xinit(cols, rows); - xsetenv(); - selinit(); - run(); - - return 0; -} diff --git a/st-0.8.4/x.c.orig b/st-0.8.4/x.c.orig deleted file mode 100644 index c87e48e..0000000 --- a/st-0.8.4/x.c.orig +++ /dev/null @@ -1,2171 +0,0 @@ -/* See LICENSE for license details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -char *argv0; -#include "arg.h" -#include "st.h" -#include "win.h" - -/* types used in config.h */ -typedef struct { - uint mod; - KeySym keysym; - void (*func)(const Arg *); - const Arg arg; -} Shortcut; - -typedef struct { - uint mod; - uint button; - void (*func)(const Arg *); - const Arg arg; - uint release; -} MouseShortcut; - -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 */ -} Key; - -/* X modifiers */ -#define XK_ANY_MOD UINT_MAX -#define XK_NO_MOD 0 -#define XK_SWITCH_MOD (1<<13) - -/* 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 *); -static void ttysend(const Arg *); - -/* config.h for applying patches and the configuration. */ -#include "config.h" - -/* XEMBED messages */ -#define XEMBED_FOCUS_IN 4 -#define XEMBED_FOCUS_OUT 5 - -/* macros */ -#define IS_SET(flag) ((win.mode & (flag)) != 0) -#define TRUERED(x) (((x) & 0xff0000) >> 8) -#define TRUEGREEN(x) (((x) & 0xff00)) -#define TRUEBLUE(x) (((x) & 0xff) << 8) - -typedef XftDraw *Draw; -typedef XftColor Color; -typedef XftGlyphFontSpec GlyphFontSpec; - -/* 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 { - Display *dpy; - Colormap cmap; - Window win; - Drawable buf; - GlyphFontSpec *specbuf; /* font spec buffer used for rendering */ - Atom xembed, wmdeletewin, netwmname, netwmpid; - struct { - XIM xim; - XIC xic; - XPoint spot; - XVaNestedList spotlist; - } ime; - Draw draw; - Visual *vis; - XSetWindowAttributes attrs; - int scr; - int isfixed; /* is fixed geometry? */ - int depth; /* bit depth */ - int l, t; /* left and top offset */ - int gm; /* geometry mask */ -} XWindow; - -typedef struct { - Atom xtarget; - char *primary, *clipboard; - struct timespec tclick1; - struct timespec tclick2; -} XSelection; - -/* Font structure */ -#define Font Font_ -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; - size_t collen; - Font font, bfont, ifont, ibfont; - GC gc; -} DC; - -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 xclear(int, int, int, int); -static int xgeommasktogravity(int); -static int ximopen(Display *); -static void ximinstantiate(Display *, XPointer, XPointer); -static void ximdestroy(XIM, XPointer, XPointer); -static int xicdestroy(XIC, XPointer, XPointer); -static void xinit(int, int); -static void cresize(int, int); -static void xresize(int, int); -static void xhints(void); -static int xloadcolor(int, const char *, Color *); -static int xloadfont(Font *, FcPattern *); -static void xloadfonts(char *, double); -static int xloadsparefont(FcPattern *, int); -static void xloadsparefonts(void); -static void xunloadfont(Font *); -static void xunloadfonts(void); -static void xsetenv(void); -static void xseturgency(int); -static int evcol(XEvent *); -static int evrow(XEvent *); - -static void expose(XEvent *); -static void visibility(XEvent *); -static void unmap(XEvent *); -static void kpress(XEvent *); -static void cmessage(XEvent *); -static void resize(XEvent *); -static void focus(XEvent *); -static uint buttonmask(uint); -static int mouseaction(XEvent *, uint); -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 setsel(char *, Time); -static void mousesel(XEvent *, int); -static void mousereport(XEvent *); -static char *kmap(KeySym, uint); -static int match(uint, uint); - -static void run(void); -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 XSelection xsel; -static TermWindow win; - -/* 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 = NULL; -static int frclen = 0; -static int frccap = 0; -static char *usedfont = NULL; -static double usedfontsize = 0; -static double defaultfontsize = 0; - -static char *opt_alpha = NULL; -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 -clipcopy(const Arg *dummy) -{ - Atom clipboard; - - free(xsel.clipboard); - xsel.clipboard = NULL; - - if (xsel.primary != NULL) { - xsel.clipboard = xstrdup(xsel.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, xsel.xtarget, clipboard, - xw.win, CurrentTime); -} - -void -selpaste(const Arg *dummy) -{ - XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY, - xw.win, CurrentTime); -} - -void -numlock(const Arg *dummy) -{ - win.mode ^= MODE_NUMLOCK; -} - -void -zoom(const Arg *arg) -{ - Arg larg; - - larg.f = usedfontsize + arg->f; - zoomabs(&larg); -} - -void -zoomabs(const Arg *arg) -{ - xunloadfonts(); - xloadfonts(usedfont, arg->f); - xloadsparefonts(); - cresize(0, 0); - redraw(); - xhints(); -} - -void -zoomreset(const Arg *arg) -{ - Arg larg; - - if (defaultfontsize > 0) { - larg.f = defaultfontsize; - zoomabs(&larg); - } -} - -void -ttysend(const Arg *arg) -{ - ttywrite(arg->s, strlen(arg->s), 1); -} - -int -evcol(XEvent *e) -{ - int x = e->xbutton.x - borderpx; - LIMIT(x, 0, win.tw - 1); - return x / win.cw; -} - -int -evrow(XEvent *e) -{ - int y = e->xbutton.y - borderpx; - LIMIT(y, 0, win.th - 1); - return y / win.ch; -} - -void -mousesel(XEvent *e, int done) -{ - int type, seltype = SEL_REGULAR; - uint state = e->xbutton.state & ~(Button1Mask | forcemousemod); - - for (type = 1; type < LEN(selmasks); ++type) { - if (match(selmasks[type], state)) { - seltype = type; - break; - } - } - selextend(evcol(e), evrow(e), seltype, done); - if (done) - setsel(getsel(), e->xbutton.time); -} - -void -mousereport(XEvent *e) -{ - int len, x = evcol(e), y = evrow(e), - button = e->xbutton.button, state = e->xbutton.state; - 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, 0); -} - -uint -buttonmask(uint button) -{ - return button == Button1 ? Button1Mask - : button == Button2 ? Button2Mask - : button == Button3 ? Button3Mask - : button == Button4 ? Button4Mask - : button == Button5 ? Button5Mask - : 0; -} - -int -mouseaction(XEvent *e, uint release) -{ - MouseShortcut *ms; - - /* ignore Buttonmask for Button - it's set on release */ - uint state = e->xbutton.state & ~buttonmask(e->xbutton.button); - - for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { - if (ms->release == release && - ms->button == e->xbutton.button && - (match(ms->mod, state) || /* exact or forced */ - match(ms->mod, state & ~forcemousemod))) { - ms->func(&(ms->arg)); - return 1; - } - } - - return 0; -} - -void -bpress(XEvent *e) -{ - struct timespec now; - int snap; - - if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { - mousereport(e); - return; - } - - if (mouseaction(e, 0)) - return; - - if (e->xbutton.button == Button1) { - /* - * If the user clicks below predefined timeouts specific - * snapping behaviour is exposed. - */ - clock_gettime(CLOCK_MONOTONIC, &now); - if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) { - snap = SNAP_LINE; - } else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) { - snap = SNAP_WORD; - } else { - snap = 0; - } - xsel.tclick2 = xsel.tclick1; - xsel.tclick1 = now; - - selstart(evcol(e), evrow(e), snap); - } -} - -void -propnotify(XEvent *e) -{ - XPropertyEvent *xpev; - Atom clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); - - xpev = &e->xproperty; - if (xpev->state == PropertyNewValue && - (xpev->atom == XA_PRIMARY || - xpev->atom == clipboard)) { - selnotify(e); - } -} - -void -selnotify(XEvent *e) -{ - ulong nitems, ofs, rem; - int format; - uchar *data, *last, *repl; - Atom type, incratom, property = None; - - 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; - - 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, 0); - ttywrite((char *)data, nitems * format / 8, 1); - if (IS_SET(MODE_BRCKTPASTE) && rem == 0) - ttywrite("\033[201~", 6, 0); - 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 -xclipcopy(void) -{ - clipcopy(NULL); -} - -void -selclear_(XEvent *e) -{ - selclear(); -} - -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 = xsel.xtarget; - XChangeProperty(xsre->display, xsre->requestor, xsre->property, - XA_ATOM, 32, PropModeReplace, - (uchar *) &string, 1); - xev.property = xsre->property; - } else if (xsre->target == xsel.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 = xsel.primary; - } else if (xsre->selection == clipboard) { - seltext = xsel.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 -setsel(char *str, Time t) -{ - if (!str) - return; - - free(xsel.primary); - xsel.primary = str; - - XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); - if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) - selclear(); - clipcopy(NULL); -} - -void -xsetsel(char *str) -{ - setsel(str, CurrentTime); -} - -void -brelease(XEvent *e) -{ - if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { - mousereport(e); - return; - } - - if (mouseaction(e, 1)) - return; - if (e->xbutton.button == Button1) - mousesel(e, 1); -} - -void -bmotion(XEvent *e) -{ - if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { - mousereport(e); - return; - } - - mousesel(e, 0); -} - -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); - xresize(col, row); - ttyresize(win.tw, win.th); -} - -void -xresize(int col, int row) -{ - win.tw = col * win.cw; - win.th = row * win.ch; - - XFreePixmap(xw.dpy, xw.buf); - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, - xw.depth); - XftDrawChange(xw.draw, xw.buf); - xclear(0, 0, win.w, win.h); - - /* resize to new width */ - xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec)); -} - -ushort -sixd_to_16bit(int x) -{ - return x == 0 ? 0 : 0x3737 + 0x2828 * x; -} - -int -xloadcolor(int i, const char *name, Color *ncolor) -{ - XRenderColor color = { .alpha = 0xffff }; - - if (!name) { - if (BETWEEN(i, 16, 255)) { /* 256 color */ - if (i < 6*6*6+16) { /* same colors as xterm */ - color.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); -} - -void -xloadcols(void) -{ - int i; - static int loaded; - Color *cp; - - if (loaded) { - for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp) - XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); - } else { - dc.collen = MAX(LEN(colorname), 256); - dc.col = xmalloc(dc.collen * sizeof(Color)); - } - - for (i = 0; i < dc.collen; 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); - } - - /* set alpha value of bg color */ - if (opt_alpha) - alpha = strtof(opt_alpha, NULL); - dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha); - dc.col[defaultbg].pixel &= 0x00FFFFFF; - dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24; - loaded = 1; -} - -int -xsetcolorname(int x, const char *name) -{ - Color ncolor; - - if (!BETWEEN(x, 0, dc.collen)) - return 1; - - if (!xloadcolor(x, name, &ncolor)) - return 1; - - XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); - dc.col[x] = ncolor; - - return 0; -} - -/* - * 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); -} - -void -xhints(void) -{ - XClassHint class = {opt_name ? opt_name : termname, - opt_class ? opt_class : termname}; - XWMHints wm = {.flags = InputHint, .input = 1}; - XSizeHints *sizeh; - - sizeh = XAllocSizeHints(); - - sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize; - sizeh->height = win.h; - sizeh->width = win.w; - sizeh->height_inc = win.ch; - sizeh->width_inc = win.cw; - sizeh->base_height = 2 * borderpx; - sizeh->base_width = 2 * borderpx; - sizeh->min_height = win.ch + 2 * borderpx; - sizeh->min_width = win.cw + 2 * borderpx; - if (xw.isfixed) { - sizeh->flags |= PMaxSize; - sizeh->min_width = sizeh->max_width = win.w; - sizeh->min_height = sizeh->max_height = win.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) -{ - switch (mask & (XNegative|YNegative)) { - case 0: - return NorthWestGravity; - case XNegative: - return NorthEastGravity; - case YNegative: - return SouthWestGravity; - } - - return SouthEastGravity; -} - -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("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("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; - - if (fontstr[0] == '-') - pattern = XftXlfdParse(fontstr, False, False); - 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; - } - - if (xloadfont(&dc.font, pattern)) - die("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. */ - 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 (xloadfont(&dc.ifont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDel(pattern, FC_WEIGHT); - FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); - if (xloadfont(&dc.ibfont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDel(pattern, FC_SLANT); - FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); - if (xloadfont(&dc.bfont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDestroy(pattern); -} - -int -xloadsparefont(FcPattern *pattern, int flags) -{ - FcPattern *match; - FcResult result; - - match = FcFontMatch(NULL, pattern, &result); - if (!match) { - return 1; - } - - if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) { - FcPatternDestroy(match); - return 1; - } - - frc[frclen].flags = flags; - /* Believe U+0000 glyph will present in each default font */ - frc[frclen].unicodep = 0; - frclen++; - - return 0; -} - -void -xloadsparefonts(void) -{ - FcPattern *pattern; - double sizeshift, fontval; - int fc; - char **fp; - - if (frclen != 0) - die("can't embed spare fonts. cache isn't empty"); - - /* Calculate count of spare fonts */ - fc = sizeof(font2) / sizeof(*font2); - if (fc == 0) - return; - - /* Allocate memory for cache entries. */ - if (frccap < 4 * fc) { - frccap += 4 * fc - frccap; - frc = xrealloc(frc, frccap * sizeof(Fontcache)); - } - - for (fp = font2; fp - font2 < fc; ++fp) { - - if (**fp == '-') - pattern = XftXlfdParse(*fp, False, False); - else - pattern = FcNameParse((FcChar8 *)*fp); - - if (!pattern) - die("can't open spare font %s\n", *fp); - - if (defaultfontsize > 0) { - sizeshift = usedfontsize - defaultfontsize; - if (sizeshift != 0 && - FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == - FcResultMatch) { - fontval += sizeshift; - FcPatternDel(pattern, FC_PIXEL_SIZE); - FcPatternDel(pattern, FC_SIZE); - FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval); - } - } - - FcPatternAddBool(pattern, FC_SCALABLE, 1); - - FcConfigSubstitute(NULL, pattern, FcMatchPattern); - XftDefaultSubstitute(xw.dpy, xw.scr, pattern); - - if (xloadsparefont(pattern, FRC_NORMAL)) - die("can't open spare font %s\n", *fp); - - FcPatternDel(pattern, FC_SLANT); - FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); - if (xloadsparefont(pattern, FRC_ITALIC)) - die("can't open spare font %s\n", *fp); - - FcPatternDel(pattern, FC_WEIGHT); - FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); - if (xloadsparefont(pattern, FRC_ITALICBOLD)) - die("can't open spare font %s\n", *fp); - - FcPatternDel(pattern, FC_SLANT); - FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); - if (xloadsparefont(pattern, FRC_BOLD)) - die("can't open spare font %s\n", *fp); - - 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); -} - -int -ximopen(Display *dpy) -{ - XIMCallback imdestroy = { .client_data = NULL, .callback = ximdestroy }; - XICCallback icdestroy = { .client_data = NULL, .callback = xicdestroy }; - - xw.ime.xim = XOpenIM(xw.dpy, NULL, NULL, NULL); - if (xw.ime.xim == NULL) - return 0; - - if (XSetIMValues(xw.ime.xim, XNDestroyCallback, &imdestroy, NULL)) - fprintf(stderr, "XSetIMValues: " - "Could not set XNDestroyCallback.\n"); - - xw.ime.spotlist = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot, - NULL); - - if (xw.ime.xic == NULL) { - xw.ime.xic = XCreateIC(xw.ime.xim, XNInputStyle, - XIMPreeditNothing | XIMStatusNothing, - XNClientWindow, xw.win, - XNDestroyCallback, &icdestroy, - NULL); - } - if (xw.ime.xic == NULL) - fprintf(stderr, "XCreateIC: Could not create input context.\n"); - - return 1; -} - -void -ximinstantiate(Display *dpy, XPointer client, XPointer call) -{ - if (ximopen(dpy)) - XUnregisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL, - ximinstantiate, NULL); -} - -void -ximdestroy(XIM xim, XPointer client, XPointer call) -{ - xw.ime.xim = NULL; - XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL, - ximinstantiate, NULL); - XFree(xw.ime.spotlist); -} - -int -xicdestroy(XIC xim, XPointer client, XPointer call) -{ - xw.ime.xic = NULL; - return 1; -} - -void -xinit(int cols, int rows) -{ - XGCValues gcvalues; - Cursor cursor; - Window parent; - pid_t thispid = getpid(); - XColor xmousefg, xmousebg; - XWindowAttributes attr; - XVisualInfo vis; - - if (!(xw.dpy = XOpenDisplay(NULL))) - die("can't open display\n"); - xw.scr = XDefaultScreen(xw.dpy); - - if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) { - parent = XRootWindow(xw.dpy, xw.scr); - xw.depth = 32; - } else { - XGetWindowAttributes(xw.dpy, parent, &attr); - xw.depth = attr.depth; - } - - XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis); - xw.vis = vis.visual; - - /* font */ - if (!FcInit()) - die("could not init fontconfig.\n"); - - usedfont = (opt_font == NULL)? font : opt_font; - xloadfonts(usedfont, 0); - - /* spare fonts */ - xloadsparefonts(); - - /* colors */ - xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None); - xloadcols(); - - /* adjust fixed window geometry */ - win.w = 2 * borderpx + cols * win.cw; - win.h = 2 * borderpx + rows * win.ch; - if (xw.gm & XNegative) - xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2; - if (xw.gm & YNegative) - xw.t += DisplayHeight(xw.dpy, xw.scr) - win.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 | KeyReleaseMask - | ExposureMask | VisibilityChangeMask | StructureNotifyMask - | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; - xw.attrs.colormap = xw.cmap; - - xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t, - win.w, win.h, 0, xw.depth, InputOutput, - xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity - | CWEventMask | CWColormap, &xw.attrs); - - memset(&gcvalues, 0, sizeof(gcvalues)); - gcvalues.graphics_exposures = False; - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth); - dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues); - XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); - XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); - - /* font spec buffer */ - xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec)); - - /* Xft rendering context */ - xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap); - - /* input methods */ - if (!ximopen(xw.dpy)) { - XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL, - ximinstantiate, NULL); - } - - /* 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); - - win.mode = MODE_NUMLOCK; - resettitle(); - xhints(); - XMapWindow(xw.dpy, xw.win); - XSync(xw.dpy, False); - - clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1); - clock_gettime(CLOCK_MONOTONIC, &xsel.tclick2); - xsel.primary = NULL; - xsel.clipboard = NULL; - xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); - if (xsel.xtarget == None) - xsel.xtarget = XA_STRING; -} - -int -xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) -{ - float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp; - ushort mode, prevmode = USHRT_MAX; - Font *font = &dc.font; - int frcflags = FRC_NORMAL; - float runewidth = win.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 = win.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); - - /* Allocate memory for the new cache entry. */ - if (frclen >= frccap) { - frccap += 16; - frc = xrealloc(frc, frccap * sizeof(Fontcache)); - } - - frc[frclen].font = XftFontOpenPattern(xw.dpy, - fontpattern); - if (!frc[frclen].font) - die("XftFontOpenPattern failed seeking fallback font: %s\n", - strerror(errno)); - 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 * win.cw, winy = borderpx + y * win.ch, - width = charlen * win.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_BOLD_FAINT) == ATTR_FAINT) { - colfg.red = fg->color.red / 2; - colfg.green = fg->color.green / 2; - colfg.blue = fg->color.blue / 2; - colfg.alpha = fg->color.alpha; - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg); - fg = &revfg; - } - - if (base.mode & ATTR_REVERSE) { - temp = fg; - fg = bg; - bg = temp; - } - - 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) { - xclear(0, (y == 0)? 0 : winy, borderpx, - winy + win.ch + - ((winy + win.ch >= borderpx + win.th)? win.h : 0)); - } - if (winx + width >= borderpx + win.tw) { - xclear(winx + width, (y == 0)? 0 : winy, win.w, - ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch))); - } - if (y == 0) - xclear(winx, 0, winx + width, borderpx); - if (winy + win.ch >= borderpx + win.th) - xclear(winx, winy + win.ch, winx + width, win.h); - - /* Clean up the region we want to draw to. */ - XftDrawRect(xw.draw, bg, winx, winy, width, win.ch); - - /* Set the clip region because Xft is sometimes dirty. */ - r.x = 0; - r.y = 0; - r.height = win.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(int cx, int cy, Glyph g, int ox, int oy, Glyph og) -{ - Color drawcol; - - /* remove the old cursor */ - if (selected(ox, oy)) - og.mode ^= ATTR_REVERSE; - xdrawglyph(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 (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 = defaultcs; - } - drawcol = dc.col[g.bg]; - } - - /* draw the new one */ - if (IS_SET(MODE_FOCUSED)) { - switch (win.cursor) { - case 7: /* st extension */ - g.u = 0x2603; /* snowman (U+2603) */ - /* FALLTHROUGH */ - case 0: /* Blinking Block */ - case 1: /* Blinking Block (Default) */ - case 2: /* Steady Block */ - xdrawglyph(g, cx, cy); - break; - case 3: /* Blinking Underline */ - case 4: /* Steady Underline */ - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - \ - cursorthickness, - win.cw, cursorthickness); - break; - case 5: /* Blinking bar */ - case 6: /* Steady bar */ - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, - cursorthickness, win.ch); - break; - } - } else { - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, - win.cw - 1, 1); - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, - 1, win.ch - 1); - XftDrawRect(xw.draw, &drawcol, - borderpx + (cx + 1) * win.cw - 1, - borderpx + cy * win.ch, - 1, win.ch - 1); - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - 1, - win.cw, 1); - } -} - -void -xsetenv(void) -{ - char buf[sizeof(long) * 8 + 1]; - - snprintf(buf, sizeof(buf), "%lu", xw.win); - setenv("WINDOWID", buf, 1); -} - -void -xsettitle(char *p) -{ - XTextProperty prop; - DEFAULT(p, opt_title); - - Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, - &prop); - XSetWMName(xw.dpy, xw.win, &prop); - XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname); - XFree(prop.value); -} - -int -xstartdraw(void) -{ - return IS_SET(MODE_VISIBLE); -} - -void -xdrawline(Line line, int x1, int y1, int x2) -{ - int i, x, ox, numspecs; - Glyph base, new; - XftGlyphFontSpec *specs = xw.specbuf; - - numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1); - i = ox = 0; - for (x = x1; x < x2 && i < numspecs; x++) { - new = line[x]; - if (new.mode == ATTR_WDUMMY) - continue; - if (selected(x, y1)) - new.mode ^= ATTR_REVERSE; - if (i > 0 && ATTRCMP(base, new)) { - xdrawglyphfontspecs(specs, base, i, ox, y1); - specs += i; - numspecs -= i; - i = 0; - } - if (i == 0) { - ox = x; - base = new; - } - i++; - } - if (i > 0) - xdrawglyphfontspecs(specs, base, i, ox, y1); -} - -void -xfinishdraw(void) -{ - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w, - win.h, 0, 0); - XSetForeground(xw.dpy, dc.gc, - dc.col[IS_SET(MODE_REVERSE)? - defaultfg : defaultbg].pixel); -} - -void -xximspot(int x, int y) -{ - if (xw.ime.xic == NULL) - return; - - xw.ime.spot.x = borderpx + x * win.cw; - xw.ime.spot.y = borderpx + (y + 1) * win.ch; - - XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.spotlist, NULL); -} - -void -expose(XEvent *ev) -{ - redraw(); -} - -void -visibility(XEvent *ev) -{ - XVisibilityEvent *e = &ev->xvisibility; - - MODBIT(win.mode, e->state != VisibilityFullyObscured, MODE_VISIBLE); -} - -void -unmap(XEvent *ev) -{ - win.mode &= ~MODE_VISIBLE; -} - -void -xsetpointermotion(int set) -{ - MODBIT(xw.attrs.event_mask, set, PointerMotionMask); - XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs); -} - -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(); -} - -int -xsetcursor(int cursor) -{ - if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */ - return 1; - win.cursor = cursor; - return 0; -} - -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 -xbell(void) -{ - if (!(IS_SET(MODE_FOCUSED))) - xseturgency(1); - if (bellvolume) - XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL); -} - -void -focus(XEvent *ev) -{ - XFocusChangeEvent *e = &ev->xfocus; - - if (e->mode == NotifyGrab) - return; - - if (ev->type == FocusIn) { - if (xw.ime.xic) - XSetICFocus(xw.ime.xic); - win.mode |= MODE_FOCUSED; - xseturgency(0); - if (IS_SET(MODE_FOCUS)) - ttywrite("\033[I", 3, 0); - } else { - if (xw.ime.xic) - XUnsetICFocus(xw.ime.xic); - win.mode &= ~MODE_FOCUSED; - if (IS_SET(MODE_FOCUS)) - ttywrite("\033[O", 3, 0); - } -} - -int -match(uint mask, uint state) -{ - return mask == XK_ANY_MOD || mask == (state & ~ignoremod); -} - -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 (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 -kpress(XEvent *ev) -{ - XKeyEvent *e = &ev->xkey; - KeySym ksym; - char buf[64], *customkey; - int len; - Rune c; - Status status; - Shortcut *bp; - - if (IS_SET(MODE_KBDLOCK)) - return; - - if (xw.ime.xic) - len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status); - else - len = XLookupString(e, buf, sizeof buf, &ksym, NULL); - /* 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))) { - ttywrite(customkey, strlen(customkey), 1); - 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; - } - } - ttywrite(buf, len, 1); -} - -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) { - win.mode |= MODE_FOCUSED; - xseturgency(0); - } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) { - win.mode &= ~MODE_FOCUSED; - } - } else if (e->xclient.data.l[0] == xw.wmdeletewin) { - ttyhangup(); - exit(0); - } -} - -void -resize(XEvent *e) -{ - if (e->xconfigure.width == win.w && e->xconfigure.height == win.h) - return; - - cresize(e->xconfigure.width, e->xconfigure.height); -} - -void -run(void) -{ - XEvent ev; - int w = win.w, h = win.h; - fd_set rfd; - int xfd = XConnectionNumber(xw.dpy), ttyfd, xev, drawing; - struct timespec seltv, *tv, now, lastblink, trigger; - double timeout; - - /* 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); - - ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd); - cresize(w, h); - - for (timeout = -1, drawing = 0, lastblink = (struct timespec){0};;) { - FD_ZERO(&rfd); - FD_SET(ttyfd, &rfd); - FD_SET(xfd, &rfd); - - if (XPending(xw.dpy)) - timeout = 0; /* existing events might not set xfd */ - - seltv.tv_sec = timeout / 1E3; - seltv.tv_nsec = 1E6 * (timeout - 1E3 * seltv.tv_sec); - tv = timeout >= 0 ? &seltv : NULL; - - if (pselect(MAX(xfd, ttyfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) { - if (errno == EINTR) - continue; - die("select failed: %s\n", strerror(errno)); - } - clock_gettime(CLOCK_MONOTONIC, &now); - - if (FD_ISSET(ttyfd, &rfd)) - ttyread(); - - xev = 0; - while (XPending(xw.dpy)) { - xev = 1; - XNextEvent(xw.dpy, &ev); - if (XFilterEvent(&ev, None)) - continue; - if (handler[ev.type]) - (handler[ev.type])(&ev); - } - - /* - * To reduce flicker and tearing, when new content or event - * triggers drawing, we first wait a bit to ensure we got - * everything, and if nothing new arrives - we draw. - * We start with trying to wait minlatency ms. If more content - * arrives sooner, we retry with shorter and shorter periods, - * and eventually draw even without idle after maxlatency ms. - * Typically this results in low latency while interacting, - * maximum latency intervals during `cat huge.txt`, and perfect - * sync with periodic updates from animations/key-repeats/etc. - */ - if (FD_ISSET(ttyfd, &rfd) || xev) { - if (!drawing) { - trigger = now; - drawing = 1; - } - timeout = (maxlatency - TIMEDIFF(now, trigger)) \ - / maxlatency * minlatency; - if (timeout > 0) - continue; /* we have time, try to find idle */ - } - - /* idle detected or maxlatency exhausted -> draw */ - timeout = -1; - if (blinktimeout && tattrset(ATTR_BLINK)) { - timeout = blinktimeout - TIMEDIFF(now, lastblink); - if (timeout <= 0) { - if (-timeout > blinktimeout) /* start visible */ - win.mode |= MODE_BLINK; - win.mode ^= MODE_BLINK; - tsetdirtattr(ATTR_BLINK); - lastblink = now; - timeout = blinktimeout; - } - } - - draw(); - XFlush(xw.dpy); - drawing = 0; - } -} - -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; - xsetcursor(cursorshape); - - ARGBEGIN { - case 'a': - allowaltscreen = 0; - break; - case 'A': - opt_alpha = EARGF(usage()); - 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 "\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" : opt_cmd[0]; - - setlocale(LC_CTYPE, ""); - XSetLocaleModifiers(""); - cols = MAX(cols, 1); - rows = MAX(rows, 1); - tnew(cols, rows); - xinit(cols, rows); - xsetenv(); - selinit(); - run(); - - return 0; -} diff --git a/st-0.8.4/x.o b/st-0.8.4/x.o deleted file mode 100644 index 028fe0a97dbdef77b6af6172a7e93d902ad8bfc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 75632 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¨AgspAoPi&x0>h{0BJsg^k-I+gWIF z&+nHpuP5G2d*=MR^?MXQc$@`Yiic0I;DF-Q$5?>RoZ!a#4<{ZF{BQ{8-y!C434@W> z4}m|h;amkb=078zq4>{qYJP{i)Y+ZKOV<*2~$gljy?|(~EJel<5DL#^T zh2jC?O^T-wZ&sXt&$~_Wu_WK6cp7oe2L@w1N+-_Y%%>60qdoIXIEu#Vd(7DZYkyv*MQ$Z&UnA;$4bg zP23;f*ZymXrzy^UCD6b}>cQv4#~{^5Q7&*Kii&zb89k2`rv z{$kQop?D4PCdIEH-mLgl#M=~aB;KX?4aEJ2_O<`l#PN4Tabx?(Qhm!)JdJpT;(s7L zO^V+^yjgMX-`W)CaimLe9(VkSeeLA&h2L+?_Vf6Xr{sBjsZgB9mnOxprTjK4&f`m) z;yk`|DbC}I|FFLH^Z1gcIFB!RivOAXS)usd?0?01e%P!y&kx%a=lNlm;ygd}C-t?T z=PhZ9^SmWbah|tSD9-biCdGN)(yaJjDZg!s^L(sJah{L)>3WXq$pfT^-vi8?=S6u+ zp65jsia)~sSGBRj<^tC^Wc$(s85zkZnT;dgqFCyNg_)_A{imxEvrg%B=F2&an_aE8U{>zB-`&YSK z>WSwm`9|Uuir+}QN%7whZ&v&^;%$oa@7#1LejmyENA$J-AH>rX-$p!7@h6E_DE=(* zCdFSR-mLiB#M>0_Al{|;C&c|n^|gOL@ifJ|iRURkl;-6Xiu;H+DSj03X2p*u-lq6y z;$4c5Bkn)Culs1!<3MJ3KOVp(Je3EZgd@=Dh#S4gcDPBU{|AW5v zUranr@wLSB6zBfDLUHa_n-u5%tyyvIXWA6!exOTnZm0g_zV>rFN>iNcd7k224=WVs zdeWpgmt(Wy?B_Pcd0gvKoW~bGty6M+;C?<$aqe&P6zBf1LUHb|niS{$q*-xp?`?{6 zd+bu2+l&9$zW(R>98ml#sz3ZY?3mwt8`b>f-(hDz458~){vCGY*aR#1x{u-_KOO(j zmPUI-yk?6iPw=TizC!Rb1aA@?lMIfvpxJ}BDZckq3%V3vM``$Jk2}=wKgkNFDgMSN z%kw;Vh2mD)ahe35M#mV|EckT6cL^@#+Xa{M2~-XkjE8I|uUjzBrgeM1PC|}T37(ho zyjaWU3H>O)f$Gmn!SRswbG=~wJYT)WL%vCH)L%>b18|HR29t<6Pd9&iIbDu9uHvWB z`4YwF(|LvBg>+u0cs-qORJ@VS?@{~?I{#epb?6Y-_<0u27r%#=%ar-~l<5T&kNIW9 zxxO(!hQ{SO{5Im5 zia$tvo#HdbTl+s!d=hm?ep*-Lbe|%=O!1R4te!f>w-V>y%VRxH6K_}Y+s?3hMo>Fu z`CNKXX{_S65qA~eOMIE)Bd1&a5ydAGzgF?N#GUa~YgfasEyEsu2i)ve@=;|`X~Fmi z{Cc%BzOW!t;EZ2hRppE~w6fe1yT`Z_#!rASgY9VsiJ~Azg23_SccnES2ufAy`<#X2;77H?tLS`1S@rk|`)l`W$&8|v zON%QD;Fse6zu5wy2D@&m?mbE~>F63hpmXZx>CAEPHa>PenLWfFtiQwV(-zo$GVCxe zRWk?Aar+^BkW;sb$ZUHu?fzD~>-ih#IkE@XoKUBZzdmTgc^t53juYSm+E0N!rjPYo zZXBP-Sq`IamQS4ta5PZXqo2kFU{Nka`|Br!T`V-+Jx5!L;cBm>Cl*NtrbLd#d zU+)?*=eH_joIb}dp!nKnWHX&gFFa*8v+S{Y_;M0NW1GE#n0!6v}b#G-|7*+h2r~Fd_L#>zbSs2l53;*RD3<5Xe(~Ke?=Ud0Q&PT z#g`0^IUe(NIKUxS6|>V$@wHu?Z;p=&QKycdTxlgXtM;Sge*fILqj|3@__{10Nk9&C_iUkdt-`{)Okx6YZY=TC4cXUgHfEe-nQB O2{wEukKEL$^S=NS&9%`0