swapped around options a bit again

slop.1

@@ -15,7 +15,7 @@ Print help and exit.
 .BR \-v ", " \-\-version
 Print version and exit.
 .TP
-.BR \-d ", " \-\-xdisplay=\fIhostname:number.screen_number\fR
+.BR \-x ", " \-\-xdisplay=\fIhostname:number.screen_number\fR
 Sets the xdisplay to use.
 .TP
 .BR \-b ", " \-\-bordersize=\fIFLOAT\fR

src/main.cpp

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

src/options.hpp

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