Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2025-01-11 05:29:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #57 from mihaip/upstreaming2

Browse Source 
Remap Cocoa/macOS menu item key modifiers
This commit is contained in:
Maxim Poliakovski 2023-11-10 08:16:54 +01:00 committed by GitHub
commit 417f988ca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -116,6 +116,11 @@ platform_glob(SOURCES "${PROJECT_SOURCE_DIR}/*.cpp"
"${PROJECT_SOURCE_DIR}/*.hpp"
"${PROJECT_SOURCE_DIR}/*.h")
if (APPLE)
platform_glob(APPLE_SOURCES "${PROJECT_SOURCE_DIR}/*.m")
list(APPEND SOURCES ${APPLE_SOURCES})
endif()
file(GLOB TEST_SOURCES "${PROJECT_SOURCE_DIR}/cpu/ppc/test/*.cpp")
add_executable(dingusppc ${SOURCES} $<TARGET_OBJECTS:core>
@ -143,6 +148,12 @@ else()
${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
endif()
if (APPLE)
find_library(COCOA_LIBRARY Cocoa)
target_link_libraries(dingusppc PRIVATE ${COCOA_LIBRARY})
endif()
if (DPPC_68K_DEBUGGER)
target_link_libraries(dingusppc PRIVATE capstone)
endif()

9
main_sdl.cpp
View File

@ -25,11 +25,20 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <loguru.hpp>
#include <SDL.h>
#ifdef __APPLE__
extern "C" void remap_appkit_menu_shortcuts();
#endif
bool init() {
if (SDL_Init(SDL_INIT_VIDEO)) {
LOG_F(ERROR, "SDL_Init error: %s", SDL_GetError());
return false;
}
#ifdef __APPLE__
remap_appkit_menu_shortcuts();
#endif
return true;
}

40
main_sdl.m Normal file
View File

@ -0,0 +1,40 @@
/*
DingusPPC - The Experimental PowerPC Macintosh emulator
Copyright (C) 2018-23 divingkatae and maximum
(theweirdo) spatium
(Contact divingkatae#1017 or powermax#2286 on Discord for more info)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <Cocoa/Cocoa.h>
/** @file SDL-specific main function additions for macOS hosts. */
// Replace Command shortcuts with Control shortcuts in the menu bar, so that
// they're not going to conflict with ones in the guest OS (but we still allow
// some of them to be used in the host OS, e.g. Control+Q to quit).
void remap_appkit_menu_shortcuts(void) {
for (NSMenuItem *menuItem in [NSApp mainMenu].itemArray) {
if (menuItem.hasSubmenu) {
for (NSMenuItem *item in menuItem.submenu.itemArray) {
if (item.keyEquivalentModifierMask & NSEventModifierFlagCommand) {
item.keyEquivalentModifierMask &= ~NSEventModifierFlagCommand;
item.keyEquivalentModifierMask |= NSEventModifierFlagControl;
}
}
}
}
}