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.46 by asvitkine, 2012-01-14T15:45:18Z

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

Diff Legend

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