diff --git a/docs/docs.md b/docs/docs.md index 90233fb..970c375 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -176,8 +176,8 @@ You may use long, descriptive arguments or the shorter arguments. `-hpl, --hide-powerline` : Hide powerline -`-hc, --hide-cursor` -: Hide cursor +`-hc, --hide-caret, --hide-cursor` +: Hide caret `-hhl, --hide-highlighting` : Hide highlight @@ -209,8 +209,8 @@ You may use long, descriptive arguments or the shorter arguments. `-spl, --show-powerline` : Show powerline -`-sc, --show-cursor` -: Show cursor +`-sc, --show-caret, --show-cursor` +: Show caret `-shl, --show-highlighting` : Show highlight diff --git a/docs/example.Xresources b/docs/example.Xresources index 80a6037..ce0889f 100644 --- a/docs/example.Xresources +++ b/docs/example.Xresources @@ -114,7 +114,7 @@ spmenu.hideitem: 0 spmenu.hideprompt: 0 spmenu.hideinput: 0 spmenu.hidepowerline: 0 -spmenu.hidecursor: 0 +spmenu.hidecaret: 0 spmenu.hidehighlight: 0 spmenu.hideimage: 0 diff --git a/docs/spmenu.conf b/docs/spmenu.conf index 7436b57..c82b279 100644 --- a/docs/spmenu.conf +++ b/docs/spmenu.conf @@ -89,7 +89,7 @@ spmenu = items = 0; prompt = 0; powerline = 0; - cursor = 0; + caret = 0; highlight = 0; matchcount = 0; mode = 0; diff --git a/libs/argv.c b/libs/argv.c index 8aa7d17..5f08e2d 100644 --- a/libs/argv.c +++ b/libs/argv.c @@ -145,10 +145,10 @@ readargs(int argc, char *argv[]) hidepowerline = 0; } else if (!strcmp(argv[i], "-sin") || (!strcmp(argv[i], "--show-input"))) { // show input hideinput = 0; - } else if (!strcmp(argv[i], "-hc") || (!strcmp(argv[i], "--hide-cursor"))) { // hide cursor - hidecursor = 1; - } else if (!strcmp(argv[i], "-sc") || (!strcmp(argv[i], "--show-cursor"))) { // show cursor - hidecursor = 0; + } else if (!strcmp(argv[i], "-hc") || (!strcmp(argv[i], "--hide-cursor") || (!strcmp(argv[i], "--hide-caret")))) { // hide cursor + hidecaret = 1; + } else if (!strcmp(argv[i], "-sc") || (!strcmp(argv[i], "--show-cursor") || (!strcmp(argv[i], "--show-caret")))) { // show cursor + hidecaret = 0; } else if (!strcmp(argv[i], "-hhl") || (!strcmp(argv[i], "--hide-highlighting"))) { // hide highlighting hidehighlight = 1; } else if (!strcmp(argv[i], "-shl") || (!strcmp(argv[i], "--show-highlighting"))) { // show highlighting @@ -449,7 +449,7 @@ usage(void) "spmenu -hpr, --hide-prompt Hide prompt\n" "spmenu -hip, --hide-input Hide input\n" "spmenu -hpl, --hide-powerline Hide powerline\n" - "spmenu -hc, --hide-cursor Hide cursor\n" + "spmenu -hc, --hide-caret, --hide-cursor Hide caret\n" "spmenu -hhl, --hide-highlighting Hide highlight\n" "spmenu -hi, --hide-image Hide image\n" "spmenu -sm, --show-mode Show mode indicator\n" @@ -460,7 +460,7 @@ usage(void) "spmenu -spr, --show-prompt Show prompt\n" "spmenu -sin, --show-input Show input\n" "spmenu -spl, --show-powerline Show powerline\n" - "spmenu -sc, --show-cursor Show cursor\n" + "spmenu -sc, --show-caret, --show-cursor Show caret\n" "spmenu -shl, --show-highlighting Show highlight\n" "spmenu -si, --show-image Show image\n" "spmenu -xrdb, --xrdb Load .Xresources on runtime\n" diff --git a/libs/conf/config.c b/libs/conf/config.c index c9bbce2..ef770dd 100644 --- a/libs/conf/config.c +++ b/libs/conf/config.c @@ -435,7 +435,7 @@ conf_init(void) config_setting_lookup_int(conf, "prompt", &hideprompt); // spmenu.hide.prompt config_setting_lookup_int(conf, "items", &hideitem); // spmenu.hide.items config_setting_lookup_int(conf, "powerline", &hidepowerline); // spmenu.hide.powerline - config_setting_lookup_int(conf, "cursor", &hidecursor); // spmenu.hide.cursor + config_setting_lookup_int(conf, "caret", &hidecaret); // spmenu.hide.caret config_setting_lookup_int(conf, "highlight", &hidehighlight); // spmenu.hide.highlight config_setting_lookup_int(conf, "matchcount", &hidematchcount); // spmenu.hide.matchcount config_setting_lookup_int(conf, "mode", &hidemode); // spmenu.hide.mode diff --git a/libs/draw.c b/libs/draw.c index 02e4804..a3efef4 100644 --- a/libs/draw.c +++ b/libs/draw.c @@ -292,7 +292,7 @@ drawinput(int x, int y, int w) curpos = TEXTW(text) - TEXTW(&text[cursor]); } - if ((curpos += lrpad / 2 - 1) < w && !hidecursor && !hideprompt) { + if ((curpos += lrpad / 2 - 1) < w && !hidecaret && !hideprompt) { drw_setscheme(drw, scheme[SchemeCaret]); drw_rect(drw, x + curpos, 2 + (bh - fh) / 2, 2, fh - 4, 1, 0); } diff --git a/libs/xresources.h b/libs/xresources.h index c882c2a..44b9437 100644 --- a/libs/xresources.h +++ b/libs/xresources.h @@ -80,7 +80,8 @@ ResourcePref resources[] = { { "hideprompt", INTEGER, &hideprompt }, { "hideinput", INTEGER, &hideinput }, { "hidepowerline", INTEGER, &hidepowerline }, - { "hidecursor", INTEGER, &hidecursor }, + { "hidecaret", INTEGER, &hidecaret }, + { "hidecursor", INTEGER, &hidecaret }, { "histdup", INTEGER, &histdup }, { "casesensitive", INTEGER, &casesensitive }, { "imagewidth", INTEGER, &imagewidth }, diff --git a/options.h b/options.h index 8568843..58684bf 100644 --- a/options.h +++ b/options.h @@ -81,7 +81,7 @@ static int hiderarrow = 0; /* Hide right arrow (0/1) */ static int hideitem = 0; /* Hide item (0/1) */ static int hideprompt = 0; /* Hide prompt (0/1) */ static int hidepowerline = 0; /* Hide powerline (0/1) */ -static int hidecursor = 0; /* Hide cursor (0/1) */ +static int hidecaret = 0; /* Hide caret (0/1) */ static int hidehighlight = 0; /* Hide highlight (0/1) */ static int hidematchcount = 0; /* Hide match count (0/1) */ static int hidemode = 0; /* Hide mode (0/1) */ diff --git a/spmenu.1 b/spmenu.1 index b2a9829..491c3f1 100644 --- a/spmenu.1 +++ b/spmenu.1 @@ -194,8 +194,8 @@ Hide input \f[V]-hpl, --hide-powerline\f[R] Hide powerline .TP -\f[V]-hc, --hide-cursor\f[R] -Hide cursor +\f[V]-hc, --hide-caret, --hide-cursor\f[R] +Hide caret .TP \f[V]-hhl, --hide-highlighting\f[R] Hide highlight @@ -227,8 +227,8 @@ Show input \f[V]-spl, --show-powerline\f[R] Show powerline .TP -\f[V]-sc, --show-cursor\f[R] -Show cursor +\f[V]-sc, --show-caret, --show-cursor\f[R] +Show caret .TP \f[V]-shl, --show-highlighting\f[R] Show highlight