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.22 by gbeauche, 2005-11-29T23:20:31Z vs.
Revision 1.31 by asvitkine, 2007-01-22T00:32:25Z

#	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 204 | Line 207 | static inline void vm_release_framebuffe
207
208
209		/*
210	+	*  Windows message handler
211	+	*/
212	+
213	+	#ifdef WIN32
214	+	#include <dbt.h>
215	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
216	+
217	+	extern void SysMediaArrived(void);
218	+	extern void SysMediaRemoved(void);
219	+	extern HWND GetMainWindowHandle(void);
220	+
221	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
222	+	{
223	+	switch (msg) {
224	+	case WM_DEVICECHANGE:
225	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
226	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
227	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
228	+	SysMediaRemoved();
229	+	}
230	+	else if (wParam == DBT_DEVICEARRIVAL) {
231	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
232	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
233	+	SysMediaArrived();
234	+	}
235	+	return 0;
236	+
237	+	default:
238	+	if (sdl_window_proc)
239	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
240	+	}
241	+
242	+	return DefWindowProc(hwnd, msg, wParam, lParam);
243	+	}
244	+	#endif
245	+
246	+
247	+	/*
248		*  SheepShaver glue
249		*/
250
#	Line 248 | Line 289 | static vector<monitor_desc *> VideoMonit
289		// Find Apple mode matching best specified dimensions
290		static int find_apple_resolution(int xsize, int ysize)
291		{
292	<	int apple_id;
293	<	if (xsize < 800)
294	<	apple_id = APPLE_640x480;
295	<	else if (xsize < 1024)
296	<	apple_id = APPLE_800x600;
297	<	else if (xsize < 1152)
298	<	apple_id = APPLE_1024x768;
299	<	else if (xsize < 1280) {
300	<	if (ysize < 900)
301	<	apple_id = APPLE_1152x768;
302	<	else
303	<	apple_id = APPLE_1152x900;
304	<	}
305	<	else if (xsize < 1600)
306	<	apple_id = APPLE_1280x1024;
266	<	else
267	<	apple_id = APPLE_1600x1200;
268	<	return apple_id;
269	<	}
270	<
271	<	// Set parameters to specified Apple mode
272	<	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
273	<	{
274	<	switch (apple_id) {
275	<	case APPLE_640x480:
276	<	xsize = 640;
277	<	ysize = 480;
278	<	break;
279	<	case APPLE_800x600:
280	<	xsize = 800;
281	<	ysize = 600;
282	<	break;
283	<	case APPLE_1024x768:
284	<	xsize = 1024;
285	<	ysize = 768;
286	<	break;
287	<	case APPLE_1152x768:
288	<	xsize = 1152;
289	<	ysize = 768;
290	<	break;
291	<	case APPLE_1152x900:
292	<	xsize = 1152;
293	<	ysize = 900;
294	<	break;
295	<	case APPLE_1280x1024:
296	<	xsize = 1280;
297	<	ysize = 1024;
298	<	break;
299	<	case APPLE_1600x1200:
300	<	xsize = 1600;
301	<	ysize = 1200;
302	<	break;
303	<	default:
304	<	abort();
305	<	}
306	<	}
307	<
308	<	// Match Apple mode matching best specified dimensions
309	<	static int match_apple_resolution(int &xsize, int &ysize)
310	<	{
311	<	int apple_id = find_apple_resolution(xsize, ysize);
312	<	set_apple_resolution(apple_id, xsize, ysize);
313	<	return apple_id;
292	>	if (xsize == 640 && ysize == 480)
293	>	return APPLE_640x480;
294	>	if (xsize == 800 && ysize == 600)
295	>	return APPLE_800x600;
296	>	if (xsize == 1024 && ysize == 768)
297	>	return APPLE_1024x768;
298	>	if (xsize == 1152 && ysize == 768)
299	>	return APPLE_1152x768;
300	>	if (xsize == 1152 && ysize == 900)
301	>	return APPLE_1152x900;
302	>	if (xsize == 1280 && ysize == 1024)
303	>	return APPLE_1280x1024;
304	>	if (xsize == 1600 && ysize == 1200)
305	>	return APPLE_1600x1200;
306	>	return APPLE_CUSTOM;
307		}
308
309		// Display error alert
#	Line 417 | Line 410 | static int sdl_depth_of_video_depth(int
410		return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
411		}
412
413	+	// Get screen dimensions
414	+	static void sdl_display_dimensions(int &width, int &height)
415	+	{
416	+	static int max_width, max_height;
417	+	if (max_width == 0 && max_height == 0) {
418	+	max_width = 640 ; max_height = 480;
419	+	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
420	+	if (modes && modes != (SDL_Rect **)-1) {
421	+	// It turns out that on some implementations, and contrary to the documentation,
422	+	// the returned list is not sorted from largest to smallest (e.g. Windows)
423	+	for (int i = 0; modes[i] != NULL; i++) {
424	+	const int w = modes[i]->w;
425	+	const int h = modes[i]->h;
426	+	if (w > max_width && h > max_height) {
427	+	max_width = w;
428	+	max_height = h;
429	+	}
430	+	}
431	+	}
432	+	}
433	+	width = max_width;
434	+	height = max_height;
435	+	}
436	+
437	+	static inline int sdl_display_width(void)
438	+	{
439	+	int width, height;
440	+	sdl_display_dimensions(width, height);
441	+	return width;
442	+	}
443	+
444	+	static inline int sdl_display_height(void)
445	+	{
446	+	int width, height;
447	+	sdl_display_dimensions(width, height);
448	+	return height;
449	+	}
450	+
451		// Check wether specified mode is available
452	<	static bool has_mode(int type, int width, int height)
452	>	static bool has_mode(int type, int width, int height, int depth)
453		{
454		#ifdef SHEEPSHAVER
455	<	// Filter out Classic resolutiosn
455	>	// Filter out Classic resolutions
456		if (width == 512 && height == 384)
457		return false;
458	+	#endif
459
460	<	// "screen" prefs items always succeeds
461	<	if (PrefsFindString("screen"))
462	<	return true;
431	<
432	<	// Read window & screen modes prefs
433	<	static uint32 window_modes = 0;
434	<	static uint32 screen_modes = 0;
435	<	if (window_modes == 0 || screen_modes == 0) {
436	<	window_modes = PrefsFindInt32("windowmodes");
437	<	screen_modes = PrefsFindInt32("screenmodes");
438	<	if (window_modes == 0 || screen_modes == 0)
439	<	window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
440	<	}
441	<
442	<	int test_modes;
443	<	switch (type) {
444	<	case DISPLAY_WINDOW:
445	<	test_modes = window_modes;
446	<	break;
447	<	case DISPLAY_SCREEN:
448	<	test_modes = screen_modes;
449	<	break;
450	<	default:
451	<	test_modes = 0;
452	<	break;
453	<	}
460	>	// Filter out out-of-bounds resolutions
461	>	if (width > sdl_display_width() || height > sdl_display_height())
462	>	return false;
463
464	<	int apple_mask;
465	<	switch (find_apple_resolution(width, height)) {
466	<	case APPLE_640x480:             apple_mask = 0x01; break;
467	<	case APPLE_800x600:             apple_mask = 0x02; break;
459	<	case APPLE_1024x768:    apple_mask = 0x04; break;
460	<	case APPLE_1152x768:    apple_mask = 0x40; break;
461	<	case APPLE_1152x900:    apple_mask = 0x08; break;
462	<	case APPLE_1280x1024:   apple_mask = 0x10; break;
463	<	case APPLE_1600x1200:   apple_mask = 0x20; break;
464	<	default:                                apple_mask = 0x00; break;
465	<	}
466	<	return (test_modes & apple_mask);
467	<	#endif
468	<	return true;
464	>	// Rely on SDL capabilities
465	>	return SDL_VideoModeOK(width, height,
466	>	sdl_depth_of_video_depth(depth),
467	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
468		}
469
470		// Add mode to list of supported modes
471		static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
472		{
473		// Filter out unsupported modes
474	<	if (!has_mode(type, width, height))
474	>	if (!has_mode(type, width, height, depth))
475		return;
476
477		// Fill in VideoMode entry
478		VIDEO_MODE mode;
479		#ifdef SHEEPSHAVER
480	<	// Recalculate dimensions to fit Apple modes
482	<	resolution_id = match_apple_resolution(width, height);
480	>	resolution_id = find_apple_resolution(width, height);
481		mode.viType = type;
482		#endif
483		VIDEO_MODE_X = width;
#	Line 490 | Line 488 | static void add_mode(int type, int width
488		VideoModes.push_back(mode);
489		}
490
493	–	// Add standard list of windowed modes for given color depth
494	–	static void add_window_modes(int depth)
495	–	{
496	–	video_depth vdepth = (video_depth)depth;
497	–	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
498	–	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
499	–	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
500	–	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
501	–	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
502	–	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
503	–	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
504	–	}
505	–
491		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
492		static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
493		{
#	Line 546 | Line 531 | static SDL_GrabMode set_grab_mode(SDL_Gr
531		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
532		}
533
534	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
535	+	static void migrate_screen_prefs(void)
536	+	{
537	+	#ifdef SHEEPSHAVER
538	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
539	+	if (PrefsFindString("screen"))
540	+	return;
541	+
542	+	uint32 window_modes = PrefsFindInt32("windowmodes");
543	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
544	+	int width = 0, height = 0;
545	+	if (screen_modes) {
546	+	static const struct {
547	+	int id;
548	+	int width;
549	+	int height;
550	+	}
551	+	modes[] = {
552	+	{  1,    640,    480 },
553	+	{  2,    800,    600 },
554	+	{  4,   1024,    768 },
555	+	{ 64,   1152,    768 },
556	+	{  8,   1152,    900 },
557	+	{ 16,   1280,   1024 },
558	+	{ 32,   1600,   1200 },
559	+	{ 0, }
560	+	};
561	+	for (int i = 0; modes[i].id != 0; i++) {
562	+	if (screen_modes & modes[i].id) {
563	+	if (width < modes[i].width && height < modes[i].height) {
564	+	width = modes[i].width;
565	+	height = modes[i].height;
566	+	}
567	+	}
568	+	}
569	+	} else {
570	+	if (window_modes & 1)
571	+	width = 640, height = 480;
572	+	if (window_modes & 2)
573	+	width = 800, height = 600;
574	+	}
575	+	if (width && height) {
576	+	char str[32];
577	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
578	+	PrefsReplaceString("screen", str);
579	+	}
580	+	#endif
581	+	}
582	+
583
584		/*
585		*  Display "driver" classes
#	Line 685 | Line 719 | void driver_base::restore_mouse_accel(vo
719		*  Windowed display driver
720		*/
721
722	+	static int SDL_display_opened = FALSE;
723	+
724		// Open display
725		driver_window::driver_window(SDL_monitor_desc &m)
726		: driver_base(m), mouse_grabbed(false)
#	Line 696 | Line 732 | driver_window::driver_window(SDL_monitor
732		// Set absolute mouse mode
733		ADBSetRelMouseMode(mouse_grabbed);
734
735	+	// This is ugly:
736	+	// If we're switching resolutions (ie, not setting it for the first time),
737	+	// there's a bug in SDL where the SDL_Surface created will not be properly
738	+	// setup. The solution is to SDL_Quit() before calling SDL_SetVideoMode for
739	+	// the second time (SDL_SetVideoMode will call SDL_Init() and all will be
740	+	// well). Without this, the video becomes corrupted (at least on Mac OS X),
741	+	// after the resolution switch (for the second and subsequent times).
742	+	// EDIT: Ack, this breaks audio!
743	+	//      if (SDL_display_opened)
744	+	//              SDL_Quit();
745	+
746		// Create surface
747		int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
748		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
749		return;
750
751	+	SDL_display_opened = TRUE;
752	+
753		#ifdef ENABLE_VOSF
754		use_vosf = true;
755		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 1025 | Line 1074 | bool SDL_monitor_desc::video_open(void)
1074		return false;
1075		}
1076
1077	+	#ifdef WIN32
1078	+	// Chain in a new message handler for WM_DEVICECHANGE
1079	+	HWND the_window = GetMainWindowHandle();
1080	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1081	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1082	+	#endif
1083	+
1084		// Initialize VideoRefresh function
1085		VideoRefreshInit();
1086
#	Line 1078 | Line 1134 | bool VideoInit(bool classic)
1134		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1135
1136		// Get screen mode from preferences
1137	+	migrate_screen_prefs();
1138		const char *mode_str = NULL;
1139		if (classic_mode)
1140		mode_str = "win/512/342";
#	Line 1101 | Line 1158 | bool VideoInit(bool classic)
1158		else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1159		display_type = DISPLAY_SCREEN;
1160		}
1104	–	int max_width = 640, max_height = 480;
1105	–	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
1106	–	if (modes && modes != (SDL_Rect **)-1) {
1107	–	// It turns out that on some implementations, and contrary to the documentation,
1108	–	// the returned list is not sorted from largest to smallest (e.g. Windows)
1109	–	for (int i = 0; modes[i] != NULL; i++) {
1110	–	const int w = modes[i]->w;
1111	–	const int h = modes[i]->h;
1112	–	if (w > max_width && h > max_height) {
1113	–	max_width = w;
1114	–	max_height = h;
1115	–	}
1116	–	}
1117	–	if (default_width > max_width)
1118	–	default_width = max_width;
1119	–	if (default_height > max_height)
1120	–	default_height = max_height;
1121	–	}
1161		if (default_width <= 0)
1162	<	default_width = max_width;
1162	>	default_width = sdl_display_width();
1163	>	else if (default_width > sdl_display_width())
1164	>	default_width = sdl_display_width();
1165		if (default_height <= 0)
1166	<	default_height = max_height;
1166	>	default_height = sdl_display_height();
1167	>	else if (default_height > sdl_display_height())
1168	>	default_height = sdl_display_height();
1169
1170		// Mac screen depth follows X depth
1171		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 1142 | Line 1185 | bool VideoInit(bool classic)
1185		break;
1186		}
1187
1188	+	// Initialize list of video modes to try
1189	+	struct {
1190	+	int w;
1191	+	int h;
1192	+	int resolution_id;
1193	+	}
1194	+	video_modes[] = {
1195	+	{   -1,   -1, 0x80 },
1196	+	{  512,  384, 0x80 },
1197	+	{  640,  480, 0x81 },
1198	+	{  800,  600, 0x82 },
1199	+	{ 1024,  768, 0x83 },
1200	+	{ 1152,  870, 0x84 },
1201	+	{ 1280, 1024, 0x85 },
1202	+	{ 1600, 1200, 0x86 },
1203	+	{ 0, }
1204	+	};
1205	+	video_modes[0].w = default_width;
1206	+	video_modes[0].h = default_height;
1207	+
1208		// Construct list of supported modes
1209		if (display_type == DISPLAY_WINDOW) {
1210		if (classic)
1211		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1212		else {
1213	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1214	<	int bpp = sdl_depth_of_video_depth(d);
1215	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1216	<	add_window_modes(video_depth(d));
1213	>	for (int i = 0; video_modes[i].w != 0; i++) {
1214	>	const int w = video_modes[i].w;
1215	>	const int h = video_modes[i].h;
1216	>	if (i > 0 && (w >= default_width || h >= default_height))
1217	>	continue;
1218	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1219	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1220		}
1221		}
1222		} else if (display_type == DISPLAY_SCREEN) {
1157	–	struct {
1158	–	int w;
1159	–	int h;
1160	–	int resolution_id;
1161	–	}
1162	–	video_modes[] = {
1163	–	{   -1,   -1, 0x80 },
1164	–	{  640,  480, 0x81 },
1165	–	{  800,  600, 0x82 },
1166	–	{ 1024,  768, 0x83 },
1167	–	{ 1152,  870, 0x84 },
1168	–	{ 1280, 1024, 0x85 },
1169	–	{ 1600, 1200, 0x86 },
1170	–	{ 0, }
1171	–	};
1172	–	video_modes[0].w = default_width;
1173	–	video_modes[0].h = default_height;
1174	–
1223		for (int i = 0; video_modes[i].w != 0; i++) {
1224		const int w = video_modes[i].w;
1225		const int h = video_modes[i].h;
1226		if (i > 0 && (w >= default_width || h >= default_height))
1227		continue;
1228	+	if (w == 512 && h == 384)
1229	+	continue;
1230		#ifdef ENABLE_VOSF
1231	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1232	<	int bpp = sdl_depth_of_video_depth(d);
1183	<	if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE | SDL_FULLSCREEN))
1184	<	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1185	<	}
1231	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1232	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1233		#else
1234		add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1235		#endif
#	Line 1259 | Line 1306 | void SDL_monitor_desc::video_close(void)
1306		{
1307		D(bug("video_close()\n"));
1308
1309	+	#ifdef WIN32
1310	+	// Remove message handler for WM_DEVICECHANGE
1311	+	HWND the_window = GetMainWindowHandle();
1312	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1313	+	#endif
1314	+
1315		// Stop redraw thread
1316		#ifndef USE_CPU_EMUL_SERVICES
1317		if (redraw_thread_active) {
#	Line 1949 | Line 2002 | static void update_display_static(driver
2002		}
2003		}
2004
2005	+	// Static display update (fixed frame rate, bounding boxes based)
2006	+	// XXX use NQD bounding boxes to help detect dirty areas?
2007	+	static void update_display_static_bbox(driver_window *drv)
2008	+	{
2009	+	const VIDEO_MODE &mode = drv->mode;
2010	+
2011	+	// Allocate bounding boxes for SDL_UpdateRects()
2012	+	const int N_PIXELS = 64;
2013	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2014	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2015	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2016	+	int nr_boxes = 0;
2017	+
2018	+	// Lock surface, if required
2019	+	if (SDL_MUSTLOCK(drv->s))
2020	+	SDL_LockSurface(drv->s);
2021	+
2022	+	// Update the surface from Mac screen
2023	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2024	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2025	+	int x, y;
2026	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2027	+	int h = N_PIXELS;
2028	+	if (h > VIDEO_MODE_Y - y)
2029	+	h = VIDEO_MODE_Y - y;
2030	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2031	+	int w = N_PIXELS;
2032	+	if (w > VIDEO_MODE_X - x)
2033	+	w = VIDEO_MODE_X - x;
2034	+	const int xs = w * bytes_per_pixel;
2035	+	const int xb = x * bytes_per_pixel;
2036	+	bool dirty = false;
2037	+	for (int j = y; j < (y + h); j++) {
2038	+	const int yb = j * bytes_per_row;
2039	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2040	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2041	+	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2042	+	dirty = true;
2043	+	}
2044	+	}
2045	+	if (dirty) {
2046	+	boxes[nr_boxes].x = x;
2047	+	boxes[nr_boxes].y = y;
2048	+	boxes[nr_boxes].w = w;
2049	+	boxes[nr_boxes].h = h;
2050	+	nr_boxes++;
2051	+	}
2052	+	}
2053	+	}
2054	+
2055	+	// Unlock surface, if required
2056	+	if (SDL_MUSTLOCK(drv->s))
2057	+	SDL_UnlockSurface(drv->s);
2058	+
2059	+	// Refresh display
2060	+	if (nr_boxes)
2061	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2062	+	}
2063	+
2064
2065		// We suggest the compiler to inline the next two functions so that it
2066		// may specialise the code according to the current screen depth and
#	Line 2043 | Line 2155 | static void video_refresh_window_static(
2155		static int tick_counter = 0;
2156		if (++tick_counter >= frame_skip) {
2157		tick_counter = 0;
2158	<	update_display_static(static_cast<driver_window *>(drv));
2158	>	const VIDEO_MODE &mode = drv->mode;
2159	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2160	>	update_display_static_bbox(static_cast<driver_window *>(drv));
2161	>	else
2162	>	update_display_static(static_cast<driver_window *>(drv));
2163		}
2164		}
2165
#	Line 2088 | Line 2204 | static inline void do_video_refresh(void
2204		LOCK_EVENTS;
2205		SDL_FreeCursor(sdl_cursor);
2206		sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2207	<	if (sdl_cursor)
2207	>	if (sdl_cursor) {
2208		SDL_SetCursor(sdl_cursor);
2209	+	#ifdef WIN32
2210	+	// XXX Windows apparently needs an extra mouse event to
2211	+	// make the new cursor image visible
2212	+	int visible = SDL_ShowCursor(-1);
2213	+	if (visible) {
2214	+	int x, y;
2215	+	SDL_GetMouseState(&x, &y);
2216	+	SDL_WarpMouse(x, y);
2217	+	}
2218	+	#endif
2219	+	}
2220		UNLOCK_EVENTS;
2221		}
2222		#endif
#	Line 2148 | Line 2275 | static int redraw_func(void *arg)
2275		return 0;
2276		}
2277		#endif
2278	+
2279	+
2280	+	/*
2281	+	*  Record dirty area from NQD
2282	+	*/
2283	+
2284	+	#ifdef SHEEPSHAVER
2285	+	void video_set_dirty_area(int x, int y, int w, int h)
2286	+	{
2287	+	const VIDEO_MODE &mode = drv->mode;
2288	+	const int screen_width = VIDEO_MODE_X;
2289	+	const int screen_height = VIDEO_MODE_Y;
2290	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2291	+
2292	+	#ifdef ENABLE_VOSF
2293	+	if (use_vosf) {
2294	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2295	+	return;
2296	+	}
2297	+	#endif
2298	+
2299	+	// XXX handle dirty bounding boxes for non-VOSF modes
2300	+	}
2301	+	#endif

Diff Legend

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