Changes for 5.0 Release, moving to SDL 2.0

.gitignore

@@ -1 +1,3 @@
 .DS_Store
+
+/atari800-MacOSX/src/Atari800MacX/build/

atari800-MacOSX/.gitignore

@@ -0,0 +1 @@
+src/Atari800MacX/DerivedData/*

atari800-MacOSX/src/Atari800MacX/AboutBox.m

@@ -3,7 +3,7 @@
    Macintosh OS X SDL port of Atari800
    Mark Grebe <atarimac@kc.rr.com>
 */
-#import "AboutBox.h";
+#import "AboutBox.h"
 #import "ControlManager.h"
 
 static int boxDisplayed = FALSE;

atari800-MacOSX/src/Atari800MacX/Atari800FunctionKeysWindow.m

@@ -30,4 +30,9 @@ - (BOOL)windowShouldClose:(id)sender
 	return YES;
 }
 
+- (BOOL)canBecomeKeyWindow
+{
+    return NO;
+}
+
 @end

atari800-MacOSX/src/Atari800MacX/Atari800ImageView.m

@@ -53,7 +53,7 @@ - (void)mouseDown:(NSEvent *)theEvent
 
 		if (SIO_drive_status[tag] == SIO_READ_ONLY || SIO_drive_status[tag] == SIO_READ_WRITE) {
 			// Write data to the pasteboard
-			NSArray *fileList = [NSArray arrayWithObjects:[NSString stringWithCString:SIO_filename[tag]], nil];
+			NSArray *fileList = [NSArray arrayWithObjects:[NSString stringWithCString:SIO_filename[tag] encoding:NSASCIIStringEncoding], nil];
 			NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
 			[pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType]
 				owner:nil];
@@ -105,7 +105,7 @@ - (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDra
 			[[MediaManager sharedInstance] diskRemoveKey:(driveNo + 1)];
 		else
 			[[MediaManager sharedInstance] 
-				diskNoInsertFile:[NSString stringWithCString:fileToCopy]:driveNo];
+				diskNoInsertFile:[NSString stringWithCString:fileToCopy encoding:NSASCIIStringEncoding]:driveNo];
 		}
 	else if (operation & NSDragOperationMove)
 		{
@@ -152,7 +152,7 @@ - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender {
 					[suffix isEqualToString:@"dcm"] ||
 					[suffix isEqualToString:@"DCM"]) ||
 					[[files objectAtIndex:0] 
-						isEqualToString:[NSString stringWithCString:SIO_filename[[self tag]]]])
+						isEqualToString:[NSString stringWithCString:SIO_filename[[self tag]] encoding:NSASCIIStringEncoding]])
 					return NSDragOperationNone;
 			if ([self tag] == 8)
 				if (!([suffix isEqualToString:@"cas"] ||

atari800-MacOSX/src/Atari800MacX/Atari800MacX Help/DisplayTab.html

@@ -158,7 +158,11 @@
 
 
 &nbsp;&nbsp;<b>&nbsp; Renderer:</b>
-<blockquote>These radio buttons allow you to which renderer
+<blockquote>
+Note, these options are disabled in Atari800MacX 5.0.0 and higher,
+and OpenGL is always used.  Also, Smooth scaling is no longer available
+and that menu option works the same as Normal scaling.
+These radio buttons allow you to which renderer
 Atari800MacX uses to display the screen.&nbsp; OpenGL requires a video
 card that supports OpenGL, but will be much faster at scaling the
 screen to larger sizes than the Software mode.&nbsp; However, OpenGL is
@@ -226,7 +230,7 @@
 unrecoverable error dialog runs, the emulator will leave Fullscreen and
 display the monitor or crash dialog in a window. &nbsp;With this item
 checked, the monitor will appear in fullscreen. &nbsp;You can also
-select the foreground and background colors for the monitor text.
+select the foreground and background colors for the monitor text, specifying the values of Red, Green, and Blue between 0-255 for each one.
 &nbsp;Note, you can currently only use the Fullscreen if you also
 select the Fullscreen Always 640x480 Item.&nbsp;&nbsp;<a href="DisplayMenu.html"></a><br>
 

atari800-MacOSX/src/Atari800MacX/Atari800MacX Help/PrinterTab.html

@@ -158,8 +158,7 @@
 
 This option
 allows you to choose the color of each pen in the Atari 1020 printer.
- Clicking on the color box will bring up a standard Mac color
-selection dialog.<br>
+&nbsp;specifying the values of Red, Green, and Blue between 0-255 for each one.<br>
 
   <br>
 

atari800-MacOSX/src/Atari800MacX/Atari800MacX Help/ReleaseHistory.html

@@ -18,12 +18,25 @@
   </tbody>
 </table>
 
+<br>Version 5.0.0 Release 01-01-2019<br>&nbsp;
+
+&nbsp;Features Added/Changed:<br>
+
+<ul><li>Changed from using underlying SDL Library 1.2 to SDL Library 2.0.  This allows operation on Mac OSX Sierra, High Sierra, and Mojave.  Note, no testing has been done on Sierra and High Sierra.</li></ul>
+<ul><li>This release requires 10.12 Sierra or above.</li></ul>
+&nbsp;&nbsp; Bugs Fixed:<br>
+<ul>
+    <li>Sound now works in Mac OSX Sierra and up</li>
+    <li>Fixed crashes with Atari 825 Printer emulation and Epson FX80 Printer emulation.</li>
+    <li>Fixes issues with Color Wells for Fullscreen Monitor and Atari 1020 Printer emulation.  Changed to use text boxes to specify 0-255 Red, Green, and Blue values for colors.
+</ul>
+
 <br>Version 4.6.0 Release 12-28-2011<br>&nbsp;
 
 &nbsp;&nbsp; Bugs Fixed:<br>
 <ul>
-  <li>Fixed issues with arrow keys in full screen menu and some of the Atari arrow key mappings.</li>
-  <li>Fixed issues with assigning tab, return, and delete as joystick keys when using international key mappings.</li>
+    <li>Fixed issues with arrow keys in full screen menu and some of the Atari arrow key mappings.</li>
+    <li>Fixed issues with assigning tab, return, and delete as joystick keys when using international key mappings.</li>
 </ul>
 
 <br>Version 4.5.0 Release 08-17-2011<br>&nbsp;
@@ -11116,4 +11129,4 @@
 
 
 
-</body></html>
+</body></html>