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.9 by gbeauche, 2004-06-27T17:31:21Z vs.
Revision 1.28 by gbeauche, 2006-05-14T13:49:53Z

#	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 37 | Line 38
38		*    Besides, there can't seem to be a way to call SetVideoMode() from a child thread.
39		*  - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
40		*  - Backport hw cursor acceleration to Basilisk II?
41	<	*  - Move generic Native QuickDraw acceleration routines to gfxaccel.cpp
41	>	*  - Factor out code
42		*/
43
44		#include "sysdeps.h"
#	Line 48 | Line 49
49		#include <errno.h>
50		#include <vector>
51
52	+	#ifdef WIN32
53	+	#include <malloc.h> /* alloca() */
54	+	#endif
55	+
56		#include "cpu_emulation.h"
57		#include "main.h"
58		#include "adb.h"
#	Line 57 | Line 62
62		#include "video.h"
63		#include "video_defs.h"
64		#include "video_blit.h"
65	+	#include "vm_alloc.h"
66
67		#define DEBUG 0
68		#include "debug.h"
#	Line 82 | Line 88 | static int display_type = DISPLAY_WINDOW
88		#endif
89
90		// Constants
91	+	#ifdef WIN32
92	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
93	+	#else
94		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
95	+	#endif
96
97
98		// Global variables
#	Line 95 | Line 105 | static uint8 *the_buffer_copy = NULL;
105		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
106
107		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
108	+	#ifndef USE_CPU_EMUL_SERVICES
109		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
110		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
111	+	#ifdef SHEEPSHAVER
112	+	static volatile bool thread_stop_req = false;
113	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
114	+	#endif
115	+	#endif
116
117		#ifdef ENABLE_VOSF
118		static bool use_vosf = false;                                           // Flag: VOSF enabled
#	Line 123 | Line 139 | static SDL_Color sdl_palette[256];                                     /
139		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
140		static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
141
142	+	// Mutex to protect SDL events
143	+	static SDL_mutex *sdl_events_lock = NULL;
144	+	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
145	+	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
146	+
147		// Mutex to protect palette
148		static SDL_mutex *sdl_palette_lock = NULL;
149		#define LOCK_PALETTE SDL_LockMutex(sdl_palette_lock)
#	Line 146 | Line 167 | extern void SysMountFirstFloppy(void);
167
168
169		/*
170	+	*  SDL surface locking glue
171	+	*/
172	+
173	+	#ifdef ENABLE_VOSF
174	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
175	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
176	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
177	+	} while (0)
178	+	#else
179	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
180	+	#endif
181	+
182	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
183	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
184	+	SDL_LockSurface(SURFACE);                               \
185	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
186	+	}                                                                                       \
187	+	} while (0)
188	+
189	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
190	+	if (SDL_MUSTLOCK(SURFACE))                                      \
191	+	SDL_UnlockSurface(SURFACE);                             \
192	+	} while (0)
193	+
194	+
195	+	/*
196	+	*  Framebuffer allocation routines
197	+	*/
198	+
199	+	static void *vm_acquire_framebuffer(uint32 size)
200	+	{
201	+	return vm_acquire(size);
202	+	}
203	+
204	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
205	+	{
206	+	vm_release(fb, size);
207	+	}
208	+
209	+
210	+	/*
211	+	*  Windows message handler
212	+	*/
213	+
214	+	#ifdef WIN32
215	+	#include <dbt.h>
216	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
217	+
218	+	extern void SysMediaArrived(void);
219	+	extern void SysMediaRemoved(void);
220	+	extern HWND GetMainWindowHandle(void);
221	+
222	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
223	+	{
224	+	switch (msg) {
225	+	case WM_DEVICECHANGE:
226	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
227	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
228	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
229	+	SysMediaRemoved();
230	+	}
231	+	else if (wParam == DBT_DEVICEARRIVAL) {
232	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
233	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
234	+	SysMediaArrived();
235	+	}
236	+	return 0;
237	+
238	+	default:
239	+	if (sdl_window_proc)
240	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
241	+	}
242	+
243	+	return DefWindowProc(hwnd, msg, wParam, lParam);
244	+	}
245	+	#endif
246	+
247	+
248	+	/*
249		*  SheepShaver glue
250		*/
251
#	Line 190 | Line 290 | static vector<monitor_desc *> VideoMonit
290		// Find Apple mode matching best specified dimensions
291		static int find_apple_resolution(int xsize, int ysize)
292		{
293	<	int apple_id;
294	<	if (xsize < 800)
295	<	apple_id = APPLE_640x480;
296	<	else if (xsize < 1024)
297	<	apple_id = APPLE_800x600;
298	<	else if (xsize < 1152)
299	<	apple_id = APPLE_1024x768;
300	<	else if (xsize < 1280) {
301	<	if (ysize < 900)
302	<	apple_id = APPLE_1152x768;
303	<	else
304	<	apple_id = APPLE_1152x900;
305	<	}
306	<	else if (xsize < 1600)
307	<	apple_id = APPLE_1280x1024;
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;
293	>	if (xsize == 640 && ysize == 480)
294	>	return APPLE_640x480;
295	>	if (xsize == 800 && ysize == 600)
296	>	return APPLE_800x600;
297	>	if (xsize == 1024 && ysize == 768)
298	>	return APPLE_1024x768;
299	>	if (xsize == 1152 && ysize == 768)
300	>	return APPLE_1152x768;
301	>	if (xsize == 1152 && ysize == 900)
302	>	return APPLE_1152x900;
303	>	if (xsize == 1280 && ysize == 1024)
304	>	return APPLE_1280x1024;
305	>	if (xsize == 1600 && ysize == 1200)
306	>	return APPLE_1600x1200;
307	>	return APPLE_CUSTOM;
308		}
309
310		// Display error alert
#	Line 325 | Line 377 | static inline int bytes_per_pixel(int de
377		}
378
379		// Map video_mode depth ID to numerical depth value
380	<	static int sdl_depth_of_video_depth(int video_depth)
380	>	static int mac_depth_of_video_depth(int video_depth)
381		{
382		int depth = -1;
383		switch (video_depth) {
#	Line 353 | Line 405 | static int sdl_depth_of_video_depth(int
405		return depth;
406		}
407
408	<	// Check wether specified mode is available
409	<	static bool has_mode(int type, int width, int height)
408	>	// Map video_mode depth ID to SDL screen depth
409	>	static int sdl_depth_of_video_depth(int video_depth)
410		{
411	<	// FIXME: no fullscreen support yet
412	<	if (type == DISPLAY_SCREEN)
413	<	return false;
411	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
412	>	}
413	>
414	>	// Get screen dimensions
415	>	static void sdl_display_dimensions(int &width, int &height)
416	>	{
417	>	static int max_width, max_height;
418	>	if (max_width == 0 && max_height == 0) {
419	>	max_width = 640 ; max_height = 480;
420	>	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
421	>	if (modes && modes != (SDL_Rect **)-1) {
422	>	// It turns out that on some implementations, and contrary to the documentation,
423	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
424	>	for (int i = 0; modes[i] != NULL; i++) {
425	>	const int w = modes[i]->w;
426	>	const int h = modes[i]->h;
427	>	if (w > max_width && h > max_height) {
428	>	max_width = w;
429	>	max_height = h;
430	>	}
431	>	}
432	>	}
433	>	}
434	>	width = max_width;
435	>	height = max_height;
436	>	}
437	>
438	>	static inline int sdl_display_width(void)
439	>	{
440	>	int width, height;
441	>	sdl_display_dimensions(width, height);
442	>	return width;
443	>	}
444
445	+	static inline int sdl_display_height(void)
446	+	{
447	+	int width, height;
448	+	sdl_display_dimensions(width, height);
449	+	return height;
450	+	}
451	+
452	+	// Check wether specified mode is available
453	+	static bool has_mode(int type, int width, int height, int depth)
454	+	{
455		#ifdef SHEEPSHAVER
456	<	// Filter out Classic resolutiosn
456	>	// Filter out Classic resolutions
457		if (width == 512 && height == 384)
458		return false;
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;
459		#endif
460	<	return false;
460	>
461	>	// Filter out out-of-bounds resolutions
462	>	if (width > sdl_display_width() || height > sdl_display_height())
463	>	return false;
464	>
465	>	// Rely on SDL capabilities
466	>	return SDL_VideoModeOK(width, height,
467	>	sdl_depth_of_video_depth(depth),
468	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
469		}
470
471		// Add mode to list of supported modes
472		static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
473		{
474		// Filter out unsupported modes
475	<	if (!has_mode(type, width, height))
475	>	if (!has_mode(type, width, height, depth))
476		return;
477
478		// Fill in VideoMode entry
479		VIDEO_MODE mode;
480		#ifdef SHEEPSHAVER
481	<	// Recalculate dimensions to fit Apple modes
409	<	resolution_id = match_apple_resolution(width, height);
481	>	resolution_id = find_apple_resolution(width, height);
482		mode.viType = type;
483		#endif
484		VIDEO_MODE_X = width;
485		VIDEO_MODE_Y = height;
486		VIDEO_MODE_RESOLUTION = resolution_id;
487		VIDEO_MODE_ROW_BYTES = bytes_per_row;
488	<	VIDEO_MODE_DEPTH = depth;
488	>	VIDEO_MODE_DEPTH = (video_depth)depth;
489		VideoModes.push_back(mode);
490		}
491
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	–
492		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
493		static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
494		{
#	Line 469 | Line 528 | static void set_window_name(int name)
528		// Set mouse grab mode
529		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
530		{
531	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
531	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
532		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
533		}
534
535	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
536	+	static void migrate_screen_prefs(void)
537	+	{
538	+	#ifdef SHEEPSHAVER
539	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
540	+	if (PrefsFindString("screen"))
541	+	return;
542	+
543	+	uint32 window_modes = PrefsFindInt32("windowmodes");
544	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
545	+	int width = 0, height = 0;
546	+	if (screen_modes) {
547	+	static const struct {
548	+	int id;
549	+	int width;
550	+	int height;
551	+	}
552	+	modes[] = {
553	+	{  1,    640,    480 },
554	+	{  2,    800,    600 },
555	+	{  4,   1024,    768 },
556	+	{ 64,   1152,    768 },
557	+	{  8,   1152,    900 },
558	+	{ 16,   1280,   1024 },
559	+	{ 32,   1600,   1200 },
560	+	{ 0, }
561	+	};
562	+	for (int i = 0; modes[i].id != 0; i++) {
563	+	if (screen_modes & modes[i].id) {
564	+	if (width < modes[i].width && height < modes[i].height) {
565	+	width = modes[i].width;
566	+	height = modes[i].height;
567	+	}
568	+	}
569	+	}
570	+	} else {
571	+	if (window_modes & 1)
572	+	width = 640, height = 480;
573	+	if (window_modes & 2)
574	+	width = 800, height = 600;
575	+	}
576	+	if (width && height) {
577	+	char str[32];
578	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
579	+	PrefsReplaceString("screen", str);
580	+	}
581	+	#endif
582	+	}
583	+
584
585		/*
586		*  Display "driver" classes
#	Line 528 | Line 636 | private:
636		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
637		};
638
639	+	class driver_fullscreen : public driver_base {
640	+	public:
641	+	driver_fullscreen(SDL_monitor_desc &monitor);
642	+	~driver_fullscreen();
643	+	};
644	+
645		static driver_base *drv = NULL; // Pointer to currently used driver object
646
647		#ifdef ENABLE_VOSF
#	Line 549 | Line 663 | driver_base::~driver_base()
663		if (s)
664		SDL_FreeSurface(s);
665
666	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
667	+	if (the_buffer != VM_MAP_FAILED) {
668	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
669	+	vm_release_framebuffer(the_buffer, the_buffer_size);
670	+	the_buffer = NULL;
671	+	}
672	+
673		// Free frame buffer(s)
674		if (!use_vosf) {
554	–	if (the_buffer) {
555	–	free(the_buffer);
556	–	the_buffer = NULL;
557	–	}
675		if (the_buffer_copy) {
676		free(the_buffer_copy);
677		the_buffer_copy = NULL;
#	Line 562 | Line 679 | driver_base::~driver_base()
679		}
680		#ifdef ENABLE_VOSF
681		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	–	}
682		if (the_host_buffer) {
683		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
684		free(the_host_buffer);
#	Line 578 | Line 689 | driver_base::~driver_base()
689		free(the_buffer_copy);
690		the_buffer_copy = NULL;
691		}
692	+
693	+	// Deinitialize VOSF
694	+	video_vosf_exit();
695		}
696		#endif
697		}
#	Line 587 | Line 701 | void driver_base::update_palette(void)
701		{
702		const VIDEO_MODE &mode = monitor.get_current_mode();
703
704	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
704	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
705		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
706		}
707
#	Line 618 | Line 732 | driver_window::driver_window(SDL_monitor
732		ADBSetRelMouseMode(mouse_grabbed);
733
734		// Create surface
735	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
735	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
736		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
737		return;
738
#	Line 627 | Line 741 | driver_window::driver_window(SDL_monitor
741		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
742		the_host_buffer = (uint8 *)s->pixels;
743		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
744	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
744	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
745		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
746		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
747
#	Line 651 | Line 765 | driver_window::driver_window(SDL_monitor
765		// Allocate memory for frame buffer
766		the_buffer_size = (aligned_height + 2) * s->pitch;
767		the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
768	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
768	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
769		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
770		}
771
#	Line 676 | Line 790 | driver_window::driver_window(SDL_monitor
790		visualFormat.Rmask = f->Rmask;
791		visualFormat.Gmask = f->Gmask;
792		visualFormat.Bmask = f->Bmask;
793	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
793	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
794
795		// Load gray ramp to 8->16/32 expand map
796		if (!IsDirectMode(mode))
#	Line 743 | Line 857 | void driver_window::mouse_moved(int x, i
857		ADBMouseMoved(x, y);
858		}
859
860	+
861	+	/*
862	+	*  Full-screen display driver
863	+	*/
864	+
865	+	// Open display
866	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
867	+	: driver_base(m)
868	+	{
869	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
870	+	int aligned_width = (width + 15) & ~15;
871	+	int aligned_height = (height + 15) & ~15;
872	+
873	+	// Set absolute mouse mode
874	+	ADBSetRelMouseMode(false);
875	+
876	+	// Create surface
877	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
878	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
879	+	return;
880	+
881	+	#ifdef ENABLE_VOSF
882	+	use_vosf = true;
883	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
884	+	the_host_buffer = (uint8 *)s->pixels;
885	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
886	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
887	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
888	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
889	+
890	+	// Check whether we can initialize the VOSF subsystem and it's profitable
891	+	if (!video_vosf_init(m)) {
892	+	WarningAlert(STR_VOSF_INIT_ERR);
893	+	use_vosf = false;
894	+	}
895	+	else if (!video_vosf_profitable()) {
896	+	video_vosf_exit();
897	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
898	+	use_vosf = false;
899	+	}
900	+	if (!use_vosf) {
901	+	free(the_buffer_copy);
902	+	vm_release(the_buffer, the_buffer_size);
903	+	the_host_buffer = NULL;
904	+	}
905	+	#endif
906	+	if (!use_vosf) {
907	+	// Allocate memory for frame buffer
908	+	the_buffer_size = (aligned_height + 2) * s->pitch;
909	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
910	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
911	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
912	+	}
913	+
914	+	// Hide cursor
915	+	SDL_ShowCursor(0);
916	+
917	+	// Init blitting routines
918	+	SDL_PixelFormat *f = s->format;
919	+	VisualFormat visualFormat;
920	+	visualFormat.depth = depth;
921	+	visualFormat.Rmask = f->Rmask;
922	+	visualFormat.Gmask = f->Gmask;
923	+	visualFormat.Bmask = f->Bmask;
924	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
925	+
926	+	// Load gray ramp to 8->16/32 expand map
927	+	if (!IsDirectMode(mode))
928	+	for (int i=0; i<256; i++)
929	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
930	+
931	+	// Set frame buffer base
932	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
933	+
934	+	// Everything went well
935	+	init_ok = true;
936	+	}
937	+
938	+	// Close display
939	+	driver_fullscreen::~driver_fullscreen()
940	+	{
941	+	#ifdef ENABLE_VOSF
942	+	if (use_vosf)
943	+	the_host_buffer = NULL; // don't free() in driver_base dtor
944	+	#endif
945	+	if (s)
946	+	SDL_FreeSurface(s);
947	+
948	+	// Show cursor
949	+	SDL_ShowCursor(1);
950	+	}
951	+
952	+
953		/*
954		*  Initialization
955		*/
#	Line 774 | Line 981 | static void keycode_init(void)
981		SDL_VideoDriverName(video_driver, sizeof(video_driver));
982		bool video_driver_found = false;
983		char line[256];
984	+	int n_keys = 0;
985		while (fgets(line, sizeof(line) - 1, f)) {
986		// Read line
987		int len = strlen(line);
#	Line 786 | Line 994 | static void keycode_init(void)
994		continue;
995
996		if (video_driver_found) {
997	<	// Skip aliases
997	>	// Skip aliases as long as we have read keycodes yet
998	>	// Otherwise, it's another mapping and we have to stop
999		static const char sdl_str[] = "sdl";
1000	<	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0)
1000	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1001		continue;
1002
1003		// Read keycode
1004		int x_code, mac_code;
1005		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1006	<	keycode_table[x_code & 0xff] = mac_code;
1006	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1007		else
1008		break;
1009		} else {
#	Line 819 | Line 1028 | static void keycode_init(void)
1028		WarningAlert(str);
1029		return;
1030		}
1031	+
1032	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1033		}
1034		}
1035
#	Line 837 | Line 1048 | bool SDL_monitor_desc::video_open(void)
1048		case DISPLAY_WINDOW:
1049		drv = new(std::nothrow) driver_window(*this);
1050		break;
1051	+	case DISPLAY_SCREEN:
1052	+	drv = new(std::nothrow) driver_fullscreen(*this);
1053	+	break;
1054		}
1055		if (drv == NULL)
1056		return false;
#	Line 846 | Line 1060 | bool SDL_monitor_desc::video_open(void)
1060		return false;
1061		}
1062
1063	+	#ifdef WIN32
1064	+	// Chain in a new message handler for WM_DEVICECHANGE
1065	+	HWND the_window = GetMainWindowHandle();
1066	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1067	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1068	+	#endif
1069	+
1070		// Initialize VideoRefresh function
1071		VideoRefreshInit();
1072
#	Line 853 | Line 1074 | bool SDL_monitor_desc::video_open(void)
1074		LOCK_FRAME_BUFFER;
1075
1076		// Start redraw/input thread
1077	+	#ifndef USE_CPU_EMUL_SERVICES
1078		redraw_thread_cancel = false;
1079		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1080		if (!redraw_thread_active) {
1081		printf("FATAL: cannot create redraw thread\n");
1082		return false;
1083		}
1084	+	#else
1085	+	redraw_thread_active = true;
1086	+	#endif
1087		return true;
1088		}
1089
#	Line 879 | Line 1104 | bool VideoInit(bool classic)
1104		#endif
1105
1106		// Create Mutexes
1107	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1108	+	return false;
1109		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1110		return false;
1111		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 893 | Line 1120 | bool VideoInit(bool classic)
1120		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1121
1122		// Get screen mode from preferences
1123	+	migrate_screen_prefs();
1124		const char *mode_str = NULL;
897	–	#ifndef SHEEPSHAVER
1125		if (classic_mode)
1126		mode_str = "win/512/342";
1127		else
1128		mode_str = PrefsFindString("screen");
902	–	#endif
1129
1130		// Determine display type and default dimensions
1131		int default_width, default_height;
#	Line 915 | Line 1141 | bool VideoInit(bool classic)
1141		if (mode_str) {
1142		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1143		display_type = DISPLAY_WINDOW;
1144	<	}
1145	<	int max_width = 640, max_height = 480;
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;
1144	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1145	>	display_type = DISPLAY_SCREEN;
1146		}
1147		if (default_width <= 0)
1148	<	default_width = max_width;
1148	>	default_width = sdl_display_width();
1149	>	else if (default_width > sdl_display_width())
1150	>	default_width = sdl_display_width();
1151		if (default_height <= 0)
1152	<	default_height = max_height;
1152	>	default_height = sdl_display_height();
1153	>	else if (default_height > sdl_display_height())
1154	>	default_height = sdl_display_height();
1155
1156		// Mac screen depth follows X depth
1157		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 949 | Line 1171 | bool VideoInit(bool classic)
1171		break;
1172		}
1173
1174	+	// Initialize list of video modes to try
1175	+	struct {
1176	+	int w;
1177	+	int h;
1178	+	int resolution_id;
1179	+	}
1180	+	video_modes[] = {
1181	+	{   -1,   -1, 0x80 },
1182	+	{  512,  384, 0x80 },
1183	+	{  640,  480, 0x81 },
1184	+	{  800,  600, 0x82 },
1185	+	{ 1024,  768, 0x83 },
1186	+	{ 1152,  870, 0x84 },
1187	+	{ 1280, 1024, 0x85 },
1188	+	{ 1600, 1200, 0x86 },
1189	+	{ 0, }
1190	+	};
1191	+	video_modes[0].w = default_width;
1192	+	video_modes[0].h = default_height;
1193	+
1194		// Construct list of supported modes
1195		if (display_type == DISPLAY_WINDOW) {
1196		if (classic)
1197		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1198		else {
1199	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1200	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1201	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1202	<	add_window_modes(video_depth(d));
1199	>	for (int i = 0; video_modes[i].w != 0; i++) {
1200	>	const int w = video_modes[i].w;
1201	>	const int h = video_modes[i].h;
1202	>	if (i > 0 && (w >= default_width || h >= default_height))
1203	>	continue;
1204	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1205	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1206		}
1207		}
1208	<	} else
1209	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1208	>	} else if (display_type == DISPLAY_SCREEN) {
1209	>	for (int i = 0; video_modes[i].w != 0; i++) {
1210	>	const int w = video_modes[i].w;
1211	>	const int h = video_modes[i].h;
1212	>	if (i > 0 && (w >= default_width || h >= default_height))
1213	>	continue;
1214	>	if (w == 512 && h == 384)
1215	>	continue;
1216	>	#ifdef ENABLE_VOSF
1217	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1218	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1219	>	#else
1220	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1221	>	#endif
1222	>	}
1223	>	}
1224	>
1225		if (VideoModes.empty()) {
1226		ErrorAlert(STR_NO_XVISUAL_ERR);
1227		return false;
#	Line 1032 | Line 1292 | void SDL_monitor_desc::video_close(void)
1292		{
1293		D(bug("video_close()\n"));
1294
1295	+	#ifdef WIN32
1296	+	// Remove message handler for WM_DEVICECHANGE
1297	+	HWND the_window = GetMainWindowHandle();
1298	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1299	+	#endif
1300	+
1301		// Stop redraw thread
1302	+	#ifndef USE_CPU_EMUL_SERVICES
1303		if (redraw_thread_active) {
1304		redraw_thread_cancel = true;
1305		SDL_WaitThread(redraw_thread, NULL);
1306		}
1307	+	#endif
1308		redraw_thread_active = false;
1309
1310		// Unlock frame buffer
1311		UNLOCK_FRAME_BUFFER;
1312		D(bug(" frame buffer unlocked\n"));
1313
1046	–	#ifdef ENABLE_VOSF
1047	–	if (use_vosf) {
1048	–	// Deinitialize VOSF
1049	–	video_vosf_exit();
1050	–	}
1051	–	#endif
1052	–
1314		// Close display
1315		delete drv;
1316		drv = NULL;
#	Line 1067 | Line 1328 | void VideoExit(void)
1328		SDL_DestroyMutex(frame_buffer_lock);
1329		if (sdl_palette_lock)
1330		SDL_DestroyMutex(sdl_palette_lock);
1331	+	if (sdl_events_lock)
1332	+	SDL_DestroyMutex(sdl_events_lock);
1333		}
1334
1335
#	Line 1147 | Line 1410 | void SDL_monitor_desc::set_palette(uint8
1410		const VIDEO_MODE &mode = get_current_mode();
1411
1412		// FIXME: how can we handle the gamma ramp?
1413	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1413	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1414		return;
1415
1416		LOCK_PALETTE;
#	Line 1208 | Line 1471 | int16 video_mode_change(VidLocals *csSav
1471		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1472		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1473
1474	<	// Disable interrupts
1474	>	// Disable interrupts and pause redraw thread
1475		DisableInterrupt();
1476	+	thread_stop_ack = false;
1477	+	thread_stop_req = true;
1478	+	while (!thread_stop_ack) ;
1479
1480		cur_mode = i;
1481		monitor_desc *monitor = VideoMonitors[0];
#	Line 1220 | Line 1486 | int16 video_mode_change(VidLocals *csSav
1486		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1487		csSave->saveMode=VModes[cur_mode].viAppleMode;
1488
1489	<	// Enable interrupts
1489	>	// Enable interrupts and resume redraw thread
1490	>	thread_stop_req = false;
1491		EnableInterrupt();
1492		return noErr;
1493		}
#	Line 1232 | Line 1499 | int16 video_mode_change(VidLocals *csSav
1499		void SDL_monitor_desc::switch_to_current_mode(void)
1500		{
1501		// Close and reopen display
1502	+	LOCK_EVENTS;
1503		video_close();
1504		video_open();
1505	+	UNLOCK_EVENTS;
1506
1507		if (drv == NULL) {
1508		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1267 | Line 1536 | void video_set_cursor(void)
1536
1537
1538		/*
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	–	/*
1539		*  Keyboard-related utilify functions
1540		*/
1541
#	Line 1698 | Line 1605 | static int kc_decode(SDL_keysym const &
1605
1606		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1607		case SDLK_2: case SDLK_AT: return 0x13;
1608	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1608	>	case SDLK_3: case SDLK_HASH: return 0x14;
1609		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1610	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1610	>	case SDLK_5: return 0x17;
1611		case SDLK_6: return 0x16;
1612		case SDLK_7: return 0x1a;
1613		case SDLK_8: return 0x1c;
1614		case SDLK_9: return 0x19;
1615		case SDLK_0: return 0x1d;
1616
1617	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1617	>	case SDLK_BACKQUOTE: return 0x0a;
1618		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1619		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1620	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1621	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1622	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1620	>	case SDLK_LEFTBRACKET: return 0x21;
1621	>	case SDLK_RIGHTBRACKET: return 0x1e;
1622	>	case SDLK_BACKSLASH: return 0x2a;
1623		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1624	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1624	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1625		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1626		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1627		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1746 | Line 1653 | static int kc_decode(SDL_keysym const &
1653		case SDLK_LMETA: return 0x3a;
1654		case SDLK_RMETA: return 0x3a;
1655		#endif
1656	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1657	+	case SDLK_RSUPER: return 0x3a;
1658		case SDLK_MENU: return 0x32;
1659		case SDLK_CAPSLOCK: return 0x39;
1660		case SDLK_NUMLOCK: return 0x47;
#	Line 1962 | Line 1871 | static void update_display_static(driver
1871
1872		// Check for first column from left and first column from right that have changed
1873		if (high) {
1874	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1874	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1875		const int src_bytes_per_row = bytes_per_row;
1876		const int dst_bytes_per_row = drv->s->pitch;
1877		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 2079 | Line 1988 | static void update_display_static(driver
1988		}
1989		}
1990
1991	+	// Static display update (fixed frame rate, bounding boxes based)
1992	+	// XXX use NQD bounding boxes to help detect dirty areas?
1993	+	static void update_display_static_bbox(driver_window *drv)
1994	+	{
1995	+	const VIDEO_MODE &mode = drv->mode;
1996	+
1997	+	// Allocate bounding boxes for SDL_UpdateRects()
1998	+	const int N_PIXELS = 64;
1999	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2000	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2001	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2002	+	int nr_boxes = 0;
2003	+
2004	+	// Lock surface, if required
2005	+	if (SDL_MUSTLOCK(drv->s))
2006	+	SDL_LockSurface(drv->s);
2007	+
2008	+	// Update the surface from Mac screen
2009	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2010	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2011	+	int x, y;
2012	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2013	+	int h = N_PIXELS;
2014	+	if (h > VIDEO_MODE_Y - y)
2015	+	h = VIDEO_MODE_Y - y;
2016	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2017	+	int w = N_PIXELS;
2018	+	if (w > VIDEO_MODE_X - x)
2019	+	w = VIDEO_MODE_X - x;
2020	+	const int xs = w * bytes_per_pixel;
2021	+	const int xb = x * bytes_per_pixel;
2022	+	bool dirty = false;
2023	+	for (int j = y; j < (y + h); j++) {
2024	+	const int yb = j * bytes_per_row;
2025	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2026	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2027	+	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2028	+	dirty = true;
2029	+	}
2030	+	}
2031	+	if (dirty) {
2032	+	boxes[nr_boxes].x = x;
2033	+	boxes[nr_boxes].y = y;
2034	+	boxes[nr_boxes].w = w;
2035	+	boxes[nr_boxes].h = h;
2036	+	nr_boxes++;
2037	+	}
2038	+	}
2039	+	}
2040	+
2041	+	// Unlock surface, if required
2042	+	if (SDL_MUSTLOCK(drv->s))
2043	+	SDL_UnlockSurface(drv->s);
2044	+
2045	+	// Refresh display
2046	+	if (nr_boxes)
2047	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2048	+	}
2049	+
2050
2051		// We suggest the compiler to inline the next two functions so that it
2052		// may specialise the code according to the current screen depth and
#	Line 2139 | Line 2107 | static void video_refresh_dga_vosf(void)
2107		tick_counter = 0;
2108		if (mainBuffer.dirty) {
2109		LOCK_VOSF;
2110	<	update_display_dga_vosf();
2110	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2111		UNLOCK_VOSF;
2112		}
2113		}
#	Line 2173 | Line 2141 | static void video_refresh_window_static(
2141		static int tick_counter = 0;
2142		if (++tick_counter >= frame_skip) {
2143		tick_counter = 0;
2144	<	update_display_static(static_cast<driver_window *>(drv));
2144	>	const VIDEO_MODE &mode = drv->mode;
2145	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2146	>	update_display_static_bbox(static_cast<driver_window *>(drv));
2147	>	else
2148	>	update_display_static(static_cast<driver_window *>(drv));
2149		}
2150		}
2151
#	Line 2203 | Line 2175 | static void VideoRefreshInit(void)
2175		}
2176		}
2177
2178	+	static inline void do_video_refresh(void)
2179	+	{
2180	+	// Handle SDL events
2181	+	handle_events();
2182	+
2183	+	// Update display
2184	+	video_refresh();
2185	+
2186	+	#ifdef SHEEPSHAVER
2187	+	// Set new cursor image if it was changed
2188	+	if (cursor_changed && sdl_cursor) {
2189	+	cursor_changed = false;
2190	+	LOCK_EVENTS;
2191	+	SDL_FreeCursor(sdl_cursor);
2192	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2193	+	if (sdl_cursor)
2194	+	SDL_SetCursor(sdl_cursor);
2195	+	UNLOCK_EVENTS;
2196	+	}
2197	+	#endif
2198	+
2199	+	// Set new palette if it was changed
2200	+	handle_palette_changes();
2201	+	}
2202	+
2203	+	// This function is called on non-threaded platforms from a timer interrupt
2204	+	void VideoRefresh(void)
2205	+	{
2206	+	// We need to check redraw_thread_active to inhibit refreshed during
2207	+	// mode changes on non-threaded platforms
2208	+	if (!redraw_thread_active)
2209	+	return;
2210	+
2211	+	// Process pending events and update display
2212	+	do_video_refresh();
2213	+	}
2214	+
2215		const int VIDEO_REFRESH_HZ = 60;
2216		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2217
2218	+	#ifndef USE_CPU_EMUL_SERVICES
2219		static int redraw_func(void *arg)
2220		{
2221		uint64 start = GetTicks_usec();
#	Line 2223 | Line 2233 | static int redraw_func(void *arg)
2233		next = GetTicks_usec();
2234		ticks++;
2235
2226	–	// Handle SDL events
2227	–	handle_events();
2228	–
2229	–	// Refresh display
2230	–	video_refresh();
2231	–
2236		#ifdef SHEEPSHAVER
2237	<	// Set new cursor image if it was changed
2238	<	if (cursor_changed && sdl_cursor) {
2239	<	cursor_changed = false;
2240	<	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);
2237	>	// Pause if requested (during video mode switches)
2238	>	if (thread_stop_req) {
2239	>	thread_stop_ack = true;
2240	>	continue;
2241		}
2242		#endif
2243
2244	<	// Set new palette if it was changed
2245	<	handle_palette_changes();
2244	>	// Process pending events and update display
2245	>	do_video_refresh();
2246		}
2247
2248		uint64 end = GetTicks_usec();
2249		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2250		return 0;
2251		}
2252	+	#endif
2253	+
2254	+
2255	+	/*
2256	+	*  Record dirty area from NQD
2257	+	*/
2258	+
2259	+	#ifdef SHEEPSHAVER
2260	+	void video_set_dirty_area(int x, int y, int w, int h)
2261	+	{
2262	+	const VIDEO_MODE &mode = drv->mode;
2263	+	const int screen_width = VIDEO_MODE_X;
2264	+	const int screen_height = VIDEO_MODE_Y;
2265	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2266	+
2267	+	#ifdef ENABLE_VOSF
2268	+	if (use_vosf) {
2269	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2270	+	return;
2271	+	}
2272	+	#endif
2273	+
2274	+	// XXX handle dirty bounding boxes for non-VOSF modes
2275	+	}
2276	+	#endif

Diff Legend

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