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.16 by gbeauche, 2005-03-17T00:19:39Z vs.
Revision 1.31 by asvitkine, 2007-01-22T00:32:25Z

#	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	+	*  - 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?
33	–	*  - 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.
38	–	*  - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
39		*  - Backport hw cursor acceleration to Basilisk II?
40	+	*  - Factor out code
41		*/
42
43		#include "sysdeps.h"
#	Line 47 | 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 99 | Line 104 | static uint8 *the_buffer_copy = NULL;
104		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
105
106		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
107	+	#ifndef USE_CPU_EMUL_SERVICES
108		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
109		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
110	+	#ifdef SHEEPSHAVER
111		static volatile bool thread_stop_req = false;
112		static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
113	+	#endif
114	+	#endif
115
116		#ifdef ENABLE_VOSF
117		static bool use_vosf = false;                                           // Flag: VOSF enabled
#	Line 129 | Line 138 | static SDL_Color sdl_palette[256];                                     /
138		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
139		static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
140
141	+	// Mutex to protect SDL events
142	+	static SDL_mutex *sdl_events_lock = NULL;
143	+	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
144	+	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
145	+
146		// Mutex to protect palette
147		static SDL_mutex *sdl_palette_lock = NULL;
148		#define LOCK_PALETTE SDL_LockMutex(sdl_palette_lock)
#	Line 152 | Line 166 | extern void SysMountFirstFloppy(void);
166
167
168		/*
169	+	*  SDL surface locking glue
170	+	*/
171	+
172	+	#ifdef ENABLE_VOSF
173	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
174	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
175	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
176	+	} while (0)
177	+	#else
178	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
179	+	#endif
180	+
181	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
182	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
183	+	SDL_LockSurface(SURFACE);                               \
184	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
185	+	}                                                                                       \
186	+	} while (0)
187	+
188	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
189	+	if (SDL_MUSTLOCK(SURFACE))                                      \
190	+	SDL_UnlockSurface(SURFACE);                             \
191	+	} while (0)
192	+
193	+
194	+	/*
195		*  Framebuffer allocation routines
196		*/
197
198		static void *vm_acquire_framebuffer(uint32 size)
199		{
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
200		return vm_acquire(size);
201		}
202
#	Line 176 | 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 220 | 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;
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;
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 389 | 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	<	// Check wether specified mode is available
414	<	static bool has_mode(int type, int width, int height)
413	>	// Get screen dimensions
414	>	static void sdl_display_dimensions(int &width, int &height)
415		{
416	<	// FIXME: no fullscreen support yet
417	<	if (type == DISPLAY_SCREEN)
418	<	return false;
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, 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;
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;
458		#endif
459	<	return false;
459	>
460	>	// Filter out out-of-bounds resolutions
461	>	if (width > sdl_display_width() || height > sdl_display_height())
462	>	return false;
463	>
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
445	<	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 453 | Line 488 | static void add_mode(int type, int width
488		VideoModes.push_back(mode);
489		}
490
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	–
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 505 | Line 527 | static void set_window_name(int name)
527		// Set mouse grab mode
528		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
529		{
530	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
530	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
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 564 | Line 635 | private:
635		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
636		};
637
638	+	class driver_fullscreen : public driver_base {
639	+	public:
640	+	driver_fullscreen(SDL_monitor_desc &monitor);
641	+	~driver_fullscreen();
642	+	};
643	+
644		static driver_base *drv = NULL; // Pointer to currently used driver object
645
646		#ifdef ENABLE_VOSF
#	Line 642 | 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 653 | 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 779 | Line 871 | void driver_window::mouse_moved(int x, i
871		ADBMouseMoved(x, y);
872		}
873
874	+
875	+	/*
876	+	*  Full-screen display driver
877	+	*/
878	+
879	+	// Open display
880	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
881	+	: driver_base(m)
882	+	{
883	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
884	+	int aligned_width = (width + 15) & ~15;
885	+	int aligned_height = (height + 15) & ~15;
886	+
887	+	// Set absolute mouse mode
888	+	ADBSetRelMouseMode(false);
889	+
890	+	// Create surface
891	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
892	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
893	+	return;
894	+
895	+	#ifdef ENABLE_VOSF
896	+	use_vosf = true;
897	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
898	+	the_host_buffer = (uint8 *)s->pixels;
899	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
900	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
901	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
902	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
903	+
904	+	// Check whether we can initialize the VOSF subsystem and it's profitable
905	+	if (!video_vosf_init(m)) {
906	+	WarningAlert(STR_VOSF_INIT_ERR);
907	+	use_vosf = false;
908	+	}
909	+	else if (!video_vosf_profitable()) {
910	+	video_vosf_exit();
911	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
912	+	use_vosf = false;
913	+	}
914	+	if (!use_vosf) {
915	+	free(the_buffer_copy);
916	+	vm_release(the_buffer, the_buffer_size);
917	+	the_host_buffer = NULL;
918	+	}
919	+	#endif
920	+	if (!use_vosf) {
921	+	// Allocate memory for frame buffer
922	+	the_buffer_size = (aligned_height + 2) * s->pitch;
923	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
924	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
925	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
926	+	}
927	+
928	+	// Hide cursor
929	+	SDL_ShowCursor(0);
930	+
931	+	// Init blitting routines
932	+	SDL_PixelFormat *f = s->format;
933	+	VisualFormat visualFormat;
934	+	visualFormat.depth = depth;
935	+	visualFormat.Rmask = f->Rmask;
936	+	visualFormat.Gmask = f->Gmask;
937	+	visualFormat.Bmask = f->Bmask;
938	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
939	+
940	+	// Load gray ramp to 8->16/32 expand map
941	+	if (!IsDirectMode(mode))
942	+	for (int i=0; i<256; i++)
943	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
944	+
945	+	// Set frame buffer base
946	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
947	+
948	+	// Everything went well
949	+	init_ok = true;
950	+	}
951	+
952	+	// Close display
953	+	driver_fullscreen::~driver_fullscreen()
954	+	{
955	+	#ifdef ENABLE_VOSF
956	+	if (use_vosf)
957	+	the_host_buffer = NULL; // don't free() in driver_base dtor
958	+	#endif
959	+	if (s)
960	+	SDL_FreeSurface(s);
961	+
962	+	// Show cursor
963	+	SDL_ShowCursor(1);
964	+	}
965	+
966	+
967		/*
968		*  Initialization
969		*/
#	Line 877 | Line 1062 | bool SDL_monitor_desc::video_open(void)
1062		case DISPLAY_WINDOW:
1063		drv = new(std::nothrow) driver_window(*this);
1064		break;
1065	+	case DISPLAY_SCREEN:
1066	+	drv = new(std::nothrow) driver_fullscreen(*this);
1067	+	break;
1068		}
1069		if (drv == NULL)
1070		return false;
#	Line 886 | 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 893 | Line 1088 | bool SDL_monitor_desc::video_open(void)
1088		LOCK_FRAME_BUFFER;
1089
1090		// Start redraw/input thread
1091	+	#ifndef USE_CPU_EMUL_SERVICES
1092		redraw_thread_cancel = false;
1093		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1094		if (!redraw_thread_active) {
1095		printf("FATAL: cannot create redraw thread\n");
1096		return false;
1097		}
1098	+	#else
1099	+	redraw_thread_active = true;
1100	+	#endif
1101		return true;
1102		}
1103
#	Line 919 | Line 1118 | bool VideoInit(bool classic)
1118		#endif
1119
1120		// Create Mutexes
1121	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1122	+	return false;
1123		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1124		return false;
1125		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 933 | 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;
937	–	#ifndef SHEEPSHAVER
1139		if (classic_mode)
1140		mode_str = "win/512/342";
1141		else
1142		mode_str = PrefsFindString("screen");
942	–	#endif
1143
1144		// Determine display type and default dimensions
1145		int default_width, default_height;
#	Line 955 | Line 1155 | bool VideoInit(bool classic)
1155		if (mode_str) {
1156		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1157		display_type = DISPLAY_WINDOW;
1158	<	}
1159	<	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;
1158	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1159	>	display_type = DISPLAY_SCREEN;
1160		}
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 989 | 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
1223	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1222	>	} else if (display_type == DISPLAY_SCREEN) {
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	>	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
1236	>	}
1237	>	}
1238	>
1239		if (VideoModes.empty()) {
1240		ErrorAlert(STR_NO_XVISUAL_ERR);
1241		return false;
#	Line 1072 | 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) {
1318		redraw_thread_cancel = true;
1319		SDL_WaitThread(redraw_thread, NULL);
1320		}
1321	+	#endif
1322		redraw_thread_active = false;
1323
1324		// Unlock frame buffer
#	Line 1100 | Line 1342 | void VideoExit(void)
1342		SDL_DestroyMutex(frame_buffer_lock);
1343		if (sdl_palette_lock)
1344		SDL_DestroyMutex(sdl_palette_lock);
1345	+	if (sdl_events_lock)
1346	+	SDL_DestroyMutex(sdl_events_lock);
1347		}
1348
1349
#	Line 1269 | Line 1513 | int16 video_mode_change(VidLocals *csSav
1513		void SDL_monitor_desc::switch_to_current_mode(void)
1514		{
1515		// Close and reopen display
1516	+	LOCK_EVENTS;
1517		video_close();
1518		video_open();
1519	+	UNLOCK_EVENTS;
1520
1521		if (drv == NULL) {
1522		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1373 | Line 1619 | static int kc_decode(SDL_keysym const &
1619
1620		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1621		case SDLK_2: case SDLK_AT: return 0x13;
1622	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1622	>	case SDLK_3: case SDLK_HASH: return 0x14;
1623		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1624	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1624	>	case SDLK_5: return 0x17;
1625		case SDLK_6: return 0x16;
1626		case SDLK_7: return 0x1a;
1627		case SDLK_8: return 0x1c;
1628		case SDLK_9: return 0x19;
1629		case SDLK_0: return 0x1d;
1630
1631	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1631	>	case SDLK_BACKQUOTE: return 0x0a;
1632		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1633		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1634	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1635	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1636	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1634	>	case SDLK_LEFTBRACKET: return 0x21;
1635	>	case SDLK_RIGHTBRACKET: return 0x1e;
1636	>	case SDLK_BACKSLASH: return 0x2a;
1637		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1638	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1638	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1639		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1640		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1641		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1421 | Line 1667 | static int kc_decode(SDL_keysym const &
1667		case SDLK_LMETA: return 0x3a;
1668		case SDLK_RMETA: return 0x3a;
1669		#endif
1670	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1671	+	case SDLK_RSUPER: return 0x3a;
1672		case SDLK_MENU: return 0x32;
1673		case SDLK_CAPSLOCK: return 0x39;
1674		case SDLK_NUMLOCK: return 0x47;
#	Line 1754 | 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 1814 | Line 2121 | static void video_refresh_dga_vosf(void)
2121		tick_counter = 0;
2122		if (mainBuffer.dirty) {
2123		LOCK_VOSF;
2124	<	update_display_dga_vosf();
2124	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2125		UNLOCK_VOSF;
2126		}
2127		}
#	Line 1848 | 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 1878 | Line 2189 | static void VideoRefreshInit(void)
2189		}
2190		}
2191
2192	+	static inline void do_video_refresh(void)
2193	+	{
2194	+	// Handle SDL events
2195	+	handle_events();
2196	+
2197	+	// Update display
2198	+	video_refresh();
2199	+
2200	+	#ifdef SHEEPSHAVER
2201	+	// Set new cursor image if it was changed
2202	+	if (cursor_changed && sdl_cursor) {
2203	+	cursor_changed = false;
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) {
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
2223	+
2224	+	// Set new palette if it was changed
2225	+	handle_palette_changes();
2226	+	}
2227	+
2228	+	// This function is called on non-threaded platforms from a timer interrupt
2229	+	void VideoRefresh(void)
2230	+	{
2231	+	// We need to check redraw_thread_active to inhibit refreshed during
2232	+	// mode changes on non-threaded platforms
2233	+	if (!redraw_thread_active)
2234	+	return;
2235	+
2236	+	// Process pending events and update display
2237	+	do_video_refresh();
2238	+	}
2239	+
2240		const int VIDEO_REFRESH_HZ = 60;
2241		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2242
2243	+	#ifndef USE_CPU_EMUL_SERVICES
2244		static int redraw_func(void *arg)
2245		{
2246		uint64 start = GetTicks_usec();
#	Line 1906 | Line 2266 | static int redraw_func(void *arg)
2266		}
2267		#endif
2268
2269	<	// Handle SDL events
2270	<	handle_events();
2269	>	// Process pending events and update display
2270	>	do_video_refresh();
2271	>	}
2272	>
2273	>	uint64 end = GetTicks_usec();
2274	>	D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2275	>	return 0;
2276	>	}
2277	>	#endif
2278	>
2279
2280	<	// Refresh display
2281	<	video_refresh();
2280	>	/*
2281	>	*  Record dirty area from NQD
2282	>	*/
2283
2284		#ifdef SHEEPSHAVER
2285	<	// Set new cursor image if it was changed
2286	<	if (cursor_changed && sdl_cursor) {
2287	<	cursor_changed = false;
2288	<	SDL_FreeCursor(sdl_cursor);
2289	<	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2290	<	if (sdl_cursor)
1922	<	SDL_SetCursor(sdl_cursor);
1923	<	}
1924	<	#endif
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	<	// Set new palette if it was changed
2293	<	handle_palette_changes();
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	<	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;
2299	>	// XXX handle dirty bounding boxes for non-VOSF modes
2300		}
2301	+	#endif

Diff Legend

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