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.20 by gbeauche, 2005-06-14T22:35:42Z vs.
Revision 1.38 by asvitkine, 2009-03-03T08:14:53Z

#	Line 1 | Line 1
1		/*
2		*  video_sdl.cpp - Video/graphics emulation, SDL specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2005 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 27 | Line 27
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?
34	–	*  - 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	–	*  - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
39		*  - Backport hw cursor acceleration to Basilisk II?
40		*  - Factor out code
41		*/
#	Line 49 | Line 48
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"
57		#include "adb.h"
#	Line 133 | Line 136 | static SDL_Cursor *sdl_cursor;                                         // C
136		static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
137		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
138		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
139	<	static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
139	>	static const int sdl_eventmask = SDL_MOUSEEVENTMASK | SDL_KEYEVENTMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK | SDL_ACTIVEEVENTMASK;
140	>
141	>	// Mutex to protect SDL events
142	>	static SDL_mutex *sdl_events_lock = NULL;
143	>	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
144	>	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
145
146		// Mutex to protect palette
147		static SDL_mutex *sdl_palette_lock = NULL;
#	Line 158 | Line 166 | extern void SysMountFirstFloppy(void);
166
167
168		/*
169	+	*  SDL surface locking glue
170	+	*/
171	+
172	+	#ifdef ENABLE_VOSF
173	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
174	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
175	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
176	+	} while (0)
177	+	#else
178	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
179	+	#endif
180	+
181	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
182	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
183	+	SDL_LockSurface(SURFACE);                               \
184	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
185	+	}                                                                                       \
186	+	} while (0)
187	+
188	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
189	+	if (SDL_MUSTLOCK(SURFACE))                                      \
190	+	SDL_UnlockSurface(SURFACE);                             \
191	+	} while (0)
192	+
193	+
194	+	/*
195		*  Framebuffer allocation routines
196		*/
197
198		static void *vm_acquire_framebuffer(uint32 size)
199		{
200	<	#ifdef SHEEPSHAVER
201	<	#ifdef DIRECT_ADDRESSING_HACK
202	<	const uint32 FRAME_BUFFER_BASE = 0x61000000;
203	<	uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE);
204	<	if (vm_acquire_fixed(fb, size) < 0)
205	<	fb = VM_MAP_FAILED;
172	<	return fb;
173	<	#endif
200	>	// always try to reallocate framebuffer at the same address
201	>	static void *fb = VM_MAP_FAILED;
202	>	if (fb != VM_MAP_FAILED) {
203	>	if (vm_acquire_fixed(fb, size) < 0) {
204	>	#ifndef SHEEPSHAVER
205	>	printf("FATAL: Could not reallocate framebuffer at previous address\n");
206		#endif
207	<	return vm_acquire(size);
207	>	fb = VM_MAP_FAILED;
208	>	}
209	>	}
210	>	if (fb == VM_MAP_FAILED)
211	>	fb = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT);
212	>	return fb;
213		}
214
215		static inline void vm_release_framebuffer(void *fb, uint32 size)
#	Line 182 | Line 219 | static inline void vm_release_framebuffe
219
220
221		/*
222	+	*  Windows message handler
223	+	*/
224	+
225	+	#ifdef WIN32
226	+	#include <dbt.h>
227	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
228	+
229	+	extern void SysMediaArrived(void);
230	+	extern void SysMediaRemoved(void);
231	+	extern HWND GetMainWindowHandle(void);
232	+
233	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
234	+	{
235	+	switch (msg) {
236	+	case WM_DEVICECHANGE:
237	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
238	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
239	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
240	+	SysMediaRemoved();
241	+	}
242	+	else if (wParam == DBT_DEVICEARRIVAL) {
243	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
244	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
245	+	SysMediaArrived();
246	+	}
247	+	return 0;
248	+
249	+	default:
250	+	if (sdl_window_proc)
251	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
252	+	}
253	+
254	+	return DefWindowProc(hwnd, msg, wParam, lParam);
255	+	}
256	+	#endif
257	+
258	+
259	+	/*
260		*  SheepShaver glue
261		*/
262
#	Line 226 | Line 301 | static vector<monitor_desc *> VideoMonit
301		// Find Apple mode matching best specified dimensions
302		static int find_apple_resolution(int xsize, int ysize)
303		{
304	<	int apple_id;
305	<	if (xsize < 800)
306	<	apple_id = APPLE_640x480;
307	<	else if (xsize < 1024)
308	<	apple_id = APPLE_800x600;
309	<	else if (xsize < 1152)
310	<	apple_id = APPLE_1024x768;
311	<	else if (xsize < 1280) {
312	<	if (ysize < 900)
313	<	apple_id = APPLE_1152x768;
314	<	else
315	<	apple_id = APPLE_1152x900;
316	<	}
317	<	else if (xsize < 1600)
318	<	apple_id = APPLE_1280x1024;
244	<	else
245	<	apple_id = APPLE_1600x1200;
246	<	return apple_id;
247	<	}
248	<
249	<	// Set parameters to specified Apple mode
250	<	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
251	<	{
252	<	switch (apple_id) {
253	<	case APPLE_640x480:
254	<	xsize = 640;
255	<	ysize = 480;
256	<	break;
257	<	case APPLE_800x600:
258	<	xsize = 800;
259	<	ysize = 600;
260	<	break;
261	<	case APPLE_1024x768:
262	<	xsize = 1024;
263	<	ysize = 768;
264	<	break;
265	<	case APPLE_1152x768:
266	<	xsize = 1152;
267	<	ysize = 768;
268	<	break;
269	<	case APPLE_1152x900:
270	<	xsize = 1152;
271	<	ysize = 900;
272	<	break;
273	<	case APPLE_1280x1024:
274	<	xsize = 1280;
275	<	ysize = 1024;
276	<	break;
277	<	case APPLE_1600x1200:
278	<	xsize = 1600;
279	<	ysize = 1200;
280	<	break;
281	<	default:
282	<	abort();
283	<	}
284	<	}
285	<
286	<	// Match Apple mode matching best specified dimensions
287	<	static int match_apple_resolution(int &xsize, int &ysize)
288	<	{
289	<	int apple_id = find_apple_resolution(xsize, ysize);
290	<	set_apple_resolution(apple_id, xsize, ysize);
291	<	return apple_id;
304	>	if (xsize == 640 && ysize == 480)
305	>	return APPLE_640x480;
306	>	if (xsize == 800 && ysize == 600)
307	>	return APPLE_800x600;
308	>	if (xsize == 1024 && ysize == 768)
309	>	return APPLE_1024x768;
310	>	if (xsize == 1152 && ysize == 768)
311	>	return APPLE_1152x768;
312	>	if (xsize == 1152 && ysize == 900)
313	>	return APPLE_1152x900;
314	>	if (xsize == 1280 && ysize == 1024)
315	>	return APPLE_1280x1024;
316	>	if (xsize == 1600 && ysize == 1200)
317	>	return APPLE_1600x1200;
318	>	return APPLE_CUSTOM;
319		}
320
321		// Display error alert
#	Line 395 | Line 422 | static int sdl_depth_of_video_depth(int
422		return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
423		}
424
425	+	// Get screen dimensions
426	+	static void sdl_display_dimensions(int &width, int &height)
427	+	{
428	+	static int max_width, max_height;
429	+	if (max_width == 0 && max_height == 0) {
430	+	max_width = 640 ; max_height = 480;
431	+	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
432	+	if (modes && modes != (SDL_Rect **)-1) {
433	+	// It turns out that on some implementations, and contrary to the documentation,
434	+	// the returned list is not sorted from largest to smallest (e.g. Windows)
435	+	for (int i = 0; modes[i] != NULL; i++) {
436	+	const int w = modes[i]->w;
437	+	const int h = modes[i]->h;
438	+	if (w > max_width && h > max_height) {
439	+	max_width = w;
440	+	max_height = h;
441	+	}
442	+	}
443	+	}
444	+	}
445	+	width = max_width;
446	+	height = max_height;
447	+	}
448	+
449	+	static inline int sdl_display_width(void)
450	+	{
451	+	int width, height;
452	+	sdl_display_dimensions(width, height);
453	+	return width;
454	+	}
455	+
456	+	static inline int sdl_display_height(void)
457	+	{
458	+	int width, height;
459	+	sdl_display_dimensions(width, height);
460	+	return height;
461	+	}
462	+
463		// Check wether specified mode is available
464	<	static bool has_mode(int type, int width, int height)
464	>	static bool has_mode(int type, int width, int height, int depth)
465		{
466		#ifdef SHEEPSHAVER
467	<	// Filter out Classic resolutiosn
467	>	// Filter out Classic resolutions
468		if (width == 512 && height == 384)
469		return false;
470	+	#endif
471
472	<	// "screen" prefs items always succeeds
473	<	if (PrefsFindString("screen"))
474	<	return true;
409	<
410	<	// Read window & screen modes prefs
411	<	static uint32 window_modes = 0;
412	<	static uint32 screen_modes = 0;
413	<	if (window_modes == 0 || screen_modes == 0) {
414	<	window_modes = PrefsFindInt32("windowmodes");
415	<	screen_modes = PrefsFindInt32("screenmodes");
416	<	if (window_modes == 0 || screen_modes == 0)
417	<	window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
418	<	}
419	<
420	<	int test_modes;
421	<	switch (type) {
422	<	case DISPLAY_WINDOW:
423	<	test_modes = window_modes;
424	<	break;
425	<	case DISPLAY_SCREEN:
426	<	test_modes = screen_modes;
427	<	break;
428	<	default:
429	<	test_modes = 0;
430	<	break;
431	<	}
472	>	// Filter out out-of-bounds resolutions
473	>	if (width > sdl_display_width() || height > sdl_display_height())
474	>	return false;
475
476	<	int apple_mask;
477	<	switch (find_apple_resolution(width, height)) {
478	<	case APPLE_640x480:             apple_mask = 0x01; break;
479	<	case APPLE_800x600:             apple_mask = 0x02; break;
437	<	case APPLE_1024x768:    apple_mask = 0x04; break;
438	<	case APPLE_1152x768:    apple_mask = 0x40; break;
439	<	case APPLE_1152x900:    apple_mask = 0x08; break;
440	<	case APPLE_1280x1024:   apple_mask = 0x10; break;
441	<	case APPLE_1600x1200:   apple_mask = 0x20; break;
442	<	default:                                apple_mask = 0x00; break;
443	<	}
444	<	return (test_modes & apple_mask);
445	<	#endif
446	<	return true;
476	>	// Rely on SDL capabilities
477	>	return SDL_VideoModeOK(width, height,
478	>	sdl_depth_of_video_depth(depth),
479	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
480		}
481
482		// Add mode to list of supported modes
483		static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
484		{
485		// Filter out unsupported modes
486	<	if (!has_mode(type, width, height))
486	>	if (!has_mode(type, width, height, depth))
487		return;
488
489		// Fill in VideoMode entry
490		VIDEO_MODE mode;
491		#ifdef SHEEPSHAVER
492	<	// Recalculate dimensions to fit Apple modes
460	<	resolution_id = match_apple_resolution(width, height);
492	>	resolution_id = find_apple_resolution(width, height);
493		mode.viType = type;
494		#endif
495		VIDEO_MODE_X = width;
#	Line 468 | Line 500 | static void add_mode(int type, int width
500		VideoModes.push_back(mode);
501		}
502
471	–	// Add standard list of windowed modes for given color depth
472	–	static void add_window_modes(int depth)
473	–	{
474	–	video_depth vdepth = (video_depth)depth;
475	–	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
476	–	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
477	–	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
478	–	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
479	–	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
480	–	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
481	–	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
482	–	}
483	–
503		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
504		static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
505		{
#	Line 524 | Line 543 | static SDL_GrabMode set_grab_mode(SDL_Gr
543		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
544		}
545
546	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
547	+	static void migrate_screen_prefs(void)
548	+	{
549	+	#ifdef SHEEPSHAVER
550	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
551	+	if (PrefsFindString("screen"))
552	+	return;
553	+
554	+	uint32 window_modes = PrefsFindInt32("windowmodes");
555	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
556	+	int width = 0, height = 0;
557	+	if (screen_modes) {
558	+	static const struct {
559	+	int id;
560	+	int width;
561	+	int height;
562	+	}
563	+	modes[] = {
564	+	{  1,    640,    480 },
565	+	{  2,    800,    600 },
566	+	{  4,   1024,    768 },
567	+	{ 64,   1152,    768 },
568	+	{  8,   1152,    900 },
569	+	{ 16,   1280,   1024 },
570	+	{ 32,   1600,   1200 },
571	+	{ 0, }
572	+	};
573	+	for (int i = 0; modes[i].id != 0; i++) {
574	+	if (screen_modes & modes[i].id) {
575	+	if (width < modes[i].width && height < modes[i].height) {
576	+	width = modes[i].width;
577	+	height = modes[i].height;
578	+	}
579	+	}
580	+	}
581	+	} else {
582	+	if (window_modes & 1)
583	+	width = 640, height = 480;
584	+	if (window_modes & 2)
585	+	width = 800, height = 600;
586	+	}
587	+	if (width && height) {
588	+	char str[32];
589	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
590	+	PrefsReplaceString("screen", str);
591	+	}
592	+	#endif
593	+	}
594	+
595
596		/*
597		*  Display "driver" classes
#	Line 557 | Line 625 | public:
625		class driver_window;
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);
628	>	static void update_display_static(driver_base *drv);
629
630		class driver_window : public driver_base {
631		friend void update_display_window_vosf(driver_window *drv);
632		friend void update_display_dynamic(int ticker, driver_window *drv);
633	<	friend void update_display_static(driver_window *drv);
633	>	friend void update_display_static(driver_base *drv);
634
635		public:
636		driver_window(SDL_monitor_desc &monitor);
#	Line 663 | Line 731 | void driver_base::restore_mouse_accel(vo
731		*  Windowed display driver
732		*/
733
734	+	static bool SDL_display_opened = false;
735	+
736		// Open display
737		driver_window::driver_window(SDL_monitor_desc &m)
738		: driver_base(m), mouse_grabbed(false)
#	Line 674 | Line 744 | driver_window::driver_window(SDL_monitor
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 = 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)
#	Line 1003 | Line 1085 | bool SDL_monitor_desc::video_open(void)
1085		return false;
1086		}
1087
1088	+	#ifdef WIN32
1089	+	// Chain in a new message handler for WM_DEVICECHANGE
1090	+	HWND the_window = GetMainWindowHandle();
1091	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1092	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1093	+	#endif
1094	+
1095		// Initialize VideoRefresh function
1096		VideoRefreshInit();
1097
#	Line 1040 | Line 1129 | bool VideoInit(bool classic)
1129		#endif
1130
1131		// Create Mutexes
1132	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1133	+	return false;
1134		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1135		return false;
1136		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 1054 | Line 1145 | bool VideoInit(bool classic)
1145		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1146
1147		// Get screen mode from preferences
1148	+	migrate_screen_prefs();
1149		const char *mode_str = NULL;
1150		if (classic_mode)
1151		mode_str = "win/512/342";
#	Line 1077 | Line 1169 | bool VideoInit(bool classic)
1169		else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1170		display_type = DISPLAY_SCREEN;
1171		}
1080	–	int max_width = 640, max_height = 480;
1081	–	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
1082	–	if (modes && modes != (SDL_Rect **)-1) {
1083	–	// It turns out that on some implementations, and contrary to the documentation,
1084	–	// the returned list is not sorted from largest to smallest (e.g. Windows)
1085	–	for (int i = 0; modes[i] != NULL; i++) {
1086	–	const int w = modes[i]->w;
1087	–	const int h = modes[i]->h;
1088	–	if (w > max_width && h > max_height) {
1089	–	max_width = w;
1090	–	max_height = h;
1091	–	}
1092	–	}
1093	–	if (default_width > max_width)
1094	–	default_width = max_width;
1095	–	if (default_height > max_height)
1096	–	default_height = max_height;
1097	–	}
1172		if (default_width <= 0)
1173	<	default_width = max_width;
1173	>	default_width = sdl_display_width();
1174	>	else if (default_width > sdl_display_width())
1175	>	default_width = sdl_display_width();
1176		if (default_height <= 0)
1177	<	default_height = max_height;
1177	>	default_height = sdl_display_height();
1178	>	else if (default_height > sdl_display_height())
1179	>	default_height = sdl_display_height();
1180
1181		// Mac screen depth follows X depth
1182		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 1118 | Line 1196 | bool VideoInit(bool classic)
1196		break;
1197		}
1198
1199	+	// Initialize list of video modes to try
1200	+	struct {
1201	+	int w;
1202	+	int h;
1203	+	int resolution_id;
1204	+	}
1205	+	video_modes[] = {
1206	+	{   -1,   -1, 0x80 },
1207	+	{  512,  384, 0x80 },
1208	+	{  640,  480, 0x81 },
1209	+	{  800,  600, 0x82 },
1210	+	{ 1024,  768, 0x83 },
1211	+	{ 1152,  870, 0x84 },
1212	+	{ 1280, 1024, 0x85 },
1213	+	{ 1600, 1200, 0x86 },
1214	+	{ 0, }
1215	+	};
1216	+	video_modes[0].w = default_width;
1217	+	video_modes[0].h = default_height;
1218	+
1219		// Construct list of supported modes
1220		if (display_type == DISPLAY_WINDOW) {
1221		if (classic)
1222		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1223		else {
1224	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1225	<	int bpp = sdl_depth_of_video_depth(d);
1226	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1227	<	add_window_modes(video_depth(d));
1224	>	for (int i = 0; video_modes[i].w != 0; i++) {
1225	>	const int w = video_modes[i].w;
1226	>	const int h = video_modes[i].h;
1227	>	if (i > 0 && (w >= default_width || h >= default_height))
1228	>	continue;
1229	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1230	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1231		}
1232		}
1233		} else if (display_type == DISPLAY_SCREEN) {
1133	–	struct {
1134	–	int w;
1135	–	int h;
1136	–	int resolution_id;
1137	–	}
1138	–	video_modes[] = {
1139	–	{   -1,   -1, 0x80 },
1140	–	{  640,  480, 0x81 },
1141	–	{  800,  600, 0x82 },
1142	–	{ 1024,  768, 0x83 },
1143	–	{ 1152,  870, 0x84 },
1144	–	{ 1280, 1024, 0x85 },
1145	–	{ 1600, 1200, 0x86 },
1146	–	{ 0, }
1147	–	};
1148	–	video_modes[0].w = default_width;
1149	–	video_modes[0].h = default_height;
1150	–
1234		for (int i = 0; video_modes[i].w != 0; i++) {
1235		const int w = video_modes[i].w;
1236		const int h = video_modes[i].h;
1237		if (i > 0 && (w >= default_width || h >= default_height))
1238		continue;
1239	<	#ifdef ENABLE_VOSF
1240	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1241	<	int bpp = sdl_depth_of_video_depth(d);
1242	<	if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE | SDL_FULLSCREEN))
1160	<	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1161	<	}
1162	<	#else
1163	<	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1164	<	#endif
1239	>	if (w == 512 && h == 384)
1240	>	continue;
1241	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1242	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1243		}
1244		}
1245
#	Line 1235 | Line 1313 | void SDL_monitor_desc::video_close(void)
1313		{
1314		D(bug("video_close()\n"));
1315
1316	+	#ifdef WIN32
1317	+	// Remove message handler for WM_DEVICECHANGE
1318	+	HWND the_window = GetMainWindowHandle();
1319	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1320	+	#endif
1321	+
1322		// Stop redraw thread
1323		#ifndef USE_CPU_EMUL_SERVICES
1324		if (redraw_thread_active) {
#	Line 1265 | Line 1349 | void VideoExit(void)
1349		SDL_DestroyMutex(frame_buffer_lock);
1350		if (sdl_palette_lock)
1351		SDL_DestroyMutex(sdl_palette_lock);
1352	+	if (sdl_events_lock)
1353	+	SDL_DestroyMutex(sdl_events_lock);
1354		}
1355
1356
#	Line 1434 | Line 1520 | int16 video_mode_change(VidLocals *csSav
1520		void SDL_monitor_desc::switch_to_current_mode(void)
1521		{
1522		// Close and reopen display
1523	+	LOCK_EVENTS;
1524		video_close();
1525		video_open();
1526	+	UNLOCK_EVENTS;
1527
1528		if (drv == NULL) {
1529		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1451 | Line 1539 | void SDL_monitor_desc::switch_to_current
1539		#ifdef SHEEPSHAVER
1540		bool video_can_change_cursor(void)
1541		{
1542	<	return (display_type == DISPLAY_WINDOW);
1542	>	static char driver[] = "Quartz?";
1543	>	static int quartzok = -1;
1544	>
1545	>	if (display_type != DISPLAY_WINDOW)
1546	>	return false;
1547	>
1548	>	if (quartzok < 0) {
1549	>	if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver))
1550	>	quartzok = true;
1551	>	else {
1552	>	// Quartz driver bug prevents cursor changing in SDL 1.2.11 and later
1553	>	const SDL_version *vp = SDL_Linked_Version();
1554	>	quartzok = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch) <= SDL_VERSIONNUM(1, 2, 10);
1555	>	}
1556	>	}
1557	>
1558	>	return quartzok;
1559		}
1560		#endif
1561
#	Line 1662 | 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 1681 | 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 1766 | 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 1777 | 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;
#	Line 1866 | Line 1982 | static void update_display_static(driver
1982
1983		} else {
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 = VIDEO_MODE_X;
1988		for (j=y1; j<=y2; j++) {
#	Line 1906 | 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 1921 | 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 1962 | 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 2015 | 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 2057 | Line 2243 | static inline void do_video_refresh(void
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)
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
#	Line 2118 | Line 2318 | static int redraw_func(void *arg)
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	+	const VIDEO_MODE &mode = drv->mode;
2331	+	const int screen_width = VIDEO_MODE_X;
2332	+	const int screen_height = VIDEO_MODE_Y;
2333	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2334	+
2335	+	#ifdef ENABLE_VOSF
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