Merge branch 'master' into 'master'

[sbj] Workaround devices with bad headset event on Sailfish. Contributes to JB#33503 Some headset drivers send KEY_MEDIA event from headset buttons, which should launch media application. Since that doesn't make sense, map to Phone key. See merge request !1
sailfishos · Jan 26, 2016 · 9b9e928 · 9b9e928
2 parents 41a6c8a + f1134be
commit 9b9e928
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/xkeyboard-config/symbols/inet b/xkeyboard-config/symbols/inet
@@ -200,7 +200,9 @@ xkb_symbols "evdev" {
     key <I231>   {      [ Cancel                ]       };
     key <I232>   {      [ XF86MonBrightnessDown ]       };
     key <I233>   {      [ XF86MonBrightnessUp   ]       };
-    key <I234>   {      [ XF86AudioMedia        ]       };
+// HACK: disabled to allow Jolla layout to define different mapping.
+// TODO: there's likely a better way to keep this and allow override.
+//    key <I234>   {      [ XF86AudioMedia        ]       };
     key <I235>   {      [ XF86Display           ]       };
     key <I236>   {      [ XF86KbdLightOnOff     ]       }; // KEY_KBDILLUMTOGGLE
     key <I237>   {      [ XF86KbdBrightnessDown ]       }; // KEY_KBDILLUMDOWN

diff --git a/xkeyboard-config/symbols/jolla_vndr/sbj b/xkeyboard-config/symbols/jolla_vndr/sbj
@@ -54,4 +54,7 @@ xkb_symbols "common-keys" {
 
     // generated from the headset, must always be in the map.
     key <I264>	{ [	XF86Phone							] };
+    // Some kernel input drivers send KEY_MEDIA from headset button.
+    // Work around by mapping to phone key.
+    key <I234>  { [     XF86Phone                                                       ] };
 };