Replace webview keyboard with native, layer backed keyboard (fixes #57)

bikkelbroeders · 8c47125475929aca3c9ce14283b5088c3e46f62a · robbertkl committed Nov 20, 2016 · Nov 20, 2016 · 8c47125
1 parent 412756a
commit 8c47125475929aca3c9ce14283b5088c3e46f62a
diff --git a/Scripts/generate_keyboard_layouts.sh b/Scripts/generate_keyboard_layouts.sh
diff --git a/Shared/Generated/KeyboardLayoutANSI.h b/Shared/Generated/KeyboardLayoutANSI.h
@@ -0,0 +1,13 @@
+//
+//  KeyboardLayoutANSI.h
+//  TouchBar
+//
+//  Generated by generate_keyboard_layouts.sh.
+//  Copyright © 2016 Bikkelbroeders. All rights reserved.
+//
+
+#import "KeyboardLayout.h"
+
+@interface KeyboardLayoutANSI : KeyboardLayout
+
+@end
diff --git a/Shared/Generated/KeyboardLayoutANSI.m b/Shared/Generated/KeyboardLayoutANSI.m
diff --git a/Shared/Generated/KeyboardLayoutISO.h b/Shared/Generated/KeyboardLayoutISO.h
@@ -0,0 +1,13 @@
+//
+//  KeyboardLayoutISO.h
+//  TouchBar
+//
+//  Generated by generate_keyboard_layouts.sh.
+//  Copyright © 2016 Bikkelbroeders. All rights reserved.
+//
+
+#import "KeyboardLayout.h"
+
+@interface KeyboardLayoutISO : KeyboardLayout
+
+@end
diff --git a/Shared/Generated/KeyboardLayoutISO.m b/Shared/Generated/KeyboardLayoutISO.m
diff --git a/Shared/Generated/KeyboardLayoutJIS.h b/Shared/Generated/KeyboardLayoutJIS.h
@@ -0,0 +1,13 @@
+//
+//  KeyboardLayoutJIS.h
+//  TouchBar
+//
+//  Generated by generate_keyboard_layouts.sh.
+//  Copyright © 2016 Bikkelbroeders. All rights reserved.
+//
+
+#import "KeyboardLayout.h"
+
+@interface KeyboardLayoutJIS : KeyboardLayout
+
+@end
diff --git a/Shared/Generated/KeyboardLayoutJIS.m b/Shared/Generated/KeyboardLayoutJIS.m
diff --git a/Shared/Keyboard.h b/Shared/Keyboard.h
@@ -23,12 +23,12 @@ typedef NS_OPTIONS(uint16_t, KeyEventModifierFlags) {
     KeyEventModifierFlagControl     = 1 << 2,
     KeyEventModifierFlagOption      = 1 << 3,
     KeyEventModifierFlagCommand     = 1 << 4,
-    KeyEventModifierFlagFunction    = 1 << 5,
+    KeyEventModifierFlagFunction    = 1 << 5, // Keep this last
 };
 
 typedef struct {
     KeyEventType type;
-    uint16_t key;
+    KeyCode key;
     KeyEventModifierFlags modifiers;
 } KeyEvent;
 
diff --git a/Shared/KeyboardLayout.h b/Shared/KeyboardLayout.h
@@ -0,0 +1,38 @@
+//
+//  KeyboardLayout.h
+//  Test
+//
+//  Created by Robbert Klarenbeek on 18/11/2016.
+//  Copyright © 2016 Bikkelbroeders. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "Keyboard.h"
+
+@import CoreGraphics;
+
+#if TARGET_OS_IPHONE
+@import UIKit;
+#endif
+
+typedef NS_ENUM(NSInteger, KeyboardLayoutType) {
+    KeyboardLayoutTypeUnknown   = -1,
+    KeyboardLayoutTypeANSI      = 0,
+    KeyboardLayoutTypeISO       = 1,
+    KeyboardLayoutTypeJIS       = 2,
+};
+
+@interface KeyboardLayout : NSObject
+@property (nonatomic, readonly) KeyboardLayoutType type;
+@property (nonatomic, readonly) CGSize size;
+@property (nonatomic, readonly) NSUInteger numberOfKeys;
+- (KeyCode)keyCodeForKeyIndex:(NSUInteger)keyIndex;
+- (KeyEventModifierFlags)modifierFlagForKeyIndex:(NSUInteger)keyIndex;
+#if TARGET_OS_IPHONE
+- (UIBezierPath *)bezierPathForKeyIndex:(NSUInteger)keyIndex;
+#endif
+- (CGPoint)textPositionForKeyIndex:(NSUInteger)keyIndex;
+- (CGFloat)fontSizeForKeyIndex:(NSUInteger)keyIndex;
++ (NSString *)fixedKeyCaptionForKeyCode:(KeyCode)keyCode withFnDown:(BOOL)fnDown;
+@end
diff --git a/Shared/KeyboardLayout.m b/Shared/KeyboardLayout.m
@@ -0,0 +1,101 @@
+//
+//  KeyboardLayout.m
+//  Test
+//
+//  Created by Robbert Klarenbeek on 18/11/2016.
+//  Copyright © 2016 Bikkelbroeders. All rights reserved.
+//
+
+#import "KeyboardLayout.h"
+
+@implementation KeyboardLayout
+
+- (KeyboardLayoutType)type {
+    return KeyboardLayoutTypeUnknown;
+}
+
+- (CGSize)size {
+    return CGSizeZero;
+}
+
+- (NSUInteger)numberOfKeys {
+    return 0;
+}
+
+- (KeyCode)keyCodeForKeyIndex:(NSUInteger)keyIndex {
+    return 0xFF;
+}
+
+- (KeyEventModifierFlags)modifierFlagForKeyIndex:(NSUInteger)keyIndex {
+    return 0;
+}
+
+#if TARGET_OS_IPHONE
+- (UIBezierPath *)bezierPathForKeyIndex:(NSUInteger)keyIndex {
+    return nil;
+}
+#endif
+
+- (CGPoint)textPositionForKeyIndex:(NSUInteger)keyIndex {
+    return CGPointZero;
+}
+
+- (CGFloat)fontSizeForKeyIndex:(NSUInteger)keyIndex {
+    return 0.0;
+}
+
++ (NSString *)fixedKeyCaptionForKeyCode:(KeyCode)keyCode withFnDown:(BOOL)fnDown {
+    switch(keyCode) {
+        case 0x24: return !fnDown ? @"↩\uFE0E" : @"⌤\uFE0E"; // kVK_Return
+        case 0x30: return @"⇥\uFE0E"; // kVK_Tab
+        case 0x33: return !fnDown ? @"⌫\uFE0E" : @"⌦\uFE0E"; // kVK_Delete
+        case 0x35: return @"esc"; // kVK_Escape
+        case 0x36: return @"⌘\uFE0E"; // kVK_RightCommand
+        case 0x37: return @"⌘\uFE0E"; // kVK_Command
+        case 0x38: return @"⇧\uFE0E"; // kVK_Shift
+        case 0x39: return @"⇪\uFE0E"; // kVK_CapsLock
+        case 0x3A: return @"⌥\uFE0E"; // kVK_Option
+        case 0x3B: return @"⌃\uFE0E"; // kVK_Control
+        case 0x3C: return @"⇧\uFE0E"; // kVK_RightShift
+        case 0x3D: return @"⌥\uFE0E"; // kVK_RightOption
+        case 0x3E: return @"⌃\uFE0E"; // kVK_RightControl
+        case 0x3F: return @"fn"; // kVK_Function
+        case 0x40: return @"F17"; // kVK_F17
+        case 0x47: return @"⌧\uFE0E"; // kVK_ANSI_KeypadClear
+        case 0x4C: return @"⌤\uFE0E"; // kVK_ANSI_KeypadEnter
+        case 0x4F: return @"F18"; // kVK_F18
+        case 0x50: return @"F19"; // kVK_F19
+        case 0x5A: return @"F20"; // kVK_F20
+        case 0x60: return @"F5"; // kVK_F5
+        case 0x61: return @"F6"; // kVK_F6
+        case 0x62: return @"F7"; // kVK_F7
+        case 0x63: return @"F3"; // kVK_F3
+        case 0x64: return @"F8"; // kVK_F8
+        case 0x65: return @"F9"; // kVK_F9
+        case 0x66: return @"英数"; // kVK_JIS_Eisu
+        case 0x67: return @"F11"; // kVK_F11
+        case 0x68: return @"かな"; // kVK_JIS_Kana
+        case 0x69: return @"F13"; // kVK_F13
+        case 0x6A: return @"F16"; // kVK_F16
+        case 0x6B: return @"F14"; // kVK_F14
+        case 0x6D: return @"F10"; // kVK_F10
+        case 0x6F: return @"F12"; // kVK_F12
+        case 0x71: return @"F15"; // kVK_F15
+        case 0x72: return @"?⃝\uFE0E"; // kVK_Help
+        case 0x73: return @"↖\uFE0E"; // kVK_Home
+        case 0x74: return @"⇞\uFE0E"; // kVK_PageUp
+        case 0x76: return @"F4"; // kVK_F4
+        case 0x77: return @"↘\uFE0E"; // kVK_End
+        case 0x78: return @"F2"; // kVK_F2
+        case 0x79: return @"⇟\uFE0E"; // kVK_PageDown
+        case 0x7A: return @"F1"; // kVK_F1
+        case 0x7B: return !fnDown ? @"⇠\uFE0E" : @"↖\uFE0E"; // kVK_LeftArrow
+        case 0x7C: return !fnDown ? @"⇢\uFE0E" : @"↘\uFE0E"; // kVK_RightArrow
+        case 0x7D: return !fnDown ? @"⇣\uFE0E" : @"⇟\uFE0E"; // kVK_DownArrow
+        case 0x7E: return !fnDown ? @"⇡\uFE0E" : @"⇞\uFE0E"; // kVK_UpArrow
+        default:
+            return nil;
+    }
+}
+
+@end
diff --git a/Shared/Protocol.h b/Shared/Protocol.h
@@ -15,7 +15,7 @@ typedef uint64_t Version;
 
 // Up this every time you want the iOS client require updated code
 // (so basically every versioned release or in case of protocol changes)
-static const Version kServerVersion = 1;
+static const Version kServerVersion = 2;
 
 static const uint32_t kProtocolFrameTypeServerMin = 1000;
 static const uint32_t kProtocolFrameTypeServerMax = 1999;
@@ -25,10 +25,11 @@ static const uint32_t kProtocolFrameTypeClientMax = 2999;
 typedef NS_ENUM(uint32_t, ProtocolFrameType) {
     ProtocolFrameTypeServerVersion              = 1000,
     ProtocolFrameTypeServerImage                = 1001,
-    ProtocolFrameTypeServerKeyboardLayout       = 1002,
+//    ProtocolFrameTypeServerKeyboardHtml         = 1002,
     ProtocolFrameTypeServerSystemKeyEvent       = 1003,
     ProtocolFrameTypeServerModeChange           = 1004,
     ProtocolFrameTypeServerAlignChange          = 1005,
+    ProtocolFrameTypeServerKeyboardLayout       = 1006,
 
     ProtocolFrameTypeClientTouchBarMouseEvent   = 2000,
     ProtocolFrameTypeClientKeyboardKeyEvent     = 2001,