diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2009-05-13 09:24:39 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2009-05-13 09:26:22 -0400 |
| commit | 9012259afd1241642b458384f903965b7f8662d5 (patch) | |
| tree | 717a1bddbacae25fbf2f5a680d0c0b315e009677 | |
| parent | eef9f6f1b8ce0d1ae06975da917906395d0f3770 (diff) | |
Manager: re-enable resizing code.
without optimisiations, but oh well.
| -rw-r--r-- | src/Manager.cpp | 6 | ||||
| -rw-r--r-- | src/PointerDevice.cpp | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Manager.cpp b/src/Manager.cpp index d6684b7..179be37 100644 --- a/src/Manager.cpp +++ b/src/Manager.cpp @@ -544,11 +544,11 @@ void Manager::handleMotionEvent(XIDeviceEvent* mev) if (dev->isDragging()) dev->dragTo(mev->root_x, mev->root_y); -#if 0 // Resizing is slow. We check if there are other events in the queue cos // if there are, we don't resize. if (dev->isResizing()) { +#if 0 XDeviceMotionEvent ev; if (!XCheckTypedEvent(x11->dpy, PointerDevice::XI_MotionNotify, @@ -563,9 +563,9 @@ void Manager::handleMotionEvent(XIDeviceEvent* mev) dev->resizeTo(mev->x_root, mev->y_root); } } else - dev->resizeTo(mev->x_root, mev->y_root); - } #endif + dev->resizeTo(mev->root_x, mev->root_y); + } } diff --git a/src/PointerDevice.cpp b/src/PointerDevice.cpp index 6d161cb..d288b65 100644 --- a/src/PointerDevice.cpp +++ b/src/PointerDevice.cpp @@ -129,7 +129,7 @@ bool PointerDevice::resizeOn(WMWindow* win, Window button, int x, int y) SetBit(bits, XI_Motion); XIGrabDevice(x11->dpy, this->id, win->getWindowBar(), CurrentTime, - None, GrabModeAsync, GrabModeAsync, True, &mask); + None, GrabModeAsync, GrabModeAsync, False, &mask); return true; } @@ -195,8 +195,7 @@ void PointerDevice::setWMEvents(WMWindow* window) SetBit(bits, XI_Motion); XISelectEvents(x11->dpy, window->getWindowBar(), &mask, 1); - - //XSelectExtensionEvent(x11->dpy, window->getResizeBar(), &classes[0], 3); + XISelectEvents(x11->dpy, window->getResizeBar(), &mask, 1); XFlush(x11->dpy); TRACE("Events set on windows %x, %x\n", (int)window->getWindowBar(), |