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.42 by asvitkine, 2011-12-28T22:15:10Z

#	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
69	+	#if (defined(__APPLE__) && defined(__MACH__))
70	+	extern "C" {
71	+	void NSAutoReleasePool_wrap(void (*fn)(void));
72	+	}
73	+	#endif
74
75		// Supported video modes
76		using std::vector;
#	Line 82 | Line 92 | static int display_type = DISPLAY_WINDOW
92		#endif
93
94		// Constants
95	+	#ifdef WIN32
96	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
97	+	#else
98		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
99	+	#endif
100
101
102		// Global variables
#	Line 95 | Line 109 | static uint8 *the_buffer_copy = NULL;
109		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
110
111		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
112	+	#ifndef USE_CPU_EMUL_SERVICES
113		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
114		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
115	+	#ifdef SHEEPSHAVER
116	+	static volatile bool thread_stop_req = false;
117	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
118	+	#endif
119	+	#endif
120
121		#ifdef ENABLE_VOSF
122		static bool use_vosf = false;                                           // Flag: VOSF enabled
#	Line 121 | Line 141 | static SDL_Cursor *sdl_cursor;                                         // C
141		static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
142		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
143		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
144	<	static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
144	>	static const int sdl_eventmask = SDL_MOUSEEVENTMASK | SDL_KEYEVENTMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK | SDL_ACTIVEEVENTMASK;
145	>
146	>	// Mutex to protect SDL events
147	>	static SDL_mutex *sdl_events_lock = NULL;
148	>	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
149	>	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
150
151		// Mutex to protect palette
152		static SDL_mutex *sdl_palette_lock = NULL;
#	Line 146 | Line 171 | extern void SysMountFirstFloppy(void);
171
172
173		/*
174	+	*  SDL surface locking glue
175	+	*/
176	+
177	+	#ifdef ENABLE_VOSF
178	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
179	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
180	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
181	+	} while (0)
182	+	#else
183	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
184	+	#endif
185	+
186	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
187	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
188	+	SDL_LockSurface(SURFACE);                               \
189	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
190	+	}                                                                                       \
191	+	} while (0)
192	+
193	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
194	+	if (SDL_MUSTLOCK(SURFACE))                                      \
195	+	SDL_UnlockSurface(SURFACE);                             \
196	+	} while (0)
197	+
198	+
199	+	/*
200	+	*  Framebuffer allocation routines
201	+	*/
202	+
203	+	static void *vm_acquire_framebuffer(uint32 size)
204	+	{
205	+	// always try to reallocate framebuffer at the same address
206	+	static void *fb = VM_MAP_FAILED;
207	+	if (fb != VM_MAP_FAILED) {
208	+	if (vm_acquire_fixed(fb, size) < 0) {
209	+	#ifndef SHEEPSHAVER
210	+	printf("FATAL: Could not reallocate framebuffer at previous address\n");
211	+	#endif
212	+	fb = VM_MAP_FAILED;
213	+	}
214	+	}
215	+	if (fb == VM_MAP_FAILED)
216	+	fb = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT);
217	+	return fb;
218	+	}
219	+
220	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
221	+	{
222	+	vm_release(fb, size);
223	+	}
224	+
225	+
226	+	/*
227	+	*  Windows message handler
228	+	*/
229	+
230	+	#ifdef WIN32
231	+	#include <dbt.h>
232	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
233	+
234	+	extern void SysMediaArrived(void);
235	+	extern void SysMediaRemoved(void);
236	+	extern HWND GetMainWindowHandle(void);
237	+
238	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
239	+	{
240	+	switch (msg) {
241	+	case WM_DEVICECHANGE:
242	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
243	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
244	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
245	+	SysMediaRemoved();
246	+	}
247	+	else if (wParam == DBT_DEVICEARRIVAL) {
248	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
249	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
250	+	SysMediaArrived();
251	+	}
252	+	return 0;
253	+
254	+	default:
255	+	if (sdl_window_proc)
256	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
257	+	}
258	+
259	+	return DefWindowProc(hwnd, msg, wParam, lParam);
260	+	}
261	+	#endif
262	+
263	+
264	+	/*
265		*  SheepShaver glue
266		*/
267
#	Line 190 | Line 306 | static vector<monitor_desc *> VideoMonit
306		// Find Apple mode matching best specified dimensions
307		static int find_apple_resolution(int xsize, int ysize)
308		{
309	<	int apple_id;
310	<	if (xsize < 800)
311	<	apple_id = APPLE_640x480;
312	<	else if (xsize < 1024)
313	<	apple_id = APPLE_800x600;
314	<	else if (xsize < 1152)
315	<	apple_id = APPLE_1024x768;
316	<	else if (xsize < 1280) {
317	<	if (ysize < 900)
318	<	apple_id = APPLE_1152x768;
319	<	else
320	<	apple_id = APPLE_1152x900;
321	<	}
322	<	else if (xsize < 1600)
323	<	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;
309	>	if (xsize == 640 && ysize == 480)
310	>	return APPLE_640x480;
311	>	if (xsize == 800 && ysize == 600)
312	>	return APPLE_800x600;
313	>	if (xsize == 1024 && ysize == 768)
314	>	return APPLE_1024x768;
315	>	if (xsize == 1152 && ysize == 768)
316	>	return APPLE_1152x768;
317	>	if (xsize == 1152 && ysize == 900)
318	>	return APPLE_1152x900;
319	>	if (xsize == 1280 && ysize == 1024)
320	>	return APPLE_1280x1024;
321	>	if (xsize == 1600 && ysize == 1200)
322	>	return APPLE_1600x1200;
323	>	return APPLE_CUSTOM;
324		}
325
326		// Display error alert
#	Line 325 | Line 393 | static inline int bytes_per_pixel(int de
393		}
394
395		// Map video_mode depth ID to numerical depth value
396	<	static int sdl_depth_of_video_depth(int video_depth)
396	>	static int mac_depth_of_video_depth(int video_depth)
397		{
398		int depth = -1;
399		switch (video_depth) {
#	Line 353 | Line 421 | static int sdl_depth_of_video_depth(int
421		return depth;
422		}
423
424	<	// Check wether specified mode is available
425	<	static bool has_mode(int type, int width, int height)
424	>	// Map video_mode depth ID to SDL screen depth
425	>	static int sdl_depth_of_video_depth(int video_depth)
426		{
427	<	// FIXME: no fullscreen support yet
428	<	if (type == DISPLAY_SCREEN)
429	<	return false;
427	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
428	>	}
429	>
430	>	// Get screen dimensions
431	>	static void sdl_display_dimensions(int &width, int &height)
432	>	{
433	>	static int max_width, max_height;
434	>	if (max_width == 0 && max_height == 0) {
435	>	max_width = 640 ; max_height = 480;
436	>	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
437	>	if (modes && modes != (SDL_Rect **)-1) {
438	>	// It turns out that on some implementations, and contrary to the documentation,
439	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
440	>	for (int i = 0; modes[i] != NULL; i++) {
441	>	const int w = modes[i]->w;
442	>	const int h = modes[i]->h;
443	>	if (w > max_width && h > max_height) {
444	>	max_width = w;
445	>	max_height = h;
446	>	}
447	>	}
448	>	}
449	>	}
450	>	width = max_width;
451	>	height = max_height;
452	>	}
453	>
454	>	static inline int sdl_display_width(void)
455	>	{
456	>	int width, height;
457	>	sdl_display_dimensions(width, height);
458	>	return width;
459	>	}
460	>
461	>	static inline int sdl_display_height(void)
462	>	{
463	>	int width, height;
464	>	sdl_display_dimensions(width, height);
465	>	return height;
466	>	}
467
468	+	// Check wether specified mode is available
469	+	static bool has_mode(int type, int width, int height, int depth)
470	+	{
471		#ifdef SHEEPSHAVER
472	<	// Filter out Classic resolutiosn
472	>	// Filter out Classic resolutions
473		if (width == 512 && height == 384)
474		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;
475		#endif
476	<	return false;
476	>
477	>	// Filter out out-of-bounds resolutions
478	>	if (width > sdl_display_width() || height > sdl_display_height())
479	>	return false;
480	>
481	>	// Rely on SDL capabilities
482	>	return SDL_VideoModeOK(width, height,
483	>	sdl_depth_of_video_depth(depth),
484	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
485		}
486
487		// Add mode to list of supported modes
488		static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
489		{
490		// Filter out unsupported modes
491	<	if (!has_mode(type, width, height))
491	>	if (!has_mode(type, width, height, depth))
492		return;
493
494		// Fill in VideoMode entry
495		VIDEO_MODE mode;
496		#ifdef SHEEPSHAVER
497	<	// Recalculate dimensions to fit Apple modes
409	<	resolution_id = match_apple_resolution(width, height);
497	>	resolution_id = find_apple_resolution(width, height);
498		mode.viType = type;
499		#endif
500		VIDEO_MODE_X = width;
501		VIDEO_MODE_Y = height;
502		VIDEO_MODE_RESOLUTION = resolution_id;
503		VIDEO_MODE_ROW_BYTES = bytes_per_row;
504	<	VIDEO_MODE_DEPTH = depth;
504	>	VIDEO_MODE_DEPTH = (video_depth)depth;
505		VideoModes.push_back(mode);
506		}
507
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	–
508		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
509		static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
510		{
#	Line 469 | Line 544 | static void set_window_name(int name)
544		// Set mouse grab mode
545		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
546		{
547	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
547	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
548		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
549		}
550
551	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
552	+	static void migrate_screen_prefs(void)
553	+	{
554	+	#ifdef SHEEPSHAVER
555	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
556	+	if (PrefsFindString("screen"))
557	+	return;
558	+
559	+	uint32 window_modes = PrefsFindInt32("windowmodes");
560	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
561	+	int width = 0, height = 0;
562	+	if (screen_modes) {
563	+	static const struct {
564	+	int id;
565	+	int width;
566	+	int height;
567	+	}
568	+	modes[] = {
569	+	{  1,    640,    480 },
570	+	{  2,    800,    600 },
571	+	{  4,   1024,    768 },
572	+	{ 64,   1152,    768 },
573	+	{  8,   1152,    900 },
574	+	{ 16,   1280,   1024 },
575	+	{ 32,   1600,   1200 },
576	+	{ 0, }
577	+	};
578	+	for (int i = 0; modes[i].id != 0; i++) {
579	+	if (screen_modes & modes[i].id) {
580	+	if (width < modes[i].width && height < modes[i].height) {
581	+	width = modes[i].width;
582	+	height = modes[i].height;
583	+	}
584	+	}
585	+	}
586	+	} else {
587	+	if (window_modes & 1)
588	+	width = 640, height = 480;
589	+	if (window_modes & 2)
590	+	width = 800, height = 600;
591	+	}
592	+	if (width && height) {
593	+	char str[32];
594	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
595	+	PrefsReplaceString("screen", str);
596	+	}
597	+	#endif
598	+	}
599	+
600
601		/*
602		*  Display "driver" classes
#	Line 506 | Line 630 | public:
630		class driver_window;
631		static void update_display_window_vosf(driver_window *drv);
632		static void update_display_dynamic(int ticker, driver_window *drv);
633	<	static void update_display_static(driver_window *drv);
633	>	static void update_display_static(driver_base *drv);
634
635		class driver_window : public driver_base {
636		friend void update_display_window_vosf(driver_window *drv);
637		friend void update_display_dynamic(int ticker, driver_window *drv);
638	<	friend void update_display_static(driver_window *drv);
638	>	friend void update_display_static(driver_base *drv);
639
640		public:
641		driver_window(SDL_monitor_desc &monitor);
#	Line 528 | Line 652 | private:
652		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
653		};
654
655	+	class driver_fullscreen : public driver_base {
656	+	public:
657	+	driver_fullscreen(SDL_monitor_desc &monitor);
658	+	~driver_fullscreen();
659	+	};
660	+
661		static driver_base *drv = NULL; // Pointer to currently used driver object
662
663		#ifdef ENABLE_VOSF
#	Line 549 | Line 679 | driver_base::~driver_base()
679		if (s)
680		SDL_FreeSurface(s);
681
682	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
683	+	if (the_buffer != VM_MAP_FAILED) {
684	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
685	+	vm_release_framebuffer(the_buffer, the_buffer_size);
686	+	the_buffer = NULL;
687	+	}
688	+
689		// Free frame buffer(s)
690		if (!use_vosf) {
554	–	if (the_buffer) {
555	–	free(the_buffer);
556	–	the_buffer = NULL;
557	–	}
691		if (the_buffer_copy) {
692		free(the_buffer_copy);
693		the_buffer_copy = NULL;
#	Line 562 | Line 695 | driver_base::~driver_base()
695		}
696		#ifdef ENABLE_VOSF
697		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	–	}
698		if (the_host_buffer) {
699		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
700		free(the_host_buffer);
#	Line 578 | Line 705 | driver_base::~driver_base()
705		free(the_buffer_copy);
706		the_buffer_copy = NULL;
707		}
708	+
709	+	// Deinitialize VOSF
710	+	video_vosf_exit();
711		}
712		#endif
713		}
#	Line 587 | Line 717 | void driver_base::update_palette(void)
717		{
718		const VIDEO_MODE &mode = monitor.get_current_mode();
719
720	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
720	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
721		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
722		}
723
#	Line 606 | Line 736 | void driver_base::restore_mouse_accel(vo
736		*  Windowed display driver
737		*/
738
739	+	static bool SDL_display_opened = false;
740	+
741		// Open display
742		driver_window::driver_window(SDL_monitor_desc &m)
743		: driver_base(m), mouse_grabbed(false)
#	Line 617 | Line 749 | driver_window::driver_window(SDL_monitor
749		// Set absolute mouse mode
750		ADBSetRelMouseMode(mouse_grabbed);
751
752	+	// This is ugly:
753	+	// If we're switching resolutions (ie, not setting it for the first time),
754	+	// there's a bug in SDL where the SDL_Surface created will not be properly
755	+	// setup. The solution is to SDL_QuitSubSystem(SDL_INIT_VIDEO) before calling
756	+	// SDL_SetVideoMode for the second time (SDL_SetVideoMode will call SDL_Init()
757	+	// and all will be well). Without this, the video becomes corrupted (at least
758	+	// on Mac OS X), after the resolution switch.
759	+	if (SDL_display_opened)
760	+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
761	+
762		// Create surface
763	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
763	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
764		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
765		return;
766
767	+	SDL_display_opened = true;
768	+
769		#ifdef ENABLE_VOSF
770		use_vosf = true;
771		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
772		the_host_buffer = (uint8 *)s->pixels;
773		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
774	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
774	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
775		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
776		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
777
#	Line 651 | Line 795 | driver_window::driver_window(SDL_monitor
795		// Allocate memory for frame buffer
796		the_buffer_size = (aligned_height + 2) * s->pitch;
797		the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
798	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
798	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
799		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
800		}
801
#	Line 676 | Line 820 | driver_window::driver_window(SDL_monitor
820		visualFormat.Rmask = f->Rmask;
821		visualFormat.Gmask = f->Gmask;
822		visualFormat.Bmask = f->Bmask;
823	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
823	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
824
825		// Load gray ramp to 8->16/32 expand map
826		if (!IsDirectMode(mode))
#	Line 743 | Line 887 | void driver_window::mouse_moved(int x, i
887		ADBMouseMoved(x, y);
888		}
889
890	+
891	+	/*
892	+	*  Full-screen display driver
893	+	*/
894	+
895	+	// Open display
896	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
897	+	: driver_base(m)
898	+	{
899	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
900	+	int aligned_width = (width + 15) & ~15;
901	+	int aligned_height = (height + 15) & ~15;
902	+
903	+	// Set absolute mouse mode
904	+	ADBSetRelMouseMode(false);
905	+
906	+	// Create surface
907	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
908	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
909	+	return;
910	+
911	+	#ifdef ENABLE_VOSF
912	+	use_vosf = true;
913	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
914	+	the_host_buffer = (uint8 *)s->pixels;
915	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
916	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
917	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
918	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
919	+
920	+	// Check whether we can initialize the VOSF subsystem and it's profitable
921	+	if (!video_vosf_init(m)) {
922	+	WarningAlert(STR_VOSF_INIT_ERR);
923	+	use_vosf = false;
924	+	}
925	+	else if (!video_vosf_profitable()) {
926	+	video_vosf_exit();
927	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
928	+	use_vosf = false;
929	+	}
930	+	if (!use_vosf) {
931	+	free(the_buffer_copy);
932	+	vm_release(the_buffer, the_buffer_size);
933	+	the_host_buffer = NULL;
934	+	}
935	+	#endif
936	+	if (!use_vosf) {
937	+	// Allocate memory for frame buffer
938	+	the_buffer_size = (aligned_height + 2) * s->pitch;
939	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
940	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
941	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
942	+	}
943	+
944	+	// Hide cursor
945	+	SDL_ShowCursor(0);
946	+
947	+	// Init blitting routines
948	+	SDL_PixelFormat *f = s->format;
949	+	VisualFormat visualFormat;
950	+	visualFormat.depth = depth;
951	+	visualFormat.Rmask = f->Rmask;
952	+	visualFormat.Gmask = f->Gmask;
953	+	visualFormat.Bmask = f->Bmask;
954	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
955	+
956	+	// Load gray ramp to 8->16/32 expand map
957	+	if (!IsDirectMode(mode))
958	+	for (int i=0; i<256; i++)
959	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
960	+
961	+	// Set frame buffer base
962	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
963	+
964	+	// Everything went well
965	+	init_ok = true;
966	+	}
967	+
968	+	// Close display
969	+	driver_fullscreen::~driver_fullscreen()
970	+	{
971	+	#ifdef ENABLE_VOSF
972	+	if (use_vosf)
973	+	the_host_buffer = NULL; // don't free() in driver_base dtor
974	+	#endif
975	+	if (s)
976	+	SDL_FreeSurface(s);
977	+
978	+	// Show cursor
979	+	SDL_ShowCursor(1);
980	+	}
981	+
982	+
983		/*
984		*  Initialization
985		*/
#	Line 774 | Line 1011 | static void keycode_init(void)
1011		SDL_VideoDriverName(video_driver, sizeof(video_driver));
1012		bool video_driver_found = false;
1013		char line[256];
1014	+	int n_keys = 0;
1015		while (fgets(line, sizeof(line) - 1, f)) {
1016		// Read line
1017		int len = strlen(line);
#	Line 786 | Line 1024 | static void keycode_init(void)
1024		continue;
1025
1026		if (video_driver_found) {
1027	<	// Skip aliases
1027	>	// Skip aliases as long as we have read keycodes yet
1028	>	// Otherwise, it's another mapping and we have to stop
1029		static const char sdl_str[] = "sdl";
1030	<	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0)
1030	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1031		continue;
1032
1033		// Read keycode
1034		int x_code, mac_code;
1035		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1036	<	keycode_table[x_code & 0xff] = mac_code;
1036	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1037		else
1038		break;
1039		} else {
#	Line 819 | Line 1058 | static void keycode_init(void)
1058		WarningAlert(str);
1059		return;
1060		}
1061	+
1062	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1063		}
1064		}
1065
#	Line 837 | Line 1078 | bool SDL_monitor_desc::video_open(void)
1078		case DISPLAY_WINDOW:
1079		drv = new(std::nothrow) driver_window(*this);
1080		break;
1081	+	case DISPLAY_SCREEN:
1082	+	drv = new(std::nothrow) driver_fullscreen(*this);
1083	+	break;
1084		}
1085		if (drv == NULL)
1086		return false;
#	Line 846 | Line 1090 | bool SDL_monitor_desc::video_open(void)
1090		return false;
1091		}
1092
1093	+	#ifdef WIN32
1094	+	// Chain in a new message handler for WM_DEVICECHANGE
1095	+	HWND the_window = GetMainWindowHandle();
1096	+	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1097	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1098	+	#endif
1099	+
1100		// Initialize VideoRefresh function
1101		VideoRefreshInit();
1102
#	Line 853 | Line 1104 | bool SDL_monitor_desc::video_open(void)
1104		LOCK_FRAME_BUFFER;
1105
1106		// Start redraw/input thread
1107	+	#ifndef USE_CPU_EMUL_SERVICES
1108		redraw_thread_cancel = false;
1109		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1110		if (!redraw_thread_active) {
1111		printf("FATAL: cannot create redraw thread\n");
1112		return false;
1113		}
1114	+	#else
1115	+	redraw_thread_active = true;
1116	+	#endif
1117		return true;
1118		}
1119
#	Line 879 | Line 1134 | bool VideoInit(bool classic)
1134		#endif
1135
1136		// Create Mutexes
1137	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1138	+	return false;
1139		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1140		return false;
1141		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 893 | Line 1150 | bool VideoInit(bool classic)
1150		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1151
1152		// Get screen mode from preferences
1153	+	migrate_screen_prefs();
1154		const char *mode_str = NULL;
897	–	#ifndef SHEEPSHAVER
1155		if (classic_mode)
1156		mode_str = "win/512/342";
1157		else
1158		mode_str = PrefsFindString("screen");
902	–	#endif
1159
1160		// Determine display type and default dimensions
1161		int default_width, default_height;
#	Line 915 | Line 1171 | bool VideoInit(bool classic)
1171		if (mode_str) {
1172		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1173		display_type = DISPLAY_WINDOW;
1174	<	}
1175	<	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;
1174	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1175	>	display_type = DISPLAY_SCREEN;
1176		}
1177		if (default_width <= 0)
1178	<	default_width = max_width;
1178	>	default_width = sdl_display_width();
1179	>	else if (default_width > sdl_display_width())
1180	>	default_width = sdl_display_width();
1181		if (default_height <= 0)
1182	<	default_height = max_height;
1182	>	default_height = sdl_display_height();
1183	>	else if (default_height > sdl_display_height())
1184	>	default_height = sdl_display_height();
1185
1186		// Mac screen depth follows X depth
1187		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 949 | Line 1201 | bool VideoInit(bool classic)
1201		break;
1202		}
1203
1204	+	// Initialize list of video modes to try
1205	+	struct {
1206	+	int w;
1207	+	int h;
1208	+	int resolution_id;
1209	+	}
1210	+	video_modes[] = {
1211	+	{   -1,   -1, 0x80 },
1212	+	{  512,  384, 0x80 },
1213	+	{  640,  480, 0x81 },
1214	+	{  800,  600, 0x82 },
1215	+	{ 1024,  768, 0x83 },
1216	+	{ 1152,  870, 0x84 },
1217	+	{ 1280, 1024, 0x85 },
1218	+	{ 1600, 1200, 0x86 },
1219	+	{ 0, }
1220	+	};
1221	+	video_modes[0].w = default_width;
1222	+	video_modes[0].h = default_height;
1223	+
1224		// Construct list of supported modes
1225		if (display_type == DISPLAY_WINDOW) {
1226		if (classic)
1227		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1228		else {
1229	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1230	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1231	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1232	<	add_window_modes(video_depth(d));
1229	>	for (int i = 0; video_modes[i].w != 0; i++) {
1230	>	const int w = video_modes[i].w;
1231	>	const int h = video_modes[i].h;
1232	>	if (i > 0 && (w >= default_width || h >= default_height))
1233	>	continue;
1234	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1235	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1236		}
1237		}
1238	<	} else
1239	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1238	>	} else if (display_type == DISPLAY_SCREEN) {
1239	>	for (int i = 0; video_modes[i].w != 0; i++) {
1240	>	const int w = video_modes[i].w;
1241	>	const int h = video_modes[i].h;
1242	>	if (i > 0 && (w >= default_width || h >= default_height))
1243	>	continue;
1244	>	if (w == 512 && h == 384)
1245	>	continue;
1246	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1247	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1248	>	}
1249	>	}
1250	>
1251		if (VideoModes.empty()) {
1252		ErrorAlert(STR_NO_XVISUAL_ERR);
1253		return false;
#	Line 1032 | Line 1318 | void SDL_monitor_desc::video_close(void)
1318		{
1319		D(bug("video_close()\n"));
1320
1321	+	#ifdef WIN32
1322	+	// Remove message handler for WM_DEVICECHANGE
1323	+	HWND the_window = GetMainWindowHandle();
1324	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1325	+	#endif
1326	+
1327		// Stop redraw thread
1328	+	#ifndef USE_CPU_EMUL_SERVICES
1329		if (redraw_thread_active) {
1330		redraw_thread_cancel = true;
1331		SDL_WaitThread(redraw_thread, NULL);
1332		}
1333	+	#endif
1334		redraw_thread_active = false;
1335
1336		// Unlock frame buffer
1337		UNLOCK_FRAME_BUFFER;
1338		D(bug(" frame buffer unlocked\n"));
1339
1046	–	#ifdef ENABLE_VOSF
1047	–	if (use_vosf) {
1048	–	// Deinitialize VOSF
1049	–	video_vosf_exit();
1050	–	}
1051	–	#endif
1052	–
1340		// Close display
1341		delete drv;
1342		drv = NULL;
#	Line 1067 | Line 1354 | void VideoExit(void)
1354		SDL_DestroyMutex(frame_buffer_lock);
1355		if (sdl_palette_lock)
1356		SDL_DestroyMutex(sdl_palette_lock);
1357	+	if (sdl_events_lock)
1358	+	SDL_DestroyMutex(sdl_events_lock);
1359		}
1360
1361
#	Line 1147 | Line 1436 | void SDL_monitor_desc::set_palette(uint8
1436		const VIDEO_MODE &mode = get_current_mode();
1437
1438		// FIXME: how can we handle the gamma ramp?
1439	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1439	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1440		return;
1441
1442		LOCK_PALETTE;
#	Line 1208 | Line 1497 | int16 video_mode_change(VidLocals *csSav
1497		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1498		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1499
1500	<	// Disable interrupts
1500	>	// Disable interrupts and pause redraw thread
1501		DisableInterrupt();
1502	+	thread_stop_ack = false;
1503	+	thread_stop_req = true;
1504	+	while (!thread_stop_ack) ;
1505
1506		cur_mode = i;
1507		monitor_desc *monitor = VideoMonitors[0];
#	Line 1220 | Line 1512 | int16 video_mode_change(VidLocals *csSav
1512		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1513		csSave->saveMode=VModes[cur_mode].viAppleMode;
1514
1515	<	// Enable interrupts
1515	>	// Enable interrupts and resume redraw thread
1516	>	thread_stop_req = false;
1517		EnableInterrupt();
1518		return noErr;
1519		}
#	Line 1232 | Line 1525 | int16 video_mode_change(VidLocals *csSav
1525		void SDL_monitor_desc::switch_to_current_mode(void)
1526		{
1527		// Close and reopen display
1528	+	LOCK_EVENTS;
1529		video_close();
1530		video_open();
1531	+	UNLOCK_EVENTS;
1532
1533		if (drv == NULL) {
1534		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1249 | Line 1544 | void SDL_monitor_desc::switch_to_current
1544		#ifdef SHEEPSHAVER
1545		bool video_can_change_cursor(void)
1546		{
1547	<	return (display_type == DISPLAY_WINDOW);
1548	<	}
1254	<	#endif
1547	>	static char driver[] = "Quartz?";
1548	>	static int quartzok = -1;
1549
1550	+	if (display_type != DISPLAY_WINDOW)
1551	+	return false;
1552
1553	<	/*
1554	<	*  Set cursor image for window
1555	<	*/
1553	>	if (quartzok < 0) {
1554	>	if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver))
1555	>	quartzok = true;
1556	>	else {
1557	>	// Quartz driver bug prevents cursor changing in SDL 1.2.11 and later
1558	>	const SDL_version *vp = SDL_Linked_Version();
1559	>	quartzok = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch) <= SDL_VERSIONNUM(1, 2, 10);
1560	>	}
1561	>	}
1562
1563	<	#ifdef SHEEPSHAVER
1262	<	void video_set_cursor(void)
1263	<	{
1264	<	cursor_changed = true;
1563	>	return quartzok;
1564		}
1565		#endif
1566
1567
1568		/*
1569	<	*  Install graphics acceleration
1569	>	*  Set cursor image for window
1570		*/
1571
1572		#ifdef SHEEPSHAVER
1573	<	// 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)
1573	>	void video_set_cursor(void)
1574		{
1575	<	// 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	<	}
1575	>	cursor_changed = true;
1576		}
1577		#endif
1578
#	Line 1698 | Line 1647 | static int kc_decode(SDL_keysym const &
1647
1648		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1649		case SDLK_2: case SDLK_AT: return 0x13;
1650	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1650	>	case SDLK_3: case SDLK_HASH: return 0x14;
1651		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1652	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1652	>	case SDLK_5: return 0x17;
1653		case SDLK_6: return 0x16;
1654		case SDLK_7: return 0x1a;
1655		case SDLK_8: return 0x1c;
1656		case SDLK_9: return 0x19;
1657		case SDLK_0: return 0x1d;
1658
1659	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1659	>	case SDLK_BACKQUOTE: return 0x0a;
1660		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1661		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1662	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1663	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1664	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1662	>	case SDLK_LEFTBRACKET: return 0x21;
1663	>	case SDLK_RIGHTBRACKET: return 0x1e;
1664	>	case SDLK_BACKSLASH: return 0x2a;
1665		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1666	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1666	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1667		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1668		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1669		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1746 | Line 1695 | static int kc_decode(SDL_keysym const &
1695		case SDLK_LMETA: return 0x3a;
1696		case SDLK_RMETA: return 0x3a;
1697		#endif
1698	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1699	+	case SDLK_RSUPER: return 0x3a;
1700		case SDLK_MENU: return 0x32;
1701		case SDLK_CAPSLOCK: return 0x39;
1702		case SDLK_NUMLOCK: return 0x47;
#	Line 1820 | Line 1771 | static void handle_events(void)
1771		// Mouse button
1772		case SDL_MOUSEBUTTONDOWN: {
1773		unsigned int button = event.button.button;
1774	<	if (button < 4)
1775	<	ADBMouseDown(button - 1);
1774	>	if (button == SDL_BUTTON_LEFT)
1775	>	ADBMouseDown(0);
1776	>	else if (button == SDL_BUTTON_RIGHT)
1777	>	ADBMouseDown(1);
1778	>	else if (button == SDL_BUTTON_MIDDLE)
1779	>	ADBMouseDown(2);
1780		else if (button < 6) {  // Wheel mouse
1781		if (mouse_wheel_mode == 0) {
1782		int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
#	Line 1839 | Line 1794 | static void handle_events(void)
1794		}
1795		case SDL_MOUSEBUTTONUP: {
1796		unsigned int button = event.button.button;
1797	<	if (button < 4)
1798	<	ADBMouseUp(button - 1);
1797	>	if (button == SDL_BUTTON_LEFT)
1798	>	ADBMouseUp(0);
1799	>	else if (button == SDL_BUTTON_RIGHT)
1800	>	ADBMouseUp(1);
1801	>	else if (button == SDL_BUTTON_MIDDLE)
1802	>	ADBMouseUp(2);
1803		break;
1804		}
1805
#	Line 1924 | Line 1883 | static void handle_events(void)
1883		ADBKeyDown(0x7f);       // Power key
1884		ADBKeyUp(0x7f);
1885		break;
1886	+
1887	+	// Application activate/deactivate; consume the event but otherwise ignore it
1888	+	case SDL_ACTIVEEVENT:
1889	+	break;
1890		}
1891		}
1892		}
#	Line 1935 | Line 1898 | static void handle_events(void)
1898		*/
1899
1900		// Static display update (fixed frame rate, but incremental)
1901	<	static void update_display_static(driver_window *drv)
1901	>	static void update_display_static(driver_base *drv)
1902		{
1903		// Incremental update code
1904		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
#	Line 1962 | Line 1925 | static void update_display_static(driver
1925
1926		// Check for first column from left and first column from right that have changed
1927		if (high) {
1928	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1928	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1929		const int src_bytes_per_row = bytes_per_row;
1930		const int dst_bytes_per_row = drv->s->pitch;
1931		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 2024 | Line 1987 | static void update_display_static(driver
1987
1988		} else {
1989		const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1990	+	const int dst_bytes_per_row = drv->s->pitch;
1991
1992		x1 = VIDEO_MODE_X;
1993		for (j=y1; j<=y2; j++) {
#	Line 2064 | Line 2028 | static void update_display_static(driver
2028		// Blit to screen surface
2029		for (j=y1; j<=y2; j++) {
2030		i = j * bytes_per_row + x1 * bytes_per_pixel;
2031	+	int dst_i = j * dst_bytes_per_row + x1 * bytes_per_pixel;
2032		memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
2033	<	Screen_blit((uint8 *)drv->s->pixels + i, the_buffer + i, bytes_per_pixel * wide);
2033	>	Screen_blit((uint8 *)drv->s->pixels + dst_i, the_buffer + i, bytes_per_pixel * wide);
2034		}
2035
2036		// Unlock surface, if required
#	Line 2079 | Line 2044 | static void update_display_static(driver
2044		}
2045		}
2046
2047	+	// Static display update (fixed frame rate, bounding boxes based)
2048	+	// XXX use NQD bounding boxes to help detect dirty areas?
2049	+	static void update_display_static_bbox(driver_base *drv)
2050	+	{
2051	+	const VIDEO_MODE &mode = drv->mode;
2052	+
2053	+	// Allocate bounding boxes for SDL_UpdateRects()
2054	+	const int N_PIXELS = 64;
2055	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2056	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2057	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2058	+	int nr_boxes = 0;
2059	+
2060	+	// Lock surface, if required
2061	+	if (SDL_MUSTLOCK(drv->s))
2062	+	SDL_LockSurface(drv->s);
2063	+
2064	+	// Update the surface from Mac screen
2065	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2066	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2067	+	const int dst_bytes_per_row = drv->s->pitch;
2068	+	int x, y;
2069	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2070	+	int h = N_PIXELS;
2071	+	if (h > VIDEO_MODE_Y - y)
2072	+	h = VIDEO_MODE_Y - y;
2073	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2074	+	int w = N_PIXELS;
2075	+	if (w > VIDEO_MODE_X - x)
2076	+	w = VIDEO_MODE_X - x;
2077	+	const int xs = w * bytes_per_pixel;
2078	+	const int xb = x * bytes_per_pixel;
2079	+	bool dirty = false;
2080	+	for (int j = y; j < (y + h); j++) {
2081	+	const int yb = j * bytes_per_row;
2082	+	const int dst_yb = j * dst_bytes_per_row;
2083	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2084	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2085	+	Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs);
2086	+	dirty = true;
2087	+	}
2088	+	}
2089	+	if (dirty) {
2090	+	boxes[nr_boxes].x = x;
2091	+	boxes[nr_boxes].y = y;
2092	+	boxes[nr_boxes].w = w;
2093	+	boxes[nr_boxes].h = h;
2094	+	nr_boxes++;
2095	+	}
2096	+	}
2097	+	}
2098	+
2099	+	// Unlock surface, if required
2100	+	if (SDL_MUSTLOCK(drv->s))
2101	+	SDL_UnlockSurface(drv->s);
2102	+
2103	+	// Refresh display
2104	+	if (nr_boxes)
2105	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2106	+	}
2107	+
2108
2109		// We suggest the compiler to inline the next two functions so that it
2110		// may specialise the code according to the current screen depth and
#	Line 2120 | Line 2146 | static inline void handle_palette_change
2146		UNLOCK_PALETTE;
2147		}
2148
2149	+	static void video_refresh_window_static(void);
2150	+
2151		static void video_refresh_dga(void)
2152		{
2153		// Quit DGA mode if requested
2154		possibly_quit_dga_mode();
2155	+	video_refresh_window_static();
2156		}
2157
2158		#ifdef ENABLE_VOSF
#	Line 2139 | Line 2168 | static void video_refresh_dga_vosf(void)
2168		tick_counter = 0;
2169		if (mainBuffer.dirty) {
2170		LOCK_VOSF;
2171	<	update_display_dga_vosf();
2171	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2172		UNLOCK_VOSF;
2173		}
2174		}
#	Line 2173 | Line 2202 | static void video_refresh_window_static(
2202		static int tick_counter = 0;
2203		if (++tick_counter >= frame_skip) {
2204		tick_counter = 0;
2205	<	update_display_static(static_cast<driver_window *>(drv));
2205	>	const VIDEO_MODE &mode = drv->mode;
2206	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2207	>	update_display_static_bbox(drv);
2208	>	else
2209	>	update_display_static(drv);
2210		}
2211		}
2212
#	Line 2203 | Line 2236 | static void VideoRefreshInit(void)
2236		}
2237		}
2238
2239	+	static inline void do_video_refresh(void)
2240	+	{
2241	+	// Handle SDL events
2242	+	handle_events();
2243	+
2244	+	// Update display
2245	+	#if (defined(__APPLE__) && defined(__MACH__))
2246	+	// SDL expects an auto-release pool to be present.
2247	+	NSAutoReleasePool_wrap(video_refresh);
2248	+	#else
2249	+	video_refresh();
2250	+	#endif
2251	+
2252	+	#ifdef SHEEPSHAVER
2253	+	// Set new cursor image if it was changed
2254	+	if (cursor_changed && sdl_cursor) {
2255	+	cursor_changed = false;
2256	+	LOCK_EVENTS;
2257	+	SDL_FreeCursor(sdl_cursor);
2258	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2259	+	if (sdl_cursor) {
2260	+	SDL_ShowCursor(private_data == NULL || private_data->cursorVisible);
2261	+	SDL_SetCursor(sdl_cursor);
2262	+	#ifdef WIN32
2263	+	// XXX Windows apparently needs an extra mouse event to
2264	+	// make the new cursor image visible
2265	+	int visible = SDL_ShowCursor(-1);
2266	+	if (visible) {
2267	+	int x, y;
2268	+	SDL_GetMouseState(&x, &y);
2269	+	SDL_WarpMouse(x, y);
2270	+	}
2271	+	#endif
2272	+	}
2273	+	UNLOCK_EVENTS;
2274	+	}
2275	+	#endif
2276	+
2277	+	// Set new palette if it was changed
2278	+	handle_palette_changes();
2279	+	}
2280	+
2281	+	// This function is called on non-threaded platforms from a timer interrupt
2282	+	void VideoRefresh(void)
2283	+	{
2284	+	// We need to check redraw_thread_active to inhibit refreshed during
2285	+	// mode changes on non-threaded platforms
2286	+	if (!redraw_thread_active)
2287	+	return;
2288	+
2289	+	// Process pending events and update display
2290	+	do_video_refresh();
2291	+	}
2292	+
2293		const int VIDEO_REFRESH_HZ = 60;
2294		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2295
2296	+	#ifndef USE_CPU_EMUL_SERVICES
2297		static int redraw_func(void *arg)
2298		{
2299		uint64 start = GetTicks_usec();
#	Line 2223 | Line 2311 | static int redraw_func(void *arg)
2311		next = GetTicks_usec();
2312		ticks++;
2313
2226	–	// Handle SDL events
2227	–	handle_events();
2228	–
2229	–	// Refresh display
2230	–	video_refresh();
2231	–
2314		#ifdef SHEEPSHAVER
2315	<	// Set new cursor image if it was changed
2316	<	if (cursor_changed && sdl_cursor) {
2317	<	cursor_changed = false;
2318	<	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);
2315	>	// Pause if requested (during video mode switches)
2316	>	if (thread_stop_req) {
2317	>	thread_stop_ack = true;
2318	>	continue;
2319		}
2320		#endif
2321
2322	<	// Set new palette if it was changed
2323	<	handle_palette_changes();
2322	>	// Process pending events and update display
2323	>	do_video_refresh();
2324		}
2325
2326		uint64 end = GetTicks_usec();
2327		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2328		return 0;
2329		}
2330	+	#endif
2331	+
2332	+
2333	+	/*
2334	+	*  Record dirty area from NQD
2335	+	*/
2336	+
2337	+	#ifdef SHEEPSHAVER
2338	+	void video_set_dirty_area(int x, int y, int w, int h)
2339	+	{
2340	+	#ifdef ENABLE_VOSF
2341	+	const VIDEO_MODE &mode = drv->mode;
2342	+	const int screen_width = VIDEO_MODE_X;
2343	+	const int screen_height = VIDEO_MODE_Y;
2344	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2345	+
2346	+	if (use_vosf) {
2347	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2348	+	return;
2349	+	}
2350	+	#endif
2351	+
2352	+	// XXX handle dirty bounding boxes for non-VOSF modes
2353	+	}
2354	+	#endif

Diff Legend

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