keep -n from consuming a parameter

CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 
 include_directories("${PROJECT_BINARY_DIR}")
 
-add_definitions(-DSLOP_VERSION="v5.3.32")
+add_definitions(-DSLOP_VERSION="v5.3.33")
 
 # The names have to be unique unfortunately.
 set(EXECUTABLE_NAME "slop")

src/main.cpp

@@ -50,6 +50,9 @@ SlopOptions* getOptions( Options& options ) {
     } catch( ... ) {
         options.getInt("nodecorations", 'n', foo->nodecorations);
     }
+    if ( foo->nodecorations < 0 || foo->nodecorations > 2 ) {
+        throw new std::invalid_argument( "--nodecorations must be between 0 and 2. Or be used as a flag." );
+    }
     return foo;
 }
 

src/options.cpp

@@ -1,6 +1,7 @@
 #include "options.hpp"
 
 Options::Options( int argc, char** argv ) {
+    validArguments.push_back( Argument( "nodecorations", 'n', true ) );
     validArguments.push_back( Argument( "bordersize",   'b', false ) );
     validArguments.push_back( Argument( "padding",      'p', false ) );
     validArguments.push_back( Argument( "color",        'c', false ) );
@@ -8,14 +9,21 @@ Options::Options( int argc, char** argv ) {
     validArguments.push_back( Argument( "highlight",    'l', true ) );
     validArguments.push_back( Argument( "format",       'f', false ) );
     validArguments.push_back( Argument( "tolerance",    't', false ) );
-    validArguments.push_back( Argument( "nodecorations", 'n', false ) );
     validArguments.push_back( Argument( "nokeyboard",   'k', true ) );
     validArguments.push_back( Argument( "noopengl",     'o', true ) );
     validArguments.push_back( Argument( "help",         'h', true ) );
     validArguments.push_back( Argument( "xdisplay",     'x', false ) );
     validArguments.push_back( Argument( "version",      'v', true ) );
     validArguments.push_back( Argument( "quiet",        'q', true ) );
-    validate( argc, argv );
+    try {
+        validate( argc, argv );
+    } catch( ... ) {
+        arguments.clear();
+        values.clear();
+        floatingValues.clear();
+        validArguments[0].isFlagArgument = false;
+        validate( argc, argv );
+    }
 }