ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/SDL/video_sdl.cpp

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.2 by gbeauche, 2004-06-23T22:37:33Z vs.
Revision 1.31 by asvitkine, 2007-01-22T00:32:25Z

#	Line 1 | Line 1
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
#	Line 21 | Line 21
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.
39	+	*  - Backport hw cursor acceleration to Basilisk II?
40	+	*  - Factor out code
41		*/
42
43		#include "sysdeps.h"
#	Line 43 | Line 46
46		#include <SDL_mutex.h>
47		#include <SDL_thread.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"
#	Line 51 | Line 59
59		#include "prefs.h"
60		#include "user_strings.h"
61		#include "video.h"
62	+	#include "video_defs.h"
63		#include "video_blit.h"
64	+	#include "vm_alloc.h"
65
66		#define DEBUG 0
67		#include "debug.h"
68
69
70		// Supported video modes
71	<	static vector<video_mode> VideoModes;
71	>	using std::vector;
72	>	static vector<VIDEO_MODE> VideoModes;
73
74		// Display types
75	+	#ifdef SHEEPSHAVER
76	+	enum {
77	+	DISPLAY_WINDOW = DIS_WINDOW,                                    // windowed display
78	+	DISPLAY_SCREEN = DIS_SCREEN                                             // fullscreen display
79	+	};
80	+	extern int display_type;                                                        // See enum above
81	+	#else
82		enum {
83	<	DISPLAY_WINDOW, // windowed display
84	<	DISPLAY_SCREEN  // fullscreen display
83	>	DISPLAY_WINDOW,                                                                 // windowed display
84	>	DISPLAY_SCREEN                                                                  // fullscreen display
85		};
86	+	static int display_type = DISPLAY_WINDOW;                       // See enum above
87	+	#endif
88
89		// Constants
90	+	#ifdef WIN32
91	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
92	+	#else
93		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
94	+	#endif
95
96
97		// Global variables
#	Line 75 | Line 99 | static int32 frame_skip;                                                       // Prefs
99		static int16 mouse_wheel_mode;
100		static int16 mouse_wheel_lines;
101
78	–	static int display_type = DISPLAY_WINDOW;                       // See enum above
102		static uint8 *the_buffer = NULL;                                        // Mac frame buffer (where MacOS draws into)
103		static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer (for refreshed modes)
104		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
105
106		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
107	+	#ifndef USE_CPU_EMUL_SERVICES
108		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
109		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
110	+	#ifdef SHEEPSHAVER
111	+	static volatile bool thread_stop_req = false;
112	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
113	+	#endif
114	+	#endif
115
116		#ifdef ENABLE_VOSF
117	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
117	>	static bool use_vosf = false;                                           // Flag: VOSF enabled
118		#else
119		static const bool use_vosf = false;                                     // VOSF not possible
120		#endif
#	Line 103 | Line 132 | static int keycode_table[256];                                         // X
132
133		// SDL variables
134		static int screen_depth;                                                        // Depth of current screen
135	+	static SDL_Cursor *sdl_cursor;                                          // Copy of Mac cursor
136	+	static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
137		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
138		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
139		static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
140
141	+	// Mutex to protect SDL events
142	+	static SDL_mutex *sdl_events_lock = NULL;
143	+	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
144	+	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
145	+
146		// Mutex to protect palette
147		static SDL_mutex *sdl_palette_lock = NULL;
148		#define LOCK_PALETTE SDL_LockMutex(sdl_palette_lock)
#	Line 130 | Line 166 | extern void SysMountFirstFloppy(void);
166
167
168		/*
169	+	*  SDL surface locking glue
170	+	*/
171	+
172	+	#ifdef ENABLE_VOSF
173	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
174	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
175	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
176	+	} while (0)
177	+	#else
178	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
179	+	#endif
180	+
181	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
182	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
183	+	SDL_LockSurface(SURFACE);                               \
184	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
185	+	}                                                                                       \
186	+	} while (0)
187	+
188	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
189	+	if (SDL_MUSTLOCK(SURFACE))                                      \
190	+	SDL_UnlockSurface(SURFACE);                             \
191	+	} while (0)
192	+
193	+
194	+	/*
195	+	*  Framebuffer allocation routines
196	+	*/
197	+
198	+	static void *vm_acquire_framebuffer(uint32 size)
199	+	{
200	+	return vm_acquire(size);
201	+	}
202	+
203	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
204	+	{
205	+	vm_release(fb, size);
206	+	}
207	+
208	+
209	+	/*
210	+	*  Windows message handler
211	+	*/
212	+
213	+	#ifdef WIN32
214	+	#include <dbt.h>
215	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
216	+
217	+	extern void SysMediaArrived(void);
218	+	extern void SysMediaRemoved(void);
219	+	extern HWND GetMainWindowHandle(void);
220	+
221	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
222	+	{
223	+	switch (msg) {
224	+	case WM_DEVICECHANGE:
225	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
226	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
227	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
228	+	SysMediaRemoved();
229	+	}
230	+	else if (wParam == DBT_DEVICEARRIVAL) {
231	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
232	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
233	+	SysMediaArrived();
234	+	}
235	+	return 0;
236	+
237	+	default:
238	+	if (sdl_window_proc)
239	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
240	+	}
241	+
242	+	return DefWindowProc(hwnd, msg, wParam, lParam);
243	+	}
244	+	#endif
245	+
246	+
247	+	/*
248	+	*  SheepShaver glue
249	+	*/
250	+
251	+	#ifdef SHEEPSHAVER
252	+	// Color depth modes type
253	+	typedef int video_depth;
254	+
255	+	// 1, 2, 4 and 8 bit depths use a color palette
256	+	static inline bool IsDirectMode(VIDEO_MODE const & mode)
257	+	{
258	+	return IsDirectMode(mode.viAppleMode);
259	+	}
260	+
261	+	// Abstract base class representing one (possibly virtual) monitor
262	+	// ("monitor" = rectangular display with a contiguous frame buffer)
263	+	class monitor_desc {
264	+	public:
265	+	monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) {}
266	+	virtual ~monitor_desc() {}
267	+
268	+	// Get current Mac frame buffer base address
269	+	uint32 get_mac_frame_base(void) const {return screen_base;}
270	+
271	+	// Set Mac frame buffer base address (called from switch_to_mode())
272	+	void set_mac_frame_base(uint32 base) {screen_base = base;}
273	+
274	+	// Get current video mode
275	+	const VIDEO_MODE &get_current_mode(void) const {return VModes[cur_mode];}
276	+
277	+	// Called by the video driver to switch the video mode on this display
278	+	// (must call set_mac_frame_base())
279	+	virtual void switch_to_current_mode(void) = 0;
280	+
281	+	// Called by the video driver to set the color palette (in indexed modes)
282	+	// or the gamma table (in direct modes)
283	+	virtual void set_palette(uint8 *pal, int num) = 0;
284	+	};
285	+
286	+	// Vector of pointers to available monitor descriptions, filled by VideoInit()
287	+	static vector<monitor_desc *> VideoMonitors;
288	+
289	+	// Find Apple mode matching best specified dimensions
290	+	static int find_apple_resolution(int xsize, int ysize)
291	+	{
292	+	if (xsize == 640 && ysize == 480)
293	+	return APPLE_640x480;
294	+	if (xsize == 800 && ysize == 600)
295	+	return APPLE_800x600;
296	+	if (xsize == 1024 && ysize == 768)
297	+	return APPLE_1024x768;
298	+	if (xsize == 1152 && ysize == 768)
299	+	return APPLE_1152x768;
300	+	if (xsize == 1152 && ysize == 900)
301	+	return APPLE_1152x900;
302	+	if (xsize == 1280 && ysize == 1024)
303	+	return APPLE_1280x1024;
304	+	if (xsize == 1600 && ysize == 1200)
305	+	return APPLE_1600x1200;
306	+	return APPLE_CUSTOM;
307	+	}
308	+
309	+	// Display error alert
310	+	static void ErrorAlert(int error)
311	+	{
312	+	ErrorAlert(GetString(error));
313	+	}
314	+
315	+	// Display warning alert
316	+	static void WarningAlert(int warning)
317	+	{
318	+	WarningAlert(GetString(warning));
319	+	}
320	+	#endif
321	+
322	+
323	+	/*
324		*  monitor_desc subclass for SDL display
325		*/
326
327		class SDL_monitor_desc : public monitor_desc {
328		public:
329	<	SDL_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
329	>	SDL_monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
330		~SDL_monitor_desc() {}
331
332		virtual void switch_to_current_mode(void);
#	Line 150 | Line 341 | public:
341		*  Utility functions
342		*/
343
344	+	// Find palette size for given color depth
345	+	static int palette_size(int mode)
346	+	{
347	+	switch (mode) {
348	+	case VIDEO_DEPTH_1BIT: return 2;
349	+	case VIDEO_DEPTH_2BIT: return 4;
350	+	case VIDEO_DEPTH_4BIT: return 16;
351	+	case VIDEO_DEPTH_8BIT: return 256;
352	+	case VIDEO_DEPTH_16BIT: return 32;
353	+	case VIDEO_DEPTH_32BIT: return 256;
354	+	default: return 0;
355	+	}
356	+	}
357	+
358	+	// Return bytes per pixel for requested depth
359	+	static inline int bytes_per_pixel(int depth)
360	+	{
361	+	int bpp;
362	+	switch (depth) {
363	+	case 8:
364	+	bpp = 1;
365	+	break;
366	+	case 15: case 16:
367	+	bpp = 2;
368	+	break;
369	+	case 24: case 32:
370	+	bpp = 4;
371	+	break;
372	+	default:
373	+	abort();
374	+	}
375	+	return bpp;
376	+	}
377	+
378		// Map video_mode depth ID to numerical depth value
379	<	static int sdl_depth_of_video_depth(int video_depth)
379	>	static int mac_depth_of_video_depth(int video_depth)
380		{
381		int depth = -1;
382		switch (video_depth) {
383	<	case VDEPTH_1BIT:
383	>	case VIDEO_DEPTH_1BIT:
384		depth = 1;
385		break;
386	<	case VDEPTH_2BIT:
386	>	case VIDEO_DEPTH_2BIT:
387		depth = 2;
388		break;
389	<	case VDEPTH_4BIT:
389	>	case VIDEO_DEPTH_4BIT:
390		depth = 4;
391		break;
392	<	case VDEPTH_8BIT:
392	>	case VIDEO_DEPTH_8BIT:
393		depth = 8;
394		break;
395	<	case VDEPTH_16BIT:
395	>	case VIDEO_DEPTH_16BIT:
396		depth = 16;
397		break;
398	<	case VDEPTH_32BIT:
398	>	case VIDEO_DEPTH_32BIT:
399		depth = 32;
400		break;
401		default:
#	Line 179 | Line 404 | static int sdl_depth_of_video_depth(int
404		return depth;
405		}
406
407	<	// Add mode to list of supported modes
408	<	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
407	>	// Map video_mode depth ID to SDL screen depth
408	>	static int sdl_depth_of_video_depth(int video_depth)
409		{
410	<	video_mode mode;
186	<	mode.x = width;
187	<	mode.y = height;
188	<	mode.resolution_id = resolution_id;
189	<	mode.bytes_per_row = bytes_per_row;
190	<	mode.depth = depth;
191	<	VideoModes.push_back(mode);
410	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
411		}
412
413	<	// Add standard list of windowed modes for given color depth
414	<	static void add_window_modes(video_depth depth)
413	>	// Get screen dimensions
414	>	static void sdl_display_dimensions(int &width, int &height)
415		{
416	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
417	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
418	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
419	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
420	<	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
421	<	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
422	<	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
416	>	static int max_width, max_height;
417	>	if (max_width == 0 && max_height == 0) {
418	>	max_width = 640 ; max_height = 480;
419	>	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
420	>	if (modes && modes != (SDL_Rect **)-1) {
421	>	// It turns out that on some implementations, and contrary to the documentation,
422	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
423	>	for (int i = 0; modes[i] != NULL; i++) {
424	>	const int w = modes[i]->w;
425	>	const int h = modes[i]->h;
426	>	if (w > max_width && h > max_height) {
427	>	max_width = w;
428	>	max_height = h;
429	>	}
430	>	}
431	>	}
432	>	}
433	>	width = max_width;
434	>	height = max_height;
435	>	}
436	>
437	>	static inline int sdl_display_width(void)
438	>	{
439	>	int width, height;
440	>	sdl_display_dimensions(width, height);
441	>	return width;
442	>	}
443	>
444	>	static inline int sdl_display_height(void)
445	>	{
446	>	int width, height;
447	>	sdl_display_dimensions(width, height);
448	>	return height;
449	>	}
450	>
451	>	// Check wether specified mode is available
452	>	static bool has_mode(int type, int width, int height, int depth)
453	>	{
454	>	#ifdef SHEEPSHAVER
455	>	// Filter out Classic resolutions
456	>	if (width == 512 && height == 384)
457	>	return false;
458	>	#endif
459	>
460	>	// Filter out out-of-bounds resolutions
461	>	if (width > sdl_display_width() || height > sdl_display_height())
462	>	return false;
463	>
464	>	// Rely on SDL capabilities
465	>	return SDL_VideoModeOK(width, height,
466	>	sdl_depth_of_video_depth(depth),
467	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
468	>	}
469	>
470	>	// Add mode to list of supported modes
471	>	static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
472	>	{
473	>	// Filter out unsupported modes
474	>	if (!has_mode(type, width, height, depth))
475	>	return;
476	>
477	>	// Fill in VideoMode entry
478	>	VIDEO_MODE mode;
479	>	#ifdef SHEEPSHAVER
480	>	resolution_id = find_apple_resolution(width, height);
481	>	mode.viType = type;
482	>	#endif
483	>	VIDEO_MODE_X = width;
484	>	VIDEO_MODE_Y = height;
485	>	VIDEO_MODE_RESOLUTION = resolution_id;
486	>	VIDEO_MODE_ROW_BYTES = bytes_per_row;
487	>	VIDEO_MODE_DEPTH = (video_depth)depth;
488	>	VideoModes.push_back(mode);
489		}
490
491		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
492	<	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, video_depth depth, bool native_byte_order)
492	>	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
493		{
494		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
495		int layout = FLAYOUT_DIRECT;
496	<	if (depth == VDEPTH_16BIT)
496	>	if (depth == VIDEO_DEPTH_16BIT)
497		layout = (screen_depth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
498	<	else if (depth == VDEPTH_32BIT)
498	>	else if (depth == VIDEO_DEPTH_32BIT)
499		layout = (screen_depth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
500		if (native_byte_order)
501		MacFrameLayout = layout;
#	Line 219 | Line 504 | static void set_mac_frame_buffer(SDL_mon
504		monitor.set_mac_frame_base(MacFrameBaseMac);
505
506		// Set variables used by UAE memory banking
507	<	const video_mode &mode = monitor.get_current_mode();
507	>	const VIDEO_MODE &mode = monitor.get_current_mode();
508		MacFrameBaseHost = the_buffer;
509	<	MacFrameSize = mode.bytes_per_row * mode.y;
509	>	MacFrameSize = VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y;
510		InitFrameBufferMapping();
511		#else
512		monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
#	Line 242 | Line 527 | static void set_window_name(int name)
527		// Set mouse grab mode
528		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
529		{
530	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
530	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
531		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
532		}
533
534	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
535	+	static void migrate_screen_prefs(void)
536	+	{
537	+	#ifdef SHEEPSHAVER
538	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
539	+	if (PrefsFindString("screen"))
540	+	return;
541	+
542	+	uint32 window_modes = PrefsFindInt32("windowmodes");
543	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
544	+	int width = 0, height = 0;
545	+	if (screen_modes) {
546	+	static const struct {
547	+	int id;
548	+	int width;
549	+	int height;
550	+	}
551	+	modes[] = {
552	+	{  1,    640,    480 },
553	+	{  2,    800,    600 },
554	+	{  4,   1024,    768 },
555	+	{ 64,   1152,    768 },
556	+	{  8,   1152,    900 },
557	+	{ 16,   1280,   1024 },
558	+	{ 32,   1600,   1200 },
559	+	{ 0, }
560	+	};
561	+	for (int i = 0; modes[i].id != 0; i++) {
562	+	if (screen_modes & modes[i].id) {
563	+	if (width < modes[i].width && height < modes[i].height) {
564	+	width = modes[i].width;
565	+	height = modes[i].height;
566	+	}
567	+	}
568	+	}
569	+	} else {
570	+	if (window_modes & 1)
571	+	width = 640, height = 480;
572	+	if (window_modes & 2)
573	+	width = 800, height = 600;
574	+	}
575	+	if (width && height) {
576	+	char str[32];
577	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
578	+	PrefsReplaceString("screen", str);
579	+	}
580	+	#endif
581	+	}
582	+
583
584		/*
585		*  Display "driver" classes
#	Line 270 | Line 604 | public:
604
605		public:
606		SDL_monitor_desc &monitor; // Associated video monitor
607	<	const video_mode &mode;    // Video mode handled by the driver
607	>	const VIDEO_MODE &mode;    // Video mode handled by the driver
608
609		bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
610		SDL_Surface *s; // The surface we draw into
#	Line 301 | Line 635 | private:
635		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
636		};
637
638	+	class driver_fullscreen : public driver_base {
639	+	public:
640	+	driver_fullscreen(SDL_monitor_desc &monitor);
641	+	~driver_fullscreen();
642	+	};
643	+
644		static driver_base *drv = NULL; // Pointer to currently used driver object
645
646		#ifdef ENABLE_VOSF
#	Line 322 | Line 662 | driver_base::~driver_base()
662		if (s)
663		SDL_FreeSurface(s);
664
665	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
666	+	if (the_buffer != VM_MAP_FAILED) {
667	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
668	+	vm_release_framebuffer(the_buffer, the_buffer_size);
669	+	the_buffer = NULL;
670	+	}
671	+
672		// Free frame buffer(s)
673		if (!use_vosf) {
327	–	if (the_buffer) {
328	–	free(the_buffer);
329	–	the_buffer = NULL;
330	–	}
674		if (the_buffer_copy) {
675		free(the_buffer_copy);
676		the_buffer_copy = NULL;
#	Line 335 | Line 678 | driver_base::~driver_base()
678		}
679		#ifdef ENABLE_VOSF
680		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	–	}
681		if (the_host_buffer) {
682		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
683		free(the_host_buffer);
#	Line 351 | Line 688 | driver_base::~driver_base()
688		free(the_buffer_copy);
689		the_buffer_copy = NULL;
690		}
691	+
692	+	// Deinitialize VOSF
693	+	video_vosf_exit();
694		}
695		#endif
696		}
#	Line 358 | Line 698 | driver_base::~driver_base()
698		// Palette has changed
699		void driver_base::update_palette(void)
700		{
701	<	const video_mode &mode = monitor.get_current_mode();
701	>	const VIDEO_MODE &mode = monitor.get_current_mode();
702
703	<	if (mode.depth <= VDEPTH_8BIT)
703	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
704		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
705		}
706
#	Line 379 | Line 719 | void driver_base::restore_mouse_accel(vo
719		*  Windowed display driver
720		*/
721
722	+	static int SDL_display_opened = FALSE;
723	+
724		// Open display
725		driver_window::driver_window(SDL_monitor_desc &m)
726		: driver_base(m), mouse_grabbed(false)
727		{
728	<	int width = mode.x, height = mode.y;
728	>	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
729		int aligned_width = (width + 15) & ~15;
730		int aligned_height = (height + 15) & ~15;
731
732		// Set absolute mouse mode
733		ADBSetRelMouseMode(mouse_grabbed);
734
735	+	// This is ugly:
736	+	// If we're switching resolutions (ie, not setting it for the first time),
737	+	// there's a bug in SDL where the SDL_Surface created will not be properly
738	+	// setup. The solution is to SDL_Quit() before calling SDL_SetVideoMode for
739	+	// the second time (SDL_SetVideoMode will call SDL_Init() and all will be
740	+	// well). Without this, the video becomes corrupted (at least on Mac OS X),
741	+	// after the resolution switch (for the second and subsequent times).
742	+	// EDIT: Ack, this breaks audio!
743	+	//      if (SDL_display_opened)
744	+	//              SDL_Quit();
745	+
746		// Create surface
747	<	int depth = (mode.depth <= VDEPTH_8BIT ? 8 : screen_depth);
747	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
748		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
749		return;
750
751	+	SDL_display_opened = TRUE;
752	+
753		#ifdef ENABLE_VOSF
754		use_vosf = true;
755		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
756		the_host_buffer = (uint8 *)s->pixels;
757		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
758	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
758	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
759		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
760		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
761	+
762	+	// Check whether we can initialize the VOSF subsystem and it's profitable
763	+	if (!video_vosf_init(m)) {
764	+	WarningAlert(STR_VOSF_INIT_ERR);
765	+	use_vosf = false;
766	+	}
767	+	else if (!video_vosf_profitable()) {
768	+	video_vosf_exit();
769	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
770	+	use_vosf = false;
771	+	}
772	+	if (!use_vosf) {
773	+	free(the_buffer_copy);
774	+	vm_release(the_buffer, the_buffer_size);
775	+	the_host_buffer = NULL;
776	+	}
777	+	#endif
778	+	if (!use_vosf) {
779	+	// Allocate memory for frame buffer
780	+	the_buffer_size = (aligned_height + 2) * s->pitch;
781	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
782	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
783	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
784	+	}
785	+
786	+	#ifdef SHEEPSHAVER
787	+	// Create cursor
788	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
789	+	SDL_SetCursor(sdl_cursor);
790	+	cursor_changed = false;
791	+	}
792		#else
793	<	// Allocate memory for frame buffer
794	<	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));
793	>	// Hide cursor
794	>	SDL_ShowCursor(0);
795		#endif
796
797		// Set window name/class
798		set_window_name(STR_WINDOW_TITLE);
799
417	–	// Hide cursor
418	–	SDL_ShowCursor(0);
419	–
800		// Init blitting routines
801		SDL_PixelFormat *f = s->format;
802		VisualFormat visualFormat;
#	Line 424 | Line 804 | driver_window::driver_window(SDL_monitor
804		visualFormat.Rmask = f->Rmask;
805		visualFormat.Gmask = f->Gmask;
806		visualFormat.Bmask = f->Bmask;
807	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(mode.depth));
807	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
808
809		// Load gray ramp to 8->16/32 expand map
810		if (!IsDirectMode(mode))
#	Line 432 | Line 812 | driver_window::driver_window(SDL_monitor
812		ExpandMap[i] = SDL_MapRGB(f, i, i, i);
813
814		// Set frame buffer base
815	<	set_mac_frame_buffer(monitor, mode.depth, true);
815	>	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
816
817		// Everything went well
818		init_ok = true;
#	Line 491 | Line 871 | void driver_window::mouse_moved(int x, i
871		ADBMouseMoved(x, y);
872		}
873
874	+
875	+	/*
876	+	*  Full-screen display driver
877	+	*/
878	+
879	+	// Open display
880	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
881	+	: driver_base(m)
882	+	{
883	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
884	+	int aligned_width = (width + 15) & ~15;
885	+	int aligned_height = (height + 15) & ~15;
886	+
887	+	// Set absolute mouse mode
888	+	ADBSetRelMouseMode(false);
889	+
890	+	// Create surface
891	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
892	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
893	+	return;
894	+
895	+	#ifdef ENABLE_VOSF
896	+	use_vosf = true;
897	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
898	+	the_host_buffer = (uint8 *)s->pixels;
899	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
900	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
901	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
902	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
903	+
904	+	// Check whether we can initialize the VOSF subsystem and it's profitable
905	+	if (!video_vosf_init(m)) {
906	+	WarningAlert(STR_VOSF_INIT_ERR);
907	+	use_vosf = false;
908	+	}
909	+	else if (!video_vosf_profitable()) {
910	+	video_vosf_exit();
911	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
912	+	use_vosf = false;
913	+	}
914	+	if (!use_vosf) {
915	+	free(the_buffer_copy);
916	+	vm_release(the_buffer, the_buffer_size);
917	+	the_host_buffer = NULL;
918	+	}
919	+	#endif
920	+	if (!use_vosf) {
921	+	// Allocate memory for frame buffer
922	+	the_buffer_size = (aligned_height + 2) * s->pitch;
923	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
924	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
925	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
926	+	}
927	+
928	+	// Hide cursor
929	+	SDL_ShowCursor(0);
930	+
931	+	// Init blitting routines
932	+	SDL_PixelFormat *f = s->format;
933	+	VisualFormat visualFormat;
934	+	visualFormat.depth = depth;
935	+	visualFormat.Rmask = f->Rmask;
936	+	visualFormat.Gmask = f->Gmask;
937	+	visualFormat.Bmask = f->Bmask;
938	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
939	+
940	+	// Load gray ramp to 8->16/32 expand map
941	+	if (!IsDirectMode(mode))
942	+	for (int i=0; i<256; i++)
943	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
944	+
945	+	// Set frame buffer base
946	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
947	+
948	+	// Everything went well
949	+	init_ok = true;
950	+	}
951	+
952	+	// Close display
953	+	driver_fullscreen::~driver_fullscreen()
954	+	{
955	+	#ifdef ENABLE_VOSF
956	+	if (use_vosf)
957	+	the_host_buffer = NULL; // don't free() in driver_base dtor
958	+	#endif
959	+	if (s)
960	+	SDL_FreeSurface(s);
961	+
962	+	// Show cursor
963	+	SDL_ShowCursor(1);
964	+	}
965	+
966	+
967		/*
968		*  Initialization
969		*/
#	Line 522 | Line 995 | static void keycode_init(void)
995		SDL_VideoDriverName(video_driver, sizeof(video_driver));
996		bool video_driver_found = false;
997		char line[256];
998	+	int n_keys = 0;
999		while (fgets(line, sizeof(line) - 1, f)) {
1000		// Read line
1001		int len = strlen(line);
#	Line 534 | Line 1008 | static void keycode_init(void)
1008		continue;
1009
1010		if (video_driver_found) {
1011	<	// Skip aliases
1012	<	static const char alias_str[] = "alias";
1013	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
1011	>	// Skip aliases as long as we have read keycodes yet
1012	>	// Otherwise, it's another mapping and we have to stop
1013	>	static const char sdl_str[] = "sdl";
1014	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1015		continue;
1016
1017		// Read keycode
1018		int x_code, mac_code;
1019		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1020	<	keycode_table[x_code & 0xff] = mac_code;
1020	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1021		else
1022		break;
1023		} else {
1024		// Search for SDL video driver string
1025	<	static const char alias_sdl_str[] = "alias SDL";
1026	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
1027	<	char *p = line + sizeof(alias_sdl_str);
1025	>	static const char sdl_str[] = "sdl";
1026	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
1027	>	char *p = line + sizeof(sdl_str);
1028		if (strstr(video_driver, p) == video_driver)
1029		video_driver_found = true;
1030		}
#	Line 567 | Line 1042 | static void keycode_init(void)
1042		WarningAlert(str);
1043		return;
1044		}
1045	+
1046	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1047		}
1048		}
1049
#	Line 574 | Line 1051 | static void keycode_init(void)
1051		bool SDL_monitor_desc::video_open(void)
1052		{
1053		D(bug("video_open()\n"));
1054	<	const video_mode &mode = get_current_mode();
1054	>	const VIDEO_MODE &mode = get_current_mode();
1055	>	#if DEBUG
1056	>	D(bug("Current video mode:\n"));
1057	>	D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f)));
1058	>	#endif
1059
1060		// Create display driver object of requested type
1061		switch (display_type) {
1062		case DISPLAY_WINDOW:
1063		drv = new(std::nothrow) driver_window(*this);
1064		break;
1065	+	case DISPLAY_SCREEN:
1066	+	drv = new(std::nothrow) driver_fullscreen(*this);
1067	+	break;
1068		}
1069		if (drv == NULL)
1070		return false;
#	Line 590 | Line 1074 | bool SDL_monitor_desc::video_open(void)
1074		return false;
1075		}
1076
1077	<	#ifdef ENABLE_VOSF
1078	<	if (use_vosf) {
1079	<	// Initialize the VOSF system
1080	<	if (!video_vosf_init(*this)) {
1081	<	ErrorAlert(STR_VOSF_INIT_ERR);
598	<	return false;
599	<	}
600	<	}
1077	>	#ifdef WIN32
1078	>	// Chain in a new message handler for WM_DEVICECHANGE
1079	>	HWND the_window = GetMainWindowHandle();
1080	>	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1081	>	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1082		#endif
1083	<
1083	>
1084		// Initialize VideoRefresh function
1085		VideoRefreshInit();
1086
#	Line 607 | Line 1088 | bool SDL_monitor_desc::video_open(void)
1088		LOCK_FRAME_BUFFER;
1089
1090		// Start redraw/input thread
1091	+	#ifndef USE_CPU_EMUL_SERVICES
1092		redraw_thread_cancel = false;
1093	<	redraw_thread_active = (SDL_CreateThread(redraw_func, NULL) != NULL);
1093	>	redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1094		if (!redraw_thread_active) {
1095		printf("FATAL: cannot create redraw thread\n");
1096		return false;
1097		}
1098	+	#else
1099	+	redraw_thread_active = true;
1100	+	#endif
1101		return true;
1102		}
1103
1104	+	#ifdef SHEEPSHAVER
1105	+	bool VideoInit(void)
1106	+	{
1107	+	const bool classic = false;
1108	+	#else
1109		bool VideoInit(bool classic)
1110		{
1111	+	#endif
1112		classic_mode = classic;
1113
1114		#ifdef ENABLE_VOSF
#	Line 627 | Line 1118 | bool VideoInit(bool classic)
1118		#endif
1119
1120		// Create Mutexes
1121	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1122	+	return false;
1123		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1124		return false;
1125		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 641 | Line 1134 | bool VideoInit(bool classic)
1134		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1135
1136		// Get screen mode from preferences
1137	<	const char *mode_str;
1137	>	migrate_screen_prefs();
1138	>	const char *mode_str = NULL;
1139		if (classic_mode)
1140		mode_str = "win/512/342";
1141		else
1142		mode_str = PrefsFindString("screen");
1143
1144		// Determine display type and default dimensions
1145	<	int default_width = 512, default_height = 384;
1145	>	int default_width, default_height;
1146	>	if (classic) {
1147	>	default_width = 512;
1148	>	default_height = 384;
1149	>	}
1150	>	else {
1151	>	default_width = 640;
1152	>	default_height = 480;
1153	>	}
1154		display_type = DISPLAY_WINDOW;
1155		if (mode_str) {
1156		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1157		display_type = DISPLAY_WINDOW;
1158	<	}
1159	<	int max_width = 640, max_height = 480;
658	<	if (display_type == DISPLAY_SCREEN) {
659	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
660	<	if (modes && modes != (SDL_Rect **)-1) {
661	<	max_width = modes[0]->w;
662	<	max_height = modes[0]->h;
663	<	}
1158	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1159	>	display_type = DISPLAY_SCREEN;
1160		}
1161		if (default_width <= 0)
1162	<	default_width = max_width;
1162	>	default_width = sdl_display_width();
1163	>	else if (default_width > sdl_display_width())
1164	>	default_width = sdl_display_width();
1165		if (default_height <= 0)
1166	<	default_height = max_height;
1166	>	default_height = sdl_display_height();
1167	>	else if (default_height > sdl_display_height())
1168	>	default_height = sdl_display_height();
1169
1170		// Mac screen depth follows X depth
1171		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
1172	<	video_depth default_depth;
1172	>	int default_depth;
1173		switch (screen_depth) {
1174		case 8:
1175	<	default_depth = VDEPTH_8BIT;
1175	>	default_depth = VIDEO_DEPTH_8BIT;
1176		break;
1177		case 15: case 16:
1178	<	default_depth = VDEPTH_16BIT;
1178	>	default_depth = VIDEO_DEPTH_16BIT;
1179		break;
1180		case 24: case 32:
1181	<	default_depth = VDEPTH_32BIT;
1181	>	default_depth = VIDEO_DEPTH_32BIT;
1182		break;
1183		default:
1184	<	default_depth =  VDEPTH_1BIT;
1184	>	default_depth =  VIDEO_DEPTH_1BIT;
1185		break;
1186		}
1187
1188	+	// Initialize list of video modes to try
1189	+	struct {
1190	+	int w;
1191	+	int h;
1192	+	int resolution_id;
1193	+	}
1194	+	video_modes[] = {
1195	+	{   -1,   -1, 0x80 },
1196	+	{  512,  384, 0x80 },
1197	+	{  640,  480, 0x81 },
1198	+	{  800,  600, 0x82 },
1199	+	{ 1024,  768, 0x83 },
1200	+	{ 1152,  870, 0x84 },
1201	+	{ 1280, 1024, 0x85 },
1202	+	{ 1600, 1200, 0x86 },
1203	+	{ 0, }
1204	+	};
1205	+	video_modes[0].w = default_width;
1206	+	video_modes[0].h = default_height;
1207	+
1208		// Construct list of supported modes
1209		if (display_type == DISPLAY_WINDOW) {
1210		if (classic)
1211	<	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1211	>	add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1212		else {
1213	<	for (int d = VDEPTH_1BIT; d <= default_depth; d++) {
1214	<	int bpp = (d <= VDEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1215	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1216	<	add_window_modes(video_depth(d));
1213	>	for (int i = 0; video_modes[i].w != 0; i++) {
1214	>	const int w = video_modes[i].w;
1215	>	const int h = video_modes[i].h;
1216	>	if (i > 0 && (w >= default_width || h >= default_height))
1217	>	continue;
1218	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1219	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1220		}
1221		}
1222	<	} else
1223	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1222	>	} else if (display_type == DISPLAY_SCREEN) {
1223	>	for (int i = 0; video_modes[i].w != 0; i++) {
1224	>	const int w = video_modes[i].w;
1225	>	const int h = video_modes[i].h;
1226	>	if (i > 0 && (w >= default_width || h >= default_height))
1227	>	continue;
1228	>	if (w == 512 && h == 384)
1229	>	continue;
1230	>	#ifdef ENABLE_VOSF
1231	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1232	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1233	>	#else
1234	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1235	>	#endif
1236	>	}
1237	>	}
1238	>
1239		if (VideoModes.empty()) {
1240		ErrorAlert(STR_NO_XVISUAL_ERR);
1241		return false;
#	Line 705 | Line 1243 | bool VideoInit(bool classic)
1243
1244		// Find requested default mode with specified dimensions
1245		uint32 default_id;
1246	<	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1246	>	std::vector<VIDEO_MODE>::const_iterator i, end = VideoModes.end();
1247		for (i = VideoModes.begin(); i != end; ++i) {
1248	<	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1249	<	default_id = i->resolution_id;
1248	>	const VIDEO_MODE & mode = (*i);
1249	>	if (VIDEO_MODE_X == default_width && VIDEO_MODE_Y == default_height && VIDEO_MODE_DEPTH == default_depth) {
1250	>	default_id = VIDEO_MODE_RESOLUTION;
1251	>	#ifdef SHEEPSHAVER
1252	>	std::vector<VIDEO_MODE>::const_iterator begin = VideoModes.begin();
1253	>	cur_mode = distance(begin, i);
1254	>	#endif
1255		break;
1256		}
1257		}
1258		if (i == end) { // not found, use first available mode
1259	<	default_depth = VideoModes[0].depth;
1260	<	default_id = VideoModes[0].resolution_id;
1259	>	const VIDEO_MODE & mode = VideoModes[0];
1260	>	default_depth = VIDEO_MODE_DEPTH;
1261	>	default_id = VIDEO_MODE_RESOLUTION;
1262	>	#ifdef SHEEPSHAVER
1263	>	cur_mode = 0;
1264	>	#endif
1265		}
1266
1267	+	#ifdef SHEEPSHAVER
1268	+	for (int i = 0; i < VideoModes.size(); i++)
1269	+	VModes[i] = VideoModes[i];
1270	+	VideoInfo *p = &VModes[VideoModes.size()];
1271	+	p->viType = DIS_INVALID;        // End marker
1272	+	p->viRowBytes = 0;
1273	+	p->viXsize = p->viYsize = 0;
1274	+	p->viAppleMode = 0;
1275	+	p->viAppleID = 0;
1276	+	#endif
1277	+
1278		#if DEBUG
1279		D(bug("Available video modes:\n"));
1280		for (i = VideoModes.begin(); i != end; ++i) {
1281	<	int bits = 1 << i->depth;
1281	>	const VIDEO_MODE & mode = (*i);
1282	>	int bits = 1 << VIDEO_MODE_DEPTH;
1283		if (bits == 16)
1284		bits = 15;
1285		else if (bits == 32)
1286		bits = 24;
1287	<	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1287	>	D(bug(" %dx%d (ID %02x), %d colors\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << bits));
1288		}
1289		#endif
1290
1291		// Create SDL_monitor_desc for this (the only) display
1292	<	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, default_depth, default_id);
1292	>	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, (video_depth)default_depth, default_id);
1293		VideoMonitors.push_back(monitor);
1294
1295		// Open display
#	Line 747 | Line 1306 | void SDL_monitor_desc::video_close(void)
1306		{
1307		D(bug("video_close()\n"));
1308
1309	+	#ifdef WIN32
1310	+	// Remove message handler for WM_DEVICECHANGE
1311	+	HWND the_window = GetMainWindowHandle();
1312	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1313	+	#endif
1314	+
1315		// Stop redraw thread
1316	+	#ifndef USE_CPU_EMUL_SERVICES
1317		if (redraw_thread_active) {
1318		redraw_thread_cancel = true;
1319	<	//              SDL_WaitThread(redraw_thread, NULL); doesn't work
754	<	while (redraw_thread_cancel);
1319	>	SDL_WaitThread(redraw_thread, NULL);
1320		}
1321	+	#endif
1322		redraw_thread_active = false;
1323
1324		// Unlock frame buffer
1325		UNLOCK_FRAME_BUFFER;
1326		D(bug(" frame buffer unlocked\n"));
1327
762	–	#ifdef ENABLE_VOSF
763	–	if (use_vosf) {
764	–	// Deinitialize VOSF
765	–	video_vosf_exit();
766	–	}
767	–	#endif
768	–
1328		// Close display
1329		delete drv;
1330		drv = NULL;
#	Line 783 | Line 1342 | void VideoExit(void)
1342		SDL_DestroyMutex(frame_buffer_lock);
1343		if (sdl_palette_lock)
1344		SDL_DestroyMutex(sdl_palette_lock);
1345	+	if (sdl_events_lock)
1346	+	SDL_DestroyMutex(sdl_events_lock);
1347		}
1348
1349
#	Line 801 | Line 1362 | void VideoQuitFullScreen(void)
1362		*  Mac VBL interrupt
1363		*/
1364
1365	+	/*
1366	+	*  Execute video VBL routine
1367	+	*/
1368	+
1369	+	#ifdef SHEEPSHAVER
1370	+	void VideoVBL(void)
1371	+	{
1372	+	// Emergency quit requested? Then quit
1373	+	if (emerg_quit)
1374	+	QuitEmulator();
1375	+
1376	+	// Temporarily give up frame buffer lock (this is the point where
1377	+	// we are suspended when the user presses Ctrl-Tab)
1378	+	UNLOCK_FRAME_BUFFER;
1379	+	LOCK_FRAME_BUFFER;
1380	+
1381	+	// Execute video VBL
1382	+	if (private_data != NULL && private_data->interruptsEnabled)
1383	+	VSLDoInterruptService(private_data->vslServiceID);
1384	+	}
1385	+	#else
1386		void VideoInterrupt(void)
1387		{
1388		// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
#	Line 815 | Line 1397 | void VideoInterrupt(void)
1397		UNLOCK_FRAME_BUFFER;
1398		LOCK_FRAME_BUFFER;
1399		}
1400	+	#endif
1401
1402
1403		/*
1404		*  Set palette
1405		*/
1406
1407	+	#ifdef SHEEPSHAVER
1408	+	void video_set_palette(void)
1409	+	{
1410	+	monitor_desc * monitor = VideoMonitors[0];
1411	+	int n_colors = palette_size(monitor->get_current_mode().viAppleMode);
1412	+	uint8 pal[256 * 3];
1413	+	for (int c = 0; c < n_colors; c++) {
1414	+	pal[c*3 + 0] = mac_pal[c].red;
1415	+	pal[c*3 + 1] = mac_pal[c].green;
1416	+	pal[c*3 + 2] = mac_pal[c].blue;
1417	+	}
1418	+	monitor->set_palette(pal, n_colors);
1419	+	}
1420	+	#endif
1421	+
1422		void SDL_monitor_desc::set_palette(uint8 *pal, int num_in)
1423		{
1424	<	const video_mode &mode = get_current_mode();
1424	>	const VIDEO_MODE &mode = get_current_mode();
1425
1426		// FIXME: how can we handle the gamma ramp?
1427	<	if (mode.depth > VDEPTH_8BIT)
1427	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1428		return;
1429
1430		LOCK_PALETTE;
#	Line 851 | Line 1449 | void SDL_monitor_desc::set_palette(uint8
1449		}
1450
1451		#ifdef ENABLE_VOSF
1452	<	// We have to redraw everything because the interpretation of pixel values changed
1453	<	LOCK_VOSF;
1454	<	PFLAG_SET_ALL;
1455	<	UNLOCK_VOSF;
1456	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1452	>	if (use_vosf) {
1453	>	// We have to redraw everything because the interpretation of pixel values changed
1454	>	LOCK_VOSF;
1455	>	PFLAG_SET_ALL;
1456	>	UNLOCK_VOSF;
1457	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1458	>	}
1459		#endif
1460		}
1461
#	Line 870 | Line 1470 | void SDL_monitor_desc::set_palette(uint8
1470		*  Switch video mode
1471		*/
1472
1473	+	#ifdef SHEEPSHAVER
1474	+	int16 video_mode_change(VidLocals *csSave, uint32 ParamPtr)
1475	+	{
1476	+	/* return if no mode change */
1477	+	if ((csSave->saveData == ReadMacInt32(ParamPtr + csData)) &&
1478	+	(csSave->saveMode == ReadMacInt16(ParamPtr + csMode))) return noErr;
1479	+
1480	+	/* first find video mode in table */
1481	+	for (int i=0; VModes[i].viType != DIS_INVALID; i++) {
1482	+	if ((ReadMacInt16(ParamPtr + csMode) == VModes[i].viAppleMode) &&
1483	+	(ReadMacInt32(ParamPtr + csData) == VModes[i].viAppleID)) {
1484	+	csSave->saveMode = ReadMacInt16(ParamPtr + csMode);
1485	+	csSave->saveData = ReadMacInt32(ParamPtr + csData);
1486	+	csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1487	+
1488	+	// Disable interrupts and pause redraw thread
1489	+	DisableInterrupt();
1490	+	thread_stop_ack = false;
1491	+	thread_stop_req = true;
1492	+	while (!thread_stop_ack) ;
1493	+
1494	+	cur_mode = i;
1495	+	monitor_desc *monitor = VideoMonitors[0];
1496	+	monitor->switch_to_current_mode();
1497	+
1498	+	WriteMacInt32(ParamPtr + csBaseAddr, screen_base);
1499	+	csSave->saveBaseAddr=screen_base;
1500	+	csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1501	+	csSave->saveMode=VModes[cur_mode].viAppleMode;
1502	+
1503	+	// Enable interrupts and resume redraw thread
1504	+	thread_stop_req = false;
1505	+	EnableInterrupt();
1506	+	return noErr;
1507	+	}
1508	+	}
1509	+	return paramErr;
1510	+	}
1511	+	#endif
1512	+
1513		void SDL_monitor_desc::switch_to_current_mode(void)
1514		{
1515		// Close and reopen display
1516	+	LOCK_EVENTS;
1517		video_close();
1518		video_open();
1519	+	UNLOCK_EVENTS;
1520
1521		if (drv == NULL) {
1522		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 884 | Line 1526 | void SDL_monitor_desc::switch_to_current
1526
1527
1528		/*
1529	<	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1530	<	*  and -2 if the key was recognized as a hotkey
1529	>	*  Can we set the MacOS cursor image into the window?
1530	>	*/
1531	>
1532	>	#ifdef SHEEPSHAVER
1533	>	bool video_can_change_cursor(void)
1534	>	{
1535	>	return (display_type == DISPLAY_WINDOW);
1536	>	}
1537	>	#endif
1538	>
1539	>
1540	>	/*
1541	>	*  Set cursor image for window
1542		*/
1543
1544	+	#ifdef SHEEPSHAVER
1545	+	void video_set_cursor(void)
1546	+	{
1547	+	cursor_changed = true;
1548	+	}
1549	+	#endif
1550	+
1551	+
1552	+	/*
1553	+	*  Keyboard-related utilify functions
1554	+	*/
1555	+
1556	+	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1557	+	{
1558	+	switch (e.keysym.sym) {
1559	+	case SDLK_NUMLOCK:
1560	+	case SDLK_CAPSLOCK:
1561	+	case SDLK_SCROLLOCK:
1562	+	case SDLK_RSHIFT:
1563	+	case SDLK_LSHIFT:
1564	+	case SDLK_RCTRL:
1565	+	case SDLK_LCTRL:
1566	+	case SDLK_RALT:
1567	+	case SDLK_LALT:
1568	+	case SDLK_RMETA:
1569	+	case SDLK_LMETA:
1570	+	case SDLK_LSUPER:
1571	+	case SDLK_RSUPER:
1572	+	case SDLK_MODE:
1573	+	case SDLK_COMPOSE:
1574	+	return true;
1575	+	}
1576	+	return false;
1577	+	}
1578	+
1579		static bool is_ctrl_down(SDL_keysym const & ks)
1580		{
1581		return ctrl_down || (ks.mod & KMOD_CTRL);
1582		}
1583
1584	+
1585	+	/*
1586	+	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1587	+	*  and -2 if the key was recognized as a hotkey
1588	+	*/
1589	+
1590		static int kc_decode(SDL_keysym const & ks, bool key_down)
1591		{
1592		switch (ks.sym) {
#	Line 925 | Line 1619 | static int kc_decode(SDL_keysym const &
1619
1620		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1621		case SDLK_2: case SDLK_AT: return 0x13;
1622	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1622	>	case SDLK_3: case SDLK_HASH: return 0x14;
1623		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1624	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1624	>	case SDLK_5: return 0x17;
1625		case SDLK_6: return 0x16;
1626		case SDLK_7: return 0x1a;
1627		case SDLK_8: return 0x1c;
1628		case SDLK_9: return 0x19;
1629		case SDLK_0: return 0x1d;
1630
1631	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1631	>	case SDLK_BACKQUOTE: return 0x0a;
1632		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1633		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1634	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1635	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1636	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1634	>	case SDLK_LEFTBRACKET: return 0x21;
1635	>	case SDLK_RIGHTBRACKET: return 0x1e;
1636	>	case SDLK_BACKSLASH: return 0x2a;
1637		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1638	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1638	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1639		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1640		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1641		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 962 | Line 1656 | static int kc_decode(SDL_keysym const &
1656		case SDLK_RCTRL: return 0x36;
1657		case SDLK_LSHIFT: return 0x38;
1658		case SDLK_RSHIFT: return 0x38;
1659	+	#if (defined(__APPLE__) && defined(__MACH__))
1660	+	case SDLK_LALT: return 0x3a;
1661	+	case SDLK_RALT: return 0x3a;
1662	+	case SDLK_LMETA: return 0x37;
1663	+	case SDLK_RMETA: return 0x37;
1664	+	#else
1665		case SDLK_LALT: return 0x37;
1666		case SDLK_RALT: return 0x37;
1667		case SDLK_LMETA: return 0x3a;
1668		case SDLK_RMETA: return 0x3a;
1669	+	#endif
1670	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1671	+	case SDLK_RSUPER: return 0x3a;
1672		case SDLK_MENU: return 0x32;
1673		case SDLK_CAPSLOCK: return 0x39;
1674		case SDLK_NUMLOCK: return 0x47;
#	Line 1072 | Line 1775 | static void handle_events(void)
1775		// Keyboard
1776		case SDL_KEYDOWN: {
1777		int code = -1;
1778	<	if (use_keycodes) {
1778	>	if (use_keycodes && !is_modifier_key(event.key)) {
1779		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1780		code = keycode_table[event.key.keysym.scancode & 0xff];
1781		} else
#	Line 1100 | Line 1803 | static void handle_events(void)
1803		}
1804		case SDL_KEYUP: {
1805		int code = -1;
1806	<	if (use_keycodes) {
1806	>	if (use_keycodes && !is_modifier_key(event.key)) {
1807		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1808		code = keycode_table[event.key.keysym.scancode & 0xff];
1809		} else
1810		code = event2keycode(event.key, false);
1811	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1812	<	ADBKeyUp(code);
1811	>	if (code >= 0) {
1812	>	if (code == 0x39) {     // Caps Lock released
1813	>	if (caps_on) {
1814	>	ADBKeyUp(code);
1815	>	caps_on = false;
1816	>	} else {
1817	>	ADBKeyDown(code);
1818	>	caps_on = true;
1819	>	}
1820	>	} else
1821	>	ADBKeyUp(code);
1822		if (code == 0x36)
1823		ctrl_down = false;
1824		}
#	Line 1116 | Line 1828 | static void handle_events(void)
1828		// Hidden parts exposed, force complete refresh of window
1829		case SDL_VIDEOEXPOSE:
1830		if (display_type == DISPLAY_WINDOW) {
1831	<	const video_mode &mode = VideoMonitors[0]->get_current_mode();
1831	>	const VIDEO_MODE &mode = VideoMonitors[0]->get_current_mode();
1832		#ifdef ENABLE_VOSF
1833		if (use_vosf) {                 // VOSF refresh
1834		LOCK_VOSF;
1835		PFLAG_SET_ALL;
1836		UNLOCK_VOSF;
1837	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1837	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1838		}
1839		else
1840		#endif
1841	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1841	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1842		}
1843		break;
1844
#	Line 1150 | Line 1862 | static void update_display_static(driver
1862		{
1863		// Incremental update code
1864		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1865	<	const video_mode &mode = drv->mode;
1866	<	int bytes_per_row = mode.bytes_per_row;
1865	>	const VIDEO_MODE &mode = drv->mode;
1866	>	int bytes_per_row = VIDEO_MODE_ROW_BYTES;
1867		uint8 *p, *p2;
1868
1869		// Check for first line from top and first line from bottom that have changed
1870		y1 = 0;
1871	<	for (j=0; j<mode.y; j++) {
1871	>	for (j=0; j<VIDEO_MODE_Y; j++) {
1872		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1873		y1 = j;
1874		break;
1875		}
1876		}
1877		y2 = y1 - 1;
1878	<	for (j=mode.y-1; j>=y1; j--) {
1878	>	for (j=VIDEO_MODE_Y-1; j>=y1; j--) {
1879		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1880		y2 = j;
1881		break;
#	Line 1173 | Line 1885 | static void update_display_static(driver
1885
1886		// Check for first column from left and first column from right that have changed
1887		if (high) {
1888	<	if (mode.depth < VDEPTH_8BIT) {
1888	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1889		const int src_bytes_per_row = bytes_per_row;
1890		const int dst_bytes_per_row = drv->s->pitch;
1891	<	const int pixels_per_byte = mode.x / src_bytes_per_row;
1891	>	const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
1892
1893	<	x1 = mode.x / pixels_per_byte;
1893	>	x1 = VIDEO_MODE_X / pixels_per_byte;
1894		for (j = y1; j <= y2; j++) {
1895		p = &the_buffer[j * bytes_per_row];
1896		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1196 | Line 1908 | static void update_display_static(driver
1908		p2 = &the_buffer_copy[j * bytes_per_row];
1909		p += bytes_per_row;
1910		p2 += bytes_per_row;
1911	<	for (i = (mode.x / pixels_per_byte); i > x2; i--) {
1911	>	for (i = (VIDEO_MODE_X / pixels_per_byte); i > x2; i--) {
1912		p--; p2--;
1913		if (*p != *p2) {
1914		x2 = i;
#	Line 1234 | Line 1946 | static void update_display_static(driver
1946		}
1947
1948		} else {
1949	<	const int bytes_per_pixel = mode.bytes_per_row / mode.x;
1949	>	const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1950
1951	<	x1 = mode.x;
1951	>	x1 = VIDEO_MODE_X;
1952		for (j=y1; j<=y2; j++) {
1953		p = &the_buffer[j * bytes_per_row];
1954		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1254 | Line 1966 | static void update_display_static(driver
1966		p2 = &the_buffer_copy[j * bytes_per_row];
1967		p += bytes_per_row;
1968		p2 += bytes_per_row;
1969	<	for (i=mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1969	>	for (i=VIDEO_MODE_X*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1970		p--;
1971		p2--;
1972		if (*p != *p2) {
#	Line 1290 | Line 2002 | static void update_display_static(driver
2002		}
2003		}
2004
2005	+	// Static display update (fixed frame rate, bounding boxes based)
2006	+	// XXX use NQD bounding boxes to help detect dirty areas?
2007	+	static void update_display_static_bbox(driver_window *drv)
2008	+	{
2009	+	const VIDEO_MODE &mode = drv->mode;
2010	+
2011	+	// Allocate bounding boxes for SDL_UpdateRects()
2012	+	const int N_PIXELS = 64;
2013	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2014	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2015	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2016	+	int nr_boxes = 0;
2017	+
2018	+	// Lock surface, if required
2019	+	if (SDL_MUSTLOCK(drv->s))
2020	+	SDL_LockSurface(drv->s);
2021	+
2022	+	// Update the surface from Mac screen
2023	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2024	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2025	+	int x, y;
2026	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2027	+	int h = N_PIXELS;
2028	+	if (h > VIDEO_MODE_Y - y)
2029	+	h = VIDEO_MODE_Y - y;
2030	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2031	+	int w = N_PIXELS;
2032	+	if (w > VIDEO_MODE_X - x)
2033	+	w = VIDEO_MODE_X - x;
2034	+	const int xs = w * bytes_per_pixel;
2035	+	const int xb = x * bytes_per_pixel;
2036	+	bool dirty = false;
2037	+	for (int j = y; j < (y + h); j++) {
2038	+	const int yb = j * bytes_per_row;
2039	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2040	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2041	+	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2042	+	dirty = true;
2043	+	}
2044	+	}
2045	+	if (dirty) {
2046	+	boxes[nr_boxes].x = x;
2047	+	boxes[nr_boxes].y = y;
2048	+	boxes[nr_boxes].w = w;
2049	+	boxes[nr_boxes].h = h;
2050	+	nr_boxes++;
2051	+	}
2052	+	}
2053	+	}
2054	+
2055	+	// Unlock surface, if required
2056	+	if (SDL_MUSTLOCK(drv->s))
2057	+	SDL_UnlockSurface(drv->s);
2058	+
2059	+	// Refresh display
2060	+	if (nr_boxes)
2061	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2062	+	}
2063	+
2064
2065		// We suggest the compiler to inline the next two functions so that it
2066		// may specialise the code according to the current screen depth and
#	Line 1350 | Line 2121 | static void video_refresh_dga_vosf(void)
2121		tick_counter = 0;
2122		if (mainBuffer.dirty) {
2123		LOCK_VOSF;
2124	<	update_display_dga_vosf();
2124	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2125		UNLOCK_VOSF;
2126		}
2127		}
#	Line 1384 | Line 2155 | static void video_refresh_window_static(
2155		static int tick_counter = 0;
2156		if (++tick_counter >= frame_skip) {
2157		tick_counter = 0;
2158	<	update_display_static(static_cast<driver_window *>(drv));
2158	>	const VIDEO_MODE &mode = drv->mode;
2159	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2160	>	update_display_static_bbox(static_cast<driver_window *>(drv));
2161	>	else
2162	>	update_display_static(static_cast<driver_window *>(drv));
2163		}
2164		}
2165
#	Line 1414 | Line 2189 | static void VideoRefreshInit(void)
2189		}
2190		}
2191
2192	+	static inline void do_video_refresh(void)
2193	+	{
2194	+	// Handle SDL events
2195	+	handle_events();
2196	+
2197	+	// Update display
2198	+	video_refresh();
2199	+
2200	+	#ifdef SHEEPSHAVER
2201	+	// Set new cursor image if it was changed
2202	+	if (cursor_changed && sdl_cursor) {
2203	+	cursor_changed = false;
2204	+	LOCK_EVENTS;
2205	+	SDL_FreeCursor(sdl_cursor);
2206	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2207	+	if (sdl_cursor) {
2208	+	SDL_SetCursor(sdl_cursor);
2209	+	#ifdef WIN32
2210	+	// XXX Windows apparently needs an extra mouse event to
2211	+	// make the new cursor image visible
2212	+	int visible = SDL_ShowCursor(-1);
2213	+	if (visible) {
2214	+	int x, y;
2215	+	SDL_GetMouseState(&x, &y);
2216	+	SDL_WarpMouse(x, y);
2217	+	}
2218	+	#endif
2219	+	}
2220	+	UNLOCK_EVENTS;
2221	+	}
2222	+	#endif
2223	+
2224	+	// Set new palette if it was changed
2225	+	handle_palette_changes();
2226	+	}
2227	+
2228	+	// This function is called on non-threaded platforms from a timer interrupt
2229	+	void VideoRefresh(void)
2230	+	{
2231	+	// We need to check redraw_thread_active to inhibit refreshed during
2232	+	// mode changes on non-threaded platforms
2233	+	if (!redraw_thread_active)
2234	+	return;
2235	+
2236	+	// Process pending events and update display
2237	+	do_video_refresh();
2238	+	}
2239	+
2240	+	const int VIDEO_REFRESH_HZ = 60;
2241	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2242	+
2243	+	#ifndef USE_CPU_EMUL_SERVICES
2244		static int redraw_func(void *arg)
2245		{
2246		uint64 start = GetTicks_usec();
2247		int64 ticks = 0;
2248	+	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2249
2250		while (!redraw_thread_cancel) {
2251
2252		// Wait
2253	<	Delay_usec(16667);
2254	<
2255	<	// Handle SDL events
2256	<	handle_events();
2257	<
2258	<	// Refresh display
1431	<	video_refresh();
2253	>	next += VIDEO_REFRESH_DELAY;
2254	>	int64 delay = next - GetTicks_usec();
2255	>	if (delay > 0)
2256	>	Delay_usec(delay);
2257	>	else if (delay < -VIDEO_REFRESH_DELAY)
2258	>	next = GetTicks_usec();
2259		ticks++;
2260
2261	<	// Set new palette if it was changed
2262	<	handle_palette_changes();
2261	>	#ifdef SHEEPSHAVER
2262	>	// Pause if requested (during video mode switches)
2263	>	if (thread_stop_req) {
2264	>	thread_stop_ack = true;
2265	>	continue;
2266	>	}
2267	>	#endif
2268	>
2269	>	// Process pending events and update display
2270	>	do_video_refresh();
2271		}
2272
2273		uint64 end = GetTicks_usec();
2274		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1440	–	redraw_thread_cancel = false;
2275		return 0;
2276		}
2277	+	#endif
2278	+
2279	+
2280	+	/*
2281	+	*  Record dirty area from NQD
2282	+	*/
2283	+
2284	+	#ifdef SHEEPSHAVER
2285	+	void video_set_dirty_area(int x, int y, int w, int h)
2286	+	{
2287	+	const VIDEO_MODE &mode = drv->mode;
2288	+	const int screen_width = VIDEO_MODE_X;
2289	+	const int screen_height = VIDEO_MODE_Y;
2290	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2291	+
2292	+	#ifdef ENABLE_VOSF
2293	+	if (use_vosf) {
2294	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2295	+	return;
2296	+	}
2297	+	#endif
2298	+
2299	+	// XXX handle dirty bounding boxes for non-VOSF modes
2300	+	}
2301	+	#endif

Diff Legend

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