mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-10-05 00:01:56 +02:00
byuu says: This will easily be the biggest diff in the history of higan. And not in a good way. * target-higan and target-loki have been blown away completely * nall and ruby massively updated * phoenix replaced with hiro (pretty near a total rewrite) * target-higan restarted using hiro (just a window for now) * all emulation cores updated to compile again * installation changed to not require root privileges (installs locally) For the foreseeable future (maybe even permanently?), the new higan UI will only build under Linux/BSD with GTK+ 2.20+. Probably the most likely route for Windows/OS X will be to try and figure out how to build hiro/GTK on those platforms, as awful as that would be. The other alternative would be to produce new UIs for those platforms ... which would actually be a good opportunity to make something much more user friendly. Being that I just started on this a few hours ago, that means that for at least a few weeks, don't expect to be able to actually play any games. Right now, you can pretty much just compile the binary and that's it. It's quite possible that some nall changes didn't produce compilation errors, but will produce runtime errors. So until the UI can actually load games, we won't know if anything is broken. But we should mostly be okay. It was mostly just trim<1> -> trim changes, moving to Hash::SHA256 (much cleaner), and patching some reckless memory copy functions enough to compile. Progress isn't going to be like it was before: I'm now dividing my time much thinner between studying and other hobbies. My aim this time is not to produce a binary for everyone to play games on. Rather, it's to keep the emulator alive. I want to be able to apply critical patches again. And I would also like the base of the emulator to live on, for use in other emulator frontends that utilize higan.
146 lines
4.1 KiB
C++
146 lines
4.1 KiB
C++
@implementation CocoaTabFrame : NSTabView
|
|
|
|
-(id) initWith:(phoenix::TabFrame&)tabFrameReference {
|
|
if(self = [super initWithFrame:NSMakeRect(0, 0, 0, 0)]) {
|
|
tabFrame = &tabFrameReference;
|
|
|
|
[self setDelegate:self];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
-(void) tabView:(NSTabView*)tabView didSelectTabViewItem:(NSTabViewItem*)tabViewItem {
|
|
tabFrame->state.selection = [tabView indexOfTabViewItem:tabViewItem];
|
|
tabFrame->p.synchronizeLayout();
|
|
if(tabFrame->onChange) tabFrame->onChange();
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation CocoaTabFrameItem : NSTabViewItem
|
|
|
|
-(id) initWith:(phoenix::TabFrame&)tabFrameReference {
|
|
if(self = [super initWithIdentifier:nil]) {
|
|
tabFrame = &tabFrameReference;
|
|
cocoaTabFrame = tabFrame->p.cocoaTabFrame;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
-(NSSize) sizeOfLabel:(BOOL)shouldTruncateLabel {
|
|
NSSize sizeOfLabel = [super sizeOfLabel:shouldTruncateLabel];
|
|
signed selection = [cocoaTabFrame indexOfTabViewItem:self];
|
|
if(selection < 0) return sizeOfLabel; //should never happen
|
|
if(tabFrame->state.image[selection].empty() == false) {
|
|
unsigned iconSize = phoenix::Font::size(tabFrame->font(), " ").height;
|
|
sizeOfLabel.width += iconSize + 2;
|
|
}
|
|
return sizeOfLabel;
|
|
}
|
|
|
|
-(void) drawLabel:(BOOL)shouldTruncateLabel inRect:(NSRect)tabRect {
|
|
signed selection = [cocoaTabFrame indexOfTabViewItem:self];
|
|
if(selection >= 0 && tabFrame->state.image[selection].empty() == false) {
|
|
unsigned iconSize = phoenix::Font::size(tabFrame->font(), " ").height;
|
|
NSImage* image = NSMakeImage(tabFrame->state.image[selection]);
|
|
|
|
[[NSGraphicsContext currentContext] saveGraphicsState];
|
|
NSRect targetRect = NSMakeRect(tabRect.origin.x, tabRect.origin.y + 2, iconSize, iconSize);
|
|
[image drawInRect:targetRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:YES hints:nil];
|
|
[[NSGraphicsContext currentContext] restoreGraphicsState];
|
|
|
|
tabRect.origin.x += iconSize + 2;
|
|
tabRect.size.width -= iconSize + 2;
|
|
}
|
|
[super drawLabel:shouldTruncateLabel inRect:tabRect];
|
|
}
|
|
|
|
@end
|
|
|
|
namespace phoenix {
|
|
|
|
void pTabFrame::append(string text, const image& image) {
|
|
@autoreleasepool {
|
|
CocoaTabFrameItem* item = [[CocoaTabFrameItem alloc] initWith:tabFrame];
|
|
[item setLabel:[NSString stringWithUTF8String:text]];
|
|
[cocoaView addTabViewItem:item];
|
|
tabs.append(item);
|
|
}
|
|
}
|
|
|
|
void pTabFrame::remove(unsigned selection) {
|
|
@autoreleasepool {
|
|
CocoaTabFrameItem* item = tabs[selection];
|
|
[cocoaView removeTabViewItem:item];
|
|
tabs.remove(selection);
|
|
}
|
|
}
|
|
|
|
void pTabFrame::setEnabled(bool enabled) {
|
|
for(auto& layout : tabFrame.state.layout) {
|
|
if(layout) layout->setEnabled(layout->enabled());
|
|
}
|
|
pWidget::setEnabled(enabled);
|
|
}
|
|
|
|
void pTabFrame::setGeometry(Geometry geometry) {
|
|
pWidget::setGeometry({
|
|
geometry.x - 7, geometry.y - 5,
|
|
geometry.width + 14, geometry.height + 6
|
|
});
|
|
geometry.x += 1, geometry.width -= 2;
|
|
geometry.y += 22, geometry.height -= 32;
|
|
for(auto& layout : tabFrame.state.layout) {
|
|
if(layout == nullptr) continue;
|
|
layout->setGeometry(geometry);
|
|
}
|
|
synchronizeLayout();
|
|
}
|
|
|
|
void pTabFrame::setImage(unsigned selection, const image& image) {
|
|
}
|
|
|
|
void pTabFrame::setSelection(unsigned selection) {
|
|
@autoreleasepool {
|
|
CocoaTabFrameItem* item = tabs[selection];
|
|
[cocoaView selectTabViewItem:item];
|
|
}
|
|
synchronizeLayout();
|
|
}
|
|
|
|
void pTabFrame::setText(unsigned selection, string text) {
|
|
@autoreleasepool {
|
|
CocoaTabFrameItem* item = tabs[selection];
|
|
[item setLabel:[NSString stringWithUTF8String:text]];
|
|
}
|
|
}
|
|
|
|
void pTabFrame::setVisible(bool visible) {
|
|
for(auto& layout : tabFrame.state.layout) {
|
|
if(layout) layout->setVisible(layout->visible());
|
|
}
|
|
pWidget::setVisible(visible);
|
|
}
|
|
|
|
void pTabFrame::constructor() {
|
|
@autoreleasepool {
|
|
cocoaView = cocoaTabFrame = [[CocoaTabFrame alloc] initWith:tabFrame];
|
|
}
|
|
}
|
|
|
|
void pTabFrame::destructor() {
|
|
@autoreleasepool {
|
|
[cocoaView release];
|
|
}
|
|
}
|
|
|
|
void pTabFrame::synchronizeLayout() {
|
|
unsigned selection = 0;
|
|
for(auto& layout : tabFrame.state.layout) {
|
|
if(layout) layout->setVisible(selection == tabFrame.state.selection);
|
|
selection++;
|
|
}
|
|
}
|
|
|
|
}
|