diff options
| author | Joel Bosveld <Joel.Bosveld@gmail.com> | 2009-08-14 06:33:58 +0800 |
|---|---|---|
| committer | Joel Bosveld <Joel.Bosveld@gmail.com> | 2009-08-14 06:34:21 +0800 |
| commit | fa027c58b00aff3a4111f226d3a2a100ff77041e (patch) | |
| tree | 5bdc81d0993c03170a8398b2c5a70f06f41e3332 | |
| parent | bedcd855a277e9ad853c6e35391efbd0a76b6e6b (diff) | |
patches: Not sure why it was working before...
| -rw-r--r-- | patches/qt.patch | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/patches/qt.patch b/patches/qt.patch index 66ecb80..2b06593 100644 --- a/patches/qt.patch +++ b/patches/qt.patch @@ -1,15 +1,15 @@ -From b2ff5bf8c40a4f48c8f7b19bdd96126ffbde5971 Mon Sep 17 00:00:00 2001 +From f78d1b2fe1ba2f17ded95812db17e892befc73e4 Mon Sep 17 00:00:00 2001 From: Joel Bosveld <Joel.Bosveld@gmail.com> Date: Fri, 7 Aug 2009 10:41:37 +0800 Subject: [PATCH] Add support for redirected windows --- configure | 2 +- - src/gui/kernel/qapplication_x11.cpp | 26 +++++++++++++ - src/gui/kernel/qdnd_x11.cpp | 70 +++++++++++++++++++++++++++++++++++ + src/gui/kernel/qapplication_x11.cpp | 26 ++++++++++++ + src/gui/kernel/qdnd_x11.cpp | 73 +++++++++++++++++++++++++++++++++++ src/gui/kernel/qt_x11_p.h | 18 +++++++++ src/gui/kernel/qwidget_x11.cpp | 1 + - 5 files changed, 116 insertions(+), 1 deletions(-) + 5 files changed, 119 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 31eade9..6e8d8da 100755 @@ -69,10 +69,10 @@ index 33aec9e..b400c1f 100644 int mitshm_minor; int mitshm_major; diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp -index 8611307..9d9b5f0 100644 +index 8611307..5d6c050 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp -@@ -1409,6 +1409,71 @@ void QDragManager::cancel(bool deleteSource) +@@ -1409,6 +1409,74 @@ void QDragManager::cancel(bool deleteSource) } static @@ -105,8 +105,11 @@ index 8611307..9d9b5f0 100644 + + if (xdnd_data.deco && c[i] == xdnd_data.deco->effectiveWinId()) continue; + -+ XGetWindowAttributes(X11->display, w, &attr); ++ XGetWindowAttributes(X11->display, c[i], &attr); + XTranslateCoordinates(X11->display, w, c[i], pos.x(), pos.y(), &x, &y, &cg); ++ ++ if (attr.map_state == IsUnmapped) continue; ++ + if (QRect(0,0,attr.width,attr.height).contains(x,y)) { + ret = findTheRightWindow (QPoint(x,y), c[i], cg, deepest); + break; @@ -144,7 +147,7 @@ index 8611307..9d9b5f0 100644 Window findRealWindow(const QPoint & pos, Window w, int md) { if (xdnd_data.deco && w == xdnd_data.deco->effectiveWinId()) -@@ -1499,6 +1564,11 @@ void QDragManager::move(const QPoint & globalPos) +@@ -1499,6 +1567,11 @@ void QDragManager::move(const QPoint & globalPos) if (target == rootwin) { // Ok. |