added noopengl flag

CMakeLists.txt

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

slop.1

@@ -47,6 +47,9 @@ Disable any unnecessary cerr output. Any warnings simply won't print.
 .TP
 .BR \-k ", " \-\-nokeyboard
 Disables the ability to cancel selections with the keyboard.
+.TP
+.BR \-o ", " \-\-noopengl
+Disables graphics acceleration. Might be useful if you get rendering bugs.
 .SH EXAMPLES
 To emulate a windows XP selection, you can use something like this:
 .PP

src/main.cpp

@@ -33,6 +33,7 @@ SlopOptions* getOptions( Options& options ) {
     glm::vec4 color = glm::vec4( foo->r, foo->g, foo->b, foo->a );
     options.getColor("color", 'c', color);
     options.getBool("nokeyboard", 'k', foo->nokeyboard);
+    options.getBool("noopengl", 'o', foo->noopengl);
     options.getString( "xdisplay", 'x', foo->xdisplay );
     options.getString( "shader", 's', foo->shader );
     foo->r = color.r;
@@ -127,6 +128,7 @@ void printHelp() {
 	std::cout << "  -f, --format=STRING           Set the output format string. Format specifiers\n";
 	std::cout << "                                  are %x, %y, %w, %h, %i, %g, and %c.\n";
 	std::cout << "                                  (default=`%g\n')\n";
+	std::cout << "  -o, --noopengl                Disable graphics acceleration.\n";
 	std::cout << "Examples\n";
 	std::cout << "    $ # Gray, thick, transparent border for maximum visiblity.\n";
 	std::cout << "    $ slop -b 20 -c 0.5,0.5,0.5,0.8\n";

src/options.cpp

@@ -10,6 +10,7 @@ Options::Options( int argc, char** argv ) {
     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 ) );

src/slop.cpp

@@ -33,6 +33,7 @@ using namespace slop;
 slop::SlopOptions::SlopOptions() {
     borderSize = 1;
     nokeyboard = false;
+    noopengl = false;
     nodecorations = false;
     tolerance = 2;
     padding = 0;
@@ -73,7 +74,7 @@ slop::SlopSelection slop::SlopSelect( slop::SlopOptions* options, bool* cancelle
     std::string errorstring = "";
     SlopWindow* window;
     // First we check if we have a compositor available
-	if ( x11->hasCompositor() ) {
+	if ( x11->hasCompositor() && !options->noopengl ) {
         // If we have a compositor, we try using OpenGL
         try {
             window = new SlopWindow();
@@ -86,7 +87,7 @@ slop::SlopSelection slop::SlopSelect( slop::SlopOptions* options, bool* cancelle
     }
     if ( !success ) {
         // If we fail, we launch the XShape version of slop.
-        if ( !quiet ) {
+        if ( !quiet && !options->noopengl ) {
             if ( errorstring.length() <= 0 ) {
                 errorstring += "Failed to launch OpenGL context, --shader parameter will be ignored.\n";
                 std::cerr << errorstring;

src/slop.hpp

@@ -32,6 +32,7 @@ public:
     float padding;
     float tolerance;
     bool highlight;
+    bool noopengl;
     bool nokeyboard;
     int nodecorations;
     std::string shader;