diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-06-25 13:58:41 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 14:40:26 +0200 |
commit | 8e280d1e187b09651c7036bd76272342d52ce401 (patch) | |
tree | 9ddd14d0ec9690dc715bc4c6f60d1a0e2c47bf0d /src/plugins/platforms/xcb/qxcbwindow.cpp | |
parent | 799f0841a6f22ccaa03f3673ba91ad7b40f20612 (diff) |
QPlatformWindow: Add Window masks.
Add functionality for window masks to QPlatformWindow, which is
required to implement QWidget::setMask() in order to fix
the regression in functionality from Qt 4.8.
Change-Id: I2c2d5629f0b4c6d90e52595ad70b13559aab1f41
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 59e805fd0e..a4ee2a461c 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -44,6 +44,7 @@ #include <QtDebug> #include <QScreen> #include <QtGui/QIcon> +#include <QtGui/QRegion> #include "qxcbconnection.h" #include "qxcbscreen.h" @@ -97,6 +98,9 @@ #ifdef XCB_USE_XLIB #include <X11/Xlib.h> #include <X11/Xutil.h> +#ifndef QT_NO_SHAPE +# include <X11/extensions/shape.h> +#endif // QT_NO_SHAPE #endif #ifdef XCB_USE_XINPUT2_MAEMO @@ -1698,4 +1702,54 @@ bool QXcbWindow::startSystemResize(const QPoint &pos, Qt::Corner corner) return true; } +#if defined(XCB_USE_XLIB) && !defined(QT_NO_SHAPE) + +static inline XRectangle qRectToX11Rectangle(const QRect &r) +{ + XRectangle result; + result.x = qMax(SHRT_MIN, r.x()); + result.y = qMax(SHRT_MIN, r.y()); + result.width = qMin((int)USHRT_MAX, r.width()); + result.height = qMin((int)USHRT_MAX, r.height()); + return result; +} + +static inline Region qRegionToX11Region(const QRegion ®ion) +{ + if (region.isEmpty()) + return None; + Region result = XCreateRegion(); + if (!result) + return None; + const QVector<QRect> rects = region.rects(); + if (rects.size() == 1) { + XRectangle xrect = qRectToX11Rectangle(region.boundingRect()); + XUnionRectWithRegion(&xrect, result, result); + } else { + foreach (const QRect &r, rects) { + XRectangle xrect = qRectToX11Rectangle(r); + XUnionRectWithRegion(&xrect, result, result); + } + } + return result; +} + + +void QXcbWindow::setMask(const QRegion ®ion) +{ + + Display *display = (Display *)connection()->xlib_display(); + if (region.isEmpty()) { + XShapeCombineMask(display, xcb_window(), + ShapeBounding, 0, 0, + None, ShapeSet); + } else { + XShapeCombineRegion(display, xcb_window(), + ShapeBounding, 0, 0, + qRegionToX11Region(region), ShapeSet); + } +} + +#endif // XCB_USE_XLIB && !QT_NO_SHAPE + QT_END_NAMESPACE |