From 49e2462b28b4e925cd5c65e5279b1f388dfcdc17 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Mon, 7 Sep 2020 22:00:10 -0400
Subject: [PATCH] adjusted launch window window size settings.

---
 Ample/Base.lproj/LaunchWindow.xib | 59 ++++++++++++++++++++++--------
 Ample/LaunchWindowController.m    | 61 ++++++++++++++++++++++---------
 2 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/Ample/Base.lproj/LaunchWindow.xib b/Ample/Base.lproj/LaunchWindow.xib
index d5357f2..677d219 100644
--- a/Ample/Base.lproj/LaunchWindow.xib
+++ b/Ample/Base.lproj/LaunchWindow.xib
@@ -107,17 +107,6 @@ DQ
                                                 <binding destination="-2" name="value" keyPath="self.mameDebug" id="vkc-sR-KnB"/>
                                             </connections>
                                         </button>
-                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="D5h-dm-fuZ">
-                                            <rect key="frame" x="165" y="60" width="104" height="18"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="check" title="Square Pixels" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="yWK-BP-7Z9">
-                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <binding destination="-2" name="value" keyPath="self.mameSquarePixels" id="BiP-wC-Hpn"/>
-                                            </connections>
-                                        </button>
                                         <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FE4-gG-fPb">
                                             <rect key="frame" x="62" y="87" width="107" height="25"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -151,13 +140,13 @@ DQ
                                     </subviews>
                                 </view>
                             </tabViewItem>
-                            <tabViewItem label="BGFX" identifier="" id="zUN-Qs-haG">
+                            <tabViewItem label="Video" identifier="" id="zUN-Qs-haG">
                                 <view key="view" id="QQT-HS-xjI">
                                     <rect key="frame" x="10" y="33" width="672" height="114"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pD8-dV-ijg">
-                                            <rect key="frame" x="79" y="61" width="172" height="25"/>
+                                            <rect key="frame" x="143" y="86" width="172" height="25"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="g0W-Ka-7bb" id="ceP-aK-me8">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -176,7 +165,7 @@ DQ
                                             </connections>
                                         </popUpButton>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qGO-Pm-SD1">
-                                            <rect key="frame" x="15" y="67" width="60" height="16"/>
+                                            <rect key="frame" x="79" y="92" width="60" height="16"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Backend:" id="WDr-Pl-lV1">
                                                 <font key="font" metaFont="system"/>
@@ -185,7 +174,7 @@ DQ
                                             </textFieldCell>
                                         </textField>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ctE-fX-twN">
-                                            <rect key="frame" x="15" y="38" width="51" height="16"/>
+                                            <rect key="frame" x="318" y="92" width="51" height="16"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Effects:" id="Sqk-7k-PxQ">
                                                 <font key="font" metaFont="system"/>
@@ -205,7 +194,7 @@ DQ
                                             </connections>
                                         </button>
                                         <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hM8-FM-Agh">
-                                            <rect key="frame" x="79" y="32" width="172" height="25"/>
+                                            <rect key="frame" x="382" y="86" width="172" height="25"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Dsm-bi-Txy" id="mBS-h4-BWC">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -225,6 +214,44 @@ DQ
                                                 <binding destination="-2" name="selectedIndex" keyPath="self.mameEffects" id="rCg-d6-OR6"/>
                                             </connections>
                                         </popUpButton>
+                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="D5h-dm-fuZ">
+                                            <rect key="frame" x="318" y="60" width="104" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="check" title="Square Pixels" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="yWK-BP-7Z9">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <connections>
+                                                <binding destination="-2" name="value" keyPath="self.mameSquarePixels" id="BiP-wC-Hpn"/>
+                                            </connections>
+                                        </button>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6gd-45-eLr">
+                                            <rect key="frame" x="15" y="60" width="94" height="16"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Window Mode:" id="l8n-CI-o4t">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sei-LG-VM6">
+                                            <rect key="frame" x="143" y="55" width="172" height="25"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <popUpButtonCell key="cell" type="push" title="Full Screen" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="0zZ-Ib-Fne" id="lsw-Vk-WcZ">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                                <menu key="menu" id="m4N-Qw-mem">
+                                                    <items>
+                                                        <menuItem title="Full Screen" state="on" id="0zZ-Ib-Fne"/>
+                                                        <menuItem title="Window 1x" id="3bZ-rq-fCt"/>
+                                                        <menuItem title="Window 2x" id="KA4-Rs-yyK"/>
+                                                    </items>
+                                                </menu>
+                                            </popUpButtonCell>
+                                            <connections>
+                                                <binding destination="-2" name="selectedIndex" keyPath="self.mameWindowMode" id="B9e-SK-3RY"/>
+                                            </connections>
+                                        </popUpButton>
                                     </subviews>
                                 </view>
                             </tabViewItem>
diff --git a/Ample/LaunchWindowController.m b/Ample/LaunchWindowController.m
index be039ed..b73f927 100644
--- a/Ample/LaunchWindowController.m
+++ b/Ample/LaunchWindowController.m
@@ -52,6 +52,8 @@ static NSString *kContextMachine = @"kContextMachine";
 @property NSInteger mameEffects;
 
 
+@property NSInteger mameWindowMode;
+
 @end
 
 
@@ -78,7 +80,7 @@ static NSString *kContextMachine = @"kContextMachine";
     
 
     NSArray *keys = @[
-        @"mameMachine", @"mameWindow", @"mameSquarePixels", @"mameNoBlur",
+        @"mameMachine", @"mameWindow", @"mameSquarePixels", @"mameNoBlur", @"mameWindowMode",
         @"mameDebug",
         @"mameSpeed", // @"mameNoThrottle",
         @"mameAVI", @"mameAVIPath",
@@ -236,29 +238,52 @@ static NSString * JoinArguments(NSArray *argv) {
     [argv addObject: _mameMachine];
     
     if (_mameDebug) [argv addObject: @"-debug"];
-    if (_mameWindow) {
-        [argv addObject: @"-window"];
-        [argv addObject: @"-nomax"];
-    }
 
+    // -confirm_quit
     [argv addObject: @"-skip_gameinfo"];
 
-    if (_mameWindow && _mameSquarePixels) {
-        NSSize screen = [_slotController resolution];
-        
-        NSString *res = [NSString stringWithFormat: @"%ux%u", (unsigned)screen.width, (unsigned)screen.height];
-        NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height];
-        
-        [argv addObject: @"-nounevenstretch"];
-
-        [argv addObject: @"-resolution"];
-        [argv addObject: res];
-
-        [argv addObject: @"-aspect"];
-        [argv addObject: aspect];
     
+    /*
+     * -window -nomax uses a 4:3 aspect ratio - ie, height = width * 3 / 4 (since height is always the limiting factor)
+     * for square pixels, should pass the true size and true aspect ratio.
+     */
+
+    NSSize screen = [_slotController resolution];
+    if (!_mameSquarePixels)
+        screen.height = round(screen.width * 3 / 4);
+    switch(_mameWindowMode) {
+        case 0: // full screen;
+            break;
+        case 1: // 1x
+#if 0
+            if (!_mameSquarePixels) {
+                [argv addObject: @"-window"];
+                [argv addObject: @"-nomax"];
+                 break;
+            }
+#endif
+            // drop through.
+        case 2: // 2x {
+            
+            [argv addObject: @"-window"];
+            NSString *res = [NSString stringWithFormat: @"%ux%u",
+                   (unsigned)(_mameWindowMode * screen.width),
+                   (unsigned)(_mameWindowMode * screen.height)
+                   ];
+            NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height];
+
+            [argv addObject: @"-resolution"];
+            [argv addObject: res];
+            if (_mameSquarePixels) {
+                [argv addObject: @"-nounevenstretch"];
+//                [argv addObject: @"-aspect"];
+//                [argv addObject: aspect];
+            }
+            break;
     }
 
+
+
     if (_mameBGFX) {
         if (_mameBackend) {
             static NSString *Names[] = {