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.10 by gbeauche, 2004-06-29T21:50:22Z vs.
Revision 1.30 by asvitkine, 2007-01-21T19:33:13Z

#	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	<	*  - Move generic Native QuickDraw acceleration routines to gfxaccel.cpp
40	>	*  - Factor out code
41		*/
42
43		#include "sysdeps.h"
#	Line 48 | 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 57 | Line 61
61		#include "video.h"
62		#include "video_defs.h"
63		#include "video_blit.h"
64	+	#include "vm_alloc.h"
65
66		#define DEBUG 0
67		#include "debug.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 123 | 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 146 | 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	+	{
200	+	return vm_acquire(size);
201	+	}
202	+
203	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
204	+	{
205	+	vm_release(fb, size);
206	+	}
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 190 | 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;
208	<	else
209	<	apple_id = APPLE_1600x1200;
210	<	return apple_id;
211	<	}
212	<
213	<	// Set parameters to specified Apple mode
214	<	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
215	<	{
216	<	switch (apple_id) {
217	<	case APPLE_640x480:
218	<	xsize = 640;
219	<	ysize = 480;
220	<	break;
221	<	case APPLE_800x600:
222	<	xsize = 800;
223	<	ysize = 600;
224	<	break;
225	<	case APPLE_1024x768:
226	<	xsize = 1024;
227	<	ysize = 768;
228	<	break;
229	<	case APPLE_1152x768:
230	<	xsize = 1152;
231	<	ysize = 768;
232	<	break;
233	<	case APPLE_1152x900:
234	<	xsize = 1152;
235	<	ysize = 900;
236	<	break;
237	<	case APPLE_1280x1024:
238	<	xsize = 1280;
239	<	ysize = 1024;
240	<	break;
241	<	case APPLE_1600x1200:
242	<	xsize = 1600;
243	<	ysize = 1200;
244	<	break;
245	<	default:
246	<	abort();
247	<	}
248	<	}
249	<
250	<	// Match Apple mode matching best specified dimensions
251	<	static int match_apple_resolution(int &xsize, int &ysize)
252	<	{
253	<	int apple_id = find_apple_resolution(xsize, ysize);
254	<	set_apple_resolution(apple_id, xsize, ysize);
255	<	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 325 | Line 376 | static inline int bytes_per_pixel(int de
376		}
377
378		// Map video_mode depth ID to numerical depth value
379	<	static int sdl_depth_of_video_depth(int video_depth)
379	>	static int mac_depth_of_video_depth(int video_depth)
380		{
381		int depth = -1;
382		switch (video_depth) {
#	Line 353 | Line 404 | static int sdl_depth_of_video_depth(int
404		return depth;
405		}
406
407	<	// Check wether specified mode is available
408	<	static bool has_mode(int type, int width, int height)
407	>	// Map video_mode depth ID to SDL screen depth
408	>	static int sdl_depth_of_video_depth(int video_depth)
409		{
410	<	// FIXME: no fullscreen support yet
411	<	if (type == DISPLAY_SCREEN)
361	<	return false;
410	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
411	>	}
412
413	+	// Get screen dimensions
414	+	static void sdl_display_dimensions(int &width, int &height)
415	+	{
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;
367	–
368	–	// Read window modes prefs
369	–	static uint32 window_modes = 0;
370	–	static uint32 screen_modes = 0;
371	–	if (window_modes == 0 || screen_modes == 0) {
372	–	window_modes = PrefsFindInt32("windowmodes");
373	–	screen_modes = PrefsFindInt32("screenmodes");
374	–	if (window_modes == 0 || screen_modes == 0)
375	–	window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
376	–	}
377	–
378	–	if (type == DISPLAY_WINDOW) {
379	–	int apple_mask, apple_id = find_apple_resolution(width, height);
380	–	switch (apple_id) {
381	–	case APPLE_640x480:             apple_mask = 0x01; break;
382	–	case APPLE_800x600:             apple_mask = 0x02; break;
383	–	case APPLE_1024x768:    apple_mask = 0x04; break;
384	–	case APPLE_1152x768:    apple_mask = 0x40; break;
385	–	case APPLE_1152x900:    apple_mask = 0x08; break;
386	–	case APPLE_1280x1024:   apple_mask = 0x10; break;
387	–	case APPLE_1600x1200:   apple_mask = 0x20; break;
388	–	default:                                apple_mask = 0x00; break;
389	–	}
390	–	return (window_modes & apple_mask);
391	–	}
392	–	#else
393	–	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
409	<	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 417 | Line 488 | static void add_mode(int type, int width
488		VideoModes.push_back(mode);
489		}
490
420	–	// Add standard list of windowed modes for given color depth
421	–	static void add_window_modes(int depth)
422	–	{
423	–	video_depth vdepth = (video_depth)depth;
424	–	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
425	–	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
426	–	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
427	–	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
428	–	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
429	–	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
430	–	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
431	–	}
432	–
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 469 | 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 528 | 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 549 | Line 662 | driver_base::~driver_base()
662		if (s)
663		SDL_FreeSurface(s);
664
665	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
666	+	if (the_buffer != VM_MAP_FAILED) {
667	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
668	+	vm_release_framebuffer(the_buffer, the_buffer_size);
669	+	the_buffer = NULL;
670	+	}
671	+
672		// Free frame buffer(s)
673		if (!use_vosf) {
554	–	if (the_buffer) {
555	–	free(the_buffer);
556	–	the_buffer = NULL;
557	–	}
674		if (the_buffer_copy) {
675		free(the_buffer_copy);
676		the_buffer_copy = NULL;
#	Line 562 | Line 678 | driver_base::~driver_base()
678		}
679		#ifdef ENABLE_VOSF
680		else {
565	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
566	–	if (the_buffer != VM_MAP_FAILED) {
567	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
568	–	vm_release(the_buffer, the_buffer_size);
569	–	the_buffer = NULL;
570	–	}
681		if (the_host_buffer) {
682		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
683		free(the_host_buffer);
#	Line 578 | Line 688 | driver_base::~driver_base()
688		free(the_buffer_copy);
689		the_buffer_copy = NULL;
690		}
691	+
692	+	// Deinitialize VOSF
693	+	video_vosf_exit();
694		}
695		#endif
696		}
#	Line 606 | 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 617 | 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	+	if (SDL_display_opened)
743	+	SDL_Quit();
744	+
745		// Create surface
746	<	int depth = ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
746	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
747		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
748		return;
749
750	+	SDL_display_opened = TRUE;
751	+
752		#ifdef ENABLE_VOSF
753		use_vosf = true;
754		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
755		the_host_buffer = (uint8 *)s->pixels;
756		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
757	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
757	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
758		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
759		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
760
#	Line 651 | Line 778 | driver_window::driver_window(SDL_monitor
778		// Allocate memory for frame buffer
779		the_buffer_size = (aligned_height + 2) * s->pitch;
780		the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
781	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
781	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
782		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
783		}
784
#	Line 676 | Line 803 | driver_window::driver_window(SDL_monitor
803		visualFormat.Rmask = f->Rmask;
804		visualFormat.Gmask = f->Gmask;
805		visualFormat.Bmask = f->Bmask;
806	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
806	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
807
808		// Load gray ramp to 8->16/32 expand map
809		if (!IsDirectMode(mode))
#	Line 743 | Line 870 | void driver_window::mouse_moved(int x, i
870		ADBMouseMoved(x, y);
871		}
872
873	+
874	+	/*
875	+	*  Full-screen display driver
876	+	*/
877	+
878	+	// Open display
879	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
880	+	: driver_base(m)
881	+	{
882	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
883	+	int aligned_width = (width + 15) & ~15;
884	+	int aligned_height = (height + 15) & ~15;
885	+
886	+	// Set absolute mouse mode
887	+	ADBSetRelMouseMode(false);
888	+
889	+	// Create surface
890	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
891	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
892	+	return;
893	+
894	+	#ifdef ENABLE_VOSF
895	+	use_vosf = true;
896	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
897	+	the_host_buffer = (uint8 *)s->pixels;
898	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
899	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
900	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
901	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
902	+
903	+	// Check whether we can initialize the VOSF subsystem and it's profitable
904	+	if (!video_vosf_init(m)) {
905	+	WarningAlert(STR_VOSF_INIT_ERR);
906	+	use_vosf = false;
907	+	}
908	+	else if (!video_vosf_profitable()) {
909	+	video_vosf_exit();
910	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
911	+	use_vosf = false;
912	+	}
913	+	if (!use_vosf) {
914	+	free(the_buffer_copy);
915	+	vm_release(the_buffer, the_buffer_size);
916	+	the_host_buffer = NULL;
917	+	}
918	+	#endif
919	+	if (!use_vosf) {
920	+	// Allocate memory for frame buffer
921	+	the_buffer_size = (aligned_height + 2) * s->pitch;
922	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
923	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
924	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
925	+	}
926	+
927	+	// Hide cursor
928	+	SDL_ShowCursor(0);
929	+
930	+	// Init blitting routines
931	+	SDL_PixelFormat *f = s->format;
932	+	VisualFormat visualFormat;
933	+	visualFormat.depth = depth;
934	+	visualFormat.Rmask = f->Rmask;
935	+	visualFormat.Gmask = f->Gmask;
936	+	visualFormat.Bmask = f->Bmask;
937	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
938	+
939	+	// Load gray ramp to 8->16/32 expand map
940	+	if (!IsDirectMode(mode))
941	+	for (int i=0; i<256; i++)
942	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
943	+
944	+	// Set frame buffer base
945	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
946	+
947	+	// Everything went well
948	+	init_ok = true;
949	+	}
950	+
951	+	// Close display
952	+	driver_fullscreen::~driver_fullscreen()
953	+	{
954	+	#ifdef ENABLE_VOSF
955	+	if (use_vosf)
956	+	the_host_buffer = NULL; // don't free() in driver_base dtor
957	+	#endif
958	+	if (s)
959	+	SDL_FreeSurface(s);
960	+
961	+	// Show cursor
962	+	SDL_ShowCursor(1);
963	+	}
964	+
965	+
966		/*
967		*  Initialization
968		*/
#	Line 774 | Line 994 | static void keycode_init(void)
994		SDL_VideoDriverName(video_driver, sizeof(video_driver));
995		bool video_driver_found = false;
996		char line[256];
997	+	int n_keys = 0;
998		while (fgets(line, sizeof(line) - 1, f)) {
999		// Read line
1000		int len = strlen(line);
#	Line 786 | Line 1007 | static void keycode_init(void)
1007		continue;
1008
1009		if (video_driver_found) {
1010	<	// Skip aliases
1010	>	// Skip aliases as long as we have read keycodes yet
1011	>	// Otherwise, it's another mapping and we have to stop
1012		static const char sdl_str[] = "sdl";
1013	<	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0)
1013	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1014		continue;
1015
1016		// Read keycode
1017		int x_code, mac_code;
1018		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1019	<	keycode_table[x_code & 0xff] = mac_code;
1019	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1020		else
1021		break;
1022		} else {
#	Line 819 | Line 1041 | static void keycode_init(void)
1041		WarningAlert(str);
1042		return;
1043		}
1044	+
1045	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1046		}
1047		}
1048
#	Line 837 | Line 1061 | bool SDL_monitor_desc::video_open(void)
1061		case DISPLAY_WINDOW:
1062		drv = new(std::nothrow) driver_window(*this);
1063		break;
1064	+	case DISPLAY_SCREEN:
1065	+	drv = new(std::nothrow) driver_fullscreen(*this);
1066	+	break;
1067		}
1068		if (drv == NULL)
1069		return false;
#	Line 846 | Line 1073 | bool SDL_monitor_desc::video_open(void)
1073		return false;
1074		}
1075
1076	+	#ifdef WIN32
1077	+	// Chain in a new message handler for WM_DEVICECHANGE
1078	+	HWND the_window = GetMainWindowHandle();
1079	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1080	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1081	+	#endif
1082	+
1083		// Initialize VideoRefresh function
1084		VideoRefreshInit();
1085
#	Line 853 | Line 1087 | bool SDL_monitor_desc::video_open(void)
1087		LOCK_FRAME_BUFFER;
1088
1089		// Start redraw/input thread
1090	+	#ifndef USE_CPU_EMUL_SERVICES
1091		redraw_thread_cancel = false;
1092		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1093		if (!redraw_thread_active) {
1094		printf("FATAL: cannot create redraw thread\n");
1095		return false;
1096		}
1097	+	#else
1098	+	redraw_thread_active = true;
1099	+	#endif
1100		return true;
1101		}
1102
#	Line 879 | Line 1117 | bool VideoInit(bool classic)
1117		#endif
1118
1119		// Create Mutexes
1120	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1121	+	return false;
1122		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1123		return false;
1124		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 893 | Line 1133 | bool VideoInit(bool classic)
1133		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1134
1135		// Get screen mode from preferences
1136	+	migrate_screen_prefs();
1137		const char *mode_str = NULL;
897	–	#ifndef SHEEPSHAVER
1138		if (classic_mode)
1139		mode_str = "win/512/342";
1140		else
1141		mode_str = PrefsFindString("screen");
902	–	#endif
1142
1143		// Determine display type and default dimensions
1144		int default_width, default_height;
#	Line 915 | Line 1154 | bool VideoInit(bool classic)
1154		if (mode_str) {
1155		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1156		display_type = DISPLAY_WINDOW;
1157	<	}
1158	<	int max_width = 640, max_height = 480;
920	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
921	<	if (modes && modes != (SDL_Rect **)-1) {
922	<	max_width = modes[0]->w;
923	<	max_height = modes[0]->h;
924	<	if (default_width > max_width)
925	<	default_width = max_width;
926	<	if (default_height > max_height)
927	<	default_height = max_height;
1157	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1158	>	display_type = DISPLAY_SCREEN;
1159		}
1160		if (default_width <= 0)
1161	<	default_width = max_width;
1161	>	default_width = sdl_display_width();
1162	>	else if (default_width > sdl_display_width())
1163	>	default_width = sdl_display_width();
1164		if (default_height <= 0)
1165	<	default_height = max_height;
1165	>	default_height = sdl_display_height();
1166	>	else if (default_height > sdl_display_height())
1167	>	default_height = sdl_display_height();
1168
1169		// Mac screen depth follows X depth
1170		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 949 | Line 1184 | bool VideoInit(bool classic)
1184		break;
1185		}
1186
1187	+	// Initialize list of video modes to try
1188	+	struct {
1189	+	int w;
1190	+	int h;
1191	+	int resolution_id;
1192	+	}
1193	+	video_modes[] = {
1194	+	{   -1,   -1, 0x80 },
1195	+	{  512,  384, 0x80 },
1196	+	{  640,  480, 0x81 },
1197	+	{  800,  600, 0x82 },
1198	+	{ 1024,  768, 0x83 },
1199	+	{ 1152,  870, 0x84 },
1200	+	{ 1280, 1024, 0x85 },
1201	+	{ 1600, 1200, 0x86 },
1202	+	{ 0, }
1203	+	};
1204	+	video_modes[0].w = default_width;
1205	+	video_modes[0].h = default_height;
1206	+
1207		// Construct list of supported modes
1208		if (display_type == DISPLAY_WINDOW) {
1209		if (classic)
1210		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1211		else {
1212	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1213	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1214	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1215	<	add_window_modes(video_depth(d));
1212	>	for (int i = 0; video_modes[i].w != 0; i++) {
1213	>	const int w = video_modes[i].w;
1214	>	const int h = video_modes[i].h;
1215	>	if (i > 0 && (w >= default_width || h >= default_height))
1216	>	continue;
1217	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1218	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1219		}
1220		}
1221	<	} else
1222	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1221	>	} else if (display_type == DISPLAY_SCREEN) {
1222	>	for (int i = 0; video_modes[i].w != 0; i++) {
1223	>	const int w = video_modes[i].w;
1224	>	const int h = video_modes[i].h;
1225	>	if (i > 0 && (w >= default_width || h >= default_height))
1226	>	continue;
1227	>	if (w == 512 && h == 384)
1228	>	continue;
1229	>	#ifdef ENABLE_VOSF
1230	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1231	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1232	>	#else
1233	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1234	>	#endif
1235	>	}
1236	>	}
1237	>
1238		if (VideoModes.empty()) {
1239		ErrorAlert(STR_NO_XVISUAL_ERR);
1240		return false;
#	Line 1032 | Line 1305 | void SDL_monitor_desc::video_close(void)
1305		{
1306		D(bug("video_close()\n"));
1307
1308	+	#ifdef WIN32
1309	+	// Remove message handler for WM_DEVICECHANGE
1310	+	HWND the_window = GetMainWindowHandle();
1311	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1312	+	#endif
1313	+
1314		// Stop redraw thread
1315	+	#ifndef USE_CPU_EMUL_SERVICES
1316		if (redraw_thread_active) {
1317		redraw_thread_cancel = true;
1318		SDL_WaitThread(redraw_thread, NULL);
1319		}
1320	+	#endif
1321		redraw_thread_active = false;
1322
1323		// Unlock frame buffer
1324		UNLOCK_FRAME_BUFFER;
1325		D(bug(" frame buffer unlocked\n"));
1326
1046	–	#ifdef ENABLE_VOSF
1047	–	if (use_vosf) {
1048	–	// Deinitialize VOSF
1049	–	video_vosf_exit();
1050	–	}
1051	–	#endif
1052	–
1327		// Close display
1328		delete drv;
1329		drv = NULL;
#	Line 1067 | Line 1341 | void VideoExit(void)
1341		SDL_DestroyMutex(frame_buffer_lock);
1342		if (sdl_palette_lock)
1343		SDL_DestroyMutex(sdl_palette_lock);
1344	+	if (sdl_events_lock)
1345	+	SDL_DestroyMutex(sdl_events_lock);
1346		}
1347
1348
#	Line 1208 | Line 1484 | int16 video_mode_change(VidLocals *csSav
1484		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1485		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1486
1487	<	// Disable interrupts
1487	>	// Disable interrupts and pause redraw thread
1488		DisableInterrupt();
1489	+	thread_stop_ack = false;
1490	+	thread_stop_req = true;
1491	+	while (!thread_stop_ack) ;
1492
1493		cur_mode = i;
1494		monitor_desc *monitor = VideoMonitors[0];
#	Line 1220 | Line 1499 | int16 video_mode_change(VidLocals *csSav
1499		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1500		csSave->saveMode=VModes[cur_mode].viAppleMode;
1501
1502	<	// Enable interrupts
1502	>	// Enable interrupts and resume redraw thread
1503	>	thread_stop_req = false;
1504		EnableInterrupt();
1505		return noErr;
1506		}
#	Line 1232 | Line 1512 | int16 video_mode_change(VidLocals *csSav
1512		void SDL_monitor_desc::switch_to_current_mode(void)
1513		{
1514		// Close and reopen display
1515	+	LOCK_EVENTS;
1516		video_close();
1517		video_open();
1518	+	UNLOCK_EVENTS;
1519
1520		if (drv == NULL) {
1521		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1267 | Line 1549 | void video_set_cursor(void)
1549
1550
1551		/*
1270	–	*  Install graphics acceleration
1271	–	*/
1272	–
1273	–	#ifdef SHEEPSHAVER
1274	–	// Rectangle inversion
1275	–	template< int bpp >
1276	–	static inline void do_invrect(uint8 *dest, uint32 length)
1277	–	{
1278	–	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1279	–	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1280	–	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1281	–	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1282	–
1283	–	#ifndef UNALIGNED_PROFITABLE
1284	–	// Align on 16-bit boundaries
1285	–	if (bpp < 16 && (((uintptr)dest) & 1)) {
1286	–	INVERT_1(dest, 0);
1287	–	dest += 1; length -= 1;
1288	–	}
1289	–
1290	–	// Align on 32-bit boundaries
1291	–	if (bpp < 32 && (((uintptr)dest) & 2)) {
1292	–	INVERT_2(dest, 0);
1293	–	dest += 2; length -= 2;
1294	–	}
1295	–	#endif
1296	–
1297	–	// Invert 8-byte words
1298	–	if (length >= 8) {
1299	–	const int r = (length / 8) % 8;
1300	–	dest += r * 8;
1301	–
1302	–	int n = ((length / 8) + 7) / 8;
1303	–	switch (r) {
1304	–	case 0: do {
1305	–	dest += 64;
1306	–	INVERT_8(dest, -8);
1307	–	case 7: INVERT_8(dest, -7);
1308	–	case 6: INVERT_8(dest, -6);
1309	–	case 5: INVERT_8(dest, -5);
1310	–	case 4: INVERT_8(dest, -4);
1311	–	case 3: INVERT_8(dest, -3);
1312	–	case 2: INVERT_8(dest, -2);
1313	–	case 1: INVERT_8(dest, -1);
1314	–	} while (--n > 0);
1315	–	}
1316	–	}
1317	–
1318	–	// 32-bit cell to invert?
1319	–	if (length & 4) {
1320	–	INVERT_4(dest, 0);
1321	–	if (bpp <= 16)
1322	–	dest += 4;
1323	–	}
1324	–
1325	–	// 16-bit cell to invert?
1326	–	if (bpp <= 16 && (length & 2)) {
1327	–	INVERT_2(dest, 0);
1328	–	if (bpp <= 8)
1329	–	dest += 2;
1330	–	}
1331	–
1332	–	// 8-bit cell to invert?
1333	–	if (bpp <= 8 && (length & 1))
1334	–	INVERT_1(dest, 0);
1335	–
1336	–	#undef INVERT_1
1337	–	#undef INVERT_2
1338	–	#undef INVERT_4
1339	–	#undef INVERT_8
1340	–	}
1341	–
1342	–	void NQD_invrect(uint32 p)
1343	–	{
1344	–	D(bug("accl_invrect %08x\n", p));
1345	–
1346	–	// Get inversion parameters
1347	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1348	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1349	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1350	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1351	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1352	–	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1353	–
1354	–	//!!?? pen_mode == 14
1355	–
1356	–	// And perform the inversion
1357	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1358	–	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1359	–	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1360	–	width *= bpp;
1361	–	switch (bpp) {
1362	–	case 1:
1363	–	for (int i = 0; i < height; i++) {
1364	–	do_invrect<8>(dest, width);
1365	–	dest += dest_row_bytes;
1366	–	}
1367	–	break;
1368	–	case 2:
1369	–	for (int i = 0; i < height; i++) {
1370	–	do_invrect<16>(dest, width);
1371	–	dest += dest_row_bytes;
1372	–	}
1373	–	break;
1374	–	case 4:
1375	–	for (int i = 0; i < height; i++) {
1376	–	do_invrect<32>(dest, width);
1377	–	dest += dest_row_bytes;
1378	–	}
1379	–	break;
1380	–	}
1381	–	}
1382	–
1383	–	// Rectangle filling
1384	–	template< int bpp >
1385	–	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1386	–	{
1387	–	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1388	–	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1389	–	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1390	–	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1391	–
1392	–	#ifndef UNALIGNED_PROFITABLE
1393	–	// Align on 16-bit boundaries
1394	–	if (bpp < 16 && (((uintptr)dest) & 1)) {
1395	–	FILL_1(dest, 0, color);
1396	–	dest += 1; length -= 1;
1397	–	}
1398	–
1399	–	// Align on 32-bit boundaries
1400	–	if (bpp < 32 && (((uintptr)dest) & 2)) {
1401	–	FILL_2(dest, 0, color);
1402	–	dest += 2; length -= 2;
1403	–	}
1404	–	#endif
1405	–
1406	–	// Fill 8-byte words
1407	–	if (length >= 8) {
1408	–	const uint64 c = (((uint64)color) << 32) | color;
1409	–	const int r = (length / 8) % 8;
1410	–	dest += r * 8;
1411	–
1412	–	int n = ((length / 8) + 7) / 8;
1413	–	switch (r) {
1414	–	case 0: do {
1415	–	dest += 64;
1416	–	FILL_8(dest, -8, c);
1417	–	case 7: FILL_8(dest, -7, c);
1418	–	case 6: FILL_8(dest, -6, c);
1419	–	case 5: FILL_8(dest, -5, c);
1420	–	case 4: FILL_8(dest, -4, c);
1421	–	case 3: FILL_8(dest, -3, c);
1422	–	case 2: FILL_8(dest, -2, c);
1423	–	case 1: FILL_8(dest, -1, c);
1424	–	} while (--n > 0);
1425	–	}
1426	–	}
1427	–
1428	–	// 32-bit cell to fill?
1429	–	if (length & 4) {
1430	–	FILL_4(dest, 0, color);
1431	–	if (bpp <= 16)
1432	–	dest += 4;
1433	–	}
1434	–
1435	–	// 16-bit cell to fill?
1436	–	if (bpp <= 16 && (length & 2)) {
1437	–	FILL_2(dest, 0, color);
1438	–	if (bpp <= 8)
1439	–	dest += 2;
1440	–	}
1441	–
1442	–	// 8-bit cell to fill?
1443	–	if (bpp <= 8 && (length & 1))
1444	–	FILL_1(dest, 0, color);
1445	–
1446	–	#undef FILL_1
1447	–	#undef FILL_2
1448	–	#undef FILL_4
1449	–	#undef FILL_8
1450	–	}
1451	–
1452	–	void NQD_fillrect(uint32 p)
1453	–	{
1454	–	D(bug("accl_fillrect %08x\n", p));
1455	–
1456	–	// Get filling parameters
1457	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1458	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1459	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1460	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1461	–	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1462	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1463	–	D(bug(" width %d, height %d\n", width, height));
1464	–	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1465	–
1466	–	// And perform the fill
1467	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1468	–	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1469	–	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1470	–	width *= bpp;
1471	–	switch (bpp) {
1472	–	case 1:
1473	–	for (int i = 0; i < height; i++) {
1474	–	memset(dest, color, width);
1475	–	dest += dest_row_bytes;
1476	–	}
1477	–	break;
1478	–	case 2:
1479	–	for (int i = 0; i < height; i++) {
1480	–	do_fillrect<16>(dest, color, width);
1481	–	dest += dest_row_bytes;
1482	–	}
1483	–	break;
1484	–	case 4:
1485	–	for (int i = 0; i < height; i++) {
1486	–	do_fillrect<32>(dest, color, width);
1487	–	dest += dest_row_bytes;
1488	–	}
1489	–	break;
1490	–	}
1491	–	}
1492	–
1493	–	bool NQD_fillrect_hook(uint32 p)
1494	–	{
1495	–	D(bug("accl_fillrect_hook %08x\n", p));
1496	–
1497	–	// Check if we can accelerate this fillrect
1498	–	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1499	–	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1500	–	if (transfer_mode == 8) {
1501	–	// Fill
1502	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1503	–	return true;
1504	–	}
1505	–	else if (transfer_mode == 10) {
1506	–	// Invert
1507	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1508	–	return true;
1509	–	}
1510	–	}
1511	–	return false;
1512	–	}
1513	–
1514	–	// Rectangle blitting
1515	–	// TODO: optimize for VOSF and target pixmap == screen
1516	–	void NQD_bitblt(uint32 p)
1517	–	{
1518	–	D(bug("accl_bitblt %08x\n", p));
1519	–
1520	–	// Get blitting parameters
1521	–	int16 src_X  = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1522	–	int16 src_Y  = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1523	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1524	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1525	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1526	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1527	–	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1528	–	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1529	–	D(bug(" width %d, height %d\n", width, height));
1530	–
1531	–	// And perform the blit
1532	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1533	–	width *= bpp;
1534	–	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1535	–	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1536	–	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1537	–	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp));
1538	–	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp));
1539	–	for (int i = 0; i < height; i++) {
1540	–	memmove(dst, src, width);
1541	–	src += src_row_bytes;
1542	–	dst += dst_row_bytes;
1543	–	}
1544	–	}
1545	–	else {
1546	–	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1547	–	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1548	–	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp));
1549	–	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp));
1550	–	for (int i = height - 1; i >= 0; i--) {
1551	–	memmove(dst, src, width);
1552	–	src -= src_row_bytes;
1553	–	dst -= dst_row_bytes;
1554	–	}
1555	–	}
1556	–	}
1557	–
1558	–	/*
1559	–	BitBlt transfer modes:
1560	–	0 : srcCopy
1561	–	1 : srcOr
1562	–	2 : srcXor
1563	–	3 : srcBic
1564	–	4 : notSrcCopy
1565	–	5 : notSrcOr
1566	–	6 : notSrcXor
1567	–	7 : notSrcBic
1568	–	32 : blend
1569	–	33 : addPin
1570	–	34 : addOver
1571	–	35 : subPin
1572	–	36 : transparent
1573	–	37 : adMax
1574	–	38 : subOver
1575	–	39 : adMin
1576	–	50 : hilite
1577	–	*/
1578	–
1579	–	bool NQD_bitblt_hook(uint32 p)
1580	–	{
1581	–	D(bug("accl_draw_hook %08x\n", p));
1582	–
1583	–	// Check if we can accelerate this bitblt
1584	–	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1585	–	ReadMacInt32(p + 0x130) == 0 &&
1586	–	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1587	–	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1588	–	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1589	–	ReadMacInt32(p + acclTransferMode) == 0 &&                                                                               // srcCopy?
1590	–	ReadMacInt32(p + 0x15c) > 0) {
1591	–
1592	–	// Yes, set function pointer
1593	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1594	–	return true;
1595	–	}
1596	–	return false;
1597	–	}
1598	–
1599	–	// Wait for graphics operation to finish
1600	–	bool NQD_sync_hook(uint32 arg)
1601	–	{
1602	–	D(bug("accl_sync_hook %08x\n", arg));
1603	–	return true;
1604	–	}
1605	–
1606	–	void VideoInstallAccel(void)
1607	–	{
1608	–	// Install acceleration hooks
1609	–	if (PrefsFindBool("gfxaccel")) {
1610	–	D(bug("Video: Installing acceleration hooks\n"));
1611	–	uint32 base;
1612	–
1613	–	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1614	–	base = bitblt_hook_info.addr();
1615	–	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1616	–	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1617	–	WriteMacInt32(base + 8, ACCL_BITBLT);
1618	–	NQDMisc(6, bitblt_hook_info.ptr());
1619	–
1620	–	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1621	–	base = fillrect_hook_info.addr();
1622	–	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1623	–	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1624	–	WriteMacInt32(base + 8, ACCL_FILLRECT);
1625	–	NQDMisc(6, fillrect_hook_info.ptr());
1626	–	}
1627	–	}
1628	–	#endif
1629	–
1630	–
1631	–	/*
1552		*  Keyboard-related utilify functions
1553		*/
1554
#	Line 1698 | Line 1618 | static int kc_decode(SDL_keysym const &
1618
1619		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1620		case SDLK_2: case SDLK_AT: return 0x13;
1621	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1621	>	case SDLK_3: case SDLK_HASH: return 0x14;
1622		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1623	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1623	>	case SDLK_5: return 0x17;
1624		case SDLK_6: return 0x16;
1625		case SDLK_7: return 0x1a;
1626		case SDLK_8: return 0x1c;
1627		case SDLK_9: return 0x19;
1628		case SDLK_0: return 0x1d;
1629
1630	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1630	>	case SDLK_BACKQUOTE: return 0x0a;
1631		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1632		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1633	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1634	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1635	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1633	>	case SDLK_LEFTBRACKET: return 0x21;
1634	>	case SDLK_RIGHTBRACKET: return 0x1e;
1635	>	case SDLK_BACKSLASH: return 0x2a;
1636		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1637	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1637	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1638		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1639		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1640		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1746 | Line 1666 | static int kc_decode(SDL_keysym const &
1666		case SDLK_LMETA: return 0x3a;
1667		case SDLK_RMETA: return 0x3a;
1668		#endif
1669	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1670	+	case SDLK_RSUPER: return 0x3a;
1671		case SDLK_MENU: return 0x32;
1672		case SDLK_CAPSLOCK: return 0x39;
1673		case SDLK_NUMLOCK: return 0x47;
#	Line 2079 | Line 2001 | static void update_display_static(driver
2001		}
2002		}
2003
2004	+	// Static display update (fixed frame rate, bounding boxes based)
2005	+	// XXX use NQD bounding boxes to help detect dirty areas?
2006	+	static void update_display_static_bbox(driver_window *drv)
2007	+	{
2008	+	const VIDEO_MODE &mode = drv->mode;
2009	+
2010	+	// Allocate bounding boxes for SDL_UpdateRects()
2011	+	const int N_PIXELS = 64;
2012	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2013	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2014	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2015	+	int nr_boxes = 0;
2016	+
2017	+	// Lock surface, if required
2018	+	if (SDL_MUSTLOCK(drv->s))
2019	+	SDL_LockSurface(drv->s);
2020	+
2021	+	// Update the surface from Mac screen
2022	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2023	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2024	+	int x, y;
2025	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2026	+	int h = N_PIXELS;
2027	+	if (h > VIDEO_MODE_Y - y)
2028	+	h = VIDEO_MODE_Y - y;
2029	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2030	+	int w = N_PIXELS;
2031	+	if (w > VIDEO_MODE_X - x)
2032	+	w = VIDEO_MODE_X - x;
2033	+	const int xs = w * bytes_per_pixel;
2034	+	const int xb = x * bytes_per_pixel;
2035	+	bool dirty = false;
2036	+	for (int j = y; j < (y + h); j++) {
2037	+	const int yb = j * bytes_per_row;
2038	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2039	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2040	+	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2041	+	dirty = true;
2042	+	}
2043	+	}
2044	+	if (dirty) {
2045	+	boxes[nr_boxes].x = x;
2046	+	boxes[nr_boxes].y = y;
2047	+	boxes[nr_boxes].w = w;
2048	+	boxes[nr_boxes].h = h;
2049	+	nr_boxes++;
2050	+	}
2051	+	}
2052	+	}
2053	+
2054	+	// Unlock surface, if required
2055	+	if (SDL_MUSTLOCK(drv->s))
2056	+	SDL_UnlockSurface(drv->s);
2057	+
2058	+	// Refresh display
2059	+	if (nr_boxes)
2060	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2061	+	}
2062	+
2063
2064		// We suggest the compiler to inline the next two functions so that it
2065		// may specialise the code according to the current screen depth and
#	Line 2139 | Line 2120 | static void video_refresh_dga_vosf(void)
2120		tick_counter = 0;
2121		if (mainBuffer.dirty) {
2122		LOCK_VOSF;
2123	<	update_display_dga_vosf();
2123	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2124		UNLOCK_VOSF;
2125		}
2126		}
#	Line 2173 | Line 2154 | static void video_refresh_window_static(
2154		static int tick_counter = 0;
2155		if (++tick_counter >= frame_skip) {
2156		tick_counter = 0;
2157	<	update_display_static(static_cast<driver_window *>(drv));
2157	>	const VIDEO_MODE &mode = drv->mode;
2158	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2159	>	update_display_static_bbox(static_cast<driver_window *>(drv));
2160	>	else
2161	>	update_display_static(static_cast<driver_window *>(drv));
2162		}
2163		}
2164
#	Line 2203 | Line 2188 | static void VideoRefreshInit(void)
2188		}
2189		}
2190
2191	+	static inline void do_video_refresh(void)
2192	+	{
2193	+	// Handle SDL events
2194	+	handle_events();
2195	+
2196	+	// Update display
2197	+	video_refresh();
2198	+
2199	+	#ifdef SHEEPSHAVER
2200	+	// Set new cursor image if it was changed
2201	+	if (cursor_changed && sdl_cursor) {
2202	+	cursor_changed = false;
2203	+	LOCK_EVENTS;
2204	+	SDL_FreeCursor(sdl_cursor);
2205	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2206	+	if (sdl_cursor) {
2207	+	SDL_SetCursor(sdl_cursor);
2208	+	#ifdef WIN32
2209	+	// XXX Windows apparently needs an extra mouse event to
2210	+	// make the new cursor image visible
2211	+	int visible = SDL_ShowCursor(-1);
2212	+	if (visible) {
2213	+	int x, y;
2214	+	SDL_GetMouseState(&x, &y);
2215	+	SDL_WarpMouse(x, y);
2216	+	}
2217	+	#endif
2218	+	}
2219	+	UNLOCK_EVENTS;
2220	+	}
2221	+	#endif
2222	+
2223	+	// Set new palette if it was changed
2224	+	handle_palette_changes();
2225	+	}
2226	+
2227	+	// This function is called on non-threaded platforms from a timer interrupt
2228	+	void VideoRefresh(void)
2229	+	{
2230	+	// We need to check redraw_thread_active to inhibit refreshed during
2231	+	// mode changes on non-threaded platforms
2232	+	if (!redraw_thread_active)
2233	+	return;
2234	+
2235	+	// Process pending events and update display
2236	+	do_video_refresh();
2237	+	}
2238	+
2239		const int VIDEO_REFRESH_HZ = 60;
2240		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2241
2242	+	#ifndef USE_CPU_EMUL_SERVICES
2243		static int redraw_func(void *arg)
2244		{
2245		uint64 start = GetTicks_usec();
#	Line 2223 | Line 2257 | static int redraw_func(void *arg)
2257		next = GetTicks_usec();
2258		ticks++;
2259
2226	–	// Handle SDL events
2227	–	handle_events();
2228	–
2229	–	// Refresh display
2230	–	video_refresh();
2231	–
2260		#ifdef SHEEPSHAVER
2261	<	// Set new cursor image if it was changed
2262	<	if (cursor_changed && sdl_cursor) {
2263	<	cursor_changed = false;
2264	<	SDL_FreeCursor(sdl_cursor);
2237	<	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2238	<	if (sdl_cursor)
2239	<	SDL_SetCursor(sdl_cursor);
2261	>	// Pause if requested (during video mode switches)
2262	>	if (thread_stop_req) {
2263	>	thread_stop_ack = true;
2264	>	continue;
2265		}
2266		#endif
2267
2268	<	// Set new palette if it was changed
2269	<	handle_palette_changes();
2268	>	// Process pending events and update display
2269	>	do_video_refresh();
2270		}
2271
2272		uint64 end = GetTicks_usec();
2273		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2274		return 0;
2275		}
2276	+	#endif
2277	+
2278	+
2279	+	/*
2280	+	*  Record dirty area from NQD
2281	+	*/
2282	+
2283	+	#ifdef SHEEPSHAVER
2284	+	void video_set_dirty_area(int x, int y, int w, int h)
2285	+	{
2286	+	const VIDEO_MODE &mode = drv->mode;
2287	+	const int screen_width = VIDEO_MODE_X;
2288	+	const int screen_height = VIDEO_MODE_Y;
2289	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2290	+
2291	+	#ifdef ENABLE_VOSF
2292	+	if (use_vosf) {
2293	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2294	+	return;
2295	+	}
2296	+	#endif
2297	+
2298	+	// XXX handle dirty bounding boxes for non-VOSF modes
2299	+	}
2300	+	#endif

Diff Legend

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