| 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; |
| 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 and later |
| 1555 |
> |
// Quartz driver bug prevents cursor changing in SDL 1.2.11 to 1.2.14. |
| 1556 |
|
const SDL_version *vp = SDL_Linked_Version(); |
| 1557 |
< |
quartzok = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch) <= SDL_VERSIONNUM(1, 2, 10); |
| 1557 |
> |
int version = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch); |
| 1558 |
> |
quartzok = (version <= SDL_VERSIONNUM(1, 2, 10) || version >= SDL_VERSIONNUM(1, 2, 15)); |
| 1559 |
|
} |
| 1560 |
|
} |
| 1561 |
|
|
| 2241 |
|
handle_events(); |
| 2242 |
|
|
| 2243 |
|
// Update display |
| 2244 |
+ |
#if (defined(__APPLE__) && defined(__MACH__)) |
| 2245 |
+ |
// SDL expects an auto-release pool to be present. |
| 2246 |
+ |
NSAutoReleasePool_wrap(video_refresh); |
| 2247 |
+ |
#else |
| 2248 |
|
video_refresh(); |
| 2249 |
+ |
#endif |
| 2250 |
|
|
| 2251 |
|
#ifdef SHEEPSHAVER |
| 2252 |
|
// Set new cursor image if it was changed |
