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.43 by asvitkine, 2011-12-29T07:38:34Z

#	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-2008 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	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	+	#if (defined(__APPLE__) && defined(__MACH__))
67	+	#include "utils_macosx.h"
68	+	#endif
69
70		#define DEBUG 0
71		#include "debug.h"
72
59	–
73		// Supported video modes
74	<	static vector<video_mode> VideoModes;
74	>	using std::vector;
75	>	static vector<VIDEO_MODE> VideoModes;
76
77		// Display types
78	+	#ifdef SHEEPSHAVER
79		enum {
80	<	DISPLAY_WINDOW, // windowed display
81	<	DISPLAY_SCREEN  // fullscreen display
80	>	DISPLAY_WINDOW = DIS_WINDOW,                                    // windowed display
81	>	DISPLAY_SCREEN = DIS_SCREEN                                             // fullscreen display
82		};
83	+	extern int display_type;                                                        // See enum above
84	+	#else
85	+	enum {
86	+	DISPLAY_WINDOW,                                                                 // windowed display
87	+	DISPLAY_SCREEN                                                                  // fullscreen display
88	+	};
89	+	static int display_type = DISPLAY_WINDOW;                       // See enum above
90	+	#endif
91
92		// Constants
93	+	#ifdef WIN32
94	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
95	+	#else
96		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
97	+	#endif
98
99
100		// Global variables
#	Line 75 | Line 102 | static int32 frame_skip;                                                       // Prefs
102		static int16 mouse_wheel_mode;
103		static int16 mouse_wheel_lines;
104
78	–	static int display_type = DISPLAY_WINDOW;                       // See enum above
105		static uint8 *the_buffer = NULL;                                        // Mac frame buffer (where MacOS draws into)
106		static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer (for refreshed modes)
107		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
108
109		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
110	+	#ifndef USE_CPU_EMUL_SERVICES
111		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
112		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
113	+	#ifdef SHEEPSHAVER
114	+	static volatile bool thread_stop_req = false;
115	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
116	+	#endif
117	+	#endif
118
119		#ifdef ENABLE_VOSF
120	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
120	>	static bool use_vosf = false;                                           // Flag: VOSF enabled
121		#else
122		static const bool use_vosf = false;                                     // VOSF not possible
123		#endif
#	Line 103 | Line 135 | static int keycode_table[256];                                         // X
135
136		// SDL variables
137		static int screen_depth;                                                        // Depth of current screen
138	+	static SDL_Cursor *sdl_cursor;                                          // Copy of Mac cursor
139	+	static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
140		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
141		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
142	<	static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
142	>	static const int sdl_eventmask = SDL_MOUSEEVENTMASK | SDL_KEYEVENTMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK | SDL_ACTIVEEVENTMASK;
143	>
144	>	// Mutex to protect SDL events
145	>	static SDL_mutex *sdl_events_lock = NULL;
146	>	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
147	>	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
148
149		// Mutex to protect palette
150		static SDL_mutex *sdl_palette_lock = NULL;
#	Line 130 | Line 169 | extern void SysMountFirstFloppy(void);
169
170
171		/*
172	+	*  SDL surface locking glue
173	+	*/
174	+
175	+	#ifdef ENABLE_VOSF
176	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
177	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
178	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
179	+	} while (0)
180	+	#else
181	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
182	+	#endif
183	+
184	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
185	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
186	+	SDL_LockSurface(SURFACE);                               \
187	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
188	+	}                                                                                       \
189	+	} while (0)
190	+
191	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
192	+	if (SDL_MUSTLOCK(SURFACE))                                      \
193	+	SDL_UnlockSurface(SURFACE);                             \
194	+	} while (0)
195	+
196	+
197	+	/*
198	+	*  Framebuffer allocation routines
199	+	*/
200	+
201	+	static void *vm_acquire_framebuffer(uint32 size)
202	+	{
203	+	// always try to reallocate framebuffer at the same address
204	+	static void *fb = VM_MAP_FAILED;
205	+	if (fb != VM_MAP_FAILED) {
206	+	if (vm_acquire_fixed(fb, size) < 0) {
207	+	#ifndef SHEEPSHAVER
208	+	printf("FATAL: Could not reallocate framebuffer at previous address\n");
209	+	#endif
210	+	fb = VM_MAP_FAILED;
211	+	}
212	+	}
213	+	if (fb == VM_MAP_FAILED)
214	+	fb = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT);
215	+	return fb;
216	+	}
217	+
218	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
219	+	{
220	+	vm_release(fb, size);
221	+	}
222	+
223	+
224	+	/*
225	+	*  Windows message handler
226	+	*/
227	+
228	+	#ifdef WIN32
229	+	#include <dbt.h>
230	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
231	+
232	+	extern void SysMediaArrived(void);
233	+	extern void SysMediaRemoved(void);
234	+	extern HWND GetMainWindowHandle(void);
235	+
236	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
237	+	{
238	+	switch (msg) {
239	+	case WM_DEVICECHANGE:
240	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
241	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
242	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
243	+	SysMediaRemoved();
244	+	}
245	+	else if (wParam == DBT_DEVICEARRIVAL) {
246	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
247	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
248	+	SysMediaArrived();
249	+	}
250	+	return 0;
251	+
252	+	default:
253	+	if (sdl_window_proc)
254	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
255	+	}
256	+
257	+	return DefWindowProc(hwnd, msg, wParam, lParam);
258	+	}
259	+	#endif
260	+
261	+
262	+	/*
263	+	*  SheepShaver glue
264	+	*/
265	+
266	+	#ifdef SHEEPSHAVER
267	+	// Color depth modes type
268	+	typedef int video_depth;
269	+
270	+	// 1, 2, 4 and 8 bit depths use a color palette
271	+	static inline bool IsDirectMode(VIDEO_MODE const & mode)
272	+	{
273	+	return IsDirectMode(mode.viAppleMode);
274	+	}
275	+
276	+	// Abstract base class representing one (possibly virtual) monitor
277	+	// ("monitor" = rectangular display with a contiguous frame buffer)
278	+	class monitor_desc {
279	+	public:
280	+	monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) {}
281	+	virtual ~monitor_desc() {}
282	+
283	+	// Get current Mac frame buffer base address
284	+	uint32 get_mac_frame_base(void) const {return screen_base;}
285	+
286	+	// Set Mac frame buffer base address (called from switch_to_mode())
287	+	void set_mac_frame_base(uint32 base) {screen_base = base;}
288	+
289	+	// Get current video mode
290	+	const VIDEO_MODE &get_current_mode(void) const {return VModes[cur_mode];}
291	+
292	+	// Called by the video driver to switch the video mode on this display
293	+	// (must call set_mac_frame_base())
294	+	virtual void switch_to_current_mode(void) = 0;
295	+
296	+	// Called by the video driver to set the color palette (in indexed modes)
297	+	// or the gamma table (in direct modes)
298	+	virtual void set_palette(uint8 *pal, int num) = 0;
299	+	};
300	+
301	+	// Vector of pointers to available monitor descriptions, filled by VideoInit()
302	+	static vector<monitor_desc *> VideoMonitors;
303	+
304	+	// Find Apple mode matching best specified dimensions
305	+	static int find_apple_resolution(int xsize, int ysize)
306	+	{
307	+	if (xsize == 640 && ysize == 480)
308	+	return APPLE_640x480;
309	+	if (xsize == 800 && ysize == 600)
310	+	return APPLE_800x600;
311	+	if (xsize == 1024 && ysize == 768)
312	+	return APPLE_1024x768;
313	+	if (xsize == 1152 && ysize == 768)
314	+	return APPLE_1152x768;
315	+	if (xsize == 1152 && ysize == 900)
316	+	return APPLE_1152x900;
317	+	if (xsize == 1280 && ysize == 1024)
318	+	return APPLE_1280x1024;
319	+	if (xsize == 1600 && ysize == 1200)
320	+	return APPLE_1600x1200;
321	+	return APPLE_CUSTOM;
322	+	}
323	+
324	+	// Display error alert
325	+	static void ErrorAlert(int error)
326	+	{
327	+	ErrorAlert(GetString(error));
328	+	}
329	+
330	+	// Display warning alert
331	+	static void WarningAlert(int warning)
332	+	{
333	+	WarningAlert(GetString(warning));
334	+	}
335	+	#endif
336	+
337	+
338	+	/*
339		*  monitor_desc subclass for SDL display
340		*/
341
342		class SDL_monitor_desc : public monitor_desc {
343		public:
344	<	SDL_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
344	>	SDL_monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
345		~SDL_monitor_desc() {}
346
347		virtual void switch_to_current_mode(void);
#	Line 150 | Line 356 | public:
356		*  Utility functions
357		*/
358
359	+	// Find palette size for given color depth
360	+	static int palette_size(int mode)
361	+	{
362	+	switch (mode) {
363	+	case VIDEO_DEPTH_1BIT: return 2;
364	+	case VIDEO_DEPTH_2BIT: return 4;
365	+	case VIDEO_DEPTH_4BIT: return 16;
366	+	case VIDEO_DEPTH_8BIT: return 256;
367	+	case VIDEO_DEPTH_16BIT: return 32;
368	+	case VIDEO_DEPTH_32BIT: return 256;
369	+	default: return 0;
370	+	}
371	+	}
372	+
373	+	// Return bytes per pixel for requested depth
374	+	static inline int bytes_per_pixel(int depth)
375	+	{
376	+	int bpp;
377	+	switch (depth) {
378	+	case 8:
379	+	bpp = 1;
380	+	break;
381	+	case 15: case 16:
382	+	bpp = 2;
383	+	break;
384	+	case 24: case 32:
385	+	bpp = 4;
386	+	break;
387	+	default:
388	+	abort();
389	+	}
390	+	return bpp;
391	+	}
392	+
393		// Map video_mode depth ID to numerical depth value
394	<	static int sdl_depth_of_video_depth(int video_depth)
394	>	static int mac_depth_of_video_depth(int video_depth)
395		{
396		int depth = -1;
397		switch (video_depth) {
398	<	case VDEPTH_1BIT:
398	>	case VIDEO_DEPTH_1BIT:
399		depth = 1;
400		break;
401	<	case VDEPTH_2BIT:
401	>	case VIDEO_DEPTH_2BIT:
402		depth = 2;
403		break;
404	<	case VDEPTH_4BIT:
404	>	case VIDEO_DEPTH_4BIT:
405		depth = 4;
406		break;
407	<	case VDEPTH_8BIT:
407	>	case VIDEO_DEPTH_8BIT:
408		depth = 8;
409		break;
410	<	case VDEPTH_16BIT:
410	>	case VIDEO_DEPTH_16BIT:
411		depth = 16;
412		break;
413	<	case VDEPTH_32BIT:
413	>	case VIDEO_DEPTH_32BIT:
414		depth = 32;
415		break;
416		default:
#	Line 179 | Line 419 | static int sdl_depth_of_video_depth(int
419		return depth;
420		}
421
422	<	// Add mode to list of supported modes
423	<	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
422	>	// Map video_mode depth ID to SDL screen depth
423	>	static int sdl_depth_of_video_depth(int video_depth)
424		{
425	<	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);
425	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
426		}
427
428	<	// Add standard list of windowed modes for given color depth
429	<	static void add_window_modes(video_depth depth)
428	>	// Get screen dimensions
429	>	static void sdl_display_dimensions(int &width, int &height)
430		{
431	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
432	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
433	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
434	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
435	<	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
436	<	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
437	<	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
431	>	static int max_width, max_height;
432	>	if (max_width == 0 && max_height == 0) {
433	>	max_width = 640 ; max_height = 480;
434	>	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
435	>	if (modes && modes != (SDL_Rect **)-1) {
436	>	// It turns out that on some implementations, and contrary to the documentation,
437	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
438	>	for (int i = 0; modes[i] != NULL; i++) {
439	>	const int w = modes[i]->w;
440	>	const int h = modes[i]->h;
441	>	if (w > max_width && h > max_height) {
442	>	max_width = w;
443	>	max_height = h;
444	>	}
445	>	}
446	>	}
447	>	}
448	>	width = max_width;
449	>	height = max_height;
450	>	}
451	>
452	>	static inline int sdl_display_width(void)
453	>	{
454	>	int width, height;
455	>	sdl_display_dimensions(width, height);
456	>	return width;
457	>	}
458	>
459	>	static inline int sdl_display_height(void)
460	>	{
461	>	int width, height;
462	>	sdl_display_dimensions(width, height);
463	>	return height;
464	>	}
465	>
466	>	// Check wether specified mode is available
467	>	static bool has_mode(int type, int width, int height, int depth)
468	>	{
469	>	#ifdef SHEEPSHAVER
470	>	// Filter out Classic resolutions
471	>	if (width == 512 && height == 384)
472	>	return false;
473	>	#endif
474	>
475	>	// Filter out out-of-bounds resolutions
476	>	if (width > sdl_display_width() || height > sdl_display_height())
477	>	return false;
478	>
479	>	// Rely on SDL capabilities
480	>	return SDL_VideoModeOK(width, height,
481	>	sdl_depth_of_video_depth(depth),
482	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
483	>	}
484	>
485	>	// Add mode to list of supported modes
486	>	static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
487	>	{
488	>	// Filter out unsupported modes
489	>	if (!has_mode(type, width, height, depth))
490	>	return;
491	>
492	>	// Fill in VideoMode entry
493	>	VIDEO_MODE mode;
494	>	#ifdef SHEEPSHAVER
495	>	resolution_id = find_apple_resolution(width, height);
496	>	mode.viType = type;
497	>	#endif
498	>	VIDEO_MODE_X = width;
499	>	VIDEO_MODE_Y = height;
500	>	VIDEO_MODE_RESOLUTION = resolution_id;
501	>	VIDEO_MODE_ROW_BYTES = bytes_per_row;
502	>	VIDEO_MODE_DEPTH = (video_depth)depth;
503	>	VideoModes.push_back(mode);
504		}
505
506		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
507	<	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, video_depth depth, bool native_byte_order)
507	>	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
508		{
509		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
510		int layout = FLAYOUT_DIRECT;
511	<	if (depth == VDEPTH_16BIT)
511	>	if (depth == VIDEO_DEPTH_16BIT)
512		layout = (screen_depth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
513	<	else if (depth == VDEPTH_32BIT)
513	>	else if (depth == VIDEO_DEPTH_32BIT)
514		layout = (screen_depth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
515		if (native_byte_order)
516		MacFrameLayout = layout;
#	Line 219 | Line 519 | static void set_mac_frame_buffer(SDL_mon
519		monitor.set_mac_frame_base(MacFrameBaseMac);
520
521		// Set variables used by UAE memory banking
522	<	const video_mode &mode = monitor.get_current_mode();
522	>	const VIDEO_MODE &mode = monitor.get_current_mode();
523		MacFrameBaseHost = the_buffer;
524	<	MacFrameSize = mode.bytes_per_row * mode.y;
524	>	MacFrameSize = VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y;
525		InitFrameBufferMapping();
526		#else
527		monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
#	Line 242 | Line 542 | static void set_window_name(int name)
542		// Set mouse grab mode
543		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
544		{
545	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
545	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
546		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
547		}
548
549	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
550	+	static void migrate_screen_prefs(void)
551	+	{
552	+	#ifdef SHEEPSHAVER
553	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
554	+	if (PrefsFindString("screen"))
555	+	return;
556	+
557	+	uint32 window_modes = PrefsFindInt32("windowmodes");
558	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
559	+	int width = 0, height = 0;
560	+	if (screen_modes) {
561	+	static const struct {
562	+	int id;
563	+	int width;
564	+	int height;
565	+	}
566	+	modes[] = {
567	+	{  1,    640,    480 },
568	+	{  2,    800,    600 },
569	+	{  4,   1024,    768 },
570	+	{ 64,   1152,    768 },
571	+	{  8,   1152,    900 },
572	+	{ 16,   1280,   1024 },
573	+	{ 32,   1600,   1200 },
574	+	{ 0, }
575	+	};
576	+	for (int i = 0; modes[i].id != 0; i++) {
577	+	if (screen_modes & modes[i].id) {
578	+	if (width < modes[i].width && height < modes[i].height) {
579	+	width = modes[i].width;
580	+	height = modes[i].height;
581	+	}
582	+	}
583	+	}
584	+	} else {
585	+	if (window_modes & 1)
586	+	width = 640, height = 480;
587	+	if (window_modes & 2)
588	+	width = 800, height = 600;
589	+	}
590	+	if (width && height) {
591	+	char str[32];
592	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
593	+	PrefsReplaceString("screen", str);
594	+	}
595	+	#endif
596	+	}
597	+
598
599		/*
600		*  Display "driver" classes
#	Line 270 | Line 619 | public:
619
620		public:
621		SDL_monitor_desc &monitor; // Associated video monitor
622	<	const video_mode &mode;    // Video mode handled by the driver
622	>	const VIDEO_MODE &mode;    // Video mode handled by the driver
623
624		bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
625		SDL_Surface *s; // The surface we draw into
#	Line 279 | Line 628 | public:
628		class driver_window;
629		static void update_display_window_vosf(driver_window *drv);
630		static void update_display_dynamic(int ticker, driver_window *drv);
631	<	static void update_display_static(driver_window *drv);
631	>	static void update_display_static(driver_base *drv);
632
633		class driver_window : public driver_base {
634		friend void update_display_window_vosf(driver_window *drv);
635		friend void update_display_dynamic(int ticker, driver_window *drv);
636	<	friend void update_display_static(driver_window *drv);
636	>	friend void update_display_static(driver_base *drv);
637
638		public:
639		driver_window(SDL_monitor_desc &monitor);
#	Line 301 | Line 650 | private:
650		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
651		};
652
653	+	class driver_fullscreen : public driver_base {
654	+	public:
655	+	driver_fullscreen(SDL_monitor_desc &monitor);
656	+	~driver_fullscreen();
657	+	};
658	+
659		static driver_base *drv = NULL; // Pointer to currently used driver object
660
661		#ifdef ENABLE_VOSF
#	Line 322 | Line 677 | driver_base::~driver_base()
677		if (s)
678		SDL_FreeSurface(s);
679
680	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
681	+	if (the_buffer != VM_MAP_FAILED) {
682	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
683	+	vm_release_framebuffer(the_buffer, the_buffer_size);
684	+	the_buffer = NULL;
685	+	}
686	+
687		// Free frame buffer(s)
688		if (!use_vosf) {
327	–	if (the_buffer) {
328	–	free(the_buffer);
329	–	the_buffer = NULL;
330	–	}
689		if (the_buffer_copy) {
690		free(the_buffer_copy);
691		the_buffer_copy = NULL;
#	Line 335 | Line 693 | driver_base::~driver_base()
693		}
694		#ifdef ENABLE_VOSF
695		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	–	}
696		if (the_host_buffer) {
697		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
698		free(the_host_buffer);
#	Line 351 | Line 703 | driver_base::~driver_base()
703		free(the_buffer_copy);
704		the_buffer_copy = NULL;
705		}
706	+
707	+	// Deinitialize VOSF
708	+	video_vosf_exit();
709		}
710		#endif
711		}
#	Line 358 | Line 713 | driver_base::~driver_base()
713		// Palette has changed
714		void driver_base::update_palette(void)
715		{
716	<	const video_mode &mode = monitor.get_current_mode();
716	>	const VIDEO_MODE &mode = monitor.get_current_mode();
717
718	<	if (mode.depth <= VDEPTH_8BIT)
718	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
719		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
720		}
721
#	Line 379 | Line 734 | void driver_base::restore_mouse_accel(vo
734		*  Windowed display driver
735		*/
736
737	+	static bool SDL_display_opened = false;
738	+
739		// Open display
740		driver_window::driver_window(SDL_monitor_desc &m)
741		: driver_base(m), mouse_grabbed(false)
742		{
743	<	int width = mode.x, height = mode.y;
743	>	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
744		int aligned_width = (width + 15) & ~15;
745		int aligned_height = (height + 15) & ~15;
746
747		// Set absolute mouse mode
748		ADBSetRelMouseMode(mouse_grabbed);
749
750	+	// This is ugly:
751	+	// If we're switching resolutions (ie, not setting it for the first time),
752	+	// there's a bug in SDL where the SDL_Surface created will not be properly
753	+	// setup. The solution is to SDL_QuitSubSystem(SDL_INIT_VIDEO) before calling
754	+	// SDL_SetVideoMode for the second time (SDL_SetVideoMode will call SDL_Init()
755	+	// and all will be well). Without this, the video becomes corrupted (at least
756	+	// on Mac OS X), after the resolution switch.
757	+	if (SDL_display_opened)
758	+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
759	+
760		// Create surface
761	<	int depth = (mode.depth <= VDEPTH_8BIT ? 8 : screen_depth);
761	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
762		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
763		return;
764
765	+	SDL_display_opened = true;
766	+
767		#ifdef ENABLE_VOSF
768		use_vosf = true;
769		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
770		the_host_buffer = (uint8 *)s->pixels;
771		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
772	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
772	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
773		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
774		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
775	+
776	+	// Check whether we can initialize the VOSF subsystem and it's profitable
777	+	if (!video_vosf_init(m)) {
778	+	WarningAlert(STR_VOSF_INIT_ERR);
779	+	use_vosf = false;
780	+	}
781	+	else if (!video_vosf_profitable()) {
782	+	video_vosf_exit();
783	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
784	+	use_vosf = false;
785	+	}
786	+	if (!use_vosf) {
787	+	free(the_buffer_copy);
788	+	vm_release(the_buffer, the_buffer_size);
789	+	the_host_buffer = NULL;
790	+	}
791	+	#endif
792	+	if (!use_vosf) {
793	+	// Allocate memory for frame buffer
794	+	the_buffer_size = (aligned_height + 2) * s->pitch;
795	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
796	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
797	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
798	+	}
799	+
800	+	#ifdef SHEEPSHAVER
801	+	// Create cursor
802	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
803	+	SDL_SetCursor(sdl_cursor);
804	+	cursor_changed = false;
805	+	}
806		#else
807	<	// Allocate memory for frame buffer
808	<	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));
807	>	// Hide cursor
808	>	SDL_ShowCursor(0);
809		#endif
810
811		// Set window name/class
812		set_window_name(STR_WINDOW_TITLE);
813
417	–	// Hide cursor
418	–	SDL_ShowCursor(0);
419	–
814		// Init blitting routines
815		SDL_PixelFormat *f = s->format;
816		VisualFormat visualFormat;
#	Line 424 | Line 818 | driver_window::driver_window(SDL_monitor
818		visualFormat.Rmask = f->Rmask;
819		visualFormat.Gmask = f->Gmask;
820		visualFormat.Bmask = f->Bmask;
821	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(mode.depth));
821	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
822
823		// Load gray ramp to 8->16/32 expand map
824		if (!IsDirectMode(mode))
#	Line 432 | Line 826 | driver_window::driver_window(SDL_monitor
826		ExpandMap[i] = SDL_MapRGB(f, i, i, i);
827
828		// Set frame buffer base
829	<	set_mac_frame_buffer(monitor, mode.depth, true);
829	>	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
830
831		// Everything went well
832		init_ok = true;
#	Line 491 | Line 885 | void driver_window::mouse_moved(int x, i
885		ADBMouseMoved(x, y);
886		}
887
888	+
889	+	/*
890	+	*  Full-screen display driver
891	+	*/
892	+
893	+	// Open display
894	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
895	+	: driver_base(m)
896	+	{
897	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
898	+	int aligned_width = (width + 15) & ~15;
899	+	int aligned_height = (height + 15) & ~15;
900	+
901	+	// Set absolute mouse mode
902	+	ADBSetRelMouseMode(false);
903	+
904	+	// Create surface
905	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
906	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
907	+	return;
908	+
909	+	#ifdef ENABLE_VOSF
910	+	use_vosf = true;
911	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
912	+	the_host_buffer = (uint8 *)s->pixels;
913	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
914	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
915	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
916	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
917	+
918	+	// Check whether we can initialize the VOSF subsystem and it's profitable
919	+	if (!video_vosf_init(m)) {
920	+	WarningAlert(STR_VOSF_INIT_ERR);
921	+	use_vosf = false;
922	+	}
923	+	else if (!video_vosf_profitable()) {
924	+	video_vosf_exit();
925	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
926	+	use_vosf = false;
927	+	}
928	+	if (!use_vosf) {
929	+	free(the_buffer_copy);
930	+	vm_release(the_buffer, the_buffer_size);
931	+	the_host_buffer = NULL;
932	+	}
933	+	#endif
934	+	if (!use_vosf) {
935	+	// Allocate memory for frame buffer
936	+	the_buffer_size = (aligned_height + 2) * s->pitch;
937	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
938	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
939	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
940	+	}
941	+
942	+	// Hide cursor
943	+	SDL_ShowCursor(0);
944	+
945	+	// Init blitting routines
946	+	SDL_PixelFormat *f = s->format;
947	+	VisualFormat visualFormat;
948	+	visualFormat.depth = depth;
949	+	visualFormat.Rmask = f->Rmask;
950	+	visualFormat.Gmask = f->Gmask;
951	+	visualFormat.Bmask = f->Bmask;
952	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
953	+
954	+	// Load gray ramp to 8->16/32 expand map
955	+	if (!IsDirectMode(mode))
956	+	for (int i=0; i<256; i++)
957	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
958	+
959	+	// Set frame buffer base
960	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
961	+
962	+	// Everything went well
963	+	init_ok = true;
964	+	}
965	+
966	+	// Close display
967	+	driver_fullscreen::~driver_fullscreen()
968	+	{
969	+	#ifdef ENABLE_VOSF
970	+	if (use_vosf)
971	+	the_host_buffer = NULL; // don't free() in driver_base dtor
972	+	#endif
973	+	if (s)
974	+	SDL_FreeSurface(s);
975	+
976	+	// Show cursor
977	+	SDL_ShowCursor(1);
978	+	}
979	+
980	+
981		/*
982		*  Initialization
983		*/
#	Line 522 | Line 1009 | static void keycode_init(void)
1009		SDL_VideoDriverName(video_driver, sizeof(video_driver));
1010		bool video_driver_found = false;
1011		char line[256];
1012	+	int n_keys = 0;
1013		while (fgets(line, sizeof(line) - 1, f)) {
1014		// Read line
1015		int len = strlen(line);
#	Line 534 | Line 1022 | static void keycode_init(void)
1022		continue;
1023
1024		if (video_driver_found) {
1025	<	// Skip aliases
1026	<	static const char alias_str[] = "alias";
1027	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
1025	>	// Skip aliases as long as we have read keycodes yet
1026	>	// Otherwise, it's another mapping and we have to stop
1027	>	static const char sdl_str[] = "sdl";
1028	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1029		continue;
1030
1031		// Read keycode
1032		int x_code, mac_code;
1033		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1034	<	keycode_table[x_code & 0xff] = mac_code;
1034	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1035		else
1036		break;
1037		} else {
1038		// Search for SDL video driver string
1039	<	static const char alias_sdl_str[] = "alias SDL";
1040	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
1041	<	char *p = line + sizeof(alias_sdl_str);
1039	>	static const char sdl_str[] = "sdl";
1040	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
1041	>	char *p = line + sizeof(sdl_str);
1042		if (strstr(video_driver, p) == video_driver)
1043		video_driver_found = true;
1044		}
#	Line 567 | Line 1056 | static void keycode_init(void)
1056		WarningAlert(str);
1057		return;
1058		}
1059	+
1060	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1061		}
1062		}
1063
#	Line 574 | Line 1065 | static void keycode_init(void)
1065		bool SDL_monitor_desc::video_open(void)
1066		{
1067		D(bug("video_open()\n"));
1068	<	const video_mode &mode = get_current_mode();
1068	>	const VIDEO_MODE &mode = get_current_mode();
1069	>	#if DEBUG
1070	>	D(bug("Current video mode:\n"));
1071	>	D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f)));
1072	>	#endif
1073
1074		// Create display driver object of requested type
1075		switch (display_type) {
1076		case DISPLAY_WINDOW:
1077		drv = new(std::nothrow) driver_window(*this);
1078		break;
1079	+	case DISPLAY_SCREEN:
1080	+	drv = new(std::nothrow) driver_fullscreen(*this);
1081	+	break;
1082		}
1083		if (drv == NULL)
1084		return false;
#	Line 590 | Line 1088 | bool SDL_monitor_desc::video_open(void)
1088		return false;
1089		}
1090
1091	<	#ifdef ENABLE_VOSF
1092	<	if (use_vosf) {
1093	<	// Initialize the VOSF system
1094	<	if (!video_vosf_init(*this)) {
1095	<	ErrorAlert(STR_VOSF_INIT_ERR);
598	<	return false;
599	<	}
600	<	}
1091	>	#ifdef WIN32
1092	>	// Chain in a new message handler for WM_DEVICECHANGE
1093	>	HWND the_window = GetMainWindowHandle();
1094	>	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1095	>	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1096		#endif
1097	<
1097	>
1098		// Initialize VideoRefresh function
1099		VideoRefreshInit();
1100
#	Line 607 | Line 1102 | bool SDL_monitor_desc::video_open(void)
1102		LOCK_FRAME_BUFFER;
1103
1104		// Start redraw/input thread
1105	+	#ifndef USE_CPU_EMUL_SERVICES
1106		redraw_thread_cancel = false;
1107	<	redraw_thread_active = (SDL_CreateThread(redraw_func, NULL) != NULL);
1107	>	redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1108		if (!redraw_thread_active) {
1109		printf("FATAL: cannot create redraw thread\n");
1110		return false;
1111		}
1112	+	#else
1113	+	redraw_thread_active = true;
1114	+	#endif
1115		return true;
1116		}
1117
1118	+	#ifdef SHEEPSHAVER
1119	+	bool VideoInit(void)
1120	+	{
1121	+	const bool classic = false;
1122	+	#else
1123		bool VideoInit(bool classic)
1124		{
1125	+	#endif
1126		classic_mode = classic;
1127
1128		#ifdef ENABLE_VOSF
#	Line 627 | Line 1132 | bool VideoInit(bool classic)
1132		#endif
1133
1134		// Create Mutexes
1135	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1136	+	return false;
1137		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1138		return false;
1139		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 641 | Line 1148 | bool VideoInit(bool classic)
1148		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1149
1150		// Get screen mode from preferences
1151	<	const char *mode_str;
1151	>	migrate_screen_prefs();
1152	>	const char *mode_str = NULL;
1153		if (classic_mode)
1154		mode_str = "win/512/342";
1155		else
1156		mode_str = PrefsFindString("screen");
1157
1158		// Determine display type and default dimensions
1159	<	int default_width = 512, default_height = 384;
1159	>	int default_width, default_height;
1160	>	if (classic) {
1161	>	default_width = 512;
1162	>	default_height = 384;
1163	>	}
1164	>	else {
1165	>	default_width = 640;
1166	>	default_height = 480;
1167	>	}
1168		display_type = DISPLAY_WINDOW;
1169		if (mode_str) {
1170		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1171		display_type = DISPLAY_WINDOW;
1172	<	}
1173	<	int max_width = 640, max_height = 480;
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	<	}
1172	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1173	>	display_type = DISPLAY_SCREEN;
1174		}
1175		if (default_width <= 0)
1176	<	default_width = max_width;
1176	>	default_width = sdl_display_width();
1177	>	else if (default_width > sdl_display_width())
1178	>	default_width = sdl_display_width();
1179		if (default_height <= 0)
1180	<	default_height = max_height;
1180	>	default_height = sdl_display_height();
1181	>	else if (default_height > sdl_display_height())
1182	>	default_height = sdl_display_height();
1183
1184		// Mac screen depth follows X depth
1185		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
1186	<	video_depth default_depth;
1186	>	int default_depth;
1187		switch (screen_depth) {
1188		case 8:
1189	<	default_depth = VDEPTH_8BIT;
1189	>	default_depth = VIDEO_DEPTH_8BIT;
1190		break;
1191		case 15: case 16:
1192	<	default_depth = VDEPTH_16BIT;
1192	>	default_depth = VIDEO_DEPTH_16BIT;
1193		break;
1194		case 24: case 32:
1195	<	default_depth = VDEPTH_32BIT;
1195	>	default_depth = VIDEO_DEPTH_32BIT;
1196		break;
1197		default:
1198	<	default_depth =  VDEPTH_1BIT;
1198	>	default_depth =  VIDEO_DEPTH_1BIT;
1199		break;
1200		}
1201
1202	+	// Initialize list of video modes to try
1203	+	struct {
1204	+	int w;
1205	+	int h;
1206	+	int resolution_id;
1207	+	}
1208	+	video_modes[] = {
1209	+	{   -1,   -1, 0x80 },
1210	+	{  512,  384, 0x80 },
1211	+	{  640,  480, 0x81 },
1212	+	{  800,  600, 0x82 },
1213	+	{ 1024,  768, 0x83 },
1214	+	{ 1152,  870, 0x84 },
1215	+	{ 1280, 1024, 0x85 },
1216	+	{ 1600, 1200, 0x86 },
1217	+	{ 0, }
1218	+	};
1219	+	video_modes[0].w = default_width;
1220	+	video_modes[0].h = default_height;
1221	+
1222		// Construct list of supported modes
1223		if (display_type == DISPLAY_WINDOW) {
1224		if (classic)
1225	<	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1225	>	add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1226		else {
1227	<	for (int d = VDEPTH_1BIT; d <= default_depth; d++) {
1228	<	int bpp = (d <= VDEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1229	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1230	<	add_window_modes(video_depth(d));
1227	>	for (int i = 0; video_modes[i].w != 0; i++) {
1228	>	const int w = video_modes[i].w;
1229	>	const int h = video_modes[i].h;
1230	>	if (i > 0 && (w >= default_width || h >= default_height))
1231	>	continue;
1232	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1233	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1234		}
1235		}
1236	<	} else
1237	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1236	>	} else if (display_type == DISPLAY_SCREEN) {
1237	>	for (int i = 0; video_modes[i].w != 0; i++) {
1238	>	const int w = video_modes[i].w;
1239	>	const int h = video_modes[i].h;
1240	>	if (i > 0 && (w >= default_width || h >= default_height))
1241	>	continue;
1242	>	if (w == 512 && h == 384)
1243	>	continue;
1244	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1245	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1246	>	}
1247	>	}
1248	>
1249		if (VideoModes.empty()) {
1250		ErrorAlert(STR_NO_XVISUAL_ERR);
1251		return false;
#	Line 705 | Line 1253 | bool VideoInit(bool classic)
1253
1254		// Find requested default mode with specified dimensions
1255		uint32 default_id;
1256	<	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1256	>	std::vector<VIDEO_MODE>::const_iterator i, end = VideoModes.end();
1257		for (i = VideoModes.begin(); i != end; ++i) {
1258	<	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1259	<	default_id = i->resolution_id;
1258	>	const VIDEO_MODE & mode = (*i);
1259	>	if (VIDEO_MODE_X == default_width && VIDEO_MODE_Y == default_height && VIDEO_MODE_DEPTH == default_depth) {
1260	>	default_id = VIDEO_MODE_RESOLUTION;
1261	>	#ifdef SHEEPSHAVER
1262	>	std::vector<VIDEO_MODE>::const_iterator begin = VideoModes.begin();
1263	>	cur_mode = distance(begin, i);
1264	>	#endif
1265		break;
1266		}
1267		}
1268		if (i == end) { // not found, use first available mode
1269	<	default_depth = VideoModes[0].depth;
1270	<	default_id = VideoModes[0].resolution_id;
1269	>	const VIDEO_MODE & mode = VideoModes[0];
1270	>	default_depth = VIDEO_MODE_DEPTH;
1271	>	default_id = VIDEO_MODE_RESOLUTION;
1272	>	#ifdef SHEEPSHAVER
1273	>	cur_mode = 0;
1274	>	#endif
1275		}
1276
1277	+	#ifdef SHEEPSHAVER
1278	+	for (int i = 0; i < VideoModes.size(); i++)
1279	+	VModes[i] = VideoModes[i];
1280	+	VideoInfo *p = &VModes[VideoModes.size()];
1281	+	p->viType = DIS_INVALID;        // End marker
1282	+	p->viRowBytes = 0;
1283	+	p->viXsize = p->viYsize = 0;
1284	+	p->viAppleMode = 0;
1285	+	p->viAppleID = 0;
1286	+	#endif
1287	+
1288		#if DEBUG
1289		D(bug("Available video modes:\n"));
1290		for (i = VideoModes.begin(); i != end; ++i) {
1291	<	int bits = 1 << i->depth;
1291	>	const VIDEO_MODE & mode = (*i);
1292	>	int bits = 1 << VIDEO_MODE_DEPTH;
1293		if (bits == 16)
1294		bits = 15;
1295		else if (bits == 32)
1296		bits = 24;
1297	<	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1297	>	D(bug(" %dx%d (ID %02x), %d colors\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << bits));
1298		}
1299		#endif
1300
1301		// Create SDL_monitor_desc for this (the only) display
1302	<	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, default_depth, default_id);
1302	>	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, (video_depth)default_depth, default_id);
1303		VideoMonitors.push_back(monitor);
1304
1305		// Open display
#	Line 747 | Line 1316 | void SDL_monitor_desc::video_close(void)
1316		{
1317		D(bug("video_close()\n"));
1318
1319	+	#ifdef WIN32
1320	+	// Remove message handler for WM_DEVICECHANGE
1321	+	HWND the_window = GetMainWindowHandle();
1322	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1323	+	#endif
1324	+
1325		// Stop redraw thread
1326	+	#ifndef USE_CPU_EMUL_SERVICES
1327		if (redraw_thread_active) {
1328		redraw_thread_cancel = true;
1329	<	//              SDL_WaitThread(redraw_thread, NULL); doesn't work
754	<	while (redraw_thread_cancel);
1329	>	SDL_WaitThread(redraw_thread, NULL);
1330		}
1331	+	#endif
1332		redraw_thread_active = false;
1333
1334		// Unlock frame buffer
1335		UNLOCK_FRAME_BUFFER;
1336		D(bug(" frame buffer unlocked\n"));
1337
762	–	#ifdef ENABLE_VOSF
763	–	if (use_vosf) {
764	–	// Deinitialize VOSF
765	–	video_vosf_exit();
766	–	}
767	–	#endif
768	–
1338		// Close display
1339		delete drv;
1340		drv = NULL;
#	Line 783 | Line 1352 | void VideoExit(void)
1352		SDL_DestroyMutex(frame_buffer_lock);
1353		if (sdl_palette_lock)
1354		SDL_DestroyMutex(sdl_palette_lock);
1355	+	if (sdl_events_lock)
1356	+	SDL_DestroyMutex(sdl_events_lock);
1357		}
1358
1359
#	Line 801 | Line 1372 | void VideoQuitFullScreen(void)
1372		*  Mac VBL interrupt
1373		*/
1374
1375	+	/*
1376	+	*  Execute video VBL routine
1377	+	*/
1378	+
1379	+	#ifdef SHEEPSHAVER
1380	+	void VideoVBL(void)
1381	+	{
1382	+	// Emergency quit requested? Then quit
1383	+	if (emerg_quit)
1384	+	QuitEmulator();
1385	+
1386	+	// Temporarily give up frame buffer lock (this is the point where
1387	+	// we are suspended when the user presses Ctrl-Tab)
1388	+	UNLOCK_FRAME_BUFFER;
1389	+	LOCK_FRAME_BUFFER;
1390	+
1391	+	// Execute video VBL
1392	+	if (private_data != NULL && private_data->interruptsEnabled)
1393	+	VSLDoInterruptService(private_data->vslServiceID);
1394	+	}
1395	+	#else
1396		void VideoInterrupt(void)
1397		{
1398		// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
#	Line 815 | Line 1407 | void VideoInterrupt(void)
1407		UNLOCK_FRAME_BUFFER;
1408		LOCK_FRAME_BUFFER;
1409		}
1410	+	#endif
1411
1412
1413		/*
1414		*  Set palette
1415		*/
1416
1417	+	#ifdef SHEEPSHAVER
1418	+	void video_set_palette(void)
1419	+	{
1420	+	monitor_desc * monitor = VideoMonitors[0];
1421	+	int n_colors = palette_size(monitor->get_current_mode().viAppleMode);
1422	+	uint8 pal[256 * 3];
1423	+	for (int c = 0; c < n_colors; c++) {
1424	+	pal[c*3 + 0] = mac_pal[c].red;
1425	+	pal[c*3 + 1] = mac_pal[c].green;
1426	+	pal[c*3 + 2] = mac_pal[c].blue;
1427	+	}
1428	+	monitor->set_palette(pal, n_colors);
1429	+	}
1430	+	#endif
1431	+
1432		void SDL_monitor_desc::set_palette(uint8 *pal, int num_in)
1433		{
1434	<	const video_mode &mode = get_current_mode();
1434	>	const VIDEO_MODE &mode = get_current_mode();
1435
1436		// FIXME: how can we handle the gamma ramp?
1437	<	if (mode.depth > VDEPTH_8BIT)
1437	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1438		return;
1439
1440		LOCK_PALETTE;
#	Line 851 | Line 1459 | void SDL_monitor_desc::set_palette(uint8
1459		}
1460
1461		#ifdef ENABLE_VOSF
1462	<	// We have to redraw everything because the interpretation of pixel values changed
1463	<	LOCK_VOSF;
1464	<	PFLAG_SET_ALL;
1465	<	UNLOCK_VOSF;
1466	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1462	>	if (use_vosf) {
1463	>	// We have to redraw everything because the interpretation of pixel values changed
1464	>	LOCK_VOSF;
1465	>	PFLAG_SET_ALL;
1466	>	UNLOCK_VOSF;
1467	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1468	>	}
1469		#endif
1470		}
1471
#	Line 870 | Line 1480 | void SDL_monitor_desc::set_palette(uint8
1480		*  Switch video mode
1481		*/
1482
1483	+	#ifdef SHEEPSHAVER
1484	+	int16 video_mode_change(VidLocals *csSave, uint32 ParamPtr)
1485	+	{
1486	+	/* return if no mode change */
1487	+	if ((csSave->saveData == ReadMacInt32(ParamPtr + csData)) &&
1488	+	(csSave->saveMode == ReadMacInt16(ParamPtr + csMode))) return noErr;
1489	+
1490	+	/* first find video mode in table */
1491	+	for (int i=0; VModes[i].viType != DIS_INVALID; i++) {
1492	+	if ((ReadMacInt16(ParamPtr + csMode) == VModes[i].viAppleMode) &&
1493	+	(ReadMacInt32(ParamPtr + csData) == VModes[i].viAppleID)) {
1494	+	csSave->saveMode = ReadMacInt16(ParamPtr + csMode);
1495	+	csSave->saveData = ReadMacInt32(ParamPtr + csData);
1496	+	csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1497	+
1498	+	// Disable interrupts and pause redraw thread
1499	+	DisableInterrupt();
1500	+	thread_stop_ack = false;
1501	+	thread_stop_req = true;
1502	+	while (!thread_stop_ack) ;
1503	+
1504	+	cur_mode = i;
1505	+	monitor_desc *monitor = VideoMonitors[0];
1506	+	monitor->switch_to_current_mode();
1507	+
1508	+	WriteMacInt32(ParamPtr + csBaseAddr, screen_base);
1509	+	csSave->saveBaseAddr=screen_base;
1510	+	csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1511	+	csSave->saveMode=VModes[cur_mode].viAppleMode;
1512	+
1513	+	// Enable interrupts and resume redraw thread
1514	+	thread_stop_req = false;
1515	+	EnableInterrupt();
1516	+	return noErr;
1517	+	}
1518	+	}
1519	+	return paramErr;
1520	+	}
1521	+	#endif
1522	+
1523		void SDL_monitor_desc::switch_to_current_mode(void)
1524		{
1525		// Close and reopen display
1526	+	LOCK_EVENTS;
1527		video_close();
1528		video_open();
1529	+	UNLOCK_EVENTS;
1530
1531		if (drv == NULL) {
1532		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 884 | Line 1536 | void SDL_monitor_desc::switch_to_current
1536
1537
1538		/*
1539	<	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1540	<	*  and -2 if the key was recognized as a hotkey
1539	>	*  Can we set the MacOS cursor image into the window?
1540	>	*/
1541	>
1542	>	#ifdef SHEEPSHAVER
1543	>	bool video_can_change_cursor(void)
1544	>	{
1545	>	static char driver[] = "Quartz?";
1546	>	static int quartzok = -1;
1547	>
1548	>	if (display_type != DISPLAY_WINDOW)
1549	>	return false;
1550	>
1551	>	if (quartzok < 0) {
1552	>	if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver))
1553	>	quartzok = true;
1554	>	else {
1555	>	// Quartz driver bug prevents cursor changing in SDL 1.2.11 and later
1556	>	const SDL_version *vp = SDL_Linked_Version();
1557	>	quartzok = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch) <= SDL_VERSIONNUM(1, 2, 10);
1558	>	}
1559	>	}
1560	>
1561	>	return quartzok;
1562	>	}
1563	>	#endif
1564	>
1565	>
1566	>	/*
1567	>	*  Set cursor image for window
1568	>	*/
1569	>
1570	>	#ifdef SHEEPSHAVER
1571	>	void video_set_cursor(void)
1572	>	{
1573	>	cursor_changed = true;
1574	>	}
1575	>	#endif
1576	>
1577	>
1578	>	/*
1579	>	*  Keyboard-related utilify functions
1580		*/
1581
1582	+	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1583	+	{
1584	+	switch (e.keysym.sym) {
1585	+	case SDLK_NUMLOCK:
1586	+	case SDLK_CAPSLOCK:
1587	+	case SDLK_SCROLLOCK:
1588	+	case SDLK_RSHIFT:
1589	+	case SDLK_LSHIFT:
1590	+	case SDLK_RCTRL:
1591	+	case SDLK_LCTRL:
1592	+	case SDLK_RALT:
1593	+	case SDLK_LALT:
1594	+	case SDLK_RMETA:
1595	+	case SDLK_LMETA:
1596	+	case SDLK_LSUPER:
1597	+	case SDLK_RSUPER:
1598	+	case SDLK_MODE:
1599	+	case SDLK_COMPOSE:
1600	+	return true;
1601	+	}
1602	+	return false;
1603	+	}
1604	+
1605		static bool is_ctrl_down(SDL_keysym const & ks)
1606		{
1607		return ctrl_down || (ks.mod & KMOD_CTRL);
1608		}
1609
1610	+
1611	+	/*
1612	+	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1613	+	*  and -2 if the key was recognized as a hotkey
1614	+	*/
1615	+
1616		static int kc_decode(SDL_keysym const & ks, bool key_down)
1617		{
1618		switch (ks.sym) {
#	Line 925 | Line 1645 | static int kc_decode(SDL_keysym const &
1645
1646		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1647		case SDLK_2: case SDLK_AT: return 0x13;
1648	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1648	>	case SDLK_3: case SDLK_HASH: return 0x14;
1649		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1650	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1650	>	case SDLK_5: return 0x17;
1651		case SDLK_6: return 0x16;
1652		case SDLK_7: return 0x1a;
1653		case SDLK_8: return 0x1c;
1654		case SDLK_9: return 0x19;
1655		case SDLK_0: return 0x1d;
1656
1657	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1657	>	case SDLK_BACKQUOTE: return 0x0a;
1658		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1659		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1660	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1661	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1662	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1660	>	case SDLK_LEFTBRACKET: return 0x21;
1661	>	case SDLK_RIGHTBRACKET: return 0x1e;
1662	>	case SDLK_BACKSLASH: return 0x2a;
1663		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1664	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1664	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1665		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1666		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1667		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 962 | Line 1682 | static int kc_decode(SDL_keysym const &
1682		case SDLK_RCTRL: return 0x36;
1683		case SDLK_LSHIFT: return 0x38;
1684		case SDLK_RSHIFT: return 0x38;
1685	+	#if (defined(__APPLE__) && defined(__MACH__))
1686	+	case SDLK_LALT: return 0x3a;
1687	+	case SDLK_RALT: return 0x3a;
1688	+	case SDLK_LMETA: return 0x37;
1689	+	case SDLK_RMETA: return 0x37;
1690	+	#else
1691		case SDLK_LALT: return 0x37;
1692		case SDLK_RALT: return 0x37;
1693		case SDLK_LMETA: return 0x3a;
1694		case SDLK_RMETA: return 0x3a;
1695	+	#endif
1696	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1697	+	case SDLK_RSUPER: return 0x3a;
1698		case SDLK_MENU: return 0x32;
1699		case SDLK_CAPSLOCK: return 0x39;
1700		case SDLK_NUMLOCK: return 0x47;
#	Line 1040 | Line 1769 | static void handle_events(void)
1769		// Mouse button
1770		case SDL_MOUSEBUTTONDOWN: {
1771		unsigned int button = event.button.button;
1772	<	if (button < 4)
1773	<	ADBMouseDown(button - 1);
1772	>	if (button == SDL_BUTTON_LEFT)
1773	>	ADBMouseDown(0);
1774	>	else if (button == SDL_BUTTON_RIGHT)
1775	>	ADBMouseDown(1);
1776	>	else if (button == SDL_BUTTON_MIDDLE)
1777	>	ADBMouseDown(2);
1778		else if (button < 6) {  // Wheel mouse
1779		if (mouse_wheel_mode == 0) {
1780		int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
#	Line 1059 | Line 1792 | static void handle_events(void)
1792		}
1793		case SDL_MOUSEBUTTONUP: {
1794		unsigned int button = event.button.button;
1795	<	if (button < 4)
1796	<	ADBMouseUp(button - 1);
1795	>	if (button == SDL_BUTTON_LEFT)
1796	>	ADBMouseUp(0);
1797	>	else if (button == SDL_BUTTON_RIGHT)
1798	>	ADBMouseUp(1);
1799	>	else if (button == SDL_BUTTON_MIDDLE)
1800	>	ADBMouseUp(2);
1801		break;
1802		}
1803
#	Line 1072 | Line 1809 | static void handle_events(void)
1809		// Keyboard
1810		case SDL_KEYDOWN: {
1811		int code = -1;
1812	<	if (use_keycodes) {
1812	>	if (use_keycodes && !is_modifier_key(event.key)) {
1813		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1814		code = keycode_table[event.key.keysym.scancode & 0xff];
1815		} else
#	Line 1100 | Line 1837 | static void handle_events(void)
1837		}
1838		case SDL_KEYUP: {
1839		int code = -1;
1840	<	if (use_keycodes) {
1840	>	if (use_keycodes && !is_modifier_key(event.key)) {
1841		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1842		code = keycode_table[event.key.keysym.scancode & 0xff];
1843		} else
1844		code = event2keycode(event.key, false);
1845	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1846	<	ADBKeyUp(code);
1845	>	if (code >= 0) {
1846	>	if (code == 0x39) {     // Caps Lock released
1847	>	if (caps_on) {
1848	>	ADBKeyUp(code);
1849	>	caps_on = false;
1850	>	} else {
1851	>	ADBKeyDown(code);
1852	>	caps_on = true;
1853	>	}
1854	>	} else
1855	>	ADBKeyUp(code);
1856		if (code == 0x36)
1857		ctrl_down = false;
1858		}
#	Line 1116 | Line 1862 | static void handle_events(void)
1862		// Hidden parts exposed, force complete refresh of window
1863		case SDL_VIDEOEXPOSE:
1864		if (display_type == DISPLAY_WINDOW) {
1865	<	const video_mode &mode = VideoMonitors[0]->get_current_mode();
1865	>	const VIDEO_MODE &mode = VideoMonitors[0]->get_current_mode();
1866		#ifdef ENABLE_VOSF
1867		if (use_vosf) {                 // VOSF refresh
1868		LOCK_VOSF;
1869		PFLAG_SET_ALL;
1870		UNLOCK_VOSF;
1871	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1871	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1872		}
1873		else
1874		#endif
1875	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1875	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1876		}
1877		break;
1878
#	Line 1135 | Line 1881 | static void handle_events(void)
1881		ADBKeyDown(0x7f);       // Power key
1882		ADBKeyUp(0x7f);
1883		break;
1884	+
1885	+	// Application activate/deactivate; consume the event but otherwise ignore it
1886	+	case SDL_ACTIVEEVENT:
1887	+	break;
1888		}
1889		}
1890		}
#	Line 1146 | Line 1896 | static void handle_events(void)
1896		*/
1897
1898		// Static display update (fixed frame rate, but incremental)
1899	<	static void update_display_static(driver_window *drv)
1899	>	static void update_display_static(driver_base *drv)
1900		{
1901		// Incremental update code
1902		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1903	<	const video_mode &mode = drv->mode;
1904	<	int bytes_per_row = mode.bytes_per_row;
1903	>	const VIDEO_MODE &mode = drv->mode;
1904	>	int bytes_per_row = VIDEO_MODE_ROW_BYTES;
1905		uint8 *p, *p2;
1906
1907		// Check for first line from top and first line from bottom that have changed
1908		y1 = 0;
1909	<	for (j=0; j<mode.y; j++) {
1909	>	for (j=0; j<VIDEO_MODE_Y; j++) {
1910		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1911		y1 = j;
1912		break;
1913		}
1914		}
1915		y2 = y1 - 1;
1916	<	for (j=mode.y-1; j>=y1; j--) {
1916	>	for (j=VIDEO_MODE_Y-1; j>=y1; j--) {
1917		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1918		y2 = j;
1919		break;
#	Line 1173 | Line 1923 | static void update_display_static(driver
1923
1924		// Check for first column from left and first column from right that have changed
1925		if (high) {
1926	<	if (mode.depth < VDEPTH_8BIT) {
1926	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1927		const int src_bytes_per_row = bytes_per_row;
1928		const int dst_bytes_per_row = drv->s->pitch;
1929	<	const int pixels_per_byte = mode.x / src_bytes_per_row;
1929	>	const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
1930
1931	<	x1 = mode.x / pixels_per_byte;
1931	>	x1 = VIDEO_MODE_X / pixels_per_byte;
1932		for (j = y1; j <= y2; j++) {
1933		p = &the_buffer[j * bytes_per_row];
1934		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1196 | Line 1946 | static void update_display_static(driver
1946		p2 = &the_buffer_copy[j * bytes_per_row];
1947		p += bytes_per_row;
1948		p2 += bytes_per_row;
1949	<	for (i = (mode.x / pixels_per_byte); i > x2; i--) {
1949	>	for (i = (VIDEO_MODE_X / pixels_per_byte); i > x2; i--) {
1950		p--; p2--;
1951		if (*p != *p2) {
1952		x2 = i;
#	Line 1234 | Line 1984 | static void update_display_static(driver
1984		}
1985
1986		} else {
1987	<	const int bytes_per_pixel = mode.bytes_per_row / mode.x;
1987	>	const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1988	>	const int dst_bytes_per_row = drv->s->pitch;
1989
1990	<	x1 = mode.x;
1990	>	x1 = VIDEO_MODE_X;
1991		for (j=y1; j<=y2; j++) {
1992		p = &the_buffer[j * bytes_per_row];
1993		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1254 | Line 2005 | static void update_display_static(driver
2005		p2 = &the_buffer_copy[j * bytes_per_row];
2006		p += bytes_per_row;
2007		p2 += bytes_per_row;
2008	<	for (i=mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
2008	>	for (i=VIDEO_MODE_X*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
2009		p--;
2010		p2--;
2011		if (*p != *p2) {
#	Line 1275 | Line 2026 | static void update_display_static(driver
2026		// Blit to screen surface
2027		for (j=y1; j<=y2; j++) {
2028		i = j * bytes_per_row + x1 * bytes_per_pixel;
2029	+	int dst_i = j * dst_bytes_per_row + x1 * bytes_per_pixel;
2030		memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
2031	<	Screen_blit((uint8 *)drv->s->pixels + i, the_buffer + i, bytes_per_pixel * wide);
2031	>	Screen_blit((uint8 *)drv->s->pixels + dst_i, the_buffer + i, bytes_per_pixel * wide);
2032		}
2033
2034		// Unlock surface, if required
#	Line 1290 | Line 2042 | static void update_display_static(driver
2042		}
2043		}
2044
2045	+	// Static display update (fixed frame rate, bounding boxes based)
2046	+	// XXX use NQD bounding boxes to help detect dirty areas?
2047	+	static void update_display_static_bbox(driver_base *drv)
2048	+	{
2049	+	const VIDEO_MODE &mode = drv->mode;
2050	+
2051	+	// Allocate bounding boxes for SDL_UpdateRects()
2052	+	const int N_PIXELS = 64;
2053	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2054	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2055	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2056	+	int nr_boxes = 0;
2057	+
2058	+	// Lock surface, if required
2059	+	if (SDL_MUSTLOCK(drv->s))
2060	+	SDL_LockSurface(drv->s);
2061	+
2062	+	// Update the surface from Mac screen
2063	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2064	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2065	+	const int dst_bytes_per_row = drv->s->pitch;
2066	+	int x, y;
2067	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2068	+	int h = N_PIXELS;
2069	+	if (h > VIDEO_MODE_Y - y)
2070	+	h = VIDEO_MODE_Y - y;
2071	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2072	+	int w = N_PIXELS;
2073	+	if (w > VIDEO_MODE_X - x)
2074	+	w = VIDEO_MODE_X - x;
2075	+	const int xs = w * bytes_per_pixel;
2076	+	const int xb = x * bytes_per_pixel;
2077	+	bool dirty = false;
2078	+	for (int j = y; j < (y + h); j++) {
2079	+	const int yb = j * bytes_per_row;
2080	+	const int dst_yb = j * dst_bytes_per_row;
2081	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2082	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2083	+	Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs);
2084	+	dirty = true;
2085	+	}
2086	+	}
2087	+	if (dirty) {
2088	+	boxes[nr_boxes].x = x;
2089	+	boxes[nr_boxes].y = y;
2090	+	boxes[nr_boxes].w = w;
2091	+	boxes[nr_boxes].h = h;
2092	+	nr_boxes++;
2093	+	}
2094	+	}
2095	+	}
2096	+
2097	+	// Unlock surface, if required
2098	+	if (SDL_MUSTLOCK(drv->s))
2099	+	SDL_UnlockSurface(drv->s);
2100	+
2101	+	// Refresh display
2102	+	if (nr_boxes)
2103	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2104	+	}
2105	+
2106
2107		// We suggest the compiler to inline the next two functions so that it
2108		// may specialise the code according to the current screen depth and
#	Line 1331 | Line 2144 | static inline void handle_palette_change
2144		UNLOCK_PALETTE;
2145		}
2146
2147	+	static void video_refresh_window_static(void);
2148	+
2149		static void video_refresh_dga(void)
2150		{
2151		// Quit DGA mode if requested
2152		possibly_quit_dga_mode();
2153	+	video_refresh_window_static();
2154		}
2155
2156		#ifdef ENABLE_VOSF
#	Line 1350 | Line 2166 | static void video_refresh_dga_vosf(void)
2166		tick_counter = 0;
2167		if (mainBuffer.dirty) {
2168		LOCK_VOSF;
2169	<	update_display_dga_vosf();
2169	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2170		UNLOCK_VOSF;
2171		}
2172		}
#	Line 1384 | Line 2200 | static void video_refresh_window_static(
2200		static int tick_counter = 0;
2201		if (++tick_counter >= frame_skip) {
2202		tick_counter = 0;
2203	<	update_display_static(static_cast<driver_window *>(drv));
2203	>	const VIDEO_MODE &mode = drv->mode;
2204	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2205	>	update_display_static_bbox(drv);
2206	>	else
2207	>	update_display_static(drv);
2208		}
2209		}
2210
#	Line 1414 | Line 2234 | static void VideoRefreshInit(void)
2234		}
2235		}
2236
2237	+	static inline void do_video_refresh(void)
2238	+	{
2239	+	// Handle SDL events
2240	+	handle_events();
2241	+
2242	+	// Update display
2243	+	#if (defined(__APPLE__) && defined(__MACH__))
2244	+	// SDL expects an auto-release pool to be present.
2245	+	NSAutoReleasePool_wrap(video_refresh);
2246	+	#else
2247	+	video_refresh();
2248	+	#endif
2249	+
2250	+	#ifdef SHEEPSHAVER
2251	+	// Set new cursor image if it was changed
2252	+	if (cursor_changed && sdl_cursor) {
2253	+	cursor_changed = false;
2254	+	LOCK_EVENTS;
2255	+	SDL_FreeCursor(sdl_cursor);
2256	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2257	+	if (sdl_cursor) {
2258	+	SDL_ShowCursor(private_data == NULL || private_data->cursorVisible);
2259	+	SDL_SetCursor(sdl_cursor);
2260	+	#ifdef WIN32
2261	+	// XXX Windows apparently needs an extra mouse event to
2262	+	// make the new cursor image visible
2263	+	int visible = SDL_ShowCursor(-1);
2264	+	if (visible) {
2265	+	int x, y;
2266	+	SDL_GetMouseState(&x, &y);
2267	+	SDL_WarpMouse(x, y);
2268	+	}
2269	+	#endif
2270	+	}
2271	+	UNLOCK_EVENTS;
2272	+	}
2273	+	#endif
2274	+
2275	+	// Set new palette if it was changed
2276	+	handle_palette_changes();
2277	+	}
2278	+
2279	+	// This function is called on non-threaded platforms from a timer interrupt
2280	+	void VideoRefresh(void)
2281	+	{
2282	+	// We need to check redraw_thread_active to inhibit refreshed during
2283	+	// mode changes on non-threaded platforms
2284	+	if (!redraw_thread_active)
2285	+	return;
2286	+
2287	+	// Process pending events and update display
2288	+	do_video_refresh();
2289	+	}
2290	+
2291	+	const int VIDEO_REFRESH_HZ = 60;
2292	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2293	+
2294	+	#ifndef USE_CPU_EMUL_SERVICES
2295		static int redraw_func(void *arg)
2296		{
2297		uint64 start = GetTicks_usec();
2298		int64 ticks = 0;
2299	+	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2300
2301		while (!redraw_thread_cancel) {
2302
2303		// Wait
2304	<	Delay_usec(16667);
2305	<
2306	<	// Handle SDL events
2307	<	handle_events();
2308	<
2309	<	// Refresh display
1431	<	video_refresh();
2304	>	next += VIDEO_REFRESH_DELAY;
2305	>	int64 delay = next - GetTicks_usec();
2306	>	if (delay > 0)
2307	>	Delay_usec(delay);
2308	>	else if (delay < -VIDEO_REFRESH_DELAY)
2309	>	next = GetTicks_usec();
2310		ticks++;
2311
2312	<	// Set new palette if it was changed
2313	<	handle_palette_changes();
2312	>	#ifdef SHEEPSHAVER
2313	>	// Pause if requested (during video mode switches)
2314	>	if (thread_stop_req) {
2315	>	thread_stop_ack = true;
2316	>	continue;
2317	>	}
2318	>	#endif
2319	>
2320	>	// Process pending events and update display
2321	>	do_video_refresh();
2322		}
2323
2324		uint64 end = GetTicks_usec();
2325		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1440	–	redraw_thread_cancel = false;
2326		return 0;
2327		}
2328	+	#endif
2329	+
2330	+
2331	+	/*
2332	+	*  Record dirty area from NQD
2333	+	*/
2334	+
2335	+	#ifdef SHEEPSHAVER
2336	+	void video_set_dirty_area(int x, int y, int w, int h)
2337	+	{
2338	+	#ifdef ENABLE_VOSF
2339	+	const VIDEO_MODE &mode = drv->mode;
2340	+	const int screen_width = VIDEO_MODE_X;
2341	+	const int screen_height = VIDEO_MODE_Y;
2342	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2343	+
2344	+	if (use_vosf) {
2345	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2346	+	return;
2347	+	}
2348	+	#endif
2349	+
2350	+	// XXX handle dirty bounding boxes for non-VOSF modes
2351	+	}
2352	+	#endif

Diff Legend

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