rename xfilepick and xtagpick

diff --git a/Makefile b/Makefile
index 0629d3b78eb9aa14c7bcc191e8c92217ddcd892d..72208423e009015d8d192fa83c2006890114a27c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 INCS = -Iinc/
 
 BINS = tide pick xcpd term
-MAN1 = docs/tide.1 docs/pick.1 docs/xtagpick.1 docs/xfilepick.1
+MAN1 = docs/tide.1 docs/pick.1 docs/picktag.1 docs/pickfile.1
 
 LIBEDIT_OBJS =     \
        lib/buf.o      \
@@ -38,15 +38,15 @@ install: all
        cp -f tide $(PREFIX)/bin
        cp -f pick $(PREFIX)/bin
        cp -f xcpd $(PREFIX)/bin
-       cp -f xfilepick $(PREFIX)/bin
-       cp -f xtagpick $(PREFIX)/bin
+       cp -f pickfile $(PREFIX)/bin
+       cp -f picktag $(PREFIX)/bin
 
 uninstall:
        rm -f $(PREFIX)/bin/tide
        rm -f $(PREFIX)/bin/pick
        rm -f $(PREFIX)/bin/xcpd
-       rm -f $(PREFIX)/bin/xfilepick
-       rm -f $(PREFIX)/bin/xtagpick
+       rm -f $(PREFIX)/bin/pickfile
+       rm -f $(PREFIX)/bin/picktag
 
 test: $(TEST_BINS)
        for t in $(TEST_BINS); do ./$$t || exit 1; done

diff --git a/TODO.md b/TODO.md
index cab8f262b234c8c7d8bfb792dfdd28939d5bb79a..249a880d6d4acae2d9e0136f29ee3b81bf63227a 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -8,6 +8,7 @@ Up Next:
 * shortcut to jump to previous edit
 * xrandr dpi setting does not affect tide like it should
 
+
 The Future:
 
 * Ctrl+Shift+Enter copies indent of wrong line
@@ -34,6 +35,8 @@ Possible Shortcuts:
 
 Maybe think about addressing these later:
 
+* add current dir to path
+* add support for guidefiles
 * Shift+Insert should insert primary selection
 * Find shortcut should select previous word if current char is newline
 * diagnostic messages can stack up if deselected and not resolved

diff --git a/config.h b/config.h
index a68255289a660e51cb7650789e3b67f95f00fb40..f48a0f1ae33e1d92f65e3f5bb8ff634ef24b6338 100644 (file)
--- a/config.h
+++ b/config.h
@@ -9,11 +9,11 @@ extern int CLR_NormalText, CLR_SelectedText, CLR_TagsBkg, CLR_EditBkg,
 /* OS-Specific Config
  ******************************************************************************/
 #ifdef __MACH__
-#define FONT    "Monaco:size=10:antialias=true:autohint=true"
-#define LNSPACE 0
+    #define FONT    "Monaco:size=10:antialias=true:autohint=true"
+    #define LNSPACE 0
 #else
-#define FONT    "Liberation Mono:pixelsize=14:antialias=true:autohint=true"
-#define LNSPACE 2
+    #define FONT    "Liberation Mono:pixelsize=14:antialias=true:autohint=true"
+    #define LNSPACE 2
 #endif
 
 /* General Config
@@ -51,10 +51,10 @@ char* ShellCmd[] = { NULL, "-c", NULL, NULL };
 char* SedCmd[] = { "sed", "-e", NULL, NULL };
 
 /* Fuzzy Picker for files in the current directory and subdirectories */
-char* PickFileCmd[] = { "xfilepick", ".", NULL };
+char* PickFileCmd[] = { "pickfile", ".", NULL };
 
 /* Fuzzy picker for tags in a ctags database. */
-char* PickTagCmd[] = { "xtagpick", NULL, "tags", NULL, NULL };
+char* PickTagCmd[] = { "picktag", NULL, "tags", NULL, NULL };
 
 /* Open a new instance of the editor */
 char* OpenCmd[] = { "tide", NULL, NULL };

diff --git a/docs/pick.1 b/docs/pick.1
index 4c0119f373d5dbbdba6bcbcae00225c35c071dcd..e1c0c46e6d19d5d75fddc896ea6336b42a254ded 100644 (file)
--- a/docs/pick.1
+++ b/docs/pick.1
@@ -25,4 +25,4 @@ If this variable is set its contents are used to populate the status region of t
 Michael D\. Lowis
 .
 .SH "SEE ALSO"
-tide(1) pick(1) xfilepick(1) xtagpick(1)
+tide(1) pick(1) pickfile(1) picktag(1)

diff --git a/docs/pick.1.md b/docs/pick.1.md
index 81757f181c32a581bf28eb5458754ce35ab3f631..7d0e983e77ce18a19373f93ca83810f4f5970466 100644 (file)
--- a/docs/pick.1.md
+++ b/docs/pick.1.md
@@ -28,4 +28,4 @@ Michael D. Lowis
 
 ## SEE ALSO
 
-tide(1) pick(1) xfilepick(1) xtagpick(1)
+tide(1) pick(1) pickfile(1) picktag(1)

diff --git a/docs/xfilepick.1 b/docs/pickfile.1
similarity index 69%
rename from docs/xfilepick.1
rename to docs/pickfile.1
index 39cf645e2148cdd533d0085aa69b77fda27187ff..35a38cff9e73b492d1a3d247966609a3327f6cea 100644 (file)
--- a/docs/xfilepick.1
+++ b/docs/pickfile.1
@@ -1,10 +1,10 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "XFILEPICK" "1" "May 2017" "" ""
+.TH "PICKFILE" "1" "May 2017" "" ""
 .
 .SH "NAME"
-\fBxfilepick\fR \- fuzzy find a file from the current directory tree
+\fBpickfile\fR \- fuzzy find a file from the current directory tree
 .
 .SH "SYNOPSIS"
 .

diff --git a/docs/xfilepick.1.md b/docs/pickfile.1.md
similarity index 62%
rename from docs/xfilepick.1.md
rename to docs/pickfile.1.md
index 6db4df02ed142b0a0de587de1b685e751dac14e9..600dec98716d9964ea4abf30dbed759544a13f53 100644 (file)
--- a/docs/xfilepick.1.md
+++ b/docs/pickfile.1.md
@@ -1,4 +1,4 @@
-# xfilepick -- fuzzy find a file from the current directory tree
+# pickfile -- fuzzy find a file from the current directory tree
 ## SYNOPSIS
 ## DESCRIPTION
 ## OPTIONS

diff --git a/docs/xtagpick.1 b/docs/picktag.1
similarity index 100%
rename from docs/xtagpick.1
rename to docs/picktag.1

diff --git a/docs/xtagpick.1.md b/docs/picktag.1.md
similarity index 100%
rename from docs/xtagpick.1.md
rename to docs/picktag.1.md

diff --git a/docs/tide.1 b/docs/tide.1
index 8fb6da66116db638ac17661ba6e1b988022c40d4..2f06f0ed0e0386e1b3adad085a50bf9d1abc3705 100644 (file)
--- a/docs/tide.1
+++ b/docs/tide.1
@@ -274,11 +274,11 @@ Execute the selected text as described in \fBCOMMAND EXECUTION\fR\. If no text i
 .
 .TP
 \fBCtrl+o\fR
-Launch xfilepick(1) to choose a file from a recursive list of files in the current deirectory and sub directories\. This file will be opened in a new instance of \fBtide\fR\.
+Launch pickfile(1) to choose a file from a recursive list of files in the current deirectory and sub directories\. This file will be opened in a new instance of \fBtide\fR\.
 .
 .TP
 \fBCtrl+p\fR
-Launch xtagpick(1) to select a tag from a ctags(1) generated index file\. \fBtide\fR will jump to the selected ctag definition in the current window if the file is currently being edited\. Otherwise, a new instance of \fBtide\fR will be launched with the target file and the cursor set to the line containing the definition\.
+Launch picktag(1) to select a tag from a ctags(1) generated index file\. \fBtide\fR will jump to the selected ctag definition in the current window if the file is currently being edited\. Otherwise, a new instance of \fBtide\fR will be launched with the target file and the cursor set to the line containing the definition\.
 .
 .TP
 \fBCtrl+g\fR
@@ -374,4 +374,4 @@ The contents of this variable are used as the shell in which all non\-builtin co
 Michael D\. Lowis
 .
 .SH "SEE ALSO"
-tide(1) pick(1) xfilepick(1) xtagpick(1)
+tide(1) pick(1) pickfile(1) picktag(1)

diff --git a/docs/tide.1.md b/docs/tide.1.md
index 21dd9bb567a1ed6e847946a3b8e81f39fb7f7f3a..c7c29680e0e151b03442c1ecce29dd2d160e509e 100644 (file)
--- a/docs/tide.1.md
+++ b/docs/tide.1.md
@@ -305,12 +305,12 @@ search operation to be applied in the opposite direction of the previous.
     in `TEXT SELECTION`.
 
 * `Ctrl+o`:
-    Launch xfilepick(1) to choose a file from a recursive list of files in the
+    Launch pickfile(1) to choose a file from a recursive list of files in the
     current deirectory and sub directories. This file will be opened in a
     new instance of `tide`.
 
 * `Ctrl+p`:
-    Launch xtagpick(1) to select a tag from a ctags(1) generated index file.
+    Launch picktag(1) to select a tag from a ctags(1) generated index file.
     `tide` will jump to the selected ctag definition in the current window if
     the file is currently being edited. Otherwise, a new instance of `tide`
     will be launched with the target file and the cursor set to the line
@@ -402,4 +402,4 @@ Michael D. Lowis
 
 ## SEE ALSO
 
-tide(1) pick(1) xfilepick(1) xtagpick(1)
+tide(1) pick(1) pickfile(1) picktag(1)

diff --git a/xfilepick b/pickfile
similarity index 100%
rename from xfilepick
rename to pickfile

diff --git a/xtagpick b/picktag
similarity index 100%
rename from xtagpick
rename to picktag