From 514457a9d04ad892c6f22977301c9f175d19d228 Mon Sep 17 00:00:00 2001 From: "Michael D. Lowis" Date: Wed, 31 May 2017 09:12:28 -0400 Subject: [PATCH] rename xfilepick and xtagpick --- Makefile | 10 +++++----- TODO.md | 3 +++ config.h | 12 ++++++------ docs/pick.1 | 2 +- docs/pick.1.md | 2 +- docs/{xfilepick.1 => pickfile.1} | 4 ++-- docs/{xfilepick.1.md => pickfile.1.md} | 2 +- docs/{xtagpick.1 => picktag.1} | 0 docs/{xtagpick.1.md => picktag.1.md} | 0 docs/tide.1 | 6 +++--- docs/tide.1.md | 6 +++--- xfilepick => pickfile | 0 xtagpick => picktag | 0 13 files changed, 25 insertions(+), 22 deletions(-) rename docs/{xfilepick.1 => pickfile.1} (69%) rename docs/{xfilepick.1.md => pickfile.1.md} (62%) rename docs/{xtagpick.1 => picktag.1} (100%) rename docs/{xtagpick.1.md => picktag.1.md} (100%) rename xfilepick => pickfile (100%) rename xtagpick => picktag (100%) diff --git a/Makefile b/Makefile index 0629d3b..7220842 100644 --- 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 cab8f26..249a880 100644 --- 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 a682552..f48a0f1 100644 --- 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 4c0119f..e1c0c46 100644 --- 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 81757f1..7d0e983 100644 --- 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 39cf645..35a38cf 100644 --- 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 6db4df0..600dec9 100644 --- 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 8fb6da6..2f06f0e 100644 --- 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 21dd9bb..c7c2968 100644 --- 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 -- 2.52.0