1 |
|
/* |
2 |
|
* video_sdl.cpp - Video/graphics emulation, SDL specific stuff |
3 |
|
* |
4 |
< |
* Basilisk II (C) 1997-2004 Christian Bauer |
4 |
> |
* Basilisk II (C) 1997-2005 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 |
+ |
* - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux |
31 |
|
* - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?) |
32 |
|
* - Mouse acceleration, there is no API in SDL yet for that |
33 |
|
* - Force relative mode in Grab mode even if SDL provides absolute coordinates? |
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. |
39 |
+ |
* - Refresh performance is still slow. Use SDL_CreateRGBSurface()? |
40 |
+ |
* - Backport hw cursor acceleration to Basilisk II? |
41 |
+ |
* - Factor out code |
42 |
|
*/ |
43 |
|
|
44 |
|
#include "sysdeps.h" |
47 |
|
#include <SDL_mutex.h> |
48 |
|
#include <SDL_thread.h> |
49 |
|
#include <errno.h> |
50 |
+ |
#include <vector> |
51 |
|
|
52 |
|
#include "cpu_emulation.h" |
53 |
|
#include "main.h" |
56 |
|
#include "prefs.h" |
57 |
|
#include "user_strings.h" |
58 |
|
#include "video.h" |
59 |
+ |
#include "video_defs.h" |
60 |
|
#include "video_blit.h" |
61 |
+ |
#include "vm_alloc.h" |
62 |
|
|
63 |
|
#define DEBUG 0 |
64 |
|
#include "debug.h" |
65 |
|
|
66 |
|
|
67 |
|
// Supported video modes |
68 |
< |
static vector<video_mode> VideoModes; |
68 |
> |
using std::vector; |
69 |
> |
static vector<VIDEO_MODE> VideoModes; |
70 |
|
|
71 |
|
// Display types |
72 |
+ |
#ifdef SHEEPSHAVER |
73 |
|
enum { |
74 |
< |
DISPLAY_WINDOW, // windowed display |
75 |
< |
DISPLAY_SCREEN // fullscreen display |
74 |
> |
DISPLAY_WINDOW = DIS_WINDOW, // windowed display |
75 |
> |
DISPLAY_SCREEN = DIS_SCREEN // fullscreen display |
76 |
|
}; |
77 |
+ |
extern int display_type; // See enum above |
78 |
+ |
#else |
79 |
+ |
enum { |
80 |
+ |
DISPLAY_WINDOW, // windowed display |
81 |
+ |
DISPLAY_SCREEN // fullscreen display |
82 |
+ |
}; |
83 |
+ |
static int display_type = DISPLAY_WINDOW; // See enum above |
84 |
+ |
#endif |
85 |
|
|
86 |
|
// Constants |
87 |
+ |
#ifdef WIN32 |
88 |
+ |
const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes"; |
89 |
+ |
#else |
90 |
|
const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes"; |
91 |
+ |
#endif |
92 |
|
|
93 |
|
|
94 |
|
// Global variables |
96 |
|
static int16 mouse_wheel_mode; |
97 |
|
static int16 mouse_wheel_lines; |
98 |
|
|
78 |
– |
static int display_type = DISPLAY_WINDOW; // See enum above |
99 |
|
static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into) |
100 |
|
static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes) |
101 |
|
static uint32 the_buffer_size; // Size of allocated the_buffer |
103 |
|
static bool redraw_thread_active = false; // Flag: Redraw thread installed |
104 |
|
static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread |
105 |
|
static SDL_Thread *redraw_thread = NULL; // Redraw thread |
106 |
+ |
static volatile bool thread_stop_req = false; |
107 |
+ |
static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req |
108 |
|
|
109 |
|
#ifdef ENABLE_VOSF |
110 |
< |
static bool use_vosf = true; // Flag: VOSF enabled |
110 |
> |
static bool use_vosf = false; // Flag: VOSF enabled |
111 |
|
#else |
112 |
|
static const bool use_vosf = false; // VOSF not possible |
113 |
|
#endif |
125 |
|
|
126 |
|
// SDL variables |
127 |
|
static int screen_depth; // Depth of current screen |
128 |
+ |
static SDL_Cursor *sdl_cursor; // Copy of Mac cursor |
129 |
+ |
static volatile bool cursor_changed = false; // Flag: cursor changed, redraw_func must update the cursor |
130 |
|
static SDL_Color sdl_palette[256]; // Color palette to be used as CLUT and gamma table |
131 |
|
static bool sdl_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors |
132 |
|
static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK; |
154 |
|
|
155 |
|
|
156 |
|
/* |
157 |
+ |
* Framebuffer allocation routines |
158 |
+ |
*/ |
159 |
+ |
|
160 |
+ |
static void *vm_acquire_framebuffer(uint32 size) |
161 |
+ |
{ |
162 |
+ |
#ifdef SHEEPSHAVER |
163 |
+ |
#ifdef DIRECT_ADDRESSING_HACK |
164 |
+ |
const uint32 FRAME_BUFFER_BASE = 0x61000000; |
165 |
+ |
uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE); |
166 |
+ |
if (vm_acquire_fixed(fb, size) < 0) |
167 |
+ |
fb = VM_MAP_FAILED; |
168 |
+ |
return fb; |
169 |
+ |
#endif |
170 |
+ |
#endif |
171 |
+ |
return vm_acquire(size); |
172 |
+ |
} |
173 |
+ |
|
174 |
+ |
static inline void vm_release_framebuffer(void *fb, uint32 size) |
175 |
+ |
{ |
176 |
+ |
vm_release(fb, size); |
177 |
+ |
} |
178 |
+ |
|
179 |
+ |
|
180 |
+ |
/* |
181 |
+ |
* SheepShaver glue |
182 |
+ |
*/ |
183 |
+ |
|
184 |
+ |
#ifdef SHEEPSHAVER |
185 |
+ |
// Color depth modes type |
186 |
+ |
typedef int video_depth; |
187 |
+ |
|
188 |
+ |
// 1, 2, 4 and 8 bit depths use a color palette |
189 |
+ |
static inline bool IsDirectMode(VIDEO_MODE const & mode) |
190 |
+ |
{ |
191 |
+ |
return IsDirectMode(mode.viAppleMode); |
192 |
+ |
} |
193 |
+ |
|
194 |
+ |
// Abstract base class representing one (possibly virtual) monitor |
195 |
+ |
// ("monitor" = rectangular display with a contiguous frame buffer) |
196 |
+ |
class monitor_desc { |
197 |
+ |
public: |
198 |
+ |
monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) {} |
199 |
+ |
virtual ~monitor_desc() {} |
200 |
+ |
|
201 |
+ |
// Get current Mac frame buffer base address |
202 |
+ |
uint32 get_mac_frame_base(void) const {return screen_base;} |
203 |
+ |
|
204 |
+ |
// Set Mac frame buffer base address (called from switch_to_mode()) |
205 |
+ |
void set_mac_frame_base(uint32 base) {screen_base = base;} |
206 |
+ |
|
207 |
+ |
// Get current video mode |
208 |
+ |
const VIDEO_MODE &get_current_mode(void) const {return VModes[cur_mode];} |
209 |
+ |
|
210 |
+ |
// Called by the video driver to switch the video mode on this display |
211 |
+ |
// (must call set_mac_frame_base()) |
212 |
+ |
virtual void switch_to_current_mode(void) = 0; |
213 |
+ |
|
214 |
+ |
// Called by the video driver to set the color palette (in indexed modes) |
215 |
+ |
// or the gamma table (in direct modes) |
216 |
+ |
virtual void set_palette(uint8 *pal, int num) = 0; |
217 |
+ |
}; |
218 |
+ |
|
219 |
+ |
// Vector of pointers to available monitor descriptions, filled by VideoInit() |
220 |
+ |
static vector<monitor_desc *> VideoMonitors; |
221 |
+ |
|
222 |
+ |
// Find Apple mode matching best specified dimensions |
223 |
+ |
static int find_apple_resolution(int xsize, int ysize) |
224 |
+ |
{ |
225 |
+ |
int apple_id; |
226 |
+ |
if (xsize < 800) |
227 |
+ |
apple_id = APPLE_640x480; |
228 |
+ |
else if (xsize < 1024) |
229 |
+ |
apple_id = APPLE_800x600; |
230 |
+ |
else if (xsize < 1152) |
231 |
+ |
apple_id = APPLE_1024x768; |
232 |
+ |
else if (xsize < 1280) { |
233 |
+ |
if (ysize < 900) |
234 |
+ |
apple_id = APPLE_1152x768; |
235 |
+ |
else |
236 |
+ |
apple_id = APPLE_1152x900; |
237 |
+ |
} |
238 |
+ |
else if (xsize < 1600) |
239 |
+ |
apple_id = APPLE_1280x1024; |
240 |
+ |
else |
241 |
+ |
apple_id = APPLE_1600x1200; |
242 |
+ |
return apple_id; |
243 |
+ |
} |
244 |
+ |
|
245 |
+ |
// Set parameters to specified Apple mode |
246 |
+ |
static void set_apple_resolution(int apple_id, int &xsize, int &ysize) |
247 |
+ |
{ |
248 |
+ |
switch (apple_id) { |
249 |
+ |
case APPLE_640x480: |
250 |
+ |
xsize = 640; |
251 |
+ |
ysize = 480; |
252 |
+ |
break; |
253 |
+ |
case APPLE_800x600: |
254 |
+ |
xsize = 800; |
255 |
+ |
ysize = 600; |
256 |
+ |
break; |
257 |
+ |
case APPLE_1024x768: |
258 |
+ |
xsize = 1024; |
259 |
+ |
ysize = 768; |
260 |
+ |
break; |
261 |
+ |
case APPLE_1152x768: |
262 |
+ |
xsize = 1152; |
263 |
+ |
ysize = 768; |
264 |
+ |
break; |
265 |
+ |
case APPLE_1152x900: |
266 |
+ |
xsize = 1152; |
267 |
+ |
ysize = 900; |
268 |
+ |
break; |
269 |
+ |
case APPLE_1280x1024: |
270 |
+ |
xsize = 1280; |
271 |
+ |
ysize = 1024; |
272 |
+ |
break; |
273 |
+ |
case APPLE_1600x1200: |
274 |
+ |
xsize = 1600; |
275 |
+ |
ysize = 1200; |
276 |
+ |
break; |
277 |
+ |
default: |
278 |
+ |
abort(); |
279 |
+ |
} |
280 |
+ |
} |
281 |
+ |
|
282 |
+ |
// Match Apple mode matching best specified dimensions |
283 |
+ |
static int match_apple_resolution(int &xsize, int &ysize) |
284 |
+ |
{ |
285 |
+ |
int apple_id = find_apple_resolution(xsize, ysize); |
286 |
+ |
set_apple_resolution(apple_id, xsize, ysize); |
287 |
+ |
return apple_id; |
288 |
+ |
} |
289 |
+ |
|
290 |
+ |
// Display error alert |
291 |
+ |
static void ErrorAlert(int error) |
292 |
+ |
{ |
293 |
+ |
ErrorAlert(GetString(error)); |
294 |
+ |
} |
295 |
+ |
|
296 |
+ |
// Display warning alert |
297 |
+ |
static void WarningAlert(int warning) |
298 |
+ |
{ |
299 |
+ |
WarningAlert(GetString(warning)); |
300 |
+ |
} |
301 |
+ |
#endif |
302 |
+ |
|
303 |
+ |
|
304 |
+ |
/* |
305 |
|
* monitor_desc subclass for SDL display |
306 |
|
*/ |
307 |
|
|
308 |
|
class SDL_monitor_desc : public monitor_desc { |
309 |
|
public: |
310 |
< |
SDL_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {} |
310 |
> |
SDL_monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {} |
311 |
|
~SDL_monitor_desc() {} |
312 |
|
|
313 |
|
virtual void switch_to_current_mode(void); |
322 |
|
* Utility functions |
323 |
|
*/ |
324 |
|
|
325 |
+ |
// Find palette size for given color depth |
326 |
+ |
static int palette_size(int mode) |
327 |
+ |
{ |
328 |
+ |
switch (mode) { |
329 |
+ |
case VIDEO_DEPTH_1BIT: return 2; |
330 |
+ |
case VIDEO_DEPTH_2BIT: return 4; |
331 |
+ |
case VIDEO_DEPTH_4BIT: return 16; |
332 |
+ |
case VIDEO_DEPTH_8BIT: return 256; |
333 |
+ |
case VIDEO_DEPTH_16BIT: return 32; |
334 |
+ |
case VIDEO_DEPTH_32BIT: return 256; |
335 |
+ |
default: return 0; |
336 |
+ |
} |
337 |
+ |
} |
338 |
+ |
|
339 |
+ |
// Return bytes per pixel for requested depth |
340 |
+ |
static inline int bytes_per_pixel(int depth) |
341 |
+ |
{ |
342 |
+ |
int bpp; |
343 |
+ |
switch (depth) { |
344 |
+ |
case 8: |
345 |
+ |
bpp = 1; |
346 |
+ |
break; |
347 |
+ |
case 15: case 16: |
348 |
+ |
bpp = 2; |
349 |
+ |
break; |
350 |
+ |
case 24: case 32: |
351 |
+ |
bpp = 4; |
352 |
+ |
break; |
353 |
+ |
default: |
354 |
+ |
abort(); |
355 |
+ |
} |
356 |
+ |
return bpp; |
357 |
+ |
} |
358 |
+ |
|
359 |
|
// Map video_mode depth ID to numerical depth value |
360 |
< |
static int sdl_depth_of_video_depth(int video_depth) |
360 |
> |
static int mac_depth_of_video_depth(int video_depth) |
361 |
|
{ |
362 |
|
int depth = -1; |
363 |
|
switch (video_depth) { |
364 |
< |
case VDEPTH_1BIT: |
364 |
> |
case VIDEO_DEPTH_1BIT: |
365 |
|
depth = 1; |
366 |
|
break; |
367 |
< |
case VDEPTH_2BIT: |
367 |
> |
case VIDEO_DEPTH_2BIT: |
368 |
|
depth = 2; |
369 |
|
break; |
370 |
< |
case VDEPTH_4BIT: |
370 |
> |
case VIDEO_DEPTH_4BIT: |
371 |
|
depth = 4; |
372 |
|
break; |
373 |
< |
case VDEPTH_8BIT: |
373 |
> |
case VIDEO_DEPTH_8BIT: |
374 |
|
depth = 8; |
375 |
|
break; |
376 |
< |
case VDEPTH_16BIT: |
376 |
> |
case VIDEO_DEPTH_16BIT: |
377 |
|
depth = 16; |
378 |
|
break; |
379 |
< |
case VDEPTH_32BIT: |
379 |
> |
case VIDEO_DEPTH_32BIT: |
380 |
|
depth = 32; |
381 |
|
break; |
382 |
|
default: |
385 |
|
return depth; |
386 |
|
} |
387 |
|
|
388 |
+ |
// Map video_mode depth ID to SDL screen depth |
389 |
+ |
static int sdl_depth_of_video_depth(int video_depth) |
390 |
+ |
{ |
391 |
+ |
return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth); |
392 |
+ |
} |
393 |
+ |
|
394 |
+ |
// Check wether specified mode is available |
395 |
+ |
static bool has_mode(int type, int width, int height) |
396 |
+ |
{ |
397 |
+ |
#ifdef SHEEPSHAVER |
398 |
+ |
// Filter out Classic resolutiosn |
399 |
+ |
if (width == 512 && height == 384) |
400 |
+ |
return false; |
401 |
+ |
|
402 |
+ |
// "screen" prefs items always succeeds |
403 |
+ |
if (PrefsFindString("screen")) |
404 |
+ |
return true; |
405 |
+ |
|
406 |
+ |
// Read window & screen modes prefs |
407 |
+ |
static uint32 window_modes = 0; |
408 |
+ |
static uint32 screen_modes = 0; |
409 |
+ |
if (window_modes == 0 || screen_modes == 0) { |
410 |
+ |
window_modes = PrefsFindInt32("windowmodes"); |
411 |
+ |
screen_modes = PrefsFindInt32("screenmodes"); |
412 |
+ |
if (window_modes == 0 || screen_modes == 0) |
413 |
+ |
window_modes |= 3; // Allow at least 640x480 and 800x600 window modes |
414 |
+ |
} |
415 |
+ |
|
416 |
+ |
int test_modes; |
417 |
+ |
switch (type) { |
418 |
+ |
case DISPLAY_WINDOW: |
419 |
+ |
test_modes = window_modes; |
420 |
+ |
break; |
421 |
+ |
case DISPLAY_SCREEN: |
422 |
+ |
test_modes = screen_modes; |
423 |
+ |
break; |
424 |
+ |
default: |
425 |
+ |
test_modes = 0; |
426 |
+ |
break; |
427 |
+ |
} |
428 |
+ |
|
429 |
+ |
int apple_mask; |
430 |
+ |
switch (find_apple_resolution(width, height)) { |
431 |
+ |
case APPLE_640x480: apple_mask = 0x01; break; |
432 |
+ |
case APPLE_800x600: apple_mask = 0x02; break; |
433 |
+ |
case APPLE_1024x768: apple_mask = 0x04; break; |
434 |
+ |
case APPLE_1152x768: apple_mask = 0x40; break; |
435 |
+ |
case APPLE_1152x900: apple_mask = 0x08; break; |
436 |
+ |
case APPLE_1280x1024: apple_mask = 0x10; break; |
437 |
+ |
case APPLE_1600x1200: apple_mask = 0x20; break; |
438 |
+ |
default: apple_mask = 0x00; break; |
439 |
+ |
} |
440 |
+ |
return (test_modes & apple_mask); |
441 |
+ |
#endif |
442 |
+ |
return true; |
443 |
+ |
} |
444 |
+ |
|
445 |
|
// Add mode to list of supported modes |
446 |
< |
static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth) |
446 |
> |
static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth) |
447 |
|
{ |
448 |
< |
video_mode mode; |
449 |
< |
mode.x = width; |
450 |
< |
mode.y = height; |
451 |
< |
mode.resolution_id = resolution_id; |
452 |
< |
mode.bytes_per_row = bytes_per_row; |
453 |
< |
mode.depth = depth; |
448 |
> |
// Filter out unsupported modes |
449 |
> |
if (!has_mode(type, width, height)) |
450 |
> |
return; |
451 |
> |
|
452 |
> |
// Fill in VideoMode entry |
453 |
> |
VIDEO_MODE mode; |
454 |
> |
#ifdef SHEEPSHAVER |
455 |
> |
// Recalculate dimensions to fit Apple modes |
456 |
> |
resolution_id = match_apple_resolution(width, height); |
457 |
> |
mode.viType = type; |
458 |
> |
#endif |
459 |
> |
VIDEO_MODE_X = width; |
460 |
> |
VIDEO_MODE_Y = height; |
461 |
> |
VIDEO_MODE_RESOLUTION = resolution_id; |
462 |
> |
VIDEO_MODE_ROW_BYTES = bytes_per_row; |
463 |
> |
VIDEO_MODE_DEPTH = (video_depth)depth; |
464 |
|
VideoModes.push_back(mode); |
465 |
|
} |
466 |
|
|
467 |
|
// Add standard list of windowed modes for given color depth |
468 |
< |
static void add_window_modes(video_depth depth) |
468 |
> |
static void add_window_modes(int depth) |
469 |
|
{ |
470 |
< |
add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth); |
471 |
< |
add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth); |
472 |
< |
add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth); |
473 |
< |
add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth); |
474 |
< |
add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth); |
475 |
< |
add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth); |
476 |
< |
add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth); |
470 |
> |
video_depth vdepth = (video_depth)depth; |
471 |
> |
add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth); |
472 |
> |
add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth); |
473 |
> |
add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth); |
474 |
> |
add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth); |
475 |
> |
add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth); |
476 |
> |
add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth); |
477 |
> |
add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth); |
478 |
|
} |
479 |
|
|
480 |
|
// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac) |
481 |
< |
static void set_mac_frame_buffer(SDL_monitor_desc &monitor, video_depth depth, bool native_byte_order) |
481 |
> |
static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order) |
482 |
|
{ |
483 |
|
#if !REAL_ADDRESSING && !DIRECT_ADDRESSING |
484 |
|
int layout = FLAYOUT_DIRECT; |
485 |
< |
if (depth == VDEPTH_16BIT) |
485 |
> |
if (depth == VIDEO_DEPTH_16BIT) |
486 |
|
layout = (screen_depth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565; |
487 |
< |
else if (depth == VDEPTH_32BIT) |
487 |
> |
else if (depth == VIDEO_DEPTH_32BIT) |
488 |
|
layout = (screen_depth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT; |
489 |
|
if (native_byte_order) |
490 |
|
MacFrameLayout = layout; |
493 |
|
monitor.set_mac_frame_base(MacFrameBaseMac); |
494 |
|
|
495 |
|
// Set variables used by UAE memory banking |
496 |
< |
const video_mode &mode = monitor.get_current_mode(); |
496 |
> |
const VIDEO_MODE &mode = monitor.get_current_mode(); |
497 |
|
MacFrameBaseHost = the_buffer; |
498 |
< |
MacFrameSize = mode.bytes_per_row * mode.y; |
498 |
> |
MacFrameSize = VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y; |
499 |
|
InitFrameBufferMapping(); |
500 |
|
#else |
501 |
|
monitor.set_mac_frame_base(Host2MacAddr(the_buffer)); |
516 |
|
// Set mouse grab mode |
517 |
|
static SDL_GrabMode set_grab_mode(SDL_GrabMode mode) |
518 |
|
{ |
519 |
< |
const SDL_VideoInfo *vi =SDL_GetVideoInfo(); |
519 |
> |
const SDL_VideoInfo *vi = SDL_GetVideoInfo(); |
520 |
|
return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF); |
521 |
|
} |
522 |
|
|
544 |
|
|
545 |
|
public: |
546 |
|
SDL_monitor_desc &monitor; // Associated video monitor |
547 |
< |
const video_mode &mode; // Video mode handled by the driver |
547 |
> |
const VIDEO_MODE &mode; // Video mode handled by the driver |
548 |
|
|
549 |
|
bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer) |
550 |
|
SDL_Surface *s; // The surface we draw into |
575 |
|
int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode) |
576 |
|
}; |
577 |
|
|
578 |
+ |
class driver_fullscreen : public driver_base { |
579 |
+ |
public: |
580 |
+ |
driver_fullscreen(SDL_monitor_desc &monitor); |
581 |
+ |
~driver_fullscreen(); |
582 |
+ |
}; |
583 |
+ |
|
584 |
|
static driver_base *drv = NULL; // Pointer to currently used driver object |
585 |
|
|
586 |
|
#ifdef ENABLE_VOSF |
602 |
|
if (s) |
603 |
|
SDL_FreeSurface(s); |
604 |
|
|
605 |
+ |
// the_buffer shall always be mapped through vm_acquire_framebuffer() |
606 |
+ |
if (the_buffer != VM_MAP_FAILED) { |
607 |
+ |
D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size)); |
608 |
+ |
vm_release_framebuffer(the_buffer, the_buffer_size); |
609 |
+ |
the_buffer = NULL; |
610 |
+ |
} |
611 |
+ |
|
612 |
|
// Free frame buffer(s) |
613 |
|
if (!use_vosf) { |
327 |
– |
if (the_buffer) { |
328 |
– |
free(the_buffer); |
329 |
– |
the_buffer = NULL; |
330 |
– |
} |
614 |
|
if (the_buffer_copy) { |
615 |
|
free(the_buffer_copy); |
616 |
|
the_buffer_copy = NULL; |
618 |
|
} |
619 |
|
#ifdef ENABLE_VOSF |
620 |
|
else { |
338 |
– |
// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will |
339 |
– |
if (the_buffer != VM_MAP_FAILED) { |
340 |
– |
D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size)); |
341 |
– |
vm_release(the_buffer, the_buffer_size); |
342 |
– |
the_buffer = NULL; |
343 |
– |
} |
621 |
|
if (the_host_buffer) { |
622 |
|
D(bug(" freeing the_host_buffer at %p\n", the_host_buffer)); |
623 |
|
free(the_host_buffer); |
628 |
|
free(the_buffer_copy); |
629 |
|
the_buffer_copy = NULL; |
630 |
|
} |
631 |
+ |
|
632 |
+ |
// Deinitialize VOSF |
633 |
+ |
video_vosf_exit(); |
634 |
|
} |
635 |
|
#endif |
636 |
|
} |
638 |
|
// Palette has changed |
639 |
|
void driver_base::update_palette(void) |
640 |
|
{ |
641 |
< |
const video_mode &mode = monitor.get_current_mode(); |
641 |
> |
const VIDEO_MODE &mode = monitor.get_current_mode(); |
642 |
|
|
643 |
< |
if (mode.depth <= VDEPTH_8BIT) |
643 |
> |
if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT) |
644 |
|
SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256); |
645 |
|
} |
646 |
|
|
663 |
|
driver_window::driver_window(SDL_monitor_desc &m) |
664 |
|
: driver_base(m), mouse_grabbed(false) |
665 |
|
{ |
666 |
< |
int width = mode.x, height = mode.y; |
666 |
> |
int width = VIDEO_MODE_X, height = VIDEO_MODE_Y; |
667 |
|
int aligned_width = (width + 15) & ~15; |
668 |
|
int aligned_height = (height + 15) & ~15; |
669 |
|
|
671 |
|
ADBSetRelMouseMode(mouse_grabbed); |
672 |
|
|
673 |
|
// Create surface |
674 |
< |
int depth = (mode.depth <= VDEPTH_8BIT ? 8 : screen_depth); |
674 |
> |
int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH); |
675 |
|
if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL) |
676 |
|
return; |
677 |
|
|
680 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
681 |
|
the_host_buffer = (uint8 *)s->pixels; |
682 |
|
the_buffer_size = page_extend((aligned_height + 2) * s->pitch); |
683 |
< |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
683 |
> |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
684 |
|
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
685 |
|
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); |
686 |
+ |
|
687 |
+ |
// Check whether we can initialize the VOSF subsystem and it's profitable |
688 |
+ |
if (!video_vosf_init(m)) { |
689 |
+ |
WarningAlert(STR_VOSF_INIT_ERR); |
690 |
+ |
use_vosf = false; |
691 |
+ |
} |
692 |
+ |
else if (!video_vosf_profitable()) { |
693 |
+ |
video_vosf_exit(); |
694 |
+ |
printf("VOSF acceleration is not profitable on this platform, disabling it\n"); |
695 |
+ |
use_vosf = false; |
696 |
+ |
} |
697 |
+ |
if (!use_vosf) { |
698 |
+ |
free(the_buffer_copy); |
699 |
+ |
vm_release(the_buffer, the_buffer_size); |
700 |
+ |
the_host_buffer = NULL; |
701 |
+ |
} |
702 |
+ |
#endif |
703 |
+ |
if (!use_vosf) { |
704 |
+ |
// Allocate memory for frame buffer |
705 |
+ |
the_buffer_size = (aligned_height + 2) * s->pitch; |
706 |
+ |
the_buffer_copy = (uint8 *)calloc(1, the_buffer_size); |
707 |
+ |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
708 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); |
709 |
+ |
} |
710 |
+ |
|
711 |
+ |
#ifdef SHEEPSHAVER |
712 |
+ |
// Create cursor |
713 |
+ |
if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) { |
714 |
+ |
SDL_SetCursor(sdl_cursor); |
715 |
+ |
cursor_changed = false; |
716 |
+ |
} |
717 |
|
#else |
718 |
< |
// Allocate memory for frame buffer |
719 |
< |
the_buffer_size = (aligned_height + 2) * s->pitch; |
409 |
< |
the_buffer_copy = (uint8 *)calloc(1, the_buffer_size); |
410 |
< |
the_buffer = (uint8 *)calloc(1, the_buffer_size); |
411 |
< |
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); |
718 |
> |
// Hide cursor |
719 |
> |
SDL_ShowCursor(0); |
720 |
|
#endif |
721 |
|
|
722 |
|
// Set window name/class |
723 |
|
set_window_name(STR_WINDOW_TITLE); |
724 |
|
|
417 |
– |
// Hide cursor |
418 |
– |
SDL_ShowCursor(0); |
419 |
– |
|
725 |
|
// Init blitting routines |
726 |
|
SDL_PixelFormat *f = s->format; |
727 |
|
VisualFormat visualFormat; |
729 |
|
visualFormat.Rmask = f->Rmask; |
730 |
|
visualFormat.Gmask = f->Gmask; |
731 |
|
visualFormat.Bmask = f->Bmask; |
732 |
< |
Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(mode.depth)); |
732 |
> |
Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH)); |
733 |
|
|
734 |
|
// Load gray ramp to 8->16/32 expand map |
735 |
|
if (!IsDirectMode(mode)) |
737 |
|
ExpandMap[i] = SDL_MapRGB(f, i, i, i); |
738 |
|
|
739 |
|
// Set frame buffer base |
740 |
< |
set_mac_frame_buffer(monitor, mode.depth, true); |
740 |
> |
set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true); |
741 |
|
|
742 |
|
// Everything went well |
743 |
|
init_ok = true; |
796 |
|
ADBMouseMoved(x, y); |
797 |
|
} |
798 |
|
|
799 |
+ |
|
800 |
+ |
/* |
801 |
+ |
* Full-screen display driver |
802 |
+ |
*/ |
803 |
+ |
|
804 |
+ |
// Open display |
805 |
+ |
driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m) |
806 |
+ |
: driver_base(m) |
807 |
+ |
{ |
808 |
+ |
int width = VIDEO_MODE_X, height = VIDEO_MODE_Y; |
809 |
+ |
int aligned_width = (width + 15) & ~15; |
810 |
+ |
int aligned_height = (height + 15) & ~15; |
811 |
+ |
|
812 |
+ |
// Set absolute mouse mode |
813 |
+ |
ADBSetRelMouseMode(false); |
814 |
+ |
|
815 |
+ |
// Create surface |
816 |
+ |
int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH); |
817 |
+ |
if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL) |
818 |
+ |
return; |
819 |
+ |
|
820 |
+ |
#ifdef ENABLE_VOSF |
821 |
+ |
use_vosf = true; |
822 |
+ |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
823 |
+ |
the_host_buffer = (uint8 *)s->pixels; |
824 |
+ |
the_buffer_size = page_extend((aligned_height + 2) * s->pitch); |
825 |
+ |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
826 |
+ |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
827 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); |
828 |
+ |
|
829 |
+ |
// Check whether we can initialize the VOSF subsystem and it's profitable |
830 |
+ |
if (!video_vosf_init(m)) { |
831 |
+ |
WarningAlert(STR_VOSF_INIT_ERR); |
832 |
+ |
use_vosf = false; |
833 |
+ |
} |
834 |
+ |
else if (!video_vosf_profitable()) { |
835 |
+ |
video_vosf_exit(); |
836 |
+ |
printf("VOSF acceleration is not profitable on this platform, disabling it\n"); |
837 |
+ |
use_vosf = false; |
838 |
+ |
} |
839 |
+ |
if (!use_vosf) { |
840 |
+ |
free(the_buffer_copy); |
841 |
+ |
vm_release(the_buffer, the_buffer_size); |
842 |
+ |
the_host_buffer = NULL; |
843 |
+ |
} |
844 |
+ |
#endif |
845 |
+ |
if (!use_vosf) { |
846 |
+ |
// Allocate memory for frame buffer |
847 |
+ |
the_buffer_size = (aligned_height + 2) * s->pitch; |
848 |
+ |
the_buffer_copy = (uint8 *)calloc(1, the_buffer_size); |
849 |
+ |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
850 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); |
851 |
+ |
} |
852 |
+ |
|
853 |
+ |
// Hide cursor |
854 |
+ |
SDL_ShowCursor(0); |
855 |
+ |
|
856 |
+ |
// Init blitting routines |
857 |
+ |
SDL_PixelFormat *f = s->format; |
858 |
+ |
VisualFormat visualFormat; |
859 |
+ |
visualFormat.depth = depth; |
860 |
+ |
visualFormat.Rmask = f->Rmask; |
861 |
+ |
visualFormat.Gmask = f->Gmask; |
862 |
+ |
visualFormat.Bmask = f->Bmask; |
863 |
+ |
Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH)); |
864 |
+ |
|
865 |
+ |
// Load gray ramp to 8->16/32 expand map |
866 |
+ |
if (!IsDirectMode(mode)) |
867 |
+ |
for (int i=0; i<256; i++) |
868 |
+ |
ExpandMap[i] = SDL_MapRGB(f, i, i, i); |
869 |
+ |
|
870 |
+ |
// Set frame buffer base |
871 |
+ |
set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true); |
872 |
+ |
|
873 |
+ |
// Everything went well |
874 |
+ |
init_ok = true; |
875 |
+ |
} |
876 |
+ |
|
877 |
+ |
// Close display |
878 |
+ |
driver_fullscreen::~driver_fullscreen() |
879 |
+ |
{ |
880 |
+ |
#ifdef ENABLE_VOSF |
881 |
+ |
if (use_vosf) |
882 |
+ |
the_host_buffer = NULL; // don't free() in driver_base dtor |
883 |
+ |
#endif |
884 |
+ |
if (s) |
885 |
+ |
SDL_FreeSurface(s); |
886 |
+ |
|
887 |
+ |
// Show cursor |
888 |
+ |
SDL_ShowCursor(1); |
889 |
+ |
} |
890 |
+ |
|
891 |
+ |
|
892 |
|
/* |
893 |
|
* Initialization |
894 |
|
*/ |
920 |
|
SDL_VideoDriverName(video_driver, sizeof(video_driver)); |
921 |
|
bool video_driver_found = false; |
922 |
|
char line[256]; |
923 |
+ |
int n_keys = 0; |
924 |
|
while (fgets(line, sizeof(line) - 1, f)) { |
925 |
|
// Read line |
926 |
|
int len = strlen(line); |
933 |
|
continue; |
934 |
|
|
935 |
|
if (video_driver_found) { |
936 |
< |
// Skip aliases |
937 |
< |
static const char alias_str[] = "alias"; |
938 |
< |
if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0) |
936 |
> |
// Skip aliases as long as we have read keycodes yet |
937 |
> |
// Otherwise, it's another mapping and we have to stop |
938 |
> |
static const char sdl_str[] = "sdl"; |
939 |
> |
if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0) |
940 |
|
continue; |
941 |
|
|
942 |
|
// Read keycode |
943 |
|
int x_code, mac_code; |
944 |
|
if (sscanf(line, "%d %d", &x_code, &mac_code) == 2) |
945 |
< |
keycode_table[x_code & 0xff] = mac_code; |
945 |
> |
keycode_table[x_code & 0xff] = mac_code, n_keys++; |
946 |
|
else |
947 |
|
break; |
948 |
|
} else { |
949 |
|
// Search for SDL video driver string |
950 |
< |
static const char alias_sdl_str[] = "alias SDL"; |
951 |
< |
if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) { |
952 |
< |
char *p = line + sizeof(alias_sdl_str); |
950 |
> |
static const char sdl_str[] = "sdl"; |
951 |
> |
if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) { |
952 |
> |
char *p = line + sizeof(sdl_str); |
953 |
|
if (strstr(video_driver, p) == video_driver) |
954 |
|
video_driver_found = true; |
955 |
|
} |
967 |
|
WarningAlert(str); |
968 |
|
return; |
969 |
|
} |
970 |
+ |
|
971 |
+ |
D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys)); |
972 |
|
} |
973 |
|
} |
974 |
|
|
976 |
|
bool SDL_monitor_desc::video_open(void) |
977 |
|
{ |
978 |
|
D(bug("video_open()\n")); |
979 |
< |
const video_mode &mode = get_current_mode(); |
979 |
> |
const VIDEO_MODE &mode = get_current_mode(); |
980 |
> |
#if DEBUG |
981 |
> |
D(bug("Current video mode:\n")); |
982 |
> |
D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f))); |
983 |
> |
#endif |
984 |
|
|
985 |
|
// Create display driver object of requested type |
986 |
|
switch (display_type) { |
987 |
|
case DISPLAY_WINDOW: |
988 |
|
drv = new(std::nothrow) driver_window(*this); |
989 |
|
break; |
990 |
+ |
case DISPLAY_SCREEN: |
991 |
+ |
drv = new(std::nothrow) driver_fullscreen(*this); |
992 |
+ |
break; |
993 |
|
} |
994 |
|
if (drv == NULL) |
995 |
|
return false; |
999 |
|
return false; |
1000 |
|
} |
1001 |
|
|
593 |
– |
#ifdef ENABLE_VOSF |
594 |
– |
if (use_vosf) { |
595 |
– |
// Initialize the VOSF system |
596 |
– |
if (!video_vosf_init(*this)) { |
597 |
– |
ErrorAlert(STR_VOSF_INIT_ERR); |
598 |
– |
return false; |
599 |
– |
} |
600 |
– |
} |
601 |
– |
#endif |
602 |
– |
|
1002 |
|
// Initialize VideoRefresh function |
1003 |
|
VideoRefreshInit(); |
1004 |
|
|
1007 |
|
|
1008 |
|
// Start redraw/input thread |
1009 |
|
redraw_thread_cancel = false; |
1010 |
< |
redraw_thread_active = (SDL_CreateThread(redraw_func, NULL) != NULL); |
1010 |
> |
redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL); |
1011 |
|
if (!redraw_thread_active) { |
1012 |
|
printf("FATAL: cannot create redraw thread\n"); |
1013 |
|
return false; |
1015 |
|
return true; |
1016 |
|
} |
1017 |
|
|
1018 |
+ |
#ifdef SHEEPSHAVER |
1019 |
+ |
bool VideoInit(void) |
1020 |
+ |
{ |
1021 |
+ |
const bool classic = false; |
1022 |
+ |
#else |
1023 |
|
bool VideoInit(bool classic) |
1024 |
|
{ |
1025 |
+ |
#endif |
1026 |
|
classic_mode = classic; |
1027 |
|
|
1028 |
|
#ifdef ENABLE_VOSF |
1046 |
|
mouse_wheel_lines = PrefsFindInt32("mousewheellines"); |
1047 |
|
|
1048 |
|
// Get screen mode from preferences |
1049 |
< |
const char *mode_str; |
1049 |
> |
const char *mode_str = NULL; |
1050 |
|
if (classic_mode) |
1051 |
|
mode_str = "win/512/342"; |
1052 |
|
else |
1053 |
|
mode_str = PrefsFindString("screen"); |
1054 |
|
|
1055 |
|
// Determine display type and default dimensions |
1056 |
< |
int default_width = 512, default_height = 384; |
1056 |
> |
int default_width, default_height; |
1057 |
> |
if (classic) { |
1058 |
> |
default_width = 512; |
1059 |
> |
default_height = 384; |
1060 |
> |
} |
1061 |
> |
else { |
1062 |
> |
default_width = 640; |
1063 |
> |
default_height = 480; |
1064 |
> |
} |
1065 |
|
display_type = DISPLAY_WINDOW; |
1066 |
|
if (mode_str) { |
1067 |
|
if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) |
1068 |
|
display_type = DISPLAY_WINDOW; |
1069 |
+ |
else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) |
1070 |
+ |
display_type = DISPLAY_SCREEN; |
1071 |
|
} |
1072 |
|
int max_width = 640, max_height = 480; |
1073 |
< |
if (display_type == DISPLAY_SCREEN) { |
1074 |
< |
SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); |
1075 |
< |
if (modes && modes != (SDL_Rect **)-1) { |
1076 |
< |
max_width = modes[0]->w; |
1077 |
< |
max_height = modes[0]->h; |
1073 |
> |
SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); |
1074 |
> |
if (modes && modes != (SDL_Rect **)-1) { |
1075 |
> |
// It turns out that on some implementations, and contrary to the documentation, |
1076 |
> |
// the returned list is not sorted from largest to smallest (e.g. Windows) |
1077 |
> |
for (int i = 0; modes[i] != NULL; i++) { |
1078 |
> |
const int w = modes[i]->w; |
1079 |
> |
const int h = modes[i]->h; |
1080 |
> |
if (w > max_width && h > max_height) { |
1081 |
> |
max_width = w; |
1082 |
> |
max_height = h; |
1083 |
> |
} |
1084 |
|
} |
1085 |
+ |
if (default_width > max_width) |
1086 |
+ |
default_width = max_width; |
1087 |
+ |
if (default_height > max_height) |
1088 |
+ |
default_height = max_height; |
1089 |
|
} |
1090 |
|
if (default_width <= 0) |
1091 |
|
default_width = max_width; |
1094 |
|
|
1095 |
|
// Mac screen depth follows X depth |
1096 |
|
screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel; |
1097 |
< |
video_depth default_depth; |
1097 |
> |
int default_depth; |
1098 |
|
switch (screen_depth) { |
1099 |
|
case 8: |
1100 |
< |
default_depth = VDEPTH_8BIT; |
1100 |
> |
default_depth = VIDEO_DEPTH_8BIT; |
1101 |
|
break; |
1102 |
|
case 15: case 16: |
1103 |
< |
default_depth = VDEPTH_16BIT; |
1103 |
> |
default_depth = VIDEO_DEPTH_16BIT; |
1104 |
|
break; |
1105 |
|
case 24: case 32: |
1106 |
< |
default_depth = VDEPTH_32BIT; |
1106 |
> |
default_depth = VIDEO_DEPTH_32BIT; |
1107 |
|
break; |
1108 |
|
default: |
1109 |
< |
default_depth = VDEPTH_1BIT; |
1109 |
> |
default_depth = VIDEO_DEPTH_1BIT; |
1110 |
|
break; |
1111 |
|
} |
1112 |
|
|
1113 |
|
// Construct list of supported modes |
1114 |
|
if (display_type == DISPLAY_WINDOW) { |
1115 |
|
if (classic) |
1116 |
< |
add_mode(512, 342, 0x80, 64, VDEPTH_1BIT); |
1116 |
> |
add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT); |
1117 |
|
else { |
1118 |
< |
for (int d = VDEPTH_1BIT; d <= default_depth; d++) { |
1119 |
< |
int bpp = (d <= VDEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d)); |
1118 |
> |
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) { |
1119 |
> |
int bpp = sdl_depth_of_video_depth(d); |
1120 |
|
if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE)) |
1121 |
|
add_window_modes(video_depth(d)); |
1122 |
|
} |
1123 |
|
} |
1124 |
< |
} else |
1125 |
< |
add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth); |
1124 |
> |
} else if (display_type == DISPLAY_SCREEN) { |
1125 |
> |
struct { |
1126 |
> |
int w; |
1127 |
> |
int h; |
1128 |
> |
int resolution_id; |
1129 |
> |
} |
1130 |
> |
video_modes[] = { |
1131 |
> |
{ -1, -1, 0x80 }, |
1132 |
> |
{ 640, 480, 0x81 }, |
1133 |
> |
{ 800, 600, 0x82 }, |
1134 |
> |
{ 1024, 768, 0x83 }, |
1135 |
> |
{ 1152, 870, 0x84 }, |
1136 |
> |
{ 1280, 1024, 0x85 }, |
1137 |
> |
{ 1600, 1200, 0x86 }, |
1138 |
> |
{ 0, } |
1139 |
> |
}; |
1140 |
> |
video_modes[0].w = default_width; |
1141 |
> |
video_modes[0].h = default_height; |
1142 |
> |
|
1143 |
> |
for (int i = 0; video_modes[i].w != 0; i++) { |
1144 |
> |
const int w = video_modes[i].w; |
1145 |
> |
const int h = video_modes[i].h; |
1146 |
> |
if (i > 0 && (w >= default_width || h >= default_height)) |
1147 |
> |
continue; |
1148 |
> |
#ifdef ENABLE_VOSF |
1149 |
> |
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) { |
1150 |
> |
int bpp = sdl_depth_of_video_depth(d); |
1151 |
> |
if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE | SDL_FULLSCREEN)) |
1152 |
> |
add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d); |
1153 |
> |
} |
1154 |
> |
#else |
1155 |
> |
add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth); |
1156 |
> |
#endif |
1157 |
> |
} |
1158 |
> |
} |
1159 |
> |
|
1160 |
|
if (VideoModes.empty()) { |
1161 |
|
ErrorAlert(STR_NO_XVISUAL_ERR); |
1162 |
|
return false; |
1164 |
|
|
1165 |
|
// Find requested default mode with specified dimensions |
1166 |
|
uint32 default_id; |
1167 |
< |
std::vector<video_mode>::const_iterator i, end = VideoModes.end(); |
1167 |
> |
std::vector<VIDEO_MODE>::const_iterator i, end = VideoModes.end(); |
1168 |
|
for (i = VideoModes.begin(); i != end; ++i) { |
1169 |
< |
if (i->x == default_width && i->y == default_height && i->depth == default_depth) { |
1170 |
< |
default_id = i->resolution_id; |
1169 |
> |
const VIDEO_MODE & mode = (*i); |
1170 |
> |
if (VIDEO_MODE_X == default_width && VIDEO_MODE_Y == default_height && VIDEO_MODE_DEPTH == default_depth) { |
1171 |
> |
default_id = VIDEO_MODE_RESOLUTION; |
1172 |
> |
#ifdef SHEEPSHAVER |
1173 |
> |
std::vector<VIDEO_MODE>::const_iterator begin = VideoModes.begin(); |
1174 |
> |
cur_mode = distance(begin, i); |
1175 |
> |
#endif |
1176 |
|
break; |
1177 |
|
} |
1178 |
|
} |
1179 |
|
if (i == end) { // not found, use first available mode |
1180 |
< |
default_depth = VideoModes[0].depth; |
1181 |
< |
default_id = VideoModes[0].resolution_id; |
1180 |
> |
const VIDEO_MODE & mode = VideoModes[0]; |
1181 |
> |
default_depth = VIDEO_MODE_DEPTH; |
1182 |
> |
default_id = VIDEO_MODE_RESOLUTION; |
1183 |
> |
#ifdef SHEEPSHAVER |
1184 |
> |
cur_mode = 0; |
1185 |
> |
#endif |
1186 |
|
} |
1187 |
|
|
1188 |
+ |
#ifdef SHEEPSHAVER |
1189 |
+ |
for (int i = 0; i < VideoModes.size(); i++) |
1190 |
+ |
VModes[i] = VideoModes[i]; |
1191 |
+ |
VideoInfo *p = &VModes[VideoModes.size()]; |
1192 |
+ |
p->viType = DIS_INVALID; // End marker |
1193 |
+ |
p->viRowBytes = 0; |
1194 |
+ |
p->viXsize = p->viYsize = 0; |
1195 |
+ |
p->viAppleMode = 0; |
1196 |
+ |
p->viAppleID = 0; |
1197 |
+ |
#endif |
1198 |
+ |
|
1199 |
|
#if DEBUG |
1200 |
|
D(bug("Available video modes:\n")); |
1201 |
|
for (i = VideoModes.begin(); i != end; ++i) { |
1202 |
< |
int bits = 1 << i->depth; |
1202 |
> |
const VIDEO_MODE & mode = (*i); |
1203 |
> |
int bits = 1 << VIDEO_MODE_DEPTH; |
1204 |
|
if (bits == 16) |
1205 |
|
bits = 15; |
1206 |
|
else if (bits == 32) |
1207 |
|
bits = 24; |
1208 |
< |
D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits)); |
1208 |
> |
D(bug(" %dx%d (ID %02x), %d colors\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << bits)); |
1209 |
|
} |
1210 |
|
#endif |
1211 |
|
|
1212 |
|
// Create SDL_monitor_desc for this (the only) display |
1213 |
< |
SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, default_depth, default_id); |
1213 |
> |
SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, (video_depth)default_depth, default_id); |
1214 |
|
VideoMonitors.push_back(monitor); |
1215 |
|
|
1216 |
|
// Open display |
1230 |
|
// Stop redraw thread |
1231 |
|
if (redraw_thread_active) { |
1232 |
|
redraw_thread_cancel = true; |
1233 |
< |
// SDL_WaitThread(redraw_thread, NULL); doesn't work |
754 |
< |
while (redraw_thread_cancel); |
1233 |
> |
SDL_WaitThread(redraw_thread, NULL); |
1234 |
|
} |
1235 |
|
redraw_thread_active = false; |
1236 |
|
|
1238 |
|
UNLOCK_FRAME_BUFFER; |
1239 |
|
D(bug(" frame buffer unlocked\n")); |
1240 |
|
|
762 |
– |
#ifdef ENABLE_VOSF |
763 |
– |
if (use_vosf) { |
764 |
– |
// Deinitialize VOSF |
765 |
– |
video_vosf_exit(); |
766 |
– |
} |
767 |
– |
#endif |
768 |
– |
|
1241 |
|
// Close display |
1242 |
|
delete drv; |
1243 |
|
drv = NULL; |
1273 |
|
* Mac VBL interrupt |
1274 |
|
*/ |
1275 |
|
|
1276 |
+ |
/* |
1277 |
+ |
* Execute video VBL routine |
1278 |
+ |
*/ |
1279 |
+ |
|
1280 |
+ |
#ifdef SHEEPSHAVER |
1281 |
+ |
void VideoVBL(void) |
1282 |
+ |
{ |
1283 |
+ |
// Emergency quit requested? Then quit |
1284 |
+ |
if (emerg_quit) |
1285 |
+ |
QuitEmulator(); |
1286 |
+ |
|
1287 |
+ |
// Temporarily give up frame buffer lock (this is the point where |
1288 |
+ |
// we are suspended when the user presses Ctrl-Tab) |
1289 |
+ |
UNLOCK_FRAME_BUFFER; |
1290 |
+ |
LOCK_FRAME_BUFFER; |
1291 |
+ |
|
1292 |
+ |
// Execute video VBL |
1293 |
+ |
if (private_data != NULL && private_data->interruptsEnabled) |
1294 |
+ |
VSLDoInterruptService(private_data->vslServiceID); |
1295 |
+ |
} |
1296 |
+ |
#else |
1297 |
|
void VideoInterrupt(void) |
1298 |
|
{ |
1299 |
|
// We must fill in the events queue in the same thread that did call SDL_SetVideoMode() |
1308 |
|
UNLOCK_FRAME_BUFFER; |
1309 |
|
LOCK_FRAME_BUFFER; |
1310 |
|
} |
1311 |
+ |
#endif |
1312 |
|
|
1313 |
|
|
1314 |
|
/* |
1315 |
|
* Set palette |
1316 |
|
*/ |
1317 |
|
|
1318 |
+ |
#ifdef SHEEPSHAVER |
1319 |
+ |
void video_set_palette(void) |
1320 |
+ |
{ |
1321 |
+ |
monitor_desc * monitor = VideoMonitors[0]; |
1322 |
+ |
int n_colors = palette_size(monitor->get_current_mode().viAppleMode); |
1323 |
+ |
uint8 pal[256 * 3]; |
1324 |
+ |
for (int c = 0; c < n_colors; c++) { |
1325 |
+ |
pal[c*3 + 0] = mac_pal[c].red; |
1326 |
+ |
pal[c*3 + 1] = mac_pal[c].green; |
1327 |
+ |
pal[c*3 + 2] = mac_pal[c].blue; |
1328 |
+ |
} |
1329 |
+ |
monitor->set_palette(pal, n_colors); |
1330 |
+ |
} |
1331 |
+ |
#endif |
1332 |
+ |
|
1333 |
|
void SDL_monitor_desc::set_palette(uint8 *pal, int num_in) |
1334 |
|
{ |
1335 |
< |
const video_mode &mode = get_current_mode(); |
1335 |
> |
const VIDEO_MODE &mode = get_current_mode(); |
1336 |
|
|
1337 |
|
// FIXME: how can we handle the gamma ramp? |
1338 |
< |
if (mode.depth > VDEPTH_8BIT) |
1338 |
> |
if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT) |
1339 |
|
return; |
1340 |
|
|
1341 |
|
LOCK_PALETTE; |
1360 |
|
} |
1361 |
|
|
1362 |
|
#ifdef ENABLE_VOSF |
1363 |
< |
// We have to redraw everything because the interpretation of pixel values changed |
1364 |
< |
LOCK_VOSF; |
1365 |
< |
PFLAG_SET_ALL; |
1366 |
< |
UNLOCK_VOSF; |
1367 |
< |
memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y); |
1363 |
> |
if (use_vosf) { |
1364 |
> |
// We have to redraw everything because the interpretation of pixel values changed |
1365 |
> |
LOCK_VOSF; |
1366 |
> |
PFLAG_SET_ALL; |
1367 |
> |
UNLOCK_VOSF; |
1368 |
> |
memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y); |
1369 |
> |
} |
1370 |
|
#endif |
1371 |
|
} |
1372 |
|
|
1381 |
|
* Switch video mode |
1382 |
|
*/ |
1383 |
|
|
1384 |
+ |
#ifdef SHEEPSHAVER |
1385 |
+ |
int16 video_mode_change(VidLocals *csSave, uint32 ParamPtr) |
1386 |
+ |
{ |
1387 |
+ |
/* return if no mode change */ |
1388 |
+ |
if ((csSave->saveData == ReadMacInt32(ParamPtr + csData)) && |
1389 |
+ |
(csSave->saveMode == ReadMacInt16(ParamPtr + csMode))) return noErr; |
1390 |
+ |
|
1391 |
+ |
/* first find video mode in table */ |
1392 |
+ |
for (int i=0; VModes[i].viType != DIS_INVALID; i++) { |
1393 |
+ |
if ((ReadMacInt16(ParamPtr + csMode) == VModes[i].viAppleMode) && |
1394 |
+ |
(ReadMacInt32(ParamPtr + csData) == VModes[i].viAppleID)) { |
1395 |
+ |
csSave->saveMode = ReadMacInt16(ParamPtr + csMode); |
1396 |
+ |
csSave->saveData = ReadMacInt32(ParamPtr + csData); |
1397 |
+ |
csSave->savePage = ReadMacInt16(ParamPtr + csPage); |
1398 |
+ |
|
1399 |
+ |
// Disable interrupts and pause redraw thread |
1400 |
+ |
DisableInterrupt(); |
1401 |
+ |
thread_stop_ack = false; |
1402 |
+ |
thread_stop_req = true; |
1403 |
+ |
while (!thread_stop_ack) ; |
1404 |
+ |
|
1405 |
+ |
cur_mode = i; |
1406 |
+ |
monitor_desc *monitor = VideoMonitors[0]; |
1407 |
+ |
monitor->switch_to_current_mode(); |
1408 |
+ |
|
1409 |
+ |
WriteMacInt32(ParamPtr + csBaseAddr, screen_base); |
1410 |
+ |
csSave->saveBaseAddr=screen_base; |
1411 |
+ |
csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */ |
1412 |
+ |
csSave->saveMode=VModes[cur_mode].viAppleMode; |
1413 |
+ |
|
1414 |
+ |
// Enable interrupts and resume redraw thread |
1415 |
+ |
thread_stop_req = false; |
1416 |
+ |
EnableInterrupt(); |
1417 |
+ |
return noErr; |
1418 |
+ |
} |
1419 |
+ |
} |
1420 |
+ |
return paramErr; |
1421 |
+ |
} |
1422 |
+ |
#endif |
1423 |
+ |
|
1424 |
|
void SDL_monitor_desc::switch_to_current_mode(void) |
1425 |
|
{ |
1426 |
|
// Close and reopen display |
1435 |
|
|
1436 |
|
|
1437 |
|
/* |
1438 |
< |
* Translate key event to Mac keycode, returns -1 if no keycode was found |
1439 |
< |
* and -2 if the key was recognized as a hotkey |
1438 |
> |
* Can we set the MacOS cursor image into the window? |
1439 |
> |
*/ |
1440 |
> |
|
1441 |
> |
#ifdef SHEEPSHAVER |
1442 |
> |
bool video_can_change_cursor(void) |
1443 |
> |
{ |
1444 |
> |
return (display_type == DISPLAY_WINDOW); |
1445 |
> |
} |
1446 |
> |
#endif |
1447 |
> |
|
1448 |
> |
|
1449 |
> |
/* |
1450 |
> |
* Set cursor image for window |
1451 |
|
*/ |
1452 |
|
|
1453 |
+ |
#ifdef SHEEPSHAVER |
1454 |
+ |
void video_set_cursor(void) |
1455 |
+ |
{ |
1456 |
+ |
cursor_changed = true; |
1457 |
+ |
} |
1458 |
+ |
#endif |
1459 |
+ |
|
1460 |
+ |
|
1461 |
+ |
/* |
1462 |
+ |
* Keyboard-related utilify functions |
1463 |
+ |
*/ |
1464 |
+ |
|
1465 |
+ |
static bool is_modifier_key(SDL_KeyboardEvent const & e) |
1466 |
+ |
{ |
1467 |
+ |
switch (e.keysym.sym) { |
1468 |
+ |
case SDLK_NUMLOCK: |
1469 |
+ |
case SDLK_CAPSLOCK: |
1470 |
+ |
case SDLK_SCROLLOCK: |
1471 |
+ |
case SDLK_RSHIFT: |
1472 |
+ |
case SDLK_LSHIFT: |
1473 |
+ |
case SDLK_RCTRL: |
1474 |
+ |
case SDLK_LCTRL: |
1475 |
+ |
case SDLK_RALT: |
1476 |
+ |
case SDLK_LALT: |
1477 |
+ |
case SDLK_RMETA: |
1478 |
+ |
case SDLK_LMETA: |
1479 |
+ |
case SDLK_LSUPER: |
1480 |
+ |
case SDLK_RSUPER: |
1481 |
+ |
case SDLK_MODE: |
1482 |
+ |
case SDLK_COMPOSE: |
1483 |
+ |
return true; |
1484 |
+ |
} |
1485 |
+ |
return false; |
1486 |
+ |
} |
1487 |
+ |
|
1488 |
|
static bool is_ctrl_down(SDL_keysym const & ks) |
1489 |
|
{ |
1490 |
|
return ctrl_down || (ks.mod & KMOD_CTRL); |
1491 |
|
} |
1492 |
|
|
1493 |
+ |
|
1494 |
+ |
/* |
1495 |
+ |
* Translate key event to Mac keycode, returns -1 if no keycode was found |
1496 |
+ |
* and -2 if the key was recognized as a hotkey |
1497 |
+ |
*/ |
1498 |
+ |
|
1499 |
|
static int kc_decode(SDL_keysym const & ks, bool key_down) |
1500 |
|
{ |
1501 |
|
switch (ks.sym) { |
1528 |
|
|
1529 |
|
case SDLK_1: case SDLK_EXCLAIM: return 0x12; |
1530 |
|
case SDLK_2: case SDLK_AT: return 0x13; |
1531 |
< |
// case SDLK_3: case SDLK_numbersign: return 0x14; |
1531 |
> |
case SDLK_3: case SDLK_HASH: return 0x14; |
1532 |
|
case SDLK_4: case SDLK_DOLLAR: return 0x15; |
1533 |
< |
// case SDLK_5: case SDLK_percent: return 0x17; |
1533 |
> |
case SDLK_5: return 0x17; |
1534 |
|
case SDLK_6: return 0x16; |
1535 |
|
case SDLK_7: return 0x1a; |
1536 |
|
case SDLK_8: return 0x1c; |
1537 |
|
case SDLK_9: return 0x19; |
1538 |
|
case SDLK_0: return 0x1d; |
1539 |
|
|
1540 |
< |
// case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a; |
1540 |
> |
case SDLK_BACKQUOTE: return 0x0a; |
1541 |
|
case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b; |
1542 |
|
case SDLK_EQUALS: case SDLK_PLUS: return 0x18; |
1543 |
< |
// case SDLK_bracketleft: case SDLK_braceleft: return 0x21; |
1544 |
< |
// case SDLK_bracketright: case SDLK_braceright: return 0x1e; |
1545 |
< |
// case SDLK_BACKSLASH: case SDLK_bar: return 0x2a; |
1543 |
> |
case SDLK_LEFTBRACKET: return 0x21; |
1544 |
> |
case SDLK_RIGHTBRACKET: return 0x1e; |
1545 |
> |
case SDLK_BACKSLASH: return 0x2a; |
1546 |
|
case SDLK_SEMICOLON: case SDLK_COLON: return 0x29; |
1547 |
< |
// case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27; |
1547 |
> |
case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27; |
1548 |
|
case SDLK_COMMA: case SDLK_LESS: return 0x2b; |
1549 |
|
case SDLK_PERIOD: case SDLK_GREATER: return 0x2f; |
1550 |
|
case SDLK_SLASH: case SDLK_QUESTION: return 0x2c; |
1565 |
|
case SDLK_RCTRL: return 0x36; |
1566 |
|
case SDLK_LSHIFT: return 0x38; |
1567 |
|
case SDLK_RSHIFT: return 0x38; |
1568 |
+ |
#if (defined(__APPLE__) && defined(__MACH__)) |
1569 |
+ |
case SDLK_LALT: return 0x3a; |
1570 |
+ |
case SDLK_RALT: return 0x3a; |
1571 |
+ |
case SDLK_LMETA: return 0x37; |
1572 |
+ |
case SDLK_RMETA: return 0x37; |
1573 |
+ |
#else |
1574 |
|
case SDLK_LALT: return 0x37; |
1575 |
|
case SDLK_RALT: return 0x37; |
1576 |
|
case SDLK_LMETA: return 0x3a; |
1577 |
|
case SDLK_RMETA: return 0x3a; |
1578 |
+ |
#endif |
1579 |
+ |
case SDLK_LSUPER: return 0x3a; // "Windows" key |
1580 |
+ |
case SDLK_RSUPER: return 0x3a; |
1581 |
|
case SDLK_MENU: return 0x32; |
1582 |
|
case SDLK_CAPSLOCK: return 0x39; |
1583 |
|
case SDLK_NUMLOCK: return 0x47; |
1684 |
|
// Keyboard |
1685 |
|
case SDL_KEYDOWN: { |
1686 |
|
int code = -1; |
1687 |
< |
if (use_keycodes) { |
1687 |
> |
if (use_keycodes && !is_modifier_key(event.key)) { |
1688 |
|
if (event2keycode(event.key, true) != -2) // This is called to process the hotkeys |
1689 |
|
code = keycode_table[event.key.keysym.scancode & 0xff]; |
1690 |
|
} else |
1712 |
|
} |
1713 |
|
case SDL_KEYUP: { |
1714 |
|
int code = -1; |
1715 |
< |
if (use_keycodes) { |
1715 |
> |
if (use_keycodes && !is_modifier_key(event.key)) { |
1716 |
|
if (event2keycode(event.key, false) != -2) // This is called to process the hotkeys |
1717 |
|
code = keycode_table[event.key.keysym.scancode & 0xff]; |
1718 |
|
} else |
1719 |
|
code = event2keycode(event.key, false); |
1720 |
< |
if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases |
1721 |
< |
ADBKeyUp(code); |
1720 |
> |
if (code >= 0) { |
1721 |
> |
if (code == 0x39) { // Caps Lock released |
1722 |
> |
if (caps_on) { |
1723 |
> |
ADBKeyUp(code); |
1724 |
> |
caps_on = false; |
1725 |
> |
} else { |
1726 |
> |
ADBKeyDown(code); |
1727 |
> |
caps_on = true; |
1728 |
> |
} |
1729 |
> |
} else |
1730 |
> |
ADBKeyUp(code); |
1731 |
|
if (code == 0x36) |
1732 |
|
ctrl_down = false; |
1733 |
|
} |
1737 |
|
// Hidden parts exposed, force complete refresh of window |
1738 |
|
case SDL_VIDEOEXPOSE: |
1739 |
|
if (display_type == DISPLAY_WINDOW) { |
1740 |
< |
const video_mode &mode = VideoMonitors[0]->get_current_mode(); |
1740 |
> |
const VIDEO_MODE &mode = VideoMonitors[0]->get_current_mode(); |
1741 |
|
#ifdef ENABLE_VOSF |
1742 |
|
if (use_vosf) { // VOSF refresh |
1743 |
|
LOCK_VOSF; |
1744 |
|
PFLAG_SET_ALL; |
1745 |
|
UNLOCK_VOSF; |
1746 |
< |
memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y); |
1746 |
> |
memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y); |
1747 |
|
} |
1748 |
|
else |
1749 |
|
#endif |
1750 |
< |
memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y); |
1750 |
> |
memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y); |
1751 |
|
} |
1752 |
|
break; |
1753 |
|
|
1771 |
|
{ |
1772 |
|
// Incremental update code |
1773 |
|
int wide = 0, high = 0, x1, x2, y1, y2, i, j; |
1774 |
< |
const video_mode &mode = drv->mode; |
1775 |
< |
int bytes_per_row = mode.bytes_per_row; |
1774 |
> |
const VIDEO_MODE &mode = drv->mode; |
1775 |
> |
int bytes_per_row = VIDEO_MODE_ROW_BYTES; |
1776 |
|
uint8 *p, *p2; |
1777 |
|
|
1778 |
|
// Check for first line from top and first line from bottom that have changed |
1779 |
|
y1 = 0; |
1780 |
< |
for (j=0; j<mode.y; j++) { |
1780 |
> |
for (j=0; j<VIDEO_MODE_Y; j++) { |
1781 |
|
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { |
1782 |
|
y1 = j; |
1783 |
|
break; |
1784 |
|
} |
1785 |
|
} |
1786 |
|
y2 = y1 - 1; |
1787 |
< |
for (j=mode.y-1; j>=y1; j--) { |
1787 |
> |
for (j=VIDEO_MODE_Y-1; j>=y1; j--) { |
1788 |
|
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { |
1789 |
|
y2 = j; |
1790 |
|
break; |
1794 |
|
|
1795 |
|
// Check for first column from left and first column from right that have changed |
1796 |
|
if (high) { |
1797 |
< |
if (mode.depth < VDEPTH_8BIT) { |
1797 |
> |
if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) { |
1798 |
|
const int src_bytes_per_row = bytes_per_row; |
1799 |
|
const int dst_bytes_per_row = drv->s->pitch; |
1800 |
< |
const int pixels_per_byte = mode.x / src_bytes_per_row; |
1800 |
> |
const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row; |
1801 |
|
|
1802 |
< |
x1 = mode.x / pixels_per_byte; |
1802 |
> |
x1 = VIDEO_MODE_X / pixels_per_byte; |
1803 |
|
for (j = y1; j <= y2; j++) { |
1804 |
|
p = &the_buffer[j * bytes_per_row]; |
1805 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1817 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1818 |
|
p += bytes_per_row; |
1819 |
|
p2 += bytes_per_row; |
1820 |
< |
for (i = (mode.x / pixels_per_byte); i > x2; i--) { |
1820 |
> |
for (i = (VIDEO_MODE_X / pixels_per_byte); i > x2; i--) { |
1821 |
|
p--; p2--; |
1822 |
|
if (*p != *p2) { |
1823 |
|
x2 = i; |
1855 |
|
} |
1856 |
|
|
1857 |
|
} else { |
1858 |
< |
const int bytes_per_pixel = mode.bytes_per_row / mode.x; |
1858 |
> |
const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X; |
1859 |
|
|
1860 |
< |
x1 = mode.x; |
1860 |
> |
x1 = VIDEO_MODE_X; |
1861 |
|
for (j=y1; j<=y2; j++) { |
1862 |
|
p = &the_buffer[j * bytes_per_row]; |
1863 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1875 |
|
p2 = &the_buffer_copy[j * bytes_per_row]; |
1876 |
|
p += bytes_per_row; |
1877 |
|
p2 += bytes_per_row; |
1878 |
< |
for (i=mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) { |
1878 |
> |
for (i=VIDEO_MODE_X*bytes_per_pixel; i>x2*bytes_per_pixel; i--) { |
1879 |
|
p--; |
1880 |
|
p2--; |
1881 |
|
if (*p != *p2) { |
1971 |
|
tick_counter = 0; |
1972 |
|
if (mainBuffer.dirty) { |
1973 |
|
LOCK_VOSF; |
1974 |
< |
update_display_dga_vosf(); |
1974 |
> |
update_display_dga_vosf(static_cast<driver_fullscreen *>(drv)); |
1975 |
|
UNLOCK_VOSF; |
1976 |
|
} |
1977 |
|
} |
2035 |
|
} |
2036 |
|
} |
2037 |
|
|
2038 |
+ |
const int VIDEO_REFRESH_HZ = 60; |
2039 |
+ |
const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ; |
2040 |
+ |
|
2041 |
|
static int redraw_func(void *arg) |
2042 |
|
{ |
2043 |
|
uint64 start = GetTicks_usec(); |
2044 |
|
int64 ticks = 0; |
2045 |
+ |
uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY; |
2046 |
|
|
2047 |
|
while (!redraw_thread_cancel) { |
2048 |
|
|
2049 |
|
// Wait |
2050 |
< |
Delay_usec(16667); |
2050 |
> |
next += VIDEO_REFRESH_DELAY; |
2051 |
> |
int64 delay = next - GetTicks_usec(); |
2052 |
> |
if (delay > 0) |
2053 |
> |
Delay_usec(delay); |
2054 |
> |
else if (delay < -VIDEO_REFRESH_DELAY) |
2055 |
> |
next = GetTicks_usec(); |
2056 |
> |
ticks++; |
2057 |
> |
|
2058 |
> |
#ifdef SHEEPSHAVER |
2059 |
> |
// Pause if requested (during video mode switches) |
2060 |
> |
if (thread_stop_req) { |
2061 |
> |
thread_stop_ack = true; |
2062 |
> |
continue; |
2063 |
> |
} |
2064 |
> |
#endif |
2065 |
|
|
2066 |
|
// Handle SDL events |
2067 |
|
handle_events(); |
2068 |
|
|
2069 |
|
// Refresh display |
2070 |
|
video_refresh(); |
2071 |
< |
ticks++; |
2071 |
> |
|
2072 |
> |
#ifdef SHEEPSHAVER |
2073 |
> |
// Set new cursor image if it was changed |
2074 |
> |
if (cursor_changed && sdl_cursor) { |
2075 |
> |
cursor_changed = false; |
2076 |
> |
SDL_FreeCursor(sdl_cursor); |
2077 |
> |
sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]); |
2078 |
> |
if (sdl_cursor) |
2079 |
> |
SDL_SetCursor(sdl_cursor); |
2080 |
> |
} |
2081 |
> |
#endif |
2082 |
|
|
2083 |
|
// Set new palette if it was changed |
2084 |
|
handle_palette_changes(); |
2086 |
|
|
2087 |
|
uint64 end = GetTicks_usec(); |
2088 |
|
D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); |
1440 |
– |
redraw_thread_cancel = false; |
2089 |
|
return 0; |
2090 |
|
} |