Created an options panel for the Oric. Which involved far too much copy and paste from the Electron. Time to figure out how to generalise this stuff, probably.

2024-07-06 01:28:57 +00:00 · 2016-10-19 22:56:14 -04:00 · 2016-10-19 22:56:14 -04:00 · c24c1bf3b1
commit c24c1bf3b1
parent b59da7d4bc
6 changed files with 122 additions and 4 deletions
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@ -20,6 +20,8 @@
 		4B1E85811D176468001EF87D /* 6532Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E85801D176468001EF87D /* 6532Tests.swift */; };
 		4B2409551C45AB05004DA684 /* Speaker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2409531C45AB05004DA684 /* Speaker.cpp */; };
 		4B2A332A1DB8544D002876E3 /* MemoryFuzzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A33281DB8544D002876E3 /* MemoryFuzzer.cpp */; };
+		4B2A332D1DB86821002876E3 /* OricOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4B2A332B1DB86821002876E3 /* OricOptions.xib */; };
+		4B2A332F1DB86869002876E3 /* OricOptionsPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A332E1DB86869002876E3 /* OricOptionsPanel.swift */; };
 		4B2A539F1D117D36003C6002 /* CSAudioQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A53911D117D36003C6002 /* CSAudioQueue.m */; };
 		4B2A53A01D117D36003C6002 /* CSMachine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A53961D117D36003C6002 /* CSMachine.mm */; };
 		4B2A53A11D117D36003C6002 /* CSAtari2600.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A539A1D117D36003C6002 /* CSAtari2600.mm */; };
@ -422,6 +424,8 @@
 		4B24095A1C45DF85004DA684 /* Stepper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Stepper.hpp; sourceTree = "<group>"; };
 		4B2A33281DB8544D002876E3 /* MemoryFuzzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryFuzzer.cpp; sourceTree = "<group>"; };
 		4B2A33291DB8544D002876E3 /* MemoryFuzzer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MemoryFuzzer.hpp; sourceTree = "<group>"; };
+		4B2A332C1DB86821002876E3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Clock Signal/Base.lproj/OricOptions.xib"; sourceTree = SOURCE_ROOT; };
+		4B2A332E1DB86869002876E3 /* OricOptionsPanel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OricOptionsPanel.swift; sourceTree = "<group>"; };
 		4B2A53901D117D36003C6002 /* CSAudioQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSAudioQueue.h; sourceTree = "<group>"; };
 		4B2A53911D117D36003C6002 /* CSAudioQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSAudioQueue.m; sourceTree = "<group>"; };
 		4B2A53931D117D36003C6002 /* CSKeyboardMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSKeyboardMachine.h; sourceTree = "<group>"; };
@ -1101,10 +1105,12 @@
 				4B8FE2281DA1EDDF0090D3CE /* ElectronOptionsPanel.swift */,
 				4B55CE5E1C3B7D960093A61B /* MachineDocument.swift */,
 				4B8FE2211DA19FB20090D3CE /* MachinePanel.swift */,
+				4B2A332E1DB86869002876E3 /* OricOptionsPanel.swift */,
 				4B9CCDA01DA279CA0098B625 /* Vic20OptionsPanel.swift */,
 				4B8FE2131DA19D5F0090D3CE /* Atari2600Options.xib */,
 				4B8FE2171DA19D5F0090D3CE /* ElectronOptions.xib */,
 				4B8FE2151DA19D5F0090D3CE /* MachineDocument.xib */,
+				4B2A332B1DB86821002876E3 /* OricOptions.xib */,
 				4B8FE2191DA19D5F0090D3CE /* Vic20Options.xib */,
 			);
 			path = Documents;
@ -1917,6 +1923,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BB73EA91B587A5100552FC2 /* Assets.xcassets in Resources */,
+				4B2A332D1DB86821002876E3 /* OricOptions.xib in Resources */,
 				4B8FE21B1DA19D5F0090D3CE /* Atari2600Options.xib in Resources */,
 				4B8FE21C1DA19D5F0090D3CE /* MachineDocument.xib in Resources */,
 				4B8FE21E1DA19D5F0090D3CE /* Vic20Options.xib in Resources */,
@ -2241,6 +2248,7 @@
 				4BC76E691C98E31700E6EF73 /* FIRFilter.cpp in Sources */,
 				4B2A332A1DB8544D002876E3 /* MemoryFuzzer.cpp in Sources */,
 				4B55CE5F1C3B7D960093A61B /* MachineDocument.swift in Sources */,
+				4B2A332F1DB86869002876E3 /* OricOptionsPanel.swift in Sources */,
 				4B2A53A11D117D36003C6002 /* CSAtari2600.mm in Sources */,
 				4BF829661D8F732B001BAE39 /* Disk.cpp in Sources */,
 				4BC5E4921D7ED365008CF980 /* StaticAnalyser.cpp in Sources */,
@ -2342,6 +2350,14 @@
 /* End PBXTargetDependency section */

 /* Begin PBXVariantGroup section */
+		4B2A332B1DB86821002876E3 /* OricOptions.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				4B2A332C1DB86821002876E3 /* Base */,
+			);
+			name = OricOptions.xib;
+			sourceTree = "<group>";
+		};
 		4B8FE2131DA19D5F0090D3CE /* Atari2600Options.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
--- a/Signal/Base.lproj/OricOptions.xib
+++ b/Signal/Base.lproj/OricOptions.xib
@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="MachineDocument" customModule="Clock_Signal" customModuleProvider="target">
+            <connections>
+                <outlet property="optionsPanel" destination="ZW7-Bw-4RP" id="JpE-wG-zRR"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Options" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="ZW7-Bw-4RP" customClass="OricOptionsPanel" customModule="Clock_Signal" customModuleProvider="target">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" nonactivatingPanel="YES" HUD="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="83" y="102" width="200" height="61"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1366" height="768"/>
+            <value key="minSize" type="size" width="200" height="83"/>
+            <value key="maxSize" type="size" width="200" height="83"/>
+            <view key="contentView" id="tpZ-0B-QQu">
+                <rect key="frame" x="0.0" y="0.0" width="200" height="61"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rh8-km-57n">
+                        <rect key="frame" x="18" y="17" width="165" height="26"/>
+                        <popUpButtonCell key="cell" type="push" title="SCART" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="tJM-kX-gaK" id="8SX-c5-ud1">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="menu"/>
+                            <menu key="menu" id="L06-TO-EF0">
+                                <items>
+                                    <menuItem title="SCART" state="on" id="tJM-kX-gaK"/>
+                                    <menuItem title="Composite" id="fFm-fS-rWG"/>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                        <connections>
+                            <action selector="setDisplayType:" target="ZW7-Bw-4RP" id="PAH-CZ-zlk"/>
+                        </connections>
+                    </popUpButton>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="rh8-km-57n" firstAttribute="leading" secondItem="tpZ-0B-QQu" secondAttribute="leading" constant="20" id="VRo-6R-IKd"/>
+                    <constraint firstAttribute="trailing" secondItem="rh8-km-57n" secondAttribute="trailing" constant="20" id="urO-Ac-aqK"/>
+                    <constraint firstItem="rh8-km-57n" firstAttribute="top" secondItem="tpZ-0B-QQu" secondAttribute="top" constant="20" id="xJx-0U-vUw"/>
+                </constraints>
+            </view>
+            <connections>
+                <outlet property="displayTypeButton" destination="rh8-km-57n" id="FB2-Zg-VKq"/>
+            </connections>
+            <point key="canvasLocation" x="129" y="35.5"/>
+        </window>
+    </objects>
+</document>
--- a/Signal/Documents/OricOptionsPanel.swift
+++ b/Signal/Documents/OricOptionsPanel.swift
@ -0,0 +1,35 @@
+//
+//  OricOptionsPanel.swift
+//  Clock Signal
+//
+//  Created by Thomas Harte on 19/10/2016.
+//  Copyright © 2016 Thomas Harte. All rights reserved.
+//
+
+class OricOptionsPanel: MachinePanel {
+	var oric: CSOric! {
+		get {
+			return self.machine as! CSOric
+		}
+	}
+
+	fileprivate let displayTypeUserDefaultsKey = "oric.displayType"
+
+	@IBOutlet var displayTypeButton: NSPopUpButton?
+	@IBAction func setDisplayType(_ sender: NSPopUpButton!) {
+		oric.useCompositeOutput = (sender.indexOfSelectedItem == 1)
+		UserDefaults.standard.set(sender.indexOfSelectedItem, forKey: self.displayTypeUserDefaultsKey)
+	}
+
+	override func establishStoredOptions() {
+		super.establishStoredOptions()
+		let standardUserDefaults = UserDefaults.standard
+		standardUserDefaults.register(defaults: [
+			displayTypeUserDefaultsKey: 0,
+		])
+
+		let displayType = standardUserDefaults.integer(forKey: self.displayTypeUserDefaultsKey)
+		oric.useCompositeOutput = (displayType == 1)
+		self.displayTypeButton?.selectItem(at: displayType)
+	}
+}
--- a/Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
+++ b/Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
@ -45,9 +45,10 @@
 {
 	switch(_target.machine)
 	{
-		case StaticAnalyser::Target::Electron:	return @"ElectronOptions";
-		case StaticAnalyser::Target::Vic20:		return @"Vic20Options";
 		case StaticAnalyser::Target::Atari2600:	return @"Atari2600Options";
+		case StaticAnalyser::Target::Electron:	return @"ElectronOptions";
+		case StaticAnalyser::Target::Oric:		return @"OricOptions";
+		case StaticAnalyser::Target::Vic20:		return @"Vic20Options";
 		default: return nil;
 	}
 }
@ -56,10 +57,10 @@
 {
 	switch(_target.machine)
 	{
-		case StaticAnalyser::Target::Electron:	return [[CSElectron alloc] init];
-		case StaticAnalyser::Target::Vic20:		return [[CSVic20 alloc] init];
 		case StaticAnalyser::Target::Atari2600:	return [[CSAtari2600 alloc] init];
+		case StaticAnalyser::Target::Electron:	return [[CSElectron alloc] init];
 		case StaticAnalyser::Target::Oric:		return [[CSOric alloc] init];
+		case StaticAnalyser::Target::Vic20:		return [[CSVic20 alloc] init];
 		default: return nil;
 	}
 }
--- a/Signal/Machine/Wrappers/CSOric.h
+++ b/Signal/Machine/Wrappers/CSOric.h
@ -11,4 +11,6 @@

@interface CSOric : CSMachine <CSKeyboardMachine>

+@property(nonatomic, assign) BOOL useCompositeOutput;
+
@end
--- a/Signal/Machine/Wrappers/CSOric.mm
+++ b/Signal/Machine/Wrappers/CSOric.mm
@ -130,6 +130,16 @@

 - (void)clearAllKeys
 {
+	_oric.clear_all_keys();
+}
+
+#pragma mark - Options
+
+- (void)setUseCompositeOutput:(BOOL)useCompositeOutput {
+	@synchronized(self) {
+		_useCompositeOutput = useCompositeOutput;
+		_oric.get_crt()->set_output_device(useCompositeOutput ? Outputs::CRT::Television : Outputs::CRT::Monitor);
+	}
 }

@end