Added a few new features

.gitignore

@@ -2,5 +2,4 @@ fzy
 fzytest
 *.o
 *.d
-config.h
 test/acceptance/vendor/bundle

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.0
+VERSION=1.1
 
 CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
 CFLAGS+=-MD -Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps -Werror=vla
@@ -31,11 +31,11 @@ check: test/fzytest
 fzy: $(OBJECTS)
 	$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) $(LIBS)
 
-%.o: %.c config.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+#%.o: %.c config.h
+#	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
-config.h: src/config.def.h
-	cp src/config.def.h config.h
+#config.h: src/config.def.h
+#	cp src/config.def.h config.h
 
 install: fzy
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -45,15 +45,20 @@ install: fzy
 	cp fzy.1 $(DESTDIR)$(MANDIR)/man1/
 	chmod 644 ${DESTDIR}${MANDIR}/man1/fzy.1
 
+uninstall:
+	rm -- $(DESTDIR)$(BINDIR)/fzy
+	rm -- $(DESTDIR)$(MANDIR)/fzy.1
+
 fmt:
 	clang-format -i src/*.c src/*.h
 
 clean:
 	rm -f fzy test/fzytest src/*.o src/*.d deps/*/*.o
 
-veryclean: clean
-	rm -f config.h
+#veryclean: clean
+#	rm -f config.h
 
-.PHONY: test check all clean veryclean install fmt acceptance
+#.PHONY: test check all clean veryclean install fmt acceptance
+.PHONY: test check all clean install fmt acceptance
 
 -include $(OBJECTS:.o=.d)

README.md

@@ -2,22 +2,10 @@
 
 **fzy** is a fast, simple fuzzy text selector for the terminal with an advanced scoring algorithm.
 
-[Try it out online!](http://jhawthorn.github.io/fzy-demo)
+**Disclaimer**: This fork (originaly intended to make fzy work with [the clifm file manager](https://github.com/leo-arch/clifm)) adds a few new features to the origianl fzy, including basic color support and multi-selection. Consult the manpage for more information.
 
 ![](http://i.hawth.ca/u/fzy_animated_demo.svg)
 
-<blockquote>
-It's been kind of life-changing.
--<a href="https://github.com/graygilmore/">@graygilmore</a>
-</blockquote>
-
-<blockquote>
-fzy works great btw
--<a href="https://twitter.com/alexblackie/status/719297828892188672">@alexblackie</a>
-</blockquote>
-
- [![Build Status](https://github.com/jhawthorn/fzy/workflows/CI/badge.svg)](https://github.com/jhawthorn/fzy/actions)
-
 ## Why use this over fzf, pick, selecta, ctrlp, ...?
 
 fzy is faster and shows better results than other fuzzy finders.
@@ -34,32 +22,13 @@ Rather than clearing the screen, fzy displays its interface directly below the c
 
 ## Installation
 
-**macOS**
-
-Using Homebrew
-
-    brew install fzy
-
-Using MacPorts
-
-    sudo port install fzy
-
-**[Arch Linux](https://www.archlinux.org/packages/?sort=&q=fzy&maintainer=&flagged=)/MSYS2**: `pacman -S fzy`
-
-**[FreeBSD](https://www.freebsd.org/cgi/ports.cgi?query=fzy&stype=all)**: `pkg install fzy`
-
-**[Gentoo Linux](https://packages.gentoo.org/packages/app-shells/fzy)**: `emerge -av app-shells/fzy`
-
-**[Ubuntu](https://packages.ubuntu.com/search?keywords=fzy&searchon=names&suite=bionic&section=all)/[Debian](https://packages.debian.org/search?keywords=fzy&searchon=names&suite=all&section=all)**: `apt-get install fzy`
-
-**[pkgsrc](http://pkgsrc.se/misc/fzy) (NetBSD and others)**: `pkgin install fzy`
-
-**[openSUSE](https://software.opensuse.org/package/fzy)**: `zypper in fzy`
-
-### From source
-
-    make
-    sudo make install
+```sh
+mkdir build && cd build
+git clone https://github.com/leo-arch/fzy
+cd fzy
+make
+sudo make install
+```
 
 The `PREFIX` environment variable can be used to specify the install location,
 the default is `/usr/local`.
@@ -98,6 +67,14 @@ nnoremap <leader>v :call FzyCommand("ag . --silent -l -g ''", ":vs")<cr>
 nnoremap <leader>s :call FzyCommand("ag . --silent -l -g ''", ":sp")<cr>
 ```
 
+### Use with [clifm](https://github.com/leo-arch/clifm)
+
+Just run clifm as follows:
+
+```sh
+clifm --fzytab
+```
+
 ## Sorting
 
 fzy attempts to present the best matches first. The following considerations are weighted when sorting:
@@ -109,9 +86,3 @@ It prefers matching the beginning of words: `amp` is likely to match <tt><b>a</b
 It prefers shorter matches: `abce` matches <tt><b>abc</b>d<b>e</b>f</tt> over <tt><b>abc</b> d<b>e</b></tt>.
 
 It prefers shorter candidates: `test` matches <tt><b>test</b>s</tt> over <tt><b>test</b>ing</b></tt>.
-
-## See Also
-
-* [fzy.js](https://github.com/jhawthorn/fzy.js) Javascript port
-
-

fzy.1

@@ -1,4 +1,4 @@
-.TH FZY 1 "2018-09-23" "fzy 1.0"
+.TH FZY 1 "Jul 9, 2022" "fzy 1.0"
 .SH NAME
 fzy \- A fuzzy text selector menu for the terminal.
 .SH SYNOPSIS
@@ -25,6 +25,14 @@ How many lines of items to display. If unspecified, defaults to 10 lines.
 Input prompt (default: '> ')
 .
 .TP
+.BR \-P ", " \-\-pad =\fINUM\fR
+Left pad the list of matches NUM places (default: 0)
+.
+.TP
+.BR \-m ", " \-\-multi
+Enable multi-selection
+.
+.TP
 .BR \-s ", " \-\-show-scores
 Show the scores for each item.
 .
@@ -52,52 +60,121 @@ Usage help.
 .BR \-v ", " \-\-version
 Usage help.
 .
+.TP
+.BR \-\-pointer =\fICHAR\fR
+Pointer to highlightled match (default '>')
+.
+.TP
+.BR \-\-marker =\fICHAR\fR
+Multi-select marker (default '*')
+.
+.TP
+.BR \-\-cyclic
+Enable cyclic scrolling
+.
+.TP
+.BR \-\-tab-accetps
+TAB accepts: print selection and exit
+.
+.TP
+.BR \-\-right-accepts
+Right arrow key accepts: print selection and exit
+.
+.TP
+.BR \-\-left-aborts
+Left arrow key aborts: cancel selection and exit
+.
+.TP
+.BR \-\-reverse
+List from top, prompt at bottom
+.
+.TP
+.BR \-\-no\-color
+Run colorless
+.
 .SH KEYS
 .
 .TP
 .BR "ENTER"
-Print the selected item to stdout and exit
+Print the selected items to stdout and exit. If \fI\-\-right\-accepts\fR is set, the Right arrow key performs the same function. Equally, if \fI\-\-tab\-accepts\fR is set, the TAB key performs the same function.
+.TP
+.BR "ESC"
+Exit without printing any result. If \fI\-\-left\-aborts\fR is set, the Left arrow key performs the same function.
 .TP
 .BR "Ctrl+c, Ctrl+g, Esc"
 Exit with status 1, without making a selection.
 .TP
 .BR "Up Arrow, Ctrl+p, Ctrl+k"
-Select the previous item
+Select the previous item.
 .TP
 .BR "Down Arrow, Ctrl+n, Ctrl+j"
-Select the next item
+Select the next item.
 .TP
-Tab
-Replace the current search string with the selected item
+.BR "TAB"
+Replace the current search string with the selected item. If the multi-selection mode (\fI-m, --multi\fR) is enabled, TAB is used to (un)mark the selected entry instead.
 .TP
 .BR "Backspace, Ctrl+h"
-Delete the character before the cursor
+Delete the character before the cursor.
 .TP
 .BR Ctrl+w
-Delete the word before the cursor
+Delete the word before the cursor.
 .TP
 .BR Ctrl+u
-Delete the entire line
+Delete the entire line.
+.
+.SH COLORS
+Interface colors are read from the environment variable \fBFZY_COLORS\fR using a simple pattern: the \fIorder\fR of the color code specifies which \fIinterface element\fR the color must be applied to, while the \fIcontent\fR of this code defines the \fIcolor\fR of this element.
+.sp
+\fBA\fR. The order is this:
+ 1) Prompt
+ 2) Pointer
+ 3) Marker
+ 4) Current entry foreground
+ 5) Current entry background
+.sp
+\fBB\fR. Possible content (available colors):
+ 0 = black
+ 1 = red
+ 2 = green
+ 3 = yellow
+ 4 = blue
+ 5 = magenta
+ 6 = cyan
+ 7 = white
+.sp
+Use a \fBb\fR before the color to make it bold/bright. A dash (\-) means that the color for the interface element in that position must be skipped.
+.sp
+For example, \fBFZF_COLORS="\-b1b2\-4"\fR is to be read as follows:
+.sp
+ \fB\-\fR: no prompt color
+ \fBb1\fR: bold red pointer color
+ \fBb2\fR: bold green marker color
+ \fB\-\fR: no color for the current entry foreground
+ \fB4\fR: blue current entry background
+.sp
+Default colors are: \fBb6b1b2b40\fR
 .
 .SH USAGE EXAMPLES
 .
 .TP
 .BR "ls | fzy"
 Present a menu of items in the current directory
 .TP
-.BR "ls | fzy -l 25"
+.BR "ls | fzy \-l 25"
 Same as above, but show 25 lines of items
 .TP
-.BR "vi $(find -type f | fzy)"
+.BR "vi $(find \-type f | fzy)"
 List files under the current directory and open the one selected in vi.
 .TP
-.BR "cd $(find -type d | fzy)"
+.BR "cd $(find \-type d | fzy)"
 Present all directories under current path, and change to the one selected.
 .TP
 .BR "ps aux | fzy | awk '{ print $2 }' | xargs kill"
 List running processes, kill the selected process
 .TP
-.BR "git checkout $(git branch | cut -c 3- | fzy)"
+.BR "git checkout $(git branch | cut \-c 3\- | fzy)"
 Same as above, but switching git branches.
-.SH AUTHOR
+.SH AUTHORS
 John Hawthorn <[email protected]>
+
+L. Abramovich <[email protected]>

src/bonus.h

@@ -1,7 +1,7 @@
 #ifndef BONUS_H
 #define BONUS_H BONUS_H
 
-#include "../config.h"
+#include "config.h"
 
 #define ASSIGN_LOWER(v) \
 	['a'] = (v), \