added version flag

CMakeLists.txt

@@ -1,6 +1,8 @@
 #Change this if you need to target a specific CMake version
 cmake_minimum_required(VERSION 3.1)
 
+add_definitions(-DSLOP_VERSION="v5.3.21")
+
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)" FORCE)
 endif()

src/main.cpp

@@ -155,6 +155,10 @@ int app( int argc, char** argv ) {
         printHelp();
         return 0;
     }
+    if ( options.getBool( "version", 'v', help ) ) {
+        std::cout << SLOP_VERSION << "\n";
+        return 0;
+    }
     // We then parse the options into something slop can understand.
     SlopOptions* parsedOptions = getOptions( options );
 

src/options.cpp

@@ -13,8 +13,8 @@ int Options::validateStringOption( int argc, char** argv, int argumentIndex ) {
                 if ( !isFlagArgument[index] && argument.find("=") == std::string::npos ) {
                     throw new std::invalid_argument("Expected `=` after " + arguments[i]);
                 }
-                if ( argument[i+3] != '=' ) {
-                    break;
+                if ( isFlagArgument[index] && i+3 != argument.length() ) {
+                    throw new std::invalid_argument("Trailing characters on flag " + argument );
                 }
                 return parseStringOption( argc, argv, argumentIndex, index );
             }

src/options.hpp

@@ -28,11 +28,10 @@
 #include <vector>
 #include <glm/glm.hpp>
 
-static std::string validStringArguments[] = { "bordersize", "padding", "color", "shader", "highlight", "format", "tolerance", "nodecorations", "nokeyboard", "help", "xdisplay" };
-static char validCharArguments[] = { 'b', 'p', 'c', 's', 'h', 'f', 't', 'n', 'k', 'h', 'x' };
-// 0 for flag, 1 for how many arguments to eat up
-static unsigned int isFlagArgument[] = { false, false, false, false, true, false, false, true, true, true, false};
-static unsigned int validArgumentCount = 11;
+static std::string validStringArguments[] = { "bordersize", "padding", "color", "shader", "highlight", "format", "tolerance", "nodecorations", "nokeyboard", "help", "xdisplay", "version" };
+static char validCharArguments[] = { 'b', 'p', 'c', 's', 'h', 'f', 't', 'n', 'k', 'h', 'x', 'v' };
+static unsigned int isFlagArgument[] = { false, false, false, false, true, false, false, true, true, true, false, true };
+static unsigned int validArgumentCount = 12;
 static unsigned int maxFloatingValues = 0;
 
 class Options {