Changed default color and size, improved readme a little, and slop now outputs the ID of the selected window.

README.md

@@ -14,7 +14,7 @@ features
     * Select X display.
     * Set padding size, even negative padding sizes!
     * Set click tolerance for if you have a shaky mouse.
-    * Set the color of the selection rectangles to match your theme!
+    * Set the color of the selection rectangles to match your theme! (Even supports transparency!)
     * Remove window decorations from selections.
 
 practical applications
@@ -34,6 +34,7 @@ You can also take images using imagemagick like so:
 eval `slop`
 import -window root -crop $G ~/myimage.png
 ```
+If you don't like ImageMagick's import: Check out [maim](https://github.com/naelstrof/maim) for a better screenshot utility.
 
 You can see my implementation of slop in a screenshooter here:
 https://gist.github.com/naelstrof/6530959
@@ -41,11 +42,11 @@ https://gist.github.com/naelstrof/6530959
 lets see some action
 --------------------
 Ok. Here's a comparison between 'scrot -s's selection and slop's:
-![scrotbad](http://farmpolice.com/content/images/scrot_bad.png)
-![slopgood](http://farmpolice.com/content/images/slrn_good.png)
+![scrotbad](http://farmpolice.com/content/images/2014-10-14-12:08:24.png)
+![slopgood](http://farmpolice.com/content/images/2014-10-14-12:14:51.png)
 
 You can see scrot leaves garbage lines over the things you're trying to screenshot!
-While slop not only looks nicer, it's impossible for it to end up in screenshots or recordings because it waits for DestroyNotify events before completely shutting down. Only after the window is completely destroyed can ffmpeg or imagemagick take a picture.
+While slop not only looks nicer, it's impossible for it to end up in screenshots or recordings because it waits for DestroyNotify events before completely shutting down. Only after the window is completely destroyed can anything take a screenshot.
 
 help
 ----

main.cpp

@@ -4,7 +4,7 @@
 #include "rectangle.hpp"
 #include "options.hpp"
 
-void printSelection( bool cancelled, int x, int y, int w, int h ) {
+void printSelection( bool cancelled, int x, int y, int w, int h, int window ) {
     printf( "X=%i\n", x );
     printf( "Y=%i\n", y );
     printf( "W=%i\n", w );
@@ -23,6 +23,7 @@ void printSelection( bool cancelled, int x, int y, int w, int h ) {
         printf( "%i", y );
     }
     printf( "\n" );
+    printf( "ID=%i\n", window );
     if ( cancelled ) {
         printf( "Cancel=true\n" );
     } else {
@@ -91,6 +92,7 @@ int main( int argc, char** argv ) {
     bool running = true;
     slop::Rectangle* selection = NULL;
     Window window = None;
+    Window windowmemory = None;
     std::string xdisplay = options->m_xdisplay;
     int padding = options->m_padding;
     int borderSize = options->m_borderSize;
@@ -116,12 +118,12 @@ int main( int argc, char** argv ) {
     // if we fail for either we exit immediately.
     err = xengine->init( xdisplay.c_str() );
     if ( err ) {
-        printSelection( true, 0, 0, 0, 0 );
+        printSelection( true, 0, 0, 0, 0, None );
         return err;
     }
     err = xengine->grabCursor( slop::Cross );
     if ( err ) {
-        printSelection( true, 0, 0, 0, 0 );
+        printSelection( true, 0, 0, 0, 0, None );
         return err;
     }
     if ( keyboard ) {
@@ -143,7 +145,7 @@ int main( int argc, char** argv ) {
         double starti = double( start.tv_sec*1000000000L + start.tv_nsec )/1000000000.f;
         if ( timei - starti > options->m_gracetime ) {
             if ( ( xengine->anyKeyPressed() && keyboard ) || xengine->mouseDown( 3 ) ) {
-                printSelection( true, 0, 0, 0, 0 );
+                printSelection( true, 0, 0, 0, 0, None );
                 fprintf( stderr, "User pressed key. Canceled selection.\n" );
                 state = -1;
                 running = false;
@@ -213,6 +215,7 @@ int main( int argc, char** argv ) {
                                                      highlight,
                                                      r, g, b, a );
                 }
+                windowmemory = window;
                 // If the user has let go of the mouse button, we'll just
                 // continue to the next state.
                 if ( !xengine->mouseDown( 1 ) ) {
@@ -226,12 +229,17 @@ int main( int argc, char** argv ) {
                     // We make sure the selection rectangle stays on the window we had selected
                     selection->setGeo( xmem, ymem, xmem + wmem, ymem + hmem );
                     xengine->setCursor( slop::Left );
+                    // Make sure
+                    window = windowmemory;
                     continue;
                 }
+                // If we're not selecting a window.
+                windowmemory = window;
+                window = None;
                 // We also detect which way the user is pulling and set the mouse icon accordingly.
                 bool x = cx > xengine->m_mousex;
                 bool y = cy > xengine->m_mousey;
-                if ( selection->m_width <= 1 && selection->m_height <= 1 || minimumsize == maximumsize ) {
+                if ( selection->m_width <= 1 && selection->m_height <= 1 || ( minimumsize == maximumsize && minimumsize != 0 && maximumsize != 0 ) ) {
                     xengine->setCursor( slop::Cross );
                 } else if ( !x && !y ) {
                     xengine->setCursor( slop::LowerRightCorner );
@@ -263,7 +271,7 @@ int main( int argc, char** argv ) {
                 // Delete the rectangle, which will remove it from the screen.
                 delete selection;
                 // Print the selection :)
-                printSelection( false, x, y, w, h );
+                printSelection( false, x, y, w, h, window );
                 break;
             }
         }

options.cpp

@@ -3,15 +3,15 @@
 slop::Options* options = new slop::Options();
 
 slop::Options::Options() {
-    m_version = "v2.1.3";
+    m_version = "v2.1.4";
     m_highlight = false;
-    m_borderSize = 10;
+    m_borderSize = 5;
     m_padding = 0;
     m_xdisplay = ":0";
     m_tolerance = 2;
-    m_red = 0;
-    m_green = 0;
-    m_blue = 0;
+    m_red = 0.5;
+    m_green = 0.5;
+    m_blue = 0.5;
     m_alpha = 1;
     m_gracetime = 0.4;
     m_keyboard = true;