Title: [133531] trunk/Source/WebCore
Revision
133531
Author
[email protected]
Date
2012-11-05 14:56:46 -0800 (Mon, 05 Nov 2012)

Log Message

Webkit does not handle some media keys correctly On Linux gtk platform.
https://bugs.webkit.org/show_bug.cgi?id=101221

Patch by Peng Huang <[email protected]> on 2012-11-05
Reviewed by Alexey Proskuryakov.

Add media keyboard support on Linux gtk platform.

* platform/chromium/KeyCodeConversionGtk.cpp:
(WebCore::windowsKeyCodeForKeyEvent):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (133530 => 133531)


--- trunk/Source/WebCore/ChangeLog	2012-11-05 22:52:04 UTC (rev 133530)
+++ trunk/Source/WebCore/ChangeLog	2012-11-05 22:56:46 UTC (rev 133531)
@@ -1,3 +1,15 @@
+2012-11-05  Peng Huang  <[email protected]>
+
+        Webkit does not handle some media keys correctly On Linux gtk platform.
+        https://bugs.webkit.org/show_bug.cgi?id=101221
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add media keyboard support on Linux gtk platform.
+
+        * platform/chromium/KeyCodeConversionGtk.cpp:
+        (WebCore::windowsKeyCodeForKeyEvent):
+
 2012-11-05  Glenn Adams  <[email protected]>
 
         Add support to -webkit-line-break property for CSS3 Text line-break property values and semantics.

Modified: trunk/Source/WebCore/platform/chromium/KeyCodeConversionGtk.cpp (133530 => 133531)


--- trunk/Source/WebCore/platform/chromium/KeyCodeConversionGtk.cpp	2012-11-05 22:52:04 UTC (rev 133530)
+++ trunk/Source/WebCore/platform/chromium/KeyCodeConversionGtk.cpp	2012-11-05 22:56:46 UTC (rev 133531)
@@ -303,24 +303,41 @@
         // VKEY_RCONTROL (A3) Right CONTROL key
         // VKEY_LMENU (A4) Left MENU key
         // VKEY_RMENU (A5) Right MENU key
-        // VKEY_BROWSER_BACK (A6) Windows 2000/XP: Browser Back key
-        // VKEY_BROWSER_FORWARD (A7) Windows 2000/XP: Browser Forward key
-        // VKEY_BROWSER_REFRESH (A8) Windows 2000/XP: Browser Refresh key
-        // VKEY_BROWSER_STOP (A9) Windows 2000/XP: Browser Stop key
-        // VKEY_BROWSER_SEARCH (AA) Windows 2000/XP: Browser Search key
-        // VKEY_BROWSER_FAVORITES (AB) Windows 2000/XP: Browser Favorites key
-        // VKEY_BROWSER_HOME (AC) Windows 2000/XP: Browser Start and Home key
-        // VKEY_VOLUME_MUTE (AD) Windows 2000/XP: Volume Mute key
-        // VKEY_VOLUME_DOWN (AE) Windows 2000/XP: Volume Down key
-        // VKEY_VOLUME_UP (AF) Windows 2000/XP: Volume Up key
-        // VKEY_MEDIA_NEXT_TRACK (B0) Windows 2000/XP: Next Track key
-        // VKEY_MEDIA_PREV_TRACK (B1) Windows 2000/XP: Previous Track key
-        // VKEY_MEDIA_STOP (B2) Windows 2000/XP: Stop Media key
-        // VKEY_MEDIA_PLAY_PAUSE (B3) Windows 2000/XP: Play/Pause Media key
-        // VKEY_LAUNCH_MAIL (B4) Windows 2000/XP: Start Mail key
+    case GDK_Back:
+        return VKEY_BROWSER_BACK; // (A6) Windows 2000/XP: Browser Back key
+    case GDK_Forward:
+        return VKEY_BROWSER_FORWARD; // (A7) Windows 2000/XP: Browser Forward key
+    case GDK_Refresh:
+        return VKEY_BROWSER_REFRESH; // (A8) Windows 2000/XP: Browser Refresh key
+    case GDK_Stop:
+        return VKEY_BROWSER_STOP; // (A9) Windows 2000/XP: Browser Stop key
+    case GDK_Search:
+        return VKEY_BROWSER_SEARCH; // (AA) Windows 2000/XP: Browser Search key
+    case GDK_Favorites:
+        return VKEY_BROWSER_FAVORITES; // (AB) Windows 2000/XP: Browser Favorites key
+    case GDK_HomePage:
+        return VKEY_BROWSER_HOME; // (AC) Windows 2000/XP: Browser Start and Home key
+    case GDK_AudioMute:
+        return VKEY_VOLUME_MUTE; // (AD) Windows 2000/XP: Volume Mute key
+    case GDK_AudioLowerVolume:
+        return VKEY_VOLUME_DOWN; // (AE) Windows 2000/XP: Volume Down key
+    case GDK_AudioRaiseVolume:
+        return VKEY_VOLUME_UP; // (AF) Windows 2000/XP: Volume Up key
+    case GDK_AudioNext:
+        return VKEY_MEDIA_NEXT_TRACK; // (B0) Windows 2000/XP: Next Track key
+    case GDK_AudioPrev:
+        return VKEY_MEDIA_PREV_TRACK; // (B1) Windows 2000/XP: Previous Track key
+    case GDK_AudioStop:
+        return VKEY_MEDIA_STOP; // (B2) Windows 2000/XP: Stop Media key
+    case GDK_AudioPlay:
+        return VKEY_MEDIA_PLAY_PAUSE; // (B3) Windows 2000/XP: Play/Pause Media key
+    case GDK_Mail:
+        return VKEY_MEDIA_LAUNCH_MAIL; // (B4) Windows 2000/XP: Start Mail key
         // VKEY_LAUNCH_MEDIA_SELECT (B5) Windows 2000/XP: Select Media key
-        // VKEY_LAUNCH_APP1 (B6) Windows 2000/XP: Start Application 1 key
-        // VKEY_LAUNCH_APP2 (B7) Windows 2000/XP: Start Application 2 key
+    case GDK_LaunchA:
+        return VKEY_MEDIA_LAUNCH_APP1; // (B6) Windows 2000/XP: Start Application 1 key
+    case GDK_LaunchB:
+        return VKEY_MEDIA_LAUNCH_APP2; // (B7) Windows 2000/XP: Start Application 2 key
 
         // VKEY_OEM_1 (BA) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the ';:' key
     case GDK_semicolon:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to