mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-02-24 23:22:25 +01:00
byuu says: Changelog: - gb/interface: fix Game Boy Color extension to be "gbc" and not "gb" [hex\_usr] - ms/interface: move Master System hardware controls below controller ports - sfc/ppu: improve latching behavior of BGnHOFS registers (not hardware verified) [AWJ] - tomoko/input: rework port/device mapping to support non-sequential ports and devices¹ - todo: should add move() to inputDevice.mappings.append and inputPort.devices.append - note: there's a weird GCC 4.9 bug with brace initialization of InputEmulator; have to assign each field separately - tomoko: all windows sans the main presentation window can be dismissed with the escape key - icarus: the single file selection dialog ("Load ROM Image...") can be dismissed with the escape key - tomoko: do not pause emulation when FocusLoss/Pause is set during exclusive fullscreen mode - hiro/(windows,gtk,qt): implemented Window::setDismissable() function (missing from cocoa port, sorry) - nall/string: fixed printing of largest possible negative numbers (eg `INT_MIN`) [Sintendo] - only took eight months! :D ¹: When I tried to move the Master System hardware port below the controller ports, I ran into a world of pain. The input settings list expects every item in the `InputEmulator<InputPort<InputDevice<InputMapping>>>>` arrays to be populated with valid results. But these would be sparsely populated based on the port and device IDs from inside higan. And that is done so that the Interface::inputPoll can have O(1) lookup of ports and devices. This worked because all the port and device IDs were sequential (they left no gaps in the maps upon creating the lists.) Unfortunately by changing the expectation of port ID to how it appears in the list, inputs would not poll correctly. By leaving them alone and just moving Hardware to the third position, the Game Gear would be missing port IDs of 0 and 1 (the controller ports of the Master System). Even by trying to make separate MasterSystemHardware and GameGearHardware ports, things still fractured when the devices were no longer contigious. I got pretty sick of this and just decided to give up on O(1) port/device lookup, and moved to O(n) lookup. It only knocked the framerate down by maybe one frame per second, enough to be in the margin of error. Inputs aren't polled *that* often for loops that usually terminate after 1-2 cycles to be too detrimental to performance. So the new input system now allows non-sequential port and device IDs. Remember that I killed input IDs a while back. There's never any reason for those to need IDs ... it was easier to just order the inputs in the order you want to see them in the user interface. So the input lookup is still O(1). Only now, everything's safer and I return a maybe<InputMapping&>, and won't crash out the program trying to use a mapping that isn't found for some reason. Errata: the escape key isn't working on the browser/message dialogs on Windows, because of course nothing can ever just be easy and work for me. If anyone else wouldn't mind looking into that, I'd greatly appreciate it. Having the `WM_KEYDOWN` test inside the main `Application_sharedProc`, it seems to not respond to the escape key on modal dialogs. If I put the `WM_KEYDOWN` test in the main window proc, then it doesn't seem to get called for `VK_ESCAPE` at all, and doesn't get called period for modal windows. So I'm at a loss and it's past 4AM here >_>
414 lines
12 KiB
C++
414 lines
12 KiB
C++
#if defined(Hiro_Window)
|
|
|
|
@implementation CocoaWindow : NSWindow
|
|
|
|
-(id) initWith:(hiro::mWindow&)windowReference {
|
|
window = &windowReference;
|
|
|
|
NSUInteger style = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask;
|
|
if(window->state.resizable) style |= NSResizableWindowMask;
|
|
|
|
if(self = [super initWithContentRect:NSMakeRect(0, 0, 640, 480) styleMask:style backing:NSBackingStoreBuffered defer:YES]) {
|
|
[self setDelegate:self];
|
|
[self setReleasedWhenClosed:NO];
|
|
[self setAcceptsMouseMovedEvents:YES];
|
|
[self setTitle:@""];
|
|
|
|
NSBundle* bundle = [NSBundle mainBundle];
|
|
NSDictionary* dictionary = [bundle infoDictionary];
|
|
NSString* applicationName = [dictionary objectForKey:@"CFBundleDisplayName"];
|
|
if(applicationName == nil) applicationName = [NSString stringWithUTF8String:hiro::Application::state.name];
|
|
|
|
menuBar = [[NSMenu alloc] init];
|
|
|
|
NSMenuItem* item;
|
|
string text;
|
|
|
|
rootMenu = [[NSMenu alloc] init];
|
|
item = [[[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""] autorelease];
|
|
[item setSubmenu:rootMenu];
|
|
[menuBar addItem:item];
|
|
|
|
item = [[[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"About %@ ...", applicationName] action:@selector(menuAbout) keyEquivalent:@""] autorelease];
|
|
[item setTarget:self];
|
|
[rootMenu addItem:item];
|
|
[rootMenu addItem:[NSMenuItem separatorItem]];
|
|
|
|
item = [[[NSMenuItem alloc] initWithTitle:@"Preferences ..." action:@selector(menuPreferences) keyEquivalent:@""] autorelease];
|
|
[item setTarget:self];
|
|
[rootMenu addItem:item];
|
|
|
|
string result = nall::execute("defaults", "read", "/Library/Preferences/com.apple.security", "GKAutoRearm").output.strip();
|
|
if(result != "0") {
|
|
disableGatekeeperAutoRearm = [[[NSMenuItem alloc] initWithTitle:@"Disable Gatekeeper Auto-Rearm" action:@selector(menuDisableGatekeeperAutoRearm) keyEquivalent:@""] autorelease];
|
|
[disableGatekeeperAutoRearm setTarget:self];
|
|
[rootMenu addItem:disableGatekeeperAutoRearm];
|
|
}
|
|
|
|
[rootMenu addItem:[NSMenuItem separatorItem]];
|
|
|
|
NSMenu* servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease];
|
|
item = [[[NSMenuItem alloc] initWithTitle:@"Services" action:nil keyEquivalent:@""] autorelease];
|
|
[item setTarget:self];
|
|
[item setSubmenu:servicesMenu];
|
|
[rootMenu addItem:item];
|
|
[rootMenu addItem:[NSMenuItem separatorItem]];
|
|
[NSApp setServicesMenu:servicesMenu];
|
|
|
|
item = [[[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Hide %@", applicationName] action:@selector(hide:) keyEquivalent:@""] autorelease];
|
|
[item setTarget:NSApp];
|
|
[rootMenu addItem:item];
|
|
|
|
item = [[[NSMenuItem alloc] initWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@""] autorelease];
|
|
[item setTarget:NSApp];
|
|
[rootMenu addItem:item];
|
|
|
|
item = [[[NSMenuItem alloc] initWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""] autorelease];
|
|
[item setTarget:NSApp];
|
|
[rootMenu addItem:item];
|
|
|
|
[rootMenu addItem:[NSMenuItem separatorItem]];
|
|
|
|
item = [[[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Quit %@", applicationName] action:@selector(menuQuit) keyEquivalent:@""] autorelease];
|
|
[item setTarget:self];
|
|
[rootMenu addItem:item];
|
|
|
|
statusBar = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)];
|
|
[statusBar setAlignment:NSLeftTextAlignment];
|
|
[statusBar setBordered:YES];
|
|
[statusBar setBezeled:YES];
|
|
[statusBar setBezelStyle:NSTextFieldSquareBezel];
|
|
[statusBar setEditable:NO];
|
|
[statusBar setHidden:YES];
|
|
|
|
[[self contentView] addSubview:statusBar positioned:NSWindowBelow relativeTo:nil];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
-(BOOL) canBecomeKeyWindow {
|
|
return YES;
|
|
}
|
|
|
|
-(BOOL) canBecomeMainWindow {
|
|
return YES;
|
|
}
|
|
|
|
-(void) windowDidBecomeMain:(NSNotification*)notification {
|
|
if(window->state.menuBar) {
|
|
[NSApp setMainMenu:menuBar];
|
|
}
|
|
}
|
|
|
|
-(void) windowDidMove:(NSNotification*)notification {
|
|
if(auto p = window->self()) p->moveEvent();
|
|
}
|
|
|
|
-(void) windowDidResize:(NSNotification*)notification {
|
|
if(auto p = window->self()) p->sizeEvent();
|
|
}
|
|
|
|
-(BOOL) windowShouldClose:(id)sender {
|
|
if(window->state.onClose) window->doClose();
|
|
else window->setVisible(false);
|
|
if(window->state.modal && !window->visible()) window->setModal(false);
|
|
return NO;
|
|
}
|
|
|
|
-(NSDragOperation) draggingEntered:(id<NSDraggingInfo>)sender {
|
|
return DropPathsOperation(sender);
|
|
}
|
|
|
|
-(BOOL) performDragOperation:(id<NSDraggingInfo>)sender {
|
|
auto paths = DropPaths(sender);
|
|
if(!paths) return NO;
|
|
window->doDrop(paths);
|
|
return YES;
|
|
}
|
|
|
|
-(NSMenu*) menuBar {
|
|
return menuBar;
|
|
}
|
|
|
|
-(void) menuAbout {
|
|
hiro::Application::Cocoa::doAbout();
|
|
}
|
|
|
|
-(void) menuPreferences {
|
|
hiro::Application::Cocoa::doPreferences();
|
|
}
|
|
|
|
-(void) menuDisableGatekeeperAutoRearm {
|
|
NSAlert* alert = [[[NSAlert alloc] init] autorelease];
|
|
[alert setMessageText:@"Disable Gatekeeper Auto-Rearm"];
|
|
|
|
nall::execute("sudo", "defaults", "write", "/Library/Preferences/com.apple.security", "GKAutoRearm", "-bool", "NO");
|
|
if(nall::execute("defaults", "read", "/Library/Preferences/com.apple.security", "GKAutoRearm").output.strip() == "0") {
|
|
[alert setAlertStyle:NSInformationalAlertStyle];
|
|
[alert setInformativeText:@"Gatekeeper's automatic 30-day rearm behavior has been disabled successfully."];
|
|
[disableGatekeeperAutoRearm setHidden:YES];
|
|
} else {
|
|
[alert setAlertStyle:NSWarningAlertStyle];
|
|
[alert setInformativeText:@"Error: failed to disable Gatekeeper's automatic rearm behavior."];
|
|
}
|
|
|
|
[alert addButtonWithTitle:@"Ok"];
|
|
[alert runModal];
|
|
}
|
|
|
|
-(void) menuQuit {
|
|
hiro::Application::Cocoa::doQuit();
|
|
}
|
|
|
|
-(NSTextField*) statusBar {
|
|
return statusBar;
|
|
}
|
|
|
|
@end
|
|
|
|
namespace hiro {
|
|
|
|
auto pWindow::construct() -> void {
|
|
@autoreleasepool {
|
|
cocoaWindow = [[CocoaWindow alloc] initWith:self()];
|
|
|
|
static bool once = true;
|
|
if(once) {
|
|
once = false;
|
|
[NSApp setMainMenu:[cocoaWindow menuBar]];
|
|
}
|
|
}
|
|
}
|
|
|
|
auto pWindow::destruct() -> void {
|
|
@autoreleasepool {
|
|
[cocoaWindow release];
|
|
}
|
|
}
|
|
|
|
auto pWindow::append(sLayout layout) -> void {
|
|
layout->setGeometry(self().geometry().setPosition(0, 0));
|
|
statusBarReposition();
|
|
}
|
|
|
|
auto pWindow::append(sMenuBar menuBar) -> void {
|
|
}
|
|
|
|
auto pWindow::append(sStatusBar statusBar) -> void {
|
|
statusBar->setEnabled(statusBar->enabled(true));
|
|
statusBar->setFont(statusBar->font(true));
|
|
statusBar->setText(statusBar->text());
|
|
statusBar->setVisible(statusBar->visible(true));
|
|
}
|
|
|
|
auto pWindow::focused() const -> bool {
|
|
@autoreleasepool {
|
|
return [cocoaWindow isMainWindow] == YES;
|
|
}
|
|
}
|
|
|
|
auto pWindow::frameMargin() const -> Geometry {
|
|
@autoreleasepool {
|
|
NSRect frame = [cocoaWindow frameRectForContentRect:NSMakeRect(0, 0, 640, 480)];
|
|
return {abs(frame.origin.x), (int)(frame.size.height - 480), (int)(frame.size.width - 640), abs(frame.origin.y)};
|
|
}
|
|
}
|
|
|
|
auto pWindow::remove(sLayout layout) -> void {
|
|
@autoreleasepool {
|
|
[[cocoaWindow contentView] setNeedsDisplay:YES];
|
|
}
|
|
}
|
|
|
|
auto pWindow::remove(sMenuBar menuBar) -> void {
|
|
}
|
|
|
|
auto pWindow::remove(sStatusBar statusBar) -> void {
|
|
@autoreleasepool {
|
|
[[cocoaWindow statusBar] setHidden:YES];
|
|
}
|
|
}
|
|
|
|
auto pWindow::setBackgroundColor(Color color) -> void {
|
|
@autoreleasepool {
|
|
[cocoaWindow
|
|
setBackgroundColor:[NSColor
|
|
colorWithCalibratedRed:color.red() / 255.0
|
|
green:color.green() / 255.0
|
|
blue:color.blue() / 255.0
|
|
alpha:color.alpha() / 255.0
|
|
]
|
|
];
|
|
}
|
|
}
|
|
|
|
auto pWindow::setDismissable(bool dismissable) -> void {
|
|
//todo: not implemented
|
|
}
|
|
|
|
auto pWindow::setDroppable(bool droppable) -> void {
|
|
@autoreleasepool {
|
|
if(droppable) {
|
|
[cocoaWindow registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
|
|
} else {
|
|
[cocoaWindow unregisterDraggedTypes];
|
|
}
|
|
}
|
|
}
|
|
|
|
auto pWindow::setFocused() -> void {
|
|
@autoreleasepool {
|
|
[cocoaWindow makeKeyAndOrderFront:nil];
|
|
}
|
|
}
|
|
|
|
auto pWindow::setFullScreen(bool fullScreen) -> void {
|
|
@autoreleasepool {
|
|
if(fullScreen) {
|
|
windowedGeometry = state().geometry;
|
|
[NSApp setPresentationOptions:NSApplicationPresentationFullScreen];
|
|
[cocoaWindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
|
|
[cocoaWindow toggleFullScreen:nil];
|
|
state().geometry = _geometry();
|
|
} else {
|
|
[cocoaWindow toggleFullScreen:nil];
|
|
[cocoaWindow setCollectionBehavior:NSWindowCollectionBehaviorDefault];
|
|
[NSApp setPresentationOptions:NSApplicationPresentationDefault];
|
|
state().geometry = windowedGeometry;
|
|
}
|
|
}
|
|
}
|
|
|
|
auto pWindow::setGeometry(Geometry geometry) -> void {
|
|
lock();
|
|
|
|
@autoreleasepool {
|
|
[cocoaWindow
|
|
setFrame:[cocoaWindow
|
|
frameRectForContentRect:NSMakeRect(
|
|
geometry.x(), Desktop::size().height() - geometry.y() - geometry.height(),
|
|
geometry.width(), geometry.height() + statusBarHeight()
|
|
)
|
|
]
|
|
display:YES
|
|
];
|
|
|
|
if(auto& layout = state().layout) {
|
|
layout->setGeometry(self().geometry().setPosition(0, 0));
|
|
}
|
|
|
|
statusBarReposition();
|
|
}
|
|
|
|
unlock();
|
|
}
|
|
|
|
auto pWindow::setModal(bool modal) -> void {
|
|
@autoreleasepool {
|
|
if(modal == true) {
|
|
[NSApp runModalForWindow:cocoaWindow];
|
|
} else {
|
|
[NSApp stopModal];
|
|
NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0.0 windowNumber:0 context:nil subtype:0 data1:0 data2:0];
|
|
[NSApp postEvent:event atStart:true];
|
|
}
|
|
}
|
|
}
|
|
|
|
auto pWindow::setResizable(bool resizable) -> void {
|
|
@autoreleasepool {
|
|
NSUInteger style = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask;
|
|
if(resizable) style |= NSResizableWindowMask;
|
|
[cocoaWindow setStyleMask:style];
|
|
}
|
|
}
|
|
|
|
auto pWindow::setTitle(const string& text) -> void {
|
|
@autoreleasepool {
|
|
[cocoaWindow setTitle:[NSString stringWithUTF8String:text]];
|
|
}
|
|
}
|
|
|
|
auto pWindow::setVisible(bool visible) -> void {
|
|
@autoreleasepool {
|
|
if(visible) [cocoaWindow makeKeyAndOrderFront:nil];
|
|
else [cocoaWindow orderOut:nil];
|
|
}
|
|
}
|
|
|
|
auto pWindow::moveEvent() -> void {
|
|
if(!locked() && !self().fullScreen() && self().visible()) {
|
|
@autoreleasepool {
|
|
NSRect area = [cocoaWindow contentRectForFrameRect:[cocoaWindow frame]];
|
|
area.size.height -= statusBarHeight();
|
|
state().geometry.setX(area.origin.x);
|
|
state().geometry.setY(Desktop::size().height() - area.origin.y - area.size.height);
|
|
}
|
|
}
|
|
|
|
if(!locked()) self().doMove();
|
|
}
|
|
|
|
auto pWindow::sizeEvent() -> void {
|
|
if(!locked() && !self().fullScreen() && self().visible()) {
|
|
@autoreleasepool {
|
|
NSRect area = [cocoaWindow contentRectForFrameRect:[cocoaWindow frame]];
|
|
area.size.height -= statusBarHeight();
|
|
state().geometry.setWidth(area.size.width);
|
|
state().geometry.setHeight(area.size.height);
|
|
}
|
|
}
|
|
|
|
if(auto& layout = state().layout) {
|
|
layout->setGeometry(self().geometry().setPosition(0, 0));
|
|
}
|
|
|
|
statusBarReposition();
|
|
|
|
if(!locked()) self().doSize();
|
|
}
|
|
|
|
auto pWindow::statusBarHeight() -> uint {
|
|
if(auto& statusBar = state().statusBar) {
|
|
if(statusBar->visible()) {
|
|
return pFont::size(statusBar->font(true), " ").height() + 6;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
auto pWindow::statusBarReposition() -> void {
|
|
@autoreleasepool {
|
|
NSRect area = [cocoaWindow contentRectForFrameRect:[cocoaWindow frame]];
|
|
[[cocoaWindow statusBar] setFrame:NSMakeRect(0, 0, area.size.width, statusBarHeight())];
|
|
[[cocoaWindow contentView] setNeedsDisplay:YES];
|
|
}
|
|
}
|
|
|
|
auto pWindow::_append(mWidget& widget) -> void {
|
|
@autoreleasepool {
|
|
if(auto pWidget = widget.self()) {
|
|
[pWidget->cocoaView removeFromSuperview];
|
|
[[cocoaWindow contentView] addSubview:pWidget->cocoaView positioned:NSWindowAbove relativeTo:nil];
|
|
pWidget->setGeometry(widget.geometry());
|
|
[[cocoaWindow contentView] setNeedsDisplay:YES];
|
|
}
|
|
}
|
|
}
|
|
|
|
auto pWindow::_geometry() -> Geometry {
|
|
@autoreleasepool {
|
|
NSRect area = [cocoaWindow contentRectForFrameRect:[cocoaWindow frame]];
|
|
area.size.height -= statusBarHeight();
|
|
return {
|
|
(int)area.origin.x, (int)(Monitor::geometry(Monitor::primary()).height() - area.origin.y - area.size.height),
|
|
(int)area.size.width, (int)area.size.height
|
|
};
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|