summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--icewm/toolbar-full7
-rw-r--r--nixos/95theme.nix46
-rw-r--r--nixos/common.nix15
-rw-r--r--nixos/lindy.nix9
-rw-r--r--nixpkgs/common.nix18
-rw-r--r--st/config.h475
-rw-r--r--st/st-colorschemes-0.8.5.diff306
-rw-r--r--st/st-copyurl-0.8.4.diff159
-rw-r--r--wp/Thatches_(Windows_95).pngbin0 -> 160 bytes
-rw-r--r--wp/Thatches_(Windows_95)_colorized.pngbin0 -> 4935 bytes
10 files changed, 1030 insertions, 5 deletions
diff --git a/icewm/toolbar-full b/icewm/toolbar-full
new file mode 100644
index 0000000..d646873
--- /dev/null
+++ b/icewm/toolbar-full
@@ -0,0 +1,7 @@
+prog "Terminal" xterm st
+prog "Qutebrowser" qutebrower qutebrowser
+prog "Firefox" firefox firefox
+prog "Thunderbird" thunderbird thunderbird
+prog "Spotify" spotify spotify
+
+
diff --git a/nixos/95theme.nix b/nixos/95theme.nix
new file mode 100644
index 0000000..c17e336
--- /dev/null
+++ b/nixos/95theme.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, modulesPath, ... }:
+let chicago95 =
+ pkgs.stdenv.mkDerivation rec {
+ pname = "chicago95";
+ version = "20230216";
+
+ src = pkgs.fetchgit {
+ url = "https://github.com/grassmunk/Chicago95.git";
+ rev = "4c39951284add04941adc6ce5a68a778590b93d1";
+ hash = "sha256-PwNuVAcJ6FZlALdHAvgX8H56bOkZ0llXGd09ETj4enQ=";
+ };
+
+ nativeBuildInputs = with pkgs; [
+ which
+ ];
+
+ installPhase = ''
+ pwd
+ ls -lah
+ for p in cursors fonts gtk_theme icons backgrounds doc; do
+ make install_$p DESTDIR=$out prefix=
+ done
+ '';
+
+ meta = with lib; {
+ description = "A rendition of everyone's favorite 1995 Microsoft operating system for Linux";
+ homepage = "https://github.com/grassmunk/Chicago95";
+ platforms = platforms.all;
+ };
+ };
+in
+{
+ services.xserver.windowManager.icewm.enable = true;
+ services.xserver.windowManager.windowmaker.enable = true;
+ services.xserver.desktopManager.xfce.enable = true;
+
+ environment.systemPackages = with pkgs; [
+ # theming
+ onestepback
+ feh
+ lxappearance
+ chicago95
+ libsForQt5.qtstyleplugins
+ libsForQt5.qt5ct
+ ];
+}
diff --git a/nixos/common.nix b/nixos/common.nix
index bbeb09b..9f3abbe 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -86,6 +86,8 @@ in
# Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true;
+ # -------------------- users ---------------------
+
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.lx = {
isNormalUser = true;
@@ -98,6 +100,8 @@ in
];
};
+ # -------------------- packages ---------------------
+
nixpkgs.config.allowUnfree = true;
nix.gc.automatic = true;
nix.gc.options = "--delete-older-than 30d";
@@ -164,7 +168,6 @@ in
file
alacritty
- st
firefox
qutebrowser
(tor-browser-bundle-bin.override { useHardenedMalloc = false; })
@@ -185,6 +188,16 @@ in
nicotine-plus
gnome.seahorse
gqrx
+
+ (st.overrideAttrs (oldAttrs: rec {
+ patches = [
+ #../st/st-colorschemes-0.8.5.diff
+ #../st/st-copyurl-0.8.4.diff
+ ];
+ configFile = writeText "config.def.h" (builtins.readFile ../st/config.h);
+ postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
+ }))
+
];
programs.vim.defaultEditor = true;
diff --git a/nixos/lindy.nix b/nixos/lindy.nix
index dac7933..3ddeaf2 100644
--- a/nixos/lindy.nix
+++ b/nixos/lindy.nix
@@ -1,6 +1,3 @@
-# Do not modify this file! It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations. Please make changes
-# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
@@ -8,6 +5,7 @@
(modulesPath + "/installer/scan/not-detected.nix")
./common.nix
./kde.nix
+ #./95theme.nix
#./gnome.nix
#./fdn-vpn.nix
];
@@ -93,6 +91,11 @@ Kogami UUID=61534c91-df18-4c71-9244-54e677f5d4fa /root/kogami_key
virtualisation.virtualbox.host.enable = true;
users.users.lx.extraGroups = [ "docker" "vboxusers" ];
+ # Making dev work available outside
+ networking.firewall.allowedTCPPorts = [
+ 8910
+ ];
+
# GnuPG agent at system level, if at home level conflicts with arch
programs.gnupg.agent = {
enable = true;
diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix
index 1f98b2e..54094f2 100644
--- a/nixpkgs/common.nix
+++ b/nixpkgs/common.nix
@@ -16,6 +16,9 @@
ll = "ls -lah";
irc = "ssh -t adnab.me /usr/local/bin/irc";
};
+ bashrcExtra = ''
+ export PATH=$HOME/.cargo/bin:$PATH
+ '';
};
programs.keychain = {
enable = true;
@@ -41,7 +44,20 @@
programs.git.userEmail = "alex@adnab.me";
programs.git.lfs.enable = true;
- home.file = { ".config/tmux/tmux.conf".source = ../tmux/tmux.conf; };
+ home.file = {
+ ".config/tmux/tmux.conf".source = ../tmux/tmux.conf;
+ ".config/icewm/preferences".source = ../icewm/preferences;
+ ".config/icewm/keys".source = ../icewm/keys;
+ ".config/icewm/menu".source = ../icewm/menu;
+ ".config/icewm/theme".source = ../icewm/theme;
+ ".config/icewm/toolbar".text = ''
+ prog "Terminal" xterm st
+ prog "Qutebrowser" ${pkgs.qutebrowser}/share/icons/hicolor/32x32/apps/qutebrowser.png qutebrowser
+ prog "Firefox" ${pkgs.firefox}/share/icons/hicolor/32x32/apps/firefox.png firefox
+ prog "Thunderbird" ${pkgs.thunderbird}/share/icons/hicolor/32x32/apps/thunderbird.png thunderbird
+ prog "Spotify" ${pkgs.spotify}/share/icons/hicolor/32x32/apps/spotify-client.png spotify
+ '';
+ };
xsession.enable = true;
home.keyboard = null;
diff --git a/st/config.h b/st/config.h
new file mode 100644
index 0000000..b489084
--- /dev/null
+++ b/st/config.h
@@ -0,0 +1,475 @@
+/* See LICENSE file for copyright and license details. */
+
+/*
+ * appearance
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */
+static char *font = "DejaVu Sans Mono:pixelsize=14:antialias=true:autohint=true";
+static int borderpx = 2;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: scroll and/or utmp
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
+static char *shell = "/bin/sh";
+char *utmp = NULL;
+/* scroll program: to enable use a string like "scroll" */
+char *scroll = NULL;
+char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
+
+/* identification sequence returned in DA and DECID */
+char *vtiden = "\033[?6c";
+
+/* Kerning / character bounding-box multipliers */
+static float cwscale = 1.05;
+static float chscale = 1.05;
+
+/*
+ * word delimiter string
+ *
+ * More advanced example: L" `'\"()[]{}"
+ */
+wchar_t *worddelimiters = L" ";
+
+/* selection timeouts (in milliseconds) */
+static unsigned int doubleclicktimeout = 300;
+static unsigned int tripleclicktimeout = 600;
+
+/* alt screens */
+int allowaltscreen = 1;
+
+/* allow certain non-interactive (insecure) window operations such as:
+ setting the clipboard text */
+int allowwindowops = 0;
+
+/*
+ * draw latency range in ms - from new content/keypress/etc until drawing.
+ * within this range, st draws when content stops arriving (idle). mostly it's
+ * near minlatency, but it waits longer for slow updates to avoid partial draw.
+ * low minlatency will tear/flicker more, as it can "detect" idle too early.
+ */
+static double minlatency = 8;
+static double maxlatency = 33;
+
+/*
+ * blinking timeout (set to 0 to disable blinking) for the terminal blinking
+ * attribute.
+ */
+static unsigned int blinktimeout = 800;
+
+/*
+ * thickness of underline and bar cursors
+ */
+static unsigned int cursorthickness = 2;
+
+/*
+ * bell volume. It must be a value between -100 and 100. Use 0 for disabling
+ * it
+ */
+static int bellvolume = 0;
+
+/* default TERM value */
+char *termname = "st-256color";
+
+/*
+ * spaces per tab
+ *
+ * When you are changing this value, don't forget to adapt the »it« value in
+ * the st.info and appropriately install the st.info in the environment where
+ * you use this st version.
+ *
+ * it#$tabspaces,
+ *
+ * Secondly make sure your kernel is not expanding tabs. When running `stty
+ * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
+ * running following command:
+ *
+ * stty tabs
+ */
+unsigned int tabspaces = 8;
+
+/* Terminal colors (16 first used in escape sequence) */
+static const char *colorname[] = {
+ /* 8 normal colors */
+ "#1d1f21", // black
+ "#cc6666", // red
+ "#b5bd68", // green
+ "#f0c674", // yellow
+ "#81a2be", // blue
+ "#b294bb", // magenta
+ "#8abeb7", // cyan
+ "#c5c8c6", // white
+
+ /* 8 bright colors */
+ "#666666", // black
+ "#d54e53", // red
+ "#b9ca4a", // green
+ "#e7c547", // yellow
+ "#7aa6da", // blue
+ "#c397d8", // magenta
+ "#70c0b1", // cyan
+ "#eaeaea", // white
+
+ [255] = 0,
+
+ /* more colors can be added after 255 to use with DefaultXX */
+ "#cccccc",
+ "#555555",
+ "#c5c8c6", /* default foreground colour */
+ "#1d1f21", /* default background colour */
+};
+
+
+/*
+ * Default colors (colorname index)
+ * foreground, background, cursor, reverse cursor
+ */
+unsigned int defaultfg = 258;
+unsigned int defaultbg = 259;
+unsigned int defaultcs = 256;
+static unsigned int defaultrcs = 257;
+
+/*
+ * Default shape of cursor
+ * 2: Block ("█")
+ * 4: Underline ("_")
+ * 6: Bar ("|")
+ * 7: Snowman ("☃")
+ */
+static unsigned int cursorshape = 2;
+
+/*
+ * Default columns and rows numbers
+ */
+
+static unsigned int cols = 80;
+static unsigned int rows = 24;
+
+/*
+ * Default colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
+
+/*
+ * Color used to display font attributes when fontconfig selected a font which
+ * doesn't match the ones requested.
+ */
+static unsigned int defaultattr = 11;
+
+/*
+ * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forcemousemod = ShiftMask;
+
+/*
+ * Internal mouse shortcuts.
+ * Beware that overloading Button1 will disable the selection.
+ */
+static MouseShortcut mshortcuts[] = {
+ /* mask button function argument release */
+ { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
+ { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
+ { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
+ { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
+ { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
+};
+
+/* Internal keyboard shortcuts. */
+#define MODKEY Mod1Mask
+#define TERMMOD (ControlMask|ShiftMask)
+
+static Shortcut shortcuts[] = {
+ /* mask keysym function argument */
+ { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
+ { ControlMask, XK_Print, toggleprinter, {.i = 0} },
+ { ShiftMask, XK_Print, printscreen, {.i = 0} },
+ { XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
+ { TERMMOD, XK_Prior, zoom, {.f = +1} },
+ { TERMMOD, XK_Next, zoom, {.f = -1} },
+ { TERMMOD, XK_Home, zoomreset, {.f = 0} },
+ { TERMMOD, XK_C, clipcopy, {.i = 0} },
+ { TERMMOD, XK_V, clippaste, {.i = 0} },
+ { TERMMOD, XK_Y, selpaste, {.i = 0} },
+ { ShiftMask, XK_Insert, selpaste, {.i = 0} },
+ { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
+};
+
+/*
+ * Special keys (change & recompile st.info accordingly)
+ *
+ * Mask value:
+ * * Use XK_ANY_MOD to match the key no matter modifiers state
+ * * Use XK_NO_MOD to match the key alone (no modifiers)
+ * appkey value:
+ * * 0: no value
+ * * > 0: keypad application mode enabled
+ * * = 2: term.numlock = 1
+ * * < 0: keypad application mode disabled
+ * appcursor value:
+ * * 0: no value
+ * * > 0: cursor application mode enabled
+ * * < 0: cursor application mode disabled
+ *
+ * Be careful with the order of the definitions because st searches in
+ * this table sequentially, so any XK_ANY_MOD must be in the last
+ * position for a key.
+ */
+
+/*
+ * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
+ * to be mapped below, add them to this array.
+ */
+static KeySym mappedkeys[] = { -1 };
+
+/*
+ * State bits to ignore when matching key or button events. By default,
+ * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
+ */
+static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
+
+/*
+ * This is the huge key array which defines all compatibility to the Linux
+ * world. Please decide about changes wisely.
+ */
+static Key key[] = {
+ /* keysym mask string appkey appcursor */
+ { XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
+ { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
+ { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
+ { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
+ { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
+ { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
+ { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
+ { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
+ { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
+ { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
+ { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
+ { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
+ { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
+ { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
+ { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
+ { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
+ { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
+ { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
+ { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
+ { XK_KP_End, ControlMask, "\033[J", -1, 0},
+ { XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
+ { XK_KP_End, ShiftMask, "\033[K", -1, 0},
+ { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
+ { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
+ { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
+ { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
+ { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
+ { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
+ { XK_KP_Insert, ControlMask, "\033[L", -1, 0},
+ { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
+ { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
+ { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
+ { XK_KP_Delete, ControlMask, "\033[M", -1, 0},
+ { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
+ { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
+ { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
+ { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
+ { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
+ { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
+ { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
+ { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
+ { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
+ { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
+ { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
+ { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
+ { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
+ { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
+ { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
+ { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
+ { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
+ { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
+ { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
+ { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
+ { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
+ { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
+ { XK_Up, ShiftMask, "\033[1;2A", 0, 0},
+ { XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
+ { XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0},
+ { XK_Up, ControlMask, "\033[1;5A", 0, 0},
+ { XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0},
+ { XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0},
+ { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0},
+ { XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
+ { XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
+ { XK_Down, ShiftMask, "\033[1;2B", 0, 0},
+ { XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
+ { XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0},
+ { XK_Down, ControlMask, "\033[1;5B", 0, 0},
+ { XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0},
+ { XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0},
+ { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0},
+ { XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
+ { XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
+ { XK_Left, ShiftMask, "\033[1;2D", 0, 0},
+ { XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
+ { XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0},
+ { XK_Left, ControlMask, "\033[1;5D", 0, 0},
+ { XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0},
+ { XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0},
+ { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0},
+ { XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
+ { XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
+ { XK_Right, ShiftMask, "\033[1;2C", 0, 0},
+ { XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
+ { XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0},
+ { XK_Right, ControlMask, "\033[1;5C", 0, 0},
+ { XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0},
+ { XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0},
+ { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0},
+ { XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
+ { XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
+ { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
+ { XK_Return, Mod1Mask, "\033\r", 0, 0},
+ { XK_Return, XK_ANY_MOD, "\r", 0, 0},
+ { XK_Insert, ShiftMask, "\033[4l", -1, 0},
+ { XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
+ { XK_Insert, ControlMask, "\033[L", -1, 0},
+ { XK_Insert, ControlMask, "\033[2;5~", +1, 0},
+ { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
+ { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
+ { XK_Delete, ControlMask, "\033[M", -1, 0},
+ { XK_Delete, ControlMask, "\033[3;5~", +1, 0},
+ { XK_Delete, ShiftMask, "\033[2K", -1, 0},
+ { XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
+ { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
+ { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
+ { XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
+ { XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
+ { XK_Home, ShiftMask, "\033[2J", 0, -1},
+ { XK_Home, ShiftMask, "\033[1;2H", 0, +1},
+ { XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
+ { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
+ { XK_End, ControlMask, "\033[J", -1, 0},
+ { XK_End, ControlMask, "\033[1;5F", +1, 0},
+ { XK_End, ShiftMask, "\033[K", -1, 0},
+ { XK_End, ShiftMask, "\033[1;2F", +1, 0},
+ { XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
+ { XK_Prior, ControlMask, "\033[5;5~", 0, 0},
+ { XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
+ { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
+ { XK_Next, ControlMask, "\033[6;5~", 0, 0},
+ { XK_Next, ShiftMask, "\033[6;2~", 0, 0},
+ { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
+ { XK_F1, XK_NO_MOD, "\033OP" , 0, 0},
+ { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
+ { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
+ { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
+ { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
+ { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
+ { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0},
+ { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
+ { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
+ { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
+ { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
+ { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
+ { XK_F3, XK_NO_MOD, "\033OR" , 0, 0},
+ { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
+ { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
+ { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
+ { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
+ { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
+ { XK_F4, XK_NO_MOD, "\033OS" , 0, 0},
+ { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
+ { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
+ { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
+ { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
+ { XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
+ { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
+ { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
+ { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
+ { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
+ { XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
+ { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
+ { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
+ { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
+ { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
+ { XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
+ { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
+ { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
+ { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
+ { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
+ { XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
+ { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
+ { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
+ { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
+ { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
+ { XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
+ { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
+ { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
+ { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
+ { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
+ { XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
+ { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
+ { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
+ { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
+ { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
+ { XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
+ { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
+ { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
+ { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
+ { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
+ { XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
+ { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
+ { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
+ { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
+ { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
+ { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
+ { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
+ { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
+ { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
+ { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
+ { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
+ { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
+ { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
+ { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
+ { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
+ { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
+ { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
+ { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
+ { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
+ { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
+ { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
+ { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
+ { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
+ { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
+ { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
+ { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
+ { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
+ { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
+};
+
+/*
+ * Selection types' masks.
+ * Use the same masks as usual.
+ * Button1Mask is always unset, to make masks match between ButtonPress.
+ * ButtonRelease and MotionNotify.
+ * If no match is found, regular selection is used.
+ */
+static uint selmasks[] = {
+ [SEL_RECTANGULAR] = Mod1Mask,
+};
+
+/*
+ * Printable characters in ASCII, used to estimate the advance width
+ * of single wide characters.
+ */
+static char ascii_printable[] =
+ " !\"#$%&'()*+,-./0123456789:;<=>?"
+ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+ "`abcdefghijklmnopqrstuvwxyz{|}~";
+
diff --git a/st/st-colorschemes-0.8.5.diff b/st/st-colorschemes-0.8.5.diff
new file mode 100644
index 0000000..28037d9
--- /dev/null
+++ b/st/st-colorschemes-0.8.5.diff
@@ -0,0 +1,306 @@
+From 9bfbafa1e98c13c039bea4790941e51b3a8054b4 Mon Sep 17 00:00:00 2001
+From: Max Schillinger <maxschillinger@web.de>
+Date: Thu, 23 Jun 2022 21:58:37 +0200
+Subject: [PATCH] Add multiple color schemes and key bindings to change them
+
+This commits adds these color schemes:
+
+- the default (dark) st color scheme
+- the default (dark) alacritty color scheme
+- One Half (dark & light)
+- Solarized (dark & light)
+- Gruvbox (dark & light)
+
+Select one with Alt+1..8.
+Select the next one with Alt+0.
+Select the previous one with Ctrl+Alt+0.
+---
+ config.def.h | 118 +++++++++++++++++++++++++++++++++++++--------------
+ st.c | 22 ++++++++++
+ st.h | 2 +
+ x.c | 52 ++++++++++++++++++++++-
+ 4 files changed, 160 insertions(+), 34 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 91ab8ca..38777fe 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -93,46 +93,87 @@ char *termname = "st-256color";
+ */
+ unsigned int tabspaces = 8;
+
+-/* Terminal colors (16 first used in escape sequence) */
+-static const char *colorname[] = {
+- /* 8 normal colors */
+- "black",
+- "red3",
+- "green3",
+- "yellow3",
+- "blue2",
+- "magenta3",
+- "cyan3",
+- "gray90",
+-
+- /* 8 bright colors */
+- "gray50",
+- "red",
+- "green",
+- "yellow",
+- "#5c5cff",
+- "magenta",
+- "cyan",
+- "white",
+-
+- [255] = 0,
+-
+- /* more colors can be added after 255 to use with DefaultXX */
+- "#cccccc",
+- "#555555",
+- "gray90", /* default foreground colour */
+- "black", /* default background colour */
++typedef struct {
++ const char* const colors[258]; /* terminal colors */
++ unsigned int fg; /* foreground */
++ unsigned int bg; /* background */
++ unsigned int cs; /* cursor */
++ unsigned int rcs; /* reverse cursor */
++} ColorScheme;
++/*
++ * Terminal colors (16 first used in escape sequence,
++ * 2 last for custom cursor color),
++ * foreground, background, cursor, reverse cursor
++ */
++static const ColorScheme schemes[] = {
++ // st (dark)
++ {{"black", "red3", "green3", "yellow3",
++ "blue2", "magenta3", "cyan3", "gray90",
++ "gray50", "red", "green", "yellow",
++ "#5c5cff", "magenta", "cyan", "white",
++ [256]="#cccccc", "#555555"}, 7, 0, 256, 257},
++
++ // Alacritty (dark)
++ {{"#1d1f21", "#cc6666", "#b5bd68", "#f0c674",
++ "#81a2be", "#b294bb", "#8abeb7", "#c5c8c6",
++ "#666666", "#d54e53", "#b9ca4a", "#e7c547",
++ "#7aa6da", "#c397d8", "#70c0b1", "#eaeaea",
++ [256]="#cccccc", "#555555"}, 7, 0, 256, 257},
++
++ // One Half dark
++ {{"#282c34", "#e06c75", "#98c379", "#e5c07b",
++ "#61afef", "#c678dd", "#56b6c2", "#dcdfe4",
++ "#282c34", "#e06c75", "#98c379", "#e5c07b",
++ "#61afef", "#c678dd", "#56b6c2", "#dcdfe4",
++ [256]="#cccccc", "#555555"}, 7, 0, 256, 257},
++
++ // One Half light
++ {{"#fafafa", "#e45649", "#50a14f", "#c18401",
++ "#0184bc", "#a626a4", "#0997b3", "#383a42",
++ "#fafafa", "#e45649", "#50a14f", "#c18401",
++ "#0184bc", "#a626a4", "#0997b3", "#383a42",
++ [256]="#cccccc", "#555555"}, 7, 0, 256, 257},
++
++ // Solarized dark
++ {{"#073642", "#dc322f", "#859900", "#b58900",
++ "#268bd2", "#d33682", "#2aa198", "#eee8d5",
++ "#002b36", "#cb4b16", "#586e75", "#657b83",
++ "#839496", "#6c71c4", "#93a1a1", "#fdf6e3",
++ [256]="#93a1a1", "#fdf6e3"}, 12, 8, 256, 257},
++
++ // Solarized light
++ {{"#eee8d5", "#dc322f", "#859900", "#b58900",
++ "#268bd2", "#d33682", "#2aa198", "#073642",
++ "#fdf6e3", "#cb4b16", "#93a1a1", "#839496",
++ "#657b83", "#6c71c4", "#586e75", "#002b36",
++ [256]="#586e75", "#002b36"}, 12, 8, 256, 257},
++
++ // Gruvbox dark
++ {{"#282828", "#cc241d", "#98971a", "#d79921",
++ "#458588", "#b16286", "#689d6a", "#a89984",
++ "#928374", "#fb4934", "#b8bb26", "#fabd2f",
++ "#83a598", "#d3869b", "#8ec07c", "#ebdbb2",
++ [256]="#ebdbb2", "#555555"}, 15, 0, 256, 257},
++
++ // Gruvbox light
++ {{"#fbf1c7", "#cc241d", "#98971a", "#d79921",
++ "#458588", "#b16286", "#689d6a", "#7c6f64",
++ "#928374", "#9d0006", "#79740e", "#b57614",
++ "#076678", "#8f3f71", "#427b58", "#3c3836",
++ [256]="#3c3836", "#555555"}, 15, 0, 256, 257},
+ };
+
++static const char * const * colorname;
++int colorscheme = 0;
+
+ /*
+ * Default colors (colorname index)
+ * foreground, background, cursor, reverse cursor
+ */
+-unsigned int defaultfg = 258;
+-unsigned int defaultbg = 259;
+-unsigned int defaultcs = 256;
+-static unsigned int defaultrcs = 257;
++unsigned int defaultfg;
++unsigned int defaultbg;
++unsigned int defaultcs;
++static unsigned int defaultrcs;
+
+ /*
+ * Default shape of cursor
+@@ -201,6 +242,17 @@ static Shortcut shortcuts[] = {
+ { TERMMOD, XK_Y, selpaste, {.i = 0} },
+ { ShiftMask, XK_Insert, selpaste, {.i = 0} },
+ { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
++ { MODKEY, XK_1, selectscheme, {.i = 0} },
++ { MODKEY, XK_2, selectscheme, {.i = 1} },
++ { MODKEY, XK_3, selectscheme, {.i = 2} },
++ { MODKEY, XK_4, selectscheme, {.i = 3} },
++ { MODKEY, XK_5, selectscheme, {.i = 4} },
++ { MODKEY, XK_6, selectscheme, {.i = 5} },
++ { MODKEY, XK_7, selectscheme, {.i = 6} },
++ { MODKEY, XK_8, selectscheme, {.i = 7} },
++ { MODKEY, XK_9, selectscheme, {.i = 8} },
++ { MODKEY, XK_0, nextscheme, {.i = +1} },
++ { MODKEY|ControlMask, XK_0, nextscheme, {.i = -1} },
+ };
+
+ /*
+diff --git a/st.c b/st.c
+index 51049ba..3ffe333 100644
+--- a/st.c
++++ b/st.c
+@@ -2196,6 +2196,28 @@ tstrsequence(uchar c)
+ term.esc |= ESC_STR;
+ }
+
++void
++tupdatebgcolor(int oldbg, int newbg)
++{
++ for (int y = 0; y < term.row; y++) {
++ for (int x = 0; x < term.col; x++) {
++ if (term.line[y][x].bg == oldbg)
++ term.line[y][x].bg = newbg;
++ }
++ }
++}
++
++void
++tupdatefgcolor(int oldfg, int newfg)
++{
++ for (int y = 0; y < term.row; y++) {
++ for (int x = 0; x < term.col; x++) {
++ if (term.line[y][x].fg == oldfg)
++ term.line[y][x].fg = newfg;
++ }
++ }
++}
++
+ void
+ tcontrolcode(uchar ascii)
+ {
+diff --git a/st.h b/st.h
+index 519b9bd..2700de5 100644
+--- a/st.h
++++ b/st.h
+@@ -90,6 +90,8 @@ int tattrset(int);
+ void tnew(int, int);
+ void tresize(int, int);
+ void tsetdirtattr(int);
++void tupdatebgcolor(int, int);
++void tupdatefgcolor(int, int);
+ void ttyhangup(void);
+ int ttynew(const char *, char *, const char *, char **);
+ size_t ttyread(void);
+diff --git a/x.c b/x.c
+index 8a16faa..bc0a48c 100644
+--- a/x.c
++++ b/x.c
+@@ -59,6 +59,8 @@ static void zoom(const Arg *);
+ static void zoomabs(const Arg *);
+ static void zoomreset(const Arg *);
+ static void ttysend(const Arg *);
++static void nextscheme(const Arg *);
++static void selectscheme(const Arg *);
+
+ /* config.h for applying patches and the configuration. */
+ #include "config.h"
+@@ -185,6 +187,7 @@ static void mousesel(XEvent *, int);
+ static void mousereport(XEvent *);
+ static char *kmap(KeySym, uint);
+ static int match(uint, uint);
++static void updatescheme(void);
+
+ static void run(void);
+ static void usage(void);
+@@ -785,7 +788,7 @@ xloadcols(void)
+ for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
+ XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
+ } else {
+- dc.collen = MAX(LEN(colorname), 256);
++ dc.collen = 258;
+ dc.col = xmalloc(dc.collen * sizeof(Color));
+ }
+
+@@ -2008,6 +2011,47 @@ usage(void)
+ " [stty_args ...]\n", argv0, argv0);
+ }
+
++void
++nextscheme(const Arg *arg)
++{
++ colorscheme += arg->i;
++ if (colorscheme >= (int)LEN(schemes))
++ colorscheme = 0;
++ else if (colorscheme < 0)
++ colorscheme = LEN(schemes) - 1;
++ updatescheme();
++}
++
++void
++selectscheme(const Arg *arg)
++{
++ if (BETWEEN(arg->i, 0, LEN(schemes)-1)) {
++ colorscheme = arg->i;
++ updatescheme();
++ }
++}
++
++void
++updatescheme(void)
++{
++ int oldbg, oldfg;
++
++ oldbg = defaultbg;
++ oldfg = defaultfg;
++ colorname = schemes[colorscheme].colors;
++ defaultbg = schemes[colorscheme].bg;
++ defaultfg = schemes[colorscheme].fg;
++ defaultcs = schemes[colorscheme].cs;
++ defaultrcs = schemes[colorscheme].rcs;
++ xloadcols();
++ if (defaultbg != oldbg)
++ tupdatebgcolor(oldbg, defaultbg);
++ if (defaultfg != oldfg)
++ tupdatefgcolor(oldfg, defaultfg);
++ cresize(win.w, win.h);
++ redraw();
++}
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -2060,6 +2104,12 @@ main(int argc, char *argv[])
+ } ARGEND;
+
+ run:
++ colorname = schemes[colorscheme].colors;
++ defaultbg = schemes[colorscheme].bg;
++ defaultfg = schemes[colorscheme].fg;
++ defaultcs = schemes[colorscheme].cs;
++ defaultrcs = schemes[colorscheme].rcs;
++
+ if (argc > 0) /* eat all remaining arguments */
+ opt_cmd = argv;
+
+--
+2.36.1
+
diff --git a/st/st-copyurl-0.8.4.diff b/st/st-copyurl-0.8.4.diff
new file mode 100644
index 0000000..c0a5e35
--- /dev/null
+++ b/st/st-copyurl-0.8.4.diff
@@ -0,0 +1,159 @@
+diff -up ../st-0.8.4/config.def.h ./config.def.h
+--- ../st-0.8.4/config.def.h 2020-06-19 10:29:45.000000000 +0100
++++ ./config.def.h 2021-01-29 22:40:56.451916768 +0000
+@@ -199,6 +199,7 @@ static Shortcut shortcuts[] = {
+ { TERMMOD, XK_Y, selpaste, {.i = 0} },
+ { ShiftMask, XK_Insert, selpaste, {.i = 0} },
+ { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
++ { MODKEY, XK_l, copyurl, {.i = 0} },
+ };
+
+ /*
+diff -up ../st-0.8.4/st.c ./st.c
+--- ../st-0.8.4/st.c 2020-06-19 10:29:45.000000000 +0100
++++ ./st.c 2021-01-29 22:41:18.031954197 +0000
+@@ -200,6 +200,8 @@ static void tdefutf8(char);
+ static int32_t tdefcolor(int *, int *, int);
+ static void tdeftran(char);
+ static void tstrsequence(uchar);
++static void tsetcolor(int, int, int, uint32_t, uint32_t);
++static char * findlastany(char *, const char**, size_t);
+
+ static void drawregion(int, int, int, int);
+
+@@ -2595,3 +2597,122 @@ redraw(void)
+ tfulldirt();
+ draw();
+ }
++
++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);
++}
+Only in .: st-copyurl-0.8.4.diff
+Only in .: st-copyurl-20190202-3be4cf1.diff
+diff -up ../st-0.8.4/st.h ./st.h
+--- ../st-0.8.4/st.h 2020-06-19 10:29:45.000000000 +0100
++++ ./st.h 2021-01-29 22:40:56.451916768 +0000
+@@ -85,6 +85,7 @@ void printscreen(const Arg *);
+ void printsel(const Arg *);
+ void sendbreak(const Arg *);
+ void toggleprinter(const Arg *);
++void copyurl(const Arg *);
+
+ int tattrset(int);
+ void tnew(int, int);
diff --git a/wp/Thatches_(Windows_95).png b/wp/Thatches_(Windows_95).png
new file mode 100644
index 0000000..c6051db
--- /dev/null
+++ b/wp/Thatches_(Windows_95).png
Binary files differ
diff --git a/wp/Thatches_(Windows_95)_colorized.png b/wp/Thatches_(Windows_95)_colorized.png
new file mode 100644
index 0000000..a45149d
--- /dev/null
+++ b/wp/Thatches_(Windows_95)_colorized.png
Binary files differ