6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-26 08:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Completes the wiring necessary for capture of the command key.

Browse Source 
At least when coupled with mouse capture.
This commit is contained in:
Thomas Harte 2019-09-22 13:53:38 -04:00
parent 077c7d767f
commit 114f81941e
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OSBindings/Mac/Clock Signal/Documents/MachineDocument.swift
View File

@ -209,8 +209,10 @@ class MachineDocument:
openGLView.delegate = self openGLView.delegate = self
openGLView.responderDelegate = self openGLView.responderDelegate = self
// If this machine has a mouse, enable mouse capture. // If this machine has a mouse, enable mouse capture; also indicate whether usurption
// of the command key is desired.
openGLView.shouldCaptureMouse = machine.hasMouse openGLView.shouldCaptureMouse = machine.hasMouse
openGLView.shouldUsurpCommand = machine.shouldUsurpCommand
setupAudioQueueClockRate() setupAudioQueueClockRate()

1
OSBindings/Mac/Clock Signal/Machine/CSMachine.h
View File

@ -94,6 +94,7 @@ typedef NS_ENUM(NSInteger, CSMachineKeyboardInputMode) {
// Input control. // Input control.
@property (nonatomic, readonly) BOOL hasExclusiveKeyboard; @property (nonatomic, readonly) BOOL hasExclusiveKeyboard;
@property (nonatomic, readonly) BOOL shouldUsurpCommand;
@property (nonatomic, readonly) BOOL hasJoystick; @property (nonatomic, readonly) BOOL hasJoystick;
@property (nonatomic, readonly) BOOL hasMouse; @property (nonatomic, readonly) BOOL hasMouse;
@property (nonatomic, assign) CSMachineKeyboardInputMode inputMode; @property (nonatomic, assign) CSMachineKeyboardInputMode inputMode;

8
OSBindings/Mac/Clock Signal/Machine/CSMachine.mm
View File

@ -671,6 +671,14 @@ struct ActivityObserver: public Activity::Observer {
return !!_machine->keyboard_machine() && _machine->keyboard_machine()->get_keyboard().is_exclusive(); return !!_machine->keyboard_machine() && _machine->keyboard_machine()->get_keyboard().is_exclusive();
} }
- (BOOL)shouldUsurpCommand {
if(!_machine->keyboard_machine()) return NO;
const auto essential_modifiers = _machine->keyboard_machine()->get_keyboard().get_essential_modifiers();
return essential_modifiers.find(Inputs::Keyboard::Key::LeftMeta) != essential_modifiers.end() ||
essential_modifiers.find(Inputs::Keyboard::Key::RightMeta) != essential_modifiers.end();
}
#pragma mark - Activity observation #pragma mark - Activity observation
- (void)addLED:(NSString *)led { - (void)addLED:(NSString *)led {

4
OSBindings/Mac/Clock Signal/Views/CSOpenGLView.m
View File

@ -245,6 +245,7 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
CGAssociateMouseAndMouseCursorPosition(true); CGAssociateMouseAndMouseCursorPosition(true);
[NSCursor unhide]; [NSCursor unhide];
[self.delegate openGLViewDidReleaseMouse:self]; [self.delegate openGLViewDidReleaseMouse:self];
((CSApplication *)[NSApplication sharedApplication]).keyboardEventDelegate = nil;
} }
} }
@ -304,6 +305,9 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
[NSCursor hide]; [NSCursor hide];
CGAssociateMouseAndMouseCursorPosition(false); CGAssociateMouseAndMouseCursorPosition(false);
[self.delegate openGLViewDidCaptureMouse:self]; [self.delegate openGLViewDidCaptureMouse:self];
if(self.shouldUsurpCommand) {
((CSApplication *)[NSApplication sharedApplication]).keyboardEventDelegate = self;
}
// Don't report the first click to the delegate; treat that as merely // Don't report the first click to the delegate; treat that as merely
// an invitation to capture the cursor. // an invitation to capture the cursor.