Fixes: NB#289336 - time is not in sync on status bar with lock screen

Bug: NB#289336 - time is not in sync on status bar with lock screen
RevBy: Artem Egorkine
Details: Qt didn't forward the PropertyNotify in some cases since it didn't find any widget with a matching window ID. This patch creates such a widget.

debian/changelog

@@ -1,6 +1,7 @@
 system-ui (1.2.19~1) unstable; urgency=low
 
   * [UNRELEASED]
+  * Fixes: NB#289336 - time is not in sync on status bar with lock screen
 
  -- Vesa Halttunen <[email protected]>  Fri, 18 Nov 2011 15:16:16 +0200
 

src/systemui/statusarea/statusarearenderer.cpp

@@ -17,8 +17,8 @@
 **
 ****************************************************************************/
 
-#include <QDebug>
 #include "statusarearenderer.h"
+#include "xeventlistenerwidget.h"
 #include <MStyle>
 #include "statusareastyle.h"
 #include <QMeeGoLivePixmap>
@@ -39,6 +39,7 @@ StatusAreaRenderer::StatusAreaRenderer(QObject *parent) :
     statusAreaLivePixmap(NULL),
     statusAreaPropertyWindow(0),
     windowManagerWindow(0),
+    windowManagerWindowWidget(NULL),
     statusBarVisible(false),
 #ifdef HAVE_QMSYSTEM
     displayState(new MeeGo::QmDisplayState()),
@@ -74,7 +75,7 @@ StatusAreaRenderer::StatusAreaRenderer(QObject *parent) :
 
     setSizeFromStyle();
     if(!createSharedPixmapHandle() || !createBackPixmap()) {
-        qWarning() << "Shared Pixmap was not created. Status area will not render";
+        qWarning("Shared Pixmap was not created. Status area will not render");
     } else {
         createStatusAreaPropertyWindow();
         setSharedPixmapHandleToWindowProperty();
@@ -228,6 +229,8 @@ StatusAreaRenderer::~StatusAreaRenderer()
         }
     }
 
+    delete windowManagerWindowWidget;
+
 #ifdef HAVE_QMSYSTEM
     delete displayState;
 #endif
@@ -291,6 +294,8 @@ bool StatusAreaRenderer::setupStatusBarVisibleListener()
     uchar *data = 0;
 
     windowManagerWindow = 0;
+    delete windowManagerWindowWidget;
+    windowManagerWindowWidget = NULL;
     if (X11Wrapper::XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), windowManagerWindowAtom,
                            0, 1024, False, XA_WINDOW, &type, &format, &length, &after, &data) == Success) {
         if (type == XA_WINDOW && format == 32) {
@@ -315,6 +320,10 @@ bool StatusAreaRenderer::setupStatusBarVisibleListener()
         }
     }
 
+    if (windowManagerWindow != 0) {
+        windowManagerWindowWidget = new XEventListenerWidget(NULL, windowManagerWindow);
+    }
+
     return (windowManagerWindow != 0);
 }
 
@@ -400,6 +409,8 @@ void StatusAreaRenderer::stopTrackingRootWindowProperties()
 void StatusAreaRenderer::wmWindowUnavailable()
 {
     windowManagerWindow = 0;
+    delete windowManagerWindowWidget;
+    windowManagerWindowWidget = NULL;
 
     // Assume status bar is visible when WM window is not available
     statusBarVisible = true;

src/systemui/statusarea/statusarearenderer.h

@@ -156,6 +156,8 @@ private slots:
     Window statusAreaPropertyWindow;
     //! Window id of the window manager window
     Window windowManagerWindow;
+    //! Widget representing the window manager window
+    QWidget *windowManagerWindowWidget;
 
     //! Status Area dimensions.
     uint statusAreaHeight;

src/systemui/systemui.pro

@@ -43,6 +43,7 @@ HEADERS +=                              \
     applicationcontext.h                \
     x11wrapper.h                        \
     xeventlistener.h                    \
+    xeventlistenerwidget.h              \
     diskspacenotifier.h
 
 SOURCES +=                              \
@@ -57,6 +58,7 @@ SOURCES +=                              \
     contextframeworkcontext.cpp         \
     x11wrapper.cpp                      \
     xeventlistener.cpp                  \
+    xeventlistenerwidget.cpp            \
     diskspacenotifier.cpp
 
 include(statusindicatormenu/statusindicatormenu.pri)

src/systemui/xeventlistenerwidget.cpp

@@ -0,0 +1,37 @@
+/***************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+**
+** This file is part of systemui.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation
+** and appearing in the file LICENSE.LGPL included in the packaging
+** of this file.
+**
+****************************************************************************/
+
+#include "xeventlistenerwidget.h"
+#include "xeventlistener.h"
+
+XEventListenerWidget::XEventListenerWidget(QWidget *parent, Window id) :
+    QWidget(parent)
+{
+    create(id, false, false);
+}
+
+XEventListenerWidget::~XEventListenerWidget()
+{
+    destroy(false, false);
+}
+
+bool XEventListenerWidget::x11Event(XEvent *event)
+{
+    return XEventListener::xEventFilter(event);
+}

src/systemui/xeventlistenerwidget.h

@@ -0,0 +1,57 @@
+/***************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+**
+** This file is part of systemui.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation
+** and appearing in the file LICENSE.LGPL included in the packaging
+** of this file.
+**
+****************************************************************************/
+
+#ifndef XEVENTLISTENERWIDGET_H_
+#define XEVENTLISTENERWIDGET_H_
+
+#include <QWidget>
+#include <X11/Xlib.h>
+
+/*!
+ * A QWidget which listens to the X events of the given window and relays them
+ * to the XEventListener.
+ */
+class XEventListenerWidget : public QWidget {
+    Q_OBJECT
+
+public:
+    /*!
+     * Creates an XEventListenerWidget.
+     *
+     * \param parent the parent widget for the widget
+     * \param id the ID of the X window for the window to be represented by this widget
+     */
+    XEventListenerWidget(QWidget *parent, Window id);
+
+    /*!
+     * Destroys the XEventListenerWidget.
+     */
+    ~XEventListenerWidget();
+
+protected:
+    //! \reimp
+    virtual bool x11Event(XEvent *event);
+    //! \reimp_end
+
+#ifdef UNIT_TEST
+    friend class Ut_XEventListenerWidget;
+#endif
+};
+
+#endif /* XEVENTLISTENERWIDGET_H_ */

tests/stubs/xeventlistenerwidget_stub.h

@@ -0,0 +1,72 @@
+/***************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+**
+** This file is part of mhome.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation
+** and appearing in the file LICENSE.LGPL included in the packaging
+** of this file.
+**
+****************************************************************************/
+#ifndef XEVENTLISTENERWIDGET_STUB
+#define XEVENTLISTENERWIDGET_STUB
+
+#include "xeventlistenerwidget.h"
+#include <stubbase.h>
+
+
+// 1. DECLARE STUB
+// FIXME - stubgen is not yet finished
+class XEventListenerWidgetStub : public StubBase {
+  public:
+  virtual void XEventListenerWidgetConstructor(QWidget *parent, Window id);
+  virtual void XEventListenerWidgetDestructor();
+  virtual bool x11Event(XEvent *event);
+}; 
+
+// 2. IMPLEMENT STUB
+void XEventListenerWidgetStub::XEventListenerWidgetConstructor(QWidget *parent, Window id) {
+  Q_UNUSED(parent);
+  Q_UNUSED(id);
+
+}
+void XEventListenerWidgetStub::XEventListenerWidgetDestructor() {
+
+}
+bool XEventListenerWidgetStub::x11Event(XEvent *event) {
+  QList<ParameterBase*> params;
+  params.append( new Parameter<XEvent * >(event));
+  stubMethodEntered("x11Event",params);
+  return stubReturnValue<bool>("x11Event");
+}
+
+
+
+// 3. CREATE A STUB INSTANCE
+XEventListenerWidgetStub gDefaultXEventListenerWidgetStub;
+XEventListenerWidgetStub* gXEventListenerWidgetStub = &gDefaultXEventListenerWidgetStub;
+
+
+// 4. CREATE A PROXY WHICH CALLS THE STUB
+XEventListenerWidget::XEventListenerWidget(QWidget *parent, Window id) {
+  gXEventListenerWidgetStub->XEventListenerWidgetConstructor(parent, id);
+}
+
+XEventListenerWidget::~XEventListenerWidget() {
+  gXEventListenerWidgetStub->XEventListenerWidgetDestructor();
+}
+
+bool XEventListenerWidget::x11Event(XEvent *event) {
+  return gXEventListenerWidgetStub->x11Event(event);
+}
+
+
+#endif

tests/ut_statusarearenderer/ut_statusarearenderer.cpp

@@ -26,6 +26,7 @@
 #include "x11wrapper_modified_stub.h"
 #include <QX11Info>
 #include "xeventlistener_stub.h"
+#include "xeventlistenerwidget_stub.h"
 
 #define ROOT_WINDOW_ID (QX11Info::appRootWindow())
 const static Window MEEGOTOUCH_STATUSBAR_WINDOW_ID = 1;

tests/ut_statusarearenderer/ut_statusarearenderer.pro

@@ -24,6 +24,7 @@ HEADERS += \
     $$SRCDIR/statusarea/statusarearenderer.h \
     $$SRCDIR/statusarea/statusarea.h \
     $$SRCDIR/x11wrapper.h \
-    $$SRCDIR/xeventlistener.h
+    $$SRCDIR/xeventlistener.h \
+    $$SRCDIR/xeventlistenerwidget.h
 
 include(../common_bot.pri)

tests/ut_xeventlistenerwidget/.gitignore

@@ -0,0 +1 @@
+ut_xeventlistenerwidget

tests/ut_xeventlistenerwidget/ut_xeventlistenerwidget.cpp

@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+**
+** This file is part of systemui.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation
+** and appearing in the file LICENSE.LGPL included in the packaging
+** of this file.
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QX11Info>
+#include "xeventlistenerwidget.h"
+#include "xeventlistener_stub.h"
+#include "ut_xeventlistenerwidget.h"
+
+WId qWidgetCreateWindow = 0;
+bool qWidgetCreateInitializeWindow = true;
+bool qWidgetCreateDestroyOldWindow = true;
+void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow)
+{
+    qWidgetCreateWindow = window;
+    qWidgetCreateInitializeWindow = initializeWindow;
+    qWidgetCreateDestroyOldWindow = destroyOldWindow;
+}
+
+bool qWidgetDestroyDestroyWindow = true;
+bool qWidgetDestroyDestroySubWindows = true;
+void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
+{
+    qWidgetDestroyDestroyWindow = destroyWindow;
+    qWidgetDestroyDestroySubWindows = destroySubWindows;
+}
+
+void Ut_XEventListenerWidget::init()
+{
+}
+
+void Ut_XEventListenerWidget::cleanup()
+{
+    gXEventListenerStub->stubReset();
+    qWidgetCreateWindow = 0;
+    qWidgetCreateInitializeWindow = true;
+    qWidgetCreateDestroyOldWindow = true;
+    qWidgetDestroyDestroyWindow = true;
+    qWidgetDestroyDestroySubWindows = true;
+}
+
+void Ut_XEventListenerWidget::initTestCase()
+{
+}
+
+void Ut_XEventListenerWidget::cleanupTestCase()
+{
+}
+
+void Ut_XEventListenerWidget::testConstructionAndDestruction()
+{
+    Qt::HANDLE window = QX11Info::appRootWindow(QX11Info::appScreen());
+    XEventListenerWidget *widget = new XEventListenerWidget(NULL, window);
+    QCOMPARE(qWidgetCreateWindow, (WId)window);
+    QCOMPARE(qWidgetCreateInitializeWindow, false);
+    QCOMPARE(qWidgetCreateDestroyOldWindow, false);
+
+    delete widget;
+    QCOMPARE(qWidgetDestroyDestroyWindow, false);
+    QCOMPARE(qWidgetDestroyDestroySubWindows, false);
+}
+
+void Ut_XEventListenerWidget::testX11Event_data()
+{
+    QTest::addColumn<bool>("returnValue");
+
+    QTest::newRow("Return true") << true;
+    QTest::newRow("Return false") << false;
+}
+
+void Ut_XEventListenerWidget::testX11Event()
+{
+    QFETCH(bool, returnValue);
+
+    gXEventListenerStub->stubSetReturnValue("xEventFilter", returnValue);
+    XEventListenerWidget widget(NULL, 0);
+    XEvent event;
+    QCOMPARE(widget.x11Event(&event), returnValue);
+    QCOMPARE(gXEventListenerStub->stubCallCount("xEventFilter"), 1);
+    QCOMPARE(gXEventListenerStub->stubLastCallTo("xEventFilter").parameter<void *>(0), &event);
+}
+
+QTEST_MAIN(Ut_XEventListenerWidget)