Changeset 117238 in webkit

Timestamp:

May 16, 2012 2:12:32 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] PlatformKeyboardEvent: figures, letters and printscreen key handling
​https://bugs.webkit.org/show_bug.cgi?id=85503

Patch by Mikhail Pozdnyakov <​mikhail.pozdnyakov@intel.com> on 2012-05-16
Reviewed by Gustavo Noronha Silva.

Source/WebCore:

• platform/efl/EflKeyboardUtilities.cpp:

(WebCore::addCharactersToKeyMap): aux function
(WebCore):
(WebCore::createKeyMap): Figures and letters keys are added to the keyMap
(WebCore::addCharactersToWinKeyMap): aux function
(WebCore::createWindowsKeyMap): Capital letters keys are added to the windowsKeyMap. Corrected value for printscreen key.
(WebCore::singleCharacterString): Return empty text for printscreen key.

LayoutTests:

Bug-related testcases are unskipped.

• platform/efl/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/efl/EflKeyboardUtilities.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-16  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        [EFL] PlatformKeyboardEvent: figures, letters and printscreen key handling
+        https://bugs.webkit.org/show_bug.cgi?id=85503
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Bug-related testcases are unskipped.
+
+        * platform/efl/Skipped:
+
 2012-05-16  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -800 +800 @@
 fast/events/key-events-in-input-text.html
 fast/events/option-tab.html
-fast/events/special-key-events-in-input-text.html
-fast/forms/enter-clicks-buttons.html
 fast/forms/input-search-press-escape-key.html
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-16  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        [EFL] PlatformKeyboardEvent: figures, letters and printscreen key handling
+        https://bugs.webkit.org/show_bug.cgi?id=85503
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * platform/efl/EflKeyboardUtilities.cpp:
+        (WebCore::addCharactersToKeyMap): aux function
+        (WebCore):
+        (WebCore::createKeyMap): Figures and letters keys are added to the keyMap
+        (WebCore::addCharactersToWinKeyMap): aux function
+        (WebCore::createWindowsKeyMap): Capital letters keys are added to the windowsKeyMap. Corrected value for printscreen key.
+        (WebCore::singleCharacterString): Return empty text for printscreen key.
+
 2012-05-16  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/platform/efl/EflKeyboardUtilities.cpp

@@ -51 +51 @@
 }
 
+static inline void addCharactersToKeyMap(const char from, const char to)
+{
+    for (char c = from; c <= to; c++)
+        keyMap().set(String(&c, 1), String::format("U+%04X", c));
+}
+
 static void createKeyMap()
 {
@@ -79 +85 @@
     keyMap().set("BackSpace", "U+0008");
     keyMap().set("space", "U+0020");
+    keyMap().set("Print", "PrintScreen");
     // Keypad location
     keyMap().set("KP_Left", "Left");
@@ -90 +97 @@
     keyMap().set("KP_Insert", "Insert");
     keyMap().set("KP_Delete", "U+007F");
+ 
+    addCharactersToKeyMap('a', 'z');
+    addCharactersToKeyMap('A', 'Z');
+    addCharactersToKeyMap('0', '9');
+}
+
+static inline void addCharactersToWinKeyMap(const char from, const char to, const int baseCode)
+{
+    int i = 0;
+    for (char c = from; c <= to; c++, i++)
+        windowsKeyMap().set(String(&c, 1), baseCode + i);
 }
 
@@ -121 +139 @@
     windowsKeyMap().set("Up", VK_UP);
     windowsKeyMap().set("Down", VK_DOWN);
-    windowsKeyMap().set("Print", VK_PRINT);
+    windowsKeyMap().set("Print", VK_SNAPSHOT);
     windowsKeyMap().set("Insert", VK_INSERT);
     windowsKeyMap().set("Delete", VK_DELETE);
@@ -156 +174 @@
 
     // Set alphabet to the windowsKeyMap.
-    const char* alphabet = "abcdefghijklmnopqrstuvwxyz";
-    for (unsigned int i = 0; i < 26; i++) {
-        String key(alphabet + i, 1);
-        windowsKeyMap().set(key, VK_A + i);
-    }
+    addCharactersToWinKeyMap('a', 'z', VK_A);
+    addCharactersToWinKeyMap('A', 'Z', VK_A);
 
     // Set digits to the windowsKeyMap.
-    for (unsigned int i = 0; i < 10; i++) {
-        String key = String::number(i);
-        windowsKeyMap().set(key, VK_0 + i);
-    }
+    addCharactersToWinKeyMap('0', '9', VK_0);
 
     // Set shifted digits to the windowsKeyMap.
@@ -210 +222 @@
     if (keyName == "Tab")
         return String("\t");
+    if (keyName == "Print")
+        return String("");
     return keyName;
 }