QtMir

Merge lp:~lukas-kde/qtmir/xkbkeys into lp:qtmir

  1. xkbkeys
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 346
Merged at revision: 352
Proposed branch: lp:~lukas-kde/qtmir/xkbkeys
Merge into: lp:qtmir
Diff against target: 411 lines (+309/-79)
1 file modified
src/platforms/mirserver/qteventfeeder.cpp (+309/-79)
To merge this branch: bzr merge lp:~lukas-kde/qtmir/xkbkeys
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Daniel d'Andrada (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+265810@code.launchpad.net

Commit message

Extend the key table to cover full xkb range of keycodes.

Fixes many missing symbols, mainly various multimedia keys.
Also fix missing mapping to back/forward extra mouse buttons.

Description of the change

Extend the key table to cover full xkb range of keycodes. Fixes many missing symbols, mainly various multimedia keys.

Also fix missing mapping to back/forward extra mouse buttons.

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/qtmir-ci/325/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/58/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/325/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Looks good to me.

review: Approve
Revision history for this message
Gerry Boland (gerboland) wrote :

+ //XKB_KEY_KP_F1, Qt::Key_F1,
+ //XKB_KEY_KP_F2, Qt::Key_F2,
+ //XKB_KEY_KP_F3, Qt::Key_F3,
+ //XKB_KEY_KP_F4, Qt::Key_F4,
Why commented out? That and several others

review: Needs Information
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> + //XKB_KEY_KP_F1, Qt::Key_F1,
> + //XKB_KEY_KP_F2, Qt::Key_F2,
> + //XKB_KEY_KP_F3, Qt::Key_F3,
> + //XKB_KEY_KP_F4, Qt::Key_F4,
> Why commented out? That and several others

In this case, it looks like the _keypad_ F1 key.... dunno if it's really a valid option. In any case, the mappings are taken from Qt source code, so it should be safe.

Revision history for this message
Gerry Boland (gerboland) wrote :

Ok, just curious

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
2--- src/platforms/mirserver/qteventfeeder.cpp 2015-05-13 09:40:03 +0000
3+++ src/platforms/mirserver/qteventfeeder.cpp 2015-07-24 10:51:56 +0000
4@@ -37,87 +37,315 @@
5
6 // XKB Keysyms which do not map directly to Qt types (i.e. Unicode points)
7 static const uint32_t KeyTable[] = {
8- XKB_KEY_Escape, Qt::Key_Escape,
9- XKB_KEY_Tab, Qt::Key_Tab,
10- XKB_KEY_ISO_Left_Tab, Qt::Key_Backtab,
11- XKB_KEY_BackSpace, Qt::Key_Backspace,
12- XKB_KEY_Return, Qt::Key_Return,
13- XKB_KEY_Insert, Qt::Key_Insert,
14- XKB_KEY_Delete, Qt::Key_Delete,
15- XKB_KEY_Clear, Qt::Key_Delete,
16- XKB_KEY_Pause, Qt::Key_Pause,
17- XKB_KEY_Print, Qt::Key_Print,
18-
19- XKB_KEY_Home, Qt::Key_Home,
20- XKB_KEY_End, Qt::Key_End,
21- XKB_KEY_Left, Qt::Key_Left,
22- XKB_KEY_Up, Qt::Key_Up,
23- XKB_KEY_Right, Qt::Key_Right,
24- XKB_KEY_Down, Qt::Key_Down,
25- XKB_KEY_Prior, Qt::Key_PageUp,
26- XKB_KEY_Next, Qt::Key_PageDown,
27-
28- XKB_KEY_Shift_L, Qt::Key_Shift,
29- XKB_KEY_Shift_R, Qt::Key_Shift,
30- XKB_KEY_Shift_Lock, Qt::Key_Shift,
31- XKB_KEY_Control_L, Qt::Key_Control,
32- XKB_KEY_Control_R, Qt::Key_Control,
33- XKB_KEY_Meta_L, Qt::Key_Meta,
34- XKB_KEY_Meta_R, Qt::Key_Meta,
35- XKB_KEY_Alt_L, Qt::Key_Alt,
36- XKB_KEY_Alt_R, Qt::Key_Alt,
37- XKB_KEY_Caps_Lock, Qt::Key_CapsLock,
38- XKB_KEY_Num_Lock, Qt::Key_NumLock,
39- XKB_KEY_Scroll_Lock, Qt::Key_ScrollLock,
40- XKB_KEY_Super_L, Qt::Key_Super_L,
41- XKB_KEY_Super_R, Qt::Key_Super_R,
42- XKB_KEY_Menu, Qt::Key_Menu,
43- XKB_KEY_Hyper_L, Qt::Key_Hyper_L,
44- XKB_KEY_Hyper_R, Qt::Key_Hyper_R,
45- XKB_KEY_Help, Qt::Key_Help,
46-
47- XKB_KEY_KP_Space, Qt::Key_Space,
48- XKB_KEY_KP_Tab, Qt::Key_Tab,
49- XKB_KEY_KP_Enter, Qt::Key_Enter,
50- XKB_KEY_KP_Home, Qt::Key_Home,
51- XKB_KEY_KP_Left, Qt::Key_Left,
52- XKB_KEY_KP_Up, Qt::Key_Up,
53- XKB_KEY_KP_Right, Qt::Key_Right,
54- XKB_KEY_KP_Down, Qt::Key_Down,
55- XKB_KEY_KP_Prior, Qt::Key_PageUp,
56- XKB_KEY_KP_Next, Qt::Key_PageDown,
57- XKB_KEY_KP_End, Qt::Key_End,
58- XKB_KEY_KP_Begin, Qt::Key_Clear,
59- XKB_KEY_KP_Insert, Qt::Key_Insert,
60- XKB_KEY_KP_Delete, Qt::Key_Delete,
61- XKB_KEY_KP_Equal, Qt::Key_Equal,
62- XKB_KEY_KP_Multiply, Qt::Key_Asterisk,
63- XKB_KEY_KP_Add, Qt::Key_Plus,
64- XKB_KEY_KP_Separator, Qt::Key_Comma,
65- XKB_KEY_KP_Subtract, Qt::Key_Minus,
66- XKB_KEY_KP_Decimal, Qt::Key_Period,
67- XKB_KEY_KP_Divide, Qt::Key_Slash,
68-
69- XKB_KEY_ISO_Level3_Shift, Qt::Key_AltGr,
70- XKB_KEY_Multi_key, Qt::Key_Multi_key,
71- XKB_KEY_Codeinput, Qt::Key_Codeinput,
72- XKB_KEY_SingleCandidate, Qt::Key_SingleCandidate,
73- XKB_KEY_MultipleCandidate, Qt::Key_MultipleCandidate,
74- XKB_KEY_PreviousCandidate, Qt::Key_PreviousCandidate,
75-
76- XKB_KEY_Mode_switch, Qt::Key_Mode_switch,
77- XKB_KEY_script_switch, Qt::Key_Mode_switch,
78+ // misc keys
79+ XKB_KEY_Escape, Qt::Key_Escape,
80+ XKB_KEY_Tab, Qt::Key_Tab,
81+ XKB_KEY_ISO_Left_Tab, Qt::Key_Backtab,
82+ XKB_KEY_BackSpace, Qt::Key_Backspace,
83+ XKB_KEY_Return, Qt::Key_Return,
84+ XKB_KEY_Insert, Qt::Key_Insert,
85+ XKB_KEY_Delete, Qt::Key_Delete,
86+ XKB_KEY_Clear, Qt::Key_Delete,
87+ XKB_KEY_Pause, Qt::Key_Pause,
88+ XKB_KEY_Print, Qt::Key_Print,
89+ 0x1005FF60, Qt::Key_SysReq, // hardcoded Sun SysReq
90+ 0x1007ff00, Qt::Key_SysReq, // hardcoded X386 SysReq
91+
92+ // cursor movement
93+
94+ XKB_KEY_Home, Qt::Key_Home,
95+ XKB_KEY_End, Qt::Key_End,
96+ XKB_KEY_Left, Qt::Key_Left,
97+ XKB_KEY_Up, Qt::Key_Up,
98+ XKB_KEY_Right, Qt::Key_Right,
99+ XKB_KEY_Down, Qt::Key_Down,
100+ XKB_KEY_Prior, Qt::Key_PageUp,
101+ XKB_KEY_Next, Qt::Key_PageDown,
102+
103+ // modifiers
104+
105+ XKB_KEY_Shift_L, Qt::Key_Shift,
106+ XKB_KEY_Shift_R, Qt::Key_Shift,
107+ XKB_KEY_Shift_Lock, Qt::Key_Shift,
108+ XKB_KEY_Control_L, Qt::Key_Control,
109+ XKB_KEY_Control_R, Qt::Key_Control,
110+ XKB_KEY_Meta_L, Qt::Key_Meta,
111+ XKB_KEY_Meta_R, Qt::Key_Meta,
112+ XKB_KEY_Alt_L, Qt::Key_Alt,
113+ XKB_KEY_Alt_R, Qt::Key_Alt,
114+ XKB_KEY_Caps_Lock, Qt::Key_CapsLock,
115+ XKB_KEY_Num_Lock, Qt::Key_NumLock,
116+ XKB_KEY_Scroll_Lock, Qt::Key_ScrollLock,
117+ XKB_KEY_Super_L, Qt::Key_Super_L,
118+ XKB_KEY_Super_R, Qt::Key_Super_R,
119+ XKB_KEY_Menu, Qt::Key_Menu,
120+ XKB_KEY_Hyper_L, Qt::Key_Hyper_L,
121+ XKB_KEY_Hyper_R, Qt::Key_Hyper_R,
122+ XKB_KEY_Help, Qt::Key_Help,
123+ 0x1000FF74, Qt::Key_Backtab, // hardcoded HP backtab
124+ 0x1005FF10, Qt::Key_F11, // hardcoded Sun F36 (labeled F11)
125+ 0x1005FF11, Qt::Key_F12, // hardcoded Sun F37 (labeled F12)
126+
127+ // numeric and function keypad keys
128+
129+ XKB_KEY_KP_Space, Qt::Key_Space,
130+ XKB_KEY_KP_Tab, Qt::Key_Tab,
131+ XKB_KEY_KP_Enter, Qt::Key_Enter,
132+ //XKB_KEY_KP_F1, Qt::Key_F1,
133+ //XKB_KEY_KP_F2, Qt::Key_F2,
134+ //XKB_KEY_KP_F3, Qt::Key_F3,
135+ //XKB_KEY_KP_F4, Qt::Key_F4,
136+ XKB_KEY_KP_Home, Qt::Key_Home,
137+ XKB_KEY_KP_Left, Qt::Key_Left,
138+ XKB_KEY_KP_Up, Qt::Key_Up,
139+ XKB_KEY_KP_Right, Qt::Key_Right,
140+ XKB_KEY_KP_Down, Qt::Key_Down,
141+ XKB_KEY_KP_Prior, Qt::Key_PageUp,
142+ XKB_KEY_KP_Next, Qt::Key_PageDown,
143+ XKB_KEY_KP_End, Qt::Key_End,
144+ XKB_KEY_KP_Begin, Qt::Key_Clear,
145+ XKB_KEY_KP_Insert, Qt::Key_Insert,
146+ XKB_KEY_KP_Delete, Qt::Key_Delete,
147+ XKB_KEY_KP_Equal, Qt::Key_Equal,
148+ XKB_KEY_KP_Multiply, Qt::Key_Asterisk,
149+ XKB_KEY_KP_Add, Qt::Key_Plus,
150+ XKB_KEY_KP_Separator, Qt::Key_Comma,
151+ XKB_KEY_KP_Subtract, Qt::Key_Minus,
152+ XKB_KEY_KP_Decimal, Qt::Key_Period,
153+ XKB_KEY_KP_Divide, Qt::Key_Slash,
154+
155+ // International input method support keys
156+
157+ // International & multi-key character composition
158+ XKB_KEY_ISO_Level3_Shift, Qt::Key_AltGr,
159+ XKB_KEY_Multi_key, Qt::Key_Multi_key,
160+ XKB_KEY_Codeinput, Qt::Key_Codeinput,
161+ XKB_KEY_SingleCandidate, Qt::Key_SingleCandidate,
162+ XKB_KEY_MultipleCandidate, Qt::Key_MultipleCandidate,
163+ XKB_KEY_PreviousCandidate, Qt::Key_PreviousCandidate,
164+
165+ // Misc Functions
166+ XKB_KEY_Mode_switch, Qt::Key_Mode_switch,
167+ XKB_KEY_script_switch, Qt::Key_Mode_switch,
168+
169+ // Japanese keyboard support
170+ XKB_KEY_Kanji, Qt::Key_Kanji,
171+ XKB_KEY_Muhenkan, Qt::Key_Muhenkan,
172+ //XKB_KEY_Henkan_Mode, Qt::Key_Henkan_Mode,
173+ XKB_KEY_Henkan_Mode, Qt::Key_Henkan,
174+ XKB_KEY_Henkan, Qt::Key_Henkan,
175+ XKB_KEY_Romaji, Qt::Key_Romaji,
176+ XKB_KEY_Hiragana, Qt::Key_Hiragana,
177+ XKB_KEY_Katakana, Qt::Key_Katakana,
178+ XKB_KEY_Hiragana_Katakana, Qt::Key_Hiragana_Katakana,
179+ XKB_KEY_Zenkaku, Qt::Key_Zenkaku,
180+ XKB_KEY_Hankaku, Qt::Key_Hankaku,
181+ XKB_KEY_Zenkaku_Hankaku, Qt::Key_Zenkaku_Hankaku,
182+ XKB_KEY_Touroku, Qt::Key_Touroku,
183+ XKB_KEY_Massyo, Qt::Key_Massyo,
184+ XKB_KEY_Kana_Lock, Qt::Key_Kana_Lock,
185+ XKB_KEY_Kana_Shift, Qt::Key_Kana_Shift,
186+ XKB_KEY_Eisu_Shift, Qt::Key_Eisu_Shift,
187+ XKB_KEY_Eisu_toggle, Qt::Key_Eisu_toggle,
188+ //XKB_KEY_Kanji_Bangou, Qt::Key_Kanji_Bangou,
189+ //XKB_KEY_Zen_Koho, Qt::Key_Zen_Koho,
190+ //XKB_KEY_Mae_Koho, Qt::Key_Mae_Koho,
191+ XKB_KEY_Kanji_Bangou, Qt::Key_Codeinput,
192+ XKB_KEY_Zen_Koho, Qt::Key_MultipleCandidate,
193+ XKB_KEY_Mae_Koho, Qt::Key_PreviousCandidate,
194+
195+#ifdef XKB_KEY_KOREAN
196+ // Korean keyboard support
197+ XKB_KEY_Hangul, Qt::Key_Hangul,
198+ XKB_KEY_Hangul_Start, Qt::Key_Hangul_Start,
199+ XKB_KEY_Hangul_End, Qt::Key_Hangul_End,
200+ XKB_KEY_Hangul_Hanja, Qt::Key_Hangul_Hanja,
201+ XKB_KEY_Hangul_Jamo, Qt::Key_Hangul_Jamo,
202+ XKB_KEY_Hangul_Romaja, Qt::Key_Hangul_Romaja,
203+ //XKB_KEY_Hangul_Codeinput, Qt::Key_Hangul_Codeinput,
204+ XKB_KEY_Hangul_Codeinput, Qt::Key_Codeinput,
205+ XKB_KEY_Hangul_Jeonja, Qt::Key_Hangul_Jeonja,
206+ XKB_KEY_Hangul_Banja, Qt::Key_Hangul_Banja,
207+ XKB_KEY_Hangul_PreHanja, Qt::Key_Hangul_PreHanja,
208+ XKB_KEY_Hangul_PostHanja, Qt::Key_Hangul_PostHanja,
209+ //XKB_KEY_Hangul_SingleCandidate,Qt::Key_Hangul_SingleCandidate,
210+ //XKB_KEY_Hangul_MultipleCandidate,Qt::Key_Hangul_MultipleCandidate,
211+ //XKB_KEY_Hangul_PreviousCandidate,Qt::Key_Hangul_PreviousCandidate,
212+ XKB_KEY_Hangul_SingleCandidate, Qt::Key_SingleCandidate,
213+ XKB_KEY_Hangul_MultipleCandidate,Qt::Key_MultipleCandidate,
214+ XKB_KEY_Hangul_PreviousCandidate,Qt::Key_PreviousCandidate,
215+ XKB_KEY_Hangul_Special, Qt::Key_Hangul_Special,
216+ //XKB_KEY_Hangul_switch, Qt::Key_Hangul_switch,
217+ XKB_KEY_Hangul_switch, Qt::Key_Mode_switch,
218+#endif // XKB_KEY_KOREAN
219+
220+ // dead keys
221+ XKB_KEY_dead_grave, Qt::Key_Dead_Grave,
222+ XKB_KEY_dead_acute, Qt::Key_Dead_Acute,
223+ XKB_KEY_dead_circumflex, Qt::Key_Dead_Circumflex,
224+ XKB_KEY_dead_tilde, Qt::Key_Dead_Tilde,
225+ XKB_KEY_dead_macron, Qt::Key_Dead_Macron,
226+ XKB_KEY_dead_breve, Qt::Key_Dead_Breve,
227+ XKB_KEY_dead_abovedot, Qt::Key_Dead_Abovedot,
228+ XKB_KEY_dead_diaeresis, Qt::Key_Dead_Diaeresis,
229+ XKB_KEY_dead_abovering, Qt::Key_Dead_Abovering,
230+ XKB_KEY_dead_doubleacute, Qt::Key_Dead_Doubleacute,
231+ XKB_KEY_dead_caron, Qt::Key_Dead_Caron,
232+ XKB_KEY_dead_cedilla, Qt::Key_Dead_Cedilla,
233+ XKB_KEY_dead_ogonek, Qt::Key_Dead_Ogonek,
234+ XKB_KEY_dead_iota, Qt::Key_Dead_Iota,
235+ XKB_KEY_dead_voiced_sound, Qt::Key_Dead_Voiced_Sound,
236+ XKB_KEY_dead_semivoiced_sound, Qt::Key_Dead_Semivoiced_Sound,
237+ XKB_KEY_dead_belowdot, Qt::Key_Dead_Belowdot,
238+ XKB_KEY_dead_hook, Qt::Key_Dead_Hook,
239+ XKB_KEY_dead_horn, Qt::Key_Dead_Horn,
240+
241+ // Special keys from X.org - This include multimedia keys,
242+ // wireless/bluetooth/uwb keys, special launcher keys, etc.
243+ XKB_KEY_XF86Back, Qt::Key_Back,
244+ XKB_KEY_XF86Forward, Qt::Key_Forward,
245+ XKB_KEY_XF86Stop, Qt::Key_Stop,
246+ XKB_KEY_XF86Refresh, Qt::Key_Refresh,
247+ XKB_KEY_XF86Favorites, Qt::Key_Favorites,
248+ XKB_KEY_XF86AudioMedia, Qt::Key_LaunchMedia,
249+ XKB_KEY_XF86OpenURL, Qt::Key_OpenUrl,
250+ XKB_KEY_XF86HomePage, Qt::Key_HomePage,
251+ XKB_KEY_XF86Search, Qt::Key_Search,
252+ XKB_KEY_XF86AudioLowerVolume, Qt::Key_VolumeDown,
253+ XKB_KEY_XF86AudioMute, Qt::Key_VolumeMute,
254 XKB_KEY_XF86AudioRaiseVolume, Qt::Key_VolumeUp,
255- XKB_KEY_XF86AudioLowerVolume, Qt::Key_VolumeDown,
256- XKB_KEY_XF86PowerOff, Qt::Key_PowerOff,
257- XKB_KEY_XF86PowerDown, Qt::Key_PowerDown,
258-
259- /* Bluetooth / Wired headset multimedia keys */
260 XKB_KEY_XF86AudioPlay, Qt::Key_MediaPlay,
261+ XKB_KEY_XF86AudioStop, Qt::Key_MediaStop,
262 XKB_KEY_XF86AudioPrev, Qt::Key_MediaPrevious,
263 XKB_KEY_XF86AudioNext, Qt::Key_MediaNext,
264+ XKB_KEY_XF86AudioRecord, Qt::Key_MediaRecord,
265 XKB_KEY_XF86AudioPause, Qt::Key_MediaPause,
266- XKB_KEY_XF86AudioMedia, Qt::Key_MediaTogglePlayPause,
267+ XKB_KEY_XF86Mail, Qt::Key_LaunchMail,
268+ XKB_KEY_XF86MyComputer, Qt::Key_Launch0, // ### Qt 6: remap properly
269+ XKB_KEY_XF86Calculator, Qt::Key_Launch1,
270+ XKB_KEY_XF86Memo, Qt::Key_Memo,
271+ XKB_KEY_XF86ToDoList, Qt::Key_ToDoList,
272+ XKB_KEY_XF86Calendar, Qt::Key_Calendar,
273+ XKB_KEY_XF86PowerDown, Qt::Key_PowerDown,
274+ XKB_KEY_XF86ContrastAdjust, Qt::Key_ContrastAdjust,
275+ XKB_KEY_XF86Standby, Qt::Key_Standby,
276+ XKB_KEY_XF86MonBrightnessUp, Qt::Key_MonBrightnessUp,
277+ XKB_KEY_XF86MonBrightnessDown, Qt::Key_MonBrightnessDown,
278+ XKB_KEY_XF86KbdLightOnOff, Qt::Key_KeyboardLightOnOff,
279+ XKB_KEY_XF86KbdBrightnessUp, Qt::Key_KeyboardBrightnessUp,
280+ XKB_KEY_XF86KbdBrightnessDown, Qt::Key_KeyboardBrightnessDown,
281+ XKB_KEY_XF86PowerOff, Qt::Key_PowerOff,
282+ XKB_KEY_XF86WakeUp, Qt::Key_WakeUp,
283+ XKB_KEY_XF86Eject, Qt::Key_Eject,
284+ XKB_KEY_XF86ScreenSaver, Qt::Key_ScreenSaver,
285+ XKB_KEY_XF86WWW, Qt::Key_WWW,
286+ XKB_KEY_XF86Sleep, Qt::Key_Sleep,
287+ XKB_KEY_XF86LightBulb, Qt::Key_LightBulb,
288+ XKB_KEY_XF86Shop, Qt::Key_Shop,
289+ XKB_KEY_XF86History, Qt::Key_History,
290+ XKB_KEY_XF86AddFavorite, Qt::Key_AddFavorite,
291+ XKB_KEY_XF86HotLinks, Qt::Key_HotLinks,
292+ XKB_KEY_XF86BrightnessAdjust, Qt::Key_BrightnessAdjust,
293+ XKB_KEY_XF86Finance, Qt::Key_Finance,
294+ XKB_KEY_XF86Community, Qt::Key_Community,
295+ XKB_KEY_XF86AudioRewind, Qt::Key_AudioRewind,
296+ XKB_KEY_XF86BackForward, Qt::Key_BackForward,
297+ XKB_KEY_XF86ApplicationLeft, Qt::Key_ApplicationLeft,
298+ XKB_KEY_XF86ApplicationRight, Qt::Key_ApplicationRight,
299+ XKB_KEY_XF86Book, Qt::Key_Book,
300+ XKB_KEY_XF86CD, Qt::Key_CD,
301+ XKB_KEY_XF86Calculater, Qt::Key_Calculator,
302+ XKB_KEY_XF86Clear, Qt::Key_Clear,
303+ XKB_KEY_XF86ClearGrab, Qt::Key_ClearGrab,
304+ XKB_KEY_XF86Close, Qt::Key_Close,
305+ XKB_KEY_XF86Copy, Qt::Key_Copy,
306+ XKB_KEY_XF86Cut, Qt::Key_Cut,
307+ XKB_KEY_XF86Display, Qt::Key_Display,
308+ XKB_KEY_XF86DOS, Qt::Key_DOS,
309+ XKB_KEY_XF86Documents, Qt::Key_Documents,
310+ XKB_KEY_XF86Excel, Qt::Key_Excel,
311+ XKB_KEY_XF86Explorer, Qt::Key_Explorer,
312+ XKB_KEY_XF86Game, Qt::Key_Game,
313+ XKB_KEY_XF86Go, Qt::Key_Go,
314+ XKB_KEY_XF86iTouch, Qt::Key_iTouch,
315+ XKB_KEY_XF86LogOff, Qt::Key_LogOff,
316+ XKB_KEY_XF86Market, Qt::Key_Market,
317+ XKB_KEY_XF86Meeting, Qt::Key_Meeting,
318+ XKB_KEY_XF86MenuKB, Qt::Key_MenuKB,
319+ XKB_KEY_XF86MenuPB, Qt::Key_MenuPB,
320+ XKB_KEY_XF86MySites, Qt::Key_MySites,
321+ XKB_KEY_XF86New, Qt::Key_New,
322+ XKB_KEY_XF86News, Qt::Key_News,
323+ XKB_KEY_XF86OfficeHome, Qt::Key_OfficeHome,
324+ XKB_KEY_XF86Open, Qt::Key_Open,
325+ XKB_KEY_XF86Option, Qt::Key_Option,
326+ XKB_KEY_XF86Paste, Qt::Key_Paste,
327+ XKB_KEY_XF86Phone, Qt::Key_Phone,
328+ XKB_KEY_XF86Reply, Qt::Key_Reply,
329+ XKB_KEY_XF86Reload, Qt::Key_Reload,
330+ XKB_KEY_XF86RotateWindows, Qt::Key_RotateWindows,
331+ XKB_KEY_XF86RotationPB, Qt::Key_RotationPB,
332+ XKB_KEY_XF86RotationKB, Qt::Key_RotationKB,
333+ XKB_KEY_XF86Save, Qt::Key_Save,
334+ XKB_KEY_XF86Send, Qt::Key_Send,
335+ XKB_KEY_XF86Spell, Qt::Key_Spell,
336+ XKB_KEY_XF86SplitScreen, Qt::Key_SplitScreen,
337+ XKB_KEY_XF86Support, Qt::Key_Support,
338+ XKB_KEY_XF86TaskPane, Qt::Key_TaskPane,
339+ XKB_KEY_XF86Terminal, Qt::Key_Terminal,
340+ XKB_KEY_XF86Tools, Qt::Key_Tools,
341+ XKB_KEY_XF86Travel, Qt::Key_Travel,
342+ XKB_KEY_XF86Video, Qt::Key_Video,
343+ XKB_KEY_XF86Word, Qt::Key_Word,
344+ XKB_KEY_XF86Xfer, Qt::Key_Xfer,
345+ XKB_KEY_XF86ZoomIn, Qt::Key_ZoomIn,
346+ XKB_KEY_XF86ZoomOut, Qt::Key_ZoomOut,
347+ XKB_KEY_XF86Away, Qt::Key_Away,
348+ XKB_KEY_XF86Messenger, Qt::Key_Messenger,
349+ XKB_KEY_XF86WebCam, Qt::Key_WebCam,
350+ XKB_KEY_XF86MailForward, Qt::Key_MailForward,
351+ XKB_KEY_XF86Pictures, Qt::Key_Pictures,
352+ XKB_KEY_XF86Music, Qt::Key_Music,
353+ XKB_KEY_XF86Battery, Qt::Key_Battery,
354+ XKB_KEY_XF86Bluetooth, Qt::Key_Bluetooth,
355+ XKB_KEY_XF86WLAN, Qt::Key_WLAN,
356+ XKB_KEY_XF86UWB, Qt::Key_UWB,
357+ XKB_KEY_XF86AudioForward, Qt::Key_AudioForward,
358+ XKB_KEY_XF86AudioRepeat, Qt::Key_AudioRepeat,
359+ XKB_KEY_XF86AudioRandomPlay, Qt::Key_AudioRandomPlay,
360+ XKB_KEY_XF86Subtitle, Qt::Key_Subtitle,
361+ XKB_KEY_XF86AudioCycleTrack, Qt::Key_AudioCycleTrack,
362+ XKB_KEY_XF86Time, Qt::Key_Time,
363+ XKB_KEY_XF86Select, Qt::Key_Select,
364+ XKB_KEY_XF86View, Qt::Key_View,
365+ XKB_KEY_XF86TopMenu, Qt::Key_TopMenu,
366+ XKB_KEY_XF86Red, Qt::Key_Red,
367+ XKB_KEY_XF86Green, Qt::Key_Green,
368+ XKB_KEY_XF86Yellow, Qt::Key_Yellow,
369+ XKB_KEY_XF86Blue, Qt::Key_Blue,
370+ XKB_KEY_XF86Bluetooth, Qt::Key_Bluetooth,
371+ XKB_KEY_XF86Suspend, Qt::Key_Suspend,
372+ XKB_KEY_XF86Hibernate, Qt::Key_Hibernate,
373+ XKB_KEY_XF86TouchpadToggle, Qt::Key_TouchpadToggle,
374+ XKB_KEY_XF86TouchpadOn, Qt::Key_TouchpadOn,
375+ XKB_KEY_XF86TouchpadOff, Qt::Key_TouchpadOff,
376+ XKB_KEY_XF86AudioMicMute, Qt::Key_MicMute,
377+ XKB_KEY_XF86Launch0, Qt::Key_Launch2, // ### Qt 6: remap properly
378+ XKB_KEY_XF86Launch1, Qt::Key_Launch3,
379+ XKB_KEY_XF86Launch2, Qt::Key_Launch4,
380+ XKB_KEY_XF86Launch3, Qt::Key_Launch5,
381+ XKB_KEY_XF86Launch4, Qt::Key_Launch6,
382+ XKB_KEY_XF86Launch5, Qt::Key_Launch7,
383+ XKB_KEY_XF86Launch6, Qt::Key_Launch8,
384+ XKB_KEY_XF86Launch7, Qt::Key_Launch9,
385+ XKB_KEY_XF86Launch8, Qt::Key_LaunchA,
386+ XKB_KEY_XF86Launch9, Qt::Key_LaunchB,
387+ XKB_KEY_XF86LaunchA, Qt::Key_LaunchC,
388+ XKB_KEY_XF86LaunchB, Qt::Key_LaunchD,
389+ XKB_KEY_XF86LaunchC, Qt::Key_LaunchE,
390+ XKB_KEY_XF86LaunchD, Qt::Key_LaunchF,
391+ XKB_KEY_XF86LaunchE, Qt::Key_LaunchG,
392+ XKB_KEY_XF86LaunchF, Qt::Key_LaunchH,
393
394 0, 0
395 };
396@@ -269,10 +497,12 @@
397 if (mir_pointer_event_button_state(pev, mir_pointer_button_secondary))
398 buttons |= Qt::RightButton;
399 if (mir_pointer_event_button_state(pev, mir_pointer_button_tertiary))
400- buttons |= Qt::MidButton;
401+ buttons |= Qt::MiddleButton;
402+ if (mir_pointer_event_button_state(pev, mir_pointer_button_back))
403+ buttons |= Qt::BackButton;
404+ if (mir_pointer_event_button_state(pev, mir_pointer_button_forward))
405+ buttons |= Qt::ForwardButton;
406
407- // TODO: Should mir back and forward buttons exist?
408- // should they be Qt::X button 1 and 2?
409 return static_cast<Qt::MouseButton>(buttons);
410 }
411 }

Subscribers

People subscribed via source and target branches