mirror of
https://github.com/mauiaaron/apple2.git
synced 2024-12-23 11:31:41 +00:00
Improvements to Mac GUI
* Reboot... menu option
* Disk image selection interface
* Whitespace code changes
This commit is contained in:
Aaron Culliney
parent
442e4c99b2
commit
6c63c49d09
@ -23,15 +23,36 @@
|
|||||||
<action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
|
<action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
|
||||||
</connections>
|
</connections>
|
||||||
</menuItem>
|
</menuItem>
|
||||||
|
<menuItem title="Reboot..." id="FjO-UG-hG2" userLabel="Menu Item - Reboot">
|
||||||
|
<string key="keyEquivalent" base64-UTF8="YES">
|
||||||
|
CA
|
||||||
|
</string>
|
||||||
|
<modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="reboot:" target="M8b-ga-iOS" id="AbH-Xq-1VZ"/>
|
||||||
|
</connections>
|
||||||
|
</menuItem>
|
||||||
|
<menuItem title="Disks" id="IU3-Bt-BuK" userLabel="Menu Item - Disks">
|
||||||
|
<modifierMask key="keyEquivalentModifierMask"/>
|
||||||
|
<menu key="submenu" title="Disks" systemMenu="help" id="Wh3-tN-xkr">
|
||||||
|
<items>
|
||||||
|
<menuItem title="Insert..." keyEquivalent="D" id="Oj8-qO-A80" userLabel="Menu Item - Insert">
|
||||||
|
<connections>
|
||||||
|
<action selector="makeKeyAndOrderFront:" target="RAk-at-ZT4" id="KbU-Gy-HOD"/>
|
||||||
|
</connections>
|
||||||
|
</menuItem>
|
||||||
|
</items>
|
||||||
|
</menu>
|
||||||
|
</menuItem>
|
||||||
<menuItem isSeparatorItem="YES" id="236">
|
<menuItem isSeparatorItem="YES" id="236">
|
||||||
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
|
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
|
||||||
</menuItem>
|
</menuItem>
|
||||||
|
<menuItem title="Preferences…" keyEquivalent="," id="129"/>
|
||||||
<menuItem title="Toggle Full Screen..." keyEquivalent="F" id="rP9-cs-9dM">
|
<menuItem title="Toggle Full Screen..." keyEquivalent="F" id="rP9-cs-9dM">
|
||||||
<connections>
|
<connections>
|
||||||
<action selector="toggleFullScreen:" target="M8b-ga-iOS" id="Xan-eQ-CRM"/>
|
<action selector="toggleFullScreen:" target="M8b-ga-iOS" id="Xan-eQ-CRM"/>
|
||||||
</connections>
|
</connections>
|
||||||
</menuItem>
|
</menuItem>
|
||||||
<menuItem title="Preferences…" keyEquivalent="," id="129"/>
|
|
||||||
<menuItem isSeparatorItem="YES" id="143">
|
<menuItem isSeparatorItem="YES" id="143">
|
||||||
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
|
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
|
||||||
</menuItem>
|
</menuItem>
|
||||||
@ -85,19 +106,190 @@
|
|||||||
<window title="Apple2Mac" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371" userLabel="Window - Apple2Mac">
|
<window title="Apple2Mac" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371" userLabel="Window - Apple2Mac">
|
||||||
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
|
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
|
||||||
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
||||||
<rect key="contentRect" x="200" y="200" width="320" height="480"/>
|
<rect key="contentRect" x="200" y="200" width="320" height="280"/>
|
||||||
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
|
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
|
||||||
<view key="contentView" id="372" customClass="EmulatorGLView">
|
<view key="contentView" id="372" customClass="EmulatorGLView">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
|
<rect key="frame" x="0.0" y="0.0" width="320" height="280"/>
|
||||||
<autoresizingMask key="autoresizingMask"/>
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
</view>
|
</view>
|
||||||
</window>
|
</window>
|
||||||
<customObject id="494" userLabel="EmulatorGLView" customClass="EmulatorGLView"/>
|
<customObject id="494" userLabel="EmulatorGLView" customClass="EmulatorGLView"/>
|
||||||
<customObject id="M8b-ga-iOS" userLabel="EmulatorWindowController" customClass="EmulatorWindowController" colorLabel="IBBuiltInLabel-Blue">
|
<customObject id="M8b-ga-iOS" userLabel="EmulatorWindowController" customClass="EmulatorWindowController" colorLabel="IBBuiltInLabel-Blue">
|
||||||
<connections>
|
<connections>
|
||||||
|
<outlet property="chooseDiskA" destination="j1W-BP-P7S" id="CuH-rj-ae4"/>
|
||||||
|
<outlet property="chooseDiskB" destination="lI0-3f-IsR" id="Ym9-IW-I4c"/>
|
||||||
|
<outlet property="diskAProperties" destination="e89-G9-nNt" id="rwR-9Z-oT4"/>
|
||||||
|
<outlet property="diskAProtection" destination="0vx-rm-Mio" id="zF2-n5-s1R"/>
|
||||||
|
<outlet property="diskBProperties" destination="AOj-bZ-LXp" id="6Q1-mW-fpP"/>
|
||||||
|
<outlet property="diskBProtection" destination="Alr-gf-yTN" id="Tyr-Oa-jKg"/>
|
||||||
|
<outlet property="diskInA" destination="cb9-Pc-Ggd" id="kP3-qf-vci"/>
|
||||||
|
<outlet property="diskInB" destination="5oU-oN-vUH" id="lNx-Lm-0FA"/>
|
||||||
|
<outlet property="disksWindow" destination="RAk-at-ZT4" id="pTD-TW-9v8"/>
|
||||||
<outlet property="view" destination="372" id="pRG-Kn-92X"/>
|
<outlet property="view" destination="372" id="pRG-Kn-92X"/>
|
||||||
<outlet property="window" destination="371" id="z3B-S9-PsV"/>
|
<outlet property="window" destination="371" id="z3B-S9-PsV"/>
|
||||||
</connections>
|
</connections>
|
||||||
</customObject>
|
</customObject>
|
||||||
|
<window title="Insert Disks" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="RAk-at-ZT4">
|
||||||
|
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
|
||||||
|
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
||||||
|
<rect key="contentRect" x="109" y="132" width="480" height="237"/>
|
||||||
|
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
|
||||||
|
<view key="contentView" id="rBl-rx-7uF">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="480" height="237"/>
|
||||||
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
|
<subviews>
|
||||||
|
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="laF-n4-ciZ">
|
||||||
|
<rect key="frame" x="18" y="200" width="225" height="17"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Slot 6 Drive A" id="Vea-pb-q49">
|
||||||
|
<font key="font" metaFont="systemBold"/>
|
||||||
|
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</textFieldCell>
|
||||||
|
</textField>
|
||||||
|
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Wzz-Yt-xlT">
|
||||||
|
<rect key="frame" x="237" y="200" width="225" height="17"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Slot 6 Drive B" id="pUB-KI-7ef">
|
||||||
|
<font key="font" metaFont="systemBold"/>
|
||||||
|
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</textFieldCell>
|
||||||
|
</textField>
|
||||||
|
<box autoresizesSubviews="NO" horizontalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="6cp-Ig-hvh">
|
||||||
|
<rect key="frame" x="238" y="61" width="5" height="164"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
|
||||||
|
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
|
<font key="titleFont" metaFont="system"/>
|
||||||
|
</box>
|
||||||
|
<button verticalHuggingPriority="750" id="j1W-BP-P7S">
|
||||||
|
<rect key="frame" x="81" y="85" width="99" height="32"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<buttonCell key="cell" type="push" title="Choose..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="nVq-kA-8RS">
|
||||||
|
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
<connections>
|
||||||
|
<action selector="chooseDriveA:" target="M8b-ga-iOS" id="TzG-WI-I5a"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button verticalHuggingPriority="750" id="lI0-3f-IsR">
|
||||||
|
<rect key="frame" x="300" y="85" width="99" height="32"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<buttonCell key="cell" type="push" title="Choose..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="nmE-5R-fEx">
|
||||||
|
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
<connections>
|
||||||
|
<action selector="chooseDriveB:" target="M8b-ga-iOS" id="RVk-Bv-LBc"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="cb9-Pc-Ggd">
|
||||||
|
<rect key="frame" x="18" y="175" width="216" height="17"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="U5Boot.do" id="UOE-Fx-vng">
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</textFieldCell>
|
||||||
|
</textField>
|
||||||
|
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="e89-G9-nNt">
|
||||||
|
<rect key="frame" x="18" y="124" width="216" height="17"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title=".dsk 143360 bytes" id="rQi-K1-5Cu">
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</textFieldCell>
|
||||||
|
</textField>
|
||||||
|
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="AOj-bZ-LXp">
|
||||||
|
<rect key="frame" x="249" y="124" width="216" height="17"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title=".dsk 143360 bytes" id="POW-zB-gIf">
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</textFieldCell>
|
||||||
|
</textField>
|
||||||
|
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="5oU-oN-vUH">
|
||||||
|
<rect key="frame" x="249" y="175" width="213" height="17"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="U5Brit.do" id="KvS-JR-AdI">
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
</textFieldCell>
|
||||||
|
</textField>
|
||||||
|
<button verticalHuggingPriority="750" id="uLZ-yk-ywF">
|
||||||
|
<rect key="frame" x="198" y="13" width="85" height="32"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<buttonCell key="cell" type="push" title="Reboot" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6er-wF-Uql">
|
||||||
|
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
<connections>
|
||||||
|
<action selector="reboot:" target="M8b-ga-iOS" id="nKX-T4-WQa"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autorecalculatesCellSize="YES" id="0vx-rm-Mio">
|
||||||
|
<rect key="frame" x="20" y="149" width="212" height="18"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<size key="cellSize" width="91" height="18"/>
|
||||||
|
<size key="intercellSpacing" width="4" height="2"/>
|
||||||
|
<buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="800-L1-WxW">
|
||||||
|
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
<cells>
|
||||||
|
<column>
|
||||||
|
<buttonCell type="radio" title="Read only" imagePosition="left" alignment="left" state="on" tag="1" inset="2" id="2ap-2b-hRw">
|
||||||
|
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
</column>
|
||||||
|
<column>
|
||||||
|
<buttonCell type="radio" title="Read/write" imagePosition="left" alignment="left" inset="2" id="aq6-LE-mOR">
|
||||||
|
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
</column>
|
||||||
|
</cells>
|
||||||
|
<connections>
|
||||||
|
<action selector="diskAProtectionChanged:" target="M8b-ga-iOS" id="Ok4-Cd-vhu"/>
|
||||||
|
</connections>
|
||||||
|
</matrix>
|
||||||
|
<matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autorecalculatesCellSize="YES" id="Alr-gf-yTN">
|
||||||
|
<rect key="frame" x="249" y="149" width="212" height="18"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||||
|
<size key="cellSize" width="91" height="18"/>
|
||||||
|
<size key="intercellSpacing" width="4" height="2"/>
|
||||||
|
<buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="uEc-fa-XXZ">
|
||||||
|
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
<cells>
|
||||||
|
<column>
|
||||||
|
<buttonCell type="radio" title="Read only" imagePosition="left" alignment="left" state="on" tag="1" inset="2" id="1XS-2y-htU">
|
||||||
|
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
</column>
|
||||||
|
<column>
|
||||||
|
<buttonCell type="radio" title="Read/write" imagePosition="left" alignment="left" inset="2" id="Obp-F0-hno">
|
||||||
|
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||||
|
<font key="font" metaFont="system"/>
|
||||||
|
</buttonCell>
|
||||||
|
</column>
|
||||||
|
</cells>
|
||||||
|
<connections>
|
||||||
|
<action selector="diskBProtectionChanged:" target="M8b-ga-iOS" id="1ty-fR-QWq"/>
|
||||||
|
</connections>
|
||||||
|
</matrix>
|
||||||
|
</subviews>
|
||||||
|
</view>
|
||||||
|
</window>
|
||||||
</objects>
|
</objects>
|
||||||
</document>
|
</document>
|
||||||
|
|||||||
@ -10,6 +10,13 @@
|
|||||||
|
|
||||||
#import "EmulatorWindowController.h"
|
#import "EmulatorWindowController.h"
|
||||||
#import "EmulatorFullscreenWindow.h"
|
#import "EmulatorFullscreenWindow.h"
|
||||||
|
#import "common.h"
|
||||||
|
|
||||||
|
#define READONLY_CHOICE_INDEX 0
|
||||||
|
#define NO_DISK_INSERTED @"(No Disk Inserted)"
|
||||||
|
#define DSK_PROPERTIES @".dsk 143360 bytes"
|
||||||
|
#define NIB_PROPERTIES @".nib 232960 bytes"
|
||||||
|
#define GZ_EXTENSION @"gz"
|
||||||
|
|
||||||
@interface EmulatorWindowController ()
|
@interface EmulatorWindowController ()
|
||||||
|
|
||||||
@ -17,6 +24,19 @@
|
|||||||
@property (nonatomic, retain) EmulatorFullscreenWindow *fullscreenWindow;
|
@property (nonatomic, retain) EmulatorFullscreenWindow *fullscreenWindow;
|
||||||
@property (nonatomic, retain) NSWindow *standardWindow;
|
@property (nonatomic, retain) NSWindow *standardWindow;
|
||||||
|
|
||||||
|
@property (assign) IBOutlet NSWindow *disksWindow;
|
||||||
|
@property (assign) IBOutlet NSTextField *diskInA;
|
||||||
|
@property (assign) IBOutlet NSTextField *diskInB;
|
||||||
|
@property (assign) IBOutlet NSTextField *diskAProperties;
|
||||||
|
@property (assign) IBOutlet NSTextField *diskBProperties;
|
||||||
|
@property (assign) IBOutlet NSMatrix *diskAProtection;
|
||||||
|
@property (assign) IBOutlet NSMatrix *diskBProtection;
|
||||||
|
@property (assign) IBOutlet NSButton *chooseDiskA;
|
||||||
|
@property (assign) IBOutlet NSButton *chooseDiskB;
|
||||||
|
|
||||||
|
@property (nonatomic, copy) NSString *diskAPath;
|
||||||
|
@property (nonatomic, copy) NSString *diskBPath;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
||||||
@ -25,18 +45,45 @@
|
|||||||
@synthesize view = _view;
|
@synthesize view = _view;
|
||||||
@synthesize fullscreenWindow = _fullscreenWindow;
|
@synthesize fullscreenWindow = _fullscreenWindow;
|
||||||
@synthesize standardWindow = _standardWindow;
|
@synthesize standardWindow = _standardWindow;
|
||||||
|
@synthesize diskAPath = _diskAPath;
|
||||||
|
@synthesize diskBPath = _diskBPath;
|
||||||
|
|
||||||
- (id)initWithWindow:(NSWindow *)window
|
- (id)initWithWindow:(NSWindow *)window
|
||||||
{
|
{
|
||||||
self = [super initWithWindow:window];
|
self = [super initWithWindow:window];
|
||||||
|
|
||||||
if (self)
|
if (self)
|
||||||
{
|
{
|
||||||
// Initialize to nil since it indicates app is not fullscreen
|
// Initialize to nil since it indicates app is not fullscreen
|
||||||
self.fullscreenWindow = nil;
|
self.fullscreenWindow = nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)dealloc
|
||||||
|
{
|
||||||
|
#warning TODO FIXME ... probably should exit emulator if this gets invoked ...
|
||||||
|
self.diskAPath = nil;
|
||||||
|
self.diskBPath = nil;
|
||||||
|
[super dealloc];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)awakeFromNib
|
||||||
|
{
|
||||||
|
[self.diskInA setStringValue:NO_DISK_INSERTED];
|
||||||
|
[self.diskAProperties setStringValue:@""];
|
||||||
|
[self.diskInB setStringValue:NO_DISK_INSERTED];
|
||||||
|
[self.diskBProperties setStringValue:@""];
|
||||||
|
|
||||||
|
[self.chooseDiskA setKeyEquivalent:@"\r"];
|
||||||
|
[self.chooseDiskA setBezelStyle:NSRoundedBezelStyle];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (IBAction)reboot:(id)sender
|
||||||
|
{
|
||||||
|
[[self disksWindow] close];
|
||||||
|
cpu65_reboot();
|
||||||
}
|
}
|
||||||
|
|
||||||
- (IBAction)toggleFullScreen:(id)sender
|
- (IBAction)toggleFullScreen:(id)sender
|
||||||
@ -51,68 +98,218 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (IBAction)diskAProtectionChanged:(id)sender
|
||||||
|
{
|
||||||
|
if ([[[self diskInA] stringValue] isEqualToString:NO_DISK_INSERTED])
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// HACK NOTE : dispatch so that state of outlet property is set properly
|
||||||
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
|
NSButtonCell *readOnlyChoice = [[[self diskAProtection] cells] firstObject];
|
||||||
|
NSString *path = [self diskAPath];
|
||||||
|
[self _insertDisketteInDrive:0 path:path type:[self _extensionForPath:path] readOnly:([readOnlyChoice state] == NSOnState)];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
- (IBAction)diskBProtectionChanged:(id)sender
|
||||||
|
{
|
||||||
|
if ([[[self diskInB] stringValue] isEqualToString:NO_DISK_INSERTED])
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// HACK NOTE : dispatch so that state of outlet property is set properly
|
||||||
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
|
NSButtonCell *readOnlyChoice = [[[self diskBProtection] cells] firstObject];
|
||||||
|
NSString *path = [self diskBPath];
|
||||||
|
[self _insertDisketteInDrive:1 path:path type:[self _extensionForPath:path] readOnly:([readOnlyChoice state] == NSOnState)];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
- (BOOL)_insertDisketteInDrive:(int)drive path:(NSString *)path type:(NSString *)type readOnly:(BOOL)readOnly
|
||||||
|
{
|
||||||
|
c_eject_6(drive);
|
||||||
|
|
||||||
|
const char *errMsg = c_new_diskette_6(drive, [path UTF8String], readOnly);
|
||||||
|
if (errMsg)
|
||||||
|
{
|
||||||
|
NSAlert *alert = [NSAlert alertWithError:[NSError errorWithDomain:[NSString stringWithUTF8String:errMsg] code:-1 userInfo:nil]];
|
||||||
|
[alert beginSheetModalForWindow:[self disksWindow] completionHandler:nil];
|
||||||
|
if (!drive)
|
||||||
|
{
|
||||||
|
[[self diskInA] setStringValue:NO_DISK_INSERTED];
|
||||||
|
[[self diskAProperties] setStringValue:@""];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
[[self diskInB] setStringValue:NO_DISK_INSERTED];
|
||||||
|
[[self diskBProperties] setStringValue:@""];
|
||||||
|
}
|
||||||
|
|
||||||
|
return NO;
|
||||||
|
}
|
||||||
|
|
||||||
|
NSString *imageName = [[path pathComponents] lastObject];
|
||||||
|
|
||||||
|
if (!drive)
|
||||||
|
{
|
||||||
|
self.diskAPath = path;
|
||||||
|
[[self diskInA] setStringValue:imageName];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
self.diskBPath = path;
|
||||||
|
[[self diskInB] setStringValue:imageName];
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([type isEqualToString:@"dsk"] || [type isEqualToString:@"do"] || [type isEqualToString:@"po"])
|
||||||
|
{
|
||||||
|
if (!drive)
|
||||||
|
{
|
||||||
|
[[self diskAProperties] setStringValue:DSK_PROPERTIES];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
[[self diskBProperties] setStringValue:DSK_PROPERTIES];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!drive)
|
||||||
|
{
|
||||||
|
[[self diskAProperties] setStringValue:NIB_PROPERTIES];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
[[self diskBProperties] setStringValue:NIB_PROPERTIES];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return YES;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (NSString *)_extensionForPath:(NSString *)path
|
||||||
|
{
|
||||||
|
NSString *extension0 = [path pathExtension];
|
||||||
|
NSString *extension1 = [[path stringByDeletingPathExtension] pathExtension];
|
||||||
|
if ([extension0 isEqualToString:GZ_EXTENSION])
|
||||||
|
{
|
||||||
|
extension0 = extension1;
|
||||||
|
}
|
||||||
|
return extension0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)_chooseDisk:(int)drive readOnly:(BOOL)readOnly
|
||||||
|
{
|
||||||
|
NSOpenPanel *openPanel = [NSOpenPanel openPanel];
|
||||||
|
[openPanel setTitle:@"Choose a disk image"];
|
||||||
|
#warning FIXME TODO : installation default should be what it bundled, but should not always choose this ...
|
||||||
|
NSURL *url = [[NSBundle mainBundle] URLForResource:@"blank" withExtension:@"dsk.gz"];
|
||||||
|
url = [url URLByDeletingLastPathComponent];
|
||||||
|
[openPanel setDirectoryURL:url];
|
||||||
|
[openPanel setShowsResizeIndicator:YES];
|
||||||
|
[openPanel setShowsHiddenFiles:NO];
|
||||||
|
[openPanel setCanChooseFiles:YES];
|
||||||
|
[openPanel setCanChooseDirectories:NO];
|
||||||
|
[openPanel setCanCreateDirectories:NO];
|
||||||
|
[openPanel setAllowsMultipleSelection:NO];
|
||||||
|
|
||||||
|
// NOTE : Doesn't appear to be a way to specify ".dsk.gz" ... so we may inadvertently allow files of ".foo.gz" here
|
||||||
|
NSSet *fileTypes = [NSSet setWithObjects:@"dsk", @"nib", @"do", @"po", GZ_EXTENSION, nil];
|
||||||
|
[openPanel setAllowedFileTypes:[fileTypes allObjects]];
|
||||||
|
[openPanel beginSheetModalForWindow:[self disksWindow] completionHandler:^(NSInteger result) {
|
||||||
|
if (result == NSOKButton)
|
||||||
|
{
|
||||||
|
NSURL *selection = [[openPanel URLs] firstObject];
|
||||||
|
NSString *path = [[selection path] stringByResolvingSymlinksInPath];
|
||||||
|
NSString *extension = [self _extensionForPath:path];
|
||||||
|
|
||||||
|
if (![fileTypes containsObject:extension])
|
||||||
|
{
|
||||||
|
NSAlert *alert = [NSAlert alertWithError:[NSError errorWithDomain:@"Disk image must have file extension of .dsk, .do, .po, or .nib only" code:-1 userInfo:nil]];
|
||||||
|
[alert beginSheetModalForWindow:[self disksWindow] completionHandler:nil];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
[self _insertDisketteInDrive:drive path:path type:extension readOnly:readOnly];
|
||||||
|
}
|
||||||
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (IBAction)chooseDriveA:(id)sender
|
||||||
|
{
|
||||||
|
NSButtonCell *readOnlyChoice = [[[self diskAProtection] cells] firstObject];
|
||||||
|
[self _chooseDisk:0 readOnly:([readOnlyChoice state] == NSOnState)];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (IBAction)chooseDriveB:(id)sender
|
||||||
|
{
|
||||||
|
NSButtonCell *readOnlyChoice = [[[self diskBProtection] cells] firstObject];
|
||||||
|
[self _chooseDisk:1 readOnly:([readOnlyChoice state] == NSOnState)];
|
||||||
|
}
|
||||||
|
|
||||||
- (void)goFullscreen
|
- (void)goFullscreen
|
||||||
{
|
{
|
||||||
// If app is already fullscreen...
|
// If app is already fullscreen...
|
||||||
if (self.fullscreenWindow)
|
if (self.fullscreenWindow)
|
||||||
{
|
{
|
||||||
//...don't do anything
|
//...don't do anything
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Allocate a new fullscreen window
|
// Allocate a new fullscreen window
|
||||||
self.fullscreenWindow = [[[EmulatorFullscreenWindow alloc] init] autorelease];
|
self.fullscreenWindow = [[[EmulatorFullscreenWindow alloc] init] autorelease];
|
||||||
|
|
||||||
// Resize the view to screensize
|
// Resize the view to screensize
|
||||||
NSRect viewRect = [self.fullscreenWindow frame];
|
NSRect viewRect = [self.fullscreenWindow frame];
|
||||||
|
|
||||||
// Set the view to the size of the fullscreen window
|
// Set the view to the size of the fullscreen window
|
||||||
[self.view setFrameSize: viewRect.size];
|
[self.view setFrameSize: viewRect.size];
|
||||||
|
|
||||||
// Set the view in the fullscreen window
|
// Set the view in the fullscreen window
|
||||||
[self.fullscreenWindow setContentView:self.view];
|
[self.fullscreenWindow setContentView:self.view];
|
||||||
|
|
||||||
self.standardWindow = [self window];
|
self.standardWindow = [self window];
|
||||||
|
|
||||||
// Hide non-fullscreen window so it doesn't show up when switching out
|
// Hide non-fullscreen window so it doesn't show up when switching out
|
||||||
// of this app (i.e. with CMD-TAB)
|
// of this app (i.e. with CMD-TAB)
|
||||||
[self.standardWindow orderOut:self];
|
[self.standardWindow orderOut:self];
|
||||||
|
|
||||||
// Set controller to the fullscreen window so that all input will go to
|
// Set controller to the fullscreen window so that all input will go to
|
||||||
// this controller (self)
|
// this controller (self)
|
||||||
[self setWindow:self.fullscreenWindow];
|
[self setWindow:self.fullscreenWindow];
|
||||||
|
|
||||||
// Show the window and make it the key window for input
|
// Show the window and make it the key window for input
|
||||||
[self.fullscreenWindow makeKeyAndOrderFront:self];
|
[self.fullscreenWindow makeKeyAndOrderFront:self];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)goWindow
|
- (void)goWindow
|
||||||
{
|
{
|
||||||
// If controller doesn't have a full screen window...
|
// If controller doesn't have a full screen window...
|
||||||
if (self.fullscreenWindow == nil)
|
if (self.fullscreenWindow == nil)
|
||||||
{
|
{
|
||||||
//...app is already windowed so don't do anything
|
//...app is already windowed so don't do anything
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the rectangle of the original window
|
// Get the rectangle of the original window
|
||||||
NSRect viewRect = [self.standardWindow frame];
|
NSRect viewRect = [self.standardWindow frame];
|
||||||
|
|
||||||
// Set the view rect to the new size
|
// Set the view rect to the new size
|
||||||
[self.view setFrame:viewRect];
|
[self.view setFrame:viewRect];
|
||||||
|
|
||||||
// Set controller to the standard window so that all input will go to
|
// Set controller to the standard window so that all input will go to
|
||||||
// this controller (self)
|
// this controller (self)
|
||||||
[self setWindow:self.standardWindow];
|
[self setWindow:self.standardWindow];
|
||||||
|
|
||||||
// Set the content of the orginal window to the view
|
// Set the content of the orginal window to the view
|
||||||
[[self window] setContentView:self.view];
|
[[self window] setContentView:self.view];
|
||||||
|
|
||||||
// Show the window and make it the key window for input
|
// Show the window and make it the key window for input
|
||||||
[[self window] makeKeyAndOrderFront:self];
|
[[self window] makeKeyAndOrderFront:self];
|
||||||
|
|
||||||
// Release/nilify fullscreenWindow
|
// Release/nilify fullscreenWindow
|
||||||
self.fullscreenWindow = nil;
|
self.fullscreenWindow = nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)keyDown:(NSEvent *)event
|
- (void)keyDown:(NSEvent *)event
|
||||||
|
|||||||
@ -646,6 +646,14 @@ void cpu65_uninterrupt(int reason)
|
|||||||
pthread_mutex_unlock(&irq_mutex);
|
pthread_mutex_unlock(&irq_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cpu65_reboot(void) {
|
||||||
|
timing_initialize();
|
||||||
|
video_set(0);
|
||||||
|
joy_button0 = 0xff; // OpenApple
|
||||||
|
cpu65_interrupt(ResetSig);
|
||||||
|
c_initialize_sound_hooks();
|
||||||
|
}
|
||||||
|
|
||||||
#if CPU_TRACING
|
#if CPU_TRACING
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------
|
/* -------------------------------------------------------------------------
|
||||||
|
|||||||
@ -44,6 +44,7 @@ extern void cpu65_interrupt(int reason);
|
|||||||
extern void cpu65_uninterrupt(int reason);
|
extern void cpu65_uninterrupt(int reason);
|
||||||
|
|
||||||
extern void cpu65_run(void);
|
extern void cpu65_run(void);
|
||||||
|
extern void cpu65_reboot(void);
|
||||||
|
|
||||||
extern void cpu65_direct_write(int ea,int data);
|
extern void cpu65_direct_write(int ea,int data);
|
||||||
|
|
||||||
|
|||||||
@ -1315,11 +1315,7 @@ void c_interface_parameters()
|
|||||||
ch = toupper(ch);
|
ch = toupper(ch);
|
||||||
if (ch == 'Y')
|
if (ch == 'Y')
|
||||||
{
|
{
|
||||||
timing_initialize();
|
cpu65_reboot();
|
||||||
video_set(0);
|
|
||||||
joy_button0 = 0xff; // OpenApple
|
|
||||||
cpu65_interrupt(ResetSig);
|
|
||||||
c_initialize_sound_hooks();
|
|
||||||
c_interface_exit(ch);
|
c_interface_exit(ch);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user