diff --git a/options.h b/options.h index 4e1d7fa..92b80d3 100644 --- a/options.h +++ b/options.h @@ -24,9 +24,9 @@ static int ypos = 0; /* Y position to offset spmenu */ static int managed = 0; /* Let your window manager manage spmenu? */ /* Powerline options */ -static int powerlineprompt = 0; /* Enable powerline for the prompt */ -static int powerlinecount = 0; /* Enable powerline for the match count */ -static int powerlinemode = 0; /* Enable powerline for the mode indicator */ +static int powerlineprompt = 1; /* Enable powerline for the prompt */ +static int powerlinecount = 1; /* Enable powerline for the match count */ +static int powerlinemode = 1; /* Enable powerline for the mode indicator */ static int promptpwlstyle = 0; /* Prompt powerline style (0: >, 1: \) */ static int matchcountpwlstyle = 0; /* Match count powerline style (0: <, 1: /) */ static int modepwlstyle = 0; /* Mode indicator powerline style (0: <, 1: /) */ diff --git a/scripts/spmenu_desktop b/scripts/spmenu_desktop deleted file mode 100755 index 91f397e..0000000 --- a/scripts/spmenu_desktop +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/sh -# spmenu_desktop - list .desktop entries with the icon. -# NOTE: Please pull request if you have any possible improvements. -[ -z "$CONFDIR" ] && CONFDIR="${XDG_CONFIG_HOME:-$HOME/.config}" -[ -z "$DESKTOP_DIR" ] && DESKTOP_DIR="/usr/share/applications" -[ -z "$ICON_DIR" ] && ICON_DIR="/usr/share/icons/hicolor /usr/share/pixmaps" -[ -z "$TEMPORARY_DIR" ] && TEMPORARY_DIR="$CONFDIR/spmenu/desktop/cache" -[ -z "$USEIMAGE" ] && USEIMAGE=true -[ -z "$config" ] && config="$CONFDIR/spmenu/desktop/config" -[ -z "$cache" ] && cache=true -[ -z "$RUNLAUNCHER" ] && RUNLAUNCHER=spmenu -[ -z "$RUNLAUNCHER_ARGS" ] && RUNLAUNCHER_ARGS="--lines 20 --columns 1 --image-size 100 --image-gaps 20 \$*" -[ -z "$LOGFILE" ] && LOGFILE="/tmp/spmenu_desktop.log" -[ -z "$PREFIX" ] && PREFIX="/usr" - -# functions -print_menu() { res="$(print_list | $RUNLAUNCHER $RUNLAUNCHER_ARGS)"; } -prep() { mkdir -p "$TEMPORARY_DIR"; rm -f "$LOGFILE"; touch "$LOGFILE"; } -scan() { entry_c="$(find "$DESKTOP_DIR" -type f | wc -l)"; cached_c="$(find "$TEMPORARY_DIR" -type f | wc -l)"; cached="$(find "$TEMPORARY_DIR" -type f)"; } - -print_help() { -cat << EOF | $RUNLAUNCHER $RUNLAUNCHER_ARGS --lines 20 --columns 1 --normal --sgr1 "#FFFF00" --hide-cursor --no-allow-typing --no-color-items --hide-prompt --hide-powerline --hide-input --hide-right-arrow --hide-left-arrow --hide-mode --hide-match-count > /dev/null -Start typing in keywords to list out entries. Press Enter to select an entry. The selected entry will be run through a shell. -To set spmenu options, you modify \$RUNLAUNCHER_ARGS in $config. See 'spmenu --help' for a list of valid arguments to add to the variable. -To configure spmenu itself, you may copy ${DESTDIR}${PREFIX}/share/spmenu.conf to ~/.config/spmenu/spmenu.conf. - -By default, spmenu_desktop will cache entries for speed reasons. You can find these entries in ~/.config/spmenu/desktop/cache. -If you make changes to .desktop files (not new entries, modified old entries), you need to clear the cache for the changes to appear. Simply delete the directory to do this. - -- Type in '?' to show this help screen at any time. - -$(printf '\033[0;31m')Note: This may also be displayed if you deleted your spmenu configuration directory. -EOF -} - -w_conf() { -if [ ! -f "$config" ]; then -mkdir -p "$(dirname $config)" -cat << EOF > "$config" -# spmenu_desktop default configuration file -# -# This is the configuration file for the desktop launcher spmenu comes with. -# It is not the configuration file for spmenu, see ~/.config/spmenu/spmenu.conf for that. -# -# spmenu_desktop runs function 'pre_func' before listing items, the output will be passed to spmenu. It also runs function 'post_func' after spawning spmenu. -# You may create those functions below. For 'post_func', the selected item is passed as an argument (\$1). -# -# For example, to implement a basic history file: -# -# post_func() { -# rm -f /tmp/spmenu_entryhist; printf "\$1\n" >> /tmp/spmenu_entryhist -# } -# -# You can use anything POSIX compliant shells support, as well as programs available on the system. -DESKTOP_DIR="/usr/share/applications" # Directories to look for .desktop files in -ICON_DIR="/usr/share/icons/hicolor /usr/share/pixmaps" # Directories to look for icons in -TEMPORARY_DIR="\$CONFDIR/spmenu/desktop/cache" # Directory used to store cache -USEIMAGE=true # Enable image support -RUNLAUNCHER="\${RUNLAUNCHER:-spmenu}" -RUNLAUNCHER_ARGS="\${RUNLAUNCHER_ARGS:- --lines 20 --columns 1 --image-size 100 --image-gaps 20}" -LOGFILE="/tmp/spmenu_desktop.log" -EOF -fi -[ -f "$config" ] && . "$config" -} - -# cache it, this means some speed improvements -cache() { - printf "Cached: %s\n" "$cached_c" >> "$LOGFILE" - printf "Entries: %s\n" "$entry_c" >> "$LOGFILE" - [ "$cached_c" = "$entry_c" ] && return # we don't need to cache anything, it's already done - - # find - entry="$(find $DESKTOP_DIR -type f)" - icons="$(find $ICON_DIR -type f)" - - # write new entries - for i in $(seq "$entry_c"); do - cur_file="$(printf "%s" "$entry" | sed "${i}q;d")" - exec="$(grep -v "TryExec" "$cur_file" | grep -m1 "Exec=" | sed "s/Exec=//g; s/%U//g; s/%F//g; s/%u//g")" - name="$(grep "Name=" "$cur_file" | grep -v Generic | head -n 1 | sed "s/Name=//g")" - - # icon name - icon_name="$(grep "Icon=" "$cur_file" | head -n 1 | sed "s/Icon=//g")" - icon="$(printf "%s" "$icons" | grep "/$icon_name[.]" | head -n 1)" && [ ! -f "$icon" ] && icon="" - - # write the file - printf "%s\n%s\n%s\n" "Name:$name" "Executable:$exec" "Icon:$icon" > "$TEMPORARY_DIR/$(basename "$cur_file").entry" - done - - # run scan() again - scan -} - -print_list() { - command -v pre_func > /dev/null && pre_func - # print data from entries - for i in $(seq "$cached_c"); do - # current file - cur_file="$(printf "%s" "$cached" | sed "${i}q;d")" && [ ! -e "$cur_file" ] && printf "File '%s' does not exist. Skipping...\n" "$cur_file" >> "$LOGFILE" && continue - - # get details to display - title="$(head -n 1 "$cur_file" | sed "s/Name://g")" - icon="$(tail -n 1 "$cur_file" | sed "s/Icon://g")" - - [ -z "$title" ] && continue # no title isn't worth displaying, obviously - - # print it all - [ "$USEIMAGE" = "true" ] && [ ! -e "$icon" ] && USEIMAGE=false && reenable=1 - [ "$USEIMAGE" = "true" ] && printf "%s\t%s\n" "IMG:${icon}" "$title" || \ - printf "%s\n" "$title" - [ "$reenable" = "1" ] && USEIMAGE=true - done -} - -execute_program() { - [ "$res" = "?" ] && print_help && main "$@" - command -v post_func > /dev/null && post_func "$res" - [ -z "$res" ] && cached_c=0 || printf "User input: %s\n" "$res" >> "$LOGFILE" - for i in $(seq "$cached_c"); do - cur_file="$(printf "%s" "$cached" | sed "${i}q;d")" && [ ! -f "$cur_file" ] && printf "File '%s' does not exist. Skipping...\n" "$cur_file" >> "$LOGFILE" && continue - - # find the executable matching the selected name - if grep -q "Name:$res" "$cur_file"; then - exec="$(head -n 2 "$cur_file" | tail -n -1 | sed "s/Executable://g")" - printf "Current file: '%s'\n" "$cur_file" >> "$LOGFILE" - - break; - else - exec="" - continue; - fi - done - - # finally run the program - if [ -n "$exec" ]; then - /bin/sh -c "$exec" - else - [ -n "$res" ] && printf "No executable found. Try clearing cache." >> "$LOGFILE" - fi - - return 0 -} - -check() { - [ ! -d "$CONFDIR/spmenu/desktop" ] && mkdir -p "$CONFDIR/spmenu/desktop" - if [ ! -f "$CONFDIR/spmenu/desktop/.first_run" ]; then - print_help - touch "$CONFDIR/spmenu/desktop/.first_run" - fi -} - -main() { - w_conf "$@" - prep - check - scan - cache - print_menu "$@" - execute_program "$@" -} - -main "$@" diff --git a/scripts/spmenu_run b/scripts/spmenu_run index b79f07a..9755af2 100755 --- a/scripts/spmenu_run +++ b/scripts/spmenu_run @@ -1,6 +1,6 @@ #!/bin/sh # spmenu_run -# Run launcher for spmenu +# Feature rich run launcher, file lister and .desktop launcher for spmenu # Set basic variables, in case the config isn't valid, env variables and config file can override these CONFDIR="${CONFDIR:-${XDG_CONFIG_HOME:-$HOME/.config}}" @@ -28,10 +28,17 @@ KEYWORDS="${KEYWORDS:-}" DISPLAY_DUPLICATES="${DISPLAY_DUPLICATES:-false}" LS_ARGS="${LS_ARGS:- --color=always}" +DESKTOP_DIR="${DESKTOP_DIR:-${DESTDIR}${PREFIX}/share/applications}" +ICON_DIR="${ICON_DIR:-${DESTDIR}${PREFIX}/share/icons/hicolor ${DESTDIR}${PREFIX}/share/pixmaps}" +TEMPORARY_DIR="${TEMPORARY_DIR:-$CONFDIR/spmenu/run/cache}" +USEIMAGE="${USEIMAGE:-true}" +CACHE="${CACHE:-true}" +LOGFILE="${LOGFILE:-/tmp/spmenu_run.log}" + check() { [ ! -d "$CONFDIR/spmenu/run" ] && mkdir -p "$CONFDIR/spmenu/run" if [ ! -f "$CONFDIR/spmenu/run/.first_run" ]; then - print_help + print_help "$@" touch "$CONFDIR/spmenu/run/.first_run" fi } @@ -84,6 +91,8 @@ To configure spmenu, you may also copy ${DESTDIR}${PREFIX}/share/spmenu/example. $(printf '\033[0;31m')Note: This may also be displayed if you deleted your spmenu configuration directory. EOF +parse "$args" +exec_cmd "$args" } print_cli_help() { @@ -92,6 +101,7 @@ spmenu_run - Run launcher for spmenu spmenu -x, --run List entries in \$PATH. spmenu -f, --fm