From 8275284136a9ee0b9ce8ff2f704c40df79463b94 Mon Sep 17 00:00:00 2001 From: CoolnsX Date: Sun, 3 Oct 2021 22:18:15 +0530 Subject: [PATCH] remove ani-cli --- ani-cli | 312 --------------------------- st-0.8.4/config.def.h | 3 +- st-0.8.4/config.h | 481 ------------------------------------------ st-0.8.4/st | Bin 102304 -> 102304 bytes st-0.8.4/x.o | Bin 75608 -> 75632 bytes 5 files changed, 2 insertions(+), 794 deletions(-) delete mode 100755 ani-cli delete mode 100644 st-0.8.4/config.h diff --git a/ani-cli b/ani-cli deleted file mode 100755 index 943c558..0000000 --- a/ani-cli +++ /dev/null @@ -1,312 +0,0 @@ -#!/bin/sh - -# dependencies: grep sed curl video_player -# video_player ( needs to be able to play urls ) -player_fn="vlc" - -prog="ani-cli" -logfile="${XDG_CACHE_HOME:-$HOME/.cache}/ani-hsts" - -c_red="\033[1;31m" -c_green="\033[1;32m" -c_yellow="\033[1;33m" -c_blue="\033[1;34m" -c_magenta="\033[1;35m" -c_cyan="\033[1;36m" -c_reset="\033[0m" - - -help_text () { - while IFS= read line; do - printf "%s\n" "$line" - done <<-EOF - USAGE: $prog - -h show this help text - -d download episode - -l watch and download episode (data saver mode) - -H continue where you left off - EOF -} - - -die () { - printf "$c_red%s$c_reset\n" "$*" >&2 - exit 1 -} - -err () { - printf "$c_red%s$c_reset\n" "$*" >&2 -} - -search_anime () { - # get anime name along with its id - search=$1 - titlepattern='/dev/null ; then - die "Program \"$dep\" not found. Please install it." - fi - done -} - -# get query -get_search_query () { - if [ -z "$*" ]; then - printf "Search Anime: " - read -r query - else - query=$* - fi -} - -# create history file -[ -f "$logfile" ] || : > "$logfile" - -##################### -## Anime selection ## -##################### - -anime_selection () { - search_results=$* - menu_format_string='[%d] %s\n' - menu_format_string_c1="$c_blue[$c_cyan%d$c_blue] $c_reset%s\n" - menu_format_string_c2="$c_blue[$c_cyan%d$c_blue] $c_yellow%s$c_reset\n" - - count=1 - while read anime_id; do - # alternating colors for menu - [ $((count % 2)) -eq 0 ] && - menu_format_string=$menu_format_string_c1 || - menu_format_string=$menu_format_string_c2 - - printf "$menu_format_string" "$count" "$anime_id" - count=$((count+1)) - done <<-EOF - $search_results - EOF - - # User input - printf "$c_blue%s$c_green" "Enter number: " - read choice - printf "$c_reset" - - # Check if input is a number - [ "$choice" -eq "$choice" ] 2>/dev/null || die "Invalid number entered" - - # Select respective anime_id - count=1 - while read anime_id; do - if [ $count -eq $choice ]; then - selection_id=$anime_id - break - fi - count=$((count+1)) - done <<-EOF - $search_results - EOF - - [ -z "$selection_id" ] && die "Invalid number entered" - - read last_ep_number <<-EOF - $(search_eps "$selection_id") - EOF -} - -################## -## Ep selection ## -################## - -episode_selection () { - [ $is_download -eq 1 ] && - printf "Range of episodes can be specified: start_number end_number\n" - - printf "${c_blue}Choose episode $c_cyan[1-%d]$c_reset:$c_green " $last_ep_number - read ep_choice_start ep_choice_end - printf "$c_reset" - -} - -open_episode () { - anime_id=$1 - episode=$2 - - if [ $episode -lt 1 ] || [ $episode -gt $last_ep_number ]; then - err "Episode out of range" - printf "${c_blue}Choose episode $c_cyan[1-%d]$c_reset:$c_green " $last_ep_number - read episode - printf "$c_reset" - fi - - printf "\nGetting data for episode %d\n" $episode - - video_url=$(get_links "$anime_id" "$episode") - - if [ $is_download -eq 0 ]; then - # write anime and episode number - sed -E " - s/^${selection_id}\t[0-9]+/${selection_id}\t$((episode+1))/ - " "$logfile" > "${logfile}.new" && mv "${logfile}.new" "$logfile" - - setsid -f $player_fn "$video_url" >/dev/null 2>&1 - echo "$video_url" - else - printf "Downloading episode $episode ...\n" - echo "$video_url" - # add 0 padding to the episode name - episode=$(printf "%03d" $episode) - { - curl -L -# -C - "$video_url" -o "${anime_id}-${episode}.mp4" && - printf "${c_green}Downloaded episode: %s${c_reset}\n" "$episode" || - printf "${c_red}Download failed episode: %s${c_reset}\n" "$episode" - } - fi -} - -############ -# Start Up # -############ - -# to clear the colors when exited using SIGINT -trap "printf '$c_reset'" INT HUP - -dep_ch "$player_fn" "curl" "sed" "grep" - -# option parsing -is_download=0 -is_low=0 -scrape=query -while getopts 'hdlH' OPT; do - case $OPT in - h) - help_text - exit 0 - ;; - d) - is_download=1 - ;; - l) - is_low=1 - ;; - H) - scrape=history - ;; - esac -done -shift $((OPTIND - 1)) - -######## -# main # -######## - -case $scrape in - query) - get_search_query "$*" - search_results=$(search_anime "$query") - [ -z "$search_results" ] && die "No search results found" - anime_selection "$search_results" - episode_selection - ;; - history) - search_results=$(sed -n -E 's/\t[0-9]*//p' "$logfile") - [ -z "$search_results" ] && die "History is empty" - anime_selection "$search_results" - ep_choice_start=$(sed -n -E "s/${selection_id}\t//p" "$logfile") - ;; -esac - - -{ # checking input - [ "$ep_choice_start" -eq "$ep_choice_start" ] 2>/dev/null || die "Invalid number entered" - episodes=$ep_choice_start - - if [ -n "$ep_choice_end" ]; then - [ "$ep_choice_end" -eq "$ep_choice_end" ] 2>/dev/null || die "Invalid number entered" - # create list of episodes to download/watch - episodes=$(seq $ep_choice_start $ep_choice_end) - fi -} - -# add anime to history file -grep -q -w "${selection_id}" "$logfile" || - printf "%s\t%d\n" "$selection_id" $((episode+1)) >> "$logfile" - -for ep in $episodes -do - open_episode "$selection_id" "$ep" -done -episode=${ep_choice_end:-$ep_choice_start} - -while :; do - printf "\n${c_green}Currently playing %s episode ${c_cyan}%d/%d\n" "$selection_id" $episode $last_ep_number - printf "$c_blue[${c_cyan}%s$c_blue] $c_yellow%s$c_reset\n" "n" "next episode" - printf "$c_blue[${c_cyan}%s$c_blue] $c_magenta%s$c_reset\n" "p" "previous episode" - printf "$c_blue[${c_cyan}%s$c_blue] $c_yellow%s$c_reset\n" "s" "select episode" - printf "$c_blue[${c_cyan}%s$c_blue] $c_red%s$c_reset\n" "q" "exit" - printf "${c_blue}Enter choice:${c_green} " - read choice - printf "$c_reset" - case $choice in - n) - episode=$((episode + 1)) - ;; - p) - episode=$((episode - 1)) - ;; - - s) printf "${c_blue}Choose episode $c_cyan[1-%d]$c_reset:$c_green " $last_ep_number - read episode - printf "$c_reset" - [ "$episode" -eq "$episode" ] 2>/dev/null || die "Invalid number entered" - ;; - - q) - break;; - - *) - die "invalid choice" - ;; - esac - - open_episode "$selection_id" "$episode" -done diff --git a/st-0.8.4/config.def.h b/st-0.8.4/config.def.h index 7c8c7b4..0e9b75e 100644 --- a/st-0.8.4/config.def.h +++ b/st-0.8.4/config.def.h @@ -125,6 +125,7 @@ static const char *colorname[] = { "#cccccc", "#555555", "black", + "#FF9F12", }; @@ -132,7 +133,7 @@ static const char *colorname[] = { * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ -unsigned int defaultfg = 15; +unsigned int defaultfg = 259; unsigned int defaultbg = 258; static unsigned int defaultcs = 256; static unsigned int defaultrcs = 257; diff --git a/st-0.8.4/config.h b/st-0.8.4/config.h deleted file mode 100644 index 7c8c7b4..0000000 --- a/st-0.8.4/config.h +++ /dev/null @@ -1,481 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* - * appearance - * - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ -static char *font = "JetBrains Mono:style=Bold:pixelsize=17:antialias=true:autohint=true"; - -static int borderpx = 0; - -/* - * What program is execed by st depends of these precedence rules: - * 1: program passed with -e - * 2: scroll and/or utmp - * 3: SHELL environment variable - * 4: value of shell in /etc/passwd - * 5: value of shell in config.h - */ -static char *shell = "/bin/sh"; -char *utmp = NULL; -/* scroll program: to enable use a string like "scroll" */ -char *scroll = NULL; -char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; - -/* identification sequence returned in DA and DECID */ -char *vtiden = "\033[?6c"; - -/* Kerning / character bounding-box multipliers */ -static float cwscale = 0.9; -static float chscale = 0.9; - -/* - * word delimiter string - * - * More advanced example: L" `'\"()[]{}" - */ -wchar_t *worddelimiters = L" "; - -/* selection timeouts (in milliseconds) */ -static unsigned int doubleclicktimeout = 300; -static unsigned int tripleclicktimeout = 600; - -/* alt screens */ -int allowaltscreen = 1; - -/* allow certain non-interactive (insecure) window operations such as: - setting the clipboard text */ -int allowwindowops = 0; - -/* - * draw latency range in ms - from new content/keypress/etc until drawing. - * within this range, st draws when content stops arriving (idle). mostly it's - * near minlatency, but it waits longer for slow updates to avoid partial draw. - * low minlatency will tear/flicker more, as it can "detect" idle too early. - */ -static double minlatency = 8; -static double maxlatency = 33; - -/* - * blinking timeout (set to 0 to disable blinking) for the terminal blinking - * attribute. - */ -static unsigned int blinktimeout = 800; - -/* - * thickness of underline and bar cursors - */ -static unsigned int cursorthickness = 2; - -/* - * bell volume. It must be a value between -100 and 100. Use 0 for disabling - * it - */ -static int bellvolume = 0; - -/* default TERM value */ -char *termname = "st-256color"; - -/* - * spaces per tab - * - * When you are changing this value, don't forget to adapt the »it« value in - * the st.info and appropriately install the st.info in the environment where - * you use this st version. - * - * it#$tabspaces, - * - * Secondly make sure your kernel is not expanding tabs. When running `stty - * -a` »tab0« should appear. You can tell the terminal to not expand tabs by - * running following command: - * - * stty tabs - */ -unsigned int tabspaces = 4; - -/* bg opacity */ -float alpha = 0.85; - -/* Terminal colors (16 first used in escape sequence) */ -static const char *colorname[] = { - /* 8 normal colors */ - "black", - "red3", - "green3", - "yellow3", - "blue2", - "magenta3", - "cyan3", - "gray90", - - /* 8 bright colors */ - "gray50", - "red", - "green", - "yellow", - "#5c5cff", - "magenta", - "cyan", - "white", - - [255] = 0, - - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", - "black", -}; - - -/* - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ -unsigned int defaultfg = 15; -unsigned int defaultbg = 258; -static unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; - -/* - * Default shape of cursor - * 2: Block ("█") - * 4: Underline ("_") - * 6: Bar ("|") - * 7: Snowman ("☃") - */ -static unsigned int cursorshape = 4; - -/* - * Default columns and rows numbers - */ - -static unsigned int cols = 80; -static unsigned int rows = 24; - -/* - * Default colour and shape of the mouse cursor - */ -static unsigned int mouseshape = XC_xterm; -static unsigned int mousefg = 7; -static unsigned int mousebg = 0; - -/* - * Color used to display font attributes when fontconfig selected a font which - * doesn't match the ones requested. - */ -static unsigned int defaultattr = 11; - -/* - * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set). - * Note that if you want to use ShiftMask with selmasks, set this to an other - * modifier, set to 0 to not use it. - */ -static uint forcemousemod = ShiftMask; - -/* - * Internal mouse shortcuts. - * Beware that overloading Button1 will disable the selection. - */ -static MouseShortcut mshortcuts[] = { - /* mask button function argument release */ - { ShiftMask, Button4, kscrollup, {.i = 1} }, - { ShiftMask, Button5, kscrolldown, {.i = 1} }, - { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, - { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, - { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, -}; - -/* Internal keyboard shortcuts. */ -#define MODKEY Mod1Mask -#define TERMMOD (ControlMask|ShiftMask) - -static Shortcut shortcuts[] = { - /* mask keysym function argument */ - { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, - { ControlMask, XK_Print, toggleprinter, {.i = 0} }, - { ShiftMask, XK_Print, printscreen, {.i = 0} }, - { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, - { TERMMOD, XK_Prior, zoom, {.f = +1} }, - { TERMMOD, XK_Next, zoom, {.f = -1} }, - { TERMMOD, XK_Home, zoomreset, {.f = 0} }, - { TERMMOD, XK_C, clipcopy, {.i = 0} }, - { TERMMOD, XK_V, clippaste, {.i = 0} }, - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, -}; - -/* - * Special keys (change & recompile st.info accordingly) - * - * Mask value: - * * Use XK_ANY_MOD to match the key no matter modifiers state - * * Use XK_NO_MOD to match the key alone (no modifiers) - * appkey value: - * * 0: no value - * * > 0: keypad application mode enabled - * * = 2: term.numlock = 1 - * * < 0: keypad application mode disabled - * appcursor value: - * * 0: no value - * * > 0: cursor application mode enabled - * * < 0: cursor application mode disabled - * - * Be careful with the order of the definitions because st searches in - * this table sequentially, so any XK_ANY_MOD must be in the last - * position for a key. - */ - -/* - * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) - * to be mapped below, add them to this array. - */ -static KeySym mappedkeys[] = { -1 }; - -/* - * State bits to ignore when matching key or button events. By default, - * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. - */ -static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; - -/* - * This is the huge key array which defines all compatibility to the Linux - * world. Please decide about changes wisely. - */ -static Key key[] = { - /* keysym mask string appkey appcursor */ - { XK_KP_Home, ShiftMask, "\033[2J", 0, -1}, - { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, - { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1}, - { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1}, - { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0}, - { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1}, - { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1}, - { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0}, - { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1}, - { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1}, - { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0}, - { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1}, - { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1}, - { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0}, - { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1}, - { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1}, - { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, - { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0}, - { XK_KP_End, ControlMask, "\033[J", -1, 0}, - { XK_KP_End, ControlMask, "\033[1;5F", +1, 0}, - { XK_KP_End, ShiftMask, "\033[K", -1, 0}, - { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0}, - { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0}, - { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, - { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0}, - { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, - { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0}, - { XK_KP_Insert, ControlMask, "\033[L", -1, 0}, - { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, - { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, - { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, - { XK_KP_Delete, ControlMask, "\033[M", -1, 0}, - { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, - { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, - { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, - { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, - { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, - { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0}, - { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0}, - { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0}, - { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0}, - { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0}, - { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0}, - { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0}, - { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0}, - { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0}, - { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0}, - { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0}, - { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0}, - { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0}, - { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0}, - { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0}, - { XK_Up, ShiftMask, "\033[1;2A", 0, 0}, - { XK_Up, Mod1Mask, "\033[1;3A", 0, 0}, - { XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0}, - { XK_Up, ControlMask, "\033[1;5A", 0, 0}, - { XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0}, - { XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0}, - { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0}, - { XK_Up, XK_ANY_MOD, "\033[A", 0, -1}, - { XK_Up, XK_ANY_MOD, "\033OA", 0, +1}, - { XK_Down, ShiftMask, "\033[1;2B", 0, 0}, - { XK_Down, Mod1Mask, "\033[1;3B", 0, 0}, - { XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0}, - { XK_Down, ControlMask, "\033[1;5B", 0, 0}, - { XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0}, - { XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0}, - { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0}, - { XK_Down, XK_ANY_MOD, "\033[B", 0, -1}, - { XK_Down, XK_ANY_MOD, "\033OB", 0, +1}, - { XK_Left, ShiftMask, "\033[1;2D", 0, 0}, - { XK_Left, Mod1Mask, "\033[1;3D", 0, 0}, - { XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0}, - { XK_Left, ControlMask, "\033[1;5D", 0, 0}, - { XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0}, - { XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0}, - { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0}, - { XK_Left, XK_ANY_MOD, "\033[D", 0, -1}, - { XK_Left, XK_ANY_MOD, "\033OD", 0, +1}, - { XK_Right, ShiftMask, "\033[1;2C", 0, 0}, - { XK_Right, Mod1Mask, "\033[1;3C", 0, 0}, - { XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0}, - { XK_Right, ControlMask, "\033[1;5C", 0, 0}, - { XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0}, - { XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0}, - { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0}, - { XK_Right, XK_ANY_MOD, "\033[C", 0, -1}, - { XK_Right, XK_ANY_MOD, "\033OC", 0, +1}, - { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, - { XK_Return, Mod1Mask, "\033\r", 0, 0}, - { XK_Return, XK_ANY_MOD, "\r", 0, 0}, - { XK_Insert, ShiftMask, "\033[4l", -1, 0}, - { XK_Insert, ShiftMask, "\033[2;2~", +1, 0}, - { XK_Insert, ControlMask, "\033[L", -1, 0}, - { XK_Insert, ControlMask, "\033[2;5~", +1, 0}, - { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, - { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, - { XK_Delete, ControlMask, "\033[M", -1, 0}, - { XK_Delete, ControlMask, "\033[3;5~", +1, 0}, - { XK_Delete, ShiftMask, "\033[2K", -1, 0}, - { XK_Delete, ShiftMask, "\033[3;2~", +1, 0}, - { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, - { XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, - { XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, - { XK_Home, ShiftMask, "\033[2J", 0, -1}, - { XK_Home, ShiftMask, "\033[1;2H", 0, +1}, - { XK_Home, XK_ANY_MOD, "\033[H", 0, -1}, - { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1}, - { XK_End, ControlMask, "\033[J", -1, 0}, - { XK_End, ControlMask, "\033[1;5F", +1, 0}, - { XK_End, ShiftMask, "\033[K", -1, 0}, - { XK_End, ShiftMask, "\033[1;2F", +1, 0}, - { XK_End, XK_ANY_MOD, "\033[4~", 0, 0}, - { XK_Prior, ControlMask, "\033[5;5~", 0, 0}, - { XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, - { XK_Next, ControlMask, "\033[6;5~", 0, 0}, - { XK_Next, ShiftMask, "\033[6;2~", 0, 0}, - { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0}, - { XK_F1, XK_NO_MOD, "\033OP" , 0, 0}, - { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, - { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, - { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, - { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, - { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, - { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0}, - { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, - { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, - { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, - { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, - { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, - { XK_F3, XK_NO_MOD, "\033OR" , 0, 0}, - { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, - { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, - { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, - { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, - { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, - { XK_F4, XK_NO_MOD, "\033OS" , 0, 0}, - { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, - { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, - { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, - { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, - { XK_F5, XK_NO_MOD, "\033[15~", 0, 0}, - { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, - { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, - { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, - { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, - { XK_F6, XK_NO_MOD, "\033[17~", 0, 0}, - { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, - { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, - { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, - { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, - { XK_F7, XK_NO_MOD, "\033[18~", 0, 0}, - { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, - { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, - { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, - { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, - { XK_F8, XK_NO_MOD, "\033[19~", 0, 0}, - { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, - { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, - { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, - { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, - { XK_F9, XK_NO_MOD, "\033[20~", 0, 0}, - { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, - { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, - { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, - { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, - { XK_F10, XK_NO_MOD, "\033[21~", 0, 0}, - { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, - { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, - { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, - { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, - { XK_F11, XK_NO_MOD, "\033[23~", 0, 0}, - { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, - { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, - { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, - { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, - { XK_F12, XK_NO_MOD, "\033[24~", 0, 0}, - { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, - { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, - { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, - { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, - { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0}, - { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0}, - { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0}, - { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0}, - { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0}, - { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0}, - { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0}, - { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0}, - { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0}, - { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0}, - { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0}, - { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0}, - { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0}, - { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0}, - { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0}, - { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0}, - { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0}, - { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0}, - { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0}, - { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0}, - { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0}, - { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, - { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, -}; - -/* - * Selection types' masks. - * Use the same masks as usual. - * Button1Mask is always unset, to make masks match between ButtonPress. - * ButtonRelease and MotionNotify. - * If no match is found, regular selection is used. - */ -static uint selmasks[] = { - [SEL_RECTANGULAR] = Mod1Mask, -}; - -/* - * Printable characters in ASCII, used to estimate the advance width - * of single wide characters. - */ -static char ascii_printable[] = - " !\"#$%&'()*+,-./0123456789:;<=>?" - "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" - "`abcdefghijklmnopqrstuvwxyz{|}~"; diff --git a/st-0.8.4/st b/st-0.8.4/st index 69a6213314f9b5e7ed248c082a90d1857795cbdf..17a948947cbff115a61228238ccb270ca4ea7b61 100755 GIT binary patch delta 2018 zcmZ{l4{Q@v7{K4xt=JPruK{-LfUPYt7Rde-wy|PhD+!|$g(4uUlC6sg8AwD7lJO_N zjKp=Lk?|3(1d?@$nxYa|E_z!S(2+Pc6Jd+6%$Ud^kqu0=jK2zqUw5y{F0o1Pz4!Zl z@4NTzy}K7}nGkK6aIjBEl(Vs4qWPy!DnuuYHN<)2%Yp(e$aF+2nW&WpDkjiBn5)GH z7x7X#0j1#hzjTQVt$PB6w7pZkv7GRpFNP{^cEyWtG_A8d?wuS_j;EztLB!VSlFiBo zW70aY(*dnw$9}Rdo!xy;vjqqqH_%E^!h;OSXhPL{+*oD5<= zk%ny1_JETS-F*MTwrt7sH@A;;7Vh%}Djfd|jhvgXCP%Ur=Eb`Avh&$r}!T@X-Bt{=E7gq)J`Ad)`vAtX^vlKQ!}m9@e!la z=X30zey*=)M)7|=WPp2$`_wK0 zTzIm5XI6M6V`kSN>1nsesy*g4-&5=~&Y%9=A(0AHfgse)5^_v{T5Y{3=X zxv){$-Tkv+%KlQuM$MI7-p=IbchoFq?7~gGg&B)EPm(3dSG_0GVKW9U<-ljS%ypceb=bDipqeo3gy08@FJe+E6KRE zK)Y!&`O`!Fg)oFg{fi-_Z0nz7aCFu%_FA~;SZ=b&-BZZeZwq}FjiI}YrPFGkFT>U! zn`yD;U&)6m<((@N0nRB~uI{v0XDw&U`({OGz`M30blSP3$x10 zJ>~9s>aY>qX{ud-J66^0gk=*ABS!gyTsQ}!?9PK6u*$3Q;1on<$cG#Q%a)yVBUmWc z=fhr%8>|pip#YW}4QZgRD1v!ewnXav;CuE7Z`Y|uS3*k~W%R73WTLupHCzO+tM0X6 zHVUavfL*P43#!wJpQuWDtGqP`bbj#jCbe_lHZle*lLgh*AY7ZB9N9;WkS9bvT0~Us zXoQC#r22_+#{pO%q>enR{3kUncAnMFkLNPk8-{%0-_us!5vES57b~uIgkc!|0TJH3 A@&Et; delta 2029 zcmZ{l4@?tR9LL}9poW`b+bLd)LR*X(ZYdN8T3j4-MlHGtMsajAP_{+cpG?S{LFVQ# zGb;)R{^H6q6Nlb=ZI*KZd&GGOw?v1n>(aHyf^LA7KCwG^nBM&DYyny+2P zOSuaQ!1jOLg_G6hVH6W~&0gMoJG7(OUccb`pH_Tx@Z%PX|IBLnP(q>!9M~~eGCTRh zB&m(qF^^g)#G$zoy5||hoi|ldf-p}qmud2EaqGn#vQ-+}$Za)N&XX`gz1cW%Vk?oP zG=td2i5vTfIEe%}DZ^1BRYW>DsX|+tgl$BQa#D-yh=hoo;KYaZL?(!Q%1Ij@Cz6?N z5c@gl#LGm=h@9mlh{kjYeME*i389NfkjM|5M6iZPl*koMqS!&iWHE@paWa8J>C!Hi zt4>vXRBv&cq~U*ZZqV@CoSQTp#?`s7YPgQ`OqJsni_u)7$^0{@w)JAGg=R`)uMViT z8v85~_;8f2EwQUPph;GJq9%iAvr6W$#twg=+UvNEtTk`yI24~ztpn@HIyJWcv})aW zoUB)4>p<?>T=cEm5C?C+|-{-ayJ1B3; zFo?%E3E~jtdo}q}+=dV`XdE>5OKu~WL)Oc;ZhSpNxUIs<4C(%AjjaRua7O*YB~;d+dZ7t|!eM;GGZ&iiNlzh^Vw-2->_u0ojl1FJZOQI^%Z9Hpb|=LuU+`>A zgb8^?`S#V|!k*3sL28s&b^RsGd}b44w>}qMO}e2s=sa@CN0$WnRn9s3ng~`r60A$z zQ_Pq?GeSD$+GI7P-|z+9EvQCUcN(n5itYzf=l>V-O$p7M3`OO>?w8}5QrHzdD;FAU};FXlW(mdYOv9!Z4f&~w%TpW%+PhhPNfoO=im zA3HY&LCg!gY~?h()KQ2Ur0k~pW_{+FG5w~#F?~6e9^FRthv$QUC&SL<%S+TBjdebL zU?`WSGH>WnsF$}5%@AzgRWkN?Q{H>_SYh9u%h)eV-2=LY8;m8;T%V@b`d6*68y`NO z4IAZW&rb(9A#c4-E=4X9PX0c&)E zo+)edU{UJbMI1;{S7LnGRx9roLwiE3xAl+>4(0jvFaS`f287%_!sJT#S;Jk diff --git a/st-0.8.4/x.o b/st-0.8.4/x.o index 4e5a21b31090b44bf1544725605af2e893e6b540..29a77985f30d69d8e854257a5b8b1128f892e29f 100644 GIT binary patch delta 157 zcmca{j^)ESmI)e+8#Zbt>awvgGBE6S*gQe^jxZB5-H*U#&yDsKc{PoGwL(3vTctNXO!b+