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

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.5 by gbeauche, 2004-06-24T21:46:55Z vs.
Revision 1.23 by gbeauche, 2006-03-28T07:01:19Z

#	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	+	* - 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 35 \| Line 36
36		* - Events processing is bound to the general emulation thread as SDL requires
37		* to PumpEvents() within the same thread as the one that called SetVideoMode().
38		* Besides, there can't seem to be a way to call SetVideoMode() from a child thread.
39	+	* - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
40	+	* - Backport hw cursor acceleration to Basilisk II?
41	+	* - Factor out code
42		*/
43
44		#include "sysdeps.h"
#	Line 54 \| Line 58
58		#include "video.h"
59		#include "video_defs.h"
60		#include "video_blit.h"
61	+	#include "vm_alloc.h"
62
63		#define DEBUG 0
64		#include "debug.h"
#	Line 79 \| Line 84 \| static int display_type = DISPLAY_WINDOW
84		#endif
85
86		// Constants
87	+	#ifdef WIN32
88	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
89	+	#else
90		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
91	+	#endif
92
93
94		// Global variables
#	Line 92 \| Line 101 \| *static uint8 the_buffer_copy = NULL;**
101		static uint32 the_buffer_size; // Size of allocated the_buffer
102
103		static bool redraw_thread_active = false; // Flag: Redraw thread installed
104	+	#ifndef USE_CPU_EMUL_SERVICES
105		static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
106		static SDL_Thread *redraw_thread = NULL; // Redraw thread
107	+	#ifdef SHEEPSHAVER
108	+	static volatile bool thread_stop_req = false;
109	+	static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req
110	+	#endif
111	+	#endif
112
113		#ifdef ENABLE_VOSF
114	<	static bool use_vosf = true; // Flag: VOSF enabled
114	>	static bool use_vosf = false; // Flag: VOSF enabled
115		#else
116		static const bool use_vosf = false; // VOSF not possible
117		#endif
#	Line 114 \| Line 129 \| static int keycode_table[256]; // X
129
130		// SDL variables
131		static int screen_depth; // Depth of current screen
132	+	static SDL_Cursor *sdl_cursor; // Copy of Mac cursor
133	+	static volatile bool cursor_changed = false; // Flag: cursor changed, redraw_func must update the cursor
134		static SDL_Color sdl_palette[256]; // Color palette to be used as CLUT and gamma table
135		static bool sdl_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
136		static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK \| SDL_MOUSEBUTTONUPMASK \| SDL_MOUSEMOTIONMASK \| SDL_KEYUPMASK \| SDL_KEYDOWNMASK \| SDL_VIDEOEXPOSEMASK \| SDL_QUITMASK;
137
138	+	// Mutex to protect SDL events
139	+	static SDL_mutex *sdl_events_lock = NULL;
140	+	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
141	+	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
142	+
143		// Mutex to protect palette
144		static SDL_mutex *sdl_palette_lock = NULL;
145		#define LOCK_PALETTE SDL_LockMutex(sdl_palette_lock)
#	Line 141 \| Line 163 \| extern void SysMountFirstFloppy(void);
163
164
165		/*
166	+	* SDL surface locking glue
167	+	*/
168	+
169	+	#ifdef ENABLE_VOSF
170	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do { \
171	+	if ((SURFACE)->flags & (SDL_HWSURFACE \| SDL_FULLSCREEN)) \
172	+	the_host_buffer = (uint8 *)(SURFACE)->pixels; \
173	+	} while (0)
174	+	#else
175	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
176	+	#endif
177	+
178	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do { \
179	+	if (SDL_MUSTLOCK(SURFACE)) { \
180	+	SDL_LockSurface(SURFACE); \
181	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE); \
182	+	} \
183	+	} while (0)
184	+
185	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do { \
186	+	if (SDL_MUSTLOCK(SURFACE)) \
187	+	SDL_UnlockSurface(SURFACE); \
188	+	} while (0)
189	+
190	+
191	+	/*
192	+	* Framebuffer allocation routines
193	+	*/
194	+
195	+	static void *vm_acquire_framebuffer(uint32 size)
196	+	{
197	+	return vm_acquire(size);
198	+	}
199	+
200	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
201	+	{
202	+	vm_release(fb, size);
203	+	}
204	+
205	+
206	+	/*
207	+	* Windows message handler
208	+	*/
209	+
210	+	#ifdef WIN32
211	+	#include <dbt.h>
212	+	static WNDPROC sdl_window_proc = NULL; // Window proc used by SDL
213	+
214	+	extern void SysMediaArrived(void);
215	+	extern void SysMediaRemoved(void);
216	+	extern HWND GetMainWindowHandle(void);
217	+
218	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
219	+	{
220	+	switch (msg) {
221	+	case WM_DEVICECHANGE:
222	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
223	+	DEV_BROADCAST_HDR p = (DEV_BROADCAST_HDR )lParam;
224	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
225	+	SysMediaRemoved();
226	+	}
227	+	else if (wParam == DBT_DEVICEARRIVAL) {
228	+	DEV_BROADCAST_HDR p = (DEV_BROADCAST_HDR )lParam;
229	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
230	+	SysMediaArrived();
231	+	}
232	+	return 0;
233	+
234	+	default:
235	+	if (sdl_window_proc)
236	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
237	+	}
238	+
239	+	return DefWindowProc(hwnd, msg, wParam, lParam);
240	+	}
241	+	#endif
242	+
243	+
244	+	/*
245		* SheepShaver glue
246		*/
247
#	Line 255 \| Line 356 \| static void ErrorAlert(int error)
356		{
357		ErrorAlert(GetString(error));
358		}
359	+
360	+	// Display warning alert
361	+	static void WarningAlert(int warning)
362	+	{
363	+	WarningAlert(GetString(warning));
364	+	}
365		#endif
366
367
#	Line 314 \| Line 421 \| static inline int bytes_per_pixel(int de
421		}
422
423		// Map video_mode depth ID to numerical depth value
424	<	static int sdl_depth_of_video_depth(int video_depth)
424	>	static int mac_depth_of_video_depth(int video_depth)
425		{
426		int depth = -1;
427		switch (video_depth) {
#	Line 342 \| Line 449 \| static int sdl_depth_of_video_depth(int
449		return depth;
450		}
451
452	+	// Map video_mode depth ID to SDL screen depth
453	+	static int sdl_depth_of_video_depth(int video_depth)
454	+	{
455	+	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
456	+	}
457	+
458		// Check wether specified mode is available
459		static bool has_mode(int type, int width, int height)
460		{
348	–	// FIXME: no fullscreen support yet
349	–	if (type == DISPLAY_SCREEN)
350	–	return false;
351	–
461		#ifdef SHEEPSHAVER
462		// Filter out Classic resolutiosn
463		if (width == 512 && height == 384)
464		return false;
465
466	<	// Read window modes prefs
466	>	// "screen" prefs items always succeeds
467	>	if (PrefsFindString("screen"))
468	>	return true;
469	>
470	>	// Read window & screen modes prefs
471		static uint32 window_modes = 0;
472		static uint32 screen_modes = 0;
473		if (window_modes == 0 \|\| screen_modes == 0) {
#	Line 364 \| Line 477 \| static bool has_mode(int type, int width
477		window_modes \|= 3; // Allow at least 640x480 and 800x600 window modes
478		}
479
480	<	if (type == DISPLAY_WINDOW) {
481	<	int apple_mask, apple_id = find_apple_resolution(width, height);
482	<	switch (apple_id) {
483	<	case APPLE_640x480: apple_mask = 0x01; break;
484	<	case APPLE_800x600: apple_mask = 0x02; break;
485	<	case APPLE_1024x768: apple_mask = 0x04; break;
486	<	case APPLE_1152x768: apple_mask = 0x40; break;
487	<	case APPLE_1152x900: apple_mask = 0x08; break;
488	<	case APPLE_1280x1024: apple_mask = 0x10; break;
489	<	case APPLE_1600x1200: apple_mask = 0x20; break;
490	<	default: apple_mask = 0x00; break;
378	<	}
379	<	return (window_modes & apple_mask);
480	>	int test_modes;
481	>	switch (type) {
482	>	case DISPLAY_WINDOW:
483	>	test_modes = window_modes;
484	>	break;
485	>	case DISPLAY_SCREEN:
486	>	test_modes = screen_modes;
487	>	break;
488	>	default:
489	>	test_modes = 0;
490	>	break;
491		}
492	<	#else
493	<	return true;
492	>
493	>	int apple_mask;
494	>	switch (find_apple_resolution(width, height)) {
495	>	case APPLE_640x480: apple_mask = 0x01; break;
496	>	case APPLE_800x600: apple_mask = 0x02; break;
497	>	case APPLE_1024x768: apple_mask = 0x04; break;
498	>	case APPLE_1152x768: apple_mask = 0x40; break;
499	>	case APPLE_1152x900: apple_mask = 0x08; break;
500	>	case APPLE_1280x1024: apple_mask = 0x10; break;
501	>	case APPLE_1600x1200: apple_mask = 0x20; break;
502	>	default: apple_mask = 0x00; break;
503	>	}
504	>	return (test_modes & apple_mask);
505		#endif
506	<	return false;
506	>	return true;
507		}
508
509		// Add mode to list of supported modes
#	Line 402 \| Line 524 \| static void add_mode(int type, int width
524		VIDEO_MODE_Y = height;
525		VIDEO_MODE_RESOLUTION = resolution_id;
526		VIDEO_MODE_ROW_BYTES = bytes_per_row;
527	<	VIDEO_MODE_DEPTH = depth;
527	>	VIDEO_MODE_DEPTH = (video_depth)depth;
528		VideoModes.push_back(mode);
529		}
530
#	Line 458 \| Line 580 \| static void set_window_name(int name)
580		// Set mouse grab mode
581		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
582		{
583	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
583	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
584		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
585		}
586
#	Line 517 \| Line 639 \| private:
639		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
640		};
641
642	+	class driver_fullscreen : public driver_base {
643	+	public:
644	+	driver_fullscreen(SDL_monitor_desc &monitor);
645	+	~driver_fullscreen();
646	+	};
647	+
648		static driver_base *drv = NULL; // Pointer to currently used driver object
649
650		#ifdef ENABLE_VOSF
#	Line 538 \| Line 666 \| driver_base::~driver_base()
666		if (s)
667		SDL_FreeSurface(s);
668
669	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
670	+	if (the_buffer != VM_MAP_FAILED) {
671	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
672	+	vm_release_framebuffer(the_buffer, the_buffer_size);
673	+	the_buffer = NULL;
674	+	}
675	+
676		// Free frame buffer(s)
677		if (!use_vosf) {
543	–	if (the_buffer) {
544	–	free(the_buffer);
545	–	the_buffer = NULL;
546	–	}
678		if (the_buffer_copy) {
679		free(the_buffer_copy);
680		the_buffer_copy = NULL;
#	Line 551 \| Line 682 \| driver_base::~driver_base()
682		}
683		#ifdef ENABLE_VOSF
684		else {
554	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
555	–	if (the_buffer != VM_MAP_FAILED) {
556	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
557	–	vm_release(the_buffer, the_buffer_size);
558	–	the_buffer = NULL;
559	–	}
685		if (the_host_buffer) {
686		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
687		free(the_host_buffer);
#	Line 567 \| Line 692 \| driver_base::~driver_base()
692		free(the_buffer_copy);
693		the_buffer_copy = NULL;
694		}
695	+
696	+	// Deinitialize VOSF
697	+	video_vosf_exit();
698		}
699		#endif
700		}
#	Line 576 \| Line 704 \| void driver_base::update_palette(void)
704		{
705		const VIDEO_MODE &mode = monitor.get_current_mode();
706
707	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
707	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
708		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
709		}
710
#	Line 607 \| Line 735 \| driver_window::driver_window(SDL_monitor
735		ADBSetRelMouseMode(mouse_grabbed);
736
737		// Create surface
738	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
738	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
739		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
740		return;
741
#	Line 616 \| Line 744 \| driver_window::driver_window(SDL_monitor
744		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
745		the_host_buffer = (uint8 *)s->pixels;
746		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
747	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
747	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
748		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
749		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
750	+
751	+	// Check whether we can initialize the VOSF subsystem and it's profitable
752	+	if (!video_vosf_init(m)) {
753	+	WarningAlert(STR_VOSF_INIT_ERR);
754	+	use_vosf = false;
755	+	}
756	+	else if (!video_vosf_profitable()) {
757	+	video_vosf_exit();
758	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
759	+	use_vosf = false;
760	+	}
761	+	if (!use_vosf) {
762	+	free(the_buffer_copy);
763	+	vm_release(the_buffer, the_buffer_size);
764	+	the_host_buffer = NULL;
765	+	}
766	+	#endif
767	+	if (!use_vosf) {
768	+	// Allocate memory for frame buffer
769	+	the_buffer_size = (aligned_height + 2) * s->pitch;
770	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
771	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
772	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
773	+	}
774	+
775	+	#ifdef SHEEPSHAVER
776	+	// Create cursor
777	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
778	+	SDL_SetCursor(sdl_cursor);
779	+	cursor_changed = false;
780	+	}
781		#else
782	<	// Allocate memory for frame buffer
783	<	the_buffer_size = (aligned_height + 2) * s->pitch;
625	<	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
626	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
627	<	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
782	>	// Hide cursor
783	>	SDL_ShowCursor(0);
784		#endif
785
786		// Set window name/class
787		set_window_name(STR_WINDOW_TITLE);
788
633	–	// Hide cursor
634	–	SDL_ShowCursor(0);
635	–
789		// Init blitting routines
790		SDL_PixelFormat *f = s->format;
791		VisualFormat visualFormat;
#	Line 640 \| Line 793 \| driver_window::driver_window(SDL_monitor
793		visualFormat.Rmask = f->Rmask;
794		visualFormat.Gmask = f->Gmask;
795		visualFormat.Bmask = f->Bmask;
796	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
796	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
797
798		// Load gray ramp to 8->16/32 expand map
799		if (!IsDirectMode(mode))
#	Line 707 \| Line 860 \| void driver_window::mouse_moved(int x, i
860		ADBMouseMoved(x, y);
861		}
862
863	+
864	+	/*
865	+	* Full-screen display driver
866	+	*/
867	+
868	+	// Open display
869	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
870	+	: driver_base(m)
871	+	{
872	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
873	+	int aligned_width = (width + 15) & ~15;
874	+	int aligned_height = (height + 15) & ~15;
875	+
876	+	// Set absolute mouse mode
877	+	ADBSetRelMouseMode(false);
878	+
879	+	// Create surface
880	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
881	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE \| SDL_FULLSCREEN)) == NULL)
882	+	return;
883	+
884	+	#ifdef ENABLE_VOSF
885	+	use_vosf = true;
886	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
887	+	the_host_buffer = (uint8 *)s->pixels;
888	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
889	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
890	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
891	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
892	+
893	+	// Check whether we can initialize the VOSF subsystem and it's profitable
894	+	if (!video_vosf_init(m)) {
895	+	WarningAlert(STR_VOSF_INIT_ERR);
896	+	use_vosf = false;
897	+	}
898	+	else if (!video_vosf_profitable()) {
899	+	video_vosf_exit();
900	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
901	+	use_vosf = false;
902	+	}
903	+	if (!use_vosf) {
904	+	free(the_buffer_copy);
905	+	vm_release(the_buffer, the_buffer_size);
906	+	the_host_buffer = NULL;
907	+	}
908	+	#endif
909	+	if (!use_vosf) {
910	+	// Allocate memory for frame buffer
911	+	the_buffer_size = (aligned_height + 2) * s->pitch;
912	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
913	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
914	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
915	+	}
916	+
917	+	// Hide cursor
918	+	SDL_ShowCursor(0);
919	+
920	+	// Init blitting routines
921	+	SDL_PixelFormat *f = s->format;
922	+	VisualFormat visualFormat;
923	+	visualFormat.depth = depth;
924	+	visualFormat.Rmask = f->Rmask;
925	+	visualFormat.Gmask = f->Gmask;
926	+	visualFormat.Bmask = f->Bmask;
927	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
928	+
929	+	// Load gray ramp to 8->16/32 expand map
930	+	if (!IsDirectMode(mode))
931	+	for (int i=0; i<256; i++)
932	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
933	+
934	+	// Set frame buffer base
935	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
936	+
937	+	// Everything went well
938	+	init_ok = true;
939	+	}
940	+
941	+	// Close display
942	+	driver_fullscreen::~driver_fullscreen()
943	+	{
944	+	#ifdef ENABLE_VOSF
945	+	if (use_vosf)
946	+	the_host_buffer = NULL; // don't free() in driver_base dtor
947	+	#endif
948	+	if (s)
949	+	SDL_FreeSurface(s);
950	+
951	+	// Show cursor
952	+	SDL_ShowCursor(1);
953	+	}
954	+
955	+
956		/*
957		* Initialization
958		*/
#	Line 738 \| Line 984 \| static void keycode_init(void)
984		SDL_VideoDriverName(video_driver, sizeof(video_driver));
985		bool video_driver_found = false;
986		char line[256];
987	+	int n_keys = 0;
988		while (fgets(line, sizeof(line) - 1, f)) {
989		// Read line
990		int len = strlen(line);
#	Line 750 \| Line 997 \| static void keycode_init(void)
997		continue;
998
999		if (video_driver_found) {
1000	<	// Skip aliases
1001	<	static const char alias_str[] = "alias";
1002	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
1000	>	// Skip aliases as long as we have read keycodes yet
1001	>	// Otherwise, it's another mapping and we have to stop
1002	>	static const char sdl_str[] = "sdl";
1003	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1004		continue;
1005
1006		// Read keycode
1007		int x_code, mac_code;
1008		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1009	<	keycode_table[x_code & 0xff] = mac_code;
1009	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1010		else
1011		break;
1012		} else {
1013		// Search for SDL video driver string
1014	<	static const char alias_sdl_str[] = "alias SDL";
1015	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
1016	<	char *p = line + sizeof(alias_sdl_str);
1014	>	static const char sdl_str[] = "sdl";
1015	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
1016	>	char *p = line + sizeof(sdl_str);
1017		if (strstr(video_driver, p) == video_driver)
1018		video_driver_found = true;
1019		}
#	Line 783 \| Line 1031 \| static void keycode_init(void)
1031		WarningAlert(str);
1032		return;
1033		}
1034	+
1035	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1036		}
1037		}
1038
#	Line 801 \| Line 1051 \| bool SDL_monitor_desc::video_open(void)
1051		case DISPLAY_WINDOW:
1052		drv = new(std::nothrow) driver_window(*this);
1053		break;
1054	+	case DISPLAY_SCREEN:
1055	+	drv = new(std::nothrow) driver_fullscreen(*this);
1056	+	break;
1057		}
1058		if (drv == NULL)
1059		return false;
#	Line 810 \| Line 1063 \| bool SDL_monitor_desc::video_open(void)
1063		return false;
1064		}
1065
1066	<	#ifdef ENABLE_VOSF
1067	<	if (use_vosf) {
1068	<	// Initialize the VOSF system
1069	<	if (!video_vosf_init(*this)) {
1070	<	ErrorAlert(STR_VOSF_INIT_ERR);
818	<	return false;
819	<	}
820	<	}
1066	>	#ifdef WIN32
1067	>	// Chain in a new message handler for WM_DEVICECHANGE
1068	>	HWND the_window = GetMainWindowHandle();
1069	>	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1070	>	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1071		#endif
1072	<
1072	>
1073		// Initialize VideoRefresh function
1074		VideoRefreshInit();
1075
#	Line 827 \| Line 1077 \| bool SDL_monitor_desc::video_open(void)
1077		LOCK_FRAME_BUFFER;
1078
1079		// Start redraw/input thread
1080	+	#ifndef USE_CPU_EMUL_SERVICES
1081		redraw_thread_cancel = false;
1082		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1083		if (!redraw_thread_active) {
1084		printf("FATAL: cannot create redraw thread\n");
1085		return false;
1086		}
1087	+	#else
1088	+	redraw_thread_active = true;
1089	+	#endif
1090		return true;
1091		}
1092
#	Line 853 \| Line 1107 \| bool VideoInit(bool classic)
1107		#endif
1108
1109		// Create Mutexes
1110	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1111	+	return false;
1112		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1113		return false;
1114		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 868 \| Line 1124 \| bool VideoInit(bool classic)
1124
1125		// Get screen mode from preferences
1126		const char *mode_str = NULL;
871	–	#ifndef SHEEPSHAVER
1127		if (classic_mode)
1128		mode_str = "win/512/342";
1129		else
1130		mode_str = PrefsFindString("screen");
876	–	#endif
1131
1132		// Determine display type and default dimensions
1133		int default_width, default_height;
#	Line 889 \| Line 1143 \| bool VideoInit(bool classic)
1143		if (mode_str) {
1144		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1145		display_type = DISPLAY_WINDOW;
1146	+	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1147	+	display_type = DISPLAY_SCREEN;
1148		}
1149		int max_width = 640, max_height = 480;
1150		SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN \| SDL_HWSURFACE);
1151		if (modes && modes != (SDL_Rect **)-1) {
1152	<	max_width = modes[0]->w;
1153	<	max_height = modes[0]->h;
1152	>	// It turns out that on some implementations, and contrary to the documentation,
1153	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
1154	>	for (int i = 0; modes[i] != NULL; i++) {
1155	>	const int w = modes[i]->w;
1156	>	const int h = modes[i]->h;
1157	>	if (w > max_width && h > max_height) {
1158	>	max_width = w;
1159	>	max_height = h;
1160	>	}
1161	>	}
1162		if (default_width > max_width)
1163		default_width = max_width;
1164		if (default_height > max_height)
#	Line 929 \| Line 1193 \| bool VideoInit(bool classic)
1193		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1194		else {
1195		for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1196	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1196	>	int bpp = sdl_depth_of_video_depth(d);
1197		if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1198		add_window_modes(video_depth(d));
1199		}
1200		}
1201	<	} else
1202	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1201	>	} else if (display_type == DISPLAY_SCREEN) {
1202	>	struct {
1203	>	int w;
1204	>	int h;
1205	>	int resolution_id;
1206	>	}
1207	>	video_modes[] = {
1208	>	{ -1, -1, 0x80 },
1209	>	{ 640, 480, 0x81 },
1210	>	{ 800, 600, 0x82 },
1211	>	{ 1024, 768, 0x83 },
1212	>	{ 1152, 870, 0x84 },
1213	>	{ 1280, 1024, 0x85 },
1214	>	{ 1600, 1200, 0x86 },
1215	>	{ 0, }
1216	>	};
1217	>	video_modes[0].w = default_width;
1218	>	video_modes[0].h = default_height;
1219	>
1220	>	for (int i = 0; video_modes[i].w != 0; i++) {
1221	>	const int w = video_modes[i].w;
1222	>	const int h = video_modes[i].h;
1223	>	if (i > 0 && (w >= default_width \|\| h >= default_height))
1224	>	continue;
1225	>	#ifdef ENABLE_VOSF
1226	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1227	>	int bpp = sdl_depth_of_video_depth(d);
1228	>	if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE \| SDL_FULLSCREEN))
1229	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1230	>	}
1231	>	#else
1232	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1233	>	#endif
1234	>	}
1235	>	}
1236	>
1237		if (VideoModes.empty()) {
1238		ErrorAlert(STR_NO_XVISUAL_ERR);
1239		return false;
#	Line 1006 \| Line 1304 \| void SDL_monitor_desc::video_close(void)
1304		{
1305		D(bug("video_close()\n"));
1306
1307	+	#ifdef WIN32
1308	+	// Remove message handler for WM_DEVICECHANGE
1309	+	HWND the_window = GetMainWindowHandle();
1310	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1311	+	#endif
1312	+
1313		// Stop redraw thread
1314	+	#ifndef USE_CPU_EMUL_SERVICES
1315		if (redraw_thread_active) {
1316		redraw_thread_cancel = true;
1317		SDL_WaitThread(redraw_thread, NULL);
1318		}
1319	+	#endif
1320		redraw_thread_active = false;
1321
1322		// Unlock frame buffer
1323		UNLOCK_FRAME_BUFFER;
1324		D(bug(" frame buffer unlocked\n"));
1325
1020	–	#ifdef ENABLE_VOSF
1021	–	if (use_vosf) {
1022	–	// Deinitialize VOSF
1023	–	video_vosf_exit();
1024	–	}
1025	–	#endif
1026	–
1326		// Close display
1327		delete drv;
1328		drv = NULL;
#	Line 1041 \| Line 1340 \| void VideoExit(void)
1340		SDL_DestroyMutex(frame_buffer_lock);
1341		if (sdl_palette_lock)
1342		SDL_DestroyMutex(sdl_palette_lock);
1343	+	if (sdl_events_lock)
1344	+	SDL_DestroyMutex(sdl_events_lock);
1345		}
1346
1347
#	Line 1121 \| Line 1422 \| void SDL_monitor_desc::set_palette(uint8
1422		const VIDEO_MODE &mode = get_current_mode();
1423
1424		// FIXME: how can we handle the gamma ramp?
1425	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1425	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1426		return;
1427
1428		LOCK_PALETTE;
#	Line 1146 \| Line 1447 \| void SDL_monitor_desc::set_palette(uint8
1447		}
1448
1449		#ifdef ENABLE_VOSF
1450	<	// We have to redraw everything because the interpretation of pixel values changed
1451	<	LOCK_VOSF;
1452	<	PFLAG_SET_ALL;
1453	<	UNLOCK_VOSF;
1454	<	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1450	>	if (use_vosf) {
1451	>	// We have to redraw everything because the interpretation of pixel values changed
1452	>	LOCK_VOSF;
1453	>	PFLAG_SET_ALL;
1454	>	UNLOCK_VOSF;
1455	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1456	>	}
1457		#endif
1458		}
1459
#	Line 1180 \| Line 1483 \| *int16 video_mode_change(VidLocals csSav**
1483		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1484		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1485
1486	<	// Disable interrupts
1486	>	// Disable interrupts and pause redraw thread
1487		DisableInterrupt();
1488	+	thread_stop_ack = false;
1489	+	thread_stop_req = true;
1490	+	while (!thread_stop_ack) ;
1491
1492		cur_mode = i;
1493		monitor_desc *monitor = VideoMonitors[0];
#	Line 1192 \| Line 1498 \| *int16 video_mode_change(VidLocals csSav**
1498		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1499		csSave->saveMode=VModes[cur_mode].viAppleMode;
1500
1501	<	// Enable interrupts
1501	>	// Enable interrupts and resume redraw thread
1502	>	thread_stop_req = false;
1503		EnableInterrupt();
1504		return noErr;
1505		}
#	Line 1204 \| Line 1511 \| *int16 video_mode_change(VidLocals csSav**
1511		void SDL_monitor_desc::switch_to_current_mode(void)
1512		{
1513		// Close and reopen display
1514	+	LOCK_EVENTS;
1515		video_close();
1516		video_open();
1517	+	UNLOCK_EVENTS;
1518
1519		if (drv == NULL) {
1520		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1221 \| Line 1530 \| void SDL_monitor_desc::switch_to_current
1530		#ifdef SHEEPSHAVER
1531		bool video_can_change_cursor(void)
1532		{
1533	<	// return hw_mac_cursor_accl && (display_type != DISPLAY_SCREEN);
1225	<	return false;
1533	>	return (display_type == DISPLAY_WINDOW);
1534		}
1535		#endif
1536
#	Line 1234 \| Line 1542 \| bool video_can_change_cursor(void)
1542		#ifdef SHEEPSHAVER
1543		void video_set_cursor(void)
1544		{
1545	<	// cursor_changed = true;
1545	>	cursor_changed = true;
1546		}
1547		#endif
1548
1549
1550		/*
1551	<	* Install graphics acceleration
1551	>	* Keyboard-related utilify functions
1552		*/
1553
1554	<	#ifdef SHEEPSHAVER
1247	<	// Rectangle inversion
1248	<	template< int bpp >
1249	<	static inline void do_invrect(uint8 *dest, uint32 length)
1250	<	{
1251	<	#define INVERT_1(PTR, OFS) ((uint8 )(PTR))[OFS] = ~((uint8 )(PTR))[OFS]
1252	<	#define INVERT_2(PTR, OFS) ((uint16 )(PTR))[OFS] = ~((uint16 )(PTR))[OFS]
1253	<	#define INVERT_4(PTR, OFS) ((uint32 )(PTR))[OFS] = ~((uint32 )(PTR))[OFS]
1254	<	#define INVERT_8(PTR, OFS) ((uint64 )(PTR))[OFS] = ~((uint64 )(PTR))[OFS]
1255	<
1256	<	#ifndef UNALIGNED_PROFITABLE
1257	<	// Align on 16-bit boundaries
1258	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1259	<	INVERT_1(dest, 0);
1260	<	dest += 1; length -= 1;
1261	<	}
1262	<
1263	<	// Align on 32-bit boundaries
1264	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1265	<	INVERT_2(dest, 0);
1266	<	dest += 2; length -= 2;
1267	<	}
1268	<	#endif
1269	<
1270	<	// Invert 8-byte words
1271	<	if (length >= 8) {
1272	<	const int r = (length / 8) % 8;
1273	<	dest += r * 8;
1274	<
1275	<	int n = ((length / 8) + 7) / 8;
1276	<	switch (r) {
1277	<	case 0: do {
1278	<	dest += 64;
1279	<	INVERT_8(dest, -8);
1280	<	case 7: INVERT_8(dest, -7);
1281	<	case 6: INVERT_8(dest, -6);
1282	<	case 5: INVERT_8(dest, -5);
1283	<	case 4: INVERT_8(dest, -4);
1284	<	case 3: INVERT_8(dest, -3);
1285	<	case 2: INVERT_8(dest, -2);
1286	<	case 1: INVERT_8(dest, -1);
1287	<	} while (--n > 0);
1288	<	}
1289	<	}
1290	<
1291	<	// 32-bit cell to invert?
1292	<	if (length & 4) {
1293	<	INVERT_4(dest, 0);
1294	<	if (bpp <= 16)
1295	<	dest += 4;
1296	<	}
1297	<
1298	<	// 16-bit cell to invert?
1299	<	if (bpp <= 16 && (length & 2)) {
1300	<	INVERT_2(dest, 0);
1301	<	if (bpp <= 8)
1302	<	dest += 2;
1303	<	}
1304	<
1305	<	// 8-bit cell to invert?
1306	<	if (bpp <= 8 && (length & 1))
1307	<	INVERT_1(dest, 0);
1308	<
1309	<	#undef INVERT_1
1310	<	#undef INVERT_2
1311	<	#undef INVERT_4
1312	<	#undef INVERT_8
1313	<	}
1314	<
1315	<	void NQD_invrect(uint32 p)
1554	>	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1555		{
1556	<	D(bug("accl_invrect %08x\n", p));
1557	<
1558	<	// Get inversion parameters
1559	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1560	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1561	<	int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1562	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1563	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1564	<	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1565	<
1566	<	//!!?? pen_mode == 14
1567	<
1568	<	// And perform the inversion
1569	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1570	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1571	<	uint8 dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y dest_row_bytes) + (dest_X * bpp));
1333	<	width *= bpp;
1334	<	switch (bpp) {
1335	<	case 1:
1336	<	for (int i = 0; i < height; i++) {
1337	<	do_invrect<8>(dest, width);
1338	<	dest += dest_row_bytes;
1339	<	}
1340	<	break;
1341	<	case 2:
1342	<	for (int i = 0; i < height; i++) {
1343	<	do_invrect<16>(dest, width);
1344	<	dest += dest_row_bytes;
1345	<	}
1346	<	break;
1347	<	case 4:
1348	<	for (int i = 0; i < height; i++) {
1349	<	do_invrect<32>(dest, width);
1350	<	dest += dest_row_bytes;
1351	<	}
1352	<	break;
1353	<	}
1354	<	}
1355	<
1356	<	// Rectangle filling
1357	<	template< int bpp >
1358	<	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1359	<	{
1360	<	#define FILL_1(PTR, OFS, VAL) ((uint8 *)(PTR))[OFS] = (VAL)
1361	<	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1362	<	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1363	<	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1364	<
1365	<	#ifndef UNALIGNED_PROFITABLE
1366	<	// Align on 16-bit boundaries
1367	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1368	<	FILL_1(dest, 0, color);
1369	<	dest += 1; length -= 1;
1370	<	}
1371	<
1372	<	// Align on 32-bit boundaries
1373	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1374	<	FILL_2(dest, 0, color);
1375	<	dest += 2; length -= 2;
1376	<	}
1377	<	#endif
1378	<
1379	<	// Fill 8-byte words
1380	<	if (length >= 8) {
1381	<	const uint64 c = (((uint64)color) << 32) \| color;
1382	<	const int r = (length / 8) % 8;
1383	<	dest += r * 8;
1384	<
1385	<	int n = ((length / 8) + 7) / 8;
1386	<	switch (r) {
1387	<	case 0: do {
1388	<	dest += 64;
1389	<	FILL_8(dest, -8, c);
1390	<	case 7: FILL_8(dest, -7, c);
1391	<	case 6: FILL_8(dest, -6, c);
1392	<	case 5: FILL_8(dest, -5, c);
1393	<	case 4: FILL_8(dest, -4, c);
1394	<	case 3: FILL_8(dest, -3, c);
1395	<	case 2: FILL_8(dest, -2, c);
1396	<	case 1: FILL_8(dest, -1, c);
1397	<	} while (--n > 0);
1398	<	}
1399	<	}
1400	<
1401	<	// 32-bit cell to fill?
1402	<	if (length & 4) {
1403	<	FILL_4(dest, 0, color);
1404	<	if (bpp <= 16)
1405	<	dest += 4;
1406	<	}
1407	<
1408	<	// 16-bit cell to fill?
1409	<	if (bpp <= 16 && (length & 2)) {
1410	<	FILL_2(dest, 0, color);
1411	<	if (bpp <= 8)
1412	<	dest += 2;
1413	<	}
1414	<
1415	<	// 8-bit cell to fill?
1416	<	if (bpp <= 8 && (length & 1))
1417	<	FILL_1(dest, 0, color);
1418	<
1419	<	#undef FILL_1
1420	<	#undef FILL_2
1421	<	#undef FILL_4
1422	<	#undef FILL_8
1423	<	}
1424	<
1425	<	void NQD_fillrect(uint32 p)
1426	<	{
1427	<	D(bug("accl_fillrect %08x\n", p));
1428	<
1429	<	// Get filling parameters
1430	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1431	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1432	<	int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1433	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1434	<	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1435	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1436	<	D(bug(" width %d, height %d\n", width, height));
1437	<	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1438	<
1439	<	// And perform the fill
1440	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1441	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1442	<	uint8 dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y dest_row_bytes) + (dest_X * bpp));
1443	<	width *= bpp;
1444	<	switch (bpp) {
1445	<	case 1:
1446	<	for (int i = 0; i < height; i++) {
1447	<	memset(dest, color, width);
1448	<	dest += dest_row_bytes;
1449	<	}
1450	<	break;
1451	<	case 2:
1452	<	for (int i = 0; i < height; i++) {
1453	<	do_fillrect<16>(dest, color, width);
1454	<	dest += dest_row_bytes;
1455	<	}
1456	<	break;
1457	<	case 4:
1458	<	for (int i = 0; i < height; i++) {
1459	<	do_fillrect<32>(dest, color, width);
1460	<	dest += dest_row_bytes;
1461	<	}
1462	<	break;
1463	<	}
1464	<	}
1465	<
1466	<	bool NQD_fillrect_hook(uint32 p)
1467	<	{
1468	<	D(bug("accl_fillrect_hook %08x\n", p));
1469	<
1470	<	// Check if we can accelerate this fillrect
1471	<	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1472	<	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1473	<	if (transfer_mode == 8) {
1474	<	// Fill
1475	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1476	<	return true;
1477	<	}
1478	<	else if (transfer_mode == 10) {
1479	<	// Invert
1480	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1481	<	return true;
1482	<	}
1483	<	}
1484	<	return false;
1485	<	}
1486	<
1487	<	// Rectangle blitting
1488	<	// TODO: optimize for VOSF and target pixmap == screen
1489	<	void NQD_bitblt(uint32 p)
1490	<	{
1491	<	D(bug("accl_bitblt %08x\n", p));
1492	<
1493	<	// Get blitting parameters
1494	<	int16 src_X = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1495	<	int16 src_Y = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1496	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1497	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1498	<	int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1499	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1500	<	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1501	<	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1502	<	D(bug(" width %d, height %d\n", width, height));
1503	<
1504	<	// And perform the blit
1505	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1506	<	width *= bpp;
1507	<	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1508	<	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1509	<	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1510	<	uint8 src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y src_row_bytes) + (src_X * bpp));
1511	<	uint8 dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y dst_row_bytes) + (dest_X * bpp));
1512	<	for (int i = 0; i < height; i++) {
1513	<	memmove(dst, src, width);
1514	<	src += src_row_bytes;
1515	<	dst += dst_row_bytes;
1516	<	}
1517	<	}
1518	<	else {
1519	<	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1520	<	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1521	<	uint8 src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) src_row_bytes) + (src_X * bpp));
1522	<	uint8 dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) dst_row_bytes) + (dest_X * bpp));
1523	<	for (int i = height - 1; i >= 0; i--) {
1524	<	memmove(dst, src, width);
1525	<	src -= src_row_bytes;
1526	<	dst -= dst_row_bytes;
1527	<	}
1528	<	}
1529	<	}
1530	<
1531	<	/*
1532	<	BitBlt transfer modes:
1533	<	0 : srcCopy
1534	<	1 : srcOr
1535	<	2 : srcXor
1536	<	3 : srcBic
1537	<	4 : notSrcCopy
1538	<	5 : notSrcOr
1539	<	6 : notSrcXor
1540	<	7 : notSrcBic
1541	<	32 : blend
1542	<	33 : addPin
1543	<	34 : addOver
1544	<	35 : subPin
1545	<	36 : transparent
1546	<	37 : adMax
1547	<	38 : subOver
1548	<	39 : adMin
1549	<	50 : hilite
1550	<	*/
1551	<
1552	<	bool NQD_bitblt_hook(uint32 p)
1553	<	{
1554	<	D(bug("accl_draw_hook %08x\n", p));
1555	<
1556	<	// Check if we can accelerate this bitblt
1557	<	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1558	<	ReadMacInt32(p + 0x130) == 0 &&
1559	<	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1560	<	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1561	<	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1562	<	ReadMacInt32(p + acclTransferMode) == 0 && // srcCopy?
1563	<	ReadMacInt32(p + 0x15c) > 0) {
1564	<
1565	<	// Yes, set function pointer
1566	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1556	>	switch (e.keysym.sym) {
1557	>	case SDLK_NUMLOCK:
1558	>	case SDLK_CAPSLOCK:
1559	>	case SDLK_SCROLLOCK:
1560	>	case SDLK_RSHIFT:
1561	>	case SDLK_LSHIFT:
1562	>	case SDLK_RCTRL:
1563	>	case SDLK_LCTRL:
1564	>	case SDLK_RALT:
1565	>	case SDLK_LALT:
1566	>	case SDLK_RMETA:
1567	>	case SDLK_LMETA:
1568	>	case SDLK_LSUPER:
1569	>	case SDLK_RSUPER:
1570	>	case SDLK_MODE:
1571	>	case SDLK_COMPOSE:
1572		return true;
1573		}
1574		return false;
1575		}
1576
1577	<	// Wait for graphics operation to finish
1573	<	bool NQD_sync_hook(uint32 arg)
1574	<	{
1575	<	D(bug("accl_sync_hook %08x\n", arg));
1576	<	return true;
1577	<	}
1578	<
1579	<	void VideoInstallAccel(void)
1577	>	static bool is_ctrl_down(SDL_keysym const & ks)
1578		{
1579	<	// Install acceleration hooks
1582	<	if (PrefsFindBool("gfxaccel")) {
1583	<	D(bug("Video: Installing acceleration hooks\n"));
1584	<	uint32 base;
1585	<
1586	<	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1587	<	base = bitblt_hook_info.addr();
1588	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1589	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1590	<	WriteMacInt32(base + 8, ACCL_BITBLT);
1591	<	NQDMisc(6, bitblt_hook_info.ptr());
1592	<
1593	<	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1594	<	base = fillrect_hook_info.addr();
1595	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1596	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1597	<	WriteMacInt32(base + 8, ACCL_FILLRECT);
1598	<	NQDMisc(6, fillrect_hook_info.ptr());
1599	<	}
1579	>	return ctrl_down \|\| (ks.mod & KMOD_CTRL);
1580		}
1601	–	#endif
1581
1582
1583		/*
#	Line 1606 \| Line 1585 \| void VideoInstallAccel(void)
1585		* and -2 if the key was recognized as a hotkey
1586		*/
1587
1609	–	static bool is_ctrl_down(SDL_keysym const & ks)
1610	–	{
1611	–	return ctrl_down \|\| (ks.mod & KMOD_CTRL);
1612	–	}
1613	–
1588		static int kc_decode(SDL_keysym const & ks, bool key_down)
1589		{
1590		switch (ks.sym) {
#	Line 1643 \| Line 1617 \| static int kc_decode(SDL_keysym const &
1617
1618		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1619		case SDLK_2: case SDLK_AT: return 0x13;
1620	<	// case SDLK_3: case SDLK_numbersign: return 0x14;
1620	>	case SDLK_3: case SDLK_HASH: return 0x14;
1621		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1622	<	// case SDLK_5: case SDLK_percent: return 0x17;
1622	>	case SDLK_5: return 0x17;
1623		case SDLK_6: return 0x16;
1624		case SDLK_7: return 0x1a;
1625		case SDLK_8: return 0x1c;
1626		case SDLK_9: return 0x19;
1627		case SDLK_0: return 0x1d;
1628
1629	<	// case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1629	>	case SDLK_BACKQUOTE: return 0x0a;
1630		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1631		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1632	<	// case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1633	<	// case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1634	<	// case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1632	>	case SDLK_LEFTBRACKET: return 0x21;
1633	>	case SDLK_RIGHTBRACKET: return 0x1e;
1634	>	case SDLK_BACKSLASH: return 0x2a;
1635		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1636	<	// case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1636	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1637		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1638		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1639		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1680 \| Line 1654 \| static int kc_decode(SDL_keysym const &
1654		case SDLK_RCTRL: return 0x36;
1655		case SDLK_LSHIFT: return 0x38;
1656		case SDLK_RSHIFT: return 0x38;
1657	+	#if (defined(__APPLE__) && defined(__MACH__))
1658	+	case SDLK_LALT: return 0x3a;
1659	+	case SDLK_RALT: return 0x3a;
1660	+	case SDLK_LMETA: return 0x37;
1661	+	case SDLK_RMETA: return 0x37;
1662	+	#else
1663		case SDLK_LALT: return 0x37;
1664		case SDLK_RALT: return 0x37;
1665		case SDLK_LMETA: return 0x3a;
1666		case SDLK_RMETA: return 0x3a;
1667	+	#endif
1668	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1669	+	case SDLK_RSUPER: return 0x3a;
1670		case SDLK_MENU: return 0x32;
1671		case SDLK_CAPSLOCK: return 0x39;
1672		case SDLK_NUMLOCK: return 0x47;
#	Line 1790 \| Line 1773 \| static void handle_events(void)
1773		// Keyboard
1774		case SDL_KEYDOWN: {
1775		int code = -1;
1776	<	if (use_keycodes) {
1776	>	if (use_keycodes && !is_modifier_key(event.key)) {
1777		if (event2keycode(event.key, true) != -2) // This is called to process the hotkeys
1778		code = keycode_table[event.key.keysym.scancode & 0xff];
1779		} else
#	Line 1818 \| Line 1801 \| static void handle_events(void)
1801		}
1802		case SDL_KEYUP: {
1803		int code = -1;
1804	<	if (use_keycodes) {
1804	>	if (use_keycodes && !is_modifier_key(event.key)) {
1805		if (event2keycode(event.key, false) != -2) // This is called to process the hotkeys
1806		code = keycode_table[event.key.keysym.scancode & 0xff];
1807		} else
1808		code = event2keycode(event.key, false);
1809	<	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
1810	<	ADBKeyUp(code);
1809	>	if (code >= 0) {
1810	>	if (code == 0x39) { // Caps Lock released
1811	>	if (caps_on) {
1812	>	ADBKeyUp(code);
1813	>	caps_on = false;
1814	>	} else {
1815	>	ADBKeyDown(code);
1816	>	caps_on = true;
1817	>	}
1818	>	} else
1819	>	ADBKeyUp(code);
1820		if (code == 0x36)
1821		ctrl_down = false;
1822		}
#	Line 1891 \| Line 1883 \| static void update_display_static(driver
1883
1884		// Check for first column from left and first column from right that have changed
1885		if (high) {
1886	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1886	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1887		const int src_bytes_per_row = bytes_per_row;
1888		const int dst_bytes_per_row = drv->s->pitch;
1889		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 2068 \| Line 2060 \| static void video_refresh_dga_vosf(void)
2060		tick_counter = 0;
2061		if (mainBuffer.dirty) {
2062		LOCK_VOSF;
2063	<	update_display_dga_vosf();
2063	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2064		UNLOCK_VOSF;
2065		}
2066		}
#	Line 2132 \| Line 2124 \| static void VideoRefreshInit(void)
2124		}
2125		}
2126
2127	+	static inline void do_video_refresh(void)
2128	+	{
2129	+	// Handle SDL events
2130	+	handle_events();
2131	+
2132	+	// Update display
2133	+	video_refresh();
2134	+
2135	+	#ifdef SHEEPSHAVER
2136	+	// Set new cursor image if it was changed
2137	+	if (cursor_changed && sdl_cursor) {
2138	+	cursor_changed = false;
2139	+	LOCK_EVENTS;
2140	+	SDL_FreeCursor(sdl_cursor);
2141	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2142	+	if (sdl_cursor)
2143	+	SDL_SetCursor(sdl_cursor);
2144	+	UNLOCK_EVENTS;
2145	+	}
2146	+	#endif
2147	+
2148	+	// Set new palette if it was changed
2149	+	handle_palette_changes();
2150	+	}
2151	+
2152	+	// This function is called on non-threaded platforms from a timer interrupt
2153	+	void VideoRefresh(void)
2154	+	{
2155	+	// We need to check redraw_thread_active to inhibit refreshed during
2156	+	// mode changes on non-threaded platforms
2157	+	if (!redraw_thread_active)
2158	+	return;
2159	+
2160	+	// Process pending events and update display
2161	+	do_video_refresh();
2162	+	}
2163	+
2164		const int VIDEO_REFRESH_HZ = 60;
2165		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2166
2167	+	#ifndef USE_CPU_EMUL_SERVICES
2168		static int redraw_func(void *arg)
2169		{
2170		uint64 start = GetTicks_usec();
#	Line 2152 \| Line 2182 \| *static int redraw_func(void arg)**
2182		next = GetTicks_usec();
2183		ticks++;
2184
2185	<	// Handle SDL events
2186	<	handle_events();
2187	<
2188	<	// Refresh display
2189	<	video_refresh();
2185	>	#ifdef SHEEPSHAVER
2186	>	// Pause if requested (during video mode switches)
2187	>	if (thread_stop_req) {
2188	>	thread_stop_ack = true;
2189	>	continue;
2190	>	}
2191	>	#endif
2192
2193	<	// Set new palette if it was changed
2194	<	handle_palette_changes();
2193	>	// Process pending events and update display
2194	>	do_video_refresh();
2195		}
2196
2197		uint64 end = GetTicks_usec();
2198		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2199		return 0;
2200		}
2201	+	#endif

Diff Legend

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

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents): Revision 1.5 by gbeauche, 2004-06-24T21:46:55Z vs. Revision 1.23 by gbeauche, 2006-03-28T07:01:19Z

Diff Legend

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.5 by gbeauche, 2004-06-24T21:46:55Z vs.
Revision 1.23 by gbeauche, 2006-03-28T07:01:19Z