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.14 by gbeauche, 2005-01-22T17:41:33Z vs.
Revision 1.29 by gbeauche, 2006-05-14T14:11:46Z

#	Line 1 | Line 1
1		/*
2		*  video_sdl.cpp - Video/graphics emulation, SDL specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2004 Christian Bauer
4	>	*  Basilisk II (C) 1997-2005 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	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 82 | Line 87 | static int display_type = DISPLAY_WINDOW
87		#endif
88
89		// Constants
90	+	#ifdef WIN32
91	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
92	+	#else
93		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
94	+	#endif
95
96
97		// Global variables
#	Line 95 | 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 125 | 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 148 | 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		{
156	–	#ifdef SHEEPSHAVER
157	–	#ifdef DIRECT_ADDRESSING_HACK
158	–	const uint32 FRAME_BUFFER_BASE = 0x61000000;
159	–	uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE);
160	–	if (vm_acquire_fixed(fb, size) < 0)
161	–	fb = VM_MAP_FAILED;
162	–	return fb;
163	–	#endif
164	–	#endif
200		return vm_acquire(size);
201		}
202
#	Line 172 | 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 216 | 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;
234	<	else
235	<	apple_id = APPLE_1600x1200;
236	<	return apple_id;
237	<	}
238	<
239	<	// Set parameters to specified Apple mode
240	<	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
241	<	{
242	<	switch (apple_id) {
243	<	case APPLE_640x480:
244	<	xsize = 640;
245	<	ysize = 480;
246	<	break;
247	<	case APPLE_800x600:
248	<	xsize = 800;
249	<	ysize = 600;
250	<	break;
251	<	case APPLE_1024x768:
252	<	xsize = 1024;
253	<	ysize = 768;
254	<	break;
255	<	case APPLE_1152x768:
256	<	xsize = 1152;
257	<	ysize = 768;
258	<	break;
259	<	case APPLE_1152x900:
260	<	xsize = 1152;
261	<	ysize = 900;
262	<	break;
263	<	case APPLE_1280x1024:
264	<	xsize = 1280;
265	<	ysize = 1024;
266	<	break;
267	<	case APPLE_1600x1200:
268	<	xsize = 1600;
269	<	ysize = 1200;
270	<	break;
271	<	default:
272	<	abort();
273	<	}
274	<	}
275	<
276	<	// Match Apple mode matching best specified dimensions
277	<	static int match_apple_resolution(int &xsize, int &ysize)
278	<	{
279	<	int apple_id = find_apple_resolution(xsize, ysize);
280	<	set_apple_resolution(apple_id, xsize, ysize);
281	<	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 385 | 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;
399	–
400	–	// Read window modes prefs
401	–	static uint32 window_modes = 0;
402	–	static uint32 screen_modes = 0;
403	–	if (window_modes == 0 || screen_modes == 0) {
404	–	window_modes = PrefsFindInt32("windowmodes");
405	–	screen_modes = PrefsFindInt32("screenmodes");
406	–	if (window_modes == 0 || screen_modes == 0)
407	–	window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
408	–	}
409	–
410	–	if (type == DISPLAY_WINDOW) {
411	–	int apple_mask, apple_id = find_apple_resolution(width, height);
412	–	switch (apple_id) {
413	–	case APPLE_640x480:             apple_mask = 0x01; break;
414	–	case APPLE_800x600:             apple_mask = 0x02; break;
415	–	case APPLE_1024x768:    apple_mask = 0x04; break;
416	–	case APPLE_1152x768:    apple_mask = 0x40; break;
417	–	case APPLE_1152x900:    apple_mask = 0x08; break;
418	–	case APPLE_1280x1024:   apple_mask = 0x10; break;
419	–	case APPLE_1600x1200:   apple_mask = 0x20; break;
420	–	default:                                apple_mask = 0x00; break;
421	–	}
422	–	return (window_modes & apple_mask);
423	–	}
424	–	#else
425	–	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
441	<	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 449 | Line 488 | static void add_mode(int type, int width
488		VideoModes.push_back(mode);
489		}
490
452	–	// Add standard list of windowed modes for given color depth
453	–	static void add_window_modes(int depth)
454	–	{
455	–	video_depth vdepth = (video_depth)depth;
456	–	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
457	–	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
458	–	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
459	–	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
460	–	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
461	–	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
462	–	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
463	–	}
464	–
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 501 | 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 560 | 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 775 | Line 856 | void driver_window::mouse_moved(int x, i
856		ADBMouseMoved(x, y);
857		}
858
859	+
860	+	/*
861	+	*  Full-screen display driver
862	+	*/
863	+
864	+	// Open display
865	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
866	+	: driver_base(m)
867	+	{
868	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
869	+	int aligned_width = (width + 15) & ~15;
870	+	int aligned_height = (height + 15) & ~15;
871	+
872	+	// Set absolute mouse mode
873	+	ADBSetRelMouseMode(false);
874	+
875	+	// Create surface
876	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
877	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
878	+	return;
879	+
880	+	#ifdef ENABLE_VOSF
881	+	use_vosf = true;
882	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
883	+	the_host_buffer = (uint8 *)s->pixels;
884	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
885	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
886	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
887	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
888	+
889	+	// Check whether we can initialize the VOSF subsystem and it's profitable
890	+	if (!video_vosf_init(m)) {
891	+	WarningAlert(STR_VOSF_INIT_ERR);
892	+	use_vosf = false;
893	+	}
894	+	else if (!video_vosf_profitable()) {
895	+	video_vosf_exit();
896	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
897	+	use_vosf = false;
898	+	}
899	+	if (!use_vosf) {
900	+	free(the_buffer_copy);
901	+	vm_release(the_buffer, the_buffer_size);
902	+	the_host_buffer = NULL;
903	+	}
904	+	#endif
905	+	if (!use_vosf) {
906	+	// Allocate memory for frame buffer
907	+	the_buffer_size = (aligned_height + 2) * s->pitch;
908	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
909	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
910	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
911	+	}
912	+
913	+	// Hide cursor
914	+	SDL_ShowCursor(0);
915	+
916	+	// Init blitting routines
917	+	SDL_PixelFormat *f = s->format;
918	+	VisualFormat visualFormat;
919	+	visualFormat.depth = depth;
920	+	visualFormat.Rmask = f->Rmask;
921	+	visualFormat.Gmask = f->Gmask;
922	+	visualFormat.Bmask = f->Bmask;
923	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
924	+
925	+	// Load gray ramp to 8->16/32 expand map
926	+	if (!IsDirectMode(mode))
927	+	for (int i=0; i<256; i++)
928	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
929	+
930	+	// Set frame buffer base
931	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
932	+
933	+	// Everything went well
934	+	init_ok = true;
935	+	}
936	+
937	+	// Close display
938	+	driver_fullscreen::~driver_fullscreen()
939	+	{
940	+	#ifdef ENABLE_VOSF
941	+	if (use_vosf)
942	+	the_host_buffer = NULL; // don't free() in driver_base dtor
943	+	#endif
944	+	if (s)
945	+	SDL_FreeSurface(s);
946	+
947	+	// Show cursor
948	+	SDL_ShowCursor(1);
949	+	}
950	+
951	+
952		/*
953		*  Initialization
954		*/
#	Line 873 | Line 1047 | bool SDL_monitor_desc::video_open(void)
1047		case DISPLAY_WINDOW:
1048		drv = new(std::nothrow) driver_window(*this);
1049		break;
1050	+	case DISPLAY_SCREEN:
1051	+	drv = new(std::nothrow) driver_fullscreen(*this);
1052	+	break;
1053		}
1054		if (drv == NULL)
1055		return false;
#	Line 882 | Line 1059 | bool SDL_monitor_desc::video_open(void)
1059		return false;
1060		}
1061
1062	+	#ifdef WIN32
1063	+	// Chain in a new message handler for WM_DEVICECHANGE
1064	+	HWND the_window = GetMainWindowHandle();
1065	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1066	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1067	+	#endif
1068	+
1069		// Initialize VideoRefresh function
1070		VideoRefreshInit();
1071
#	Line 889 | Line 1073 | bool SDL_monitor_desc::video_open(void)
1073		LOCK_FRAME_BUFFER;
1074
1075		// Start redraw/input thread
1076	+	#ifndef USE_CPU_EMUL_SERVICES
1077		redraw_thread_cancel = false;
1078		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1079		if (!redraw_thread_active) {
1080		printf("FATAL: cannot create redraw thread\n");
1081		return false;
1082		}
1083	+	#else
1084	+	redraw_thread_active = true;
1085	+	#endif
1086		return true;
1087		}
1088
#	Line 915 | Line 1103 | bool VideoInit(bool classic)
1103		#endif
1104
1105		// Create Mutexes
1106	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1107	+	return false;
1108		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1109		return false;
1110		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 929 | 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;
933	–	#ifndef SHEEPSHAVER
1124		if (classic_mode)
1125		mode_str = "win/512/342";
1126		else
1127		mode_str = PrefsFindString("screen");
938	–	#endif
1128
1129		// Determine display type and default dimensions
1130		int default_width, default_height;
#	Line 951 | Line 1140 | bool VideoInit(bool classic)
1140		if (mode_str) {
1141		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1142		display_type = DISPLAY_WINDOW;
1143	<	}
1144	<	int max_width = 640, max_height = 480;
956	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
957	<	if (modes && modes != (SDL_Rect **)-1) {
958	<	max_width = modes[0]->w;
959	<	max_height = modes[0]->h;
960	<	if (default_width > max_width)
961	<	default_width = max_width;
962	<	if (default_height > max_height)
963	<	default_height = max_height;
1143	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1144	>	display_type = DISPLAY_SCREEN;
1145		}
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 985 | 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
1208	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1207	>	} else if (display_type == DISPLAY_SCREEN) {
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	>	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
1221	>	}
1222	>	}
1223	>
1224		if (VideoModes.empty()) {
1225		ErrorAlert(STR_NO_XVISUAL_ERR);
1226		return false;
#	Line 1068 | Line 1291 | void SDL_monitor_desc::video_close(void)
1291		{
1292		D(bug("video_close()\n"));
1293
1294	+	#ifdef WIN32
1295	+	// Remove message handler for WM_DEVICECHANGE
1296	+	HWND the_window = GetMainWindowHandle();
1297	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1298	+	#endif
1299	+
1300		// Stop redraw thread
1301	+	#ifndef USE_CPU_EMUL_SERVICES
1302		if (redraw_thread_active) {
1303		redraw_thread_cancel = true;
1304		SDL_WaitThread(redraw_thread, NULL);
1305		}
1306	+	#endif
1307		redraw_thread_active = false;
1308
1309		// Unlock frame buffer
#	Line 1096 | Line 1327 | void VideoExit(void)
1327		SDL_DestroyMutex(frame_buffer_lock);
1328		if (sdl_palette_lock)
1329		SDL_DestroyMutex(sdl_palette_lock);
1330	+	if (sdl_events_lock)
1331	+	SDL_DestroyMutex(sdl_events_lock);
1332		}
1333
1334
#	Line 1265 | Line 1498 | int16 video_mode_change(VidLocals *csSav
1498		void SDL_monitor_desc::switch_to_current_mode(void)
1499		{
1500		// Close and reopen display
1501	+	LOCK_EVENTS;
1502		video_close();
1503		video_open();
1504	+	UNLOCK_EVENTS;
1505
1506		if (drv == NULL) {
1507		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1369 | Line 1604 | static int kc_decode(SDL_keysym const &
1604
1605		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1606		case SDLK_2: case SDLK_AT: return 0x13;
1607	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1607	>	case SDLK_3: case SDLK_HASH: return 0x14;
1608		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1609	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1609	>	case SDLK_5: return 0x17;
1610		case SDLK_6: return 0x16;
1611		case SDLK_7: return 0x1a;
1612		case SDLK_8: return 0x1c;
1613		case SDLK_9: return 0x19;
1614		case SDLK_0: return 0x1d;
1615
1616	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1616	>	case SDLK_BACKQUOTE: return 0x0a;
1617		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1618		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1619	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1620	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1621	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1619	>	case SDLK_LEFTBRACKET: return 0x21;
1620	>	case SDLK_RIGHTBRACKET: return 0x1e;
1621	>	case SDLK_BACKSLASH: return 0x2a;
1622		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1623	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1623	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1624		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1625		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1626		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1417 | Line 1652 | static int kc_decode(SDL_keysym const &
1652		case SDLK_LMETA: return 0x3a;
1653		case SDLK_RMETA: return 0x3a;
1654		#endif
1655	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1656	+	case SDLK_RSUPER: return 0x3a;
1657		case SDLK_MENU: return 0x32;
1658		case SDLK_CAPSLOCK: return 0x39;
1659		case SDLK_NUMLOCK: return 0x47;
#	Line 1750 | 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 1810 | Line 2106 | static void video_refresh_dga_vosf(void)
2106		tick_counter = 0;
2107		if (mainBuffer.dirty) {
2108		LOCK_VOSF;
2109	<	update_display_dga_vosf();
2109	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2110		UNLOCK_VOSF;
2111		}
2112		}
#	Line 1844 | 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 1874 | Line 2174 | static void VideoRefreshInit(void)
2174		}
2175		}
2176
2177	+	static inline void do_video_refresh(void)
2178	+	{
2179	+	// Handle SDL events
2180	+	handle_events();
2181	+
2182	+	// Update display
2183	+	video_refresh();
2184	+
2185	+	#ifdef SHEEPSHAVER
2186	+	// Set new cursor image if it was changed
2187	+	if (cursor_changed && sdl_cursor) {
2188	+	cursor_changed = false;
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) {
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
2208	+
2209	+	// Set new palette if it was changed
2210	+	handle_palette_changes();
2211	+	}
2212	+
2213	+	// This function is called on non-threaded platforms from a timer interrupt
2214	+	void VideoRefresh(void)
2215	+	{
2216	+	// We need to check redraw_thread_active to inhibit refreshed during
2217	+	// mode changes on non-threaded platforms
2218	+	if (!redraw_thread_active)
2219	+	return;
2220	+
2221	+	// Process pending events and update display
2222	+	do_video_refresh();
2223	+	}
2224	+
2225		const int VIDEO_REFRESH_HZ = 60;
2226		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2227
2228	+	#ifndef USE_CPU_EMUL_SERVICES
2229		static int redraw_func(void *arg)
2230		{
2231		uint64 start = GetTicks_usec();
#	Line 1902 | Line 2251 | static int redraw_func(void *arg)
2251		}
2252		#endif
2253
2254	<	// Handle SDL events
2255	<	handle_events();
2254	>	// Process pending events and update display
2255	>	do_video_refresh();
2256	>	}
2257
2258	<	// Refresh display
2259	<	video_refresh();
2258	>	uint64 end = GetTicks_usec();
2259	>	D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2260	>	return 0;
2261	>	}
2262	>	#endif
2263	>
2264	>
2265	>	/*
2266	>	*  Record dirty area from NQD
2267	>	*/
2268
2269		#ifdef SHEEPSHAVER
2270	<	// Set new cursor image if it was changed
2271	<	if (cursor_changed && sdl_cursor) {
2272	<	cursor_changed = false;
2273	<	SDL_FreeCursor(sdl_cursor);
2274	<	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2275	<	if (sdl_cursor)
1918	<	SDL_SetCursor(sdl_cursor);
1919	<	}
1920	<	#endif
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	<	// Set new palette if it was changed
2278	<	handle_palette_changes();
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	<	uint64 end = GetTicks_usec();
1927	<	D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1928	<	return 0;
2284	>	// XXX handle dirty bounding boxes for non-VOSF modes
2285		}
2286	+	#endif

Diff Legend

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