diff --git a/.gitmodules b/.gitmodules index 28c5f68..d685ac7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,11 @@ [submodule "desktop/.dwm"] path = desktop/.dwm url = https://github.com/eRgo35/dwm + +[submodule "desktop/.dmenu"] + path = desktop/.dmenu + url = https://github.com/eRgo35/dmenu + +[submodule "desktop/.st"] + path = desktop/.st + url = https://github.com/eRgo35/st diff --git a/desktop/.dmenu/.gitignore b/desktop/.dmenu/.gitignore deleted file mode 100644 index 3ef527d..0000000 --- a/desktop/.dmenu/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.o -config.h -patches.h -dmenu -stest diff --git a/desktop/.dmenu/LICENSE b/desktop/.dmenu/LICENSE deleted file mode 100644 index 2a64b28..0000000 --- a/desktop/.dmenu/LICENSE +++ /dev/null @@ -1,30 +0,0 @@ -MIT/X Consortium License - -© 2006-2019 Anselm R Garbe -© 2006-2008 Sander van Dijk -© 2006-2007 Michał Janeczek -© 2007 Kris Maglione -© 2009 Gottox -© 2009 Markus Schnalke -© 2009 Evan Gates -© 2010-2012 Connor Lane Smith -© 2014-2022 Hiltjo Posthuma -© 2015-2019 Quentin Rameau - -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/desktop/.dmenu/Makefile b/desktop/.dmenu/Makefile deleted file mode 100644 index f4be9d1..0000000 --- a/desktop/.dmenu/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# dmenu - dynamic menu -# See LICENSE file for copyright and license details. - -include config.mk - -SRC = drw.c dmenu.c stest.c util.c -OBJ = $(SRC:.c=.o) - -all: options dmenu stest - -options: - @echo dmenu build options: - @echo "CFLAGS = $(CFLAGS)" - @echo "LDFLAGS = $(LDFLAGS)" - @echo "CC = $(CC)" - -.c.o: - $(CC) -c $(CFLAGS) $< - -config.h: - cp config.def.h $@ - -patches.h: - cp patches.def.h $@ - -$(OBJ): arg.h config.h config.mk drw.h patches.h - -dmenu: dmenu.o drw.o util.o - $(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS) - -stest: stest.o - $(CC) -o $@ stest.o $(LDFLAGS) - -clean: - rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz - -dist: clean - mkdir -p dmenu-$(VERSION) - cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\ - drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\ - dmenu-$(VERSION) - tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION) - gzip dmenu-$(VERSION).tar - rm -rf dmenu-$(VERSION) - -install: all - mkdir -p $(DESTDIR)$(PREFIX)/bin - cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin - chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu - chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path - chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run - chmod 755 $(DESTDIR)$(PREFIX)/bin/stest - mkdir -p $(DESTDIR)$(MANPREFIX)/man1 - sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1 - sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1 - -uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\ - $(DESTDIR)$(PREFIX)/bin/dmenu_path\ - $(DESTDIR)$(PREFIX)/bin/dmenu_run\ - $(DESTDIR)$(PREFIX)/bin/stest\ - $(DESTDIR)$(MANPREFIX)/man1/dmenu.1\ - $(DESTDIR)$(MANPREFIX)/man1/stest.1 - -.PHONY: all options clean dist install uninstall diff --git a/desktop/.dmenu/README b/desktop/.dmenu/README deleted file mode 100644 index a8fcdfe..0000000 --- a/desktop/.dmenu/README +++ /dev/null @@ -1,24 +0,0 @@ -dmenu - dynamic menu -==================== -dmenu is an efficient dynamic menu for X. - - -Requirements ------------- -In order to build dmenu you need the Xlib header files. - - -Installation ------------- -Edit config.mk to match your local setup (dmenu is installed into -the /usr/local namespace by default). - -Afterwards enter the following command to build and install dmenu -(if necessary as root): - - make clean install - - -Running dmenu -------------- -See the man page for details. diff --git a/desktop/.dmenu/README.md b/desktop/.dmenu/README.md deleted file mode 100644 index e328022..0000000 --- a/desktop/.dmenu/README.md +++ /dev/null @@ -1,260 +0,0 @@ -Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this dmenu 5.2 (e42c036, -2022-10-26) project has a different take on patching. It uses preprocessor directives to decide -whether or not to include a patch during build time. Essentially this means that this build, for -better or worse, contains both the patched _and_ the original code. The aim being that you can -select which patches to include and the build will contain that code and nothing more. - -For example to include the `alpha` patch then you would only need to flip this setting from 0 -to 1 in [patches.h](https://github.com/bakkeby/dmenu-flexipatch/blob/master/patches.def.h): -```c -#define ALPHA_PATCH 1 -``` - -Once you have found out what works for you and what doesn't then you should be in a better position -to choose patches should you want to start patching from scratch. - -Alternatively if you have found the patches you want, but don't want the rest of the flexipatch -entanglement on your plate then you may want to have a look at -[flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer); a custom pre-processor -tool that removes all the unused flexipatch code leaving you with a build that contains the patches -you selected. - -Refer to [https://tools.suckless.org/dmenu/](https://tools.suckless.org/dmenu/) for details on -dmenu, how to install it and how it works. - -Browsing patches? There is a [map of patches](https://coggle.it/diagram/YjT2DD6jBM9dayf3) diagram which tries to organise patches into categories. - ---- - -### Changelog: - -2022-09-05 - Removed the json patch due to maintenance and compatibility reasons, added the - separator patch - -2022-09-04 - Added the fzfexpect patch - -2022-06-21 - Adding barpadding patch and relative input width patch - -2022-03-02 - Bump to 5.1 - -2021-05-23 - Adding support for `ctrl+v` to paste and adding emoji-highlight patch - -2021-05-17 - Added the restrict return, no sort, gridnav and plain-prompt (listfullwidth) patches - -2021-05-15 - Added the tsv and printindex patches - -2020-08-08 - Added the json, symbols, managed, morecolor, multi-selection and preselect patches - -2020-08-05 - Added the grid, highlight, highpriority, dynamic options and numbers patches - -2020-06-13 - Added the pango patch - -2020-06-10 - Added the case-insensitive patch - -2020-05-29 - Added the alpha patch (derived from Baitinq's [build](https://github.com/Baitinq/dmenu)) - and the color emoji patch - -2020-04-05 - Added fuzzyhighlight patch - -2020-02-09 - Added revised border patch (adding command line parameter for setting border width) - -2019-12-29 - Added xresources patch - -2019-10-16 - Introduced [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer) - -2019-09-18 - Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, - mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, - rejectnomatch, scroll, vertfull, wmtype and xyw patches - -### Patches included: - - - [alpha](https://github.com/bakkeby/patches/blob/master/dmenu/dmenu-alpha-5.0_20210725_523aa08.diff) - - adds transparency for the dmenu window - - - [barpadding](https://github.com/bakkeby/patches/wiki/barpadding) - - adds padding for dmenu in similar fashion to the [barpadding](https://dwm.suckless.org/patches/barpadding/) - patch for dwm - - - [border](http://tools.suckless.org/dmenu/patches/border/) - - adds a border around the dmenu window - - - [case-insensitive](http://tools.suckless.org/dmenu/patches/case-insensitive/) - - makes dmenu case-insensitive by default, replacing the case-insensitive `-i` option with a - case sensitive `-s` option - - - [center](https://tools.suckless.org/dmenu/patches/center/) - - this patch centers dmenu in the middle of the screen - - - color_emoji - - enables color emoji in dmenu by removing a workaround for a BadLength error in the Xft - library when color glyphs are used - - enabling this will crash dmenu on encountering such glyphs unless you also have an updated - Xft library that can handle them - - - [dynamic_options](https://tools.suckless.org/dmenu/patches/dynamicoptions/) - - adds a flag (`-dy`) which makes dmenu run the command given to it whenever input is changed - with the current input as the last argument and update the option list according to the - output of that command - - - [emoji-highlight](https://tools.suckless.org/dmenu/patches/emoji-highlight/) - - this patch will allow for emojis on the left side with a colored background when selected - - - [fuzzyhighlight](https://tools.suckless.org/dmenu/patches/fuzzyhighlight/) - - intended to be combined with the fuzzymatch patch, this makes it so that fuzzy matches are - highlighted - - - [fuzzymatch](https://tools.suckless.org/dmenu/patches/fuzzymatch/) - - adds support for fuzzy-matching to dmenu, allowing users to type non-consecutive portions - of the string to be matched - - - [fzfexpect](https://github.com/DAFF0D11/dafmenu/blob/master/patches/dmenu-fzfexpect-5.1.diff) - - adds fzf expect functionality in dmenu - - - [grid](https://tools.suckless.org/dmenu/patches/grid/) - - allows dmenu's entries to be rendered in a grid by adding a new `-g` flag to specify the - number of grid columns - - the `-g` and `-l` options can be used together to create a G columns * L lines grid - - - [gridnav](https://tools.suckless.org/dmenu/patches/gridnav/) - - adds the ability to move left and right through a grid (when using the grid patch) - - - [highlight](https://tools.suckless.org/dmenu/patches/highlight/) - - this patch highlights the individual characters of matched text for each dmenu list entry - - - [highpriority](https://tools.suckless.org/dmenu/patches/highpriority/) - - this patch will automatically sort the search result so that high priority items are shown - first - - - [incremental](https://tools.suckless.org/dmenu/patches/incremental/) - - this patch causes dmenu to print out the current text each time a key is pressed - - - [initialtext](https://tools.suckless.org/dmenu/patches/initialtext/) - - adds an option to provide preselected text - - - [instant](https://tools.suckless.org/dmenu/patches/instant/) - - adds a flag that will cause dmenu to select an item immediately if there is only one - matching option left - - - [~json~](https://tools.suckless.org/dmenu/patches/json/) - - ~adds basic support for json files~ - - - [line-height](http://tools.suckless.org/dmenu/patches/line-height/) - - adds a `-h` option which sets the minimum height of a dmenu line - - this helps integrate dmenu with other UI elements that require a particular vertical size - - - [managed](https://tools.suckless.org/dmenu/patches/managed/) - - adds a `-wm` flag which sets override_redirect to false; thus letting your window manager - manage the dmenu window - - this may be helpful in contexts where you don't want to exclusively bind dmenu or want to - treat dmenu more as a "window" rather than as an overlay - - - [morecolor](https://tools.suckless.org/dmenu/patches/morecolor/) - - adds an additional color scheme for highlighting entries adjacent to the current selection - - - [mouse-support](https://tools.suckless.org/dmenu/patches/mouse-support/) - - adds basic mouse support for dmenu - - - [multi-selection](https://tools.suckless.org/dmenu/patches/multi-selection/) - - without this patch when you press `Ctrl+Enter` dmenu just outputs current item and it is - not possible to undo that - - with this patch dmenu will output all selected items only on exit - - it is also possible to deselect any selected item - - - [navhistory](https://tools.suckless.org/dmenu/patches/navhistory/) - - provides dmenu the ability for history navigation similar to that of bash - - - [no-sort](https://tools.suckless.org/dmenu/patches/no-sort/) - - adds the `-S` option to disable sorting menu items after matching - - useful, for example, when menu items are sorted by their frequency of use (using an - external cache) and the most frequently selected items should always appear first regardless - of how they were exact, prefix, or substring matches - - - [non-blocking-stdin](https://tools.suckless.org/dmenu/patches/non_blocking_stdin/) - - this is a patch to have dmenu read stdin in a non blocking way, making it wait for input - both from stdin and from X - - this means that you can continue feeding dmenu while you type - - the patch is meant to be used along with the incremental patch in order to use stdout to - feed stdin - - - [numbers](https://tools.suckless.org/dmenu/patches/numbers/) - - adds text which displays the number of matched and total items in the top right corner of - dmenu - - - [pango](https://github.com/StillANixRookie/dmenu-pango/) - - adds simple markup for dmenu using pango markup - - - [password](https://tools.suckless.org/dmenu/patches/password/) - - with this patch dmenu will not directly display the keyboard input, but instead replace it - with dots - - all data from stdin will be ignored - - - [pipeout](https://tools.suckless.org/dmenu/patches/pipeout/) - - this patch allows the selected text to be piped back out with dmenu - - this can be useful if you want to display the output of a command on the screen - - - [plain-prompt](https://tools.suckless.org/dmenu/patches/listfullwidth/) - - simple change that avoids colors for the prompt by making it use the same style as the - rest of the input field - - - [prefix-completion](https://tools.suckless.org/dmenu/patches/prefix-completion/) - - changes the behaviour of matched items and the Tab key to allow tab completion - - - [preselect](https://tools.suckless.org/dmenu/patches/preselect/) - - adds an option `-ps` to preselect an item by providing the index that should be pre-selected - - - [printindex](https://tools.suckless.org/dmenu/patches/printindex/) - - allows dmenu to print out the 0-based index of matched text instead of the matched text - itself - - this can be useful in cases where you would like to select entries from one array of text - but index into another, or when you are selecting from an ordered list of non-unique items - - - [printinputtext](https://tools.suckless.org/dmenu/patches/printinputtext/) - - this patch adds a flag `-t` which makes Return key ignore selection and print the input - text to stdout - - the flag basically swaps the functions of Return and Shift+Return hotkeys - - - [rejectnomatch](https://tools.suckless.org/dmenu/patches/reject-no-match/) - - adds a new flag to dmenu with which text input will be rejected if it would result in no - matching item - - - relative_input_width - - prior to commit [e1e1de7](https://git.suckless.org/dmenu/commit/e1e1de7b3b8399cba90ddca9613f837b2dbef7b9.html) - the input width was calculated based on the input options - - this feature was removed in favour of hardcoding the input width to always take up 1/3rd of - the available space - - this patch adds that feature back in with some bespoke performance optimisations at the cost - of accuracy and correctness - - - [restrict-return](https://tools.suckless.org/dmenu/patches/restrict-return/) - - adds a `-1` option which disables Shift-Return and Ctrl-Return - - this guarantees that dmenu will only output one item, and that item was read from stdin - - - [scroll](https://tools.suckless.org/dmenu/patches/scroll/) - - this patch adds support for text scrolling - - it doesn't append `...` for long input anymore as it can handle long text - - - [separator](https://tools.suckless.org/dmenu/patches/separator/) - - adds `-d` and `-D` flags which separates the input into two halves; one half to be - displayed in dmenu and the other to be printed to stdout - - - [symbols](https://tools.suckless.org/dmenu/patches/symbols/) - - allows the symbols, which are printed in dmenu to indicate that either the input is too - long or there are too many options to be shown in dmenu in one line, to be defined - - - [tsv](https://tools.suckless.org/dmenu/patches/tsv/) - - makes dmenu split input lines at first tab character and only display first part, but it - will perform matching on and output full lines as usual - - can be useful if you want to separate data and representation - - - [vertfull](https://tools.suckless.org/dmenu/patches/vertfull/) - - prevents dmenu from indenting items at the same level as the prompt length - - - [wmtype](https://github.com/Baitinq/dmenu/blob/master/patches/dmenu-wm_type.diff) - - adds extended window manager hints such as \_NET_WM_WINDOW_TYPE and \_NET_WM_WINDOW_TYPE_DOCK - - - [xresources](https://tools.suckless.org/dmenu/patches/xresources/) - - allows dmenu to read font and colors from Xresources - - note that with this patch the Xresources settings takes precedence over command line arguments - - - [xyw](https://tools.suckless.org/dmenu/patches/xyw/) - - adds options for specifying dmenu window position and width diff --git a/desktop/.dmenu/arg.h b/desktop/.dmenu/arg.h deleted file mode 100644 index e94e02b..0000000 --- a/desktop/.dmenu/arg.h +++ /dev/null @@ -1,49 +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;\ - }\ - for (brk_ = 0, argv[0]++, argv_ = argv;\ - argv[0][0] && !brk_;\ - argv[0]++) {\ - if (argv_ != argv)\ - break;\ - argc_ = argv[0][0];\ - switch (argc_) - -#define ARGEND }\ - } - -#define ARGC() argc_ - -#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\ - ((x), abort(), (char *)0) :\ - (brk_ = 1, (argv[0][1] != '\0')?\ - (&argv[0][1]) :\ - (argc--, argv++, argv[0]))) - -#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\ - (char *)0 :\ - (brk_ = 1, (argv[0][1] != '\0')?\ - (&argv[0][1]) :\ - (argc--, argv++, argv[0]))) - -#endif diff --git a/desktop/.dmenu/config.def.h b/desktop/.dmenu/config.def.h deleted file mode 100644 index 07dc63e..0000000 --- a/desktop/.dmenu/config.def.h +++ /dev/null @@ -1,151 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -/* Default settings; can be overriden by command line. */ - -static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ -#if ALPHA_PATCH -static int opacity = 1; /* -o option; if 0, then alpha is disabled */ -#endif // ALPHA_PATCH -#if FUZZYMATCH_PATCH -static int fuzzy = 1; /* -F option; if 0, dmenu doesn't use fuzzy matching */ -#endif // FUZZYMATCH_PATCH -#if INCREMENTAL_PATCH -static int incremental = 0; /* -r option; if 1, outputs text each time a key is pressed */ -#endif // INCREMENTAL_PATCH -#if INSTANT_PATCH -static int instant = 0; /* -n option; if 1, selects matching item without the need to press enter */ -#endif // INSTANT_PATCH -#if CENTER_PATCH -static int center = 1; /* -c option; if 0, dmenu won't be centered on the screen */ -static int min_width = 500; /* minimum width when centered */ -#endif // CENTER_PATCH -#if BARPADDING_PATCH -static const int vertpad = 10; /* vertical padding of bar */ -static const int sidepad = 30; /* horizontal padding of bar */ -#endif // BARPADDING_PATCH -#if RESTRICT_RETURN_PATCH -static int restrict_return = 0; /* -1 option; if 1, disables shift-return and ctrl-return */ -#endif // RESTRICT_RETURN_PATCH -/* -fn option overrides fonts[0]; default X11 font or font set */ -#if PANGO_PATCH -static char font[] = "monospace 10"; -#else -#if XRESOURCES_PATCH -static char *fonts[] = -#else -static const char *fonts[] = -#endif // XRESOURCES_PATCH -{ - "SauceCodePro Nerd Font Mono:size=11:antialias=true" - "monospace:size=10" -}; -#endif // PANGO_PATCH -#if MANAGED_PATCH -static char *prompt = NULL; /* -p option; prompt to the left of input field */ -#else -static const char *prompt = NULL; /* -p option; prompt to the left of input field */ -#endif // MANAGED_PATCH -#if DYNAMIC_OPTIONS_PATCH -static const char *dynamic = NULL; /* -dy option; dynamic command to run on input change */ -#endif // DYNAMIC_OPTIONS_PATCH -#if SYMBOLS_PATCH -static const char *symbol_1 = "<"; -static const char *symbol_2 = ">"; -#endif // SYMBOLS_PATCH - -#if ALPHA_PATCH -static const unsigned int baralpha = 0xd0; -static const unsigned int borderalpha = OPAQUE; -static const unsigned int alphas[][3] = { - /* fg bg border */ - [SchemeNorm] = { OPAQUE, baralpha, borderalpha }, - [SchemeSel] = { OPAQUE, baralpha, borderalpha }, - #if BORDER_PATCH - [SchemeBorder] = { OPAQUE, OPAQUE, OPAQUE }, - #endif // BORDER_PATCH - #if MORECOLOR_PATCH - [SchemeMid] = { OPAQUE, baralpha, borderalpha }, - #endif // MORECOLOR_PATCH - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - [SchemeSelHighlight] = { OPAQUE, baralpha, borderalpha }, - [SchemeNormHighlight] = { OPAQUE, baralpha, borderalpha }, - #endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH - #if HIGHPRIORITY_PATCH - [SchemeHp] = { OPAQUE, baralpha, borderalpha }, - #endif // HIGHPRIORITY_PATCH - #if EMOJI_HIGHLIGHT_PATCH - [SchemeHover] = { OPAQUE, baralpha, borderalpha }, - [SchemeGreen] = { OPAQUE, baralpha, borderalpha }, - [SchemeRed] = { OPAQUE, baralpha, borderalpha }, - [SchemeYellow] = { OPAQUE, baralpha, borderalpha }, - [SchemeBlue] = { OPAQUE, baralpha, borderalpha }, - [SchemePurple] = { OPAQUE, baralpha, borderalpha }, - #endif // EMOJI_HIGHLIGHT_PATCH -}; -#endif // ALPHA_PATCH - -static -#if !XRESOURCES_PATCH -const -#endif // XRESOURCES_PATCH -char *colors[][2] = { - /* fg bg */ - [SchemeNorm] = { "#bbbbbb", "#222222" }, - [SchemeSel] = { "#eeeeee", "#005577" }, - [SchemeOut] = { "#000000", "#00ffff" }, - #if BORDER_PATCH - [SchemeBorder] = { "#000000", "#005577" }, - #endif // BORDER_PATCH - #if MORECOLOR_PATCH - [SchemeMid] = { "#eeeeee", "#770000" }, - #endif // MORECOLOR_PATCH - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - [SchemeSelHighlight] = { "#ffc978", "#005577" }, - [SchemeNormHighlight] = { "#ffc978", "#222222" }, - #endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH - #if HIGHPRIORITY_PATCH - [SchemeHp] = { "#bbbbbb", "#333333" }, - #endif // HIGHPRIORITY_PATCH - #if EMOJI_HIGHLIGHT_PATCH - [SchemeHover] = { "#ffffff", "#353D4B" }, - [SchemeGreen] = { "#ffffff", "#52E067" }, - [SchemeRed] = { "#ffffff", "#e05252" }, - [SchemeYellow] = { "#ffffff", "#e0c452" }, - [SchemeBlue] = { "#ffffff", "#5280e0" }, - [SchemePurple] = { "#ffffff", "#9952e0" }, - #endif // EMOJI_HIGHLIGHT_PATCH -}; -/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ -static unsigned int lines = 0; -#if GRID_PATCH -/* -g option; if nonzero, dmenu uses a grid comprised of columns and lines */ -static unsigned int columns = 0; -#endif // GRID_PATCH -#if LINE_HEIGHT_PATCH -static unsigned int lineheight = 32; /* -h option; minimum height of a menu line */ -static unsigned int min_lineheight = 8; -#endif // LINE_HEIGHT_PATCH -#if NAVHISTORY_PATCH -static unsigned int maxhist = 15; -static int histnodup = 1; /* if 0, record repeated histories */ -#endif // NAVHISTORY_PATCH - -/* - * Characters not considered part of a word while deleting words - * for example: " /?\"&[]" - */ -#if PIPEOUT_PATCH -static const char startpipe[] = "#"; -#endif // PIPEOUT_PATCH -static const char worddelimiters[] = " "; - -#if BORDER_PATCH -/* Size of the window border */ -static unsigned int border_width = 0; -#endif // BORDER_PATCH - -#if PREFIXCOMPLETION_PATCH -/* - * Use prefix matching by default; can be inverted with the -x flag. - */ -static int use_prefix = 1; -#endif // PREFIXCOMPLETION_PATCH \ No newline at end of file diff --git a/desktop/.dmenu/config.mk b/desktop/.dmenu/config.mk deleted file mode 100644 index 29b96ca..0000000 --- a/desktop/.dmenu/config.mk +++ /dev/null @@ -1,42 +0,0 @@ -# dmenu version -VERSION = 5.2 - -# paths -PREFIX = /usr/local -MANPREFIX = $(PREFIX)/share/man - -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib - -# Xinerama, comment if you don't want it -XINERAMALIBS = -lXinerama -XINERAMAFLAGS = -DXINERAMA - -# freetype -FREETYPELIBS = -lfontconfig -lXft -FREETYPEINC = /usr/include/freetype2 -# OpenBSD (uncomment) -#FREETYPEINC = $(X11INC)/freetype2 -#MANPREFIX = ${PREFIX}/man - -# uncomment on RHEL for strcasecmp -#EXTRAFLAGS=-D_GNU_SOURCE - -# Uncomment this for the alpha patch / ALPHA_PATCH -XRENDER = -lXrender - -# Uncomment for the pango patch / PANGO_PATCH -#PANGOINC = `pkg-config --cflags xft pango pangoxft` -#PANGOLIB = `pkg-config --libs xft pango pangoxft` - -# includes and libs -INCS = -I$(X11INC) -I$(FREETYPEINC) ${PANGOINC} -LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lm $(XRENDER) ${PANGOLIB} - -# flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) $(EXTRAFLAGS) -CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) -LDFLAGS = $(LIBS) - -# compiler and linker -CC = cc diff --git a/desktop/.dmenu/dmenu.1 b/desktop/.dmenu/dmenu.1 deleted file mode 100644 index 323f93c..0000000 --- a/desktop/.dmenu/dmenu.1 +++ /dev/null @@ -1,194 +0,0 @@ -.TH DMENU 1 dmenu\-VERSION -.SH NAME -dmenu \- dynamic menu -.SH SYNOPSIS -.B dmenu -.RB [ \-bfiv ] -.RB [ \-l -.IR lines ] -.RB [ \-m -.IR monitor ] -.RB [ \-p -.IR prompt ] -.RB [ \-fn -.IR font ] -.RB [ \-nb -.IR color ] -.RB [ \-nf -.IR color ] -.RB [ \-sb -.IR color ] -.RB [ \-sf -.IR color ] -.RB [ \-w -.IR windowid ] -.P -.BR dmenu_run " ..." -.SH DESCRIPTION -.B dmenu -is a dynamic menu for X, which reads a list of newline\-separated items from -stdin. When the user selects an item and presses Return, their choice is printed -to stdout and dmenu terminates. Entering text will narrow the items to those -matching the tokens in the input. -.P -.B dmenu_run -is a script used by -.IR dwm (1) -which lists programs in the user's $PATH and runs the result in their $SHELL. -.SH OPTIONS -.TP -.B \-b -dmenu appears at the bottom of the screen. -.TP -.B \-f -dmenu grabs the keyboard before reading stdin if not reading from a tty. This -is faster, but will lock up X until stdin reaches end\-of\-file. -.TP -.B \-i -dmenu matches menu items case insensitively. -.TP -.BI \-l " lines" -dmenu lists items vertically, with the given number of lines. -.TP -.BI \-m " monitor" -dmenu is displayed on the monitor number supplied. Monitor numbers are starting -from 0. -.TP -.BI \-p " prompt" -defines the prompt to be displayed to the left of the input field. -.TP -.BI \-fn " font" -defines the font or font set used. -.TP -.BI \-nb " color" -defines the normal background color. -.IR #RGB , -.IR #RRGGBB , -and X color names are supported. -.TP -.BI \-nf " color" -defines the normal foreground color. -.TP -.BI \-sb " color" -defines the selected background color. -.TP -.BI \-sf " color" -defines the selected foreground color. -.TP -.B \-v -prints version information to stdout, then exits. -.TP -.BI \-w " windowid" -embed into windowid. -.SH USAGE -dmenu is completely controlled by the keyboard. Items are selected using the -arrow keys, page up, page down, home, and end. -.TP -.B Tab -Copy the selected item to the input field. -.TP -.B Return -Confirm selection. Prints the selected item to stdout and exits, returning -success. -.TP -.B Ctrl-Return -Confirm selection. Prints the selected item to stdout and continues. -.TP -.B Shift\-Return -Confirm input. Prints the input text to stdout and exits, returning success. -.TP -.B Escape -Exit without selecting an item, returning failure. -.TP -.B Ctrl-Left -Move cursor to the start of the current word -.TP -.B Ctrl-Right -Move cursor to the end of the current word -.TP -.B C\-a -Home -.TP -.B C\-b -Left -.TP -.B C\-c -Escape -.TP -.B C\-d -Delete -.TP -.B C\-e -End -.TP -.B C\-f -Right -.TP -.B C\-g -Escape -.TP -.B C\-h -Backspace -.TP -.B C\-i -Tab -.TP -.B C\-j -Return -.TP -.B C\-J -Shift-Return -.TP -.B C\-k -Delete line right -.TP -.B C\-m -Return -.TP -.B C\-M -Shift-Return -.TP -.B C\-n -Down -.TP -.B C\-p -Up -.TP -.B C\-u -Delete line left -.TP -.B C\-w -Delete word left -.TP -.B C\-y -Paste from primary X selection -.TP -.B C\-Y -Paste from X clipboard -.TP -.B M\-b -Move cursor to the start of the current word -.TP -.B M\-f -Move cursor to the end of the current word -.TP -.B M\-g -Home -.TP -.B M\-G -End -.TP -.B M\-h -Up -.TP -.B M\-j -Page down -.TP -.B M\-k -Page up -.TP -.B M\-l -Down -.SH SEE ALSO -.IR dwm (1), -.IR stest (1) diff --git a/desktop/.dmenu/dmenu.c b/desktop/.dmenu/dmenu.c deleted file mode 100644 index d7aa2df..0000000 --- a/desktop/.dmenu/dmenu.c +++ /dev/null @@ -1,2187 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#ifdef XINERAMA -#include -#endif -#include - -#include "patches.h" -/* Patch incompatibility overrides */ -#if MULTI_SELECTION_PATCH -#undef NON_BLOCKING_STDIN_PATCH -#undef PIPEOUT_PATCH -#undef PRINTINPUTTEXT_PATCH -#endif // MULTI_SELECTION_PATCH - -#include "drw.h" -#include "util.h" -#if GRIDNAV_PATCH -#include -#endif // GRIDNAV_PATCH - -/* macros */ -#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \ - * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) -#define LENGTH(X) (sizeof X / sizeof X[0]) -#if PANGO_PATCH -#define TEXTW(X) (drw_font_getwidth(drw, (X), False) + lrpad) -#define TEXTWM(X) (drw_font_getwidth(drw, (X), True) + lrpad) -#else -#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) -#endif // PANGO_PATCH -#if ALPHA_PATCH -#define OPAQUE 0xffU -#define OPACITY "_NET_WM_WINDOW_OPACITY" -#endif // ALPHA_PATCH - -/* enums */ -enum { - SchemeNorm, - SchemeSel, - SchemeOut, - #if BORDER_PATCH - SchemeBorder, - #endif // BORDER_PATCH - #if MORECOLOR_PATCH - SchemeMid, - #endif // MORECOLOR_PATCH - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - SchemeNormHighlight, - SchemeSelHighlight, - #endif // HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - #if HIGHPRIORITY_PATCH - SchemeHp, - #endif // HIGHPRIORITY_PATCH - #if EMOJI_HIGHLIGHT_PATCH - SchemeHover, - SchemeGreen, - SchemeYellow, - SchemeBlue, - SchemePurple, - SchemeRed, - #endif // EMOJI_HIGHLIGHT_PATCH - SchemeLast, -}; /* color schemes */ - -struct item { - char *text; - #if SEPARATOR_PATCH - char *text_output; - #elif TSV_PATCH - char *stext; - #endif // SEPARATOR_PATCH | TSV_PATCH - struct item *left, *right; - #if NON_BLOCKING_STDIN_PATCH - struct item *next; - #endif // NON_BLOCKING_STDIN_PATCH - #if MULTI_SELECTION_PATCH - int id; /* for multiselect */ - #else - int out; - #endif // MULTI_SELECTION_PATCH - #if HIGHPRIORITY_PATCH - int hp; - #endif // HIGHPRIORITY_PATCH - #if FUZZYMATCH_PATCH - double distance; - #endif // FUZZYMATCH_PATCH - #if PRINTINDEX_PATCH - int index; - #endif // PRINTINDEX_PATCH -}; - -static char text[BUFSIZ] = ""; -#if PIPEOUT_PATCH -static char pipeout[8] = " | dmenu"; -#endif // PIPEOUT_PATCH -static char *embed; -#if SEPARATOR_PATCH -static char separator; -static int separator_greedy; -static int separator_reverse; -#endif // SEPARATOR_PATCH -static int bh, mw, mh; -#if XYW_PATCH -static int dmx = 0, dmy = 0; /* put dmenu at these x and y offsets */ -static unsigned int dmw = 0; /* make dmenu this wide */ -#endif // XYW_PATCH -static int inputw = 0, promptw; -#if PASSWORD_PATCH -static int passwd = 0; -#endif // PASSWORD_PATCH -static int lrpad; /* sum of left and right padding */ -#if BARPADDING_PATCH -static int vp; /* vertical padding for bar */ -static int sp; /* side padding for bar */ -#endif // BARPADDING_PATCH -#if REJECTNOMATCH_PATCH -static int reject_no_match = 0; -#endif // REJECTNOMATCH_PATCH -static size_t cursor; -static struct item *items = NULL; -static struct item *matches, *matchend; -static struct item *prev, *curr, *next, *sel; -static int mon = -1, screen; -#if PRINTINDEX_PATCH -static int print_index = 0; -#endif // PRINTINDEX_PATCH -#if MANAGED_PATCH -static int managed = 0; -#endif // MANAGED_PATCH -#if MULTI_SELECTION_PATCH -static int *selid = NULL; -static unsigned int selidsize = 0; -#endif // MULTI_SELECTION_PATCH -#if NO_SORT_PATCH -static unsigned int sortmatches = 1; -#endif // NO_SORT_PATCH -#if PRINTINPUTTEXT_PATCH -static int use_text_input = 0; -#endif // PRINTINPUTTEXT_PATCH -#if PRESELECT_PATCH -static unsigned int preselected = 0; -#endif // PRESELECT_PATCH -#if EMOJI_HIGHLIGHT_PATCH -static int commented = 0; -static int animated = 0; -#endif // EMOJI_HIGHLIGHT_PATCH - -static Atom clip, utf8; -#if WMTYPE_PATCH -static Atom type, dock; -#endif // WMTYPE_PATCH -static Display *dpy; -static Window root, parentwin, win; -static XIC xic; - -#if ALPHA_PATCH -static int useargb = 0; -static Visual *visual; -static int depth; -static Colormap cmap; -#endif // ALPHA_PATCH - -static Drw *drw; -static Clr *scheme[SchemeLast]; - -#include "patch/include.h" - -#include "config.h" - -#if CASEINSENSITIVE_PATCH -static char * cistrstr(const char *s, const char *sub); -static int (*fstrncmp)(const char *, const char *, size_t) = strncasecmp; -static char *(*fstrstr)(const char *, const char *) = cistrstr; -#else -static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; -static char *(*fstrstr)(const char *, const char *) = strstr; -#endif // CASEINSENSITIVE_PATCH - -static unsigned int -textw_clamp(const char *str, unsigned int n) -{ - unsigned int w = drw_fontset_getwidth_clamp(drw, str, n) + lrpad; - return MIN(w, n); -} - -static void appenditem(struct item *item, struct item **list, struct item **last); -static void calcoffsets(void); -static void cleanup(void); -static char * cistrstr(const char *s, const char *sub); -static int drawitem(struct item *item, int x, int y, int w); -static void drawmenu(void); -static void grabfocus(void); -static void grabkeyboard(void); -static void match(void); -static void insert(const char *str, ssize_t n); -static size_t nextrune(int inc); -static void movewordedge(int dir); -static void keypress(XKeyEvent *ev); -static void paste(void); -#if ALPHA_PATCH -static void xinitvisual(void); -#endif // ALPHA_PATCH -static void readstdin(void); -static void run(void); -static void setup(void); -static void usage(void); - -#include "patch/include.c" - -static void -appenditem(struct item *item, struct item **list, struct item **last) -{ - if (*last) - (*last)->right = item; - else - *list = item; - - item->left = *last; - item->right = NULL; - *last = item; -} - -static void -calcoffsets(void) -{ - int i, n, rpad = 0; - - if (lines > 0) { - #if GRID_PATCH - if (columns) - n = lines * columns * bh; - else - n = lines * bh; - #else - n = lines * bh; - #endif // GRID_PATCH - } else { - #if NUMBERS_PATCH - rpad = TEXTW(numbers); - #endif // NUMBERS_PATCH - #if SYMBOLS_PATCH - n = mw - (promptw + inputw + TEXTW(symbol_1) + TEXTW(symbol_2) + rpad); - #else - n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">") + rpad); - #endif // SYMBOLS_PATCH - } - /* calculate which items will begin the next page and previous page */ - for (i = 0, next = curr; next; next = next->right) - if ((i += (lines > 0) ? bh : textw_clamp(next->text, n)) > n) - break; - for (i = 0, prev = curr; prev && prev->left; prev = prev->left) - if ((i += (lines > 0) ? bh : textw_clamp(prev->left->text, n)) > n) - break; -} - -static void -cleanup(void) -{ - size_t i; - - XUngrabKey(dpy, AnyKey, AnyModifier, root); - for (i = 0; i < SchemeLast; i++) - free(scheme[i]); - for (i = 0; items && items[i].text; ++i) - free(items[i].text); - free(items); - #if HIGHPRIORITY_PATCH - for (i = 0; i < hplength; ++i) - free(hpitems[i]); - free(hpitems); - #endif // HIGHPRIORITY_PATCH - drw_free(drw); - XSync(dpy, False); - XCloseDisplay(dpy); - #if MULTI_SELECTION_PATCH - free(selid); - #endif // MULTI_SELECTION_PATCH -} - -static char * -cistrstr(const char *s, const char *sub) -{ - size_t len; - - for (len = strlen(sub); *s; s++) - if (!strncasecmp(s, sub, len)) - return (char *)s; - return NULL; -} - -static int -drawitem(struct item *item, int x, int y, int w) -{ - int r; - #if TSV_PATCH && !SEPARATOR_PATCH - char *text = item->stext; - #else - char *text = item->text; - #endif // TSV_PATCH - - #if EMOJI_HIGHLIGHT_PATCH - int iscomment = 0; - if (text[0] == '>') { - if (text[1] == '>') { - iscomment = 3; - switch (text[2]) { - case 'r': - drw_setscheme(drw, scheme[SchemeRed]); - break; - case 'g': - drw_setscheme(drw, scheme[SchemeGreen]); - break; - case 'y': - drw_setscheme(drw, scheme[SchemeYellow]); - break; - case 'b': - drw_setscheme(drw, scheme[SchemeBlue]); - break; - case 'p': - drw_setscheme(drw, scheme[SchemePurple]); - break; - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - case 'h': - drw_setscheme(drw, scheme[SchemeNormHighlight]); - break; - #endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH - case 's': - drw_setscheme(drw, scheme[SchemeSel]); - break; - default: - iscomment = 1; - drw_setscheme(drw, scheme[SchemeNorm]); - break; - } - } else { - drw_setscheme(drw, scheme[SchemeNorm]); - iscomment = 1; - } - } else if (text[0] == ':') { - iscomment = 2; - if (item == sel) { - switch (text[1]) { - case 'r': - drw_setscheme(drw, scheme[SchemeRed]); - break; - case 'g': - drw_setscheme(drw, scheme[SchemeGreen]); - break; - case 'y': - drw_setscheme(drw, scheme[SchemeYellow]); - break; - case 'b': - drw_setscheme(drw, scheme[SchemeBlue]); - break; - case 'p': - drw_setscheme(drw, scheme[SchemePurple]); - break; - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - case 'h': - drw_setscheme(drw, scheme[SchemeNormHighlight]); - break; - #endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH - case 's': - drw_setscheme(drw, scheme[SchemeSel]); - break; - default: - drw_setscheme(drw, scheme[SchemeSel]); - iscomment = 0; - break; - } - } else { - drw_setscheme(drw, scheme[SchemeNorm]); - } - } - #endif // EMOJI_HIGHLIGHT_PATCH - - #if EMOJI_HIGHLIGHT_PATCH - int temppadding = 0; - if (iscomment == 2) { - if (text[2] == ' ') { - #if PANGO_PATCH - temppadding = drw->font->h * 3; - #else - temppadding = drw->fonts->h * 3; - #endif // PANGO_PATCH - animated = 1; - char dest[1000]; - strcpy(dest, text); - dest[6] = '\0'; - drw_text(drw, x, y - , temppadding - #if LINE_HEIGHT_PATCH - , MAX(lineheight, bh) - #else - , bh - #endif // LINE_HEIGHT_PATCH - , temppadding / 2.6 - , dest + 3 - , 0 - #if PANGO_PATCH - , True - #endif // PANGO_PATCH - ); - iscomment = 6; - drw_setscheme(drw, sel == item ? scheme[SchemeHover] : scheme[SchemeNorm]); - } - } - - char *output; - if (commented) { - static char onestr[2]; - onestr[0] = text[0]; - onestr[1] = '\0'; - output = onestr; - } else { - output = text; - } - #endif // EMOJI_HIGHLIGHT_PATCH - - if (item == sel) - drw_setscheme(drw, scheme[SchemeSel]); - #if HIGHPRIORITY_PATCH - else if (item->hp) - drw_setscheme(drw, scheme[SchemeHp]); - #endif // HIGHPRIORITY_PATCH - #if MORECOLOR_PATCH - else if (item->left == sel || item->right == sel) - drw_setscheme(drw, scheme[SchemeMid]); - #endif // MORECOLOR_PATCH - #if MULTI_SELECTION_PATCH - else if (issel(item->id)) - #else - else if (item->out) - #endif // MULTI_SELECTION_PATCH - drw_setscheme(drw, scheme[SchemeOut]); - else - drw_setscheme(drw, scheme[SchemeNorm]); - - r = drw_text(drw - #if EMOJI_HIGHLIGHT_PATCH - , x + ((iscomment == 6) ? temppadding : 0) - #else - , x - #endif // EMOJI_HIGHLIGHT_PATCH - , y - , w - , bh - #if EMOJI_HIGHLIGHT_PATCH - , commented ? (bh - TEXTW(output) - lrpad) / 2 : lrpad / 2 - #else - , lrpad / 2 - #endif // EMOJI_HIGHLIGHT_PATCH - #if EMOJI_HIGHLIGHT_PATCH - , output + iscomment - #else - , text - #endif // EMOJI_HIGHLIGHT_PATCH - , 0 - #if PANGO_PATCH - , True - #endif // PANGO_PATCH - ); - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - #if EMOJI_HIGHLIGHT_PATCH - drawhighlights(item, output + iscomment, x + ((iscomment == 6) ? temppadding : 0), y, w); - #else - drawhighlights(item, x, y, w); - #endif // EMOJI_HIGHLIGHT_PATCH - #endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH - return r; -} - -static void -drawmenu(void) -{ - #if SCROLL_PATCH - static int curpos, oldcurlen; - int curlen, rcurlen; - #else - unsigned int curpos; - #endif // SCROLL_PATCH - struct item *item; - int x = 0, y = 0, w, rpad = 0, itw = 0, stw = 0; - #if LINE_HEIGHT_PATCH && PANGO_PATCH - int fh = drw->font->h; - #elif LINE_HEIGHT_PATCH - int fh = drw->fonts->h; - #endif // LINE_HEIGHT_PATCH - #if PASSWORD_PATCH - char *censort; - #endif // PASSWORD_PATCH - - drw_setscheme(drw, scheme[SchemeNorm]); - drw_rect(drw, 0, 0, mw, mh, 1, 1); - - if (prompt && *prompt) { - #if !PLAIN_PROMPT_PATCH - drw_setscheme(drw, scheme[SchemeSel]); - #endif // PLAIN_PROMPT_PATCH - x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0 - #if PANGO_PATCH - , True - #endif // PANGO_PATCH - ); - } - /* draw input field */ - w = (lines > 0 || !matches) ? mw - x : inputw; - - #if SCROLL_PATCH - w -= lrpad / 2; - x += lrpad / 2; - rcurlen = TEXTW(text + cursor) - lrpad; - curlen = TEXTW(text) - lrpad - rcurlen; - curpos += curlen - oldcurlen; - curpos = MIN(w, MAX(0, curpos)); - curpos = MAX(curpos, w - rcurlen); - curpos = MIN(curpos, curlen); - oldcurlen = curlen; - - drw_setscheme(drw, scheme[SchemeNorm]); - #if PASSWORD_PATCH - if (passwd) { - censort = ecalloc(1, sizeof(text)); - memset(censort, '.', strlen(text)); - drw_text_align(drw, x, 0, curpos, bh, censort, cursor, AlignR); - drw_text_align(drw, x + curpos, 0, w - curpos, bh, censort + cursor, strlen(censort) - cursor, AlignL); - free(censort); - } else { - drw_text_align(drw, x, 0, curpos, bh, text, cursor, AlignR); - drw_text_align(drw, x + curpos, 0, w - curpos, bh, text + cursor, strlen(text) - cursor, AlignL); - } - #else - drw_text_align(drw, x, 0, curpos, bh, text, cursor, AlignR); - drw_text_align(drw, x + curpos, 0, w - curpos, bh, text + cursor, strlen(text) - cursor, AlignL); - #endif // PASSWORD_PATCH - #if LINE_HEIGHT_PATCH - drw_rect(drw, x + curpos - 1, 2 + (bh-fh)/2, 2, fh - 4, 1, 0); - #else - drw_rect(drw, x + curpos - 1, 2, 2, bh - 4, 1, 0); - #endif // LINE_HEIGHT_PATCH - #else // !SCROLL_PATCH - drw_setscheme(drw, scheme[SchemeNorm]); - #if PASSWORD_PATCH - if (passwd) { - censort = ecalloc(1, sizeof(text)); - memset(censort, '.', strlen(text)); - drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0 - #if PANGO_PATCH - , False - #endif // PANGO_PATCH - ); - drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0 - #if PANGO_PATCH - , False - #endif // PANGO_PATCH - ); - free(censort); - } else { - drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0 - #if PANGO_PATCH - , False - #endif // PANGO_PATCH - ); - } - #else - drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0 - #if PANGO_PATCH - , False - #endif // PANGO_PATCH - ); - #endif // PASSWORD_PATCH - - curpos = TEXTW(text) - TEXTW(&text[cursor]); - if ((curpos += lrpad / 2 - 1) < w) { - drw_setscheme(drw, scheme[SchemeNorm]); - #if LINE_HEIGHT_PATCH - drw_rect(drw, x + curpos, 2 + (bh-fh)/2, 2, fh - 4, 1, 0); - #else - drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); - #endif // LINE_HEIGHT_PATCH - } - #endif // SCROLL_PATCH - - #if NUMBERS_PATCH - recalculatenumbers(); - rpad = TEXTW(numbers); - #if BARPADDING_PATCH - rpad += 2 * sp; - #endif // BARPADDING_PATCH - #if BORDER_PATCH - rpad += border_width; - #endif // BORDER_PATCH - #endif // NUMBERS_PATCH - if (lines > 0) { - #if GRID_PATCH - /* draw grid */ - int i = 0; - for (item = curr; item != next; item = item->right, i++) - if (columns) - #if VERTFULL_PATCH - drawitem( - item, - 0 + ((i / lines) * (mw / columns)), - y + (((i % lines) + 1) * bh), - mw / columns - ); - #else - drawitem( - item, - x + ((i / lines) * ((mw - x) / columns)), - y + (((i % lines) + 1) * bh), - (mw - x) / columns - ); - #endif // VERTFULL_PATCH - else - #if VERTFULL_PATCH - drawitem(item, 0, y += bh, mw); - #else - drawitem(item, x, y += bh, mw - x); - #endif // VERTFULL_PATCH - #else - /* draw vertical list */ - for (item = curr; item != next; item = item->right) - #if VERTFULL_PATCH - drawitem(item, 0, y += bh, mw); - #else - drawitem(item, x, y += bh, mw - x); - #endif // VERTFULL_PATCH - #endif // GRID_PATCH - } else if (matches) { - /* draw horizontal list */ - x += inputw; - w = TEXTW("<"); - if (curr->left) { - drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0 - #if PANGO_PATCH - , True - #endif // PANGO_PATCH - ); - } - x += w; - for (item = curr; item != next; item = item->right) { - #if SYMBOLS_PATCH - stw = TEXTW(symbol_2); - #else - stw = TEXTW(">"); - #endif // SYMBOLS_PATCH - #if TSV_PATCH && !SEPARATOR_PATCH - itw = textw_clamp(item->stext, mw - x - stw - rpad); - #else - itw = textw_clamp(item->text, mw - x - stw - rpad); - #endif // TSV_PATCH - x = drawitem(item, x, 0, itw); - } - if (next) { - #if SYMBOLS_PATCH - w = TEXTW(symbol_2); - #else - w = TEXTW(">"); - #endif // SYMBOLS_PATCH - drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, mw - w - rpad, 0, w, bh, lrpad / 2 - #if SYMBOLS_PATCH - , symbol_2 - #else - , ">" - #endif // SYMBOLS_PATCH - , 0 - #if PANGO_PATCH - , True - #endif // PANGO_PATCH - ); - } - } - #if NUMBERS_PATCH - drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, mw - rpad, 0, TEXTW(numbers), bh, lrpad / 2, numbers, 0); - #endif // NUMBERS_PATCH - drw_map(drw, win, 0, 0, mw, mh); - #if NON_BLOCKING_STDIN_PATCH - XFlush(dpy); - #endif // NON_BLOCKING_STDIN_PATCH -} - -static void -grabfocus(void) -{ - struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 }; - Window focuswin; - int i, revertwin; - - for (i = 0; i < 100; ++i) { - XGetInputFocus(dpy, &focuswin, &revertwin); - if (focuswin == win) - return; - #if !MANAGED_PATCH - XSetInputFocus(dpy, win, RevertToParent, CurrentTime); - #endif // MANAGED_PATCH - nanosleep(&ts, NULL); - } - die("cannot grab focus"); -} - -static void -grabkeyboard(void) -{ - struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 }; - int i; - - #if MANAGED_PATCH - if (embed || managed) - #else - if (embed) - #endif // MANAGED_PATCH - return; - /* try to grab keyboard, we may have to wait for another process to ungrab */ - for (i = 0; i < 1000; i++) { - if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync, - GrabModeAsync, CurrentTime) == GrabSuccess) - return; - nanosleep(&ts, NULL); - } - die("cannot grab keyboard"); -} - -static void -match(void) -{ - #if DYNAMIC_OPTIONS_PATCH - if (dynamic && *dynamic) - refreshoptions(); - #endif // DYNAMIC_OPTIONS_PATCH - - #if FUZZYMATCH_PATCH - if (fuzzy) { - fuzzymatch(); - return; - } - #endif - static char **tokv = NULL; - static int tokn = 0; - - char buf[sizeof text], *s; - int i, tokc = 0; - size_t len, textsize; - struct item *item, *lprefix, *lsubstr, *prefixend, *substrend; - #if HIGHPRIORITY_PATCH - struct item *lhpprefix, *hpprefixend; - #endif // HIGHPRIORITY_PATCH - #if NON_BLOCKING_STDIN_PATCH - int preserve = 0; - #endif // NON_BLOCKING_STDIN_PATCH - - strcpy(buf, text); - /* separate input text into tokens to be matched individually */ - for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " ")) - if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv))) - die("cannot realloc %zu bytes:", tokn * sizeof *tokv); - len = tokc ? strlen(tokv[0]) : 0; - - #if PREFIXCOMPLETION_PATCH - if (use_prefix) { - matches = lprefix = matchend = prefixend = NULL; - textsize = strlen(text); - } else { - matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; - textsize = strlen(text) + 1; - } - #else - matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; - textsize = strlen(text) + 1; - #endif // PREFIXCOMPLETION_PATCH - #if HIGHPRIORITY_PATCH - lhpprefix = hpprefixend = NULL; - #endif // HIGHPRIORITY_PATCH - #if NON_BLOCKING_STDIN_PATCH && DYNAMIC_OPTIONS_PATCH - for (item = items; item && (!(dynamic && *dynamic) || item->text); item = (dynamic && *dynamic) ? item + 1 : item->next) - #elif NON_BLOCKING_STDIN_PATCH - for (item = items; item; item = item->next) - #else - for (item = items; item && item->text; item++) - #endif - { - for (i = 0; i < tokc; i++) - if (!fstrstr(item->text, tokv[i])) - break; - #if DYNAMIC_OPTIONS_PATCH - if (i != tokc && !(dynamic && *dynamic)) /* not all tokens match */ - continue; - #else - if (i != tokc) /* not all tokens match */ - continue; - #endif // DYNAMIC_OPTIONS_PATCH - #if HIGHPRIORITY_PATCH - /* exact matches go first, then prefixes with high priority, then prefixes, then substrings */ - #else - /* exact matches go first, then prefixes, then substrings */ - #endif // HIGHPRIORITY_PATCH - #if NO_SORT_PATCH - if (!sortmatches) - appenditem(item, &matches, &matchend); - else - #endif // NO_SORT_PATCH - if (!tokc || !fstrncmp(text, item->text, textsize)) - appenditem(item, &matches, &matchend); - #if HIGHPRIORITY_PATCH - else if (item->hp && !fstrncmp(tokv[0], item->text, len)) - appenditem(item, &lhpprefix, &hpprefixend); - #endif // HIGHPRIORITY_PATCH - else if (!fstrncmp(tokv[0], item->text, len)) - appenditem(item, &lprefix, &prefixend); - #if PREFIXCOMPLETION_PATCH - else if (!use_prefix) - #else - else - #endif // PREFIXCOMPLETION_PATCH - appenditem(item, &lsubstr, &substrend); - #if NON_BLOCKING_STDIN_PATCH - if (sel == item) - preserve = 1; - #endif // NON_BLOCKING_STDIN_PATCH - } - #if HIGHPRIORITY_PATCH - if (lhpprefix) { - if (matches) { - matchend->right = lhpprefix; - lhpprefix->left = matchend; - } else - matches = lhpprefix; - matchend = hpprefixend; - } - #endif // HIGHPRIORITY_PATCH - if (lprefix) { - if (matches) { - matchend->right = lprefix; - lprefix->left = matchend; - } else - matches = lprefix; - matchend = prefixend; - } - #if PREFIXCOMPLETION_PATCH - if (!use_prefix && lsubstr) - #else - if (lsubstr) - #endif // PREFIXCOMPLETION_PATCH - { - if (matches) { - matchend->right = lsubstr; - lsubstr->left = matchend; - } else - matches = lsubstr; - matchend = substrend; - } - #if NON_BLOCKING_STDIN_PATCH - if (!preserve) - #endif // NON_BLOCKING_STDIN_PATCH - curr = sel = matches; - - #if INSTANT_PATCH - if (instant && matches && matches==matchend && !lsubstr) { - puts(matches->text); - cleanup(); - exit(0); - } - #endif // INSTANT_PATCH - - calcoffsets(); -} - -static void -insert(const char *str, ssize_t n) -{ - if (strlen(text) + n > sizeof text - 1) - return; - - #if REJECTNOMATCH_PATCH - static char last[BUFSIZ] = ""; - if (reject_no_match) { - /* store last text value in case we need to revert it */ - memcpy(last, text, BUFSIZ); - } - #endif // REJECTNOMATCH_PATCH - - /* move existing text out of the way, insert new text, and update cursor */ - memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); - if (n > 0) - memcpy(&text[cursor], str, n); - cursor += n; - match(); - - #if REJECTNOMATCH_PATCH - if (!matches && reject_no_match) { - /* revert to last text value if theres no match */ - memcpy(text, last, BUFSIZ); - cursor -= n; - match(); - } - #endif // REJECTNOMATCH_PATCH -} - -static size_t -nextrune(int inc) -{ - ssize_t n; - - /* return location of next utf8 rune in the given direction (+1 or -1) */ - for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc) - ; - return n; -} - -static void -movewordedge(int dir) -{ - if (dir < 0) { /* move cursor to the start of the word*/ - while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) - cursor = nextrune(-1); - while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) - cursor = nextrune(-1); - } else { /* move cursor to the end of the word */ - while (text[cursor] && strchr(worddelimiters, text[cursor])) - cursor = nextrune(+1); - while (text[cursor] && !strchr(worddelimiters, text[cursor])) - cursor = nextrune(+1); - } -} - -static void -keypress(XKeyEvent *ev) -{ - char buf[64]; - int len; - #if PREFIXCOMPLETION_PATCH - struct item * item; - #endif // PREFIXCOMPLETION_PATCH - KeySym ksym = NoSymbol; - Status status; - #if GRID_PATCH && GRIDNAV_PATCH - int i; - struct item *tmpsel; - bool offscreen = false; - #endif // GRIDNAV_PATCH - - len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); - switch (status) { - default: /* XLookupNone, XBufferOverflow */ - return; - case XLookupChars: /* composed string from input method */ - goto insert; - case XLookupKeySym: - case XLookupBoth: /* a KeySym and a string are returned: use keysym */ - break; - } - - if (ev->state & ControlMask) { - switch(ksym) { - #if FZFEXPECT_PATCH - case XK_a: expect("ctrl-a", ev); ksym = XK_Home; break; - case XK_b: expect("ctrl-b", ev); ksym = XK_Left; break; - case XK_c: expect("ctrl-c", ev); ksym = XK_Escape; break; - case XK_d: expect("ctrl-d", ev); ksym = XK_Delete; break; - case XK_e: expect("ctrl-e", ev); ksym = XK_End; break; - case XK_f: expect("ctrl-f", ev); ksym = XK_Right; break; - case XK_g: expect("ctrl-g", ev); ksym = XK_Escape; break; - case XK_h: expect("ctrl-h", ev); ksym = XK_BackSpace; break; - case XK_i: expect("ctrl-i", ev); ksym = XK_Tab; break; - case XK_j: expect("ctrl-j", ev); ksym = XK_Down; break; - case XK_J:/* fallthrough */ - case XK_l: expect("ctrl-l", ev); break; - case XK_m: expect("ctrl-m", ev); /* fallthrough */ - case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break; - case XK_n: expect("ctrl-n", ev); ksym = XK_Down; break; - case XK_p: expect("ctrl-p", ev); ksym = XK_Up; break; - case XK_o: expect("ctrl-o", ev); break; - case XK_q: expect("ctrl-q", ev); break; - case XK_r: expect("ctrl-r", ev); break; - case XK_s: expect("ctrl-s", ev); break; - case XK_t: expect("ctrl-t", ev); break; - case XK_k: expect("ctrl-k", ev); ksym = XK_Up; break; - #else - case XK_a: ksym = XK_Home; break; - case XK_b: ksym = XK_Left; break; - case XK_c: ksym = XK_Escape; break; - case XK_d: ksym = XK_Delete; break; - case XK_e: ksym = XK_End; break; - case XK_f: ksym = XK_Right; break; - case XK_g: ksym = XK_Escape; break; - case XK_h: ksym = XK_BackSpace; break; - case XK_i: ksym = XK_Tab; break; - case XK_j: /* fallthrough */ - case XK_J: /* fallthrough */ - case XK_m: /* fallthrough */ - case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break; - case XK_n: ksym = XK_Down; break; - case XK_p: ksym = XK_Up; break; - - case XK_k: /* delete right */ - text[cursor] = '\0'; - match(); - break; - #endif // FZFEXPECT_PATCH - #if FZFEXPECT_PATCH - case XK_u: expect("ctrl-u", ev); /* delete left */ - #else - case XK_u: /* delete left */ - #endif // FZFEXPECT_PATCH - insert(NULL, 0 - cursor); - break; - #if FZFEXPECT_PATCH - case XK_w: expect("ctrl-w", ev); /* delete word */ - #else - case XK_w: /* delete word */ - #endif // FZFEXPECT_PATCH - while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) - insert(NULL, nextrune(-1) - cursor); - while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) - insert(NULL, nextrune(-1) - cursor); - break; - #if FZFEXPECT_PATCH || CTRL_V_TO_PASTE_PATCH - case XK_v: - #if FZFEXPECT_PATCH - expect("ctrl-v", ev); - #endif // FZFEXPECT_PATCH - case XK_V: - XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, - utf8, utf8, win, CurrentTime); - return; - #endif // FZFEXPECT_PATCH | CTRL_V_TO_PASTE_PATCH - #if FZFEXPECT_PATCH - case XK_y: expect("ctrl-y", ev); /* paste selection */ - #else - case XK_y: /* paste selection */ - #endif // FZFEXPECT_PATCH - case XK_Y: - XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, - utf8, utf8, win, CurrentTime); - return; - #if FZFEXPECT_PATCH - case XK_x: expect("ctrl-x", ev); break; - case XK_z: expect("ctrl-z", ev); break; - #endif // FZFEXPECT_PATCH - case XK_Left: - case XK_KP_Left: - movewordedge(-1); - goto draw; - case XK_Right: - case XK_KP_Right: - movewordedge(+1); - goto draw; - case XK_Return: - case XK_KP_Enter: - #if RESTRICT_RETURN_PATCH - if (restrict_return) - break; - #endif // RESTRICT_RETURN_PATCH - #if MULTI_SELECTION_PATCH - selsel(); - #endif // MULTI_SELECTION_PATCH - break; - case XK_bracketleft: - cleanup(); - exit(1); - default: - return; - } - } else if (ev->state & Mod1Mask) { - switch(ksym) { - case XK_b: - movewordedge(-1); - goto draw; - case XK_f: - movewordedge(+1); - goto draw; - case XK_g: ksym = XK_Home; break; - case XK_G: ksym = XK_End; break; - case XK_h: ksym = XK_Up; break; - case XK_j: ksym = XK_Next; break; - case XK_k: ksym = XK_Prior; break; - case XK_l: ksym = XK_Down; break; - #if NAVHISTORY_PATCH - case XK_p: - navhistory(-1); - buf[0]=0; - break; - case XK_n: - navhistory(1); - buf[0]=0; - break; - #endif // NAVHISTORY_PATCH - default: - return; - } - } - - switch(ksym) { - default: -insert: - if (!iscntrl((unsigned char)*buf)) - insert(buf, len); - break; - case XK_Delete: - case XK_KP_Delete: - if (text[cursor] == '\0') - return; - cursor = nextrune(+1); - /* fallthrough */ - case XK_BackSpace: - if (cursor == 0) - return; - insert(NULL, nextrune(-1) - cursor); - break; - case XK_End: - case XK_KP_End: - if (text[cursor] != '\0') { - cursor = strlen(text); - break; - } - if (next) { - /* jump to end of list and position items in reverse */ - curr = matchend; - calcoffsets(); - curr = prev; - calcoffsets(); - while (next && (curr = curr->right)) - calcoffsets(); - } - sel = matchend; - break; - case XK_Escape: - cleanup(); - exit(1); - case XK_Home: - case XK_KP_Home: - if (sel == matches) { - cursor = 0; - break; - } - sel = curr = matches; - calcoffsets(); - break; - case XK_Left: - case XK_KP_Left: - #if GRID_PATCH && GRIDNAV_PATCH - if (columns > 1) { - if (!sel) - return; - tmpsel = sel; - for (i = 0; i < lines; i++) { - if (!tmpsel->left || tmpsel->left->right != tmpsel) - return; - if (tmpsel == curr) - offscreen = true; - tmpsel = tmpsel->left; - } - sel = tmpsel; - if (offscreen) { - curr = prev; - calcoffsets(); - } - break; - } - #endif // GRIDNAV_PATCH - if (cursor > 0 && (!sel || !sel->left || lines > 0)) { - cursor = nextrune(-1); - break; - } - if (lines > 0) - return; - /* fallthrough */ - case XK_Up: - case XK_KP_Up: - if (sel && sel->left && (sel = sel->left)->right == curr) { - curr = prev; - calcoffsets(); - } - break; - case XK_Next: - case XK_KP_Next: - if (!next) - return; - sel = curr = next; - calcoffsets(); - break; - case XK_Prior: - case XK_KP_Prior: - if (!prev) - return; - sel = curr = prev; - calcoffsets(); - break; - case XK_Return: - case XK_KP_Enter: - #if RESTRICT_RETURN_PATCH - if (restrict_return && (!sel || ev->state & (ShiftMask | ControlMask))) - break; - #endif // RESTRICT_RETURN_PATCH - #if !MULTI_SELECTION_PATCH - #if PIPEOUT_PATCH - #if PRINTINPUTTEXT_PATCH - if (sel && ( - (use_text_input && (ev->state & ShiftMask)) || - (!use_text_input && !(ev->state & ShiftMask)) - )) - #else - if (sel && !(ev->state & ShiftMask)) - #endif // PRINTINPUTTEXT_PATCH - { - if (sel->text[0] == startpipe[0]) { - strncpy(sel->text + strlen(sel->text),pipeout,8); - puts(sel->text+1); - } - #if PRINTINDEX_PATCH - if (print_index) - printf("%d\n", sel->index); - else - #endif // PRINTINDEX_PATCH - puts(sel->text); - } else { - if (text[0] == startpipe[0]) { - strncpy(text + strlen(text),pipeout,8); - puts(text+1); - } - puts(text); - } - #elif PRINTINPUTTEXT_PATCH - if (use_text_input) - puts((sel && (ev->state & ShiftMask)) ? sel->text : text); - #if PRINTINDEX_PATCH - else if (print_index) - printf("%d\n", (sel && !(ev->state & ShiftMask)) ? sel->index : -1); - #endif // PRINTINDEX_PATCH - else - #if SEPARATOR_PATCH - puts((sel && !(ev->state & ShiftMask)) ? sel->text_output : text); - #else - puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); - #endif // SEPARATOR_PATCH - #elif PRINTINDEX_PATCH - if (print_index) - printf("%d\n", (sel && !(ev->state & ShiftMask)) ? sel->index : -1); - else - #if SEPARATOR_PATCH - puts((sel && !(ev->state & ShiftMask)) ? sel->text_output : text); - #else - puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); - #endif // SEPARATOR_PATCH - #elif SEPARATOR_PATCH - puts((sel && !(ev->state & ShiftMask)) ? sel->text_output : text); - #else - puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); - #endif // PIPEOUT_PATCH | PRINTINPUTTEXT_PATCH | PRINTINDEX_PATCH - #endif // MULTI_SELECTION_PATCH - if (!(ev->state & ControlMask)) { - #if NAVHISTORY_PATCH - savehistory((sel && !(ev->state & ShiftMask)) - ? sel->text : text); - #endif // NAVHISTORY_PATCH - #if MULTI_SELECTION_PATCH - printsel(ev->state); - #endif // MULTI_SELECTION_PATCH - cleanup(); - exit(0); - } - #if !MULTI_SELECTION_PATCH - if (sel) - sel->out = 1; - #endif // MULTI_SELECTION_PATCH - break; - case XK_Right: - case XK_KP_Right: - #if GRID_PATCH && GRIDNAV_PATCH - if (columns > 1) { - if (!sel) - return; - tmpsel = sel; - for (i = 0; i < lines; i++) { - if (!tmpsel->right || tmpsel->right->left != tmpsel) - return; - tmpsel = tmpsel->right; - if (tmpsel == next) - offscreen = true; - } - sel = tmpsel; - if (offscreen) { - curr = next; - calcoffsets(); - } - break; - } - #endif // GRIDNAV_PATCH - if (text[cursor] != '\0') { - cursor = nextrune(+1); - break; - } - if (lines > 0) - return; - /* fallthrough */ - case XK_Down: - case XK_KP_Down: - if (sel && sel->right && (sel = sel->right) == next) { - curr = next; - calcoffsets(); - } - break; - case XK_Tab: - #if PREFIXCOMPLETION_PATCH - if (!matches) - break; /* cannot complete no matches */ - #if FUZZYMATCH_PATCH - /* only do tab completion if all matches start with prefix */ - for (item = matches; item && item->text; item = item->right) - if (item->text[0] != text[0]) - goto draw; - #endif // FUZZYMATCH_PATCH - strncpy(text, matches->text, sizeof text - 1); - text[sizeof text - 1] = '\0'; - len = cursor = strlen(text); /* length of longest common prefix */ - for (item = matches; item && item->text; item = item->right) { - cursor = 0; - while (cursor < len && text[cursor] == item->text[cursor]) - cursor++; - len = cursor; - } - memset(text + len, '\0', strlen(text) - len); - #else - if (!sel) - return; - cursor = strnlen(sel->text, sizeof text - 1); - memcpy(text, sel->text, cursor); - text[cursor] = '\0'; - match(); - #endif // PREFIXCOMPLETION_PATCH - break; - } - -draw: - #if INCREMENTAL_PATCH - if (incremental) { - puts(text); - fflush(stdout); - } - #endif // INCREMENTAL_PATCH - drawmenu(); -} - -static void -paste(void) -{ - char *p, *q; - int di; - unsigned long dl; - Atom da; - - /* we have been given the current selection, now insert it into input */ - if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, - utf8, &da, &di, &dl, &dl, (unsigned char **)&p) - == Success && p) { - insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p)); - XFree(p); - } - drawmenu(); -} - -#if ALPHA_PATCH -static void -xinitvisual() -{ - XVisualInfo *infos; - XRenderPictFormat *fmt; - int nitems; - int i; - - XVisualInfo tpl = { - .screen = screen, - .depth = 32, - .class = TrueColor - }; - long masks = VisualScreenMask | VisualDepthMask | VisualClassMask; - - infos = XGetVisualInfo(dpy, masks, &tpl, &nitems); - visual = NULL; - for(i = 0; i < nitems; i ++) { - fmt = XRenderFindVisualFormat(dpy, infos[i].visual); - if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) { - visual = infos[i].visual; - depth = infos[i].depth; - cmap = XCreateColormap(dpy, root, visual, AllocNone); - useargb = 1; - break; - } - } - - XFree(infos); - - if (!visual || !opacity) { - visual = DefaultVisual(dpy, screen); - depth = DefaultDepth(dpy, screen); - cmap = DefaultColormap(dpy, screen); - } -} -#endif // ALPHA_PATCH - -#if !NON_BLOCKING_STDIN_PATCH -static void -readstdin(void) -{ - char *line = NULL; - #if SEPARATOR_PATCH - char *p; - #elif TSV_PATCH - char *buf, *p; - #endif // SEPARATOR_PATCH | TSV_PATCH - - size_t size = 0; - size_t i, junk; - ssize_t len; - - #if PASSWORD_PATCH - if (passwd) { - inputw = lines = 0; - return; - } - #endif // PASSWORD_PATCH - - /* read each line from stdin and add it to the item list */ - for (i = 0; (len = getline(&line, &junk, stdin)) != -1; i++, line = NULL) { - if (i + 1 >= size / sizeof *items) - if (!(items = realloc(items, (size += BUFSIZ)))) - die("cannot realloc %zu bytes:", size); - if (line[len - 1] == '\n') - line[len - 1] = '\0'; - - items[i].text = line; - #if SEPARATOR_PATCH - if (separator && (p = separator_greedy ? - strrchr(items[i].text, separator) : strchr(items[i].text, separator))) { - *p = '\0'; - items[i].text_output = ++p; - } else { - items[i].text_output = items[i].text; - } - if (separator_reverse) { - p = items[i].text; - items[i].text = items[i].text_output; - items[i].text_output = p; - } - #elif TSV_PATCH - if (!(buf = strdup(line))) - die("cannot strdup %u bytes:", strlen(line) + 1); - if ((p = strchr(buf, '\t'))) - *p = '\0'; - items[i].stext = buf; - #endif // SEPARATOR_PATCH | TSV_PATCH - #if MULTI_SELECTION_PATCH - items[i].id = i; /* for multiselect */ - #if PRINTINDEX_PATCH - items[i].index = i; - #endif // PRINTINDEX_PATCH - #elif PRINTINDEX_PATCH - items[i].index = i; - #else - items[i].out = 0; - #endif // MULTI_SELECTION_PATCH | PRINTINDEX_PATCH - - #if HIGHPRIORITY_PATCH - items[i].hp = arrayhas(hpitems, hplength, items[i].text); - #endif // HIGHPRIORITY_PATCH - } - if (items) - items[i].text = NULL; - lines = MIN(lines, i); -} -#endif // NON_BLOCKING_STDIN_PATCH - -static void -#if NON_BLOCKING_STDIN_PATCH -readevent(void) -#else -run(void) -#endif // NON_BLOCKING_STDIN_PATCH -{ - XEvent ev; - #if PRESELECT_PATCH - int i; - #endif // PRESELECT_PATCH - - while (!XNextEvent(dpy, &ev)) { - #if PRESELECT_PATCH - if (preselected) { - for (i = 0; i < preselected; i++) { - if (sel && sel->right && (sel = sel->right) == next) { - curr = next; - calcoffsets(); - } - } - drawmenu(); - preselected = 0; - } - #endif // PRESELECT_PATCH - if (XFilterEvent(&ev, win)) - continue; - switch(ev.type) { - #if MOUSE_SUPPORT_PATCH - case ButtonPress: - buttonpress(&ev); - break; - #endif // MOUSE_SUPPORT_PATCH - case DestroyNotify: - if (ev.xdestroywindow.window != win) - break; - cleanup(); - exit(1); - case Expose: - if (ev.xexpose.count == 0) - drw_map(drw, win, 0, 0, mw, mh); - break; - case FocusIn: - /* regrab focus from parent window */ - if (ev.xfocus.window != win) - grabfocus(); - break; - case KeyPress: - keypress(&ev.xkey); - break; - case SelectionNotify: - if (ev.xselection.property == utf8) - paste(); - break; - case VisibilityNotify: - if (ev.xvisibility.state != VisibilityUnobscured) - XRaiseWindow(dpy, win); - break; - } - } -} - -static void -setup(void) -{ - int x, y, i, j; - unsigned int du; - #if RELATIVE_INPUT_WIDTH_PATCH - unsigned int tmp, minstrlen = 0, curstrlen = 0; - int numwidthchecks = 100; - struct item *item; - #endif // RELATIVE_INPUT_WIDTH_PATCH - XSetWindowAttributes swa; - XIM xim; - Window w, dw, *dws; - XWindowAttributes wa; - XClassHint ch = {"dmenu", "dmenu"}; -#ifdef XINERAMA - XineramaScreenInfo *info; - Window pw; - int a, di, n, area = 0; -#endif - /* init appearance */ - #if XRESOURCES_PATCH - for (j = 0; j < SchemeLast; j++) - #if ALPHA_PATCH - scheme[j] = drw_scm_create(drw, (const char**)colors[j], alphas[j], 2); - #else - scheme[j] = drw_scm_create(drw, (const char**)colors[j], 2); - #endif // ALPHA_PATCH - #else - for (j = 0; j < SchemeLast; j++) - #if ALPHA_PATCH - scheme[j] = drw_scm_create(drw, colors[j], alphas[j], 2); - #else - scheme[j] = drw_scm_create(drw, colors[j], 2); - #endif // ALPHA_PATCH - #endif // XRESOURCES_PATCH - - clip = XInternAtom(dpy, "CLIPBOARD", False); - utf8 = XInternAtom(dpy, "UTF8_STRING", False); - #if WMTYPE_PATCH - type = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); - dock = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DOCK", False); - #endif // WMTYPE_PATCH - - /* calculate menu geometry */ - #if PANGO_PATCH - bh = drw->font->h + 2; - #else - bh = drw->fonts->h + 2; - #endif // PANGO_PATCH - #if LINE_HEIGHT_PATCH - bh = MAX(bh,lineheight); /* make a menu line AT LEAST 'lineheight' tall */ - #endif // LINE_HEIGHT_PATCH - lines = MAX(lines, 0); - mh = (lines + 1) * bh; - #if CENTER_PATCH && PANGO_PATCH - promptw = (prompt && *prompt) ? TEXTWM(prompt) - lrpad / 4 : 0; - #elif CENTER_PATCH - promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; - #endif // CENTER_PATCH -#ifdef XINERAMA - i = 0; - if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { - XGetInputFocus(dpy, &w, &di); - if (mon >= 0 && mon < n) - i = mon; - else if (w != root && w != PointerRoot && w != None) { - /* find top-level window containing current input focus */ - do { - if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws) - XFree(dws); - } while (w != root && w != pw); - /* find xinerama screen with which the window intersects most */ - if (XGetWindowAttributes(dpy, pw, &wa)) - for (j = 0; j < n; j++) - if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) { - area = a; - i = j; - } - } - /* no focused window is on screen, so use pointer location instead */ - if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du)) - for (i = 0; i < n; i++) - if (INTERSECT(x, y, 1, 1, info[i]) != 0) - break; - - #if CENTER_PATCH - if (center) { - mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width); - x = info[i].x_org + ((info[i].width - mw) / 2); - y = info[i].y_org + ((info[i].height - mh) / 2); - } else { - #if XYW_PATCH - x = info[i].x_org + dmx; - y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy); - mw = (dmw>0 ? dmw : info[i].width); - #else - x = info[i].x_org; - y = info[i].y_org + (topbar ? 0 : info[i].height - mh); - mw = info[i].width; - #endif // XYW_PATCH - } - #elif XYW_PATCH - x = info[i].x_org + dmx; - y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy); - mw = (dmw>0 ? dmw : info[i].width); - #else - x = info[i].x_org; - y = info[i].y_org + (topbar ? 0 : info[i].height - mh); - mw = info[i].width; - #endif // CENTER_PATCH / XYW_PATCH - XFree(info); - } else -#endif - { - if (!XGetWindowAttributes(dpy, parentwin, &wa)) - die("could not get embedding window attributes: 0x%lx", - parentwin); - #if CENTER_PATCH - if (center) { - mw = MIN(MAX(max_textw() + promptw, min_width), wa.width); - x = (wa.width - mw) / 2; - y = (wa.height - mh) / 2; - } else { - #if XYW_PATCH - x = dmx; - y = topbar ? dmy : wa.height - mh - dmy; - mw = (dmw>0 ? dmw : wa.width); - #else - x = 0; - y = topbar ? 0 : wa.height - mh; - mw = wa.width; - #endif // XYW_PATCH - } - #elif XYW_PATCH - x = dmx; - y = topbar ? dmy : wa.height - mh - dmy; - mw = (dmw>0 ? dmw : wa.width); - #else - x = 0; - y = topbar ? 0 : wa.height - mh; - mw = wa.width; - #endif // CENTER_PATCH / XYW_PATCH - } - #if !CENTER_PATCH - #if PANGO_PATCH - promptw = (prompt && *prompt) ? TEXTWM(prompt) - lrpad / 4 : 0; - #else - promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; - #endif // PANGO_PATCH - #endif // CENTER_PATCH - #if RELATIVE_INPUT_WIDTH_PATCH - for (item = items; !lines && item && item->text; ++item) { - curstrlen = strlen(item->text); - if (numwidthchecks || minstrlen < curstrlen) { - numwidthchecks = MAX(numwidthchecks - 1, 0); - minstrlen = MAX(minstrlen, curstrlen); - if ((tmp = textw_clamp(item->text, mw/3)) > inputw) { - inputw = tmp; - if (tmp == mw/3) - break; - } - } - } - #else - inputw = mw / 3; /* input width: ~33.33% of monitor width */ - #endif // RELATIVE_INPUT_WIDTH_PATCH - match(); - - /* create menu window */ - #if MANAGED_PATCH - swa.override_redirect = managed ? False : True; - #else - swa.override_redirect = True; - #endif // MANAGED_PATCH - #if ALPHA_PATCH - swa.background_pixel = 0; - swa.colormap = cmap; - #else - swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; - #endif // ALPHA_PATCH - swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask - #if MOUSE_SUPPORT_PATCH - | ButtonPressMask - #endif // MOUSE_SUPPORT_PATCH - ; - win = XCreateWindow( - dpy, parentwin, - #if BARPADDING_PATCH && BORDER_PATCH - x + sp, y + vp - (topbar ? 0 : border_width * 2), mw - 2 * sp - border_width * 2, mh, border_width, - #elif BARPADDING_PATCH - x + sp, y + vp, mw - 2 * sp, mh, 0, - #elif BORDER_PATCH - x, y - (topbar ? 0 : border_width * 2), mw - border_width * 2, mh, border_width, - #else - x, y, mw, mh, 0, - #endif // BORDER_PATCH | BARPADDING_PATCH - #if ALPHA_PATCH - depth, InputOutput, visual, - CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &swa - #else - CopyFromParent, CopyFromParent, CopyFromParent, - CWOverrideRedirect | CWBackPixel | CWEventMask, &swa - #endif // ALPHA_PATCH - ); - #if BORDER_PATCH - if (border_width) - XSetWindowBorder(dpy, win, scheme[SchemeBorder][ColBg].pixel); - #endif // BORDER_PATCH - XSetClassHint(dpy, win, &ch); - #if WMTYPE_PATCH - XChangeProperty(dpy, win, type, XA_ATOM, 32, PropModeReplace, - (unsigned char *) &dock, 1); - #endif // WMTYPE_PATCH - - - /* input methods */ - if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) - die("XOpenIM failed: could not open input device"); - - xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, - XNClientWindow, win, XNFocusWindow, win, NULL); - - #if MANAGED_PATCH - if (managed) { - XTextProperty prop; - char *windowtitle = prompt != NULL ? prompt : "dmenu"; - Xutf8TextListToTextProperty(dpy, &windowtitle, 1, XUTF8StringStyle, &prop); - XSetWMName(dpy, win, &prop); - XSetTextProperty(dpy, win, &prop, XInternAtom(dpy, "_NET_WM_NAME", False)); - XFree(prop.value); - } - #endif // MANAGED_PATCH - - XMapRaised(dpy, win); - if (embed) { - XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask); - if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { - for (i = 0; i < du && dws[i] != win; ++i) - XSelectInput(dpy, dws[i], FocusChangeMask); - XFree(dws); - } - grabfocus(); - } - drw_resize(drw, mw, mh); - drawmenu(); -} - -static void -usage(void) -{ - die("usage: dmenu [-bv" - #if CENTER_PATCH - "c" - #endif - #if !NON_BLOCKING_STDIN_PATCH - "f" - #endif // NON_BLOCKING_STDIN_PATCH - #if INCREMENTAL_PATCH - "r" - #endif // INCREMENTAL_PATCH - #if CASEINSENSITIVE_PATCH - "s" - #else - "i" - #endif // CASEINSENSITIVE_PATCH - #if INSTANT_PATCH - "n" - #endif // INSTANT_PATCH - #if PRINTINPUTTEXT_PATCH - "t" - #endif // PRINTINPUTTEXT_PATCH - #if PREFIXCOMPLETION_PATCH - "x" - #endif // PREFIXCOMPLETION_PATCH - #if FUZZYMATCH_PATCH - "F" - #endif // FUZZYMATCH_PATCH - #if PASSWORD_PATCH - "P" - #endif // PASSWORD_PATCH - #if NO_SORT_PATCH - "S" - #endif // NO_SORT_PATCH - #if REJECTNOMATCH_PATCH - "R" // (changed from r to R due to conflict with INCREMENTAL_PATCH) - #endif // REJECTNOMATCH_PATCH - #if RESTRICT_RETURN_PATCH - "1" - #endif // RESTRICT_RETURN_PATCH - "] " - #if MANAGED_PATCH - "[-wm] " - #endif // MANAGED_PATCH - #if GRID_PATCH - "[-g columns] " - #endif // GRID_PATCH - "[-l lines] [-p prompt] [-fn font] [-m monitor]" - "\n [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]" - #if DYNAMIC_OPTIONS_PATCH || FZFEXPECT_PATCH || ALPHA_PATCH || BORDER_PATCH || HIGHPRIORITY_PATCH - "\n " - #endif - #if DYNAMIC_OPTIONS_PATCH - " [-dy command]" - #endif // DYNAMIC_OPTIONS_PATCH - #if FZFEXPECT_PATCH - " [-ex expectkey]" - #endif // FZFEXPECT_PATCH - #if ALPHA_PATCH - " [-o opacity]" - #endif // ALPHA_PATCH - #if BORDER_PATCH - " [-bw width]" - #endif // BORDER_PATCH - #if HIGHPRIORITY_PATCH - " [-hb color] [-hf color] [-hp items]" - #endif // HIGHPRIORITY_PATCH - #if INITIALTEXT_PATCH || LINE_HEIGHT_PATCH || PRESELECT_PATCH || NAVHISTORY_PATCH || XYW_PATCH - "\n " - #endif - #if INITIALTEXT_PATCH - " [-it text]" - #endif // INITIALTEXT_PATCH - #if LINE_HEIGHT_PATCH - " [-h height]" - #endif // LINE_HEIGHT_PATCH - #if PRESELECT_PATCH - " [-ps index]" - #endif // PRESELECT_PATCH - #if NAVHISTORY_PATCH - " [-H histfile]" - #endif // NAVHISTORY_PATCH - #if XYW_PATCH - " [-X xoffset] [-Y yoffset] [-W width]" // (arguments made upper case due to conflicts) - #endif // XYW_PATCH - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - "\n [-nhb color] [-nhf color] [-shb color] [-shf color]" // highlight colors - #endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH - #if SEPARATOR_PATCH - "\n [-d separator] [-D separator]" - #endif // SEPARATOR_PATCH - "\n"); -} - -int -main(int argc, char *argv[]) -{ - XWindowAttributes wa; - int i; - #if !NON_BLOCKING_STDIN_PATCH - int fast = 0; - #endif // NON_BLOCKING_STDIN_PATCH - - #if XRESOURCES_PATCH - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); - if (!embed || !(parentwin = strtol(embed, NULL, 0))) - parentwin = root; - if (!XGetWindowAttributes(dpy, parentwin, &wa)) - die("could not get embedding window attributes: 0x%lx", - parentwin); - - #if ALPHA_PATCH - xinitvisual(); - drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap); - #else - drw = drw_create(dpy, screen, root, wa.width, wa.height); - #endif // ALPHA_PATCH - readxresources(); - #endif // XRESOURCES_PATCH - - for (i = 1; i < argc; i++) - /* these options take no arguments */ - if (!strcmp(argv[i], "-v")) { /* prints version information */ - puts("dmenu-"VERSION); - exit(0); - } else if (!strcmp(argv[i], "-b")) { /* appears at the bottom of the screen */ - topbar = 0; - #if CENTER_PATCH - } else if (!strcmp(argv[i], "-c")) { /* toggles centering of dmenu window on screen */ - center = !center; - #endif // CENTER_PATCH - #if !NON_BLOCKING_STDIN_PATCH - } else if (!strcmp(argv[i], "-f")) { /* grabs keyboard before reading stdin */ - fast = 1; - #endif // NON_BLOCKING_STDIN_PATCH - #if INCREMENTAL_PATCH - } else if (!strcmp(argv[i], "-r")) { /* incremental */ - incremental = !incremental; - #endif // INCREMENTAL_PATCH - #if CASEINSENSITIVE_PATCH - } else if (!strcmp(argv[i], "-s")) { /* case-sensitive item matching */ - fstrncmp = strncmp; - fstrstr = strstr; - #else - } else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ - fstrncmp = strncasecmp; - fstrstr = cistrstr; - #endif // CASEINSENSITIVE_PATCH - #if MANAGED_PATCH - } else if (!strcmp(argv[i], "-wm")) { /* display as managed wm window */ - managed = 1; - #endif // MANAGED_PATCH - #if INSTANT_PATCH - } else if (!strcmp(argv[i], "-n")) { /* instant select only match */ - instant = !instant; - #endif // INSTANT_PATCH - #if PRINTINPUTTEXT_PATCH - } else if (!strcmp(argv[i], "-t")) { /* favors text input over selection */ - use_text_input = 1; - #endif // PRINTINPUTTEXT_PATCH - #if PREFIXCOMPLETION_PATCH - } else if (!strcmp(argv[i], "-x")) { /* invert use_prefix */ - use_prefix = !use_prefix; - #endif // PREFIXCOMPLETION_PATCH - #if FUZZYMATCH_PATCH - } else if (!strcmp(argv[i], "-F")) { /* disable/enable fuzzy matching, depends on default */ - fuzzy = !fuzzy; - #endif // FUZZYMATCH_PATCH - #if PASSWORD_PATCH - } else if (!strcmp(argv[i], "-P")) { /* is the input a password */ - passwd = 1; - #endif // PASSWORD_PATCH - #if FZFEXPECT_PATCH - } else if (!strcmp(argv[i], "-ex")) { /* expect key */ - expected = argv[++i]; - #endif // FZFEXPECT_PATCH - #if REJECTNOMATCH_PATCH - } else if (!strcmp(argv[i], "-R")) { /* reject input which results in no match */ - reject_no_match = 1; - #endif // REJECTNOMATCH_PATCH - #if NO_SORT_PATCH - } else if (!strcmp(argv[i], "-S")) { /* do not sort matches */ - sortmatches = 0; - #endif // NO_SORT_PATCH - #if PRINTINDEX_PATCH - } else if (!strcmp(argv[i], "-ix")) { /* adds ability to return index in list */ - print_index = 1; - #endif // PRINTINDEX_PATCH - #if RESTRICT_RETURN_PATCH - } else if (!strcmp(argv[i], "-1")) { - restrict_return = 1; - #endif // RESTRICT_RETURN_PATCH - } else if (i + 1 == argc) - usage(); - /* these options take one argument */ - #if NAVHISTORY_PATCH - else if (!strcmp(argv[i], "-H")) - histfile = argv[++i]; - #endif // NAVHISTORY_PATCH - #if GRID_PATCH - else if (!strcmp(argv[i], "-g")) { /* number of columns in grid */ - columns = atoi(argv[++i]); - if (columns && lines == 0) - lines = 1; - } - #endif // GRID_PATCH - else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ - lines = atoi(argv[++i]); - #if XYW_PATCH - else if (!strcmp(argv[i], "-X")) /* window x offset */ - dmx = atoi(argv[++i]); - else if (!strcmp(argv[i], "-Y")) /* window y offset (from bottom up if -b) */ - dmy = atoi(argv[++i]); - else if (!strcmp(argv[i], "-W")) /* make dmenu this wide */ - dmw = atoi(argv[++i]); - #endif // XYW_PATCH - else if (!strcmp(argv[i], "-m")) - mon = atoi(argv[++i]); - #if ALPHA_PATCH - else if (!strcmp(argv[i], "-o")) /* opacity, pass -o 0 to disable alpha */ - opacity = atoi(argv[++i]); - #endif // ALPHA_PATCH - else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ - prompt = argv[++i]; - else if (!strcmp(argv[i], "-fn")) /* font or font set */ - #if PANGO_PATCH - strcpy(font, argv[++i]); - #else - fonts[0] = argv[++i]; - #endif // PANGO_PATCH - #if LINE_HEIGHT_PATCH - else if(!strcmp(argv[i], "-h")) { /* minimum height of one menu line */ - lineheight = atoi(argv[++i]); - lineheight = MAX(lineheight, min_lineheight); /* reasonable default in case of value too small/negative */ - } - #endif // LINE_HEIGHT_PATCH - else if (!strcmp(argv[i], "-nb")) /* normal background color */ - colors[SchemeNorm][ColBg] = argv[++i]; - else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ - colors[SchemeNorm][ColFg] = argv[++i]; - else if (!strcmp(argv[i], "-sb")) /* selected background color */ - colors[SchemeSel][ColBg] = argv[++i]; - else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ - colors[SchemeSel][ColFg] = argv[++i]; - #if HIGHPRIORITY_PATCH - else if (!strcmp(argv[i], "-hb")) /* high priority background color */ - colors[SchemeHp][ColBg] = argv[++i]; - else if (!strcmp(argv[i], "-hf")) /* low priority background color */ - colors[SchemeHp][ColFg] = argv[++i]; - else if (!strcmp(argv[i], "-hp")) - hpitems = tokenize(argv[++i], ",", &hplength); - #endif // HIGHPRIORITY_PATCH - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - else if (!strcmp(argv[i], "-nhb")) /* normal hi background color */ - colors[SchemeNormHighlight][ColBg] = argv[++i]; - else if (!strcmp(argv[i], "-nhf")) /* normal hi foreground color */ - colors[SchemeNormHighlight][ColFg] = argv[++i]; - else if (!strcmp(argv[i], "-shb")) /* selected hi background color */ - colors[SchemeSelHighlight][ColBg] = argv[++i]; - else if (!strcmp(argv[i], "-shf")) /* selected hi foreground color */ - colors[SchemeSelHighlight][ColFg] = argv[++i]; - #endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH - else if (!strcmp(argv[i], "-w")) /* embedding window id */ - embed = argv[++i]; - #if SEPARATOR_PATCH - else if (!strcmp(argv[i], "-d") || /* field separator */ - (separator_greedy = !strcmp(argv[i], "-D"))) { - separator = argv[++i][0]; - separator_reverse = argv[i][1] == '|'; - } - #endif // SEPARATOR_PATCH - #if PRESELECT_PATCH - else if (!strcmp(argv[i], "-ps")) /* preselected item */ - preselected = atoi(argv[++i]); - #endif // PRESELECT_PATCH - #if DYNAMIC_OPTIONS_PATCH - else if (!strcmp(argv[i], "-dy")) /* dynamic command to run */ - dynamic = argv[++i]; - #endif // DYNAMIC_OPTIONS_PATCH - #if BORDER_PATCH - else if (!strcmp(argv[i], "-bw")) /* border width around dmenu */ - border_width = atoi(argv[++i]); - #endif // BORDER_PATCH - #if INITIALTEXT_PATCH - else if (!strcmp(argv[i], "-it")) { /* adds initial text */ - const char * text = argv[++i]; - insert(text, strlen(text)); - } - #endif // INITIALTEXT_PATCH - else - usage(); - - #if XRESOURCES_PATCH - #if PANGO_PATCH - if (!drw_font_create(drw, font)) - die("no fonts could be loaded."); - #else - if (!drw_fontset_create(drw, (const char**)fonts, LENGTH(fonts))) - die("no fonts could be loaded."); - #endif // PANGO_PATCH - #else // !XRESOURCES_PATCH - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); - if (!embed || !(parentwin = strtol(embed, NULL, 0))) - parentwin = root; - if (!XGetWindowAttributes(dpy, parentwin, &wa)) - die("could not get embedding window attributes: 0x%lx", - parentwin); - - #if ALPHA_PATCH - xinitvisual(); - drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap); - #else - drw = drw_create(dpy, screen, root, wa.width, wa.height); - #endif // ALPHA_PATCH - - #if PANGO_PATCH - if (!drw_font_create(drw, font)) - die("no fonts could be loaded."); - #else - if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) - die("no fonts could be loaded."); - #endif // PANGO_PATCH - #endif // XRESOURCES_PATCH - - #if PANGO_PATCH - lrpad = drw->font->h; - #else - lrpad = drw->fonts->h; - #endif // PANGO_PATCH - - #if BARPADDING_PATCH - sp = sidepad; - vp = (topbar ? vertpad : - vertpad); - #endif // BARPADDING_PATCH - - #if LINE_HEIGHT_PATCH - if (lineheight == -1) - #if PANGO_PATCH - lineheight = drw->font->h * 2.5; - #else - lineheight = drw->fonts->h * 2.5; - #endif // PANGO_PATCH - #endif // LINE_HEIGHT_PATCH - -#ifdef __OpenBSD__ - if (pledge("stdio rpath", NULL) == -1) - die("pledge"); -#endif - #if NAVHISTORY_PATCH - loadhistory(); - #endif // NAVHISTORY_PATCH - - #if NON_BLOCKING_STDIN_PATCH - grabkeyboard(); - #else - if (fast && !isatty(0)) { - grabkeyboard(); - #if DYNAMIC_OPTIONS_PATCH - if (!(dynamic && *dynamic)) - readstdin(); - #else - readstdin(); - #endif // DYNAMIC_OPTIONS_PATCH - } else { - #if DYNAMIC_OPTIONS_PATCH - if (!(dynamic && *dynamic)) - readstdin(); - #else - readstdin(); - #endif // DYNAMIC_OPTIONS_PATCH - grabkeyboard(); - } - #endif // NON_BLOCKING_STDIN_PATCH - setup(); - run(); - - return 1; /* unreachable */ -} diff --git a/desktop/.dmenu/dmenu_path b/desktop/.dmenu/dmenu_path deleted file mode 100755 index 3a7cda7..0000000 --- a/desktop/.dmenu/dmenu_path +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}" -cache="$cachedir/dmenu_run" - -[ ! -e "$cachedir" ] && mkdir -p "$cachedir" - -IFS=: -if stest -dqr -n "$cache" $PATH; then - stest -flx $PATH | sort -u | tee "$cache" -else - cat "$cache" -fi diff --git a/desktop/.dmenu/dmenu_run b/desktop/.dmenu/dmenu_run deleted file mode 100755 index cc05de4..0000000 --- a/desktop/.dmenu/dmenu_run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -export _JAVA_AWT_WM_NONREPARENTING=1 -exec $(dmenu_path | dmenu "$@") - -# Uncomment for the NAVHISTORY patch (and remove the exec above) -#dmenu_path | dmenu -H "${XDG_CACHE_HOME:-$HOME/.cache/}/dmenu_run.hist" "$@" | ${SHELL:-"/bin/sh"} & \ No newline at end of file diff --git a/desktop/.dmenu/drw.c b/desktop/.dmenu/drw.c deleted file mode 100644 index 62096d1..0000000 --- a/desktop/.dmenu/drw.c +++ /dev/null @@ -1,696 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include -#include - -#include "patches.h" -#include "drw.h" -#include "util.h" - -#if !PANGO_PATCH -#define UTF_INVALID 0xFFFD -#define UTF_SIZ 4 - -static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; -static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; -static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; -static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; - -static long -utf8decodebyte(const char c, size_t *i) -{ - for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) - if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) - return (unsigned char)c & ~utfmask[*i]; - return 0; -} - -static size_t -utf8validate(long *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 size_t -utf8decode(const char *c, long *u, size_t clen) -{ - size_t i, j, len, type; - long 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) - return j; - } - if (j < len) - return 0; - *u = udecoded; - utf8validate(u, len); - - return len; -} -#endif // PANGO_PATCH - -Drw * -#if ALPHA_PATCH -drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap) -#else -drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) -#endif // ALPHA_PATCH -{ - Drw *drw = ecalloc(1, sizeof(Drw)); - - drw->dpy = dpy; - drw->screen = screen; - drw->root = root; - drw->w = w; - drw->h = h; - #if ALPHA_PATCH - drw->visual = visual; - drw->depth = depth; - drw->cmap = cmap; - drw->drawable = XCreatePixmap(dpy, root, w, h, depth); - drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL); - #else - drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); - drw->gc = XCreateGC(dpy, root, 0, NULL); - #endif // ALPHA_PATCH - XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); - - return drw; -} - -void -drw_resize(Drw *drw, unsigned int w, unsigned int h) -{ - if (!drw) - return; - - drw->w = w; - drw->h = h; - if (drw->drawable) - XFreePixmap(drw->dpy, drw->drawable); - #if ALPHA_PATCH - drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth); - #else - drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); - #endif // ALPHA_PATCH -} - -void -drw_free(Drw *drw) -{ - XFreePixmap(drw->dpy, drw->drawable); - XFreeGC(drw->dpy, drw->gc); - #if PANGO_PATCH - drw_font_free(drw->font); - #else - drw_fontset_free(drw->fonts); - #endif // PANGO_PATCH - free(drw); -} - -#if PANGO_PATCH -/* This function is an implementation detail. Library users should use - * drw_font_create instead. - */ -static Fnt * -xfont_create(Drw *drw, const char *fontname) -{ - Fnt *font; - PangoFontMap *fontmap; - PangoContext *context; - PangoFontDescription *desc; - PangoFontMetrics *metrics; - - if (!fontname) { - die("no font specified."); - } - - font = ecalloc(1, sizeof(Fnt)); - font->dpy = drw->dpy; - - fontmap = pango_xft_get_font_map(drw->dpy, drw->screen); - context = pango_font_map_create_context(fontmap); - desc = pango_font_description_from_string(fontname); - font->layout = pango_layout_new(context); - pango_layout_set_font_description(font->layout, desc); - - metrics = pango_context_get_metrics(context, desc, pango_language_from_string ("en-us")); - font->h = pango_font_metrics_get_height(metrics) / PANGO_SCALE; - - pango_font_metrics_unref(metrics); - g_object_unref(context); - - return font; -} -#else -/* This function is an implementation detail. Library users should use - * drw_fontset_create instead. - */ -static Fnt * -xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) -{ - Fnt *font; - XftFont *xfont = NULL; - FcPattern *pattern = NULL; - - if (fontname) { - /* Using the pattern found at font->xfont->pattern does not yield the - * same substitution results as using the pattern returned by - * FcNameParse; using the latter results in the desired fallback - * behaviour whereas the former just results in missing-character - * rectangles being drawn, at least with some fonts. */ - if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { - fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); - return NULL; - } - if (!(pattern = FcNameParse((FcChar8 *) fontname))) { - fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); - XftFontClose(drw->dpy, xfont); - return NULL; - } - } else if (fontpattern) { - if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { - fprintf(stderr, "error, cannot load font from pattern.\n"); - return NULL; - } - } else { - die("no font specified."); - } - - #if NO_COLOR_EMOJI_PATCH - /* Do not allow using color fonts. This is a workaround for a BadLength - * error from Xft with color glyphs. Modelled on the Xterm workaround. See - * https://bugzilla.redhat.com/show_bug.cgi?id=1498269 - * https://lists.suckless.org/dev/1701/30932.html - * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349 - * and lots more all over the internet. - */ - FcBool iscol; - if (FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) { - XftFontClose(drw->dpy, xfont); - return NULL; - } - #endif // NO_COLOR_EMOJI_PATCH - - font = ecalloc(1, sizeof(Fnt)); - font->xfont = xfont; - font->pattern = pattern; - font->h = xfont->ascent + xfont->descent; - font->dpy = drw->dpy; - - return font; -} -#endif // PANGO_PATCH - -static void -xfont_free(Fnt *font) -{ - if (!font) - return; - #if PANGO_PATCH - if (font->layout) - g_object_unref(font->layout); - #else - if (font->pattern) - FcPatternDestroy(font->pattern); - XftFontClose(font->dpy, font->xfont); - #endif // PANGO_PATCH - free(font); -} - -#if PANGO_PATCH -Fnt* -drw_font_create(Drw* drw, const char font[]) -{ - Fnt *fnt = NULL; - - if (!drw || !font) - return NULL; - - fnt = xfont_create(drw, font); - - return (drw->font = fnt); -} -#else -Fnt* -drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) -{ - Fnt *cur, *ret = NULL; - size_t i; - - if (!drw || !fonts) - return NULL; - - for (i = 1; i <= fontcount; i++) { - if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { - cur->next = ret; - ret = cur; - } - } - return (drw->fonts = ret); -} -#endif // PANGO_PATCH - -#if PANGO_PATCH -void -drw_font_free(Fnt *font) -{ - if (font) - xfont_free(font); -} -#else -void -drw_fontset_free(Fnt *font) -{ - if (font) { - drw_fontset_free(font->next); - xfont_free(font); - } -} -#endif // PANGO_PATCH - -void -#if ALPHA_PATCH -drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) -#else -drw_clr_create(Drw *drw, Clr *dest, const char *clrname) -#endif // ALPHA_PATCH -{ - if (!drw || !dest || !clrname) - return; - - #if ALPHA_PATCH - if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap, - clrname, dest)) - die("error, cannot allocate color '%s'", clrname); - - dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24); - #else - if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), - DefaultColormap(drw->dpy, drw->screen), - clrname, dest)) - die("error, cannot allocate color '%s'", clrname); - #endif // ALPHA_PATCH -} - -/* Wrapper to create color schemes. The caller has to call free(3) on the - * returned color scheme when done using it. */ -Clr * -#if ALPHA_PATCH -drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount) -#else -drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) -#endif // ALPHA_PATCH -{ - size_t i; - Clr *ret; - - /* need at least two colors for a scheme */ - if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) - return NULL; - - for (i = 0; i < clrcount; i++) - #if ALPHA_PATCH - drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]); - #else - drw_clr_create(drw, &ret[i], clrnames[i]); - #endif // ALPHA_PATCH - return ret; -} - -#if !PANGO_PATCH -void -drw_setfontset(Drw *drw, Fnt *set) -{ - if (drw) - drw->fonts = set; -} -#endif // PANGO_PATCH - -void -drw_setscheme(Drw *drw, Clr *scm) -{ - if (drw) - drw->scheme = scm; -} - -void -drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) -{ - if (!drw || !drw->scheme) - return; - XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); - if (filled) - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - else - XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); -} - -#if PANGO_PATCH -int -drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup) -{ - char buf[1024]; - int ty; - unsigned int ew; - XftDraw *d = NULL; - size_t i, len; - int render = x || y || w || h; - - if (!drw || (render && !drw->scheme) || !text || !drw->font) - return 0; - - if (!render) { - w = invert ? invert : ~invert; - } else { - XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - #if ALPHA_PATCH - d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap); - #else - d = XftDrawCreate(drw->dpy, drw->drawable, - DefaultVisual(drw->dpy, drw->screen), - DefaultColormap(drw->dpy, drw->screen)); - #endif // ALPHA_PATCH - x += lpad; - w -= lpad; - } - - len = strlen(text); - - if (len) { - drw_font_getexts(drw->font, text, len, &ew, NULL, markup); - /* shorten text if necessary */ - for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--) - drw_font_getexts(drw->font, text, len, &ew, NULL, markup); - - if (len) { - memcpy(buf, text, len); - buf[len] = '\0'; - if (len < strlen(text)) - for (i = len; i && i > len - 3; buf[--i] = '.') - ; /* NOP */ - - if (render) { - ty = y + (h - drw->font->h) / 2; - if (markup) - pango_layout_set_markup(drw->font->layout, buf, len); - else - pango_layout_set_text(drw->font->layout, buf, len); - pango_xft_render_layout(d, &drw->scheme[invert ? ColBg : ColFg], - drw->font->layout, x * PANGO_SCALE, ty * PANGO_SCALE); - if (markup) /* clear markup attributes */ - pango_layout_set_attributes(drw->font->layout, NULL); - } - x += ew; - w -= ew; - } - } - - if (d) - XftDrawDestroy(d); - - return x + (render ? w : 0); -} -#else -int -drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) -{ - int i, ty, ellipsis_x = 0; - unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; - XftDraw *d = NULL; - Fnt *usedfont, *curfont, *nextfont; - int utf8strlen, utf8charlen, render = x || y || w || h; - long utf8codepoint = 0; - const char *utf8str; - FcCharSet *fccharset; - FcPattern *fcpattern; - FcPattern *match; - XftResult result; - int charexists = 0, overflow = 0; - /* keep track of a couple codepoints for which we have no match. */ - enum { nomatches_len = 64 }; - static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches; - const char *ellipsis = "..."; - static unsigned int ellipsis_width = 0; - - if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) - return 0; - - if (!render) { - w = invert ? invert : ~invert; - } else { - XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - #if ALPHA_PATCH - d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap); - #else - d = XftDrawCreate(drw->dpy, drw->drawable, - DefaultVisual(drw->dpy, drw->screen), - DefaultColormap(drw->dpy, drw->screen)); - #endif // ALPHA_PATCH - x += lpad; - w -= lpad; - } - - usedfont = drw->fonts; - if (!ellipsis_width && render) - ellipsis_width = drw_fontset_getwidth(drw, ellipsis); - while (1) { - ew = ellipsis_len = utf8strlen = 0; - utf8str = text; - nextfont = NULL; - while (*text) { - utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); - for (curfont = drw->fonts; curfont; curfont = curfont->next) { - charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); - if (charexists) { - drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); - if (ew + ellipsis_width <= w) { - /* keep track where the ellipsis still fits */ - ellipsis_x = x + ew; - ellipsis_w = w - ew; - ellipsis_len = utf8strlen; - } - - if (ew + tmpw > w) { - overflow = 1; - /* called from drw_fontset_getwidth_clamp(): - * it wants the width AFTER the overflow - */ - if (!render) - x += tmpw; - else - utf8strlen = ellipsis_len; - } else if (curfont == usedfont) { - utf8strlen += utf8charlen; - text += utf8charlen; - ew += tmpw; - } else { - nextfont = curfont; - } - break; - } - } - - if (overflow || !charexists || nextfont) - break; - else - charexists = 0; - } - - if (utf8strlen) { - if (render) { - ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; - XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], - usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen); - } - x += ew; - w -= ew; - } - if (render && overflow && ellipsis_w) - drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, ellipsis, invert); - - if (!*text || overflow) { - break; - } else if (nextfont) { - charexists = 0; - usedfont = nextfont; - } else { - /* Regardless of whether or not a fallback font is found, the - * character must be drawn. */ - charexists = 1; - - for (i = 0; i < nomatches_len; ++i) { - /* avoid calling XftFontMatch if we know we won't find a match */ - if (utf8codepoint == nomatches.codepoint[i]) - goto no_match; - } - - fccharset = FcCharSetCreate(); - FcCharSetAddChar(fccharset, utf8codepoint); - - if (!drw->fonts->pattern) { - /* Refer to the comment in xfont_create for more information. */ - die("the first font in the cache must be loaded from a font string."); - } - - fcpattern = FcPatternDuplicate(drw->fonts->pattern); - FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); - #if NO_COLOR_EMOJI_PATCH - FcPatternAddBool(fcpattern, FC_COLOR, FcFalse); - #endif // NO_COLOR_EMOJI_PATCH - - FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); - FcDefaultSubstitute(fcpattern); - match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); - - FcCharSetDestroy(fccharset); - FcPatternDestroy(fcpattern); - - if (match) { - usedfont = xfont_create(drw, NULL, match); - if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { - for (curfont = drw->fonts; curfont->next; curfont = curfont->next) - ; /* NOP */ - curfont->next = usedfont; - } else { - xfont_free(usedfont); - nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint; -no_match: - usedfont = drw->fonts; - } - } - } - } - if (d) - XftDrawDestroy(d); - - return x + (render ? w : 0); -} -#endif // PANGO_PATCH - -void -drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) -{ - if (!drw) - return; - - XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); - XSync(drw->dpy, False); -} - -#if PANGO_PATCH -unsigned int -drw_font_getwidth(Drw *drw, const char *text, Bool markup) -{ - if (!drw || !drw->font || !text) - return 0; - return drw_text(drw, 0, 0, 0, 0, 0, text, 0, markup); -} - -unsigned int -drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) -{ - unsigned int tmp = 0; - if (drw && drw->font && text && n) - tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n, True); - return MIN(n, tmp); -} -#else -unsigned int -drw_fontset_getwidth(Drw *drw, const char *text) -{ - if (!drw || !drw->fonts || !text) - return 0; - return drw_text(drw, 0, 0, 0, 0, 0, text, 0); -} - -unsigned int -drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) -{ - unsigned int tmp = 0; - if (drw && drw->fonts && text && n) - tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); - return MIN(n, tmp); -} -#endif // PANGO_PATCH - -#if PANGO_PATCH -void -drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup) -{ - if (!font || !text) - return; - - PangoRectangle r; - if (markup) - pango_layout_set_markup(font->layout, text, len); - else - pango_layout_set_text(font->layout, text, len); - pango_layout_get_extents(font->layout, 0, &r); - if (markup) /* clear markup attributes */ - pango_layout_set_attributes(font->layout, NULL); - if (w) - *w = r.width / PANGO_SCALE; - if (h) - *h = font->h; -} -#else -void -drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) -{ - XGlyphInfo ext; - - if (!font || !text) - return; - - XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); - if (w) - *w = ext.xOff; - if (h) - *h = font->h; -} -#endif // PANGO_PATCH - -Cur * -drw_cur_create(Drw *drw, int shape) -{ - Cur *cur; - - if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) - return NULL; - - cur->cursor = XCreateFontCursor(drw->dpy, shape); - - return cur; -} - -void -drw_cur_free(Drw *drw, Cur *cursor) -{ - if (!cursor) - return; - - XFreeCursor(drw->dpy, cursor->cursor); - free(cursor); -} - -#if SCROLL_PATCH -#include "patch/scroll.c" -#endif diff --git a/desktop/.dmenu/drw.h b/desktop/.dmenu/drw.h deleted file mode 100644 index af4af4d..0000000 --- a/desktop/.dmenu/drw.h +++ /dev/null @@ -1,103 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -#if PANGO_PATCH -#include -#include -#endif // PANGO_PATCH - -typedef struct { - Cursor cursor; -} Cur; - -typedef struct Fnt { - Display *dpy; - unsigned int h; - #if PANGO_PATCH - PangoLayout *layout; - #else - XftFont *xfont; - FcPattern *pattern; - struct Fnt *next; - #endif // PANGO_PATCH -} Fnt; - -enum { ColFg, ColBg }; /* Clr scheme index */ -typedef XftColor Clr; - -typedef struct { - unsigned int w, h; - Display *dpy; - int screen; - Window root; - #if ALPHA_PATCH - Visual *visual; - unsigned int depth; - Colormap cmap; - #endif // ALPHA_PATCH - Drawable drawable; - GC gc; - Clr *scheme; - #if PANGO_PATCH - Fnt *font; - #else - Fnt *fonts; - #endif // PANGO_PATCH -} Drw; - -/* Drawable abstraction */ -#if ALPHA_PATCH -Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap); -#else -Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); -#endif // ALPHA_PATCH -void drw_resize(Drw *drw, unsigned int w, unsigned int h); -void drw_free(Drw *drw); - -/* Fnt abstraction */ -#if PANGO_PATCH -Fnt *drw_font_create(Drw* drw, const char font[]); -void drw_font_free(Fnt* set); -unsigned int drw_font_getwidth(Drw *drw, const char *text, Bool markup); -unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n); -void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup); -#else -Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); -void drw_fontset_free(Fnt* set); -unsigned int drw_fontset_getwidth(Drw *drw, const char *text); -unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n); -void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); -#endif // PANGO_PATCH - -/* Colorscheme abstraction */ -#if ALPHA_PATCH -void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha); -Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount); -#else -void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); -Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); -#endif // ALPHA_PATCH - -/* Cursor abstraction */ -Cur *drw_cur_create(Drw *drw, int shape); -void drw_cur_free(Drw *drw, Cur *cursor); - -/* Drawing context manipulation */ -#if !PANGO_PATCH -void drw_setfontset(Drw *drw, Fnt *set); -#endif // PANGO_PATCH -void drw_setscheme(Drw *drw, Clr *scm); - -/* Drawing functions */ -void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); -#if PANGO_PATCH -int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup); -#else -int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert); -#endif // PANGO_PATCH - -/* Map functions */ -void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); - -#if SCROLL_PATCH -#include "patch/scroll.h" -#endif \ No newline at end of file diff --git a/desktop/.dmenu/patch/center.c b/desktop/.dmenu/patch/center.c deleted file mode 100644 index 9682bfb..0000000 --- a/desktop/.dmenu/patch/center.c +++ /dev/null @@ -1,8 +0,0 @@ -static int -max_textw(void) -{ - int len = 0; - for (struct item *item = items; item && item->text; item++) - len = MAX(TEXTW(item->text), len); - return len; -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/dynamicoptions.c b/desktop/.dmenu/patch/dynamicoptions.c deleted file mode 100644 index 0102cfb..0000000 --- a/desktop/.dmenu/patch/dynamicoptions.c +++ /dev/null @@ -1,91 +0,0 @@ -static void -refreshoptions() -{ - int dynlen = strlen(dynamic); - char* cmd= malloc(dynlen + strlen(text) + 2); - if (cmd == NULL) - die("malloc:"); - sprintf(cmd, "%s %s", dynamic, text); - FILE *stream = popen(cmd, "r"); - if (!stream) - die("popen(%s):", cmd); - readstream(stream); - int pc = pclose(stream); - if (pc == -1) - die("pclose:"); - free(cmd); - curr = sel = items; -} - -static void -readstream(FILE* stream) -{ - char buf[sizeof text], *p; - size_t i, imax = 0, size = 0; - unsigned int tmpmax = 0; - - /* read each line from stdin and add it to the item list */ - for (i = 0; fgets(buf, sizeof buf, stream); i++) { - if (i + 1 >= size / sizeof *items) - if (!(items = realloc(items, (size += BUFSIZ)))) - die("cannot realloc %u bytes:", size); - if ((p = strchr(buf, '\n'))) - *p = '\0'; - if (!(items[i].text = strdup(buf))) - die("cannot strdup %u bytes:", strlen(buf) + 1); - #if SEPARATOR_PATCH - if (separator && (p = separator_greedy ? - strrchr(items[i].text, separator) : strchr(items[i].text, separator))) { - *p = '\0'; - items[i].text_output = ++p; - } else { - items[i].text_output = items[i].text; - } - if (separator_reverse) { - p = items[i].text; - items[i].text = items[i].text_output; - items[i].text_output = p; - } - #elif TSV_PATCH - if ((p = strchr(buf, '\t'))) - *p = '\0'; - if (!(items[i].stext = strdup(buf))) - die("cannot strdup %u bytes:", strlen(buf) + 1); - #endif // TSV_PATCH - #if MULTI_SELECTION_PATCH - items[i].id = i; - #else - items[i].out = 0; - #endif // MULTI_SELECTION_PATCH - #if HIGHPRIORITY_PATCH - items[i].hp = arrayhas(hpitems, hplength, items[i].text); - #endif // HIGHPRIORITY_PATCH - #if PANGO_PATCH - drw_font_getexts(drw->font, buf, strlen(buf), &tmpmax, NULL, True); - #else - drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL); - #endif // PANGO_PATCH - if (tmpmax > inputw) { - inputw = tmpmax; - imax = i; - } - } - - /* If the command did not give any output at all, then do not clear the existing items */ - if (!i) - return; - - if (items) - items[i].text = NULL; - #if PANGO_PATCH - inputw = items ? TEXTWM(items[imax].text) : 0; - #else - inputw = items ? TEXTW(items[imax].text) : 0; - #endif // PANGO_PATCH - if (!dynamic || !*dynamic) - lines = MIN(lines, i); - else { - text[0] = '\0'; - cursor = 0; - } -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/dynamicoptions.h b/desktop/.dmenu/patch/dynamicoptions.h deleted file mode 100644 index eba9fb0..0000000 --- a/desktop/.dmenu/patch/dynamicoptions.h +++ /dev/null @@ -1,2 +0,0 @@ -static void refreshoptions(); -static void readstream(FILE* stream); \ No newline at end of file diff --git a/desktop/.dmenu/patch/fuzzyhighlight.c b/desktop/.dmenu/patch/fuzzyhighlight.c deleted file mode 100644 index a62fba7..0000000 --- a/desktop/.dmenu/patch/fuzzyhighlight.c +++ /dev/null @@ -1,57 +0,0 @@ -static void -#if EMOJI_HIGHLIGHT_PATCH -drawhighlights(struct item *item, char *output, int x, int y, int maxw) -#else -drawhighlights(struct item *item, int x, int y, int maxw) -#endif // EMOJI_HIGHLIGHT_PATCH -{ - int i, indent; - char *highlight; - char c; - - #if EMOJI_HIGHLIGHT_PATCH - char *itemtext = output; - #elif TSV_PATCH && !SEPARATOR_PATCH - char *itemtext = item->stext; - #else - char *itemtext = item->text; - #endif // TSV_PATCH - - if (!(strlen(itemtext) && strlen(text))) - return; - - drw_setscheme(drw, scheme[item == sel - ? SchemeSelHighlight - : SchemeNormHighlight]); - for (i = 0, highlight = itemtext; *highlight && text[i];) { - #if FUZZYMATCH_PATCH - if (!fstrncmp(&(*highlight), &text[i], 1)) - #else - if (*highlight == text[i]) - #endif // FUZZYMATCH_PATCH - { - /* get indentation */ - c = *highlight; - *highlight = '\0'; - indent = TEXTW(itemtext) - lrpad; - *highlight = c; - - /* highlight character */ - c = highlight[1]; - highlight[1] = '\0'; - drw_text( - drw, - x + indent + (lrpad / 2), - y, - MIN(maxw - indent - lrpad, TEXTW(highlight) - lrpad), - bh, 0, highlight, 0 - #if PANGO_PATCH - , True - #endif // PANGO_PATCH - ); - highlight[1] = c; - i++; - } - highlight++; - } -} diff --git a/desktop/.dmenu/patch/fuzzymatch.c b/desktop/.dmenu/patch/fuzzymatch.c deleted file mode 100644 index ab934ba..0000000 --- a/desktop/.dmenu/patch/fuzzymatch.c +++ /dev/null @@ -1,106 +0,0 @@ -#include - -int -compare_distance(const void *a, const void *b) -{ - struct item *da = *(struct item **) a; - struct item *db = *(struct item **) b; - - if (!db) - return 1; - if (!da) - return -1; - - return da->distance == db->distance ? 0 : da->distance < db->distance ? -1 : 1; -} - -void -fuzzymatch(void) -{ - /* bang - we have so much memory */ - struct item *it; - struct item **fuzzymatches = NULL; - char c; - int number_of_matches = 0, i, pidx, sidx, eidx; - int text_len = strlen(text), itext_len; - #if HIGHPRIORITY_PATCH - struct item *lhpprefix, *hpprefixend; - lhpprefix = hpprefixend = NULL; - #endif // HIGHPRIORITY_PATCH - matches = matchend = NULL; - - /* walk through all items */ - for (it = items; it && it->text; it++) { - if (text_len) { - itext_len = strlen(it->text); - pidx = 0; /* pointer */ - sidx = eidx = -1; /* start of match, end of match */ - /* walk through item text */ - for (i = 0; i < itext_len && (c = it->text[i]); i++) { - /* fuzzy match pattern */ - if (!fstrncmp(&text[pidx], &c, 1)) { - if (sidx == -1) - sidx = i; - pidx++; - if (pidx == text_len) { - eidx = i; - break; - } - } - } - /* build list of matches */ - if (eidx != -1) { - /* compute distance */ - /* add penalty if match starts late (log(sidx+2)) - * add penalty for long a match without many matching characters */ - it->distance = log(sidx + 2) + (double)(eidx - sidx - text_len); - /* fprintf(stderr, "distance %s %f\n", it->text, it->distance); */ - appenditem(it, &matches, &matchend); - number_of_matches++; - } - } else { - appenditem(it, &matches, &matchend); - } - } - - if (number_of_matches) { - /* initialize array with matches */ - if (!(fuzzymatches = realloc(fuzzymatches, number_of_matches * sizeof(struct item*)))) - die("cannot realloc %u bytes:", number_of_matches * sizeof(struct item*)); - for (i = 0, it = matches; it && i < number_of_matches; i++, it = it->right) { - fuzzymatches[i] = it; - } - - #if NO_SORT_PATCH - if (sortmatches) - #endif // NO_SORT_PATCH - /* sort matches according to distance */ - qsort(fuzzymatches, number_of_matches, sizeof(struct item*), compare_distance); - /* rebuild list of matches */ - matches = matchend = NULL; - for (i = 0, it = fuzzymatches[i]; i < number_of_matches && it && \ - it->text; i++, it = fuzzymatches[i]) { - #if HIGHPRIORITY_PATCH - #if NO_SORT_PATCH - if (sortmatches && it->hp) - #else - if (it->hp) - #endif // NO_SORT_PATCH - appenditem(it, &lhpprefix, &hpprefixend); - else - appenditem(it, &matches, &matchend); - #else - appenditem(it, &matches, &matchend); - #endif // HIGHPRIORITY_PATCH - } - free(fuzzymatches); - } - #if HIGHPRIORITY_PATCH - if (lhpprefix) { - hpprefixend->right = matches; - matches = lhpprefix; - } - #endif // HIGHPRIORITY_PATCH - curr = sel = matches; - calcoffsets(); -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/fzfexpect.c b/desktop/.dmenu/patch/fzfexpect.c deleted file mode 100644 index 1563362..0000000 --- a/desktop/.dmenu/patch/fzfexpect.c +++ /dev/null @@ -1,39 +0,0 @@ -static char *expected; -#if MULTI_SELECTION_PATCH -void -expect(char *expect, XKeyEvent *ev) -{ - if (sel && expected && strstr(expected, expect)) { - if (expected && sel && !(ev->state & ShiftMask)) - puts(expect); - for (int i = 0; i < selidsize; i++) - if (selid[i] != -1 && (!sel || sel->id != selid[i])) - puts(items[selid[i]].text); - if (sel && !(ev->state & ShiftMask)) { - puts(sel->text); - } else - puts(text); - cleanup(); - exit(1); - } else if (!sel && expected && strstr(expected, expect)) { - puts(expect); - cleanup(); - exit(1); - } -} -#else -void -expect(char *expect, XKeyEvent *ignored) -{ - if (sel && expected && strstr(expected, expect)) { - puts(expect); - puts(sel->text); - cleanup(); - exit(1); - } else if (!sel && expected && strstr(expected, expect)){ - puts(expect); - cleanup(); - exit(1); - } -} -#endif // MULTI_SELECTION_PATCH \ No newline at end of file diff --git a/desktop/.dmenu/patch/fzfexpect.h b/desktop/.dmenu/patch/fzfexpect.h deleted file mode 100644 index 95c1dad..0000000 --- a/desktop/.dmenu/patch/fzfexpect.h +++ /dev/null @@ -1 +0,0 @@ -static void expect(char *expect, XKeyEvent *ev); diff --git a/desktop/.dmenu/patch/highlight.c b/desktop/.dmenu/patch/highlight.c deleted file mode 100644 index b5947b5..0000000 --- a/desktop/.dmenu/patch/highlight.c +++ /dev/null @@ -1,51 +0,0 @@ -static void -#if EMOJI_HIGHLIGHT_PATCH -drawhighlights(struct item *item, char *output, int x, int y, int maxw) -#else -drawhighlights(struct item *item, int x, int y, int maxw) -#endif // EMOJI_HIGHLIGHT_PATCH -{ - char restorechar, tokens[sizeof text], *highlight, *token; - int indentx, highlightlen; - #if EMOJI_HIGHLIGHT_PATCH - char *itemtext = output; - #elif TSV_PATCH && !SEPARATOR_PATCH - char *itemtext = item->stext; - #else - char *itemtext = item->text; - #endif // EMOJI_HIGHLIGHT_PATCH | TSV_PATCH - - drw_setscheme(drw, scheme[item == sel ? SchemeSelHighlight : SchemeNormHighlight]); - strcpy(tokens, text); - for (token = strtok(tokens, " "); token; token = strtok(NULL, " ")) { - highlight = fstrstr(itemtext, token); - while (highlight) { - // Move item str end, calc width for highlight indent, & restore - highlightlen = highlight - itemtext; - restorechar = *highlight; - itemtext[highlightlen] = '\0'; - indentx = TEXTW(itemtext); - itemtext[highlightlen] = restorechar; - - // Move highlight str end, draw highlight, & restore - restorechar = highlight[strlen(token)]; - highlight[strlen(token)] = '\0'; - if (indentx - (lrpad / 2) - 1 < maxw) - drw_text( - drw, - x + indentx - (lrpad / 2) - 1, - y, - MIN(maxw - indentx, TEXTW(highlight) - lrpad), - bh, 0, highlight, 0 - #if PANGO_PATCH - , True - #endif // PANGO_PATCH - ); - highlight[strlen(token)] = restorechar; - - if (strlen(highlight) - strlen(token) < strlen(token)) - break; - highlight = fstrstr(highlight + strlen(token), token); - } - } -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/highpriority.c b/desktop/.dmenu/patch/highpriority.c deleted file mode 100644 index 2b3577a..0000000 --- a/desktop/.dmenu/patch/highpriority.c +++ /dev/null @@ -1,35 +0,0 @@ -static char **hpitems = NULL; -static int hplength = 0; - -static char ** -tokenize(char *source, const char *delim, int *llen) -{ - int listlength = 0, list_size = 0; - char **list = NULL, *token; - - token = strtok(source, delim); - while (token) { - if (listlength + 1 >= list_size) { - if (!(list = realloc(list, (list_size += 8) * sizeof(*list)))) - die("Unable to realloc %zu bytes\n", list_size * sizeof(*list)); - } - if (!(list[listlength] = strdup(token))) - die("Unable to strdup %zu bytes\n", strlen(token) + 1); - token = strtok(NULL, delim); - listlength++; - } - - *llen = listlength; - return list; -} - -static int -arrayhas(char **list, int length, char *item) { - for (int i = 0; i < length; i++) { - int len1 = strlen(list[i]); - int len2 = strlen(item); - if (fstrncmp(list[i], item, len1 > len2 ? len2 : len1) == 0) - return 1; - } - return 0; -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/highpriority.h b/desktop/.dmenu/patch/highpriority.h deleted file mode 100644 index 8fa65bf..0000000 --- a/desktop/.dmenu/patch/highpriority.h +++ /dev/null @@ -1,2 +0,0 @@ -static int arrayhas(char **list, int length, char *item); - diff --git a/desktop/.dmenu/patch/include.c b/desktop/.dmenu/patch/include.c deleted file mode 100644 index 4240212..0000000 --- a/desktop/.dmenu/patch/include.c +++ /dev/null @@ -1,38 +0,0 @@ -#if CENTER_PATCH -#include "center.c" -#endif -#if FUZZYHIGHLIGHT_PATCH -#include "fuzzyhighlight.c" -#elif HIGHLIGHT_PATCH -#include "highlight.c" -#endif -#if FUZZYMATCH_PATCH -#include "fuzzymatch.c" -#endif -#if FZFEXPECT_PATCH -#include "fzfexpect.c" -#endif -#if HIGHPRIORITY_PATCH -#include "highpriority.c" -#endif -#if DYNAMIC_OPTIONS_PATCH -#include "dynamicoptions.c" -#endif -#if MULTI_SELECTION_PATCH -#include "multiselect.c" -#endif -#if MOUSE_SUPPORT_PATCH -#include "mousesupport.c" -#endif -#if NAVHISTORY_PATCH -#include "navhistory.c" -#endif -#if NON_BLOCKING_STDIN_PATCH -#include "nonblockingstdin.c" -#endif -#if NUMBERS_PATCH -#include "numbers.c" -#endif -#if XRESOURCES_PATCH -#include "xresources.c" -#endif \ No newline at end of file diff --git a/desktop/.dmenu/patch/include.h b/desktop/.dmenu/patch/include.h deleted file mode 100644 index 1e7e0cc..0000000 --- a/desktop/.dmenu/patch/include.h +++ /dev/null @@ -1,15 +0,0 @@ -#if DYNAMIC_OPTIONS_PATCH -#include "dynamicoptions.h" -#endif -#if FZFEXPECT_PATCH -#include "fzfexpect.h" -#endif -#if HIGHPRIORITY_PATCH -#include "highpriority.h" -#endif -#if NON_BLOCKING_STDIN_PATCH -#include "nonblockingstdin.h" -#endif -#if NUMBERS_PATCH -#include "numbers.h" -#endif \ No newline at end of file diff --git a/desktop/.dmenu/patch/mousesupport.c b/desktop/.dmenu/patch/mousesupport.c deleted file mode 100644 index d040e86..0000000 --- a/desktop/.dmenu/patch/mousesupport.c +++ /dev/null @@ -1,159 +0,0 @@ -static void -buttonpress(XEvent *e) -{ - struct item *item; - XButtonPressedEvent *ev = &e->xbutton; - int x = 0, y = 0, h = bh, w; - - if (ev->window != win) - return; - - /* right-click: exit */ - if (ev->button == Button3) - exit(1); - - if (prompt && *prompt) - x += promptw; - - /* input field */ - w = (lines > 0 || !matches) ? mw - x : inputw; - - /* left-click on input: clear input, - * NOTE: if there is no left-arrow the space for < is reserved so - * add that to the input width */ - #if SYMBOLS_PATCH - if (ev->button == Button1 && - ((lines <= 0 && ev->x >= 0 && ev->x <= x + w + - ((!prev || !curr->left) ? TEXTW(symbol_1) : 0)) || - (lines > 0 && ev->y >= y && ev->y <= y + h))) { - insert(NULL, -cursor); - drawmenu(); - return; - } - #else - if (ev->button == Button1 && - ((lines <= 0 && ev->x >= 0 && ev->x <= x + w + - ((!prev || !curr->left) ? TEXTW("<") : 0)) || - (lines > 0 && ev->y >= y && ev->y <= y + h))) { - insert(NULL, -cursor); - drawmenu(); - return; - } - #endif // SYMBOLS_PATCH - /* middle-mouse click: paste selection */ - if (ev->button == Button2) { - XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, - utf8, utf8, win, CurrentTime); - drawmenu(); - return; - } - /* scroll up */ - if (ev->button == Button4 && prev) { - sel = curr = prev; - calcoffsets(); - drawmenu(); - return; - } - /* scroll down */ - if (ev->button == Button5 && next) { - sel = curr = next; - calcoffsets(); - drawmenu(); - return; - } - if (ev->button != Button1) - return; - if (ev->state & ~ControlMask) - return; - if (lines > 0) { - /* vertical list: (ctrl)left-click on item */ - w = mw - x; - for (item = curr; item != next; item = item->right) { - y += h; - if (ev->y >= y && ev->y <= (y + h)) { - #if !MULTI_SELECTION_PATCH - puts(item->text); - #endif // MULTI_SELECTION_PATCH - if (!(ev->state & ControlMask)) { - #if MULTI_SELECTION_PATCH - sel = item; - selsel(); - printsel(ev->state); - #endif // MULTI_SELECTION_PATCH - exit(0); - } - sel = item; - if (sel) { - #if MULTI_SELECTION_PATCH - selsel(); - #else - sel->out = 1; - #endif // MULTI_SELECTION_PATCH - drawmenu(); - } - return; - } - } - } else if (matches) { - /* left-click on left arrow */ - x += inputw; - #if SYMBOLS_PATCH - w = TEXTW(symbol_1); - #else - w = TEXTW("<"); - #endif // SYMBOLS_PATCH - if (prev && curr->left) { - if (ev->x >= x && ev->x <= x + w) { - sel = curr = prev; - calcoffsets(); - drawmenu(); - return; - } - } - /* horizontal list: (ctrl)left-click on item */ - for (item = curr; item != next; item = item->right) { - x += w; - #if SYMBOLS_PATCH - w = MIN(TEXTW(item->text), mw - x - TEXTW(symbol_2)); - #else - w = MIN(TEXTW(item->text), mw - x - TEXTW(">")); - #endif // SYMBOLS_PATCH - if (ev->x >= x && ev->x <= x + w) { - #if !MULTI_SELECTION_PATCH - puts(item->text); - #endif // MULTI_SELECTION_PATCH - if (!(ev->state & ControlMask)) { - #if MULTI_SELECTION_PATCH - sel = item; - selsel(); - printsel(ev->state); - #endif // MULTI_SELECTION_PATCH - exit(0); - } - sel = item; - if (sel) { - #if MULTI_SELECTION_PATCH - selsel(); - #else - sel->out = 1; - #endif // MULTI_SELECTION_PATCH - drawmenu(); - } - return; - } - } - /* left-click on right arrow */ - #if SYMBOLS_PATCH - w = TEXTW(symbol_2); - #else - w = TEXTW(">"); - #endif // SYMBOLS_PATCH - x = mw - w; - if (next && ev->x >= x && ev->x <= x + w) { - sel = curr = next; - calcoffsets(); - drawmenu(); - return; - } - } -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/multiselect.c b/desktop/.dmenu/patch/multiselect.c deleted file mode 100644 index ad78db3..0000000 --- a/desktop/.dmenu/patch/multiselect.c +++ /dev/null @@ -1,53 +0,0 @@ -static int -issel(size_t id) -{ - for (int i = 0;i < selidsize;i++) - if (selid[i] == id) - return 1; - return 0; -} - -static void -printsel(unsigned int state) -{ - for (int i = 0;i < selidsize;i++) - if (selid[i] != -1 && (!sel || sel->id != selid[i])) { - #if PRINTINDEX_PATCH - if (print_index) - printf("%d\n", selid[i]); - else - #endif // PRINTINDEX_PATCH - puts(items[selid[i]].text); - } - if (sel && !(state & ShiftMask)) { - #if PRINTINDEX_PATCH - if (print_index) - printf("%d\n", sel->index); - else - #endif // PRINTINDEX_PATCH - puts(sel->text); - } else - puts(text); - -} - -static void -selsel() -{ - if (!sel) - return; - if (issel(sel->id)) { - for (int i = 0; i < selidsize; i++) - if (selid[i] == sel->id) - selid[i] = -1; - } else { - for (int i = 0; i < selidsize; i++) - if (selid[i] == -1) { - selid[i] = sel->id; - return; - } - selidsize++; - selid = realloc(selid, (selidsize + 1) * sizeof(int)); - selid[selidsize - 1] = sel->id; - } -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/navhistory.c b/desktop/.dmenu/patch/navhistory.c deleted file mode 100644 index 7d10ee4..0000000 --- a/desktop/.dmenu/patch/navhistory.c +++ /dev/null @@ -1,126 +0,0 @@ -static char *histfile; -static char **history; -static size_t histsz, histpos; - -static void -loadhistory(void) -{ - FILE *fp = NULL; - static size_t cap = 0; - size_t llen; - char *line; - - if (!histfile) { - return; - } - - fp = fopen(histfile, "r"); - if (!fp) { - return; - } - - for (;;) { - line = NULL; - llen = 0; - if (-1 == getline(&line, &llen, fp)) { - if (ferror(fp)) { - die("failed to read history"); - } - free(line); - break; - } - - if (cap == histsz) { - cap += 64 * sizeof(char*); - history = realloc(history, cap); - if (!history) { - die("failed to realloc memory"); - } - } - strtok(line, "\n"); - history[histsz] = line; - histsz++; - } - histpos = histsz; - - if (fclose(fp)) { - die("failed to close file %s", histfile); - } -} - -static void -navhistory(int dir) -{ - static char def[BUFSIZ]; - char *p = NULL; - size_t len = 0; - - if (!history || histpos + 1 == 0) - return; - - if (histsz == histpos) { - strncpy(def, text, sizeof(def)); - } - - switch(dir) { - case 1: - if (histpos < histsz - 1) { - p = history[++histpos]; - } else if (histpos == histsz - 1) { - p = def; - histpos++; - } - break; - case -1: - if (histpos > 0) { - p = history[--histpos]; - } - break; - } - if (p == NULL) { - return; - } - - len = MIN(strlen(p), BUFSIZ - 1); - strncpy(text, p, len); - text[len] = '\0'; - cursor = len; - match(); -} - -static void -savehistory(char *input) -{ - unsigned int i; - FILE *fp; - - if (!histfile || - 0 == maxhist || - 0 == strlen(input)) { - goto out; - } - - fp = fopen(histfile, "w"); - if (!fp) { - die("failed to open %s", histfile); - } - for (i = histsz < maxhist ? 0 : histsz - maxhist; i < histsz; i++) { - if (0 >= fprintf(fp, "%s\n", history[i])) { - die("failed to write to %s", histfile); - } - } - if (histsz == 0 || !histnodup || (histsz > 0 && strcmp(input, history[histsz-1]) != 0)) { /* TODO */ - if (0 >= fputs(input, fp)) { - die("failed to write to %s", histfile); - } - } - if (fclose(fp)) { - die("failed to close file %s", histfile); - } - -out: - for (i = 0; i < histsz; i++) { - free(history[i]); - } - free(history); -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/nonblockingstdin.c b/desktop/.dmenu/patch/nonblockingstdin.c deleted file mode 100644 index eb7013f..0000000 --- a/desktop/.dmenu/patch/nonblockingstdin.c +++ /dev/null @@ -1,68 +0,0 @@ -#include -#include -#include - -static void -readstdin(void) -{ - static size_t max = 0; - static struct item **end = &items; - - char buf[sizeof text], *p, *maxstr; - struct item *item; - - #if PASSWORD_PATCH - if (passwd) { - inputw = lines = 0; - return; - } - #endif // PASSWORD_PATCH - - /* read each line from stdin and add it to the item list */ - while (fgets(buf, sizeof buf, stdin)) { - if (!(item = malloc(sizeof *item))) - die("cannot malloc %u bytes:", sizeof *item); - if ((p = strchr(buf, '\n'))) - *p = '\0'; - if (!(item->text = strdup(buf))) - die("cannot strdup %u bytes:", strlen(buf)+1); - if (strlen(item->text) > max) { - max = strlen(maxstr = item->text); - #if PANGO_PATCH - inputw = maxstr ? TEXTWM(maxstr) : 0; - #else - inputw = maxstr ? TEXTW(maxstr) : 0; - #endif // PANGO_PATCH - } - *end = item; - end = &item->next; - item->next = NULL; - item->out = 0; - } - match(); - drawmenu(); -} - -static void -run(void) -{ - fd_set fds; - int flags, xfd = XConnectionNumber(dpy); - - if ((flags = fcntl(0, F_GETFL)) == -1) - die("cannot get stdin control flags:"); - if (fcntl(0, F_SETFL, flags | O_NONBLOCK) == -1) - die("cannot set stdin control flags:"); - for (;;) { - FD_ZERO(&fds); - FD_SET(xfd, &fds); - if (!feof(stdin)) - FD_SET(0, &fds); - if (select(xfd + 1, &fds, NULL, NULL, NULL) == -1) - die("cannot multiplex input:"); - if (FD_ISSET(xfd, &fds)) - readevent(); - if (FD_ISSET(0, &fds)) - readstdin(); - } -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/nonblockingstdin.h b/desktop/.dmenu/patch/nonblockingstdin.h deleted file mode 100644 index a0c4dfe..0000000 --- a/desktop/.dmenu/patch/nonblockingstdin.h +++ /dev/null @@ -1 +0,0 @@ -static void readevent(); \ No newline at end of file diff --git a/desktop/.dmenu/patch/numbers.c b/desktop/.dmenu/patch/numbers.c deleted file mode 100644 index 9f9557a..0000000 --- a/desktop/.dmenu/patch/numbers.c +++ /dev/null @@ -1,16 +0,0 @@ -static char numbers[NUMBERSBUFSIZE] = ""; - -static void -recalculatenumbers() -{ - unsigned int numer = 0, denom = 0; - struct item *item; - if (matchend) { - numer++; - for (item = matchend; item && item->left; item = item->left) - numer++; - } - for (item = items; item && item->text; item++) - denom++; - snprintf(numbers, NUMBERSBUFSIZE, "%d/%d", numer, denom); -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/numbers.h b/desktop/.dmenu/patch/numbers.h deleted file mode 100644 index 34d3dbc..0000000 --- a/desktop/.dmenu/patch/numbers.h +++ /dev/null @@ -1,4 +0,0 @@ -#define NUMBERSMAXDIGITS 100 -#define NUMBERSBUFSIZE (NUMBERSMAXDIGITS * 2) + 1 - -static void recalculatenumbers(); \ No newline at end of file diff --git a/desktop/.dmenu/patch/scroll.c b/desktop/.dmenu/patch/scroll.c deleted file mode 100644 index 9021edf..0000000 --- a/desktop/.dmenu/patch/scroll.c +++ /dev/null @@ -1,168 +0,0 @@ -int -utf8nextchar(const char *str, int len, int i, int inc) -{ - int n; - - for (n = i + inc; n + inc >= 0 && n + inc <= len - && (str[n] & 0xc0) == 0x80; n += inc) - ; - return n; -} - -int -drw_text_align(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int textlen, int align) -{ - int ty; - unsigned int ew; - XftDraw *d = NULL; - Fnt *usedfont, *curfont, *nextfont; - size_t len; - int utf8strlen, utf8charlen, render = x || y || w || h; - long utf8codepoint = 0; - const char *utf8str; - FcCharSet *fccharset; - FcPattern *fcpattern; - FcPattern *match; - XftResult result; - int charexists = 0; - int i, n; - - if (!drw || (render && !drw->scheme) || !text || !drw->fonts || textlen <= 0 - || (align != AlignL && align != AlignR)) - return 0; - - if (!render) { - w = ~w; - } else { - XSetForeground(drw->dpy, drw->gc, drw->scheme[ColBg].pixel); - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - d = XftDrawCreate(drw->dpy, drw->drawable, - DefaultVisual(drw->dpy, drw->screen), - DefaultColormap(drw->dpy, drw->screen)); - } - - usedfont = drw->fonts; - i = align == AlignL ? 0 : textlen; - x = align == AlignL ? x : x + w; - while (1) { - utf8strlen = 0; - nextfont = NULL; - /* if (align == AlignL) */ - utf8str = text + i; - - while ((align == AlignL && i < textlen) || (align == AlignR && i > 0)) { - if (align == AlignL) { - utf8charlen = utf8decode(text + i, &utf8codepoint, MIN(textlen - i, UTF_SIZ)); - if (!utf8charlen) { - textlen = i; - break; - } - } else { - n = utf8nextchar(text, textlen, i, -1); - utf8charlen = utf8decode(text + n, &utf8codepoint, MIN(textlen - n, UTF_SIZ)); - if (!utf8charlen) { - textlen -= i; - text += i; - i = 0; - break; - } - } - for (curfont = drw->fonts; curfont; curfont = curfont->next) { - charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); - if (charexists) { - if (curfont == usedfont) { - utf8strlen += utf8charlen; - i += align == AlignL ? utf8charlen : -utf8charlen; - } else { - nextfont = curfont; - } - break; - } - } - - if (!charexists || nextfont) - break; - else - charexists = 0; - } - - if (align == AlignR) - utf8str = text + i; - - if (utf8strlen) { - drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL); - /* shorten text if necessary */ - if (align == AlignL) { - for (len = utf8strlen; len && ew > w; ) { - len = utf8nextchar(utf8str, len, len, -1); - drw_font_getexts(usedfont, utf8str, len, &ew, NULL); - } - } else { - for (len = utf8strlen; len && ew > w; ) { - n = utf8nextchar(utf8str, len, 0, +1); - utf8str += n; - len -= n; - drw_font_getexts(usedfont, utf8str, len, &ew, NULL); - } - } - - if (len) { - if (render) { - ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; - XftDrawStringUtf8(d, &drw->scheme[ColFg], - usedfont->xfont, align == AlignL ? x : x - ew, ty, (XftChar8 *)utf8str, len); - } - x += align == AlignL ? ew : -ew; - w -= ew; - } - if (len < utf8strlen) - break; - } - - if ((align == AlignR && i <= 0) || (align == AlignL && i >= textlen)) { - break; - } else if (nextfont) { - charexists = 0; - usedfont = nextfont; - } else { - /* Regardless of whether or not a fallback font is found, the - * character must be drawn. */ - charexists = 1; - - fccharset = FcCharSetCreate(); - FcCharSetAddChar(fccharset, utf8codepoint); - - if (!drw->fonts->pattern) { - /* Refer to the comment in xfont_create for more information. */ - die("the first font in the cache must be loaded from a font string."); - } - - fcpattern = FcPatternDuplicate(drw->fonts->pattern); - FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); - - FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); - FcDefaultSubstitute(fcpattern); - match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); - - FcCharSetDestroy(fccharset); - FcPatternDestroy(fcpattern); - - if (match) { - usedfont = xfont_create(drw, NULL, match); - if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { - for (curfont = drw->fonts; curfont->next; curfont = curfont->next) - ; /* NOP */ - curfont->next = usedfont; - } else { - xfont_free(usedfont); - usedfont = drw->fonts; - } - } - } - } - if (d) - XftDrawDestroy(d); - - return x; -} \ No newline at end of file diff --git a/desktop/.dmenu/patch/scroll.h b/desktop/.dmenu/patch/scroll.h deleted file mode 100644 index 927df9a..0000000 --- a/desktop/.dmenu/patch/scroll.h +++ /dev/null @@ -1,3 +0,0 @@ -enum { AlignL, AlignR }; - -int drw_text_align(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int textlen, int align); \ No newline at end of file diff --git a/desktop/.dmenu/patch/xresources.c b/desktop/.dmenu/patch/xresources.c deleted file mode 100644 index cdb1631..0000000 --- a/desktop/.dmenu/patch/xresources.c +++ /dev/null @@ -1,90 +0,0 @@ -#include - -void -readxresources(void) -{ - XrmInitialize(); - - char* xrm; - if ((xrm = XResourceManagerString(drw->dpy))) { - char *type; - XrmDatabase xdb = XrmGetStringDatabase(xrm); - XrmValue xval; - - if (XrmGetResource(xdb, "dmenu.font", "*", &type, &xval)) - #if PANGO_PATCH - strcpy(font, xval.addr); - #else - fonts[0] = strdup(xval.addr); - #endif // PANGO_PATCH - #if !PANGO_PATCH - else - fonts[0] = strdup(fonts[0]); - #endif // PANGO_PATCH - if (XrmGetResource(xdb, "dmenu.background", "*", &type, &xval)) - colors[SchemeNorm][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.foreground", "*", &type, &xval)) - colors[SchemeNorm][ColFg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.selbackground", "*", &type, &xval)) - colors[SchemeSel][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.selforeground", "*", &type, &xval)) - colors[SchemeSel][ColFg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.outbackground", "*", &type, &xval)) - colors[SchemeOut][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.outforeground", "*", &type, &xval)) - colors[SchemeOut][ColFg] = strdup(xval.addr); - #if MORECOLOR_PATCH - if (XrmGetResource(xdb, "dmenu.midbackground", "*", &type, &xval)) - colors[SchemeMid][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.midforeground", "*", &type, &xval)) - colors[SchemeMid][ColFg] = strdup(xval.addr); - #endif // MORECOLOR_PATCH - #if BORDER_PATCH - if (XrmGetResource(xdb, "dmenu.bordercolor", "*", &type, &xval)) - colors[SchemeBorder][ColBg] = strdup(xval.addr); - #endif // BORDER_PATCH - #if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH - if (XrmGetResource(xdb, "dmenu.selhlbackground", "*", &type, &xval)) - colors[SchemeSelHighlight][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.selhlforeground", "*", &type, &xval)) - colors[SchemeSelHighlight][ColFg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.hlbackground", "*", &type, &xval)) - colors[SchemeNormHighlight][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.hlforeground", "*", &type, &xval)) - colors[SchemeNormHighlight][ColFg] = strdup(xval.addr); - #endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH - #if HIGHPRIORITY_PATCH - if (XrmGetResource(xdb, "dmenu.hpbackground", "*", &type, &xval)) - colors[SchemeHp][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.hpforeground", "*", &type, &xval)) - colors[SchemeHp][ColFg] = strdup(xval.addr); - #endif // HIGHPRIORITY_PATCH - #if EMOJI_HIGHLIGHT_PATCH - if (XrmGetResource(xdb, "dmenu.hoverbackground", "*", &type, &xval)) - colors[SchemeHover][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.hoverforeground", "*", &type, &xval)) - colors[SchemeHover][ColFg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.greenbackground", "*", &type, &xval)) - colors[SchemeGreen][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.greenforeground", "*", &type, &xval)) - colors[SchemeGreen][ColFg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.yellowbackground", "*", &type, &xval)) - colors[SchemeYellow][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.yellowforeground", "*", &type, &xval)) - colors[SchemeYellow][ColFg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.bluebackground", "*", &type, &xval)) - colors[SchemeBlue][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.blueforeground", "*", &type, &xval)) - colors[SchemeBlue][ColFg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.purplebackground", "*", &type, &xval)) - colors[SchemePurple][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.purpleforeground", "*", &type, &xval)) - colors[SchemePurple][ColFg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.redbackground", "*", &type, &xval)) - colors[SchemeRed][ColBg] = strdup(xval.addr); - if (XrmGetResource(xdb, "dmenu.redforeground", "*", &type, &xval)) - colors[SchemeRed][ColFg] = strdup(xval.addr); - #endif // EMOJI_HIGHLIGHT_PATCH - XrmDestroyDatabase(xdb); - } -} \ No newline at end of file diff --git a/desktop/.dmenu/patches.def.h b/desktop/.dmenu/patches.def.h deleted file mode 100644 index 42c47a6..0000000 --- a/desktop/.dmenu/patches.def.h +++ /dev/null @@ -1,349 +0,0 @@ -/* Patches */ - -/* The alpha patch adds transparency for the dmenu window. - * You need to uncomment the corresponding line in config.mk to use the -lXrender library - * when including this patch. - * https://github.com/bakkeby/patches/blob/master/dmenu/dmenu-alpha-5.0_20210725_523aa08.diff - */ -#define ALPHA_PATCH 0 - -/* This adds padding for dmenu in similar fashion to the similarly named patch for dwm. The idea - * is to have dmenu appear on top of the bar when using said patch in dwm. - * https://github.com/bakkeby/patches/wiki/barpadding - */ -#define BARPADDING_PATCH 1 - -/* This patch adds a border around the dmenu window. It is intended to be used with the center - * or xyw patches, to make the menu stand out from similarly coloured windows. - * http://tools.suckless.org/dmenu/patches/border/ - */ -#define BORDER_PATCH 0 - -/* This patch makes dmenu case-insensitive by default, replacing the - * case-insensitive -i option with a case sensitive -s option. - * http://tools.suckless.org/dmenu/patches/case-insensitive/ - */ -#define CASEINSENSITIVE_PATCH 1 - -/* This patch centers dmenu in the middle of the screen. - * https://tools.suckless.org/dmenu/patches/center/ - */ -#define CENTER_PATCH 0 - -/* Minor patch to enable the use of Ctrl+v (XA_PRIMARY) and Ctrl+Shift+v (CLIPBOARD) to paste. - * By default dmenu only supports Ctrl+y and Ctrl+Shift+y to paste. - */ -#define CTRL_V_TO_PASTE_PATCH 1 - -/* This patch adds a flag (-dy) which makes dmenu run the command given to it whenever input - * is changed with the current input as the last argument and update the option list according - * to the output of that command. - * https://tools.suckless.org/dmenu/patches/dynamicoptions/ - */ -#define DYNAMIC_OPTIONS_PATCH 0 - -/* This patch will allow for emojis on the left side with a colored background when selected. - * To test this try running: - * $ echo -e ":b here\n:p there\n:r and here" | ./dmenu -p "Search..." -W 400 -l 20 -i -h -1 - * NB: the original patch came embedded with the the xyw patch, the morecolors patch and the - * line height patch and as such is intended to be combined with these. - * https://tools.suckless.org/dmenu/patches/emoji-highlight/ - */ -#define EMOJI_HIGHLIGHT_PATCH 0 - -/* This patch make it so that fuzzy matches gets highlighted and is therefore meant - * to be used together with the fuzzymatch patch. - * https://tools.suckless.org/dmenu/patches/fuzzyhighlight/ - */ -#define FUZZYHIGHLIGHT_PATCH 1 - -/* This patch adds support for fuzzy-matching to dmenu, allowing users to type non-consecutive - * portions of the string to be matched. - * https://tools.suckless.org/dmenu/patches/fuzzymatch/ - */ -#define FUZZYMATCH_PATCH 1 - -/* Adds fzf-like functionality for dmenu. - * Refer to https://github.com/DAFF0D11/dafmenu/ for documentation and example use cases. - * https://github.com/DAFF0D11/dafmenu/blob/master/patches/dmenu-fzfexpect-5.1.diff - */ -#define FZFEXPECT_PATCH 0 - -/* Allows dmenu's entries to be rendered in a grid by adding a new -g flag to specify - * the number of grid columns. The -g and -l options can be used together to create a - * G columns * L lines grid. - * https://tools.suckless.org/dmenu/patches/grid/ - */ -#define GRID_PATCH 0 - -/* This patch adds the ability to move left and right through a grid. - * This patch depends on the grid patch. - * https://tools.suckless.org/dmenu/patches/gridnav/ - */ -#define GRIDNAV_PATCH 0 - -/* This patch highlights the individual characters of matched text for each dmenu list entry. - * The fuzzy highlight patch takes precedence over this patch. - * https://tools.suckless.org/dmenu/patches/highlight/ - */ -#define HIGHLIGHT_PATCH 0 - -/* This will automatically sort the search result so that high priority items are shown first. - * https://tools.suckless.org/dmenu/patches/highpriority/ - */ -#define HIGHPRIORITY_PATCH 0 - -/* This patch causes dmenu to print out the current text each time a key is pressed. - * https://tools.suckless.org/dmenu/patches/incremental/ - */ -#define INCREMENTAL_PATCH 0 - -/* This patch adds an option to provide preselected text. - * https://tools.suckless.org/dmenu/patches/initialtext/ - */ -#define INITIALTEXT_PATCH 0 - -/* This patch adds a flag which will cause dmenu to select an item immediately if there - * is only one matching option left. - * https://tools.suckless.org/dmenu/patches/instant/ - */ -#define INSTANT_PATCH 0 - -/* This patch adds a '-h' option which sets the minimum height of a dmenu line. This helps - * integrate dmenu with other UI elements that require a particular vertical size. - * http://tools.suckless.org/dmenu/patches/line-height/ - */ -#define LINE_HEIGHT_PATCH 1 - -/* This patch adds a -wm flag which sets override_redirect to false; thus letting your window - * manager manage the dmenu window. - * - * This may be helpful in contexts where you don't want to exclusively bind dmenu or want to - * treat dmenu more as a "window" rather than as an overlay. - * https://tools.suckless.org/dmenu/patches/managed/ - */ -#define MANAGED_PATCH 0 - -/* This patch adds an additional color scheme for highlighting entries adjacent to the current - * selection. - * https://tools.suckless.org/dmenu/patches/morecolor/ - */ -#define MORECOLOR_PATCH 0 - -/* This patch adds basic mouse support for dmenu. - * https://tools.suckless.org/dmenu/patches/mouse-support/ - */ -#define MOUSE_SUPPORT_PATCH 1 - -/* Without this patch when you press Ctrl+Enter dmenu just outputs current item and it is not - * possible to undo that. - * With this patch dmenu will output all selected items only on exit. It is also possible to - * deselect any selected item. - * Also refer to the dmenu_run replacement on the below URL that supports multiple selections. - * - * This patch is not compatible with, and takes precedence over, the json, printinputtext, - * pipeout and non-blocking stdin patches. - * - * https://tools.suckless.org/dmenu/patches/multi-selection/ - */ -#define MULTI_SELECTION_PATCH 0 - -/* This patch provides dmenu the ability for history navigation similar to that of bash. - * - * If you take this patch then it is recommended that you also uncomment the line in the - * dmenu_run script which replaces the exec command. - * - * https://tools.suckless.org/dmenu/patches/navhistory/ - */ -#define NAVHISTORY_PATCH 0 - -/* This patch adds back in the workaround for a BadLength error in the Xft library when color - * glyphs are used. This is for systems that do not have an updated version of the Xft library - * (or generally prefer monochrome fonts). - */ -#define NO_COLOR_EMOJI_PATCH 0 - -/* Adds the -S option to disable sorting menu items after matching. Useful, for example, when menu - * items are sorted by their frequency of use (using an external cache) and the most frequently - * selected items should always appear first regardless of how they were exact, prefix, or - * substring matches. - * https://tools.suckless.org/dmenu/patches/no-sort/ - */ -#define NO_SORT_PATCH 0 - -/* This is a patch to have dmenu read stdin in a non blocking way, making it wait for input both - * from stdin and from X. This means that you can continue feeding dmenu while you type. - * This patch is meant to be used along with the incremental patch, so that you can use stdout - * to feed stdin. - * - * This patch is not compatible with the json and multi-selection patches, both of which takes - * precedence over this patch. - * - * https://tools.suckless.org/dmenu/patches/non_blocking_stdin/ - */ -#define NON_BLOCKING_STDIN_PATCH 0 - -/* Adds text which displays the number of matched and total items in the top right corner of dmenu. - * https://tools.suckless.org/dmenu/patches/numbers/ - */ -#define NUMBERS_PATCH 0 - -/* This patch adds simple markup for dmenu using pango markup. - * This depends on the pango library v1.44 or greater. - * You need to uncomment the corresponding lines in config.mk to use the pango libraries - * when including this patch. - * - * Note that the pango patch is incompatible with the scroll patch and will result in - * compilation errors if both are enabled. - * - * Note that the pango patch does not protect against the BadLength error from Xft - * when color glyphs are used, which means that dmenu will crash if color emoji is used. - * - * If you need color emoji then you may want to install this patched library from the AUR: - * https://aur.archlinux.org/packages/libxft-bgra/ - * - * A long term fix for the libXft library is pending approval of this pull request: - * https://gitlab.freedesktop.org/xorg/lib/libxft/-/merge_requests/1 - * - * Also see: - * https://developer.gnome.org/pygtk/stable/pango-markup-language.html - * https://github.com/StillANixRookie/dmenu-pango - */ -#define PANGO_PATCH 0 - -/* With this patch dmenu will not directly display the keyboard input, but instead replace - * it with dots. All data from stdin will be ignored. - * https://tools.suckless.org/dmenu/patches/password/ - */ -#define PASSWORD_PATCH 0 - -/* This patch allows the selected text to be piped back out with dmenu. This can be useful if you - * want to display the output of a command on the screen. - * Only text starting with the character '#' is piped out by default. - * - * This patch is not compatible with the json and multi-select patches, both of which takes - * precedence over this one. - * - * https://tools.suckless.org/dmenu/patches/pipeout/ - */ -#define PIPEOUT_PATCH 0 - -/* Lifted from the listfullwidth patch this simple change just avoids colors for the prompt (with - * the -p option or in config.h) by making it use the same style as the rest of the input field. - * The rest of the listfullwidth patch is covered by the vertfull patch. - * https://tools.suckless.org/dmenu/patches/listfullwidth/ - */ -#define PLAIN_PROMPT_PATCH 0 - -/* This patch changes the behaviour of matched items and the Tab key to allow tab completion. - * https://tools.suckless.org/dmenu/patches/prefix-completion/ - */ -#define PREFIXCOMPLETION_PATCH 0 - -/* This patch adds an option -ps to specify an item by providing the index that should be - * pre-selected. - * https://tools.suckless.org/dmenu/patches/preselect/ - */ -#define PRESELECT_PATCH 0 - -/* This patch allows dmenu to print out the 0-based index of matched text instead of the matched - * text itself. This can be useful in cases where you would like to select entries from one array - * of text but index into another, or when you are selecting from an ordered list of non-unique - * items. - * https://tools.suckless.org/dmenu/patches/printindex/ - */ -#define PRINTINDEX_PATCH 0 - -/* This patch adds a flag (-t) which makes Return key to ignore selection and print the input - * text to stdout. The flag basically swaps the functions of Return and Shift+Return hotkeys. - * - * This patch is not compatible with the multi-select and json patches, both of which takes - * precedence over this one. - * - * https://tools.suckless.org/dmenu/patches/printinputtext/ - */ -#define PRINTINPUTTEXT_PATCH 0 - -/* This patch adds a new flag to dmenu with which text input will be rejected if it would - * result in no matching item. - * https://tools.suckless.org/dmenu/patches/reject-no-match/ - */ -#define REJECTNOMATCH_PATCH 0 - -/* The input width used to be relative to the input options prior to commit e1e1de7: - * https://git.suckless.org/dmenu/commit/e1e1de7b3b8399cba90ddca9613f837b2dbef7b9.html - * - * This had a performance hit when using large data sets and was removed in favour of having the - * input width take up 1/3rd of the available space. - * - * This option adds that feature back in with some performance optimisations at the cost of - * accuracy and correctness. - */ -#define RELATIVE_INPUT_WIDTH_PATCH 0 - -/* This patch adds a '-1' option which disables Shift-Return and Ctrl-Return. - * This guarantees that dmenu will only output one item, and that item was read from stdin. - * The original patch used '-r'. This was changed to '-1' to avoid conflict with the incremental - * patch. - * https://tools.suckless.org/dmenu/patches/restrict-return/ - */ -#define RESTRICT_RETURN_PATCH 0 - -/* This patch adds support for text scrolling and no longer appends '...' for long input as - * it can handle long text. - * https://tools.suckless.org/dmenu/patches/scroll/ - */ -#define SCROLL_PATCH 0 - -/* This patch adds -d and -D flags which separates the input into two halves; one half to be - * displayed in dmenu and the other to be printed to stdout. This patch takes precedence over - * the TSV patch. - * https://tools.suckless.org/dmenu/patches/separator/ - */ -#define SEPARATOR_PATCH 0 - -/* This patch allows the symbols, which are printed in dmenu to indicate that either the input - * is too long or there are too many options to be shown in dmenu in one line, to be defined. - * https://tools.suckless.org/dmenu/patches/symbols/ - */ -#define SYMBOLS_PATCH 0 - -/* With this patch dmenu will split input lines at first tab character and only display first - * part, but it will perform matching on and output full lines as usual. - * - * This can be useful if you want to separate data and representation, for example, a music - * player wrapper can display only a track title to user, but still supply full filename to - * the underlying script. - * https://tools.suckless.org/dmenu/patches/tsv/ - */ -#define TSV_PATCH 0 - -/* This patch prevents dmenu from indenting items at the same level as the prompt length. - * https://tools.suckless.org/dmenu/patches/vertfull/ - */ -#define VERTFULL_PATCH 0 - -/* Adds extended window manager hints such as _NET_WM_WINDOW_TYPE and _NET_WM_WINDOW_TYPE_DOCK. - * https://github.com/Baitinq/dmenu/blob/master/patches/dmenu-wm_type.diff - */ -#define WMTYPE_PATCH 0 - -/* This patch adds the ability to configure dmenu via Xresources. At startup, dmenu will read and - * apply the resources named below: - * dmenu.font : font or font set - * dmenu.background : normal background color - * dmenu.foreground : normal foreground color - * dmenu.selbackground : selected background color - * dmenu.selforeground : selected foreground color - * - * See patch/xresources.c for more color settings. - * - * https://tools.suckless.org/dmenu/patches/xresources/ - */ -#define XRESOURCES_PATCH 0 - -/* This patch adds options for specifying dmenu window position and width. - * The center patch takes precedence over the XYW patch if enabled. - * https://tools.suckless.org/dmenu/patches/xyw/ - */ -#define XYW_PATCH 0 diff --git a/desktop/.dmenu/recompile b/desktop/.dmenu/recompile deleted file mode 100755 index 102ea03..0000000 --- a/desktop/.dmenu/recompile +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -rm -f ./config.h -sudo make clean install diff --git a/desktop/.dmenu/stest.1 b/desktop/.dmenu/stest.1 deleted file mode 100644 index 2667d8a..0000000 --- a/desktop/.dmenu/stest.1 +++ /dev/null @@ -1,90 +0,0 @@ -.TH STEST 1 dmenu\-VERSION -.SH NAME -stest \- filter a list of files by properties -.SH SYNOPSIS -.B stest -.RB [ -abcdefghlpqrsuwx ] -.RB [ -n -.IR file ] -.RB [ -o -.IR file ] -.RI [ file ...] -.SH DESCRIPTION -.B stest -takes a list of files and filters by the files' properties, analogous to -.IR test (1). -Files which pass all tests are printed to stdout. If no files are given, stest -reads files from stdin. -.SH OPTIONS -.TP -.B \-a -Test hidden files. -.TP -.B \-b -Test that files are block specials. -.TP -.B \-c -Test that files are character specials. -.TP -.B \-d -Test that files are directories. -.TP -.B \-e -Test that files exist. -.TP -.B \-f -Test that files are regular files. -.TP -.B \-g -Test that files have their set-group-ID flag set. -.TP -.B \-h -Test that files are symbolic links. -.TP -.B \-l -Test the contents of a directory given as an argument. -.TP -.BI \-n " file" -Test that files are newer than -.IR file . -.TP -.BI \-o " file" -Test that files are older than -.IR file . -.TP -.B \-p -Test that files are named pipes. -.TP -.B \-q -No files are printed, only the exit status is returned. -.TP -.B \-r -Test that files are readable. -.TP -.B \-s -Test that files are not empty. -.TP -.B \-u -Test that files have their set-user-ID flag set. -.TP -.B \-v -Invert the sense of tests, only failing files pass. -.TP -.B \-w -Test that files are writable. -.TP -.B \-x -Test that files are executable. -.SH EXIT STATUS -.TP -.B 0 -At least one file passed all tests. -.TP -.B 1 -No files passed all tests. -.TP -.B 2 -An error occurred. -.SH SEE ALSO -.IR dmenu (1), -.IR test (1) diff --git a/desktop/.dmenu/stest.c b/desktop/.dmenu/stest.c deleted file mode 100644 index e27d3a5..0000000 --- a/desktop/.dmenu/stest.c +++ /dev/null @@ -1,109 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include - -#include -#include -#include -#include -#include -#include - -#include "arg.h" -char *argv0; - -#define FLAG(x) (flag[(x)-'a']) - -static void test(const char *, const char *); -static void usage(void); - -static int match = 0; -static int flag[26]; -static struct stat old, new; - -static void -test(const char *path, const char *name) -{ - struct stat st, ln; - - if ((!stat(path, &st) && (FLAG('a') || name[0] != '.') /* hidden files */ - && (!FLAG('b') || S_ISBLK(st.st_mode)) /* block special */ - && (!FLAG('c') || S_ISCHR(st.st_mode)) /* character special */ - && (!FLAG('d') || S_ISDIR(st.st_mode)) /* directory */ - && (!FLAG('e') || access(path, F_OK) == 0) /* exists */ - && (!FLAG('f') || S_ISREG(st.st_mode)) /* regular file */ - && (!FLAG('g') || st.st_mode & S_ISGID) /* set-group-id flag */ - && (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link */ - && (!FLAG('n') || st.st_mtime > new.st_mtime) /* newer than file */ - && (!FLAG('o') || st.st_mtime < old.st_mtime) /* older than file */ - && (!FLAG('p') || S_ISFIFO(st.st_mode)) /* named pipe */ - && (!FLAG('r') || access(path, R_OK) == 0) /* readable */ - && (!FLAG('s') || st.st_size > 0) /* not empty */ - && (!FLAG('u') || st.st_mode & S_ISUID) /* set-user-id flag */ - && (!FLAG('w') || access(path, W_OK) == 0) /* writable */ - && (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) { /* executable */ - if (FLAG('q')) - exit(0); - match = 1; - puts(name); - } -} - -static void -usage(void) -{ - fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] " - "[-n file] [-o file] [file...]\n", argv0); - exit(2); /* like test(1) return > 1 on error */ -} - -int -main(int argc, char *argv[]) -{ - struct dirent *d; - char path[PATH_MAX], *line = NULL, *file; - size_t linesiz = 0; - ssize_t n; - DIR *dir; - int r; - - ARGBEGIN { - case 'n': /* newer than file */ - case 'o': /* older than file */ - file = EARGF(usage()); - if (!(FLAG(ARGC()) = !stat(file, (ARGC() == 'n' ? &new : &old)))) - perror(file); - break; - default: - /* miscellaneous operators */ - if (strchr("abcdefghlpqrsuvwx", ARGC())) - FLAG(ARGC()) = 1; - else - usage(); /* unknown flag */ - } ARGEND; - - if (!argc) { - /* read list from stdin */ - while ((n = getline(&line, &linesiz, stdin)) > 0) { - if (line[n - 1] == '\n') - line[n - 1] = '\0'; - test(line, line); - } - free(line); - } else { - for (; argc; argc--, argv++) { - if (FLAG('l') && (dir = opendir(*argv))) { - /* test directory contents */ - while ((d = readdir(dir))) { - r = snprintf(path, sizeof path, "%s/%s", - *argv, d->d_name); - if (r >= 0 && (size_t)r < sizeof path) - test(path, d->d_name); - } - closedir(dir); - } else { - test(*argv, *argv); - } - } - } - return match ? 0 : 1; -} diff --git a/desktop/.dmenu/util.c b/desktop/.dmenu/util.c deleted file mode 100644 index 96b82c9..0000000 --- a/desktop/.dmenu/util.c +++ /dev/null @@ -1,36 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include - -#include "util.h" - -void -die(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - - if (fmt[0] && fmt[strlen(fmt)-1] == ':') { - fputc(' ', stderr); - perror(NULL); - } else { - fputc('\n', stderr); - } - - exit(1); -} - -void * -ecalloc(size_t nmemb, size_t size) -{ - void *p; - - if (!(p = calloc(nmemb, size))) - die("calloc:"); - return p; -} diff --git a/desktop/.dmenu/util.h b/desktop/.dmenu/util.h deleted file mode 100644 index 531ab25..0000000 --- a/desktop/.dmenu/util.h +++ /dev/null @@ -1,12 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -#ifndef MAX -#define MAX(A, B) ((A) > (B) ? (A) : (B)) -#endif -#ifndef MIN -#define MIN(A, B) ((A) < (B) ? (A) : (B)) -#endif -#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) - -void die(const char *fmt, ...); -void *ecalloc(size_t nmemb, size_t size); diff --git a/desktop/.st/.gitignore b/desktop/.st/.gitignore deleted file mode 100644 index 2bfe577..0000000 --- a/desktop/.st/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.o -config.h -patches.h -st diff --git a/desktop/.st/FAQ b/desktop/.st/FAQ deleted file mode 100644 index b4d0b8a..0000000 --- a/desktop/.st/FAQ +++ /dev/null @@ -1,253 +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 path 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. - -As of 2022-09-05 this now seems to be finally fixed in libXft 2.3.5: -https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS \ No newline at end of file diff --git a/desktop/.st/LEGACY b/desktop/.st/LEGACY deleted file mode 100644 index bf28b1e..0000000 --- a/desktop/.st/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/desktop/.st/LICENSE b/desktop/.st/LICENSE deleted file mode 100644 index 3cbf420..0000000 --- a/desktop/.st/LICENSE +++ /dev/null @@ -1,34 +0,0 @@ -MIT/X Consortium License - -© 2014-2022 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/desktop/.st/Makefile b/desktop/.st/Makefile deleted file mode 100644 index f44cb30..0000000 --- a/desktop/.st/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# st - simple terminal -# See LICENSE file for copyright and license details. -.POSIX: - -include config.mk - -SRC = st.c x.c $(LIGATURES_C) $(SIXEL_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 - -patches.h: - cp patches.def.h patches.h - -.c.o: - $(CC) $(STCFLAGS) -c $< - -st.o: config.h st.h win.h -x.o: arg.h config.h st.h win.h $(LIGATURES_H) - -$(OBJ): config.h config.mk patches.h - -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 $(LIGATURES_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 - mkdir -p $(DESTDIR)$(PREFIX)/share/applications # desktop-entry patch - cp -n st.desktop $(DESTDIR)$(PREFIX)/share/applications # desktop-entry patch - @echo Please see the README file regarding the terminfo entry of st. - -uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/st - rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1 - rm -f $(DESTDIR)$(PREFIX)/share/applications/st.desktop # desktop-entry patch - -.PHONY: all options clean dist install uninstall diff --git a/desktop/.st/README b/desktop/.st/README deleted file mode 100644 index 6a846ed..0000000 --- a/desktop/.st/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/desktop/.st/README.md b/desktop/.st/README.md deleted file mode 100644 index 190fcf0..0000000 --- a/desktop/.st/README.md +++ /dev/null @@ -1,307 +0,0 @@ -Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.9 (e5e9598, 2022-10-25) project has a different take on st patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more. - -For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/st-flexipatch/blob/master/patches.def.h): -```c -#define ALPHA_PATCH 1 -``` - -Once you have found out what works for you and what doesn't then you should be in a better position to choose patches should you want to start patching from scratch. - -Alternatively if you have found the patches you want, but don't want the rest of the flexipatch entanglement on your plate then you may want to have a look at [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer); a custom pre-processor tool that removes all the unused flexipatch code leaving you with a build that contains the patches you selected. - -Refer to [https://st.suckless.org/](https://st.suckless.org/) for details on the st terminal, how to install it and how it works. - ---- - -### Changelog: - -2022-10-24 - Added the fullscreen patch - -2022-08-28 - Added the use XftFontMatch patch - -2022-08-24 - Added the no window decorations patch - -2022-04-11 - Added the background image reload patch - -2022-03-10 - Added the background image patch - -2022-02-24 - Upgraded to st 0.8.5 e823e23, 2022-02-17 - removing osc_10_11_12_2 patch as no longer relevant - -2021-08-18 - Added the CSI 22 & 23 patch - -2021-07-26 - Added columns patch - -2021-07-07 - Added sixel scrollback and the openurlonclick patch - -2021-06-09 - Added the hide terminal cursor patch - -2021-05-16 - Added swapmouse patch - -2021-05-11 - Added default cursor patch - -2021-05-10 - Upgrade to 46b02f, 2021-03-28 - -2021-05-09 - Added the sync, alpha-focus-hightlight and vim browse patches - -2021-05-08 - Added blinking cursor, delkey, undercurl,universcroll, desktopentry, netwmicon and osc_10_11_12_2 patches - -2021-05-07 - Added xresources reload patch - -2021-04-21 - Added (temporary?) hack for Variable Fonts (VT) support - -2021-03-10 - Added sixel support - -2021-02-26 - Added the dynamic cursor color patch - -2021-02-15 - Added the alpha gradient patch - -2020-11-14 - Added the wide glyphs patch - -2020-10-23 - Added the monochrome patch - -2020-08-08 - Re-added the visualbell patch - -2020-06-26 - Added the single drawable buffer patch as per the FAQ in order to get w3m images to display - -2020-06-25 - Upgrade to 0.8.4 (367803, 2020-06-19) - -2020-06-14 - Added w3m patch - -2020-06-10 - Upgrade to 249ef9, 2020-06-01 - -2020-06-05 - Added the ligatures patch - -2020-05-20 - Upgrade to 222876, 2020-05-09, and removed visualbell 1, 2, 3 patches and force redraw after keypress due to incompatibility. Refer to tag [371878](https://github.com/bakkeby/st-flexipatch/tree/371878) if you want to try these out. - -2020-04-20 - Upgrade to c279f5, 2020-04-19, and added the force redraw on pselect after key is pressed patch and the externalpipein patch - -2020-03-29 - Added invert and workingdir patches - -2020-03-24 - Upgraded to latest (master) of st (commit 51e19ea11dd42eefed1ca136ee3f6be975f618b1 at the time of writing). Custom changes to make the altscreen mouse scollback patch working. - -2020-03-21 - Added font2 patch - -2020-01-07 - Added st embedder patch - -2019-10-16 - Introduced [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer) - -2019-09-17 - Added relativeborder, fix-keyboard-input, iso14755, visualbell, right-click-to-plumb, boxdraw and keyboard-select patches - -2019-09-16 - Added alpha, anysize, bold-is-not-bright, clipboard, copyurl, disable-fonts, externalpipe, fixime, hidecursor, newterm, open-copied-url, vertcenter, scrollback, spoiler, themed cursor and xresources patches - -### Patches included: - - - [alpha](https://st.suckless.org/patches/alpha/) - - adds transparency for the terminal - - - [alpha-focus-highlight](https://st.suckless.org/patches/alpha_focus_highlight/) - - allows the user to specify two distinct opacity values or background colors in order to - easily differentiate between focused and unfocused terminal windows - - - [anysize](https://st.suckless.org/patches/anysize/) - - allows st to reize to any pixel size rather than snapping to character width / height - - - [~anysize\_nobar~](https://github.com/connor-brooks/st-anysize-nobar) - - ~a patch that aims to prevent black bars being drawn on the edges of st terminals using the - anysize patch~ - - - [background-image](https://st.suckless.org/patches/background_image/) - - draws a background image in farbfeld format in place of the defaultbg color allowing for - pseudo transparency - - - background-image-reload - - allows the background image to be reloaded similar to xresources using USR1 signals - - - [blinking-cursor](https://st.suckless.org/patches/blinking_cursor/) - - allows the use of a blinking cursor - - - [bold-is-not-bright](https://st.suckless.org/patches/bold-is-not-bright/) - - by default bold text is rendered with a bold font in the bright variant of the current color - - this patch makes bold text rendered simply as bold, leaving the color unaffected - - - [boxdraw](https://st.suckless.org/patches/boxdraw/) - - adds dustom rendering of lines/blocks/braille characters for gapless alignment - - - [clipboard](https://st.suckless.org/patches/clipboard/) - - by default st only sets PRIMARY on selection - - this patch makes st set CLIPBOARD on selection - - - [columns](https://github.com/bakkeby/st-flexipatch/issues/34) - - allows st to be resized without cutting off text when the terminal window is made larger again - - text does not wrap when the terminal window is made smaller - - - [copyurl](https://st.suckless.org/patches/copyurl/) - - this patch allows you to select and copy the last URL displayed with Mod+l - - multiple invocations cycle through the available URLs - - - [csi\_23\_23](https://st.suckless.org/patches/csi_22_23/) - - adds support for CSI escape sequences 22 and 23, which save and restores the window title - (for instance nvim does this when opening and closing) - - - default-cursor - - minor change allowing escape sequences like `\e[ q` or `\e[0 q` to set the cursor back to default configuration instead of a blinking block - - while many terminals do this the behaviour is not according to the specification - - - [delkey](https://st.suckless.org/patches/delkey/) - - return BS on pressing backspace and DEL on pressing the delete key - - - [desktopentry](https://st.suckless.org/patches/desktopentry/) - - adds a desktop entry for st so that it can be displayed with an icon when using a graphical launcher - - this patch only applies to the Makefile and is enabled by default, remove if not needed - - - [disable-fonts](https://st.suckless.org/patches/disable_bold_italic_fonts/) - - this patch adds the option of disabling bold/italic/roman fonts globally - - - [dynamic-cursor-color](https://st.suckless.org/patches/dynamic-cursor-color/) - - this patch makes the cursor color the inverse of the current cell color - - - [externalpipe](https://st.suckless.org/patches/externalpipe/) - - this patch allows for reading and writing st's screen through a pipe, e.g. to pass info to dmenu - - - [externalpipein](https://lists.suckless.org/hackers/2004/17218.html) - - this patch prevents the reset of the signal handler set on SIGCHILD, when the forked process that executes the external process exits - - it adds the externalpipein function to redirect the standard output of the external command to the slave size of the pty, that is, as if the external program had been manually executed on the terminal - - this can be used to send desired escape sequences to the terminal with a shortcut (e.g. to change colors) - - - [~fixime~](https://st.suckless.org/patches/fix_ime/) - - adds better Input Method Editor (IME) support - - (included in the base as per [35f7db](https://git.suckless.org/st/commit/e85b6b64660214121164ea97fb098eaa4935f7db.html)) - - - [fix-keyboard-input](https://st.suckless.org/patches/fix_keyboard_input/) - - allows cli applications to use all the fancy key combinations that are available to GUI applications - - - [font2](https://st.suckless.org/patches/font2/) - - allows you to add a spare font besides the default - - - [~force-redraw-after-keypress~](https://lists.suckless.org/hackers/2004/17221.html) - - ~this patch forces the terminal to check for new data on the tty on keypress with the aim of reducing input latency~ - - - [fullscreen](https://st.suckless.org/patches/fullscreen/) - - allows the st window to go into fullscreen mode - - - [gradient](https://st.suckless.org/patches/gradient/) - - adds gradient transparency to st - - depends on the alpha patch - - - [hidecursor](https://st.suckless.org/patches/hidecursor/) - - hides the X cursor whenever a key is pressed and show it back when the mouse is moved in the terminal window - - - [hide-terminal-cursor](https://www.reddit.com/r/suckless/comments/nvee8h/how_to_hide_cursor_in_st_is_there_a_patch_for_it/) - - hides the terminal cursor when the window loses focus (as opposed to showing a hollow cursor) - - - [invert](https://st.suckless.org/patches/invert/) - - adds a keybinding that lets you invert the current colorscheme of st - - this provides a simple way to temporarily switch to a light colorscheme if you use a dark colorscheme or visa-versa - - - [iso14755](https://st.suckless.org/patches/iso14755/) - - pressing the default binding Ctrl+Shift-i will popup dmenu, asking you to enter a unicode codepoint that will be converted to a glyph and then pushed to st - - - [keyboard-select](https://st.suckless.org/patches/keyboard_select/) - - allows you to select text on the terminal using keyboard shortcuts - - - [ligatures](https://st.suckless.org/patches/ligatures/) - - adds support for drawing ligatures using the Harfbuzz library to transform original text of a single line to a list of glyphs with ligatures included - - - [monochrome](https://www.reddit.com/r/suckless/comments/ixbx6z/how_to_use_black_and_white_only_for_st/) - - makes st ignore terminal color attributes to make for a monochrome look - - - [netwmicon](https://st.suckless.org/patches/netwmicon/) - - this patch sets the \_NET\_WM\_ICON X property with a hardcoded icon for st - - - [newterm](https://st.suckless.org/patches/newterm/) - - allows you to spawn a new st terminal using Ctrl-Shift-Return - - it will have the same CWD (current working directory) as the original st instance - - - [no-window-decorations](https://github.com/bakkeby/patches/wiki/no_window_decorations) - - makes st show without window decorations if the WM supports it - - - [open-copied-url](https://st.suckless.org/patches/open_copied_url/) - - open contents of the clipboard in a user-defined browser - - - [openurlonclick](https://www.reddit.com/r/suckless/comments/cc83om/st_open_url/) - - allows for URLs to be opened directly when you click on them - - - [~osc\_10\_11\_12\_2~](https://st.suckless.org/patches/osc_10_11_12_2/) - - ~this patch adds support for OSC escape sequences 10, 11, and 12 in the way they are~ - ~implemented in most other terminals (e.g libvte, kitty)~ - - ~specifically it differs from~ [~osc_10_11_12~](https://st.suckless.org/patches/osc_10_11_12/) - ~in that it treats the background and foreground colors as distinct from palette colours 01~ - ~and 07 in order to facilitate the use of theme setting scripts like~ - [~theme.sh~](https://github.com/lemnos/theme.sh) ~which expect these colours to be distinct~ - - - [relativeborder](https://st.suckless.org/patches/relativeborder/) - - allows you to specify a border that is relative in size to the width of a cell in the - terminal - - - [right-click-to-plumb](https://st.suckless.org/patches/right_click_to_plumb/) - - allows you to right-click on some selected text to send it to the plumbing program of choice - - - [scrollback](https://st.suckless.org/patches/scrollback/) - - allows you scroll back through terminal output using keyboard shortcuts or mousewheel - - - sixel - - this patch adds SIXEL graphics support - - - st-embedder - - this patch allows clients to embed into the st window and can be useful if you tend to - start X applications from the terminal - - the behavior is similar to Plan 9 where applications can take over windows - - - [spoiler](https://st.suckless.org/patches/spoiler/) - - use inverted defaultbg/fg for selection when bg/fg are the same - - - [swapmouse](https://st.suckless.org/patches/swapmouse/) - - changes the mouse shape to the global default when the running program subscribes for mouse - events, for instance, in programs like ranger and fzf - - it emulates the behaviour shown by vte terminals like termite - - - [sync](https://st.suckless.org/patches/sync/) - - adds synchronized-updates/application-sync support in st - - this has no effect except when an application uses the synchronized-update escape sequences - - with this patch nearly all cursor flicker is eliminated in tmux, and tmux detects it - automatically via terminfo - - - [themed-cursor](https://st.suckless.org/patches/themed_cursor/) - - instead of a default X cursor, use the xterm cursor from your cursor theme - - - [undercurl](https://st.suckless.org/patches/undercurl/) - - adds support for special underlines, e.g. curly / wavy underlines - - - [universcroll](https://st.suckless.org/patches/universcroll/) - - allows mouse scroll without modifier keys for regardless of alt screen using the external - scroll program - - - [use-XftFontMatch](https://git.suckless.org/st/commit/528241aa3835e2f1f052abeeaf891737712955a0.html) - - use XftFontMatch in place of FcFontMatch to allow font to scale with Xft.dpi resource - setting - - - [vertcenter](https://st.suckless.org/patches/vertcenter/) - - vertically center lines in the space available if you have set a larger chscale in config.h - - - [vim-browse](https://st.suckless.org/patches/vim_browse/) - - the vim-browse patch offers the possibility to move through the terminal history-buffer, - search for strings using VIM-like motions, operations and quantifiers - - it overlays the screen with highlighted search results and displays the current operation - / motions / search string in the bottom right corner - - - [visualbell](https://st.suckless.org/patches/visualbell/) - - adds visual indicators for the terminal bell event - - - [w3m](https://st.suckless.org/patches/w3m/) - - adds support for w3m images - - - [wide-glyphs](https://www.reddit.com/r/suckless/comments/jt90ai/update_support_for_proper_glyph_rendering_in_st/) - - adds proper support for wide glyphs, as opposed to rendering smaller or cut glyphs - - - [wide-glyph-spacing](https://github.com/googlefonts/Inconsolata/issues/42#issuecomment-737508890) - - there is a known issue that Google's Variable Fonts (VF) can end up with letter spacing - that is too wide in programs that use Xft, for example Inconsolata v3.000 - - this is intended as a temporary workaround / patch / hack until (if) this is fixed in the - Xft library itself - - - [workingdir](https://st.suckless.org/patches/workingdir/) - - allows user to specify the initial path st should use as the working directory - - - [xresources](https://st.suckless.org/patches/xresources/) - - adds the ability to configure st via Xresources - - during startup, st will read and apply the resources named in the resources[] array in config.h diff --git a/desktop/.st/TODO b/desktop/.st/TODO deleted file mode 100644 index 5f74cd5..0000000 --- a/desktop/.st/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/desktop/.st/arg.h b/desktop/.st/arg.h deleted file mode 100644 index a22e019..0000000 --- a/desktop/.st/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/desktop/.st/config.def.h b/desktop/.st/config.def.h deleted file mode 100644 index 2dcaef7..0000000 --- a/desktop/.st/config.def.h +++ /dev/null @@ -1,763 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* - * appearance - * - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; -#if FONT2_PATCH -/* Spare fonts */ -static char *font2[] = { -/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */ -/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */ -}; -#endif // FONT2_PATCH - -#if BACKGROUND_IMAGE_PATCH -/* - * background image - * expects farbfeld format - * pseudo transparency fixes coordinates to the screen origin - */ -static const char *bgfile = "/path/to/image.ff"; -static const int pseudotransparency = 0; -#endif // BACKGROUND_IMAGE_PATCH - -#if RELATIVEBORDER_PATCH -/* borderperc: percentage of cell width to use as a border - * 0 = no border, 100 = border width is same as cell width */ -int borderperc = 20; -#else -static int borderpx = 2; -#endif // RELATIVEBORDER_PATCH - -#if OPENURLONCLICK_PATCH -/* modkey options: ControlMask, ShiftMask or XK_ANY_MOD */ -static uint url_opener_modkey = XK_ANY_MOD; -static char *url_opener = "xdg-open"; -#endif // OPENURLONCLICK_PATCH - -/* - * 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 */ -#if SIXEL_PATCH -char *vtiden = "\033[?12;4c"; -#else -char *vtiden = "\033[?6c"; -#endif - -/* Kerning / character bounding-box multipliers */ -static float cwscale = 1.0; -static float chscale = 1.0; - -/* - * 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; - -#if SYNC_PATCH -/* - * Synchronized-Update timeout in ms - * https://gitlab.com/gnachman/iterm2/-/wikis/synchronized-updates-spec - */ -static uint su_timeout = 200; -#endif // SYNC_PATCH - -/* - * 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; - -#if BOXDRAW_PATCH -/* - * 1: render most of the lines/blocks characters without using the font for - * perfect alignment between cells (U2500 - U259F except dashes/diagonals). - * Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored. - * 0: disable (render all U25XX glyphs normally from the font). - */ -const int boxdraw = 0; -const int boxdraw_bold = 0; - -/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */ -const int boxdraw_braille = 0; -#endif // BOXDRAW_PATCH - -/* - * 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; - -#if ALPHA_PATCH -/* bg opacity */ -float alpha = 0.8; -#if ALPHA_GRADIENT_PATCH -float grad_alpha = 0.54; //alpha value that'll change -float stat_alpha = 0.46; //constant alpha value that'll get added to grad_alpha -#endif // ALPHA_GRADIENT_PATCH -#if ALPHA_FOCUS_HIGHLIGHT_PATCH -float alphaUnfocused = 0.6; -#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH -#endif // ALPHA_PATCH - -/* 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 */ - "#add8e6", /* 256 -> cursor */ - "#555555", /* 257 -> rev cursor*/ - "#000000", /* 258 -> bg */ - "#e5e5e5", /* 259 -> fg */ -}; - - -/* - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ -#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH -unsigned int defaultbg = 0; -unsigned int bg = 17, bgUnfocused = 16; -#else -unsigned int defaultbg = 258; -#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH -unsigned int defaultfg = 259; -unsigned int defaultcs = 256; -unsigned int defaultrcs = 257; - -#if VIM_BROWSE_PATCH -unsigned int const currentBg = 6, buffSize = 2048; -/// Enable double / triple click yanking / selection of word / line. -int const mouseYank = 1, mouseSelect = 0; -/// [Vim Browse] Colors for search results currently on screen. -unsigned int const highlightBg = 160, highlightFg = 15; -char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t"; -char *nmKeys [] = { ///< Shortcusts executed in normal mode - "R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n", - "Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf" -}; -unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys); -/// Style of the {command, search} string shown in the right corner (y,v,V,/) -Glyph styleSearch = {' ', ATTR_ITALIC | ATTR_BOLD_FAINT, 7, 16}; -Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11}, - {' ', ATTR_ITALIC, 232, 4}, {' ', ATTR_ITALIC, 232, 12}}; -#endif // VIM_BROWSE_PATCH - -#if BLINKING_CURSOR_PATCH -/* - * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Functions-using-CSI-_-ordered-by-the-final-character-lparen-s-rparen:CSI-Ps-SP-q.1D81 - * Default style of cursor - * 0: Blinking block - * 1: Blinking block (default) - * 2: Steady block ("â–ˆ") - * 3: Blinking underline - * 4: Steady underline ("_") - * 5: Blinking bar - * 6: Steady bar ("|") - * 7: Blinking st cursor - * 8: Steady st cursor - */ -static unsigned int cursorstyle = 1; -static Rune stcursor = 0x2603; /* snowman (U+2603) */ -#else -/* - * Default shape of cursor - * 2: Block ("█") - * 4: Underline ("_") - * 6: Bar ("|") - * 7: Snowman ("☃") - */ -static unsigned int cursorshape = 2; -#endif // BLINKING_CURSOR_PATCH - -/* - * Default columns and rows numbers - */ - -static unsigned int cols = 80; -static unsigned int rows = 24; - -#if THEMED_CURSOR_PATCH -/* - * Default shape of the mouse cursor - */ -static char* mouseshape = "xterm"; -#else -/* - * Default colour and shape of the mouse cursor - */ -static unsigned int mouseshape = XC_xterm; -static unsigned int mousefg = 7; -static unsigned int mousebg = 0; -#endif // THEMED_CURSOR_PATCH - -/* - * Color used to display font attributes when fontconfig selected a font which - * doesn't match the ones requested. - */ -static unsigned int defaultattr = 11; - -#if XRESOURCES_PATCH -/* - * Xresources preferences to load at startup - */ -ResourcePref resources[] = { - { "font", STRING, &font }, - { "color0", STRING, &colorname[0] }, - { "color1", STRING, &colorname[1] }, - { "color2", STRING, &colorname[2] }, - { "color3", STRING, &colorname[3] }, - { "color4", STRING, &colorname[4] }, - { "color5", STRING, &colorname[5] }, - { "color6", STRING, &colorname[6] }, - { "color7", STRING, &colorname[7] }, - { "color8", STRING, &colorname[8] }, - { "color9", STRING, &colorname[9] }, - { "color10", STRING, &colorname[10] }, - { "color11", STRING, &colorname[11] }, - { "color12", STRING, &colorname[12] }, - { "color13", STRING, &colorname[13] }, - { "color14", STRING, &colorname[14] }, - { "color15", STRING, &colorname[15] }, - { "background", STRING, &colorname[258] }, - { "foreground", STRING, &colorname[259] }, - { "cursorColor", STRING, &colorname[256] }, - { "termname", STRING, &termname }, - { "shell", STRING, &shell }, - { "minlatency", INTEGER, &minlatency }, - { "maxlatency", INTEGER, &maxlatency }, - { "blinktimeout", INTEGER, &blinktimeout }, - { "bellvolume", INTEGER, &bellvolume }, - { "tabspaces", INTEGER, &tabspaces }, - #if RELATIVEBORDER_PATCH - { "borderperc", INTEGER, &borderperc }, - #else - { "borderpx", INTEGER, &borderpx }, - #endif // RELATIVEBORDER_PATCH - { "cwscale", FLOAT, &cwscale }, - { "chscale", FLOAT, &chscale }, - #if ALPHA_PATCH - { "alpha", FLOAT, &alpha }, - #endif // ALPHA_PATCH - #if ALPHA_FOCUS_HIGHLIGHT_PATCH - { "alphaUnfocused",FLOAT, &alphaUnfocused }, - #endif // ALPHA_FOCUS_HIGHLIGHT_PATCH -}; -#endif // XRESOURCES_PATCH - -/* - * 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 screen */ - #if CLIPBOARD_PATCH - { XK_ANY_MOD, Button2, clippaste, {.i = 0}, 1 }, - #else - { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, - #endif // CLIPBOARD_PATCH - #if SCROLLBACK_MOUSE_PATCH - { ShiftMask, Button4, kscrollup, {.i = 1}, 0, S_PRI}, - { ShiftMask, Button5, kscrolldown, {.i = 1}, 0, S_PRI}, - #elif UNIVERSCROLL_PATCH - { XK_ANY_MOD, Button4, ttysend, {.s = "\033[5;2~"}, 0, S_PRI }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\033[6;2~"}, 0, S_PRI }, - #else - { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, - { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, - #endif // SCROLLBACK_MOUSE_PATCH - #if SCROLLBACK_MOUSE_ALTSCREEN_PATCH - { XK_NO_MOD, Button4, kscrollup, {.i = 1}, 0, S_PRI }, - { XK_NO_MOD, Button5, kscrolldown, {.i = 1}, 0, S_PRI }, - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"}, 0, S_ALT }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"}, 0, S_ALT }, - #else - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, - #endif // SCROLLBACK_MOUSE_ALTSCREEN_PATCH -}; - -/* Internal keyboard shortcuts. */ -#define MODKEY Mod1Mask -#define TERMMOD (ControlMask|ShiftMask) - -#if EXTERNALPIPE_PATCH // example command -static char *openurlcmd[] = { "/bin/sh", "-c", - "xurls | dmenu -l 10 -w $WINDOWID | xargs -r open", - "externalpipe", NULL }; - -#if EXTERNALPIPEIN_PATCH // example command -static char *setbgcolorcmd[] = { "/bin/sh", "-c", - "printf '\033]11;#008000\007'", - "externalpipein", NULL }; -#endif // EXTERNALPIPEIN_PATCH -#endif // EXTERNALPIPE_PATCH - -static Shortcut shortcuts[] = { - /* mask keysym function argument screen */ - { 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} }, - #if ALPHA_PATCH - { TERMMOD, XK_O, changealpha, {.f = +0.05} }, - { TERMMOD, XK_P, changealpha, {.f = -0.05} }, - #if ALPHA_FOCUS_HIGHLIGHT_PATCH - //{ TERMMOD, XK_, changealphaunfocused, {.f = +0.05} }, - //{ TERMMOD, XK_, changealphaunfocused, {.f = -0.05} }, - #endif // ALPHA_FOCUS_HIGHLIGHT_PATCH - #endif // ALPHA_PATCH - #if FULLSCREEN_PATCH - { XK_NO_MOD, XK_F11, fullscreen, {.i = 0} }, - { MODKEY, XK_Return, fullscreen, {.i = 0} }, - #endif // FULLSCREEN_PATCH - #if SCROLLBACK_PATCH - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1}, S_PRI }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1}, S_PRI }, - #endif // SCROLLBACK_PATCH - #if CLIPBOARD_PATCH - { TERMMOD, XK_Y, clippaste, {.i = 0} }, - { ShiftMask, XK_Insert, clippaste, {.i = 0} }, - #else - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - #endif // CLIPBOARD_PATCH - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, - #if COPYURL_PATCH || COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH - { MODKEY, XK_l, copyurl, {.i = 0} }, - #endif // COPYURL_PATCH - #if OPENCOPIED_PATCH - { MODKEY, XK_o, opencopied, {.v = "xdg-open"} }, - #endif // OPENCOPIED_PATCH - #if NEWTERM_PATCH - { TERMMOD, XK_Return, newterm, {.i = 0} }, - #endif // NEWTERM_PATCH - #if EXTERNALPIPE_PATCH - { TERMMOD, XK_U, externalpipe, { .v = openurlcmd } }, - #if EXTERNALPIPEIN_PATCH - { TERMMOD, XK_M, externalpipein, { .v = setbgcolorcmd } }, - #endif // EXTERNALPIPEIN_PATCH - #endif // EXTERNALPIPE_PATCH - #if KEYBOARDSELECT_PATCH - { TERMMOD, XK_Escape, keyboard_select, { 0 } }, - #endif // KEYBOARDSELECT_PATCH - #if ISO14755_PATCH - { TERMMOD, XK_I, iso14755, {.i = 0} }, - #endif // ISO14755_PATCH - #if INVERT_PATCH - { TERMMOD, XK_X, invert, { 0 } }, - #endif // INVERT_PATCH - #if VIM_BROWSE_PATCH - { MODKEY, XK_c, normalMode, {.i = 0} }, - #endif // VIM_BROWSE_PATCH -}; - -/* - * 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 !FIXKEYBOARDINPUT_PATCH -/* - * 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 }; -#endif // FIXKEYBOARDINPUT_PATCH - -/* - * 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; - -#if !FIXKEYBOARDINPUT_PATCH -/* - * 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}, - #if DELKEY_PATCH - { XK_KP_Delete, XK_ANY_MOD, "\033[3~", -1, 0}, - #else - { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - #endif // DELKEY_PATCH - { 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}, - #if DELKEY_PATCH - { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0}, - #else - { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - #endif // DELKEY_PATCH - { 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}, -}; -#endif // FIXKEYBOARDINPUT_PATCH - -/* - * 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{|}~"; - -#if RIGHTCLICKTOPLUMB_PATCH -/* - * plumb_cmd is run on mouse button 3 click, with argument set to - * current selection and with cwd set to the cwd of the active shell - */ -static char *plumb_cmd = "plumb"; -#endif // RIGHTCLICKTOPLUMB_PATCH - -#if UNDERCURL_PATCH -/** - * Undercurl style. Set UNDERCURL_STYLE to one of the available styles. - * - * Curly: Dunno how to draw it *shrug* - * _ _ _ _ - * ( ) ( ) ( ) ( ) - * (_) (_) (_) (_) - * - * Spiky: - * /\ /\ /\ /\ - * \/ \/ \/ - * - * Capped: - * _ _ _ - * / \ / \ / \ - * \_/ \_/ - */ -// Available styles -#define UNDERCURL_CURLY 0 -#define UNDERCURL_SPIKY 1 -#define UNDERCURL_CAPPED 2 -// Active style -#define UNDERCURL_STYLE UNDERCURL_SPIKY -#endif // UNDERCURL_PATCH diff --git a/desktop/.st/config.mk b/desktop/.st/config.mk deleted file mode 100644 index 36e98ce..0000000 --- a/desktop/.st/config.mk +++ /dev/null @@ -1,53 +0,0 @@ -# st version -VERSION = 0.9 - -# 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 - -# Uncomment this for the alpha patch / ALPHA_PATCH -#XRENDER = -lXrender - -# Uncomment this for the themed cursor patch / THEMED_CURSOR_PATCH -#XCURSOR = -lXcursor - -# Uncomment the lines below for the ligatures patch / LIGATURES_PATCH -#LIGATURES_C = hb.c -#LIGATURES_H = hb.h -#LIGATURES_INC = `$(PKG_CONFIG) --cflags harfbuzz` -#LIGATURES_LIBS = `$(PKG_CONFIG) --libs harfbuzz` - -# Uncomment this for the SIXEL patch / SIXEL_PATCH -#SIXEL_C = sixel.c sixel_hls.c - -# includes and libs, uncomment harfbuzz for the ligatures patch -INCS = -I$(X11INC) \ - `$(PKG_CONFIG) --cflags fontconfig` \ - `$(PKG_CONFIG) --cflags freetype2` \ - $(LIGATURES_INC) -LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft ${XRENDER} ${XCURSOR}\ - `$(PKG_CONFIG) --libs fontconfig` \ - `$(PKG_CONFIG) --libs freetype2` \ - $(LIGATURES_LIBS) - -# 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` -#MANPREFIX = ${PREFIX}/man - -# compiler and linker -# CC = c99 diff --git a/desktop/.st/hb.c b/desktop/.st/hb.c deleted file mode 100644 index db845e7..0000000 --- a/desktop/.st/hb.c +++ /dev/null @@ -1,108 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -#include "st.h" -#include "hb.h" - -#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END } - -hb_font_t *hbfindfont(XftFont *match); - -typedef struct { - XftFont *match; - hb_font_t *font; -} HbFontMatch; - -static int hbfontslen = 0; -static HbFontMatch *hbfontcache = NULL; - -/* - * Poplulate the array with a list of font features, wrapped in FEATURE macro, - * e. g. - * FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g') - */ -hb_feature_t features[] = { 0 }; - -void -hbunloadfonts() -{ - for (int i = 0; i < hbfontslen; i++) { - hb_font_destroy(hbfontcache[i].font); - XftUnlockFace(hbfontcache[i].match); - } - - if (hbfontcache != NULL) { - free(hbfontcache); - hbfontcache = NULL; - } - hbfontslen = 0; -} - -hb_font_t * -hbfindfont(XftFont *match) -{ - for (int i = 0; i < hbfontslen; i++) { - if (hbfontcache[i].match == match) - return hbfontcache[i].font; - } - - /* Font not found in cache, caching it now. */ - hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 1)); - FT_Face face = XftLockFace(match); - hb_font_t *font = hb_ft_font_create(face, NULL); - if (font == NULL) - die("Failed to load Harfbuzz font."); - - hbfontcache[hbfontslen].match = match; - hbfontcache[hbfontslen].font = font; - hbfontslen += 1; - - return font; -} - -void hbtransform(HbTransformData *data, XftFont *xfont, const Glyph *glyphs, int start, int length) { - Rune rune; - ushort mode = USHRT_MAX; - unsigned int glyph_count; - int i, end = start + length; - - hb_font_t *font = hbfindfont(xfont); - if (font == NULL) - return; - - hb_buffer_t *buffer = hb_buffer_create(); - hb_buffer_set_direction(buffer, HB_DIRECTION_LTR); - - /* Fill buffer with codepoints. */ - for (i = start; i < end; i++) { - rune = glyphs[i].u; - mode = glyphs[i].mode; - if (mode & ATTR_WDUMMY) - rune = 0x0020; - hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1); - } - - /* Shape the segment. */ - hb_shape(font, buffer, features, sizeof(features)/sizeof(hb_feature_t)); - - /* Get new glyph info. */ - hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, &glyph_count); - hb_glyph_position_t *pos = hb_buffer_get_glyph_positions(buffer, &glyph_count); - - /** Fill the output. */ - data->buffer = buffer; - data->glyphs = info; - data->positions = pos; - data->count = glyph_count; -} - -void hbcleanup(HbTransformData *data) { - hb_buffer_destroy(data->buffer); - memset(data, 0, sizeof(HbTransformData)); -} diff --git a/desktop/.st/hb.h b/desktop/.st/hb.h deleted file mode 100644 index 3b0ef44..0000000 --- a/desktop/.st/hb.h +++ /dev/null @@ -1,14 +0,0 @@ -#include -#include -#include - -typedef struct { - hb_buffer_t *buffer; - hb_glyph_info_t *glyphs; - hb_glyph_position_t *positions; - unsigned int count; -} HbTransformData; - -void hbunloadfonts(); -void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int); -void hbcleanup(HbTransformData *); diff --git a/desktop/.st/patch/alpha.c b/desktop/.st/patch/alpha.c deleted file mode 100644 index 146bf4b..0000000 --- a/desktop/.st/patch/alpha.c +++ /dev/null @@ -1,30 +0,0 @@ -float -clamp(float value, float lower, float upper) { - if (value < lower) - return lower; - if (value > upper) - return upper; - return value; -} - -void -changealpha(const Arg *arg) -{ - if ((alpha > 0 && arg->f < 0) || (alpha < 1 && arg->f > 0)) - alpha += arg->f; - alpha = clamp(alpha, 0.0, 1.0); - xloadcols(); - redraw(); -} - -#if ALPHA_FOCUS_HIGHLIGHT_PATCH -void -changealphaunfocused(const Arg *arg) -{ - if ((alphaUnfocused > 0 && arg->f < 0) || (alphaUnfocused < 1 && arg->f > 0)) - alphaUnfocused += arg->f; - alphaUnfocused = clamp(alphaUnfocused, 0.0, 1.0); - xloadcols(); - redraw(); -} -#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH diff --git a/desktop/.st/patch/alpha.h b/desktop/.st/patch/alpha.h deleted file mode 100644 index 2d01830..0000000 --- a/desktop/.st/patch/alpha.h +++ /dev/null @@ -1,5 +0,0 @@ -static float clamp(float value, float lower, float upper); -static void changealpha(const Arg *); -#if ALPHA_FOCUS_HIGHLIGHT_PATCH -static void changealphaunfocused(const Arg *arg); -#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH diff --git a/desktop/.st/patch/background_image_x.c b/desktop/.st/patch/background_image_x.c deleted file mode 100644 index 3bbb189..0000000 --- a/desktop/.st/patch/background_image_x.c +++ /dev/null @@ -1,106 +0,0 @@ -void -updatexy() -{ - Window child; - XTranslateCoordinates(xw.dpy, xw.win, DefaultRootWindow(xw.dpy), 0, 0, &win.x, &win.y, &child); -} - -/* - * load farbfeld file to XImage - */ -XImage* -loadff(const char *filename) -{ - uint32_t i, hdr[4], w, h, size; - uint64_t *data; - FILE *f = fopen(filename, "rb"); - - if (f == NULL) { - fprintf(stderr, "could not load background image.\n"); - return NULL; - } - - if (fread(hdr, sizeof(*hdr), LEN(hdr), f) != LEN(hdr)) { - fprintf(stderr, "fread: %s\n", ferror(f) ? "" : "Unexpected end of file reading header"); - fclose(f); - return NULL; - } - - if (memcmp("farbfeld", hdr, sizeof("farbfeld") - 1)) { - fprintf(stderr, "Invalid magic value\n"); - fclose(f); - return NULL; - } - - w = ntohl(hdr[2]); - h = ntohl(hdr[3]); - size = w * h; - data = xmalloc(size * sizeof(uint64_t)); - - if (fread(data, sizeof(uint64_t), size, f) != size) { - fprintf(stderr, "fread: %s\n", ferror(f) ? "" : "Unexpected end of file reading data"); - fclose(f); - return NULL; - } - - fclose(f); - - for (i = 0; i < size; i++) - data[i] = (data[i] & 0x00000000000000FF) << 16 | - (data[i] & 0x0000000000FF0000) >> 8 | - (data[i] & 0x000000FF00000000) >> 32 | - (data[i] & 0x00FF000000000000) >> 24; - - #if ALPHA_PATCH - XImage *xi = XCreateImage(xw.dpy, xw.vis, xw.depth, ZPixmap, 0, - (char *)data, w, h, 32, w * 8); - #else - XImage *xi = XCreateImage(xw.dpy, DefaultVisual(xw.dpy, xw.scr), - DefaultDepth(xw.dpy, xw.scr), ZPixmap, 0, - (char *)data, w, h, 32, w * 8); - #endif // ALPHA_PATCH - xi->bits_per_pixel = 64; - return xi; -} - -/* - * initialize background image - */ -void -bginit() -{ - XGCValues gcvalues; - Drawable bgimg; - XImage *bgxi = loadff(bgfile); - - memset(&gcvalues, 0, sizeof(gcvalues)); - xw.bggc = XCreateGC(xw.dpy, xw.win, 0, &gcvalues); - if (!bgxi) - return; - #if ALPHA_PATCH - bgimg = XCreatePixmap(xw.dpy, xw.win, bgxi->width, bgxi->height, - xw.depth); - #else - bgimg = XCreatePixmap(xw.dpy, xw.win, bgxi->width, bgxi->height, - DefaultDepth(xw.dpy, xw.scr)); - #endif // ALPHA_PATCH - XPutImage(xw.dpy, bgimg, dc.gc, bgxi, 0, 0, 0, 0, bgxi->width, bgxi->height); - XDestroyImage(bgxi); - XSetTile(xw.dpy, xw.bggc, bgimg); - XSetFillStyle(xw.dpy, xw.bggc, FillTiled); - if (pseudotransparency) { - updatexy(); - MODBIT(xw.attrs.event_mask, 1, PropertyChangeMask); - XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs); - } -} - -#if BACKGROUND_IMAGE_RELOAD_PATCH -void -reload_image() -{ - XFreeGC(xw.dpy, xw.bggc); - bginit(); - redraw(); -} -#endif // XRESOURCES_RELOAD_PATCH diff --git a/desktop/.st/patch/background_image_x.h b/desktop/.st/patch/background_image_x.h deleted file mode 100644 index e96edd2..0000000 --- a/desktop/.st/patch/background_image_x.h +++ /dev/null @@ -1,6 +0,0 @@ -#include - -static void updatexy(void); -static XImage *loadff(const char *); -static void bginit(); -static void reload_image(); diff --git a/desktop/.st/patch/boxdraw.c b/desktop/.st/patch/boxdraw.c deleted file mode 100644 index 3cc5b51..0000000 --- a/desktop/.st/patch/boxdraw.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih - * MIT/X Consortium License - */ - -#include - -/* Rounded non-negative integers division of n / d */ -#define DIV(n, d) (((n) + (d) / 2) / (d)) - -static Display *xdpy; -static Colormap xcmap; -static XftDraw *xd; -static Visual *xvis; - -static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort); -static void drawboxlines(int, int, int, int, XftColor *, ushort); - -/* public API */ - -void -boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis) -{ - xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis; -} - -int -isboxdraw(Rune u) -{ - Rune block = u & ~0xff; - return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) || - (boxdraw_braille && block == 0x2800); -} - -/* the "index" is actually the entire shape data encoded as ushort */ -ushort -boxdrawindex(const Glyph *g) -{ - if (boxdraw_braille && (g->u & ~0xff) == 0x2800) - return BRL | (uint8_t)g->u; - if (boxdraw_bold && (g->mode & ATTR_BOLD)) - return BDB | boxdata[(uint8_t)g->u]; - return boxdata[(uint8_t)g->u]; -} - -void -drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg, - const XftGlyphFontSpec *specs, int len) -{ - for ( ; len-- > 0; x += cw, specs++) - drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph); -} - -/* implementation */ - -void -drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd) -{ - ushort cat = bd & ~(BDB | 0xff); /* mask out bold and data */ - if (bd & (BDL | BDA)) { - /* lines (light/double/heavy/arcs) */ - drawboxlines(x, y, w, h, fg, bd); - - } else if (cat == BBD) { - /* lower (8-X)/8 block */ - int d = DIV((uint8_t)bd * h, 8); - XftDrawRect(xd, fg, x, y + d, w, h - d); - - } else if (cat == BBU) { - /* upper X/8 block */ - XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8)); - - } else if (cat == BBL) { - /* left X/8 block */ - XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h); - - } else if (cat == BBR) { - /* right (8-X)/8 block */ - int d = DIV((uint8_t)bd * w, 8); - XftDrawRect(xd, fg, x + d, y, w - d, h); - - } else if (cat == BBQ) { - /* Quadrants */ - int w2 = DIV(w, 2), h2 = DIV(h, 2); - if (bd & TL) - XftDrawRect(xd, fg, x, y, w2, h2); - if (bd & TR) - XftDrawRect(xd, fg, x + w2, y, w - w2, h2); - if (bd & BL) - XftDrawRect(xd, fg, x, y + h2, w2, h - h2); - if (bd & BR) - XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2); - - } else if (bd & BBS) { - /* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */ - int d = (uint8_t)bd; - XftColor xfc; - XRenderColor xrc = { .alpha = 0xffff }; - - xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4); - xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4); - xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4); - - XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc); - XftDrawRect(xd, &xfc, x, y, w, h); - XftColorFree(xdpy, xvis, xcmap, &xfc); - - } else if (cat == BRL) { - /* braille, each data bit corresponds to one dot at 2x4 grid */ - int w1 = DIV(w, 2); - int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4); - - if (bd & 1) XftDrawRect(xd, fg, x, y, w1, h1); - if (bd & 2) XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1); - if (bd & 4) XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2); - if (bd & 8) XftDrawRect(xd, fg, x + w1, y, w - w1, h1); - if (bd & 16) XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1); - if (bd & 32) XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2); - if (bd & 64) XftDrawRect(xd, fg, x, y + h3, w1, h - h3); - if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3); - - } -} - -void -drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd) -{ - /* s: stem thickness. width/8 roughly matches underscore thickness. */ - /* We draw bold as 1.5 * normal-stem and at least 1px thicker. */ - /* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */ - int mwh = MIN(w, h); - int base_s = MAX(1, DIV(mwh, 8)); - int bold = (bd & BDB) && mwh >= 6; /* possibly ignore boldness */ - int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s; - int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2); - /* the s-by-s square (x + w2, y + h2, s, s) is the center texel. */ - /* The base length (per direction till edge) includes this square. */ - - int light = bd & (LL | LU | LR | LD); - int double_ = bd & (DL | DU | DR | DD); - - if (light) { - /* d: additional (negative) length to not-draw the center */ - /* texel - at arcs and avoid drawing inside (some) doubles */ - int arc = bd & BDA; - int multi_light = light & (light - 1); - int multi_double = double_ & (double_ - 1); - /* light crosses double only at DH+LV, DV+LH (ref. shapes) */ - int d = arc || (multi_double && !multi_light) ? -s : 0; - - if (bd & LL) - XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s); - if (bd & LU) - XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d); - if (bd & LR) - XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s); - if (bd & LD) - XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d); - } - - /* double lines - also align with light to form heavy when combined */ - if (double_) { - /* - * going clockwise, for each double-ray: p is additional length - * to the single-ray nearer to the previous direction, and n to - * the next. p and n adjust from the base length to lengths - * which consider other doubles - shorter to avoid intersections - * (p, n), or longer to draw the far-corner texel (n). - */ - int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD; - if (dl) { - int p = dd ? -s : 0, n = du ? -s : dd ? s : 0; - XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s); - XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s); - } - if (du) { - int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0; - XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p); - XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n); - } - if (dr) { - int p = du ? -s : 0, n = dd ? -s : du ? s : 0; - XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s); - XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s); - } - if (dd) { - int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0; - XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p); - XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n); - } - } -} \ No newline at end of file diff --git a/desktop/.st/patch/boxdraw.h b/desktop/.st/patch/boxdraw.h deleted file mode 100644 index 12df637..0000000 --- a/desktop/.st/patch/boxdraw.h +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih - * MIT/X Consortium License - */ - -/* - * U+25XX codepoints data - * - * References: - * http://www.unicode.org/charts/PDF/U2500.pdf - * http://www.unicode.org/charts/PDF/U2580.pdf - * - * Test page: - * https://github.com/GNOME/vte/blob/master/doc/boxes.txt - */ - -/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */ -/* Categories (mutually exclusive except BDB): */ -/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */ -#define BDL (1<<8) /* Box Draw Lines (light/double/heavy) */ -#define BDA (1<<9) /* Box Draw Arc (light) */ - -#define BBD (1<<10) /* Box Block Down (lower) X/8 */ -#define BBL (2<<10) /* Box Block Left X/8 */ -#define BBU (3<<10) /* Box Block Upper X/8 */ -#define BBR (4<<10) /* Box Block Right X/8 */ -#define BBQ (5<<10) /* Box Block Quadrants */ -#define BRL (6<<10) /* Box Braille (data is lower byte of U28XX) */ - -#define BBS (1<<14) /* Box Block Shades */ -#define BDB (1<<15) /* Box Draw is Bold */ - -/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical */ -/* Heavy is light+double (literally drawing light+double align to form heavy) */ -#define LL (1<<0) -#define LU (1<<1) -#define LR (1<<2) -#define LD (1<<3) -#define LH (LL+LR) -#define LV (LU+LD) - -#define DL (1<<4) -#define DU (1<<5) -#define DR (1<<6) -#define DD (1<<7) -#define DH (DL+DR) -#define DV (DU+DD) - -#define HL (LL+DL) -#define HU (LU+DU) -#define HR (LR+DR) -#define HD (LD+DD) -#define HH (HL+HR) -#define HV (HU+HD) - -/* (BBQ) Quadrants Top/Bottom x Left/Right */ -#define TL (1<<0) -#define TR (1<<1) -#define BL (1<<2) -#define BR (1<<3) - -/* Data for U+2500 - U+259F except dashes/diagonals */ -static const unsigned short boxdata[256] = { - /* light lines */ - [0x00] = BDL + LH, /* light horizontal */ - [0x02] = BDL + LV, /* light vertical */ - [0x0c] = BDL + LD + LR, /* light down and right */ - [0x10] = BDL + LD + LL, /* light down and left */ - [0x14] = BDL + LU + LR, /* light up and right */ - [0x18] = BDL + LU + LL, /* light up and left */ - [0x1c] = BDL + LV + LR, /* light vertical and right */ - [0x24] = BDL + LV + LL, /* light vertical and left */ - [0x2c] = BDL + LH + LD, /* light horizontal and down */ - [0x34] = BDL + LH + LU, /* light horizontal and up */ - [0x3c] = BDL + LV + LH, /* light vertical and horizontal */ - [0x74] = BDL + LL, /* light left */ - [0x75] = BDL + LU, /* light up */ - [0x76] = BDL + LR, /* light right */ - [0x77] = BDL + LD, /* light down */ - - /* heavy [+light] lines */ - [0x01] = BDL + HH, - [0x03] = BDL + HV, - [0x0d] = BDL + HR + LD, - [0x0e] = BDL + HD + LR, - [0x0f] = BDL + HD + HR, - [0x11] = BDL + HL + LD, - [0x12] = BDL + HD + LL, - [0x13] = BDL + HD + HL, - [0x15] = BDL + HR + LU, - [0x16] = BDL + HU + LR, - [0x17] = BDL + HU + HR, - [0x19] = BDL + HL + LU, - [0x1a] = BDL + HU + LL, - [0x1b] = BDL + HU + HL, - [0x1d] = BDL + HR + LV, - [0x1e] = BDL + HU + LD + LR, - [0x1f] = BDL + HD + LR + LU, - [0x20] = BDL + HV + LR, - [0x21] = BDL + HU + HR + LD, - [0x22] = BDL + HD + HR + LU, - [0x23] = BDL + HV + HR, - [0x25] = BDL + HL + LV, - [0x26] = BDL + HU + LD + LL, - [0x27] = BDL + HD + LU + LL, - [0x28] = BDL + HV + LL, - [0x29] = BDL + HU + HL + LD, - [0x2a] = BDL + HD + HL + LU, - [0x2b] = BDL + HV + HL, - [0x2d] = BDL + HL + LD + LR, - [0x2e] = BDL + HR + LL + LD, - [0x2f] = BDL + HH + LD, - [0x30] = BDL + HD + LH, - [0x31] = BDL + HD + HL + LR, - [0x32] = BDL + HR + HD + LL, - [0x33] = BDL + HH + HD, - [0x35] = BDL + HL + LU + LR, - [0x36] = BDL + HR + LU + LL, - [0x37] = BDL + HH + LU, - [0x38] = BDL + HU + LH, - [0x39] = BDL + HU + HL + LR, - [0x3a] = BDL + HU + HR + LL, - [0x3b] = BDL + HH + HU, - [0x3d] = BDL + HL + LV + LR, - [0x3e] = BDL + HR + LV + LL, - [0x3f] = BDL + HH + LV, - [0x40] = BDL + HU + LH + LD, - [0x41] = BDL + HD + LH + LU, - [0x42] = BDL + HV + LH, - [0x43] = BDL + HU + HL + LD + LR, - [0x44] = BDL + HU + HR + LD + LL, - [0x45] = BDL + HD + HL + LU + LR, - [0x46] = BDL + HD + HR + LU + LL, - [0x47] = BDL + HH + HU + LD, - [0x48] = BDL + HH + HD + LU, - [0x49] = BDL + HV + HL + LR, - [0x4a] = BDL + HV + HR + LL, - [0x4b] = BDL + HV + HH, - [0x78] = BDL + HL, - [0x79] = BDL + HU, - [0x7a] = BDL + HR, - [0x7b] = BDL + HD, - [0x7c] = BDL + HR + LL, - [0x7d] = BDL + HD + LU, - [0x7e] = BDL + HL + LR, - [0x7f] = BDL + HU + LD, - - /* double [+light] lines */ - [0x50] = BDL + DH, - [0x51] = BDL + DV, - [0x52] = BDL + DR + LD, - [0x53] = BDL + DD + LR, - [0x54] = BDL + DR + DD, - [0x55] = BDL + DL + LD, - [0x56] = BDL + DD + LL, - [0x57] = BDL + DL + DD, - [0x58] = BDL + DR + LU, - [0x59] = BDL + DU + LR, - [0x5a] = BDL + DU + DR, - [0x5b] = BDL + DL + LU, - [0x5c] = BDL + DU + LL, - [0x5d] = BDL + DL + DU, - [0x5e] = BDL + DR + LV, - [0x5f] = BDL + DV + LR, - [0x60] = BDL + DV + DR, - [0x61] = BDL + DL + LV, - [0x62] = BDL + DV + LL, - [0x63] = BDL + DV + DL, - [0x64] = BDL + DH + LD, - [0x65] = BDL + DD + LH, - [0x66] = BDL + DD + DH, - [0x67] = BDL + DH + LU, - [0x68] = BDL + DU + LH, - [0x69] = BDL + DH + DU, - [0x6a] = BDL + DH + LV, - [0x6b] = BDL + DV + LH, - [0x6c] = BDL + DH + DV, - - /* (light) arcs */ - [0x6d] = BDA + LD + LR, - [0x6e] = BDA + LD + LL, - [0x6f] = BDA + LU + LL, - [0x70] = BDA + LU + LR, - - /* Lower (Down) X/8 block (data is 8 - X) */ - [0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4, - [0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0, - - /* Left X/8 block (data is X) */ - [0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4, - [0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1, - - /* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */ - [0x80] = BBU + 4, [0x94] = BBU + 1, - [0x90] = BBR + 4, [0x95] = BBR + 7, - - /* Quadrants */ - [0x96] = BBQ + BL, - [0x97] = BBQ + BR, - [0x98] = BBQ + TL, - [0x99] = BBQ + TL + BL + BR, - [0x9a] = BBQ + TL + BR, - [0x9b] = BBQ + TL + TR + BL, - [0x9c] = BBQ + TL + TR + BR, - [0x9d] = BBQ + TR, - [0x9e] = BBQ + BL + TR, - [0x9f] = BBQ + BL + TR + BR, - - /* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */ - [0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3, - - /* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */ - /* U+2571 - U+2573: unsupported (diagonals) */ -}; \ No newline at end of file diff --git a/desktop/.st/patch/copyurl.c b/desktop/.st/patch/copyurl.c deleted file mode 100644 index 90d96db..0000000 --- a/desktop/.st/patch/copyurl.c +++ /dev/null @@ -1,180 +0,0 @@ -#if COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH -void -tsetcolor( int row, int start, int end, uint32_t fg, uint32_t bg ) -{ - int i = start; - for( ; i < end; ++i ) - { - term.line[row][i].fg = fg; - term.line[row][i].bg = bg; - } -} - -char * -findlastany(char *str, const char** find, size_t len) -{ - char* found = NULL; - int i = 0; - for(found = str + strlen(str) - 1; found >= str; --found) { - for(i = 0; i < len; i++) { - if(strncmp(found, find[i], strlen(find[i])) == 0) { - return found; - } - } - } - - return NULL; -} - -/* -** Select and copy the previous url on screen (do nothing if there's no url). -** -** FIXME: doesn't handle urls that span multiple lines; will need to add support -** for multiline "getsel()" first -*/ -void -copyurl(const Arg *arg) { - /* () and [] can appear in urls, but excluding them here will reduce false - * positives when figuring out where a given url ends. - */ - static char URLCHARS[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789-._~:/?#@!$&'*+,;=%"; - - static const char* URLSTRINGS[] = {"http://", "https://"}; - - /* remove highlighting from previous selection if any */ - if(sel.ob.x >= 0 && sel.oe.x >= 0) - tsetcolor(sel.nb.y, sel.ob.x, sel.oe.x + 1, defaultfg, defaultbg); - - int i = 0, - row = 0, /* row of current URL */ - col = 0, /* column of current URL start */ - startrow = 0, /* row of last occurrence */ - colend = 0, /* column of last occurrence */ - passes = 0; /* how many rows have been scanned */ - - char *linestr = calloc(term.col+1, sizeof(Rune)); - char *c = NULL, - *match = NULL; - - row = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.y : term.bot; - LIMIT(row, term.top, term.bot); - startrow = row; - - colend = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.x : term.col; - LIMIT(colend, 0, term.col); - - /* - ** Scan from (term.bot,term.col) to (0,0) and find - ** next occurrance of a URL - */ - while (passes !=term.bot + 2) { - /* Read in each column of every row until - ** we hit previous occurrence of URL - */ - for (col = 0, i = 0; col < colend; ++col,++i) { - linestr[i] = term.line[row][col].u; - } - linestr[term.col] = '\0'; - - if ((match = findlastany(linestr, URLSTRINGS, - sizeof(URLSTRINGS)/sizeof(URLSTRINGS[0])))) - break; - - if (--row < term.top) - row = term.bot; - - colend = term.col; - passes++; - }; - - if (match) { - /* must happen before trim */ - selclear(); - sel.ob.x = strlen(linestr) - strlen(match); - - /* trim the rest of the line from the url match */ - for (c = match; *c != '\0'; ++c) - if (!strchr(URLCHARS, *c)) { - *c = '\0'; - break; - } - - /* highlight selection by inverting terminal colors */ - tsetcolor(row, sel.ob.x, sel.ob.x + strlen( match ), defaultbg, defaultfg); - - /* select and copy */ - sel.mode = 1; - sel.type = SEL_REGULAR; - sel.oe.x = sel.ob.x + strlen(match)-1; - sel.ob.y = sel.oe.y = row; - selnormalize(); - tsetdirt(sel.nb.y, sel.ne.y); - xsetsel(getsel()); - xclipcopy(); - } - - free(linestr); -} -#else -/* select and copy the previous url on screen (do nothing if there's no url). - * known bug: doesn't handle urls that span multiple lines (wontfix), depends on multiline "getsel()" - * known bug: only finds first url on line (mightfix) - */ -void -copyurl(const Arg *arg) { - /* () and [] can appear in urls, but excluding them here will reduce false - * positives when figuring out where a given url ends. - */ - static char URLCHARS[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789-._~:/?#@!$&'*+,;=%"; - - int i, row, startrow; - char *linestr = calloc(term.col+1, sizeof(Rune)); - char *c, *match = NULL; - - row = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.y-1 : term.bot; - LIMIT(row, term.top, term.bot); - startrow = row; - - /* find the start of the last url before selection */ - do { - for (i = 0; i < term.col; ++i) { - linestr[i] = term.line[row][i].u; - } - linestr[term.col] = '\0'; - if ((match = strstr(linestr, "http://")) - || (match = strstr(linestr, "https://"))) - break; - if (--row < term.top) - row = term.bot; - } while (row != startrow); - - if (match) { - /* must happen before trim */ - selclear(); - sel.ob.x = strlen(linestr) - strlen(match); - - /* trim the rest of the line from the url match */ - for (c = match; *c != '\0'; ++c) - if (!strchr(URLCHARS, *c)) { - *c = '\0'; - break; - } - - /* select and copy */ - sel.mode = 1; - sel.type = SEL_REGULAR; - sel.oe.x = sel.ob.x + strlen(match)-1; - sel.ob.y = sel.oe.y = row; - selnormalize(); - tsetdirt(sel.nb.y, sel.ne.y); - xsetsel(getsel()); - xclipcopy(); - } - - free(linestr); -} -#endif // COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH \ No newline at end of file diff --git a/desktop/.st/patch/copyurl.h b/desktop/.st/patch/copyurl.h deleted file mode 100644 index 88059af..0000000 --- a/desktop/.st/patch/copyurl.h +++ /dev/null @@ -1,5 +0,0 @@ -void copyurl(const Arg *); -#if COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH -static void tsetcolor(int, int, int, uint32_t, uint32_t); -static char * findlastany(char *, const char**, size_t); -#endif // COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH \ No newline at end of file diff --git a/desktop/.st/patch/externalpipe.c b/desktop/.st/patch/externalpipe.c deleted file mode 100644 index 37d8848..0000000 --- a/desktop/.st/patch/externalpipe.c +++ /dev/null @@ -1,76 +0,0 @@ -int extpipeactive = 0; - -void -#if EXTERNALPIPEIN_PATCH -extpipe(const Arg *arg, int in) -#else -externalpipe(const Arg *arg) -#endif // EXTERNALPIPEIN_PATCH -{ - int to[2]; - char buf[UTF_SIZ]; - void (*oldsigpipe)(int); - Glyph *bp, *end; - int lastpos, n, newline; - - if (pipe(to) == -1) - return; - - switch (fork()) { - case -1: - close(to[0]); - close(to[1]); - return; - case 0: - dup2(to[0], STDIN_FILENO); - close(to[0]); - close(to[1]); - #if EXTERNALPIPEIN_PATCH - if (in) - dup2(csdfd, STDOUT_FILENO); - close(csdfd); - #endif // EXTERNALPIPEIN_PATCH - execvp(((char **)arg->v)[0], (char **)arg->v); - fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]); - perror("failed"); - exit(0); - } - - close(to[0]); - /* ignore sigpipe for now, in case child exists early */ - oldsigpipe = signal(SIGPIPE, SIG_IGN); - newline = 0; - for (n = 0; n < term.row; n++) { - bp = term.line[n]; - lastpos = MIN(tlinelen(n) + 1, term.col) - 1; - if (lastpos < 0) - break; - end = &bp[lastpos + 1]; - for (; bp < end; ++bp) - if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0) - break; - if ((newline = term.line[n][lastpos].mode & ATTR_WRAP)) - continue; - if (xwrite(to[1], "\n", 1) < 0) - break; - newline = 0; - } - if (newline) - (void)xwrite(to[1], "\n", 1); - close(to[1]); - /* restore */ - signal(SIGPIPE, oldsigpipe); - extpipeactive = 1; -} - -#if EXTERNALPIPEIN_PATCH -void -externalpipe(const Arg *arg) { - extpipe(arg, 0); -} - -void -externalpipein(const Arg *arg) { - extpipe(arg, 1); -} -#endif // EXTERNALPIPEIN_PATCH \ No newline at end of file diff --git a/desktop/.st/patch/externalpipe.h b/desktop/.st/patch/externalpipe.h deleted file mode 100644 index 764504b..0000000 --- a/desktop/.st/patch/externalpipe.h +++ /dev/null @@ -1,4 +0,0 @@ -void externalpipe(const Arg *); -#if EXTERNALPIPEIN_PATCH -void externalpipein(const Arg *); -#endif // EXTERNALPIPEIN_PATCH \ No newline at end of file diff --git a/desktop/.st/patch/fixkeyboardinput.c b/desktop/.st/patch/fixkeyboardinput.c deleted file mode 100644 index 75f8f40..0000000 --- a/desktop/.st/patch/fixkeyboardinput.c +++ /dev/null @@ -1,811 +0,0 @@ -/* - * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) - * to be mapped below, add them to this array. - */ -static KeySym mappedkeys[] = { - XK_space, - XK_m, - XK_i, - XK_A, - XK_B, - XK_C, - XK_D, - XK_E, - XK_F, - XK_G, - XK_H, - XK_I, - XK_K, - XK_J, - XK_L, - XK_M, - XK_N, - XK_O, - XK_P, - XK_Q, - XK_R, - XK_S, - XK_T, - XK_U, - XK_V, - XK_W, - XK_X, - XK_Y, - XK_Z, - XK_0, - XK_1, - XK_2, - XK_3, - XK_4, - XK_5, - XK_6, - XK_7, - XK_8, - XK_9, - XK_exclam, - XK_quotedbl, - XK_numbersign, - XK_dollar, - XK_percent, - XK_ampersand, - XK_apostrophe, - XK_parenleft, - XK_parenright, - XK_asterisk, - XK_plus, - XK_comma, - XK_minus, - XK_period, - XK_slash, - XK_colon, - XK_semicolon, - XK_less, - XK_equal, - XK_greater, - XK_question, - XK_at, - XK_bracketleft, - XK_backslash, - XK_bracketright, - XK_asciicircum, - XK_underscore, - XK_grave, - XK_braceleft, - XK_bar, - XK_braceright, - XK_asciitilde, -}; - -/* - * 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_Prior, ShiftMask, "\033[5;2~", 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_Next, ShiftMask, "\033[6;2~", 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_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_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_NO_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_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_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_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_Prior, ControlMask, "\033[5;5~", 0, 0}, - { XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_Next, ControlMask, "\033[6;5~", 0, 0}, - { XK_Next, ShiftMask, "\033[6;2~", 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}, - - // libtermkey compatible keyboard input - { XK_KP_Home, XK_NO_MOD, "\033[H", 0, -1}, - { XK_KP_Home, XK_NO_MOD, "\033[1~", 0, +1}, - { XK_KP_Home, ControlMask, "\033[149;5u", 0, 0}, - { XK_KP_Home, ControlMask|ShiftMask, "\033[149;6u", 0, 0}, - { XK_KP_Home, Mod1Mask, "\033[149;3u", 0, 0}, - { XK_KP_Home, Mod1Mask|ControlMask, "\033[149;7u", 0, 0}, - { XK_KP_Home, Mod1Mask|ControlMask|ShiftMask, "\033[149;8u", 0, 0}, - { XK_KP_Home, Mod1Mask|ShiftMask, "\033[149;4u", 0, 0}, - { XK_KP_Home, ShiftMask, "\033[149;2u", 0, 0}, - { XK_KP_Up, XK_NO_MOD, "\033Ox", +1, 0}, - { XK_KP_Up, XK_NO_MOD, "\033[A", 0, -1}, - { XK_KP_Up, XK_NO_MOD, "\033OA", 0, +1}, - { XK_KP_Up, ControlMask, "\033[151;5u", 0, 0}, - { XK_KP_Up, ControlMask|ShiftMask, "\033[151;6u", 0, 0}, - { XK_KP_Up, Mod1Mask, "\033[151;3u", 0, 0}, - { XK_KP_Up, Mod1Mask|ControlMask, "\033[151;7u", 0, 0}, - { XK_KP_Up, Mod1Mask|ControlMask|ShiftMask, "\033[151;8u", 0, 0}, - { XK_KP_Up, Mod1Mask|ShiftMask, "\033[151;4u", 0, 0}, - { XK_KP_Up, ShiftMask, "\033[151;2u", 0, 0}, - { XK_KP_Down, XK_NO_MOD, "\033Or", +1, 0}, - { XK_KP_Down, XK_NO_MOD, "\033[B", 0, -1}, - { XK_KP_Down, XK_NO_MOD, "\033OB", 0, +1}, - { XK_KP_Down, ControlMask, "\033[153;5u", 0, 0}, - { XK_KP_Down, ControlMask|ShiftMask, "\033[153;6u", 0, 0}, - { XK_KP_Down, Mod1Mask, "\033[153;3u", 0, 0}, - { XK_KP_Down, Mod1Mask|ControlMask, "\033[153;7u", 0, 0}, - { XK_KP_Down, Mod1Mask|ControlMask|ShiftMask, "\033[153;8u", 0, 0}, - { XK_KP_Down, Mod1Mask|ShiftMask, "\033[153;4u", 0, 0}, - { XK_KP_Down, ShiftMask, "\033[153;2u", 0, 0}, - { XK_KP_Left, XK_NO_MOD, "\033Ot", +1, 0}, - { XK_KP_Left, XK_NO_MOD, "\033[D", 0, -1}, - { XK_KP_Left, XK_NO_MOD, "\033OD", 0, +1}, - { XK_KP_Left, ControlMask, "\033[150;5u", 0, 0}, - { XK_KP_Left, ControlMask|ShiftMask, "\033[150;6u", 0, 0}, - { XK_KP_Left, Mod1Mask, "\033[150;3u", 0, 0}, - { XK_KP_Left, Mod1Mask|ControlMask, "\033[150;7u", 0, 0}, - { XK_KP_Left, Mod1Mask|ControlMask|ShiftMask, "\033[150;8u", 0, 0}, - { XK_KP_Left, Mod1Mask|ShiftMask, "\033[150;4u", 0, 0}, - { XK_KP_Left, ShiftMask, "\033[150;2u", 0, 0}, - { XK_KP_Right, XK_NO_MOD, "\033Ov", +1, 0}, - { XK_KP_Right, XK_NO_MOD, "\033[C", 0, -1}, - { XK_KP_Right, XK_NO_MOD, "\033OC", 0, +1}, - { XK_KP_Right, ControlMask, "\033[152;5u", 0, 0}, - { XK_KP_Right, ControlMask|ShiftMask, "\033[152;6u", 0, 0}, - { XK_KP_Right, Mod1Mask, "\033[152;3u", 0, 0}, - { XK_KP_Right, Mod1Mask|ControlMask, "\033[152;7u", 0, 0}, - { XK_KP_Right, Mod1Mask|ControlMask|ShiftMask, "\033[152;8u", 0, 0}, - { XK_KP_Right, Mod1Mask|ShiftMask, "\033[152;4u", 0, 0}, - { XK_KP_Right, ShiftMask, "\033[152;2u", 0, 0}, - { XK_KP_Prior, XK_NO_MOD, "\033[5~", 0, 0}, - { XK_KP_Prior, ControlMask, "\033[154;5u", 0, 0}, - { XK_KP_Prior, ControlMask|ShiftMask, "\033[154;6u", 0, 0}, - { XK_KP_Prior, Mod1Mask, "\033[154;3u", 0, 0}, - { XK_KP_Prior, Mod1Mask|ControlMask, "\033[154;7u", 0, 0}, - { XK_KP_Prior, Mod1Mask|ControlMask|ShiftMask, "\033[154;8u", 0, 0}, - { XK_KP_Prior, Mod1Mask|ShiftMask, "\033[154;4u", 0, 0}, - { XK_KP_Begin, XK_NO_MOD, "\033[E", 0, 0}, - { XK_KP_Begin, ControlMask, "\033[157;5u", 0, 0}, - { XK_KP_Begin, ControlMask|ShiftMask, "\033[157;6u", 0, 0}, - { XK_KP_Begin, Mod1Mask, "\033[157;3u", 0, 0}, - { XK_KP_Begin, Mod1Mask|ControlMask, "\033[157;7u", 0, 0}, - { XK_KP_Begin, Mod1Mask|ControlMask|ShiftMask, "\033[157;8u", 0, 0}, - { XK_KP_Begin, Mod1Mask|ShiftMask, "\033[157;4u", 0, 0}, - { XK_KP_Begin, ShiftMask, "\033[157;2u", 0, 0}, - { XK_KP_End, XK_NO_MOD, "\033[4~", 0, 0}, - { XK_KP_End, ControlMask|ShiftMask, "\033[156;6u", 0, 0}, - { XK_KP_End, Mod1Mask, "\033[156;3u", 0, 0}, - { XK_KP_End, Mod1Mask|ControlMask, "\033[156;7u", 0, 0}, - { XK_KP_End, Mod1Mask|ControlMask|ShiftMask, "\033[156;8u", 0, 0}, - { XK_KP_End, Mod1Mask|ShiftMask, "\033[156;4u", 0, 0}, - { XK_KP_Next, XK_NO_MOD, "\033[6~", 0, 0}, - { XK_KP_Next, ControlMask, "\033[155;5u", 0, 0}, - { XK_KP_Next, ControlMask|ShiftMask, "\033[155;6u", 0, 0}, - { XK_KP_Next, Mod1Mask, "\033[155;3u", 0, 0}, - { XK_KP_Next, Mod1Mask|ControlMask, "\033[155;7u", 0, 0}, - { XK_KP_Next, Mod1Mask|ControlMask|ShiftMask, "\033[155;8u", 0, 0}, - { XK_KP_Next, Mod1Mask|ShiftMask, "\033[155;4u", 0, 0}, - { XK_KP_Insert, XK_NO_MOD, "\033[4h", -1, 0}, - { XK_KP_Insert, XK_NO_MOD, "\033[2~", +1, 0}, - { XK_KP_Insert, ControlMask|ShiftMask, "\033[158;6u", 0, 0}, - { XK_KP_Insert, Mod1Mask, "\033[158;3u", 0, 0}, - { XK_KP_Insert, Mod1Mask|ControlMask, "\033[158;7u", 0, 0}, - { XK_KP_Insert, Mod1Mask|ControlMask|ShiftMask, "\033[158;8u", 0, 0}, - { XK_KP_Insert, Mod1Mask|ShiftMask, "\033[158;4u", 0, 0}, - { XK_KP_Delete, XK_NO_MOD, "\033[P", -1, 0}, - { XK_KP_Delete, XK_NO_MOD, "\033[3~", +1, 0}, - { XK_KP_Delete, ControlMask|ShiftMask, "\033[159;6u", 0, 0}, - { XK_KP_Delete, Mod1Mask, "\033[159;3u", 0, 0}, - { XK_KP_Delete, Mod1Mask|ControlMask, "\033[159;7u", 0, 0}, - { XK_KP_Delete, Mod1Mask|ControlMask|ShiftMask, "\033[159;8u", 0, 0}, - { XK_KP_Delete, Mod1Mask|ShiftMask, "\033[159;4u", 0, 0}, - { XK_KP_Multiply, XK_NO_MOD, "\033Oj", +2, 0}, - { XK_KP_Multiply, ControlMask, "\033[170;5u", 0, 0}, - { XK_KP_Multiply, ControlMask|ShiftMask, "\033[170;6u", 0, 0}, - { XK_KP_Multiply, Mod1Mask, "\033[170;3u", 0, 0}, - { XK_KP_Multiply, Mod1Mask|ControlMask, "\033[170;7u", 0, 0}, - { XK_KP_Multiply, Mod1Mask|ControlMask|ShiftMask, "\033[170;8u", 0, 0}, - { XK_KP_Multiply, Mod1Mask|ShiftMask, "\033[170;4u", 0, 0}, - { XK_KP_Multiply, ShiftMask, "\033[170;2u", 0, 0}, - { XK_KP_Add, XK_NO_MOD, "\033Ok", +2, 0}, - { XK_KP_Add, ControlMask, "\033[171;5u", 0, 0}, - { XK_KP_Add, ControlMask|ShiftMask, "\033[171;6u", 0, 0}, - { XK_KP_Add, Mod1Mask, "\033[171;3u", 0, 0}, - { XK_KP_Add, Mod1Mask|ControlMask, "\033[171;7u", 0, 0}, - { XK_KP_Add, Mod1Mask|ControlMask|ShiftMask, "\033[171;8u", 0, 0}, - { XK_KP_Add, Mod1Mask|ShiftMask, "\033[171;4u", 0, 0}, - { XK_KP_Add, ShiftMask, "\033[171;2u", 0, 0}, - { XK_KP_Enter, XK_NO_MOD, "\033OM", +2, 0}, - { XK_KP_Enter, XK_NO_MOD, "\r", -1, 0}, - { XK_KP_Enter, XK_NO_MOD, "\r\n", -1, 0}, - { XK_KP_Enter, ControlMask, "\033[141;5u", 0, 0}, - { XK_KP_Enter, ControlMask|ShiftMask, "\033[141;6u", 0, 0}, - { XK_KP_Enter, Mod1Mask, "\033[141;3u", 0, 0}, - { XK_KP_Enter, Mod1Mask|ControlMask, "\033[141;7u", 0, 0}, - { XK_KP_Enter, Mod1Mask|ControlMask|ShiftMask, "\033[141;8u", 0, 0}, - { XK_KP_Enter, Mod1Mask|ShiftMask, "\033[141;4u", 0, 0}, - { XK_KP_Enter, ShiftMask, "\033[141;2u", 0, 0}, - { XK_KP_Subtract, XK_NO_MOD, "\033Om", +2, 0}, - { XK_KP_Subtract, ControlMask, "\033[173;5u", 0, 0}, - { XK_KP_Subtract, ControlMask|ShiftMask, "\033[173;6u", 0, 0}, - { XK_KP_Subtract, Mod1Mask, "\033[173;3u", 0, 0}, - { XK_KP_Subtract, Mod1Mask|ControlMask, "\033[173;7u", 0, 0}, - { XK_KP_Subtract, Mod1Mask|ControlMask|ShiftMask, "\033[173;8u", 0, 0}, - { XK_KP_Subtract, Mod1Mask|ShiftMask, "\033[173;4u", 0, 0}, - { XK_KP_Subtract, ShiftMask, "\033[173;2u", 0, 0}, - { XK_KP_Decimal, XK_NO_MOD, "\033On", +2, 0}, - { XK_KP_Decimal, ControlMask, "\033[174;5u", 0, 0}, - { XK_KP_Decimal, ControlMask|ShiftMask, "\033[174;6u", 0, 0}, - { XK_KP_Decimal, Mod1Mask, "\033[174;3u", 0, 0}, - { XK_KP_Decimal, Mod1Mask|ControlMask, "\033[174;7u", 0, 0}, - { XK_KP_Decimal, Mod1Mask|ControlMask|ShiftMask, "\033[174;8u", 0, 0}, - { XK_KP_Decimal, Mod1Mask|ShiftMask, "\033[174;4u", 0, 0}, - { XK_KP_Decimal, ShiftMask, "\033[174;2u", 0, 0}, - { XK_KP_Divide, XK_NO_MOD, "\033Oo", +2, 0}, - { XK_KP_Divide, ControlMask, "\033[175;5u", 0, 0}, - { XK_KP_Divide, ControlMask|ShiftMask, "\033[175;6u", 0, 0}, - { XK_KP_Divide, Mod1Mask, "\033[175;3u", 0, 0}, - { XK_KP_Divide, Mod1Mask|ControlMask, "\033[175;7u", 0, 0}, - { XK_KP_Divide, Mod1Mask|ControlMask|ShiftMask, "\033[175;8u", 0, 0}, - { XK_KP_Divide, Mod1Mask|ShiftMask, "\033[175;4u", 0, 0}, - { XK_KP_Divide, ShiftMask, "\033[175;2u", 0, 0}, - { XK_KP_0, XK_NO_MOD, "\033Op", +2, 0}, - { XK_KP_0, ControlMask, "\033[176;5u", 0, 0}, - { XK_KP_0, ControlMask|ShiftMask, "\033[176;6u", 0, 0}, - { XK_KP_0, Mod1Mask, "\033[176;3u", 0, 0}, - { XK_KP_0, Mod1Mask|ControlMask, "\033[176;7u", 0, 0}, - { XK_KP_0, Mod1Mask|ControlMask|ShiftMask, "\033[176;8u", 0, 0}, - { XK_KP_0, Mod1Mask|ShiftMask, "\033[176;4u", 0, 0}, - { XK_KP_0, ShiftMask, "\033[176;2u", 0, 0}, - { XK_KP_1, XK_NO_MOD, "\033Oq", +2, 0}, - { XK_KP_0, ControlMask, "\033[177;5u", 0, 0}, - { XK_KP_0, ControlMask|ShiftMask, "\033[177;6u", 0, 0}, - { XK_KP_0, Mod1Mask, "\033[177;3u", 0, 0}, - { XK_KP_0, Mod1Mask|ControlMask, "\033[177;7u", 0, 0}, - { XK_KP_0, Mod1Mask|ControlMask|ShiftMask, "\033[177;8u", 0, 0}, - { XK_KP_0, Mod1Mask|ShiftMask, "\033[177;4u", 0, 0}, - { XK_KP_0, ShiftMask, "\033[177;2u", 0, 0}, - { XK_KP_2, XK_NO_MOD, "\033Or", +2, 0}, - { XK_KP_2, ControlMask, "\033[178;5u", 0, 0}, - { XK_KP_2, ControlMask|ShiftMask, "\033[178;6u", 0, 0}, - { XK_KP_2, Mod1Mask, "\033[178;3u", 0, 0}, - { XK_KP_2, Mod1Mask|ControlMask, "\033[178;7u", 0, 0}, - { XK_KP_2, Mod1Mask|ControlMask|ShiftMask, "\033[178;8u", 0, 0}, - { XK_KP_2, Mod1Mask|ShiftMask, "\033[178;4u", 0, 0}, - { XK_KP_2, ShiftMask, "\033[178;2u", 0, 0}, - { XK_KP_3, XK_NO_MOD, "\033Os", +2, 0}, - { XK_KP_3, ControlMask, "\033[179;5u", 0, 0}, - { XK_KP_3, ControlMask|ShiftMask, "\033[179;6u", 0, 0}, - { XK_KP_3, Mod1Mask, "\033[179;3u", 0, 0}, - { XK_KP_3, Mod1Mask|ControlMask, "\033[179;7u", 0, 0}, - { XK_KP_3, Mod1Mask|ControlMask|ShiftMask, "\033[179;8u", 0, 0}, - { XK_KP_3, Mod1Mask|ShiftMask, "\033[179;4u", 0, 0}, - { XK_KP_3, ShiftMask, "\033[179;2u", 0, 0}, - { XK_KP_4, XK_NO_MOD, "\033Ot", +2, 0}, - { XK_KP_4, ControlMask, "\033[180;5u", 0, 0}, - { XK_KP_4, ControlMask|ShiftMask, "\033[180;6u", 0, 0}, - { XK_KP_4, Mod1Mask, "\033[180;3u", 0, 0}, - { XK_KP_4, Mod1Mask|ControlMask, "\033[180;7u", 0, 0}, - { XK_KP_4, Mod1Mask|ControlMask|ShiftMask, "\033[180;8u", 0, 0}, - { XK_KP_4, Mod1Mask|ShiftMask, "\033[180;4u", 0, 0}, - { XK_KP_4, ShiftMask, "\033[180;2u", 0, 0}, - { XK_KP_5, XK_NO_MOD, "\033Ou", +2, 0}, - { XK_KP_5, ControlMask, "\033[181;5u", 0, 0}, - { XK_KP_5, ControlMask|ShiftMask, "\033[181;6u", 0, 0}, - { XK_KP_5, Mod1Mask, "\033[181;3u", 0, 0}, - { XK_KP_5, Mod1Mask|ControlMask, "\033[181;7u", 0, 0}, - { XK_KP_5, Mod1Mask|ControlMask|ShiftMask, "\033[181;8u", 0, 0}, - { XK_KP_5, Mod1Mask|ShiftMask, "\033[181;4u", 0, 0}, - { XK_KP_5, ShiftMask, "\033[181;2u", 0, 0}, - { XK_KP_6, XK_NO_MOD, "\033Ov", +2, 0}, - { XK_KP_6, ControlMask, "\033[182;5u", 0, 0}, - { XK_KP_6, ControlMask|ShiftMask, "\033[182;6u", 0, 0}, - { XK_KP_6, Mod1Mask, "\033[182;3u", 0, 0}, - { XK_KP_6, Mod1Mask|ControlMask, "\033[182;7u", 0, 0}, - { XK_KP_6, Mod1Mask|ControlMask|ShiftMask, "\033[182;8u", 0, 0}, - { XK_KP_6, Mod1Mask|ShiftMask, "\033[182;4u", 0, 0}, - { XK_KP_6, ShiftMask, "\033[182;2u", 0, 0}, - { XK_KP_7, XK_NO_MOD, "\033Ow", +2, 0}, - { XK_KP_7, ControlMask, "\033[183;5u", 0, 0}, - { XK_KP_7, ControlMask|ShiftMask, "\033[183;6u", 0, 0}, - { XK_KP_7, Mod1Mask, "\033[183;3u", 0, 0}, - { XK_KP_7, Mod1Mask|ControlMask, "\033[183;7u", 0, 0}, - { XK_KP_7, Mod1Mask|ControlMask|ShiftMask, "\033[183;8u", 0, 0}, - { XK_KP_7, Mod1Mask|ShiftMask, "\033[183;4u", 0, 0}, - { XK_KP_7, ShiftMask, "\033[183;2u", 0, 0}, - { XK_KP_8, XK_NO_MOD, "\033Ox", +2, 0}, - { XK_KP_8, ControlMask, "\033[184;5u", 0, 0}, - { XK_KP_8, ControlMask|ShiftMask, "\033[184;6u", 0, 0}, - { XK_KP_8, Mod1Mask, "\033[184;3u", 0, 0}, - { XK_KP_8, Mod1Mask|ControlMask, "\033[184;7u", 0, 0}, - { XK_KP_8, Mod1Mask|ControlMask|ShiftMask, "\033[184;8u", 0, 0}, - { XK_KP_8, Mod1Mask|ShiftMask, "\033[184;4u", 0, 0}, - { XK_KP_8, ShiftMask, "\033[184;2u", 0, 0}, - { XK_KP_9, XK_NO_MOD, "\033Oy", +2, 0}, - { XK_KP_9, ControlMask, "\033[185;5u", 0, 0}, - { XK_KP_9, ControlMask|ShiftMask, "\033[185;6u", 0, 0}, - { XK_KP_9, Mod1Mask, "\033[185;3u", 0, 0}, - { XK_KP_9, Mod1Mask|ControlMask, "\033[185;7u", 0, 0}, - { XK_KP_9, Mod1Mask|ControlMask|ShiftMask, "\033[185;8u", 0, 0}, - { XK_KP_9, Mod1Mask|ShiftMask, "\033[185;4u", 0, 0}, - { XK_KP_9, ShiftMask, "\033[185;2u", 0, 0}, - { XK_BackSpace, ControlMask, "\033[127;5u", 0, 0}, - { XK_BackSpace, ControlMask|ShiftMask, "\033[127;6u", 0, 0}, - { XK_BackSpace, Mod1Mask, "\033[127;3u", 0, 0}, - { XK_BackSpace, Mod1Mask|ControlMask, "\033[127;7u", 0, 0}, - { XK_BackSpace, Mod1Mask|ControlMask|ShiftMask, "\033[127;8u", 0, 0}, - { XK_BackSpace, Mod1Mask|ShiftMask, "\033[127;4u", 0, 0}, - { XK_BackSpace, ShiftMask, "\033[127;2u", 0, 0}, - { XK_Tab, ControlMask, "\033[9;5u", 0, 0}, - { XK_Tab, ControlMask|ShiftMask, "\033[1;5Z", 0, 0}, - { XK_Tab, Mod1Mask, "\033[1;3Z", 0, 0}, - { XK_Tab, Mod1Mask|ControlMask, "\033[1;7Z", 0, 0}, - { XK_Tab, Mod1Mask|ControlMask|ShiftMask, "\033[1;8Z", 0, 0}, - { XK_Tab, Mod1Mask|ShiftMask, "\033[1;4Z", 0, 0}, - { XK_Return, ControlMask, "\033[13;5u", 0, 0}, - { XK_Return, ControlMask|ShiftMask, "\033[13;6u", 0, 0}, - { XK_Return, Mod1Mask, "\033[13;3u", 0, 0}, - { XK_Return, Mod1Mask|ControlMask, "\033[13;7u", 0, 0}, - { XK_Return, Mod1Mask|ControlMask|ShiftMask, "\033[13;8u", 0, 0}, - { XK_Return, Mod1Mask|ShiftMask, "\033[13;4u", 0, 0}, - { XK_Return, ShiftMask, "\033[13;2u", 0, 0}, - { XK_Pause, ControlMask, "\033[18;5u", 0, 0}, - { XK_Pause, ControlMask|ShiftMask, "\033[18;6u", 0, 0}, - { XK_Pause, Mod1Mask, "\033[18;3u", 0, 0}, - { XK_Pause, Mod1Mask|ControlMask, "\033[18;7u", 0, 0}, - { XK_Pause, Mod1Mask|ControlMask|ShiftMask, "\033[18;8u", 0, 0}, - { XK_Pause, Mod1Mask|ShiftMask, "\033[18;4u", 0, 0}, - { XK_Pause, ShiftMask, "\033[18;2u", 0, 0}, - { XK_Scroll_Lock, ControlMask, "\033[20;5u", 0, 0}, - { XK_Scroll_Lock, ControlMask|ShiftMask, "\033[20;6u", 0, 0}, - { XK_Scroll_Lock, Mod1Mask, "\033[20;3u", 0, 0}, - { XK_Scroll_Lock, Mod1Mask|ControlMask, "\033[20;7u", 0, 0}, - { XK_Scroll_Lock, Mod1Mask|ControlMask|ShiftMask, "\033[20;8u", 0, 0}, - { XK_Scroll_Lock, Mod1Mask|ShiftMask, "\033[20;4u", 0, 0}, - { XK_Scroll_Lock, ShiftMask, "\033[20;2u", 0, 0}, - { XK_Escape, ControlMask, "\033[27;5u", 0, 0}, - { XK_Escape, ControlMask|ShiftMask, "\033[27;6u", 0, 0}, - { XK_Escape, Mod1Mask, "\033[27;3u", 0, 0}, - { XK_Escape, Mod1Mask|ControlMask, "\033[27;7u", 0, 0}, - { XK_Escape, Mod1Mask|ControlMask|ShiftMask, "\033[27;8u", 0, 0}, - { XK_Escape, Mod1Mask|ShiftMask, "\033[27;4u", 0, 0}, - { XK_Escape, ShiftMask, "\033[27;2u", 0, 0}, - { XK_Home, XK_NO_MOD, "\033[H", 0, -1}, - { XK_Home, XK_NO_MOD, "\033[1~", 0, +1}, - { XK_Home, ControlMask|ShiftMask, "\033[80;6u", 0, 0}, - { XK_Home, Mod1Mask, "\033[80;3u", 0, 0}, - { XK_Home, Mod1Mask|ControlMask, "\033[80;7u", 0, 0}, - { XK_Home, Mod1Mask|ControlMask|ShiftMask, "\033[80;8u", 0, 0}, - { XK_Home, Mod1Mask|ShiftMask, "\033[80;4u", 0, 0}, - { XK_End, XK_NO_MOD, "\033[4~", 0, 0}, - { XK_End, ControlMask|ShiftMask, "\033[87;6u", 0, 0}, - { XK_End, Mod1Mask, "\033[87;3u", 0, 0}, - { XK_End, Mod1Mask|ControlMask, "\033[87;7u", 0, 0}, - { XK_End, Mod1Mask|ControlMask|ShiftMask, "\033[87;8u", 0, 0}, - { XK_End, Mod1Mask|ShiftMask, "\033[87;4u", 0, 0}, - { XK_Prior, XK_NO_MOD, "\033[5~", 0, 0}, - { XK_Prior, ControlMask|ShiftMask, "\033[85;6u", 0, 0}, - { XK_Prior, Mod1Mask, "\033[85;3u", 0, 0}, - { XK_Prior, Mod1Mask|ControlMask, "\033[85;7u", 0, 0}, - { XK_Prior, Mod1Mask|ControlMask|ShiftMask, "\033[85;8u", 0, 0}, - { XK_Prior, Mod1Mask|ShiftMask, "\033[85;4u", 0, 0}, - { XK_Next, XK_NO_MOD, "\033[6~", 0, 0}, - { XK_Next, ControlMask|ShiftMask, "\033[86;6u", 0, 0}, - { XK_Next, Mod1Mask, "\033[86;3u", 0, 0}, - { XK_Next, Mod1Mask|ControlMask, "\033[86;7u", 0, 0}, - { XK_Next, Mod1Mask|ControlMask|ShiftMask, "\033[86;8u", 0, 0}, - { XK_Next, Mod1Mask|ShiftMask, "\033[86;4u", 0, 0}, - { XK_Print, ControlMask, "\033[97;5u", 0, 0}, - { XK_Print, ControlMask|ShiftMask, "\033[97;6u", 0, 0}, - { XK_Print, Mod1Mask, "\033[97;3u", 0, 0}, - { XK_Print, Mod1Mask|ControlMask, "\033[97;7u", 0, 0}, - { XK_Print, Mod1Mask|ControlMask|ShiftMask, "\033[97;8u", 0, 0}, - { XK_Print, Mod1Mask|ShiftMask, "\033[97;4u", 0, 0}, - { XK_Print, ShiftMask, "\033[97;2u", 0, 0}, - { XK_Insert, XK_NO_MOD, "\033[4h", -1, 0}, - { XK_Insert, XK_NO_MOD, "\033[2~", +1, 0}, - { XK_Insert, ControlMask|ShiftMask, "\033[99;6u", 0, 0}, - { XK_Insert, Mod1Mask, "\033[99;3u", 0, 0}, - { XK_Insert, Mod1Mask|ControlMask, "\033[99;7u", 0, 0}, - { XK_Insert, Mod1Mask|ControlMask|ShiftMask, "\033[99;8u", 0, 0}, - { XK_Insert, Mod1Mask|ShiftMask, "\033[99;4u", 0, 0}, - { XK_Menu, ControlMask, "\033[103;5u", 0, 0}, - { XK_Menu, ControlMask|ShiftMask, "\033[103;6u", 0, 0}, - { XK_Menu, Mod1Mask, "\033[103;3u", 0, 0}, - { XK_Menu, Mod1Mask|ControlMask, "\033[103;7u", 0, 0}, - { XK_Menu, Mod1Mask|ControlMask|ShiftMask, "\033[103;8u", 0, 0}, - { XK_Menu, Mod1Mask|ShiftMask, "\033[103;4u", 0, 0}, - { XK_Menu, ShiftMask, "\033[103;2u", 0, 0}, - { XK_Delete, XK_NO_MOD, "\033[P", -1, 0}, - { XK_Delete, XK_NO_MOD, "\033[3~", +1, 0}, - { XK_Delete, ControlMask|ShiftMask, "\033[255;6u", 0, 0}, - { XK_Delete, Mod1Mask, "\033[255;3u", 0, 0}, - { XK_Delete, Mod1Mask|ControlMask, "\033[255;7u", 0, 0}, - { XK_Delete, Mod1Mask|ControlMask|ShiftMask, "\033[255;8u", 0, 0}, - { XK_Delete, Mod1Mask|ShiftMask, "\033[255;4u", 0, 0}, - { XK_i, ControlMask, "\033[105;5u", 0, 0}, - { XK_i, Mod1Mask|ControlMask, "\033[105;7u", 0, 0}, - { XK_m, ControlMask, "\033[109;5u", 0, 0}, - { XK_m, Mod1Mask|ControlMask, "\033[109;7u", 0, 0}, - { XK_space, ControlMask|ShiftMask, "\033[32;6u", 0, 0}, - { XK_space, Mod1Mask, "\033[32;3u", 0, 0}, - { XK_space, Mod1Mask|ControlMask, "\033[32;7u", 0, 0}, - { XK_space, Mod1Mask|ControlMask|ShiftMask, "\033[32;8u", 0, 0}, - { XK_space, Mod1Mask|ShiftMask, "\033[32;4u", 0, 0}, - { XK_space, ShiftMask, "\033[32;2u", 0, 0}, - { XK_0, ControlMask, "\033[48;5u", 0, 0}, - { XK_A, ControlMask|ShiftMask, "\033[65;6u", 0, 0}, - { XK_B, ControlMask|ShiftMask, "\033[66;6u", 0, 0}, - { XK_C, ControlMask|ShiftMask, "\033[67;6u", 0, 0}, - { XK_D, ControlMask|ShiftMask, "\033[68;6u", 0, 0}, - { XK_E, ControlMask|ShiftMask, "\033[69;6u", 0, 0}, - { XK_F, ControlMask|ShiftMask, "\033[70;6u", 0, 0}, - { XK_G, ControlMask|ShiftMask, "\033[71;6u", 0, 0}, - { XK_H, ControlMask|ShiftMask, "\033[72;6u", 0, 0}, - { XK_I, ControlMask|ShiftMask, "\033[73;6u", 0, 0}, - { XK_I, Mod1Mask|ControlMask|ShiftMask, "\033[73;8u", 0, 0}, - { XK_J, ControlMask|ShiftMask, "\033[75;6u", 0, 0}, - { XK_K, ControlMask|ShiftMask, "\033[74;6u", 0, 0}, - { XK_L, ControlMask|ShiftMask, "\033[76;6u", 0, 0}, - { XK_M, ControlMask|ShiftMask, "\033[77;6u", 0, 0}, - { XK_M, Mod1Mask|ControlMask|ShiftMask, "\033[77;8u", 0, 0}, - { XK_N, ControlMask|ShiftMask, "\033[78;6u", 0, 0}, - { XK_O, ControlMask|ShiftMask, "\033[79;6u", 0, 0}, - { XK_P, ControlMask|ShiftMask, "\033[80;6u", 0, 0}, - { XK_Q, ControlMask|ShiftMask, "\033[81;6u", 0, 0}, - { XK_R, ControlMask|ShiftMask, "\033[82;6u", 0, 0}, - { XK_S, ControlMask|ShiftMask, "\033[83;6u", 0, 0}, - { XK_T, ControlMask|ShiftMask, "\033[84;6u", 0, 0}, - { XK_U, ControlMask|ShiftMask, "\033[85;6u", 0, 0}, - { XK_V, ControlMask|ShiftMask, "\033[86;6u", 0, 0}, - { XK_W, ControlMask|ShiftMask, "\033[87;6u", 0, 0}, - { XK_X, ControlMask|ShiftMask, "\033[88;6u", 0, 0}, - { XK_Y, ControlMask|ShiftMask, "\033[89;6u", 0, 0}, - { XK_Z, ControlMask|ShiftMask, "\033[90;6u", 0, 0}, - { XK_0, Mod1Mask|ControlMask, "\033[48;7u", 0, 0}, - { XK_1, ControlMask, "\033[49;5u", 0, 0}, - { XK_1, Mod1Mask|ControlMask, "\033[49;7u", 0, 0}, - { XK_2, ControlMask, "\033[50;5u", 0, 0}, - { XK_2, Mod1Mask|ControlMask, "\033[50;7u", 0, 0}, - { XK_3, ControlMask, "\033[51;5u", 0, 0}, - { XK_3, Mod1Mask|ControlMask, "\033[51;7u", 0, 0}, - { XK_4, ControlMask, "\033[52;5u", 0, 0}, - { XK_4, Mod1Mask|ControlMask, "\033[52;7u", 0, 0}, - { XK_5, ControlMask, "\033[53;5u", 0, 0}, - { XK_5, Mod1Mask|ControlMask, "\033[53;7u", 0, 0}, - { XK_6, ControlMask, "\033[54;5u", 0, 0}, - { XK_6, Mod1Mask|ControlMask, "\033[54;7u", 0, 0}, - { XK_7, ControlMask, "\033[55;5u", 0, 0}, - { XK_7, Mod1Mask|ControlMask, "\033[55;7u", 0, 0}, - { XK_8, ControlMask, "\033[56;5u", 0, 0}, - { XK_8, Mod1Mask|ControlMask, "\033[56;7u", 0, 0}, - { XK_9, ControlMask, "\033[57;5u", 0, 0}, - { XK_9, Mod1Mask|ControlMask, "\033[57;7u", 0, 0}, - { XK_ampersand, ControlMask, "\033[38;5u", 0, 0}, - { XK_ampersand, ControlMask|ShiftMask, "\033[38;6u", 0, 0}, - { XK_ampersand, Mod1Mask, "\033[38;3u", 0, 0}, - { XK_ampersand, Mod1Mask|ControlMask, "\033[38;7u", 0, 0}, - { XK_ampersand, Mod1Mask|ControlMask|ShiftMask, "\033[38;8u", 0, 0}, - { XK_ampersand, Mod1Mask|ShiftMask, "\033[38;4u", 0, 0}, - { XK_apostrophe, ControlMask, "\033[39;5u", 0, 0}, - { XK_apostrophe, ControlMask|ShiftMask, "\033[39;6u", 0, 0}, - { XK_apostrophe, Mod1Mask, "\033[39;3u", 0, 0}, - { XK_apostrophe, Mod1Mask|ControlMask, "\033[39;7u", 0, 0}, - { XK_apostrophe, Mod1Mask|ControlMask|ShiftMask, "\033[39;8u", 0, 0}, - { XK_apostrophe, Mod1Mask|ShiftMask, "\033[39;4u", 0, 0}, - { XK_asciicircum, ControlMask, "\033[94;5u", 0, 0}, - { XK_asciicircum, ControlMask|ShiftMask, "\033[94;6u", 0, 0}, - { XK_asciicircum, Mod1Mask, "\033[94;3u", 0, 0}, - { XK_asciicircum, Mod1Mask|ControlMask, "\033[94;7u", 0, 0}, - { XK_asciicircum, Mod1Mask|ControlMask|ShiftMask, "\033[94;8u", 0, 0}, - { XK_asciicircum, Mod1Mask|ShiftMask, "\033[94;4u", 0, 0}, - { XK_asciitilde, ControlMask, "\033[126;5u", 0, 0}, - { XK_asciitilde, ControlMask|ShiftMask, "\033[126;6u", 0, 0}, - { XK_asciitilde, Mod1Mask, "\033[126;3u", 0, 0}, - { XK_asciitilde, Mod1Mask|ControlMask, "\033[126;7u", 0, 0}, - { XK_asciitilde, Mod1Mask|ControlMask|ShiftMask, "\033[126;8u", 0, 0}, - { XK_asciitilde, Mod1Mask|ShiftMask, "\033[126;4u", 0, 0}, - { XK_asterisk, ControlMask, "\033[42;5u", 0, 0}, - { XK_asterisk, ControlMask|ShiftMask, "\033[42;6u", 0, 0}, - { XK_asterisk, Mod1Mask, "\033[42;3u", 0, 0}, - { XK_asterisk, Mod1Mask|ControlMask, "\033[42;7u", 0, 0}, - { XK_asterisk, Mod1Mask|ControlMask|ShiftMask, "\033[42;8u", 0, 0}, - { XK_asterisk, Mod1Mask|ShiftMask, "\033[42;4u", 0, 0}, - { XK_at, ControlMask, "\033[64;5u", 0, 0}, - { XK_at, ControlMask|ShiftMask, "\033[64;6u", 0, 0}, - { XK_at, Mod1Mask, "\033[64;3u", 0, 0}, - { XK_at, Mod1Mask|ControlMask, "\033[64;7u", 0, 0}, - { XK_at, Mod1Mask|ControlMask|ShiftMask, "\033[64;8u", 0, 0}, - { XK_at, Mod1Mask|ShiftMask, "\033[64;4u", 0, 0}, - { XK_backslash, ControlMask, "\033[92;5u", 0, 0}, - { XK_backslash, ControlMask|ShiftMask, "\033[92;6u", 0, 0}, - { XK_backslash, Mod1Mask, "\033[92;3u", 0, 0}, - { XK_backslash, Mod1Mask|ControlMask, "\033[92;7u", 0, 0}, - { XK_backslash, Mod1Mask|ControlMask|ShiftMask, "\033[92;8u", 0, 0}, - { XK_backslash, Mod1Mask|ShiftMask, "\033[92;4u", 0, 0}, - { XK_bar, ControlMask, "\033[124;5u", 0, 0}, - { XK_bar, ControlMask|ShiftMask, "\033[124;6u", 0, 0}, - { XK_bar, Mod1Mask, "\033[124;3u", 0, 0}, - { XK_bar, Mod1Mask|ControlMask, "\033[124;7u", 0, 0}, - { XK_bar, Mod1Mask|ControlMask|ShiftMask, "\033[124;8u", 0, 0}, - { XK_bar, Mod1Mask|ShiftMask, "\033[124;4u", 0, 0}, - { XK_braceleft, ControlMask, "\033[123;5u", 0, 0}, - { XK_braceleft, ControlMask|ShiftMask, "\033[123;6u", 0, 0}, - { XK_braceleft, Mod1Mask, "\033[123;3u", 0, 0}, - { XK_braceleft, Mod1Mask|ControlMask, "\033[123;7u", 0, 0}, - { XK_braceleft, Mod1Mask|ControlMask|ShiftMask, "\033[123;8u", 0, 0}, - { XK_braceleft, Mod1Mask|ShiftMask, "\033[123;4u", 0, 0}, - { XK_braceright, ControlMask, "\033[125;5u", 0, 0}, - { XK_braceright, ControlMask|ShiftMask, "\033[125;6u", 0, 0}, - { XK_braceright, Mod1Mask, "\033[125;3u", 0, 0}, - { XK_braceright, Mod1Mask|ControlMask, "\033[125;7u", 0, 0}, - { XK_braceright, Mod1Mask|ControlMask|ShiftMask, "\033[125;8u", 0, 0}, - { XK_braceright, Mod1Mask|ShiftMask, "\033[125;4u", 0, 0}, - { XK_bracketleft, ControlMask, "\033[91;5u", 0, 0}, - { XK_bracketleft, ControlMask|ShiftMask, "\033[91;6u", 0, 0}, - { XK_bracketleft, Mod1Mask, "\033[91;3u", 0, 0}, - { XK_bracketleft, Mod1Mask|ControlMask, "\033[91;7u", 0, 0}, - { XK_bracketleft, Mod1Mask|ControlMask|ShiftMask, "\033[91;8u", 0, 0}, - { XK_bracketleft, Mod1Mask|ShiftMask, "\033[91;4u", 0, 0}, - { XK_bracketright, ControlMask, "\033[93;5u", 0, 0}, - { XK_bracketright, ControlMask|ShiftMask, "\033[93;6u", 0, 0}, - { XK_bracketright, Mod1Mask, "\033[93;3u", 0, 0}, - { XK_bracketright, Mod1Mask|ControlMask, "\033[93;7u", 0, 0}, - { XK_bracketright, Mod1Mask|ControlMask|ShiftMask, "\033[93;8u", 0, 0}, - { XK_bracketright, Mod1Mask|ShiftMask, "\033[93;4u", 0, 0}, - { XK_colon, ControlMask, "\033[58;5u", 0, 0}, - { XK_colon, ControlMask|ShiftMask, "\033[58;6u", 0, 0}, - { XK_colon, Mod1Mask, "\033[58;3u", 0, 0}, - { XK_colon, Mod1Mask|ControlMask, "\033[58;7u", 0, 0}, - { XK_colon, Mod1Mask|ControlMask|ShiftMask, "\033[58;8u", 0, 0}, - { XK_colon, Mod1Mask|ShiftMask, "\033[58;4u", 0, 0}, - { XK_comma, ControlMask, "\033[44;5u", 0, 0}, - { XK_comma, ControlMask|ShiftMask, "\033[44;6u", 0, 0}, - { XK_comma, Mod1Mask, "\033[44;3u", 0, 0}, - { XK_comma, Mod1Mask|ControlMask, "\033[44;7u", 0, 0}, - { XK_comma, Mod1Mask|ControlMask|ShiftMask, "\033[44;8u", 0, 0}, - { XK_comma, Mod1Mask|ShiftMask, "\033[44;4u", 0, 0}, - { XK_dollar, ControlMask, "\033[36;5u", 0, 0}, - { XK_dollar, ControlMask|ShiftMask, "\033[36;6u", 0, 0}, - { XK_dollar, Mod1Mask, "\033[36;3u", 0, 0}, - { XK_dollar, Mod1Mask|ControlMask, "\033[36;7u", 0, 0}, - { XK_dollar, Mod1Mask|ControlMask|ShiftMask, "\033[36;8u", 0, 0}, - { XK_dollar, Mod1Mask|ShiftMask, "\033[36;4u", 0, 0}, - { XK_equal, ControlMask, "\033[61;5u", 0, 0}, - { XK_equal, ControlMask|ShiftMask, "\033[61;6u", 0, 0}, - { XK_equal, Mod1Mask, "\033[61;3u", 0, 0}, - { XK_equal, Mod1Mask|ControlMask, "\033[61;7u", 0, 0}, - { XK_equal, Mod1Mask|ControlMask|ShiftMask, "\033[61;8u", 0, 0}, - { XK_equal, Mod1Mask|ShiftMask, "\033[61;4u", 0, 0}, - { XK_exclam, ControlMask, "\033[33;5u", 0, 0}, - { XK_exclam, ControlMask|ShiftMask, "\033[33;6u", 0, 0}, - { XK_exclam, Mod1Mask, "\033[33;3u", 0, 0}, - { XK_exclam, Mod1Mask|ControlMask, "\033[33;7u", 0, 0}, - { XK_exclam, Mod1Mask|ControlMask|ShiftMask, "\033[33;8u", 0, 0}, - { XK_exclam, Mod1Mask|ShiftMask, "\033[33;4u", 0, 0}, - { XK_grave, ControlMask, "\033[96;5u", 0, 0}, - { XK_grave, ControlMask|ShiftMask, "\033[96;6u", 0, 0}, - { XK_grave, Mod1Mask, "\033[96;3u", 0, 0}, - { XK_grave, Mod1Mask|ControlMask, "\033[96;7u", 0, 0}, - { XK_grave, Mod1Mask|ControlMask|ShiftMask, "\033[96;8u", 0, 0}, - { XK_grave, Mod1Mask|ShiftMask, "\033[96;4u", 0, 0}, - { XK_greater, ControlMask, "\033[62;5u", 0, 0}, - { XK_greater, ControlMask|ShiftMask, "\033[62;6u", 0, 0}, - { XK_greater, Mod1Mask, "\033[62;3u", 0, 0}, - { XK_greater, Mod1Mask|ControlMask, "\033[62;7u", 0, 0}, - { XK_greater, Mod1Mask|ControlMask|ShiftMask, "\033[62;8u", 0, 0}, - { XK_greater, Mod1Mask|ShiftMask, "\033[62;4u", 0, 0}, - { XK_less, ControlMask, "\033[60;5u", 0, 0}, - { XK_less, ControlMask|ShiftMask, "\033[60;6u", 0, 0}, - { XK_less, Mod1Mask, "\033[60;3u", 0, 0}, - { XK_less, Mod1Mask|ControlMask, "\033[60;7u", 0, 0}, - { XK_less, Mod1Mask|ControlMask|ShiftMask, "\033[60;8u", 0, 0}, - { XK_less, Mod1Mask|ShiftMask, "\033[60;4u", 0, 0}, - { XK_minus, ControlMask, "\033[45;5u", 0, 0}, - { XK_minus, ControlMask|ShiftMask, "\033[45;6u", 0, 0}, - { XK_minus, Mod1Mask, "\033[45;3u", 0, 0}, - { XK_minus, Mod1Mask|ControlMask, "\033[45;7u", 0, 0}, - { XK_minus, Mod1Mask|ControlMask|ShiftMask, "\033[45;8u", 0, 0}, - { XK_minus, Mod1Mask|ShiftMask, "\033[45;4u", 0, 0}, - { XK_numbersign, ControlMask, "\033[35;5u", 0, 0}, - { XK_numbersign, ControlMask|ShiftMask, "\033[35;6u", 0, 0}, - { XK_numbersign, Mod1Mask, "\033[35;3u", 0, 0}, - { XK_numbersign, Mod1Mask|ControlMask, "\033[35;7u", 0, 0}, - { XK_numbersign, Mod1Mask|ControlMask|ShiftMask, "\033[35;8u", 0, 0}, - { XK_numbersign, Mod1Mask|ShiftMask, "\033[35;4u", 0, 0}, - { XK_parenleft, ControlMask, "\033[40;5u", 0, 0}, - { XK_parenleft, ControlMask|ShiftMask, "\033[40;6u", 0, 0}, - { XK_parenleft, Mod1Mask, "\033[40;3u", 0, 0}, - { XK_parenleft, Mod1Mask|ControlMask, "\033[40;7u", 0, 0}, - { XK_parenleft, Mod1Mask|ControlMask|ShiftMask, "\033[40;8u", 0, 0}, - { XK_parenleft, Mod1Mask|ShiftMask, "\033[40;4u", 0, 0}, - { XK_parenright, ControlMask, "\033[41;5u", 0, 0}, - { XK_parenright, ControlMask|ShiftMask, "\033[41;6u", 0, 0}, - { XK_parenright, Mod1Mask, "\033[41;3u", 0, 0}, - { XK_parenright, Mod1Mask|ControlMask, "\033[41;7u", 0, 0}, - { XK_parenright, Mod1Mask|ControlMask|ShiftMask, "\033[41;8u", 0, 0}, - { XK_parenright, Mod1Mask|ShiftMask, "\033[41;4u", 0, 0}, - { XK_percent, ControlMask, "\033[37;5u", 0, 0}, - { XK_percent, ControlMask|ShiftMask, "\033[37;6u", 0, 0}, - { XK_percent, Mod1Mask, "\033[37;3u", 0, 0}, - { XK_percent, Mod1Mask|ControlMask, "\033[37;7u", 0, 0}, - { XK_percent, Mod1Mask|ControlMask|ShiftMask, "\033[37;8u", 0, 0}, - { XK_percent, Mod1Mask|ShiftMask, "\033[37;4u", 0, 0}, - { XK_period, ControlMask, "\033[46;5u", 0, 0}, - { XK_period, ControlMask|ShiftMask, "\033[46;6u", 0, 0}, - { XK_period, Mod1Mask|ControlMask, "\033[46;7u", 0, 0}, - { XK_period, Mod1Mask|ControlMask|ShiftMask, "\033[46;8u", 0, 0}, - { XK_period, Mod1Mask|ShiftMask, "\033[46;4u", 0, 0}, - { XK_plus, ControlMask, "\033[43;5u", 0, 0}, - { XK_plus, ControlMask|ShiftMask, "\033[43;6u", 0, 0}, - { XK_plus, Mod1Mask, "\033[43;3u", 0, 0}, - { XK_plus, Mod1Mask|ControlMask, "\033[43;7u", 0, 0}, - { XK_plus, Mod1Mask|ControlMask|ShiftMask, "\033[43;8u", 0, 0}, - { XK_plus, Mod1Mask|ShiftMask, "\033[43;4u", 0, 0}, - { XK_question, ControlMask, "\033[63;5u", 0, 0}, - { XK_question, ControlMask|ShiftMask, "\033[63;6u", 0, 0}, - { XK_question, Mod1Mask, "\033[63;3u", 0, 0}, - { XK_question, Mod1Mask|ControlMask, "\033[63;7u", 0, 0}, - { XK_question, Mod1Mask|ControlMask|ShiftMask, "\033[63;8u", 0, 0}, - { XK_question, Mod1Mask|ShiftMask, "\033[63;4u", 0, 0}, - { XK_quotedbl, ControlMask, "\033[34;5u", 0, 0}, - { XK_quotedbl, ControlMask|ShiftMask, "\033[34;6u", 0, 0}, - { XK_quotedbl, Mod1Mask, "\033[34;3u", 0, 0}, - { XK_quotedbl, Mod1Mask|ControlMask, "\033[34;7u", 0, 0}, - { XK_quotedbl, Mod1Mask|ControlMask|ShiftMask, "\033[34;8u", 0, 0}, - { XK_quotedbl, Mod1Mask|ShiftMask, "\033[34;4u", 0, 0}, - { XK_semicolon, ControlMask, "\033[59;5u", 0, 0}, - { XK_semicolon, ControlMask|ShiftMask, "\033[59;6u", 0, 0}, - { XK_semicolon, Mod1Mask, "\033[59;3u", 0, 0}, - { XK_semicolon, Mod1Mask|ControlMask, "\033[59;7u", 0, 0}, - { XK_semicolon, Mod1Mask|ControlMask|ShiftMask, "\033[59;8u", 0, 0}, - { XK_semicolon, Mod1Mask|ShiftMask, "\033[59;4u", 0, 0}, - { XK_slash, ControlMask|ShiftMask, "\033[47;6u", 0, 0}, - { XK_slash, Mod1Mask, "\033[47;3u", 0, 0}, - { XK_slash, Mod1Mask|ControlMask, "\033[47;7u", 0, 0}, - { XK_slash, Mod1Mask|ControlMask|ShiftMask, "\033[47;8u", 0, 0}, - { XK_slash, Mod1Mask|ShiftMask, "\033[47;4u", 0, 0}, - { XK_underscore, ControlMask, "\033[95;5u", 0, 0}, - { XK_underscore, ControlMask|ShiftMask, "\033[95;6u", 0, 0}, - { XK_underscore, Mod1Mask, "\033[95;3u", 0, 0}, - { XK_underscore, Mod1Mask|ControlMask, "\033[95;7u", 0, 0}, - { XK_underscore, Mod1Mask|ControlMask|ShiftMask, "\033[95;8u", 0, 0}, - { XK_underscore, Mod1Mask|ShiftMask, "\033[95;4u", 0, 0}, -}; \ No newline at end of file diff --git a/desktop/.st/patch/font2.c b/desktop/.st/patch/font2.c deleted file mode 100644 index 9fc0e2d..0000000 --- a/desktop/.st/patch/font2.c +++ /dev/null @@ -1,104 +0,0 @@ -int -xloadsparefont(FcPattern *pattern, int flags) -{ - FcPattern *match; - FcResult result; - - #if USE_XFTFONTMATCH_PATCH - match = XftFontMatch(xw.dpy, xw.scr, pattern, &result); - #else - match = FcFontMatch(NULL, pattern, &result); - #endif // USE_XFTFONTMATCH_PATCH - 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 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 && defaultfontsize != usedfontsize) { - if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == - FcResultMatch) { - fontval *= usedfontsize / defaultfontsize; - FcPatternDel(pattern, FC_PIXEL_SIZE); - FcPatternDel(pattern, FC_SIZE); - FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval); - } else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) == - FcResultMatch) { - fontval *= usedfontsize / defaultfontsize; - FcPatternDel(pattern, FC_PIXEL_SIZE); - FcPatternDel(pattern, FC_SIZE); - FcPatternAddDouble(pattern, FC_SIZE, fontval); - } - } - - FcPatternAddBool(pattern, FC_SCALABLE, 1); - - #if !USE_XFTFONTMATCH_PATCH - FcConfigSubstitute(NULL, pattern, FcMatchPattern); - XftDefaultSubstitute(xw.dpy, xw.scr, pattern); - #endif // USE_XFTFONTMATCH_PATCH - - 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); - } -} \ No newline at end of file diff --git a/desktop/.st/patch/font2.h b/desktop/.st/patch/font2.h deleted file mode 100644 index c0f9ff5..0000000 --- a/desktop/.st/patch/font2.h +++ /dev/null @@ -1,2 +0,0 @@ -static int xloadsparefont(FcPattern *, int); -static void xloadsparefonts(void); \ No newline at end of file diff --git a/desktop/.st/patch/fullscreen_x.c b/desktop/.st/patch/fullscreen_x.c deleted file mode 100644 index 3fa65f7..0000000 --- a/desktop/.st/patch/fullscreen_x.c +++ /dev/null @@ -1,17 +0,0 @@ -void -fullscreen(const Arg *arg) -{ - XEvent ev; - - memset(&ev, 0, sizeof(ev)); - - ev.xclient.type = ClientMessage; - ev.xclient.message_type = xw.netwmstate; - ev.xclient.display = xw.dpy; - ev.xclient.window = xw.win; - ev.xclient.format = 32; - ev.xclient.data.l[0] = 2; /* _NET_WM_STATE_TOGGLE */ - ev.xclient.data.l[1] = xw.netwmfullscreen; - - XSendEvent(xw.dpy, DefaultRootWindow(xw.dpy), False, SubstructureNotifyMask|SubstructureRedirectMask, &ev); -} diff --git a/desktop/.st/patch/fullscreen_x.h b/desktop/.st/patch/fullscreen_x.h deleted file mode 100644 index 28a833b..0000000 --- a/desktop/.st/patch/fullscreen_x.h +++ /dev/null @@ -1 +0,0 @@ -static void fullscreen(const Arg *arg); diff --git a/desktop/.st/patch/invert.c b/desktop/.st/patch/invert.c deleted file mode 100644 index 2260b5d..0000000 --- a/desktop/.st/patch/invert.c +++ /dev/null @@ -1,21 +0,0 @@ -static int invertcolors = 0; - -void -invert(const Arg *dummy) -{ - invertcolors = !invertcolors; - redraw(); -} - -Color -invertedcolor(Color *clr) -{ - XRenderColor rc; - Color inverted; - rc.red = ~clr->color.red; - rc.green = ~clr->color.green; - rc.blue = ~clr->color.blue; - rc.alpha = clr->color.alpha; - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &rc, &inverted); - return inverted; -} \ No newline at end of file diff --git a/desktop/.st/patch/invert.h b/desktop/.st/patch/invert.h deleted file mode 100644 index 0b0931f..0000000 --- a/desktop/.st/patch/invert.h +++ /dev/null @@ -1 +0,0 @@ -static void invert(const Arg *); \ No newline at end of file diff --git a/desktop/.st/patch/iso14755.c b/desktop/.st/patch/iso14755.c deleted file mode 100644 index a2fbd79..0000000 --- a/desktop/.st/patch/iso14755.c +++ /dev/null @@ -1,21 +0,0 @@ -void -iso14755(const Arg *arg) -{ - FILE *p; - char *us, *e, codepoint[9], uc[UTF_SIZ]; - unsigned long utf32; - - if (!(p = popen(ISO14755CMD, "r"))) - return; - - us = fgets(codepoint, sizeof(codepoint), p); - pclose(p); - - if (!us || *us == '\0' || *us == '-' || strlen(us) > 7) - return; - if ((utf32 = strtoul(us, &e, 16)) == ULONG_MAX || - (*e != '\n' && *e != '\0')) - return; - - ttywrite(uc, utf8encode(utf32, uc), 1); -} \ No newline at end of file diff --git a/desktop/.st/patch/iso14755.h b/desktop/.st/patch/iso14755.h deleted file mode 100644 index 45a3d7a..0000000 --- a/desktop/.st/patch/iso14755.h +++ /dev/null @@ -1,6 +0,0 @@ -#define NUMMAXLEN(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1) - -/* constants */ -#define ISO14755CMD "dmenu -w \"$WINDOWID\" -p codepoint: mode = ATTR_REVERSE, - deb->u = *z, - deb->fg = defaultfg, deb->bg = defaultbg; - } else if (type < 5) - memcpy(term.line[bot], g, col * sizeof(Glyph)); - else { - for (deb = &term.line[bot][0], fin = &term.line[bot][col]; deb < fin; deb++) - deb->mode = ATTR_REVERSE, - deb->u = ' ', - deb->fg = defaultfg, deb->bg = defaultbg; - term.line[bot][0].u = ksym; - } - - term.dirty[bot] = 1; - drawregion(0, bot, col, bot + 1); -} - -#if SCROLLBACK_PATCH && KEYBOARDSELECT_PATCH -Glyph getglyph(Term term, int y, int x) -{ - Glyph g; - int realy = y - term.scr; - if(realy >= 0) { - g = term.line[realy][x]; - } else { - realy = term.histi - term.scr + y + 1; - g = term.hist[realy][x]; - } - return g; -} -#endif - -void select_or_drawcursor(int selectsearch_mode, int type) -{ - int done = 0; - - if (selectsearch_mode & 1) { - selextend(term.c.x, term.c.y, type, done); - xsetsel(getsel()); - } else { - #if LIGATURES_PATCH - xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x], - term.ocx, term.ocy, term.line[term.ocy][term.ocx], - term.line[term.ocy], term.col); - #elif SCROLLBACK_PATCH && KEYBOARDSELECT_PATCH - xdrawcursor(term.c.x, term.c.y, getglyph(term, term.c.y, term.c.x), - term.ocx, term.ocy, getglyph(term, term.ocy, term.ocx)); - #else - xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x], - term.ocx, term.ocy, term.line[term.ocy][term.ocx]); - #endif // LIGATURES_PATCH - } -} - -void search(int selectsearch_mode, Rune *target, int ptarget, int incr, int type, TCursor *cu) -{ - Rune *r; - int i, bound = (term.col * cu->y + cu->x) * (incr > 0) + incr; - - for (i = term.col * term.c.y + term.c.x + incr; i != bound; i += incr) { - for (r = target; r - target < ptarget; r++) { - if (*r == term.line[(i + r - target) / term.col][(i + r - target) % term.col].u) { - if (r - target == ptarget - 1) - break; - } else { - r = NULL; - break; - } - } - if (r != NULL) - break; - } - - if (i != bound) { - term.c.y = i / term.col, term.c.x = i % term.col; - select_or_drawcursor(selectsearch_mode, type); - } -} - -int trt_kbdselect(KeySym ksym, char *buf, int len) -{ - static TCursor cu; - static Rune target[64]; - static int type = 1, ptarget, in_use; - static int sens, quant; - static char selectsearch_mode; - int i, bound, *xy; - - if (selectsearch_mode & 2) { - if (ksym == XK_Return) { - selectsearch_mode ^= 2; - set_notifmode(selectsearch_mode, -2); - if (ksym == XK_Escape) - ptarget = 0; - return 0; - } else if (ksym == XK_BackSpace) { - if (!ptarget) - return 0; - term.line[term.bot][ptarget--].u = ' '; - } else if (len < 1) { - return 0; - } else if (ptarget == term.col || ksym == XK_Escape) { - return 0; - } else { - utf8decode(buf, &target[ptarget++], len); - term.line[term.bot][ptarget].u = target[ptarget - 1]; - } - - if (ksym != XK_BackSpace) - search(selectsearch_mode, &target[0], ptarget, sens, type, &cu); - - term.dirty[term.bot] = 1; - drawregion(0, term.bot, term.col, term.bot + 1); - return 0; - } - - switch (ksym) { - case -1: - in_use = 1; - cu.x = term.c.x, cu.y = term.c.y; - set_notifmode(0, ksym); - return MODE_KBDSELECT; - case XK_s: - if (selectsearch_mode & 1) - selclear(); - else - selstart(term.c.x, term.c.y, 0); - set_notifmode(selectsearch_mode ^= 1, ksym); - break; - case XK_t: - selextend(term.c.x, term.c.y, type ^= 3, i = 0); /* 2 fois */ - selextend(term.c.x, term.c.y, type, i = 0); - break; - case XK_slash: - case XK_KP_Divide: - case XK_question: - ksym &= XK_question; /* Divide to slash */ - sens = (ksym == XK_slash) ? -1 : 1; - ptarget = 0; - set_notifmode(15, ksym); - selectsearch_mode ^= 2; - break; - case XK_Escape: - if (!in_use) - break; - selclear(); - case XK_Return: - set_notifmode(4, ksym); - term.c.x = cu.x, term.c.y = cu.y; - select_or_drawcursor(selectsearch_mode = 0, type); - in_use = quant = 0; - return MODE_KBDSELECT; - case XK_n: - case XK_N: - if (ptarget) - search(selectsearch_mode, &target[0], ptarget, (ksym == XK_n) ? -1 : 1, type, &cu); - break; - case XK_BackSpace: - term.c.x = 0; - select_or_drawcursor(selectsearch_mode, type); - break; - case XK_dollar: - term.c.x = term.col - 1; - select_or_drawcursor(selectsearch_mode, type); - break; - case XK_Home: - term.c.x = 0, term.c.y = 0; - select_or_drawcursor(selectsearch_mode, type); - break; - case XK_End: - term.c.x = cu.x, term.c.y = cu.y; - select_or_drawcursor(selectsearch_mode, type); - break; - case XK_Page_Up: - case XK_Page_Down: - term.c.y = (ksym == XK_Prior ) ? 0 : cu.y; - select_or_drawcursor(selectsearch_mode, type); - break; - case XK_exclam: - term.c.x = term.col >> 1; - select_or_drawcursor(selectsearch_mode, type); - break; - case XK_asterisk: - case XK_KP_Multiply: - term.c.x = term.col >> 1; - case XK_underscore: - term.c.y = cu.y >> 1; - select_or_drawcursor(selectsearch_mode, type); - break; - default: - if (ksym >= XK_0 && ksym <= XK_9) { /* 0-9 keyboard */ - quant = (quant * 10) + (ksym ^ XK_0); - return 0; - } else if (ksym >= XK_KP_0 && ksym <= XK_KP_9) { /* 0-9 numpad */ - quant = (quant * 10) + (ksym ^ XK_KP_0); - return 0; - } else if (ksym == XK_k || ksym == XK_h) - i = ksym & 1; - else if (ksym == XK_l || ksym == XK_j) - i = ((ksym & 6) | 4) >> 1; - else if ((XK_Home & ksym) != XK_Home || (i = (ksym ^ XK_Home) - 1) > 3) - break; - - xy = (i & 1) ? &term.c.y : &term.c.x; - sens = (i & 2) ? 1 : -1; - bound = (i >> 1 ^ 1) ? 0 : (i ^ 3) ? term.col - 1 : term.bot; - - if (quant == 0) - quant++; - - if (*xy == bound && ((sens < 0 && bound == 0) || (sens > 0 && bound > 0))) - break; - - *xy += quant * sens; - if (*xy < 0 || ( bound > 0 && *xy > bound)) - *xy = bound; - - select_or_drawcursor(selectsearch_mode, type); - } - quant = 0; - return 0; -} diff --git a/desktop/.st/patch/keyboardselect_st.h b/desktop/.st/patch/keyboardselect_st.h deleted file mode 100644 index 3fa1ad7..0000000 --- a/desktop/.st/patch/keyboardselect_st.h +++ /dev/null @@ -1,2 +0,0 @@ -void toggle_winmode(int); -int trt_kbdselect(KeySym, char *, int); \ No newline at end of file diff --git a/desktop/.st/patch/keyboardselect_x.c b/desktop/.st/patch/keyboardselect_x.c deleted file mode 100644 index 16af3e1..0000000 --- a/desktop/.st/patch/keyboardselect_x.c +++ /dev/null @@ -1,7 +0,0 @@ -void toggle_winmode(int flag) { - win.mode ^= flag; -} - -void keyboard_select(const Arg *dummy) { - win.mode ^= trt_kbdselect(-1, NULL, 0); -} \ No newline at end of file diff --git a/desktop/.st/patch/keyboardselect_x.h b/desktop/.st/patch/keyboardselect_x.h deleted file mode 100644 index 6b1241a..0000000 --- a/desktop/.st/patch/keyboardselect_x.h +++ /dev/null @@ -1,2 +0,0 @@ -void toggle_winmode(int); -void keyboard_select(const Arg *); \ No newline at end of file diff --git a/desktop/.st/patch/netwmicon.h b/desktop/.st/patch/netwmicon.h deleted file mode 100644 index 5e9c654..0000000 --- a/desktop/.st/patch/netwmicon.h +++ /dev/null @@ -1,686 +0,0 @@ -unsigned long icon[] = { - 64, 64, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x03000000, - 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, - 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, - 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, - 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, - 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, - 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, - 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, - 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, - 0x03000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, - 0x20181818, 0x4e868686, 0x74b2b2b2, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, - 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, - 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, - 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, - 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, - 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, - 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, - 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, - 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x74b2b2b2, - 0x4e868686, 0x20181818, 0x03000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x03000000, 0x46717171, 0xcef3f3f3, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xcdf3f3f3, - 0x456f6f6f, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x211f1f1f, 0xd1f4f4f4, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xd0f3f3f3, 0x20181818, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x59959595, 0xffffffff, - 0xffffffff, 0xff8b8b8b, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff8c8c8c, 0xffffffff, 0xffffffff, 0x58919191, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x83b3b3b3, 0xffffffff, 0xffffffff, 0xff262626, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff262626, 0xffffffff, - 0xffffffff, 0x83b3b3b3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff2c2c2c, 0xffe0e0e0, 0xff1c1c1c, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff202020, - 0xff6c6c6c, 0xffffffff, 0xff6d6d6d, 0xff3c3c3c, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff2d2d2d, 0xffe1e1e1, 0xffc3c3c3, 0xffffffff, - 0xffa1a1a1, 0xffdddddd, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff7f7f7f, 0xffbfbfbf, 0xff303030, 0xffffffff, 0xff1c1c1c, 0xff181818, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff717171, 0xffe1e1e1, - 0xff545454, 0xffffffff, 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff1c1c1c, 0xffa1a1a1, 0xfff6f6f6, 0xffffffff, - 0xffaeaeae, 0xff515151, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff343434, 0xffffffff, 0xff979797, 0xfff9f9f9, - 0xff515151, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff303030, 0xffffffff, 0xff1c1c1c, 0xffb3b3b3, 0xff8d8d8d, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff686868, 0xff616161, 0xff3c3c3c, 0xffffffff, - 0xff545454, 0xffe8e8e8, 0xff5b5b5b, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff4b4b4b, 0xffb3b3b3, 0xffe1e1e1, 0xffffffff, 0xffcccccc, 0xff717171, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff303030, 0xffffffff, 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff2b2b2b, 0xffd1d1d1, - 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff7f7f7f, 0xffe9e9e9, 0xffe9e9e9, 0xffe9e9e9, 0xffe9e9e9, - 0xffe9e9e9, 0xffe9e9e9, 0xff444444, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, - 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, - 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x8aacacac, 0xffffffff, 0xffffffff, 0xff262626, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, - 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff262626, 0xffffffff, - 0xffffffff, 0x8aacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x62858585, 0xffffffff, 0xffffffff, 0xff8c8c8c, 0xff373737, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, - 0xff363636, 0xff373737, 0xff8d8d8d, 0xffffffff, 0xffffffff, 0x62828282, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x21171717, 0xdee2e2e2, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xdee1e1e1, 0x1f101010, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x03000000, 0x5f4e4e4e, 0xdbe1e1e1, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xdae1e1e1, - 0x5f4b4b4b, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x12000000, 0x48040404, 0x6d595959, 0x8d929292, 0x90979797, - 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, - 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, - 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, - 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, - 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, - 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, - 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, - 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, - 0x90979797, 0x8d929292, 0x6d595959, 0x48040404, 0x12000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x06000000, 0x22000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, - 0x22000000, 0x06000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, -}; \ No newline at end of file diff --git a/desktop/.st/patch/newterm.c b/desktop/.st/patch/newterm.c deleted file mode 100644 index d4a1735..0000000 --- a/desktop/.st/patch/newterm.c +++ /dev/null @@ -1,30 +0,0 @@ -void -newterm(const Arg* a) -{ - int res; - switch (fork()) { - case -1: - die("fork failed: %s\n", strerror(errno)); - break; - case 0: - switch (fork()) { - case -1: - die("fork failed: %s\n", strerror(errno)); - break; - case 0: - res = chdir(getcwd_by_pid(pid)); - execlp("st", "./st", NULL); - break; - default: - exit(0); - } - default: - wait(NULL); - } -} - -static char *getcwd_by_pid(pid_t pid) { - char buf[32]; - snprintf(buf, sizeof buf, "/proc/%d/cwd", pid); - return realpath(buf, NULL); -} \ No newline at end of file diff --git a/desktop/.st/patch/newterm.h b/desktop/.st/patch/newterm.h deleted file mode 100644 index ea7292c..0000000 --- a/desktop/.st/patch/newterm.h +++ /dev/null @@ -1,2 +0,0 @@ -void newterm(const Arg *); -static char *getcwd_by_pid(pid_t pid); \ No newline at end of file diff --git a/desktop/.st/patch/normalMode.c b/desktop/.st/patch/normalMode.c deleted file mode 100644 index bbc9cfb..0000000 --- a/desktop/.st/patch/normalMode.c +++ /dev/null @@ -1,284 +0,0 @@ -#include -#include - -#include "normalMode.h" -#include "utils.h" - -extern Glyph const styleSearch, style[]; -extern char const wDelS[], wDelL[], *nmKeys[]; -extern unsigned int bg[], fg, currentBg, highlightBg, highlightFg, amountNmKeys; - -typedef struct { int p[3]; } Pos; - -typedef enum {visual='v', visualLine='V', yank = 'y'} Op; -typedef enum {infix_none=0, infix_i='i', infix_a='a'} Infix; -typedef enum {fw='/', bw='?'} Search; -struct NormalModeState { - struct OperationState { Op op; Infix infix; } cmd; - struct MotionState { uint32_t c; int active; Pos searchPos; Search search; } m; -} defaultNormalMode, state; - -DynamicArray searchStr=UTF8_ARRAY, cCmd=UTF8_ARRAY, lCmd=UTF8_ARRAY; -Glyph styleCmd; -char posBuffer[10], braces[6][3] = { {"()"}, {"<>"}, {"{}"}, {"[]"}, {"\"\""}, {"''"}}; -int exited=1, overlay=1; -static inline Rune cChar() { return term.line[term.c.y][term.c.x].u; } -static inline int pos(int p, int h) {return IS_SET(MODE_ALTSCREEN)?p:rangeY(p+h*histOff-insertOff);} -static inline int contains(Rune l, char const * values, size_t const memSize) { - for (uint32_t i = 0; i < memSize; ++i) if (l == values[i]) return 1; - return 0; -} -static inline void decodeTo(char const *cs, size_t len, DynamicArray *arr) { - char *var = expand(arr); - if (!var) empty(arr); else utf8decode(cs, (Rune*)(var), len); -} -static inline void applyPos(Pos p) { - term.c.x = p.p[0], term.c.y = p.p[1]; - if (!IS_SET(MODE_ALTSCREEN) && histOp) term.line = &buf[histOff = p.p[2]]; -} -/// Find string in history buffer, and provide string-match-lookup for highlighting matches -static int highlighted(int x, int y) { - int const s=term.row*term.col, i=y*term.col+x, sz=size(&searchStr); - return sz && i0)==cChar())?wIdx+1:0; - if (wi && !wIdx) historyMove(-(int)(s*wi), 0, 0); - } - if (wIdx == strSz && wIdx) historyMove(-(int)(s*strSz), 0, 0); - else applyPos(p); - markSearchMatches(all); - return wIdx == strSz; -} -/// Execute series of normal-mode commands from char array / decoded from dynamic array -ExitState pressKeys(char const* s, size_t e) { - ExitState x=success; - for (size_t i=0; iu = *((Rune*)(st->content + (size(st)+x-xEnd)*st->elSize)); -} -/// Expand "infix" expression: for instance (w =>) l b | | v e | | y -static ExitState expandExpression(char l) { // ({ =>) l ? { \n | l | v / } \n | h | y - int a=state.cmd.infix==infix_a, yank=state.cmd.op=='y', lc=tolower(l), found=1; - state.cmd.infix = infix_none; - if(!yank && state.cmd.op!=visual && state.cmd.op!=visualLine) return failed; - char mot[11] = {'l', 0, 'b', 0, 0, 'v', 0, 'e', 0, 0, (char)(yank ? 'y' : 0)}; - if (lc == 'w') mot[2] = (char) ('b' - lc + l), mot[7] = (char) ((a ? 'w' : 'e') - lc + l), mot[9]=(char)(a?'h':0); - else { - mot[1]='?', mot[3]=mot[8]='\n', mot[6]='/', mot[4]=(char)(a?0:'l'), mot[9]=(char)(a?0:'h'); - for (int i=found=0; !found && i < 6; ++i) - if ((found=contains(l,braces[i],2))) mot[2]=braces[i][0], mot[7]=braces[i][1]; - } - if (!found) return failed; - assign(&lCmd, &cCmd); - empty(&cCmd); - state.cmd = defaultNormalMode.cmd; - return pressKeys(mot, 11); -} - -ExitState executeMotion(char const cs, KeySym const *const ks) { - state.m.c = state.m.c < 1u ? 1u : state.m.c; - if (ks && *ks == XK_d) historyMove(0, 0, term.row / 2); - else if (ks && *ks == XK_u) historyMove(0, 0, -term.row / 2); - else if (ks && *ks == XK_f) historyMove(0, 0, term.row-1+(term.c.y=0)); - else if (ks && *ks == XK_b) historyMove(0, 0, -(term.c.y=term.row-1)); - else if (ks && *ks == XK_h) overlay = !overlay; - else if (cs == 'K') historyMove(0, 0, -(int)state.m.c); - else if (cs == 'J') historyMove(0, 0, (int)state.m.c); - else if (cs == 'k') historyMove(0, -(int)state.m.c, 0); - else if (cs == 'j') historyMove(0, (int)state.m.c, 0); - else if (cs == 'h') historyMove(-(int)state.m.c, 0, 0); - else if (cs == 'l') historyMove( (int)state.m.c, 0, 0); - else if (cs == 'H') term.c.y = 0; - else if (cs == 'M') term.c.y = term.bot / 2; - else if (cs == 'L') term.c.y = term.bot; - else if (cs == 's' || cs == 'S') altToggle = cs == 's' ? !altToggle : 1; - else if (cs == 'G' || cs == 'g') { - if (cs == 'G') term.c = c[0] = c[IS_SET(MODE_ALTSCREEN)+1]; - if (!IS_SET(MODE_ALTSCREEN)) term.line = &buf[histOff=insertOff]; - } else if (cs == '0') term.c.x = 0; - else if (cs == '$') term.c.x = term.col-1; - else if (cs == 't') sel.type = sel.type==SEL_REGULAR ? SEL_RECTANGULAR : SEL_REGULAR; - else if (cs == 'n' || cs == 'N') { - int const d = ((cs=='N')!=(state.m.search==bw))?-1:1; - for (uint32_t i = state.m.c; i && findString(d, 0); --i); - } else if (contains(cs, "wWeEbB", 6)) { - int const low=cs<=90, off=tolower(cs)!='w', sgn=(tolower(cs)=='b')?-1:1; - size_t const l=strlen(wDelL), s=strlen(wDelS), maxIt=rows()*term.col; - for (int it=0, on=0; state.m.c > 0 && it < maxIt; ++it) { - // If an offset is to be performed in beginning or not in beginning, move in history. - if ((off || it) && historyMove(sgn, 0, 0)) break; - // Determine if the category of the current letter changed since last iteration. - int n = 1<<(contains(cChar(),wDelS,s) ?(2-low) :!contains(cChar(),wDelL,l)), - found = (on|=n)^n && ((off ?on^n :n)!=1); - // If a reverse offset is to be performed and this is the last letter: - if (found && off) historyMove(-sgn, 0, 0); - // Terminate iteration: reset #it and old n value #on and decrease operation count: - if (found) it=-1, on=0, --state.m.c; - } - } else return failed; - state.m.c = 0; - return state.cmd.op == yank ? exitMotion : success; -} - -ExitState kPressHist(char const *cs, size_t len, int ctrl, KeySym const *kSym) { - historyOpToggle(1, 1); - int const prevYOff=IS_SET(MODE_ALTSCREEN)?0:histOff, search=state.m.search&&state.m.active, - prevAltToggle=altToggle, prevOverlay=overlay; - int const noOp=!state.cmd.op&&!state.cmd.infix, num=len==1&&BETWEEN(cs[0],48,57), - esc=kSym&&*kSym==XK_Escape, ret=(kSym&&*kSym==XK_Return)||(len==1&&cs[0]=='\n'), - quantifier=num&&(cs[0]!='0'||state.m.c), ins=!search &&noOp &&len &&cs[0]=='i'; - exited = 0; - ExitState result = success; - if (esc || ret || ins) { result = exitMotion, len = 0; - } else if (kSym && *kSym == XK_BackSpace) { - if ((search || state.m.c) && size(&cCmd)) pop(&cCmd); - if (search) { - if (size(&searchStr)) pop(&searchStr); - else result = exitMotion; - if (!size(&searchStr)) tfulldirt(); - applyPos(state.m.searchPos); - findString(state.m.search==fw ? 1 : -1, 1); - } else if (state.m.c) state.m.c /= 10; - len = 0; - } else if (search) { - if (len >= 1) decodeTo(cs, len, &searchStr); - applyPos(state.m.searchPos); - findString(state.m.search==fw ? 1 : -1, 1); - } else if (len == 0) { result = failed; - } else if (quantifier) { state.m.c = min(SHRT_MAX, (int)state.m.c*10+cs[0]-48); - } else if (state.cmd.infix && state.cmd.op && (result = expandExpression(cs[0]), len=0)) { - } else if (cs[0] == 'd') { state = defaultNormalMode; result = exitMotion; state.m.active = 1; - } else if (cs[0] == '.') { - if (size(&cCmd)) assign(&lCmd, &cCmd); - empty(&cCmd); - executeCommand((uint32_t*) lCmd.content, size(&lCmd)); - empty(&cCmd); - len = 0; - } else if (cs[0] == 'r') { tfulldirt(); - } else if (cs[0] == 'c') { - empty(&lCmd); - empty(&cCmd); - empty(&searchStr); - tfulldirt(); - len = 0; - } else if (cs[0] == fw || cs[0] == bw) { - empty(&searchStr); - state.m.search = (Search) cs[0]; - state.m.searchPos = (Pos){.p={term.c.x, term.c.y, prevYOff}}; - state.m.active = 1; - } else if (cs[0]==infix_i || cs[0]==infix_a) { state.cmd.infix=(Infix) cs[0]; - } else if (cs[0] == 'y') { - if (state.cmd.op) { - result = (state.cmd.op == yank || state.cmd.op == visualLine) ? exitOp : exitMotion; - if (state.cmd.op == yank) selstart(0, term.c.y, 0); - } else selstart(term.c.x, term.c.y, 0); - state.cmd.op = yank; - } else if (cs[0] == visual || cs[0] == visualLine) { - if (state.cmd.op != (Op) cs[0]) { - state.cmd = defaultNormalMode.cmd; - state.cmd.op = (Op) cs[0]; - selstart(cs[0] == visualLine ?0 :term.c.x, term.c.y, 0); - } else result = exitOp; - } else if (!(result =executeMotion((char) (len?cs[0]:0), ctrl?kSym:NULL))) { - result=failed; - for (size_t i = 0; !ctrl && i < amountNmKeys; ++i) - if (cs[0]==nmKeys[i][0] && - failed!=(result=pressKeys(&nmKeys[i][1], strlen(nmKeys[i])-1))) goto end; - } // Operation/Motion finished if valid: update cmd string, extend selection, update search - if (result != failed) { - if (len == 1 && !ctrl) decodeTo(cs, len, &cCmd); - if ((state.cmd.op == visualLine) || ((state.cmd.op == yank) && (result == exitOp))) { - int const off = term.c.y + (IS_SET(MODE_ALTSCREEN) ? 0 : histOff) < sel.ob.y; //< Selection start below end. - sel.ob.x = off ? term.col - 1 : 0; - selextend(off ? 0 : term.col-1, term.c.y, sel.type, 0); - } else if (sel.oe.x != -1) { - selextend(term.c.x, term.c.y, sel.type, 0); - } - } // Set repaint for motion or status bar - if (!IS_SET(MODE_ALTSCREEN) && prevYOff != histOff) tfulldirt(); - // Terminate Motion / operation if thus indicated - if (result == exitMotion) { - if (!state.m.active) result = (exited=noOp) ? finish : exitOp; - state.m.active = (int) (state.m.c = 0u); - } - if (result == exitOp || result == finish) { - if (state.cmd.op == yank) { - xsetsel(getsel()); - xclipcopy(); - } - state = defaultNormalMode; - selclear(); - if (!esc) assign(&lCmd, &cCmd); - empty(&cCmd); - } // Update the content displayed in the history overlay - styleCmd = style[state.cmd.op==yank ? 1 : (state.cmd.op==visual ? 2 : - (state.cmd.op==visualLine ? 3 :0))]; - int const posLin = !IS_SET(MODE_ALTSCREEN) ? rangeY(insertOff-histOff):0, h=rows()-term.row; - if (!posLin || posLin==h || !h) strcpy(posBuffer, posLin ? " [BOT] " : " [TOP] "); - else sprintf(posBuffer, " % 3d%c ", min(100, max(0, (int)(.5 + posLin * 100. / h))),'%'); - if ((overlay || overlay!=prevOverlay) && term.col>9 && term.row>4) { - if (!term.dirty[term.row-1]) xdrawline(term.line[term.row-1], term.col*2/3, term.row-1, term.col-1); - if (!term.dirty[term.row-2]) xdrawline(term.line[term.row-2], term.col*2/3, term.row-2, term.col-1); - } - if (result==finish) altToggle = 0; - if (altToggle != prevAltToggle) tswapscreen(); -end: - historyOpToggle(-1, 1); - return result; -} - -void historyOverlay(int x, int y, Glyph* g) { - if (!histMode) return; - TCursor const *cHist = histOp ? &term.c : &c[0]; - if(overlay && term.col > 9 && term.row > 4 && (x > (2*term.col/3)) && (y >= (term.row-2))) { - *g = (y == term.row - 2) ? styleSearch : styleCmd; - if (y == term.row-2) getChar(&searchStr, g, term.row-2, term.col-2, term.col/3, x); - else if (x > term.col - 7) g->u = (Rune)(posBuffer[x - term.col + 7]); - else getChar(size(&cCmd) ?&cCmd :&lCmd, g, term.row-1, term.col-7, term.col/3-6, x); - } else if (highlighted(x, y)) g->bg = highlightBg, g->fg = highlightFg; - else if ((x==cHist->x) ^ (y==cHist->y)) g->bg = currentBg; - else if (x==cHist->x) g->mode^=ATTR_REVERSE; -} -void historyPreDraw() { - static Pos op = {.p={0, 0, 0}}; - historyOpToggle(1, 0); - // Draw the cursor cross if changed - if (term.c.y >= term.row || op.p[1] >= term.row) tfulldirt(); - else if (exited || (op.p[1] != term.c.y)) term.dirty[term.c.y] = term.dirty[op.p[1]] = 1; - for (int i=0; (exited || term.c.x != op.p[0]) && iv, clip); - res = system(cmd); -} \ No newline at end of file diff --git a/desktop/.st/patch/opencopied.h b/desktop/.st/patch/opencopied.h deleted file mode 100644 index 3734ac7..0000000 --- a/desktop/.st/patch/opencopied.h +++ /dev/null @@ -1 +0,0 @@ -void opencopied(const Arg *); \ No newline at end of file diff --git a/desktop/.st/patch/openurlonclick.c b/desktop/.st/patch/openurlonclick.c deleted file mode 100644 index 626cde6..0000000 --- a/desktop/.st/patch/openurlonclick.c +++ /dev/null @@ -1,141 +0,0 @@ -#if SCROLLBACK_PATCH && !VIM_BROWSE_PATCH -#define TLINEURL(y) TLINE(y) -#else -#define TLINEURL(y) term.line[y] -#endif // SCROLLBACK_PATCH - -#if VIM_BROWSE_PATCH -extern int buffCols; -#endif // VIM_BROWSE_PATCH - -int url_x1, url_y1, url_x2, url_y2 = -1; -int url_draw, url_click, url_maxcol; - -static int -isvalidurlchar(Rune u) -{ - /* () and [] can appear in urls, but excluding them here will reduce false - * positives when figuring out where a given url ends. See copyurl patch. - */ - static char urlchars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789-._~:/?#@!$&'*+,;=%"; - return u < 128 && strchr(urlchars, (int)u) != NULL; -} - -/* find the end of the wrapped line */ -static int -findeowl(int row) -{ - #if VIM_BROWSE_PATCH - int col = buffCols - 1; - #elif COLUMNS_PATCH - int col = term.maxcol - 1; - #else - int col = term.col - 1; - #endif // VIM_BROWSE_PATCH - - do { - if (TLINEURL(row)[col].mode & ATTR_WRAP) - return col; - } while (TLINEURL(row)[col].u == ' ' && --col >= 0); - return -1; -} - -void -clearurl(void) -{ - while (url_y1 <= url_y2 && url_y1 < term.row) - term.dirty[url_y1++] = 1; - url_y2 = -1; -} - -char * -detecturl(int col, int row, int draw) -{ - static char url[2048]; - int x1, y1, x2, y2, wrapped; - int row_start = row; - int col_start = col; - int i = sizeof(url)/2+1, j = sizeof(url)/2; - #if SCROLLBACK_PATCH && !VIM_BROWSE_PATCH - int minrow = term.scr - term.histn, maxrow = term.scr + term.row - 1; - /* Fixme: MODE_ALTSCREEN is not defined here, I had to use the magic number 1<<2 */ - if ((term.mode & (1 << 2)) != 0) - minrow = 0, maxrow = term.row - 1; - #else - int minrow = 0, maxrow = term.row - 1; - #endif // scrollback_patch - url_maxcol = 0; - - /* clear previously underlined url */ - if (draw) - clearurl(); - - if (!isvalidurlchar(TLINEURL(row)[col].u)) - return NULL; - - /* find the first character of url */ - do { - x1 = col_start, y1 = row_start; - url_maxcol = MAX(url_maxcol, x1); - url[--i] = TLINEURL(row_start)[col_start].u; - if (--col_start < 0) { - if (--row_start < minrow || (col_start = findeowl(row_start)) < 0) - break; - } - } while (i > 0 && isvalidurlchar(TLINEURL(row_start)[col_start].u)); - - /* early detection */ - if (url[i] != 'h') - return NULL; - - /* find the last character of url */ - do { - x2 = col, y2 = row; - url_maxcol = MAX(url_maxcol, x2); - url[j++] = TLINEURL(row)[col].u; - wrapped = TLINEURL(row)[col].mode & ATTR_WRAP; - #if VIM_BROWSE_PATCH - if (++col >= buffCols || wrapped) { - #elif COLUMNS_PATCH - if (++col >= term.maxcol || wrapped) { - #else - if (++col >= term.col || wrapped) { - #endif // VIM_BROWSE_PATCH - col = 0; - if (++row > maxrow || !wrapped) - break; - } - } while (j < sizeof(url)-1 && isvalidurlchar(TLINEURL(row)[col].u)); - - url[j] = 0; - - if (strncmp("https://", &url[i], 8) && strncmp("http://", &url[i], 7)) - return NULL; - - /* underline url (see xdrawglyphfontspecs() in x.c) */ - if (draw) { - url_x1 = (y1 >= 0) ? x1 : 0; - url_x2 = (y2 < term.row) ? x2 : url_maxcol; - url_y1 = MAX(y1, 0); - url_y2 = MIN(y2, term.row-1); - url_draw = 1; - for (y1 = url_y1; y1 <= url_y2; y1++) - term.dirty[y1] = 1; - } - - return &url[i]; -} - -void -openUrlOnClick(int col, int row, char* url_opener) -{ - char *url = detecturl(col, row, 1); - if (url) { - extern char **environ; - pid_t junk; - char *argv[] = { url_opener, url, NULL }; - posix_spawnp(&junk, argv[0], NULL, NULL, argv, environ); - } -} diff --git a/desktop/.st/patch/openurlonclick.h b/desktop/.st/patch/openurlonclick.h deleted file mode 100644 index 5aa09de..0000000 --- a/desktop/.st/patch/openurlonclick.h +++ /dev/null @@ -1,8 +0,0 @@ -#include - -static inline void restoremousecursor(void) { - if (!(win.mode & MODE_MOUSE) && xw.pointerisvisible) - XDefineCursor(xw.dpy, xw.win, xw.vpointer); -} -static void clearurl(void); -static void openUrlOnClick(int col, int row, char* url_opener); diff --git a/desktop/.st/patch/rightclicktoplumb_st.c b/desktop/.st/patch/rightclicktoplumb_st.c deleted file mode 100644 index c60b946..0000000 --- a/desktop/.st/patch/rightclicktoplumb_st.c +++ /dev/null @@ -1,19 +0,0 @@ -#if defined(__OpenBSD__) - #include -#endif - -int -subprocwd(char *path) -{ -#if defined(__linux) - if (snprintf(path, PATH_MAX, "/proc/%d/cwd", pid) < 0) - return -1; - return 0; -#elif defined(__OpenBSD__) - size_t sz = PATH_MAX; - int name[3] = {CTL_KERN, KERN_PROC_CWD, pid}; - if (sysctl(name, 3, path, &sz, 0, 0) == -1) - return -1; - return 0; -#endif -} \ No newline at end of file diff --git a/desktop/.st/patch/rightclicktoplumb_st.h b/desktop/.st/patch/rightclicktoplumb_st.h deleted file mode 100644 index 98e42ab..0000000 --- a/desktop/.st/patch/rightclicktoplumb_st.h +++ /dev/null @@ -1 +0,0 @@ -int subprocwd(char *); \ No newline at end of file diff --git a/desktop/.st/patch/rightclicktoplumb_x.c b/desktop/.st/patch/rightclicktoplumb_x.c deleted file mode 100644 index 1b9b2bc..0000000 --- a/desktop/.st/patch/rightclicktoplumb_x.c +++ /dev/null @@ -1,24 +0,0 @@ -#include - -void -plumb(char *sel) { - if (sel == NULL) - return; - char cwd[PATH_MAX]; - pid_t child; - if (subprocwd(cwd) != 0) - return; - - switch(child = fork()) { - case -1: - return; - case 0: - if (chdir(cwd) != 0) - exit(1); - if (execvp(plumb_cmd, (char *const []){plumb_cmd, sel, 0}) == -1) - exit(1); - exit(0); - default: - waitpid(child, NULL, 0); - } -} \ No newline at end of file diff --git a/desktop/.st/patch/rightclicktoplumb_x.h b/desktop/.st/patch/rightclicktoplumb_x.h deleted file mode 100644 index d0c8b88..0000000 --- a/desktop/.st/patch/rightclicktoplumb_x.h +++ /dev/null @@ -1 +0,0 @@ -void plumb(char *); \ No newline at end of file diff --git a/desktop/.st/patch/scrollback.c b/desktop/.st/patch/scrollback.c deleted file mode 100644 index 2644cfe..0000000 --- a/desktop/.st/patch/scrollback.c +++ /dev/null @@ -1,55 +0,0 @@ -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(); - } - - #if SIXEL_PATCH - scroll_images(-1*n); - #endif // SIXEL_PATCH - - #if OPENURLONCLICK_PATCH - if (n > 0) - restoremousecursor(); - #endif // OPENURLONCLICK_PATCH -} - -void -kscrollup(const Arg* a) -{ - int n = a->i; - if (n < 0) - n = term.row + n; - - if (term.scr + n > term.histn) - n = term.histn - term.scr; - - if (!n) - return; - - if (term.scr <= HISTSIZE-n) { - term.scr += n; - selscroll(0, n); - tfulldirt(); - } - - #if SIXEL_PATCH - scroll_images(n); - #endif // SIXEL_PATCH - - #if OPENURLONCLICK_PATCH - if (n > 0) - restoremousecursor(); - #endif // OPENURLONCLICK_PATCH -} diff --git a/desktop/.st/patch/scrollback.h b/desktop/.st/patch/scrollback.h deleted file mode 100644 index 08940f0..0000000 --- a/desktop/.st/patch/scrollback.h +++ /dev/null @@ -1,17 +0,0 @@ -#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \ - term.scr + HISTSIZE + 1) % HISTSIZE] : \ - term.line[(y) - term.scr]) - -void kscrolldown(const Arg *); -void kscrollup(const Arg *); - -#if SCROLLBACK_MOUSE_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH -typedef struct { - uint b; - uint mask; - void (*func)(const Arg *); - const Arg arg; -} MouseKey; - -extern MouseKey mkeys[]; -#endif // SCROLLBACK_MOUSE_PATCH / SCROLLBACK_MOUSE_ALTSCREEN_PATCH diff --git a/desktop/.st/patch/sixel_st.c b/desktop/.st/patch/sixel_st.c deleted file mode 100644 index ed64fee..0000000 --- a/desktop/.st/patch/sixel_st.c +++ /dev/null @@ -1,42 +0,0 @@ -sixel_state_t sixel_st; - -void -dcshandle(void) -{ - switch (csiescseq.mode[0]) { - default: - fprintf(stderr, "erresc: unknown csi "); - csidump(); - /* die(""); */ - break; - case 'q': /* DECSIXEL */ - if (sixel_parser_init(&sixel_st, 0, 0 << 16 | 0 << 8 | 0, 1, win.cw, win.ch) != 0) - perror("sixel_parser_init() failed"); - term.mode |= MODE_SIXEL; - break; - } -} - -void -scroll_images(int n) { - ImageList *im; - int tmp; - - /* maximum sixel distance in lines from current view before - * deallocation - * TODO: should be in config.h */ - int max_sixel_distance = 10000; - - for (im = term.images; im; im = im->next) { - im->y += n; - - /* check if the current sixel has exceeded the maximum - * draw distance, and should therefore be deleted */ - tmp = im->y; - if (tmp < 0) { tmp = tmp * -1; } - if (tmp > max_sixel_distance) { - fprintf(stderr, "im@0x%08x exceeded maximum distance\n"); - im->should_delete = 1; - } - } -} \ No newline at end of file diff --git a/desktop/.st/patch/sixel_st.h b/desktop/.st/patch/sixel_st.h deleted file mode 100644 index cf2f0e1..0000000 --- a/desktop/.st/patch/sixel_st.h +++ /dev/null @@ -1,2 +0,0 @@ -static void dcshandle(void); -static void scroll_images(int n); \ No newline at end of file diff --git a/desktop/.st/patch/sixel_x.c b/desktop/.st/patch/sixel_x.c deleted file mode 100644 index 0f74f53..0000000 --- a/desktop/.st/patch/sixel_x.c +++ /dev/null @@ -1,14 +0,0 @@ -void -delete_image(ImageList *im) -{ - if (im->prev) - im->prev->next = im->next; - else - term.images = im->next; - if (im->next) - im->next->prev = im->prev; - if (im->pixmap) - XFreePixmap(xw.dpy, (Drawable)im->pixmap); - free(im->pixels); - free(im); -} \ No newline at end of file diff --git a/desktop/.st/patch/st_embedder_x.c b/desktop/.st/patch/st_embedder_x.c deleted file mode 100644 index c73c389..0000000 --- a/desktop/.st/patch/st_embedder_x.c +++ /dev/null @@ -1,50 +0,0 @@ -static Window embed; - -void -createnotify(XEvent *e) -{ - XWindowChanges wc; - - if (embed || e->xcreatewindow.override_redirect) - return; - - embed = e->xcreatewindow.window; - - XReparentWindow(xw.dpy, embed, xw.win, 0, 0); - XSelectInput(xw.dpy, embed, PropertyChangeMask | StructureNotifyMask | EnterWindowMask); - - XMapWindow(xw.dpy, embed); - sendxembed(XEMBED_EMBEDDED_NOTIFY, 0, xw.win, 0); - - wc.width = win.w; - wc.height = win.h; - XConfigureWindow(xw.dpy, embed, CWWidth | CWHeight, &wc); - - XSetInputFocus(xw.dpy, embed, RevertToParent, CurrentTime); -} - -void -destroynotify(XEvent *e) -{ - visibility(e); - if (embed == e->xdestroywindow.window) { - focus(e); - } -} - -void -sendxembed(long msg, long detail, long d1, long d2) -{ - XEvent e = { 0 }; - - e.xclient.window = embed; - e.xclient.type = ClientMessage; - e.xclient.message_type = xw.xembed; - e.xclient.format = 32; - e.xclient.data.l[0] = CurrentTime; - e.xclient.data.l[1] = msg; - e.xclient.data.l[2] = detail; - e.xclient.data.l[3] = d1; - e.xclient.data.l[4] = d2; - XSendEvent(xw.dpy, embed, False, NoEventMask, &e); -} diff --git a/desktop/.st/patch/st_embedder_x.h b/desktop/.st/patch/st_embedder_x.h deleted file mode 100644 index 6910fb9..0000000 --- a/desktop/.st/patch/st_embedder_x.h +++ /dev/null @@ -1,7 +0,0 @@ -#define XEMBED_EMBEDDED_NOTIFY 0 -#define XEMBED_WINDOW_ACTIVATE 1 -#define XEMBED_FOCUS_CURRENT 0 - -static void createnotify(XEvent *e); -static void destroynotify(XEvent *e); -static void sendxembed(long msg, long detail, long d1, long d2); \ No newline at end of file diff --git a/desktop/.st/patch/st_include.c b/desktop/.st/patch/st_include.c deleted file mode 100644 index 6772a6e..0000000 --- a/desktop/.st/patch/st_include.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Patches */ -#if COPYURL_PATCH || COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH -#include "copyurl.c" -#endif -#if EXTERNALPIPE_PATCH -#include "externalpipe.c" -#endif -#if ISO14755_PATCH -#include "iso14755.c" -#endif -#if KEYBOARDSELECT_PATCH -#include "keyboardselect_st.c" -#endif -#if RIGHTCLICKTOPLUMB_PATCH -#include "rightclicktoplumb_st.c" -#endif -#if NEWTERM_PATCH -#include "newterm.c" -#endif -#if SCROLLBACK_PATCH || SCROLLBACK_MOUSE_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH -#include "scrollback.c" -#endif -#if SIXEL_PATCH -#include "sixel_st.c" -#endif -#if SYNC_PATCH -#include "sync.c" -#endif -#if VIM_BROWSE_PATCH -#include "normalMode.c" -#endif \ No newline at end of file diff --git a/desktop/.st/patch/st_include.h b/desktop/.st/patch/st_include.h deleted file mode 100644 index c30a752..0000000 --- a/desktop/.st/patch/st_include.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Patches */ -#if COPYURL_PATCH || COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH -#include "copyurl.h" -#endif -#if EXTERNALPIPE_PATCH -#include "externalpipe.h" -#endif -#if ISO14755_PATCH -#include "iso14755.h" -#endif -#if KEYBOARDSELECT_PATCH -#include "keyboardselect_st.h" -#endif -#if OPENURLONCLICK_PATCH -#include "openurlonclick.h" -#endif -#if RIGHTCLICKTOPLUMB_PATCH -#include "rightclicktoplumb_st.h" -#endif -#if NEWTERM_PATCH -#include "newterm.h" -#endif -#if SCROLLBACK_PATCH || SCROLLBACK_MOUSE_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH -#include "scrollback.h" -#endif -#if SIXEL_PATCH -#include "sixel_st.h" -#endif -#if SYNC_PATCH -#include "sync.h" -#endif -// #if VIM_BROWSE_PATCH -// #include "normalMode.h" -// #endif diff --git a/desktop/.st/patch/sync.c b/desktop/.st/patch/sync.c deleted file mode 100644 index a0a815c..0000000 --- a/desktop/.st/patch/sync.c +++ /dev/null @@ -1,31 +0,0 @@ -#include -struct timespec sutv; - -static void -tsync_begin() -{ - clock_gettime(CLOCK_MONOTONIC, &sutv); - su = 1; -} - -static void -tsync_end() -{ - su = 0; -} - -int -tinsync(uint timeout) -{ - struct timespec now; - if (su && !clock_gettime(CLOCK_MONOTONIC, &now) - && TIMEDIFF(now, sutv) >= timeout) - su = 0; - return su; -} - -int -ttyread_pending() -{ - return twrite_aborted; -} \ No newline at end of file diff --git a/desktop/.st/patch/sync.h b/desktop/.st/patch/sync.h deleted file mode 100644 index 6c2ebe7..0000000 --- a/desktop/.st/patch/sync.h +++ /dev/null @@ -1,7 +0,0 @@ -static int su = 0; -static int twrite_aborted = 0; - -static void tsync_begin(); -static void tsync_end(); -int tinsync(uint timeout); -int ttyread_pending(); \ No newline at end of file diff --git a/desktop/.st/patch/utils.h b/desktop/.st/patch/utils.h deleted file mode 100644 index 5ecea0d..0000000 --- a/desktop/.st/patch/utils.h +++ /dev/null @@ -1,23 +0,0 @@ -/// Dynamic memory-chunk, with (1) datatype size, (2/3) initialized / allocated chunk, (4) content -typedef struct { uint8_t const elSize; uint32_t init, alloc; char* content; } DynamicArray; -#define UTF8_ARRAY {4, 0, 0, NULL} - -static inline int p_alloc(DynamicArray *s, uint32_t amount) { - uint32_t const diff=s->init+s->elSize*amount-s->alloc, nas=s->alloc+max(diff,15)*s->elSize; - if (s->alloc < s->init + s->elSize * amount) { - char* tmp = realloc(s->content, nas); - if (!tmp) return 0; - s->alloc = nas, s->content = tmp; - } - return 1; -} -static inline char *view(DynamicArray * s, uint32_t i) { return s->content + i*s->elSize; } -static inline char *end(DynamicArray *s, uint32_t i) { return s->content +s->init-(i+1)*s->elSize; } -static inline uint32_t getU32(DynamicArray* s, uint32_t i, int b) { return *((uint32_t*) (b ?view(s,i) :end(s,i))); } -static char *expand(DynamicArray *s) { if (!p_alloc(s, 1)) return NULL; s->init += s->elSize; return end(s, 0); } -static inline void pop(DynamicArray* s) { s->init -= s->elSize; } -static inline void empty(DynamicArray* s) { s->init = 0; } -static inline int size(DynamicArray const * s) { return s->init / s->elSize; } -static inline void assign(DynamicArray* s, DynamicArray const *o) { - if (p_alloc(s, size(o))) memcpy(s->content, o->content, (s->init=o->init)); -} \ No newline at end of file diff --git a/desktop/.st/patch/x_include.c b/desktop/.st/patch/x_include.c deleted file mode 100644 index cbea418..0000000 --- a/desktop/.st/patch/x_include.c +++ /dev/null @@ -1,43 +0,0 @@ -/* Patches */ -#if ALPHA_PATCH -#include "alpha.c" -#endif -#if BACKGROUND_IMAGE_PATCH -#include "background_image_x.c" -#endif -#if BOXDRAW_PATCH -#include "boxdraw.c" -#endif -#if OPENCOPIED_PATCH -#include "opencopied.c" -#endif -#if FIXKEYBOARDINPUT_PATCH -#include "fixkeyboardinput.c" -#endif -#if FONT2_PATCH -#include "font2.c" -#endif -#if FULLSCREEN_PATCH -#include "fullscreen_x.c" -#endif -#if INVERT_PATCH -#include "invert.c" -#endif -#if KEYBOARDSELECT_PATCH -#include "keyboardselect_x.c" -#endif -#if OPENURLONCLICK_PATCH -#include "openurlonclick.c" -#endif -#if RIGHTCLICKTOPLUMB_PATCH -#include "rightclicktoplumb_x.c" -#endif -#if SIXEL_PATCH -#include "sixel_x.c" -#endif -#if ST_EMBEDDER_PATCH -#include "st_embedder_x.c" -#endif -#if XRESOURCES_PATCH -#include "xresources.c" -#endif \ No newline at end of file diff --git a/desktop/.st/patch/x_include.h b/desktop/.st/patch/x_include.h deleted file mode 100644 index 6505909..0000000 --- a/desktop/.st/patch/x_include.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Patches */ -#if ALPHA_PATCH -#include "alpha.h" -#endif -#if BACKGROUND_IMAGE_PATCH -#include "background_image_x.h" -#endif -#if BOXDRAW_PATCH -#include "boxdraw.h" -#endif -#if OPENCOPIED_PATCH -#include "opencopied.h" -#endif -#if FONT2_PATCH -#include "font2.h" -#endif -#if FULLSCREEN_PATCH -#include "fullscreen_x.h" -#endif -#if INVERT_PATCH -#include "invert.h" -#endif -#if KEYBOARDSELECT_PATCH -#include "keyboardselect_x.h" -#endif -#if NETWMICON_PATCH -#include "netwmicon.h" -#endif -#if RIGHTCLICKTOPLUMB_PATCH -#include "rightclicktoplumb_x.h" -#endif -#if ST_EMBEDDER_PATCH -#include "st_embedder_x.h" -#endif -#if XRESOURCES_PATCH -#include "xresources.h" -#endif -#if VIM_BROWSE_PATCH -#include "normalMode.h" -#endif diff --git a/desktop/.st/patch/xresources.c b/desktop/.st/patch/xresources.c deleted file mode 100644 index ba3d985..0000000 --- a/desktop/.st/patch/xresources.c +++ /dev/null @@ -1,82 +0,0 @@ -int -resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst) -{ - char **sdst = dst; - int *idst = dst; - float *fdst = dst; - - char fullname[256]; - char fullclass[256]; - char *type; - XrmValue ret; - - snprintf(fullname, sizeof(fullname), "%s.%s", - opt_name ? opt_name : "st", name); - snprintf(fullclass, sizeof(fullclass), "%s.%s", - opt_class ? opt_class : "St", name); - fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0'; - - XrmGetResource(db, fullname, fullclass, &type, &ret); - if (ret.addr == NULL || strncmp("String", type, 64)) - return 1; - - switch (rtype) { - case STRING: - *sdst = ret.addr; - break; - case INTEGER: - *idst = strtoul(ret.addr, NULL, 10); - break; - case FLOAT: - *fdst = strtof(ret.addr, NULL); - break; - } - return 0; -} - -void -config_init(Display *dpy) -{ - char *resm; - XrmDatabase db; - ResourcePref *p; - - XrmInitialize(); - resm = XResourceManagerString(dpy); - if (!resm) - return; - - db = XrmGetStringDatabase(resm); - for (p = resources; p < resources + LEN(resources); p++) - resource_load(db, p->name, p->type, p->dst); -} - -#if XRESOURCES_RELOAD_PATCH -void -reload_config(int sig) -{ - /* Recreate a Display object to have up to date Xresources entries */ - Display *dpy; - if (!(dpy = XOpenDisplay(NULL))) - die("Can't open display\n"); - - config_init(dpy); - xloadcols(); - - /* nearly like zoomabs() */ - xunloadfonts(); - xloadfonts(font, 0); /* font <- config_init() */ - #if FONT2_PATCH - xloadsparefonts(); - #endif // FONT2_PATCH - cresize(0, 0); - redraw(); - xhints(); - - XCloseDisplay(dpy); - - /* from https://st.suckless.org/patches/xresources-with-reload-signal */ - /* triggers re-render if we're visible */ - ttywrite("\033[O", 3, 1); -} -#endif // XRESOURCES_RELOAD_PATCH diff --git a/desktop/.st/patch/xresources.h b/desktop/.st/patch/xresources.h deleted file mode 100644 index c184852..0000000 --- a/desktop/.st/patch/xresources.h +++ /dev/null @@ -1,17 +0,0 @@ -#include - -/* Xresources preferences */ -enum resource_type { - STRING = 0, - INTEGER = 1, - FLOAT = 2 -}; - -typedef struct { - char *name; - enum resource_type type; - void *dst; -} ResourcePref; - -int resource_load(XrmDatabase, char *, enum resource_type, void *); -void config_init(Display *dpy); diff --git a/desktop/.st/patches.def.h b/desktop/.st/patches.def.h deleted file mode 100644 index dc5d769..0000000 --- a/desktop/.st/patches.def.h +++ /dev/null @@ -1,454 +0,0 @@ -/* - * This file contains patch control flags. - * - * In principle you should be able to mix and match any patches - * you may want. In cases where patches are logically incompatible - * one patch may take precedence over the other as noted in the - * relevant descriptions. - */ - -/* Patches */ - -/* The alpha patch adds transparency for the terminal. - * You need to uncomment the corresponding line in config.mk to use the -lXrender library - * when including this patch. - * https://st.suckless.org/patches/alpha/ - */ -#define ALPHA_PATCH 1 - -/* The alpha focus highlight patch allows the user to specify two distinct opacity values or - * background colors in order to easily differentiate between focused and unfocused terminal - * windows. This depends on the alpha patch. - * https://github.com/juliusHuelsmann/st-focus/ - * https://st.suckless.org/patches/alpha_focus_highlight/ - */ -#define ALPHA_FOCUS_HIGHLIGHT_PATCH 0 - -/* Adds gradient transparency to st, depends on the alpha patch. - * https://st.suckless.org/patches/gradient/ - */ -#define ALPHA_GRADIENT_PATCH 0 - -/* This patch allows st to resize to any pixel size rather than snapping to character width/height. - * https://st.suckless.org/patches/anysize/ - */ -#define ANYSIZE_PATCH 0 - -/* A simple variant of the anysize patch that only changes the resize hints to allow the window to - * be resized to any size. - */ -#define ANYSIZE_SIMPLE_PATCH 0 - -/* Draws a background image in farbfeld format in place of the defaultbg color allowing for pseudo - * transparency. - * https://st.suckless.org/patches/background_image/ - */ -#define BACKGROUND_IMAGE_PATCH 0 - -/* This patch adds the ability to reload the background image config when a SIGUSR1 signal is - * received, e.g.: killall -USR1 st - * Depends on the BACKGROUND_IMAGE_PATCH. - */ -#define BACKGROUND_IMAGE_RELOAD_PATCH 0 - -/* This patch allows the use of a blinking cursor. - * Only cursor styles 0, 1, 3, 5, and 7 blink. Set cursorstyle accordingly. - * Cursor styles are defined here: - * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Functions-using-CSI-_-ordered-by-the-final-character-lparen-s-rparen:CSI-Ps-SP-q.1D81 - * https://st.suckless.org/patches/blinking_cursor/ - */ -#define BLINKING_CURSOR_PATCH 1 - -/* By default bold text is rendered with a bold font in the bright variant of the current color. - * This patch makes bold text rendered simply as bold, leaving the color unaffected. - * https://st.suckless.org/patches/bold-is-not-bright/ - */ -#define BOLD_IS_NOT_BRIGHT_PATCH 1 - -/* This patch adds custom rendering of lines/blocks/braille characters for gapless alignment. - * https://st.suckless.org/patches/boxdraw/ - */ -#define BOXDRAW_PATCH 0 - -/* By default st only sets PRIMARY on selection. - * This patch makes st set CLIPBOARD on selection. - * https://st.suckless.org/patches/clipboard/ - */ -#define CLIPBOARD_PATCH 0 - -/* This patch allows st to be resized without cutting off text when the terminal window is - * made larger again. Text does not wrap when the terminal window is made smaller. - * - * The vim browse patch takes precedence over this patch. - * - * https://github.com/bakkeby/st-flexipatch/issues/34 - */ -#define COLUMNS_PATCH 0 - -/* Select and copy the last URL displayed with Mod+l. Multiple invocations cycle through the - * available URLs. - * https://st.suckless.org/patches/copyurl/ - */ -#define COPYURL_PATCH 0 - -/* Select and copy the last URL displayed with Mod+l. Multiple invocations cycle through the - * available URLs. This variant also highlights the selected URLs. - * https://st.suckless.org/patches/copyurl/ - */ -#define COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH 0 - -/* This patch adds support for CSI escape sequences 22 and 23, which save and - * restores the window title (for instance nvim does this when opening and closing). - * https://st.suckless.org/patches/csi_22_23/ - */ -#define CSI_22_23_PATCH 0 - -/* According to the specification (see link in BLINKING_CURSOR_PATCH) the "Set cursor style - * (DECSCUSR), VT520." escape sequences define both values of 0 and 1 as a blinking block, - * with 1 being the default. - * - * This patch allows the default cursor to be set when value 0 is used, as opposed to - * setting the cursor to a blinking block. - * - * This allows a command like this to restore the cursor to what st is configured with: - * $ echo -ne "\e[ q" - * - * While many terminal emulators do this it is not adhering to specification. xterm is an - * example terminal that sets a blinking block instead of the configured one, same as st. - */ -#define DEFAULT_CURSOR_PATCH 0 - -/* Return BS on pressing backspace and DEL on pressing the delete key. - * https://st.suckless.org/patches/delkey/ - */ -#define DELKEY_PATCH 1 - -/* This patch adds the option of disabling bold fonts globally. - * https://st.suckless.org/patches/disable_bold_italic_fonts/ - */ -#define DISABLE_BOLD_FONTS_PATCH 0 - -/* This patch adds the option of disabling italic fonts globally. - * https://st.suckless.org/patches/disable_bold_italic_fonts/ - */ -#define DISABLE_ITALIC_FONTS_PATCH 0 - -/* This patch adds the option of disabling roman fonts globally. - * https://st.suckless.org/patches/disable_bold_italic_fonts/ - */ -#define DISABLE_ROMAN_FONTS_PATCH 0 - -/* This patch makes the cursor color the inverse of the current cell color. - * https://st.suckless.org/patches/dynamic-cursor-color/ - */ -#define DYNAMIC_CURSOR_COLOR_PATCH 0 - -/* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. - * https://st.suckless.org/patches/externalpipe/ - */ -#define EXTERNALPIPE_PATCH 0 - -/* This patch improves and extends the externalpipe patch in two ways: - * - it prevents the reset of the signal handler set on SIGCHILD, when - * the forked process that executes the external process exits and - * - it adds the externalpipein function to redirect the standard output - * of the external command to the slave size of the pty, that is, as if - * the external program had been manually executed on the terminal - * - * It can be used to send desired escape sequences to the terminal with a - * keyboard shortcut. The patch was created to make use of the dynamic-colors - * tool that uses the OSC escape sequences to change the colors of the terminal. - * - * This patch depends on EXTERNALPIPE_PATCH being enabled. - * - * https://github.com/sos4nt/dynamic-colors - * https://lists.suckless.org/hackers/2004/17218.html - */ -#define EXTERNALPIPEIN_PATCH 0 - -/* This patch allows command line applications to use all the fancy key combinations - * that are available to GUI applications. - * https://st.suckless.org/patches/fix_keyboard_input/ - */ -#define FIXKEYBOARDINPUT_PATCH 0 - -/* This patch allows you to add spare font besides the default. Some glyphs can be not present in - * the 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 the font cache. - * So they will be used first for glyphs that are absent in the default font. - * https://st.suckless.org/patches/font2/ - */ -#define FONT2_PATCH 0 - -/* This patch adds the ability to toggle st into fullscreen mode. - * Two key bindings are defined: F11 which is typical with other applications and Alt+Enter - * which matches the default xterm behavior. - * https://st.suckless.org/patches/fullscreen/ - */ -#define FULLSCREEN_PATCH 0 - -/* Hide the X cursor whenever a key is pressed and show it back when the mouse is moved in - * the terminal window. - * https://st.suckless.org/patches/hidecursor/ - */ -#define HIDECURSOR_PATCH 0 - -/* This patch hides the terminal cursor when the window loses focus (as opposed to showing a hollow - * cursor). - * https://www.reddit.com/r/suckless/comments/nvee8h/how_to_hide_cursor_in_st_is_there_a_patch_for_it/ - */ -#define HIDE_TERMINAL_CURSOR_PATCH 0 - -/* This patch adds a keybinding that lets you invert the current colorscheme of st. - * This provides a simple way to temporarily switch to a light colorscheme if you use a dark - * colorscheme or visa-versa. - * https://st.suckless.org/patches/invert/ - */ -#define INVERT_PATCH 0 - -/* Pressing the default binding Ctrl+Shift-i will popup dmenu, asking you to enter a unicode - * codepoint that will be converted to a glyph and then pushed to st. - * https://st.suckless.org/patches/iso14755/ - */ -#define ISO14755_PATCH 0 - -/* This patch allows you to select text on the terminal using keyboard shortcuts. - * https://st.suckless.org/patches/keyboard_select/ - */ -#define KEYBOARDSELECT_PATCH 0 - -/* This patch adds support for drawing ligatures using the Harfbuzz library to transform - * original text of a single line to a list of glyphs with ligatures included. - * This patch depends on the Harfbuzz library and headers to compile. - * You need to uncomment the corresponding lines in config.mk to use the harfbuzz library - * when including this patch. - * https://github.com/cog1to/st-ligatures - * https://st.suckless.org/patches/ligatures/ - */ -#define LIGATURES_PATCH 0 - -/* This patch makes st ignore terminal color attributes by forcing display of the default - * foreground and background colors only - making for a monochrome look. Idea ref. - * https://www.reddit.com/r/suckless/comments/ixbx6z/how_to_use_black_and_white_only_for_st/ - */ -#define MONOCHROME_PATCH 0 - -/* This patch sets the _NET_WM_ICON X property with a hardcoded icon for st. - * https://st.suckless.org/patches/netwmicon/ - */ -#define NETWMICON_PATCH 0 - -/* This patch allows you to spawn a new st terminal using Ctrl-Shift-Return. It will have the - * same CWD (current working directory) as the original st instance. - * https://st.suckless.org/patches/newterm/ - */ -#define NEWTERM_PATCH 0 - -/* This patch will set the _MOTIF_WM_HINTS property for the st window which, if the window manager - * respects it, will show the st window without window decorations. - * - * In dwm, if the decoration hints patch is applied, then the st window will start out without a - * border. In GNOME and KDE the window should start without a window title. - */ -#define NO_WINDOW_DECORATIONS_PATCH 0 - -/* Open contents of the clipboard in a user-defined browser. - * https://st.suckless.org/patches/open_copied_url/ - */ -#define OPENCOPIED_PATCH 0 - -/* This patch allows for URLs to be opened directly when you click on them. This may not work with - * all terminal applications. - * - * https://www.reddit.com/r/suckless/comments/cc83om/st_open_url/ - */ -#define OPENURLONCLICK_PATCH 0 - -/* This patch allows you to specify a border that is relative in size to the width of a cell - * in the terminal. - * https://st.suckless.org/patches/relativeborder/ - */ -#define RELATIVEBORDER_PATCH 0 - -/* This patch allows you to right-click on some selected text to send it to the plumbing - * program of choice, e.g. open a file, view an image, open a URL. - * https://st.suckless.org/patches/right_click_to_plumb/ - */ -#define RIGHTCLICKTOPLUMB_PATCH 0 - -/* Scroll back through terminal output using Shift+{PageUp, PageDown}. - * https://st.suckless.org/patches/scrollback/ - */ -#define SCROLLBACK_PATCH 1 - -/* Scroll back through terminal output using Shift+MouseWheel. - * This variant depends on SCROLLBACK_PATCH being enabled. - * https://st.suckless.org/patches/scrollback/ - */ -#define SCROLLBACK_MOUSE_PATCH 1 - -/* Scroll back through terminal output using mouse wheel (when not in MODE_ALTSCREEN). - * This variant depends on SCROLLBACK_PATCH being enabled. - * https://st.suckless.org/patches/scrollback/ - */ -#define SCROLLBACK_MOUSE_ALTSCREEN_PATCH 0 - -/* This is the single drawable buffer patch as outlined in the FAQ to get images - * in w3m to display. While this patch does not break the alpha patch it images - * are not shown in w3m if the alpha patch is applied. - */ -#define SINGLE_DRAWABLE_BUFFER_PATCH 0 - -/* This patch adds SIXEL graphics support for st. - * Note that patch/sixel.c/sixel_hls.c come from mintty, licensed under GPL. - * Known issues: - * - Rendering sixel graphics may cause unusual cursor placement, this is - * not specific to this variant of st - the same issue is present in - * the xterm implementation. This is likely an issue of sixel height - * not being detected correctly. - * - * Note that you need to uncomment the corresponding lines in config.mk when including this patch. - * This patch is incompatible with the W3M patch. - * - * https://gist.github.com/saitoha/70e0fdf22e3e8f63ce937c7f7da71809 - */ -#define SIXEL_PATCH 0 - -/* This patch allows clients to embed into the st window and is useful if you tend to - * start X applications from the terminal. For example: - * - * $ surf -e $WINDOWID - * - * The behavior is similar to Plan 9 where applications can take over windows. - * URL TBC - */ -#define ST_EMBEDDER_PATCH 0 - -/* Use inverted defaultbg/fg for selection when bg/fg are the same. - * https://st.suckless.org/patches/spoiler/ - */ -#define SPOILER_PATCH 0 - -/* This patch changes the mouse shape to the global default when the running program subscribes - * for mouse events, for instance, in programs like ranger and fzf. It emulates the behaviour - * shown by vte terminals like termite. - * https://st.suckless.org/patches/swapmouse/ - */ -#define SWAPMOUSE_PATCH 0 - -/* This patch adds synchronized-updates/application-sync support in st. - * This will have no effect except when an application uses the synchronized-update escape - * sequences. With this patch nearly all cursor flicker is eliminated in tmux, and tmux detects - * it automatically via terminfo. - * - * Note: this patch alters st.info to promote support for extra escape sequences, which can - * potentially cause application misbehaviour if you do not use this patch. Try removing or - * commenting out the corresponding line in st.info if this is causing issues. - * - * https://st.suckless.org/patches/sync/ - */ -#define SYNC_PATCH 0 - -/* Instead of a default X cursor, use the xterm cursor from your cursor theme. - * You need to uncomment the corresponding line in config.mk to use the -lXcursor library - * when including this patch. - * https://st.suckless.org/patches/themed_cursor/ - */ -#define THEMED_CURSOR_PATCH 0 - -/* Adds support for special underlines. - * - * Example test command: - * $ echo -e "\e[4:3m\e[58:5:10munderline\e[0m" - * ^ ^ ^ ^ ^- sets terminal color 10 - * | | | \- indicates that terminal colors should be used - * | | \- indicates that underline color is being set - * | \- sets underline style to curvy - * \- set underline - * - * Note: this patch alters st.info to promote support for extra escape sequences, which can - * potentially cause application misbehaviour if you do not use this patch. Try removing or - * commenting out the corresponding line in st.info if this is causing issues. - * - * https://st.suckless.org/patches/undercurl/ - */ -#define UNDERCURL_PATCH 0 - -/* Allows mouse scroll without modifier keys for regardless of alt screen using the external - * scroll program. - * https://st.suckless.org/patches/universcroll/ - */ -#define UNIVERSCROLL_PATCH 0 - -/* Use XftFontMatch in place of FcFontMatch. - * - * XftFontMatch calls XftDefaultSubstitute which configures various match properties according - * to the user's configured Xft defaults (xrdb) as well as according to the current display and - * screen. Most importantly, the screen DPI is computed [1]. Without this, st uses a "default" - * DPI of 75 [2]. - * - * [1]: https://cgit.freedesktop.org/xorg/lib/libXft/tree/src/xftdpy.c?id=libXft-2.3.2#n535 - * [2]: https://cgit.freedesktop.org/fontconfig/tree/src/fcdefault.c?id=2.11.1#n255 - * - * https://git.suckless.org/st/commit/528241aa3835e2f1f052abeeaf891737712955a0.html - */ -#define USE_XFTFONTMATCH_PATCH 0 - -/* Vertically center lines in the space available if you have set a larger chscale in config.h - * https://st.suckless.org/patches/vertcenter/ - */ -#define VERTCENTER_PATCH 0 - -/* The vim-browse patch offers the possibility to move through the terminal history-buffer, - * search for strings using VIM-like motions, operations and quantifiers. It overlays the - * screen with highlighted search results and displays the current operation / motions / search - * string in the bottom right corner. - * - * https://github.com/juliusHuelsmann/st-history-vim - * https://st.suckless.org/patches/vim_browse/ - */ -#define VIM_BROWSE_PATCH 0 - -/* Briefly inverts window content on terminal bell event. - * https://st.suckless.org/patches/visualbell/ - */ -#define VISUALBELL_1_PATCH 0 - -/* Adds support for w3m images. - * https://st.suckless.org/patches/w3m/ - */ -#define W3M_PATCH 0 - -/* Adds proper glyphs rendering in st allowing wide glyphs to be drawn as-is as opposed to - * smaller or cut glyphs being rendered. - * https://github.com/Dreomite/st/commit/e3b821dcb3511d60341dec35ee05a4a0abfef7f2 - * https://www.reddit.com/r/suckless/comments/jt90ai/update_support_for_proper_glyph_rendering_in_st/ - */ -#define WIDE_GLYPHS_PATCH 0 - -/* There is a known issue that Google's Variable Fonts (VF) can end up with letter spacing - * that is too wide in programs that use Xft, for example Inconsolata v3.000. - * - * This is intended as a temporary patch / hack until (if) this is fixed in the Xft library - * itself. - * - * https://github.com/googlefonts/Inconsolata/issues/42#issuecomment-737508890 - */ -#define WIDE_GLYPH_SPACING_PATCH 0 - -/* This patch allows user to specify the initial path st should use as the working directory. - * https://st.suckless.org/patches/workingdir/ - */ -#define WORKINGDIR_PATCH 0 - -/* This patch adds the ability to configure st via Xresources. At startup, st will read and - * apply the resources named in the resources[] array in config.h. - * https://st.suckless.org/patches/xresources/ - */ -#define XRESOURCES_PATCH 0 - -/* This patch adds the ability to reload the Xresources config when a SIGUSR1 signal is received - * e.g.: killall -USR1 st - * Depends on the XRESOURCES_PATCH. - */ -#define XRESOURCES_RELOAD_PATCH 0 diff --git a/desktop/.st/recompile b/desktop/.st/recompile deleted file mode 100755 index 102ea03..0000000 --- a/desktop/.st/recompile +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -rm -f ./config.h -sudo make clean install diff --git a/desktop/.st/sixel.c b/desktop/.st/sixel.c deleted file mode 100644 index 2c382f4..0000000 --- a/desktop/.st/sixel.c +++ /dev/null @@ -1,616 +0,0 @@ -// sixel.c (part of mintty) -// originally written by kmiya@cluti (https://github.com/saitoha/sixel/blob/master/fromsixel.c) -// Licensed under the terms of the GNU General Public License v3 or later. - -#include -#include /* memcpy */ - -#include "sixel.h" -#include "sixel_hls.h" - -#define SIXEL_RGB(r, g, b) ((r) + ((g) << 8) + ((b) << 16)) -#define SIXEL_PALVAL(n,a,m) (((n) * (a) + ((m) / 2)) / (m)) -#define SIXEL_XRGB(r,g,b) SIXEL_RGB(SIXEL_PALVAL(r, 255, 100), SIXEL_PALVAL(g, 255, 100), SIXEL_PALVAL(b, 255, 100)) - -static sixel_color_t const sixel_default_color_table[] = { - SIXEL_XRGB( 0, 0, 0), /* 0 Black */ - SIXEL_XRGB(20, 20, 80), /* 1 Blue */ - SIXEL_XRGB(80, 13, 13), /* 2 Red */ - SIXEL_XRGB(20, 80, 20), /* 3 Green */ - SIXEL_XRGB(80, 20, 80), /* 4 Magenta */ - SIXEL_XRGB(20, 80, 80), /* 5 Cyan */ - SIXEL_XRGB(80, 80, 20), /* 6 Yellow */ - SIXEL_XRGB(53, 53, 53), /* 7 Gray 50% */ - SIXEL_XRGB(26, 26, 26), /* 8 Gray 25% */ - SIXEL_XRGB(33, 33, 60), /* 9 Blue* */ - SIXEL_XRGB(60, 26, 26), /* 10 Red* */ - SIXEL_XRGB(33, 60, 33), /* 11 Green* */ - SIXEL_XRGB(60, 33, 60), /* 12 Magenta* */ - SIXEL_XRGB(33, 60, 60), /* 13 Cyan* */ - SIXEL_XRGB(60, 60, 33), /* 14 Yellow* */ - SIXEL_XRGB(80, 80, 80), /* 15 Gray 75% */ -}; - -static int -set_default_color(sixel_image_t *image) -{ - int i; - int n; - int r; - int g; - int b; - - /* palette initialization */ - for (n = 1; n < 17; n++) { - image->palette[n] = sixel_default_color_table[n - 1]; - } - - /* colors 17-232 are a 6x6x6 color cube */ - for (r = 0; r < 6; r++) { - for (g = 0; g < 6; g++) { - for (b = 0; b < 6; b++) { - image->palette[n++] = SIXEL_RGB(r * 51, g * 51, b * 51); - } - } - } - - /* colors 233-256 are a grayscale ramp, intentionally leaving out */ - for (i = 0; i < 24; i++) { - image->palette[n++] = SIXEL_RGB(i * 11, i * 11, i * 11); - } - - for (; n < DECSIXEL_PALETTE_MAX; n++) { - image->palette[n] = SIXEL_RGB(255, 255, 255); - } - - return (0); -} - -static int -sixel_image_init( - sixel_image_t *image, - int width, - int height, - int fgcolor, - int bgcolor, - int use_private_register) -{ - int status = (-1); - size_t size; - - size = (size_t)(width * height) * sizeof(sixel_color_no_t); - image->width = width; - image->height = height; - image->data = (sixel_color_no_t *)malloc(size); - image->ncolors = 2; - image->use_private_register = use_private_register; - - if (image->data == NULL) { - status = (-1); - goto end; - } - memset(image->data, 0, size); - - image->palette[0] = bgcolor; - - if (image->use_private_register) - image->palette[1] = fgcolor; - - image->palette_modified = 0; - - status = (0); - -end: - return status; -} - - -static int -image_buffer_resize( - sixel_image_t *image, - int width, - int height) -{ - int status = (-1); - size_t size; - sixel_color_no_t *alt_buffer; - int n; - int min_height; - - size = (size_t)(width * height) * sizeof(sixel_color_no_t); - alt_buffer = (sixel_color_no_t *)malloc(size); - if (alt_buffer == NULL) { - /* free source image */ - free(image->data); - image->data = NULL; - status = (-1); - goto end; - } - - min_height = height > image->height ? image->height: height; - if (width > image->width) { /* if width is extended */ - for (n = 0; n < min_height; ++n) { - /* copy from source image */ - memcpy(alt_buffer + width * n, - image->data + image->width * n, - (size_t)image->width * sizeof(sixel_color_no_t)); - /* fill extended area with background color */ - memset(alt_buffer + width * n + image->width, - 0, - (size_t)(width - image->width) * sizeof(sixel_color_no_t)); - } - } else { - for (n = 0; n < min_height; ++n) { - /* copy from source image */ - memcpy(alt_buffer + width * n, - image->data + image->width * n, - (size_t)width * sizeof(sixel_color_no_t)); - } - } - - if (height > image->height) { /* if height is extended */ - /* fill extended area with background color */ - memset(alt_buffer + width * image->height, - 0, - (size_t)(width * (height - image->height)) * sizeof(sixel_color_no_t)); - } - - /* free source image */ - free(image->data); - - image->data = alt_buffer; - image->width = width; - image->height = height; - - status = (0); - -end: - return status; -} - -static void -sixel_image_deinit(sixel_image_t *image) -{ - free(image->data); - image->data = NULL; -} - -int -sixel_parser_init(sixel_state_t *st, - sixel_color_t fgcolor, sixel_color_t bgcolor, - unsigned char use_private_register, - int cell_width, int cell_height) -{ - int status = (-1); - - st->state = PS_DECSIXEL; - st->pos_x = 0; - st->pos_y = 0; - st->max_x = 0; - st->max_y = 0; - st->attributed_pan = 2; - st->attributed_pad = 1; - st->attributed_ph = 0; - st->attributed_pv = 0; - st->repeat_count = 1; - st->color_index = 16; - st->grid_width = cell_width; - st->grid_height = cell_height; - st->nparams = 0; - st->param = 0; - - /* buffer initialization */ - status = sixel_image_init(&st->image, 1, 1, fgcolor, bgcolor, use_private_register); - - return status; -} - -int -sixel_parser_set_default_color(sixel_state_t *st) -{ - return set_default_color(&st->image); -} - -int -sixel_parser_finalize(sixel_state_t *st, unsigned char *pixels) -{ - int status = (-1); - int sx; - int sy; - sixel_image_t *image = &st->image; - int x, y; - sixel_color_no_t *src; - unsigned char *dst; - int color; - - if (++st->max_x < st->attributed_ph) - st->max_x = st->attributed_ph; - - if (++st->max_y < st->attributed_pv) - st->max_y = st->attributed_pv; - - sx = (st->max_x + st->grid_width - 1) / st->grid_width * st->grid_width; - sy = (st->max_y + st->grid_height - 1) / st->grid_height * st->grid_height; - - if (image->width > sx || image->height > sy) { - status = image_buffer_resize(image, sx, sy); - if (status < 0) - goto end; - } - - if (image->use_private_register && image->ncolors > 2 && !image->palette_modified) { - status = set_default_color(image); - if (status < 0) - goto end; - } - - src = st->image.data; - dst = pixels; - for (y = 0; y < st->image.height; ++y) { - for (x = 0; x < st->image.width; ++x) { - color = st->image.palette[*src++]; - *dst++ = color >> 16 & 0xff; /* b */ - *dst++ = color >> 8 & 0xff; /* g */ - *dst++ = color >> 0 & 0xff; /* r */ - *dst++ = 255; /* a */ - } - /* fill right padding with bgcolor */ - for (; x < st->image.width; ++x) { - color = st->image.palette[0]; /* bgcolor */ - *dst++ = color >> 16 & 0xff; /* b */ - *dst++ = color >> 8 & 0xff; /* g */ - *dst++ = color >> 0 & 0xff; /* r */ - dst++; /* a */ - } - } - /* fill bottom padding with bgcolor */ - for (; y < st->image.height; ++y) { - for (x = 0; x < st->image.width; ++x) { - color = st->image.palette[0]; /* bgcolor */ - *dst++ = color >> 16 & 0xff; /* b */ - *dst++ = color >> 8 & 0xff; /* g */ - *dst++ = color >> 0 & 0xff; /* r */ - dst++; /* a */ - } - } - - status = (0); - -end: - return status; -} - -/* convert sixel data into indexed pixel bytes and palette data */ -int -sixel_parser_parse(sixel_state_t *st, unsigned char *p, size_t len) -{ - int status = (-1); - int n; - int i; - int x; - int y; - int bits; - int sixel_vertical_mask; - int sx; - int sy; - int c; - int pos; - unsigned char *p0 = p; - sixel_image_t *image = &st->image; - - if (! image->data) - goto end; - - while (p < p0 + len) { - switch (st->state) { - case PS_ESC: - goto end; - - case PS_DECSIXEL: - switch (*p) { - case '\x1b': - st->state = PS_ESC; - p++; - break; - case '"': - st->param = 0; - st->nparams = 0; - st->state = PS_DECGRA; - p++; - break; - case '!': - st->param = 0; - st->nparams = 0; - st->state = PS_DECGRI; - p++; - break; - case '#': - st->param = 0; - st->nparams = 0; - st->state = PS_DECGCI; - p++; - break; - case '$': - /* DECGCR Graphics Carriage Return */ - st->pos_x = 0; - p++; - break; - case '-': - /* DECGNL Graphics Next Line */ - st->pos_x = 0; - if (st->pos_y < DECSIXEL_HEIGHT_MAX - 5 - 6) - st->pos_y += 6; - else - st->pos_y = DECSIXEL_HEIGHT_MAX + 1; - p++; - break; - default: - if (*p >= '?' && *p <= '~') { /* sixel characters */ - if ((image->width < (st->pos_x + st->repeat_count) || image->height < (st->pos_y + 6)) - && image->width < DECSIXEL_WIDTH_MAX && image->height < DECSIXEL_HEIGHT_MAX) { - sx = image->width * 2; - sy = image->height * 2; - while (sx < (st->pos_x + st->repeat_count) || sy < (st->pos_y + 6)) { - sx *= 2; - sy *= 2; - } - - if (sx > DECSIXEL_WIDTH_MAX) - sx = DECSIXEL_WIDTH_MAX; - if (sy > DECSIXEL_HEIGHT_MAX) - sy = DECSIXEL_HEIGHT_MAX; - - status = image_buffer_resize(image, sx, sy); - if (status < 0) - goto end; - } - - if (st->color_index > image->ncolors) - image->ncolors = st->color_index; - - if (st->pos_x + st->repeat_count > image->width) - st->repeat_count = image->width - st->pos_x; - - if (st->repeat_count > 0 && st->pos_y - 5 < image->height) { - bits = *p - '?'; - if (bits != 0) { - sixel_vertical_mask = 0x01; - if (st->repeat_count <= 1) { - for (i = 0; i < 6; i++) { - if ((bits & sixel_vertical_mask) != 0) { - pos = image->width * (st->pos_y + i) + st->pos_x; - image->data[pos] = st->color_index; - if (st->max_x < st->pos_x) - st->max_x = st->pos_x; - if (st->max_y < (st->pos_y + i)) - st->max_y = st->pos_y + i; - } - sixel_vertical_mask <<= 1; - } - } else { - /* st->repeat_count > 1 */ - for (i = 0; i < 6; i++) { - if ((bits & sixel_vertical_mask) != 0) { - c = sixel_vertical_mask << 1; - for (n = 1; (i + n) < 6; n++) { - if ((bits & c) == 0) - break; - c <<= 1; - } - for (y = st->pos_y + i; y < st->pos_y + i + n; ++y) { - for (x = st->pos_x; x < st->pos_x + st->repeat_count; ++x) - image->data[image->width * y + x] = st->color_index; - } - if (st->max_x < (st->pos_x + st->repeat_count - 1)) - st->max_x = st->pos_x + st->repeat_count - 1; - if (st->max_y < (st->pos_y + i + n - 1)) - st->max_y = st->pos_y + i + n - 1; - i += (n - 1); - sixel_vertical_mask <<= (n - 1); - } - sixel_vertical_mask <<= 1; - } - } - } - } - if (st->repeat_count > 0) - st->pos_x += st->repeat_count; - st->repeat_count = 1; - } - p++; - break; - } - break; - - case PS_DECGRA: - /* DECGRA Set Raster Attributes " Pan; Pad; Ph; Pv */ - switch (*p) { - case '\x1b': - st->state = PS_ESC; - p++; - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - st->param = st->param * 10 + *p - '0'; - if (st->param > DECSIXEL_PARAMVALUE_MAX) - st->param = DECSIXEL_PARAMVALUE_MAX; - p++; - break; - case ';': - if (st->nparams < DECSIXEL_PARAMS_MAX) - st->params[st->nparams++] = st->param; - st->param = 0; - p++; - break; - default: - if (st->nparams < DECSIXEL_PARAMS_MAX) - st->params[st->nparams++] = st->param; - if (st->nparams > 0) - st->attributed_pad = st->params[0]; - if (st->nparams > 1) - st->attributed_pan = st->params[1]; - if (st->nparams > 2 && st->params[2] > 0) - st->attributed_ph = st->params[2]; - if (st->nparams > 3 && st->params[3] > 0) - st->attributed_pv = st->params[3]; - - if (st->attributed_pan <= 0) - st->attributed_pan = 1; - if (st->attributed_pad <= 0) - st->attributed_pad = 1; - - if (image->width < st->attributed_ph || - image->height < st->attributed_pv) { - sx = st->attributed_ph; - if (image->width > st->attributed_ph) - sx = image->width; - - sy = st->attributed_pv; - if (image->height > st->attributed_pv) - sy = image->height; - - sx = (sx + st->grid_width - 1) / st->grid_width * st->grid_width; - sy = (sy + st->grid_height - 1) / st->grid_height * st->grid_height; - - if (sx > DECSIXEL_WIDTH_MAX) - sx = DECSIXEL_WIDTH_MAX; - if (sy > DECSIXEL_HEIGHT_MAX) - sy = DECSIXEL_HEIGHT_MAX; - - status = image_buffer_resize(image, sx, sy); - if (status < 0) - goto end; - } - st->state = PS_DECSIXEL; - st->param = 0; - st->nparams = 0; - } - break; - - case PS_DECGRI: - /* DECGRI Graphics Repeat Introducer ! Pn Ch */ - switch (*p) { - case '\x1b': - st->state = PS_ESC; - p++; - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - st->param = st->param * 10 + *p - '0'; - if (st->param > DECSIXEL_PARAMVALUE_MAX) - st->param = DECSIXEL_PARAMVALUE_MAX; - p++; - break; - default: - st->repeat_count = st->param; - if (st->repeat_count == 0) - st->repeat_count = 1; - st->state = PS_DECSIXEL; - st->param = 0; - st->nparams = 0; - break; - } - break; - - case PS_DECGCI: - /* DECGCI Graphics Color Introducer # Pc; Pu; Px; Py; Pz */ - switch (*p) { - case '\x1b': - st->state = PS_ESC; - p++; - break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - st->param = st->param * 10 + *p - '0'; - if (st->param > DECSIXEL_PARAMVALUE_MAX) - st->param = DECSIXEL_PARAMVALUE_MAX; - p++; - break; - case ';': - if (st->nparams < DECSIXEL_PARAMS_MAX) - st->params[st->nparams++] = st->param; - st->param = 0; - p++; - break; - default: - st->state = PS_DECSIXEL; - if (st->nparams < DECSIXEL_PARAMS_MAX) - st->params[st->nparams++] = st->param; - st->param = 0; - - if (st->nparams > 0) { - st->color_index = 1 + st->params[0]; /* offset 1(background color) added */ - if (st->color_index < 0) - st->color_index = 0; - else if (st->color_index >= DECSIXEL_PALETTE_MAX) - st->color_index = DECSIXEL_PALETTE_MAX - 1; - } - - if (st->nparams > 4) { - st->image.palette_modified = 1; - if (st->params[1] == 1) { - /* HLS */ - if (st->params[2] > 360) - st->params[2] = 360; - if (st->params[3] > 100) - st->params[3] = 100; - if (st->params[4] > 100) - st->params[4] = 100; - image->palette[st->color_index] - = hls_to_rgb(st->params[2], st->params[3], st->params[4]); - } else if (st->params[1] == 2) { - /* RGB */ - if (st->params[2] > 100) - st->params[2] = 100; - if (st->params[3] > 100) - st->params[3] = 100; - if (st->params[4] > 100) - st->params[4] = 100; - image->palette[st->color_index] - = SIXEL_XRGB(st->params[2], st->params[3], st->params[4]); - } - } - break; - } - break; - default: - break; - } - } - - status = (0); - -end: - return status; -} - -void -sixel_parser_deinit(sixel_state_t *st) -{ - if (st) - sixel_image_deinit(&st->image); -} diff --git a/desktop/.st/sixel.h b/desktop/.st/sixel.h deleted file mode 100644 index 8a05c44..0000000 --- a/desktop/.st/sixel.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef SIXEL_H -#define SIXEL_H - -#define DECSIXEL_PARAMS_MAX 16 -#define DECSIXEL_PALETTE_MAX 1024 -#define DECSIXEL_PARAMVALUE_MAX 65535 -#define DECSIXEL_WIDTH_MAX 4096 -#define DECSIXEL_HEIGHT_MAX 4096 - -typedef unsigned short sixel_color_no_t; -typedef unsigned int sixel_color_t; - -typedef struct sixel_image_buffer { - sixel_color_no_t *data; - int width; - int height; - sixel_color_t palette[DECSIXEL_PALETTE_MAX]; - sixel_color_no_t ncolors; - int palette_modified; - int use_private_register; -} sixel_image_t; - -typedef enum parse_state { - PS_ESC = 1, /* ESC */ - PS_DECSIXEL = 2, /* DECSIXEL body part ", $, -, ? ... ~ */ - PS_DECGRA = 3, /* DECGRA Set Raster Attributes " Pan; Pad; Ph; Pv */ - PS_DECGRI = 4, /* DECGRI Graphics Repeat Introducer ! Pn Ch */ - PS_DECGCI = 5, /* DECGCI Graphics Color Introducer # Pc; Pu; Px; Py; Pz */ -} parse_state_t; - -typedef struct parser_context { - parse_state_t state; - int pos_x; - int pos_y; - int max_x; - int max_y; - int attributed_pan; - int attributed_pad; - int attributed_ph; - int attributed_pv; - int repeat_count; - int color_index; - int bgindex; - int grid_width; - int grid_height; - int param; - int nparams; - int params[DECSIXEL_PARAMS_MAX]; - sixel_image_t image; -} sixel_state_t; - -int sixel_parser_init(sixel_state_t *st, sixel_color_t fgcolor, sixel_color_t bgcolor, unsigned char use_private_register, int cell_width, int cell_height); -int sixel_parser_parse(sixel_state_t *st, unsigned char *p, size_t len); -int sixel_parser_set_default_color(sixel_state_t *st); -int sixel_parser_finalize(sixel_state_t *st, unsigned char *pixels); -void sixel_parser_deinit(sixel_state_t *st); - -#endif diff --git a/desktop/.st/sixel_hls.c b/desktop/.st/sixel_hls.c deleted file mode 100644 index 4f157b2..0000000 --- a/desktop/.st/sixel_hls.c +++ /dev/null @@ -1,115 +0,0 @@ -// sixel.c (part of mintty) -// this function is derived from a part of graphics.c -// in Xterm pl#310 originally written by Ross Combs. -// -// Copyright 2013,2014 by Ross Combs -// -// All Rights Reserved -// -// 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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. -// -// Except as contained in this notice, the name(s) of the above copyright -// holders shall not be used in advertising or otherwise to promote the -// sale, use or other dealings in this Software without prior written -// authorization. - -#define SIXEL_RGB(r, g, b) (((r) << 16) + ((g) << 8) + (b)) - -int -hls_to_rgb(int hue, int lum, int sat) -{ - double hs = (hue + 240) % 360; - double hv = hs / 360.0; - double lv = lum / 100.0; - double sv = sat / 100.0; - double c, x, m, c2; - double r1, g1, b1; - int r, g, b; - int hpi; - - if (sat == 0) { - r = g = b = lum * 255 / 100; - return SIXEL_RGB(r, g, b); - } - - if ((c2 = ((2.0 * lv) - 1.0)) < 0.0) { - c2 = -c2; - } - c = (1.0 - c2) * sv; - hpi = (int) (hv * 6.0); - x = (hpi & 1) ? c : 0.0; - m = lv - 0.5 * c; - - switch (hpi) { - case 0: - r1 = c; - g1 = x; - b1 = 0.0; - break; - case 1: - r1 = x; - g1 = c; - b1 = 0.0; - break; - case 2: - r1 = 0.0; - g1 = c; - b1 = x; - break; - case 3: - r1 = 0.0; - g1 = x; - b1 = c; - break; - case 4: - r1 = x; - g1 = 0.0; - b1 = c; - break; - case 5: - r1 = c; - g1 = 0.0; - b1 = x; - break; - default: - return SIXEL_RGB(255, 255, 255); - } - - r = (int) ((r1 + m) * 100.0 + 0.5); - g = (int) ((g1 + m) * 100.0 + 0.5); - b = (int) ((b1 + m) * 100.0 + 0.5); - - if (r < 0) { - r = 0; - } else if (r > 100) { - r = 100; - } - if (g < 0) { - g = 0; - } else if (g > 100) { - g = 100; - } - if (b < 0) { - b = 0; - } else if (b > 100) { - b = 100; - } - return SIXEL_RGB(r * 255 / 100, g * 255 / 100, b * 255 / 100); -} diff --git a/desktop/.st/sixel_hls.h b/desktop/.st/sixel_hls.h deleted file mode 100644 index 6176589..0000000 --- a/desktop/.st/sixel_hls.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Primary color hues: - * blue: 0 degrees - * red: 120 degrees - * green: 240 degrees - */ -int hls_to_rgb(int hue, int lum, int sat); diff --git a/desktop/.st/st.1 b/desktop/.st/st.1 deleted file mode 100644 index 39120b4..0000000 --- a/desktop/.st/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/desktop/.st/st.c b/desktop/.st/st.c deleted file mode 100644 index 2009c6c..0000000 --- a/desktop/.st/st.c +++ /dev/null @@ -1,3570 +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 VIM_BROWSE_PATCH -#include -#endif // VIM_BROWSE_PATCH - -#if KEYBOARDSELECT_PATCH -#include -#include -#endif // KEYBOARDSELECT_PATCH - -#if SIXEL_PATCH -#include "sixel.h" -#endif // SIXEL_PATCH - -#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 -#if UNDERCURL_PATCH -#define CAR_PER_ARG 4 -#endif // UNDERCURL_PATCH -#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)) -#if VIM_BROWSE_PATCH -static inline int max(int a, int b) { return a > b ? a : b; } -static inline int min(int a, int b) { return a < b ? a : b; } -#endif // VIM_BROWSE_PATCH - -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, - #if SIXEL_PATCH - MODE_SIXEL = 1 << 7, - #endif // SIXEL_PATCH -}; - -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, - #if SIXEL_PATCH - ESC_DCS =128, - #endif // SIXEL_PATCH -}; - -typedef struct { - int mode; - int type; - int snap; - #if VIM_BROWSE_PATCH - int swap; - #endif // VIM_BROWSE_PATCH - /* - * 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; - -/* 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]; - #if UNDERCURL_PATCH - int carg[ESC_ARG_SIZ][CAR_PER_ARG]; /* colon args */ - #endif // UNDERCURL_PATCH -} 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); -#if UNDERCURL_PATCH -static void readcolonargs(char **, int, int[][CAR_PER_ARG]); -#endif // UNDERCURL_PATCH -static void csiparse(void); -static void csireset(void); -static void osc4_color_response(int num); -static void osc_color_response(int index, int num); -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); -#if !VIM_BROWSE_PATCH -static void tmoveto(int, int); -#endif // VIM_BROWSE_PATCH -static void tmoveato(int, int); -static void tnewline(int); -static void tputtab(int); -static void tputc(Rune); -static void treset(void); -#if SCROLLBACK_PATCH -static void tscrollup(int, int, int); -#else -static void tscrollup(int, int); -#endif // SCROLLBACK_PATCH -static void tscrolldown(int, int); -static void tsetattr(const int *, int); -static void tsetchar(Rune, const Glyph *, int, int); -static void tsetdirt(int, int); -static void tsetscroll(int, int); -static void tswapscreen(void); -static void tsetmode(int, int, const int *, int); -static int twrite(const char *, int, int); -static void tcontrolcode(uchar ); -static void tdectest(char ); -static void tdefutf8(char); -static int32_t tdefcolor(const int *, int *, int); -static void tdeftran(char); -static void tstrsequence(uchar); -static void selnormalize(void); -static void selscroll(int, int); -#if !VIM_BROWSE_PATCH -static void selsnap(int *, int *, int); -#endif // VIM_BROWSE_PATCH - -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 Selection sel; -static CSIEscape csiescseq; -static STREscape strescseq; -static int iofd = 1; -static int cmdfd; -#if EXTERNALPIPEIN_PATCH && EXTERNALPIPE_PATCH -static int csdfd; -#endif // EXTERNALPIPEIN_PATCH -static pid_t pid; -#if SIXEL_PATCH -sixel_state_t sixel_st; -#endif // SIXEL_PATCH - -static const uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; -static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; -static const Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; -static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; - -#if VIM_BROWSE_PATCH -int buffCols; -extern int const buffSize; -int histOp, histMode, histOff, insertOff, altToggle, *mark; -Line *buf = NULL; -static TCursor c[3]; -static inline int rows() { return IS_SET(MODE_ALTSCREEN) ? term.row : buffSize;} -static inline int rangeY(int i) { while (i < 0) i += rows(); return i % rows();} -#endif // VIM_BROWSE_PATCH - -#include "patch/st_include.h" - -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(const char *s) -{ - char *p; - if ((p = strdup(s)) == NULL) - die("strdup: %s\n", strerror(errno)); - - return p; -} - -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; -} - -char -base64dec_getc(const char **src) -{ - while (**src && !isprint((unsigned char)**src)) - (*src)++; - return **src ? *((*src)++) : '='; /* emulate padding if string ends */ -} - -char * -base64dec(const char *src) -{ - size_t in_len = strlen(src); - char *result, *dst; - static const char base64_digits[256] = { - [43] = 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 - }; - - 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 SCROLLBACK_PATCH - if (TLINE(y)[i - 1].mode & ATTR_WRAP) - return i; - - while (i > 0 && TLINE(y)[i - 1].u == ' ') - --i; - #else - if (term.line[y][i - 1].mode & ATTR_WRAP) - return i; - - while (i > 0 && term.line[y][i - 1].u == ' ') - --i; - #endif // SCROLLBACK_PATCH - - return i; -} - -#if VIM_BROWSE_PATCH -void historyOpToggle(int start, int paint) { - if ((!histOp == !(histOp + start)) && ((histOp += start) || 1)) return; - if (histMode && paint && (!IS_SET(MODE_ALTSCREEN) || altToggle)) draw(); - tcursor(CURSOR_SAVE); - histOp += start; - if (histMode && altToggle) { - tswapscreen(); - memset(term.dirty,0,sizeof(*term.dirty)*term.row); - } - tcursor(CURSOR_LOAD); - *(!IS_SET(MODE_ALTSCREEN)?&term.line:&term.alt)=&buf[histOp?histOff:insertOff]; -} - -void historyModeToggle(int start) { - if (!(histMode = (histOp = !!start))) { - selnormalize(); - tfulldirt(); - } else { - tcursor(CURSOR_SAVE); - histOp = 0; - histOff = insertOff; - } -} - -int historyBufferScroll(int n) { - if (IS_SET(MODE_ALTSCREEN) || !n) return histOp; - int p=abs(n=(n<0) ? max(n,-term.row) : min(n,term.row)), r=term.row-p, - s=sizeof(*term.dirty), *ptr=histOp?&histOff:&insertOff; - if (!histMode || histOp) tfulldirt(); else { - memmove(&term.dirty[-min(n,0)], &term.dirty[max(n,0)], s*r); - memset(&term.dirty[n>0 ? r : 0], 0, s * p); - } - term.line = &buf[*ptr = (buffSize+*ptr+n) % buffSize]; - // Cut part of selection removed from buffer, and update sel.ne/b. - int const prevOffBuf = sel.alt ? 0 : insertOff + term.row; - if (sel.ob.x != -1 && !histOp && n) { - int const offBuf = sel.alt ? 0 : insertOff + term.row, - pb = rangeY(sel.ob.y - prevOffBuf), - pe = rangeY(sel.oe.y - prevOffBuf); - int const b = rangeY(sel.ob.y - offBuf), nln = n < 0, - e = rangeY(sel.oe.y - offBuf), last = offBuf - nln; - if (pb != b && ((pb < b) != nln)) sel.ob.y = last; - if (pe != e && ((pe < e) != nln)) sel.oe.y = last; - if (sel.oe.y == last && sel.ob.y == last) selclear(); - } - selnormalize(); - // Clear the new region exposed by the shift. - if (!histOp) tclearregion(0, n>0?r+1:0, buffCols-1, n>0?term.row:p-1); - return 1; -} - -int historyMove(int x, int y, int ly) { - historyOpToggle(1, 1); - y += ((term.c.x += x) < 0 ?term.c.x-term.col :term.c.x) / term.col;//< x - if ((term.c.x %= term.col) < 0) term.c.x += term.col; - if ((term.c.y += y) >= term.row) ly += term.c.y - term.row + 1; //< y - else if (term.c.y < 0) ly += term.c.y; - term.c.y = MIN(MAX(term.c.y, 0), term.row - 1); - // Check if scroll is necessary / arrived at top / bottom of terminal history - int t = 0, b = 0, finTop = ly < 0, finBot = ly > 0; - if (!IS_SET(MODE_ALTSCREEN)) { - b=rangeY(insertOff-histOff), t=-rangeY(-term.row-(insertOff-histOff)); - finBot = ly > b, finTop=histMode&&((-ly>-t)); - } - if ((finTop || finBot) && (x||y)) term.c.x = finBot ? term.col-1 : 0; - historyBufferScroll(finBot ? b : (finTop ? t : ly)); - historyOpToggle(-1, 1); - return finTop || finBot; -} - -void selnormalize(void) { - historyOpToggle(1, 1); - - int const oldb = sel.nb.y, olde = sel.ne.y; - if (sel.ob.x == -1) { - sel.ne.y = sel.nb.y = -1; - } else { - int const offsetBuffer = sel.alt ? 0 : insertOff + term.row; - int const off = sel.alt ? 0 : (histMode ? histOff : insertOff); - int const nby = rangeY(sel.ob.y - off), - ney = rangeY(sel.oe.y - off); - sel.swap = rangeY(sel.ob.y - offsetBuffer) - > rangeY(sel.oe.y - offsetBuffer); - sel.nb.y = sel.swap ? ney : nby; - sel.ne.y = !sel.swap ? ney : nby; - int const cnb = sel.nb.y < term.row, cne = sel.ne.y < term.row; - if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { - if (cnb) sel.nb.x = (!sel.swap) ? sel.ob.x : sel.oe.x; - if (cne) sel.ne.x = (!sel.swap) ? sel.oe.x : sel.ob.x; - } else { - if (cnb) sel.nb.x = MIN(sel.ob.x, sel.oe.x); - if (cne) sel.ne.x = MAX(sel.ob.x, sel.oe.x); - } - } - int const nBet=sel.nb.y<=sel.ne.y, oBet=oldb<=olde; - for (int i = 0; i < term.row; ++i) { - int const n = nBet ? BETWEEN(i, sel.nb.y, sel.ne.y) - : OUT(i, sel.nb.y, sel.ne.y); - term.dirty[i] |= (sel.type == SEL_RECTANGULAR && n) || - (n != (oBet ? BETWEEN(i,oldb,olde) : OUT(i,oldb,olde))); - - } - if (BETWEEN(oldb, 0, term.row - 1)) term.dirty[oldb] = 1; - if (BETWEEN(olde, 0, term.row - 1)) term.dirty[olde] = 1; - if (BETWEEN(sel.nb.y, 0, term.row - 1)) term.dirty[sel.nb.y] = 1; - if (BETWEEN(sel.ne.y, 0, term.row - 1)) term.dirty[sel.ne.y] = 1; - - historyOpToggle(-1, 1); -} -#endif // VIM_BROWSE_PATCH - -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; - #if VIM_BROWSE_PATCH - sel.oe.y = sel.ob.y = row + !sel.alt * (histMode ? histOff : insertOff); - if (sel.snap != 0) sel.mode = SEL_READY; - #else - sel.oe.y = sel.ob.y = row; - #endif // VIM_BROWSE_PATCH - selnormalize(); - - #if !VIM_BROWSE_PATCH - if (sel.snap != 0) - sel.mode = SEL_READY; - tsetdirt(sel.nb.y, sel.ne.y); - #endif // VIM_BROWSE_PATCH -} - -void -selextend(int col, int row, int type, int done) -{ - #if !VIM_BROWSE_PATCH - int oldey, oldex, oldsby, oldsey, oldtype; - #endif // VIM_BROWSE_PATCH - - if (sel.mode == SEL_IDLE) - return; - if (done && sel.mode == SEL_EMPTY) { - selclear(); - return; - } - - #if !VIM_BROWSE_PATCH - oldey = sel.oe.y; - oldex = sel.oe.x; - oldsby = sel.nb.y; - oldsey = sel.ne.y; - oldtype = sel.type; - #endif // VIM_BROWSE_PATCH - - sel.oe.x = col; - #if VIM_BROWSE_PATCH - sel.oe.y = row + (sel.alt ? 0 : (histMode ? histOff : insertOff)); - #else - sel.oe.y = row; - #endif // VIM_BROWSE_PATCH - selnormalize(); - sel.type = type; - - #if !VIM_BROWSE_PATCH - 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)); - #endif // VIM_BROWSE_PATCH - - sel.mode = done ? SEL_IDLE : SEL_READY; -} - -#if !VIM_BROWSE_PATCH -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; -} -#endif // VIM_BROWSE_PATCH - -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); - - #if VIM_BROWSE_PATCH - return ((sel.nb.y > sel.ne.y) ? OUT(y, sel.nb.y, sel.ne.y) - : BETWEEN(y, sel.nb.y, sel.ne.y)) && - (y != sel.nb.y || x >= sel.nb.x) && - (y != sel.ne.y || x <= sel.ne.x); - #else - 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); - #endif // VIM_BROWSE_PATCH -} - -#if !VIM_BROWSE_PATCH -void -selsnap(int *x, int *y, int direction) -{ - int newx, newy, xt, yt; - int delim, prevdelim; - const Glyph *gp, *prevgp; - - switch (sel.snap) { - case SNAP_WORD: - /* - * Snap around if the word wraps around at the end or - * beginning of a line. - */ - #if SCROLLBACK_PATCH - prevgp = &TLINE(*y)[*x]; - #else - prevgp = &term.line[*y][*x]; - #endif // SCROLLBACK_PATCH - 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 SCROLLBACK_PATCH - if (!(TLINE(yt)[xt].mode & ATTR_WRAP)) - #else - if (!(term.line[yt][xt].mode & ATTR_WRAP)) - #endif // SCROLLBACK_PATCH - break; - } - - if (newx >= tlinelen(newy)) - break; - - #if SCROLLBACK_PATCH - gp = &TLINE(newy)[newx]; - #else - gp = &term.line[newy][newx]; - #endif // SCROLLBACK_PATCH - 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 SCROLLBACK_PATCH - if (!(TLINE(*y-1)[term.col-1].mode & ATTR_WRAP)) - #else - if (!(term.line[*y-1][term.col-1].mode & ATTR_WRAP)) - #endif // SCROLLBACK_PATCH - { - break; - } - } - } else if (direction > 0) { - for (; *y < term.row-1; *y += direction) { - #if SCROLLBACK_PATCH - if (!(TLINE(*y)[term.col-1].mode & ATTR_WRAP)) - #else - if (!(term.line[*y][term.col-1].mode & ATTR_WRAP)) - #endif // SCROLLBACK_PATCH - { - break; - } - } - } - break; - } -} -#endif // VIM_BROWSE_PATCH - -char * -getsel(void) -{ - char *str, *ptr; - #if VIM_BROWSE_PATCH - int y, yy, bufsize, lastx; - #else - int y, bufsize, lastx, linelen; - #endif // VIM_BROWSE_PATCH - const Glyph *gp, *last; - - if (sel.ob.x == -1) - return NULL; - - #if VIM_BROWSE_PATCH - int const start = sel.swap ? sel.oe.y : sel.ob.y, h = rows(); - int endy = (sel.swap ? sel.ob.y : sel.oe.y); - for (; endy < start; endy += h); - Line * const cbuf = IS_SET(MODE_ALTSCREEN) ? term.line : buf; - bufsize = (term.col+1) * (endy-start+1 ) * UTF_SIZ; - assert(bufsize > 0); - #else - bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ; - #endif // VIM_BROWSE_PATCH - ptr = str = xmalloc(bufsize); - - /* append every set & selected glyph to the selection */ - #if VIM_BROWSE_PATCH - for (y = start; y <= endy; y++) - #else - for (y = sel.nb.y; y <= sel.ne.y; y++) - #endif // VIM_BROWSE_PATCH - { - #if VIM_BROWSE_PATCH - yy = y % h; - #else - if ((linelen = tlinelen(y)) == 0) { - *ptr++ = '\n'; - continue; - } - #endif // VIM_BROWSE_PATCH - - if (sel.type == SEL_RECTANGULAR) { - #if VIM_BROWSE_PATCH - gp = &cbuf[yy][sel.nb.x]; - #elif SCROLLBACK_PATCH - gp = &TLINE(y)[sel.nb.x]; - #else - gp = &term.line[y][sel.nb.x]; - #endif // SCROLLBACK_PATCH - lastx = sel.ne.x; - } else { - #if VIM_BROWSE_PATCH - gp = &cbuf[yy][start == y ? sel.nb.x : 0]; - #elif SCROLLBACK_PATCH - gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0]; - #else - gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; - #endif // SCROLLBACK_PATCH - #if VIM_BROWSE_PATCH - lastx = (endy == y) ? sel.ne.x : term.col-1; - #else - lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; - #endif // VIM_BROWSE_PATCH - } - #if VIM_BROWSE_PATCH - last = &cbuf[yy][lastx]; - #elif SCROLLBACK_PATCH - last = &TLINE(y)[MIN(lastx, linelen-1)]; - #else - last = &term.line[y][MIN(lastx, linelen-1)]; - #endif // SCROLLBACK_PATCH - #if VIM_BROWSE_PATCH - if (!(cbuf[yy][term.col - 1].mode & ATTR_WRAP)) - while (last > gp && last->u == ' ') --last; - #else - while (last >= gp && last->u == ' ') - --last; - #endif // VIM_BROWSE_PATCH - - 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 ( - #if VIM_BROWSE_PATCH - (y < endy || lastx == term.col - 1) - #else - (y < sel.ne.y || lastx >= linelen) - #endif // - && (!(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; - #if VIM_BROWSE_PATCH - selnormalize(); - #else - tsetdirt(sel.nb.y, sel.ne.y); - #endif // VIM_BROWSE_PATCH -} - -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); - setenv("COLORTERM", "truecolor", 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 EXTERNALPIPEIN_PATCH && EXTERNALPIPE_PATCH - if ((p = waitpid((extpipeactive ? -1 : pid), &stat, WNOHANG)) < 0) - #else - if ((p = waitpid(pid, &stat, WNOHANG)) < 0) - #endif // EXTERNALPIPEIN_PATCH - die("waiting for pid %hd failed: %s\n", pid, strerror(errno)); - - #if EXTERNALPIPE_PATCH - if (pid != p) { - if (!extpipeactive) - return; - - if (p == 0 && wait(&stat) < 0) - die("wait: %s\n", strerror(errno)); - - /* reinstall sigchld handler */ - signal(SIGCHLD, sigchld); - extpipeactive = 0; - return; - } - #else - if (pid != p) - return; - #endif // EXTERNALPIPE_PATCH - - #if EXTERNALPIPEIN_PATCH && EXTERNALPIPE_PATCH - close(csdfd); - #endif // EXTERNALPIPEIN_PATCH - - 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(const char *line, char *cmd, const char *out, char **args) -{ - int m, s; - #if EXTERNALPIPEIN_PATCH && EXTERNALPIPE_PATCH - struct sigaction sa; - #endif // EXTERNALPIPEIN_PATCH - - 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); - close(m); - 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)); - if (s > 2) - close(s); -#ifdef __OpenBSD__ - if (pledge("stdio getpw proc exec", NULL) == -1) - die("pledge\n"); -#endif - execsh(cmd, args); - break; - default: -#ifdef __OpenBSD__ - #if RIGHTCLICKTOPLUMB_PATCH || OPENCOPIED_PATCH - if (pledge("stdio rpath tty proc ps exec", NULL) == -1) - #else - if (pledge("stdio rpath tty proc", NULL) == -1) - #endif // RIGHTCLICKTOPLUMB_PATCH - die("pledge\n"); -#endif - #if EXTERNALPIPEIN_PATCH && EXTERNALPIPE_PATCH - csdfd = s; - cmdfd = m; - memset(&sa, 0, sizeof(sa)); - sigemptyset(&sa.sa_mask); - sa.sa_handler = sigchld; - sigaction(SIGCHLD, &sa, NULL); - #else - close(s); - cmdfd = m; - signal(SIGCHLD, sigchld); - #endif // EXTERNALPIPEIN_PATCH - break; - } - return cmdfd; -} - -size_t -ttyread(void) -{ - static char buf[BUFSIZ]; - static int buflen = 0; - int ret, written; - - /* append read bytes to unprocessed bytes */ - #if SYNC_PATCH - ret = twrite_aborted ? 1 : read(cmdfd, buf+buflen, LEN(buf)-buflen); - #else - ret = read(cmdfd, buf+buflen, LEN(buf)-buflen); - #endif // SYNC_PATCH - - switch (ret) { - case 0: - exit(0); - case -1: - die("couldn't read from shell: %s\n", strerror(errno)); - default: - #if SYNC_PATCH - buflen += twrite_aborted ? 0 : ret; - #else - buflen += ret; - #endif // SYNC_PATCH - 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 SCROLLBACK_PATCH - Arg arg = (Arg) { .i = term.scr }; - - kscrolldown(&arg); - #endif // SCROLLBACK_PATCH - - 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(void) -{ - /* 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; -} - -int -tisaltscr(void) -{ - return IS_SET(MODE_ALTSCREEN); -} - -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) -{ - #if SYNC_PATCH - tsync_end(); - #endif // SYNC_PATCH - tsetdirt(0, term.row-1); -} - -void -tcursor(int mode) -{ - #if VIM_BROWSE_PATCH - int alt = (histOp) ? 0 : (IS_SET(MODE_ALTSCREEN) + 1); - #else - static TCursor c[2]; - int alt = IS_SET(MODE_ALTSCREEN); - #endif // VIM_BROWSE_PATCH - - 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; - #if SIXEL_PATCH - ImageList *im; - #endif // SIXEL_PATCH - - 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); - #if COLUMNS_PATCH && !VIM_BROWSE_PATCH - tclearregion(0, 0, term.maxcol-1, term.row-1); - #else - tclearregion(0, 0, term.col-1, term.row-1); - #endif // COLUMNS_PATCH - tswapscreen(); - } - #if SIXEL_PATCH - for (im = term.images; im; im = im->next) - im->should_delete = 1; - #endif // SIXEL_PATCH -} - -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; - #if SIXEL_PATCH - ImageList *im = term.images; - #endif // SIXEL_PATCH - - term.line = term.alt; - term.alt = tmp; - #if SIXEL_PATCH - term.images = term.images_alt; - term.images_alt = im; - #endif // SIXEL_PATCH - term.mode ^= MODE_ALTSCREEN; - tfulldirt(); -} - -void -tscrolldown(int orig, int n) -{ - #if OPENURLONCLICK_PATCH - restoremousecursor(); - #endif //OPENURLONCLICK_PATCH - - #if VIM_BROWSE_PATCH - if (!orig && historyBufferScroll(-n)) - return; - #endif // VIM_BROWSE_PATCH - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - - tsetdirt(orig, term.bot-n); - #if COLUMNS_PATCH && !VIM_BROWSE_PATCH - tclearregion(0, term.bot-n+1, term.maxcol-1, term.bot); - #else - tclearregion(0, term.bot-n+1, term.col-1, term.bot); - #endif // COLUMNS_PATCH - - 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 SIXEL_PATCH - /* move images, if they are inside the scrolling region */ - ImageList *im; - for (im = term.images; im; im = im->next) { - if (im->y * win.ch + im->height > orig * win.ch && im->y <= term.bot) { - im->y += n; - im->should_delete |= (im->y >= term.row); - } - } - #endif // SIXEL_PATCH - - #if SCROLLBACK_PATCH - if (term.scr == 0) - selscroll(orig, n); - #else - selscroll(orig, n); - #endif // SCROLLBACK_PATCH -} - -void -#if SCROLLBACK_PATCH -tscrollup(int orig, int n, int copyhist) -#else -tscrollup(int orig, int n) -#endif // SCROLLBACK_PATCH -{ - #if OPENURLONCLICK_PATCH - restoremousecursor(); - #endif //OPENURLONCLICK_PATCH - - #if VIM_BROWSE_PATCH - if (!orig && historyBufferScroll(n)) - return; - #endif // VIM_BROWSE_PATCH - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - - #if SCROLLBACK_PATCH - if (copyhist && !IS_SET(MODE_ALTSCREEN)) { - for (i = 0; i < n; i++) { - term.histi = (term.histi + 1) % HISTSIZE; - temp = term.hist[term.histi]; - term.hist[term.histi] = term.line[orig+i]; - term.line[orig+i] = temp; - } - term.histn = MIN(term.histn + n, HISTSIZE); - - if (term.scr > 0 && term.scr < HISTSIZE) - term.scr = MIN(term.scr + n, HISTSIZE-1); - } - #endif // SCROLLBACK_PATCH - - #if COLUMNS_PATCH && !VIM_BROWSE_PATCH - tclearregion(0, orig, term.maxcol-1, orig+n-1); - #else - tclearregion(0, orig, term.col-1, orig+n-1); - #endif // COLUMNS_PATCH - 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 SIXEL_PATCH - #if SCROLLBACK_PATCH - if (term.scr == 0) - scroll_images(-1 * n); - #else - scroll_images(-1 * n); - #endif - #endif // SIXEL_PATCH - - #if SCROLLBACK_PATCH - if (term.scr == 0) - selscroll(orig, -n); - #else - selscroll(orig, -n); - #endif // SCROLLBACK_PATCH -} - -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) { - #if SCROLLBACK_PATCH - tscrollup(term.top, 1, 1); - #else - tscrollup(term.top, 1); - #endif // SCROLLBACK_PATCH - } else { - y++; - } - tmoveto(first_col ? 0 : term.c.x, y); -} - -#if UNDERCURL_PATCH -void -readcolonargs(char **p, int cursor, int params[][CAR_PER_ARG]) -{ - int i = 0; - for (; i < CAR_PER_ARG; i++) - params[cursor][i] = -1; - - if (**p != ':') - return; - - char *np = NULL; - i = 0; - - while (**p == ':' && i < CAR_PER_ARG) { - while (**p == ':') - (*p)++; - params[cursor][i] = strtol(*p, &np, 10); - *p = np; - i++; - } -} -#endif // UNDERCURL_PATCH - -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 UNDERCURL_PATCH - readcolonargs(&p, csiescseq.narg-1, csiescseq.carg); - #endif // UNDERCURL_PATCH - 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, const Glyph *attr, int x, int y) -{ - static const 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; - - #if BOXDRAW_PATCH - if (isboxdraw(u)) - term.line[y][x].mode |= ATTR_BOXDRAW; - #endif // BOXDRAW_PATCH -} - -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; - - #if VIM_BROWSE_PATCH - LIMIT(x1, 0, buffCols-1); - LIMIT(x2, 0, buffCols-1); - #elif COLUMNS_PATCH - LIMIT(x1, 0, term.maxcol-1); - LIMIT(x2, 0, term.maxcol-1); - #else - LIMIT(x1, 0, term.col-1); - LIMIT(x2, 0, term.col-1); - #endif // VIM_BROWSE_PATCH - 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)) - #if SCROLLBACK_PATCH - tscrollup(term.c.y, n, 0); - #else - tscrollup(term.c.y, n); - #endif // SCROLLBACK_PATCH -} - -int32_t -tdefcolor(const 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(const 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; - #if UNDERCURL_PATCH - term.c.attr.ustyle = -1; - term.c.attr.ucolor[0] = -1; - term.c.attr.ucolor[1] = -1; - term.c.attr.ucolor[2] = -1; - #endif // UNDERCURL_PATCH - 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: - #if UNDERCURL_PATCH - term.c.attr.ustyle = csiescseq.carg[i][0]; - - if (term.c.attr.ustyle != 0) - term.c.attr.mode |= ATTR_UNDERLINE; - else - term.c.attr.mode &= ~ATTR_UNDERLINE; - - term.c.attr.mode ^= ATTR_DIRTYUNDERLINE; - #else - term.c.attr.mode |= ATTR_UNDERLINE; - #endif // UNDERCURL_PATCH - 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) - #if MONOCHROME_PATCH - term.c.attr.fg = defaultfg; - #else - term.c.attr.fg = idx; - #endif // MONOCHROME_PATCH - break; - case 39: - term.c.attr.fg = defaultfg; - break; - case 48: - if ((idx = tdefcolor(attr, &i, l)) >= 0) - #if MONOCHROME_PATCH - term.c.attr.bg = 0; - #else - term.c.attr.bg = idx; - #endif // MONOCHROME_PATCH - break; - case 49: - term.c.attr.bg = defaultbg; - break; - #if UNDERCURL_PATCH - case 58: - term.c.attr.ucolor[0] = csiescseq.carg[i][1]; - term.c.attr.ucolor[1] = csiescseq.carg[i][2]; - term.c.attr.ucolor[2] = csiescseq.carg[i][3]; - term.c.attr.mode ^= ATTR_DIRTYUNDERLINE; - break; - case 59: - term.c.attr.ucolor[0] = -1; - term.c.attr.ucolor[1] = -1; - term.c.attr.ucolor[2] = -1; - term.c.attr.mode ^= ATTR_DIRTYUNDERLINE; - break; - #endif // UNDERCURL_PATCH - default: - if (BETWEEN(attr[i], 30, 37)) { - #if MONOCHROME_PATCH - term.c.attr.fg = defaultfg; - #else - term.c.attr.fg = attr[i] - 30; - #endif // MONOCHROME_PATCH - } else if (BETWEEN(attr[i], 40, 47)) { - #if MONOCHROME_PATCH - term.c.attr.bg = 0; - #else - term.c.attr.bg = attr[i] - 40; - #endif // MONOCHROME_PATCH - } else if (BETWEEN(attr[i], 90, 97)) { - #if MONOCHROME_PATCH - term.c.attr.fg = defaultfg; - #else - term.c.attr.fg = attr[i] - 90 + 8; - #endif // MONOCHROME_PATCH - } else if (BETWEEN(attr[i], 100, 107)) { - #if MONOCHROME_PATCH - term.c.attr.bg = 0; - #else - term.c.attr.bg = attr[i] - 100 + 8; - #endif // MONOCHROME_PATCH - } 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, const int *args, int narg) -{ - int alt; - const int *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) { - #if COLUMNS_PATCH && !VIM_BROWSE_PATCH - tclearregion(0, 0, term.maxcol-1, term.row-1); - #else - tclearregion(0, 0, term.col-1, term.row-1); - #endif // COLUMNS_PATCH - } - 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 buffer[40]; - int len; - #if SIXEL_PATCH - ImageList *im; - #endif // SIXEL_PATCH - #if COLUMNS_PATCH && !VIM_BROWSE_PATCH - int maxcol = term.maxcol; - #else - int maxcol = term.col; - #endif // COLUMNS_PATCH - - 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, maxcol-1, term.c.y); - if (term.c.y < term.row-1) { - tclearregion(0, term.c.y+1, maxcol-1, - term.row-1); - } - break; - case 1: /* above */ - if (term.c.y > 1) - tclearregion(0, 0, maxcol-1, term.c.y-1); - tclearregion(0, term.c.y, term.c.x, term.c.y); - break; - case 2: /* screen */ - #if SCROLLBACK_PATCH || VIM_BROWSE_PATCH - if (!IS_SET(MODE_ALTSCREEN)) { - #if SCROLLBACK_PATCH - kscrolldown(&((Arg){ .i = term.scr })); - #endif - int n, m, bot = term.bot; - term.bot = term.row-1; - for (n = term.row-1; n >= 0; n--) { - for (m = 0; m < maxcol && term.line[n][m].u == ' ' && !term.line[n][m].mode; m++); - if (m < maxcol) { - #if SCROLLBACK_PATCH - tscrollup(0, n+1, 1); - #else - tscrollup(0, n+1); - #endif - break; - } - } - if (n < term.row-1) - tclearregion(0, 0, maxcol-1, term.row-n-2); - term.bot = bot; - break; - } - #endif // SCROLLBACK_PATCH - - tclearregion(0, 0, maxcol-1, term.row-1); - - #if SIXEL_PATCH - for (im = term.images; im; im = im->next) - im->should_delete = 1; - #endif // SIXEL_PATCH - break; - case 3: /* scrollback */ - #if VIM_BROWSE_PATCH - if (!IS_SET(MODE_ALTSCREEN)) { - Glyph g=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0}; - for (int i = 0; i < buffSize; ++i) { - if (!BETWEEN(i, insertOff, insertOff + term.row - 1) && - !(insertOff + term.row > buffSize && - BETWEEN(i, 0, (insertOff + term.row - 1) % buffSize))) { - for (int j = 0; j < term.col; ++j) - buf[i][j] = g; - } - } - } - #elif SCROLLBACK_PATCH - if (!IS_SET(MODE_ALTSCREEN)) { - term.scr = 0; - term.histi = 0; - term.histn = 0; - Glyph g=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0}; - for (int i = 0; i < HISTSIZE; i++) { - for (int j = 0; j < maxcol; j++) - term.hist[i][j] = g; - } - } - #endif // SCROLLBACK_PATCH - #if SIXEL_PATCH - if (!IS_SET(MODE_ALTSCREEN)) { - for (im = term.images; im; im = im->next) - im->should_delete |= (im->y * win.ch + im->height <= 0); - } - #endif // SIXEL_PATCH - break; - default: - goto unknown; - } - break; - case 'K': /* EL -- Clear line */ - switch (csiescseq.arg[0]) { - case 0: /* right */ - tclearregion(term.c.x, term.c.y, maxcol-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, maxcol-1, term.c.y); - break; - } - break; - case 'S': /* SU -- Scroll line up */ - DEFAULT(csiescseq.arg[0], 1); - #if SIXEL_PATCH && SCROLLBACK_PATCH - tscrollup(term.top, csiescseq.arg[0], 1); - #elif SCROLLBACK_PATCH - tscrollup(term.top, csiescseq.arg[0], 0); - #else - tscrollup(term.top, csiescseq.arg[0]); - #endif // SCROLLBACK_PATCH - 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(buffer, sizeof(buffer), "\033[%i;%iR", - term.c.y+1, term.c.x+1); - ttywrite(buffer, 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; - #if CSI_22_23_PATCH - case 't': /* title stack operations */ - switch (csiescseq.arg[0]) { - case 22: /* pust current title on stack */ - switch (csiescseq.arg[1]) { - case 0: - case 1: - case 2: - xpushtitle(); - break; - default: - goto unknown; - } - break; - case 23: /* pop last title from stack */ - switch (csiescseq.arg[1]) { - case 0: - case 1: - case 2: - xsettitle(NULL, 1); - break; - default: - goto unknown; - } - break; - default: - goto unknown; - } - break; - #endif // CSI_22_23_PATCH - 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 -osc4_color_response(int num) -{ - int n; - char buf[32]; - unsigned char r, g, b; - - if (xgetcolor(num, &r, &g, &b)) { - fprintf(stderr, "erresc: failed to fetch osc4 color %d\n", num); - return; - } - - n = snprintf(buf, sizeof buf, "\033]4;%d;rgb:%02x%02x/%02x%02x/%02x%02x\007", - num, r, r, g, g, b, b); - - ttywrite(buf, n, 1); -} - -void -osc_color_response(int index, int num) -{ - int n; - char buf[32]; - unsigned char r, g, b; - - if (xgetcolor(index, &r, &g, &b)) { - fprintf(stderr, "erresc: failed to fetch osc color %d\n", index); - return; - } - - n = snprintf(buf, sizeof buf, "\033]%d;rgb:%02x%02x/%02x%02x/%02x%02x\007", - num, r, r, g, g, b, b); - - ttywrite(buf, n, 1); -} - -void -strhandle(void) -{ - char *p = NULL, *dec; - int j, narg, par; - #if SIXEL_PATCH - ImageList *new_image; - int i; - #endif // SIXEL_PATCH - - 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: - if (narg > 1) { - #if CSI_22_23_PATCH - xsettitle(strescseq.args[1], 0); - #else - xsettitle(strescseq.args[1]); - #endif // CSI_22_23_PATCH - xseticontitle(strescseq.args[1]); - } - return; - case 1: - if (narg > 1) - xseticontitle(strescseq.args[1]); - return; - case 2: - if (narg > 1) - #if CSI_22_23_PATCH - xsettitle(strescseq.args[1], 0); - #else - xsettitle(strescseq.args[1]); - #endif // CSI_22_23_PATCH - 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 10: - if (narg < 2) - break; - - p = strescseq.args[1]; - - if (!strcmp(p, "?")) - osc_color_response(defaultfg, 10); - else if (xsetcolorname(defaultfg, p)) - fprintf(stderr, "erresc: invalid foreground color: %s\n", p); - else - tfulldirt(); - return; - case 11: - if (narg < 2) - break; - - p = strescseq.args[1]; - - if (!strcmp(p, "?")) - osc_color_response(defaultbg, 11); - else if (xsetcolorname(defaultbg, p)) - fprintf(stderr, "erresc: invalid background color: %s\n", p); - else - tfulldirt(); - return; - case 12: - if (narg < 2) - break; - - p = strescseq.args[1]; - - if (!strcmp(p, "?")) - osc_color_response(defaultcs, 12); - else if (xsetcolorname(defaultcs, p)) - fprintf(stderr, "erresc: invalid cursor color: %s\n", p); - else - tfulldirt(); - return; - case 4: /* color set */ - if ((par == 4 && narg < 3) || narg < 2) - break; - p = strescseq.args[((par == 4) ? 2 : 1)]; - /* FALLTHROUGH */ - case 104: /* color reset */ - if (par == 10) - j = defaultfg; - else if (par == 11) - j = defaultbg; - else if (par == 12) - j = defaultcs; - else - j = (narg > 1) ? atoi(strescseq.args[1]) : -1; - - if (p && !strcmp(p, "?")) - osc4_color_response(j); - else 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 { - if (j == defaultbg) - xclearwin(); - tfulldirt(); - } - return; - } - break; - case 'k': /* old title set compatibility */ - #if CSI_22_23_PATCH - xsettitle(strescseq.args[0], 0); - #else - xsettitle(strescseq.args[0]); - #endif // CSI_22_23_PATCH - return; - case 'P': /* DCS -- Device Control String */ - #if SIXEL_PATCH - if (IS_SET(MODE_SIXEL)) { - term.mode &= ~MODE_SIXEL; - new_image = malloc(sizeof(ImageList)); - memset(new_image, 0, sizeof(ImageList)); - new_image->x = term.c.x; - new_image->y = term.c.y; - new_image->width = sixel_st.image.width; - new_image->height = sixel_st.image.height; - new_image->pixels = malloc(new_image->width * new_image->height * 4); - if (sixel_parser_finalize(&sixel_st, new_image->pixels) != 0) { - perror("sixel_parser_finalize() failed"); - sixel_parser_deinit(&sixel_st); - return; - } - sixel_parser_deinit(&sixel_st); - if (term.images) { - ImageList *im; - for (im = term.images; im->next;) - im = im->next; - im->next = new_image; - new_image->prev = im; - } else { - term.images = new_image; - } - for (i = 0; i < (sixel_st.image.height + win.ch-1)/win.ch; ++i) { - int x; - tclearregion(term.c.x, term.c.y, term.c.x+(sixel_st.image.width+win.cw-1)/win.cw, term.c.y); - for (x = term.c.x; x < MIN(term.col, term.c.x+(sixel_st.image.width+win.cw-1)/win.cw); x++) - term.line[term.c.y][x].mode |= ATTR_SIXEL; - tnewline(1); - } - } - #endif // SIXEL_PATCH - #if SYNC_PATCH - /* https://gitlab.com/gnachman/iterm2/-/wikis/synchronized-updates-spec */ - if (strstr(strescseq.buf, "=1s") == strescseq.buf) - tsync_begin(); /* BSU */ - else if (strstr(strescseq.buf, "=2s") == strescseq.buf) - tsync_end(); /* ESU */ - #endif // SYNC_PATCH - #if SIXEL_PATCH || SYNC_PATCH - return; - #endif // SIXEL_PATCH | SYNC_PATCH - 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]; - const 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) -{ - #if SIXEL_PATCH - strreset(); - #endif // SIXEL_PATCH - - switch (c) { - case 0x90: /* DCS -- Device Control String */ - c = 'P'; - #if SIXEL_PATCH - term.esc |= ESC_DCS; - #endif // SIXEL_PATCH - break; - case 0x9f: /* APC -- Application Program Command */ - c = '_'; - break; - case 0x9e: /* PM -- Privacy Message */ - c = '^'; - break; - case 0x9d: /* OSC -- Operating System Command */ - c = ']'; - break; - } - #if !SIXEL_PATCH - strreset(); - #endif // SIXEL_PATCH - 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 */ - #if SIXEL_PATCH - term.esc |= ESC_DCS; - #endif // SIXEL_PATCH - 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) { - #if SCROLLBACK_PATCH - tscrollup(term.top, 1, 1); - #else - tscrollup(term.top, 1); - #endif // SCROLLBACK_PATCH - } 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(); - #if CSI_22_23_PATCH - xfreetitlestack(); - #endif // CSI_22_23_PATCH - 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 SIXEL_PATCH - if (u < 127 || !IS_SET(MODE_UTF8 | MODE_SIXEL)) - #else - if (u < 127 || !IS_SET(MODE_UTF8)) - #endif // SIXEL_PATCH - { - 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)) { - #if SIXEL_PATCH - term.esc &= ~(ESC_START|ESC_STR|ESC_DCS); - #else - term.esc &= ~(ESC_START|ESC_STR); - #endif // SIXEL_PATCH - term.esc |= ESC_STR_END; - goto check_control_code; - } - - #if SIXEL_PATCH - if (IS_SET(MODE_SIXEL)) { - if (sixel_parser_parse(&sixel_st, (unsigned char *)&u, 1) != 0) - perror("sixel_parser_parse() failed"); - return; - } - if (term.esc & ESC_DCS) - goto check_control_code; - #endif // SIXEL_PATCH - - 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; - #if SIXEL_PATCH - } else if (term.esc & ESC_DCS) { - csiescseq.buf[csiescseq.len++] = u; - if (BETWEEN(u, 0x40, 0x7E) - || csiescseq.len >= \ - sizeof(csiescseq.buf)-1) { - csiparse(); - dcshandle(); - } - return; - #endif // SIXEL_PATCH - } 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 !VIM_BROWSE_PATCH - if (selected(term.c.x, term.c.y)) - selclear(); - #endif // VIM_BROWSE_PATCH - - 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) { - if (gp[1].mode == ATTR_WIDE && term.c.x+2 < term.col) { - gp[2].u = ' '; - gp[2].mode &= ~ATTR_WDUMMY; - } - 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; - - #if SYNC_PATCH - int su0 = su; - twrite_aborted = 0; - #endif // SYNC_PATCH - - for (n = 0; n < buflen; n += charsize) { - #if SIXEL_PATCH - if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) - #else - if (IS_SET(MODE_UTF8)) - #endif // SIXEL_PATCH - { - /* process a complete utf8 char */ - charsize = utf8decode(buf + n, &u, buflen - n); - if (charsize == 0) - break; - } else { - u = buf[n] & 0xFF; - charsize = 1; - } - #if SYNC_PATCH - if (su0 && !su) { - twrite_aborted = 1; - break; // ESU - allow rendering before a new BSU - } - #endif // SYNC_PATCH - 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; - #if SCROLLBACK_PATCH - int j; - #endif // SCROLLBACK_PATCH - #if VIM_BROWSE_PATCH - int const colSet = col, alt = IS_SET(MODE_ALTSCREEN), ini = buf == NULL; - col = MAX(col, buffCols); - row = MIN(row, buffSize); - int const minrow = MIN(row, term.row), mincol = MIN(col, buffCols); - #elif COLUMNS_PATCH - int tmp = col; - int minrow, mincol; - - if (!term.maxcol) - term.maxcol = term.col; - col = MAX(col, term.maxcol); - minrow = MIN(row, term.row); - mincol = MIN(col, term.maxcol); - #else - int minrow = MIN(row, term.row); - int mincol = MIN(col, term.col); - #endif // VIM_BROWSE_PATCH - int *bp; - TCursor c; - - #if KEYBOARDSELECT_PATCH - if ( row < term.row || col < term.col ) - toggle_winmode(trt_kbdselect(XK_Escape, NULL, 0)); - #endif // KEYBOARDSELECT_PATCH - - if (col < 1 || row < 1) { - fprintf(stderr, - "tresize: error resizing to %dx%d\n", col, row); - return; - } - - #if VIM_BROWSE_PATCH - if (alt) - tswapscreen(); - #endif // VIM_BROWSE_PATCH - - /* - * 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++) { - #if !VIM_BROWSE_PATCH - free(term.line[i]); - #endif // VIM_BROWSE_PATCH - free(term.alt[i]); - } - /* ensure that both src and dst are not NULL */ - if (i > 0) { - #if !VIM_BROWSE_PATCH - memmove(term.line, term.line + i, row * sizeof(Line)); - #endif // VIM_BROWSE_PATCH - memmove(term.alt, term.alt + i, row * sizeof(Line)); - } - for (i += row; i < term.row; i++) { - #if !VIM_BROWSE_PATCH - free(term.line[i]); - #endif // VIM_BROWSE_PATCH - free(term.alt[i]); - } - - /* resize to new height */ - #if VIM_BROWSE_PATCH - buf = xrealloc(buf, (buffSize + row) * sizeof(Line)); - mark = xrealloc(mark, col * row * sizeof(*mark)); - #else - term.line = xrealloc(term.line, row * sizeof(Line)); - #endif // VIM_BROWSE_PATCH - 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)); - - #if SCROLLBACK_PATCH - Glyph gc=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0}; - 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] = gc; - } - #endif // SCROLLBACK_PATCH - - /* resize each row to new width, zero-pad if needed */ - for (i = 0; i < minrow; i++) { - #if !VIM_BROWSE_PATCH - term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); - #endif // VIM_BROWSE_PATCH - term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph)); - } - - /* allocate any new rows */ - for (/* i = minrow */; i < row; i++) { - #if !VIM_BROWSE_PATCH - term.line[i] = xmalloc(col * sizeof(Glyph)); - #endif // VIM_BROWSE_PATCH - term.alt[i] = xmalloc(col * sizeof(Glyph)); - } - #if VIM_BROWSE_PATCH - if (col > buffCols) - #elif COLUMNS_PATCH - if (col > term.maxcol) - #else - if (col > term.col) - #endif // VIM_BROWSE_PATCH - { - #if VIM_BROWSE_PATCH - bp = term.tabs + buffCols; - memset(bp, 0, sizeof(*term.tabs) * (col - buffCols)); - #elif COLUMNS_PATCH - bp = term.tabs + term.maxcol; - memset(bp, 0, sizeof(*term.tabs) * (col - term.maxcol)); - #else - bp = term.tabs + term.col; - memset(bp, 0, sizeof(*term.tabs) * (col - term.col)); - #endif // VIM_BROWSE_PATCH - - while (--bp > term.tabs && !*bp) - /* nothing */ ; - for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces) - *bp = 1; - } - #if VIM_BROWSE_PATCH - Glyph g=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0}; - for (i = 0; i < buffSize; ++i) { - buf[i] = xrealloc(ini ? NULL : buf[i], col*sizeof(Glyph)); - for (int j = ini ? 0 : buffCols; j < col; ++j) buf[i][j] = g; - } - for (i = 0; i < row; ++i) buf[buffSize + i] = buf[i]; - term.line = &buf[*(histOp?&histOff:&insertOff) +=MAX(term.c.y-row+1,0)]; - memset(mark, 0, col * row * sizeof(*mark)); - #endif // VIM_BROWSE_PATCH - /* update terminal size */ - #if VIM_BROWSE_PATCH - term.col = colSet; - buffCols = col; - #elif COLUMNS_PATCH - term.col = tmp; - term.maxcol = col; - #else - term.col = col; - #endif // VIM_BROWSE_PATCH - term.row = row; - #if VIM_BROWSE_PATCH - if (alt) - tswapscreen(); - #endif // VIM_BROWSE_PATCH - /* 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) -{ - #if CSI_22_23_PATCH - xsettitle(NULL, 0); - #else - xsettitle(NULL); - #endif // CSI_22_23_PATCH -} - -void -drawregion(int x1, int y1, int x2, int y2) -{ - #if VIM_BROWSE_PATCH - if (altToggle && histMode && !histOp) - memset(term.dirty, 0, sizeof(*term.dirty) * term.row); - int const o = !IS_SET(MODE_ALTSCREEN) && histMode && !histOp, h =rows(); - #endif // VIM_BROWSE_PATCH - int y; - - for (y = y1; y < y2; y++) { - #if VIM_BROWSE_PATCH - int const oy = o ? (y + insertOff - histOff + h) % h : y; - if (!BETWEEN(oy, 0, term.row-1) || !term.dirty[y]) continue; - xdrawline(term.line[y], x1, oy, x2); - #else - if (!term.dirty[y]) - continue; - - term.dirty[y] = 0; - #if SCROLLBACK_PATCH - xdrawline(TLINE(y), x1, y, x2); - #else - xdrawline(term.line[y], x1, y, x2); - #endif // SCROLLBACK_PATCH - #endif // VIM_BROWSE_PATCH - } - #if VIM_BROWSE_PATCH - memset(&term.dirty[y1], 0, sizeof(*term.dirty) * (y2 - y1)); - #endif // VIM_BROWSE_PATCH -} - -#include "patch/st_include.c" - -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--; - - #if VIM_BROWSE_PATCH - if (histMode) - historyPreDraw(); - #endif // VIM_BROWSE_PATCH - - drawregion(0, 0, term.col, term.row); - - #if VIM_BROWSE_PATCH - if (!histMode) - #elif SCROLLBACK_PATCH - if (term.scr == 0) - #endif // SCROLLBACK_PATCH - #if LIGATURES_PATCH - xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], - term.ocx, term.ocy, term.line[term.ocy][term.ocx], - term.line[term.ocy], term.col); - #else - xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], - term.ocx, term.ocy, term.line[term.ocy][term.ocx]); - #endif // LIGATURES_PATCH - 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/desktop/.st/st.desktop b/desktop/.st/st.desktop deleted file mode 100644 index 14a389a..0000000 --- a/desktop/.st/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; \ No newline at end of file diff --git a/desktop/.st/st.h b/desktop/.st/st.h deleted file mode 100644 index 41af307..0000000 --- a/desktop/.st/st.h +++ /dev/null @@ -1,392 +0,0 @@ -/* See LICENSE for license details. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "patches.h" - -/* 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)) -#if VIM_BROWSE_PATCH -#define OUT(x, a, b) ((a) <= (x) || (x) <= (b)) -#endif // VIM_BROWSE_PATCH -#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) -#if LIGATURES_PATCH -#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \ - (a).fg != (b).fg || \ - (a).bg != (b).bg) -#else -#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \ - (a).bg != (b).bg) -#endif // LIGATURES_PATCH -#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)) -#if SCROLLBACK_PATCH -#define HISTSIZE 2000 -#endif // SCROLLBACK_PATCH - -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, - #if BOXDRAW_PATCH - ATTR_BOXDRAW = 1 << 11, - #endif // BOXDRAW_PATCH - #if LIGATURES_PATCH - ATTR_LIGA = 1 << 12, - #endif // LIGATURES_PATCH - #if SIXEL_PATCH - ATTR_SIXEL = 1 << 13, - #endif // SIXEL_PATCH - ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, - #if UNDERCURL_PATCH - ATTR_DIRTYUNDERLINE = 1 << 15, - #endif // UNDERCURL_PATCH -}; - -#if SIXEL_PATCH -typedef struct _ImageList { - struct _ImageList *next, *prev; - unsigned char *pixels; - void *pixmap; - int width; - int height; - int x; - int y; - int should_delete; -} ImageList; -#endif // SIXEL_PATCH - -#if WIDE_GLYPHS_PATCH -enum drawing_mode { - DRAW_NONE = 0, - DRAW_BG = 1 << 0, - DRAW_FG = 1 << 1, -}; -#endif // WIDE_GLYPHS_PATCH - -/* Used to control which screen(s) keybindings and mouse shortcuts apply to. */ -enum screen { - S_PRI = -1, /* primary screen */ - S_ALL = 0, /* both primary and alt screen */ - S_ALT = 1 /* alternate screen */ -}; - -enum selection_mode { - SEL_IDLE = 0, - SEL_EMPTY = 1, - SEL_READY = 2 -}; - -enum selection_type { - SEL_REGULAR = 1, - SEL_RECTANGULAR = 2 -}; - -enum selection_snap { - SNAP_WORD = 1, - SNAP_LINE = 2 -}; - -typedef unsigned char uchar; -typedef unsigned int uint; -typedef unsigned long ulong; -typedef unsigned short ushort; - -typedef uint_least32_t Rune; - -typedef XftDraw *Draw; -typedef XftColor Color; -typedef XftGlyphFontSpec GlyphFontSpec; - -#define Glyph Glyph_ -typedef struct { - Rune u; /* character code */ - ushort mode; /* attribute flags */ - uint32_t fg; /* foreground */ - uint32_t bg; /* background */ - #if UNDERCURL_PATCH - int ustyle; /* underline style */ - int ucolor[3]; /* underline color */ - #endif // UNDERCURL_PATCH -} Glyph; - -typedef Glyph *Line; - -typedef struct { - Glyph attr; /* current char attributes */ - int x; - int y; - char state; -} TCursor; - -/* Internal representation of the screen */ -typedef struct { - int row; /* nb row */ - int col; /* nb col */ - #if COLUMNS_PATCH && !VIM_BROWSE_PATCH - int maxcol; - #endif // COLUMNS_PATCH - Line *line; /* screen */ - Line *alt; /* alternate screen */ - #if SCROLLBACK_PATCH - Line hist[HISTSIZE]; /* history buffer */ - int histi; /* history index */ - int histn; /* number of history entries */ - int scr; /* scroll back */ - #endif // SCROLLBACK_PATCH - 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; - #if SIXEL_PATCH - ImageList *images; /* sixel images */ - ImageList *images_alt; /* sixel images for alternate screen */ - #endif // SIXEL_PATCH - Rune lastc; /* last printed char outside of sequence, 0 if control */ -} Term; - -typedef union { - int i; - uint ui; - float f; - const void *v; - const char *s; -} Arg; - -/* Purely graphic info */ -typedef struct { - int tw, th; /* tty width and height */ - int w, h; /* window width and height */ - #if BACKGROUND_IMAGE_PATCH - int x, y; /* window location */ - #endif // BACKGROUND_IMAGE_PATCH - #if ANYSIZE_PATCH - int hborderpx, vborderpx; - #endif // ANYSIZE_PATCH - int ch; /* char height */ - int cw; /* char width */ - #if VERTCENTER_PATCH - int cyo; /* char y offset */ - #endif // VERTCENTER_PATCH - 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, netwmiconname, netwmpid; - #if FULLSCREEN_PATCH - Atom netwmstate, netwmfullscreen; - #endif // FULLSCREEN_PATCH - #if NETWMICON_PATCH - Atom netwmicon; - #endif // NETWMICON_PATCH - struct { - XIM xim; - XIC xic; - XPoint spot; - XVaNestedList spotlist; - } ime; - Draw draw; - #if BACKGROUND_IMAGE_PATCH - GC bggc; /* Graphics Context for background */ - #endif // BACKGROUND_IMAGE_PATCH - Visual *vis; - XSetWindowAttributes attrs; - #if HIDECURSOR_PATCH || OPENURLONCLICK_PATCH - /* Here, we use the term *pointer* to differentiate the cursor - * one sees when hovering the mouse over the terminal from, e.g., - * a green rectangle where text would be entered. */ - Cursor vpointer, bpointer; /* visible and hidden pointers */ - int pointerisvisible; - #endif // HIDECURSOR_PATCH - #if OPENURLONCLICK_PATCH - Cursor upointer; - #endif // OPENURLONCLICK_PATCH - int scr; - int isfixed; /* is fixed geometry? */ - #if ALPHA_PATCH - int depth; /* bit depth */ - #endif // ALPHA_PATCH - 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; - -/* types used in config.h */ -typedef struct { - uint mod; - KeySym keysym; - void (*func)(const Arg *); - const Arg arg; - int screen; -} Shortcut; - -typedef struct { - uint mod; - uint button; - void (*func)(const Arg *); - const Arg arg; - uint release; - int screen; -} 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; - -/* 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; - -void die(const char *, ...); -void redraw(void); -void draw(void); -void drawregion(int, int, int, int); -void tfulldirt(void); - -void printscreen(const Arg *); -void printsel(const Arg *); -void sendbreak(const Arg *); -void toggleprinter(const Arg *); - -int tattrset(int); -int tisaltscr(void); -void tnew(int, int); -void tresize(int, int); -#if VIM_BROWSE_PATCH -void tmoveto(int x, int y); -#endif // VIM_BROWSE_PATCH -void tsetdirtattr(int); -void ttyhangup(void); -int ttynew(const char *, char *, const 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(const char *); - -int xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b); - -#if BOXDRAW_PATCH -int isboxdraw(Rune); -ushort boxdrawindex(const Glyph *); -#ifdef XFT_VERSION -/* only exposed to x.c, otherwise we'll need Xft.h for the types */ -void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *); -void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int); -#endif // XFT_VERSION -#endif // BOXDRAW_PATCH - -/* 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 unsigned int defaultcs; -#if EXTERNALPIPE_PATCH -extern int extpipeactive; -#endif // EXTERNALPIPE_PATCH - -#if BOXDRAW_PATCH -extern const int boxdraw, boxdraw_bold, boxdraw_braille; -#endif // BOXDRAW_PATCH -#if ALPHA_PATCH -extern float alpha; -#if ALPHA_FOCUS_HIGHLIGHT_PATCH -extern float alphaUnfocused; -#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH -#endif // ALPHA_PATCH - -extern DC dc; -extern XWindow xw; -extern XSelection xsel; -extern TermWindow win; -extern Term term; diff --git a/desktop/.st/st.info b/desktop/.st/st.info deleted file mode 100644 index 1ff5af9..0000000 --- a/desktop/.st/st.info +++ /dev/null @@ -1,248 +0,0 @@ -st-mono| simpleterm monocolor, -# undercurl patch / UNDERCURL_PATCH - Su, - 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, - E3=\E[3J, - 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, -# CSI 22, 23 patch / CSI_22_23_PATCH -# rmcup=\E[?1049l, - rmcup=\E[?1049l\E[23;0;0t, - 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, -# CSI 22, 23 patch / CSI_22_23_PATCH -# smcup=\E[?1049h, - smcup=\E[?1049h\E[22;0;0t, - 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, -# sync patch / SYNC_PATCH - Sync=\EP=%p1%ds\E\\, - -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/desktop/.st/win.h b/desktop/.st/win.h deleted file mode 100644 index 55bd990..0000000 --- a/desktop/.st/win.h +++ /dev/null @@ -1,57 +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, - #if VIM_BROWSE_PATCH - MODE_NORMAL = 1 << 18, - #endif // VIM_BROWSE_PATCH - #if KEYBOARDSELECT_PATCH - MODE_KBDSELECT = 1 << 19, - #endif // KEYBOARDSELECT_PATCH -}; - -void xbell(void); -void xclipcopy(void); -#if LIGATURES_PATCH -void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int); -#else -void xdrawcursor(int, int, Glyph, int, int, Glyph); -#endif // LIGATURES_PATCH -void xdrawline(Line, int, int, int); -void xfinishdraw(void); -void xloadcols(void); -int xsetcolorname(int, const char *); -void xseticontitle(char *); -#if CSI_22_23_PATCH -void xfreetitlestack(void); -void xsettitle(char *, int); -void xpushtitle(void); -#else -void xsettitle(char *); -#endif // CSI_22_23_PATCH -int xsetcursor(int); -void xsetmode(int, unsigned int); -void xsetpointermotion(int); -void xsetsel(char *); -int xstartdraw(void); -void xximspot(int, int); -void xclearwin(void); \ No newline at end of file diff --git a/desktop/.st/x.c b/desktop/.st/x.c deleted file mode 100644 index c2f5a59..0000000 --- a/desktop/.st/x.c +++ /dev/null @@ -1,3673 +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" -#if LIGATURES_PATCH -#include "hb.h" -#endif // LIGATURES_PATCH - -#if THEMED_CURSOR_PATCH -#include -#endif // THEMED_CURSOR_PATCH - -#if UNDERCURL_PATCH -/* Undercurl slope types */ -enum undercurl_slope_type { - UNDERCURL_SLOPE_ASCENDING = 0, - UNDERCURL_SLOPE_TOP_CAP = 1, - UNDERCURL_SLOPE_DESCENDING = 2, - UNDERCURL_SLOPE_BOTTOM_CAP = 3 -}; -#endif // UNDERCURL_PATCH - -/* X modifiers */ -#define XK_ANY_MOD UINT_MAX -#define XK_NO_MOD 0 -#define XK_SWITCH_MOD (1<<13|1<<14) - -/* 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 ttysend(const Arg *); -static void zoom(const Arg *); -static void zoomabs(const Arg *); -static void zoomreset(const Arg *); - -#include "patch/st_include.h" -#include "patch/x_include.h" - -/* config.h for applying patches and the configuration. */ -#include "config.h" - -#if CSI_22_23_PATCH -/* size of title stack */ -#define TITLESTACKSIZE 8 -#endif // CSI_22_23_PATCH - -/* 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) - -static inline ushort sixd_to_16bit(int); -static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int); -#if WIDE_GLYPHS_PATCH -static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int); -#else -static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int); -#endif // WIDE_GLYPHS_PATCH -#if LIGATURES_PATCH -static void xresetfontsettings(ushort mode, Font **font, int *frcflags); -#endif // LIGATURES_PATCH -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(const 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 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); -#if XRESOURCES_PATCH && XRESOURCES_RELOAD_PATCH || BACKGROUND_IMAGE_PATCH && BACKGROUND_IMAGE_RELOAD_PATCH -static void sigusr1_reload(int sig); -#endif // XRESOURCES_RELOAD_PATCH | BACKGROUND_IMAGE_RELOAD_PATCH -static int mouseaction(XEvent *, uint); -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, - #if ST_EMBEDDER_PATCH - [CreateNotify] = createnotify, - [DestroyNotify] = destroynotify, - #endif // ST_EMBEDDER_PATCH -}; - -/* Globals */ -Term term; -DC dc; -XWindow xw; -XSelection xsel; -TermWindow win; - -#if CSI_22_23_PATCH -static int tstki; /* title stack index */ -static char *titlestack[TITLESTACKSIZE]; /* title stack */ -#endif // CSI_22_23_PATCH - -/* 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; - -#if ALPHA_PATCH -static char *opt_alpha = NULL; -#endif // ALPHA_PATCH -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; -#if WORKINGDIR_PATCH -static char *opt_dir = NULL; -#endif // WORKINGDIR_PATCH - -#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH -static int focused = 0; -#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH - -static uint buttons; /* bit field of pressed buttons */ -#if BLINKING_CURSOR_PATCH -static int cursorblinks = 0; -#endif // BLINKING_CURSOR_PATCH -#if VISUALBELL_1_PATCH -static int bellon = 0; /* visual bell status */ -#endif // VISUALBELL_1_PATCH -#if RELATIVEBORDER_PATCH -int borderpx; -#endif // RELATIVEBORDER_PATCH -#if SWAPMOUSE_PATCH -static Cursor cursor; -static XColor xmousefg, xmousebg; -#endif // SWAPMOUSE_PATCH - -#include "patch/x_include.c" - -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 -numlock(const Arg *dummy) -{ - win.mode ^= MODE_NUMLOCK; -} - -void -selpaste(const Arg *dummy) -{ - XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY, - xw.win, CurrentTime); -} - -void -ttysend(const Arg *arg) -{ - ttywrite(arg->s, strlen(arg->s), 1); -} - -void -zoom(const Arg *arg) -{ - Arg larg; - - larg.f = usedfontsize + arg->f; - zoomabs(&larg); -} - -void -zoomabs(const Arg *arg) -{ - xunloadfonts(); - xloadfonts(usedfont, arg->f); - #if FONT2_PATCH - xloadsparefonts(); - #endif // FONT2_PATCH - cresize(0, 0); - redraw(); - xhints(); -} - -void -zoomreset(const Arg *arg) -{ - Arg larg; - - if (defaultfontsize > 0) { - larg.f = defaultfontsize; - zoomabs(&larg); - } -} - -int -evcol(XEvent *e) -{ - #if ANYSIZE_PATCH - int x = e->xbutton.x - win.hborderpx; - #else - int x = e->xbutton.x - borderpx; - #endif // ANYSIZE_PATCH - LIMIT(x, 0, win.tw - 1); - return x / win.cw; -} - -int -evrow(XEvent *e) -{ - #if ANYSIZE_PATCH - int y = e->xbutton.y - win.vborderpx; - #else - int y = e->xbutton.y - borderpx; - #endif // ANYSIZE_PATCH - LIMIT(y, 0, win.th - 1); - return y / win.ch; -} - -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; - int screen = tisaltscr() ? S_ALT : S_PRI; - - /* 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 && - (!ms->screen || (ms->screen == screen)) && - (match(ms->mod, state) || /* exact or forced */ - match(ms->mod, state & ~forcemousemod))) { - ms->func(&(ms->arg)); - return 1; - } - } - - return 0; -} - -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, btn, code; - int x = evcol(e), y = evrow(e); - int state = e->xbutton.state; - char buf[40]; - static int ox, oy; - - if (e->type == MotionNotify) { - if (x == ox && y == oy) - return; - if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY)) - return; - /* MODE_MOUSEMOTION: no reporting if no button is pressed */ - if (IS_SET(MODE_MOUSEMOTION) && buttons == 0) - return; - - /* Set btn to lowest-numbered pressed button, or 12 if no - * buttons are pressed. */ - for (btn = 1; btn <= 11 && !(buttons & (1<<(btn-1))); btn++) - ; - code = 32; - } else { - btn = e->xbutton.button; - /* Only buttons 1 through 11 can be encoded */ - if (btn < 1 || btn > 11) - return; - if (e->type == ButtonRelease) { - /* MODE_MOUSEX10: no button release reporting */ - if (IS_SET(MODE_MOUSEX10)) - return; - /* Don't send release events for the scroll wheel */ - if (btn == 4 || btn == 5) - return; - } - code = 0; - } - - ox = x; - oy = y; - - /* Encode btn into code. If no button is pressed for a motion event in - * MODE_MOUSEMANY, then encode it as a release. */ - if ((!IS_SET(MODE_MOUSESGR) && e->type == ButtonRelease) || btn == 12) - code += 3; - else if (btn >= 8) - code += 128 + btn - 8; - else if (btn >= 4) - code += 64 + btn - 4; - else - code += btn - 1; - - if (!IS_SET(MODE_MOUSEX10)) { - code += ((state & ShiftMask ) ? 4 : 0) - + ((state & Mod1Mask ) ? 8 : 0) /* meta key: alt */ - + ((state & ControlMask) ? 16 : 0); - } - - if (IS_SET(MODE_MOUSESGR)) { - len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c", - code, x+1, y+1, - e->type == ButtonRelease ? 'm' : 'M'); - } else if (x < 223 && y < 223) { - len = snprintf(buf, sizeof(buf), "\033[M%c%c%c", - 32+code, 32+x+1, 32+y+1); - } else { - return; - } - - ttywrite(buf, len, 0); -} - -void -bpress(XEvent *e) -{ - int btn = e->xbutton.button; - struct timespec now; - #if !VIM_BROWSE_PATCH - int snap; - #endif // VIM_BROWSE_PATCH - - if (1 <= btn && btn <= 11) - buttons |= 1 << (btn-1); - - if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { - mousereport(e); - return; - } - - if (mouseaction(e, 0)) - return; - - if (btn == Button1) { - /* - * If the user clicks below predefined timeouts specific - * snapping behaviour is exposed. - */ - clock_gettime(CLOCK_MONOTONIC, &now); - #if VIM_BROWSE_PATCH - int const tripleClick = TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout, - doubleClick = TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout; - if ((mouseYank || mouseSelect) && (tripleClick || doubleClick)) { - if (!IS_SET(MODE_NORMAL)) normalMode(); - historyOpToggle(1, 1); - tmoveto(evcol(e), evrow(e)); - if (tripleClick) { - if (mouseYank) pressKeys("dVy", 3); - if (mouseSelect) pressKeys("dV", 2); - } else if (doubleClick) { - if (mouseYank) pressKeys("dyiW", 4); - if (mouseSelect) { - tmoveto(evcol(e), evrow(e)); - pressKeys("viW", 3); - } - } - historyOpToggle(-1, 1); - } else { - if (!IS_SET(MODE_NORMAL)) selstart(evcol(e), evrow(e), 0); - else { - historyOpToggle(1, 1); - tmoveto(evcol(e), evrow(e)); - pressKeys("v", 1); - historyOpToggle(-1, 1); - } - } - #else - if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) { - snap = SNAP_LINE; - } else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) { - snap = SNAP_WORD; - } else { - snap = 0; - } - #endif // VIM_BROWSE_PATCH - xsel.tclick2 = xsel.tclick1; - xsel.tclick1 = now; - - #if !VIM_BROWSE_PATCH - selstart(evcol(e), evrow(e), snap); - #endif // VIM_BROWSE_PATCH - - #if OPENURLONCLICK_PATCH - clearurl(); - url_click = 1; - #endif // OPENURLONCLICK_PATCH - } -} - -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); - } - - #if BACKGROUND_IMAGE_PATCH - if (pseudotransparency && - !strncmp(XGetAtomName(xw.dpy, e->xproperty.atom), "_NET_WM_STATE", 13)) { - updatexy(); - redraw(); - } - #endif // BACKGROUND_IMAGE_PATCH -} - -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 BACKGROUND_IMAGE_PATCH - if (e->type == PropertyNotify && nitems == 0 && rem == 0 && !pseudotransparency) - #else - if (e->type == PropertyNotify && nitems == 0 && rem == 0) - #endif // BACKGROUND_IMAGE_PATCH - { - /* - * 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. - */ - #if BACKGROUND_IMAGE_PATCH - if (!pseudotransparency) { - #endif // BACKGROUND_IMAGE_PATCH - MODBIT(xw.attrs.event_mask, 1, PropertyChangeMask); - XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, - &xw.attrs); - #if BACKGROUND_IMAGE_PATCH - } - #endif // BACKGROUND_IMAGE_PATCH - - /* - * 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(); - - #if CLIPBOARD_PATCH - clipcopy(NULL); - #endif // CLIPBOARD_PATCH -} - -#if XRESOURCES_PATCH && XRESOURCES_RELOAD_PATCH || BACKGROUND_IMAGE_PATCH && BACKGROUND_IMAGE_RELOAD_PATCH -void -sigusr1_reload(int sig) -{ - #if XRESOURCES_PATCH && XRESOURCES_RELOAD_PATCH - reload_config(sig); - #endif // XRESOURCES_RELOAD_PATCH - #if BACKGROUND_IMAGE_PATCH && BACKGROUND_IMAGE_RELOAD_PATCH - reload_image(); - #endif // BACKGROUND_IMAGE_RELOAD_PATCH - signal(SIGUSR1, sigusr1_reload); -} -#endif // XRESOURCES_RELOAD_PATCH | BACKGROUND_IMAGE_RELOAD_PATCH - -void -xsetsel(char *str) -{ - setsel(str, CurrentTime); -} - -void -brelease(XEvent *e) -{ - int btn = e->xbutton.button; - - if (1 <= btn && btn <= 11) - buttons &= ~(1 << (btn-1)); - - if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { - mousereport(e); - return; - } - - if (mouseaction(e, 1)) - return; - #if VIM_BROWSE_PATCH - if (btn == Button1 && !IS_SET(MODE_NORMAL)) { - mousesel(e, 1); - #if OPENURLONCLICK_PATCH - if (url_click && e->xkey.state & url_opener_modkey) - openUrlOnClick(evcol(e), evrow(e), url_opener); - #endif // OPENURLONCLICK_PATCH - } - #else - if (btn == Button1) { - mousesel(e, 1); - #if OPENURLONCLICK_PATCH - if (url_click && e->xkey.state & url_opener_modkey) - openUrlOnClick(evcol(e), evrow(e), url_opener); - #endif // OPENURLONCLICK_PATCH - } - #endif // VIM_BROWSE_PATCH - #if RIGHTCLICKTOPLUMB_PATCH - else if (btn == Button3) - plumb(xsel.primary); - #endif // RIGHTCLICKTOPLUMB_PATCH -} - -void -bmotion(XEvent *e) -{ - #if HIDECURSOR_PATCH - if (!xw.pointerisvisible) { - #if SWAPMOUSE_PATCH - if (win.mode & MODE_MOUSE) - XUndefineCursor(xw.dpy, xw.win); - else - XDefineCursor(xw.dpy, xw.win, xw.vpointer); - #else - XDefineCursor(xw.dpy, xw.win, xw.vpointer); - #endif // SWAPMOUSE_PATCH - xw.pointerisvisible = 1; - if (!IS_SET(MODE_MOUSEMANY)) - xsetpointermotion(0); - } - #endif // HIDECURSOR_PATCH - #if OPENURLONCLICK_PATCH - #if VIM_BROWSE_PATCH - if (!IS_SET(MODE_NORMAL)) - #endif // VIM_BROWSE_PATCH - if (!IS_SET(MODE_MOUSE)) { - if (!(e->xbutton.state & Button1Mask) && detecturl(evcol(e), evrow(e), 1)) - XDefineCursor(xw.dpy, xw.win, xw.upointer); - else - XDefineCursor(xw.dpy, xw.win, xw.vpointer); - } - url_click = 0; - #endif // OPENURLONCLICK_PATCH - - 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); - - #if ANYSIZE_PATCH - win.hborderpx = (win.w - col * win.cw) / 2; - win.vborderpx = (win.h - row * win.ch) / 2; - #endif // ANYSIZE_PATCH - - 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; - - #if !SINGLE_DRAWABLE_BUFFER_PATCH - XFreePixmap(xw.dpy, xw.buf); - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, - #if ALPHA_PATCH - xw.depth - #else - DefaultDepth(xw.dpy, xw.scr) - #endif // ALPHA_PATCH - ); - XftDrawChange(xw.draw, xw.buf); - #endif // SINGLE_DRAWABLE_BUFFER_PATCH - 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); -} - -#if VIM_BROWSE_PATCH -void normalMode() -{ - #if OPENURLONCLICK_PATCH - clearurl(); - restoremousecursor(); - #endif // OPENURLONCLICK_PATCH - historyModeToggle((win.mode ^=MODE_NORMAL) & MODE_NORMAL); -} -#endif // VIM_BROWSE_PATCH - -#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH -void -xloadalpha(void) -{ - float const usedAlpha = focused ? alpha : alphaUnfocused; - if (opt_alpha) alpha = strtof(opt_alpha, NULL); - dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * usedAlpha); - dc.col[defaultbg].pixel &= 0x00FFFFFF; - dc.col[defaultbg].pixel |= (unsigned char)(0xff * usedAlpha) << 24; -} -#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH - -#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH -void -xloadcols(void) -{ - static int loaded; - Color *cp; - - if (!loaded) { - dc.collen = 1 + (defaultbg = MAX(LEN(colorname), 256)); - dc.col = xmalloc((dc.collen) * sizeof(Color)); - } - - for (int i = 0; i+1 < 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); - } - if (dc.collen) // cannot die, as the color is already loaded. - xloadcolor(focused ? bg : bgUnfocused, NULL, &dc.col[defaultbg]); - - xloadalpha(); - loaded = 1; -} -#else -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); - } - #if ALPHA_PATCH - /* 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; - #endif // ALPHA_PATCH - loaded = 1; -} -#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH - -int -xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b) -{ - if (!BETWEEN(x, 0, dc.collen)) - return 1; - - *r = dc.col[x].color.red >> 8; - *g = dc.col[x].color.green >> 8; - *b = dc.col[x].color.blue >> 8; - - return 0; -} - -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; - - #if ALPHA_PATCH - /* set alpha value of bg color */ - if (x == defaultbg) { - 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; - } - #endif // ALPHA_PATCH - return 0; -} - -/* - * Absolute coordinates. - */ -void -xclear(int x1, int y1, int x2, int y2) -{ - #if BACKGROUND_IMAGE_PATCH - if (pseudotransparency) - XSetTSOrigin(xw.dpy, xw.bggc, -win.x, -win.y); - XFillRectangle(xw.dpy, xw.buf, xw.bggc, x1, y1, x2-x1, y2-y1); - #elif INVERT_PATCH - Color c; - c = dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg]; - if (invertcolors) { - c = invertedcolor(&c); - } - XftDrawRect(xw.draw, &c, x1, y1, x2-x1, y2-y1); - #else - XftDrawRect(xw.draw, - &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg], - x1, y1, x2-x1, y2-y1); - #endif // INVERT_PATCH -} - -void -xclearwin(void) -{ - xclear(0, 0, win.w, win.h); -} - -void -xhints(void) -{ - #if XRESOURCES_PATCH - XClassHint class = {opt_name ? opt_name : "st", - opt_class ? opt_class : "St"}; - #else - XClassHint class = {opt_name ? opt_name : termname, - opt_class ? opt_class : termname}; - #endif // XRESOURCES_PATCH - XWMHints wm = {.flags = InputHint, .input = 1}; - XSizeHints *sizeh; - - sizeh = XAllocSizeHints(); - - sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize; - sizeh->height = win.h; - sizeh->width = win.w; - #if ANYSIZE_PATCH || ANYSIZE_SIMPLE_PATCH - sizeh->height_inc = 1; - sizeh->width_inc = 1; - #else - sizeh->height_inc = win.ch; - sizeh->width_inc = win.cw; - #endif // ANYSIZE_PATCH - 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 -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; -} - -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); - - #if USE_XFTFONTMATCH_PATCH - match = XftFontMatch(xw.dpy, xw.scr, pattern, &result); - #else - match = FcFontMatch(NULL, configured, &result); - #endif // USE_XFTFONTMATCH_PATCH - 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; - #if WIDE_GLYPH_SPACING_PATCH - f->width = DIVCEIL(extents.xOff > 18 ? extents.xOff / 3 : extents.xOff, strlen(ascii_printable)); - #else - f->width = DIVCEIL(extents.xOff, strlen(ascii_printable)); - #endif // WIDE_GLYPH_SPACING_PATCH - - return 0; -} - -void -xloadfonts(const char *fontstr, double fontsize) -{ - FcPattern *pattern; - double fontval; - - if (fontstr[0] == '-') - pattern = XftXlfdParse(fontstr, False, False); - else - pattern = FcNameParse((const 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); - #if VERTCENTER_PATCH - win.cyo = ceilf(dc.font.height * (chscale - 1) / 2); - #endif // VERTCENTER_PATCH - - #if RELATIVEBORDER_PATCH - borderpx = (int) ceilf(((float)borderperc / 100) * win.cw); - #endif // RELATIVEBORDER_PATCH - FcPatternDel(pattern, FC_SLANT); - #if !DISABLE_ITALIC_FONTS_PATCH - FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); - #endif // DISABLE_ITALIC_FONTS_PATCH - if (xloadfont(&dc.ifont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDel(pattern, FC_WEIGHT); - #if !DISABLE_BOLD_FONTS_PATCH - FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); - #endif // DISABLE_BOLD_FONTS_PATCH - if (xloadfont(&dc.ibfont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDel(pattern, FC_SLANT); - #if !DISABLE_ROMAN_FONTS_PATCH - FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); - #endif // DISABLE_ROMAN_FONTS_PATCH - 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) -{ - #if LIGATURES_PATCH - /* Clear Harfbuzz font cache. */ - hbunloadfonts(); - #endif // LIGATURES_PATCH - - /* Free the loaded fonts in the font cache. */ - while (frclen > 0) - XftFontClose(xw.dpy, frc[--frclen].font); - - xunloadfont(&dc.font); - xunloadfont(&dc.bfont); - xunloadfont(&dc.ifont); - xunloadfont(&dc.ibfont); -} - -void -xinit(int cols, int rows) -{ - XGCValues gcvalues; - #if HIDECURSOR_PATCH - Pixmap blankpm; - #elif !SWAPMOUSE_PATCH - Cursor cursor; - #endif // HIDECURSOR_PATCH - Window parent; - pid_t thispid = getpid(); - #if !SWAPMOUSE_PATCH - XColor xmousefg, xmousebg; - #endif // SWAPMOUSE_PATCH - #if ALPHA_PATCH - XWindowAttributes attr; - XVisualInfo vis; - #endif // ALPHA_PATCH - - #if !XRESOURCES_PATCH - if (!(xw.dpy = XOpenDisplay(NULL))) - die("can't open display\n"); - #endif // XRESOURCES_PATCH - xw.scr = XDefaultScreen(xw.dpy); - - #if ALPHA_PATCH - 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; - #else - xw.vis = XDefaultVisual(xw.dpy, xw.scr); - #endif // ALPHA_PATCH - - /* font */ - if (!FcInit()) - die("could not init fontconfig.\n"); - - usedfont = (opt_font == NULL)? font : opt_font; - xloadfonts(usedfont, 0); - - #if FONT2_PATCH - /* spare fonts */ - xloadsparefonts(); - #endif // FONT2_PATCH - - /* colors */ - #if ALPHA_PATCH - xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None); - #else - xw.cmap = XDefaultColormap(xw.dpy, xw.scr); - #endif // ALPHA_PATCH - xloadcols(); - - /* adjust fixed window geometry */ - #if ANYSIZE_PATCH - win.w = 2 * win.hborderpx + cols * win.cw; - win.h = 2 * win.vborderpx + rows * win.ch; - #else - win.w = 2 * borderpx + cols * win.cw; - win.h = 2 * borderpx + rows * win.ch; - #endif // ANYSIZE_PATCH - 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 - #if ST_EMBEDDER_PATCH - | SubstructureNotifyMask | SubstructureRedirectMask - #endif // ST_EMBEDDER_PATCH - ; - xw.attrs.colormap = xw.cmap; - #if OPENURLONCLICK_PATCH - xw.attrs.event_mask |= PointerMotionMask; - #endif // OPENURLONCLICK_PATCH - - #if !ALPHA_PATCH - if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) - parent = XRootWindow(xw.dpy, xw.scr); - #endif // ALPHA_PATCH - xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t, - #if ALPHA_PATCH - win.w, win.h, 0, xw.depth, InputOutput, - #else - win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, - #endif // ALPHA_PATCH - xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity - | CWEventMask | CWColormap, &xw.attrs); - - memset(&gcvalues, 0, sizeof(gcvalues)); - gcvalues.graphics_exposures = False; - - #if ALPHA_PATCH - #if SINGLE_DRAWABLE_BUFFER_PATCH - xw.buf = xw.win; - #else - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth); - #endif // SINGLE_DRAWABLE_BUFFER_PATCH - dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues); - #else - dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures, - &gcvalues); - #if SINGLE_DRAWABLE_BUFFER_PATCH - xw.buf = xw.win; - #else - xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, - DefaultDepth(xw.dpy, xw.scr)); - #endif // SINGLE_DRAWABLE_BUFFER_PATCH - #endif // ALPHA_PATCH - 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 */ - #if HIDECURSOR_PATCH - xw.pointerisvisible = 1; - #if THEMED_CURSOR_PATCH - xw.vpointer = XcursorLibraryLoadCursor(xw.dpy, mouseshape); - #else - xw.vpointer = XCreateFontCursor(xw.dpy, mouseshape); - #endif // THEMED_CURSOR_PATCH - XDefineCursor(xw.dpy, xw.win, xw.vpointer); - #elif THEMED_CURSOR_PATCH - cursor = XcursorLibraryLoadCursor(xw.dpy, mouseshape); - XDefineCursor(xw.dpy, xw.win, cursor); - #else - cursor = XCreateFontCursor(xw.dpy, mouseshape); - XDefineCursor(xw.dpy, xw.win, cursor); - #endif // HIDECURSOR_PATCH - - #if !THEMED_CURSOR_PATCH - 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; - } - #endif // THEMED_CURSOR_PATCH - - #if HIDECURSOR_PATCH - #if !THEMED_CURSOR_PATCH - XRecolorCursor(xw.dpy, xw.vpointer, &xmousefg, &xmousebg); - #endif // THEMED_CURSOR_PATCH - blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1); - xw.bpointer = XCreatePixmapCursor(xw.dpy, blankpm, blankpm, - &xmousefg, &xmousebg, 0, 0); - #elif !THEMED_CURSOR_PATCH - XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg); - #endif // HIDECURSOR_PATCH - - #if OPENURLONCLICK_PATCH - xw.upointer = XCreateFontCursor(xw.dpy, XC_hand2); - #if !HIDECURSOR_PATCH - xw.vpointer = cursor; - xw.pointerisvisible = 1; - #endif // HIDECURSOR_PATCH - #endif // OPENURLONCLICK_PATCH - - 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); - xw.netwmiconname = XInternAtom(xw.dpy, "_NET_WM_ICON_NAME", False); - XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1); - - #if NETWMICON_PATCH - xw.netwmicon = XInternAtom(xw.dpy, "_NET_WM_ICON", False); - XChangeProperty(xw.dpy, xw.win, xw.netwmicon, XA_CARDINAL, 32, - PropModeReplace, (uchar *)&icon, LEN(icon)); - #endif //NETWMICON_PATCH - - #if NO_WINDOW_DECORATIONS_PATCH - Atom motifwmhints = XInternAtom(xw.dpy, "_MOTIF_WM_HINTS", False); - unsigned int data[] = { 0x2, 0x0, 0x0, 0x0, 0x0 }; - XChangeProperty(xw.dpy, xw.win, motifwmhints, motifwmhints, 16, - PropModeReplace, (unsigned char *)data, 5); - #endif // NO_WINDOW_DECORATIONS_PATCH - - xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False); - XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32, - PropModeReplace, (uchar *)&thispid, 1); - - #if FULLSCREEN_PATCH - xw.netwmstate = XInternAtom(xw.dpy, "_NET_WM_STATE", False); - xw.netwmfullscreen = XInternAtom(xw.dpy, "_NET_WM_STATE_FULLSCREEN", False); - #endif // FULLSCREEN_PATCH - - 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; - - #if BOXDRAW_PATCH - boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis); - #endif // BOXDRAW_PATCH -} - -#if LIGATURES_PATCH -void -xresetfontsettings(ushort mode, Font **font, int *frcflags) -{ - *font = &dc.font; - 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; - } -} -#endif // LIGATURES_PATCH - -int -xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) -{ - #if ANYSIZE_PATCH - float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp; - #else - float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp; - #endif // ANYSIZE_PATCH - 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; - #if LIGATURES_PATCH - int length = 0, start = 0; - HbTransformData shaped = { 0 }; - - /* Initial values. */ - mode = prevmode = glyphs[0].mode; - xresetfontsettings(mode, &font, &frcflags); - #endif // LIGATURES_PATCH - - #if VERTCENTER_PATCH - for (i = 0, xp = winx, yp = winy + font->ascent + win.cyo; i < len; ++i) - #else - for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) - #endif // VERTCENTER_PATCH - { - /* Fetch rune and mode for current glyph. */ - #if VIM_BROWSE_PATCH - Glyph g = glyphs[i]; - historyOverlay(x+i, y, &g); - rune = g.u; - mode = g.mode; - #elif LIGATURES_PATCH - mode = glyphs[i].mode; - #else - rune = glyphs[i].u; - mode = glyphs[i].mode; - #endif // VIM_BROWSE_PATCH | LIGATURES_PATCH - - /* Skip dummy wide-character spacing. */ - #if LIGATURES_PATCH - if (mode & ATTR_WDUMMY) - continue; - - if ( - prevmode != mode - || ATTRCMP(glyphs[start], glyphs[i]) - || selected(x + i, y) != selected(x + start, y) - || i == (len - 1) - ) { - /* Handle 1-character wide segments and end of line */ - length = i - start; - if (i == start) { - length = 1; - } else if (i == (len - 1)) { - length = (i - start + 1); - } - - /* Shape the segment. */ - hbtransform(&shaped, font->match, glyphs, start, length); - for (int code_idx = 0; code_idx < shaped.count; code_idx++) { - rune = glyphs[start + code_idx].u; - runewidth = win.cw * ((glyphs[start + code_idx].mode & ATTR_WIDE) ? 2.0f : 1.0f); - - if (glyphs[start + code_idx].mode & ATTR_WDUMMY) - continue; - - #if BOXDRAW_PATCH - if (glyphs[start + code_idx].mode & ATTR_BOXDRAW) { - /* minor shoehorning: boxdraw uses only this ushort */ - specs[numspecs].font = font->match; - specs[numspecs].glyph = boxdrawindex(&glyphs[start + code_idx]); - specs[numspecs].x = xp; - specs[numspecs].y = yp; - xp += runewidth; - numspecs++; - } else - #endif // BOXDRAW_PATCH - if (shaped.glyphs[code_idx].codepoint != 0) { - /* If symbol is found, put it into the specs. */ - specs[numspecs].font = font->match; - specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint; - specs[numspecs].x = xp + (short)shaped.positions[code_idx].x_offset; - specs[numspecs].y = yp + (short)shaped.positions[code_idx].y_offset; - xp += runewidth; - numspecs++; - } else { - /* If it's not found, try to fetch it through the font cache. */ - 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++; - } - } - - /* Cleanup and get ready for next segment. */ - hbcleanup(&shaped); - start = i; - - /* Determine font for glyph if different from previous glyph. */ - if (prevmode != mode) { - prevmode = mode; - xresetfontsettings(mode, &font, &frcflags); - yp = winy + font->ascent; - } - } - #else // !LIGATURES_PATCH - 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; - } - #if VERTCENTER_PATCH - yp = winy + font->ascent + win.cyo; - #else - yp = winy + font->ascent; - #endif // VERTCENTER_PATCH - } - - #if BOXDRAW_PATCH - if (mode & ATTR_BOXDRAW) { - /* minor shoehorning: boxdraw uses only this ushort */ - glyphidx = boxdrawindex(&glyphs[i]); - } else { - /* Lookup character index with default font. */ - glyphidx = XftCharIndex(xw.dpy, font->match, rune); - } - #else - /* Lookup character index with default font. */ - glyphidx = XftCharIndex(xw.dpy, font->match, rune); - #endif // BOXDRAW_PATCH - 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); - - #if !USE_XFTFONTMATCH_PATCH - FcConfigSubstitute(0, fcpattern, FcMatchPattern); - FcDefaultSubstitute(fcpattern); - #endif // USE_XFTFONTMATCH_PATCH - - 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++; - #endif // LIGATURES_PATCH - } - - return numspecs; -} - -#if UNDERCURL_PATCH -static int isSlopeRising (int x, int iPoint, int waveWidth) -{ - // . . . . - // / \ / \ / \ / \ - // / \ / \ / \ / \ - // . . . . . - - // Find absolute `x` of point - x += iPoint * (waveWidth/2); - - // Find index of absolute wave - int absSlope = x / ((float)waveWidth/2); - - return (absSlope % 2); -} - -static int getSlope (int x, int iPoint, int waveWidth) -{ - // Sizes: Caps are half width of slopes - // 1_2 1_2 1_2 1_2 - // / \ / \ / \ / \ - // / \ / \ / \ / \ - // 0 3_0 3_0 3_0 3_ - // <2-> <1> <---6----> - - // Find type of first point - int firstType; - x -= (x / waveWidth) * waveWidth; - if (x < (waveWidth * (2.f/6.f))) - firstType = UNDERCURL_SLOPE_ASCENDING; - else if (x < (waveWidth * (3.f/6.f))) - firstType = UNDERCURL_SLOPE_TOP_CAP; - else if (x < (waveWidth * (5.f/6.f))) - firstType = UNDERCURL_SLOPE_DESCENDING; - else - firstType = UNDERCURL_SLOPE_BOTTOM_CAP; - - // Find type of given point - int pointType = (iPoint % 4); - pointType += firstType; - pointType %= 4; - - return pointType; -} -#endif // UNDERCURL_PATCH - -void -#if WIDE_GLYPHS_PATCH -xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int dmode) -#else -xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y) -#endif // WIDE_GLYPHS_PATCH -{ - int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1); - #if ANYSIZE_PATCH - int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch; - #else - int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch; - #endif // ANYSIZE_PATCH - int 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]; - } - - #if !BOLD_IS_NOT_BRIGHT_PATCH - /* 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]; - #endif // BOLD_IS_NOT_BRIGHT_PATCH - - 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) { - #if SPOILER_PATCH - if (bg == fg) { - bg = &dc.col[defaultfg]; - fg = &dc.col[defaultbg]; - } else { - temp = fg; - fg = bg; - bg = temp; - } - #else - temp = fg; - fg = bg; - bg = temp; - #endif // SPOILER_PATCH - } - - if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK) - fg = bg; - - if (base.mode & ATTR_INVISIBLE) - fg = bg; - - #if INVERT_PATCH - if (invertcolors) { - revfg = invertedcolor(fg); - revbg = invertedcolor(bg); - fg = &revfg; - bg = &revbg; - } - #endif // INVERT_PATCH - - #if ALPHA_PATCH && ALPHA_GRADIENT_PATCH - // gradient - bg->color.alpha = grad_alpha * 0xffff * (win.h - y*win.ch) / win.h + stat_alpha * 0xffff; - // uncomment to invert the gradient - // bg->color.alpha = grad_alpha * 0xffff * (y*win.ch) / win.h + stat_alpha * 0xffff; - #endif // ALPHA_PATCH | ALPHA_GRADIENT_PATCH - - #if WIDE_GLYPHS_PATCH - if (dmode & DRAW_BG) { - #endif // WIDE_GLYPHS_PATCH - /* Intelligent cleaning up of the borders. */ - #if ANYSIZE_PATCH - if (x == 0) { - xclear(0, (y == 0)? 0 : winy, win.hborderpx, - winy + win.ch + - ((winy + win.ch >= win.vborderpx + win.th)? win.h : 0)); - } - if (winx + width >= win.hborderpx + win.tw) { - xclear(winx + width, (y == 0)? 0 : winy, win.w, - ((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch))); - } - if (y == 0) - xclear(winx, 0, winx + width, win.vborderpx); - if (winy + win.ch >= win.vborderpx + win.th) - xclear(winx, winy + win.ch, winx + width, win.h); - #else - 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); - #endif // ANYSIZE_PATCH - - /* Clean up the region we want to draw to. */ - #if BACKGROUND_IMAGE_PATCH - if (bg == &dc.col[defaultbg]) - xclear(winx, winy, winx + width, winy + win.ch); - else - #endif // BACKGROUND_IMAGE_PATCH - - #if !WIDE_GLYPHS_PATCH - XftDrawRect(xw.draw, bg, winx, winy, width, win.ch); - #endif // WIDE_GLYPHS_PATCH - - /* 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); - - #if WIDE_GLYPHS_PATCH - /* Fill the background */ - XftDrawRect(xw.draw, bg, winx, winy, width, win.ch); - } - #endif // WIDE_GLYPHS_PATCH - - #if WIDE_GLYPHS_PATCH - if (dmode & DRAW_FG) { - #endif // WIDE_GLYPHS_PATCH - #if BOXDRAW_PATCH - if (base.mode & ATTR_BOXDRAW) { - drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len); - } else { - /* Render the glyphs. */ - XftDrawGlyphFontSpec(xw.draw, fg, specs, len); - } - #else - /* Render the glyphs. */ - XftDrawGlyphFontSpec(xw.draw, fg, specs, len); - #endif // BOXDRAW_PATCH - - /* Render underline and strikethrough. */ - if (base.mode & ATTR_UNDERLINE) { - #if UNDERCURL_PATCH - // Underline Color - const int widthThreshold = 28; // +1 width every widthThreshold px of font - int wlw = (win.ch / widthThreshold) + 1; // Wave Line Width - int linecolor; - if ((base.ucolor[0] >= 0) && - !(base.mode & ATTR_BLINK && win.mode & MODE_BLINK) && - !(base.mode & ATTR_INVISIBLE) - ) { - // Special color for underline - // Index - if (base.ucolor[1] < 0) { - linecolor = dc.col[base.ucolor[0]].pixel; - } - // RGB - else { - XColor lcolor; - lcolor.red = base.ucolor[0] * 257; - lcolor.green = base.ucolor[1] * 257; - lcolor.blue = base.ucolor[2] * 257; - lcolor.flags = DoRed | DoGreen | DoBlue; - XAllocColor(xw.dpy, xw.cmap, &lcolor); - linecolor = lcolor.pixel; - } - } else { - // Foreground color for underline - linecolor = fg->pixel; - } - - XGCValues ugcv = { - .foreground = linecolor, - .line_width = wlw, - .line_style = LineSolid, - .cap_style = CapNotLast - }; - - GC ugc = XCreateGC(xw.dpy, XftDrawDrawable(xw.draw), - GCForeground | GCLineWidth | GCLineStyle | GCCapStyle, - &ugcv); - - // Underline Style - if (base.ustyle != 3) { - XFillRectangle(xw.dpy, XftDrawDrawable(xw.draw), ugc, winx, - winy + dc.font.ascent * chscale + 1, width, wlw); - } else if (base.ustyle == 3) { - int ww = win.cw;//width; - int wh = dc.font.descent - wlw/2 - 1;//r.height/7; - int wx = winx; - int wy = winy + win.ch - dc.font.descent; - #if VERTCENTER_PATCH - wy -= win.cyo; - #endif // VERTCENTER_PATCH - -#if UNDERCURL_STYLE == UNDERCURL_CURLY - // Draw waves - int narcs = charlen * 2 + 1; - XArc *arcs = xmalloc(sizeof(XArc) * narcs); - - int i = 0; - for (i = 0; i < charlen-1; i++) { - arcs[i*2] = (XArc) { - .x = wx + win.cw * i + ww / 4, - .y = wy, - .width = win.cw / 2, - .height = wh, - .angle1 = 0, - .angle2 = 180 * 64 - }; - arcs[i*2+1] = (XArc) { - .x = wx + win.cw * i + ww * 0.75, - .y = wy, - .width = win.cw/2, - .height = wh, - .angle1 = 180 * 64, - .angle2 = 180 * 64 - }; - } - // Last wave - arcs[i*2] = (XArc) {wx + ww * i + ww / 4, wy, ww / 2, wh, - 0, 180 * 64 }; - // Last wave tail - arcs[i*2+1] = (XArc) {wx + ww * i + ww * 0.75, wy, ceil(ww / 2.), - wh, 180 * 64, 90 * 64}; - // First wave tail - i++; - arcs[i*2] = (XArc) {wx - ww/4 - 1, wy, ceil(ww / 2.), wh, 270 * 64, - 90 * 64 }; - - XDrawArcs(xw.dpy, XftDrawDrawable(xw.draw), ugc, arcs, narcs); - - free(arcs); -#elif UNDERCURL_STYLE == UNDERCURL_SPIKY - // Make the underline corridor larger - /* - wy -= wh; - */ - wh *= 2; - - // Set the angle of the slope to 45° - ww = wh; - - // Position of wave is independent of word, it's absolute - wx = (wx / (ww/2)) * (ww/2); - - int marginStart = winx - wx; - - // Calculate number of points with floating precision - float n = width; // Width of word in pixels - n = (n / ww) * 2; // Number of slopes (/ or \) - n += 2; // Add two last points - int npoints = n; // Convert to int - - // Total length of underline - float waveLength = 0; - - if (npoints >= 3) { - // We add an aditional slot in case we use a bonus point - XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1)); - - // First point (Starts with the word bounds) - points[0] = (XPoint) { - .x = wx + marginStart, - .y = (isSlopeRising(wx, 0, ww)) - ? (wy - marginStart + ww/2.f) - : (wy + marginStart) - }; - - // Second point (Goes back to the absolute point coordinates) - points[1] = (XPoint) { - .x = (ww/2.f) - marginStart, - .y = (isSlopeRising(wx, 1, ww)) - ? (ww/2.f - marginStart) - : (-ww/2.f + marginStart) - }; - waveLength += (ww/2.f) - marginStart; - - // The rest of the points - for (int i = 2; i < npoints-1; i++) { - points[i] = (XPoint) { - .x = ww/2, - .y = (isSlopeRising(wx, i, ww)) - ? wh/2 - : -wh/2 - }; - waveLength += ww/2; - } - - // Last point - points[npoints-1] = (XPoint) { - .x = ww/2, - .y = (isSlopeRising(wx, npoints-1, ww)) - ? wh/2 - : -wh/2 - }; - waveLength += ww/2; - - // End - if (waveLength < width) { // Add a bonus point? - int marginEnd = width - waveLength; - points[npoints] = (XPoint) { - .x = marginEnd, - .y = (isSlopeRising(wx, npoints, ww)) - ? (marginEnd) - : (-marginEnd) - }; - - npoints++; - } else if (waveLength > width) { // Is last point too far? - int marginEnd = waveLength - width; - points[npoints-1].x -= marginEnd; - if (isSlopeRising(wx, npoints-1, ww)) - points[npoints-1].y -= (marginEnd); - else - points[npoints-1].y += (marginEnd); - } - - // Draw the lines - XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints, - CoordModePrevious); - - // Draw a second underline with an offset of 1 pixel - if ( ((win.ch / (widthThreshold/2)) % 2)) { - points[0].x++; - - XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, - npoints, CoordModePrevious); - } - - // Free resources - free(points); - } -#else // UNDERCURL_CAPPED - // Cap is half of wave width - float capRatio = 0.5f; - - // Make the underline corridor larger - wh *= 2; - - // Set the angle of the slope to 45° - ww = wh; - ww *= 1 + capRatio; // Add a bit of width for the cap - - // Position of wave is independent of word, it's absolute - wx = (wx / ww) * ww; - - float marginStart; - switch(getSlope(winx, 0, ww)) { - case UNDERCURL_SLOPE_ASCENDING: - marginStart = winx - wx; - break; - case UNDERCURL_SLOPE_TOP_CAP: - marginStart = winx - (wx + (ww * (2.f/6.f))); - break; - case UNDERCURL_SLOPE_DESCENDING: - marginStart = winx - (wx + (ww * (3.f/6.f))); - break; - case UNDERCURL_SLOPE_BOTTOM_CAP: - marginStart = winx - (wx + (ww * (5.f/6.f))); - break; - } - - // Calculate number of points with floating precision - float n = width; // Width of word in pixels - // ._. - n = (n / ww) * 4; // Number of points (./ \.) - n += 2; // Add two last points - int npoints = n; // Convert to int - - // Position of the pen to draw the lines - float penX = 0; - float penY = 0; - - if (npoints >= 3) { - XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1)); - - // First point (Starts with the word bounds) - penX = winx; - switch (getSlope(winx, 0, ww)) { - case UNDERCURL_SLOPE_ASCENDING: - penY = wy + wh/2.f - marginStart; - break; - case UNDERCURL_SLOPE_TOP_CAP: - penY = wy; - break; - case UNDERCURL_SLOPE_DESCENDING: - penY = wy + marginStart; - break; - case UNDERCURL_SLOPE_BOTTOM_CAP: - penY = wy + wh/2.f; - break; - } - points[0].x = penX; - points[0].y = penY; - - // Second point (Goes back to the absolute point coordinates) - switch (getSlope(winx, 1, ww)) { - case UNDERCURL_SLOPE_ASCENDING: - penX += ww * (1.f/6.f) - marginStart; - penY += 0; - break; - case UNDERCURL_SLOPE_TOP_CAP: - penX += ww * (2.f/6.f) - marginStart; - penY += -wh/2.f + marginStart; - break; - case UNDERCURL_SLOPE_DESCENDING: - penX += ww * (1.f/6.f) - marginStart; - penY += 0; - break; - case UNDERCURL_SLOPE_BOTTOM_CAP: - penX += ww * (2.f/6.f) - marginStart; - penY += -marginStart + wh/2.f; - break; - } - points[1].x = penX; - points[1].y = penY; - - // The rest of the points - for (int i = 2; i < npoints; i++) { - switch (getSlope(winx, i, ww)) { - case UNDERCURL_SLOPE_ASCENDING: - case UNDERCURL_SLOPE_DESCENDING: - penX += ww * (1.f/6.f); - penY += 0; - break; - case UNDERCURL_SLOPE_TOP_CAP: - penX += ww * (2.f/6.f); - penY += -wh / 2.f; - break; - case UNDERCURL_SLOPE_BOTTOM_CAP: - penX += ww * (2.f/6.f); - penY += wh / 2.f; - break; - } - points[i].x = penX; - points[i].y = penY; - } - - // End - float waveLength = penX - winx; - if (waveLength < width) { // Add a bonus point? - int marginEnd = width - waveLength; - penX += marginEnd; - switch(getSlope(winx, npoints, ww)) { - case UNDERCURL_SLOPE_ASCENDING: - case UNDERCURL_SLOPE_DESCENDING: - //penY += 0; - break; - case UNDERCURL_SLOPE_TOP_CAP: - penY += -marginEnd; - break; - case UNDERCURL_SLOPE_BOTTOM_CAP: - penY += marginEnd; - break; - } - - points[npoints].x = penX; - points[npoints].y = penY; - - npoints++; - } else if (waveLength > width) { // Is last point too far? - int marginEnd = waveLength - width; - points[npoints-1].x -= marginEnd; - switch(getSlope(winx, npoints-1, ww)) { - case UNDERCURL_SLOPE_TOP_CAP: - points[npoints-1].y += marginEnd; - break; - case UNDERCURL_SLOPE_BOTTOM_CAP: - points[npoints-1].y -= marginEnd; - break; - default: - break; - } - } - - // Draw the lines - XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints, - CoordModeOrigin); - - // Draw a second underline with an offset of 1 pixel - if ( ((win.ch / (widthThreshold/2)) % 2)) { - for (int i = 0; i < npoints; i++) - points[i].x++; - - XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, - npoints, CoordModeOrigin); - } - - // Free resources - free(points); - } -#endif - } - - XFreeGC(xw.dpy, ugc); - #elif VERTCENTER_PATCH - XftDrawRect(xw.draw, fg, winx, winy + win.cyo + dc.font.ascent * chscale + 1, - width, 1); - #else - XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1, - width, 1); - #endif // UNDERCURL_PATCH | VERTCENTER_PATCH - } - - if (base.mode & ATTR_STRUCK) { - #if VERTCENTER_PATCH - XftDrawRect(xw.draw, fg, winx, winy + win.cyo + 2 * dc.font.ascent * chscale / 3, - width, 1); - #else - XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3, - width, 1); - #endif // VERTCENTER_PATCH - } - #if WIDE_GLYPHS_PATCH - } - #endif // WIDE_GLYPHS_PATCH - - #if OPENURLONCLICK_PATCH - if (url_draw && y >= url_y1 && y <= url_y2) { - int x1 = (y == url_y1) ? url_x1 : 0; - int x2 = (y == url_y2) ? MIN(url_x2, term.col-1) : url_maxcol; - if (x + charlen > x1 && x <= x2) { - int xu = MAX(x, x1); - int wu = (x2 - xu + 1) * win.cw; - #if ANYSIZE_PATCH - xu = win.hborderpx + xu * win.cw; - #else - xu = borderpx + xu * win.cw; - #endif // ANYSIZE_PATCH - #if VERTCENTER_PATCH - XftDrawRect(xw.draw, fg, xu, winy + win.cyo + dc.font.ascent * chscale + 2, wu, 1); - #else - XftDrawRect(xw.draw, fg, xu, winy + dc.font.ascent * chscale + 2, wu, 1); - #endif // VERTCENTER_PATCH - url_draw = (y != url_y2 || x + charlen <= x2); - } - } - #endif // OPENURLONCLICK_PATCH - - /* 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); - #if WIDE_GLYPHS_PATCH - xdrawglyphfontspecs(&spec, g, numspecs, x, y, DRAW_BG | DRAW_FG); - #else - xdrawglyphfontspecs(&spec, g, numspecs, x, y); - #endif // WIDE_GLYPHS_PATCH -} - -void -#if LIGATURES_PATCH -xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len) -#else -xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) -#endif // LIGATURES_PATCH -{ - Color drawcol; - #if DYNAMIC_CURSOR_COLOR_PATCH - XRenderColor colbg; - #endif // DYNAMIC_CURSOR_COLOR_PATCH - - /* remove the old cursor */ - if (selected(ox, oy)) - og.mode ^= ATTR_REVERSE; - #if LIGATURES_PATCH - /* Redraw the line where cursor was previously. - * It will restore the ligatures broken by the cursor. */ - xdrawline(line, 0, oy, len); - #else - xdrawglyph(og, ox, oy); - #endif // LIGATURES_PATCH - - #if HIDE_TERMINAL_CURSOR_PATCH - if (IS_SET(MODE_HIDE) || !IS_SET(MODE_FOCUSED)) - return; - #else - if (IS_SET(MODE_HIDE)) - return; - #endif // HIDE_TERMINAL_CURSOR_PATCH - - /* - * Select the right color for the right mode. - */ - #if BOXDRAW_PATCH - g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW; - #else - g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE; - #endif // BOXDRAW_PATCH - - 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; - } - #if !DYNAMIC_CURSOR_COLOR_PATCH - else { - g.fg = defaultbg; - g.bg = defaultcs; - } - - drawcol = dc.col[g.bg]; - #else - else if (!(og.mode & ATTR_REVERSE)) { - unsigned int tmpcol = g.bg; - g.bg = g.fg; - g.fg = tmpcol; - } - - if (IS_TRUECOL(g.bg)) { - colbg.alpha = 0xffff; - colbg.red = TRUERED(g.bg); - colbg.green = TRUEGREEN(g.bg); - colbg.blue = TRUEBLUE(g.bg); - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &drawcol); - } else - drawcol = dc.col[g.bg]; - #endif // DYNAMIC_CURSOR_COLOR_PATCH - } - - /* draw the new one */ - if (IS_SET(MODE_FOCUSED)) { - switch (win.cursor) { - #if !BLINKING_CURSOR_PATCH - case 7: /* st extension */ - g.u = 0x2603; /* snowman (U+2603) */ - /* FALLTHROUGH */ - #endif // BLINKING_CURSOR_PATCH - case 0: /* Blinking block */ - case 1: /* Blinking block (default) */ - #if BLINKING_CURSOR_PATCH - if (IS_SET(MODE_BLINK)) - break; - /* FALLTHROUGH */ - #endif // BLINKING_CURSOR_PATCH - case 2: /* Steady block */ - xdrawglyph(g, cx, cy); - break; - case 3: /* Blinking underline */ - #if BLINKING_CURSOR_PATCH - if (IS_SET(MODE_BLINK)) - break; - /* FALLTHROUGH */ - #endif // BLINKING_CURSOR_PATCH - case 4: /* Steady underline */ - #if ANYSIZE_PATCH - XftDrawRect(xw.draw, &drawcol, - win.hborderpx + cx * win.cw, - win.vborderpx + (cy + 1) * win.ch - \ - cursorthickness, - win.cw, cursorthickness); - #else - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - \ - cursorthickness, - win.cw, cursorthickness); - #endif // ANYSIZE_PATCH - break; - case 5: /* Blinking bar */ - #if BLINKING_CURSOR_PATCH - if (IS_SET(MODE_BLINK)) - break; - /* FALLTHROUGH */ - #endif // BLINKING_CURSOR_PATCH - case 6: /* Steady bar */ - XftDrawRect(xw.draw, &drawcol, - #if ANYSIZE_PATCH - win.hborderpx + cx * win.cw, - win.vborderpx + cy * win.ch, - #else - borderpx + cx * win.cw, - borderpx + cy * win.ch, - #endif // ANYSIZE_PATCH - cursorthickness, win.ch); - break; - #if BLINKING_CURSOR_PATCH - case 7: /* Blinking st cursor */ - if (IS_SET(MODE_BLINK)) - break; - /* FALLTHROUGH */ - case 8: /* Steady st cursor */ - g.u = stcursor; - xdrawglyph(g, cx, cy); - break; - #endif // BLINKING_CURSOR_PATCH - } - } else { - XftDrawRect(xw.draw, &drawcol, - #if ANYSIZE_PATCH - win.hborderpx + cx * win.cw, - win.vborderpx + cy * win.ch, - #else - borderpx + cx * win.cw, - borderpx + cy * win.ch, - #endif // ANYSIZE_PATCH - win.cw - 1, 1); - XftDrawRect(xw.draw, &drawcol, - #if ANYSIZE_PATCH - win.hborderpx + cx * win.cw, - win.vborderpx + cy * win.ch, - #else - borderpx + cx * win.cw, - borderpx + cy * win.ch, - #endif // ANYSIZE_PATCH - 1, win.ch - 1); - XftDrawRect(xw.draw, &drawcol, - #if ANYSIZE_PATCH - win.hborderpx + (cx + 1) * win.cw - 1, - win.vborderpx + cy * win.ch, - #else - borderpx + (cx + 1) * win.cw - 1, - borderpx + cy * win.ch, - #endif // ANYSIZE_PATCH - 1, win.ch - 1); - XftDrawRect(xw.draw, &drawcol, - #if ANYSIZE_PATCH - win.hborderpx + cx * win.cw, - win.vborderpx + (cy + 1) * win.ch - 1, - #else - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - 1, - #endif // ANYSIZE_PATCH - win.cw, 1); - } -} - -void -xsetenv(void) -{ - char buf[sizeof(long) * 8 + 1]; - - snprintf(buf, sizeof(buf), "%lu", xw.win); - setenv("WINDOWID", buf, 1); -} - -void -xseticontitle(char *p) -{ - XTextProperty prop; - DEFAULT(p, opt_title); - - if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, - &prop) != Success) - return; - XSetWMIconName(xw.dpy, xw.win, &prop); - XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmiconname); - XFree(prop.value); -} - -#if CSI_22_23_PATCH -void -xsettitle(char *p, int pop) -{ - XTextProperty prop; - - free(titlestack[tstki]); - if (pop) { - titlestack[tstki] = NULL; - tstki = (tstki - 1 + TITLESTACKSIZE) % TITLESTACKSIZE; - p = titlestack[tstki] ? titlestack[tstki] : opt_title; - } else if (p) { - titlestack[tstki] = xstrdup(p); - } else { - titlestack[tstki] = NULL; - p = opt_title; - } - - if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, - &prop) != Success) - return; - XSetWMName(xw.dpy, xw.win, &prop); - XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname); - XFree(prop.value); -} - -void -xpushtitle(void) -{ - int tstkin = (tstki + 1) % TITLESTACKSIZE; - - free(titlestack[tstkin]); - titlestack[tstkin] = titlestack[tstki] ? xstrdup(titlestack[tstki]) : NULL; - tstki = tstkin; -} - -void -xfreetitlestack(void) -{ - for (int i = 0; i < LEN(titlestack); i++) { - free(titlestack[i]); - titlestack[i] = NULL; - } -} -#else -void -xsettitle(char *p) -{ - XTextProperty prop; - DEFAULT(p, opt_title); - - if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, - &prop) != Success) - return; - XSetWMName(xw.dpy, xw.win, &prop); - XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname); - XFree(prop.value); -} -#endif // CSI_22_23_PATCH - -int -xstartdraw(void) -{ - #if W3M_PATCH - if (IS_SET(MODE_VISIBLE)) - XCopyArea(xw.dpy, xw.win, xw.buf, dc.gc, 0, 0, win.w, win.h, 0, 0); - #endif // W3M_PATCH - return IS_SET(MODE_VISIBLE); -} - -void -xdrawline(Line line, int x1, int y1, int x2) -{ - int i, x, ox, numspecs; - #if WIDE_GLYPHS_PATCH - int numspecs_cached; - #endif // WIDE_GLYPHS_PATCH - Glyph base, new; - #if WIDE_GLYPHS_PATCH - XftGlyphFontSpec *specs; - - numspecs_cached = xmakeglyphfontspecs(xw.specbuf, &line[x1], x2 - x1, x1, y1); - - /* Draw line in 2 passes: background and foreground. This way wide glyphs - won't get truncated (#223) */ - for (int dmode = DRAW_BG; dmode <= DRAW_FG; dmode <<= 1) { - specs = xw.specbuf; - numspecs = numspecs_cached; - i = ox = 0; - for (x = x1; x < x2 && i < numspecs; x++) { - new = line[x]; - #if VIM_BROWSE_PATCH - historyOverlay(x, y1, &new); - #endif // VIM_BROWSE_PATCH - 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, dmode); - specs += i; - numspecs -= i; - i = 0; - } - if (i == 0) { - ox = x; - base = new; - } - i++; - } - if (i > 0) - xdrawglyphfontspecs(specs, base, i, ox, y1, dmode); - } - #else - 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 VIM_BROWSE_PATCH - historyOverlay(x, y1, &new); - #endif // VIM_BROWSE_PATCH - 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); - #endif // WIDE_GLYPHS_PATCH -} - -void -xfinishdraw(void) -{ - #if SIXEL_PATCH - ImageList *im; - XGCValues gcvalues; - GC gc; - #endif // SIXEL_PATCH - - #if SIXEL_PATCH - for (im = term.images; im; im = im->next) { - if (term.images == NULL) { - /* last image was deleted, bail out */ - break; - } - - if (im->should_delete) { - delete_image(im); - - /* prevent the next iteration from accessing an invalid image pointer */ - im = term.images; - if (im == NULL) { - break; - } else { - continue; - } - } - - if (!im->pixmap) { - im->pixmap = (void *)XCreatePixmap(xw.dpy, xw.win, im->width, im->height, - #if ALPHA_PATCH - xw.depth - #else - DefaultDepth(xw.dpy, xw.scr) - #endif // ALPHA_PATCH - ); - XImage ximage = { - .format = ZPixmap, - .data = (char *)im->pixels, - .width = im->width, - .height = im->height, - .xoffset = 0, - .byte_order = LSBFirst, - .bitmap_bit_order = MSBFirst, - .bits_per_pixel = 32, - .bytes_per_line = im->width * 4, - .bitmap_unit = 32, - .bitmap_pad = 32, - #if ALPHA_PATCH - .depth = xw.depth - #else - .depth = 24 - #endif // ALPHA_PATCH - }; - XPutImage(xw.dpy, (Drawable)im->pixmap, dc.gc, &ximage, 0, 0, 0, 0, im->width, im->height); - free(im->pixels); - im->pixels = NULL; - } - - memset(&gcvalues, 0, sizeof(gcvalues)); - gc = XCreateGC(xw.dpy, xw.win, 0, &gcvalues); - - #if ANYSIZE_PATCH - XCopyArea(xw.dpy, (Drawable)im->pixmap, xw.buf, gc, 0, 0, im->width, im->height, win.hborderpx + im->x * win.cw, win.vborderpx + im->y * win.ch); - #else - XCopyArea(xw.dpy, (Drawable)im->pixmap, xw.buf, gc, 0, 0, im->width, im->height, borderpx + im->x * win.cw, borderpx + im->y * win.ch); - #endif // ANYSIZE_PATCH - XFreeGC(xw.dpy, gc); - - } - #endif // SIXEL_PATCH - - #if !SINGLE_DRAWABLE_BUFFER_PATCH - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w, win.h, 0, 0); - #endif // SINGLE_DRAWABLE_BUFFER_PATCH - 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) -{ - #if ST_EMBEDDER_PATCH - if (embed == ev->xunmap.window) { - embed = 0; - XRaiseWindow(xw.dpy, xw.win); - XSetInputFocus(xw.dpy, xw.win, RevertToParent, CurrentTime); - } - #endif // ST_EMBEDDER_PATCH - win.mode &= ~MODE_VISIBLE; -} - -void -xsetpointermotion(int set) -{ - #if HIDECURSOR_PATCH - if (!set && !xw.pointerisvisible) - return; - #endif // HIDECURSOR_PATCH - #if OPENURLONCLICK_PATCH - set = 1; /* keep MotionNotify event enabled */ - #endif // OPENURLONCLICK_PATCH - 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 SWAPMOUSE_PATCH - if ((flags & MODE_MOUSE) - #if HIDECURSOR_PATCH - && xw.pointerisvisible - #endif // HIDECURSOR_PATCH - ) { - if (win.mode & MODE_MOUSE) - XUndefineCursor(xw.dpy, xw.win); - else - #if HIDECURSOR_PATCH - XDefineCursor(xw.dpy, xw.win, xw.vpointer); - #else - XDefineCursor(xw.dpy, xw.win, cursor); - #endif // HIDECURSOR_PATCH - } - #elif OPENURLONCLICK_PATCH - if (win.mode & MODE_MOUSE && xw.pointerisvisible) - XDefineCursor(xw.dpy, xw.win, xw.vpointer); - #endif // SWAPMOUSE_PATCH - if ((win.mode & MODE_REVERSE) != (mode & MODE_REVERSE)) - redraw(); -} - -int -xsetcursor(int cursor) -{ - #if BLINKING_CURSOR_PATCH - if (!BETWEEN(cursor, 0, 8)) /* 7-8: st extensions */ - #else - if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */ - #endif // BLINKING_CURSOR_PATCH - return 1; - #if DEFAULT_CURSOR_PATCH - #if BLINKING_CURSOR_PATCH - win.cursor = (cursor ? cursor : cursorstyle); - #else - win.cursor = (cursor ? cursor : cursorshape); - #endif // BLINKING_CURSOR_PATCH - #else - win.cursor = cursor; - #endif // DEFAULT_CURSOR_PATCH - #if BLINKING_CURSOR_PATCH - cursorblinks = win.cursor == 0 || win.cursor == 1 || - win.cursor == 3 || win.cursor == 5 || - win.cursor == 7; - #endif // BLINKING_CURSOR_PATCH - 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); - #if VISUALBELL_1_PATCH - if (!bellon) /* turn visual bell on */ - bellon = 1; - #endif // VISUALBELL_1_PATCH -} - -void -focus(XEvent *ev) -{ - XFocusChangeEvent *e = &ev->xfocus; - - #if ST_EMBEDDER_PATCH - if (embed && ev->type == FocusIn) { - XRaiseWindow(xw.dpy, embed); - XSetInputFocus(xw.dpy, embed, RevertToParent, CurrentTime); - sendxembed(XEMBED_FOCUS_IN, XEMBED_FOCUS_CURRENT, 0, 0); - sendxembed(XEMBED_WINDOW_ACTIVATE, 0, 0, 0); - } - #endif // ST_EMBEDDER_PATCH - - 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); - #if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH - if (!focused) { - focused = 1; - xloadcols(); - tfulldirt(); - } - #endif // ALPHA_FOCUS_HIGHLIGHT_PATCH - } else { - if (xw.ime.xic) - XUnsetICFocus(xw.ime.xic); - win.mode &= ~MODE_FOCUSED; - if (IS_SET(MODE_FOCUS)) - ttywrite("\033[O", 3, 0); - #if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH - if (focused) { - focused = 0; - xloadcols(); - tfulldirt(); - } - #endif // ALPHA_FOCUS_HIGHLIGHT_PATCH - } -} - -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 = NoSymbol; - char buf[64], *customkey; - int len, screen; - Rune c; - Status status; - Shortcut *bp; - - #if HIDECURSOR_PATCH - if (xw.pointerisvisible) { - #if OPENURLONCLICK_PATCH - #if ANYSIZE_PATCH - int x = e->x - win.hborderpx; - int y = e->y - win.vborderpx; - #else - int x = e->x - borderpx; - int y = e->y - borderpx; - #endif // ANYSIZE_PATCH - LIMIT(x, 0, win.tw - 1); - LIMIT(y, 0, win.th - 1); - if (!detecturl(x / win.cw, y / win.ch, 0)) { - XDefineCursor(xw.dpy, xw.win, xw.bpointer); - xsetpointermotion(1); - xw.pointerisvisible = 0; - } - #else - XDefineCursor(xw.dpy, xw.win, xw.bpointer); - xsetpointermotion(1); - xw.pointerisvisible = 0; - #endif // OPENURLONCLICK_PATCH - } - #endif // HIDECURSOR_PATCH - - if (IS_SET(MODE_KBDLOCK)) - return; - - if (xw.ime.xic) { - len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status); - if (status == XBufferOverflow) - return; - } else { - len = XLookupString(e, buf, sizeof buf, &ksym, NULL); - } - #if KEYBOARDSELECT_PATCH - if ( IS_SET(MODE_KBDSELECT) ) { - if ( match(XK_NO_MOD, e->state) || - (XK_Shift_L | XK_Shift_R) & e->state ) - win.mode ^= trt_kbdselect(ksym, buf, len); - return; - } - #endif // KEYBOARDSELECT_PATCH - #if VIM_BROWSE_PATCH - if (IS_SET(MODE_NORMAL)) { - if (kPressHist(buf, len, match(ControlMask, e->state), &ksym) - == finish) normalMode(); - return; - } - #endif // VIM_BROWSE_PATCH - - screen = tisaltscr() ? S_ALT : S_PRI; - - /* 1. shortcuts */ - for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { - if (ksym == bp->keysym && match(bp->mod, e->state) && - (!bp->screen || bp->screen == screen)) { - 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 ST_EMBEDDER_PATCH - XWindowChanges wc; - #endif // ST_EMBEDDER_PATCH - - #if BACKGROUND_IMAGE_PATCH - if (pseudotransparency) { - if (e->xconfigure.width == win.w && - e->xconfigure.height == win.h && - e->xconfigure.x == win.x && e->xconfigure.y == win.y) - return; - updatexy(); - } else - #endif // BACKGROUND_IMAGE_PATCH - if (e->xconfigure.width == win.w && e->xconfigure.height == win.h) - return; - - #if ST_EMBEDDER_PATCH - if (embed) { - wc.width = e->xconfigure.width; - wc.height = e->xconfigure.height; - XConfigureWindow(xw.dpy, embed, CWWidth | CWHeight, &wc); - } - #endif // ST_EMBEDDER_PATCH - - 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 SYNC_PATCH - if (XPending(xw.dpy) || ttyread_pending()) - #else - if (XPending(xw.dpy)) - #endif // SYNC_PATCH - 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 SYNC_PATCH - int ttyin = FD_ISSET(ttyfd, &rfd) || ttyread_pending(); - if (ttyin) - ttyread(); - #else - if (FD_ISSET(ttyfd, &rfd)) - ttyread(); - #endif // SYNC_PATCH - - 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 SYNC_PATCH - if (ttyin || xev) - #else - if (FD_ISSET(ttyfd, &rfd) || xev) - #endif // SYNC_PATCH - { - if (!drawing) { - trigger = now; - #if BLINKING_CURSOR_PATCH - if (IS_SET(MODE_BLINK)) { - win.mode ^= MODE_BLINK; - } - lastblink = now; - #endif // BLINKING_CURSOR_PATCH - drawing = 1; - } - timeout = (maxlatency - TIMEDIFF(now, trigger)) \ - / maxlatency * minlatency; - if (timeout > 0) - continue; /* we have time, try to find idle */ - } - - #if SYNC_PATCH - if (tinsync(su_timeout)) { - /* - * on synchronized-update draw-suspension: don't reset - * drawing so that we draw ASAP once we can (just after - * ESU). it won't be too soon because we already can - * draw now but we skip. we set timeout > 0 to draw on - * SU-timeout even without new content. - */ - timeout = minlatency; - continue; - } - #endif // SYNC_PATCH - - /* idle detected or maxlatency exhausted -> draw */ - timeout = -1; - #if BLINKING_CURSOR_PATCH - if (blinktimeout && (cursorblinks || tattrset(ATTR_BLINK))) - #else - if (blinktimeout && tattrset(ATTR_BLINK)) - #endif // BLINKING_CURSOR_PATCH - { - 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; - } - } - - #if VISUALBELL_1_PATCH - if (bellon) { - bellon++; - bellon %= 3; - MODBIT(win.mode, !IS_SET(MODE_REVERSE), MODE_REVERSE); - redraw(); - } - else - draw(); - #else - draw(); - #endif // VISUALBELL_1_PATCH - XFlush(xw.dpy); - drawing = 0; - } -} - -void -usage(void) -{ - die("usage: %s [-aiv] [-c class]" - #if WORKINGDIR_PATCH - " [-d path]" - #endif // WORKINGDIR_PATCH - " [-f font] [-g geometry]" - " [-n name] [-o file]\n" - " [-T title] [-t title] [-w windowid]" - " [[-e] command [args ...]]\n" - " %s [-aiv] [-c class]" - #if WORKINGDIR_PATCH - " [-d path]" - #endif // WORKINGDIR_PATCH - " [-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; - #if BLINKING_CURSOR_PATCH - xsetcursor(cursorstyle); - #else - xsetcursor(cursorshape); - #endif // BLINKING_CURSOR_PATCH - - ARGBEGIN { - case 'a': - allowaltscreen = 0; - break; - #if ALPHA_PATCH - case 'A': - opt_alpha = EARGF(usage()); - break; - #endif // ALPHA_PATCH - case 'c': - opt_class = EARGF(usage()); - break; - #if WORKINGDIR_PATCH - case 'd': - opt_dir = EARGF(usage()); - break; - #endif // WORKINGDIR_PATCH - 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(""); - #if XRESOURCES_PATCH && XRESOURCES_RELOAD_PATCH || BACKGROUND_IMAGE_PATCH && BACKGROUND_IMAGE_RELOAD_PATCH - signal(SIGUSR1, sigusr1_reload); - #endif // XRESOURCES_RELOAD_PATCH | BACKGROUND_IMAGE_RELOAD_PATCH - #if XRESOURCES_PATCH - if (!(xw.dpy = XOpenDisplay(NULL))) - die("Can't open display\n"); - - config_init(xw.dpy); - #endif // XRESOURCES_PATCH - cols = MAX(cols, 1); - rows = MAX(rows, 1); - #if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH - defaultbg = MAX(LEN(colorname), 256); - #endif // ALPHA_FOCUS_HIGHLIGHT_PATCH - tnew(cols, rows); - xinit(cols, rows); - #if BACKGROUND_IMAGE_PATCH - bginit(); - #endif // BACKGROUND_IMAGE_PATCH - xsetenv(); - selinit(); - #if WORKINGDIR_PATCH - if (opt_dir && chdir(opt_dir)) - die("Can't change to working directory %s\n", opt_dir); - #endif // WORKINGDIR_PATCH - run(); - - return 0; -}