added window detection

CMakeLists.txt

@@ -27,6 +27,7 @@ set(EXECUTABLE_NAME "slop")
 
 set( source src/x.cpp
             src/window.cpp
+            src/windowhelper.cpp
             src/mouse.cpp
             src/keyboard.cpp
             src/framebuffer.cpp

src/mouse.cpp

@@ -43,9 +43,16 @@ Mouse::Mouse(X11* x11) {
     this->x11 = x11;
     currentCursor = XC_cross;
     xcursor = XCreateFontCursor( x11->display, XC_cross );
+    hoverWindow = None;
     XGrabPointer( x11->display, x11->root, True,
                   PointerMotionMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask,
                   GrabModeAsync, GrabModeAsync, None, xcursor, CurrentTime );
+
+    Window root;
+    int mx, my;
+    int wx, wy;
+    unsigned int mask;
+    XQueryPointer( x11->display, x11->root, &root, &hoverWindow, &mx, &my, &wx, &wy, &mask );
 }
 
 Mouse::~Mouse() {
@@ -61,9 +68,7 @@ void Mouse::update() {
 		setButton( event.xbutton.button, 0 );
 	}
     while ( XCheckTypedEvent( x11->display, EnterNotify, &event ) ) {
-        subWindow = event.xcrossing.subwindow;
         hoverWindow = event.xcrossing.window;
-        std::cout << hoverWindow << "\n";
 	}
 }
 

src/mouse.hpp

@@ -36,7 +36,6 @@ private:
     int currentCursor;
 public:
 	Window hoverWindow;
-	Window subWindow;
 	void update();
     Mouse( X11* x11 );
     ~Mouse();

src/slopstates.cpp

@@ -16,6 +16,14 @@ void SlopStart::update( SlopMemory& memory, double dt ) {
     if ( mouse->getButton( 1 ) ) {
         memory.setState( (SlopState*)new SlopStartDrag( mouse->getMousePos() ) );
     }
+    if ( mouse->hoverWindow != None ) {
+        glm::vec4 rect = getWindowGeometry( mouse->hoverWindow, true );
+        memory.rectangle->setPoints( glm::vec2( (float)rect.x, (float)rect.y ), glm::vec2( (float)rect.x+rect.z, (float)rect.y+rect.w ) );
+    }
+}
+
+void SlopStart::draw( SlopMemory& memory, glm::mat4 matrix ) {
+    memory.rectangle->draw( matrix );
 }
 
 SlopStartDrag::SlopStartDrag( glm::vec2 point ) {

src/slopstates.hpp

@@ -23,6 +23,7 @@
 
 #include "mouse.hpp"
 #include "rectangle.hpp"
+#include "windowhelper.hpp"
 #include "slop.hpp"
 
 class SlopMemory;
@@ -39,6 +40,7 @@ public:
 class SlopStart : SlopState {
 public:
     virtual void update( SlopMemory& memory, double dt );
+    virtual void draw( SlopMemory& memory, glm::mat4 matrix );
 };
 
 class SlopStartDrag : SlopState {

src/windowhelper.cpp

@@ -0,0 +1,36 @@
+#include "windowhelper.hpp"
+
+glm::vec4 getWindowGeometry( Window win, bool removeDecoration ) {
+    XWindowAttributes attr;         
+    XGetWindowAttributes( x11->display, win, &attr );
+    unsigned int width = attr.width;           
+    unsigned int height = attr.height;         
+    unsigned int border = attr.border_width;   
+    int x, y;
+    Window junk;
+    XTranslateCoordinates( x11->display, win, attr.root, -attr.border_width, -attr.border_width, &x, &y, &junk );
+    if ( !removeDecoration ) {
+        width += border*2;
+        height += border*2;
+        return glm::vec4( x, y, width, height );
+    }
+    // This is required to be defined by the window manager, so we can assume it exists.
+    Atom actual_type;
+    int actual_format;
+    unsigned long nitems, bytes_after;
+    unsigned char *data;
+    int result = XGetWindowProperty(x11->display, win,
+                                    XInternAtom(x11->display, "_NET_FRAME_EXTENTS", true),
+                                    0, 4, False, AnyPropertyType, 
+                                    &actual_type, &actual_format, &nitems, &bytes_after, &data);
+    if ( result == Success ) {
+        // Make sure we got the data we expect...
+        if ((nitems == 4) && (bytes_after == 0)) {
+            x += (int)data[0];
+            width -= (int)data[1];
+            y += (int)data[2];
+            height -= (int)data[3];
+        }
+    }
+    return glm::vec4( x, y, width, height );
+}

src/windowhelper.hpp

@@ -0,0 +1,31 @@
+/* windowhelper.hpp: Analyzes input windows to determine decorations and such.
+ *
+ * Copyright (C) 2014: Dalton Nell, Slop Contributors (https://github.com/naelstrof/slop/graphs/contributors).
+ *
+ * This file is part of Slop.
+ *
+ * Slop is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Slop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Slop.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef N_WINDOWHELPER_H_
+#define N_WINDOWHELPER_H_
+
+#include <glm/glm.hpp>
+#include <X11/Xlib.h>
+
+#include "x.hpp"
+
+glm::vec4 getWindowGeometry( Window win, bool removeDecoration );
+
+#endif