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.8 by gbeauche, 2004-06-26T17:20:35Z vs.
Revision 1.45 by asvitkine, 2012-01-04T22:52:05Z

#	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-2008 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"
68
64	–
69		// Supported video modes
70		using std::vector;
71		static vector<VIDEO_MODE> VideoModes;
#	Line 82 | Line 86 | static int display_type = DISPLAY_WINDOW
86		#endif
87
88		// Constants
89	+	#ifdef WIN32
90	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
91	+	#else
92		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
93	+	#endif
94
95
96		// Global variables
#	Line 95 | Line 103 | static uint8 *the_buffer_copy = NULL;
103		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
104
105		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
106	+	#ifndef USE_CPU_EMUL_SERVICES
107		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
108		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
109	+	#ifdef SHEEPSHAVER
110	+	static volatile bool thread_stop_req = false;
111	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
112	+	#endif
113	+	#endif
114
115		#ifdef ENABLE_VOSF
116		static bool use_vosf = false;                                           // Flag: VOSF enabled
#	Line 121 | Line 135 | static SDL_Cursor *sdl_cursor;                                         // C
135		static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
136		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
137		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
138	<	static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
138	>	static const int sdl_eventmask = SDL_MOUSEEVENTMASK | SDL_KEYEVENTMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK | SDL_ACTIVEEVENTMASK;
139	>
140	>	// Mutex to protect SDL events
141	>	static SDL_mutex *sdl_events_lock = NULL;
142	>	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
143	>	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
144
145		// Mutex to protect palette
146		static SDL_mutex *sdl_palette_lock = NULL;
#	Line 146 | Line 165 | extern void SysMountFirstFloppy(void);
165
166
167		/*
168	+	*  SDL surface locking glue
169	+	*/
170	+
171	+	#ifdef ENABLE_VOSF
172	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
173	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
174	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
175	+	} while (0)
176	+	#else
177	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
178	+	#endif
179	+
180	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
181	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
182	+	SDL_LockSurface(SURFACE);                               \
183	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
184	+	}                                                                                       \
185	+	} while (0)
186	+
187	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
188	+	if (SDL_MUSTLOCK(SURFACE))                                      \
189	+	SDL_UnlockSurface(SURFACE);                             \
190	+	} while (0)
191	+
192	+
193	+	/*
194	+	*  Framebuffer allocation routines
195	+	*/
196	+
197	+	static void *vm_acquire_framebuffer(uint32 size)
198	+	{
199	+	// always try to reallocate framebuffer at the same address
200	+	static void *fb = VM_MAP_FAILED;
201	+	if (fb != VM_MAP_FAILED) {
202	+	if (vm_acquire_fixed(fb, size) < 0) {
203	+	#ifndef SHEEPSHAVER
204	+	printf("FATAL: Could not reallocate framebuffer at previous address\n");
205	+	#endif
206	+	fb = VM_MAP_FAILED;
207	+	}
208	+	}
209	+	if (fb == VM_MAP_FAILED)
210	+	fb = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT);
211	+	return fb;
212	+	}
213	+
214	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
215	+	{
216	+	vm_release(fb, size);
217	+	}
218	+
219	+
220	+	/*
221	+	*  Windows message handler
222	+	*/
223	+
224	+	#ifdef WIN32
225	+	#include <dbt.h>
226	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
227	+
228	+	extern void SysMediaArrived(void);
229	+	extern void SysMediaRemoved(void);
230	+	extern HWND GetMainWindowHandle(void);
231	+
232	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
233	+	{
234	+	switch (msg) {
235	+	case WM_DEVICECHANGE:
236	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
237	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
238	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
239	+	SysMediaRemoved();
240	+	}
241	+	else if (wParam == DBT_DEVICEARRIVAL) {
242	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
243	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
244	+	SysMediaArrived();
245	+	}
246	+	return 0;
247	+
248	+	default:
249	+	if (sdl_window_proc)
250	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
251	+	}
252	+
253	+	return DefWindowProc(hwnd, msg, wParam, lParam);
254	+	}
255	+	#endif
256	+
257	+
258	+	/*
259		*  SheepShaver glue
260		*/
261
#	Line 190 | Line 300 | static vector<monitor_desc *> VideoMonit
300		// Find Apple mode matching best specified dimensions
301		static int find_apple_resolution(int xsize, int ysize)
302		{
303	<	int apple_id;
304	<	if (xsize < 800)
305	<	apple_id = APPLE_640x480;
306	<	else if (xsize < 1024)
307	<	apple_id = APPLE_800x600;
308	<	else if (xsize < 1152)
309	<	apple_id = APPLE_1024x768;
310	<	else if (xsize < 1280) {
311	<	if (ysize < 900)
312	<	apple_id = APPLE_1152x768;
313	<	else
314	<	apple_id = APPLE_1152x900;
315	<	}
316	<	else if (xsize < 1600)
317	<	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;
303	>	if (xsize == 640 && ysize == 480)
304	>	return APPLE_640x480;
305	>	if (xsize == 800 && ysize == 600)
306	>	return APPLE_800x600;
307	>	if (xsize == 1024 && ysize == 768)
308	>	return APPLE_1024x768;
309	>	if (xsize == 1152 && ysize == 768)
310	>	return APPLE_1152x768;
311	>	if (xsize == 1152 && ysize == 900)
312	>	return APPLE_1152x900;
313	>	if (xsize == 1280 && ysize == 1024)
314	>	return APPLE_1280x1024;
315	>	if (xsize == 1600 && ysize == 1200)
316	>	return APPLE_1600x1200;
317	>	return APPLE_CUSTOM;
318		}
319
320		// Display error alert
#	Line 325 | Line 387 | static inline int bytes_per_pixel(int de
387		}
388
389		// Map video_mode depth ID to numerical depth value
390	<	static int sdl_depth_of_video_depth(int video_depth)
390	>	static int mac_depth_of_video_depth(int video_depth)
391		{
392		int depth = -1;
393		switch (video_depth) {
#	Line 353 | Line 415 | static int sdl_depth_of_video_depth(int
415		return depth;
416		}
417
418	<	// Check wether specified mode is available
419	<	static bool has_mode(int type, int width, int height)
418	>	// Map video_mode depth ID to SDL screen depth
419	>	static int sdl_depth_of_video_depth(int video_depth)
420		{
421	<	// FIXME: no fullscreen support yet
422	<	if (type == DISPLAY_SCREEN)
361	<	return false;
421	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
422	>	}
423
424	+	// Get screen dimensions
425	+	static void sdl_display_dimensions(int &width, int &height)
426	+	{
427	+	static int max_width, max_height;
428	+	if (max_width == 0 && max_height == 0) {
429	+	max_width = 640 ; max_height = 480;
430	+	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
431	+	if (modes && modes != (SDL_Rect **)-1) {
432	+	// It turns out that on some implementations, and contrary to the documentation,
433	+	// the returned list is not sorted from largest to smallest (e.g. Windows)
434	+	for (int i = 0; modes[i] != NULL; i++) {
435	+	const int w = modes[i]->w;
436	+	const int h = modes[i]->h;
437	+	if (w > max_width && h > max_height) {
438	+	max_width = w;
439	+	max_height = h;
440	+	}
441	+	}
442	+	}
443	+	}
444	+	width = max_width;
445	+	height = max_height;
446	+	}
447	+
448	+	static inline int sdl_display_width(void)
449	+	{
450	+	int width, height;
451	+	sdl_display_dimensions(width, height);
452	+	return width;
453	+	}
454	+
455	+	static inline int sdl_display_height(void)
456	+	{
457	+	int width, height;
458	+	sdl_display_dimensions(width, height);
459	+	return height;
460	+	}
461	+
462	+	// Check wether specified mode is available
463	+	static bool has_mode(int type, int width, int height, int depth)
464	+	{
465		#ifdef SHEEPSHAVER
466	<	// Filter out Classic resolutiosn
466	>	// Filter out Classic resolutions
467		if (width == 512 && height == 384)
468		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;
469		#endif
470	<	return false;
470	>
471	>	// Filter out out-of-bounds resolutions
472	>	if (width > sdl_display_width() || height > sdl_display_height())
473	>	return false;
474	>
475	>	// Rely on SDL capabilities
476	>	return SDL_VideoModeOK(width, height,
477	>	sdl_depth_of_video_depth(depth),
478	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
479		}
480
481		// Add mode to list of supported modes
482		static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
483		{
484		// Filter out unsupported modes
485	<	if (!has_mode(type, width, height))
485	>	if (!has_mode(type, width, height, depth))
486		return;
487
488		// Fill in VideoMode entry
489		VIDEO_MODE mode;
490		#ifdef SHEEPSHAVER
491	<	// Recalculate dimensions to fit Apple modes
409	<	resolution_id = match_apple_resolution(width, height);
491	>	resolution_id = find_apple_resolution(width, height);
492		mode.viType = type;
493		#endif
494		VIDEO_MODE_X = width;
495		VIDEO_MODE_Y = height;
496		VIDEO_MODE_RESOLUTION = resolution_id;
497		VIDEO_MODE_ROW_BYTES = bytes_per_row;
498	<	VIDEO_MODE_DEPTH = depth;
498	>	VIDEO_MODE_DEPTH = (video_depth)depth;
499		VideoModes.push_back(mode);
500		}
501
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	–
502		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
503		static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
504		{
#	Line 469 | Line 538 | static void set_window_name(int name)
538		// Set mouse grab mode
539		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
540		{
541	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
541	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
542		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
543		}
544
545	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
546	+	static void migrate_screen_prefs(void)
547	+	{
548	+	#ifdef SHEEPSHAVER
549	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
550	+	if (PrefsFindString("screen"))
551	+	return;
552	+
553	+	uint32 window_modes = PrefsFindInt32("windowmodes");
554	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
555	+	int width = 0, height = 0;
556	+	if (screen_modes) {
557	+	static const struct {
558	+	int id;
559	+	int width;
560	+	int height;
561	+	}
562	+	modes[] = {
563	+	{  1,    640,    480 },
564	+	{  2,    800,    600 },
565	+	{  4,   1024,    768 },
566	+	{ 64,   1152,    768 },
567	+	{  8,   1152,    900 },
568	+	{ 16,   1280,   1024 },
569	+	{ 32,   1600,   1200 },
570	+	{ 0, }
571	+	};
572	+	for (int i = 0; modes[i].id != 0; i++) {
573	+	if (screen_modes & modes[i].id) {
574	+	if (width < modes[i].width && height < modes[i].height) {
575	+	width = modes[i].width;
576	+	height = modes[i].height;
577	+	}
578	+	}
579	+	}
580	+	} else {
581	+	if (window_modes & 1)
582	+	width = 640, height = 480;
583	+	if (window_modes & 2)
584	+	width = 800, height = 600;
585	+	}
586	+	if (width && height) {
587	+	char str[32];
588	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
589	+	PrefsReplaceString("screen", str);
590	+	}
591	+	#endif
592	+	}
593	+
594
595		/*
596		*  Display "driver" classes
#	Line 506 | Line 624 | public:
624		class driver_window;
625		static void update_display_window_vosf(driver_window *drv);
626		static void update_display_dynamic(int ticker, driver_window *drv);
627	<	static void update_display_static(driver_window *drv);
627	>	static void update_display_static(driver_base *drv);
628
629		class driver_window : public driver_base {
630		friend void update_display_window_vosf(driver_window *drv);
631		friend void update_display_dynamic(int ticker, driver_window *drv);
632	<	friend void update_display_static(driver_window *drv);
632	>	friend void update_display_static(driver_base *drv);
633
634		public:
635		driver_window(SDL_monitor_desc &monitor);
#	Line 528 | Line 646 | private:
646		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
647		};
648
649	+	class driver_fullscreen : public driver_base {
650	+	public:
651	+	driver_fullscreen(SDL_monitor_desc &monitor);
652	+	~driver_fullscreen();
653	+	};
654	+
655		static driver_base *drv = NULL; // Pointer to currently used driver object
656
657		#ifdef ENABLE_VOSF
#	Line 549 | Line 673 | driver_base::~driver_base()
673		if (s)
674		SDL_FreeSurface(s);
675
676	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
677	+	if (the_buffer != VM_MAP_FAILED) {
678	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
679	+	vm_release_framebuffer(the_buffer, the_buffer_size);
680	+	the_buffer = NULL;
681	+	}
682	+
683		// Free frame buffer(s)
684		if (!use_vosf) {
554	–	if (the_buffer) {
555	–	free(the_buffer);
556	–	the_buffer = NULL;
557	–	}
685		if (the_buffer_copy) {
686		free(the_buffer_copy);
687		the_buffer_copy = NULL;
#	Line 562 | Line 689 | driver_base::~driver_base()
689		}
690		#ifdef ENABLE_VOSF
691		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	–	}
692		if (the_host_buffer) {
693		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
694		free(the_host_buffer);
#	Line 578 | Line 699 | driver_base::~driver_base()
699		free(the_buffer_copy);
700		the_buffer_copy = NULL;
701		}
702	+
703	+	// Deinitialize VOSF
704	+	video_vosf_exit();
705		}
706		#endif
707		}
#	Line 587 | Line 711 | void driver_base::update_palette(void)
711		{
712		const VIDEO_MODE &mode = monitor.get_current_mode();
713
714	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
714	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
715		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
716		}
717
#	Line 606 | Line 730 | void driver_base::restore_mouse_accel(vo
730		*  Windowed display driver
731		*/
732
733	+	static bool SDL_display_opened = false;
734	+
735		// Open display
736		driver_window::driver_window(SDL_monitor_desc &m)
737		: driver_base(m), mouse_grabbed(false)
#	Line 617 | Line 743 | driver_window::driver_window(SDL_monitor
743		// Set absolute mouse mode
744		ADBSetRelMouseMode(mouse_grabbed);
745
746	+	// This is ugly:
747	+	// If we're switching resolutions (ie, not setting it for the first time),
748	+	// there's a bug in SDL where the SDL_Surface created will not be properly
749	+	// setup. The solution is to SDL_QuitSubSystem(SDL_INIT_VIDEO) before calling
750	+	// SDL_SetVideoMode for the second time (SDL_SetVideoMode will call SDL_Init()
751	+	// and all will be well). Without this, the video becomes corrupted (at least
752	+	// on Mac OS X), after the resolution switch.
753	+	if (SDL_display_opened)
754	+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
755	+
756		// Create surface
757	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
757	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
758		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
759		return;
760
761	+	SDL_display_opened = true;
762	+
763		#ifdef ENABLE_VOSF
764		use_vosf = true;
765		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
766		the_host_buffer = (uint8 *)s->pixels;
767		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
768	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
768	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
769		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
770		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
771
#	Line 651 | Line 789 | driver_window::driver_window(SDL_monitor
789		// Allocate memory for frame buffer
790		the_buffer_size = (aligned_height + 2) * s->pitch;
791		the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
792	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
792	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
793		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
794		}
795
#	Line 676 | Line 814 | driver_window::driver_window(SDL_monitor
814		visualFormat.Rmask = f->Rmask;
815		visualFormat.Gmask = f->Gmask;
816		visualFormat.Bmask = f->Bmask;
817	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
817	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
818
819		// Load gray ramp to 8->16/32 expand map
820		if (!IsDirectMode(mode))
#	Line 743 | Line 881 | void driver_window::mouse_moved(int x, i
881		ADBMouseMoved(x, y);
882		}
883
884	+
885	+	/*
886	+	*  Full-screen display driver
887	+	*/
888	+
889	+	// Open display
890	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
891	+	: driver_base(m)
892	+	{
893	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
894	+	int aligned_width = (width + 15) & ~15;
895	+	int aligned_height = (height + 15) & ~15;
896	+
897	+	// Set absolute mouse mode
898	+	ADBSetRelMouseMode(false);
899	+
900	+	// Create surface
901	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
902	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
903	+	return;
904	+
905	+	#ifdef ENABLE_VOSF
906	+	use_vosf = true;
907	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
908	+	the_host_buffer = (uint8 *)s->pixels;
909	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
910	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
911	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
912	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
913	+
914	+	// Check whether we can initialize the VOSF subsystem and it's profitable
915	+	if (!video_vosf_init(m)) {
916	+	WarningAlert(STR_VOSF_INIT_ERR);
917	+	use_vosf = false;
918	+	}
919	+	else if (!video_vosf_profitable()) {
920	+	video_vosf_exit();
921	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
922	+	use_vosf = false;
923	+	}
924	+	if (!use_vosf) {
925	+	free(the_buffer_copy);
926	+	vm_release(the_buffer, the_buffer_size);
927	+	the_host_buffer = NULL;
928	+	}
929	+	#endif
930	+	if (!use_vosf) {
931	+	// Allocate memory for frame buffer
932	+	the_buffer_size = (aligned_height + 2) * s->pitch;
933	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
934	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
935	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
936	+	}
937	+
938	+	// Hide cursor
939	+	SDL_ShowCursor(0);
940	+
941	+	// Init blitting routines
942	+	SDL_PixelFormat *f = s->format;
943	+	VisualFormat visualFormat;
944	+	visualFormat.depth = depth;
945	+	visualFormat.Rmask = f->Rmask;
946	+	visualFormat.Gmask = f->Gmask;
947	+	visualFormat.Bmask = f->Bmask;
948	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
949	+
950	+	// Load gray ramp to 8->16/32 expand map
951	+	if (!IsDirectMode(mode))
952	+	for (int i=0; i<256; i++)
953	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
954	+
955	+	// Set frame buffer base
956	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
957	+
958	+	// Everything went well
959	+	init_ok = true;
960	+	}
961	+
962	+	// Close display
963	+	driver_fullscreen::~driver_fullscreen()
964	+	{
965	+	#ifdef ENABLE_VOSF
966	+	if (use_vosf)
967	+	the_host_buffer = NULL; // don't free() in driver_base dtor
968	+	#endif
969	+	if (s)
970	+	SDL_FreeSurface(s);
971	+
972	+	// Show cursor
973	+	SDL_ShowCursor(1);
974	+	}
975	+
976	+
977		/*
978		*  Initialization
979		*/
#	Line 774 | Line 1005 | static void keycode_init(void)
1005		SDL_VideoDriverName(video_driver, sizeof(video_driver));
1006		bool video_driver_found = false;
1007		char line[256];
1008	+	int n_keys = 0;
1009		while (fgets(line, sizeof(line) - 1, f)) {
1010		// Read line
1011		int len = strlen(line);
#	Line 786 | Line 1018 | static void keycode_init(void)
1018		continue;
1019
1020		if (video_driver_found) {
1021	<	// Skip aliases
1022	<	static const char alias_str[] = "alias";
1023	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
1021	>	// Skip aliases as long as we have read keycodes yet
1022	>	// Otherwise, it's another mapping and we have to stop
1023	>	static const char sdl_str[] = "sdl";
1024	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1025		continue;
1026
1027		// Read keycode
1028		int x_code, mac_code;
1029		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1030	<	keycode_table[x_code & 0xff] = mac_code;
1030	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1031		else
1032		break;
1033		} else {
1034		// Search for SDL video driver string
1035	<	static const char alias_sdl_str[] = "alias SDL";
1036	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
1037	<	char *p = line + sizeof(alias_sdl_str);
1035	>	static const char sdl_str[] = "sdl";
1036	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
1037	>	char *p = line + sizeof(sdl_str);
1038		if (strstr(video_driver, p) == video_driver)
1039		video_driver_found = true;
1040		}
#	Line 819 | Line 1052 | static void keycode_init(void)
1052		WarningAlert(str);
1053		return;
1054		}
1055	+
1056	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1057		}
1058		}
1059
#	Line 837 | Line 1072 | bool SDL_monitor_desc::video_open(void)
1072		case DISPLAY_WINDOW:
1073		drv = new(std::nothrow) driver_window(*this);
1074		break;
1075	+	case DISPLAY_SCREEN:
1076	+	drv = new(std::nothrow) driver_fullscreen(*this);
1077	+	break;
1078		}
1079		if (drv == NULL)
1080		return false;
#	Line 846 | Line 1084 | bool SDL_monitor_desc::video_open(void)
1084		return false;
1085		}
1086
1087	+	#ifdef WIN32
1088	+	// Chain in a new message handler for WM_DEVICECHANGE
1089	+	HWND the_window = GetMainWindowHandle();
1090	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1091	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1092	+	#endif
1093	+
1094		// Initialize VideoRefresh function
1095		VideoRefreshInit();
1096
#	Line 853 | Line 1098 | bool SDL_monitor_desc::video_open(void)
1098		LOCK_FRAME_BUFFER;
1099
1100		// Start redraw/input thread
1101	+	#ifndef USE_CPU_EMUL_SERVICES
1102		redraw_thread_cancel = false;
1103		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1104		if (!redraw_thread_active) {
1105		printf("FATAL: cannot create redraw thread\n");
1106		return false;
1107		}
1108	+	#else
1109	+	redraw_thread_active = true;
1110	+	#endif
1111		return true;
1112		}
1113
#	Line 879 | Line 1128 | bool VideoInit(bool classic)
1128		#endif
1129
1130		// Create Mutexes
1131	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1132	+	return false;
1133		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1134		return false;
1135		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 893 | Line 1144 | bool VideoInit(bool classic)
1144		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1145
1146		// Get screen mode from preferences
1147	+	migrate_screen_prefs();
1148		const char *mode_str = NULL;
897	–	#ifndef SHEEPSHAVER
1149		if (classic_mode)
1150		mode_str = "win/512/342";
1151		else
1152		mode_str = PrefsFindString("screen");
902	–	#endif
1153
1154		// Determine display type and default dimensions
1155		int default_width, default_height;
#	Line 915 | Line 1165 | bool VideoInit(bool classic)
1165		if (mode_str) {
1166		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1167		display_type = DISPLAY_WINDOW;
1168	<	}
1169	<	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;
1168	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1169	>	display_type = DISPLAY_SCREEN;
1170		}
1171		if (default_width <= 0)
1172	<	default_width = max_width;
1172	>	default_width = sdl_display_width();
1173	>	else if (default_width > sdl_display_width())
1174	>	default_width = sdl_display_width();
1175		if (default_height <= 0)
1176	<	default_height = max_height;
1176	>	default_height = sdl_display_height();
1177	>	else if (default_height > sdl_display_height())
1178	>	default_height = sdl_display_height();
1179
1180		// Mac screen depth follows X depth
1181		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 949 | Line 1195 | bool VideoInit(bool classic)
1195		break;
1196		}
1197
1198	+	// Initialize list of video modes to try
1199	+	struct {
1200	+	int w;
1201	+	int h;
1202	+	int resolution_id;
1203	+	}
1204	+	video_modes[] = {
1205	+	{   -1,   -1, 0x80 },
1206	+	{  512,  384, 0x80 },
1207	+	{  640,  480, 0x81 },
1208	+	{  800,  600, 0x82 },
1209	+	{ 1024,  768, 0x83 },
1210	+	{ 1152,  870, 0x84 },
1211	+	{ 1280, 1024, 0x85 },
1212	+	{ 1600, 1200, 0x86 },
1213	+	{ 0, }
1214	+	};
1215	+	video_modes[0].w = default_width;
1216	+	video_modes[0].h = default_height;
1217	+
1218		// Construct list of supported modes
1219		if (display_type == DISPLAY_WINDOW) {
1220		if (classic)
1221		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1222		else {
1223	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1224	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1225	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1226	<	add_window_modes(video_depth(d));
1223	>	for (int i = 0; video_modes[i].w != 0; i++) {
1224	>	const int w = video_modes[i].w;
1225	>	const int h = video_modes[i].h;
1226	>	if (i > 0 && (w >= default_width || h >= default_height))
1227	>	continue;
1228	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1229	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1230		}
1231		}
1232	<	} else
1233	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1232	>	} else if (display_type == DISPLAY_SCREEN) {
1233	>	for (int i = 0; video_modes[i].w != 0; i++) {
1234	>	const int w = video_modes[i].w;
1235	>	const int h = video_modes[i].h;
1236	>	if (i > 0 && (w >= default_width || h >= default_height))
1237	>	continue;
1238	>	if (w == 512 && h == 384)
1239	>	continue;
1240	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1241	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1242	>	}
1243	>	}
1244	>
1245		if (VideoModes.empty()) {
1246		ErrorAlert(STR_NO_XVISUAL_ERR);
1247		return false;
#	Line 1032 | Line 1312 | void SDL_monitor_desc::video_close(void)
1312		{
1313		D(bug("video_close()\n"));
1314
1315	+	#ifdef WIN32
1316	+	// Remove message handler for WM_DEVICECHANGE
1317	+	HWND the_window = GetMainWindowHandle();
1318	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1319	+	#endif
1320	+
1321		// Stop redraw thread
1322	+	#ifndef USE_CPU_EMUL_SERVICES
1323		if (redraw_thread_active) {
1324		redraw_thread_cancel = true;
1325		SDL_WaitThread(redraw_thread, NULL);
1326		}
1327	+	#endif
1328		redraw_thread_active = false;
1329
1330		// Unlock frame buffer
1331		UNLOCK_FRAME_BUFFER;
1332		D(bug(" frame buffer unlocked\n"));
1333
1046	–	#ifdef ENABLE_VOSF
1047	–	if (use_vosf) {
1048	–	// Deinitialize VOSF
1049	–	video_vosf_exit();
1050	–	}
1051	–	#endif
1052	–
1334		// Close display
1335		delete drv;
1336		drv = NULL;
#	Line 1067 | Line 1348 | void VideoExit(void)
1348		SDL_DestroyMutex(frame_buffer_lock);
1349		if (sdl_palette_lock)
1350		SDL_DestroyMutex(sdl_palette_lock);
1351	+	if (sdl_events_lock)
1352	+	SDL_DestroyMutex(sdl_events_lock);
1353		}
1354
1355
#	Line 1147 | Line 1430 | void SDL_monitor_desc::set_palette(uint8
1430		const VIDEO_MODE &mode = get_current_mode();
1431
1432		// FIXME: how can we handle the gamma ramp?
1433	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1433	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1434		return;
1435
1436		LOCK_PALETTE;
#	Line 1208 | Line 1491 | int16 video_mode_change(VidLocals *csSav
1491		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1492		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1493
1494	<	// Disable interrupts
1494	>	// Disable interrupts and pause redraw thread
1495		DisableInterrupt();
1496	+	thread_stop_ack = false;
1497	+	thread_stop_req = true;
1498	+	while (!thread_stop_ack) ;
1499
1500		cur_mode = i;
1501		monitor_desc *monitor = VideoMonitors[0];
#	Line 1220 | Line 1506 | int16 video_mode_change(VidLocals *csSav
1506		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1507		csSave->saveMode=VModes[cur_mode].viAppleMode;
1508
1509	<	// Enable interrupts
1509	>	// Enable interrupts and resume redraw thread
1510	>	thread_stop_req = false;
1511		EnableInterrupt();
1512		return noErr;
1513		}
#	Line 1232 | Line 1519 | int16 video_mode_change(VidLocals *csSav
1519		void SDL_monitor_desc::switch_to_current_mode(void)
1520		{
1521		// Close and reopen display
1522	+	LOCK_EVENTS;
1523		video_close();
1524		video_open();
1525	+	UNLOCK_EVENTS;
1526
1527		if (drv == NULL) {
1528		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1249 | Line 1538 | void SDL_monitor_desc::switch_to_current
1538		#ifdef SHEEPSHAVER
1539		bool video_can_change_cursor(void)
1540		{
1541	<	return (display_type == DISPLAY_WINDOW);
1541	>	static char driver[] = "Quartz?";
1542	>	static int quartzok = -1;
1543	>
1544	>	if (display_type != DISPLAY_WINDOW)
1545	>	return false;
1546	>
1547	>	if (quartzok < 0) {
1548	>	if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver))
1549	>	quartzok = true;
1550	>	else {
1551	>	// Quartz driver bug prevents cursor changing in SDL 1.2.11 to 1.2.14.
1552	>	const SDL_version *vp = SDL_Linked_Version();
1553	>	int version = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch);
1554	>	quartzok = (version <= SDL_VERSIONNUM(1, 2, 10) || version >= SDL_VERSIONNUM(1, 2, 15));
1555	>	}
1556	>	}
1557	>
1558	>	return quartzok;
1559		}
1560		#endif
1561
#	Line 1267 | Line 1573 | void video_set_cursor(void)
1573
1574
1575		/*
1576	<	*  Install graphics acceleration
1576	>	*  Keyboard-related utilify functions
1577		*/
1578
1579	<	#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)
1579	>	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1580		{
1581	<	D(bug("accl_fillrect_hook %08x\n", p));
1582	<
1583	<	// Check if we can accelerate this fillrect
1584	<	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1585	<	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1586	<	if (transfer_mode == 8) {
1587	<	// Fill
1588	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1589	<	return true;
1590	<	}
1591	<	else if (transfer_mode == 10) {
1592	<	// Invert
1593	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1594	<	return true;
1595	<	}
1596	<	}
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));
1581	>	switch (e.keysym.sym) {
1582	>	case SDLK_NUMLOCK:
1583	>	case SDLK_CAPSLOCK:
1584	>	case SDLK_SCROLLOCK:
1585	>	case SDLK_RSHIFT:
1586	>	case SDLK_LSHIFT:
1587	>	case SDLK_RCTRL:
1588	>	case SDLK_LCTRL:
1589	>	case SDLK_RALT:
1590	>	case SDLK_LALT:
1591	>	case SDLK_RMETA:
1592	>	case SDLK_LMETA:
1593	>	case SDLK_LSUPER:
1594	>	case SDLK_RSUPER:
1595	>	case SDLK_MODE:
1596	>	case SDLK_COMPOSE:
1597		return true;
1598		}
1599		return false;
1600		}
1601
1602	<	// 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)
1602	>	static bool is_ctrl_down(SDL_keysym const & ks)
1603		{
1604	<	// 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	<	}
1604	>	return ctrl_down || (ks.mod & KMOD_CTRL);
1605		}
1628	–	#endif
1606
1607
1608		/*
#	Line 1633 | Line 1610 | void VideoInstallAccel(void)
1610		*  and -2 if the key was recognized as a hotkey
1611		*/
1612
1636	–	static bool is_ctrl_down(SDL_keysym const & ks)
1637	–	{
1638	–	return ctrl_down || (ks.mod & KMOD_CTRL);
1639	–	}
1640	–
1613		static int kc_decode(SDL_keysym const & ks, bool key_down)
1614		{
1615		switch (ks.sym) {
#	Line 1670 | Line 1642 | static int kc_decode(SDL_keysym const &
1642
1643		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1644		case SDLK_2: case SDLK_AT: return 0x13;
1645	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1645	>	case SDLK_3: case SDLK_HASH: return 0x14;
1646		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1647	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1647	>	case SDLK_5: return 0x17;
1648		case SDLK_6: return 0x16;
1649		case SDLK_7: return 0x1a;
1650		case SDLK_8: return 0x1c;
1651		case SDLK_9: return 0x19;
1652		case SDLK_0: return 0x1d;
1653
1654	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1654	>	case SDLK_BACKQUOTE: return 0x0a;
1655		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1656		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1657	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1658	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1659	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1657	>	case SDLK_LEFTBRACKET: return 0x21;
1658	>	case SDLK_RIGHTBRACKET: return 0x1e;
1659	>	case SDLK_BACKSLASH: return 0x2a;
1660		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1661	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1661	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1662		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1663		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1664		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1707 | Line 1679 | static int kc_decode(SDL_keysym const &
1679		case SDLK_RCTRL: return 0x36;
1680		case SDLK_LSHIFT: return 0x38;
1681		case SDLK_RSHIFT: return 0x38;
1682	+	#if (defined(__APPLE__) && defined(__MACH__))
1683	+	case SDLK_LALT: return 0x3a;
1684	+	case SDLK_RALT: return 0x3a;
1685	+	case SDLK_LMETA: return 0x37;
1686	+	case SDLK_RMETA: return 0x37;
1687	+	#else
1688		case SDLK_LALT: return 0x37;
1689		case SDLK_RALT: return 0x37;
1690		case SDLK_LMETA: return 0x3a;
1691		case SDLK_RMETA: return 0x3a;
1692	+	#endif
1693	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1694	+	case SDLK_RSUPER: return 0x3a;
1695		case SDLK_MENU: return 0x32;
1696		case SDLK_CAPSLOCK: return 0x39;
1697		case SDLK_NUMLOCK: return 0x47;
#	Line 1785 | Line 1766 | static void handle_events(void)
1766		// Mouse button
1767		case SDL_MOUSEBUTTONDOWN: {
1768		unsigned int button = event.button.button;
1769	<	if (button < 4)
1770	<	ADBMouseDown(button - 1);
1769	>	if (button == SDL_BUTTON_LEFT)
1770	>	ADBMouseDown(0);
1771	>	else if (button == SDL_BUTTON_RIGHT)
1772	>	ADBMouseDown(1);
1773	>	else if (button == SDL_BUTTON_MIDDLE)
1774	>	ADBMouseDown(2);
1775		else if (button < 6) {  // Wheel mouse
1776		if (mouse_wheel_mode == 0) {
1777		int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
#	Line 1804 | Line 1789 | static void handle_events(void)
1789		}
1790		case SDL_MOUSEBUTTONUP: {
1791		unsigned int button = event.button.button;
1792	<	if (button < 4)
1793	<	ADBMouseUp(button - 1);
1792	>	if (button == SDL_BUTTON_LEFT)
1793	>	ADBMouseUp(0);
1794	>	else if (button == SDL_BUTTON_RIGHT)
1795	>	ADBMouseUp(1);
1796	>	else if (button == SDL_BUTTON_MIDDLE)
1797	>	ADBMouseUp(2);
1798		break;
1799		}
1800
#	Line 1817 | Line 1806 | static void handle_events(void)
1806		// Keyboard
1807		case SDL_KEYDOWN: {
1808		int code = -1;
1809	<	if (use_keycodes) {
1809	>	if (use_keycodes && !is_modifier_key(event.key)) {
1810		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1811		code = keycode_table[event.key.keysym.scancode & 0xff];
1812		} else
#	Line 1845 | Line 1834 | static void handle_events(void)
1834		}
1835		case SDL_KEYUP: {
1836		int code = -1;
1837	<	if (use_keycodes) {
1837	>	if (use_keycodes && !is_modifier_key(event.key)) {
1838		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1839		code = keycode_table[event.key.keysym.scancode & 0xff];
1840		} else
1841		code = event2keycode(event.key, false);
1842	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1843	<	ADBKeyUp(code);
1842	>	if (code >= 0) {
1843	>	if (code == 0x39) {     // Caps Lock released
1844	>	if (caps_on) {
1845	>	ADBKeyUp(code);
1846	>	caps_on = false;
1847	>	} else {
1848	>	ADBKeyDown(code);
1849	>	caps_on = true;
1850	>	}
1851	>	} else
1852	>	ADBKeyUp(code);
1853		if (code == 0x36)
1854		ctrl_down = false;
1855		}
#	Line 1880 | Line 1878 | static void handle_events(void)
1878		ADBKeyDown(0x7f);       // Power key
1879		ADBKeyUp(0x7f);
1880		break;
1881	+
1882	+	// Application activate/deactivate; consume the event but otherwise ignore it
1883	+	case SDL_ACTIVEEVENT:
1884	+	break;
1885		}
1886		}
1887		}
#	Line 1891 | Line 1893 | static void handle_events(void)
1893		*/
1894
1895		// Static display update (fixed frame rate, but incremental)
1896	<	static void update_display_static(driver_window *drv)
1896	>	static void update_display_static(driver_base *drv)
1897		{
1898		// Incremental update code
1899		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
#	Line 1918 | Line 1920 | static void update_display_static(driver
1920
1921		// Check for first column from left and first column from right that have changed
1922		if (high) {
1923	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1923	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1924		const int src_bytes_per_row = bytes_per_row;
1925		const int dst_bytes_per_row = drv->s->pitch;
1926		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 1980 | Line 1982 | static void update_display_static(driver
1982
1983		} else {
1984		const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1985	+	const int dst_bytes_per_row = drv->s->pitch;
1986
1987		x1 = VIDEO_MODE_X;
1988		for (j=y1; j<=y2; j++) {
#	Line 2020 | Line 2023 | static void update_display_static(driver
2023		// Blit to screen surface
2024		for (j=y1; j<=y2; j++) {
2025		i = j * bytes_per_row + x1 * bytes_per_pixel;
2026	+	int dst_i = j * dst_bytes_per_row + x1 * bytes_per_pixel;
2027		memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
2028	<	Screen_blit((uint8 *)drv->s->pixels + i, the_buffer + i, bytes_per_pixel * wide);
2028	>	Screen_blit((uint8 *)drv->s->pixels + dst_i, the_buffer + i, bytes_per_pixel * wide);
2029		}
2030
2031		// Unlock surface, if required
#	Line 2035 | Line 2039 | static void update_display_static(driver
2039		}
2040		}
2041
2042	+	// Static display update (fixed frame rate, bounding boxes based)
2043	+	// XXX use NQD bounding boxes to help detect dirty areas?
2044	+	static void update_display_static_bbox(driver_base *drv)
2045	+	{
2046	+	const VIDEO_MODE &mode = drv->mode;
2047	+
2048	+	// Allocate bounding boxes for SDL_UpdateRects()
2049	+	const int N_PIXELS = 64;
2050	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2051	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2052	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2053	+	int nr_boxes = 0;
2054	+
2055	+	// Lock surface, if required
2056	+	if (SDL_MUSTLOCK(drv->s))
2057	+	SDL_LockSurface(drv->s);
2058	+
2059	+	// Update the surface from Mac screen
2060	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2061	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2062	+	const int dst_bytes_per_row = drv->s->pitch;
2063	+	int x, y;
2064	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2065	+	int h = N_PIXELS;
2066	+	if (h > VIDEO_MODE_Y - y)
2067	+	h = VIDEO_MODE_Y - y;
2068	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2069	+	int w = N_PIXELS;
2070	+	if (w > VIDEO_MODE_X - x)
2071	+	w = VIDEO_MODE_X - x;
2072	+	const int xs = w * bytes_per_pixel;
2073	+	const int xb = x * bytes_per_pixel;
2074	+	bool dirty = false;
2075	+	for (int j = y; j < (y + h); j++) {
2076	+	const int yb = j * bytes_per_row;
2077	+	const int dst_yb = j * dst_bytes_per_row;
2078	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2079	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2080	+	Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs);
2081	+	dirty = true;
2082	+	}
2083	+	}
2084	+	if (dirty) {
2085	+	boxes[nr_boxes].x = x;
2086	+	boxes[nr_boxes].y = y;
2087	+	boxes[nr_boxes].w = w;
2088	+	boxes[nr_boxes].h = h;
2089	+	nr_boxes++;
2090	+	}
2091	+	}
2092	+	}
2093	+
2094	+	// Unlock surface, if required
2095	+	if (SDL_MUSTLOCK(drv->s))
2096	+	SDL_UnlockSurface(drv->s);
2097	+
2098	+	// Refresh display
2099	+	if (nr_boxes)
2100	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2101	+	}
2102	+
2103
2104		// We suggest the compiler to inline the next two functions so that it
2105		// may specialise the code according to the current screen depth and
#	Line 2076 | Line 2141 | static inline void handle_palette_change
2141		UNLOCK_PALETTE;
2142		}
2143
2144	+	static void video_refresh_window_static(void);
2145	+
2146		static void video_refresh_dga(void)
2147		{
2148		// Quit DGA mode if requested
2149		possibly_quit_dga_mode();
2150	+	video_refresh_window_static();
2151		}
2152
2153		#ifdef ENABLE_VOSF
#	Line 2095 | Line 2163 | static void video_refresh_dga_vosf(void)
2163		tick_counter = 0;
2164		if (mainBuffer.dirty) {
2165		LOCK_VOSF;
2166	<	update_display_dga_vosf();
2166	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2167		UNLOCK_VOSF;
2168		}
2169		}
#	Line 2129 | Line 2197 | static void video_refresh_window_static(
2197		static int tick_counter = 0;
2198		if (++tick_counter >= frame_skip) {
2199		tick_counter = 0;
2200	<	update_display_static(static_cast<driver_window *>(drv));
2200	>	const VIDEO_MODE &mode = drv->mode;
2201	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2202	>	update_display_static_bbox(drv);
2203	>	else
2204	>	update_display_static(drv);
2205		}
2206		}
2207
#	Line 2159 | Line 2231 | static void VideoRefreshInit(void)
2231		}
2232		}
2233
2234	+	static inline void do_video_refresh(void)
2235	+	{
2236	+	// Handle SDL events
2237	+	handle_events();
2238	+
2239	+	// Update display
2240	+	video_refresh();
2241	+
2242	+	#ifdef SHEEPSHAVER
2243	+	// Set new cursor image if it was changed
2244	+	if (cursor_changed && sdl_cursor) {
2245	+	cursor_changed = false;
2246	+	LOCK_EVENTS;
2247	+	SDL_FreeCursor(sdl_cursor);
2248	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2249	+	if (sdl_cursor) {
2250	+	SDL_ShowCursor(private_data == NULL || private_data->cursorVisible);
2251	+	SDL_SetCursor(sdl_cursor);
2252	+	#ifdef WIN32
2253	+	// XXX Windows apparently needs an extra mouse event to
2254	+	// make the new cursor image visible
2255	+	int visible = SDL_ShowCursor(-1);
2256	+	if (visible) {
2257	+	int x, y;
2258	+	SDL_GetMouseState(&x, &y);
2259	+	SDL_WarpMouse(x, y);
2260	+	}
2261	+	#endif
2262	+	}
2263	+	UNLOCK_EVENTS;
2264	+	}
2265	+	#endif
2266	+
2267	+	// Set new palette if it was changed
2268	+	handle_palette_changes();
2269	+	}
2270	+
2271	+	// This function is called on non-threaded platforms from a timer interrupt
2272	+	void VideoRefresh(void)
2273	+	{
2274	+	// We need to check redraw_thread_active to inhibit refreshed during
2275	+	// mode changes on non-threaded platforms
2276	+	if (!redraw_thread_active)
2277	+	return;
2278	+
2279	+	// Process pending events and update display
2280	+	do_video_refresh();
2281	+	}
2282	+
2283		const int VIDEO_REFRESH_HZ = 60;
2284		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2285
2286	+	#ifndef USE_CPU_EMUL_SERVICES
2287		static int redraw_func(void *arg)
2288		{
2289		uint64 start = GetTicks_usec();
#	Line 2179 | Line 2301 | static int redraw_func(void *arg)
2301		next = GetTicks_usec();
2302		ticks++;
2303
2182	–	// Handle SDL events
2183	–	handle_events();
2184	–
2185	–	// Refresh display
2186	–	video_refresh();
2187	–
2304		#ifdef SHEEPSHAVER
2305	<	// Set new cursor image if it was changed
2306	<	if (cursor_changed && sdl_cursor) {
2307	<	cursor_changed = false;
2308	<	SDL_FreeCursor(sdl_cursor);
2193	<	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2194	<	if (sdl_cursor)
2195	<	SDL_SetCursor(sdl_cursor);
2305	>	// Pause if requested (during video mode switches)
2306	>	if (thread_stop_req) {
2307	>	thread_stop_ack = true;
2308	>	continue;
2309		}
2310		#endif
2311
2312	<	// Set new palette if it was changed
2313	<	handle_palette_changes();
2312	>	// Process pending events and update display
2313	>	do_video_refresh();
2314		}
2315
2316		uint64 end = GetTicks_usec();
2317		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2318		return 0;
2319		}
2320	+	#endif
2321	+
2322	+
2323	+	/*
2324	+	*  Record dirty area from NQD
2325	+	*/
2326	+
2327	+	#ifdef SHEEPSHAVER
2328	+	void video_set_dirty_area(int x, int y, int w, int h)
2329	+	{
2330	+	#ifdef ENABLE_VOSF
2331	+	const VIDEO_MODE &mode = drv->mode;
2332	+	const int screen_width = VIDEO_MODE_X;
2333	+	const int screen_height = VIDEO_MODE_Y;
2334	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2335	+
2336	+	if (use_vosf) {
2337	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2338	+	return;
2339	+	}
2340	+	#endif
2341	+
2342	+	// XXX handle dirty bounding boxes for non-VOSF modes
2343	+	}
2344	+	#endif

Diff Legend

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