OpenEmu/VICE-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: OpenEmu/VICE-Core:testcore
Branches Tags
OpenEmu/VICE-Core:master OpenEmu/VICE-Core:testcore
...
pull from: OpenEmu/VICE-Core:master
Branches Tags
OpenEmu/VICE-Core:master OpenEmu/VICE-Core:testcore

1 Commits
testcore ... master

Author SHA1 Message Date
Stuart Carnie 482fa8f1f1 chore: Update SDK 2023-04-01 10:21:59 +11:00
2 changed files with 8 additions and 6 deletions
Expand all files Collapse all files
Core/Classes/ViceGameCore.m
+7 -5
View File
@@ -259,7 +259,7 @@ KeyboardMod flagsToMod(NSEventModifierFlags flags) {
return res;
}
- (oneway void)keyDown:(unsigned short)keyCode characters:(NSString *)characters charactersIgnoringModifiers:(NSString *)charactersIgnoringModifiers flags:(NSEventModifierFlags)flags
- (oneway void)keyDown:(NSUInteger)keyCode
{
if(keyCode == kVK_Function)
return;
@@ -281,8 +281,9 @@ KeyboardMod flagsToMod(NSEventModifierFlags flags) {
if (!(flags & OENSEventModifierFlagFunctionKey))
return;
}
KeyboardMod mod = flagsToMod(flags);
// TODO: Fix flags, which will be sent as virtual key codes
KeyboardMod mod = flagsToMod(0);
NSLog(@"keyDown: code=%03d, flags=%08x, mod=%08lx", keyCode, (uint32_t)flags, mod);
@@ -291,7 +292,7 @@ KeyboardMod flagsToMod(NSEventModifierFlags flags) {
[_c64 keyboardKeyDown:keyCode mod:mod];
}
- (oneway void)keyUp:(unsigned short)keyCode characters:(NSString *)characters charactersIgnoringModifiers:(NSString *)charactersIgnoringModifiers flags:(NSEventModifierFlags)flags
- (oneway void)keyUp:(NSUInteger)keyCode
{
if(keyCode == kVK_Function)
return;
@@ -314,7 +315,8 @@ KeyboardMod flagsToMod(NSEventModifierFlags flags) {
return;
}
KeyboardMod mod = flagsToMod(flags);
// TODO: Fix flags, which will be sent as virtual key codes
KeyboardMod mod = flagsToMod(0);
NSLog(@"keyUp: code=%03d, flags=%08x, mod=%08lx", keyCode, (uint32_t)flags, mod);
VICE.xcodeproj/project.pbxproj
+1 -1
View File
@@ -215,7 +215,7 @@
05A8982423F1229F000CA1D2 /* osx_pos.vkm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = osx_pos.vkm; sourceTree = "<group>"; };
05A8982523F1229F000CA1D2 /* osx_sym.vkm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = osx_sym.vkm; sourceTree = "<group>"; };
3E1BCCA31F16DA250022C2EF /* libedit.3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libedit.3.0.tbd; path = usr/lib/libedit.3.0.tbd; sourceTree = SDKROOT; };
3E3DDE7E1F46863A00639644 /* OEC64SystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OEC64SystemResponderClient.h; path = "../../OpenEmu/Commodore 64/OEC64SystemResponderClient.h"; sourceTree = "<group>"; };
3E3DDE7E1F46863A00639644 /* OEC64SystemResponderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OEC64SystemResponderClient.h; path = "../../OpenEmu/SystemPlugins/Commodore 64/OEC64SystemResponderClient.h"; sourceTree = "<group>"; };
3E6E5E3B1F17301C007FEF0A /* libedit.3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libedit.3.tbd; path = usr/lib/libedit.3.tbd; sourceTree = SDKROOT; };
3EDA96DB1F19560C0015CED2 /* VICE.oecoreplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VICE.oecoreplugin; sourceTree = BUILT_PRODUCTS_DIR; };
3EDA98AC1F197B540015CED2 /* OpenEmuBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenEmuBase.framework; path = "../../Library/Developer/Xcode/DerivedData/OpenEmu-daupfkdcntzkhycxsuyuvqosnsbs/Build/Products/Debug/OpenEmuBase.framework"; sourceTree = "<group>"; };