Changeset 54058 in webkit

Timestamp:

Jan 29, 2010 6:00:29 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-29 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Add support for Maemo zoom keys in QtLauncher

​https://bugs.webkit.org/show_bug.cgi?id=34160

• QtLauncher/main.cpp: (LauncherWindow::LauncherWindow): (LauncherWindow::~LauncherWindow): (LauncherWindow::keyPressEvent): (LauncherWindow::grabZoomKeys):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-29  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add support for Maemo zoom keys in QtLauncher
+
+        https://bugs.webkit.org/show_bug.cgi?id=34160
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::LauncherWindow):
+        (LauncherWindow::~LauncherWindow):
+        (LauncherWindow::keyPressEvent):
+        (LauncherWindow::grabZoomKeys):
+
 2010-01-29  Benjamin Poulain  <benjamin.poulain@nokia.com>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -50 +50 @@
 #include <qwebinspector.h>
 #include <qwebsettings.h>
+
+#ifdef Q_WS_MAEMO_5
+#include <qx11info_x11.h>
+#endif
+
 #include "urlloader.h"
 #include "utils.h"
@@ -56 +61 @@
 #include "webview.h"
 
+#ifdef Q_WS_MAEMO_5
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#undef KeyPress
+#endif
+
 #ifndef NDEBUG
 void QWEBKIT_EXPORT qt_drt_garbageCollector_collect();
@@ -96 +107 @@
         zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
 
+        grabZoomKeys(true);
+
         load(url);
+    }
+
+    ~LauncherWindow()
+    {
+        grabZoomKeys(false);
+    }
+
+    void keyPressEvent(QKeyEvent* event)
+    {
+#ifdef Q_WS_MAEMO_5
+        switch (event->key()) {
+        case Qt::Key_F7:
+            zoomIn();
+            event->accept();
+            break;
+        case Qt::Key_F8:
+            zoomOut();
+            event->accept();
+            break;
+        }
+#endif
+        MainWindow::keyPressEvent(event);
+    }
+
+    void grabZoomKeys(bool grab)
+    {
+#ifdef Q_WS_MAEMO_5
+        if (!winId()) {
+            qWarning("Can't grab keys unless we have a window id");
+            return;
+        }
+
+        Atom atom = XInternAtom(QX11Info::display(), "_HILDON_ZOOM_KEY_ATOM", False);
+        if (!atom) {
+            qWarning("Unable to obtain _HILDON_ZOOM_KEY_ATOM");
+            return;
+        }
+
+        unsigned long val = (grab) ? 1 : 0;
+        XChangeProperty(QX11Info::display(), winId(), atom, XA_INTEGER, 32, PropModeReplace, reinterpret_cast<unsigned char*>(&val), 1);
+#endif
     }