prepared dmenu-1.8, shortened command line options (-font is -fn, -selbg is -sb, -selfg is -sf, -normbg is -nb, -normfg is -nf now)

2 files changed, 26 insertions, 26 deletions

diff --git a/dmenu.1 b/dmenu.1
index 5a3956d..9cc80a5 100644
--- a/dmenu.1
+++ b/dmenu.1
@@ -3,13 +3,13 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
-.RB [ \-bottom ]
-.RB [ \-font " <name>"]
-.RB [ \-normbg " <color>"]
-.RB [ \-normfg " <color>"]
-.RB [ \-selbg " <color>"]
-.RB [ \-selfg " <color>"]
+.RB [ \-b ]
+.RB [ \-fn " <font>"]
+.RB [ \-nb " <color>"]
+.RB [ \-nf " <color>"]
 .RB [ \-p " <prompt>"]
+.RB [ \-sb " <color>"]
+.RB [ \-sf " <color>"]
 .RB [ \-t " <seconds>"]
 .RB [ \-v ]
 .SH DESCRIPTION
@@ -20,27 +20,27 @@ It manages huge amounts (up to 10.000 and more) of user defined menu items
 efficiently.
 .SS Options
 .TP
-.B \-bottom
+.B \-b
 makes dmenu appear at the screen bottom (by default it appears at the screen top).
 .TP
-.B \-font <name>
+.B \-font <font>
 defines the font.
 .TP
-.B \-normbg <color>
+.B \-nb <color>
 defines the normal background color (#RGB, #RRGGBB, and color names are supported).
 .TP
-.B \-normfg <color>
+.B \-nf <color>
 defines the normal foreground color (#RGB, #RRGGBB, and color names are supported).
 .TP
-.B \-selbg <color>
+.B \-p <prompt>
+defines a prompt to be displayed before the input area.
+.TP
+.B \-sb <color>
 defines the selected background color (#RGB, #RRGGBB, and color names are supported).
 .TP
-.B \-selfg <color>
+.B \-sf <color>
 defines the selected foreground color (#RGB, #RRGGBB, and color names are supported).
 .TP
-.B \-p <prompt>
-defines a prompt to be displayed before the input area.
-.TP
 .B \-t <seconds>
 defines the seconds to wait for standard input, before exiting (default is 3).
 .TP
diff --git a/main.c b/main.c
index 9ef0bae..69214dd 100644
--- a/main.c
+++ b/main.c
@@ -348,27 +348,27 @@ main(int argc, char *argv[]) {
         timeout.tv_sec = 3;
         /* command line args */
         for(i = 1; i < argc; i++)
-                if(!strncmp(argv[i], "-bottom", 8)) {
+                if(!strncmp(argv[i], "-b", 3)) {
                         bottom = True;
                 }
-                else if(!strncmp(argv[i], "-font", 6)) {
+                else if(!strncmp(argv[i], "-fn", 4)) {
                         if(++i < argc) font = argv[i];
                 }
-                else if(!strncmp(argv[i], "-normbg", 8)) {
+                else if(!strncmp(argv[i], "-nb", 4)) {
                         if(++i < argc) normbg = argv[i];
                 }
-                else if(!strncmp(argv[i], "-normfg", 8)) {
+                else if(!strncmp(argv[i], "-nf", 4)) {
                         if(++i < argc) normfg = argv[i];
                 }
-                else if(!strncmp(argv[i], "-selbg", 7)) {
+                else if(!strncmp(argv[i], "-p", 3)) {
+                        if(++i < argc) prompt = argv[i];
+                }
+                else if(!strncmp(argv[i], "-sb", 4)) {
                         if(++i < argc) selbg = argv[i];
                 }
-                else if(!strncmp(argv[i], "-selfg", 7)) {
+                else if(!strncmp(argv[i], "-sf", 4)) {
                         if(++i < argc) selfg = argv[i];
                 }
-                else if(!strncmp(argv[i], "-p", 3)) {
-                        if(++i < argc) prompt = argv[i];
-                }
                 else if(!strncmp(argv[i], "-t", 3)) {
                         if(++i < argc) timeout.tv_sec = atoi(argv[i]);
                 }
@@ -377,8 +377,8 @@ main(int argc, char *argv[]) {
                         exit(EXIT_SUCCESS);
                 }
                 else
-                        eprint("usage: dmenu [-bottom] [-font <name>] [-{norm,sel}{bg,fg} <color>]\n"
-                                "             [-p <prompt>] [-t <seconds>] [-v]\n", stdout);
+                        eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>] [-p <prompt>]\n"
+                                "             [-sb <color>] [-sf <color>] [-t <seconds>] [-v]\n", stdout);
         setlocale(LC_CTYPE, "");
         dpy = XOpenDisplay(0);
         if(!dpy)