1 |
|
/* |
2 |
|
* video_sdl.cpp - Video/graphics emulation, SDL specific stuff |
3 |
|
* |
4 |
< |
* Basilisk II (C) 1997-2005 Christian Bauer |
4 |
> |
* Basilisk II (C) 1997-2008 Christian Bauer |
5 |
|
* |
6 |
|
* This program is free software; you can redistribute it and/or modify |
7 |
|
* it under the terms of the GNU General Public License as published by |
21 |
|
/* |
22 |
|
* NOTES: |
23 |
|
* The Ctrl key works like a qualifier for special actions: |
24 |
< |
* Ctrl-Tab = suspend DGA mode |
24 |
> |
* Ctrl-Tab = suspend DGA mode (TODO) |
25 |
|
* Ctrl-Esc = emergency quit |
26 |
|
* Ctrl-F1 = mount floppy |
27 |
|
* Ctrl-F5 = grab mouse (in windowed mode) |
28 |
|
* |
29 |
|
* FIXMEs and TODOs: |
30 |
+ |
* - Windows requires an extra mouse event to update the actual cursor image? |
31 |
+ |
* - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux |
32 |
|
* - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?) |
33 |
|
* - Mouse acceleration, there is no API in SDL yet for that |
34 |
|
* - Force relative mode in Grab mode even if SDL provides absolute coordinates? |
33 |
– |
* - Fullscreen mode |
35 |
|
* - Gamma tables support is likely to be broken here |
36 |
|
* - Events processing is bound to the general emulation thread as SDL requires |
37 |
|
* to PumpEvents() within the same thread as the one that called SetVideoMode(). |
38 |
|
* Besides, there can't seem to be a way to call SetVideoMode() from a child thread. |
38 |
– |
* - Refresh performance is still slow. Use SDL_CreateRGBSurface()? |
39 |
|
* - Backport hw cursor acceleration to Basilisk II? |
40 |
+ |
* - Factor out code |
41 |
|
*/ |
42 |
|
|
43 |
|
#include "sysdeps.h" |
48 |
|
#include <errno.h> |
49 |
|
#include <vector> |
50 |
|
|
51 |
+ |
#ifdef WIN32 |
52 |
+ |
#include <malloc.h> /* alloca() */ |
53 |
+ |
#endif |
54 |
+ |
|
55 |
|
#include "cpu_emulation.h" |
56 |
|
#include "main.h" |
57 |
|
#include "adb.h" |
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 |
|
|
64 |
– |
|
73 |
|
// Supported video modes |
74 |
|
using std::vector; |
75 |
|
static vector<VIDEO_MODE> VideoModes; |
107 |
|
static uint32 the_buffer_size; // Size of allocated the_buffer |
108 |
|
|
109 |
|
static bool redraw_thread_active = false; // Flag: Redraw thread installed |
110 |
+ |
#ifndef USE_CPU_EMUL_SERVICES |
111 |
|
static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread |
112 |
|
static SDL_Thread *redraw_thread = NULL; // Redraw thread |
113 |
+ |
#ifdef SHEEPSHAVER |
114 |
|
static volatile bool thread_stop_req = false; |
115 |
|
static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req |
116 |
+ |
#endif |
117 |
+ |
#endif |
118 |
|
|
119 |
|
#ifdef ENABLE_VOSF |
120 |
|
static bool use_vosf = false; // Flag: VOSF enabled |
139 |
|
static volatile bool cursor_changed = false; // Flag: cursor changed, redraw_func must update the cursor |
140 |
|
static SDL_Color sdl_palette[256]; // Color palette to be used as CLUT and gamma table |
141 |
|
static bool sdl_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors |
142 |
< |
static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK; |
142 |
> |
static const int sdl_eventmask = SDL_MOUSEEVENTMASK | SDL_KEYEVENTMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK | SDL_ACTIVEEVENTMASK; |
143 |
> |
|
144 |
> |
// Mutex to protect SDL events |
145 |
> |
static SDL_mutex *sdl_events_lock = NULL; |
146 |
> |
#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock) |
147 |
> |
#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock) |
148 |
|
|
149 |
|
// Mutex to protect palette |
150 |
|
static SDL_mutex *sdl_palette_lock = NULL; |
169 |
|
|
170 |
|
|
171 |
|
/* |
172 |
+ |
* SDL surface locking glue |
173 |
+ |
*/ |
174 |
+ |
|
175 |
+ |
#ifdef ENABLE_VOSF |
176 |
+ |
#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do { \ |
177 |
+ |
if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN)) \ |
178 |
+ |
the_host_buffer = (uint8 *)(SURFACE)->pixels; \ |
179 |
+ |
} while (0) |
180 |
+ |
#else |
181 |
+ |
#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) |
182 |
+ |
#endif |
183 |
+ |
|
184 |
+ |
#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do { \ |
185 |
+ |
if (SDL_MUSTLOCK(SURFACE)) { \ |
186 |
+ |
SDL_LockSurface(SURFACE); \ |
187 |
+ |
SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE); \ |
188 |
+ |
} \ |
189 |
+ |
} while (0) |
190 |
+ |
|
191 |
+ |
#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do { \ |
192 |
+ |
if (SDL_MUSTLOCK(SURFACE)) \ |
193 |
+ |
SDL_UnlockSurface(SURFACE); \ |
194 |
+ |
} while (0) |
195 |
+ |
|
196 |
+ |
|
197 |
+ |
/* |
198 |
|
* Framebuffer allocation routines |
199 |
|
*/ |
200 |
|
|
201 |
|
static void *vm_acquire_framebuffer(uint32 size) |
202 |
|
{ |
203 |
< |
#ifdef SHEEPSHAVER |
204 |
< |
#ifdef DIRECT_ADDRESSING_HACK |
205 |
< |
const uint32 FRAME_BUFFER_BASE = 0x61000000; |
206 |
< |
uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE); |
207 |
< |
if (vm_acquire_fixed(fb, size) < 0) |
208 |
< |
fb = VM_MAP_FAILED; |
166 |
< |
return fb; |
167 |
< |
#endif |
203 |
> |
// always try to reallocate framebuffer at the same address |
204 |
> |
static void *fb = VM_MAP_FAILED; |
205 |
> |
if (fb != VM_MAP_FAILED) { |
206 |
> |
if (vm_acquire_fixed(fb, size) < 0) { |
207 |
> |
#ifndef SHEEPSHAVER |
208 |
> |
printf("FATAL: Could not reallocate framebuffer at previous address\n"); |
209 |
|
#endif |
210 |
< |
return vm_acquire(size); |
210 |
> |
fb = VM_MAP_FAILED; |
211 |
> |
} |
212 |
> |
} |
213 |
> |
if (fb == VM_MAP_FAILED) |
214 |
> |
fb = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT); |
215 |
> |
return fb; |
216 |
|
} |
217 |
|
|
218 |
|
static inline void vm_release_framebuffer(void *fb, uint32 size) |
222 |
|
|
223 |
|
|
224 |
|
/* |
225 |
+ |
* Windows message handler |
226 |
+ |
*/ |
227 |
+ |
|
228 |
+ |
#ifdef WIN32 |
229 |
+ |
#include <dbt.h> |
230 |
+ |
static WNDPROC sdl_window_proc = NULL; // Window proc used by SDL |
231 |
+ |
|
232 |
+ |
extern void SysMediaArrived(void); |
233 |
+ |
extern void SysMediaRemoved(void); |
234 |
+ |
extern HWND GetMainWindowHandle(void); |
235 |
+ |
|
236 |
+ |
static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) |
237 |
+ |
{ |
238 |
+ |
switch (msg) { |
239 |
+ |
case WM_DEVICECHANGE: |
240 |
+ |
if (wParam == DBT_DEVICEREMOVECOMPLETE) { |
241 |
+ |
DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam; |
242 |
+ |
if (p->dbch_devicetype == DBT_DEVTYP_VOLUME) |
243 |
+ |
SysMediaRemoved(); |
244 |
+ |
} |
245 |
+ |
else if (wParam == DBT_DEVICEARRIVAL) { |
246 |
+ |
DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam; |
247 |
+ |
if (p->dbch_devicetype == DBT_DEVTYP_VOLUME) |
248 |
+ |
SysMediaArrived(); |
249 |
+ |
} |
250 |
+ |
return 0; |
251 |
+ |
|
252 |
+ |
default: |
253 |
+ |
if (sdl_window_proc) |
254 |
+ |
return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam); |
255 |
+ |
} |
256 |
+ |
|
257 |
+ |
return DefWindowProc(hwnd, msg, wParam, lParam); |
258 |
+ |
} |
259 |
+ |
#endif |
260 |
+ |
|
261 |
+ |
|
262 |
+ |
/* |
263 |
|
* SheepShaver glue |
264 |
|
*/ |
265 |
|
|
304 |
|
// Find Apple mode matching best specified dimensions |
305 |
|
static int find_apple_resolution(int xsize, int ysize) |
306 |
|
{ |
307 |
< |
int apple_id; |
308 |
< |
if (xsize < 800) |
309 |
< |
apple_id = APPLE_640x480; |
310 |
< |
else if (xsize < 1024) |
311 |
< |
apple_id = APPLE_800x600; |
312 |
< |
else if (xsize < 1152) |
313 |
< |
apple_id = APPLE_1024x768; |
314 |
< |
else if (xsize < 1280) { |
315 |
< |
if (ysize < 900) |
316 |
< |
apple_id = APPLE_1152x768; |
317 |
< |
else |
318 |
< |
apple_id = APPLE_1152x900; |
319 |
< |
} |
320 |
< |
else if (xsize < 1600) |
321 |
< |
apple_id = APPLE_1280x1024; |
238 |
< |
else |
239 |
< |
apple_id = APPLE_1600x1200; |
240 |
< |
return apple_id; |
241 |
< |
} |
242 |
< |
|
243 |
< |
// Set parameters to specified Apple mode |
244 |
< |
static void set_apple_resolution(int apple_id, int &xsize, int &ysize) |
245 |
< |
{ |
246 |
< |
switch (apple_id) { |
247 |
< |
case APPLE_640x480: |
248 |
< |
xsize = 640; |
249 |
< |
ysize = 480; |
250 |
< |
break; |
251 |
< |
case APPLE_800x600: |
252 |
< |
xsize = 800; |
253 |
< |
ysize = 600; |
254 |
< |
break; |
255 |
< |
case APPLE_1024x768: |
256 |
< |
xsize = 1024; |
257 |
< |
ysize = 768; |
258 |
< |
break; |
259 |
< |
case APPLE_1152x768: |
260 |
< |
xsize = 1152; |
261 |
< |
ysize = 768; |
262 |
< |
break; |
263 |
< |
case APPLE_1152x900: |
264 |
< |
xsize = 1152; |
265 |
< |
ysize = 900; |
266 |
< |
break; |
267 |
< |
case APPLE_1280x1024: |
268 |
< |
xsize = 1280; |
269 |
< |
ysize = 1024; |
270 |
< |
break; |
271 |
< |
case APPLE_1600x1200: |
272 |
< |
xsize = 1600; |
273 |
< |
ysize = 1200; |
274 |
< |
break; |
275 |
< |
default: |
276 |
< |
abort(); |
277 |
< |
} |
278 |
< |
} |
279 |
< |
|
280 |
< |
// Match Apple mode matching best specified dimensions |
281 |
< |
static int match_apple_resolution(int &xsize, int &ysize) |
282 |
< |
{ |
283 |
< |
int apple_id = find_apple_resolution(xsize, ysize); |
284 |
< |
set_apple_resolution(apple_id, xsize, ysize); |
285 |
< |
return apple_id; |
307 |
> |
if (xsize == 640 && ysize == 480) |
308 |
> |
return APPLE_640x480; |
309 |
> |
if (xsize == 800 && ysize == 600) |
310 |
> |
return APPLE_800x600; |
311 |
> |
if (xsize == 1024 && ysize == 768) |
312 |
> |
return APPLE_1024x768; |
313 |
> |
if (xsize == 1152 && ysize == 768) |
314 |
> |
return APPLE_1152x768; |
315 |
> |
if (xsize == 1152 && ysize == 900) |
316 |
> |
return APPLE_1152x900; |
317 |
> |
if (xsize == 1280 && ysize == 1024) |
318 |
> |
return APPLE_1280x1024; |
319 |
> |
if (xsize == 1600 && ysize == 1200) |
320 |
> |
return APPLE_1600x1200; |
321 |
> |
return APPLE_CUSTOM; |
322 |
|
} |
323 |
|
|
324 |
|
// Display error alert |
425 |
|
return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth); |
426 |
|
} |
427 |
|
|
428 |
< |
// Check wether specified mode is available |
429 |
< |
static bool has_mode(int type, int width, int height) |
428 |
> |
// Get screen dimensions |
429 |
> |
static void sdl_display_dimensions(int &width, int &height) |
430 |
|
{ |
431 |
< |
// FIXME: no fullscreen support yet |
432 |
< |
if (type == DISPLAY_SCREEN) |
433 |
< |
return false; |
431 |
> |
static int max_width, max_height; |
432 |
> |
if (max_width == 0 && max_height == 0) { |
433 |
> |
max_width = 640 ; max_height = 480; |
434 |
> |
SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); |
435 |
> |
if (modes && modes != (SDL_Rect **)-1) { |
436 |
> |
// It turns out that on some implementations, and contrary to the documentation, |
437 |
> |
// the returned list is not sorted from largest to smallest (e.g. Windows) |
438 |
> |
for (int i = 0; modes[i] != NULL; i++) { |
439 |
> |
const int w = modes[i]->w; |
440 |
> |
const int h = modes[i]->h; |
441 |
> |
if (w > max_width && h > max_height) { |
442 |
> |
max_width = w; |
443 |
> |
max_height = h; |
444 |
> |
} |
445 |
> |
} |
446 |
> |
} |
447 |
> |
} |
448 |
> |
width = max_width; |
449 |
> |
height = max_height; |
450 |
> |
} |
451 |
> |
|
452 |
> |
static inline int sdl_display_width(void) |
453 |
> |
{ |
454 |
> |
int width, height; |
455 |
> |
sdl_display_dimensions(width, height); |
456 |
> |
return width; |
457 |
> |
} |
458 |
|
|
459 |
+ |
static inline int sdl_display_height(void) |
460 |
+ |
{ |
461 |
+ |
int width, height; |
462 |
+ |
sdl_display_dimensions(width, height); |
463 |
+ |
return height; |
464 |
+ |
} |
465 |
+ |
|
466 |
+ |
// Check wether specified mode is available |
467 |
+ |
static bool has_mode(int type, int width, int height, int depth) |
468 |
+ |
{ |
469 |
|
#ifdef SHEEPSHAVER |
470 |
< |
// Filter out Classic resolutiosn |
470 |
> |
// Filter out Classic resolutions |
471 |
|
if (width == 512 && height == 384) |
472 |
|
return false; |
403 |
– |
|
404 |
– |
// Read window modes prefs |
405 |
– |
static uint32 window_modes = 0; |
406 |
– |
static uint32 screen_modes = 0; |
407 |
– |
if (window_modes == 0 || screen_modes == 0) { |
408 |
– |
window_modes = PrefsFindInt32("windowmodes"); |
409 |
– |
screen_modes = PrefsFindInt32("screenmodes"); |
410 |
– |
if (window_modes == 0 || screen_modes == 0) |
411 |
– |
window_modes |= 3; // Allow at least 640x480 and 800x600 window modes |
412 |
– |
} |
413 |
– |
|
414 |
– |
if (type == DISPLAY_WINDOW) { |
415 |
– |
int apple_mask, apple_id = find_apple_resolution(width, height); |
416 |
– |
switch (apple_id) { |
417 |
– |
case APPLE_640x480: apple_mask = 0x01; break; |
418 |
– |
case APPLE_800x600: apple_mask = 0x02; break; |
419 |
– |
case APPLE_1024x768: apple_mask = 0x04; break; |
420 |
– |
case APPLE_1152x768: apple_mask = 0x40; break; |
421 |
– |
case APPLE_1152x900: apple_mask = 0x08; break; |
422 |
– |
case APPLE_1280x1024: apple_mask = 0x10; break; |
423 |
– |
case APPLE_1600x1200: apple_mask = 0x20; break; |
424 |
– |
default: apple_mask = 0x00; break; |
425 |
– |
} |
426 |
– |
return (window_modes & apple_mask); |
427 |
– |
} |
428 |
– |
#else |
429 |
– |
return true; |
473 |
|
#endif |
474 |
< |
return false; |
474 |
> |
|
475 |
> |
// Filter out out-of-bounds resolutions |
476 |
> |
if (width > sdl_display_width() || height > sdl_display_height()) |
477 |
> |
return false; |
478 |
> |
|
479 |
> |
// Rely on SDL capabilities |
480 |
> |
return SDL_VideoModeOK(width, height, |
481 |
> |
sdl_depth_of_video_depth(depth), |
482 |
> |
SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0)); |
483 |
|
} |
484 |
|
|
485 |
|
// Add mode to list of supported modes |
486 |
|
static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth) |
487 |
|
{ |
488 |
|
// Filter out unsupported modes |
489 |
< |
if (!has_mode(type, width, height)) |
489 |
> |
if (!has_mode(type, width, height, depth)) |
490 |
|
return; |
491 |
|
|
492 |
|
// Fill in VideoMode entry |
493 |
|
VIDEO_MODE mode; |
494 |
|
#ifdef SHEEPSHAVER |
495 |
< |
// Recalculate dimensions to fit Apple modes |
445 |
< |
resolution_id = match_apple_resolution(width, height); |
495 |
> |
resolution_id = find_apple_resolution(width, height); |
496 |
|
mode.viType = type; |
497 |
|
#endif |
498 |
|
VIDEO_MODE_X = width; |
503 |
|
VideoModes.push_back(mode); |
504 |
|
} |
505 |
|
|
456 |
– |
// Add standard list of windowed modes for given color depth |
457 |
– |
static void add_window_modes(int depth) |
458 |
– |
{ |
459 |
– |
video_depth vdepth = (video_depth)depth; |
460 |
– |
add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth); |
461 |
– |
add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth); |
462 |
– |
add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth); |
463 |
– |
add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth); |
464 |
– |
add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth); |
465 |
– |
add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth); |
466 |
– |
add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth); |
467 |
– |
} |
468 |
– |
|
506 |
|
// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac) |
507 |
|
static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order) |
508 |
|
{ |
542 |
|
// Set mouse grab mode |
543 |
|
static SDL_GrabMode set_grab_mode(SDL_GrabMode mode) |
544 |
|
{ |
545 |
< |
const SDL_VideoInfo *vi =SDL_GetVideoInfo(); |
545 |
> |
const SDL_VideoInfo *vi = SDL_GetVideoInfo(); |
546 |
|
return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF); |
547 |
|
} |
548 |
|
|
549 |
+ |
// Migrate preferences items (XXX to be handled in MigratePrefs()) |
550 |
+ |
static void migrate_screen_prefs(void) |
551 |
+ |
{ |
552 |
+ |
#ifdef SHEEPSHAVER |
553 |
+ |
// Look-up priorities are: "screen", "screenmodes", "windowmodes". |
554 |
+ |
if (PrefsFindString("screen")) |
555 |
+ |
return; |
556 |
+ |
|
557 |
+ |
uint32 window_modes = PrefsFindInt32("windowmodes"); |
558 |
+ |
uint32 screen_modes = PrefsFindInt32("screenmodes"); |
559 |
+ |
int width = 0, height = 0; |
560 |
+ |
if (screen_modes) { |
561 |
+ |
static const struct { |
562 |
+ |
int id; |
563 |
+ |
int width; |
564 |
+ |
int height; |
565 |
+ |
} |
566 |
+ |
modes[] = { |
567 |
+ |
{ 1, 640, 480 }, |
568 |
+ |
{ 2, 800, 600 }, |
569 |
+ |
{ 4, 1024, 768 }, |
570 |
+ |
{ 64, 1152, 768 }, |
571 |
+ |
{ 8, 1152, 900 }, |
572 |
+ |
{ 16, 1280, 1024 }, |
573 |
+ |
{ 32, 1600, 1200 }, |
574 |
+ |
{ 0, } |
575 |
+ |
}; |
576 |
+ |
for (int i = 0; modes[i].id != 0; i++) { |
577 |
+ |
if (screen_modes & modes[i].id) { |
578 |
+ |
if (width < modes[i].width && height < modes[i].height) { |
579 |
+ |
width = modes[i].width; |
580 |
+ |
height = modes[i].height; |
581 |
+ |
} |
582 |
+ |
} |
583 |
+ |
} |
584 |
+ |
} else { |
585 |
+ |
if (window_modes & 1) |
586 |
+ |
width = 640, height = 480; |
587 |
+ |
if (window_modes & 2) |
588 |
+ |
width = 800, height = 600; |
589 |
+ |
} |
590 |
+ |
if (width && height) { |
591 |
+ |
char str[32]; |
592 |
+ |
sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height); |
593 |
+ |
PrefsReplaceString("screen", str); |
594 |
+ |
} |
595 |
+ |
#endif |
596 |
+ |
} |
597 |
+ |
|
598 |
|
|
599 |
|
/* |
600 |
|
* Display "driver" classes |
628 |
|
class driver_window; |
629 |
|
static void update_display_window_vosf(driver_window *drv); |
630 |
|
static void update_display_dynamic(int ticker, driver_window *drv); |
631 |
< |
static void update_display_static(driver_window *drv); |
631 |
> |
static void update_display_static(driver_base *drv); |
632 |
|
|
633 |
|
class driver_window : public driver_base { |
634 |
|
friend void update_display_window_vosf(driver_window *drv); |
635 |
|
friend void update_display_dynamic(int ticker, driver_window *drv); |
636 |
< |
friend void update_display_static(driver_window *drv); |
636 |
> |
friend void update_display_static(driver_base *drv); |
637 |
|
|
638 |
|
public: |
639 |
|
driver_window(SDL_monitor_desc &monitor); |
650 |
|
int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode) |
651 |
|
}; |
652 |
|
|
653 |
+ |
class driver_fullscreen : public driver_base { |
654 |
+ |
public: |
655 |
+ |
driver_fullscreen(SDL_monitor_desc &monitor); |
656 |
+ |
~driver_fullscreen(); |
657 |
+ |
}; |
658 |
+ |
|
659 |
|
static driver_base *drv = NULL; // Pointer to currently used driver object |
660 |
|
|
661 |
|
#ifdef ENABLE_VOSF |
734 |
|
* Windowed display driver |
735 |
|
*/ |
736 |
|
|
737 |
+ |
static bool SDL_display_opened = false; |
738 |
+ |
|
739 |
|
// Open display |
740 |
|
driver_window::driver_window(SDL_monitor_desc &m) |
741 |
|
: driver_base(m), mouse_grabbed(false) |
747 |
|
// Set absolute mouse mode |
748 |
|
ADBSetRelMouseMode(mouse_grabbed); |
749 |
|
|
750 |
+ |
// This is ugly: |
751 |
+ |
// If we're switching resolutions (ie, not setting it for the first time), |
752 |
+ |
// there's a bug in SDL where the SDL_Surface created will not be properly |
753 |
+ |
// setup. The solution is to SDL_QuitSubSystem(SDL_INIT_VIDEO) before calling |
754 |
+ |
// SDL_SetVideoMode for the second time (SDL_SetVideoMode will call SDL_Init() |
755 |
+ |
// and all will be well). Without this, the video becomes corrupted (at least |
756 |
+ |
// on Mac OS X), after the resolution switch. |
757 |
+ |
if (SDL_display_opened) |
758 |
+ |
SDL_QuitSubSystem(SDL_INIT_VIDEO); |
759 |
+ |
|
760 |
|
// Create surface |
761 |
|
int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH); |
762 |
|
if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL) |
763 |
|
return; |
764 |
|
|
765 |
+ |
SDL_display_opened = true; |
766 |
+ |
|
767 |
|
#ifdef ENABLE_VOSF |
768 |
|
use_vosf = true; |
769 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
885 |
|
ADBMouseMoved(x, y); |
886 |
|
} |
887 |
|
|
888 |
+ |
|
889 |
+ |
/* |
890 |
+ |
* Full-screen display driver |
891 |
+ |
*/ |
892 |
+ |
|
893 |
+ |
// Open display |
894 |
+ |
driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m) |
895 |
+ |
: driver_base(m) |
896 |
+ |
{ |
897 |
+ |
int width = VIDEO_MODE_X, height = VIDEO_MODE_Y; |
898 |
+ |
int aligned_width = (width + 15) & ~15; |
899 |
+ |
int aligned_height = (height + 15) & ~15; |
900 |
+ |
|
901 |
+ |
// Set absolute mouse mode |
902 |
+ |
ADBSetRelMouseMode(false); |
903 |
+ |
|
904 |
+ |
// Create surface |
905 |
+ |
int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH); |
906 |
+ |
if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL) |
907 |
+ |
return; |
908 |
+ |
|
909 |
+ |
#ifdef ENABLE_VOSF |
910 |
+ |
use_vosf = true; |
911 |
+ |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
912 |
+ |
the_host_buffer = (uint8 *)s->pixels; |
913 |
+ |
the_buffer_size = page_extend((aligned_height + 2) * s->pitch); |
914 |
+ |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
915 |
+ |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
916 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); |
917 |
+ |
|
918 |
+ |
// Check whether we can initialize the VOSF subsystem and it's profitable |
919 |
+ |
if (!video_vosf_init(m)) { |
920 |
+ |
WarningAlert(STR_VOSF_INIT_ERR); |
921 |
+ |
use_vosf = false; |
922 |
+ |
} |
923 |
+ |
else if (!video_vosf_profitable()) { |
924 |
+ |
video_vosf_exit(); |
925 |
+ |
printf("VOSF acceleration is not profitable on this platform, disabling it\n"); |
926 |
+ |
use_vosf = false; |
927 |
+ |
} |
928 |
+ |
if (!use_vosf) { |
929 |
+ |
free(the_buffer_copy); |
930 |
+ |
vm_release(the_buffer, the_buffer_size); |
931 |
+ |
the_host_buffer = NULL; |
932 |
+ |
} |
933 |
+ |
#endif |
934 |
+ |
if (!use_vosf) { |
935 |
+ |
// Allocate memory for frame buffer |
936 |
+ |
the_buffer_size = (aligned_height + 2) * s->pitch; |
937 |
+ |
the_buffer_copy = (uint8 *)calloc(1, the_buffer_size); |
938 |
+ |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
939 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); |
940 |
+ |
} |
941 |
+ |
|
942 |
+ |
// Hide cursor |
943 |
+ |
SDL_ShowCursor(0); |
944 |
+ |
|
945 |
+ |
// Init blitting routines |
946 |
+ |
SDL_PixelFormat *f = s->format; |
947 |
+ |
VisualFormat visualFormat; |
948 |
+ |
visualFormat.depth = depth; |
949 |
+ |
visualFormat.Rmask = f->Rmask; |
950 |
+ |
visualFormat.Gmask = f->Gmask; |
951 |
+ |
visualFormat.Bmask = f->Bmask; |
952 |
+ |
Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH)); |
953 |
+ |
|
954 |
+ |
// Load gray ramp to 8->16/32 expand map |
955 |
+ |
if (!IsDirectMode(mode)) |
956 |
+ |
for (int i=0; i<256; i++) |
957 |
+ |
ExpandMap[i] = SDL_MapRGB(f, i, i, i); |
958 |
+ |
|
959 |
+ |
// Set frame buffer base |
960 |
+ |
set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true); |
961 |
+ |
|
962 |
+ |
// Everything went well |
963 |
+ |
init_ok = true; |
964 |
+ |
} |
965 |
+ |
|
966 |
+ |
// Close display |
967 |
+ |
driver_fullscreen::~driver_fullscreen() |
968 |
+ |
{ |
969 |
+ |
#ifdef ENABLE_VOSF |
970 |
+ |
if (use_vosf) |
971 |
+ |
the_host_buffer = NULL; // don't free() in driver_base dtor |
972 |
+ |
#endif |
973 |
+ |
if (s) |
974 |
+ |
SDL_FreeSurface(s); |
975 |
+ |
|
976 |
+ |
// Show cursor |
977 |
+ |
SDL_ShowCursor(1); |
978 |
+ |
} |
979 |
+ |
|
980 |
+ |
|
981 |
|
/* |
982 |
|
* Initialization |
983 |
|
*/ |
1076 |
|
case DISPLAY_WINDOW: |
1077 |
|
drv = new(std::nothrow) driver_window(*this); |
1078 |
|
break; |
1079 |
+ |
case DISPLAY_SCREEN: |
1080 |
+ |
drv = new(std::nothrow) driver_fullscreen(*this); |
1081 |
+ |
break; |
1082 |
|
} |
1083 |
|
if (drv == NULL) |
1084 |
|
return false; |
1088 |
|
return false; |
1089 |
|
} |
1090 |
|
|
1091 |
+ |
#ifdef WIN32 |
1092 |
+ |
// Chain in a new message handler for WM_DEVICECHANGE |
1093 |
+ |
HWND the_window = GetMainWindowHandle(); |
1094 |
+ |
sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC); |
1095 |
+ |
SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler); |
1096 |
+ |
#endif |
1097 |
+ |
|
1098 |
|
// Initialize VideoRefresh function |
1099 |
|
VideoRefreshInit(); |
1100 |
|
|
1102 |
|
LOCK_FRAME_BUFFER; |
1103 |
|
|
1104 |
|
// Start redraw/input thread |
1105 |
+ |
#ifndef USE_CPU_EMUL_SERVICES |
1106 |
|
redraw_thread_cancel = false; |
1107 |
|
redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL); |
1108 |
|
if (!redraw_thread_active) { |
1109 |
|
printf("FATAL: cannot create redraw thread\n"); |
1110 |
|
return false; |
1111 |
|
} |
1112 |
+ |
#else |
1113 |
+ |
redraw_thread_active = true; |
1114 |
+ |
#endif |
1115 |
|
return true; |
1116 |
|
} |
1117 |
|
|
1132 |
|
#endif |
1133 |
|
|
1134 |
|
// Create Mutexes |
1135 |
+ |
if ((sdl_events_lock = SDL_CreateMutex()) == NULL) |
1136 |
+ |
return false; |
1137 |
|
if ((sdl_palette_lock = SDL_CreateMutex()) == NULL) |
1138 |
|
return false; |
1139 |
|
if ((frame_buffer_lock = SDL_CreateMutex()) == NULL) |
1148 |
|
mouse_wheel_lines = PrefsFindInt32("mousewheellines"); |
1149 |
|
|
1150 |
|
// Get screen mode from preferences |
1151 |
+ |
migrate_screen_prefs(); |
1152 |
|
const char *mode_str = NULL; |
937 |
– |
#ifndef SHEEPSHAVER |
1153 |
|
if (classic_mode) |
1154 |
|
mode_str = "win/512/342"; |
1155 |
|
else |
1156 |
|
mode_str = PrefsFindString("screen"); |
942 |
– |
#endif |
1157 |
|
|
1158 |
|
// Determine display type and default dimensions |
1159 |
|
int default_width, default_height; |
1169 |
|
if (mode_str) { |
1170 |
|
if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) |
1171 |
|
display_type = DISPLAY_WINDOW; |
1172 |
< |
} |
1173 |
< |
int max_width = 640, max_height = 480; |
960 |
< |
SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); |
961 |
< |
if (modes && modes != (SDL_Rect **)-1) { |
962 |
< |
// It turns out that on some implementations, and contrary to the documentation, |
963 |
< |
// the returned list is not sorted from largest to smallest (e.g. Windows) |
964 |
< |
for (int i = 0; modes[i] != NULL; i++) { |
965 |
< |
const int w = modes[i]->w; |
966 |
< |
const int h = modes[i]->h; |
967 |
< |
if (w > max_width && h > max_height) { |
968 |
< |
max_width = w; |
969 |
< |
max_height = h; |
970 |
< |
} |
971 |
< |
} |
972 |
< |
if (default_width > max_width) |
973 |
< |
default_width = max_width; |
974 |
< |
if (default_height > max_height) |
975 |
< |
default_height = max_height; |
1172 |
> |
else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) |
1173 |
> |
display_type = DISPLAY_SCREEN; |
1174 |
|
} |
1175 |
|
if (default_width <= 0) |
1176 |
< |
default_width = max_width; |
1176 |
> |
default_width = sdl_display_width(); |
1177 |
> |
else if (default_width > sdl_display_width()) |
1178 |
> |
default_width = sdl_display_width(); |
1179 |
|
if (default_height <= 0) |
1180 |
< |
default_height = max_height; |
1180 |
> |
default_height = sdl_display_height(); |
1181 |
> |
else if (default_height > sdl_display_height()) |
1182 |
> |
default_height = sdl_display_height(); |
1183 |
|
|
1184 |
|
// Mac screen depth follows X depth |
1185 |
|
screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel; |
1199 |
|
break; |
1200 |
|
} |
1201 |
|
|
1202 |
+ |
// Initialize list of video modes to try |
1203 |
+ |
struct { |
1204 |
+ |
int w; |
1205 |
+ |
int h; |
1206 |
+ |
int resolution_id; |
1207 |
+ |
} |
1208 |
+ |
video_modes[] = { |
1209 |
+ |
{ -1, -1, 0x80 }, |
1210 |
+ |
{ 512, 384, 0x80 }, |
1211 |
+ |
{ 640, 480, 0x81 }, |
1212 |
+ |
{ 800, 600, 0x82 }, |
1213 |
+ |
{ 1024, 768, 0x83 }, |
1214 |
+ |
{ 1152, 870, 0x84 }, |
1215 |
+ |
{ 1280, 1024, 0x85 }, |
1216 |
+ |
{ 1600, 1200, 0x86 }, |
1217 |
+ |
{ 0, } |
1218 |
+ |
}; |
1219 |
+ |
video_modes[0].w = default_width; |
1220 |
+ |
video_modes[0].h = default_height; |
1221 |
+ |
|
1222 |
|
// Construct list of supported modes |
1223 |
|
if (display_type == DISPLAY_WINDOW) { |
1224 |
|
if (classic) |
1225 |
|
add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT); |
1226 |
|
else { |
1227 |
< |
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) { |
1228 |
< |
int bpp = sdl_depth_of_video_depth(d); |
1229 |
< |
if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE)) |
1230 |
< |
add_window_modes(video_depth(d)); |
1227 |
> |
for (int i = 0; video_modes[i].w != 0; i++) { |
1228 |
> |
const int w = video_modes[i].w; |
1229 |
> |
const int h = video_modes[i].h; |
1230 |
> |
if (i > 0 && (w >= default_width || h >= default_height)) |
1231 |
> |
continue; |
1232 |
> |
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) |
1233 |
> |
add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d); |
1234 |
|
} |
1235 |
|
} |
1236 |
< |
} else |
1237 |
< |
add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth); |
1236 |
> |
} else if (display_type == DISPLAY_SCREEN) { |
1237 |
> |
for (int i = 0; video_modes[i].w != 0; i++) { |
1238 |
> |
const int w = video_modes[i].w; |
1239 |
> |
const int h = video_modes[i].h; |
1240 |
> |
if (i > 0 && (w >= default_width || h >= default_height)) |
1241 |
> |
continue; |
1242 |
> |
if (w == 512 && h == 384) |
1243 |
> |
continue; |
1244 |
> |
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) |
1245 |
> |
add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d); |
1246 |
> |
} |
1247 |
> |
} |
1248 |
> |
|
1249 |
|
if (VideoModes.empty()) { |
1250 |
|
ErrorAlert(STR_NO_XVISUAL_ERR); |
1251 |
|
return false; |
1316 |
|
{ |
1317 |
|
D(bug("video_close()\n")); |
1318 |
|
|
1319 |
+ |
#ifdef WIN32 |
1320 |
+ |
// Remove message handler for WM_DEVICECHANGE |
1321 |
+ |
HWND the_window = GetMainWindowHandle(); |
1322 |
+ |
SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc); |
1323 |
+ |
#endif |
1324 |
+ |
|
1325 |
|
// Stop redraw thread |
1326 |
+ |
#ifndef USE_CPU_EMUL_SERVICES |
1327 |
|
if (redraw_thread_active) { |
1328 |
|
redraw_thread_cancel = true; |
1329 |
|
SDL_WaitThread(redraw_thread, NULL); |
1330 |
|
} |
1331 |
+ |
#endif |
1332 |
|
redraw_thread_active = false; |
1333 |
|
|
1334 |
|
// Unlock frame buffer |
1352 |
|
SDL_DestroyMutex(frame_buffer_lock); |
1353 |
|
if (sdl_palette_lock) |
1354 |
|
SDL_DestroyMutex(sdl_palette_lock); |
1355 |
+ |
if (sdl_events_lock) |
1356 |
+ |
SDL_DestroyMutex(sdl_events_lock); |
1357 |
|
} |
1358 |
|
|
1359 |
|
|
1523 |
|
void SDL_monitor_desc::switch_to_current_mode(void) |
1524 |
|
{ |
1525 |
|
// Close and reopen display |
1526 |
+ |
LOCK_EVENTS; |
1527 |
|
video_close(); |
1528 |
|
video_open(); |
1529 |
+ |
UNLOCK_EVENTS; |
1530 |
|
|
1531 |
|
if (drv == NULL) { |
1532 |
|
ErrorAlert(STR_OPEN_WINDOW_ERR); |
1542 |
|
#ifdef SHEEPSHAVER |
1543 |
|
bool video_can_change_cursor(void) |
1544 |
|
{ |
1545 |
< |
return (display_type == DISPLAY_WINDOW); |
1545 |
> |
static char driver[] = "Quartz?"; |
1546 |
> |
static int quartzok = -1; |
1547 |
> |
|
1548 |
> |
if (display_type != DISPLAY_WINDOW) |
1549 |
> |
return false; |
1550 |
> |
|
1551 |
> |
if (quartzok < 0) { |
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.14. |
1556 |
> |
const SDL_version *vp = SDL_Linked_Version(); |
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 |
> |
|
1562 |
> |
return quartzok; |
1563 |
|
} |
1564 |
|
#endif |
1565 |
|
|
1694 |
|
case SDLK_LMETA: return 0x3a; |
1695 |
|
case SDLK_RMETA: return 0x3a; |
1696 |
|
#endif |
1697 |
+ |
case SDLK_LSUPER: return 0x3a; // "Windows" key |
1698 |
+ |
case SDLK_RSUPER: return 0x3a; |
1699 |
|
case SDLK_MENU: return 0x32; |
1700 |
|
case SDLK_CAPSLOCK: return 0x39; |
1701 |
|
case SDLK_NUMLOCK: return 0x47; |
1770 |
|
// Mouse button |
1771 |
|
case SDL_MOUSEBUTTONDOWN: { |
1772 |
|
unsigned int button = event.button.button; |
1773 |
< |
if (button < 4) |
1774 |
< |
ADBMouseDown(button - 1); |
1773 |
> |
if (button == SDL_BUTTON_LEFT) |
1774 |
> |
ADBMouseDown(0); |
1775 |
> |
else if (button == SDL_BUTTON_RIGHT) |
1776 |
> |
ADBMouseDown(1); |
1777 |
> |
else if (button == SDL_BUTTON_MIDDLE) |
1778 |
> |
ADBMouseDown(2); |
1779 |
|
else if (button < 6) { // Wheel mouse |
1780 |
|
if (mouse_wheel_mode == 0) { |
1781 |
|
int key = (button == 5) ? 0x79 : 0x74; // Page up/down |
1793 |
|
} |
1794 |
|
case SDL_MOUSEBUTTONUP: { |
1795 |
|
unsigned int button = event.button.button; |
1796 |
< |
if (button < 4) |
1797 |
< |
ADBMouseUp(button - 1); |
1796 |
> |
if (button == SDL_BUTTON_LEFT) |
1797 |
> |
ADBMouseUp(0); |
1798 |
> |
else if (button == SDL_BUTTON_RIGHT) |
1799 |
> |
ADBMouseUp(1); |
1800 |
> |
else if (button == SDL_BUTTON_MIDDLE) |
1801 |
> |
ADBMouseUp(2); |
1802 |
|
break; |
1803 |
|
} |
1804 |
|
|
1882 |
|
ADBKeyDown(0x7f); // Power key |
1883 |
|
ADBKeyUp(0x7f); |
1884 |
|
break; |
1885 |
+ |
|
1886 |
+ |
// Application activate/deactivate; consume the event but otherwise ignore it |
1887 |
+ |
case SDL_ACTIVEEVENT: |
1888 |
+ |
break; |
1889 |
|
} |
1890 |
|
} |
1891 |
|
} |
1897 |
|
*/ |
1898 |
|
|
1899 |
|
// Static display update (fixed frame rate, but incremental) |
1900 |
< |
static void update_display_static(driver_window *drv) |
1900 |
> |
static void update_display_static(driver_base *drv) |
1901 |
|
{ |
1902 |
|
// Incremental update code |
1903 |
|
int wide = 0, high = 0, x1, x2, y1, y2, i, j; |
1986 |
|
|
1987 |
|
} else { |
1988 |
|
const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X; |
1989 |
+ |
const int dst_bytes_per_row = drv->s->pitch; |
1990 |
|
|
1991 |
|
x1 = VIDEO_MODE_X; |
1992 |
|
for (j=y1; j<=y2; j++) { |
2027 |
|
// Blit to screen surface |
2028 |
|
for (j=y1; j<=y2; j++) { |
2029 |
|
i = j * bytes_per_row + x1 * bytes_per_pixel; |
2030 |
+ |
int dst_i = j * dst_bytes_per_row + x1 * bytes_per_pixel; |
2031 |
|
memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide); |
2032 |
< |
Screen_blit((uint8 *)drv->s->pixels + i, the_buffer + i, bytes_per_pixel * wide); |
2032 |
> |
Screen_blit((uint8 *)drv->s->pixels + dst_i, the_buffer + i, bytes_per_pixel * wide); |
2033 |
|
} |
2034 |
|
|
2035 |
|
// Unlock surface, if required |
2043 |
|
} |
2044 |
|
} |
2045 |
|
|
2046 |
+ |
// Static display update (fixed frame rate, bounding boxes based) |
2047 |
+ |
// XXX use NQD bounding boxes to help detect dirty areas? |
2048 |
+ |
static void update_display_static_bbox(driver_base *drv) |
2049 |
+ |
{ |
2050 |
+ |
const VIDEO_MODE &mode = drv->mode; |
2051 |
+ |
|
2052 |
+ |
// Allocate bounding boxes for SDL_UpdateRects() |
2053 |
+ |
const int N_PIXELS = 64; |
2054 |
+ |
const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS; |
2055 |
+ |
const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS; |
2056 |
+ |
SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes); |
2057 |
+ |
int nr_boxes = 0; |
2058 |
+ |
|
2059 |
+ |
// Lock surface, if required |
2060 |
+ |
if (SDL_MUSTLOCK(drv->s)) |
2061 |
+ |
SDL_LockSurface(drv->s); |
2062 |
+ |
|
2063 |
+ |
// Update the surface from Mac screen |
2064 |
+ |
const int bytes_per_row = VIDEO_MODE_ROW_BYTES; |
2065 |
+ |
const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X; |
2066 |
+ |
const int dst_bytes_per_row = drv->s->pitch; |
2067 |
+ |
int x, y; |
2068 |
+ |
for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) { |
2069 |
+ |
int h = N_PIXELS; |
2070 |
+ |
if (h > VIDEO_MODE_Y - y) |
2071 |
+ |
h = VIDEO_MODE_Y - y; |
2072 |
+ |
for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) { |
2073 |
+ |
int w = N_PIXELS; |
2074 |
+ |
if (w > VIDEO_MODE_X - x) |
2075 |
+ |
w = VIDEO_MODE_X - x; |
2076 |
+ |
const int xs = w * bytes_per_pixel; |
2077 |
+ |
const int xb = x * bytes_per_pixel; |
2078 |
+ |
bool dirty = false; |
2079 |
+ |
for (int j = y; j < (y + h); j++) { |
2080 |
+ |
const int yb = j * bytes_per_row; |
2081 |
+ |
const int dst_yb = j * dst_bytes_per_row; |
2082 |
+ |
if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) { |
2083 |
+ |
memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs); |
2084 |
+ |
Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs); |
2085 |
+ |
dirty = true; |
2086 |
+ |
} |
2087 |
+ |
} |
2088 |
+ |
if (dirty) { |
2089 |
+ |
boxes[nr_boxes].x = x; |
2090 |
+ |
boxes[nr_boxes].y = y; |
2091 |
+ |
boxes[nr_boxes].w = w; |
2092 |
+ |
boxes[nr_boxes].h = h; |
2093 |
+ |
nr_boxes++; |
2094 |
+ |
} |
2095 |
+ |
} |
2096 |
+ |
} |
2097 |
+ |
|
2098 |
+ |
// Unlock surface, if required |
2099 |
+ |
if (SDL_MUSTLOCK(drv->s)) |
2100 |
+ |
SDL_UnlockSurface(drv->s); |
2101 |
+ |
|
2102 |
+ |
// Refresh display |
2103 |
+ |
if (nr_boxes) |
2104 |
+ |
SDL_UpdateRects(drv->s, nr_boxes, boxes); |
2105 |
+ |
} |
2106 |
+ |
|
2107 |
|
|
2108 |
|
// We suggest the compiler to inline the next two functions so that it |
2109 |
|
// may specialise the code according to the current screen depth and |
2145 |
|
UNLOCK_PALETTE; |
2146 |
|
} |
2147 |
|
|
2148 |
+ |
static void video_refresh_window_static(void); |
2149 |
+ |
|
2150 |
|
static void video_refresh_dga(void) |
2151 |
|
{ |
2152 |
|
// Quit DGA mode if requested |
2153 |
|
possibly_quit_dga_mode(); |
2154 |
+ |
video_refresh_window_static(); |
2155 |
|
} |
2156 |
|
|
2157 |
|
#ifdef ENABLE_VOSF |
2167 |
|
tick_counter = 0; |
2168 |
|
if (mainBuffer.dirty) { |
2169 |
|
LOCK_VOSF; |
2170 |
< |
update_display_dga_vosf(); |
2170 |
> |
update_display_dga_vosf(static_cast<driver_fullscreen *>(drv)); |
2171 |
|
UNLOCK_VOSF; |
2172 |
|
} |
2173 |
|
} |
2201 |
|
static int tick_counter = 0; |
2202 |
|
if (++tick_counter >= frame_skip) { |
2203 |
|
tick_counter = 0; |
2204 |
< |
update_display_static(static_cast<driver_window *>(drv)); |
2204 |
> |
const VIDEO_MODE &mode = drv->mode; |
2205 |
> |
if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT) |
2206 |
> |
update_display_static_bbox(drv); |
2207 |
> |
else |
2208 |
> |
update_display_static(drv); |
2209 |
|
} |
2210 |
|
} |
2211 |
|
|
2235 |
|
} |
2236 |
|
} |
2237 |
|
|
2238 |
+ |
static inline void do_video_refresh(void) |
2239 |
+ |
{ |
2240 |
+ |
// Handle SDL events |
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 |
2253 |
+ |
if (cursor_changed && sdl_cursor) { |
2254 |
+ |
cursor_changed = false; |
2255 |
+ |
LOCK_EVENTS; |
2256 |
+ |
SDL_FreeCursor(sdl_cursor); |
2257 |
+ |
sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]); |
2258 |
+ |
if (sdl_cursor) { |
2259 |
+ |
SDL_ShowCursor(private_data == NULL || private_data->cursorVisible); |
2260 |
+ |
SDL_SetCursor(sdl_cursor); |
2261 |
+ |
#ifdef WIN32 |
2262 |
+ |
// XXX Windows apparently needs an extra mouse event to |
2263 |
+ |
// make the new cursor image visible |
2264 |
+ |
int visible = SDL_ShowCursor(-1); |
2265 |
+ |
if (visible) { |
2266 |
+ |
int x, y; |
2267 |
+ |
SDL_GetMouseState(&x, &y); |
2268 |
+ |
SDL_WarpMouse(x, y); |
2269 |
+ |
} |
2270 |
+ |
#endif |
2271 |
+ |
} |
2272 |
+ |
UNLOCK_EVENTS; |
2273 |
+ |
} |
2274 |
+ |
#endif |
2275 |
+ |
|
2276 |
+ |
// Set new palette if it was changed |
2277 |
+ |
handle_palette_changes(); |
2278 |
+ |
} |
2279 |
+ |
|
2280 |
+ |
// This function is called on non-threaded platforms from a timer interrupt |
2281 |
+ |
void VideoRefresh(void) |
2282 |
+ |
{ |
2283 |
+ |
// We need to check redraw_thread_active to inhibit refreshed during |
2284 |
+ |
// mode changes on non-threaded platforms |
2285 |
+ |
if (!redraw_thread_active) |
2286 |
+ |
return; |
2287 |
+ |
|
2288 |
+ |
// Process pending events and update display |
2289 |
+ |
do_video_refresh(); |
2290 |
+ |
} |
2291 |
+ |
|
2292 |
|
const int VIDEO_REFRESH_HZ = 60; |
2293 |
|
const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ; |
2294 |
|
|
2295 |
+ |
#ifndef USE_CPU_EMUL_SERVICES |
2296 |
|
static int redraw_func(void *arg) |
2297 |
|
{ |
2298 |
|
uint64 start = GetTicks_usec(); |
2318 |
|
} |
2319 |
|
#endif |
2320 |
|
|
2321 |
< |
// Handle SDL events |
2322 |
< |
handle_events(); |
2321 |
> |
// Process pending events and update display |
2322 |
> |
do_video_refresh(); |
2323 |
> |
} |
2324 |
> |
|
2325 |
> |
uint64 end = GetTicks_usec(); |
2326 |
> |
D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); |
2327 |
> |
return 0; |
2328 |
> |
} |
2329 |
> |
#endif |
2330 |
> |
|
2331 |
|
|
2332 |
< |
// Refresh display |
2333 |
< |
video_refresh(); |
2332 |
> |
/* |
2333 |
> |
* Record dirty area from NQD |
2334 |
> |
*/ |
2335 |
|
|
2336 |
|
#ifdef SHEEPSHAVER |
2337 |
< |
// Set new cursor image if it was changed |
2338 |
< |
if (cursor_changed && sdl_cursor) { |
2339 |
< |
cursor_changed = false; |
2340 |
< |
SDL_FreeCursor(sdl_cursor); |
2341 |
< |
sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]); |
2342 |
< |
if (sdl_cursor) |
2343 |
< |
SDL_SetCursor(sdl_cursor); |
1931 |
< |
} |
1932 |
< |
#endif |
2337 |
> |
void video_set_dirty_area(int x, int y, int w, int h) |
2338 |
> |
{ |
2339 |
> |
#ifdef ENABLE_VOSF |
2340 |
> |
const VIDEO_MODE &mode = drv->mode; |
2341 |
> |
const int screen_width = VIDEO_MODE_X; |
2342 |
> |
const int screen_height = VIDEO_MODE_Y; |
2343 |
> |
const int bytes_per_row = VIDEO_MODE_ROW_BYTES; |
2344 |
|
|
2345 |
< |
// Set new palette if it was changed |
2346 |
< |
handle_palette_changes(); |
2345 |
> |
if (use_vosf) { |
2346 |
> |
vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row); |
2347 |
> |
return; |
2348 |
|
} |
2349 |
+ |
#endif |
2350 |
|
|
2351 |
< |
uint64 end = GetTicks_usec(); |
1939 |
< |
D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); |
1940 |
< |
return 0; |
2351 |
> |
// XXX handle dirty bounding boxes for non-VOSF modes |
2352 |
|
} |
2353 |
+ |
#endif |