Set window types to input

Compatibility with MCompositor and Maliit 0.8. InputMethodQuick method call moved just because otherwise Qt was aborting, possibly due to opengl drivers, but registering after set up is done is more logical anyways. RevBy: Jan Arne Petersen
maliit · Apr 24, 2013 · 39baf74 · 39baf74
1 parent c7337c1
commit 39baf74
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 7 deletions.
diff --git a/src/quick/inputmethodquick.cpp b/src/quick/inputmethodquick.cpp
@@ -41,13 +41,13 @@ QQuickView *createWindow(MAbstractInputMethodHost *host)
 {
     QScopedPointer<QQuickView> view(new QQuickView);
 
-    host->registerWindow(view.data(), Maliit::PositionCenterBottom);
-
     QSurfaceFormat format;
     format.setAlphaBufferSize(8);
     view->setFormat(format);
     view->setColor(QColor(Qt::transparent));
 
+    host->registerWindow(view.data(), Maliit::PositionCenterBottom);
+
     return view.take();
 }
 

diff --git a/src/windowgroup.cpp b/src/windowgroup.cpp
@@ -62,10 +62,8 @@ void WindowGroup::setupWindow(QWindow *window, Maliit::Position position)
             }
             m_window_list.append (WindowData(window, position));
 
-            window->setFlags (Qt::Dialog |
-                              Qt::FramelessWindowHint |
+            window->setFlags (Qt::FramelessWindowHint |
                               Qt::WindowStaysOnTopHint |
-                              Qt::X11BypassWindowManagerHint |
                               Qt::WindowDoesNotAcceptFocus);
 
             connect (window, SIGNAL (visibleChanged(bool)),

diff --git a/src/xcbplatform.cpp b/src/xcbplatform.cpp
@@ -28,9 +28,52 @@ namespace Maliit
 void XCBPlatform::setupInputPanel(QWindow* window,
                                   Maliit::Position position)
 {
-    Q_UNUSED(window);
     Q_UNUSED(position);
-    // nothing to do.
+
+    if (not window) {
+        return;
+    }
+
+    // set window type as input, supported by at least mcompositor
+    QPlatformNativeInterface *xcbiface = QGuiApplication::platformNativeInterface();
+    xcb_connection_t *xcbConnection
+            = static_cast<xcb_connection_t *>(xcbiface->nativeResourceForWindow("connection", window));
+    if (!xcbConnection) {
+        qWarning("Unable to get Xcb connection");
+        return;
+    }
+
+    const char * windowType = "_NET_WM_WINDOW_TYPE";
+    const char * windowTypeInput = "_NET_WM_WINDOW_TYPE_INPUT";
+
+    xcb_intern_atom_cookie_t windowTypeCookie =
+            xcb_intern_atom(xcbConnection, false, strlen(windowType), windowType);
+    xcb_intern_atom_cookie_t typeInputCookie =
+            xcb_intern_atom(xcbConnection, false, strlen(windowTypeInput), windowTypeInput);
+
+    xcb_atom_t windowTypeAtom;
+    xcb_atom_t windowTypeInputAtom;
+
+    xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(xcbConnection, windowTypeCookie, 0);
+    if (reply) {
+        windowTypeAtom = reply->atom;
+        free(reply);
+    } else {
+        qWarning("Unable to fetch window type atom");
+        return;
+    }
+
+    reply = xcb_intern_atom_reply(xcbConnection, typeInputCookie, 0);
+    if (reply) {
+        windowTypeInputAtom = reply->atom;
+        free(reply);
+    } else {
+        qWarning("Unable to fetch window type input atom");
+        return;
+    }
+
+    xcb_change_property(xcbConnection, XCB_PROP_MODE_REPLACE, window->winId(), windowTypeAtom, XCB_ATOM_ATOM,
+                        32, 1, &windowTypeInputAtom);
 }
 
 void XCBPlatform::setInputRegion(QWindow* window,