ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/MacOSX/video_macosx.mm
(Generate patch)

Comparing BasiliskII/src/MacOSX/video_macosx.mm (file contents):
Revision 1.11 by cebix, 2004-01-12T15:29:24Z vs.
Revision 1.15 by gbeauche, 2005-01-30T21:42:13Z

# Line 4 | Line 4
4   *  video_macosx.mm - Interface between Basilisk II and Cocoa windowing.
5   *                    Based on video_amiga.cpp and video_x.cpp
6   *
7 < *  Basilisk II (C) 1997-2004 Christian Bauer
7 > *  Basilisk II (C) 1997-2005 Christian Bauer
8   *
9   *  This program is free software; you can redistribute it and/or modify
10   *  it under the terms of the GNU General Public License as published by
# Line 101 | Line 101 | colours_from_depth(const uint16 depth)
101   bool
102   parse_screen_prefs(const char *mode_str)
103   {
104 +        if ( ! mode_str )
105 +        {
106 +                // No screen pref was found. Supply a default:
107 +                mode_str = "win/512/384";
108 +        }
109 +
110          if (sscanf(mode_str, "win/%hd/%hd/%hd",
111                                  &init_width, &init_height, &init_depth) == 3)
112                  display_type = DISPLAY_WINDOW;
# Line 1030 | Line 1036 | OSX_monitor::switch_to_current_mode(void
1036                          failure = "Could not get base address of screen";
1037  
1038          }
1039 + #ifdef CGIMAGEREF
1040          // Clean up the old CGImageRef stuff
1041          else if ( display_type == DISPLAY_WINDOW && imageRef )
1042          {
# Line 1048 | Line 1055 | OSX_monitor::switch_to_current_mode(void
1055                  else
1056                          failure = "Could not video_open() requested mode";
1057          }
1058 + #endif
1059          else if ( ! video_open(mode) )
1060                  failure = "Could not video_open() requested mode";
1061  
# Line 1103 | Line 1111 | void VideoInterrupt(void)
1111   void VideoRefresh(void)
1112   {
1113   }
1114 +
1115 +
1116 +
1117 + // Deal with a memory access signal referring to the screen.
1118 + // For now, just ignore
1119 + bool Screen_fault_handler(char *a, char *b)
1120 + {
1121 + //      NSLog(@"Got a screen fault %lx %lx", a, b);
1122 + //      [output setNeedsDisplay: YES];
1123 +        return YES;
1124 + }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines