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.1 by gbeauche, 2004-06-23T13:47:20Z vs.
Revision 1.20 by gbeauche, 2005-06-14T22:35:42Z

#	Line 1 | Line 1
1		/*
2		*  video_sdl.cpp - Video/graphics emulation, SDL specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2004 Christian Bauer
4	>	*  Basilisk II (C) 1997-2005 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 21 | Line 21
21		/*
22		*  NOTES:
23		*    The Ctrl key works like a qualifier for special actions:
24	<	*      Ctrl-Tab = suspend DGA mode
24	>	*      Ctrl-Tab = suspend DGA mode (TODO)
25		*      Ctrl-Esc = emergency quit
26		*      Ctrl-F1 = mount floppy
27		*      Ctrl-F5 = grab mouse (in windowed mode)
28		*
29		*  FIXMEs and TODOs:
30	+	*  - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux
31		*  - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?)
32		*  - Mouse acceleration, there is no API in SDL yet for that
33		*  - Force relative mode in Grab mode even if SDL provides absolute coordinates?
34		*  - 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	+	*  - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
40	+	*  - Backport hw cursor acceleration to Basilisk II?
41	+	*  - Factor out code
42		*/
43
44		#include "sysdeps.h"
#	Line 40 | Line 47
47		#include <SDL_mutex.h>
48		#include <SDL_thread.h>
49		#include <errno.h>
50	+	#include <vector>
51
52		#include "cpu_emulation.h"
53		#include "main.h"
#	Line 48 | Line 56
56		#include "prefs.h"
57		#include "user_strings.h"
58		#include "video.h"
59	+	#include "video_defs.h"
60		#include "video_blit.h"
61	+	#include "vm_alloc.h"
62
63		#define DEBUG 0
64		#include "debug.h"
65
66
67		// Supported video modes
68	<	static vector<video_mode> VideoModes;
68	>	using std::vector;
69	>	static vector<VIDEO_MODE> VideoModes;
70
71		// Display types
72	+	#ifdef SHEEPSHAVER
73		enum {
74	<	DISPLAY_WINDOW, // windowed display
75	<	DISPLAY_SCREEN  // fullscreen display
74	>	DISPLAY_WINDOW = DIS_WINDOW,                                    // windowed display
75	>	DISPLAY_SCREEN = DIS_SCREEN                                             // fullscreen display
76		};
77	+	extern int display_type;                                                        // See enum above
78	+	#else
79	+	enum {
80	+	DISPLAY_WINDOW,                                                                 // windowed display
81	+	DISPLAY_SCREEN                                                                  // fullscreen display
82	+	};
83	+	static int display_type = DISPLAY_WINDOW;                       // See enum above
84	+	#endif
85
86		// Constants
87	+	#ifdef WIN32
88	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
89	+	#else
90		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
91	+	#endif
92
93
94		// Global variables
#	Line 72 | Line 96 | static int32 frame_skip;                                                       // Prefs
96		static int16 mouse_wheel_mode;
97		static int16 mouse_wheel_lines;
98
75	–	static int display_type = DISPLAY_WINDOW;                       // See enum above
99		static uint8 *the_buffer = NULL;                                        // Mac frame buffer (where MacOS draws into)
100		static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer (for refreshed modes)
101		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
102
103		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
104	+	#ifndef USE_CPU_EMUL_SERVICES
105		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
106		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
107	+	#ifdef SHEEPSHAVER
108	+	static volatile bool thread_stop_req = false;
109	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
110	+	#endif
111	+	#endif
112
113		#ifdef ENABLE_VOSF
114	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
114	>	static bool use_vosf = false;                                           // Flag: VOSF enabled
115		#else
116		static const bool use_vosf = false;                                     // VOSF not possible
117		#endif
#	Line 100 | Line 129 | static int keycode_table[256];                                         // X
129
130		// SDL variables
131		static int screen_depth;                                                        // Depth of current screen
132	+	static SDL_Cursor *sdl_cursor;                                          // Copy of Mac cursor
133	+	static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
134		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
135		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
136	+	static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
137
138		// Mutex to protect palette
139		static SDL_mutex *sdl_palette_lock = NULL;
#	Line 126 | Line 158 | extern void SysMountFirstFloppy(void);
158
159
160		/*
161	+	*  Framebuffer allocation routines
162	+	*/
163	+
164	+	static void *vm_acquire_framebuffer(uint32 size)
165	+	{
166	+	#ifdef SHEEPSHAVER
167	+	#ifdef DIRECT_ADDRESSING_HACK
168	+	const uint32 FRAME_BUFFER_BASE = 0x61000000;
169	+	uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE);
170	+	if (vm_acquire_fixed(fb, size) < 0)
171	+	fb = VM_MAP_FAILED;
172	+	return fb;
173	+	#endif
174	+	#endif
175	+	return vm_acquire(size);
176	+	}
177	+
178	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
179	+	{
180	+	vm_release(fb, size);
181	+	}
182	+
183	+
184	+	/*
185	+	*  SheepShaver glue
186	+	*/
187	+
188	+	#ifdef SHEEPSHAVER
189	+	// Color depth modes type
190	+	typedef int video_depth;
191	+
192	+	// 1, 2, 4 and 8 bit depths use a color palette
193	+	static inline bool IsDirectMode(VIDEO_MODE const & mode)
194	+	{
195	+	return IsDirectMode(mode.viAppleMode);
196	+	}
197	+
198	+	// Abstract base class representing one (possibly virtual) monitor
199	+	// ("monitor" = rectangular display with a contiguous frame buffer)
200	+	class monitor_desc {
201	+	public:
202	+	monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) {}
203	+	virtual ~monitor_desc() {}
204	+
205	+	// Get current Mac frame buffer base address
206	+	uint32 get_mac_frame_base(void) const {return screen_base;}
207	+
208	+	// Set Mac frame buffer base address (called from switch_to_mode())
209	+	void set_mac_frame_base(uint32 base) {screen_base = base;}
210	+
211	+	// Get current video mode
212	+	const VIDEO_MODE &get_current_mode(void) const {return VModes[cur_mode];}
213	+
214	+	// Called by the video driver to switch the video mode on this display
215	+	// (must call set_mac_frame_base())
216	+	virtual void switch_to_current_mode(void) = 0;
217	+
218	+	// Called by the video driver to set the color palette (in indexed modes)
219	+	// or the gamma table (in direct modes)
220	+	virtual void set_palette(uint8 *pal, int num) = 0;
221	+	};
222	+
223	+	// Vector of pointers to available monitor descriptions, filled by VideoInit()
224	+	static vector<monitor_desc *> VideoMonitors;
225	+
226	+	// Find Apple mode matching best specified dimensions
227	+	static int find_apple_resolution(int xsize, int ysize)
228	+	{
229	+	int apple_id;
230	+	if (xsize < 800)
231	+	apple_id = APPLE_640x480;
232	+	else if (xsize < 1024)
233	+	apple_id = APPLE_800x600;
234	+	else if (xsize < 1152)
235	+	apple_id = APPLE_1024x768;
236	+	else if (xsize < 1280) {
237	+	if (ysize < 900)
238	+	apple_id = APPLE_1152x768;
239	+	else
240	+	apple_id = APPLE_1152x900;
241	+	}
242	+	else if (xsize < 1600)
243	+	apple_id = APPLE_1280x1024;
244	+	else
245	+	apple_id = APPLE_1600x1200;
246	+	return apple_id;
247	+	}
248	+
249	+	// Set parameters to specified Apple mode
250	+	static void set_apple_resolution(int apple_id, int &xsize, int &ysize)
251	+	{
252	+	switch (apple_id) {
253	+	case APPLE_640x480:
254	+	xsize = 640;
255	+	ysize = 480;
256	+	break;
257	+	case APPLE_800x600:
258	+	xsize = 800;
259	+	ysize = 600;
260	+	break;
261	+	case APPLE_1024x768:
262	+	xsize = 1024;
263	+	ysize = 768;
264	+	break;
265	+	case APPLE_1152x768:
266	+	xsize = 1152;
267	+	ysize = 768;
268	+	break;
269	+	case APPLE_1152x900:
270	+	xsize = 1152;
271	+	ysize = 900;
272	+	break;
273	+	case APPLE_1280x1024:
274	+	xsize = 1280;
275	+	ysize = 1024;
276	+	break;
277	+	case APPLE_1600x1200:
278	+	xsize = 1600;
279	+	ysize = 1200;
280	+	break;
281	+	default:
282	+	abort();
283	+	}
284	+	}
285	+
286	+	// Match Apple mode matching best specified dimensions
287	+	static int match_apple_resolution(int &xsize, int &ysize)
288	+	{
289	+	int apple_id = find_apple_resolution(xsize, ysize);
290	+	set_apple_resolution(apple_id, xsize, ysize);
291	+	return apple_id;
292	+	}
293	+
294	+	// Display error alert
295	+	static void ErrorAlert(int error)
296	+	{
297	+	ErrorAlert(GetString(error));
298	+	}
299	+
300	+	// Display warning alert
301	+	static void WarningAlert(int warning)
302	+	{
303	+	WarningAlert(GetString(warning));
304	+	}
305	+	#endif
306	+
307	+
308	+	/*
309		*  monitor_desc subclass for SDL display
310		*/
311
312		class SDL_monitor_desc : public monitor_desc {
313		public:
314	<	SDL_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
314	>	SDL_monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
315		~SDL_monitor_desc() {}
316
317		virtual void switch_to_current_mode(void);
#	Line 146 | Line 326 | public:
326		*  Utility functions
327		*/
328
329	+	// Find palette size for given color depth
330	+	static int palette_size(int mode)
331	+	{
332	+	switch (mode) {
333	+	case VIDEO_DEPTH_1BIT: return 2;
334	+	case VIDEO_DEPTH_2BIT: return 4;
335	+	case VIDEO_DEPTH_4BIT: return 16;
336	+	case VIDEO_DEPTH_8BIT: return 256;
337	+	case VIDEO_DEPTH_16BIT: return 32;
338	+	case VIDEO_DEPTH_32BIT: return 256;
339	+	default: return 0;
340	+	}
341	+	}
342	+
343	+	// Return bytes per pixel for requested depth
344	+	static inline int bytes_per_pixel(int depth)
345	+	{
346	+	int bpp;
347	+	switch (depth) {
348	+	case 8:
349	+	bpp = 1;
350	+	break;
351	+	case 15: case 16:
352	+	bpp = 2;
353	+	break;
354	+	case 24: case 32:
355	+	bpp = 4;
356	+	break;
357	+	default:
358	+	abort();
359	+	}
360	+	return bpp;
361	+	}
362	+
363		// Map video_mode depth ID to numerical depth value
364	<	static int sdl_depth_of_video_depth(int video_depth)
364	>	static int mac_depth_of_video_depth(int video_depth)
365		{
366		int depth = -1;
367		switch (video_depth) {
368	<	case VDEPTH_1BIT:
368	>	case VIDEO_DEPTH_1BIT:
369		depth = 1;
370		break;
371	<	case VDEPTH_2BIT:
371	>	case VIDEO_DEPTH_2BIT:
372		depth = 2;
373		break;
374	<	case VDEPTH_4BIT:
374	>	case VIDEO_DEPTH_4BIT:
375		depth = 4;
376		break;
377	<	case VDEPTH_8BIT:
377	>	case VIDEO_DEPTH_8BIT:
378		depth = 8;
379		break;
380	<	case VDEPTH_16BIT:
380	>	case VIDEO_DEPTH_16BIT:
381		depth = 16;
382		break;
383	<	case VDEPTH_32BIT:
383	>	case VIDEO_DEPTH_32BIT:
384		depth = 32;
385		break;
386		default:
#	Line 175 | Line 389 | static int sdl_depth_of_video_depth(int
389		return depth;
390		}
391
392	+	// Map video_mode depth ID to SDL screen depth
393	+	static int sdl_depth_of_video_depth(int video_depth)
394	+	{
395	+	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
396	+	}
397	+
398	+	// Check wether specified mode is available
399	+	static bool has_mode(int type, int width, int height)
400	+	{
401	+	#ifdef SHEEPSHAVER
402	+	// Filter out Classic resolutiosn
403	+	if (width == 512 && height == 384)
404	+	return false;
405	+
406	+	// "screen" prefs items always succeeds
407	+	if (PrefsFindString("screen"))
408	+	return true;
409	+
410	+	// Read window & screen modes prefs
411	+	static uint32 window_modes = 0;
412	+	static uint32 screen_modes = 0;
413	+	if (window_modes == 0 || screen_modes == 0) {
414	+	window_modes = PrefsFindInt32("windowmodes");
415	+	screen_modes = PrefsFindInt32("screenmodes");
416	+	if (window_modes == 0 || screen_modes == 0)
417	+	window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
418	+	}
419	+
420	+	int test_modes;
421	+	switch (type) {
422	+	case DISPLAY_WINDOW:
423	+	test_modes = window_modes;
424	+	break;
425	+	case DISPLAY_SCREEN:
426	+	test_modes = screen_modes;
427	+	break;
428	+	default:
429	+	test_modes = 0;
430	+	break;
431	+	}
432	+
433	+	int apple_mask;
434	+	switch (find_apple_resolution(width, height)) {
435	+	case APPLE_640x480:             apple_mask = 0x01; break;
436	+	case APPLE_800x600:             apple_mask = 0x02; break;
437	+	case APPLE_1024x768:    apple_mask = 0x04; break;
438	+	case APPLE_1152x768:    apple_mask = 0x40; break;
439	+	case APPLE_1152x900:    apple_mask = 0x08; break;
440	+	case APPLE_1280x1024:   apple_mask = 0x10; break;
441	+	case APPLE_1600x1200:   apple_mask = 0x20; break;
442	+	default:                                apple_mask = 0x00; break;
443	+	}
444	+	return (test_modes & apple_mask);
445	+	#endif
446	+	return true;
447	+	}
448	+
449		// Add mode to list of supported modes
450	<	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
450	>	static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
451		{
452	<	video_mode mode;
453	<	mode.x = width;
454	<	mode.y = height;
455	<	mode.resolution_id = resolution_id;
456	<	mode.bytes_per_row = bytes_per_row;
457	<	mode.depth = depth;
452	>	// Filter out unsupported modes
453	>	if (!has_mode(type, width, height))
454	>	return;
455	>
456	>	// Fill in VideoMode entry
457	>	VIDEO_MODE mode;
458	>	#ifdef SHEEPSHAVER
459	>	// Recalculate dimensions to fit Apple modes
460	>	resolution_id = match_apple_resolution(width, height);
461	>	mode.viType = type;
462	>	#endif
463	>	VIDEO_MODE_X = width;
464	>	VIDEO_MODE_Y = height;
465	>	VIDEO_MODE_RESOLUTION = resolution_id;
466	>	VIDEO_MODE_ROW_BYTES = bytes_per_row;
467	>	VIDEO_MODE_DEPTH = (video_depth)depth;
468		VideoModes.push_back(mode);
469		}
470
471		// Add standard list of windowed modes for given color depth
472	<	static void add_window_modes(video_depth depth)
472	>	static void add_window_modes(int depth)
473		{
474	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
475	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
476	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
477	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
478	<	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
479	<	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
480	<	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
474	>	video_depth vdepth = (video_depth)depth;
475	>	add_mode(DISPLAY_WINDOW, 512, 384, 0x80, TrivialBytesPerRow(512, vdepth), depth);
476	>	add_mode(DISPLAY_WINDOW, 640, 480, 0x81, TrivialBytesPerRow(640, vdepth), depth);
477	>	add_mode(DISPLAY_WINDOW, 800, 600, 0x82, TrivialBytesPerRow(800, vdepth), depth);
478	>	add_mode(DISPLAY_WINDOW, 1024, 768, 0x83, TrivialBytesPerRow(1024, vdepth), depth);
479	>	add_mode(DISPLAY_WINDOW, 1152, 870, 0x84, TrivialBytesPerRow(1152, vdepth), depth);
480	>	add_mode(DISPLAY_WINDOW, 1280, 1024, 0x85, TrivialBytesPerRow(1280, vdepth), depth);
481	>	add_mode(DISPLAY_WINDOW, 1600, 1200, 0x86, TrivialBytesPerRow(1600, vdepth), depth);
482		}
483
484		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
485	<	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, video_depth depth, bool native_byte_order)
485	>	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
486		{
487		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
488		int layout = FLAYOUT_DIRECT;
489	<	if (depth == VDEPTH_16BIT)
489	>	if (depth == VIDEO_DEPTH_16BIT)
490		layout = (screen_depth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
491	<	else if (depth == VDEPTH_32BIT)
491	>	else if (depth == VIDEO_DEPTH_32BIT)
492		layout = (screen_depth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
493		if (native_byte_order)
494		MacFrameLayout = layout;
#	Line 215 | Line 497 | static void set_mac_frame_buffer(SDL_mon
497		monitor.set_mac_frame_base(MacFrameBaseMac);
498
499		// Set variables used by UAE memory banking
500	<	const video_mode &mode = monitor.get_current_mode();
500	>	const VIDEO_MODE &mode = monitor.get_current_mode();
501		MacFrameBaseHost = the_buffer;
502	<	MacFrameSize = mode.bytes_per_row * mode.y;
502	>	MacFrameSize = VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y;
503		InitFrameBufferMapping();
504		#else
505		monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
#	Line 238 | Line 520 | static void set_window_name(int name)
520		// Set mouse grab mode
521		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
522		{
523	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
523	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
524		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
525		}
526
#	Line 266 | Line 548 | public:
548
549		public:
550		SDL_monitor_desc &monitor; // Associated video monitor
551	<	const video_mode &mode;    // Video mode handled by the driver
551	>	const VIDEO_MODE &mode;    // Video mode handled by the driver
552
553		bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
554		SDL_Surface *s; // The surface we draw into
#	Line 297 | Line 579 | private:
579		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
580		};
581
582	+	class driver_fullscreen : public driver_base {
583	+	public:
584	+	driver_fullscreen(SDL_monitor_desc &monitor);
585	+	~driver_fullscreen();
586	+	};
587	+
588		static driver_base *drv = NULL; // Pointer to currently used driver object
589
590		#ifdef ENABLE_VOSF
#	Line 318 | Line 606 | driver_base::~driver_base()
606		if (s)
607		SDL_FreeSurface(s);
608
609	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
610	+	if (the_buffer != VM_MAP_FAILED) {
611	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
612	+	vm_release_framebuffer(the_buffer, the_buffer_size);
613	+	the_buffer = NULL;
614	+	}
615	+
616		// Free frame buffer(s)
617		if (!use_vosf) {
323	–	if (the_buffer) {
324	–	free(the_buffer);
325	–	the_buffer = NULL;
326	–	}
618		if (the_buffer_copy) {
619		free(the_buffer_copy);
620		the_buffer_copy = NULL;
#	Line 331 | Line 622 | driver_base::~driver_base()
622		}
623		#ifdef ENABLE_VOSF
624		else {
334	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
335	–	if (the_buffer != VM_MAP_FAILED) {
336	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
337	–	vm_release(the_buffer, the_buffer_size);
338	–	the_buffer = NULL;
339	–	}
625		if (the_host_buffer) {
626		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
627		free(the_host_buffer);
#	Line 347 | Line 632 | driver_base::~driver_base()
632		free(the_buffer_copy);
633		the_buffer_copy = NULL;
634		}
635	+
636	+	// Deinitialize VOSF
637	+	video_vosf_exit();
638		}
639		#endif
640		}
#	Line 354 | Line 642 | driver_base::~driver_base()
642		// Palette has changed
643		void driver_base::update_palette(void)
644		{
645	<	const video_mode &mode = monitor.get_current_mode();
645	>	const VIDEO_MODE &mode = monitor.get_current_mode();
646
647	<	if (mode.depth <= VDEPTH_8BIT)
647	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
648		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
649		}
650
#	Line 379 | Line 667 | void driver_base::restore_mouse_accel(vo
667		driver_window::driver_window(SDL_monitor_desc &m)
668		: driver_base(m), mouse_grabbed(false)
669		{
670	<	int width = mode.x, height = mode.y;
670	>	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
671		int aligned_width = (width + 15) & ~15;
672		int aligned_height = (height + 15) & ~15;
673
#	Line 387 | Line 675 | driver_window::driver_window(SDL_monitor
675		ADBSetRelMouseMode(mouse_grabbed);
676
677		// Create surface
678	<	int depth = (mode.depth <= VDEPTH_8BIT ? 8 : screen_depth);
678	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
679		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
680		return;
681
#	Line 396 | Line 684 | driver_window::driver_window(SDL_monitor
684		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
685		the_host_buffer = (uint8 *)s->pixels;
686		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
687	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
687	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
688		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
689		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
690	+
691	+	// Check whether we can initialize the VOSF subsystem and it's profitable
692	+	if (!video_vosf_init(m)) {
693	+	WarningAlert(STR_VOSF_INIT_ERR);
694	+	use_vosf = false;
695	+	}
696	+	else if (!video_vosf_profitable()) {
697	+	video_vosf_exit();
698	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
699	+	use_vosf = false;
700	+	}
701	+	if (!use_vosf) {
702	+	free(the_buffer_copy);
703	+	vm_release(the_buffer, the_buffer_size);
704	+	the_host_buffer = NULL;
705	+	}
706	+	#endif
707	+	if (!use_vosf) {
708	+	// Allocate memory for frame buffer
709	+	the_buffer_size = (aligned_height + 2) * s->pitch;
710	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
711	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
712	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
713	+	}
714	+
715	+	#ifdef SHEEPSHAVER
716	+	// Create cursor
717	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
718	+	SDL_SetCursor(sdl_cursor);
719	+	cursor_changed = false;
720	+	}
721		#else
722	<	// Allocate memory for frame buffer
723	<	the_buffer_size = (aligned_height + 2) * s->pitch;
405	<	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
406	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
407	<	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
722	>	// Hide cursor
723	>	SDL_ShowCursor(0);
724		#endif
725
726		// Set window name/class
727		set_window_name(STR_WINDOW_TITLE);
728
413	–	// Hide cursor
414	–	SDL_ShowCursor(0);
415	–
729		// Init blitting routines
730		SDL_PixelFormat *f = s->format;
731		VisualFormat visualFormat;
#	Line 420 | Line 733 | driver_window::driver_window(SDL_monitor
733		visualFormat.Rmask = f->Rmask;
734		visualFormat.Gmask = f->Gmask;
735		visualFormat.Bmask = f->Bmask;
736	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(mode.depth));
736	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
737
738		// Load gray ramp to 8->16/32 expand map
739		if (!IsDirectMode(mode))
#	Line 428 | Line 741 | driver_window::driver_window(SDL_monitor
741		ExpandMap[i] = SDL_MapRGB(f, i, i, i);
742
743		// Set frame buffer base
744	<	set_mac_frame_buffer(monitor, mode.depth, true);
744	>	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
745
746		// Everything went well
747		init_ok = true;
#	Line 487 | Line 800 | void driver_window::mouse_moved(int x, i
800		ADBMouseMoved(x, y);
801		}
802
803	+
804	+	/*
805	+	*  Full-screen display driver
806	+	*/
807	+
808	+	// Open display
809	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
810	+	: driver_base(m)
811	+	{
812	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
813	+	int aligned_width = (width + 15) & ~15;
814	+	int aligned_height = (height + 15) & ~15;
815	+
816	+	// Set absolute mouse mode
817	+	ADBSetRelMouseMode(false);
818	+
819	+	// Create surface
820	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
821	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
822	+	return;
823	+
824	+	#ifdef ENABLE_VOSF
825	+	use_vosf = true;
826	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
827	+	the_host_buffer = (uint8 *)s->pixels;
828	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
829	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
830	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
831	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
832	+
833	+	// Check whether we can initialize the VOSF subsystem and it's profitable
834	+	if (!video_vosf_init(m)) {
835	+	WarningAlert(STR_VOSF_INIT_ERR);
836	+	use_vosf = false;
837	+	}
838	+	else if (!video_vosf_profitable()) {
839	+	video_vosf_exit();
840	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
841	+	use_vosf = false;
842	+	}
843	+	if (!use_vosf) {
844	+	free(the_buffer_copy);
845	+	vm_release(the_buffer, the_buffer_size);
846	+	the_host_buffer = NULL;
847	+	}
848	+	#endif
849	+	if (!use_vosf) {
850	+	// Allocate memory for frame buffer
851	+	the_buffer_size = (aligned_height + 2) * s->pitch;
852	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
853	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
854	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
855	+	}
856	+
857	+	// Hide cursor
858	+	SDL_ShowCursor(0);
859	+
860	+	// Init blitting routines
861	+	SDL_PixelFormat *f = s->format;
862	+	VisualFormat visualFormat;
863	+	visualFormat.depth = depth;
864	+	visualFormat.Rmask = f->Rmask;
865	+	visualFormat.Gmask = f->Gmask;
866	+	visualFormat.Bmask = f->Bmask;
867	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
868	+
869	+	// Load gray ramp to 8->16/32 expand map
870	+	if (!IsDirectMode(mode))
871	+	for (int i=0; i<256; i++)
872	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
873	+
874	+	// Set frame buffer base
875	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
876	+
877	+	// Everything went well
878	+	init_ok = true;
879	+	}
880	+
881	+	// Close display
882	+	driver_fullscreen::~driver_fullscreen()
883	+	{
884	+	#ifdef ENABLE_VOSF
885	+	if (use_vosf)
886	+	the_host_buffer = NULL; // don't free() in driver_base dtor
887	+	#endif
888	+	if (s)
889	+	SDL_FreeSurface(s);
890	+
891	+	// Show cursor
892	+	SDL_ShowCursor(1);
893	+	}
894	+
895	+
896		/*
897		*  Initialization
898		*/
#	Line 518 | Line 924 | static void keycode_init(void)
924		SDL_VideoDriverName(video_driver, sizeof(video_driver));
925		bool video_driver_found = false;
926		char line[256];
927	+	int n_keys = 0;
928		while (fgets(line, sizeof(line) - 1, f)) {
929		// Read line
930		int len = strlen(line);
#	Line 530 | Line 937 | static void keycode_init(void)
937		continue;
938
939		if (video_driver_found) {
940	<	// Skip aliases
941	<	static const char alias_str[] = "alias";
942	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
940	>	// Skip aliases as long as we have read keycodes yet
941	>	// Otherwise, it's another mapping and we have to stop
942	>	static const char sdl_str[] = "sdl";
943	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
944		continue;
945
946		// Read keycode
947		int x_code, mac_code;
948		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
949	<	keycode_table[x_code & 0xff] = mac_code;
949	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
950		else
951		break;
952		} else {
953		// Search for SDL video driver string
954	<	static const char alias_sdl_str[] = "alias SDL";
955	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
956	<	char *p = line + sizeof(alias_sdl_str);
954	>	static const char sdl_str[] = "sdl";
955	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
956	>	char *p = line + sizeof(sdl_str);
957		if (strstr(video_driver, p) == video_driver)
958		video_driver_found = true;
959		}
#	Line 563 | Line 971 | static void keycode_init(void)
971		WarningAlert(str);
972		return;
973		}
974	+
975	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
976		}
977		}
978
#	Line 570 | Line 980 | static void keycode_init(void)
980		bool SDL_monitor_desc::video_open(void)
981		{
982		D(bug("video_open()\n"));
983	<	const video_mode &mode = get_current_mode();
983	>	const VIDEO_MODE &mode = get_current_mode();
984	>	#if DEBUG
985	>	D(bug("Current video mode:\n"));
986	>	D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f)));
987	>	#endif
988
989		// Create display driver object of requested type
990		switch (display_type) {
991		case DISPLAY_WINDOW:
992		drv = new(std::nothrow) driver_window(*this);
993		break;
994	+	case DISPLAY_SCREEN:
995	+	drv = new(std::nothrow) driver_fullscreen(*this);
996	+	break;
997		}
998		if (drv == NULL)
999		return false;
#	Line 586 | Line 1003 | bool SDL_monitor_desc::video_open(void)
1003		return false;
1004		}
1005
589	–	#ifdef ENABLE_VOSF
590	–	if (use_vosf) {
591	–	// Initialize the VOSF system
592	–	if (!video_vosf_init(*this)) {
593	–	ErrorAlert(STR_VOSF_INIT_ERR);
594	–	return false;
595	–	}
596	–	}
597	–	#endif
598	–
1006		// Initialize VideoRefresh function
1007		VideoRefreshInit();
1008
#	Line 603 | Line 1010 | bool SDL_monitor_desc::video_open(void)
1010		LOCK_FRAME_BUFFER;
1011
1012		// Start redraw/input thread
1013	+	#ifndef USE_CPU_EMUL_SERVICES
1014		redraw_thread_cancel = false;
1015	<	redraw_thread_active = (SDL_CreateThread(redraw_func, NULL) != NULL);
1015	>	redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1016		if (!redraw_thread_active) {
1017		printf("FATAL: cannot create redraw thread\n");
1018		return false;
1019		}
1020	+	#else
1021	+	redraw_thread_active = true;
1022	+	#endif
1023		return true;
1024		}
1025
1026	+	#ifdef SHEEPSHAVER
1027	+	bool VideoInit(void)
1028	+	{
1029	+	const bool classic = false;
1030	+	#else
1031		bool VideoInit(bool classic)
1032		{
1033	+	#endif
1034		classic_mode = classic;
1035
1036		#ifdef ENABLE_VOSF
#	Line 637 | Line 1054 | bool VideoInit(bool classic)
1054		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1055
1056		// Get screen mode from preferences
1057	<	const char *mode_str;
1057	>	const char *mode_str = NULL;
1058		if (classic_mode)
1059		mode_str = "win/512/342";
1060		else
1061		mode_str = PrefsFindString("screen");
1062
1063		// Determine display type and default dimensions
1064	<	int default_width = 512, default_height = 384;
1064	>	int default_width, default_height;
1065	>	if (classic) {
1066	>	default_width = 512;
1067	>	default_height = 384;
1068	>	}
1069	>	else {
1070	>	default_width = 640;
1071	>	default_height = 480;
1072	>	}
1073		display_type = DISPLAY_WINDOW;
1074		if (mode_str) {
1075		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1076		display_type = DISPLAY_WINDOW;
1077	+	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1078	+	display_type = DISPLAY_SCREEN;
1079		}
1080		int max_width = 640, max_height = 480;
1081	<	if (display_type == DISPLAY_SCREEN) {
1082	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
1083	<	if (modes && modes != (SDL_Rect **)-1) {
1084	<	max_width = modes[0]->w;
1085	<	max_height = modes[0]->h;
1081	>	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
1082	>	if (modes && modes != (SDL_Rect **)-1) {
1083	>	// It turns out that on some implementations, and contrary to the documentation,
1084	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
1085	>	for (int i = 0; modes[i] != NULL; i++) {
1086	>	const int w = modes[i]->w;
1087	>	const int h = modes[i]->h;
1088	>	if (w > max_width && h > max_height) {
1089	>	max_width = w;
1090	>	max_height = h;
1091	>	}
1092		}
1093	+	if (default_width > max_width)
1094	+	default_width = max_width;
1095	+	if (default_height > max_height)
1096	+	default_height = max_height;
1097		}
1098		if (default_width <= 0)
1099		default_width = max_width;
#	Line 665 | Line 1102 | bool VideoInit(bool classic)
1102
1103		// Mac screen depth follows X depth
1104		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
1105	<	video_depth default_depth;
1105	>	int default_depth;
1106		switch (screen_depth) {
1107		case 8:
1108	<	default_depth = VDEPTH_8BIT;
1108	>	default_depth = VIDEO_DEPTH_8BIT;
1109		break;
1110		case 15: case 16:
1111	<	default_depth = VDEPTH_16BIT;
1111	>	default_depth = VIDEO_DEPTH_16BIT;
1112		break;
1113		case 24: case 32:
1114	<	default_depth = VDEPTH_32BIT;
1114	>	default_depth = VIDEO_DEPTH_32BIT;
1115		break;
1116		default:
1117	<	default_depth =  VDEPTH_1BIT;
1117	>	default_depth =  VIDEO_DEPTH_1BIT;
1118		break;
1119		}
1120
1121		// Construct list of supported modes
1122		if (display_type == DISPLAY_WINDOW) {
1123		if (classic)
1124	<	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1124	>	add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1125		else {
1126	<	for (int d = VDEPTH_1BIT; d <= default_depth; d++) {
1127	<	int bpp = (d <= VDEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1126	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1127	>	int bpp = sdl_depth_of_video_depth(d);
1128		if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1129		add_window_modes(video_depth(d));
1130		}
1131		}
1132	<	} else
1133	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1132	>	} else if (display_type == DISPLAY_SCREEN) {
1133	>	struct {
1134	>	int w;
1135	>	int h;
1136	>	int resolution_id;
1137	>	}
1138	>	video_modes[] = {
1139	>	{   -1,   -1, 0x80 },
1140	>	{  640,  480, 0x81 },
1141	>	{  800,  600, 0x82 },
1142	>	{ 1024,  768, 0x83 },
1143	>	{ 1152,  870, 0x84 },
1144	>	{ 1280, 1024, 0x85 },
1145	>	{ 1600, 1200, 0x86 },
1146	>	{ 0, }
1147	>	};
1148	>	video_modes[0].w = default_width;
1149	>	video_modes[0].h = default_height;
1150	>
1151	>	for (int i = 0; video_modes[i].w != 0; i++) {
1152	>	const int w = video_modes[i].w;
1153	>	const int h = video_modes[i].h;
1154	>	if (i > 0 && (w >= default_width || h >= default_height))
1155	>	continue;
1156	>	#ifdef ENABLE_VOSF
1157	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1158	>	int bpp = sdl_depth_of_video_depth(d);
1159	>	if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE | SDL_FULLSCREEN))
1160	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1161	>	}
1162	>	#else
1163	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1164	>	#endif
1165	>	}
1166	>	}
1167	>
1168		if (VideoModes.empty()) {
1169		ErrorAlert(STR_NO_XVISUAL_ERR);
1170		return false;
#	Line 701 | Line 1172 | bool VideoInit(bool classic)
1172
1173		// Find requested default mode with specified dimensions
1174		uint32 default_id;
1175	<	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1175	>	std::vector<VIDEO_MODE>::const_iterator i, end = VideoModes.end();
1176		for (i = VideoModes.begin(); i != end; ++i) {
1177	<	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1178	<	default_id = i->resolution_id;
1177	>	const VIDEO_MODE & mode = (*i);
1178	>	if (VIDEO_MODE_X == default_width && VIDEO_MODE_Y == default_height && VIDEO_MODE_DEPTH == default_depth) {
1179	>	default_id = VIDEO_MODE_RESOLUTION;
1180	>	#ifdef SHEEPSHAVER
1181	>	std::vector<VIDEO_MODE>::const_iterator begin = VideoModes.begin();
1182	>	cur_mode = distance(begin, i);
1183	>	#endif
1184		break;
1185		}
1186		}
1187		if (i == end) { // not found, use first available mode
1188	<	default_depth = VideoModes[0].depth;
1189	<	default_id = VideoModes[0].resolution_id;
1188	>	const VIDEO_MODE & mode = VideoModes[0];
1189	>	default_depth = VIDEO_MODE_DEPTH;
1190	>	default_id = VIDEO_MODE_RESOLUTION;
1191	>	#ifdef SHEEPSHAVER
1192	>	cur_mode = 0;
1193	>	#endif
1194		}
1195
1196	+	#ifdef SHEEPSHAVER
1197	+	for (int i = 0; i < VideoModes.size(); i++)
1198	+	VModes[i] = VideoModes[i];
1199	+	VideoInfo *p = &VModes[VideoModes.size()];
1200	+	p->viType = DIS_INVALID;        // End marker
1201	+	p->viRowBytes = 0;
1202	+	p->viXsize = p->viYsize = 0;
1203	+	p->viAppleMode = 0;
1204	+	p->viAppleID = 0;
1205	+	#endif
1206	+
1207		#if DEBUG
1208		D(bug("Available video modes:\n"));
1209		for (i = VideoModes.begin(); i != end; ++i) {
1210	<	int bits = 1 << i->depth;
1210	>	const VIDEO_MODE & mode = (*i);
1211	>	int bits = 1 << VIDEO_MODE_DEPTH;
1212		if (bits == 16)
1213		bits = 15;
1214		else if (bits == 32)
1215		bits = 24;
1216	<	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1216	>	D(bug(" %dx%d (ID %02x), %d colors\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << bits));
1217		}
1218		#endif
1219
1220		// Create SDL_monitor_desc for this (the only) display
1221	<	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, default_depth, default_id);
1221	>	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, (video_depth)default_depth, default_id);
1222		VideoMonitors.push_back(monitor);
1223
1224		// Open display
#	Line 744 | Line 1236 | void SDL_monitor_desc::video_close(void)
1236		D(bug("video_close()\n"));
1237
1238		// Stop redraw thread
1239	+	#ifndef USE_CPU_EMUL_SERVICES
1240		if (redraw_thread_active) {
1241		redraw_thread_cancel = true;
1242	<	//              SDL_WaitThread(redraw_thread, NULL); doesn't work
750	<	while (redraw_thread_cancel);
1242	>	SDL_WaitThread(redraw_thread, NULL);
1243		}
1244	+	#endif
1245		redraw_thread_active = false;
1246
1247		// Unlock frame buffer
1248		UNLOCK_FRAME_BUFFER;
1249		D(bug(" frame buffer unlocked\n"));
1250
758	–	#ifdef ENABLE_VOSF
759	–	if (use_vosf) {
760	–	// Deinitialize VOSF
761	–	video_vosf_exit();
762	–	}
763	–	#endif
764	–
1251		// Close display
1252		delete drv;
1253		drv = NULL;
#	Line 797 | Line 1283 | void VideoQuitFullScreen(void)
1283		*  Mac VBL interrupt
1284		*/
1285
1286	+	/*
1287	+	*  Execute video VBL routine
1288	+	*/
1289	+
1290	+	#ifdef SHEEPSHAVER
1291	+	void VideoVBL(void)
1292	+	{
1293	+	// Emergency quit requested? Then quit
1294	+	if (emerg_quit)
1295	+	QuitEmulator();
1296	+
1297	+	// Temporarily give up frame buffer lock (this is the point where
1298	+	// we are suspended when the user presses Ctrl-Tab)
1299	+	UNLOCK_FRAME_BUFFER;
1300	+	LOCK_FRAME_BUFFER;
1301	+
1302	+	// Execute video VBL
1303	+	if (private_data != NULL && private_data->interruptsEnabled)
1304	+	VSLDoInterruptService(private_data->vslServiceID);
1305	+	}
1306	+	#else
1307		void VideoInterrupt(void)
1308		{
1309	+	// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
1310	+	SDL_PumpEvents();
1311	+
1312		// Emergency quit requested? Then quit
1313		if (emerg_quit)
1314		QuitEmulator();
#	Line 808 | Line 1318 | void VideoInterrupt(void)
1318		UNLOCK_FRAME_BUFFER;
1319		LOCK_FRAME_BUFFER;
1320		}
1321	+	#endif
1322
1323
1324		/*
1325		*  Set palette
1326		*/
1327
1328	+	#ifdef SHEEPSHAVER
1329	+	void video_set_palette(void)
1330	+	{
1331	+	monitor_desc * monitor = VideoMonitors[0];
1332	+	int n_colors = palette_size(monitor->get_current_mode().viAppleMode);
1333	+	uint8 pal[256 * 3];
1334	+	for (int c = 0; c < n_colors; c++) {
1335	+	pal[c*3 + 0] = mac_pal[c].red;
1336	+	pal[c*3 + 1] = mac_pal[c].green;
1337	+	pal[c*3 + 2] = mac_pal[c].blue;
1338	+	}
1339	+	monitor->set_palette(pal, n_colors);
1340	+	}
1341	+	#endif
1342	+
1343		void SDL_monitor_desc::set_palette(uint8 *pal, int num_in)
1344		{
1345	<	const video_mode &mode = get_current_mode();
1345	>	const VIDEO_MODE &mode = get_current_mode();
1346
1347		// FIXME: how can we handle the gamma ramp?
1348	<	if (mode.depth > VDEPTH_8BIT)
1348	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1349		return;
1350
1351		LOCK_PALETTE;
#	Line 844 | Line 1370 | void SDL_monitor_desc::set_palette(uint8
1370		}
1371
1372		#ifdef ENABLE_VOSF
1373	<	// We have to redraw everything because the interpretation of pixel values changed
1374	<	LOCK_VOSF;
1375	<	PFLAG_SET_ALL;
1376	<	UNLOCK_VOSF;
1377	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1373	>	if (use_vosf) {
1374	>	// We have to redraw everything because the interpretation of pixel values changed
1375	>	LOCK_VOSF;
1376	>	PFLAG_SET_ALL;
1377	>	UNLOCK_VOSF;
1378	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1379	>	}
1380		#endif
1381		}
1382
#	Line 863 | Line 1391 | void SDL_monitor_desc::set_palette(uint8
1391		*  Switch video mode
1392		*/
1393
1394	+	#ifdef SHEEPSHAVER
1395	+	int16 video_mode_change(VidLocals *csSave, uint32 ParamPtr)
1396	+	{
1397	+	/* return if no mode change */
1398	+	if ((csSave->saveData == ReadMacInt32(ParamPtr + csData)) &&
1399	+	(csSave->saveMode == ReadMacInt16(ParamPtr + csMode))) return noErr;
1400	+
1401	+	/* first find video mode in table */
1402	+	for (int i=0; VModes[i].viType != DIS_INVALID; i++) {
1403	+	if ((ReadMacInt16(ParamPtr + csMode) == VModes[i].viAppleMode) &&
1404	+	(ReadMacInt32(ParamPtr + csData) == VModes[i].viAppleID)) {
1405	+	csSave->saveMode = ReadMacInt16(ParamPtr + csMode);
1406	+	csSave->saveData = ReadMacInt32(ParamPtr + csData);
1407	+	csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1408	+
1409	+	// Disable interrupts and pause redraw thread
1410	+	DisableInterrupt();
1411	+	thread_stop_ack = false;
1412	+	thread_stop_req = true;
1413	+	while (!thread_stop_ack) ;
1414	+
1415	+	cur_mode = i;
1416	+	monitor_desc *monitor = VideoMonitors[0];
1417	+	monitor->switch_to_current_mode();
1418	+
1419	+	WriteMacInt32(ParamPtr + csBaseAddr, screen_base);
1420	+	csSave->saveBaseAddr=screen_base;
1421	+	csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1422	+	csSave->saveMode=VModes[cur_mode].viAppleMode;
1423	+
1424	+	// Enable interrupts and resume redraw thread
1425	+	thread_stop_req = false;
1426	+	EnableInterrupt();
1427	+	return noErr;
1428	+	}
1429	+	}
1430	+	return paramErr;
1431	+	}
1432	+	#endif
1433	+
1434		void SDL_monitor_desc::switch_to_current_mode(void)
1435		{
1436		// Close and reopen display
#	Line 877 | Line 1445 | void SDL_monitor_desc::switch_to_current
1445
1446
1447		/*
1448	<	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1449	<	*  and -2 if the key was recognized as a hotkey
1448	>	*  Can we set the MacOS cursor image into the window?
1449	>	*/
1450	>
1451	>	#ifdef SHEEPSHAVER
1452	>	bool video_can_change_cursor(void)
1453	>	{
1454	>	return (display_type == DISPLAY_WINDOW);
1455	>	}
1456	>	#endif
1457	>
1458	>
1459	>	/*
1460	>	*  Set cursor image for window
1461		*/
1462
1463	+	#ifdef SHEEPSHAVER
1464	+	void video_set_cursor(void)
1465	+	{
1466	+	cursor_changed = true;
1467	+	}
1468	+	#endif
1469	+
1470	+
1471	+	/*
1472	+	*  Keyboard-related utilify functions
1473	+	*/
1474	+
1475	+	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1476	+	{
1477	+	switch (e.keysym.sym) {
1478	+	case SDLK_NUMLOCK:
1479	+	case SDLK_CAPSLOCK:
1480	+	case SDLK_SCROLLOCK:
1481	+	case SDLK_RSHIFT:
1482	+	case SDLK_LSHIFT:
1483	+	case SDLK_RCTRL:
1484	+	case SDLK_LCTRL:
1485	+	case SDLK_RALT:
1486	+	case SDLK_LALT:
1487	+	case SDLK_RMETA:
1488	+	case SDLK_LMETA:
1489	+	case SDLK_LSUPER:
1490	+	case SDLK_RSUPER:
1491	+	case SDLK_MODE:
1492	+	case SDLK_COMPOSE:
1493	+	return true;
1494	+	}
1495	+	return false;
1496	+	}
1497	+
1498		static bool is_ctrl_down(SDL_keysym const & ks)
1499		{
1500		return ctrl_down || (ks.mod & KMOD_CTRL);
1501		}
1502
1503	+
1504	+	/*
1505	+	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1506	+	*  and -2 if the key was recognized as a hotkey
1507	+	*/
1508	+
1509		static int kc_decode(SDL_keysym const & ks, bool key_down)
1510		{
1511		switch (ks.sym) {
#	Line 918 | Line 1538 | static int kc_decode(SDL_keysym const &
1538
1539		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1540		case SDLK_2: case SDLK_AT: return 0x13;
1541	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1541	>	case SDLK_3: case SDLK_HASH: return 0x14;
1542		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1543	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1543	>	case SDLK_5: return 0x17;
1544		case SDLK_6: return 0x16;
1545		case SDLK_7: return 0x1a;
1546		case SDLK_8: return 0x1c;
1547		case SDLK_9: return 0x19;
1548		case SDLK_0: return 0x1d;
1549
1550	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1550	>	case SDLK_BACKQUOTE: return 0x0a;
1551		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1552		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1553	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1554	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1555	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1553	>	case SDLK_LEFTBRACKET: return 0x21;
1554	>	case SDLK_RIGHTBRACKET: return 0x1e;
1555	>	case SDLK_BACKSLASH: return 0x2a;
1556		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1557	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1557	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1558		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1559		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1560		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 955 | Line 1575 | static int kc_decode(SDL_keysym const &
1575		case SDLK_RCTRL: return 0x36;
1576		case SDLK_LSHIFT: return 0x38;
1577		case SDLK_RSHIFT: return 0x38;
1578	+	#if (defined(__APPLE__) && defined(__MACH__))
1579	+	case SDLK_LALT: return 0x3a;
1580	+	case SDLK_RALT: return 0x3a;
1581	+	case SDLK_LMETA: return 0x37;
1582	+	case SDLK_RMETA: return 0x37;
1583	+	#else
1584		case SDLK_LALT: return 0x37;
1585		case SDLK_RALT: return 0x37;
1586		case SDLK_LMETA: return 0x3a;
1587		case SDLK_RMETA: return 0x3a;
1588	+	#endif
1589	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1590	+	case SDLK_RSUPER: return 0x3a;
1591		case SDLK_MENU: return 0x32;
1592		case SDLK_CAPSLOCK: return 0x39;
1593		case SDLK_NUMLOCK: return 0x47;
#	Line 1021 | Line 1650 | static int event2keycode(SDL_KeyboardEve
1650
1651		static void handle_events(void)
1652		{
1653	<	SDL_Event event;
1654	<	while (SDL_PollEvent(&event)) {
1655	<	switch (event.type) {
1653	>	SDL_Event events[10];
1654	>	const int n_max_events = sizeof(events) / sizeof(events[0]);
1655	>	int n_events;
1656	>
1657	>	while ((n_events = SDL_PeepEvents(events, n_max_events, SDL_GETEVENT, sdl_eventmask)) > 0) {
1658	>	for (int i = 0; i < n_events; i++) {
1659	>	SDL_Event const & event = events[i];
1660	>	switch (event.type) {
1661
1662		// Mouse button
1663		case SDL_MOUSEBUTTONDOWN: {
#	Line 1060 | Line 1694 | static void handle_events(void)
1694		// Keyboard
1695		case SDL_KEYDOWN: {
1696		int code = -1;
1697	<	if (use_keycodes) {
1697	>	if (use_keycodes && !is_modifier_key(event.key)) {
1698		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1699		code = keycode_table[event.key.keysym.scancode & 0xff];
1700		} else
#	Line 1088 | Line 1722 | static void handle_events(void)
1722		}
1723		case SDL_KEYUP: {
1724		int code = -1;
1725	<	if (use_keycodes) {
1725	>	if (use_keycodes && !is_modifier_key(event.key)) {
1726		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1727		code = keycode_table[event.key.keysym.scancode & 0xff];
1728		} else
1729		code = event2keycode(event.key, false);
1730	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1731	<	ADBKeyUp(code);
1730	>	if (code >= 0) {
1731	>	if (code == 0x39) {     // Caps Lock released
1732	>	if (caps_on) {
1733	>	ADBKeyUp(code);
1734	>	caps_on = false;
1735	>	} else {
1736	>	ADBKeyDown(code);
1737	>	caps_on = true;
1738	>	}
1739	>	} else
1740	>	ADBKeyUp(code);
1741		if (code == 0x36)
1742		ctrl_down = false;
1743		}
#	Line 1104 | Line 1747 | static void handle_events(void)
1747		// Hidden parts exposed, force complete refresh of window
1748		case SDL_VIDEOEXPOSE:
1749		if (display_type == DISPLAY_WINDOW) {
1750	<	const video_mode &mode = VideoMonitors[0]->get_current_mode();
1750	>	const VIDEO_MODE &mode = VideoMonitors[0]->get_current_mode();
1751		#ifdef ENABLE_VOSF
1752		if (use_vosf) {                 // VOSF refresh
1753		LOCK_VOSF;
1754		PFLAG_SET_ALL;
1755		UNLOCK_VOSF;
1756	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1756	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1757		}
1758		else
1759		#endif
1760	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1760	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1761		}
1762		break;
1763
#	Line 1123 | Line 1766 | static void handle_events(void)
1766		ADBKeyDown(0x7f);       // Power key
1767		ADBKeyUp(0x7f);
1768		break;
1769	+	}
1770		}
1771		}
1772		}
#	Line 1137 | Line 1781 | static void update_display_static(driver
1781		{
1782		// Incremental update code
1783		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1784	<	const video_mode &mode = drv->mode;
1785	<	int bytes_per_row = mode.bytes_per_row;
1784	>	const VIDEO_MODE &mode = drv->mode;
1785	>	int bytes_per_row = VIDEO_MODE_ROW_BYTES;
1786		uint8 *p, *p2;
1787
1788		// Check for first line from top and first line from bottom that have changed
1789		y1 = 0;
1790	<	for (j=0; j<mode.y; j++) {
1790	>	for (j=0; j<VIDEO_MODE_Y; j++) {
1791		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1792		y1 = j;
1793		break;
1794		}
1795		}
1796		y2 = y1 - 1;
1797	<	for (j=mode.y-1; j>=y1; j--) {
1797	>	for (j=VIDEO_MODE_Y-1; j>=y1; j--) {
1798		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1799		y2 = j;
1800		break;
#	Line 1160 | Line 1804 | static void update_display_static(driver
1804
1805		// Check for first column from left and first column from right that have changed
1806		if (high) {
1807	<	if (mode.depth < VDEPTH_8BIT) {
1807	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1808		const int src_bytes_per_row = bytes_per_row;
1809		const int dst_bytes_per_row = drv->s->pitch;
1810	<	const int pixels_per_byte = mode.x / src_bytes_per_row;
1810	>	const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
1811
1812	<	x1 = mode.x / pixels_per_byte;
1812	>	x1 = VIDEO_MODE_X / pixels_per_byte;
1813		for (j = y1; j <= y2; j++) {
1814		p = &the_buffer[j * bytes_per_row];
1815		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1183 | Line 1827 | static void update_display_static(driver
1827		p2 = &the_buffer_copy[j * bytes_per_row];
1828		p += bytes_per_row;
1829		p2 += bytes_per_row;
1830	<	for (i = (mode.x / pixels_per_byte); i > x2; i--) {
1830	>	for (i = (VIDEO_MODE_X / pixels_per_byte); i > x2; i--) {
1831		p--; p2--;
1832		if (*p != *p2) {
1833		x2 = i;
#	Line 1221 | Line 1865 | static void update_display_static(driver
1865		}
1866
1867		} else {
1868	<	const int bytes_per_pixel = mode.bytes_per_row / mode.x;
1868	>	const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1869
1870	<	x1 = mode.x;
1870	>	x1 = VIDEO_MODE_X;
1871		for (j=y1; j<=y2; j++) {
1872		p = &the_buffer[j * bytes_per_row];
1873		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1241 | Line 1885 | static void update_display_static(driver
1885		p2 = &the_buffer_copy[j * bytes_per_row];
1886		p += bytes_per_row;
1887		p2 += bytes_per_row;
1888	<	for (i=mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1888	>	for (i=VIDEO_MODE_X*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1889		p--;
1890		p2--;
1891		if (*p != *p2) {
#	Line 1337 | Line 1981 | static void video_refresh_dga_vosf(void)
1981		tick_counter = 0;
1982		if (mainBuffer.dirty) {
1983		LOCK_VOSF;
1984	<	update_display_dga_vosf();
1984	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
1985		UNLOCK_VOSF;
1986		}
1987		}
#	Line 1401 | Line 2045 | static void VideoRefreshInit(void)
2045		}
2046		}
2047
2048	+	static inline void do_video_refresh(void)
2049	+	{
2050	+	// Handle SDL events
2051	+	handle_events();
2052	+
2053	+	// Update display
2054	+	video_refresh();
2055	+
2056	+	#ifdef SHEEPSHAVER
2057	+	// Set new cursor image if it was changed
2058	+	if (cursor_changed && sdl_cursor) {
2059	+	cursor_changed = false;
2060	+	SDL_FreeCursor(sdl_cursor);
2061	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2062	+	if (sdl_cursor)
2063	+	SDL_SetCursor(sdl_cursor);
2064	+	}
2065	+	#endif
2066	+
2067	+	// Set new palette if it was changed
2068	+	handle_palette_changes();
2069	+	}
2070	+
2071	+	// This function is called on non-threaded platforms from a timer interrupt
2072	+	void VideoRefresh(void)
2073	+	{
2074	+	// We need to check redraw_thread_active to inhibit refreshed during
2075	+	// mode changes on non-threaded platforms
2076	+	if (!redraw_thread_active)
2077	+	return;
2078	+
2079	+	// Process pending events and update display
2080	+	do_video_refresh();
2081	+	}
2082	+
2083	+	const int VIDEO_REFRESH_HZ = 60;
2084	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2085	+
2086	+	#ifndef USE_CPU_EMUL_SERVICES
2087		static int redraw_func(void *arg)
2088		{
2089		uint64 start = GetTicks_usec();
2090		int64 ticks = 0;
2091	+	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2092
2093		while (!redraw_thread_cancel) {
2094
2095		// Wait
2096	<	Delay_usec(16667);
2097	<
2098	<	// Handle SDL events
2099	<	handle_events();
2100	<
2101	<	// Refresh display
1418	<	video_refresh();
2096	>	next += VIDEO_REFRESH_DELAY;
2097	>	int64 delay = next - GetTicks_usec();
2098	>	if (delay > 0)
2099	>	Delay_usec(delay);
2100	>	else if (delay < -VIDEO_REFRESH_DELAY)
2101	>	next = GetTicks_usec();
2102		ticks++;
2103
2104	<	// Set new palette if it was changed
2105	<	handle_palette_changes();
2104	>	#ifdef SHEEPSHAVER
2105	>	// Pause if requested (during video mode switches)
2106	>	if (thread_stop_req) {
2107	>	thread_stop_ack = true;
2108	>	continue;
2109	>	}
2110	>	#endif
2111	>
2112	>	// Process pending events and update display
2113	>	do_video_refresh();
2114		}
2115
2116		uint64 end = GetTicks_usec();
2117		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1427	–	redraw_thread_cancel = false;
2118		return 0;
2119		}
2120	+	#endif

Diff Legend

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