fixed mouse typo

main.cpp

@@ -28,6 +28,9 @@ int parseOptions( int argc, char** argv ) {
                 arg.at( find ) = ' ';
             }
             int num = sscanf( arg.c_str(), "%*s %i", &borderSize );
+            if ( borderSize < 0 ) {
+                borderSize = 0;
+            }
             if ( num != 1 ) {
                 printf( "Error parsing command arguments near %s\n", argv[i] );
                 printf( "Usage: -b=INT or --bordersize=INT\n" );
@@ -135,7 +138,6 @@ int main( int argc, char** argv ) {
             }
             case 1: {
                 selection = new is::Rectangle( xengine->m_mousex, xengine->m_mousey, 0, 0, borderSize, padding );
-                selection->setPos( xengine->m_mousex, xengine->m_mousey );
                 xengine->addRect( selection );
                 state++;
                 break;
@@ -146,14 +148,13 @@ int main( int argc, char** argv ) {
                     break;
                 }
                 selection->setDim( xengine->m_mousex - selection->m_x, xengine->m_mousey - selection->m_y );
-                // x and y offsets can indicate if the selection is inside-out, which lets us know which kind of cursor we need.
-                int x = selection->m_xoffset;
-                int y = selection->m_yoffset;
-                if ( x == 0 && y == 0) {
+                bool x = selection->m_flippedx;
+                bool y = selection->m_flippedy;
+                if ( !x && !y ) {
                     xengine->setCursor( is::LowerRightCorner );
-                } else if ( x && y == 0 ) {
+                } else if ( x && !y ) {
                     xengine->setCursor( is::LowerLeftCorner );
-                } else if ( x == 0 && y ) {
+                } else if ( !x && y ) {
                     xengine->setCursor( is::UpperRightCorner );
                 } else {
                     xengine->setCursor( is::UpperLeftCorner );

x.cpp

@@ -85,7 +85,7 @@ int is::XEngine::grabCursor( is::CursorType type ) {
     unsigned int mask;
     XQueryPointer( m_display, m_root, &root, &child, &mx, &my, &wx, &wy, &mask );
     m_mousex = mx;
-    m_mousex = my;
+    m_mousey = my;
     updateHoverWindow( child );
     return 0;
 }
@@ -102,7 +102,7 @@ void is::XEngine::tick() {
     if ( !m_good ) {
         return;
     }
-    XSync( m_display, false );
+    XFlush( m_display );
     XEvent event;
     while ( XPending( m_display ) ) {
         XNextEvent( m_display, &event );
@@ -239,6 +239,9 @@ void is::Rectangle::setDim( int w, int h ) {
     }
 
     constrain( w, h );
+    if ( m_border == 0 ) {
+        return;
+    }
 
     XResizeWindow( xengine->m_display, m_window, m_width+m_border*2, m_height+m_border*2 );
     XMoveWindow( xengine->m_display, m_window, m_x+m_xoffset, m_y+m_yoffset );
@@ -308,9 +311,11 @@ void is::Rectangle::constrain( int w, int h ) {
         pad = 0;
     }
     if ( w < 0 ) {
+        m_flippedx = true;
         m_xoffset = w - pad - m_border;
         m_width = -w + pad*2;
     } else {
+        m_flippedx = false;
         m_xoffset = -pad - m_border;
         m_width = w + pad*2;
     }
@@ -320,9 +325,11 @@ void is::Rectangle::constrain( int w, int h ) {
         pad = 0;
     }
     if ( h < 0 ) {
+        m_flippedy = true;
         m_yoffset = h - pad - m_border;
         m_height = -h + pad*2;
     } else {
+        m_flippedy = false;
         m_yoffset = -pad - m_border;
         m_height = h + pad*2;
     }

x.hpp

@@ -52,6 +52,8 @@ public:
     int     m_padding;
     XColor  m_forground, m_forgroundExact;
     XColor  m_background, m_backgroundExact;
+    bool    m_flippedx;
+    bool    m_flippedy;
 private:
     void    constrain( int w, int h );
 };