Allow for truncating of flag arguments

README.md

@@ -7,7 +7,7 @@ This just a re-write with less dependencies, inaccuracies, etc.
 TODO:
 - [x] Window Selection
 - [x] Keyboard
-- [ ] Shaders (Partially complete, need more robust features still).
+- [x] Shaders
 - [x] Custom output formatting
 - [ ] Manpages
 - [x] Option parsing
@@ -15,6 +15,7 @@ TODO:
 - [x] Mouse stuff
 - [x] Drawing stuff
 - [x] Printing stuff
+- [ ] Librarify (so I can plug it into maim)
 
 Avoiding:
 - [ ] Themes (Not going to happen. It'd add a texture library dependency.)

src/options.cpp

@@ -30,8 +30,25 @@ int Options::parseCharOption( int argc, char** argv, int argumentIndex, int vali
     // If we're a flag, we take no arguments, nor do we allow = signs or whatever.
     if ( isFlagArgument[validIndex] ) {
         if ( argument != std::string()+"-"+validCharArguments[validIndex] ) {
-            throw new std::invalid_argument( std::string()+"Unexpected characters around flag `" + argument + "`." );
-            return 0;
+            for( int o=1;o<argument.length();o++ ) {
+                bool isValid = false;
+                for( int i=0;i<validArgumentCount&&!isValid;i++ ) {
+                    if ( argument[o] == validCharArguments[i] ) {
+                        if ( isFlagArgument[i] ) {
+                            isValid = true;
+                            arguments.push_back( std::string()+validCharArguments[i] );
+                            values.push_back("");
+                            break;
+                        } else {
+                            throw new std::invalid_argument( std::string()+"Truncating non-flag arguments is not allowed. Split this up: `" + argument + "`." );
+                        }
+                    }
+                }
+                if (!isValid) {
+                    throw new std::invalid_argument( std::string()+"Unexpected characters around flag `" + argument + "`." );
+                }
+            }
+            return 1;
         } else {
             arguments.push_back( std::string()+argument[1] );
             values.push_back("");