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.23 by gbeauche, 2006-03-28T07:01:19Z vs.
Revision 1.29 by gbeauche, 2006-05-14T14:11:46Z

#	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 286 | 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;
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;
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 455 | 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;
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	<	}
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;
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;
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
520	<	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 528 | Line 488 | static void add_mode(int type, int width
488		VideoModes.push_back(mode);
489		}
490
531	–	// Add standard list of windowed modes for given color depth
532	–	static void add_window_modes(int depth)
533	–	{
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	–
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 584 | 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 1123 | Line 1119 | bool VideoInit(bool classic)
1119		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1120
1121		// Get screen mode from preferences
1122	+	migrate_screen_prefs();
1123		const char *mode_str = NULL;
1124		if (classic_mode)
1125		mode_str = "win/512/342";
#	Line 1146 | Line 1143 | bool VideoInit(bool classic)
1143		else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1144		display_type = DISPLAY_SCREEN;
1145		}
1149	–	int max_width = 640, max_height = 480;
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	–	}
1146		if (default_width <= 0)
1147	<	default_width = max_width;
1147	>	default_width = sdl_display_width();
1148	>	else if (default_width > sdl_display_width())
1149	>	default_width = sdl_display_width();
1150		if (default_height <= 0)
1151	<	default_height = max_height;
1151	>	default_height = sdl_display_height();
1152	>	else if (default_height > sdl_display_height())
1153	>	default_height = sdl_display_height();
1154
1155		// Mac screen depth follows X depth
1156		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 1187 | Line 1170 | bool VideoInit(bool classic)
1170		break;
1171		}
1172
1173	+	// Initialize list of video modes to try
1174	+	struct {
1175	+	int w;
1176	+	int h;
1177	+	int resolution_id;
1178	+	}
1179	+	video_modes[] = {
1180	+	{   -1,   -1, 0x80 },
1181	+	{  512,  384, 0x80 },
1182	+	{  640,  480, 0x81 },
1183	+	{  800,  600, 0x82 },
1184	+	{ 1024,  768, 0x83 },
1185	+	{ 1152,  870, 0x84 },
1186	+	{ 1280, 1024, 0x85 },
1187	+	{ 1600, 1200, 0x86 },
1188	+	{ 0, }
1189	+	};
1190	+	video_modes[0].w = default_width;
1191	+	video_modes[0].h = default_height;
1192	+
1193		// Construct list of supported modes
1194		if (display_type == DISPLAY_WINDOW) {
1195		if (classic)
1196		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1197		else {
1198	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1199	<	int bpp = sdl_depth_of_video_depth(d);
1200	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1201	<	add_window_modes(video_depth(d));
1198	>	for (int i = 0; video_modes[i].w != 0; i++) {
1199	>	const int w = video_modes[i].w;
1200	>	const int h = video_modes[i].h;
1201	>	if (i > 0 && (w >= default_width || h >= default_height))
1202	>	continue;
1203	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1204	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1205		}
1206		}
1207		} 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	–
1208		for (int i = 0; video_modes[i].w != 0; i++) {
1209		const int w = video_modes[i].w;
1210		const int h = video_modes[i].h;
1211		if (i > 0 && (w >= default_width || h >= default_height))
1212		continue;
1213	+	if (w == 512 && h == 384)
1214	+	continue;
1215		#ifdef ENABLE_VOSF
1216	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1217	<	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	<	}
1216	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1217	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1218		#else
1219		add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1220		#endif
#	Line 2000 | Line 1987 | static void update_display_static(driver
1987		}
1988		}
1989
1990	+	// Static display update (fixed frame rate, bounding boxes based)
1991	+	// XXX use NQD bounding boxes to help detect dirty areas?
1992	+	static void update_display_static_bbox(driver_window *drv)
1993	+	{
1994	+	const VIDEO_MODE &mode = drv->mode;
1995	+
1996	+	// Allocate bounding boxes for SDL_UpdateRects()
1997	+	const int N_PIXELS = 64;
1998	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
1999	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2000	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2001	+	int nr_boxes = 0;
2002	+
2003	+	// Lock surface, if required
2004	+	if (SDL_MUSTLOCK(drv->s))
2005	+	SDL_LockSurface(drv->s);
2006	+
2007	+	// Update the surface from Mac screen
2008	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2009	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2010	+	int x, y;
2011	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2012	+	int h = N_PIXELS;
2013	+	if (h > VIDEO_MODE_Y - y)
2014	+	h = VIDEO_MODE_Y - y;
2015	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2016	+	int w = N_PIXELS;
2017	+	if (w > VIDEO_MODE_X - x)
2018	+	w = VIDEO_MODE_X - x;
2019	+	const int xs = w * bytes_per_pixel;
2020	+	const int xb = x * bytes_per_pixel;
2021	+	bool dirty = false;
2022	+	for (int j = y; j < (y + h); j++) {
2023	+	const int yb = j * bytes_per_row;
2024	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2025	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2026	+	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2027	+	dirty = true;
2028	+	}
2029	+	}
2030	+	if (dirty) {
2031	+	boxes[nr_boxes].x = x;
2032	+	boxes[nr_boxes].y = y;
2033	+	boxes[nr_boxes].w = w;
2034	+	boxes[nr_boxes].h = h;
2035	+	nr_boxes++;
2036	+	}
2037	+	}
2038	+	}
2039	+
2040	+	// Unlock surface, if required
2041	+	if (SDL_MUSTLOCK(drv->s))
2042	+	SDL_UnlockSurface(drv->s);
2043	+
2044	+	// Refresh display
2045	+	if (nr_boxes)
2046	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2047	+	}
2048	+
2049
2050		// We suggest the compiler to inline the next two functions so that it
2051		// may specialise the code according to the current screen depth and
#	Line 2094 | Line 2140 | static void video_refresh_window_static(
2140		static int tick_counter = 0;
2141		if (++tick_counter >= frame_skip) {
2142		tick_counter = 0;
2143	<	update_display_static(static_cast<driver_window *>(drv));
2143	>	const VIDEO_MODE &mode = drv->mode;
2144	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2145	>	update_display_static_bbox(static_cast<driver_window *>(drv));
2146	>	else
2147	>	update_display_static(static_cast<driver_window *>(drv));
2148		}
2149		}
2150
#	Line 2139 | Line 2189 | static inline void do_video_refresh(void
2189		LOCK_EVENTS;
2190		SDL_FreeCursor(sdl_cursor);
2191		sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2192	<	if (sdl_cursor)
2192	>	if (sdl_cursor) {
2193		SDL_SetCursor(sdl_cursor);
2194	+	#ifdef WIN32
2195	+	// XXX Windows apparently needs an extra mouse event to
2196	+	// make the new cursor image visible
2197	+	int visible = SDL_ShowCursor(-1);
2198	+	if (visible) {
2199	+	int x, y;
2200	+	SDL_GetMouseState(&x, &y);
2201	+	SDL_WarpMouse(x, y);
2202	+	}
2203	+	#endif
2204	+	}
2205		UNLOCK_EVENTS;
2206		}
2207		#endif
#	Line 2199 | Line 2260 | static int redraw_func(void *arg)
2260		return 0;
2261		}
2262		#endif
2263	+
2264	+
2265	+	/*
2266	+	*  Record dirty area from NQD
2267	+	*/
2268	+
2269	+	#ifdef SHEEPSHAVER
2270	+	void video_set_dirty_area(int x, int y, int w, int h)
2271	+	{
2272	+	const VIDEO_MODE &mode = drv->mode;
2273	+	const int screen_width = VIDEO_MODE_X;
2274	+	const int screen_height = VIDEO_MODE_Y;
2275	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2276	+
2277	+	#ifdef ENABLE_VOSF
2278	+	if (use_vosf) {
2279	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2280	+	return;
2281	+	}
2282	+	#endif
2283	+
2284	+	// XXX handle dirty bounding boxes for non-VOSF modes
2285	+	}
2286	+	#endif

Diff Legend

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