[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4a1e6f247f70a253ff622fd3153debebae1ddeb5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 27 16:33:19 2004 +0000

            Reviewed by Ken.
    
            - fixed <rdar://problem/3526056>: W3C says that DEL key identifier should be U+00007F, we give ForwardDelete instead
    
            * kwq/KWQEvent.mm: (keyIdentifierForKeyEvent): Correct the key identifiers for the Delete, Insert,
            Menu, Scroll Lock, and Select keys, as well as some obscure F25 and higher keys. Also add some
            explicit constants for the keys defined in NSEvent.h that we map to a key identifier using the
            vendor-area Unicode values (which are probably not appropriate).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5990 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 28f5c18..23649d3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-01-27  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed <rdar://problem/3526056>: W3C says that DEL key identifier should be U+00007F, we give ForwardDelete instead
+
+        * kwq/KWQEvent.mm: (keyIdentifierForKeyEvent): Correct the key identifiers for the Delete, Insert,
+        Menu, Scroll Lock, and Select keys, as well as some obscure F25 and higher keys. Also add some
+        explicit constants for the keys defined in NSEvent.h that we map to a key identifier using the
+        vendor-area Unicode values (which are probably not appropriate).
+
 2004-01-27  David Hyatt  <hyatt at apple.com>
 
 	Make a change suggested by kocienda to add a remove() method to InlineBoxes.
diff --git a/WebCore/kwq/KWQEvent.mm b/WebCore/kwq/KWQEvent.mm
index 46526a7..4a8f0b1 100644
--- a/WebCore/kwq/KWQEvent.mm
+++ b/WebCore/kwq/KWQEvent.mm
@@ -42,7 +42,11 @@ static QString keyIdentifierForKeyEvent(NSEvent *event)
 
         // "Accept"
         // "AllCandidates"
+
         // "Alt"
+        case NSMenuFunctionKey:
+            return "Alt";
+
         // "Apps"
         // "BrowserBack"
         // "BrowserForward"
@@ -160,9 +164,6 @@ static QString keyIdentifierForKeyEvent(NSEvent *event)
         // "Find"
         case NSFindFunctionKey:
             return "Find";
-        // "ForwardDelete" (Non-standard)
-        case NSDeleteFunctionKey:
-            return "ForwardDelete";
 
         // "FullWidth"
         // "HalfWidth"
@@ -180,7 +181,7 @@ static QString keyIdentifierForKeyEvent(NSEvent *event)
             return "Home";
         // "Insert"
         case NSInsertFunctionKey:
-            return "Left";
+            return "Insert";
 
         // "JapaneseHiragana"
         // "JapaneseKatakana"
@@ -238,8 +239,14 @@ static QString keyIdentifierForKeyEvent(NSEvent *event)
             return "Right";
 
         // "RomanCharacters"
+
         // "Scroll"
+        case NSScrollLockFunctionKey:
+            return "Scroll";
         // "Select"
+        case NSSelectFunctionKey:
+            return "Select";
+
         // "SelectMedia"
         // "Shift"
 
@@ -259,10 +266,54 @@ static QString keyIdentifierForKeyEvent(NSEvent *event)
         // "Win"
         // "Zoom"
 
+        // More function keys, not in the key identifier specification.
+	case NSF25FunctionKey:
+            return "F25";
+	case NSF26FunctionKey:
+            return "F26";
+	case NSF27FunctionKey:
+            return "F27";
+	case NSF28FunctionKey:
+            return "F28";
+	case NSF29FunctionKey:
+            return "F29";
+	case NSF30FunctionKey:
+            return "F30";
+	case NSF31FunctionKey:
+            return "F31";
+	case NSF32FunctionKey:
+            return "F32";
+	case NSF33FunctionKey:
+            return "F33";
+	case NSF34FunctionKey:
+            return "F34";
+	case NSF35FunctionKey:
+            return "F35";
+
         // Turn 0x7F into 0x08, because backspace needs to always be 0x08.
         case 0x7F:
             return "U+000008";
-
+        // Standard says that DEL becomes U+00007F.
+        case NSDeleteFunctionKey:
+            return "U+00007F";
+
+	case NSBeginFunctionKey:
+	case NSBreakFunctionKey:
+	case NSClearDisplayFunctionKey:
+	case NSDeleteCharFunctionKey:
+	case NSDeleteLineFunctionKey:
+	case NSInsertCharFunctionKey:
+	case NSInsertLineFunctionKey:
+	case NSNextFunctionKey:
+	case NSPrevFunctionKey:
+	case NSPrintFunctionKey:
+	case NSRedoFunctionKey:
+	case NSResetFunctionKey:
+	case NSSysReqFunctionKey:
+	case NSSystemFunctionKey:
+	case NSUserFunctionKey:
+            // FIXME: We should use something other than the vendor-area Unicode values for the above keys.
+            // For now, just fall through to the default.
         default:
             return QString().sprintf("U+%06X", toupper(c));
     }

-- 
WebKit Debian packaging