ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/SDL/video_sdl.cpp
(Generate patch)

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.40 by asvitkine, 2011-12-28T21:35:42Z vs.
Revision 1.43 by asvitkine, 2011-12-29T07:38:34Z

# Line 63 | Line 63
63   #include "video_blit.h"
64   #include "vm_alloc.h"
65  
66 + #if (defined(__APPLE__) && defined(__MACH__))
67 + #include "utils_macosx.h"
68 + #endif
69 +
70   #define DEBUG 0
71   #include "debug.h"
72  
69
73   // Supported video modes
74   using std::vector;
75   static vector<VIDEO_MODE> VideoModes;
# Line 1549 | Line 1552 | bool video_can_change_cursor(void)
1552                  if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver))
1553                          quartzok = true;
1554                  else {
1555 <                        // Quartz driver bug prevents cursor changing in SDL 1.2.11 to 1.2.13.
1555 >                        // Quartz driver bug prevents cursor changing in SDL 1.2.11 and later
1556                          const SDL_version *vp = SDL_Linked_Version();
1557 <                        int version = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch);
1555 <                        quartzok = (version <= SDL_VERSIONNUM(1, 2, 10) || version >= SDL_VERSIONNUM(1, 2, 14));
1557 >                        quartzok = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch) <= SDL_VERSIONNUM(1, 2, 10);
1558                  }
1559          }
1560  
# Line 2238 | Line 2240 | static inline void do_video_refresh(void
2240          handle_events();
2241  
2242          // Update display
2243 + #if (defined(__APPLE__) && defined(__MACH__))
2244 +        // SDL expects an auto-release pool to be present.
2245 +        NSAutoReleasePool_wrap(video_refresh);
2246 + #else
2247          video_refresh();
2248 + #endif
2249  
2250   #ifdef SHEEPSHAVER
2251          // Set new cursor image if it was changed

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines