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.19 by gbeauche, 2005-06-06T21:20:28Z vs.
Revision 1.26 by gbeauche, 2006-05-13T16:58:44Z

#	Line 101 | Line 101 | static uint8 *the_buffer_copy = NULL;
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 = false;                                           // Flag: VOSF enabled
#	Line 131 | Line 135 | static SDL_Color sdl_palette[256];                                     /
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 154 | 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		{
162	–	#ifdef SHEEPSHAVER
163	–	#ifdef DIRECT_ADDRESSING_HACK
164	–	const uint32 FRAME_BUFFER_BASE = 0x61000000;
165	–	uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE);
166	–	if (vm_acquire_fixed(fb, size) < 0)
167	–	fb = VM_MAP_FAILED;
168	–	return fb;
169	–	#endif
170	–	#endif
197		return vm_acquire(size);
198		}
199
#	Line 178 | Line 204 | static inline void vm_release_framebuffe
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
#	Line 222 | Line 286 | static vector<monitor_desc *> VideoMonit
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;
240	<	else
241	<	apple_id = APPLE_1600x1200;
242	<	return apple_id;
243	<	}
244	<
245	<	// Set parameters to specified Apple mode
246	<	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
247	<	{
248	<	switch (apple_id) {
249	<	case APPLE_640x480:
250	<	xsize = 640;
251	<	ysize = 480;
252	<	break;
253	<	case APPLE_800x600:
254	<	xsize = 800;
255	<	ysize = 600;
256	<	break;
257	<	case APPLE_1024x768:
258	<	xsize = 1024;
259	<	ysize = 768;
260	<	break;
261	<	case APPLE_1152x768:
262	<	xsize = 1152;
263	<	ysize = 768;
264	<	break;
265	<	case APPLE_1152x900:
266	<	xsize = 1152;
267	<	ysize = 900;
268	<	break;
269	<	case APPLE_1280x1024:
270	<	xsize = 1280;
271	<	ysize = 1024;
272	<	break;
273	<	case APPLE_1600x1200:
274	<	xsize = 1600;
275	<	ysize = 1200;
276	<	break;
277	<	default:
278	<	abort();
279	<	}
280	<	}
281	<
282	<	// Match Apple mode matching best specified dimensions
283	<	static int match_apple_resolution(int &xsize, int &ysize)
284	<	{
285	<	int apple_id = find_apple_resolution(xsize, ysize);
286	<	set_apple_resolution(apple_id, xsize, ysize);
287	<	return apple_id;
289	>	if (xsize == 640 && ysize == 480)
290	>	return APPLE_640x480;
291	>	if (xsize == 800 && ysize == 600)
292	>	return APPLE_800x600;
293	>	if (xsize == 1024 && ysize == 768)
294	>	return APPLE_1024x768;
295	>	if (xsize == 1152 && ysize == 768)
296	>	return APPLE_1152x768;
297	>	if (xsize == 1152 && ysize == 900)
298	>	return APPLE_1152x900;
299	>	if (xsize == 1280 && ysize == 1024)
300	>	return APPLE_1280x1024;
301	>	if (xsize == 1600 && ysize == 1200)
302	>	return APPLE_1600x1200;
303	>	return APPLE_CUSTOM;
304		}
305
306		// Display error alert
#	Line 391 | Line 407 | static int sdl_depth_of_video_depth(int
407		return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
408		}
409
410	+	// Get screen dimensions
411	+	static void sdl_display_dimensions(int &width, int &height)
412	+	{
413	+	static int max_width, max_height;
414	+	if (max_width == 0 && max_height == 0) {
415	+	max_width = 640 ; max_height = 480;
416	+	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
417	+	if (modes && modes != (SDL_Rect **)-1) {
418	+	// It turns out that on some implementations, and contrary to the documentation,
419	+	// the returned list is not sorted from largest to smallest (e.g. Windows)
420	+	for (int i = 0; modes[i] != NULL; i++) {
421	+	const int w = modes[i]->w;
422	+	const int h = modes[i]->h;
423	+	if (w > max_width && h > max_height) {
424	+	max_width = w;
425	+	max_height = h;
426	+	}
427	+	}
428	+	}
429	+	}
430	+	width = max_width;
431	+	height = max_height;
432	+	}
433	+
434	+	static inline int sdl_display_width(void)
435	+	{
436	+	int width, height;
437	+	sdl_display_dimensions(width, height);
438	+	return width;
439	+	}
440	+
441	+	static inline int sdl_display_height(void)
442	+	{
443	+	int width, height;
444	+	sdl_display_dimensions(width, height);
445	+	return height;
446	+	}
447	+
448		// Check wether specified mode is available
449	<	static bool has_mode(int type, int width, int height)
449	>	static bool has_mode(int type, int width, int height, int depth)
450		{
451		#ifdef SHEEPSHAVER
452	<	// Filter out Classic resolutiosn
452	>	// Filter out Classic resolutions
453		if (width == 512 && height == 384)
454		return false;
455	+	#endif
456
457	<	// "screen" prefs items always succeeds
458	<	if (PrefsFindString("screen"))
459	<	return true;
405	<
406	<	// Read window & screen modes prefs
407	<	static uint32 window_modes = 0;
408	<	static uint32 screen_modes = 0;
409	<	if (window_modes == 0 || screen_modes == 0) {
410	<	window_modes = PrefsFindInt32("windowmodes");
411	<	screen_modes = PrefsFindInt32("screenmodes");
412	<	if (window_modes == 0 || screen_modes == 0)
413	<	window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
414	<	}
415	<
416	<	int test_modes;
417	<	switch (type) {
418	<	case DISPLAY_WINDOW:
419	<	test_modes = window_modes;
420	<	break;
421	<	case DISPLAY_SCREEN:
422	<	test_modes = screen_modes;
423	<	break;
424	<	default:
425	<	test_modes = 0;
426	<	break;
427	<	}
457	>	// Filter out out-of-bounds resolutions
458	>	if (width > sdl_display_width() || height > sdl_display_height())
459	>	return false;
460
461	<	int apple_mask;
462	<	switch (find_apple_resolution(width, height)) {
463	<	case APPLE_640x480:             apple_mask = 0x01; break;
464	<	case APPLE_800x600:             apple_mask = 0x02; break;
433	<	case APPLE_1024x768:    apple_mask = 0x04; break;
434	<	case APPLE_1152x768:    apple_mask = 0x40; break;
435	<	case APPLE_1152x900:    apple_mask = 0x08; break;
436	<	case APPLE_1280x1024:   apple_mask = 0x10; break;
437	<	case APPLE_1600x1200:   apple_mask = 0x20; break;
438	<	default:                                apple_mask = 0x00; break;
439	<	}
440	<	return (test_modes & apple_mask);
441	<	#endif
442	<	return true;
461	>	// Rely on SDL capabilities
462	>	return SDL_VideoModeOK(width, height,
463	>	sdl_depth_of_video_depth(depth),
464	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
465		}
466
467		// Add mode to list of supported modes
468		static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
469		{
470		// Filter out unsupported modes
471	<	if (!has_mode(type, width, height))
471	>	if (!has_mode(type, width, height, depth))
472		return;
473
474		// Fill in VideoMode entry
475		VIDEO_MODE mode;
476		#ifdef SHEEPSHAVER
477	<	// Recalculate dimensions to fit Apple modes
456	<	resolution_id = match_apple_resolution(width, height);
477	>	resolution_id = find_apple_resolution(width, height);
478		mode.viType = type;
479		#endif
480		VIDEO_MODE_X = width;
#	Line 464 | Line 485 | static void add_mode(int type, int width
485		VideoModes.push_back(mode);
486		}
487
467	–	// Add standard list of windowed modes for given color depth
468	–	static void add_window_modes(int depth)
469	–	{
470	–	video_depth vdepth = (video_depth)depth;
471	–	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
472	–	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
473	–	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
474	–	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
475	–	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
476	–	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
477	–	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
478	–	}
479	–
488		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
489		static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
490		{
#	Line 520 | Line 528 | static SDL_GrabMode set_grab_mode(SDL_Gr
528		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
529		}
530
531	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
532	+	static void migrate_screen_prefs(void)
533	+	{
534	+	#ifdef SHEEPSHAVER
535	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
536	+	if (PrefsFindString("screen"))
537	+	return;
538	+
539	+	uint32 window_modes = PrefsFindInt32("windowmodes");
540	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
541	+	int width = 0, height = 0;
542	+	if (screen_modes) {
543	+	static const struct {
544	+	int id;
545	+	int width;
546	+	int height;
547	+	}
548	+	modes[] = {
549	+	{  1,    640,    480 },
550	+	{  2,    800,    600 },
551	+	{  4,   1024,    768 },
552	+	{ 64,   1152,    768 },
553	+	{  8,   1152,    900 },
554	+	{ 16,   1280,   1024 },
555	+	{ 32,   1600,   1200 },
556	+	{ 0, }
557	+	};
558	+	for (int i = 0; modes[i].id != 0; i++) {
559	+	if (screen_modes & modes[i].id) {
560	+	if (width < modes[i].width && height < modes[i].height) {
561	+	width = modes[i].width;
562	+	height = modes[i].height;
563	+	}
564	+	}
565	+	}
566	+	} else {
567	+	if (window_modes & 1)
568	+	width = 640, height = 480;
569	+	if (window_modes & 2)
570	+	width = 800, height = 600;
571	+	}
572	+	if (width && height) {
573	+	char str[32];
574	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
575	+	PrefsReplaceString("screen", str);
576	+	}
577	+	#endif
578	+	}
579	+
580
581		/*
582		*  Display "driver" classes
#	Line 999 | Line 1056 | bool SDL_monitor_desc::video_open(void)
1056		return false;
1057		}
1058
1059	+	#ifdef WIN32
1060	+	// Chain in a new message handler for WM_DEVICECHANGE
1061	+	HWND the_window = GetMainWindowHandle();
1062	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1063	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1064	+	#endif
1065	+
1066		// Initialize VideoRefresh function
1067		VideoRefreshInit();
1068
#	Line 1006 | Line 1070 | bool SDL_monitor_desc::video_open(void)
1070		LOCK_FRAME_BUFFER;
1071
1072		// Start redraw/input thread
1073	+	#ifndef USE_CPU_EMUL_SERVICES
1074		redraw_thread_cancel = false;
1075		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1076		if (!redraw_thread_active) {
1077		printf("FATAL: cannot create redraw thread\n");
1078		return false;
1079		}
1080	+	#else
1081	+	redraw_thread_active = true;
1082	+	#endif
1083		return true;
1084		}
1085
#	Line 1032 | Line 1100 | bool VideoInit(bool classic)
1100		#endif
1101
1102		// Create Mutexes
1103	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1104	+	return false;
1105		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1106		return false;
1107		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 1046 | Line 1116 | bool VideoInit(bool classic)
1116		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1117
1118		// Get screen mode from preferences
1119	+	migrate_screen_prefs();
1120		const char *mode_str = NULL;
1121		if (classic_mode)
1122		mode_str = "win/512/342";
#	Line 1069 | Line 1140 | bool VideoInit(bool classic)
1140		else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1141		display_type = DISPLAY_SCREEN;
1142		}
1072	–	int max_width = 640, max_height = 480;
1073	–	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
1074	–	if (modes && modes != (SDL_Rect **)-1) {
1075	–	// It turns out that on some implementations, and contrary to the documentation,
1076	–	// the returned list is not sorted from largest to smallest (e.g. Windows)
1077	–	for (int i = 0; modes[i] != NULL; i++) {
1078	–	const int w = modes[i]->w;
1079	–	const int h = modes[i]->h;
1080	–	if (w > max_width && h > max_height) {
1081	–	max_width = w;
1082	–	max_height = h;
1083	–	}
1084	–	}
1085	–	if (default_width > max_width)
1086	–	default_width = max_width;
1087	–	if (default_height > max_height)
1088	–	default_height = max_height;
1089	–	}
1143		if (default_width <= 0)
1144	<	default_width = max_width;
1144	>	default_width = sdl_display_width();
1145	>	else if (default_width > sdl_display_width())
1146	>	default_width = sdl_display_width();
1147		if (default_height <= 0)
1148	<	default_height = max_height;
1148	>	default_height = sdl_display_height();
1149	>	else if (default_height > sdl_display_height())
1150	>	default_height = sdl_display_height();
1151
1152		// Mac screen depth follows X depth
1153		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 1110 | Line 1167 | bool VideoInit(bool classic)
1167		break;
1168		}
1169
1170	+	// Initialize list of video modes to try
1171	+	struct {
1172	+	int w;
1173	+	int h;
1174	+	int resolution_id;
1175	+	}
1176	+	video_modes[] = {
1177	+	{   -1,   -1, 0x80 },
1178	+	{  512,  384, 0x80 },
1179	+	{  640,  480, 0x81 },
1180	+	{  800,  600, 0x82 },
1181	+	{ 1024,  768, 0x83 },
1182	+	{ 1152,  870, 0x84 },
1183	+	{ 1280, 1024, 0x85 },
1184	+	{ 1600, 1200, 0x86 },
1185	+	{ 0, }
1186	+	};
1187	+	video_modes[0].w = default_width;
1188	+	video_modes[0].h = default_height;
1189	+
1190		// Construct list of supported modes
1191		if (display_type == DISPLAY_WINDOW) {
1192		if (classic)
1193		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1194		else {
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));
1195	>	for (int i = 0; video_modes[i].w != 0; i++) {
1196	>	const int w = video_modes[i].w;
1197	>	const int h = video_modes[i].h;
1198	>	if (i > 0 && (w >= default_width || h >= default_height))
1199	>	continue;
1200	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1201	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1202		}
1203		}
1204		} else if (display_type == DISPLAY_SCREEN) {
1125	–	struct {
1126	–	int w;
1127	–	int h;
1128	–	int resolution_id;
1129	–	}
1130	–	video_modes[] = {
1131	–	{   -1,   -1, 0x80 },
1132	–	{  640,  480, 0x81 },
1133	–	{  800,  600, 0x82 },
1134	–	{ 1024,  768, 0x83 },
1135	–	{ 1152,  870, 0x84 },
1136	–	{ 1280, 1024, 0x85 },
1137	–	{ 1600, 1200, 0x86 },
1138	–	{ 0, }
1139	–	};
1140	–	video_modes[0].w = default_width;
1141	–	video_modes[0].h = default_height;
1142	–
1205		for (int i = 0; video_modes[i].w != 0; i++) {
1206		const int w = video_modes[i].w;
1207		const int h = video_modes[i].h;
1208		if (i > 0 && (w >= default_width || h >= default_height))
1209		continue;
1210	+	if (w == 512 && h == 384)
1211	+	continue;
1212		#ifdef ENABLE_VOSF
1213	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1214	<	int bpp = sdl_depth_of_video_depth(d);
1151	<	if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE | SDL_FULLSCREEN))
1152	<	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1153	<	}
1213	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1214	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1215		#else
1216		add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1217		#endif
#	Line 1227 | Line 1288 | void SDL_monitor_desc::video_close(void)
1288		{
1289		D(bug("video_close()\n"));
1290
1291	+	#ifdef WIN32
1292	+	// Remove message handler for WM_DEVICECHANGE
1293	+	HWND the_window = GetMainWindowHandle();
1294	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1295	+	#endif
1296	+
1297		// Stop redraw thread
1298	+	#ifndef USE_CPU_EMUL_SERVICES
1299		if (redraw_thread_active) {
1300		redraw_thread_cancel = true;
1301		SDL_WaitThread(redraw_thread, NULL);
1302		}
1303	+	#endif
1304		redraw_thread_active = false;
1305
1306		// Unlock frame buffer
#	Line 1255 | Line 1324 | void VideoExit(void)
1324		SDL_DestroyMutex(frame_buffer_lock);
1325		if (sdl_palette_lock)
1326		SDL_DestroyMutex(sdl_palette_lock);
1327	+	if (sdl_events_lock)
1328	+	SDL_DestroyMutex(sdl_events_lock);
1329		}
1330
1331
#	Line 1424 | Line 1495 | int16 video_mode_change(VidLocals *csSav
1495		void SDL_monitor_desc::switch_to_current_mode(void)
1496		{
1497		// Close and reopen display
1498	+	LOCK_EVENTS;
1499		video_close();
1500		video_open();
1501	+	UNLOCK_EVENTS;
1502
1503		if (drv == NULL) {
1504		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1911 | Line 1984 | static void update_display_static(driver
1984		}
1985		}
1986
1987	+	// Static display update (fixed frame rate, bounding boxes based)
1988	+	// XXX use NQD bounding boxes to help detect dirty areas?
1989	+	static void update_display_static_bbox(driver_window *drv)
1990	+	{
1991	+	const VIDEO_MODE &mode = drv->mode;
1992	+
1993	+	// Allocate bounding boxes for SDL_UpdateRects()
1994	+	const int N_PIXELS = 64;
1995	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
1996	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
1997	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
1998	+	int nr_boxes = 0;
1999	+
2000	+	// Lock surface, if required
2001	+	if (SDL_MUSTLOCK(drv->s))
2002	+	SDL_LockSurface(drv->s);
2003	+
2004	+	// Update the surface from Mac screen
2005	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2006	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2007	+	int x, y;
2008	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2009	+	int h = N_PIXELS;
2010	+	if (h > VIDEO_MODE_Y - y)
2011	+	h = VIDEO_MODE_Y - y;
2012	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2013	+	int w = N_PIXELS;
2014	+	if (w > VIDEO_MODE_X - x)
2015	+	w = VIDEO_MODE_X - x;
2016	+	const int xs = w * bytes_per_pixel;
2017	+	const int xb = x * bytes_per_pixel;
2018	+	bool dirty = false;
2019	+	for (int j = y; j < (y + h); j++) {
2020	+	const int yb = j * bytes_per_row;
2021	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2022	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2023	+	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2024	+	dirty = true;
2025	+	}
2026	+	}
2027	+	if (dirty) {
2028	+	boxes[nr_boxes].x = x;
2029	+	boxes[nr_boxes].y = y;
2030	+	boxes[nr_boxes].w = w;
2031	+	boxes[nr_boxes].h = h;
2032	+	nr_boxes++;
2033	+	}
2034	+	}
2035	+	}
2036	+
2037	+	// Unlock surface, if required
2038	+	if (SDL_MUSTLOCK(drv->s))
2039	+	SDL_UnlockSurface(drv->s);
2040	+
2041	+	// Refresh display
2042	+	if (nr_boxes)
2043	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2044	+	}
2045	+
2046
2047		// We suggest the compiler to inline the next two functions so that it
2048		// may specialise the code according to the current screen depth and
#	Line 2005 | Line 2137 | static void video_refresh_window_static(
2137		static int tick_counter = 0;
2138		if (++tick_counter >= frame_skip) {
2139		tick_counter = 0;
2140	<	update_display_static(static_cast<driver_window *>(drv));
2140	>	const VIDEO_MODE &mode = drv->mode;
2141	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2142	>	update_display_static_bbox(static_cast<driver_window *>(drv));
2143	>	else
2144	>	update_display_static(static_cast<driver_window *>(drv));
2145		}
2146		}
2147
#	Line 2035 | Line 2171 | static void VideoRefreshInit(void)
2171		}
2172		}
2173
2174	+	static inline void do_video_refresh(void)
2175	+	{
2176	+	// Handle SDL events
2177	+	handle_events();
2178	+
2179	+	// Update display
2180	+	video_refresh();
2181	+
2182	+	#ifdef SHEEPSHAVER
2183	+	// Set new cursor image if it was changed
2184	+	if (cursor_changed && sdl_cursor) {
2185	+	cursor_changed = false;
2186	+	LOCK_EVENTS;
2187	+	SDL_FreeCursor(sdl_cursor);
2188	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2189	+	if (sdl_cursor)
2190	+	SDL_SetCursor(sdl_cursor);
2191	+	UNLOCK_EVENTS;
2192	+	}
2193	+	#endif
2194	+
2195	+	// Set new palette if it was changed
2196	+	handle_palette_changes();
2197	+	}
2198	+
2199	+	// This function is called on non-threaded platforms from a timer interrupt
2200	+	void VideoRefresh(void)
2201	+	{
2202	+	// We need to check redraw_thread_active to inhibit refreshed during
2203	+	// mode changes on non-threaded platforms
2204	+	if (!redraw_thread_active)
2205	+	return;
2206	+
2207	+	// Process pending events and update display
2208	+	do_video_refresh();
2209	+	}
2210	+
2211		const int VIDEO_REFRESH_HZ = 60;
2212		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2213
2214	+	#ifndef USE_CPU_EMUL_SERVICES
2215		static int redraw_func(void *arg)
2216		{
2217		uint64 start = GetTicks_usec();
#	Line 2063 | Line 2237 | static int redraw_func(void *arg)
2237		}
2238		#endif
2239
2240	<	// Handle SDL events
2241	<	handle_events();
2240	>	// Process pending events and update display
2241	>	do_video_refresh();
2242	>	}
2243
2244	<	// Refresh display
2245	<	video_refresh();
2244	>	uint64 end = GetTicks_usec();
2245	>	D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2246	>	return 0;
2247	>	}
2248	>	#endif
2249	>
2250	>
2251	>	/*
2252	>	*  Record dirty area from NQD
2253	>	*/
2254
2255		#ifdef SHEEPSHAVER
2256	<	// Set new cursor image if it was changed
2257	<	if (cursor_changed && sdl_cursor) {
2258	<	cursor_changed = false;
2259	<	SDL_FreeCursor(sdl_cursor);
2260	<	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2261	<	if (sdl_cursor)
2079	<	SDL_SetCursor(sdl_cursor);
2080	<	}
2081	<	#endif
2256	>	void video_set_dirty_area(int x, int y, int w, int h)
2257	>	{
2258	>	const VIDEO_MODE &mode = drv->mode;
2259	>	const int screen_width = VIDEO_MODE_X;
2260	>	const int screen_height = VIDEO_MODE_Y;
2261	>	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2262
2263	<	// Set new palette if it was changed
2264	<	handle_palette_changes();
2263	>	#ifdef ENABLE_VOSF
2264	>	if (use_vosf) {
2265	>	vosf_set_dirty_area(x, y, w, h, screen_width, bytes_per_row);
2266	>	return;
2267		}
2268	+	#endif
2269
2270	<	uint64 end = GetTicks_usec();
2088	<	D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2089	<	return 0;
2270	>	// XXX handle dirty bounding boxes for non-VOSF modes
2271		}
2272	+	#endif

Diff Legend

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