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.28 by gbeauche, 2006-05-14T13:49:53Z

#	Line 49 | Line 49
49		#include <errno.h>
50		#include <vector>
51
52	+	#ifdef WIN32
53	+	#include <malloc.h> /* alloca() */
54	+	#endif
55	+
56		#include "cpu_emulation.h"
57		#include "main.h"
58		#include "adb.h"
#	Line 286 | Line 290 | static vector<monitor_desc *> VideoMonit
290		// Find Apple mode matching best specified dimensions
291		static int find_apple_resolution(int xsize, int ysize)
292		{
293	<	int apple_id;
294	<	if (xsize < 800)
295	<	apple_id = APPLE_640x480;
296	<	else if (xsize < 1024)
297	<	apple_id = APPLE_800x600;
298	<	else if (xsize < 1152)
299	<	apple_id = APPLE_1024x768;
300	<	else if (xsize < 1280) {
301	<	if (ysize < 900)
302	<	apple_id = APPLE_1152x768;
303	<	else
304	<	apple_id = APPLE_1152x900;
305	<	}
306	<	else if (xsize < 1600)
307	<	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;
293	>	if (xsize == 640 && ysize == 480)
294	>	return APPLE_640x480;
295	>	if (xsize == 800 && ysize == 600)
296	>	return APPLE_800x600;
297	>	if (xsize == 1024 && ysize == 768)
298	>	return APPLE_1024x768;
299	>	if (xsize == 1152 && ysize == 768)
300	>	return APPLE_1152x768;
301	>	if (xsize == 1152 && ysize == 900)
302	>	return APPLE_1152x900;
303	>	if (xsize == 1280 && ysize == 1024)
304	>	return APPLE_1280x1024;
305	>	if (xsize == 1600 && ysize == 1200)
306	>	return APPLE_1600x1200;
307	>	return APPLE_CUSTOM;
308		}
309
310		// Display error alert
#	Line 455 | Line 411 | static int sdl_depth_of_video_depth(int
411		return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
412		}
413
414	+	// Get screen dimensions
415	+	static void sdl_display_dimensions(int &width, int &height)
416	+	{
417	+	static int max_width, max_height;
418	+	if (max_width == 0 && max_height == 0) {
419	+	max_width = 640 ; max_height = 480;
420	+	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
421	+	if (modes && modes != (SDL_Rect **)-1) {
422	+	// It turns out that on some implementations, and contrary to the documentation,
423	+	// the returned list is not sorted from largest to smallest (e.g. Windows)
424	+	for (int i = 0; modes[i] != NULL; i++) {
425	+	const int w = modes[i]->w;
426	+	const int h = modes[i]->h;
427	+	if (w > max_width && h > max_height) {
428	+	max_width = w;
429	+	max_height = h;
430	+	}
431	+	}
432	+	}
433	+	}
434	+	width = max_width;
435	+	height = max_height;
436	+	}
437	+
438	+	static inline int sdl_display_width(void)
439	+	{
440	+	int width, height;
441	+	sdl_display_dimensions(width, height);
442	+	return width;
443	+	}
444	+
445	+	static inline int sdl_display_height(void)
446	+	{
447	+	int width, height;
448	+	sdl_display_dimensions(width, height);
449	+	return height;
450	+	}
451	+
452		// Check wether specified mode is available
453	<	static bool has_mode(int type, int width, int height)
453	>	static bool has_mode(int type, int width, int height, int depth)
454		{
455		#ifdef SHEEPSHAVER
456	<	// Filter out Classic resolutiosn
456	>	// Filter out Classic resolutions
457		if (width == 512 && height == 384)
458		return false;
459	+	#endif
460
461	<	// "screen" prefs items always succeeds
462	<	if (PrefsFindString("screen"))
463	<	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	<	}
461	>	// Filter out out-of-bounds resolutions
462	>	if (width > sdl_display_width() || height > sdl_display_height())
463	>	return false;
464
465	<	int apple_mask;
466	<	switch (find_apple_resolution(width, height)) {
467	<	case APPLE_640x480:             apple_mask = 0x01; break;
468	<	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;
465	>	// Rely on SDL capabilities
466	>	return SDL_VideoModeOK(width, height,
467	>	sdl_depth_of_video_depth(depth),
468	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
469		}
470
471		// Add mode to list of supported modes
472		static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
473		{
474		// Filter out unsupported modes
475	<	if (!has_mode(type, width, height))
475	>	if (!has_mode(type, width, height, depth))
476		return;
477
478		// Fill in VideoMode entry
479		VIDEO_MODE mode;
480		#ifdef SHEEPSHAVER
481	<	// Recalculate dimensions to fit Apple modes
520	<	resolution_id = match_apple_resolution(width, height);
481	>	resolution_id = find_apple_resolution(width, height);
482		mode.viType = type;
483		#endif
484		VIDEO_MODE_X = width;
#	Line 528 | Line 489 | static void add_mode(int type, int width
489		VideoModes.push_back(mode);
490		}
491
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	–
492		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
493		static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
494		{
#	Line 584 | Line 532 | static SDL_GrabMode set_grab_mode(SDL_Gr
532		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
533		}
534
535	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
536	+	static void migrate_screen_prefs(void)
537	+	{
538	+	#ifdef SHEEPSHAVER
539	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
540	+	if (PrefsFindString("screen"))
541	+	return;
542	+
543	+	uint32 window_modes = PrefsFindInt32("windowmodes");
544	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
545	+	int width = 0, height = 0;
546	+	if (screen_modes) {
547	+	static const struct {
548	+	int id;
549	+	int width;
550	+	int height;
551	+	}
552	+	modes[] = {
553	+	{  1,    640,    480 },
554	+	{  2,    800,    600 },
555	+	{  4,   1024,    768 },
556	+	{ 64,   1152,    768 },
557	+	{  8,   1152,    900 },
558	+	{ 16,   1280,   1024 },
559	+	{ 32,   1600,   1200 },
560	+	{ 0, }
561	+	};
562	+	for (int i = 0; modes[i].id != 0; i++) {
563	+	if (screen_modes & modes[i].id) {
564	+	if (width < modes[i].width && height < modes[i].height) {
565	+	width = modes[i].width;
566	+	height = modes[i].height;
567	+	}
568	+	}
569	+	}
570	+	} else {
571	+	if (window_modes & 1)
572	+	width = 640, height = 480;
573	+	if (window_modes & 2)
574	+	width = 800, height = 600;
575	+	}
576	+	if (width && height) {
577	+	char str[32];
578	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
579	+	PrefsReplaceString("screen", str);
580	+	}
581	+	#endif
582	+	}
583	+
584
585		/*
586		*  Display "driver" classes
#	Line 1123 | Line 1120 | bool VideoInit(bool classic)
1120		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1121
1122		// Get screen mode from preferences
1123	+	migrate_screen_prefs();
1124		const char *mode_str = NULL;
1125		if (classic_mode)
1126		mode_str = "win/512/342";
#	Line 1146 | Line 1144 | bool VideoInit(bool classic)
1144		else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1145		display_type = DISPLAY_SCREEN;
1146		}
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	–	}
1147		if (default_width <= 0)
1148	<	default_width = max_width;
1148	>	default_width = sdl_display_width();
1149	>	else if (default_width > sdl_display_width())
1150	>	default_width = sdl_display_width();
1151		if (default_height <= 0)
1152	<	default_height = max_height;
1152	>	default_height = sdl_display_height();
1153	>	else if (default_height > sdl_display_height())
1154	>	default_height = sdl_display_height();
1155
1156		// Mac screen depth follows X depth
1157		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 1187 | Line 1171 | bool VideoInit(bool classic)
1171		break;
1172		}
1173
1174	+	// Initialize list of video modes to try
1175	+	struct {
1176	+	int w;
1177	+	int h;
1178	+	int resolution_id;
1179	+	}
1180	+	video_modes[] = {
1181	+	{   -1,   -1, 0x80 },
1182	+	{  512,  384, 0x80 },
1183	+	{  640,  480, 0x81 },
1184	+	{  800,  600, 0x82 },
1185	+	{ 1024,  768, 0x83 },
1186	+	{ 1152,  870, 0x84 },
1187	+	{ 1280, 1024, 0x85 },
1188	+	{ 1600, 1200, 0x86 },
1189	+	{ 0, }
1190	+	};
1191	+	video_modes[0].w = default_width;
1192	+	video_modes[0].h = default_height;
1193	+
1194		// Construct list of supported modes
1195		if (display_type == DISPLAY_WINDOW) {
1196		if (classic)
1197		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1198		else {
1199	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1200	<	int bpp = sdl_depth_of_video_depth(d);
1201	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1202	<	add_window_modes(video_depth(d));
1199	>	for (int i = 0; video_modes[i].w != 0; i++) {
1200	>	const int w = video_modes[i].w;
1201	>	const int h = video_modes[i].h;
1202	>	if (i > 0 && (w >= default_width || h >= default_height))
1203	>	continue;
1204	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1205	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1206		}
1207		}
1208		} 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	–
1209		for (int i = 0; video_modes[i].w != 0; i++) {
1210		const int w = video_modes[i].w;
1211		const int h = video_modes[i].h;
1212		if (i > 0 && (w >= default_width || h >= default_height))
1213		continue;
1214	+	if (w == 512 && h == 384)
1215	+	continue;
1216		#ifdef ENABLE_VOSF
1217	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1218	<	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	<	}
1217	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1218	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1219		#else
1220		add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1221		#endif
#	Line 2000 | Line 1988 | static void update_display_static(driver
1988		}
1989		}
1990
1991	+	// Static display update (fixed frame rate, bounding boxes based)
1992	+	// XXX use NQD bounding boxes to help detect dirty areas?
1993	+	static void update_display_static_bbox(driver_window *drv)
1994	+	{
1995	+	const VIDEO_MODE &mode = drv->mode;
1996	+
1997	+	// Allocate bounding boxes for SDL_UpdateRects()
1998	+	const int N_PIXELS = 64;
1999	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2000	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2001	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2002	+	int nr_boxes = 0;
2003	+
2004	+	// Lock surface, if required
2005	+	if (SDL_MUSTLOCK(drv->s))
2006	+	SDL_LockSurface(drv->s);
2007	+
2008	+	// Update the surface from Mac screen
2009	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2010	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2011	+	int x, y;
2012	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2013	+	int h = N_PIXELS;
2014	+	if (h > VIDEO_MODE_Y - y)
2015	+	h = VIDEO_MODE_Y - y;
2016	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2017	+	int w = N_PIXELS;
2018	+	if (w > VIDEO_MODE_X - x)
2019	+	w = VIDEO_MODE_X - x;
2020	+	const int xs = w * bytes_per_pixel;
2021	+	const int xb = x * bytes_per_pixel;
2022	+	bool dirty = false;
2023	+	for (int j = y; j < (y + h); j++) {
2024	+	const int yb = j * bytes_per_row;
2025	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2026	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2027	+	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2028	+	dirty = true;
2029	+	}
2030	+	}
2031	+	if (dirty) {
2032	+	boxes[nr_boxes].x = x;
2033	+	boxes[nr_boxes].y = y;
2034	+	boxes[nr_boxes].w = w;
2035	+	boxes[nr_boxes].h = h;
2036	+	nr_boxes++;
2037	+	}
2038	+	}
2039	+	}
2040	+
2041	+	// Unlock surface, if required
2042	+	if (SDL_MUSTLOCK(drv->s))
2043	+	SDL_UnlockSurface(drv->s);
2044	+
2045	+	// Refresh display
2046	+	if (nr_boxes)
2047	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2048	+	}
2049	+
2050
2051		// We suggest the compiler to inline the next two functions so that it
2052		// may specialise the code according to the current screen depth and
#	Line 2094 | Line 2141 | static void video_refresh_window_static(
2141		static int tick_counter = 0;
2142		if (++tick_counter >= frame_skip) {
2143		tick_counter = 0;
2144	<	update_display_static(static_cast<driver_window *>(drv));
2144	>	const VIDEO_MODE &mode = drv->mode;
2145	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2146	>	update_display_static_bbox(static_cast<driver_window *>(drv));
2147	>	else
2148	>	update_display_static(static_cast<driver_window *>(drv));
2149		}
2150		}
2151
#	Line 2199 | Line 2250 | static int redraw_func(void *arg)
2250		return 0;
2251		}
2252		#endif
2253	+
2254	+
2255	+	/*
2256	+	*  Record dirty area from NQD
2257	+	*/
2258	+
2259	+	#ifdef SHEEPSHAVER
2260	+	void video_set_dirty_area(int x, int y, int w, int h)
2261	+	{
2262	+	const VIDEO_MODE &mode = drv->mode;
2263	+	const int screen_width = VIDEO_MODE_X;
2264	+	const int screen_height = VIDEO_MODE_Y;
2265	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2266	+
2267	+	#ifdef ENABLE_VOSF
2268	+	if (use_vosf) {
2269	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2270	+	return;
2271	+	}
2272	+	#endif
2273	+
2274	+	// XXX handle dirty bounding boxes for non-VOSF modes
2275	+	}
2276	+	#endif

Diff Legend

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