Fixed slop from returning the wrong window ID in certain situations.

README.md

@@ -67,7 +67,7 @@ Make sure to check out and install [maim](https://github.com/naelstrof/maim) too
 help
 ----
 ```text
-slop v3.1.4
+slop v3.1.5
 
 Copyright (C) 2014 Dalton Nell, Slop Contributors (https://github.com/naelstrof/slop/graphs/contributors)
 

cmdline.h

@@ -31,7 +31,7 @@ extern "C" {
 
 #ifndef CMDLINE_PARSER_VERSION
 /** @brief the program version */
-#define CMDLINE_PARSER_VERSION "v3.1.4"
+#define CMDLINE_PARSER_VERSION "v3.1.5"
 #endif
 
 /** @brief Where the command line options are stored */

main.cpp

@@ -213,7 +213,9 @@ int main( int argc, char** argv ) {
                     } else {
                         selection->setGeo( t.m_x, t.m_y, t.m_x + t.m_width, t.m_y + t.m_height );
                     }
-                    window = xengine->m_hoverWindow;
+                    //window = xengine->m_hoverWindow;
+                    // Since WindowRectangle can select different windows depending on click location...
+                    window = t.getWindow();
                 }
                 // If the user clicked we move on to the next state.
                 if ( xengine->mouseDown( 1 ) ) {

options.ggo

@@ -1,5 +1,5 @@
 package "slop"
-version "v3.1.4"
+version "v3.1.5"
 usage "slop [options]"
 description "slop (Select Operation) is an application that queries for a selection from the user and prints the region to stdout."
 versiontext "Copyright (C) 2014 Dalton Nell, Slop Contributors (https://github.com/naelstrof/slop/graphs/contributors)"

x.cpp

@@ -288,6 +288,10 @@ void slop::WindowRectangle::applyPadding( int padding ) {
     }
 }
 
+Window slop::WindowRectangle::getWindow() {
+    return m_window;
+}
+
 void slop::WindowRectangle::applyMinMaxSize( int minimumsize, int maximumsize ) {
     if ( minimumsize > maximumsize && maximumsize > 0 ) {
         fprintf( stderr, "Error: minimumsize is greater than maximumsize.\n" );
@@ -337,6 +341,8 @@ void slop::WindowRectangle::setGeometry( Window win, bool decorations ) {
             status = XQueryTree( xengine->m_display, test, &root, &parent, &childlist, &ujunk);
             free( childlist );
         }
+        // test contains the window we're screenshotting.
+        m_window = test;
         // Once found, proceed normally.
         if ( test && parent == root && status ) {
             XWindowAttributes attr;
@@ -362,4 +368,5 @@ void slop::WindowRectangle::setGeometry( Window win, bool decorations ) {
     m_height = attr.height;
     m_border = attr.border_width;
     XTranslateCoordinates( xengine->m_display, win, attr.root, -attr.border_width, -attr.border_width, &(m_x), &(m_y), &junk );
+    m_window = win;
 }

x.hpp

@@ -56,7 +56,9 @@ public:
     unsigned int m_width;
     unsigned int m_height;
     unsigned int m_border;
+    Window       m_window;
     bool         m_decorations;
+    Window       getWindow();
     void         setGeometry( Window win, bool decorations );
     void         applyPadding( int padding );
     void         applyMinMaxSize( int minimumsize, int maximumsize );