Browse Source

swapped around options a bit again

naelstrof 7 years ago
parent
commit
dfd9462608
4 changed files with 3 additions and 3 deletions
  1. 1
    1
      slop.1
  2. BIN
      slop.1.gz
  3. 1
    1
      src/main.cpp
  4. 1
    1
      src/options.hpp

+ 1
- 1
slop.1 View File

15
 .BR \-v ", " \-\-version
15
 .BR \-v ", " \-\-version
16
 Print version and exit.
16
 Print version and exit.
17
 .TP
17
 .TP
18
-.BR \-d ", " \-\-xdisplay=\fIhostname:number.screen_number\fR
18
+.BR \-x ", " \-\-xdisplay=\fIhostname:number.screen_number\fR
19
 Sets the xdisplay to use.
19
 Sets the xdisplay to use.
20
 .TP
20
 .TP
21
 .BR \-b ", " \-\-bordersize=\fIFLOAT\fR
21
 .BR \-b ", " \-\-bordersize=\fIFLOAT\fR

BIN
slop.1.gz View File


+ 1
- 1
src/main.cpp View File

89
     std::cout << "-h, --help                    Print help and exit\n";
89
     std::cout << "-h, --help                    Print help and exit\n";
90
     std::cout << "-v, --version                 Print version and exit\n";
90
     std::cout << "-v, --version                 Print version and exit\n";
91
     std::cout << "Options\n";
91
     std::cout << "Options\n";
92
-    std::cout << "  -d, --xdisplay=hostname:number.screen_number\n";
92
+    std::cout << "  -x, --xdisplay=hostname:number.screen_number\n";
93
     std::cout << "                                Sets the x display.\n";
93
     std::cout << "                                Sets the x display.\n";
94
 	std::cout << "  -k, --nokeyboard              Disables the ability to cancel selections with\n";
94
 	std::cout << "  -k, --nokeyboard              Disables the ability to cancel selections with\n";
95
 	std::cout << "                                  the keyboard.  (default=off)\n";
95
 	std::cout << "                                  the keyboard.  (default=off)\n";

+ 1
- 1
src/options.hpp View File

29
 #include <glm/glm.hpp>
29
 #include <glm/glm.hpp>
30
 
30
 
31
 static std::string validStringArguments[] = { "bordersize", "padding", "color", "shader", "highlight", "format", "tolerance", "nodecorations", "nokeyboard", "help", "xdisplay", "version", "quiet" };
31
 static std::string validStringArguments[] = { "bordersize", "padding", "color", "shader", "highlight", "format", "tolerance", "nodecorations", "nokeyboard", "help", "xdisplay", "version", "quiet" };
32
-static char validCharArguments[] = { 'b', 'p', 'c', 'r', 'l', 'f', 't', 'n', 'k', 'h', 'd', 'v', 'q' };
32
+static char validCharArguments[] = { 'b', 'p', 'c', 'r', 'l', 'f', 't', 'n', 'k', 'h', 'x', 'v', 'q' };
33
 static unsigned int isFlagArgument[] = { false, false, false, false, true, false, false, false, true, true, false, true, true };
33
 static unsigned int isFlagArgument[] = { false, false, false, false, true, false, false, false, true, true, false, true, true };
34
 static unsigned int validArgumentCount = 13;
34
 static unsigned int validArgumentCount = 13;
35
 static unsigned int maxFloatingValues = 0;
35
 static unsigned int maxFloatingValues = 0;