Browse Source

flexipatch

master
Ivan Polyakov 3 years ago
parent
commit
9d756be6ae
  1. 6
      .gitignore
  2. 4
      FAQ
  3. 33
      Makefile
  4. 278
      README.md
  5. 0
      README.st
  6. 317
      config.def.h
  7. 43
      config.mk
  8. 143
      hb.c
  9. 6
      hb.h
  10. 192
      patch/boxdraw.c
  11. 214
      patch/boxdraw.h
  12. 180
      patch/copyurl.c
  13. 5
      patch/copyurl.h
  14. 76
      patch/externalpipe.c
  15. 4
      patch/externalpipe.h
  16. 813
      patch/fixkeyboardinput.c
  17. 94
      patch/font2.c
  18. 2
      patch/font2.h
  19. 21
      patch/invert.c
  20. 1
      patch/invert.h
  21. 21
      patch/iso14755.c
  22. 6
      patch/iso14755.h
  23. 222
      patch/keyboardselect_st.c
  24. 2
      patch/keyboardselect_st.h
  25. 7
      patch/keyboardselect_x.c
  26. 2
      patch/keyboardselect_x.h
  27. 686
      patch/netwmicon.h
  28. 30
      patch/newterm.c
  29. 2
      patch/newterm.h
  30. 284
      patch/normalMode.c
  31. 8
      patch/normalMode.h
  32. 19
      patch/opencopied.c
  33. 1
      patch/opencopied.h
  34. 59
      patch/openurlonclick.c
  35. 1
      patch/openurlonclick.h
  36. 19
      patch/rightclicktoplumb_st.c
  37. 1
      patch/rightclicktoplumb_st.h
  38. 24
      patch/rightclicktoplumb_x.c
  39. 1
      patch/rightclicktoplumb_x.h
  40. 39
      patch/scrollback.c
  41. 17
      patch/scrollback.h
  42. 42
      patch/sixel_st.c
  43. 2
      patch/sixel_st.h
  44. 14
      patch/sixel_x.c
  45. 50
      patch/st_embedder_x.c
  46. 7
      patch/st_embedder_x.h
  47. 34
      patch/st_include.c
  48. 34
      patch/st_include.h
  49. 31
      patch/sync.c
  50. 7
      patch/sync.h
  51. 5
      patch/universcroll.c
  52. 1
      patch/universcroll.h
  53. 23
      patch/utils.h
  54. 34
      patch/x_include.c
  55. 34
      patch/x_include.h
  56. 79
      patch/xresources.c
  57. 21
      patch/xresources.h
  58. 436
      patches.def.h
  59. 11
      patches/vilor-config.diff
  60. 616
      sixel.c
  61. 58
      sixel.h
  62. 115
      sixel_hls.c
  63. 7
      sixel_hls.h
  64. 1022
      st.c
  65. 245
      st.h
  66. 14
      st.info
  67. 17
      win.h
  68. 1733
      x.c

6
.gitignore vendored

@ -7,8 +7,4 @@ st
# generated files # generated files
config.h config.h
patches.h
# patch
*.unpatched
*.orig
*.rej

4
FAQ

@ -29,8 +29,8 @@ you can manually run `tic -sx st.info`.
## I would like to have utmp and/or scroll functionality by default ## 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 You can add the absolute patch of both programs in your config.h
have to modify the value of utmp and scroll variables. file. You only have to modify the value of utmp and scroll variables.
## Why doesn't the Del key work in some programs? ## Why doesn't the Del key work in some programs?

33
Makefile

@ -4,7 +4,7 @@
include config.mk include config.mk
SRC = st.c x.c SRC = st.c x.c $(LIGATURES_C) $(SIXEL_C)
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
all: options st all: options st
@ -15,27 +15,30 @@ options:
@echo "LDFLAGS = $(STLDFLAGS)" @echo "LDFLAGS = $(STLDFLAGS)"
@echo "CC = $(CC)" @echo "CC = $(CC)"
config.h: patch config.h:
cp config.def.h $@ cp config.def.h $@
patches.h:
cp patches.def.h $@
.c.o: .c.o:
$(CC) $(STCFLAGS) -c $< $(CC) $(STCFLAGS) -c $<
st.o: config.h st.h win.h st.o: config.h st.h win.h
x.o: arg.h config.h st.h win.h x.o: arg.h config.h st.h win.h $(LIGATURES_H)
$(OBJ): config.h config.mk $(OBJ): config.h config.mk patches.h
st: $(OBJ) st: $(OBJ)
$(CC) -o $@ $(OBJ) $(STLDFLAGS) $(CC) -o $@ $(OBJ) $(STLDFLAGS)
clean: restore clean:
rm -f st $(OBJ) st-$(VERSION).tar.gz config.h *.rej *.orig rm -f st $(OBJ) st-$(VERSION).tar.gz config.h patches.h
dist: clean dist: clean
mkdir -p st-$(VERSION) mkdir -p st-$(VERSION)
cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\ cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
config.def.h st.info st.1 arg.h st.h win.h $(SRC)\ config.def.h st.info st.1 arg.h st.h win.h $(LIGATURES_H) $(SRC)\
st-$(VERSION) st-$(VERSION)
tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
rm -rf st-$(VERSION) rm -rf st-$(VERSION)
@ -48,21 +51,13 @@ install: st
sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1 sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1 chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
tic -sx st.info 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. @echo Please see the README file regarding the terminfo entry of st.
uninstall: uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/st rm -f $(DESTDIR)$(PREFIX)/bin/st
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1 rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
rm -f $(DESTDIR)$(PREFIX)/share/applications/st.desktop # desktop-entry patch
backup: .PHONY: all options clean dist install uninstall
find . -iname '*.[ch]' -exec sh -c 'cp $$0 $$0.backup' {} \;
restore:
find . -iname '*.backup' \
-exec sh -c 'mv $$0 "$${0%.backup}"' {} \;
patch: backup
find ${PATCHESDIR} -iname '*.diff' -exec sh -c 'patch < $$0' {} \;
.PHONY: all options clean dist install uninstall backup patch restore

278
README.md

@ -0,0 +1,278 @@
Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.8.4 (2f6e597, 2021-08-24) 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:
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
- [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 eading 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~
- [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
- [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
- [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

0
README → README.st

317
config.def.h

@ -5,8 +5,26 @@
* *
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/ */
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; static char *font = "Liberation Mono:pixelsize=20: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 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; static int borderpx = 2;
#endif // RELATIVEBORDER_PATCH
#if OPENURLONCLICK_PATCH
static char *url_opener = "xdg-open";
#endif // OPENURLONCLICK_PATCH
/* /*
* What program is execed by st depends of these precedence rules: * What program is execed by st depends of these precedence rules:
@ -23,7 +41,11 @@ char *scroll = NULL;
char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
/* identification sequence returned in DA and DECID */ /* identification sequence returned in DA and DECID */
#if SIXEL_PATCH
char *vtiden = "\033[?12;4c";
#else
char *vtiden = "\033[?6c"; char *vtiden = "\033[?6c";
#endif
/* Kerning / character bounding-box multipliers */ /* Kerning / character bounding-box multipliers */
static float cwscale = 1.0; static float cwscale = 1.0;
@ -56,6 +78,14 @@ int allowwindowops = 0;
static double minlatency = 8; static double minlatency = 8;
static double maxlatency = 33; 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 * blinking timeout (set to 0 to disable blinking) for the terminal blinking
* attribute. * attribute.
@ -67,6 +97,20 @@ static unsigned int blinktimeout = 800;
*/ */
static unsigned int cursorthickness = 2; 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 * bell volume. It must be a value between -100 and 100. Use 0 for disabling
* it * it
@ -93,6 +137,18 @@ char *termname = "st-256color";
*/ */
unsigned int tabspaces = 8; 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) */ /* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = { static const char *colorname[] = {
/* 8 normal colors */ /* 8 normal colors */
@ -118,10 +174,10 @@ static const char *colorname[] = {
[255] = 0, [255] = 0,
/* more colors can be added after 255 to use with DefaultXX */ /* more colors can be added after 255 to use with DefaultXX */
"#cccccc", "#add8e6", /* 256 -> cursor */
"#555555", "#555555", /* 257 -> rev cursor*/
"gray90", /* default foreground colour */ "#000000", /* 258 -> bg */
"black", /* default background colour */ "#e5e5e5", /* 259 -> fg */
}; };
@ -129,11 +185,51 @@ static const char *colorname[] = {
* Default colors (colorname index) * Default colors (colorname index)
* foreground, background, cursor, reverse cursor * foreground, background, cursor, reverse cursor
*/ */
unsigned int defaultfg = 258; #if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
unsigned int defaultbg = 259; 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 defaultcs = 256;
static unsigned int defaultrcs = 257; 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 * Default shape of cursor
* 2: Block ("") * 2: Block ("")
@ -142,6 +238,7 @@ static unsigned int defaultrcs = 257;
* 7: Snowman ("") * 7: Snowman ("")
*/ */
static unsigned int cursorshape = 2; static unsigned int cursorshape = 2;
#endif // BLINKING_CURSOR_PATCH
/* /*
* Default columns and rows numbers * Default columns and rows numbers
@ -150,12 +247,19 @@ static unsigned int cursorshape = 2;
static unsigned int cols = 80; static unsigned int cols = 80;
static unsigned int rows = 24; 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 * Default colour and shape of the mouse cursor
*/ */
static unsigned int mouseshape = XC_xterm; static unsigned int mouseshape = XC_xterm;
static unsigned int mousefg = 7; static unsigned int mousefg = 7;
static unsigned int mousebg = 0; static unsigned int mousebg = 0;
#endif // THEMED_CURSOR_PATCH
/* /*
* Color used to display font attributes when fontconfig selected a font which * Color used to display font attributes when fontconfig selected a font which
@ -163,6 +267,54 @@ static unsigned int mousebg = 0;
*/ */
static unsigned int defaultattr = 11; 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). * 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 * Note that if you want to use ShiftMask with selmasks, set this to an other
@ -175,32 +327,105 @@ static uint forcemousemod = ShiftMask;
* Beware that overloading Button1 will disable the selection. * Beware that overloading Button1 will disable the selection.
*/ */
static MouseShortcut mshortcuts[] = { static MouseShortcut mshortcuts[] = {
#if UNIVERSCROLL_PATCH
/* mask button function argument release alt */
#else
/* mask button function argument release */ /* mask button function argument release */
#endif // UNIVERSCROLL_PATCH
#if CLIPBOARD_PATCH
{ XK_ANY_MOD, Button2, clippaste, {.i = 0}, 1 },
#else
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
#endif // CLIPBOARD_PATCH
#if SCROLLBACK_MOUSE_PATCH
{ ShiftMask, Button4, kscrollup, {.i = 1} },
{ ShiftMask, Button5, kscrolldown, {.i = 1} },
#elif UNIVERSCROLL_PATCH
{ XK_ANY_MOD, Button4, ttysend, {.s = "\033[5;2~"}, 0, -1 },
{ XK_ANY_MOD, Button5, ttysend, {.s = "\033[6;2~"}, 0, -1 },
#else
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
#endif // SCROLLBACK_MOUSE_PATCH
#if SCROLLBACK_MOUSE_ALTSCREEN_PATCH
{ XK_NO_MOD, Button4, kscrollup, {.i = 1} },
{ XK_NO_MOD, Button5, kscrolldown, {.i = 1} },
#else
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
#endif // SCROLLBACK_MOUSE_ALTSCREEN_PATCH
};
#if SCROLLBACK_MOUSE_ALTSCREEN_PATCH
static MouseShortcut maltshortcuts[] = {
/* mask button function argument release */
#if CLIPBOARD_PATCH
{ XK_ANY_MOD, Button2, clippaste, {.i = 0}, 1 },
#else
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
#endif // CLIPBOARD_PATCH
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
}; };
#endif // SCROLLBACK_MOUSE_ALTSCREEN_PATCH
/* Internal keyboard shortcuts. */ /* Internal keyboard shortcuts. */
#define MODKEY Mod1Mask #define MODKEY Mod1Mask
#define TERMMOD (ControlMask|ShiftMask) #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 };
#endif // EXTERNALPIPE_PATCH
static Shortcut shortcuts[] = { static Shortcut shortcuts[] = {
/* mask keysym function argument */ /* mask keysym function argument */
{ XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
{ ControlMask, XK_Print, toggleprinter, {.i = 0} }, { ControlMask, XK_Print, toggleprinter, {.i = 0} },
{ ShiftMask, XK_Print, printscreen, {.i = 0} }, { ShiftMask, XK_Print, printscreen, {.i = 0} },
{ XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, { XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
{ TERMMOD, XK_Prior, zoom, {.f = +1} }, { TERMMOD, XK_Prior, zoom, {.f = +1} },
{ TERMMOD, XK_Next, zoom, {.f = -1} }, { TERMMOD, XK_Next, zoom, {.f = -1} },
{ TERMMOD, XK_Home, zoomreset, {.f = 0} }, { TERMMOD, XK_Home, zoomreset, {.f = 0} },
{ TERMMOD, XK_C, clipcopy, {.i = 0} }, { TERMMOD, XK_C, clipcopy, {.i = 0} },
{ TERMMOD, XK_V, clippaste, {.i = 0} }, { TERMMOD, XK_V, clippaste, {.i = 0} },
{ TERMMOD, XK_Y, selpaste, {.i = 0} }, #if SCROLLBACK_PATCH
{ ShiftMask, XK_Insert, selpaste, {.i = 0} }, { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
#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 } },
#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
}; };
/* /*
@ -224,11 +449,13 @@ static Shortcut shortcuts[] = {
* position for a key. * position for a key.
*/ */
#if !FIXKEYBOARDINPUT_PATCH
/* /*
* If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
* to be mapped below, add them to this array. * to be mapped below, add them to this array.
*/ */
static KeySym mappedkeys[] = { -1 }; static KeySym mappedkeys[] = { -1 };
#endif // FIXKEYBOARDINPUT_PATCH
/* /*
* State bits to ignore when matching key or button events. By default, * State bits to ignore when matching key or button events. By default,
@ -236,6 +463,7 @@ static KeySym mappedkeys[] = { -1 };
*/ */
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
#if !FIXKEYBOARDINPUT_PATCH
/* /*
* This is the huge key array which defines all compatibility to the Linux * This is the huge key array which defines all compatibility to the Linux
* world. Please decide about changes wisely. * world. Please decide about changes wisely.
@ -278,7 +506,11 @@ static Key key[] = {
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +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}, { 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_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
@ -346,7 +578,11 @@ static Key key[] = {
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0}, { XK_Delete, ControlMask, "\033[3;5~", +1, 0},
{ XK_Delete, ShiftMask, "\033[2K", -1, 0}, { XK_Delete, ShiftMask, "\033[2K", -1, 0},
{ XK_Delete, ShiftMask, "\033[3;2~", +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}, { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
#endif // DELKEY_PATCH
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, { XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, { XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
@ -452,6 +688,7 @@ static Key key[] = {
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
}; };
#endif // FIXKEYBOARDINPUT_PATCH
/* /*
* Selection types' masks. * Selection types' masks.
@ -472,3 +709,37 @@ static char ascii_printable[] =
" !\"#$%&'()*+,-./0123456789:;<=>?" " !\"#$%&'()*+,-./0123456789:;<=>?"
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
"`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

43
config.mk

@ -1,37 +1,52 @@
# st version # st version
VERSION = 0.8.5 VERSION = 0.8.4
# Customize below to fit your system # Customize below to fit your system
# paths # paths
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man MANPREFIX = $(PREFIX)/share/man
PATCHESDIR = patches
X11INC = /usr/X11R6/include X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib X11LIB = /usr/X11R6/lib
PKG_CONFIG = pkg-config PKG_CONFIG = pkg-config
# includes and libs # 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) \ INCS = -I$(X11INC) \
`$(PKG_CONFIG) --cflags fontconfig` \ `$(PKG_CONFIG) --cflags fontconfig` \
`$(PKG_CONFIG) --cflags freetype2` `$(PKG_CONFIG) --cflags freetype2` \
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ $(LIGATURES_INC)
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft ${XRENDER} ${XCURSOR}\
`$(PKG_CONFIG) --libs fontconfig` \ `$(PKG_CONFIG) --libs fontconfig` \
`$(PKG_CONFIG) --libs freetype2` `$(PKG_CONFIG) --libs freetype2` \
$(LIGATURES_LIBS)
# flags # flags
CFLAGS += -std=c99 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) STLDFLAGS = $(LIBS) $(LDFLAGS)
STLDFLAGS = $(LIBS) $(LDFLAGS)
# OpenBSD: # OpenBSD:
#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE #CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \ #LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
# `$(PKG_CONFIG) --libs fontconfig` \ # `pkg-config --libs fontconfig` \
# `$(PKG_CONFIG) --libs freetype2` # `pkg-config --libs freetype2`
# compiler and linker # compiler and linker
CC = gcc CC = gcc

143
hb.c

@ -0,0 +1,143 @@
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include <X11/Xft/Xft.h>
#include <time.h>
#include <hb.h>
#include <hb-ft.h>
#include "st.h"
void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
hb_font_t *hbfindfont(XftFont *match);
typedef struct {
XftFont *match;
hb_font_t *font;
} HbFontMatch;
static int hbfontslen = 0;
static HbFontMatch *hbfontcache = NULL;
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(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
{
int start = 0, length = 1, gstart = 0;
hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
for (int idx = 1, specidx = 1; idx < len; idx++) {
if (glyphs[idx].mode & ATTR_WDUMMY) {
length += 1;
continue;
}
if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
/* Reset the sequence. */
length = 1;
start = specidx;
gstart = idx;
} else {
length += 1;
}
specidx++;
}
/* EOL. */
hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
/* Apply the transformation to glyph specs. */
for (int i = 0, specidx = 0; i < len; i++) {
if (glyphs[i].mode & ATTR_WDUMMY)
continue;
#if BOXDRAW_PATCH
if (glyphs[i].mode & ATTR_BOXDRAW) {
specidx++;
continue;
}
#endif
if (codepoints[i] != specs[specidx].glyph)
((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
specs[specidx++].glyph = codepoints[i];
}
free(codepoints);
}
void
hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
{
hb_font_t *font = hbfindfont(xfont);
if (font == NULL)
return;
Rune rune;
ushort mode = USHRT_MAX;
hb_buffer_t *buffer = hb_buffer_create();
hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
/* Fill buffer with codepoints. */
for (int i = start; i < (start+length); i++) {
rune = string[i].u;
mode = string[i].mode;
if (mode & ATTR_WDUMMY)
rune = 0x0020;
hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
}
/* Shape the segment. */
hb_shape(font, buffer, NULL, 0);
/* Get new glyph info. */
hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
/* Write new codepoints. */
for (int i = 0; i < length; i++) {
hb_codepoint_t gid = info[i].codepoint;
codepoints[start+i] = gid;
}
/* Cleanup. */
hb_buffer_destroy(buffer);
}

6
hb.h

@ -0,0 +1,6 @@
#include <X11/Xft/Xft.h>
#include <hb.h>
#include <hb-ft.h>
void hbunloadfonts();
void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);

192
patch/boxdraw.c

@ -0,0 +1,192 @@
/*
* Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
* MIT/X Consortium License
*/
#include <X11/Xft/Xft.h>
/* 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);
}
}
}

214
patch/boxdraw.h

@ -0,0 +1,214 @@
/*
* 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) */
};

180
patch/copyurl.c

@ -0,0 +1,180 @@
#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

5
patch/copyurl.h

@ -0,0 +1,5 @@
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

76
patch/externalpipe.c

@ -0,0 +1,76 @@
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

4
patch/externalpipe.h

@ -0,0 +1,4 @@
void externalpipe(const Arg *);
#if EXTERNALPIPEIN_PATCH
void externalpipein(const Arg *);
#endif // EXTERNALPIPEIN_PATCH

813
patch/fixkeyboardinput.c

@ -0,0 +1,813 @@
/*
* 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_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_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},
};

94
patch/font2.c

@ -0,0 +1,94 @@
int
xloadsparefont(FcPattern *pattern, int flags)
{
FcPattern *match;
FcResult result;
match = FcFontMatch(NULL, pattern, &result);
if (!match) {
return 1;
}
if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) {
FcPatternDestroy(match);
return 1;
}
frc[frclen].flags = flags;
/* Believe U+0000 glyph will present in each default font */
frc[frclen].unicodep = 0;
frclen++;
return 0;
}
void
xloadsparefonts(void)
{
FcPattern *pattern;
double sizeshift, fontval;
int fc;
char **fp;
if (frclen != 0)
die("can't embed spare fonts. cache isn't empty");
/* Calculate count of spare fonts */
fc = sizeof(font2) / sizeof(*font2);
if (fc == 0)
return;
/* Allocate memory for cache entries. */
if (frccap < 4 * fc) {
frccap += 4 * fc - frccap;
frc = xrealloc(frc, frccap * sizeof(Fontcache));
}
for (fp = font2; fp - font2 < fc; ++fp) {
if (**fp == '-')
pattern = XftXlfdParse(*fp, False, False);
else
pattern = FcNameParse((FcChar8 *)*fp);
if (!pattern)
die("can't open spare font %s\n", *fp);
if (defaultfontsize > 0) {
sizeshift = usedfontsize - defaultfontsize;
if (sizeshift != 0 &&
FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
FcResultMatch) {
fontval += sizeshift;
FcPatternDel(pattern, FC_PIXEL_SIZE);
FcPatternDel(pattern, FC_SIZE);
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
}
}
FcPatternAddBool(pattern, FC_SCALABLE, 1);
FcConfigSubstitute(NULL, pattern, FcMatchPattern);
XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
if (xloadsparefont(pattern, FRC_NORMAL))
die("can't open spare font %s\n", *fp);
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
if (xloadsparefont(pattern, FRC_ITALIC))
die("can't open spare font %s\n", *fp);
FcPatternDel(pattern, FC_WEIGHT);
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
if (xloadsparefont(pattern, FRC_ITALICBOLD))
die("can't open spare font %s\n", *fp);
FcPatternDel(pattern, FC_SLANT);
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
if (xloadsparefont(pattern, FRC_BOLD))
die("can't open spare font %s\n", *fp);
FcPatternDestroy(pattern);
}
}

2
patch/font2.h

@ -0,0 +1,2 @@
static int xloadsparefont(FcPattern *, int);
static void xloadsparefonts(void);

21
patch/invert.c

@ -0,0 +1,21 @@
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;
}

1
patch/invert.h

@ -0,0 +1 @@
static void invert(const Arg *);

21
patch/iso14755.c

@ -0,0 +1,21 @@
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);
}

6
patch/iso14755.h

@ -0,0 +1,6 @@
#define NUMMAXLEN(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)
/* constants */
#define ISO14755CMD "dmenu -w \"$WINDOWID\" -p codepoint: </dev/null"
void iso14755(const Arg *);

222
patch/keyboardselect_st.c

@ -0,0 +1,222 @@
void set_notifmode(int type, KeySym ksym)
{
static char *lib[] = { " MOVE ", " SEL "};
static Glyph *g, *deb, *fin;
static int col, bot;
if (ksym == -1) {
free(g);
col = term.col, bot = term.bot;
g = xmalloc(col * sizeof(Glyph));
memcpy(g, term.line[bot], col * sizeof(Glyph));
} else if (ksym == -2)
memcpy(term.line[bot], g, col * sizeof(Glyph));
if ( type < 2 ) {
char *z = lib[type];
for (deb = &term.line[bot][col - 6], fin = &term.line[bot][col]; deb < fin; z++, deb++)
deb->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);
}
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);
#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;
}

2
patch/keyboardselect_st.h

@ -0,0 +1,2 @@
void toggle_winmode(int);
int trt_kbdselect(KeySym, char *, int);

7
patch/keyboardselect_x.c

@ -0,0 +1,7 @@
void toggle_winmode(int flag) {
win.mode ^= flag;
}
void keyboard_select(const Arg *dummy) {
win.mode ^= trt_kbdselect(-1, NULL, 0);
}

2
patch/keyboardselect_x.h

@ -0,0 +1,2 @@
void toggle_winmode(int);
void keyboard_select(const Arg *);

686
patch/netwmicon.h

@ -0,0 +1,686 @@
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,
};

30
patch/newterm.c

@ -0,0 +1,30 @@
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);
}

2
patch/newterm.h

@ -0,0 +1,2 @@
void newterm(const Arg *);
static char *getcwd_by_pid(pid_t pid);

284
patch/normalMode.c

@ -0,0 +1,284 @@
#include <X11/keysym.h>
#include <X11/XKBlib.h>
#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 && i<s && mark[i]!=sz && i+mark[i]<s && !mark[i+mark[i]];
}
static void markSearchMatches(int all) {
int sz = size(&searchStr), ox = 0, oy = 0, oi=0;
for (int y=0; sz && all && y<term.row; ++y)
for (int x=0; x<term.col; ++x) term.dirty[y] |= highlighted(x, y);
for (int y = 0, wi=0, owi=0, i=0; sz && y < term.row; ++y)
for (int x=0; x<term.col; ++x, wi%=sz, ++i, owi=wi)
if (all || term.dirty[y]) {
mark[i]=sz-(wi=(getU32(&searchStr,wi,1)==term.line[y][x].u?wi+1:0));
if (wi==1) ox=x, oy=y, oi=i; else if (!wi && owi) x=ox, y=oy, i=oi;
}
for (int y=0; sz &&all &&y<term.row; ++y)
for (int x=0; x<term.col; ++x) term.dirty[y] |= highlighted(x, y);
}
static int findString(int s, int all) {
Pos p = (Pos) {.p={term.c.x, term.c.y, IS_SET(MODE_ALTSCREEN) ? 0 : histOff}};
historyMove(s, 0, 0);
uint32_t strSz=size(&searchStr), maxIter=rows()*term.col+strSz, wIdx=0;
for (uint32_t i=0, wi = 0; wIdx<strSz && ++i<=maxIter; historyMove(s, 0, 0), wi=wIdx) {
wIdx = (getU32(&searchStr, wIdx, s>0)==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; i<e && (x=(!s[i] ? x : kPressHist(&s[i], 1, 0, NULL))); ++i);
return x;
}
static ExitState executeCommand(uint32_t *cs, size_t z) {
ExitState x=success;
char dc [32];
for (size_t i=0; i<z && (x=kPressHist(dc, utf8encode(cs[i],dc),0,NULL));++i);
return x;
}
/// Get character for overlay, if the overlay (st) has something to show, else normal char.
static void getChar(DynamicArray *st, Glyph *glyphChange, int y, int xEnd, int width, int x) {
if (x < xEnd - min(min(width,xEnd), size(st))) *glyphChange = term.line[y][x];
else if (x<xEnd) glyphChange->u = *((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]) && i<term.row; ++i) if (!term.dirty[i]) {
xdrawline(term.line[i], term.c.x, i, term.c.x + 1);
xdrawline(term.line[i], op.p[0], i, op.p[0] + 1);
}
// Update search results either only for lines with new content or all results if exiting
markSearchMatches(exited);
op = (Pos){.p = {term.c.x, term.c.y, 0}};
historyOpToggle(-1, 0);
}

8
patch/normalMode.h

@ -0,0 +1,8 @@
void normalMode();
void historyPreDraw();
void historyOverlay(int x, int y, Glyph* g);
void historyModeToggle(int start);
void historyOpToggle(int, int);
typedef enum {failed=0, success=1, exitMotion=2, exitOp=3, finish=4} ExitState;
ExitState kPressHist(char const *txt, size_t len, int ctrl, KeySym const *kSym);
ExitState pressKeys(char const* s, size_t e);

19
patch/opencopied.c

@ -0,0 +1,19 @@
void
opencopied(const Arg *arg)
{
int res;
size_t const max_cmd = 2048;
char * const clip = xsel.clipboard;
if (!clip) {
fprintf(stderr, "Warning: nothing copied to clipboard\n");
return;
}
/* account for space/quote (3) and \0 (1) and & (1) */
/* e.g.: xdg-open "https://st.suckless.org"& */
size_t const cmd_size = max_cmd + strlen(clip) + 5;
char cmd[cmd_size];
snprintf(cmd, cmd_size, "%s \"%s\"&", (char *)arg->v, clip);
res = system(cmd);
}

1
patch/opencopied.h

@ -0,0 +1 @@
void opencopied(const Arg *);

59
patch/openurlonclick.c

@ -0,0 +1,59 @@
void
openUrlOnClick(int col, int row, char* url_opener)
{
int row_start = row;
int col_start = col;
int row_end = row;
int col_end = col;
if (term.line[row][col].u == ' ')
return;
/* while previous character is not space */
while (term.line[row_start][col_start-1].u != ' ') {
if (col_start == 0)
{
// Before moving start pointer to the previous line we check if it ends with space
if (term.line[row_start - 1][term.col - 1].u == ' ')
break;
col_start=term.col - 1;
row_start--;
} else {
col_start--;
}
}
/* while next character is not space nor end of line */
while (term.line[row_end][col_end].u != ' ') {
col_end++;
if (col_end == term.col - 1)
{
if (term.line[row_end + 1][0].u == ' ')
break;
col_end=0;
row_end++;
}
}
char url[200] = "";
int url_index=0;
do {
url[url_index] = term.line[row_start][col_start].u;
url_index++;
col_start++;
if (col_start == term.col)
{
col_start = 0;
row_start++;
}
} while (url_index < (sizeof(url)-1) &&
(row_start != row_end || col_start != col_end));
if (strncmp("http", url, 4) != 0) {
return;
}
char command[strlen(url_opener)+strlen(url)+2];
sprintf(command, "%s %s", url_opener, url);
system(command);
}

1
patch/openurlonclick.h

@ -0,0 +1 @@
static void openUrlOnClick(int col, int row, char* url_opener);

19
patch/rightclicktoplumb_st.c

@ -0,0 +1,19 @@
#if defined(__OpenBSD__)
#include <sys/sysctl.h>
#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
}

1
patch/rightclicktoplumb_st.h

@ -0,0 +1 @@
int subprocwd(char *);

24
patch/rightclicktoplumb_x.c

@ -0,0 +1,24 @@
#include <sys/wait.h>
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);
}
}

1
patch/rightclicktoplumb_x.h

@ -0,0 +1 @@
void plumb(char *);

39
patch/scrollback.c

@ -0,0 +1,39 @@
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
}
void
kscrollup(const Arg* a)
{
int n = a->i;
if (n < 0)
n = term.row + n;
if (term.scr <= HISTSIZE-n) {
term.scr += n;
selscroll(0, n);
tfulldirt();
}
#if SIXEL_PATCH
scroll_images(n);
#endif // SIXEL_PATCH
}

17
patch/scrollback.h

@ -0,0 +1,17 @@
#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

42
patch/sixel_st.c

@ -0,0 +1,42 @@
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;
}
}
}

2
patch/sixel_st.h

@ -0,0 +1,2 @@
static void dcshandle(void);
static void scroll_images(int n);

14
patch/sixel_x.c

@ -0,0 +1,14 @@
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);
}

50
patch/st_embedder_x.c

@ -0,0 +1,50 @@
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);
}

7
patch/st_embedder_x.h

@ -0,0 +1,7 @@
#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);

34
patch/st_include.c

@ -0,0 +1,34 @@
/* 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 UNIVERSCROLL_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH
#include "universcroll.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

34
patch/st_include.h

@ -0,0 +1,34 @@
/* 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 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 UNIVERSCROLL_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH
#include "universcroll.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

31
patch/sync.c

@ -0,0 +1,31 @@
#include <time.h>
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;
}

7
patch/sync.h

@ -0,0 +1,7 @@
static int su = 0;
static int twrite_aborted = 0;
static void tsync_begin();
static void tsync_end();
int tinsync(uint timeout);
int ttyread_pending();

5
patch/universcroll.c

@ -0,0 +1,5 @@
int
tisaltscr(void)
{
return IS_SET(MODE_ALTSCREEN);
}

1
patch/universcroll.h

@ -0,0 +1 @@
int tisaltscr(void);

23
patch/utils.h

@ -0,0 +1,23 @@
/// 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));
}

34
patch/x_include.c

@ -0,0 +1,34 @@
/* Patches */
#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 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

34
patch/x_include.h

@ -0,0 +1,34 @@
/* Patches */
#if BOXDRAW_PATCH
#include "boxdraw.h"
#endif
#if OPENCOPIED_PATCH
#include "opencopied.h"
#endif
#if FONT2_PATCH
#include "font2.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 OPENURLONCLICK_PATCH
#include "openurlonclick.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

79
patch/xresources.c

@ -0,0 +1,79 @@
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
#if XRESOURCES_RELOAD_PATCH
config_init(Display *dpy)
#else
config_init(void)
#endif // XRESOURCES_RELOAD_PATCH
{
char *resm;
XrmDatabase db;
ResourcePref *p;
XrmInitialize();
#if XRESOURCES_RELOAD_PATCH
resm = XResourceManagerString(dpy);
#else
resm = XResourceManagerString(xw.dpy);
#endif // XRESOURCES_RELOAD_PATCH
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);
if (sig != -1) {
/* Called due to a SIGUSR1 */
xloadcols();
redraw();
}
signal(SIGUSR1, reload_config);
}
#endif // XRESOURCES_RELOAD_PATCH

21
patch/xresources.h

@ -0,0 +1,21 @@
#include <X11/Xresource.h>
/* 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 *);
#if XRESOURCES_RELOAD_PATCH
void config_init(Display *dpy);
#else
void config_init(void);
#endif // XRESOURCES_RELOAD_PATCH

436
patches.def.h

@ -0,0 +1,436 @@
/*
* 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 0
/* 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
/* This patch aims to prevent black bars being drawn on the edges of st terminals using the anysize
* patch. This generally only occurs when the terminal background color doesn't match the colors
* set in st's config.h file, for example when using terminal theming scripts such as base16.
* (I have not found this to be working, but adding for reference. May reduce flickering on
* terminal resizes.)
* https://github.com/connor-brooks/st-anysize-nobar
*/
#define ANYSIZE_NOBAR_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
/* 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 0
/* 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 0
/* 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 0
/* 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
/* 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
/* 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 adds support for OSC escape sequences 10, 11 and 12 that modify the background,
* foreground and cursor colors in the way they are implemented in most other terminals
* (e.g libvte, kitty). Specifically it differs from 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.
* https://st.suckless.org/patches/osc_10_11_12_2/
*/
#define OSC_10_11_12_2_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 0
/* 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 0
/* 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.
* - If combined with the alpha patch sixel graphics disappear (become white)
* when transparent and rendered against a white background. This is believed
* to be related to how the sixel graphics use RGB colors instead of RGBA.
* A pull request or instructions for how to properly add alpha support for
* sixel graphics would be very welcome.
*
* Note that you need to uncomment the corresponding lines in config.mk when including this 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
/* 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

11
patches/vilor-config.diff

@ -1,11 +0,0 @@
--- a/config.def.h 2022-01-07 19:49:00.328773990 +0300
+++ b/config.def.h 2022-01-07 19:50:18.516334300 +0300
@@ -5,7 +5,7 @@
*
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/
-static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
+static char *font = "Liberation Mono:pixelsize=20:antialias=true:autohint=true";
static int borderpx = 2;
/*

616
sixel.c

@ -0,0 +1,616 @@
// 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 <stdlib.h>
#include <string.h> /* 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);
}

58
sixel.h

@ -0,0 +1,58 @@
#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

115
sixel_hls.c

@ -0,0 +1,115 @@
// 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);
}

7
sixel_hls.h

@ -0,0 +1,7 @@
/*
* Primary color hues:
* blue: 0 degrees
* red: 120 degrees
* green: 240 degrees
*/
int hls_to_rgb(int hue, int lum, int sat);

1022
st.c

File diff suppressed because it is too large Load Diff

245
st.h

@ -2,23 +2,42 @@
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xft/Xft.h>
#include <X11/XKBlib.h>
#include "patches.h"
/* macros */ /* macros */
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) < (b) ? (b) : (a)) #define MAX(a, b) ((a) < (b) ? (b) : (a))
#define LEN(a) (sizeof(a) / sizeof(a)[0]) #define LEN(a) (sizeof(a) / sizeof(a)[0])
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) #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 DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
#define DEFAULT(a, b) (a) = (a) ? (a) : (b) #define DEFAULT(a, b) (a) = (a) ? (a) : (b)
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) #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 || \ #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
(a).bg != (b).bg) (a).bg != (b).bg)
#endif // LIGATURES_PATCH
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \ #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
(t1.tv_nsec-t2.tv_nsec)/1E6) (t1.tv_nsec-t2.tv_nsec)/1E6)
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit))) #define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b)) #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
#define IS_TRUECOL(x) (1 << 24 & (x)) #define IS_TRUECOL(x) (1 << 24 & (x))
#if SCROLLBACK_PATCH
#define HISTSIZE 2000
#endif // SCROLLBACK_PATCH
enum glyph_attribute { enum glyph_attribute {
ATTR_NULL = 0, ATTR_NULL = 0,
@ -33,8 +52,41 @@ enum glyph_attribute {
ATTR_WRAP = 1 << 8, ATTR_WRAP = 1 << 8,
ATTR_WIDE = 1 << 9, ATTR_WIDE = 1 << 9,
ATTR_WDUMMY = 1 << 10, 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, 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
enum selection_mode { enum selection_mode {
SEL_IDLE = 0, SEL_IDLE = 0,
@ -59,16 +111,64 @@ typedef unsigned short ushort;
typedef uint_least32_t Rune; typedef uint_least32_t Rune;
typedef XftDraw *Draw;
typedef XftColor Color;
typedef XftGlyphFontSpec GlyphFontSpec;
#define Glyph Glyph_ #define Glyph Glyph_
typedef struct { typedef struct {
Rune u; /* character code */ Rune u; /* character code */
ushort mode; /* attribute flags */ ushort mode; /* attribute flags */
uint32_t fg; /* foreground */ uint32_t fg; /* foreground */
uint32_t bg; /* background */ uint32_t bg; /* background */
#if UNDERCURL_PATCH
int ustyle; /* underline style */
int ucolor[3]; /* underline color */
#endif // UNDERCURL_PATCH
} Glyph; } Glyph;
typedef Glyph *Line; 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 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 { typedef union {
int i; int i;
uint ui; uint ui;
@ -77,9 +177,121 @@ typedef union {
const char *s; const char *s;
} Arg; } Arg;
/* Purely graphic info */
typedef struct {
int tw, th; /* tty width and height */
int w, h; /* window width and height */
#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 NETWMICON_PATCH
Atom netwmicon;
#endif // NETWMICON_PATCH
struct {
XIM xim;
XIC xic;
XPoint spot;
XVaNestedList spotlist;
} ime;
Draw draw;
Visual *vis;
XSetWindowAttributes attrs;
#if HIDECURSOR_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
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;
} Shortcut;
typedef struct {
uint mod;
uint button;
void (*func)(const Arg *);
const Arg arg;
uint release;
#if UNIVERSCROLL_PATCH
int altscrn; /* 0: don't care, -1: not alt screen, 1: alt screen */
#endif // UNIVERSCROLL_PATCH
} 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 die(const char *, ...);
void redraw(void); void redraw(void);
void draw(void); void draw(void);
void drawregion(int, int, int, int);
void tfulldirt(void);
void printscreen(const Arg *); void printscreen(const Arg *);
void printsel(const Arg *); void printsel(const Arg *);
@ -89,6 +301,9 @@ void toggleprinter(const Arg *);
int tattrset(int); int tattrset(int);
void tnew(int, int); void tnew(int, int);
void tresize(int, int); void tresize(int, int);
#if VIM_BROWSE_PATCH
void tmoveto(int x, int y);
#endif // VIM_BROWSE_PATCH
void tsetdirtattr(int); void tsetdirtattr(int);
void ttyhangup(void); void ttyhangup(void);
int ttynew(const char *, char *, const char *, char **); int ttynew(const char *, char *, const char *, char **);
@ -110,8 +325,15 @@ size_t utf8encode(Rune, char *);
void *xmalloc(size_t); void *xmalloc(size_t);
void *xrealloc(void *, size_t); void *xrealloc(void *, size_t);
char *xstrdup(const char *); char *xstrdup(const char *);
#if BOXDRAW_PATCH
int xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b); 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 */ /* config.h globals */
extern char *utmp; extern char *utmp;
@ -126,3 +348,22 @@ extern unsigned int tabspaces;
extern unsigned int defaultfg; extern unsigned int defaultfg;
extern unsigned int defaultbg; extern unsigned int defaultbg;
extern unsigned int defaultcs; 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;

14
st.info

@ -1,4 +1,6 @@
st-mono| simpleterm monocolor, st-mono| simpleterm monocolor,
# undercurl patch / UNDERCURL_PATCH
Su,
acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
am, am,
bce, bce,
@ -8,7 +10,7 @@ st-mono| simpleterm monocolor,
cbt=\E[Z, cbt=\E[Z,
cvvis=\E[?25h, cvvis=\E[?25h,
civis=\E[?25l, civis=\E[?25l,
clear=\E[H\E[2J, clear=\E[H\E[3J,
cnorm=\E[?12l\E[?25h, cnorm=\E[?12l\E[?25h,
colors#2, colors#2,
cols#80, cols#80,
@ -161,7 +163,9 @@ st-mono| simpleterm monocolor,
rin=\E[%p1%dT, rin=\E[%p1%dT,
ritm=\E[23m, ritm=\E[23m,
rmacs=\E(B, rmacs=\E(B,
rmcup=\E[?1049l, # CSI 22, 23 patch / CSI_22_23_PATCH
# rmcup=\E[?1049l,
rmcup=\E[?1049l\E[23;0;0t,
rmir=\E[4l, rmir=\E[4l,
rmkx=\E[?1l\E>, rmkx=\E[?1l\E>,
rmso=\E[27m, rmso=\E[27m,
@ -172,7 +176,9 @@ st-mono| simpleterm monocolor,
sitm=\E[3m, sitm=\E[3m,
sgr0=\E[0m, sgr0=\E[0m,
smacs=\E(0, smacs=\E(0,
smcup=\E[?1049h, # CSI 22, 23 patch / CSI_22_23_PATCH
# smcup=\E[?1049h,
smcup=\E[?1049h\E[22;0;0t,
smir=\E[4h, smir=\E[4h,
smkx=\E[?1h\E=, smkx=\E[?1h\E=,
smso=\E[7m, smso=\E[7m,
@ -191,6 +197,8 @@ st-mono| simpleterm monocolor,
Ms=\E]52;%p1%s;%p2%s\007, Ms=\E]52;%p1%s;%p2%s\007,
Se=\E[2 q, Se=\E[2 q,
Ss=\E[%p1%d q, Ss=\E[%p1%d q,
# sync patch / SYNC_PATCH
Sync=\EP=%p1%ds\E\\,
st| simpleterm, st| simpleterm,
use=st-mono, use=st-mono,

17
win.h

@ -21,20 +21,37 @@ enum win_mode {
MODE_NUMLOCK = 1 << 17, MODE_NUMLOCK = 1 << 17,
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\ MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|MODE_MOUSEMANY, |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 xbell(void);
void xclipcopy(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); void xdrawcursor(int, int, Glyph, int, int, Glyph);
#endif // LIGATURES_PATCH
void xdrawline(Line, int, int, int); void xdrawline(Line, int, int, int);
void xfinishdraw(void); void xfinishdraw(void);
void xloadcols(void); void xloadcols(void);
int xsetcolorname(int, const char *); int xsetcolorname(int, const char *);
void xseticontitle(char *); void xseticontitle(char *);
#if CSI_22_23_PATCH
void xfreetitlestack(void);
void xsettitle(char *, int);
void xpushtitle(void);
#else
void xsettitle(char *); void xsettitle(char *);
#endif // CSI_22_23_PATCH
int xsetcursor(int); int xsetcursor(int);
void xsetmode(int, unsigned int); void xsetmode(int, unsigned int);
void xsetpointermotion(int); void xsetpointermotion(int);
void xsetsel(char *); void xsetsel(char *);
int xstartdraw(void); int xstartdraw(void);
void xximspot(int, int); void xximspot(int, int);
void xclearwin(void);

1733
x.c

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save