Add support for three new X11 keys

New keys are: XF86XK_TouchpadToggle, XF86XK_TouchpadOn and XF86XK_TouchpadOff

Change-Id: I51c0330213def093adf959d4065ee6d7c1f66d76
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 91bfbfd..b6e2384 100644 (file)
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -970,6 +970,10 @@ public:
         Key_LaunchG  = 0x0100010e,
         Key_LaunchH  = 0x0100010f,
 
+        Key_TouchpadToggle = 0x01000110,
+        Key_TouchpadOn = 0x01000111,
+        Key_TouchpadOff = 0x01000112,
+
         Key_MediaLast = 0x0100ffff,
 
         // Keypad navigation keys

diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 958587c..63ac4a9 100644 (file)
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1649,6 +1649,9 @@
     \value Key_PowerDown
     \value Key_Suspend
     \value Key_ContrastAdjust
+    \value Key_TouchpadToggle
+    \value Key_TouchpadOn
+    \value Key_TouchpadOff
     \value Key_MediaLast
     \value Key_unknown
 

diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
index a2a519c..581693c 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
@@ -239,6 +239,9 @@
 #define XF86XK_TopMenu             0x1008FFA2
 #define XF86XK_Suspend             0x1008FFA7
 #define XF86XK_Hibernate           0x1008FFA8
+#define XF86XK_TouchpadToggle      0x1008FFA9
+#define XF86XK_TouchpadOn          0x1008FFB0
+#define XF86XK_TouchpadOff         0x1008FFB1
 
 
 // end of XF86keysyms.h
@@ -549,6 +552,9 @@ static const unsigned int KeyTbl[] = {
     XF86XK_Bluetooth,           Qt::Key_Bluetooth,
     XF86XK_Suspend,             Qt::Key_Suspend,
     XF86XK_Hibernate,           Qt::Key_Hibernate,
+    XF86XK_TouchpadToggle,      Qt::Key_TouchpadToggle,
+    XF86XK_TouchpadOn,          Qt::Key_TouchpadOn,
+    XF86XK_TouchpadOff,         Qt::Key_TouchpadOff,
     XF86XK_Launch0,             Qt::Key_Launch2, // ### Qt 5: remap properly
     XF86XK_Launch1,             Qt::Key_Launch3,
     XF86XK_Launch2,             Qt::Key_Launch4,

diff --git a/src/plugins/platforms/xlib/qxlibkeyboard.cpp b/src/plugins/platforms/xlib/qxlibkeyboard.cpp
index 66e48fe..1d3dc83 100644 (file)
--- a/src/plugins/platforms/xlib/qxlibkeyboard.cpp
+++ b/src/plugins/platforms/xlib/qxlibkeyboard.cpp
@@ -236,6 +236,9 @@
 #define XF86XK_TopMenu             0x1008FFA2
 #define XF86XK_Suspend             0x1008FFA7
 #define XF86XK_Hibernate           0x1008FFA8
+#define XF86XK_TouchpadToggle      0x1008FFA9
+#define XF86XK_TouchpadOn          0x1008FFB0
+#define XF86XK_TouchpadOff         0x1008FFB1
 
 
 // end of XF86keysyms.h
@@ -544,6 +547,9 @@ static const unsigned int KeyTbl[] = {
     XF86XK_Bluetooth,           Qt::Key_Bluetooth,
     XF86XK_Suspend,             Qt::Key_Suspend,
     XF86XK_Hibernate,           Qt::Key_Hibernate,
+    XF86XK_TouchpadToggle,      Qt::Key_TouchpadToggle,
+    XF86XK_TouchpadOn,          Qt::Key_TouchpadOn,
+    XF86XK_TouchpadOff,         Qt::Key_TouchpadOff,
     XF86XK_Launch0,             Qt::Key_Launch2, // ### Qt 5: remap properly
     XF86XK_Launch1,             Qt::Key_Launch3,
     XF86XK_Launch2,             Qt::Key_Launch4,