summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-02-11 18:43:58 +1030
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-02-11 18:43:58 +1030
commitc4bacebbcf98486330980694ed1846c0150fd254 (patch)
treec37d6e35721555b3fefaf7c12ae61eaccc86219c
parentaeb8e743e1d33eb7941ad71c0ab377fcfaf25182 (diff)
Re-enable floor control toggling.
No idea if it actually works, no time for testing. But the wireframe comes up.
-rw-r--r--src/Manager.cpp4
-rw-r--r--src/PointerDevice.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Manager.cpp b/src/Manager.cpp
index 285c766..6e7a8e2 100644
--- a/src/Manager.cpp
+++ b/src/Manager.cpp
@@ -733,11 +733,11 @@ void Manager::handleButtonRelease(XDeviceButtonEvent* bev)
{
win->destroy();
return;
- }
+ }
// leftclick on button: lock window to pointer
// rightclick on button: display floor control gui
- if (win->isButtonFloor(bev->subwindow))
+ if (win->isButtonFloor(bev->window))
{
if (bev->button == Button3)
{
diff --git a/src/PointerDevice.cpp b/src/PointerDevice.cpp
index 6b9a1d5..603a7a2 100644
--- a/src/PointerDevice.cpp
+++ b/src/PointerDevice.cpp
@@ -200,7 +200,7 @@ void PointerDevice::setWMEvents(WMWindow* window)
XSelectExtensionEvent(x11->dpy, window->getWindowBar(), &classes[0], 3);
//XSelectExtensionEvent(x11->dpy, window->getResizeBar(), &classes[0], 3);
XSelectExtensionEvent(x11->dpy, window->getButtonClose(), &classes[1], 2);
- XSelectExtensionEvent(x11->dpy, window->getButtonFloor(), &classes[1], 1);
+ XSelectExtensionEvent(x11->dpy, window->getButtonFloor(), &classes[1], 2);
XSelectExtensionEvent(x11->dpy, window->getButtonOverlay(), &classes[1], 1);
XSelectExtensionEvent(x11->dpy, window->getButtonMinimize(), &classes[1], 1);