[ViewVC] Diff of: cebix/BasiliskII/src/SDL/video

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.16 by gbeauche, 2005-03-17T00:19:39Z vs.
Revision 1.28 by gbeauche, 2006-05-14T13:49:53Z

#	Line 21 \| Line 21
21		/*
22		* NOTES:
23		* The Ctrl key works like a qualifier for special actions:
24	<	* Ctrl-Tab = suspend DGA mode
24	>	* Ctrl-Tab = suspend DGA mode (TODO)
25		* Ctrl-Esc = emergency quit
26		* Ctrl-F1 = mount floppy
27		* Ctrl-F5 = grab mouse (in windowed mode)
28		*
29		* FIXMEs and TODOs:
30	+	* - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux
31		* - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?)
32		* - Mouse acceleration, there is no API in SDL yet for that
33		* - Force relative mode in Grab mode even if SDL provides absolute coordinates?
#	Line 37 \| Line 38
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()?
40		* - Backport hw cursor acceleration to Basilisk II?
41	+	* - Factor out code
42		*/
43
44		#include "sysdeps.h"
#	Line 47 \| 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 99 \| Line 105 \| *static uint8 the_buffer_copy = NULL;**
105		static uint32 the_buffer_size; // Size of allocated the_buffer
106
107		static bool redraw_thread_active = false; // Flag: Redraw thread installed
108	+	#ifndef USE_CPU_EMUL_SERVICES
109		static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
110		static SDL_Thread *redraw_thread = NULL; // Redraw thread
111	+	#ifdef SHEEPSHAVER
112		static volatile bool thread_stop_req = false;
113		static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req
114	+	#endif
115	+	#endif
116
117		#ifdef ENABLE_VOSF
118		static bool use_vosf = false; // Flag: VOSF enabled
#	Line 129 \| Line 139 \| static SDL_Color sdl_palette[256]; /
139		static bool sdl_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
140		static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK \| SDL_MOUSEBUTTONUPMASK \| SDL_MOUSEMOTIONMASK \| SDL_KEYUPMASK \| SDL_KEYDOWNMASK \| SDL_VIDEOEXPOSEMASK \| SDL_QUITMASK;
141
142	+	// Mutex to protect SDL events
143	+	static SDL_mutex *sdl_events_lock = NULL;
144	+	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
145	+	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
146	+
147		// Mutex to protect palette
148		static SDL_mutex *sdl_palette_lock = NULL;
149		#define LOCK_PALETTE SDL_LockMutex(sdl_palette_lock)
#	Line 152 \| Line 167 \| extern void SysMountFirstFloppy(void);
167
168
169		/*
170	+	* SDL surface locking glue
171	+	*/
172	+
173	+	#ifdef ENABLE_VOSF
174	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do { \
175	+	if ((SURFACE)->flags & (SDL_HWSURFACE \| SDL_FULLSCREEN)) \
176	+	the_host_buffer = (uint8 *)(SURFACE)->pixels; \
177	+	} while (0)
178	+	#else
179	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
180	+	#endif
181	+
182	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do { \
183	+	if (SDL_MUSTLOCK(SURFACE)) { \
184	+	SDL_LockSurface(SURFACE); \
185	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE); \
186	+	} \
187	+	} while (0)
188	+
189	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do { \
190	+	if (SDL_MUSTLOCK(SURFACE)) \
191	+	SDL_UnlockSurface(SURFACE); \
192	+	} while (0)
193	+
194	+
195	+	/*
196		* Framebuffer allocation routines
197		*/
198
199		static void *vm_acquire_framebuffer(uint32 size)
200		{
160	–	#ifdef SHEEPSHAVER
161	–	#ifdef DIRECT_ADDRESSING_HACK
162	–	const uint32 FRAME_BUFFER_BASE = 0x61000000;
163	–	uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE);
164	–	if (vm_acquire_fixed(fb, size) < 0)
165	–	fb = VM_MAP_FAILED;
166	–	return fb;
167	–	#endif
168	–	#endif
201		return vm_acquire(size);
202		}
203
#	Line 176 \| Line 208 \| static inline void vm_release_framebuffe
208
209
210		/*
211	+	* Windows message handler
212	+	*/
213	+
214	+	#ifdef WIN32
215	+	#include <dbt.h>
216	+	static WNDPROC sdl_window_proc = NULL; // Window proc used by SDL
217	+
218	+	extern void SysMediaArrived(void);
219	+	extern void SysMediaRemoved(void);
220	+	extern HWND GetMainWindowHandle(void);
221	+
222	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
223	+	{
224	+	switch (msg) {
225	+	case WM_DEVICECHANGE:
226	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
227	+	DEV_BROADCAST_HDR p = (DEV_BROADCAST_HDR )lParam;
228	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
229	+	SysMediaRemoved();
230	+	}
231	+	else if (wParam == DBT_DEVICEARRIVAL) {
232	+	DEV_BROADCAST_HDR p = (DEV_BROADCAST_HDR )lParam;
233	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
234	+	SysMediaArrived();
235	+	}
236	+	return 0;
237	+
238	+	default:
239	+	if (sdl_window_proc)
240	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
241	+	}
242	+
243	+	return DefWindowProc(hwnd, msg, wParam, lParam);
244	+	}
245	+	#endif
246	+
247	+
248	+	/*
249		* SheepShaver glue
250		*/
251
#	Line 220 \| 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;
238	<	else
239	<	apple_id = APPLE_1600x1200;
240	<	return apple_id;
241	<	}
242	<
243	<	// Set parameters to specified Apple mode
244	<	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
245	<	{
246	<	switch (apple_id) {
247	<	case APPLE_640x480:
248	<	xsize = 640;
249	<	ysize = 480;
250	<	break;
251	<	case APPLE_800x600:
252	<	xsize = 800;
253	<	ysize = 600;
254	<	break;
255	<	case APPLE_1024x768:
256	<	xsize = 1024;
257	<	ysize = 768;
258	<	break;
259	<	case APPLE_1152x768:
260	<	xsize = 1152;
261	<	ysize = 768;
262	<	break;
263	<	case APPLE_1152x900:
264	<	xsize = 1152;
265	<	ysize = 900;
266	<	break;
267	<	case APPLE_1280x1024:
268	<	xsize = 1280;
269	<	ysize = 1024;
270	<	break;
271	<	case APPLE_1600x1200:
272	<	xsize = 1600;
273	<	ysize = 1200;
274	<	break;
275	<	default:
276	<	abort();
277	<	}
278	<	}
279	<
280	<	// Match Apple mode matching best specified dimensions
281	<	static int match_apple_resolution(int &xsize, int &ysize)
282	<	{
283	<	int apple_id = find_apple_resolution(xsize, ysize);
284	<	set_apple_resolution(apple_id, xsize, ysize);
285	<	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 389 \| 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	<	// Check wether specified mode is available
415	<	static bool has_mode(int type, int width, int height)
414	>	// Get screen dimensions
415	>	static void sdl_display_dimensions(int &width, int &height)
416		{
417	<	// FIXME: no fullscreen support yet
418	<	if (type == DISPLAY_SCREEN)
419	<	return false;
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, 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;
403	–
404	–	// Read window modes prefs
405	–	static uint32 window_modes = 0;
406	–	static uint32 screen_modes = 0;
407	–	if (window_modes == 0 \|\| screen_modes == 0) {
408	–	window_modes = PrefsFindInt32("windowmodes");
409	–	screen_modes = PrefsFindInt32("screenmodes");
410	–	if (window_modes == 0 \|\| screen_modes == 0)
411	–	window_modes \|= 3; // Allow at least 640x480 and 800x600 window modes
412	–	}
413	–
414	–	if (type == DISPLAY_WINDOW) {
415	–	int apple_mask, apple_id = find_apple_resolution(width, height);
416	–	switch (apple_id) {
417	–	case APPLE_640x480: apple_mask = 0x01; break;
418	–	case APPLE_800x600: apple_mask = 0x02; break;
419	–	case APPLE_1024x768: apple_mask = 0x04; break;
420	–	case APPLE_1152x768: apple_mask = 0x40; break;
421	–	case APPLE_1152x900: apple_mask = 0x08; break;
422	–	case APPLE_1280x1024: apple_mask = 0x10; break;
423	–	case APPLE_1600x1200: apple_mask = 0x20; break;
424	–	default: apple_mask = 0x00; break;
425	–	}
426	–	return (window_modes & apple_mask);
427	–	}
428	–	#else
429	–	return true;
459		#endif
460	<	return false;
460	>
461	>	// Filter out out-of-bounds resolutions
462	>	if (width > sdl_display_width() \|\| height > sdl_display_height())
463	>	return false;
464	>
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
445	<	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 453 \| Line 489 \| static void add_mode(int type, int width
489		VideoModes.push_back(mode);
490		}
491
456	–	// Add standard list of windowed modes for given color depth
457	–	static void add_window_modes(int depth)
458	–	{
459	–	video_depth vdepth = (video_depth)depth;
460	–	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
461	–	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
462	–	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
463	–	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
464	–	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
465	–	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
466	–	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
467	–	}
468	–
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 505 \| Line 528 \| static void set_window_name(int name)
528		// Set mouse grab mode
529		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
530		{
531	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
531	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
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 564 \| Line 636 \| private:
636		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
637		};
638
639	+	class driver_fullscreen : public driver_base {
640	+	public:
641	+	driver_fullscreen(SDL_monitor_desc &monitor);
642	+	~driver_fullscreen();
643	+	};
644	+
645		static driver_base *drv = NULL; // Pointer to currently used driver object
646
647		#ifdef ENABLE_VOSF
#	Line 779 \| Line 857 \| void driver_window::mouse_moved(int x, i
857		ADBMouseMoved(x, y);
858		}
859
860	+
861	+	/*
862	+	* Full-screen display driver
863	+	*/
864	+
865	+	// Open display
866	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
867	+	: driver_base(m)
868	+	{
869	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
870	+	int aligned_width = (width + 15) & ~15;
871	+	int aligned_height = (height + 15) & ~15;
872	+
873	+	// Set absolute mouse mode
874	+	ADBSetRelMouseMode(false);
875	+
876	+	// Create surface
877	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
878	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE \| SDL_FULLSCREEN)) == NULL)
879	+	return;
880	+
881	+	#ifdef ENABLE_VOSF
882	+	use_vosf = true;
883	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
884	+	the_host_buffer = (uint8 *)s->pixels;
885	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
886	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
887	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
888	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
889	+
890	+	// Check whether we can initialize the VOSF subsystem and it's profitable
891	+	if (!video_vosf_init(m)) {
892	+	WarningAlert(STR_VOSF_INIT_ERR);
893	+	use_vosf = false;
894	+	}
895	+	else if (!video_vosf_profitable()) {
896	+	video_vosf_exit();
897	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
898	+	use_vosf = false;
899	+	}
900	+	if (!use_vosf) {
901	+	free(the_buffer_copy);
902	+	vm_release(the_buffer, the_buffer_size);
903	+	the_host_buffer = NULL;
904	+	}
905	+	#endif
906	+	if (!use_vosf) {
907	+	// Allocate memory for frame buffer
908	+	the_buffer_size = (aligned_height + 2) * s->pitch;
909	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
910	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
911	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
912	+	}
913	+
914	+	// Hide cursor
915	+	SDL_ShowCursor(0);
916	+
917	+	// Init blitting routines
918	+	SDL_PixelFormat *f = s->format;
919	+	VisualFormat visualFormat;
920	+	visualFormat.depth = depth;
921	+	visualFormat.Rmask = f->Rmask;
922	+	visualFormat.Gmask = f->Gmask;
923	+	visualFormat.Bmask = f->Bmask;
924	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
925	+
926	+	// Load gray ramp to 8->16/32 expand map
927	+	if (!IsDirectMode(mode))
928	+	for (int i=0; i<256; i++)
929	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
930	+
931	+	// Set frame buffer base
932	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
933	+
934	+	// Everything went well
935	+	init_ok = true;
936	+	}
937	+
938	+	// Close display
939	+	driver_fullscreen::~driver_fullscreen()
940	+	{
941	+	#ifdef ENABLE_VOSF
942	+	if (use_vosf)
943	+	the_host_buffer = NULL; // don't free() in driver_base dtor
944	+	#endif
945	+	if (s)
946	+	SDL_FreeSurface(s);
947	+
948	+	// Show cursor
949	+	SDL_ShowCursor(1);
950	+	}
951	+
952	+
953		/*
954		* Initialization
955		*/
#	Line 877 \| Line 1048 \| bool SDL_monitor_desc::video_open(void)
1048		case DISPLAY_WINDOW:
1049		drv = new(std::nothrow) driver_window(*this);
1050		break;
1051	+	case DISPLAY_SCREEN:
1052	+	drv = new(std::nothrow) driver_fullscreen(*this);
1053	+	break;
1054		}
1055		if (drv == NULL)
1056		return false;
#	Line 886 \| Line 1060 \| bool SDL_monitor_desc::video_open(void)
1060		return false;
1061		}
1062
1063	+	#ifdef WIN32
1064	+	// Chain in a new message handler for WM_DEVICECHANGE
1065	+	HWND the_window = GetMainWindowHandle();
1066	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1067	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1068	+	#endif
1069	+
1070		// Initialize VideoRefresh function
1071		VideoRefreshInit();
1072
#	Line 893 \| Line 1074 \| bool SDL_monitor_desc::video_open(void)
1074		LOCK_FRAME_BUFFER;
1075
1076		// Start redraw/input thread
1077	+	#ifndef USE_CPU_EMUL_SERVICES
1078		redraw_thread_cancel = false;
1079		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1080		if (!redraw_thread_active) {
1081		printf("FATAL: cannot create redraw thread\n");
1082		return false;
1083		}
1084	+	#else
1085	+	redraw_thread_active = true;
1086	+	#endif
1087		return true;
1088		}
1089
#	Line 919 \| Line 1104 \| bool VideoInit(bool classic)
1104		#endif
1105
1106		// Create Mutexes
1107	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1108	+	return false;
1109		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1110		return false;
1111		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 933 \| 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;
937	–	#ifndef SHEEPSHAVER
1125		if (classic_mode)
1126		mode_str = "win/512/342";
1127		else
1128		mode_str = PrefsFindString("screen");
942	–	#endif
1129
1130		// Determine display type and default dimensions
1131		int default_width, default_height;
#	Line 955 \| Line 1141 \| bool VideoInit(bool classic)
1141		if (mode_str) {
1142		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1143		display_type = DISPLAY_WINDOW;
1144	<	}
1145	<	int max_width = 640, max_height = 480;
960	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN \| SDL_HWSURFACE);
961	<	if (modes && modes != (SDL_Rect **)-1) {
962	<	max_width = modes[0]->w;
963	<	max_height = modes[0]->h;
964	<	if (default_width > max_width)
965	<	default_width = max_width;
966	<	if (default_height > max_height)
967	<	default_height = max_height;
1144	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1145	>	display_type = DISPLAY_SCREEN;
1146		}
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 989 \| 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
1209	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1208	>	} else if (display_type == DISPLAY_SCREEN) {
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	>	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
1222	>	}
1223	>	}
1224	>
1225		if (VideoModes.empty()) {
1226		ErrorAlert(STR_NO_XVISUAL_ERR);
1227		return false;
#	Line 1072 \| Line 1292 \| void SDL_monitor_desc::video_close(void)
1292		{
1293		D(bug("video_close()\n"));
1294
1295	+	#ifdef WIN32
1296	+	// Remove message handler for WM_DEVICECHANGE
1297	+	HWND the_window = GetMainWindowHandle();
1298	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1299	+	#endif
1300	+
1301		// Stop redraw thread
1302	+	#ifndef USE_CPU_EMUL_SERVICES
1303		if (redraw_thread_active) {
1304		redraw_thread_cancel = true;
1305		SDL_WaitThread(redraw_thread, NULL);
1306		}
1307	+	#endif
1308		redraw_thread_active = false;
1309
1310		// Unlock frame buffer
#	Line 1100 \| Line 1328 \| void VideoExit(void)
1328		SDL_DestroyMutex(frame_buffer_lock);
1329		if (sdl_palette_lock)
1330		SDL_DestroyMutex(sdl_palette_lock);
1331	+	if (sdl_events_lock)
1332	+	SDL_DestroyMutex(sdl_events_lock);
1333		}
1334
1335
#	Line 1269 \| Line 1499 \| *int16 video_mode_change(VidLocals csSav**
1499		void SDL_monitor_desc::switch_to_current_mode(void)
1500		{
1501		// Close and reopen display
1502	+	LOCK_EVENTS;
1503		video_close();
1504		video_open();
1505	+	UNLOCK_EVENTS;
1506
1507		if (drv == NULL) {
1508		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1373 \| Line 1605 \| static int kc_decode(SDL_keysym const &
1605
1606		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1607		case SDLK_2: case SDLK_AT: return 0x13;
1608	<	// case SDLK_3: case SDLK_numbersign: return 0x14;
1608	>	case SDLK_3: case SDLK_HASH: return 0x14;
1609		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1610	<	// case SDLK_5: case SDLK_percent: return 0x17;
1610	>	case SDLK_5: return 0x17;
1611		case SDLK_6: return 0x16;
1612		case SDLK_7: return 0x1a;
1613		case SDLK_8: return 0x1c;
1614		case SDLK_9: return 0x19;
1615		case SDLK_0: return 0x1d;
1616
1617	<	// case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1617	>	case SDLK_BACKQUOTE: return 0x0a;
1618		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1619		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1620	<	// case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1621	<	// case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1622	<	// case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1620	>	case SDLK_LEFTBRACKET: return 0x21;
1621	>	case SDLK_RIGHTBRACKET: return 0x1e;
1622	>	case SDLK_BACKSLASH: return 0x2a;
1623		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1624	<	// case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1624	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1625		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1626		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1627		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1421 \| Line 1653 \| static int kc_decode(SDL_keysym const &
1653		case SDLK_LMETA: return 0x3a;
1654		case SDLK_RMETA: return 0x3a;
1655		#endif
1656	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1657	+	case SDLK_RSUPER: return 0x3a;
1658		case SDLK_MENU: return 0x32;
1659		case SDLK_CAPSLOCK: return 0x39;
1660		case SDLK_NUMLOCK: return 0x47;
#	Line 1754 \| 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 1814 \| Line 2107 \| static void video_refresh_dga_vosf(void)
2107		tick_counter = 0;
2108		if (mainBuffer.dirty) {
2109		LOCK_VOSF;
2110	<	update_display_dga_vosf();
2110	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2111		UNLOCK_VOSF;
2112		}
2113		}
#	Line 1848 \| 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 1878 \| Line 2175 \| static void VideoRefreshInit(void)
2175		}
2176		}
2177
2178	+	static inline void do_video_refresh(void)
2179	+	{
2180	+	// Handle SDL events
2181	+	handle_events();
2182	+
2183	+	// Update display
2184	+	video_refresh();
2185	+
2186	+	#ifdef SHEEPSHAVER
2187	+	// Set new cursor image if it was changed
2188	+	if (cursor_changed && sdl_cursor) {
2189	+	cursor_changed = false;
2190	+	LOCK_EVENTS;
2191	+	SDL_FreeCursor(sdl_cursor);
2192	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2193	+	if (sdl_cursor)
2194	+	SDL_SetCursor(sdl_cursor);
2195	+	UNLOCK_EVENTS;
2196	+	}
2197	+	#endif
2198	+
2199	+	// Set new palette if it was changed
2200	+	handle_palette_changes();
2201	+	}
2202	+
2203	+	// This function is called on non-threaded platforms from a timer interrupt
2204	+	void VideoRefresh(void)
2205	+	{
2206	+	// We need to check redraw_thread_active to inhibit refreshed during
2207	+	// mode changes on non-threaded platforms
2208	+	if (!redraw_thread_active)
2209	+	return;
2210	+
2211	+	// Process pending events and update display
2212	+	do_video_refresh();
2213	+	}
2214	+
2215		const int VIDEO_REFRESH_HZ = 60;
2216		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2217
2218	+	#ifndef USE_CPU_EMUL_SERVICES
2219		static int redraw_func(void *arg)
2220		{
2221		uint64 start = GetTicks_usec();
#	Line 1906 \| Line 2241 \| *static int redraw_func(void arg)**
2241		}
2242		#endif
2243
2244	<	// Handle SDL events
2245	<	handle_events();
2244	>	// Process pending events and update display
2245	>	do_video_refresh();
2246	>	}
2247
2248	<	// Refresh display
2249	<	video_refresh();
2248	>	uint64 end = GetTicks_usec();
2249	>	D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2250	>	return 0;
2251	>	}
2252	>	#endif
2253	>
2254	>
2255	>	/*
2256	>	* Record dirty area from NQD
2257	>	*/
2258
2259		#ifdef SHEEPSHAVER
2260	<	// Set new cursor image if it was changed
2261	<	if (cursor_changed && sdl_cursor) {
2262	<	cursor_changed = false;
2263	<	SDL_FreeCursor(sdl_cursor);
2264	<	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2265	<	if (sdl_cursor)
1922	<	SDL_SetCursor(sdl_cursor);
1923	<	}
1924	<	#endif
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	<	// Set new palette if it was changed
2268	<	handle_palette_changes();
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	<	uint64 end = GetTicks_usec();
1931	<	D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1932	<	return 0;
2274	>	// XXX handle dirty bounding boxes for non-VOSF modes
2275		}
2276	+	#endif

Diff Legend

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

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents): Revision 1.16 by gbeauche, 2005-03-17T00:19:39Z vs. Revision 1.28 by gbeauche, 2006-05-14T13:49:53Z

Diff Legend

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.16 by gbeauche, 2005-03-17T00:19:39Z vs.
Revision 1.28 by gbeauche, 2006-05-14T13:49:53Z