Fixed another off-by-one bug, and a typo.

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required( VERSION 2.8 )
 project( "slop" )
 set( slop_VERSION_MAJOR 4 )
 set( slop_VERSION_MINOR 2 )
-set( slop_VERSION_PATCH 19 )
+set( slop_VERSION_PATCH 20 )
 
 set( CMAKE_OPENGL_SUPPORT FALSE CACHE BOOL "Whether or not to compile with OpenGL, shaders, magnification, and theming support." )
 

README.md

@@ -115,7 +115,7 @@ Feel free to make your own themes and submit a pull request to see if it can be
 help
 ----
 ```text
-slop v4.2.19
+slop v4.2.20
 
 Copyright (C) 2014 Dalton Nell, Slop Contributors
 (https://github.com/naelstrof/slop/graphs/contributors)

src/glselectrectangle.cpp

@@ -214,6 +214,17 @@ void slop::GLSelectRectangle::findOptimalGlassPosition() {
 void slop::GLSelectRectangle::generateMagnifyingGlass() {
     int x = xengine->m_mousex-m_glassPixels/2;
     int y = xengine->m_mousey-m_glassPixels/2;
+    bool fx = xengine->m_mousex < m_x+m_width/2;
+    bool fy = xengine->m_mousey < m_y+m_height/2;
+    // Mouse behavior SUCKS
+    if ( !fx && !fy ) {
+        x += 1;
+        y += 1;
+    } else if ( fx && !fy ) {
+        y += 1;
+    } else if ( !fx && fy ) {
+        x += 1;
+    }
     int w = m_glassPixels;
     int h = m_glassPixels;
     constrainWithinMonitor( &x, &y, &w, &h );

src/main.cpp

@@ -54,11 +54,6 @@ void current_utc_time(struct timespec *ts) {
 }
 
 int printSelection( std::string format, bool cancelled, int x, int y, int w, int h, int window ) {
-    //Impossible to select nothing
-    if (!cancelled) {
-        w += 1;
-        h += 1;
-    }
     size_t pos = 0;
     while ( ( pos = format.find( "%", pos ) ) != std::string::npos ) {
         if ( pos + 1 > format.size() ) {
@@ -292,7 +287,7 @@ int app( int argc, char** argv ) {
     cmdline_parser_free( &options );
 #ifndef OPENGL_ENABLED
     if ( opengl || themeon || magenabled ) {
-        throw std::runtime_error( "Slop wasn't compiled with OpenGL support, so themes, magnifications, and shaders are disabled! Try compiling it with the CMAKE_OPENGL_ENABLED set to true." );
+        throw std::runtime_error( "Slop wasn't compiled with OpenGL support, so themes, magnifications, and shaders are disabled! Try compiling it with the CMAKE_OPENGL_SUPPORT set to true." );
     }
 #else // OPENGL_ENABLED
     if ( ( themeon || magenabled || shadergiven ) && !opengl ) {
@@ -511,7 +506,7 @@ int app( int argc, char** argv ) {
                 int sx, sy, ex, ey;
                 constrain( cx, cy, xengine->m_mousex, xengine->m_mousey, padding, minimumsize, maximumsize, &sx, &sy, &ex, &ey );
                 // Set the selection rectangle's dimensions to mouse movement.
-                selection->setGeo( sx + xoffset, sy + yoffset, ex-1, ey-1 );
+                selection->setGeo( sx + xoffset, sy + yoffset, ex, ey );
                 selection->update( deltatime );
                 break;
             }