diff --git a/src/main.sh b/src/main.sh index 5e0ddba..502848f 100755 --- a/src/main.sh +++ b/src/main.sh @@ -478,18 +478,11 @@ open \"https://musicbrainz.org/\$t/{r3}\"" \ --bind="$KEYS_OPEN:execute-silent: [ {4} ] || exit 0 open \"\$(dirname {4})\"" \ - --bind="$KEYS_SELECT_ARTIST:" \ - --bind="$KEYS_FILTER_LOCAL:" \ - --bind="$KEYS_FILTER_1:" \ - --bind="$KEYS_FILTER_2:" \ - --bind="$KEYS_FILTER_3:" \ - --bind="$KEYS_FILTER_4:" \ - --bind="$KEYS_SWITCH_ARTIST_ALBUM:" \ - --bind="$KEYS_SWITCH_LOCAL_REMOTE:" \ + --bind="$KEYS_QUIT:print($VIEW_QUIT)+accept" \ + --bind="$KEYS_N_QUIT:transform:$IN_NORMAL_MODE && ($IN_LIST_ARTISTS_VIEW && echo \"print($VIEW_QUIT)+accept\" || $0 --draw $MODE_NORMAL $VIEW_LIST_ARTISTS) || $PUT_FZF_KEY_LOGIC" \ --bind="$KEYS_PLAY:" \ --bind="$KEYS_QUEUE:" \ --bind="$KEYS_SHOW_PLAYLIST:" \ - --bind="$KEYS_QUIT:print($VIEW_QUIT)+accept" \ --delimiter="\t" \ --with-nth="{1}" || true ) diff --git a/src/sh/keys.sh b/src/sh/keys.sh index 8b08eae..2dffdec 100644 --- a/src/sh/keys.sh +++ b/src/sh/keys.sh @@ -45,12 +45,15 @@ # - KEYS_FILTER_8: Preset query `8` depending on the view (see `src/sh/filter.sh`) # - KEYS_FILTER_9: Preset query `9` depending on the view (see `src/sh/filter.sh`) # +# Specials: +# - KEYS_BROWSE: Open MusicBrainz webpage of the selected item +# - KEYS_OPEN: Open file manager in the directory of the selected item +# - KEYS_QUIT: Quit application +# - KEYS_N_QUIT: Quit application if we are in VIEW_LIST_ARTISTS, else go to +# view VIEW_LIST_ARTISTS (normal mode) +# # Playback: # -# Specials: -# - $KEYS_BROWSE: Open MusicBrainz webpage of the selected item -# - $KEYS_OPEN: Open file manager in the directory of the selected item -# - $KEYS_QUIT: Quit application # Mode selection: KEYS_I_NORMAL="${KEYS_I_NORMAL:-"esc"}" @@ -93,13 +96,13 @@ KEYS_FILTER_9="${KEYS_FILTER_9:-"alt-9"}" KEYS_FILTER_0="${KEYS_FILTER_9:-"alt-0"}" KEYS_FILTER="$KEYS_FILTER_LOCAL,$KEYS_FILTER_1,$KEYS_FILTER_2,$KEYS_FILTER_3,$KEYS_FILTER_4,$KEYS_FILTER_5,$KEYS_FILTER_6,$KEYS_FILTER_7,$KEYS_FILTER_8,$KEYS_FILTER_9,$KEYS_FILTER_0" -# ... - # Specials: +KEYS_BROWSE="${KEYS_BROWSE:-"alt-b"}" +KEYS_OPEN="${KEYS_OPEN:-"alt-o"}" KEYS_QUIT="${KEYS_QUIT:-"ctrl-c"}" +KEYS_N_QUIT="${KEYS_N_QUIT:-"q"}" ## Not yet characterized -KEYS_N_QUIT="${KEYS_N_QUIT:-"q"}" KEYS_INPUT_SINGLE='0,1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,!,",#,$,%,&,\,(,),*,+,,,-,.,/,:,;,<,=,>,?,@,[,\,\,],^,_,`,{,|,},~' KEYS_INPUT_SINGLE="$KEYS_INPUT_SINGLE,'" @@ -107,8 +110,6 @@ KEYS_INPUT_SPECIAL="space,backspace,delete,left,right" export KEYS_INPUT_SINGLE KEYS_INPUT_SPECIAL # Normal and insert mode -KEYS_BROWSE="${KEYS_BROWSE:-"alt-b"}" -KEYS_OPEN="${KEYS_OPEN:-"alt-o"}" KEYS_SELECT_ARTIST="${KEYS_SELECT_ARTIST:-"ctrl-a"}" KEYS_PLAY="${KEYS_PLAY:-"enter"}" KEYS_QUEUE="${KEYS_QUEUE:-"ctrl-alt-m"}"