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.5 by gbeauche, 2004-06-24T21:46:55Z vs.
Revision 1.44 by asvitkine, 2011-12-30T15:11:08Z

#	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.
39	+	*  - Backport hw cursor acceleration to Basilisk II?
40	+	*  - Factor out code
41		*/
42
43		#include "sysdeps.h"
#	Line 45 | 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 54 | Line 61
61		#include "video.h"
62		#include "video_defs.h"
63		#include "video_blit.h"
64	+	#include "vm_alloc.h"
65	+
66	+	#if (defined(__APPLE__) && defined(__MACH__))
67	+	#include "utils_macosx.h"
68	+	#endif
69
70		#define DEBUG 0
71		#include "debug.h"
72
61	–
73		// Supported video modes
74		using std::vector;
75		static vector<VIDEO_MODE> VideoModes;
#	Line 79 | Line 90 | static int display_type = DISPLAY_WINDOW
90		#endif
91
92		// Constants
93	+	#ifdef WIN32
94	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
95	+	#else
96		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
97	+	#endif
98
99
100		// Global variables
#	Line 92 | Line 107 | static uint8 *the_buffer_copy = NULL;
107		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
108
109		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
110	+	#ifndef USE_CPU_EMUL_SERVICES
111		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
112		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
113	+	#ifdef SHEEPSHAVER
114	+	static volatile bool thread_stop_req = false;
115	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
116	+	#endif
117	+	#endif
118
119		#ifdef ENABLE_VOSF
120	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
120	>	static bool use_vosf = false;                                           // Flag: VOSF enabled
121		#else
122		static const bool use_vosf = false;                                     // VOSF not possible
123		#endif
#	Line 114 | Line 135 | static int keycode_table[256];                                         // X
135
136		// SDL variables
137		static int screen_depth;                                                        // Depth of current screen
138	+	static SDL_Cursor *sdl_cursor;                                          // Copy of Mac cursor
139	+	static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
140		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
141		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
142	<	static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
142	>	static const int sdl_eventmask = SDL_MOUSEEVENTMASK | SDL_KEYEVENTMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK | SDL_ACTIVEEVENTMASK;
143	>
144	>	// Mutex to protect SDL events
145	>	static SDL_mutex *sdl_events_lock = NULL;
146	>	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
147	>	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
148
149		// Mutex to protect palette
150		static SDL_mutex *sdl_palette_lock = NULL;
#	Line 141 | Line 169 | extern void SysMountFirstFloppy(void);
169
170
171		/*
172	+	*  SDL surface locking glue
173	+	*/
174	+
175	+	#ifdef ENABLE_VOSF
176	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
177	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
178	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
179	+	} while (0)
180	+	#else
181	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
182	+	#endif
183	+
184	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
185	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
186	+	SDL_LockSurface(SURFACE);                               \
187	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
188	+	}                                                                                       \
189	+	} while (0)
190	+
191	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
192	+	if (SDL_MUSTLOCK(SURFACE))                                      \
193	+	SDL_UnlockSurface(SURFACE);                             \
194	+	} while (0)
195	+
196	+
197	+	/*
198	+	*  Framebuffer allocation routines
199	+	*/
200	+
201	+	static void *vm_acquire_framebuffer(uint32 size)
202	+	{
203	+	// always try to reallocate framebuffer at the same address
204	+	static void *fb = VM_MAP_FAILED;
205	+	if (fb != VM_MAP_FAILED) {
206	+	if (vm_acquire_fixed(fb, size) < 0) {
207	+	#ifndef SHEEPSHAVER
208	+	printf("FATAL: Could not reallocate framebuffer at previous address\n");
209	+	#endif
210	+	fb = VM_MAP_FAILED;
211	+	}
212	+	}
213	+	if (fb == VM_MAP_FAILED)
214	+	fb = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT);
215	+	return fb;
216	+	}
217	+
218	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
219	+	{
220	+	vm_release(fb, size);
221	+	}
222	+
223	+
224	+	/*
225	+	*  Windows message handler
226	+	*/
227	+
228	+	#ifdef WIN32
229	+	#include <dbt.h>
230	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
231	+
232	+	extern void SysMediaArrived(void);
233	+	extern void SysMediaRemoved(void);
234	+	extern HWND GetMainWindowHandle(void);
235	+
236	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
237	+	{
238	+	switch (msg) {
239	+	case WM_DEVICECHANGE:
240	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
241	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
242	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
243	+	SysMediaRemoved();
244	+	}
245	+	else if (wParam == DBT_DEVICEARRIVAL) {
246	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
247	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
248	+	SysMediaArrived();
249	+	}
250	+	return 0;
251	+
252	+	default:
253	+	if (sdl_window_proc)
254	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
255	+	}
256	+
257	+	return DefWindowProc(hwnd, msg, wParam, lParam);
258	+	}
259	+	#endif
260	+
261	+
262	+	/*
263		*  SheepShaver glue
264		*/
265
#	Line 185 | Line 304 | static vector<monitor_desc *> VideoMonit
304		// Find Apple mode matching best specified dimensions
305		static int find_apple_resolution(int xsize, int ysize)
306		{
307	<	int apple_id;
308	<	if (xsize < 800)
309	<	apple_id = APPLE_640x480;
310	<	else if (xsize < 1024)
311	<	apple_id = APPLE_800x600;
312	<	else if (xsize < 1152)
313	<	apple_id = APPLE_1024x768;
314	<	else if (xsize < 1280) {
315	<	if (ysize < 900)
316	<	apple_id = APPLE_1152x768;
317	<	else
318	<	apple_id = APPLE_1152x900;
319	<	}
320	<	else if (xsize < 1600)
321	<	apple_id = APPLE_1280x1024;
203	<	else
204	<	apple_id = APPLE_1600x1200;
205	<	return apple_id;
206	<	}
207	<
208	<	// Set parameters to specified Apple mode
209	<	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
210	<	{
211	<	switch (apple_id) {
212	<	case APPLE_640x480:
213	<	xsize = 640;
214	<	ysize = 480;
215	<	break;
216	<	case APPLE_800x600:
217	<	xsize = 800;
218	<	ysize = 600;
219	<	break;
220	<	case APPLE_1024x768:
221	<	xsize = 1024;
222	<	ysize = 768;
223	<	break;
224	<	case APPLE_1152x768:
225	<	xsize = 1152;
226	<	ysize = 768;
227	<	break;
228	<	case APPLE_1152x900:
229	<	xsize = 1152;
230	<	ysize = 900;
231	<	break;
232	<	case APPLE_1280x1024:
233	<	xsize = 1280;
234	<	ysize = 1024;
235	<	break;
236	<	case APPLE_1600x1200:
237	<	xsize = 1600;
238	<	ysize = 1200;
239	<	break;
240	<	default:
241	<	abort();
242	<	}
243	<	}
244	<
245	<	// Match Apple mode matching best specified dimensions
246	<	static int match_apple_resolution(int &xsize, int &ysize)
247	<	{
248	<	int apple_id = find_apple_resolution(xsize, ysize);
249	<	set_apple_resolution(apple_id, xsize, ysize);
250	<	return apple_id;
307	>	if (xsize == 640 && ysize == 480)
308	>	return APPLE_640x480;
309	>	if (xsize == 800 && ysize == 600)
310	>	return APPLE_800x600;
311	>	if (xsize == 1024 && ysize == 768)
312	>	return APPLE_1024x768;
313	>	if (xsize == 1152 && ysize == 768)
314	>	return APPLE_1152x768;
315	>	if (xsize == 1152 && ysize == 900)
316	>	return APPLE_1152x900;
317	>	if (xsize == 1280 && ysize == 1024)
318	>	return APPLE_1280x1024;
319	>	if (xsize == 1600 && ysize == 1200)
320	>	return APPLE_1600x1200;
321	>	return APPLE_CUSTOM;
322		}
323
324		// Display error alert
#	Line 255 | Line 326 | static void ErrorAlert(int error)
326		{
327		ErrorAlert(GetString(error));
328		}
329	+
330	+	// Display warning alert
331	+	static void WarningAlert(int warning)
332	+	{
333	+	WarningAlert(GetString(warning));
334	+	}
335		#endif
336
337
#	Line 314 | Line 391 | static inline int bytes_per_pixel(int de
391		}
392
393		// Map video_mode depth ID to numerical depth value
394	<	static int sdl_depth_of_video_depth(int video_depth)
394	>	static int mac_depth_of_video_depth(int video_depth)
395		{
396		int depth = -1;
397		switch (video_depth) {
#	Line 342 | Line 419 | static int sdl_depth_of_video_depth(int
419		return depth;
420		}
421
422	<	// Check wether specified mode is available
423	<	static bool has_mode(int type, int width, int height)
422	>	// Map video_mode depth ID to SDL screen depth
423	>	static int sdl_depth_of_video_depth(int video_depth)
424		{
425	<	// FIXME: no fullscreen support yet
426	<	if (type == DISPLAY_SCREEN)
350	<	return false;
425	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
426	>	}
427
428	+	// Get screen dimensions
429	+	static void sdl_display_dimensions(int &width, int &height)
430	+	{
431	+	static int max_width, max_height;
432	+	if (max_width == 0 && max_height == 0) {
433	+	max_width = 640 ; max_height = 480;
434	+	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
435	+	if (modes && modes != (SDL_Rect **)-1) {
436	+	// It turns out that on some implementations, and contrary to the documentation,
437	+	// the returned list is not sorted from largest to smallest (e.g. Windows)
438	+	for (int i = 0; modes[i] != NULL; i++) {
439	+	const int w = modes[i]->w;
440	+	const int h = modes[i]->h;
441	+	if (w > max_width && h > max_height) {
442	+	max_width = w;
443	+	max_height = h;
444	+	}
445	+	}
446	+	}
447	+	}
448	+	width = max_width;
449	+	height = max_height;
450	+	}
451	+
452	+	static inline int sdl_display_width(void)
453	+	{
454	+	int width, height;
455	+	sdl_display_dimensions(width, height);
456	+	return width;
457	+	}
458	+
459	+	static inline int sdl_display_height(void)
460	+	{
461	+	int width, height;
462	+	sdl_display_dimensions(width, height);
463	+	return height;
464	+	}
465	+
466	+	// Check wether specified mode is available
467	+	static bool has_mode(int type, int width, int height, int depth)
468	+	{
469		#ifdef SHEEPSHAVER
470	<	// Filter out Classic resolutiosn
470	>	// Filter out Classic resolutions
471		if (width == 512 && height == 384)
472		return false;
356	–
357	–	// Read window modes prefs
358	–	static uint32 window_modes = 0;
359	–	static uint32 screen_modes = 0;
360	–	if (window_modes == 0 || screen_modes == 0) {
361	–	window_modes = PrefsFindInt32("windowmodes");
362	–	screen_modes = PrefsFindInt32("screenmodes");
363	–	if (window_modes == 0 || screen_modes == 0)
364	–	window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
365	–	}
366	–
367	–	if (type == DISPLAY_WINDOW) {
368	–	int apple_mask, apple_id = find_apple_resolution(width, height);
369	–	switch (apple_id) {
370	–	case APPLE_640x480:             apple_mask = 0x01; break;
371	–	case APPLE_800x600:             apple_mask = 0x02; break;
372	–	case APPLE_1024x768:    apple_mask = 0x04; break;
373	–	case APPLE_1152x768:    apple_mask = 0x40; break;
374	–	case APPLE_1152x900:    apple_mask = 0x08; break;
375	–	case APPLE_1280x1024:   apple_mask = 0x10; break;
376	–	case APPLE_1600x1200:   apple_mask = 0x20; break;
377	–	default:                                apple_mask = 0x00; break;
378	–	}
379	–	return (window_modes & apple_mask);
380	–	}
381	–	#else
382	–	return true;
473		#endif
474	<	return false;
474	>
475	>	// Filter out out-of-bounds resolutions
476	>	if (width > sdl_display_width() || height > sdl_display_height())
477	>	return false;
478	>
479	>	// Rely on SDL capabilities
480	>	return SDL_VideoModeOK(width, height,
481	>	sdl_depth_of_video_depth(depth),
482	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
483		}
484
485		// Add mode to list of supported modes
486		static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
487		{
488		// Filter out unsupported modes
489	<	if (!has_mode(type, width, height))
489	>	if (!has_mode(type, width, height, depth))
490		return;
491
492		// Fill in VideoMode entry
493		VIDEO_MODE mode;
494		#ifdef SHEEPSHAVER
495	<	// Recalculate dimensions to fit Apple modes
398	<	resolution_id = match_apple_resolution(width, height);
495	>	resolution_id = find_apple_resolution(width, height);
496		mode.viType = type;
497		#endif
498		VIDEO_MODE_X = width;
499		VIDEO_MODE_Y = height;
500		VIDEO_MODE_RESOLUTION = resolution_id;
501		VIDEO_MODE_ROW_BYTES = bytes_per_row;
502	<	VIDEO_MODE_DEPTH = depth;
502	>	VIDEO_MODE_DEPTH = (video_depth)depth;
503		VideoModes.push_back(mode);
504		}
505
409	–	// Add standard list of windowed modes for given color depth
410	–	static void add_window_modes(int depth)
411	–	{
412	–	video_depth vdepth = (video_depth)depth;
413	–	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
414	–	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
415	–	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
416	–	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
417	–	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
418	–	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
419	–	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
420	–	}
421	–
506		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
507		static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
508		{
#	Line 458 | Line 542 | static void set_window_name(int name)
542		// Set mouse grab mode
543		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
544		{
545	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
545	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
546		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
547		}
548
549	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
550	+	static void migrate_screen_prefs(void)
551	+	{
552	+	#ifdef SHEEPSHAVER
553	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
554	+	if (PrefsFindString("screen"))
555	+	return;
556	+
557	+	uint32 window_modes = PrefsFindInt32("windowmodes");
558	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
559	+	int width = 0, height = 0;
560	+	if (screen_modes) {
561	+	static const struct {
562	+	int id;
563	+	int width;
564	+	int height;
565	+	}
566	+	modes[] = {
567	+	{  1,    640,    480 },
568	+	{  2,    800,    600 },
569	+	{  4,   1024,    768 },
570	+	{ 64,   1152,    768 },
571	+	{  8,   1152,    900 },
572	+	{ 16,   1280,   1024 },
573	+	{ 32,   1600,   1200 },
574	+	{ 0, }
575	+	};
576	+	for (int i = 0; modes[i].id != 0; i++) {
577	+	if (screen_modes & modes[i].id) {
578	+	if (width < modes[i].width && height < modes[i].height) {
579	+	width = modes[i].width;
580	+	height = modes[i].height;
581	+	}
582	+	}
583	+	}
584	+	} else {
585	+	if (window_modes & 1)
586	+	width = 640, height = 480;
587	+	if (window_modes & 2)
588	+	width = 800, height = 600;
589	+	}
590	+	if (width && height) {
591	+	char str[32];
592	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
593	+	PrefsReplaceString("screen", str);
594	+	}
595	+	#endif
596	+	}
597	+
598
599		/*
600		*  Display "driver" classes
#	Line 495 | Line 628 | public:
628		class driver_window;
629		static void update_display_window_vosf(driver_window *drv);
630		static void update_display_dynamic(int ticker, driver_window *drv);
631	<	static void update_display_static(driver_window *drv);
631	>	static void update_display_static(driver_base *drv);
632
633		class driver_window : public driver_base {
634		friend void update_display_window_vosf(driver_window *drv);
635		friend void update_display_dynamic(int ticker, driver_window *drv);
636	<	friend void update_display_static(driver_window *drv);
636	>	friend void update_display_static(driver_base *drv);
637
638		public:
639		driver_window(SDL_monitor_desc &monitor);
#	Line 517 | Line 650 | private:
650		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
651		};
652
653	+	class driver_fullscreen : public driver_base {
654	+	public:
655	+	driver_fullscreen(SDL_monitor_desc &monitor);
656	+	~driver_fullscreen();
657	+	};
658	+
659		static driver_base *drv = NULL; // Pointer to currently used driver object
660
661		#ifdef ENABLE_VOSF
#	Line 538 | Line 677 | driver_base::~driver_base()
677		if (s)
678		SDL_FreeSurface(s);
679
680	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
681	+	if (the_buffer != VM_MAP_FAILED) {
682	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
683	+	vm_release_framebuffer(the_buffer, the_buffer_size);
684	+	the_buffer = NULL;
685	+	}
686	+
687		// Free frame buffer(s)
688		if (!use_vosf) {
543	–	if (the_buffer) {
544	–	free(the_buffer);
545	–	the_buffer = NULL;
546	–	}
689		if (the_buffer_copy) {
690		free(the_buffer_copy);
691		the_buffer_copy = NULL;
#	Line 551 | Line 693 | driver_base::~driver_base()
693		}
694		#ifdef ENABLE_VOSF
695		else {
554	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
555	–	if (the_buffer != VM_MAP_FAILED) {
556	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
557	–	vm_release(the_buffer, the_buffer_size);
558	–	the_buffer = NULL;
559	–	}
696		if (the_host_buffer) {
697		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
698		free(the_host_buffer);
#	Line 567 | Line 703 | driver_base::~driver_base()
703		free(the_buffer_copy);
704		the_buffer_copy = NULL;
705		}
706	+
707	+	// Deinitialize VOSF
708	+	video_vosf_exit();
709		}
710		#endif
711		}
#	Line 576 | Line 715 | void driver_base::update_palette(void)
715		{
716		const VIDEO_MODE &mode = monitor.get_current_mode();
717
718	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
718	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
719		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
720		}
721
#	Line 595 | Line 734 | void driver_base::restore_mouse_accel(vo
734		*  Windowed display driver
735		*/
736
737	+	static bool SDL_display_opened = false;
738	+
739		// Open display
740		driver_window::driver_window(SDL_monitor_desc &m)
741		: driver_base(m), mouse_grabbed(false)
#	Line 606 | Line 747 | driver_window::driver_window(SDL_monitor
747		// Set absolute mouse mode
748		ADBSetRelMouseMode(mouse_grabbed);
749
750	+	// This is ugly:
751	+	// If we're switching resolutions (ie, not setting it for the first time),
752	+	// there's a bug in SDL where the SDL_Surface created will not be properly
753	+	// setup. The solution is to SDL_QuitSubSystem(SDL_INIT_VIDEO) before calling
754	+	// SDL_SetVideoMode for the second time (SDL_SetVideoMode will call SDL_Init()
755	+	// and all will be well). Without this, the video becomes corrupted (at least
756	+	// on Mac OS X), after the resolution switch.
757	+	if (SDL_display_opened)
758	+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
759	+
760		// Create surface
761	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
761	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
762		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
763		return;
764
765	+	SDL_display_opened = true;
766	+
767		#ifdef ENABLE_VOSF
768		use_vosf = true;
769		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
770		the_host_buffer = (uint8 *)s->pixels;
771		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
772	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
772	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
773		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
774		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
775	+
776	+	// Check whether we can initialize the VOSF subsystem and it's profitable
777	+	if (!video_vosf_init(m)) {
778	+	WarningAlert(STR_VOSF_INIT_ERR);
779	+	use_vosf = false;
780	+	}
781	+	else if (!video_vosf_profitable()) {
782	+	video_vosf_exit();
783	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
784	+	use_vosf = false;
785	+	}
786	+	if (!use_vosf) {
787	+	free(the_buffer_copy);
788	+	vm_release(the_buffer, the_buffer_size);
789	+	the_host_buffer = NULL;
790	+	}
791	+	#endif
792	+	if (!use_vosf) {
793	+	// Allocate memory for frame buffer
794	+	the_buffer_size = (aligned_height + 2) * s->pitch;
795	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
796	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
797	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
798	+	}
799	+
800	+	#ifdef SHEEPSHAVER
801	+	// Create cursor
802	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
803	+	SDL_SetCursor(sdl_cursor);
804	+	cursor_changed = false;
805	+	}
806		#else
807	<	// Allocate memory for frame buffer
808	<	the_buffer_size = (aligned_height + 2) * s->pitch;
625	<	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
626	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
627	<	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
807	>	// Hide cursor
808	>	SDL_ShowCursor(0);
809		#endif
810
811		// Set window name/class
812		set_window_name(STR_WINDOW_TITLE);
813
633	–	// Hide cursor
634	–	SDL_ShowCursor(0);
635	–
814		// Init blitting routines
815		SDL_PixelFormat *f = s->format;
816		VisualFormat visualFormat;
#	Line 640 | Line 818 | driver_window::driver_window(SDL_monitor
818		visualFormat.Rmask = f->Rmask;
819		visualFormat.Gmask = f->Gmask;
820		visualFormat.Bmask = f->Bmask;
821	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
821	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
822
823		// Load gray ramp to 8->16/32 expand map
824		if (!IsDirectMode(mode))
#	Line 707 | Line 885 | void driver_window::mouse_moved(int x, i
885		ADBMouseMoved(x, y);
886		}
887
888	+
889	+	/*
890	+	*  Full-screen display driver
891	+	*/
892	+
893	+	// Open display
894	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
895	+	: driver_base(m)
896	+	{
897	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
898	+	int aligned_width = (width + 15) & ~15;
899	+	int aligned_height = (height + 15) & ~15;
900	+
901	+	// Set absolute mouse mode
902	+	ADBSetRelMouseMode(false);
903	+
904	+	// Create surface
905	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
906	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
907	+	return;
908	+
909	+	#ifdef ENABLE_VOSF
910	+	use_vosf = true;
911	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
912	+	the_host_buffer = (uint8 *)s->pixels;
913	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
914	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
915	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
916	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
917	+
918	+	// Check whether we can initialize the VOSF subsystem and it's profitable
919	+	if (!video_vosf_init(m)) {
920	+	WarningAlert(STR_VOSF_INIT_ERR);
921	+	use_vosf = false;
922	+	}
923	+	else if (!video_vosf_profitable()) {
924	+	video_vosf_exit();
925	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
926	+	use_vosf = false;
927	+	}
928	+	if (!use_vosf) {
929	+	free(the_buffer_copy);
930	+	vm_release(the_buffer, the_buffer_size);
931	+	the_host_buffer = NULL;
932	+	}
933	+	#endif
934	+	if (!use_vosf) {
935	+	// Allocate memory for frame buffer
936	+	the_buffer_size = (aligned_height + 2) * s->pitch;
937	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
938	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
939	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
940	+	}
941	+
942	+	// Hide cursor
943	+	SDL_ShowCursor(0);
944	+
945	+	// Init blitting routines
946	+	SDL_PixelFormat *f = s->format;
947	+	VisualFormat visualFormat;
948	+	visualFormat.depth = depth;
949	+	visualFormat.Rmask = f->Rmask;
950	+	visualFormat.Gmask = f->Gmask;
951	+	visualFormat.Bmask = f->Bmask;
952	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
953	+
954	+	// Load gray ramp to 8->16/32 expand map
955	+	if (!IsDirectMode(mode))
956	+	for (int i=0; i<256; i++)
957	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
958	+
959	+	// Set frame buffer base
960	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
961	+
962	+	// Everything went well
963	+	init_ok = true;
964	+	}
965	+
966	+	// Close display
967	+	driver_fullscreen::~driver_fullscreen()
968	+	{
969	+	#ifdef ENABLE_VOSF
970	+	if (use_vosf)
971	+	the_host_buffer = NULL; // don't free() in driver_base dtor
972	+	#endif
973	+	if (s)
974	+	SDL_FreeSurface(s);
975	+
976	+	// Show cursor
977	+	SDL_ShowCursor(1);
978	+	}
979	+
980	+
981		/*
982		*  Initialization
983		*/
#	Line 738 | Line 1009 | static void keycode_init(void)
1009		SDL_VideoDriverName(video_driver, sizeof(video_driver));
1010		bool video_driver_found = false;
1011		char line[256];
1012	+	int n_keys = 0;
1013		while (fgets(line, sizeof(line) - 1, f)) {
1014		// Read line
1015		int len = strlen(line);
#	Line 750 | Line 1022 | static void keycode_init(void)
1022		continue;
1023
1024		if (video_driver_found) {
1025	<	// Skip aliases
1026	<	static const char alias_str[] = "alias";
1027	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
1025	>	// Skip aliases as long as we have read keycodes yet
1026	>	// Otherwise, it's another mapping and we have to stop
1027	>	static const char sdl_str[] = "sdl";
1028	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
1029		continue;
1030
1031		// Read keycode
1032		int x_code, mac_code;
1033		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1034	<	keycode_table[x_code & 0xff] = mac_code;
1034	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1035		else
1036		break;
1037		} else {
1038		// Search for SDL video driver string
1039	<	static const char alias_sdl_str[] = "alias SDL";
1040	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
1041	<	char *p = line + sizeof(alias_sdl_str);
1039	>	static const char sdl_str[] = "sdl";
1040	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
1041	>	char *p = line + sizeof(sdl_str);
1042		if (strstr(video_driver, p) == video_driver)
1043		video_driver_found = true;
1044		}
#	Line 783 | Line 1056 | static void keycode_init(void)
1056		WarningAlert(str);
1057		return;
1058		}
1059	+
1060	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1061		}
1062		}
1063
#	Line 801 | Line 1076 | bool SDL_monitor_desc::video_open(void)
1076		case DISPLAY_WINDOW:
1077		drv = new(std::nothrow) driver_window(*this);
1078		break;
1079	+	case DISPLAY_SCREEN:
1080	+	drv = new(std::nothrow) driver_fullscreen(*this);
1081	+	break;
1082		}
1083		if (drv == NULL)
1084		return false;
#	Line 810 | Line 1088 | bool SDL_monitor_desc::video_open(void)
1088		return false;
1089		}
1090
1091	<	#ifdef ENABLE_VOSF
1092	<	if (use_vosf) {
1093	<	// Initialize the VOSF system
1094	<	if (!video_vosf_init(*this)) {
1095	<	ErrorAlert(STR_VOSF_INIT_ERR);
818	<	return false;
819	<	}
820	<	}
1091	>	#ifdef WIN32
1092	>	// Chain in a new message handler for WM_DEVICECHANGE
1093	>	HWND the_window = GetMainWindowHandle();
1094	>	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1095	>	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1096		#endif
1097	<
1097	>
1098		// Initialize VideoRefresh function
1099		VideoRefreshInit();
1100
#	Line 827 | Line 1102 | bool SDL_monitor_desc::video_open(void)
1102		LOCK_FRAME_BUFFER;
1103
1104		// Start redraw/input thread
1105	+	#ifndef USE_CPU_EMUL_SERVICES
1106		redraw_thread_cancel = false;
1107		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1108		if (!redraw_thread_active) {
1109		printf("FATAL: cannot create redraw thread\n");
1110		return false;
1111		}
1112	+	#else
1113	+	redraw_thread_active = true;
1114	+	#endif
1115		return true;
1116		}
1117
#	Line 853 | Line 1132 | bool VideoInit(bool classic)
1132		#endif
1133
1134		// Create Mutexes
1135	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1136	+	return false;
1137		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1138		return false;
1139		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 867 | Line 1148 | bool VideoInit(bool classic)
1148		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1149
1150		// Get screen mode from preferences
1151	+	migrate_screen_prefs();
1152		const char *mode_str = NULL;
871	–	#ifndef SHEEPSHAVER
1153		if (classic_mode)
1154		mode_str = "win/512/342";
1155		else
1156		mode_str = PrefsFindString("screen");
876	–	#endif
1157
1158		// Determine display type and default dimensions
1159		int default_width, default_height;
#	Line 889 | Line 1169 | bool VideoInit(bool classic)
1169		if (mode_str) {
1170		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1171		display_type = DISPLAY_WINDOW;
1172	<	}
1173	<	int max_width = 640, max_height = 480;
894	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
895	<	if (modes && modes != (SDL_Rect **)-1) {
896	<	max_width = modes[0]->w;
897	<	max_height = modes[0]->h;
898	<	if (default_width > max_width)
899	<	default_width = max_width;
900	<	if (default_height > max_height)
901	<	default_height = max_height;
1172	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1173	>	display_type = DISPLAY_SCREEN;
1174		}
1175		if (default_width <= 0)
1176	<	default_width = max_width;
1176	>	default_width = sdl_display_width();
1177	>	else if (default_width > sdl_display_width())
1178	>	default_width = sdl_display_width();
1179		if (default_height <= 0)
1180	<	default_height = max_height;
1180	>	default_height = sdl_display_height();
1181	>	else if (default_height > sdl_display_height())
1182	>	default_height = sdl_display_height();
1183
1184		// Mac screen depth follows X depth
1185		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
#	Line 923 | Line 1199 | bool VideoInit(bool classic)
1199		break;
1200		}
1201
1202	+	// Initialize list of video modes to try
1203	+	struct {
1204	+	int w;
1205	+	int h;
1206	+	int resolution_id;
1207	+	}
1208	+	video_modes[] = {
1209	+	{   -1,   -1, 0x80 },
1210	+	{  512,  384, 0x80 },
1211	+	{  640,  480, 0x81 },
1212	+	{  800,  600, 0x82 },
1213	+	{ 1024,  768, 0x83 },
1214	+	{ 1152,  870, 0x84 },
1215	+	{ 1280, 1024, 0x85 },
1216	+	{ 1600, 1200, 0x86 },
1217	+	{ 0, }
1218	+	};
1219	+	video_modes[0].w = default_width;
1220	+	video_modes[0].h = default_height;
1221	+
1222		// Construct list of supported modes
1223		if (display_type == DISPLAY_WINDOW) {
1224		if (classic)
1225		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1226		else {
1227	<	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1228	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1229	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1230	<	add_window_modes(video_depth(d));
1227	>	for (int i = 0; video_modes[i].w != 0; i++) {
1228	>	const int w = video_modes[i].w;
1229	>	const int h = video_modes[i].h;
1230	>	if (i > 0 && (w >= default_width || h >= default_height))
1231	>	continue;
1232	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1233	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1234		}
1235		}
1236	<	} else
1237	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1236	>	} else if (display_type == DISPLAY_SCREEN) {
1237	>	for (int i = 0; video_modes[i].w != 0; i++) {
1238	>	const int w = video_modes[i].w;
1239	>	const int h = video_modes[i].h;
1240	>	if (i > 0 && (w >= default_width || h >= default_height))
1241	>	continue;
1242	>	if (w == 512 && h == 384)
1243	>	continue;
1244	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1245	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1246	>	}
1247	>	}
1248	>
1249		if (VideoModes.empty()) {
1250		ErrorAlert(STR_NO_XVISUAL_ERR);
1251		return false;
#	Line 1006 | Line 1316 | void SDL_monitor_desc::video_close(void)
1316		{
1317		D(bug("video_close()\n"));
1318
1319	+	#ifdef WIN32
1320	+	// Remove message handler for WM_DEVICECHANGE
1321	+	HWND the_window = GetMainWindowHandle();
1322	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1323	+	#endif
1324	+
1325		// Stop redraw thread
1326	+	#ifndef USE_CPU_EMUL_SERVICES
1327		if (redraw_thread_active) {
1328		redraw_thread_cancel = true;
1329		SDL_WaitThread(redraw_thread, NULL);
1330		}
1331	+	#endif
1332		redraw_thread_active = false;
1333
1334		// Unlock frame buffer
1335		UNLOCK_FRAME_BUFFER;
1336		D(bug(" frame buffer unlocked\n"));
1337
1020	–	#ifdef ENABLE_VOSF
1021	–	if (use_vosf) {
1022	–	// Deinitialize VOSF
1023	–	video_vosf_exit();
1024	–	}
1025	–	#endif
1026	–
1338		// Close display
1339		delete drv;
1340		drv = NULL;
#	Line 1041 | Line 1352 | void VideoExit(void)
1352		SDL_DestroyMutex(frame_buffer_lock);
1353		if (sdl_palette_lock)
1354		SDL_DestroyMutex(sdl_palette_lock);
1355	+	if (sdl_events_lock)
1356	+	SDL_DestroyMutex(sdl_events_lock);
1357		}
1358
1359
#	Line 1121 | Line 1434 | void SDL_monitor_desc::set_palette(uint8
1434		const VIDEO_MODE &mode = get_current_mode();
1435
1436		// FIXME: how can we handle the gamma ramp?
1437	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1437	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1438		return;
1439
1440		LOCK_PALETTE;
#	Line 1146 | Line 1459 | void SDL_monitor_desc::set_palette(uint8
1459		}
1460
1461		#ifdef ENABLE_VOSF
1462	<	// We have to redraw everything because the interpretation of pixel values changed
1463	<	LOCK_VOSF;
1464	<	PFLAG_SET_ALL;
1465	<	UNLOCK_VOSF;
1466	<	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1462	>	if (use_vosf) {
1463	>	// We have to redraw everything because the interpretation of pixel values changed
1464	>	LOCK_VOSF;
1465	>	PFLAG_SET_ALL;
1466	>	UNLOCK_VOSF;
1467	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1468	>	}
1469		#endif
1470		}
1471
#	Line 1180 | Line 1495 | int16 video_mode_change(VidLocals *csSav
1495		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1496		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1497
1498	<	// Disable interrupts
1498	>	// Disable interrupts and pause redraw thread
1499		DisableInterrupt();
1500	+	thread_stop_ack = false;
1501	+	thread_stop_req = true;
1502	+	while (!thread_stop_ack) ;
1503
1504		cur_mode = i;
1505		monitor_desc *monitor = VideoMonitors[0];
#	Line 1192 | Line 1510 | int16 video_mode_change(VidLocals *csSav
1510		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1511		csSave->saveMode=VModes[cur_mode].viAppleMode;
1512
1513	<	// Enable interrupts
1513	>	// Enable interrupts and resume redraw thread
1514	>	thread_stop_req = false;
1515		EnableInterrupt();
1516		return noErr;
1517		}
#	Line 1204 | Line 1523 | int16 video_mode_change(VidLocals *csSav
1523		void SDL_monitor_desc::switch_to_current_mode(void)
1524		{
1525		// Close and reopen display
1526	+	LOCK_EVENTS;
1527		video_close();
1528		video_open();
1529	+	UNLOCK_EVENTS;
1530
1531		if (drv == NULL) {
1532		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1221 | Line 1542 | void SDL_monitor_desc::switch_to_current
1542		#ifdef SHEEPSHAVER
1543		bool video_can_change_cursor(void)
1544		{
1545	<	//      return hw_mac_cursor_accl && (display_type != DISPLAY_SCREEN);
1546	<	return false;
1545	>	static char driver[] = "Quartz?";
1546	>	static int quartzok = -1;
1547	>
1548	>	if (display_type != DISPLAY_WINDOW)
1549	>	return false;
1550	>
1551	>	if (quartzok < 0) {
1552	>	if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver))
1553	>	quartzok = true;
1554	>	else {
1555	>	// Quartz driver bug prevents cursor changing in SDL 1.2.11 to 1.2.14.
1556	>	const SDL_version *vp = SDL_Linked_Version();
1557	>	int version = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch);
1558	>	quartzok = (version <= SDL_VERSIONNUM(1, 2, 10) || version >= SDL_VERSIONNUM(1, 2, 15));
1559	>	}
1560	>	}
1561	>
1562	>	return quartzok;
1563		}
1564		#endif
1565
#	Line 1234 | Line 1571 | bool video_can_change_cursor(void)
1571		#ifdef SHEEPSHAVER
1572		void video_set_cursor(void)
1573		{
1574	<	//      cursor_changed = true;
1574	>	cursor_changed = true;
1575		}
1576		#endif
1577
1578
1579		/*
1580	<	*  Install graphics acceleration
1580	>	*  Keyboard-related utilify functions
1581		*/
1582
1583	<	#ifdef SHEEPSHAVER
1247	<	// Rectangle inversion
1248	<	template< int bpp >
1249	<	static inline void do_invrect(uint8 *dest, uint32 length)
1250	<	{
1251	<	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1252	<	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1253	<	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1254	<	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1255	<
1256	<	#ifndef UNALIGNED_PROFITABLE
1257	<	// Align on 16-bit boundaries
1258	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1259	<	INVERT_1(dest, 0);
1260	<	dest += 1; length -= 1;
1261	<	}
1262	<
1263	<	// Align on 32-bit boundaries
1264	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1265	<	INVERT_2(dest, 0);
1266	<	dest += 2; length -= 2;
1267	<	}
1268	<	#endif
1269	<
1270	<	// Invert 8-byte words
1271	<	if (length >= 8) {
1272	<	const int r = (length / 8) % 8;
1273	<	dest += r * 8;
1274	<
1275	<	int n = ((length / 8) + 7) / 8;
1276	<	switch (r) {
1277	<	case 0: do {
1278	<	dest += 64;
1279	<	INVERT_8(dest, -8);
1280	<	case 7: INVERT_8(dest, -7);
1281	<	case 6: INVERT_8(dest, -6);
1282	<	case 5: INVERT_8(dest, -5);
1283	<	case 4: INVERT_8(dest, -4);
1284	<	case 3: INVERT_8(dest, -3);
1285	<	case 2: INVERT_8(dest, -2);
1286	<	case 1: INVERT_8(dest, -1);
1287	<	} while (--n > 0);
1288	<	}
1289	<	}
1290	<
1291	<	// 32-bit cell to invert?
1292	<	if (length & 4) {
1293	<	INVERT_4(dest, 0);
1294	<	if (bpp <= 16)
1295	<	dest += 4;
1296	<	}
1297	<
1298	<	// 16-bit cell to invert?
1299	<	if (bpp <= 16 && (length & 2)) {
1300	<	INVERT_2(dest, 0);
1301	<	if (bpp <= 8)
1302	<	dest += 2;
1303	<	}
1304	<
1305	<	// 8-bit cell to invert?
1306	<	if (bpp <= 8 && (length & 1))
1307	<	INVERT_1(dest, 0);
1308	<
1309	<	#undef INVERT_1
1310	<	#undef INVERT_2
1311	<	#undef INVERT_4
1312	<	#undef INVERT_8
1313	<	}
1314	<
1315	<	void NQD_invrect(uint32 p)
1316	<	{
1317	<	D(bug("accl_invrect %08x\n", p));
1318	<
1319	<	// Get inversion parameters
1320	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1321	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1322	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1323	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1324	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1325	<	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1326	<
1327	<	//!!?? pen_mode == 14
1328	<
1329	<	// And perform the inversion
1330	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1331	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1332	<	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1333	<	width *= bpp;
1334	<	switch (bpp) {
1335	<	case 1:
1336	<	for (int i = 0; i < height; i++) {
1337	<	do_invrect<8>(dest, width);
1338	<	dest += dest_row_bytes;
1339	<	}
1340	<	break;
1341	<	case 2:
1342	<	for (int i = 0; i < height; i++) {
1343	<	do_invrect<16>(dest, width);
1344	<	dest += dest_row_bytes;
1345	<	}
1346	<	break;
1347	<	case 4:
1348	<	for (int i = 0; i < height; i++) {
1349	<	do_invrect<32>(dest, width);
1350	<	dest += dest_row_bytes;
1351	<	}
1352	<	break;
1353	<	}
1354	<	}
1355	<
1356	<	// Rectangle filling
1357	<	template< int bpp >
1358	<	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1359	<	{
1360	<	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1361	<	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1362	<	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1363	<	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1364	<
1365	<	#ifndef UNALIGNED_PROFITABLE
1366	<	// Align on 16-bit boundaries
1367	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1368	<	FILL_1(dest, 0, color);
1369	<	dest += 1; length -= 1;
1370	<	}
1371	<
1372	<	// Align on 32-bit boundaries
1373	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1374	<	FILL_2(dest, 0, color);
1375	<	dest += 2; length -= 2;
1376	<	}
1377	<	#endif
1378	<
1379	<	// Fill 8-byte words
1380	<	if (length >= 8) {
1381	<	const uint64 c = (((uint64)color) << 32) | color;
1382	<	const int r = (length / 8) % 8;
1383	<	dest += r * 8;
1384	<
1385	<	int n = ((length / 8) + 7) / 8;
1386	<	switch (r) {
1387	<	case 0: do {
1388	<	dest += 64;
1389	<	FILL_8(dest, -8, c);
1390	<	case 7: FILL_8(dest, -7, c);
1391	<	case 6: FILL_8(dest, -6, c);
1392	<	case 5: FILL_8(dest, -5, c);
1393	<	case 4: FILL_8(dest, -4, c);
1394	<	case 3: FILL_8(dest, -3, c);
1395	<	case 2: FILL_8(dest, -2, c);
1396	<	case 1: FILL_8(dest, -1, c);
1397	<	} while (--n > 0);
1398	<	}
1399	<	}
1400	<
1401	<	// 32-bit cell to fill?
1402	<	if (length & 4) {
1403	<	FILL_4(dest, 0, color);
1404	<	if (bpp <= 16)
1405	<	dest += 4;
1406	<	}
1407	<
1408	<	// 16-bit cell to fill?
1409	<	if (bpp <= 16 && (length & 2)) {
1410	<	FILL_2(dest, 0, color);
1411	<	if (bpp <= 8)
1412	<	dest += 2;
1413	<	}
1414	<
1415	<	// 8-bit cell to fill?
1416	<	if (bpp <= 8 && (length & 1))
1417	<	FILL_1(dest, 0, color);
1418	<
1419	<	#undef FILL_1
1420	<	#undef FILL_2
1421	<	#undef FILL_4
1422	<	#undef FILL_8
1423	<	}
1424	<
1425	<	void NQD_fillrect(uint32 p)
1426	<	{
1427	<	D(bug("accl_fillrect %08x\n", p));
1428	<
1429	<	// Get filling parameters
1430	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1431	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1432	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1433	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1434	<	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1435	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1436	<	D(bug(" width %d, height %d\n", width, height));
1437	<	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1438	<
1439	<	// And perform the fill
1440	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1441	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1442	<	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1443	<	width *= bpp;
1444	<	switch (bpp) {
1445	<	case 1:
1446	<	for (int i = 0; i < height; i++) {
1447	<	memset(dest, color, width);
1448	<	dest += dest_row_bytes;
1449	<	}
1450	<	break;
1451	<	case 2:
1452	<	for (int i = 0; i < height; i++) {
1453	<	do_fillrect<16>(dest, color, width);
1454	<	dest += dest_row_bytes;
1455	<	}
1456	<	break;
1457	<	case 4:
1458	<	for (int i = 0; i < height; i++) {
1459	<	do_fillrect<32>(dest, color, width);
1460	<	dest += dest_row_bytes;
1461	<	}
1462	<	break;
1463	<	}
1464	<	}
1465	<
1466	<	bool NQD_fillrect_hook(uint32 p)
1583	>	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1584		{
1585	<	D(bug("accl_fillrect_hook %08x\n", p));
1586	<
1587	<	// Check if we can accelerate this fillrect
1588	<	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1589	<	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1590	<	if (transfer_mode == 8) {
1591	<	// Fill
1592	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1593	<	return true;
1594	<	}
1595	<	else if (transfer_mode == 10) {
1596	<	// Invert
1597	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1598	<	return true;
1599	<	}
1600	<	}
1484	<	return false;
1485	<	}
1486	<
1487	<	// Rectangle blitting
1488	<	// TODO: optimize for VOSF and target pixmap == screen
1489	<	void NQD_bitblt(uint32 p)
1490	<	{
1491	<	D(bug("accl_bitblt %08x\n", p));
1492	<
1493	<	// Get blitting parameters
1494	<	int16 src_X  = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1495	<	int16 src_Y  = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1496	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1497	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1498	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1499	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1500	<	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1501	<	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1502	<	D(bug(" width %d, height %d\n", width, height));
1503	<
1504	<	// And perform the blit
1505	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1506	<	width *= bpp;
1507	<	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1508	<	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1509	<	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1510	<	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp));
1511	<	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp));
1512	<	for (int i = 0; i < height; i++) {
1513	<	memmove(dst, src, width);
1514	<	src += src_row_bytes;
1515	<	dst += dst_row_bytes;
1516	<	}
1517	<	}
1518	<	else {
1519	<	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1520	<	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1521	<	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp));
1522	<	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp));
1523	<	for (int i = height - 1; i >= 0; i--) {
1524	<	memmove(dst, src, width);
1525	<	src -= src_row_bytes;
1526	<	dst -= dst_row_bytes;
1527	<	}
1528	<	}
1529	<	}
1530	<
1531	<	/*
1532	<	BitBlt transfer modes:
1533	<	0 : srcCopy
1534	<	1 : srcOr
1535	<	2 : srcXor
1536	<	3 : srcBic
1537	<	4 : notSrcCopy
1538	<	5 : notSrcOr
1539	<	6 : notSrcXor
1540	<	7 : notSrcBic
1541	<	32 : blend
1542	<	33 : addPin
1543	<	34 : addOver
1544	<	35 : subPin
1545	<	36 : transparent
1546	<	37 : adMax
1547	<	38 : subOver
1548	<	39 : adMin
1549	<	50 : hilite
1550	<	*/
1551	<
1552	<	bool NQD_bitblt_hook(uint32 p)
1553	<	{
1554	<	D(bug("accl_draw_hook %08x\n", p));
1555	<
1556	<	// Check if we can accelerate this bitblt
1557	<	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1558	<	ReadMacInt32(p + 0x130) == 0 &&
1559	<	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1560	<	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1561	<	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1562	<	ReadMacInt32(p + acclTransferMode) == 0 &&                                                                               // srcCopy?
1563	<	ReadMacInt32(p + 0x15c) > 0) {
1564	<
1565	<	// Yes, set function pointer
1566	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1585	>	switch (e.keysym.sym) {
1586	>	case SDLK_NUMLOCK:
1587	>	case SDLK_CAPSLOCK:
1588	>	case SDLK_SCROLLOCK:
1589	>	case SDLK_RSHIFT:
1590	>	case SDLK_LSHIFT:
1591	>	case SDLK_RCTRL:
1592	>	case SDLK_LCTRL:
1593	>	case SDLK_RALT:
1594	>	case SDLK_LALT:
1595	>	case SDLK_RMETA:
1596	>	case SDLK_LMETA:
1597	>	case SDLK_LSUPER:
1598	>	case SDLK_RSUPER:
1599	>	case SDLK_MODE:
1600	>	case SDLK_COMPOSE:
1601		return true;
1602		}
1603		return false;
1604		}
1605
1606	<	// Wait for graphics operation to finish
1573	<	bool NQD_sync_hook(uint32 arg)
1574	<	{
1575	<	D(bug("accl_sync_hook %08x\n", arg));
1576	<	return true;
1577	<	}
1578	<
1579	<	void VideoInstallAccel(void)
1606	>	static bool is_ctrl_down(SDL_keysym const & ks)
1607		{
1608	<	// Install acceleration hooks
1582	<	if (PrefsFindBool("gfxaccel")) {
1583	<	D(bug("Video: Installing acceleration hooks\n"));
1584	<	uint32 base;
1585	<
1586	<	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1587	<	base = bitblt_hook_info.addr();
1588	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1589	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1590	<	WriteMacInt32(base + 8, ACCL_BITBLT);
1591	<	NQDMisc(6, bitblt_hook_info.ptr());
1592	<
1593	<	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1594	<	base = fillrect_hook_info.addr();
1595	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1596	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1597	<	WriteMacInt32(base + 8, ACCL_FILLRECT);
1598	<	NQDMisc(6, fillrect_hook_info.ptr());
1599	<	}
1608	>	return ctrl_down || (ks.mod & KMOD_CTRL);
1609		}
1601	–	#endif
1610
1611
1612		/*
#	Line 1606 | Line 1614 | void VideoInstallAccel(void)
1614		*  and -2 if the key was recognized as a hotkey
1615		*/
1616
1609	–	static bool is_ctrl_down(SDL_keysym const & ks)
1610	–	{
1611	–	return ctrl_down || (ks.mod & KMOD_CTRL);
1612	–	}
1613	–
1617		static int kc_decode(SDL_keysym const & ks, bool key_down)
1618		{
1619		switch (ks.sym) {
#	Line 1643 | Line 1646 | static int kc_decode(SDL_keysym const &
1646
1647		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1648		case SDLK_2: case SDLK_AT: return 0x13;
1649	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1649	>	case SDLK_3: case SDLK_HASH: return 0x14;
1650		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1651	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1651	>	case SDLK_5: return 0x17;
1652		case SDLK_6: return 0x16;
1653		case SDLK_7: return 0x1a;
1654		case SDLK_8: return 0x1c;
1655		case SDLK_9: return 0x19;
1656		case SDLK_0: return 0x1d;
1657
1658	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1658	>	case SDLK_BACKQUOTE: return 0x0a;
1659		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1660		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1661	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1662	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1663	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1661	>	case SDLK_LEFTBRACKET: return 0x21;
1662	>	case SDLK_RIGHTBRACKET: return 0x1e;
1663	>	case SDLK_BACKSLASH: return 0x2a;
1664		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1665	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1665	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1666		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1667		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1668		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1680 | Line 1683 | static int kc_decode(SDL_keysym const &
1683		case SDLK_RCTRL: return 0x36;
1684		case SDLK_LSHIFT: return 0x38;
1685		case SDLK_RSHIFT: return 0x38;
1686	+	#if (defined(__APPLE__) && defined(__MACH__))
1687	+	case SDLK_LALT: return 0x3a;
1688	+	case SDLK_RALT: return 0x3a;
1689	+	case SDLK_LMETA: return 0x37;
1690	+	case SDLK_RMETA: return 0x37;
1691	+	#else
1692		case SDLK_LALT: return 0x37;
1693		case SDLK_RALT: return 0x37;
1694		case SDLK_LMETA: return 0x3a;
1695		case SDLK_RMETA: return 0x3a;
1696	+	#endif
1697	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1698	+	case SDLK_RSUPER: return 0x3a;
1699		case SDLK_MENU: return 0x32;
1700		case SDLK_CAPSLOCK: return 0x39;
1701		case SDLK_NUMLOCK: return 0x47;
#	Line 1758 | Line 1770 | static void handle_events(void)
1770		// Mouse button
1771		case SDL_MOUSEBUTTONDOWN: {
1772		unsigned int button = event.button.button;
1773	<	if (button < 4)
1774	<	ADBMouseDown(button - 1);
1773	>	if (button == SDL_BUTTON_LEFT)
1774	>	ADBMouseDown(0);
1775	>	else if (button == SDL_BUTTON_RIGHT)
1776	>	ADBMouseDown(1);
1777	>	else if (button == SDL_BUTTON_MIDDLE)
1778	>	ADBMouseDown(2);
1779		else if (button < 6) {  // Wheel mouse
1780		if (mouse_wheel_mode == 0) {
1781		int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
#	Line 1777 | Line 1793 | static void handle_events(void)
1793		}
1794		case SDL_MOUSEBUTTONUP: {
1795		unsigned int button = event.button.button;
1796	<	if (button < 4)
1797	<	ADBMouseUp(button - 1);
1796	>	if (button == SDL_BUTTON_LEFT)
1797	>	ADBMouseUp(0);
1798	>	else if (button == SDL_BUTTON_RIGHT)
1799	>	ADBMouseUp(1);
1800	>	else if (button == SDL_BUTTON_MIDDLE)
1801	>	ADBMouseUp(2);
1802		break;
1803		}
1804
#	Line 1790 | Line 1810 | static void handle_events(void)
1810		// Keyboard
1811		case SDL_KEYDOWN: {
1812		int code = -1;
1813	<	if (use_keycodes) {
1813	>	if (use_keycodes && !is_modifier_key(event.key)) {
1814		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1815		code = keycode_table[event.key.keysym.scancode & 0xff];
1816		} else
#	Line 1818 | Line 1838 | static void handle_events(void)
1838		}
1839		case SDL_KEYUP: {
1840		int code = -1;
1841	<	if (use_keycodes) {
1841	>	if (use_keycodes && !is_modifier_key(event.key)) {
1842		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1843		code = keycode_table[event.key.keysym.scancode & 0xff];
1844		} else
1845		code = event2keycode(event.key, false);
1846	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1847	<	ADBKeyUp(code);
1846	>	if (code >= 0) {
1847	>	if (code == 0x39) {     // Caps Lock released
1848	>	if (caps_on) {
1849	>	ADBKeyUp(code);
1850	>	caps_on = false;
1851	>	} else {
1852	>	ADBKeyDown(code);
1853	>	caps_on = true;
1854	>	}
1855	>	} else
1856	>	ADBKeyUp(code);
1857		if (code == 0x36)
1858		ctrl_down = false;
1859		}
#	Line 1853 | Line 1882 | static void handle_events(void)
1882		ADBKeyDown(0x7f);       // Power key
1883		ADBKeyUp(0x7f);
1884		break;
1885	+
1886	+	// Application activate/deactivate; consume the event but otherwise ignore it
1887	+	case SDL_ACTIVEEVENT:
1888	+	break;
1889		}
1890		}
1891		}
#	Line 1864 | Line 1897 | static void handle_events(void)
1897		*/
1898
1899		// Static display update (fixed frame rate, but incremental)
1900	<	static void update_display_static(driver_window *drv)
1900	>	static void update_display_static(driver_base *drv)
1901		{
1902		// Incremental update code
1903		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
#	Line 1891 | Line 1924 | static void update_display_static(driver
1924
1925		// Check for first column from left and first column from right that have changed
1926		if (high) {
1927	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1927	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1928		const int src_bytes_per_row = bytes_per_row;
1929		const int dst_bytes_per_row = drv->s->pitch;
1930		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 1953 | Line 1986 | static void update_display_static(driver
1986
1987		} else {
1988		const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1989	+	const int dst_bytes_per_row = drv->s->pitch;
1990
1991		x1 = VIDEO_MODE_X;
1992		for (j=y1; j<=y2; j++) {
#	Line 1993 | Line 2027 | static void update_display_static(driver
2027		// Blit to screen surface
2028		for (j=y1; j<=y2; j++) {
2029		i = j * bytes_per_row + x1 * bytes_per_pixel;
2030	+	int dst_i = j * dst_bytes_per_row + x1 * bytes_per_pixel;
2031		memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
2032	<	Screen_blit((uint8 *)drv->s->pixels + i, the_buffer + i, bytes_per_pixel * wide);
2032	>	Screen_blit((uint8 *)drv->s->pixels + dst_i, the_buffer + i, bytes_per_pixel * wide);
2033		}
2034
2035		// Unlock surface, if required
#	Line 2008 | Line 2043 | static void update_display_static(driver
2043		}
2044		}
2045
2046	+	// Static display update (fixed frame rate, bounding boxes based)
2047	+	// XXX use NQD bounding boxes to help detect dirty areas?
2048	+	static void update_display_static_bbox(driver_base *drv)
2049	+	{
2050	+	const VIDEO_MODE &mode = drv->mode;
2051	+
2052	+	// Allocate bounding boxes for SDL_UpdateRects()
2053	+	const int N_PIXELS = 64;
2054	+	const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2055	+	const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2056	+	SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2057	+	int nr_boxes = 0;
2058	+
2059	+	// Lock surface, if required
2060	+	if (SDL_MUSTLOCK(drv->s))
2061	+	SDL_LockSurface(drv->s);
2062	+
2063	+	// Update the surface from Mac screen
2064	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2065	+	const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2066	+	const int dst_bytes_per_row = drv->s->pitch;
2067	+	int x, y;
2068	+	for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2069	+	int h = N_PIXELS;
2070	+	if (h > VIDEO_MODE_Y - y)
2071	+	h = VIDEO_MODE_Y - y;
2072	+	for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2073	+	int w = N_PIXELS;
2074	+	if (w > VIDEO_MODE_X - x)
2075	+	w = VIDEO_MODE_X - x;
2076	+	const int xs = w * bytes_per_pixel;
2077	+	const int xb = x * bytes_per_pixel;
2078	+	bool dirty = false;
2079	+	for (int j = y; j < (y + h); j++) {
2080	+	const int yb = j * bytes_per_row;
2081	+	const int dst_yb = j * dst_bytes_per_row;
2082	+	if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2083	+	memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2084	+	Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs);
2085	+	dirty = true;
2086	+	}
2087	+	}
2088	+	if (dirty) {
2089	+	boxes[nr_boxes].x = x;
2090	+	boxes[nr_boxes].y = y;
2091	+	boxes[nr_boxes].w = w;
2092	+	boxes[nr_boxes].h = h;
2093	+	nr_boxes++;
2094	+	}
2095	+	}
2096	+	}
2097	+
2098	+	// Unlock surface, if required
2099	+	if (SDL_MUSTLOCK(drv->s))
2100	+	SDL_UnlockSurface(drv->s);
2101	+
2102	+	// Refresh display
2103	+	if (nr_boxes)
2104	+	SDL_UpdateRects(drv->s, nr_boxes, boxes);
2105	+	}
2106	+
2107
2108		// We suggest the compiler to inline the next two functions so that it
2109		// may specialise the code according to the current screen depth and
#	Line 2049 | Line 2145 | static inline void handle_palette_change
2145		UNLOCK_PALETTE;
2146		}
2147
2148	+	static void video_refresh_window_static(void);
2149	+
2150		static void video_refresh_dga(void)
2151		{
2152		// Quit DGA mode if requested
2153		possibly_quit_dga_mode();
2154	+	video_refresh_window_static();
2155		}
2156
2157		#ifdef ENABLE_VOSF
#	Line 2068 | Line 2167 | static void video_refresh_dga_vosf(void)
2167		tick_counter = 0;
2168		if (mainBuffer.dirty) {
2169		LOCK_VOSF;
2170	<	update_display_dga_vosf();
2170	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2171		UNLOCK_VOSF;
2172		}
2173		}
#	Line 2102 | Line 2201 | static void video_refresh_window_static(
2201		static int tick_counter = 0;
2202		if (++tick_counter >= frame_skip) {
2203		tick_counter = 0;
2204	<	update_display_static(static_cast<driver_window *>(drv));
2204	>	const VIDEO_MODE &mode = drv->mode;
2205	>	if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2206	>	update_display_static_bbox(drv);
2207	>	else
2208	>	update_display_static(drv);
2209		}
2210		}
2211
#	Line 2132 | Line 2235 | static void VideoRefreshInit(void)
2235		}
2236		}
2237
2238	+	static inline void do_video_refresh(void)
2239	+	{
2240	+	// Handle SDL events
2241	+	handle_events();
2242	+
2243	+	// Update display
2244	+	#if (defined(__APPLE__) && defined(__MACH__))
2245	+	// SDL expects an auto-release pool to be present.
2246	+	NSAutoReleasePool_wrap(video_refresh);
2247	+	#else
2248	+	video_refresh();
2249	+	#endif
2250	+
2251	+	#ifdef SHEEPSHAVER
2252	+	// Set new cursor image if it was changed
2253	+	if (cursor_changed && sdl_cursor) {
2254	+	cursor_changed = false;
2255	+	LOCK_EVENTS;
2256	+	SDL_FreeCursor(sdl_cursor);
2257	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2258	+	if (sdl_cursor) {
2259	+	SDL_ShowCursor(private_data == NULL || private_data->cursorVisible);
2260	+	SDL_SetCursor(sdl_cursor);
2261	+	#ifdef WIN32
2262	+	// XXX Windows apparently needs an extra mouse event to
2263	+	// make the new cursor image visible
2264	+	int visible = SDL_ShowCursor(-1);
2265	+	if (visible) {
2266	+	int x, y;
2267	+	SDL_GetMouseState(&x, &y);
2268	+	SDL_WarpMouse(x, y);
2269	+	}
2270	+	#endif
2271	+	}
2272	+	UNLOCK_EVENTS;
2273	+	}
2274	+	#endif
2275	+
2276	+	// Set new palette if it was changed
2277	+	handle_palette_changes();
2278	+	}
2279	+
2280	+	// This function is called on non-threaded platforms from a timer interrupt
2281	+	void VideoRefresh(void)
2282	+	{
2283	+	// We need to check redraw_thread_active to inhibit refreshed during
2284	+	// mode changes on non-threaded platforms
2285	+	if (!redraw_thread_active)
2286	+	return;
2287	+
2288	+	// Process pending events and update display
2289	+	do_video_refresh();
2290	+	}
2291	+
2292		const int VIDEO_REFRESH_HZ = 60;
2293		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2294
2295	+	#ifndef USE_CPU_EMUL_SERVICES
2296		static int redraw_func(void *arg)
2297		{
2298		uint64 start = GetTicks_usec();
#	Line 2152 | Line 2310 | static int redraw_func(void *arg)
2310		next = GetTicks_usec();
2311		ticks++;
2312
2313	<	// Handle SDL events
2314	<	handle_events();
2315	<
2316	<	// Refresh display
2317	<	video_refresh();
2313	>	#ifdef SHEEPSHAVER
2314	>	// Pause if requested (during video mode switches)
2315	>	if (thread_stop_req) {
2316	>	thread_stop_ack = true;
2317	>	continue;
2318	>	}
2319	>	#endif
2320
2321	<	// Set new palette if it was changed
2322	<	handle_palette_changes();
2321	>	// Process pending events and update display
2322	>	do_video_refresh();
2323		}
2324
2325		uint64 end = GetTicks_usec();
2326		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2327		return 0;
2328		}
2329	+	#endif
2330	+
2331	+
2332	+	/*
2333	+	*  Record dirty area from NQD
2334	+	*/
2335	+
2336	+	#ifdef SHEEPSHAVER
2337	+	void video_set_dirty_area(int x, int y, int w, int h)
2338	+	{
2339	+	#ifdef ENABLE_VOSF
2340	+	const VIDEO_MODE &mode = drv->mode;
2341	+	const int screen_width = VIDEO_MODE_X;
2342	+	const int screen_height = VIDEO_MODE_Y;
2343	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2344	+
2345	+	if (use_vosf) {
2346	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2347	+	return;
2348	+	}
2349	+	#endif
2350	+
2351	+	// XXX handle dirty bounding boxes for non-VOSF modes
2352	+	}
2353	+	#endif

Diff Legend

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