Added quiet option

slop.1

@@ -44,6 +44,9 @@ Sets the level of aggressiveness when trying to remove window decroations. `0' i
 .TP
 .BR \-l ", " \-\-highlight
 Instead of outlining a selection, slop will highlight it instead. This is particularly useful if the color is set to an opacity lower than 1.
+.TP
+.BR \-q ", " \-\-quiet
+Disable any unnecessary cerr output. Any warnings simply won't print.
 .SH EXAMPLES
 To emulate a windows XP selection, you can use something like this:
 .PP

src/main.cpp

@@ -108,12 +108,14 @@ void printHelp() {
 	std::cout << "                                Set the selection rectangle's color. Supports\n";
 	std::cout << "                                  RGB or RGBA values.\n";
 	std::cout << "                                  (default=`0.5,0.5,0.5,1')\n";
-	std::cout << "  -n, --nodecorations=INT           Attempt to select child windows in order to\n";
+	std::cout << "  -n, --nodecorations=INT       Attempt to select child windows in order to\n";
 	std::cout << "                                  avoid window decorations. Setting this to\n";
     std::cout << "                                  1 will enable a light attempt to\n";
     std::cout << "                                  remove decorations. Setting this to 2 will\n";
-    std::cout << "                                  enable an aggressive decoration removal.\n";
+    std::cout << "                                  enable aggressive decoration removal.\n";
     std::cout << "                                  (default=`0')\n";
+	std::cout << "  -q, --quiet                   Disable any unnecessary cerr output. Any\n";
+	std::cout << "                                  warnings simply won't print.\n";
 	std::cout << "  -l, --highlight               Instead of outlining selections, slop\n";
 	std::cout << "                                  highlights it. This is only useful when\n";
 	std::cout << "                                  --color is set to a transparent color.\n";
@@ -151,7 +153,9 @@ void printHelp() {
 int app( int argc, char** argv ) {
     // Options just validates all of our input from argv
     Options options( argc, argv );
-    bool help;
+    bool quiet = false;
+    options.getBool( "quiet", 'q', quiet );
+    bool help = false;
     if ( options.getBool( "help", 'h', help ) ) {
         printHelp();
         return 0;
@@ -174,13 +178,15 @@ int app( int argc, char** argv ) {
 
     // Finally we do the real selection.
     bool cancelled = false;
-    selection = SlopSelect(parsedOptions, &cancelled);
+    selection = SlopSelect(parsedOptions, &cancelled, quiet);
     
     // Here we're done with the parsed option data.
     delete parsedOptions;
     // We know if we cancelled or not
     if ( cancelled ) {
-        std::cerr << "Selection was cancelled by keystroke or right-click.\n";
+        if ( !quiet ) {
+            std::cerr << "Selection was cancelled by keystroke or right-click.\n";
+        }
         return 1;
     }
     // If we recieved a format option, we output the specified output.

src/options.hpp

@@ -28,10 +28,10 @@
 #include <vector>
 #include <glm/glm.hpp>
 
-static std::string validStringArguments[] = { "bordersize", "padding", "color", "shader", "highlight", "format", "tolerance", "nodecorations", "nokeyboard", "help", "xdisplay", "version" };
-static char validCharArguments[] = { 'b', 'p', 'c', 's', 'l', 'f', 't', 'n', 'k', 'h', 'x', 'v' };
-static unsigned int isFlagArgument[] = { false, false, false, false, true, false, false, false, true, true, false, true };
-static unsigned int validArgumentCount = 12;
+static std::string validStringArguments[] = { "bordersize", "padding", "color", "shader", "highlight", "format", "tolerance", "nodecorations", "nokeyboard", "help", "xdisplay", "version", "quiet" };
+static char validCharArguments[] = { 'b', 'p', 'c', 's', '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;
 
 class Options {

src/slop.cpp

@@ -31,7 +31,7 @@ SlopSelection::SlopSelection( float x, float y, float w, float h, int id ) {
 SlopSelection GLSlopSelect( SlopOptions* options, bool* cancelled, SlopWindow* window );
 SlopSelection XShapeSlopSelect( SlopOptions* options, bool* cancelled);
 
-SlopSelection SlopSelect( SlopOptions* options, bool* cancelled ) {
+SlopSelection SlopSelect( SlopOptions* options, bool* cancelled, bool quiet) {
     SlopSelection returnval(0,0,0,0,0);
     bool deleteOptions = false;
     if ( !options ) {
@@ -59,11 +59,13 @@ SlopSelection SlopSelect( SlopOptions* options, bool* cancelled ) {
     }
     if ( !success ) {
         // If we fail, we launch the XShape version of slop.
-        if ( errorstring.length() <= 0 ) {
-            errorstring += "Failed to launch OpenGL context, --shader parameter will be ignored.\n";
-            std::cerr << errorstring;
-        } else {
-            std::cerr << errorstring;
+        if ( !quiet ) {
+            if ( errorstring.length() <= 0 ) {
+                errorstring += "Failed to launch OpenGL context, --shader parameter will be ignored.\n";
+                std::cerr << errorstring;
+            } else {
+                std::cerr << errorstring;
+            }
         }
         returnval = XShapeSlopSelect( options, cancelled );
     } else {

src/slop.hpp

@@ -64,6 +64,6 @@ public:
     int id;
 };
 
-SlopSelection SlopSelect( SlopOptions* options = NULL, bool* cancelled = NULL );
+SlopSelection SlopSelect( SlopOptions* options = NULL, bool* cancelled = NULL, bool quiet = false );
 
 #endif // N_SLOP_H_