[ViewVC] Diff of: cebix/BasiliskII/src/SDL/video

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.3 by gbeauche, 2004-06-23T22:55:47Z vs.
Revision 1.23 by gbeauche, 2006-03-28T07:01:19Z

#	Line 1 \| Line 1
1		/*
2		* video_sdl.cpp - Video/graphics emulation, SDL specific stuff
3		*
4	<	* Basilisk II (C) 1997-2004 Christian Bauer
4	>	* Basilisk II (C) 1997-2005 Christian Bauer
5		*
6		* This program is free software; you can redistribute it and/or modify
7		* it under the terms of the GNU General Public License as published by
#	Line 21 \| Line 21
21		/*
22		* NOTES:
23		* The Ctrl key works like a qualifier for special actions:
24	<	* Ctrl-Tab = suspend DGA mode
24	>	* Ctrl-Tab = suspend DGA mode (TODO)
25		* Ctrl-Esc = emergency quit
26		* Ctrl-F1 = mount floppy
27		* Ctrl-F5 = grab mouse (in windowed mode)
28		*
29		* FIXMEs and TODOs:
30	+	* - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux
31		* - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?)
32		* - Mouse acceleration, there is no API in SDL yet for that
33		* - Force relative mode in Grab mode even if SDL provides absolute coordinates?
#	Line 35 \| Line 36
36		* - Events processing is bound to the general emulation thread as SDL requires
37		* to PumpEvents() within the same thread as the one that called SetVideoMode().
38		* Besides, there can't seem to be a way to call SetVideoMode() from a child thread.
39	+	* - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
40	+	* - Backport hw cursor acceleration to Basilisk II?
41	+	* - Factor out code
42		*/
43
44		#include "sysdeps.h"
#	Line 43 \| Line 47
47		#include <SDL_mutex.h>
48		#include <SDL_thread.h>
49		#include <errno.h>
50	+	#include <vector>
51
52		#include "cpu_emulation.h"
53		#include "main.h"
#	Line 51 \| Line 56
56		#include "prefs.h"
57		#include "user_strings.h"
58		#include "video.h"
59	+	#include "video_defs.h"
60		#include "video_blit.h"
61	+	#include "vm_alloc.h"
62
63		#define DEBUG 0
64		#include "debug.h"
65
66
67		// Supported video modes
68	<	static vector<video_mode> VideoModes;
68	>	using std::vector;
69	>	static vector<VIDEO_MODE> VideoModes;
70
71		// Display types
72	+	#ifdef SHEEPSHAVER
73		enum {
74	<	DISPLAY_WINDOW, // windowed display
75	<	DISPLAY_SCREEN // fullscreen display
74	>	DISPLAY_WINDOW = DIS_WINDOW, // windowed display
75	>	DISPLAY_SCREEN = DIS_SCREEN // fullscreen display
76		};
77	+	extern int display_type; // See enum above
78	+	#else
79	+	enum {
80	+	DISPLAY_WINDOW, // windowed display
81	+	DISPLAY_SCREEN // fullscreen display
82	+	};
83	+	static int display_type = DISPLAY_WINDOW; // See enum above
84	+	#endif
85
86		// Constants
87	+	#ifdef WIN32
88	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
89	+	#else
90		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
91	+	#endif
92
93
94		// Global variables
#	Line 75 \| Line 96 \| static int32 frame_skip; // Prefs
96		static int16 mouse_wheel_mode;
97		static int16 mouse_wheel_lines;
98
78	–	static int display_type = DISPLAY_WINDOW; // See enum above
99		static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into)
100		static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes)
101		static uint32 the_buffer_size; // Size of allocated the_buffer
102
103		static bool redraw_thread_active = false; // Flag: Redraw thread installed
104	+	#ifndef USE_CPU_EMUL_SERVICES
105		static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
106		static SDL_Thread *redraw_thread = NULL; // Redraw thread
107	+	#ifdef SHEEPSHAVER
108	+	static volatile bool thread_stop_req = false;
109	+	static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req
110	+	#endif
111	+	#endif
112
113		#ifdef ENABLE_VOSF
114	<	static bool use_vosf = true; // Flag: VOSF enabled
114	>	static bool use_vosf = false; // Flag: VOSF enabled
115		#else
116		static const bool use_vosf = false; // VOSF not possible
117		#endif
#	Line 103 \| Line 129 \| static int keycode_table[256]; // X
129
130		// SDL variables
131		static int screen_depth; // Depth of current screen
132	+	static SDL_Cursor *sdl_cursor; // Copy of Mac cursor
133	+	static volatile bool cursor_changed = false; // Flag: cursor changed, redraw_func must update the cursor
134		static SDL_Color sdl_palette[256]; // Color palette to be used as CLUT and gamma table
135		static bool sdl_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
136		static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK \| SDL_MOUSEBUTTONUPMASK \| SDL_MOUSEMOTIONMASK \| SDL_KEYUPMASK \| SDL_KEYDOWNMASK \| SDL_VIDEOEXPOSEMASK \| SDL_QUITMASK;
137
138	+	// Mutex to protect SDL events
139	+	static SDL_mutex *sdl_events_lock = NULL;
140	+	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
141	+	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
142	+
143		// Mutex to protect palette
144		static SDL_mutex *sdl_palette_lock = NULL;
145		#define LOCK_PALETTE SDL_LockMutex(sdl_palette_lock)
#	Line 130 \| Line 163 \| extern void SysMountFirstFloppy(void);
163
164
165		/*
166	+	* SDL surface locking glue
167	+	*/
168	+
169	+	#ifdef ENABLE_VOSF
170	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do { \
171	+	if ((SURFACE)->flags & (SDL_HWSURFACE \| SDL_FULLSCREEN)) \
172	+	the_host_buffer = (uint8 *)(SURFACE)->pixels; \
173	+	} while (0)
174	+	#else
175	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
176	+	#endif
177	+
178	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do { \
179	+	if (SDL_MUSTLOCK(SURFACE)) { \
180	+	SDL_LockSurface(SURFACE); \
181	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE); \
182	+	} \
183	+	} while (0)
184	+
185	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do { \
186	+	if (SDL_MUSTLOCK(SURFACE)) \
187	+	SDL_UnlockSurface(SURFACE); \
188	+	} while (0)
189	+
190	+
191	+	/*
192	+	* Framebuffer allocation routines
193	+	*/
194	+
195	+	static void *vm_acquire_framebuffer(uint32 size)
196	+	{
197	+	return vm_acquire(size);
198	+	}
199	+
200	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
201	+	{
202	+	vm_release(fb, size);
203	+	}
204	+
205	+
206	+	/*
207	+	* Windows message handler
208	+	*/
209	+
210	+	#ifdef WIN32
211	+	#include <dbt.h>
212	+	static WNDPROC sdl_window_proc = NULL; // Window proc used by SDL
213	+
214	+	extern void SysMediaArrived(void);
215	+	extern void SysMediaRemoved(void);
216	+	extern HWND GetMainWindowHandle(void);
217	+
218	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
219	+	{
220	+	switch (msg) {
221	+	case WM_DEVICECHANGE:
222	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
223	+	DEV_BROADCAST_HDR p = (DEV_BROADCAST_HDR )lParam;
224	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
225	+	SysMediaRemoved();
226	+	}
227	+	else if (wParam == DBT_DEVICEARRIVAL) {
228	+	DEV_BROADCAST_HDR p = (DEV_BROADCAST_HDR )lParam;
229	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
230	+	SysMediaArrived();
231	+	}
232	+	return 0;
233	+
234	+	default:
235	+	if (sdl_window_proc)
236	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
237	+	}
238	+
239	+	return DefWindowProc(hwnd, msg, wParam, lParam);
240	+	}
241	+	#endif
242	+
243	+
244	+	/*
245	+	* SheepShaver glue
246	+	*/
247	+
248	+	#ifdef SHEEPSHAVER
249	+	// Color depth modes type
250	+	typedef int video_depth;
251	+
252	+	// 1, 2, 4 and 8 bit depths use a color palette
253	+	static inline bool IsDirectMode(VIDEO_MODE const & mode)
254	+	{
255	+	return IsDirectMode(mode.viAppleMode);
256	+	}
257	+
258	+	// Abstract base class representing one (possibly virtual) monitor
259	+	// ("monitor" = rectangular display with a contiguous frame buffer)
260	+	class monitor_desc {
261	+	public:
262	+	monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) {}
263	+	virtual ~monitor_desc() {}
264	+
265	+	// Get current Mac frame buffer base address
266	+	uint32 get_mac_frame_base(void) const {return screen_base;}
267	+
268	+	// Set Mac frame buffer base address (called from switch_to_mode())
269	+	void set_mac_frame_base(uint32 base) {screen_base = base;}
270	+
271	+	// Get current video mode
272	+	const VIDEO_MODE &get_current_mode(void) const {return VModes[cur_mode];}
273	+
274	+	// Called by the video driver to switch the video mode on this display
275	+	// (must call set_mac_frame_base())
276	+	virtual void switch_to_current_mode(void) = 0;
277	+
278	+	// Called by the video driver to set the color palette (in indexed modes)
279	+	// or the gamma table (in direct modes)
280	+	virtual void set_palette(uint8 *pal, int num) = 0;
281	+	};
282	+
283	+	// Vector of pointers to available monitor descriptions, filled by VideoInit()
284	+	static vector<monitor_desc *> VideoMonitors;
285	+
286	+	// Find Apple mode matching best specified dimensions
287	+	static int find_apple_resolution(int xsize, int ysize)
288	+	{
289	+	int apple_id;
290	+	if (xsize < 800)
291	+	apple_id = APPLE_640x480;
292	+	else if (xsize < 1024)
293	+	apple_id = APPLE_800x600;
294	+	else if (xsize < 1152)
295	+	apple_id = APPLE_1024x768;
296	+	else if (xsize < 1280) {
297	+	if (ysize < 900)
298	+	apple_id = APPLE_1152x768;
299	+	else
300	+	apple_id = APPLE_1152x900;
301	+	}
302	+	else if (xsize < 1600)
303	+	apple_id = APPLE_1280x1024;
304	+	else
305	+	apple_id = APPLE_1600x1200;
306	+	return apple_id;
307	+	}
308	+
309	+	// Set parameters to specified Apple mode
310	+	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
311	+	{
312	+	switch (apple_id) {
313	+	case APPLE_640x480:
314	+	xsize = 640;
315	+	ysize = 480;
316	+	break;
317	+	case APPLE_800x600:
318	+	xsize = 800;
319	+	ysize = 600;
320	+	break;
321	+	case APPLE_1024x768:
322	+	xsize = 1024;
323	+	ysize = 768;
324	+	break;
325	+	case APPLE_1152x768:
326	+	xsize = 1152;
327	+	ysize = 768;
328	+	break;
329	+	case APPLE_1152x900:
330	+	xsize = 1152;
331	+	ysize = 900;
332	+	break;
333	+	case APPLE_1280x1024:
334	+	xsize = 1280;
335	+	ysize = 1024;
336	+	break;
337	+	case APPLE_1600x1200:
338	+	xsize = 1600;
339	+	ysize = 1200;
340	+	break;
341	+	default:
342	+	abort();
343	+	}
344	+	}
345	+
346	+	// Match Apple mode matching best specified dimensions
347	+	static int match_apple_resolution(int &xsize, int &ysize)
348	+	{
349	+	int apple_id = find_apple_resolution(xsize, ysize);
350	+	set_apple_resolution(apple_id, xsize, ysize);
351	+	return apple_id;
352	+	}
353	+
354	+	// Display error alert
355	+	static void ErrorAlert(int error)
356	+	{
357	+	ErrorAlert(GetString(error));
358	+	}
359	+
360	+	// Display warning alert
361	+	static void WarningAlert(int warning)
362	+	{
363	+	WarningAlert(GetString(warning));
364	+	}
365	+	#endif
366	+
367	+
368	+	/*
369		* monitor_desc subclass for SDL display
370		*/
371
372		class SDL_monitor_desc : public monitor_desc {
373		public:
374	<	SDL_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
374	>	SDL_monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
375		~SDL_monitor_desc() {}
376
377		virtual void switch_to_current_mode(void);
#	Line 150 \| Line 386 \| public:
386		* Utility functions
387		*/
388
389	+	// Find palette size for given color depth
390	+	static int palette_size(int mode)
391	+	{
392	+	switch (mode) {
393	+	case VIDEO_DEPTH_1BIT: return 2;
394	+	case VIDEO_DEPTH_2BIT: return 4;
395	+	case VIDEO_DEPTH_4BIT: return 16;
396	+	case VIDEO_DEPTH_8BIT: return 256;
397	+	case VIDEO_DEPTH_16BIT: return 32;
398	+	case VIDEO_DEPTH_32BIT: return 256;
399	+	default: return 0;
400	+	}
401	+	}
402	+
403	+	// Return bytes per pixel for requested depth
404	+	static inline int bytes_per_pixel(int depth)
405	+	{
406	+	int bpp;
407	+	switch (depth) {
408	+	case 8:
409	+	bpp = 1;
410	+	break;
411	+	case 15: case 16:
412	+	bpp = 2;
413	+	break;
414	+	case 24: case 32:
415	+	bpp = 4;
416	+	break;
417	+	default:
418	+	abort();
419	+	}
420	+	return bpp;
421	+	}
422	+
423		// Map video_mode depth ID to numerical depth value
424	<	static int sdl_depth_of_video_depth(int video_depth)
424	>	static int mac_depth_of_video_depth(int video_depth)
425		{
426		int depth = -1;
427		switch (video_depth) {
428	<	case VDEPTH_1BIT:
428	>	case VIDEO_DEPTH_1BIT:
429		depth = 1;
430		break;
431	<	case VDEPTH_2BIT:
431	>	case VIDEO_DEPTH_2BIT:
432		depth = 2;
433		break;
434	<	case VDEPTH_4BIT:
434	>	case VIDEO_DEPTH_4BIT:
435		depth = 4;
436		break;
437	<	case VDEPTH_8BIT:
437	>	case VIDEO_DEPTH_8BIT:
438		depth = 8;
439		break;
440	<	case VDEPTH_16BIT:
440	>	case VIDEO_DEPTH_16BIT:
441		depth = 16;
442		break;
443	<	case VDEPTH_32BIT:
443	>	case VIDEO_DEPTH_32BIT:
444		depth = 32;
445		break;
446		default:
#	Line 179 \| Line 449 \| static int sdl_depth_of_video_depth(int
449		return depth;
450		}
451
452	+	// Map video_mode depth ID to SDL screen depth
453	+	static int sdl_depth_of_video_depth(int video_depth)
454	+	{
455	+	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
456	+	}
457	+
458	+	// Check wether specified mode is available
459	+	static bool has_mode(int type, int width, int height)
460	+	{
461	+	#ifdef SHEEPSHAVER
462	+	// Filter out Classic resolutiosn
463	+	if (width == 512 && height == 384)
464	+	return false;
465	+
466	+	// "screen" prefs items always succeeds
467	+	if (PrefsFindString("screen"))
468	+	return true;
469	+
470	+	// Read window & screen modes prefs
471	+	static uint32 window_modes = 0;
472	+	static uint32 screen_modes = 0;
473	+	if (window_modes == 0 \|\| screen_modes == 0) {
474	+	window_modes = PrefsFindInt32("windowmodes");
475	+	screen_modes = PrefsFindInt32("screenmodes");
476	+	if (window_modes == 0 \|\| screen_modes == 0)
477	+	window_modes \|= 3; // Allow at least 640x480 and 800x600 window modes
478	+	}
479	+
480	+	int test_modes;
481	+	switch (type) {
482	+	case DISPLAY_WINDOW:
483	+	test_modes = window_modes;
484	+	break;
485	+	case DISPLAY_SCREEN:
486	+	test_modes = screen_modes;
487	+	break;
488	+	default:
489	+	test_modes = 0;
490	+	break;
491	+	}
492	+
493	+	int apple_mask;
494	+	switch (find_apple_resolution(width, height)) {
495	+	case APPLE_640x480: apple_mask = 0x01; break;
496	+	case APPLE_800x600: apple_mask = 0x02; break;
497	+	case APPLE_1024x768: apple_mask = 0x04; break;
498	+	case APPLE_1152x768: apple_mask = 0x40; break;
499	+	case APPLE_1152x900: apple_mask = 0x08; break;
500	+	case APPLE_1280x1024: apple_mask = 0x10; break;
501	+	case APPLE_1600x1200: apple_mask = 0x20; break;
502	+	default: apple_mask = 0x00; break;
503	+	}
504	+	return (test_modes & apple_mask);
505	+	#endif
506	+	return true;
507	+	}
508	+
509		// Add mode to list of supported modes
510	<	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
510	>	static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
511		{
512	<	video_mode mode;
513	<	mode.x = width;
514	<	mode.y = height;
515	<	mode.resolution_id = resolution_id;
516	<	mode.bytes_per_row = bytes_per_row;
517	<	mode.depth = depth;
512	>	// Filter out unsupported modes
513	>	if (!has_mode(type, width, height))
514	>	return;
515	>
516	>	// Fill in VideoMode entry
517	>	VIDEO_MODE mode;
518	>	#ifdef SHEEPSHAVER
519	>	// Recalculate dimensions to fit Apple modes
520	>	resolution_id = match_apple_resolution(width, height);
521	>	mode.viType = type;
522	>	#endif
523	>	VIDEO_MODE_X = width;
524	>	VIDEO_MODE_Y = height;
525	>	VIDEO_MODE_RESOLUTION = resolution_id;
526	>	VIDEO_MODE_ROW_BYTES = bytes_per_row;
527	>	VIDEO_MODE_DEPTH = (video_depth)depth;
528		VideoModes.push_back(mode);
529		}
530
531		// Add standard list of windowed modes for given color depth
532	<	static void add_window_modes(video_depth depth)
532	>	static void add_window_modes(int depth)
533		{
534	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
535	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
536	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
537	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
538	<	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
539	<	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
540	<	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
534	>	video_depth vdepth = (video_depth)depth;
535	>	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
536	>	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
537	>	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
538	>	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
539	>	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
540	>	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
541	>	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
542		}
543
544		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
545	<	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, video_depth depth, bool native_byte_order)
545	>	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
546		{
547		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
548		int layout = FLAYOUT_DIRECT;
549	<	if (depth == VDEPTH_16BIT)
549	>	if (depth == VIDEO_DEPTH_16BIT)
550		layout = (screen_depth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
551	<	else if (depth == VDEPTH_32BIT)
551	>	else if (depth == VIDEO_DEPTH_32BIT)
552		layout = (screen_depth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
553		if (native_byte_order)
554		MacFrameLayout = layout;
#	Line 219 \| Line 557 \| static void set_mac_frame_buffer(SDL_mon
557		monitor.set_mac_frame_base(MacFrameBaseMac);
558
559		// Set variables used by UAE memory banking
560	<	const video_mode &mode = monitor.get_current_mode();
560	>	const VIDEO_MODE &mode = monitor.get_current_mode();
561		MacFrameBaseHost = the_buffer;
562	<	MacFrameSize = mode.bytes_per_row * mode.y;
562	>	MacFrameSize = VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y;
563		InitFrameBufferMapping();
564		#else
565		monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
#	Line 242 \| Line 580 \| static void set_window_name(int name)
580		// Set mouse grab mode
581		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
582		{
583	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
583	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
584		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
585		}
586
#	Line 270 \| Line 608 \| public:
608
609		public:
610		SDL_monitor_desc &monitor; // Associated video monitor
611	<	const video_mode &mode; // Video mode handled by the driver
611	>	const VIDEO_MODE &mode; // Video mode handled by the driver
612
613		bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
614		SDL_Surface *s; // The surface we draw into
#	Line 301 \| Line 639 \| private:
639		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
640		};
641
642	+	class driver_fullscreen : public driver_base {
643	+	public:
644	+	driver_fullscreen(SDL_monitor_desc &monitor);
645	+	~driver_fullscreen();
646	+	};
647	+
648		static driver_base *drv = NULL; // Pointer to currently used driver object
649
650		#ifdef ENABLE_VOSF
#	Line 322 \| Line 666 \| driver_base::~driver_base()
666		if (s)
667		SDL_FreeSurface(s);
668
669	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
670	+	if (the_buffer != VM_MAP_FAILED) {
671	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
672	+	vm_release_framebuffer(the_buffer, the_buffer_size);
673	+	the_buffer = NULL;
674	+	}
675	+
676		// Free frame buffer(s)
677		if (!use_vosf) {
327	–	if (the_buffer) {
328	–	free(the_buffer);
329	–	the_buffer = NULL;
330	–	}
678		if (the_buffer_copy) {
679		free(the_buffer_copy);
680		the_buffer_copy = NULL;
#	Line 335 \| Line 682 \| driver_base::~driver_base()
682		}
683		#ifdef ENABLE_VOSF
684		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	–	}
685		if (the_host_buffer) {
686		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
687		free(the_host_buffer);
#	Line 351 \| Line 692 \| driver_base::~driver_base()
692		free(the_buffer_copy);
693		the_buffer_copy = NULL;
694		}
695	+
696	+	// Deinitialize VOSF
697	+	video_vosf_exit();
698		}
699		#endif
700		}
#	Line 358 \| Line 702 \| driver_base::~driver_base()
702		// Palette has changed
703		void driver_base::update_palette(void)
704		{
705	<	const video_mode &mode = monitor.get_current_mode();
705	>	const VIDEO_MODE &mode = monitor.get_current_mode();
706
707	<	if (mode.depth <= VDEPTH_8BIT)
707	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
708		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
709		}
710
#	Line 383 \| Line 727 \| void driver_base::restore_mouse_accel(vo
727		driver_window::driver_window(SDL_monitor_desc &m)
728		: driver_base(m), mouse_grabbed(false)
729		{
730	<	int width = mode.x, height = mode.y;
730	>	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
731		int aligned_width = (width + 15) & ~15;
732		int aligned_height = (height + 15) & ~15;
733
#	Line 391 \| Line 735 \| driver_window::driver_window(SDL_monitor
735		ADBSetRelMouseMode(mouse_grabbed);
736
737		// Create surface
738	<	int depth = (mode.depth <= VDEPTH_8BIT ? 8 : screen_depth);
738	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
739		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
740		return;
741
#	Line 400 \| Line 744 \| driver_window::driver_window(SDL_monitor
744		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
745		the_host_buffer = (uint8 *)s->pixels;
746		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
747	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
747	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
748		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
749		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
750	+
751	+	// Check whether we can initialize the VOSF subsystem and it's profitable
752	+	if (!video_vosf_init(m)) {
753	+	WarningAlert(STR_VOSF_INIT_ERR);
754	+	use_vosf = false;
755	+	}
756	+	else if (!video_vosf_profitable()) {
757	+	video_vosf_exit();
758	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
759	+	use_vosf = false;
760	+	}
761	+	if (!use_vosf) {
762	+	free(the_buffer_copy);
763	+	vm_release(the_buffer, the_buffer_size);
764	+	the_host_buffer = NULL;
765	+	}
766	+	#endif
767	+	if (!use_vosf) {
768	+	// Allocate memory for frame buffer
769	+	the_buffer_size = (aligned_height + 2) * s->pitch;
770	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
771	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
772	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
773	+	}
774	+
775	+	#ifdef SHEEPSHAVER
776	+	// Create cursor
777	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
778	+	SDL_SetCursor(sdl_cursor);
779	+	cursor_changed = false;
780	+	}
781		#else
782	<	// Allocate memory for frame buffer
783	<	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));
782	>	// Hide cursor
783	>	SDL_ShowCursor(0);
784		#endif
785
786		// Set window name/class
787		set_window_name(STR_WINDOW_TITLE);
788
417	–	// Hide cursor
418	–	SDL_ShowCursor(0);
419	–
789		// Init blitting routines
790		SDL_PixelFormat *f = s->format;
791		VisualFormat visualFormat;
#	Line 424 \| Line 793 \| driver_window::driver_window(SDL_monitor
793		visualFormat.Rmask = f->Rmask;
794		visualFormat.Gmask = f->Gmask;
795		visualFormat.Bmask = f->Bmask;
796	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(mode.depth));
796	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
797
798		// Load gray ramp to 8->16/32 expand map
799		if (!IsDirectMode(mode))
#	Line 432 \| Line 801 \| driver_window::driver_window(SDL_monitor
801		ExpandMap[i] = SDL_MapRGB(f, i, i, i);
802
803		// Set frame buffer base
804	<	set_mac_frame_buffer(monitor, mode.depth, true);
804	>	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
805
806		// Everything went well
807		init_ok = true;
#	Line 491 \| Line 860 \| void driver_window::mouse_moved(int x, i
860		ADBMouseMoved(x, y);
861		}
862
863	+
864	+	/*
865	+	* Full-screen display driver
866	+	*/
867	+
868	+	// Open display
869	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
870	+	: driver_base(m)
871	+	{
872	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
873	+	int aligned_width = (width + 15) & ~15;
874	+	int aligned_height = (height + 15) & ~15;
875	+
876	+	// Set absolute mouse mode
877	+	ADBSetRelMouseMode(false);
878	+
879	+	// Create surface
880	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
881	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE \| SDL_FULLSCREEN)) == NULL)
882	+	return;
883	+
884	+	#ifdef ENABLE_VOSF
885	+	use_vosf = true;
886	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
887	+	the_host_buffer = (uint8 *)s->pixels;
888	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
889	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
890	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
891	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
892	+
893	+	// Check whether we can initialize the VOSF subsystem and it's profitable
894	+	if (!video_vosf_init(m)) {
895	+	WarningAlert(STR_VOSF_INIT_ERR);
896	+	use_vosf = false;
897	+	}
898	+	else if (!video_vosf_profitable()) {
899	+	video_vosf_exit();
900	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
901	+	use_vosf = false;
902	+	}
903	+	if (!use_vosf) {
904	+	free(the_buffer_copy);
905	+	vm_release(the_buffer, the_buffer_size);
906	+	the_host_buffer = NULL;
907	+	}
908	+	#endif
909	+	if (!use_vosf) {
910	+	// Allocate memory for frame buffer
911	+	the_buffer_size = (aligned_height + 2) * s->pitch;
912	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
913	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
914	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
915	+	}
916	+
917	+	// Hide cursor
918	+	SDL_ShowCursor(0);
919	+
920	+	// Init blitting routines
921	+	SDL_PixelFormat *f = s->format;
922	+	VisualFormat visualFormat;
923	+	visualFormat.depth = depth;
924	+	visualFormat.Rmask = f->Rmask;
925	+	visualFormat.Gmask = f->Gmask;
926	+	visualFormat.Bmask = f->Bmask;
927	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
928	+
929	+	// Load gray ramp to 8->16/32 expand map
930	+	if (!IsDirectMode(mode))
931	+	for (int i=0; i<256; i++)
932	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
933	+
934	+	// Set frame buffer base
935	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
936	+
937	+	// Everything went well
938	+	init_ok = true;
939	+	}
940	+
941	+	// Close display
942	+	driver_fullscreen::~driver_fullscreen()
943	+	{
944	+	#ifdef ENABLE_VOSF
945	+	if (use_vosf)
946	+	the_host_buffer = NULL; // don't free() in driver_base dtor
947	+	#endif
948	+	if (s)
949	+	SDL_FreeSurface(s);
950	+
951	+	// Show cursor
952	+	SDL_ShowCursor(1);
953	+	}
954	+
955	+
956		/*
957		* Initialization
958		*/
#	Line 522 \| Line 984 \| static void keycode_init(void)
984		SDL_VideoDriverName(video_driver, sizeof(video_driver));
985		bool video_driver_found = false;
986		char line[256];
987	+	int n_keys = 0;
988		while (fgets(line, sizeof(line) - 1, f)) {
989		// Read line
990		int len = strlen(line);
#	Line 534 \| Line 997 \| static void keycode_init(void)
997		continue;
998
999		if (video_driver_found) {
1000	<	// Skip aliases
1001	<	static const char alias_str[] = "alias";
1002	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
1000	>	// Skip aliases as long as we have read keycodes yet
1001	>	// Otherwise, it's another mapping and we have to stop
1002	>	static const char sdl_str[] = "sdl";
1003	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1004		continue;
1005
1006		// Read keycode
1007		int x_code, mac_code;
1008		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1009	<	keycode_table[x_code & 0xff] = mac_code;
1009	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1010		else
1011		break;
1012		} else {
1013		// Search for SDL video driver string
1014	<	static const char alias_sdl_str[] = "alias SDL";
1015	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
1016	<	char *p = line + sizeof(alias_sdl_str);
1014	>	static const char sdl_str[] = "sdl";
1015	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
1016	>	char *p = line + sizeof(sdl_str);
1017		if (strstr(video_driver, p) == video_driver)
1018		video_driver_found = true;
1019		}
#	Line 567 \| Line 1031 \| static void keycode_init(void)
1031		WarningAlert(str);
1032		return;
1033		}
1034	+
1035	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1036		}
1037		}
1038
#	Line 574 \| Line 1040 \| static void keycode_init(void)
1040		bool SDL_monitor_desc::video_open(void)
1041		{
1042		D(bug("video_open()\n"));
1043	<	const video_mode &mode = get_current_mode();
1043	>	const VIDEO_MODE &mode = get_current_mode();
1044	>	#if DEBUG
1045	>	D(bug("Current video mode:\n"));
1046	>	D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f)));
1047	>	#endif
1048
1049		// Create display driver object of requested type
1050		switch (display_type) {
1051		case DISPLAY_WINDOW:
1052		drv = new(std::nothrow) driver_window(*this);
1053		break;
1054	+	case DISPLAY_SCREEN:
1055	+	drv = new(std::nothrow) driver_fullscreen(*this);
1056	+	break;
1057		}
1058		if (drv == NULL)
1059		return false;
#	Line 590 \| Line 1063 \| bool SDL_monitor_desc::video_open(void)
1063		return false;
1064		}
1065
1066	<	#ifdef ENABLE_VOSF
1067	<	if (use_vosf) {
1068	<	// Initialize the VOSF system
1069	<	if (!video_vosf_init(*this)) {
1070	<	ErrorAlert(STR_VOSF_INIT_ERR);
598	<	return false;
599	<	}
600	<	}
1066	>	#ifdef WIN32
1067	>	// Chain in a new message handler for WM_DEVICECHANGE
1068	>	HWND the_window = GetMainWindowHandle();
1069	>	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1070	>	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1071		#endif
1072	<
1072	>
1073		// Initialize VideoRefresh function
1074		VideoRefreshInit();
1075
#	Line 607 \| Line 1077 \| bool SDL_monitor_desc::video_open(void)
1077		LOCK_FRAME_BUFFER;
1078
1079		// Start redraw/input thread
1080	+	#ifndef USE_CPU_EMUL_SERVICES
1081		redraw_thread_cancel = false;
1082		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1083		if (!redraw_thread_active) {
1084		printf("FATAL: cannot create redraw thread\n");
1085		return false;
1086		}
1087	+	#else
1088	+	redraw_thread_active = true;
1089	+	#endif
1090		return true;
1091		}
1092
1093	+	#ifdef SHEEPSHAVER
1094	+	bool VideoInit(void)
1095	+	{
1096	+	const bool classic = false;
1097	+	#else
1098		bool VideoInit(bool classic)
1099		{
1100	+	#endif
1101		classic_mode = classic;
1102
1103		#ifdef ENABLE_VOSF
#	Line 627 \| Line 1107 \| bool VideoInit(bool classic)
1107		#endif
1108
1109		// Create Mutexes
1110	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1111	+	return false;
1112		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1113		return false;
1114		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 641 \| Line 1123 \| bool VideoInit(bool classic)
1123		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1124
1125		// Get screen mode from preferences
1126	<	const char *mode_str;
1126	>	const char *mode_str = NULL;
1127		if (classic_mode)
1128		mode_str = "win/512/342";
1129		else
1130		mode_str = PrefsFindString("screen");
1131
1132		// Determine display type and default dimensions
1133	<	int default_width = 512, default_height = 384;
1133	>	int default_width, default_height;
1134	>	if (classic) {
1135	>	default_width = 512;
1136	>	default_height = 384;
1137	>	}
1138	>	else {
1139	>	default_width = 640;
1140	>	default_height = 480;
1141	>	}
1142		display_type = DISPLAY_WINDOW;
1143		if (mode_str) {
1144		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1145		display_type = DISPLAY_WINDOW;
1146	+	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1147	+	display_type = DISPLAY_SCREEN;
1148		}
1149		int max_width = 640, max_height = 480;
1150	<	if (display_type == DISPLAY_SCREEN) {
1151	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN \| SDL_HWSURFACE);
1152	<	if (modes && modes != (SDL_Rect **)-1) {
1153	<	max_width = modes[0]->w;
1154	<	max_height = modes[0]->h;
1150	>	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN \| SDL_HWSURFACE);
1151	>	if (modes && modes != (SDL_Rect **)-1) {
1152	>	// It turns out that on some implementations, and contrary to the documentation,
1153	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
1154	>	for (int i = 0; modes[i] != NULL; i++) {
1155	>	const int w = modes[i]->w;
1156	>	const int h = modes[i]->h;
1157	>	if (w > max_width && h > max_height) {
1158	>	max_width = w;
1159	>	max_height = h;
1160	>	}
1161		}
1162	+	if (default_width > max_width)
1163	+	default_width = max_width;
1164	+	if (default_height > max_height)
1165	+	default_height = max_height;
1166		}
1167		if (default_width <= 0)
1168		default_width = max_width;
#	Line 669 \| Line 1171 \| bool VideoInit(bool classic)
1171
1172		// Mac screen depth follows X depth
1173		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
1174	<	video_depth default_depth;
1174	>	int default_depth;
1175		switch (screen_depth) {
1176		case 8:
1177	<	default_depth = VDEPTH_8BIT;
1177	>	default_depth = VIDEO_DEPTH_8BIT;
1178		break;
1179		case 15: case 16:
1180	<	default_depth = VDEPTH_16BIT;
1180	>	default_depth = VIDEO_DEPTH_16BIT;
1181		break;
1182		case 24: case 32:
1183	<	default_depth = VDEPTH_32BIT;
1183	>	default_depth = VIDEO_DEPTH_32BIT;
1184		break;
1185		default:
1186	<	default_depth = VDEPTH_1BIT;
1186	>	default_depth = VIDEO_DEPTH_1BIT;
1187		break;
1188		}
1189
1190		// Construct list of supported modes
1191		if (display_type == DISPLAY_WINDOW) {
1192		if (classic)
1193	<	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1193	>	add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1194		else {
1195	<	for (int d = VDEPTH_1BIT; d <= default_depth; d++) {
1196	<	int bpp = (d <= VDEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1195	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1196	>	int bpp = sdl_depth_of_video_depth(d);
1197		if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1198		add_window_modes(video_depth(d));
1199		}
1200		}
1201	<	} else
1202	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1201	>	} else if (display_type == DISPLAY_SCREEN) {
1202	>	struct {
1203	>	int w;
1204	>	int h;
1205	>	int resolution_id;
1206	>	}
1207	>	video_modes[] = {
1208	>	{ -1, -1, 0x80 },
1209	>	{ 640, 480, 0x81 },
1210	>	{ 800, 600, 0x82 },
1211	>	{ 1024, 768, 0x83 },
1212	>	{ 1152, 870, 0x84 },
1213	>	{ 1280, 1024, 0x85 },
1214	>	{ 1600, 1200, 0x86 },
1215	>	{ 0, }
1216	>	};
1217	>	video_modes[0].w = default_width;
1218	>	video_modes[0].h = default_height;
1219	>
1220	>	for (int i = 0; video_modes[i].w != 0; i++) {
1221	>	const int w = video_modes[i].w;
1222	>	const int h = video_modes[i].h;
1223	>	if (i > 0 && (w >= default_width \|\| h >= default_height))
1224	>	continue;
1225	>	#ifdef ENABLE_VOSF
1226	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1227	>	int bpp = sdl_depth_of_video_depth(d);
1228	>	if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE \| SDL_FULLSCREEN))
1229	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1230	>	}
1231	>	#else
1232	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1233	>	#endif
1234	>	}
1235	>	}
1236	>
1237		if (VideoModes.empty()) {
1238		ErrorAlert(STR_NO_XVISUAL_ERR);
1239		return false;
#	Line 705 \| Line 1241 \| bool VideoInit(bool classic)
1241
1242		// Find requested default mode with specified dimensions
1243		uint32 default_id;
1244	<	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1244	>	std::vector<VIDEO_MODE>::const_iterator i, end = VideoModes.end();
1245		for (i = VideoModes.begin(); i != end; ++i) {
1246	<	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1247	<	default_id = i->resolution_id;
1246	>	const VIDEO_MODE & mode = (*i);
1247	>	if (VIDEO_MODE_X == default_width && VIDEO_MODE_Y == default_height && VIDEO_MODE_DEPTH == default_depth) {
1248	>	default_id = VIDEO_MODE_RESOLUTION;
1249	>	#ifdef SHEEPSHAVER
1250	>	std::vector<VIDEO_MODE>::const_iterator begin = VideoModes.begin();
1251	>	cur_mode = distance(begin, i);
1252	>	#endif
1253		break;
1254		}
1255		}
1256		if (i == end) { // not found, use first available mode
1257	<	default_depth = VideoModes[0].depth;
1258	<	default_id = VideoModes[0].resolution_id;
1257	>	const VIDEO_MODE & mode = VideoModes[0];
1258	>	default_depth = VIDEO_MODE_DEPTH;
1259	>	default_id = VIDEO_MODE_RESOLUTION;
1260	>	#ifdef SHEEPSHAVER
1261	>	cur_mode = 0;
1262	>	#endif
1263		}
1264
1265	+	#ifdef SHEEPSHAVER
1266	+	for (int i = 0; i < VideoModes.size(); i++)
1267	+	VModes[i] = VideoModes[i];
1268	+	VideoInfo *p = &VModes[VideoModes.size()];
1269	+	p->viType = DIS_INVALID; // End marker
1270	+	p->viRowBytes = 0;
1271	+	p->viXsize = p->viYsize = 0;
1272	+	p->viAppleMode = 0;
1273	+	p->viAppleID = 0;
1274	+	#endif
1275	+
1276		#if DEBUG
1277		D(bug("Available video modes:\n"));
1278		for (i = VideoModes.begin(); i != end; ++i) {
1279	<	int bits = 1 << i->depth;
1279	>	const VIDEO_MODE & mode = (*i);
1280	>	int bits = 1 << VIDEO_MODE_DEPTH;
1281		if (bits == 16)
1282		bits = 15;
1283		else if (bits == 32)
1284		bits = 24;
1285	<	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1285	>	D(bug(" %dx%d (ID %02x), %d colors\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << bits));
1286		}
1287		#endif
1288
1289		// Create SDL_monitor_desc for this (the only) display
1290	<	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, default_depth, default_id);
1290	>	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, (video_depth)default_depth, default_id);
1291		VideoMonitors.push_back(monitor);
1292
1293		// Open display
#	Line 747 \| Line 1304 \| void SDL_monitor_desc::video_close(void)
1304		{
1305		D(bug("video_close()\n"));
1306
1307	+	#ifdef WIN32
1308	+	// Remove message handler for WM_DEVICECHANGE
1309	+	HWND the_window = GetMainWindowHandle();
1310	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1311	+	#endif
1312	+
1313		// Stop redraw thread
1314	+	#ifndef USE_CPU_EMUL_SERVICES
1315		if (redraw_thread_active) {
1316		redraw_thread_cancel = true;
1317		SDL_WaitThread(redraw_thread, NULL);
1318		}
1319	+	#endif
1320		redraw_thread_active = false;
1321
1322		// Unlock frame buffer
1323		UNLOCK_FRAME_BUFFER;
1324		D(bug(" frame buffer unlocked\n"));
1325
761	–	#ifdef ENABLE_VOSF
762	–	if (use_vosf) {
763	–	// Deinitialize VOSF
764	–	video_vosf_exit();
765	–	}
766	–	#endif
767	–
1326		// Close display
1327		delete drv;
1328		drv = NULL;
#	Line 782 \| Line 1340 \| void VideoExit(void)
1340		SDL_DestroyMutex(frame_buffer_lock);
1341		if (sdl_palette_lock)
1342		SDL_DestroyMutex(sdl_palette_lock);
1343	+	if (sdl_events_lock)
1344	+	SDL_DestroyMutex(sdl_events_lock);
1345		}
1346
1347
#	Line 800 \| Line 1360 \| void VideoQuitFullScreen(void)
1360		* Mac VBL interrupt
1361		*/
1362
1363	+	/*
1364	+	* Execute video VBL routine
1365	+	*/
1366	+
1367	+	#ifdef SHEEPSHAVER
1368	+	void VideoVBL(void)
1369	+	{
1370	+	// Emergency quit requested? Then quit
1371	+	if (emerg_quit)
1372	+	QuitEmulator();
1373	+
1374	+	// Temporarily give up frame buffer lock (this is the point where
1375	+	// we are suspended when the user presses Ctrl-Tab)
1376	+	UNLOCK_FRAME_BUFFER;
1377	+	LOCK_FRAME_BUFFER;
1378	+
1379	+	// Execute video VBL
1380	+	if (private_data != NULL && private_data->interruptsEnabled)
1381	+	VSLDoInterruptService(private_data->vslServiceID);
1382	+	}
1383	+	#else
1384		void VideoInterrupt(void)
1385		{
1386		// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
#	Line 814 \| Line 1395 \| void VideoInterrupt(void)
1395		UNLOCK_FRAME_BUFFER;
1396		LOCK_FRAME_BUFFER;
1397		}
1398	+	#endif
1399
1400
1401		/*
1402		* Set palette
1403		*/
1404
1405	+	#ifdef SHEEPSHAVER
1406	+	void video_set_palette(void)
1407	+	{
1408	+	monitor_desc * monitor = VideoMonitors[0];
1409	+	int n_colors = palette_size(monitor->get_current_mode().viAppleMode);
1410	+	uint8 pal[256 * 3];
1411	+	for (int c = 0; c < n_colors; c++) {
1412	+	pal[c*3 + 0] = mac_pal[c].red;
1413	+	pal[c*3 + 1] = mac_pal[c].green;
1414	+	pal[c*3 + 2] = mac_pal[c].blue;
1415	+	}
1416	+	monitor->set_palette(pal, n_colors);
1417	+	}
1418	+	#endif
1419	+
1420		void SDL_monitor_desc::set_palette(uint8 *pal, int num_in)
1421		{
1422	<	const video_mode &mode = get_current_mode();
1422	>	const VIDEO_MODE &mode = get_current_mode();
1423
1424		// FIXME: how can we handle the gamma ramp?
1425	<	if (mode.depth > VDEPTH_8BIT)
1425	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1426		return;
1427
1428		LOCK_PALETTE;
#	Line 850 \| Line 1447 \| void SDL_monitor_desc::set_palette(uint8
1447		}
1448
1449		#ifdef ENABLE_VOSF
1450	<	// We have to redraw everything because the interpretation of pixel values changed
1451	<	LOCK_VOSF;
1452	<	PFLAG_SET_ALL;
1453	<	UNLOCK_VOSF;
1454	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1450	>	if (use_vosf) {
1451	>	// We have to redraw everything because the interpretation of pixel values changed
1452	>	LOCK_VOSF;
1453	>	PFLAG_SET_ALL;
1454	>	UNLOCK_VOSF;
1455	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1456	>	}
1457		#endif
1458		}
1459
#	Line 869 \| Line 1468 \| void SDL_monitor_desc::set_palette(uint8
1468		* Switch video mode
1469		*/
1470
1471	+	#ifdef SHEEPSHAVER
1472	+	int16 video_mode_change(VidLocals *csSave, uint32 ParamPtr)
1473	+	{
1474	+	/* return if no mode change */
1475	+	if ((csSave->saveData == ReadMacInt32(ParamPtr + csData)) &&
1476	+	(csSave->saveMode == ReadMacInt16(ParamPtr + csMode))) return noErr;
1477	+
1478	+	/* first find video mode in table */
1479	+	for (int i=0; VModes[i].viType != DIS_INVALID; i++) {
1480	+	if ((ReadMacInt16(ParamPtr + csMode) == VModes[i].viAppleMode) &&
1481	+	(ReadMacInt32(ParamPtr + csData) == VModes[i].viAppleID)) {
1482	+	csSave->saveMode = ReadMacInt16(ParamPtr + csMode);
1483	+	csSave->saveData = ReadMacInt32(ParamPtr + csData);
1484	+	csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1485	+
1486	+	// Disable interrupts and pause redraw thread
1487	+	DisableInterrupt();
1488	+	thread_stop_ack = false;
1489	+	thread_stop_req = true;
1490	+	while (!thread_stop_ack) ;
1491	+
1492	+	cur_mode = i;
1493	+	monitor_desc *monitor = VideoMonitors[0];
1494	+	monitor->switch_to_current_mode();
1495	+
1496	+	WriteMacInt32(ParamPtr + csBaseAddr, screen_base);
1497	+	csSave->saveBaseAddr=screen_base;
1498	+	csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1499	+	csSave->saveMode=VModes[cur_mode].viAppleMode;
1500	+
1501	+	// Enable interrupts and resume redraw thread
1502	+	thread_stop_req = false;
1503	+	EnableInterrupt();
1504	+	return noErr;
1505	+	}
1506	+	}
1507	+	return paramErr;
1508	+	}
1509	+	#endif
1510	+
1511		void SDL_monitor_desc::switch_to_current_mode(void)
1512		{
1513		// Close and reopen display
1514	+	LOCK_EVENTS;
1515		video_close();
1516		video_open();
1517	+	UNLOCK_EVENTS;
1518
1519		if (drv == NULL) {
1520		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 883 \| Line 1524 \| void SDL_monitor_desc::switch_to_current
1524
1525
1526		/*
1527	<	* Translate key event to Mac keycode, returns -1 if no keycode was found
1528	<	* and -2 if the key was recognized as a hotkey
1527	>	* Can we set the MacOS cursor image into the window?
1528	>	*/
1529	>
1530	>	#ifdef SHEEPSHAVER
1531	>	bool video_can_change_cursor(void)
1532	>	{
1533	>	return (display_type == DISPLAY_WINDOW);
1534	>	}
1535	>	#endif
1536	>
1537	>
1538	>	/*
1539	>	* Set cursor image for window
1540		*/
1541
1542	+	#ifdef SHEEPSHAVER
1543	+	void video_set_cursor(void)
1544	+	{
1545	+	cursor_changed = true;
1546	+	}
1547	+	#endif
1548	+
1549	+
1550	+	/*
1551	+	* Keyboard-related utilify functions
1552	+	*/
1553	+
1554	+	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1555	+	{
1556	+	switch (e.keysym.sym) {
1557	+	case SDLK_NUMLOCK:
1558	+	case SDLK_CAPSLOCK:
1559	+	case SDLK_SCROLLOCK:
1560	+	case SDLK_RSHIFT:
1561	+	case SDLK_LSHIFT:
1562	+	case SDLK_RCTRL:
1563	+	case SDLK_LCTRL:
1564	+	case SDLK_RALT:
1565	+	case SDLK_LALT:
1566	+	case SDLK_RMETA:
1567	+	case SDLK_LMETA:
1568	+	case SDLK_LSUPER:
1569	+	case SDLK_RSUPER:
1570	+	case SDLK_MODE:
1571	+	case SDLK_COMPOSE:
1572	+	return true;
1573	+	}
1574	+	return false;
1575	+	}
1576	+
1577		static bool is_ctrl_down(SDL_keysym const & ks)
1578		{
1579		return ctrl_down \|\| (ks.mod & KMOD_CTRL);
1580		}
1581
1582	+
1583	+	/*
1584	+	* Translate key event to Mac keycode, returns -1 if no keycode was found
1585	+	* and -2 if the key was recognized as a hotkey
1586	+	*/
1587	+
1588		static int kc_decode(SDL_keysym const & ks, bool key_down)
1589		{
1590		switch (ks.sym) {
#	Line 924 \| Line 1617 \| static int kc_decode(SDL_keysym const &
1617
1618		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1619		case SDLK_2: case SDLK_AT: return 0x13;
1620	<	// case SDLK_3: case SDLK_numbersign: return 0x14;
1620	>	case SDLK_3: case SDLK_HASH: return 0x14;
1621		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1622	<	// case SDLK_5: case SDLK_percent: return 0x17;
1622	>	case SDLK_5: return 0x17;
1623		case SDLK_6: return 0x16;
1624		case SDLK_7: return 0x1a;
1625		case SDLK_8: return 0x1c;
1626		case SDLK_9: return 0x19;
1627		case SDLK_0: return 0x1d;
1628
1629	<	// case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1629	>	case SDLK_BACKQUOTE: return 0x0a;
1630		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1631		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1632	<	// case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1633	<	// case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1634	<	// case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1632	>	case SDLK_LEFTBRACKET: return 0x21;
1633	>	case SDLK_RIGHTBRACKET: return 0x1e;
1634	>	case SDLK_BACKSLASH: return 0x2a;
1635		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1636	<	// case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1636	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1637		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1638		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1639		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 961 \| Line 1654 \| static int kc_decode(SDL_keysym const &
1654		case SDLK_RCTRL: return 0x36;
1655		case SDLK_LSHIFT: return 0x38;
1656		case SDLK_RSHIFT: return 0x38;
1657	+	#if (defined(__APPLE__) && defined(__MACH__))
1658	+	case SDLK_LALT: return 0x3a;
1659	+	case SDLK_RALT: return 0x3a;
1660	+	case SDLK_LMETA: return 0x37;
1661	+	case SDLK_RMETA: return 0x37;
1662	+	#else
1663		case SDLK_LALT: return 0x37;
1664		case SDLK_RALT: return 0x37;
1665		case SDLK_LMETA: return 0x3a;
1666		case SDLK_RMETA: return 0x3a;
1667	+	#endif
1668	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1669	+	case SDLK_RSUPER: return 0x3a;
1670		case SDLK_MENU: return 0x32;
1671		case SDLK_CAPSLOCK: return 0x39;
1672		case SDLK_NUMLOCK: return 0x47;
#	Line 1071 \| Line 1773 \| static void handle_events(void)
1773		// Keyboard
1774		case SDL_KEYDOWN: {
1775		int code = -1;
1776	<	if (use_keycodes) {
1776	>	if (use_keycodes && !is_modifier_key(event.key)) {
1777		if (event2keycode(event.key, true) != -2) // This is called to process the hotkeys
1778		code = keycode_table[event.key.keysym.scancode & 0xff];
1779		} else
#	Line 1099 \| Line 1801 \| static void handle_events(void)
1801		}
1802		case SDL_KEYUP: {
1803		int code = -1;
1804	<	if (use_keycodes) {
1804	>	if (use_keycodes && !is_modifier_key(event.key)) {
1805		if (event2keycode(event.key, false) != -2) // This is called to process the hotkeys
1806		code = keycode_table[event.key.keysym.scancode & 0xff];
1807		} else
1808		code = event2keycode(event.key, false);
1809	<	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
1810	<	ADBKeyUp(code);
1809	>	if (code >= 0) {
1810	>	if (code == 0x39) { // Caps Lock released
1811	>	if (caps_on) {
1812	>	ADBKeyUp(code);
1813	>	caps_on = false;
1814	>	} else {
1815	>	ADBKeyDown(code);
1816	>	caps_on = true;
1817	>	}
1818	>	} else
1819	>	ADBKeyUp(code);
1820		if (code == 0x36)
1821		ctrl_down = false;
1822		}
#	Line 1115 \| Line 1826 \| static void handle_events(void)
1826		// Hidden parts exposed, force complete refresh of window
1827		case SDL_VIDEOEXPOSE:
1828		if (display_type == DISPLAY_WINDOW) {
1829	<	const video_mode &mode = VideoMonitors[0]->get_current_mode();
1829	>	const VIDEO_MODE &mode = VideoMonitors[0]->get_current_mode();
1830		#ifdef ENABLE_VOSF
1831		if (use_vosf) { // VOSF refresh
1832		LOCK_VOSF;
1833		PFLAG_SET_ALL;
1834		UNLOCK_VOSF;
1835	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1835	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1836		}
1837		else
1838		#endif
1839	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1839	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1840		}
1841		break;
1842
#	Line 1149 \| Line 1860 \| static void update_display_static(driver
1860		{
1861		// Incremental update code
1862		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1863	<	const video_mode &mode = drv->mode;
1864	<	int bytes_per_row = mode.bytes_per_row;
1863	>	const VIDEO_MODE &mode = drv->mode;
1864	>	int bytes_per_row = VIDEO_MODE_ROW_BYTES;
1865		uint8 p, p2;
1866
1867		// Check for first line from top and first line from bottom that have changed
1868		y1 = 0;
1869	<	for (j=0; j<mode.y; j++) {
1869	>	for (j=0; j<VIDEO_MODE_Y; j++) {
1870		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1871		y1 = j;
1872		break;
1873		}
1874		}
1875		y2 = y1 - 1;
1876	<	for (j=mode.y-1; j>=y1; j--) {
1876	>	for (j=VIDEO_MODE_Y-1; j>=y1; j--) {
1877		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1878		y2 = j;
1879		break;
#	Line 1172 \| Line 1883 \| static void update_display_static(driver
1883
1884		// Check for first column from left and first column from right that have changed
1885		if (high) {
1886	<	if (mode.depth < VDEPTH_8BIT) {
1886	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1887		const int src_bytes_per_row = bytes_per_row;
1888		const int dst_bytes_per_row = drv->s->pitch;
1889	<	const int pixels_per_byte = mode.x / src_bytes_per_row;
1889	>	const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
1890
1891	<	x1 = mode.x / pixels_per_byte;
1891	>	x1 = VIDEO_MODE_X / pixels_per_byte;
1892		for (j = y1; j <= y2; j++) {
1893		p = &the_buffer[j * bytes_per_row];
1894		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1195 \| Line 1906 \| static void update_display_static(driver
1906		p2 = &the_buffer_copy[j * bytes_per_row];
1907		p += bytes_per_row;
1908		p2 += bytes_per_row;
1909	<	for (i = (mode.x / pixels_per_byte); i > x2; i--) {
1909	>	for (i = (VIDEO_MODE_X / pixels_per_byte); i > x2; i--) {
1910		p--; p2--;
1911		if (p != p2) {
1912		x2 = i;
#	Line 1233 \| Line 1944 \| static void update_display_static(driver
1944		}
1945
1946		} else {
1947	<	const int bytes_per_pixel = mode.bytes_per_row / mode.x;
1947	>	const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1948
1949	<	x1 = mode.x;
1949	>	x1 = VIDEO_MODE_X;
1950		for (j=y1; j<=y2; j++) {
1951		p = &the_buffer[j * bytes_per_row];
1952		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1253 \| Line 1964 \| static void update_display_static(driver
1964		p2 = &the_buffer_copy[j * bytes_per_row];
1965		p += bytes_per_row;
1966		p2 += bytes_per_row;
1967	<	for (i=mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1967	>	for (i=VIDEO_MODE_Xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1968		p--;
1969		p2--;
1970		if (p != p2) {
#	Line 1349 \| Line 2060 \| static void video_refresh_dga_vosf(void)
2060		tick_counter = 0;
2061		if (mainBuffer.dirty) {
2062		LOCK_VOSF;
2063	<	update_display_dga_vosf();
2063	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2064		UNLOCK_VOSF;
2065		}
2066		}
#	Line 1413 \| Line 2124 \| static void VideoRefreshInit(void)
2124		}
2125		}
2126
2127	+	static inline void do_video_refresh(void)
2128	+	{
2129	+	// Handle SDL events
2130	+	handle_events();
2131	+
2132	+	// Update display
2133	+	video_refresh();
2134	+
2135	+	#ifdef SHEEPSHAVER
2136	+	// Set new cursor image if it was changed
2137	+	if (cursor_changed && sdl_cursor) {
2138	+	cursor_changed = false;
2139	+	LOCK_EVENTS;
2140	+	SDL_FreeCursor(sdl_cursor);
2141	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2142	+	if (sdl_cursor)
2143	+	SDL_SetCursor(sdl_cursor);
2144	+	UNLOCK_EVENTS;
2145	+	}
2146	+	#endif
2147	+
2148	+	// Set new palette if it was changed
2149	+	handle_palette_changes();
2150	+	}
2151	+
2152	+	// This function is called on non-threaded platforms from a timer interrupt
2153	+	void VideoRefresh(void)
2154	+	{
2155	+	// We need to check redraw_thread_active to inhibit refreshed during
2156	+	// mode changes on non-threaded platforms
2157	+	if (!redraw_thread_active)
2158	+	return;
2159	+
2160	+	// Process pending events and update display
2161	+	do_video_refresh();
2162	+	}
2163	+
2164	+	const int VIDEO_REFRESH_HZ = 60;
2165	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2166	+
2167	+	#ifndef USE_CPU_EMUL_SERVICES
2168		static int redraw_func(void *arg)
2169		{
2170		uint64 start = GetTicks_usec();
2171		int64 ticks = 0;
2172	+	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2173
2174		while (!redraw_thread_cancel) {
2175
2176		// Wait
2177	<	Delay_usec(16667);
2178	<
2179	<	// Handle SDL events
2180	<	handle_events();
2181	<
2182	<	// Refresh display
1430	<	video_refresh();
2177	>	next += VIDEO_REFRESH_DELAY;
2178	>	int64 delay = next - GetTicks_usec();
2179	>	if (delay > 0)
2180	>	Delay_usec(delay);
2181	>	else if (delay < -VIDEO_REFRESH_DELAY)
2182	>	next = GetTicks_usec();
2183		ticks++;
2184
2185	<	// Set new palette if it was changed
2186	<	handle_palette_changes();
2185	>	#ifdef SHEEPSHAVER
2186	>	// Pause if requested (during video mode switches)
2187	>	if (thread_stop_req) {
2188	>	thread_stop_ack = true;
2189	>	continue;
2190	>	}
2191	>	#endif
2192	>
2193	>	// Process pending events and update display
2194	>	do_video_refresh();
2195		}
2196
2197		uint64 end = GetTicks_usec();
2198		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2199		return 0;
2200		}
2201	+	#endif

Diff Legend

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

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents): Revision 1.3 by gbeauche, 2004-06-23T22:55:47Z vs. Revision 1.23 by gbeauche, 2006-03-28T07:01:19Z

Diff Legend

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.3 by gbeauche, 2004-06-23T22:55:47Z vs.
Revision 1.23 by gbeauche, 2006-03-28T07:01:19Z