Handle more keys

Apple2Mac/Apple2Mac/Classes/OSX/EmulatorFullscreenWindow.m

@@ -14,35 +14,38 @@
 
 - (id)init
 {
-	// Create a screen-sized window on the display you want to take over
+    // Create a screen-sized window on the display you want to take over
-	NSRect screenRect = [[NSScreen mainScreen] frame];
+    NSRect screenRect = [[NSScreen mainScreen] frame];
 
-	// Initialize the window making it size of the screen and borderless
+    // Initialize the window making it size of the screen and borderless
-	self = [super initWithContentRect:screenRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
+    self = [super initWithContentRect:screenRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
 
-	// Set the window level to be above the menu bar to cover everything else
+    // Set the window level to be above the menu bar to cover everything else
-	[self setLevel:NSMainMenuWindowLevel+1];
+    [self setLevel:NSMainMenuWindowLevel+1];
 
-	// Set opaque
+    // Set opaque
-	[self setOpaque:YES];
+    [self setOpaque:YES];
 
-	// Hide this when user switches to another window (or app)
+    // Hide this when user switches to another window (or app)
-	[self setHidesOnDeactivate:YES];
+    [self setHidesOnDeactivate:YES];
 
-	return self;
+    return self;
 }
 
 - (BOOL)canBecomeKeyWindow
 {
-	// Return yes so that this borderless window can receive input
+    // Return yes so that this borderless window can receive input
-	return YES;
+    return YES;
+}
+
+- (void)keyUp:(NSEvent *)event
+{
+    [[self windowController] keyUp:event];
 }
 
 - (void)keyDown:(NSEvent *)event
 {
-	// Implement keyDown since controller will not get [ESC] key event which
+    [[self windowController] keyDown:event];
-	// the controller uses to kill fullscreen
-	[[self windowController] keyDown:event];
 }
 
 @end

Apple2Mac/Apple2Mac/Classes/OSX/EmulatorWindowController.m

@@ -18,7 +18,13 @@
 #define NIB_PROPERTIES @".nib 232960 bytes"
 #define GZ_EXTENSION @"gz"
 
-#define KEYCODE_CAPS_LOCK 0x39
+#define CAPS_LOCK 0x39
+#define SHIFT_LT 0x38
+#define SHIFT_RT 0x3c
+#define CTRL_LT 0x3b
+#define CTRL_RT 0x3e
+#define ALT_LT 0x3a
+#define ALT_RT 0x3d
 
 @interface EmulatorWindowController ()
 
@@ -317,26 +323,159 @@
 - (void)flagsChanged:(NSEvent*)event
 {
     static BOOL modified_caps_lock = NO;
-    if ([event keyCode] == KEYCODE_CAPS_LOCK)
+    switch ([event keyCode])
     {
-        NSUInteger flags = [event modifierFlags];
+        case CAPS_LOCK:
-        if (flags & NSAlphaShiftKeyMask)
         {
-            modified_caps_lock = YES;
+            if ([event modifierFlags] & NSAlphaShiftKeyMask)
-            caps_lock = true;
+            {
-        }
+                modified_caps_lock = YES;
-        else
+                caps_lock = true;
-        {
+            }
-            caps_lock = false;
+            else
+            {
+                caps_lock = false;
+            }
         }
+
+        case SHIFT_LT:
+            c_keys_handle_input(SCODE_L_SHIFT, ([event modifierFlags] & NSShiftKeyMask), 0);
+            break;
+
+        case SHIFT_RT:
+            c_keys_handle_input(SCODE_R_SHIFT, ([event modifierFlags] & NSShiftKeyMask), 0);
+            break;
+
+        case CTRL_LT:
+            c_keys_handle_input(SCODE_L_CTRL, ([event modifierFlags] & NSControlKeyMask), 0);
+            break;
+
+        case CTRL_RT:
+            c_keys_handle_input(SCODE_R_CTRL, ([event modifierFlags] & NSControlKeyMask), 0);
+            break;
+
+        case ALT_LT:
+            c_keys_handle_input(SCODE_L_ALT, ([event modifierFlags] & NSAlternateKeyMask), 0);
+            break;
+
+        case ALT_RT:
+            c_keys_handle_input(SCODE_R_ALT, ([event modifierFlags] & NSAlternateKeyMask), 0);
+            break;
+
+        default:
+            break;
     }
+    
+    NSLog(@"keyCode : %04x", [event keyCode]);
+}
+
+- (void)_handleKeyEvent:(NSEvent *)event pressed:(BOOL)pressed
+{
+    unichar c = [[event charactersIgnoringModifiers] characterAtIndex:0];
+    int scode = (int)c;
+    
+    NSLog(@"key = %08x", c);
+    
+    int cooked = 0;
+    switch (scode)
+    {
+        case 0x1b:
+            scode = SCODE_ESC;
+            NSLog(@"ESC...");
+            break;
+            
+        case NSUpArrowFunctionKey:
+            scode = SCODE_U;
+            break;
+        case NSDownArrowFunctionKey:
+            scode = SCODE_D;
+            break;
+        case NSLeftArrowFunctionKey:
+            NSLog(@"LEFT ARROW");
+            scode = SCODE_L;
+            break;
+        case NSRightArrowFunctionKey:
+            scode = SCODE_R;
+            break;
+
+        case NSF1FunctionKey:
+            scode = SCODE_F1;
+            break;
+        case NSF2FunctionKey:
+            scode = SCODE_F2;
+            break;
+        case NSF3FunctionKey:
+            scode = SCODE_F3;
+            break;
+        case NSF4FunctionKey:
+            scode = SCODE_F4;
+            break;
+        case NSF5FunctionKey:
+            scode = SCODE_F5;
+            break;
+        case NSF6FunctionKey:
+            scode = SCODE_F6;
+            break;
+        case NSF7FunctionKey:
+            scode = SCODE_F7;
+            break;
+        case NSF8FunctionKey:
+            scode = SCODE_F8;
+            break;
+        case NSF9FunctionKey:
+            scode = SCODE_F9;
+            break;
+        case NSF10FunctionKey:
+            scode = SCODE_F10;
+            break;
+        case NSF11FunctionKey:
+            scode = SCODE_F11;
+            break;
+        case NSF12FunctionKey:
+            scode = SCODE_F12;
+            break;
+
+        case NSInsertFunctionKey:
+            scode = SCODE_INS;
+            break;
+        case NSDeleteFunctionKey:
+            scode = SCODE_DEL;
+            break;
+        case NSHomeFunctionKey:
+            scode = SCODE_HOME;
+            break;
+        case NSEndFunctionKey:
+            scode = SCODE_END;
+            break;
+
+        case NSPageUpFunctionKey:
+            scode = SCODE_PGUP;
+            break;
+        case NSPageDownFunctionKey:
+            scode = SCODE_PGDN;
+            break;
+
+        case NSPrintScreenFunctionKey:
+            scode = SCODE_PRNT;
+            break;
+        case NSPauseFunctionKey:
+            scode = SCODE_PAUSE;
+            break;
+        case NSBreakFunctionKey:
+            scode = SCODE_BRK;
+            break;
+            
+        default:
+            cooked = 1;
+            break;
+    }
+    
+    c_keys_handle_input(scode, pressed, cooked);
 }
 
 - (void)keyUp:(NSEvent *)event
 {
-    unichar c = [[event charactersIgnoringModifiers] characterAtIndex:0];
+    [self _handleKeyEvent:event pressed:NO];
-    
-    c_keys_handle_input((int)c, 0, 1);
     
     // Allow other character to be handled (or not and beep)
     //[super keyDown:event];
@@ -344,9 +483,7 @@
 
 - (void)keyDown:(NSEvent *)event
 {
-    unichar c = [[event charactersIgnoringModifiers] characterAtIndex:0];
+    [self _handleKeyEvent:event pressed:YES];
-
-    c_keys_handle_input((int)c, 1, 1);
 
     // Allow other character to be handled (or not and beep)
     //[super keyDown:event];