mirror of https://github.com/snes9xgit/snes9x.git
Get app running that can load ROMs and be controlled with the default key bindings. No configuration is yet possible.
This commit is contained in:
Michael Buckley
parent
bc9d2cb2bc
commit
366ce0b105
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,14 @@
|
|||
//
|
||||
// AppDelegate.h
|
||||
// Snes9x
|
||||
//
|
||||
// Created by Buckley on 8/21/19.
|
||||
//
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
@interface AppDelegate : NSObject <NSApplicationDelegate>
|
||||
|
||||
|
||||
@end
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
//
|
||||
// AppDelegate.m
|
||||
// Snes9x
|
||||
//
|
||||
// Created by Buckley on 8/21/19.
|
||||
//
|
||||
|
||||
#import "AppDelegate.h"
|
||||
#import <snes9x_framework/snes9x_framework.h>
|
||||
|
||||
@interface AppDelegate ()
|
||||
|
||||
@property (strong) S9xEngine *s9xEngine;
|
||||
@end
|
||||
|
||||
@implementation AppDelegate
|
||||
|
||||
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
|
||||
self.s9xEngine = [S9xEngine new];
|
||||
}
|
||||
|
||||
|
||||
- (void)applicationWillTerminate:(NSNotification *)aNotification {
|
||||
// Insert code here to tear down your application
|
||||
}
|
||||
|
||||
- (IBAction)openDocument:(id)sender
|
||||
{
|
||||
NSOpenPanel* panel = [NSOpenPanel new];
|
||||
NSModalResponse response = [panel runModal];
|
||||
|
||||
if ( response == NSModalResponseOK )
|
||||
{
|
||||
[self.s9xEngine loadROM:panel.URL];
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "16x16",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "16x16",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "32x32",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "32x32",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "128x128",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "128x128",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "256x256",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "256x256",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "512x512",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "512x512",
|
||||
"scale" : "2x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,678 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
|
||||
<connections>
|
||||
<outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
|
||||
</connections>
|
||||
</customObject>
|
||||
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||
<customObject id="-3" userLabel="Application"/>
|
||||
<customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
|
||||
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
|
||||
<menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
|
||||
<items>
|
||||
<menuItem title="Snes9x" id="1Xt-HY-uBw">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Snes9x" systemMenu="apple" id="uQy-DD-JDr">
|
||||
<items>
|
||||
<menuItem title="About Snes9x" id="5kV-Vb-QxS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
|
||||
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
|
||||
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
|
||||
<menuItem title="Services" id="NMo-om-nkz">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
|
||||
<menuItem title="Hide Snes9x" keyEquivalent="h" id="Olw-nP-bQN">
|
||||
<connections>
|
||||
<action selector="hide:" target="-1" id="PnN-Uc-m68"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="hideOtherApplications:" target="-1" id="VT4-aY-XCT"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Show All" id="Kd2-mp-pUS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="unhideAllApplications:" target="-1" id="Dhg-Le-xox"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
|
||||
<menuItem title="Quit Snes9x" keyEquivalent="q" id="4sb-4s-VLi">
|
||||
<connections>
|
||||
<action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="File" id="dMs-cI-mzQ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="File" id="bib-Uj-vzu">
|
||||
<items>
|
||||
<menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
|
||||
<connections>
|
||||
<action selector="newDocument:" target="-1" id="4Si-XN-c54"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
|
||||
<connections>
|
||||
<action selector="openDocument:" target="-1" id="bVn-NM-KNZ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Open Recent" id="tXI-mr-wws">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
|
||||
<items>
|
||||
<menuItem title="Clear Menu" id="vNY-rz-j42">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="clearRecentDocuments:" target="-1" id="Daa-9d-B3U"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
|
||||
<menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
|
||||
<connections>
|
||||
<action selector="performClose:" target="-1" id="HmO-Ls-i7Q"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
|
||||
<connections>
|
||||
<action selector="saveDocument:" target="-1" id="teZ-XB-qJY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
|
||||
<connections>
|
||||
<action selector="saveDocumentAs:" target="-1" id="mDf-zr-I0C"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Revert to Saved" keyEquivalent="r" id="KaW-ft-85H">
|
||||
<connections>
|
||||
<action selector="revertDocumentToSaved:" target="-1" id="iJ3-Pv-kwq"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
|
||||
<menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
|
||||
<modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="runPageLayout:" target="-1" id="Din-rz-gC5"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
|
||||
<connections>
|
||||
<action selector="print:" target="-1" id="qaZ-4w-aoO"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Edit" id="5QF-Oa-p0T">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Edit" id="W48-6f-4Dl">
|
||||
<items>
|
||||
<menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
|
||||
<connections>
|
||||
<action selector="undo:" target="-1" id="M6e-cu-g7V"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
|
||||
<connections>
|
||||
<action selector="redo:" target="-1" id="oIA-Rs-6OD"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
|
||||
<menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
|
||||
<connections>
|
||||
<action selector="cut:" target="-1" id="YJe-68-I9s"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
|
||||
<connections>
|
||||
<action selector="copy:" target="-1" id="G1f-GL-Joy"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
|
||||
<connections>
|
||||
<action selector="paste:" target="-1" id="UvS-8e-Qdg"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteAsPlainText:" target="-1" id="cEh-KX-wJQ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Delete" id="pa3-QI-u2k">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="delete:" target="-1" id="0Mk-Ml-PaM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
|
||||
<connections>
|
||||
<action selector="selectAll:" target="-1" id="VNm-Mi-diN"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
|
||||
<menuItem title="Find" id="4EN-yA-p0u">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Find" id="1b7-l0-nxx">
|
||||
<items>
|
||||
<menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="-1" id="cD7-Qs-BN4"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="-1" id="WD3-Gg-5AJ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="-1" id="NDo-RZ-v9R"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="-1" id="HOh-sY-3ay"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="-1" id="U76-nv-p5D"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
|
||||
<connections>
|
||||
<action selector="centerSelectionInVisibleArea:" target="-1" id="IOG-6D-g5B"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
|
||||
<items>
|
||||
<menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
|
||||
<connections>
|
||||
<action selector="showGuessPanel:" target="-1" id="vFj-Ks-hy3"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
|
||||
<connections>
|
||||
<action selector="checkSpelling:" target="-1" id="fz7-VC-reM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
|
||||
<menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleContinuousSpellChecking:" target="-1" id="7w6-Qz-0kB"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleGrammarChecking:" target="-1" id="muD-Qn-j4w"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticSpellingCorrection:" target="-1" id="2lM-Qi-WAP"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Substitutions" id="9ic-FL-obx">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
|
||||
<items>
|
||||
<menuItem title="Show Substitutions" id="z6F-FW-3nz">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="orderFrontSubstitutionsPanel:" target="-1" id="oku-mr-iSq"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
|
||||
<menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleSmartInsertDelete:" target="-1" id="3IJ-Se-DZD"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Quotes" id="hQb-2v-fYv">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="ptq-xd-QOA"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Dashes" id="rgM-f4-ycn">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticDashSubstitution:" target="-1" id="oCt-pO-9gS"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Links" id="cwL-P1-jid">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticLinkDetection:" target="-1" id="Gip-E3-Fov"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Data Detectors" id="tRr-pd-1PS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticDataDetection:" target="-1" id="R1I-Nq-Kbl"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Text Replacement" id="HFQ-gK-NFA">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticTextReplacement:" target="-1" id="DvP-Fe-Py6"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Transformations" id="2oI-Rn-ZJC">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Transformations" id="c8a-y6-VQd">
|
||||
<items>
|
||||
<menuItem title="Make Upper Case" id="vmV-6d-7jI">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="uppercaseWord:" target="-1" id="sPh-Tk-edu"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Make Lower Case" id="d9M-CD-aMd">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="lowercaseWord:" target="-1" id="iUZ-b5-hil"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Capitalize" id="UEZ-Bs-lqG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="capitalizeWord:" target="-1" id="26H-TL-nsh"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Speech" id="xrE-MZ-jX0">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Speech" id="3rS-ZA-NoH">
|
||||
<items>
|
||||
<menuItem title="Start Speaking" id="Ynk-f8-cLZ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="startSpeaking:" target="-1" id="654-Ng-kyl"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Stop Speaking" id="Oyz-dy-DGm">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="stopSpeaking:" target="-1" id="dX8-6p-jy9"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Format" id="jxT-CU-nIS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Format" id="GEO-Iw-cKr">
|
||||
<items>
|
||||
<menuItem title="Font" id="Gi5-1S-RQB">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
|
||||
<items>
|
||||
<menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq">
|
||||
<connections>
|
||||
<action selector="orderFrontFontPanel:" target="YLy-65-1bz" id="WHr-nq-2xA"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27">
|
||||
<connections>
|
||||
<action selector="addFontTrait:" target="YLy-65-1bz" id="hqk-hr-sYV"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq">
|
||||
<connections>
|
||||
<action selector="addFontTrait:" target="YLy-65-1bz" id="IHV-OB-c03"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
|
||||
<connections>
|
||||
<action selector="underline:" target="-1" id="FYS-2b-JAY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/>
|
||||
<menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL">
|
||||
<connections>
|
||||
<action selector="modifyFont:" target="YLy-65-1bz" id="Uc7-di-UnL"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST">
|
||||
<connections>
|
||||
<action selector="modifyFont:" target="YLy-65-1bz" id="HcX-Lf-eNd"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/>
|
||||
<menuItem title="Kern" id="jBQ-r6-VK2">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Kern" id="tlD-Oa-oAM">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="GUa-eO-cwY">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useStandardKerning:" target="-1" id="6dk-9l-Ckg"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use None" id="cDB-IK-hbR">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="turnOffKerning:" target="-1" id="U8a-gz-Maa"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Tighten" id="46P-cB-AYj">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="tightenKerning:" target="-1" id="hr7-Nz-8ro"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Loosen" id="ogc-rX-tC1">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="loosenKerning:" target="-1" id="8i4-f9-FKE"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Ligatures" id="o6e-r0-MWq">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="agt-UL-0e3">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useStandardLigatures:" target="-1" id="7uR-wd-Dx6"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use None" id="J7y-lM-qPV">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="turnOffLigatures:" target="-1" id="iX2-gA-Ilz"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use All" id="xQD-1f-W4t">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useAllLigatures:" target="-1" id="KcB-kA-TuK"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Baseline" id="OaQ-X3-Vso">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Baseline" id="ijk-EB-dga">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="3Om-Ey-2VK">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="unscript:" target="-1" id="0vZ-95-Ywn"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Superscript" id="Rqc-34-cIF">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="superscript:" target="-1" id="3qV-fo-wpU"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Subscript" id="I0S-gh-46l">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="subscript:" target="-1" id="Q6W-4W-IGz"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Raise" id="2h7-ER-AoG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="raiseBaseline:" target="-1" id="4sk-31-7Q9"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Lower" id="1tx-W0-xDw">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="lowerBaseline:" target="-1" id="OF1-bc-KW4"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="Ndw-q3-faq"/>
|
||||
<menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
|
||||
<connections>
|
||||
<action selector="orderFrontColorPanel:" target="-1" id="mSX-Xz-DV3"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="iMs-zA-UFJ"/>
|
||||
<menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="copyFont:" target="-1" id="GJO-xA-L4q"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteFont:" target="-1" id="JfD-CL-leO"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Text" id="Fal-I4-PZk">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Text" id="d9c-me-L2H">
|
||||
<items>
|
||||
<menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
|
||||
<connections>
|
||||
<action selector="alignLeft:" target="-1" id="zUv-R1-uAa"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
|
||||
<connections>
|
||||
<action selector="alignCenter:" target="-1" id="spX-mk-kcS"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Justify" id="J5U-5w-g23">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="alignJustified:" target="-1" id="ljL-7U-jND"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
|
||||
<connections>
|
||||
<action selector="alignRight:" target="-1" id="r48-bG-YeY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="4s2-GY-VfK"/>
|
||||
<menuItem title="Writing Direction" id="H1b-Si-o9J">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
|
||||
<items>
|
||||
<menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
</menuItem>
|
||||
<menuItem id="YGs-j5-SAR">
|
||||
<string key="title"> Default</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionNatural:" target="-1" id="qtV-5e-UBP"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="Lbh-J2-qVU">
|
||||
<string key="title"> Left to Right</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="S0X-9S-QSf"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="jFq-tB-4Kx">
|
||||
<string key="title"> Right to Left</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="5fk-qB-AqJ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="swp-gr-a21"/>
|
||||
<menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
</menuItem>
|
||||
<menuItem id="Nop-cj-93Q">
|
||||
<string key="title"> Default</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionNatural:" target="-1" id="lPI-Se-ZHp"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="BgM-ve-c93">
|
||||
<string key="title"> Left to Right</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="caW-Bv-w94"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="RB4-Sm-HuC">
|
||||
<string key="title"> Right to Left</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="EXD-6r-ZUu"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="fKy-g9-1gm"/>
|
||||
<menuItem title="Show Ruler" id="vLm-3I-IUL">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleRuler:" target="-1" id="FOx-HJ-KwY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="copyRuler:" target="-1" id="71i-fW-3W2"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteRuler:" target="-1" id="cSh-wd-qM2"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="View" id="H8h-7b-M4v">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="View" id="HyV-fh-RgO">
|
||||
<items>
|
||||
<menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="toggleToolbarShown:" target="-1" id="BXY-wc-z0C"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="runToolbarCustomizationPalette:" target="-1" id="pQI-g3-MTW"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="hB3-LF-h0Y"/>
|
||||
<menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="toggleSidebar:" target="-1" id="iwa-gc-5KM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="toggleFullScreen:" target="-1" id="dU3-MA-1Rq"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Window" id="aUF-d1-5bR">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
|
||||
<items>
|
||||
<menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
|
||||
<connections>
|
||||
<action selector="performMiniaturize:" target="-1" id="VwT-WD-YPe"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Zoom" id="R4o-n2-Eq4">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="performZoom:" target="-1" id="DIl-cC-cCs"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
|
||||
<menuItem title="Bring All to Front" id="LE2-aR-0XJ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="arrangeInFront:" target="-1" id="DRN-fu-gQh"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Help" id="wpr-3q-Mcd">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
|
||||
<items>
|
||||
<menuItem title="Snes9x Help" keyEquivalent="?" id="FKE-Sm-Kum">
|
||||
<connections>
|
||||
<action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string></string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>MainMenu</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict/>
|
||||
</plist>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
//
|
||||
// main.m
|
||||
// Snes9x
|
||||
//
|
||||
// Created by Buckley on 8/21/19.
|
||||
//
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
int main(int argc, const char * argv[]) {
|
||||
return NSApplicationMain(argc, argv);
|
||||
}
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
@ -43,11 +44,6 @@ int cureffect = kAUReverb;
|
|||
static AUGraph agraph;
|
||||
static AUNode outNode, cnvNode, revNode, eqlNode;
|
||||
static AudioUnit outAU, cnvAU, revAU, eqlAU;
|
||||
static AudioUnitCarbonView carbonView = NULL;
|
||||
static EventHandlerUPP carbonViewEventUPP = NULL;
|
||||
static EventHandlerRef carbonViewEventRef = NULL;
|
||||
static WindowRef effectWRef;
|
||||
static HISize effectWSize;
|
||||
static pthread_mutex_t mutex;
|
||||
static UInt32 outStoredFrames, cnvStoredFrames, revStoredFrames, eqlStoredFrames, devStoredFrames;
|
||||
static int16_t *audioBuffer;
|
||||
|
|
@ -73,11 +69,7 @@ void InitMacSound (void)
|
|||
|
||||
err = NewAUGraph(&agraph);
|
||||
|
||||
#ifndef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
AudioComponentDescription outdesc, cnvdesc, revdesc, eqldesc;
|
||||
#else
|
||||
ComponentDescription outdesc, cnvdesc, revdesc, eqldesc;
|
||||
#endif
|
||||
|
||||
outdesc.componentType = kAudioUnitType_Output;
|
||||
outdesc.componentSubType = kAudioUnitSubType_DefaultOutput;
|
||||
|
|
@ -103,31 +95,18 @@ void InitMacSound (void)
|
|||
eqldesc.componentFlags = 0;
|
||||
eqldesc.componentFlagsMask = 0;
|
||||
|
||||
#ifndef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
err = AUGraphAddNode(agraph, &outdesc, &outNode);
|
||||
err = AUGraphAddNode(agraph, &cnvdesc, &cnvNode);
|
||||
err = AUGraphAddNode(agraph, &revdesc, &revNode);
|
||||
err = AUGraphAddNode(agraph, &eqldesc, &eqlNode);
|
||||
#else
|
||||
err = AUGraphNewNode(agraph, &outdesc, 0, NULL, &outNode);
|
||||
err = AUGraphNewNode(agraph, &cnvdesc, 0, NULL, &cnvNode);
|
||||
err = AUGraphNewNode(agraph, &revdesc, 0, NULL, &revNode);
|
||||
err = AUGraphNewNode(agraph, &eqldesc, 0, NULL, &eqlNode);
|
||||
#endif
|
||||
|
||||
err = AUGraphOpen(agraph);
|
||||
|
||||
#ifndef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
err = AUGraphNodeInfo(agraph, outNode, NULL, &outAU);
|
||||
err = AUGraphNodeInfo(agraph, cnvNode, NULL, &cnvAU);
|
||||
err = AUGraphNodeInfo(agraph, revNode, NULL, &revAU);
|
||||
err = AUGraphNodeInfo(agraph, eqlNode, NULL, &eqlAU);
|
||||
#else
|
||||
err = AUGraphGetNodeInfo(agraph, outNode, NULL, NULL, NULL, &outAU);
|
||||
err = AUGraphGetNodeInfo(agraph, cnvNode, NULL, NULL, NULL, &cnvAU);
|
||||
err = AUGraphGetNodeInfo(agraph, revNode, NULL, NULL, NULL, &revAU);
|
||||
err = AUGraphGetNodeInfo(agraph, eqlNode, NULL, NULL, NULL, &eqlAU);
|
||||
#endif
|
||||
|
||||
|
||||
SetAudioUnitSoundFormat();
|
||||
SetAudioUnitVolume();
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
@ -128,7 +129,7 @@ void CocoaAddPopUpBtnToView (NSView *view, NSArray *array, float x, float y, flo
|
|||
{
|
||||
NSPopUpButton *control;
|
||||
NSMenu *menu;
|
||||
int n;
|
||||
NSUInteger n;
|
||||
|
||||
menu = [[NSMenu alloc] init];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
@ -32,8 +33,6 @@
|
|||
#define ASSIGN_POINTRf(n, s) S9xMapPointer(n, cmd = S9xGetCommandT(s), false)
|
||||
#define ASSIGN_POINTRt(n, s) S9xMapPointer(n, cmd = S9xGetCommandT(s), true)
|
||||
|
||||
#define KeyIsPressed(km, k) (1 & (((unsigned char *) km) [(k) >> 3] >> ((k) & 7)))
|
||||
|
||||
|
||||
void S9xSetupDefaultKeymap (void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,12 +15,17 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
#ifndef _mac_os_h_
|
||||
#define _mac_os_h_
|
||||
|
||||
#import <os/lock.h>
|
||||
|
||||
@class NSOpenGLView;
|
||||
|
||||
enum
|
||||
{
|
||||
kDrawingReserved1 = 1, // unused
|
||||
|
|
@ -107,6 +112,7 @@ typedef struct
|
|||
#define kMacWindowHeight (SNES_HEIGHT_EXTENDED << 1)
|
||||
#define MAC_MAX_PLAYERS 8
|
||||
#define MAC_MAX_CHEATS 150
|
||||
#define MAC_NUM_KEYCODES 255
|
||||
|
||||
extern volatile bool8 running, s9xthreadrunning;
|
||||
extern volatile bool8 eventQueued, windowExtend;
|
||||
|
|
@ -114,8 +120,7 @@ extern volatile int windowResizeCount;
|
|||
extern uint32 controlPad[MAC_MAX_PLAYERS];
|
||||
extern uint8 romDetect, interleaveDetect, videoDetect, headerDetect;
|
||||
extern WindowRef gWindow;
|
||||
extern HIRect gWindowRect;
|
||||
extern int glScreenW, glScreenH;
|
||||
extern uint32 glScreenW, glScreenH;
|
||||
extern CGRect glScreenBounds;
|
||||
extern Point windowPos[kWindowCount];
|
||||
extern CGSize windowSize[kWindowCount];
|
||||
|
|
@ -158,6 +163,11 @@ extern CFStringRef multiCartPath[2];
|
|||
extern IconRef macIconRef[118];
|
||||
#endif
|
||||
|
||||
extern bool8 pressedKeys[MAC_NUM_KEYCODES];
|
||||
extern os_unfair_lock keyLock;
|
||||
|
||||
extern NSOpenGLView *s9xView;
|
||||
|
||||
void AddRecentItem (NSURL *);
|
||||
void AdjustMenus (void);
|
||||
void UpdateMenuCommandStatus (Boolean);
|
||||
|
|
@ -167,6 +177,14 @@ void ChangeInputDevice (void);
|
|||
void GetGameScreenPointer (int16 *, int16 *, bool);
|
||||
void PostQueueToSubEventLoop (void);
|
||||
int PromptFreezeDefrost (Boolean);
|
||||
uint64 GetMicroseconds();
|
||||
uint64 GetMicroseconds(void);
|
||||
|
||||
@interface S9xEngine : NSObject
|
||||
|
||||
- (void)start;
|
||||
|
||||
- (void)loadROM:(NSURL *)fileURL;
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
|
|
|
|||
1799
macosx/mac-os.mm
1799
macosx/mac-os.mm
File diff suppressed because it is too large
Load Diff
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,10 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
#include "snes9x.h"
|
||||
#include "memmap.h"
|
||||
|
|
@ -47,10 +49,8 @@ static void S9xInitFullScreen (void);
|
|||
static void S9xDeinitFullScreen (void);
|
||||
static void S9xInitWindowMode (void);
|
||||
static void S9xDeinitWindowMode (void);
|
||||
static void S9xInitOpenGLFullScreen (void);
|
||||
static void S9xDeinitOpenGLFullScreen (void);
|
||||
static void S9xInitOpenGLWindowMode (void);
|
||||
static void S9xDeinitOpenGLWindowMode (void);
|
||||
static void S9xInitOpenGL (void);
|
||||
static void S9xDeinitOpenGL(void);
|
||||
static void S9xInitBlitGL (void);
|
||||
static void S9xDeinitBlitGL (void);
|
||||
static void S9xInitOpenGLContext (void);
|
||||
|
|
@ -64,9 +64,6 @@ static void GLMakeScreenMesh (GLfloat *, int, int);
|
|||
static void GLMakeTextureMesh (GLfloat *, int, int, float, float);
|
||||
static void GLPrepareTexture (bool8, int, int, int, int, int, int);
|
||||
static inline void RenderBlitScreen (Blitter, int, int, int, int, int, uint16 *);
|
||||
#ifndef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
static void SetBestDisplayMode (int, int);
|
||||
#endif
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
@ -144,8 +141,6 @@ static uint16 *gfxScreen[2],
|
|||
*snesScreenB;
|
||||
static uint8 *blitGLBuffer;
|
||||
|
||||
static CGDirectDisplayID gGameDisplayID;
|
||||
|
||||
static MPTaskID taskID = NULL;
|
||||
static MPQueueID notificationQueue = NULL,
|
||||
taskQueue = NULL;
|
||||
|
|
@ -153,17 +148,7 @@ static MPSemaphoreID readySemaphore = NULL;
|
|||
static MPData *mpBlit = NULL;
|
||||
|
||||
static OpenGLData OpenGL;
|
||||
static CGLContextObj glContext;
|
||||
static AGLContext agContext;
|
||||
static CGLPixelFormatObj cglpix;
|
||||
static AGLPixelFormat aglpix;
|
||||
static GLint glSwapInterval = 0;
|
||||
static GLint agSwapInterval = 0;
|
||||
#ifdef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
static CFDictionaryRef oldDisplayMode;
|
||||
#else
|
||||
static CGDisplayModeRef oldDisplayModeRef;
|
||||
#endif
|
||||
|
||||
static CGImageRef cgGameImage = NULL,
|
||||
cgBlitImage = NULL;
|
||||
|
||||
|
|
@ -338,252 +323,54 @@ void ClearGFXScreen (void)
|
|||
imageWidth[1] = imageHeight[1] = 0;
|
||||
prevBlitWidth = prevBlitHeight = 0;
|
||||
|
||||
if (fullscreen)
|
||||
{
|
||||
CGLSetCurrentContext(glContext);
|
||||
CGLSetCurrentContext(s9xView.openGLContext.CGLContextObj);
|
||||
glViewport(0, 0, glScreenW, glScreenH);
|
||||
}
|
||||
else
|
||||
{
|
||||
aglSetCurrentContext(agContext);
|
||||
aglUpdateContext(agContext);
|
||||
glViewport(0, 0, (GLsizei) gWindowRect.size.width, (GLsizei) gWindowRect.size.height);
|
||||
}
|
||||
|
||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
if (fullscreen)
|
||||
CGLFlushDrawable(glContext);
|
||||
else
|
||||
aglSwapBuffers(agContext);
|
||||
glSwapAPPLE();
|
||||
//CGLFlushDrawable(s9xView.openGLContext.CGLContextObj);
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
static void SetBestDisplayMode (int width, int height)
|
||||
{
|
||||
if (autoRes || !gl32bit)
|
||||
{
|
||||
CGError err;
|
||||
CGDisplayModeRef mode;
|
||||
CFArrayRef array;
|
||||
CFStringRef pixenc, pix;
|
||||
CFIndex n, i;
|
||||
size_t w, h;
|
||||
bool r;
|
||||
|
||||
pixenc = gl32bit ? CFSTR(IO32BitDirectPixels) : CFSTR(IO16BitDirectPixels);
|
||||
|
||||
array = CGDisplayCopyAllDisplayModes(gGameDisplayID, NULL);
|
||||
n = CFArrayGetCount(array);
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
{
|
||||
mode = (CGDisplayModeRef) CFArrayGetValueAtIndex(array, i);
|
||||
|
||||
w = CGDisplayModeGetWidth(mode);
|
||||
h = CGDisplayModeGetHeight(mode);
|
||||
pix = CGDisplayModeCopyPixelEncoding(mode);
|
||||
r = CFStringCompare(pix, pixenc, 0) == kCFCompareEqualTo;
|
||||
CFRelease(pix);
|
||||
|
||||
if (w == (size_t) width && h == (size_t) height && r)
|
||||
break;
|
||||
}
|
||||
|
||||
if (i < n)
|
||||
err = CGDisplaySetDisplayMode(gGameDisplayID, mode, NULL);
|
||||
|
||||
CFRelease(array);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void S9xInitFullScreen (void)
|
||||
{
|
||||
size_t width, height;
|
||||
|
||||
width = autoRes ? 640 : CGDisplayPixelsWide(gGameDisplayID);
|
||||
height = autoRes ? 480 : CGDisplayPixelsHigh(gGameDisplayID);
|
||||
|
||||
#ifdef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
CFDictionaryRef mode;
|
||||
boolean_t exactMatch;
|
||||
size_t depth = gl32bit ? 32 : 16;
|
||||
|
||||
oldDisplayMode = CGDisplayCurrentMode(gGameDisplayID);
|
||||
mode = CGDisplayBestModeForParameters(gGameDisplayID, depth, width, height, &exactMatch);
|
||||
CGDisplayCapture(gGameDisplayID);
|
||||
CGDisplaySwitchToMode(gGameDisplayID, mode);
|
||||
#else
|
||||
oldDisplayModeRef = CGDisplayCopyDisplayMode(gGameDisplayID);
|
||||
CGDisplayCapture(gGameDisplayID);
|
||||
SetBestDisplayMode(width, height);
|
||||
#endif
|
||||
|
||||
CGDisplayErr cgErr;
|
||||
CGDisplayCount numDisplays, maxDisplays = 32;
|
||||
CGDirectDisplayID activeDisplays[32];
|
||||
|
||||
cgErr = CGGetActiveDisplayList(maxDisplays, activeDisplays, &numDisplays);
|
||||
if (cgErr == noErr)
|
||||
{
|
||||
if ((macControllerOption == SNES_MOUSE) || (macControllerOption == SNES_MOUSE_SWAPPED) || (numDisplays == 1))
|
||||
CGDisplayHideCursor(gGameDisplayID);
|
||||
|
||||
if ((macControllerOption == SNES_MOUSE) || (macControllerOption == SNES_MOUSE_SWAPPED))
|
||||
{
|
||||
CGDisplayMoveCursorToPoint(gGameDisplayID, CGPointMake((float) (width >> 1), (float) (height >> 1)));
|
||||
[NSCursor hide];
|
||||
CGAssociateMouseAndMouseCursorPosition(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void S9xDeinitFullScreen (void)
|
||||
{
|
||||
CGAssociateMouseAndMouseCursorPosition(true);
|
||||
CGDisplayShowCursor(gGameDisplayID);
|
||||
|
||||
#ifdef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
CGDisplaySwitchToMode(gGameDisplayID, oldDisplayMode);
|
||||
#else
|
||||
CGError err;
|
||||
|
||||
err = CGDisplaySetDisplayMode(gGameDisplayID, oldDisplayModeRef, NULL);
|
||||
CGDisplayModeRelease(oldDisplayModeRef);
|
||||
#endif
|
||||
|
||||
CGDisplayRelease(gGameDisplayID);
|
||||
[NSCursor unhide];
|
||||
}
|
||||
|
||||
static void S9xInitWindowMode (void)
|
||||
{
|
||||
Rect rct;
|
||||
size_t width, height;
|
||||
|
||||
width = CGDisplayPixelsWide(gGameDisplayID);
|
||||
height = CGDisplayPixelsHigh(gGameDisplayID);
|
||||
|
||||
#ifdef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
CFDictionaryRef mode;
|
||||
boolean_t exactMatch;
|
||||
size_t depth = gl32bit ? 32 : 16;
|
||||
|
||||
oldDisplayMode = CGDisplayCurrentMode(gGameDisplayID);
|
||||
mode = CGDisplayBestModeForParameters(gGameDisplayID, depth, width, height, &exactMatch);
|
||||
if (exactMatch)
|
||||
CGDisplaySwitchToMode(gGameDisplayID, mode);
|
||||
#else
|
||||
oldDisplayModeRef = CGDisplayCopyDisplayMode(gGameDisplayID);
|
||||
SetBestDisplayMode(width, height);
|
||||
#endif
|
||||
|
||||
// InitGameWindow();
|
||||
// ShowWindow(gWindow);
|
||||
//
|
||||
// GetWindowBounds(gWindow, kWindowContentRgn, &rct);
|
||||
// gWindowRect = CGRectMake((float) rct.left, (float) rct.top, (float) (rct.right - rct.left), (float) (rct.bottom - rct.top));
|
||||
|
||||
// UpdateGameWindow();
|
||||
}
|
||||
|
||||
static void S9xDeinitWindowMode (void)
|
||||
{
|
||||
#ifdef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
CGDisplaySwitchToMode(gGameDisplayID, oldDisplayMode);
|
||||
#else
|
||||
CGError err;
|
||||
|
||||
err = CGDisplaySetDisplayMode(gGameDisplayID, oldDisplayModeRef, NULL);
|
||||
CGDisplayModeRelease(oldDisplayModeRef);
|
||||
#endif
|
||||
|
||||
// UpdateGameWindow();
|
||||
}
|
||||
|
||||
static void S9xInitOpenGLFullScreen (void)
|
||||
static void S9xInitOpenGL (void)
|
||||
{
|
||||
CGOpenGLDisplayMask displayMask;
|
||||
GLint numPixelFormats;
|
||||
|
||||
displayMask = CGDisplayIDToOpenGLDisplayMask(gGameDisplayID);
|
||||
CGLPixelFormatAttribute attribs[] = { (CGLPixelFormatAttribute) kCGLPFAFullScreen,
|
||||
(CGLPixelFormatAttribute) kCGLPFADoubleBuffer,
|
||||
(CGLPixelFormatAttribute) kCGLPFAAccelerated,
|
||||
(CGLPixelFormatAttribute) kCGLPFANoRecovery,
|
||||
(CGLPixelFormatAttribute) kCGLPFAColorSize,
|
||||
(CGLPixelFormatAttribute) (gl32bit ? 32 : 16),
|
||||
(CGLPixelFormatAttribute) kCGLPFADisplayMask,
|
||||
(CGLPixelFormatAttribute) displayMask,
|
||||
(CGLPixelFormatAttribute) 0 };
|
||||
|
||||
CGLChoosePixelFormat(attribs, &cglpix, &numPixelFormats);
|
||||
CGLCreateContext(cglpix, NULL, &glContext);
|
||||
glSwapInterval = vsync ? 1 : 0;
|
||||
GLint glSwapInterval = vsync ? 1 : 0;
|
||||
if (extraOptions.benchmark)
|
||||
glSwapInterval = 0;
|
||||
CGLSetParameter(glContext, kCGLCPSwapInterval, &glSwapInterval);
|
||||
CGLSetCurrentContext(glContext);
|
||||
CGLSetParameter(s9xView.openGLContext.CGLContextObj, kCGLCPSwapInterval, &glSwapInterval);
|
||||
CGLSetCurrentContext(s9xView.openGLContext.CGLContextObj);
|
||||
|
||||
#ifdef MAC_LEOPARD_TIGER_PANTHER_SUPPORT
|
||||
CGLSetFullScreen(glContext);
|
||||
#else
|
||||
CGLSetFullScreenOnDisplay(glContext, CGDisplayIDToOpenGLDisplayMask(gGameDisplayID));
|
||||
#endif
|
||||
|
||||
glScreenW = CGDisplayPixelsWide(gGameDisplayID);
|
||||
glScreenH = CGDisplayPixelsHigh(gGameDisplayID);
|
||||
glScreenW = glScreenBounds.size.width;
|
||||
glScreenH = glScreenBounds.size.height;
|
||||
}
|
||||
|
||||
static void S9xDeinitOpenGLFullScreen (void)
|
||||
{
|
||||
if (glContext)
|
||||
static void S9xDeinitOpenGL (void)
|
||||
{
|
||||
CGLSetCurrentContext(NULL);
|
||||
CGLClearDrawable(glContext);
|
||||
CGLDestroyContext(glContext);
|
||||
CGLDestroyPixelFormat(cglpix);
|
||||
}
|
||||
}
|
||||
|
||||
static void S9xInitOpenGLWindowMode (void)
|
||||
{
|
||||
GLint attribs[] = { AGL_RGBA,
|
||||
AGL_DOUBLEBUFFER,
|
||||
AGL_ACCELERATED,
|
||||
AGL_NO_RECOVERY,
|
||||
AGL_PIXEL_SIZE, gl32bit ? 32 : 16,
|
||||
AGL_NONE };
|
||||
|
||||
aglpix = aglChoosePixelFormat(NULL, 0, attribs);
|
||||
agContext = aglCreateContext(aglpix, NULL);
|
||||
|
||||
aglSetWindowRef(agContext, gWindow);
|
||||
|
||||
agSwapInterval = vsync ? 1 : 0;
|
||||
if (extraOptions.benchmark)
|
||||
agSwapInterval = 0;
|
||||
aglSetInteger(agContext, AGL_SWAP_INTERVAL, &agSwapInterval);
|
||||
aglSetCurrentContext(agContext);
|
||||
|
||||
aglGetCGLPixelFormat(aglpix, (void **) &cglpix);
|
||||
aglGetCGLContext(agContext, (void **) &glContext);
|
||||
}
|
||||
|
||||
static void S9xDeinitOpenGLWindowMode (void)
|
||||
{
|
||||
if (agContext)
|
||||
{
|
||||
aglSetWindowRef(agContext, NULL);
|
||||
|
||||
aglSetCurrentContext(NULL);
|
||||
aglDestroyContext(agContext);
|
||||
aglDestroyPixelFormat(aglpix);
|
||||
}
|
||||
}
|
||||
|
||||
static void S9xInitBlitGL (void)
|
||||
|
|
@ -601,9 +388,6 @@ static void S9xDeinitBlitGL (void)
|
|||
{
|
||||
if (multiprocessor)
|
||||
{
|
||||
MPNotifyQueue(taskQueue, (void *) kMPBlitDone, 0, 0);
|
||||
MPWaitOnQueue(notificationQueue, NULL, NULL, NULL, kDurationForever);
|
||||
MPDeleteQueue(notificationQueue);
|
||||
notificationQueue = NULL;
|
||||
|
||||
printf("MP: Successfully received terminate signal from BlitGL thread.\n");
|
||||
|
|
@ -805,28 +589,15 @@ static void S9xInitOpenGLContext (void)
|
|||
GLMakeScreenMesh(scScnArray, kSCMeshX, kSCMeshY);
|
||||
}
|
||||
|
||||
if (fullscreen)
|
||||
{
|
||||
CGLSetCurrentContext(glContext);
|
||||
CGLSetCurrentContext(s9xView.openGLContext.CGLContextObj);
|
||||
glViewport(0, 0, glScreenW, glScreenH);
|
||||
}
|
||||
else
|
||||
{
|
||||
aglSetCurrentContext(agContext);
|
||||
aglUpdateContext(agContext);
|
||||
glViewport(0, 0, (GLsizei) gWindowRect.size.width, (GLsizei) gWindowRect.size.height);
|
||||
}
|
||||
|
||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
if (fullscreen)
|
||||
CGLFlushDrawable(glContext);
|
||||
else
|
||||
aglSwapBuffers(agContext);
|
||||
//CGLFlushDrawable(s9xView.openGLContext.CGLContextObj);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -871,7 +642,7 @@ static void S9xInitCoreImage (void)
|
|||
cgGameImage = NULL;
|
||||
cgBlitImage = NULL;
|
||||
|
||||
InitCoreImageContext(glContext, cglpix);
|
||||
InitCoreImageContext(s9xView.openGLContext.CGLContextObj, s9xView.pixelFormat.CGLPixelFormatObj);
|
||||
}
|
||||
|
||||
static void S9xDeinitCoreImage (void)
|
||||
|
|
@ -893,29 +664,10 @@ static void S9xDeinitCoreImage (void)
|
|||
|
||||
void GetGameDisplay (int *w, int *h)
|
||||
{
|
||||
CGDisplayErr cgErr;
|
||||
CGDisplayCount numDisplays, maxDisplays = 32;
|
||||
CGDirectDisplayID activeDisplays[32];
|
||||
CGPoint windowAt;
|
||||
|
||||
gGameDisplayID = CGMainDisplayID();
|
||||
|
||||
windowAt = CGPointMake((float) windowPos[kWindowScreen].h, (float) windowPos[kWindowScreen].v);
|
||||
|
||||
cgErr = CGGetDisplaysWithPoint(windowAt, maxDisplays, activeDisplays, &numDisplays);
|
||||
if ((cgErr == noErr) && (numDisplays > 0))
|
||||
{
|
||||
for (unsigned int i = 0; i < numDisplays; i++)
|
||||
{
|
||||
if (activeDisplays[i] != CGMainDisplayID())
|
||||
gGameDisplayID = activeDisplays[i];
|
||||
}
|
||||
}
|
||||
|
||||
if (w != NULL && h != NULL)
|
||||
{
|
||||
*w = CGDisplayPixelsWide(gGameDisplayID);
|
||||
*h = CGDisplayPixelsHigh(gGameDisplayID);
|
||||
*w = s9xView.frame.size.width;
|
||||
*h = s9xView.frame.size.height;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -924,9 +676,7 @@ void S9xInitDisplay (int argc, char **argv)
|
|||
if (directDisplay)
|
||||
return;
|
||||
|
||||
GetGameDisplay(NULL, NULL);
|
||||
|
||||
glScreenBounds = CGDisplayBounds(gGameDisplayID);
|
||||
glScreenBounds = s9xView.frame;
|
||||
|
||||
unlimitedCursor = CGPointMake(0.0f, 0.0f);
|
||||
|
||||
|
|
@ -969,14 +719,14 @@ void S9xInitDisplay (int argc, char **argv)
|
|||
if (fullscreen)
|
||||
{
|
||||
S9xInitFullScreen();
|
||||
S9xInitOpenGLFullScreen();
|
||||
}
|
||||
else
|
||||
{
|
||||
S9xInitWindowMode();
|
||||
S9xInitOpenGLWindowMode();
|
||||
}
|
||||
|
||||
S9xInitOpenGL();
|
||||
|
||||
S9xInitOpenGLContext();
|
||||
if (ciFilterEnable)
|
||||
S9xInitCoreImage();
|
||||
|
|
@ -984,7 +734,7 @@ void S9xInitDisplay (int argc, char **argv)
|
|||
S9xInitBlitGL();
|
||||
|
||||
S9xSetSoundMute(false);
|
||||
Microseconds((UnsignedWide *) &lastFrame);
|
||||
lastFrame = GetMicroseconds();
|
||||
|
||||
windowResizeCount = 1;
|
||||
|
||||
|
|
@ -1008,15 +758,15 @@ void S9xDeinitDisplay (void)
|
|||
|
||||
if (fullscreen)
|
||||
{
|
||||
S9xDeinitOpenGLFullScreen();
|
||||
S9xDeinitFullScreen();
|
||||
}
|
||||
else
|
||||
{
|
||||
S9xDeinitOpenGLWindowMode();
|
||||
S9xDeinitWindowMode();
|
||||
}
|
||||
|
||||
S9xDeinitOpenGL();
|
||||
|
||||
directDisplay = false;
|
||||
}
|
||||
|
||||
|
|
@ -1239,14 +989,14 @@ static void S9xPutImageOpenGL (int width, int height)
|
|||
|
||||
int vh = (height > 256) ? height : (height << 1);
|
||||
|
||||
if (fullscreen)
|
||||
{
|
||||
CGLSetCurrentContext(glContext);
|
||||
CGLSetCurrentContext(s9xView.openGLContext.CGLContextObj);
|
||||
|
||||
glViewport(0, 0, glScreenW, glScreenH);
|
||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
if ( fullscreen )
|
||||
{
|
||||
if (glstretch)
|
||||
{
|
||||
float fpw = (float) glScreenH / vh * 512.0f;
|
||||
|
|
@ -1259,18 +1009,8 @@ static void S9xPutImageOpenGL (int width, int height)
|
|||
}
|
||||
else
|
||||
{
|
||||
int ww = (int) gWindowRect.size.width,
|
||||
wh = (int) gWindowRect.size.height;
|
||||
|
||||
aglSetCurrentContext(agContext);
|
||||
aglUpdateContext(agContext);
|
||||
|
||||
glViewport(0, 0, ww, wh);
|
||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
if (windowExtend)
|
||||
glViewport(0, ((kMacWindowHeight - vh) >> 1) * wh / kMacWindowHeight, ww, vh * wh / kMacWindowHeight);
|
||||
glViewport(0, ((kMacWindowHeight - vh) >> 1) * glScreenH / kMacWindowHeight, glScreenW, vh * glScreenH / kMacWindowHeight);
|
||||
}
|
||||
|
||||
glPixelStorei(GL_UNPACK_ROW_LENGTH, width);
|
||||
|
|
@ -1350,10 +1090,8 @@ static void S9xPutImageOpenGL (int width, int height)
|
|||
DrawWithCoreImageFilter(src, cgGameImage);
|
||||
}
|
||||
|
||||
if (fullscreen)
|
||||
CGLFlushDrawable(glContext);
|
||||
else
|
||||
aglSwapBuffers(agContext);
|
||||
//CGLFlushDrawable(s9xView.openGLContext.CGLContextObj);
|
||||
glSwapAPPLE();
|
||||
}
|
||||
|
||||
static void S9xPutImageBlitGL (int width, int height)
|
||||
|
|
@ -1532,9 +1270,7 @@ static void S9xPutImageBlitGL2 (int blit_width, int blit_height)
|
|||
|
||||
if (windowResizeCount > 0)
|
||||
{
|
||||
if (fullscreen)
|
||||
{
|
||||
CGLSetCurrentContext(glContext);
|
||||
CGLSetCurrentContext(s9xView.openGLContext.CGLContextObj);
|
||||
|
||||
glViewport(0, 0, glScreenW, glScreenH);
|
||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
|
|
@ -1565,25 +1301,6 @@ static void S9xPutImageBlitGL2 (int blit_width, int blit_height)
|
|||
|
||||
glViewport((glScreenW - sw) >> 1, (glScreenH - sh) >> 1, sw, sh);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int ww = (int) gWindowRect.size.width,
|
||||
wh = (int) gWindowRect.size.height;
|
||||
|
||||
aglSetCurrentContext(agContext);
|
||||
aglUpdateContext(agContext);
|
||||
|
||||
glViewport(0, 0, ww, wh);
|
||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
if (windowExtend)
|
||||
{
|
||||
int bh = (blit_height % SNES_HEIGHT) ? (SNES_HEIGHT_EXTENDED << 1) : (SNES_HEIGHT << 1);
|
||||
glViewport(0, ((kMacWindowHeight - bh) >> 1) * wh / kMacWindowHeight, ww, bh * wh / kMacWindowHeight);
|
||||
}
|
||||
}
|
||||
|
||||
if (!ciFilterEnable)
|
||||
{
|
||||
|
|
@ -1717,10 +1434,8 @@ static void S9xPutImageBlitGL2 (int blit_width, int blit_height)
|
|||
DrawWithCoreImageFilter(src, cgBlitImage);
|
||||
}
|
||||
|
||||
if (fullscreen)
|
||||
CGLFlushDrawable(glContext);
|
||||
else
|
||||
aglSwapBuffers(agContext);
|
||||
//CGLFlushDrawable(s9xView.openGLContext.CGLContextObj);
|
||||
glSwapAPPLE();
|
||||
}
|
||||
|
||||
void S9xTextMode (void)
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ void SNES9X_Go (void)
|
|||
bool8 SNES9X_OpenCart (NSURL *inRef)
|
||||
{
|
||||
NSURL *cartRef;
|
||||
const char *filename = inRef.lastPathComponent.UTF8String;
|
||||
const char *filename = inRef.path.UTF8String;
|
||||
|
||||
if (cartOpen)
|
||||
{
|
||||
|
|
@ -304,7 +304,7 @@ bool8 SNES9X_FreezeTo (void)
|
|||
NSURL *url = NavFreezeTo();
|
||||
if (url != nil)
|
||||
{
|
||||
const char *filename = url.lastPathComponent.UTF8String;
|
||||
const char *filename = url.path.UTF8String;
|
||||
unlink(filename);
|
||||
|
||||
S9xFreezeGame(filename);
|
||||
|
|
@ -320,14 +320,12 @@ bool8 SNES9X_FreezeTo (void)
|
|||
|
||||
bool8 SNES9X_DefrostFrom (void)
|
||||
{
|
||||
char filename[PATH_MAX + 1];
|
||||
|
||||
if (cartOpen)
|
||||
{
|
||||
NSURL *url = NavDefrostFrom();
|
||||
if (url != nil)
|
||||
{
|
||||
const char *filename = url.lastPathComponent.UTF8String;
|
||||
const char *filename = url.path.UTF8String;
|
||||
S9xUnfreezeGame(filename);
|
||||
|
||||
SNES9X_Go();
|
||||
|
|
@ -346,7 +344,7 @@ bool8 SNES9X_RecordMovie (void)
|
|||
NSURL *url = NavRecordMovieTo();
|
||||
if (url != nil)
|
||||
{
|
||||
const char *filename = url.lastPathComponent.UTF8String;
|
||||
const char *filename = url.path.UTF8String;
|
||||
unlink(filename);
|
||||
|
||||
int r;
|
||||
|
|
@ -390,7 +388,7 @@ bool8 SNES9X_PlayMovie (void)
|
|||
NSURL *url = NavPlayMovieFrom();
|
||||
if (url != nil)
|
||||
{
|
||||
const char *filename = url.lastPathComponent.UTF8String;
|
||||
const char *filename = url.path.UTF8String;
|
||||
int r;
|
||||
|
||||
r = S9xMovieOpen(filename, macPlayFlag & 1);
|
||||
|
|
@ -415,7 +413,7 @@ bool8 SNES9X_QTMovieRecord (void)
|
|||
NSURL *url = NavQTMovieRecordTo();
|
||||
if (url != nil)
|
||||
{
|
||||
const char *filename = url.lastPathComponent.UTF8String;
|
||||
const char *filename = url.path.UTF8String;
|
||||
macQTRecord = true;
|
||||
SNES9X_Go();
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
(c) Copyright 2004 Alexander and Sander
|
||||
(c) Copyright 2004 - 2005 Steven Seeger
|
||||
(c) Copyright 2005 Ryan Vogt
|
||||
(c) Copyright 2019 Michael Donald Buckley
|
||||
***********************************************************************************/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,12 +7,14 @@
|
|||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
|
||||
//! Project version number for snes9x_framework.
|
||||
FOUNDATION_EXPORT double snes9x_frameworkVersionNumber;
|
||||
|
||||
//! Project version string for snes9x_framework.
|
||||
FOUNDATION_EXPORT const unsigned char snes9x_frameworkVersionString[];
|
||||
|
||||
// In this header, you should import all the public headers of your framework using statements like #import <snes9x_framework/PublicHeader.h>
|
||||
#import <snes9x_framework/port.h>
|
||||
#import <snes9x_framework/mac-os.h>
|
||||
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Loading…
Reference in New Issue