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.1 by gbeauche, 2004-06-23T13:47:20Z vs.
Revision 1.29 by gbeauche, 2006-05-14T14:11:46Z

#	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 40 | 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 48 | 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 72 | Line 99 | static int32 frame_skip;                                                       // Prefs
99		static int16 mouse_wheel_mode;
100		static int16 mouse_wheel_lines;
101
75	–	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 100 | 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;
#	Line 126 | 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 146 | 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 175 | 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;
411	<	mode.x = width;
412	<	mode.y = height;
413	<	mode.resolution_id = resolution_id;
414	<	mode.bytes_per_row = bytes_per_row;
415	<	mode.depth = depth;
416	<	VideoModes.push_back(mode);
410	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
411	>	}
412	>
413	>	// Get screen dimensions
414	>	static void sdl_display_dimensions(int &width, int &height)
415	>	{
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 standard list of windowed modes for given color depth
471	<	static void add_window_modes(video_depth depth)
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	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
474	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
475	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
476	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
477	<	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
478	<	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
479	<	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
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 215 | 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 238 | 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 266 | 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 297 | 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 318 | 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) {
323	–	if (the_buffer) {
324	–	free(the_buffer);
325	–	the_buffer = NULL;
326	–	}
674		if (the_buffer_copy) {
675		free(the_buffer_copy);
676		the_buffer_copy = NULL;
#	Line 331 | Line 678 | driver_base::~driver_base()
678		}
679		#ifdef ENABLE_VOSF
680		else {
334	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
335	–	if (the_buffer != VM_MAP_FAILED) {
336	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
337	–	vm_release(the_buffer, the_buffer_size);
338	–	the_buffer = NULL;
339	–	}
681		if (the_host_buffer) {
682		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
683		free(the_host_buffer);
#	Line 347 | 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 354 | 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 723 | void driver_base::restore_mouse_accel(vo
723		driver_window::driver_window(SDL_monitor_desc &m)
724		: driver_base(m), mouse_grabbed(false)
725		{
726	<	int width = mode.x, height = mode.y;
726	>	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
727		int aligned_width = (width + 15) & ~15;
728		int aligned_height = (height + 15) & ~15;
729
#	Line 387 | Line 731 | driver_window::driver_window(SDL_monitor
731		ADBSetRelMouseMode(mouse_grabbed);
732
733		// Create surface
734	<	int depth = (mode.depth <= VDEPTH_8BIT ? 8 : screen_depth);
734	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
735		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
736		return;
737
#	Line 396 | Line 740 | driver_window::driver_window(SDL_monitor
740		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
741		the_host_buffer = (uint8 *)s->pixels;
742		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
743	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
743	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
744		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
745		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
746	+
747	+	// Check whether we can initialize the VOSF subsystem and it's profitable
748	+	if (!video_vosf_init(m)) {
749	+	WarningAlert(STR_VOSF_INIT_ERR);
750	+	use_vosf = false;
751	+	}
752	+	else if (!video_vosf_profitable()) {
753	+	video_vosf_exit();
754	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
755	+	use_vosf = false;
756	+	}
757	+	if (!use_vosf) {
758	+	free(the_buffer_copy);
759	+	vm_release(the_buffer, the_buffer_size);
760	+	the_host_buffer = NULL;
761	+	}
762	+	#endif
763	+	if (!use_vosf) {
764	+	// Allocate memory for frame buffer
765	+	the_buffer_size = (aligned_height + 2) * s->pitch;
766	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
767	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
768	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
769	+	}
770	+
771	+	#ifdef SHEEPSHAVER
772	+	// Create cursor
773	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
774	+	SDL_SetCursor(sdl_cursor);
775	+	cursor_changed = false;
776	+	}
777		#else
778	<	// Allocate memory for frame buffer
779	<	the_buffer_size = (aligned_height + 2) * s->pitch;
405	<	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
406	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
407	<	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
778	>	// Hide cursor
779	>	SDL_ShowCursor(0);
780		#endif
781
782		// Set window name/class
783		set_window_name(STR_WINDOW_TITLE);
784
413	–	// Hide cursor
414	–	SDL_ShowCursor(0);
415	–
785		// Init blitting routines
786		SDL_PixelFormat *f = s->format;
787		VisualFormat visualFormat;
#	Line 420 | Line 789 | driver_window::driver_window(SDL_monitor
789		visualFormat.Rmask = f->Rmask;
790		visualFormat.Gmask = f->Gmask;
791		visualFormat.Bmask = f->Bmask;
792	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(mode.depth));
792	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
793
794		// Load gray ramp to 8->16/32 expand map
795		if (!IsDirectMode(mode))
#	Line 428 | Line 797 | driver_window::driver_window(SDL_monitor
797		ExpandMap[i] = SDL_MapRGB(f, i, i, i);
798
799		// Set frame buffer base
800	<	set_mac_frame_buffer(monitor, mode.depth, true);
800	>	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
801
802		// Everything went well
803		init_ok = true;
#	Line 487 | Line 856 | void driver_window::mouse_moved(int x, i
856		ADBMouseMoved(x, y);
857		}
858
859	+
860	+	/*
861	+	*  Full-screen display driver
862	+	*/
863	+
864	+	// Open display
865	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
866	+	: driver_base(m)
867	+	{
868	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
869	+	int aligned_width = (width + 15) & ~15;
870	+	int aligned_height = (height + 15) & ~15;
871	+
872	+	// Set absolute mouse mode
873	+	ADBSetRelMouseMode(false);
874	+
875	+	// Create surface
876	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
877	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
878	+	return;
879	+
880	+	#ifdef ENABLE_VOSF
881	+	use_vosf = true;
882	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
883	+	the_host_buffer = (uint8 *)s->pixels;
884	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
885	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
886	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
887	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
888	+
889	+	// Check whether we can initialize the VOSF subsystem and it's profitable
890	+	if (!video_vosf_init(m)) {
891	+	WarningAlert(STR_VOSF_INIT_ERR);
892	+	use_vosf = false;
893	+	}
894	+	else if (!video_vosf_profitable()) {
895	+	video_vosf_exit();
896	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
897	+	use_vosf = false;
898	+	}
899	+	if (!use_vosf) {
900	+	free(the_buffer_copy);
901	+	vm_release(the_buffer, the_buffer_size);
902	+	the_host_buffer = NULL;
903	+	}
904	+	#endif
905	+	if (!use_vosf) {
906	+	// Allocate memory for frame buffer
907	+	the_buffer_size = (aligned_height + 2) * s->pitch;
908	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
909	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
910	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
911	+	}
912	+
913	+	// Hide cursor
914	+	SDL_ShowCursor(0);
915	+
916	+	// Init blitting routines
917	+	SDL_PixelFormat *f = s->format;
918	+	VisualFormat visualFormat;
919	+	visualFormat.depth = depth;
920	+	visualFormat.Rmask = f->Rmask;
921	+	visualFormat.Gmask = f->Gmask;
922	+	visualFormat.Bmask = f->Bmask;
923	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
924	+
925	+	// Load gray ramp to 8->16/32 expand map
926	+	if (!IsDirectMode(mode))
927	+	for (int i=0; i<256; i++)
928	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
929	+
930	+	// Set frame buffer base
931	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
932	+
933	+	// Everything went well
934	+	init_ok = true;
935	+	}
936	+
937	+	// Close display
938	+	driver_fullscreen::~driver_fullscreen()
939	+	{
940	+	#ifdef ENABLE_VOSF
941	+	if (use_vosf)
942	+	the_host_buffer = NULL; // don't free() in driver_base dtor
943	+	#endif
944	+	if (s)
945	+	SDL_FreeSurface(s);
946	+
947	+	// Show cursor
948	+	SDL_ShowCursor(1);
949	+	}
950	+
951	+
952		/*
953		*  Initialization
954		*/
#	Line 518 | Line 980 | static void keycode_init(void)
980		SDL_VideoDriverName(video_driver, sizeof(video_driver));
981		bool video_driver_found = false;
982		char line[256];
983	+	int n_keys = 0;
984		while (fgets(line, sizeof(line) - 1, f)) {
985		// Read line
986		int len = strlen(line);
#	Line 530 | Line 993 | static void keycode_init(void)
993		continue;
994
995		if (video_driver_found) {
996	<	// Skip aliases
997	<	static const char alias_str[] = "alias";
998	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
996	>	// Skip aliases as long as we have read keycodes yet
997	>	// Otherwise, it's another mapping and we have to stop
998	>	static const char sdl_str[] = "sdl";
999	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1000		continue;
1001
1002		// Read keycode
1003		int x_code, mac_code;
1004		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1005	<	keycode_table[x_code & 0xff] = mac_code;
1005	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1006		else
1007		break;
1008		} else {
1009		// Search for SDL video driver string
1010	<	static const char alias_sdl_str[] = "alias SDL";
1011	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
1012	<	char *p = line + sizeof(alias_sdl_str);
1010	>	static const char sdl_str[] = "sdl";
1011	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
1012	>	char *p = line + sizeof(sdl_str);
1013		if (strstr(video_driver, p) == video_driver)
1014		video_driver_found = true;
1015		}
#	Line 563 | Line 1027 | static void keycode_init(void)
1027		WarningAlert(str);
1028		return;
1029		}
1030	+
1031	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1032		}
1033		}
1034
#	Line 570 | Line 1036 | static void keycode_init(void)
1036		bool SDL_monitor_desc::video_open(void)
1037		{
1038		D(bug("video_open()\n"));
1039	<	const video_mode &mode = get_current_mode();
1039	>	const VIDEO_MODE &mode = get_current_mode();
1040	>	#if DEBUG
1041	>	D(bug("Current video mode:\n"));
1042	>	D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f)));
1043	>	#endif
1044
1045		// Create display driver object of requested type
1046		switch (display_type) {
1047		case DISPLAY_WINDOW:
1048		drv = new(std::nothrow) driver_window(*this);
1049		break;
1050	+	case DISPLAY_SCREEN:
1051	+	drv = new(std::nothrow) driver_fullscreen(*this);
1052	+	break;
1053		}
1054		if (drv == NULL)
1055		return false;
#	Line 586 | Line 1059 | bool SDL_monitor_desc::video_open(void)
1059		return false;
1060		}
1061
1062	<	#ifdef ENABLE_VOSF
1063	<	if (use_vosf) {
1064	<	// Initialize the VOSF system
1065	<	if (!video_vosf_init(*this)) {
1066	<	ErrorAlert(STR_VOSF_INIT_ERR);
594	<	return false;
595	<	}
596	<	}
1062	>	#ifdef WIN32
1063	>	// Chain in a new message handler for WM_DEVICECHANGE
1064	>	HWND the_window = GetMainWindowHandle();
1065	>	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1066	>	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1067		#endif
1068	<
1068	>
1069		// Initialize VideoRefresh function
1070		VideoRefreshInit();
1071
#	Line 603 | Line 1073 | bool SDL_monitor_desc::video_open(void)
1073		LOCK_FRAME_BUFFER;
1074
1075		// Start redraw/input thread
1076	+	#ifndef USE_CPU_EMUL_SERVICES
1077		redraw_thread_cancel = false;
1078	<	redraw_thread_active = (SDL_CreateThread(redraw_func, NULL) != NULL);
1078	>	redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1079		if (!redraw_thread_active) {
1080		printf("FATAL: cannot create redraw thread\n");
1081		return false;
1082		}
1083	+	#else
1084	+	redraw_thread_active = true;
1085	+	#endif
1086		return true;
1087		}
1088
1089	+	#ifdef SHEEPSHAVER
1090	+	bool VideoInit(void)
1091	+	{
1092	+	const bool classic = false;
1093	+	#else
1094		bool VideoInit(bool classic)
1095		{
1096	+	#endif
1097		classic_mode = classic;
1098
1099		#ifdef ENABLE_VOSF
#	Line 623 | Line 1103 | bool VideoInit(bool classic)
1103		#endif
1104
1105		// Create Mutexes
1106	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1107	+	return false;
1108		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1109		return false;
1110		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 637 | Line 1119 | bool VideoInit(bool classic)
1119		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1120
1121		// Get screen mode from preferences
1122	<	const char *mode_str;
1122	>	migrate_screen_prefs();
1123	>	const char *mode_str = NULL;
1124		if (classic_mode)
1125		mode_str = "win/512/342";
1126		else
1127		mode_str = PrefsFindString("screen");
1128
1129		// Determine display type and default dimensions
1130	<	int default_width = 512, default_height = 384;
1130	>	int default_width, default_height;
1131	>	if (classic) {
1132	>	default_width = 512;
1133	>	default_height = 384;
1134	>	}
1135	>	else {
1136	>	default_width = 640;
1137	>	default_height = 480;
1138	>	}
1139		display_type = DISPLAY_WINDOW;
1140		if (mode_str) {
1141		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1142		display_type = DISPLAY_WINDOW;
1143	<	}
1144	<	int max_width = 640, max_height = 480;
654	<	if (display_type == DISPLAY_SCREEN) {
655	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
656	<	if (modes && modes != (SDL_Rect **)-1) {
657	<	max_width = modes[0]->w;
658	<	max_height = modes[0]->h;
659	<	}
1143	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1144	>	display_type = DISPLAY_SCREEN;
1145		}
1146		if (default_width <= 0)
1147	<	default_width = max_width;
1147	>	default_width = sdl_display_width();
1148	>	else if (default_width > sdl_display_width())
1149	>	default_width = sdl_display_width();
1150		if (default_height <= 0)
1151	<	default_height = max_height;
1151	>	default_height = sdl_display_height();
1152	>	else if (default_height > sdl_display_height())
1153	>	default_height = sdl_display_height();
1154
1155		// Mac screen depth follows X depth
1156		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
1157	<	video_depth default_depth;
1157	>	int default_depth;
1158		switch (screen_depth) {
1159		case 8:
1160	<	default_depth = VDEPTH_8BIT;
1160	>	default_depth = VIDEO_DEPTH_8BIT;
1161		break;
1162		case 15: case 16:
1163	<	default_depth = VDEPTH_16BIT;
1163	>	default_depth = VIDEO_DEPTH_16BIT;
1164		break;
1165		case 24: case 32:
1166	<	default_depth = VDEPTH_32BIT;
1166	>	default_depth = VIDEO_DEPTH_32BIT;
1167		break;
1168		default:
1169	<	default_depth =  VDEPTH_1BIT;
1169	>	default_depth =  VIDEO_DEPTH_1BIT;
1170		break;
1171		}
1172
1173	+	// Initialize list of video modes to try
1174	+	struct {
1175	+	int w;
1176	+	int h;
1177	+	int resolution_id;
1178	+	}
1179	+	video_modes[] = {
1180	+	{   -1,   -1, 0x80 },
1181	+	{  512,  384, 0x80 },
1182	+	{  640,  480, 0x81 },
1183	+	{  800,  600, 0x82 },
1184	+	{ 1024,  768, 0x83 },
1185	+	{ 1152,  870, 0x84 },
1186	+	{ 1280, 1024, 0x85 },
1187	+	{ 1600, 1200, 0x86 },
1188	+	{ 0, }
1189	+	};
1190	+	video_modes[0].w = default_width;
1191	+	video_modes[0].h = default_height;
1192	+
1193		// Construct list of supported modes
1194		if (display_type == DISPLAY_WINDOW) {
1195		if (classic)
1196	<	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1196	>	add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1197		else {
1198	<	for (int d = VDEPTH_1BIT; d <= default_depth; d++) {
1199	<	int bpp = (d <= VDEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1200	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1201	<	add_window_modes(video_depth(d));
1198	>	for (int i = 0; video_modes[i].w != 0; i++) {
1199	>	const int w = video_modes[i].w;
1200	>	const int h = video_modes[i].h;
1201	>	if (i > 0 && (w >= default_width || h >= default_height))
1202	>	continue;
1203	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1204	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1205		}
1206		}
1207	<	} else
1208	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1207	>	} else if (display_type == DISPLAY_SCREEN) {
1208	>	for (int i = 0; video_modes[i].w != 0; i++) {
1209	>	const int w = video_modes[i].w;
1210	>	const int h = video_modes[i].h;
1211	>	if (i > 0 && (w >= default_width || h >= default_height))
1212	>	continue;
1213	>	if (w == 512 && h == 384)
1214	>	continue;
1215	>	#ifdef ENABLE_VOSF
1216	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1217	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1218	>	#else
1219	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1220	>	#endif
1221	>	}
1222	>	}
1223	>
1224		if (VideoModes.empty()) {
1225		ErrorAlert(STR_NO_XVISUAL_ERR);
1226		return false;
#	Line 701 | Line 1228 | bool VideoInit(bool classic)
1228
1229		// Find requested default mode with specified dimensions
1230		uint32 default_id;
1231	<	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1231	>	std::vector<VIDEO_MODE>::const_iterator i, end = VideoModes.end();
1232		for (i = VideoModes.begin(); i != end; ++i) {
1233	<	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1234	<	default_id = i->resolution_id;
1233	>	const VIDEO_MODE & mode = (*i);
1234	>	if (VIDEO_MODE_X == default_width && VIDEO_MODE_Y == default_height && VIDEO_MODE_DEPTH == default_depth) {
1235	>	default_id = VIDEO_MODE_RESOLUTION;
1236	>	#ifdef SHEEPSHAVER
1237	>	std::vector<VIDEO_MODE>::const_iterator begin = VideoModes.begin();
1238	>	cur_mode = distance(begin, i);
1239	>	#endif
1240		break;
1241		}
1242		}
1243		if (i == end) { // not found, use first available mode
1244	<	default_depth = VideoModes[0].depth;
1245	<	default_id = VideoModes[0].resolution_id;
1244	>	const VIDEO_MODE & mode = VideoModes[0];
1245	>	default_depth = VIDEO_MODE_DEPTH;
1246	>	default_id = VIDEO_MODE_RESOLUTION;
1247	>	#ifdef SHEEPSHAVER
1248	>	cur_mode = 0;
1249	>	#endif
1250		}
1251
1252	+	#ifdef SHEEPSHAVER
1253	+	for (int i = 0; i < VideoModes.size(); i++)
1254	+	VModes[i] = VideoModes[i];
1255	+	VideoInfo *p = &VModes[VideoModes.size()];
1256	+	p->viType = DIS_INVALID;        // End marker
1257	+	p->viRowBytes = 0;
1258	+	p->viXsize = p->viYsize = 0;
1259	+	p->viAppleMode = 0;
1260	+	p->viAppleID = 0;
1261	+	#endif
1262	+
1263		#if DEBUG
1264		D(bug("Available video modes:\n"));
1265		for (i = VideoModes.begin(); i != end; ++i) {
1266	<	int bits = 1 << i->depth;
1266	>	const VIDEO_MODE & mode = (*i);
1267	>	int bits = 1 << VIDEO_MODE_DEPTH;
1268		if (bits == 16)
1269		bits = 15;
1270		else if (bits == 32)
1271		bits = 24;
1272	<	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1272	>	D(bug(" %dx%d (ID %02x), %d colors\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << bits));
1273		}
1274		#endif
1275
1276		// Create SDL_monitor_desc for this (the only) display
1277	<	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, default_depth, default_id);
1277	>	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, (video_depth)default_depth, default_id);
1278		VideoMonitors.push_back(monitor);
1279
1280		// Open display
#	Line 743 | Line 1291 | void SDL_monitor_desc::video_close(void)
1291		{
1292		D(bug("video_close()\n"));
1293
1294	+	#ifdef WIN32
1295	+	// Remove message handler for WM_DEVICECHANGE
1296	+	HWND the_window = GetMainWindowHandle();
1297	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1298	+	#endif
1299	+
1300		// Stop redraw thread
1301	+	#ifndef USE_CPU_EMUL_SERVICES
1302		if (redraw_thread_active) {
1303		redraw_thread_cancel = true;
1304	<	//              SDL_WaitThread(redraw_thread, NULL); doesn't work
750	<	while (redraw_thread_cancel);
1304	>	SDL_WaitThread(redraw_thread, NULL);
1305		}
1306	+	#endif
1307		redraw_thread_active = false;
1308
1309		// Unlock frame buffer
1310		UNLOCK_FRAME_BUFFER;
1311		D(bug(" frame buffer unlocked\n"));
1312
758	–	#ifdef ENABLE_VOSF
759	–	if (use_vosf) {
760	–	// Deinitialize VOSF
761	–	video_vosf_exit();
762	–	}
763	–	#endif
764	–
1313		// Close display
1314		delete drv;
1315		drv = NULL;
#	Line 779 | Line 1327 | void VideoExit(void)
1327		SDL_DestroyMutex(frame_buffer_lock);
1328		if (sdl_palette_lock)
1329		SDL_DestroyMutex(sdl_palette_lock);
1330	+	if (sdl_events_lock)
1331	+	SDL_DestroyMutex(sdl_events_lock);
1332		}
1333
1334
#	Line 797 | Line 1347 | void VideoQuitFullScreen(void)
1347		*  Mac VBL interrupt
1348		*/
1349
1350	+	/*
1351	+	*  Execute video VBL routine
1352	+	*/
1353	+
1354	+	#ifdef SHEEPSHAVER
1355	+	void VideoVBL(void)
1356	+	{
1357	+	// Emergency quit requested? Then quit
1358	+	if (emerg_quit)
1359	+	QuitEmulator();
1360	+
1361	+	// Temporarily give up frame buffer lock (this is the point where
1362	+	// we are suspended when the user presses Ctrl-Tab)
1363	+	UNLOCK_FRAME_BUFFER;
1364	+	LOCK_FRAME_BUFFER;
1365	+
1366	+	// Execute video VBL
1367	+	if (private_data != NULL && private_data->interruptsEnabled)
1368	+	VSLDoInterruptService(private_data->vslServiceID);
1369	+	}
1370	+	#else
1371		void VideoInterrupt(void)
1372		{
1373	+	// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
1374	+	SDL_PumpEvents();
1375	+
1376		// Emergency quit requested? Then quit
1377		if (emerg_quit)
1378		QuitEmulator();
#	Line 808 | Line 1382 | void VideoInterrupt(void)
1382		UNLOCK_FRAME_BUFFER;
1383		LOCK_FRAME_BUFFER;
1384		}
1385	+	#endif
1386
1387
1388		/*
1389		*  Set palette
1390		*/
1391
1392	+	#ifdef SHEEPSHAVER
1393	+	void video_set_palette(void)
1394	+	{
1395	+	monitor_desc * monitor = VideoMonitors[0];
1396	+	int n_colors = palette_size(monitor->get_current_mode().viAppleMode);
1397	+	uint8 pal[256 * 3];
1398	+	for (int c = 0; c < n_colors; c++) {
1399	+	pal[c*3 + 0] = mac_pal[c].red;
1400	+	pal[c*3 + 1] = mac_pal[c].green;
1401	+	pal[c*3 + 2] = mac_pal[c].blue;
1402	+	}
1403	+	monitor->set_palette(pal, n_colors);
1404	+	}
1405	+	#endif
1406	+
1407		void SDL_monitor_desc::set_palette(uint8 *pal, int num_in)
1408		{
1409	<	const video_mode &mode = get_current_mode();
1409	>	const VIDEO_MODE &mode = get_current_mode();
1410
1411		// FIXME: how can we handle the gamma ramp?
1412	<	if (mode.depth > VDEPTH_8BIT)
1412	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1413		return;
1414
1415		LOCK_PALETTE;
#	Line 844 | Line 1434 | void SDL_monitor_desc::set_palette(uint8
1434		}
1435
1436		#ifdef ENABLE_VOSF
1437	<	// We have to redraw everything because the interpretation of pixel values changed
1438	<	LOCK_VOSF;
1439	<	PFLAG_SET_ALL;
1440	<	UNLOCK_VOSF;
1441	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1437	>	if (use_vosf) {
1438	>	// We have to redraw everything because the interpretation of pixel values changed
1439	>	LOCK_VOSF;
1440	>	PFLAG_SET_ALL;
1441	>	UNLOCK_VOSF;
1442	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1443	>	}
1444		#endif
1445		}
1446
#	Line 863 | Line 1455 | void SDL_monitor_desc::set_palette(uint8
1455		*  Switch video mode
1456		*/
1457
1458	+	#ifdef SHEEPSHAVER
1459	+	int16 video_mode_change(VidLocals *csSave, uint32 ParamPtr)
1460	+	{
1461	+	/* return if no mode change */
1462	+	if ((csSave->saveData == ReadMacInt32(ParamPtr + csData)) &&
1463	+	(csSave->saveMode == ReadMacInt16(ParamPtr + csMode))) return noErr;
1464	+
1465	+	/* first find video mode in table */
1466	+	for (int i=0; VModes[i].viType != DIS_INVALID; i++) {
1467	+	if ((ReadMacInt16(ParamPtr + csMode) == VModes[i].viAppleMode) &&
1468	+	(ReadMacInt32(ParamPtr + csData) == VModes[i].viAppleID)) {
1469	+	csSave->saveMode = ReadMacInt16(ParamPtr + csMode);
1470	+	csSave->saveData = ReadMacInt32(ParamPtr + csData);
1471	+	csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1472	+
1473	+	// Disable interrupts and pause redraw thread
1474	+	DisableInterrupt();
1475	+	thread_stop_ack = false;
1476	+	thread_stop_req = true;
1477	+	while (!thread_stop_ack) ;
1478	+
1479	+	cur_mode = i;
1480	+	monitor_desc *monitor = VideoMonitors[0];
1481	+	monitor->switch_to_current_mode();
1482	+
1483	+	WriteMacInt32(ParamPtr + csBaseAddr, screen_base);
1484	+	csSave->saveBaseAddr=screen_base;
1485	+	csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1486	+	csSave->saveMode=VModes[cur_mode].viAppleMode;
1487	+
1488	+	// Enable interrupts and resume redraw thread
1489	+	thread_stop_req = false;
1490	+	EnableInterrupt();
1491	+	return noErr;
1492	+	}
1493	+	}
1494	+	return paramErr;
1495	+	}
1496	+	#endif
1497	+
1498		void SDL_monitor_desc::switch_to_current_mode(void)
1499		{
1500		// Close and reopen display
1501	+	LOCK_EVENTS;
1502		video_close();
1503		video_open();
1504	+	UNLOCK_EVENTS;
1505
1506		if (drv == NULL) {
1507		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 877 | Line 1511 | void SDL_monitor_desc::switch_to_current
1511
1512
1513		/*
1514	<	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1515	<	*  and -2 if the key was recognized as a hotkey
1514	>	*  Can we set the MacOS cursor image into the window?
1515	>	*/
1516	>
1517	>	#ifdef SHEEPSHAVER
1518	>	bool video_can_change_cursor(void)
1519	>	{
1520	>	return (display_type == DISPLAY_WINDOW);
1521	>	}
1522	>	#endif
1523	>
1524	>
1525	>	/*
1526	>	*  Set cursor image for window
1527	>	*/
1528	>
1529	>	#ifdef SHEEPSHAVER
1530	>	void video_set_cursor(void)
1531	>	{
1532	>	cursor_changed = true;
1533	>	}
1534	>	#endif
1535	>
1536	>
1537	>	/*
1538	>	*  Keyboard-related utilify functions
1539		*/
1540
1541	+	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1542	+	{
1543	+	switch (e.keysym.sym) {
1544	+	case SDLK_NUMLOCK:
1545	+	case SDLK_CAPSLOCK:
1546	+	case SDLK_SCROLLOCK:
1547	+	case SDLK_RSHIFT:
1548	+	case SDLK_LSHIFT:
1549	+	case SDLK_RCTRL:
1550	+	case SDLK_LCTRL:
1551	+	case SDLK_RALT:
1552	+	case SDLK_LALT:
1553	+	case SDLK_RMETA:
1554	+	case SDLK_LMETA:
1555	+	case SDLK_LSUPER:
1556	+	case SDLK_RSUPER:
1557	+	case SDLK_MODE:
1558	+	case SDLK_COMPOSE:
1559	+	return true;
1560	+	}
1561	+	return false;
1562	+	}
1563	+
1564		static bool is_ctrl_down(SDL_keysym const & ks)
1565		{
1566		return ctrl_down || (ks.mod & KMOD_CTRL);
1567		}
1568
1569	+
1570	+	/*
1571	+	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1572	+	*  and -2 if the key was recognized as a hotkey
1573	+	*/
1574	+
1575		static int kc_decode(SDL_keysym const & ks, bool key_down)
1576		{
1577		switch (ks.sym) {
#	Line 918 | Line 1604 | static int kc_decode(SDL_keysym const &
1604
1605		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1606		case SDLK_2: case SDLK_AT: return 0x13;
1607	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1607	>	case SDLK_3: case SDLK_HASH: return 0x14;
1608		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1609	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1609	>	case SDLK_5: return 0x17;
1610		case SDLK_6: return 0x16;
1611		case SDLK_7: return 0x1a;
1612		case SDLK_8: return 0x1c;
1613		case SDLK_9: return 0x19;
1614		case SDLK_0: return 0x1d;
1615
1616	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1616	>	case SDLK_BACKQUOTE: return 0x0a;
1617		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1618		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1619	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1620	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1621	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1619	>	case SDLK_LEFTBRACKET: return 0x21;
1620	>	case SDLK_RIGHTBRACKET: return 0x1e;
1621	>	case SDLK_BACKSLASH: return 0x2a;
1622		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1623	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1623	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1624		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1625		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1626		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 955 | Line 1641 | static int kc_decode(SDL_keysym const &
1641		case SDLK_RCTRL: return 0x36;
1642		case SDLK_LSHIFT: return 0x38;
1643		case SDLK_RSHIFT: return 0x38;
1644	+	#if (defined(__APPLE__) && defined(__MACH__))
1645	+	case SDLK_LALT: return 0x3a;
1646	+	case SDLK_RALT: return 0x3a;
1647	+	case SDLK_LMETA: return 0x37;
1648	+	case SDLK_RMETA: return 0x37;
1649	+	#else
1650		case SDLK_LALT: return 0x37;
1651		case SDLK_RALT: return 0x37;
1652		case SDLK_LMETA: return 0x3a;
1653		case SDLK_RMETA: return 0x3a;
1654	+	#endif
1655	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1656	+	case SDLK_RSUPER: return 0x3a;
1657		case SDLK_MENU: return 0x32;
1658		case SDLK_CAPSLOCK: return 0x39;
1659		case SDLK_NUMLOCK: return 0x47;
#	Line 1021 | Line 1716 | static int event2keycode(SDL_KeyboardEve
1716
1717		static void handle_events(void)
1718		{
1719	<	SDL_Event event;
1720	<	while (SDL_PollEvent(&event)) {
1721	<	switch (event.type) {
1719	>	SDL_Event events[10];
1720	>	const int n_max_events = sizeof(events) / sizeof(events[0]);
1721	>	int n_events;
1722	>
1723	>	while ((n_events = SDL_PeepEvents(events, n_max_events, SDL_GETEVENT, sdl_eventmask)) > 0) {
1724	>	for (int i = 0; i < n_events; i++) {
1725	>	SDL_Event const & event = events[i];
1726	>	switch (event.type) {
1727
1728		// Mouse button
1729		case SDL_MOUSEBUTTONDOWN: {
#	Line 1060 | Line 1760 | static void handle_events(void)
1760		// Keyboard
1761		case SDL_KEYDOWN: {
1762		int code = -1;
1763	<	if (use_keycodes) {
1763	>	if (use_keycodes && !is_modifier_key(event.key)) {
1764		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1765		code = keycode_table[event.key.keysym.scancode & 0xff];
1766		} else
#	Line 1088 | Line 1788 | static void handle_events(void)
1788		}
1789		case SDL_KEYUP: {
1790		int code = -1;
1791	<	if (use_keycodes) {
1791	>	if (use_keycodes && !is_modifier_key(event.key)) {
1792		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1793		code = keycode_table[event.key.keysym.scancode & 0xff];
1794		} else
1795		code = event2keycode(event.key, false);
1796	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1797	<	ADBKeyUp(code);
1796	>	if (code >= 0) {
1797	>	if (code == 0x39) {     // Caps Lock released
1798	>	if (caps_on) {
1799	>	ADBKeyUp(code);
1800	>	caps_on = false;
1801	>	} else {
1802	>	ADBKeyDown(code);
1803	>	caps_on = true;
1804	>	}
1805	>	} else
1806	>	ADBKeyUp(code);
1807		if (code == 0x36)
1808		ctrl_down = false;
1809		}
#	Line 1104 | Line 1813 | static void handle_events(void)
1813		// Hidden parts exposed, force complete refresh of window
1814		case SDL_VIDEOEXPOSE:
1815		if (display_type == DISPLAY_WINDOW) {
1816	<	const video_mode &mode = VideoMonitors[0]->get_current_mode();
1816	>	const VIDEO_MODE &mode = VideoMonitors[0]->get_current_mode();
1817		#ifdef ENABLE_VOSF
1818		if (use_vosf) {                 // VOSF refresh
1819		LOCK_VOSF;
1820		PFLAG_SET_ALL;
1821		UNLOCK_VOSF;
1822	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1822	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1823		}
1824		else
1825		#endif
1826	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1826	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1827		}
1828		break;
1829
#	Line 1123 | Line 1832 | static void handle_events(void)
1832		ADBKeyDown(0x7f);       // Power key
1833		ADBKeyUp(0x7f);
1834		break;
1835	+	}
1836		}
1837		}
1838		}
#	Line 1137 | Line 1847 | static void update_display_static(driver
1847		{
1848		// Incremental update code
1849		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1850	<	const video_mode &mode = drv->mode;
1851	<	int bytes_per_row = mode.bytes_per_row;
1850	>	const VIDEO_MODE &mode = drv->mode;
1851	>	int bytes_per_row = VIDEO_MODE_ROW_BYTES;
1852		uint8 *p, *p2;
1853
1854		// Check for first line from top and first line from bottom that have changed
1855		y1 = 0;
1856	<	for (j=0; j<mode.y; j++) {
1856	>	for (j=0; j<VIDEO_MODE_Y; j++) {
1857		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1858		y1 = j;
1859		break;
1860		}
1861		}
1862		y2 = y1 - 1;
1863	<	for (j=mode.y-1; j>=y1; j--) {
1863	>	for (j=VIDEO_MODE_Y-1; j>=y1; j--) {
1864		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1865		y2 = j;
1866		break;
#	Line 1160 | Line 1870 | static void update_display_static(driver
1870
1871		// Check for first column from left and first column from right that have changed
1872		if (high) {
1873	<	if (mode.depth < VDEPTH_8BIT) {
1873	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1874		const int src_bytes_per_row = bytes_per_row;
1875		const int dst_bytes_per_row = drv->s->pitch;
1876	<	const int pixels_per_byte = mode.x / src_bytes_per_row;
1876	>	const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
1877
1878	<	x1 = mode.x / pixels_per_byte;
1878	>	x1 = VIDEO_MODE_X / pixels_per_byte;
1879		for (j = y1; j <= y2; j++) {
1880		p = &the_buffer[j * bytes_per_row];
1881		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1183 | Line 1893 | static void update_display_static(driver
1893		p2 = &the_buffer_copy[j * bytes_per_row];
1894		p += bytes_per_row;
1895		p2 += bytes_per_row;
1896	<	for (i = (mode.x / pixels_per_byte); i > x2; i--) {
1896	>	for (i = (VIDEO_MODE_X / pixels_per_byte); i > x2; i--) {
1897		p--; p2--;
1898		if (*p != *p2) {
1899		x2 = i;
#	Line 1221 | Line 1931 | static void update_display_static(driver
1931		}
1932
1933		} else {
1934	<	const int bytes_per_pixel = mode.bytes_per_row / mode.x;
1934	>	const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1935
1936	<	x1 = mode.x;
1936	>	x1 = VIDEO_MODE_X;
1937		for (j=y1; j<=y2; j++) {
1938		p = &the_buffer[j * bytes_per_row];
1939		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1241 | Line 1951 | static void update_display_static(driver
1951		p2 = &the_buffer_copy[j * bytes_per_row];
1952		p += bytes_per_row;
1953		p2 += bytes_per_row;
1954	<	for (i=mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1954	>	for (i=VIDEO_MODE_X*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1955		p--;
1956		p2--;
1957		if (*p != *p2) {
#	Line 1277 | Line 1987 | static void update_display_static(driver
1987		}
1988		}
1989
1990	+	// Static display update (fixed frame rate, bounding boxes based)
1991	+	// XXX use NQD bounding boxes to help detect dirty areas?
1992	+	static void update_display_static_bbox(driver_window *drv)
1993	+	{
1994	+	const VIDEO_MODE &mode = drv->mode;
1995	+
1996	+	// Allocate bounding boxes for SDL_UpdateRects()
1997	+	const int N_PIXELS = 64;
1998	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
1999	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2000	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2001	+	int nr_boxes = 0;
2002	+
2003	+	// Lock surface, if required
2004	+	if (SDL_MUSTLOCK(drv->s))
2005	+	SDL_LockSurface(drv->s);
2006	+
2007	+	// Update the surface from Mac screen
2008	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2009	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2010	+	int x, y;
2011	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2012	+	int h = N_PIXELS;
2013	+	if (h > VIDEO_MODE_Y - y)
2014	+	h = VIDEO_MODE_Y - y;
2015	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2016	+	int w = N_PIXELS;
2017	+	if (w > VIDEO_MODE_X - x)
2018	+	w = VIDEO_MODE_X - x;
2019	+	const int xs = w * bytes_per_pixel;
2020	+	const int xb = x * bytes_per_pixel;
2021	+	bool dirty = false;
2022	+	for (int j = y; j < (y + h); j++) {
2023	+	const int yb = j * bytes_per_row;
2024	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2025	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2026	+	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2027	+	dirty = true;
2028	+	}
2029	+	}
2030	+	if (dirty) {
2031	+	boxes[nr_boxes].x = x;
2032	+	boxes[nr_boxes].y = y;
2033	+	boxes[nr_boxes].w = w;
2034	+	boxes[nr_boxes].h = h;
2035	+	nr_boxes++;
2036	+	}
2037	+	}
2038	+	}
2039	+
2040	+	// Unlock surface, if required
2041	+	if (SDL_MUSTLOCK(drv->s))
2042	+	SDL_UnlockSurface(drv->s);
2043	+
2044	+	// Refresh display
2045	+	if (nr_boxes)
2046	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2047	+	}
2048	+
2049
2050		// We suggest the compiler to inline the next two functions so that it
2051		// may specialise the code according to the current screen depth and
#	Line 1337 | Line 2106 | static void video_refresh_dga_vosf(void)
2106		tick_counter = 0;
2107		if (mainBuffer.dirty) {
2108		LOCK_VOSF;
2109	<	update_display_dga_vosf();
2109	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2110		UNLOCK_VOSF;
2111		}
2112		}
#	Line 1371 | Line 2140 | static void video_refresh_window_static(
2140		static int tick_counter = 0;
2141		if (++tick_counter >= frame_skip) {
2142		tick_counter = 0;
2143	<	update_display_static(static_cast<driver_window *>(drv));
2143	>	const VIDEO_MODE &mode = drv->mode;
2144	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2145	>	update_display_static_bbox(static_cast<driver_window *>(drv));
2146	>	else
2147	>	update_display_static(static_cast<driver_window *>(drv));
2148		}
2149		}
2150
#	Line 1401 | Line 2174 | static void VideoRefreshInit(void)
2174		}
2175		}
2176
2177	+	static inline void do_video_refresh(void)
2178	+	{
2179	+	// Handle SDL events
2180	+	handle_events();
2181	+
2182	+	// Update display
2183	+	video_refresh();
2184	+
2185	+	#ifdef SHEEPSHAVER
2186	+	// Set new cursor image if it was changed
2187	+	if (cursor_changed && sdl_cursor) {
2188	+	cursor_changed = false;
2189	+	LOCK_EVENTS;
2190	+	SDL_FreeCursor(sdl_cursor);
2191	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2192	+	if (sdl_cursor) {
2193	+	SDL_SetCursor(sdl_cursor);
2194	+	#ifdef WIN32
2195	+	// XXX Windows apparently needs an extra mouse event to
2196	+	// make the new cursor image visible
2197	+	int visible = SDL_ShowCursor(-1);
2198	+	if (visible) {
2199	+	int x, y;
2200	+	SDL_GetMouseState(&x, &y);
2201	+	SDL_WarpMouse(x, y);
2202	+	}
2203	+	#endif
2204	+	}
2205	+	UNLOCK_EVENTS;
2206	+	}
2207	+	#endif
2208	+
2209	+	// Set new palette if it was changed
2210	+	handle_palette_changes();
2211	+	}
2212	+
2213	+	// This function is called on non-threaded platforms from a timer interrupt
2214	+	void VideoRefresh(void)
2215	+	{
2216	+	// We need to check redraw_thread_active to inhibit refreshed during
2217	+	// mode changes on non-threaded platforms
2218	+	if (!redraw_thread_active)
2219	+	return;
2220	+
2221	+	// Process pending events and update display
2222	+	do_video_refresh();
2223	+	}
2224	+
2225	+	const int VIDEO_REFRESH_HZ = 60;
2226	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2227	+
2228	+	#ifndef USE_CPU_EMUL_SERVICES
2229		static int redraw_func(void *arg)
2230		{
2231		uint64 start = GetTicks_usec();
2232		int64 ticks = 0;
2233	+	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2234
2235		while (!redraw_thread_cancel) {
2236
2237		// Wait
2238	<	Delay_usec(16667);
2239	<
2240	<	// Handle SDL events
2241	<	handle_events();
2242	<
2243	<	// Refresh display
1418	<	video_refresh();
2238	>	next += VIDEO_REFRESH_DELAY;
2239	>	int64 delay = next - GetTicks_usec();
2240	>	if (delay > 0)
2241	>	Delay_usec(delay);
2242	>	else if (delay < -VIDEO_REFRESH_DELAY)
2243	>	next = GetTicks_usec();
2244		ticks++;
2245
2246	<	// Set new palette if it was changed
2247	<	handle_palette_changes();
2246	>	#ifdef SHEEPSHAVER
2247	>	// Pause if requested (during video mode switches)
2248	>	if (thread_stop_req) {
2249	>	thread_stop_ack = true;
2250	>	continue;
2251	>	}
2252	>	#endif
2253	>
2254	>	// Process pending events and update display
2255	>	do_video_refresh();
2256		}
2257
2258		uint64 end = GetTicks_usec();
2259		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1427	–	redraw_thread_cancel = false;
2260		return 0;
2261		}
2262	+	#endif
2263	+
2264	+
2265	+	/*
2266	+	*  Record dirty area from NQD
2267	+	*/
2268	+
2269	+	#ifdef SHEEPSHAVER
2270	+	void video_set_dirty_area(int x, int y, int w, int h)
2271	+	{
2272	+	const VIDEO_MODE &mode = drv->mode;
2273	+	const int screen_width = VIDEO_MODE_X;
2274	+	const int screen_height = VIDEO_MODE_Y;
2275	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2276	+
2277	+	#ifdef ENABLE_VOSF
2278	+	if (use_vosf) {
2279	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2280	+	return;
2281	+	}
2282	+	#endif
2283	+
2284	+	// XXX handle dirty bounding boxes for non-VOSF modes
2285	+	}
2286	+	#endif

Diff Legend

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