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.2 by gbeauche, 2004-06-23T22:37:33Z vs.
Revision 1.24 by gbeauche, 2006-05-09T21:41:02Z

#	Line 1 | Line 1
1		/*
2		*  video_sdl.cpp - Video/graphics emulation, SDL specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2004 Christian Bauer
4	>	*  Basilisk II (C) 1997-2005 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 21 | Line 21
21		/*
22		*  NOTES:
23		*    The Ctrl key works like a qualifier for special actions:
24	<	*      Ctrl-Tab = suspend DGA mode
24	>	*      Ctrl-Tab = suspend DGA mode (TODO)
25		*      Ctrl-Esc = emergency quit
26		*      Ctrl-F1 = mount floppy
27		*      Ctrl-F5 = grab mouse (in windowed mode)
28		*
29		*  FIXMEs and TODOs:
30	+	*  - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux
31		*  - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?)
32		*  - Mouse acceleration, there is no API in SDL yet for that
33		*  - Force relative mode in Grab mode even if SDL provides absolute coordinates?
#	Line 35 | Line 36
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 43 | 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 51 | 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 75 | Line 96 | static int32 frame_skip;                                                       // Prefs
96		static int16 mouse_wheel_mode;
97		static int16 mouse_wheel_lines;
98
78	–	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 103 | 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 SDL events
139	+	static SDL_mutex *sdl_events_lock = NULL;
140	+	#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock)
141	+	#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock)
142	+
143		// Mutex to protect palette
144		static SDL_mutex *sdl_palette_lock = NULL;
145		#define LOCK_PALETTE SDL_LockMutex(sdl_palette_lock)
#	Line 130 | Line 163 | extern void SysMountFirstFloppy(void);
163
164
165		/*
166	+	*  SDL surface locking glue
167	+	*/
168	+
169	+	#ifdef ENABLE_VOSF
170	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do {                               \
171	+	if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN))        \
172	+	the_host_buffer = (uint8 *)(SURFACE)->pixels;                   \
173	+	} while (0)
174	+	#else
175	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
176	+	#endif
177	+
178	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do {    \
179	+	if (SDL_MUSTLOCK(SURFACE)) {                            \
180	+	SDL_LockSurface(SURFACE);                               \
181	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE);   \
182	+	}                                                                                       \
183	+	} while (0)
184	+
185	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do {  \
186	+	if (SDL_MUSTLOCK(SURFACE))                                      \
187	+	SDL_UnlockSurface(SURFACE);                             \
188	+	} while (0)
189	+
190	+
191	+	/*
192	+	*  Framebuffer allocation routines
193	+	*/
194	+
195	+	static void *vm_acquire_framebuffer(uint32 size)
196	+	{
197	+	return vm_acquire(size);
198	+	}
199	+
200	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
201	+	{
202	+	vm_release(fb, size);
203	+	}
204	+
205	+
206	+	/*
207	+	*  Windows message handler
208	+	*/
209	+
210	+	#ifdef WIN32
211	+	#include <dbt.h>
212	+	static WNDPROC sdl_window_proc = NULL;                          // Window proc used by SDL
213	+
214	+	extern void SysMediaArrived(void);
215	+	extern void SysMediaRemoved(void);
216	+	extern HWND GetMainWindowHandle(void);
217	+
218	+	static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
219	+	{
220	+	switch (msg) {
221	+	case WM_DEVICECHANGE:
222	+	if (wParam == DBT_DEVICEREMOVECOMPLETE) {
223	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
224	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
225	+	SysMediaRemoved();
226	+	}
227	+	else if (wParam == DBT_DEVICEARRIVAL) {
228	+	DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam;
229	+	if (p->dbch_devicetype == DBT_DEVTYP_VOLUME)
230	+	SysMediaArrived();
231	+	}
232	+	return 0;
233	+
234	+	default:
235	+	if (sdl_window_proc)
236	+	return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam);
237	+	}
238	+
239	+	return DefWindowProc(hwnd, msg, wParam, lParam);
240	+	}
241	+	#endif
242	+
243	+
244	+	/*
245	+	*  SheepShaver glue
246	+	*/
247	+
248	+	#ifdef SHEEPSHAVER
249	+	// Color depth modes type
250	+	typedef int video_depth;
251	+
252	+	// 1, 2, 4 and 8 bit depths use a color palette
253	+	static inline bool IsDirectMode(VIDEO_MODE const & mode)
254	+	{
255	+	return IsDirectMode(mode.viAppleMode);
256	+	}
257	+
258	+	// Abstract base class representing one (possibly virtual) monitor
259	+	// ("monitor" = rectangular display with a contiguous frame buffer)
260	+	class monitor_desc {
261	+	public:
262	+	monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) {}
263	+	virtual ~monitor_desc() {}
264	+
265	+	// Get current Mac frame buffer base address
266	+	uint32 get_mac_frame_base(void) const {return screen_base;}
267	+
268	+	// Set Mac frame buffer base address (called from switch_to_mode())
269	+	void set_mac_frame_base(uint32 base) {screen_base = base;}
270	+
271	+	// Get current video mode
272	+	const VIDEO_MODE &get_current_mode(void) const {return VModes[cur_mode];}
273	+
274	+	// Called by the video driver to switch the video mode on this display
275	+	// (must call set_mac_frame_base())
276	+	virtual void switch_to_current_mode(void) = 0;
277	+
278	+	// Called by the video driver to set the color palette (in indexed modes)
279	+	// or the gamma table (in direct modes)
280	+	virtual void set_palette(uint8 *pal, int num) = 0;
281	+	};
282	+
283	+	// Vector of pointers to available monitor descriptions, filled by VideoInit()
284	+	static vector<monitor_desc *> VideoMonitors;
285	+
286	+	// Find Apple mode matching best specified dimensions
287	+	static int find_apple_resolution(int xsize, int ysize)
288	+	{
289	+	if (xsize == 640 && ysize == 480)
290	+	return APPLE_640x480;
291	+	if (xsize == 800 && ysize == 600)
292	+	return APPLE_800x600;
293	+	if (xsize == 1024 && ysize == 768)
294	+	return APPLE_1024x768;
295	+	if (xsize == 1152 && ysize == 768)
296	+	return APPLE_1152x768;
297	+	if (xsize == 1152 && ysize == 900)
298	+	return APPLE_1152x900;
299	+	if (xsize == 1280 && ysize == 1024)
300	+	return APPLE_1280x1024;
301	+	if (xsize == 1600 && ysize == 1200)
302	+	return APPLE_1600x1200;
303	+	return APPLE_CUSTOM;
304	+	}
305	+
306	+	// Display error alert
307	+	static void ErrorAlert(int error)
308	+	{
309	+	ErrorAlert(GetString(error));
310	+	}
311	+
312	+	// Display warning alert
313	+	static void WarningAlert(int warning)
314	+	{
315	+	WarningAlert(GetString(warning));
316	+	}
317	+	#endif
318	+
319	+
320	+	/*
321		*  monitor_desc subclass for SDL display
322		*/
323
324		class SDL_monitor_desc : public monitor_desc {
325		public:
326	<	SDL_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
326	>	SDL_monitor_desc(const vector<VIDEO_MODE> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
327		~SDL_monitor_desc() {}
328
329		virtual void switch_to_current_mode(void);
#	Line 150 | Line 338 | public:
338		*  Utility functions
339		*/
340
341	+	// Find palette size for given color depth
342	+	static int palette_size(int mode)
343	+	{
344	+	switch (mode) {
345	+	case VIDEO_DEPTH_1BIT: return 2;
346	+	case VIDEO_DEPTH_2BIT: return 4;
347	+	case VIDEO_DEPTH_4BIT: return 16;
348	+	case VIDEO_DEPTH_8BIT: return 256;
349	+	case VIDEO_DEPTH_16BIT: return 32;
350	+	case VIDEO_DEPTH_32BIT: return 256;
351	+	default: return 0;
352	+	}
353	+	}
354	+
355	+	// Return bytes per pixel for requested depth
356	+	static inline int bytes_per_pixel(int depth)
357	+	{
358	+	int bpp;
359	+	switch (depth) {
360	+	case 8:
361	+	bpp = 1;
362	+	break;
363	+	case 15: case 16:
364	+	bpp = 2;
365	+	break;
366	+	case 24: case 32:
367	+	bpp = 4;
368	+	break;
369	+	default:
370	+	abort();
371	+	}
372	+	return bpp;
373	+	}
374	+
375		// Map video_mode depth ID to numerical depth value
376	<	static int sdl_depth_of_video_depth(int video_depth)
376	>	static int mac_depth_of_video_depth(int video_depth)
377		{
378		int depth = -1;
379		switch (video_depth) {
380	<	case VDEPTH_1BIT:
380	>	case VIDEO_DEPTH_1BIT:
381		depth = 1;
382		break;
383	<	case VDEPTH_2BIT:
383	>	case VIDEO_DEPTH_2BIT:
384		depth = 2;
385		break;
386	<	case VDEPTH_4BIT:
386	>	case VIDEO_DEPTH_4BIT:
387		depth = 4;
388		break;
389	<	case VDEPTH_8BIT:
389	>	case VIDEO_DEPTH_8BIT:
390		depth = 8;
391		break;
392	<	case VDEPTH_16BIT:
392	>	case VIDEO_DEPTH_16BIT:
393		depth = 16;
394		break;
395	<	case VDEPTH_32BIT:
395	>	case VIDEO_DEPTH_32BIT:
396		depth = 32;
397		break;
398		default:
#	Line 179 | Line 401 | static int sdl_depth_of_video_depth(int
401		return depth;
402		}
403
404	<	// Add mode to list of supported modes
405	<	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
404	>	// Map video_mode depth ID to SDL screen depth
405	>	static int sdl_depth_of_video_depth(int video_depth)
406		{
407	<	video_mode mode;
186	<	mode.x = width;
187	<	mode.y = height;
188	<	mode.resolution_id = resolution_id;
189	<	mode.bytes_per_row = bytes_per_row;
190	<	mode.depth = depth;
191	<	VideoModes.push_back(mode);
407	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
408		}
409
410	<	// Add standard list of windowed modes for given color depth
411	<	static void add_window_modes(video_depth depth)
410	>	// Get screen dimensions
411	>	static void sdl_display_dimensions(int &width, int &height)
412		{
413	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
414	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
415	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
416	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
417	<	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
418	<	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
419	<	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
413	>	static int max_width, max_height;
414	>	if (max_width == 0 && max_height == 0) {
415	>	max_width = 640 ; max_height = 480;
416	>	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
417	>	if (modes && modes != (SDL_Rect **)-1) {
418	>	// It turns out that on some implementations, and contrary to the documentation,
419	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
420	>	for (int i = 0; modes[i] != NULL; i++) {
421	>	const int w = modes[i]->w;
422	>	const int h = modes[i]->h;
423	>	if (w > max_width && h > max_height) {
424	>	max_width = w;
425	>	max_height = h;
426	>	}
427	>	}
428	>	}
429	>	}
430	>	width = max_width;
431	>	height = max_height;
432	>	}
433	>
434	>	static inline int sdl_display_width(void)
435	>	{
436	>	int width, height;
437	>	sdl_display_dimensions(width, height);
438	>	return width;
439	>	}
440	>
441	>	static inline int sdl_display_height(void)
442	>	{
443	>	int width, height;
444	>	sdl_display_dimensions(width, height);
445	>	return height;
446	>	}
447	>
448	>	// Check wether specified mode is available
449	>	static bool has_mode(int type, int width, int height, int depth)
450	>	{
451	>	#ifdef SHEEPSHAVER
452	>	// Filter out Classic resolutions
453	>	if (width == 512 && height == 384)
454	>	return false;
455	>	#endif
456	>
457	>	// Filter out out-of-bounds resolutions
458	>	if (width > sdl_display_width() || height > sdl_display_height())
459	>	return false;
460	>
461	>	// Rely on SDL capabilities
462	>	return SDL_VideoModeOK(width, height,
463	>	sdl_depth_of_video_depth(depth),
464	>	SDL_HWSURFACE | (type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0));
465	>	}
466	>
467	>	// Add mode to list of supported modes
468	>	static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
469	>	{
470	>	// Filter out unsupported modes
471	>	if (!has_mode(type, width, height, depth))
472	>	return;
473	>
474	>	// Fill in VideoMode entry
475	>	VIDEO_MODE mode;
476	>	#ifdef SHEEPSHAVER
477	>	resolution_id = find_apple_resolution(width, height);
478	>	mode.viType = type;
479	>	#endif
480	>	VIDEO_MODE_X = width;
481	>	VIDEO_MODE_Y = height;
482	>	VIDEO_MODE_RESOLUTION = resolution_id;
483	>	VIDEO_MODE_ROW_BYTES = bytes_per_row;
484	>	VIDEO_MODE_DEPTH = (video_depth)depth;
485	>	VideoModes.push_back(mode);
486		}
487
488		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
489	<	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, video_depth depth, bool native_byte_order)
489	>	static void set_mac_frame_buffer(SDL_monitor_desc &monitor, int depth, bool native_byte_order)
490		{
491		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
492		int layout = FLAYOUT_DIRECT;
493	<	if (depth == VDEPTH_16BIT)
493	>	if (depth == VIDEO_DEPTH_16BIT)
494		layout = (screen_depth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
495	<	else if (depth == VDEPTH_32BIT)
495	>	else if (depth == VIDEO_DEPTH_32BIT)
496		layout = (screen_depth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
497		if (native_byte_order)
498		MacFrameLayout = layout;
#	Line 219 | Line 501 | static void set_mac_frame_buffer(SDL_mon
501		monitor.set_mac_frame_base(MacFrameBaseMac);
502
503		// Set variables used by UAE memory banking
504	<	const video_mode &mode = monitor.get_current_mode();
504	>	const VIDEO_MODE &mode = monitor.get_current_mode();
505		MacFrameBaseHost = the_buffer;
506	<	MacFrameSize = mode.bytes_per_row * mode.y;
506	>	MacFrameSize = VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y;
507		InitFrameBufferMapping();
508		#else
509		monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
#	Line 242 | Line 524 | static void set_window_name(int name)
524		// Set mouse grab mode
525		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
526		{
527	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
527	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
528		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
529		}
530
531	+	// Migrate preferences items (XXX to be handled in MigratePrefs())
532	+	static void migrate_screen_prefs(void)
533	+	{
534	+	#ifdef SHEEPSHAVER
535	+	// Look-up priorities are: "screen", "screenmodes", "windowmodes".
536	+	if (PrefsFindString("screen"))
537	+	return;
538	+
539	+	uint32 window_modes = PrefsFindInt32("windowmodes");
540	+	uint32 screen_modes = PrefsFindInt32("screenmodes");
541	+	int width = 0, height = 0;
542	+	if (screen_modes) {
543	+	static const struct {
544	+	int id;
545	+	int width;
546	+	int height;
547	+	}
548	+	modes[] = {
549	+	{  1,    640,    480 },
550	+	{  2,    800,    600 },
551	+	{  4,   1024,    768 },
552	+	{ 64,   1152,    768 },
553	+	{  8,   1152,    900 },
554	+	{ 16,   1280,   1024 },
555	+	{ 32,   1600,   1200 },
556	+	{ 0, }
557	+	};
558	+	for (int i = 0; modes[i].id != 0; i++) {
559	+	if (screen_modes & modes[i].id) {
560	+	if (width < modes[i].width && height < modes[i].height) {
561	+	width = modes[i].width;
562	+	height = modes[i].height;
563	+	}
564	+	}
565	+	}
566	+	} else {
567	+	if (window_modes & 1)
568	+	width = 640, height = 480;
569	+	if (window_modes & 2)
570	+	width = 800, height = 600;
571	+	}
572	+	if (width && height) {
573	+	char str[32];
574	+	sprintf(str, "%s/%d/%d", screen_modes ? "dga" : "win", width, height);
575	+	PrefsReplaceString("screen", str);
576	+	}
577	+	#endif
578	+	}
579	+
580
581		/*
582		*  Display "driver" classes
#	Line 270 | Line 601 | public:
601
602		public:
603		SDL_monitor_desc &monitor; // Associated video monitor
604	<	const video_mode &mode;    // Video mode handled by the driver
604	>	const VIDEO_MODE &mode;    // Video mode handled by the driver
605
606		bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
607		SDL_Surface *s; // The surface we draw into
#	Line 301 | Line 632 | private:
632		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
633		};
634
635	+	class driver_fullscreen : public driver_base {
636	+	public:
637	+	driver_fullscreen(SDL_monitor_desc &monitor);
638	+	~driver_fullscreen();
639	+	};
640	+
641		static driver_base *drv = NULL; // Pointer to currently used driver object
642
643		#ifdef ENABLE_VOSF
#	Line 322 | Line 659 | driver_base::~driver_base()
659		if (s)
660		SDL_FreeSurface(s);
661
662	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
663	+	if (the_buffer != VM_MAP_FAILED) {
664	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
665	+	vm_release_framebuffer(the_buffer, the_buffer_size);
666	+	the_buffer = NULL;
667	+	}
668	+
669		// Free frame buffer(s)
670		if (!use_vosf) {
327	–	if (the_buffer) {
328	–	free(the_buffer);
329	–	the_buffer = NULL;
330	–	}
671		if (the_buffer_copy) {
672		free(the_buffer_copy);
673		the_buffer_copy = NULL;
#	Line 335 | Line 675 | driver_base::~driver_base()
675		}
676		#ifdef ENABLE_VOSF
677		else {
338	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
339	–	if (the_buffer != VM_MAP_FAILED) {
340	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
341	–	vm_release(the_buffer, the_buffer_size);
342	–	the_buffer = NULL;
343	–	}
678		if (the_host_buffer) {
679		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
680		free(the_host_buffer);
#	Line 351 | Line 685 | driver_base::~driver_base()
685		free(the_buffer_copy);
686		the_buffer_copy = NULL;
687		}
688	+
689	+	// Deinitialize VOSF
690	+	video_vosf_exit();
691		}
692		#endif
693		}
#	Line 358 | Line 695 | driver_base::~driver_base()
695		// Palette has changed
696		void driver_base::update_palette(void)
697		{
698	<	const video_mode &mode = monitor.get_current_mode();
698	>	const VIDEO_MODE &mode = monitor.get_current_mode();
699
700	<	if (mode.depth <= VDEPTH_8BIT)
700	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
701		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
702		}
703
#	Line 383 | Line 720 | void driver_base::restore_mouse_accel(vo
720		driver_window::driver_window(SDL_monitor_desc &m)
721		: driver_base(m), mouse_grabbed(false)
722		{
723	<	int width = mode.x, height = mode.y;
723	>	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
724		int aligned_width = (width + 15) & ~15;
725		int aligned_height = (height + 15) & ~15;
726
#	Line 391 | Line 728 | driver_window::driver_window(SDL_monitor
728		ADBSetRelMouseMode(mouse_grabbed);
729
730		// Create surface
731	<	int depth = (mode.depth <= VDEPTH_8BIT ? 8 : screen_depth);
731	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
732		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
733		return;
734
#	Line 400 | Line 737 | driver_window::driver_window(SDL_monitor
737		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
738		the_host_buffer = (uint8 *)s->pixels;
739		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
740	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
740	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
741		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
742		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
743	+
744	+	// Check whether we can initialize the VOSF subsystem and it's profitable
745	+	if (!video_vosf_init(m)) {
746	+	WarningAlert(STR_VOSF_INIT_ERR);
747	+	use_vosf = false;
748	+	}
749	+	else if (!video_vosf_profitable()) {
750	+	video_vosf_exit();
751	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
752	+	use_vosf = false;
753	+	}
754	+	if (!use_vosf) {
755	+	free(the_buffer_copy);
756	+	vm_release(the_buffer, the_buffer_size);
757	+	the_host_buffer = NULL;
758	+	}
759	+	#endif
760	+	if (!use_vosf) {
761	+	// Allocate memory for frame buffer
762	+	the_buffer_size = (aligned_height + 2) * s->pitch;
763	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
764	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
765	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
766	+	}
767	+
768	+	#ifdef SHEEPSHAVER
769	+	// Create cursor
770	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
771	+	SDL_SetCursor(sdl_cursor);
772	+	cursor_changed = false;
773	+	}
774		#else
775	<	// Allocate memory for frame buffer
776	<	the_buffer_size = (aligned_height + 2) * s->pitch;
409	<	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
410	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
411	<	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
775	>	// Hide cursor
776	>	SDL_ShowCursor(0);
777		#endif
778
779		// Set window name/class
780		set_window_name(STR_WINDOW_TITLE);
781
417	–	// Hide cursor
418	–	SDL_ShowCursor(0);
419	–
782		// Init blitting routines
783		SDL_PixelFormat *f = s->format;
784		VisualFormat visualFormat;
#	Line 424 | Line 786 | driver_window::driver_window(SDL_monitor
786		visualFormat.Rmask = f->Rmask;
787		visualFormat.Gmask = f->Gmask;
788		visualFormat.Bmask = f->Bmask;
789	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(mode.depth));
789	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
790
791		// Load gray ramp to 8->16/32 expand map
792		if (!IsDirectMode(mode))
#	Line 432 | Line 794 | driver_window::driver_window(SDL_monitor
794		ExpandMap[i] = SDL_MapRGB(f, i, i, i);
795
796		// Set frame buffer base
797	<	set_mac_frame_buffer(monitor, mode.depth, true);
797	>	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
798
799		// Everything went well
800		init_ok = true;
#	Line 491 | Line 853 | void driver_window::mouse_moved(int x, i
853		ADBMouseMoved(x, y);
854		}
855
856	+
857	+	/*
858	+	*  Full-screen display driver
859	+	*/
860	+
861	+	// Open display
862	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
863	+	: driver_base(m)
864	+	{
865	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
866	+	int aligned_width = (width + 15) & ~15;
867	+	int aligned_height = (height + 15) & ~15;
868	+
869	+	// Set absolute mouse mode
870	+	ADBSetRelMouseMode(false);
871	+
872	+	// Create surface
873	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
874	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
875	+	return;
876	+
877	+	#ifdef ENABLE_VOSF
878	+	use_vosf = true;
879	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
880	+	the_host_buffer = (uint8 *)s->pixels;
881	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
882	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
883	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
884	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
885	+
886	+	// Check whether we can initialize the VOSF subsystem and it's profitable
887	+	if (!video_vosf_init(m)) {
888	+	WarningAlert(STR_VOSF_INIT_ERR);
889	+	use_vosf = false;
890	+	}
891	+	else if (!video_vosf_profitable()) {
892	+	video_vosf_exit();
893	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
894	+	use_vosf = false;
895	+	}
896	+	if (!use_vosf) {
897	+	free(the_buffer_copy);
898	+	vm_release(the_buffer, the_buffer_size);
899	+	the_host_buffer = NULL;
900	+	}
901	+	#endif
902	+	if (!use_vosf) {
903	+	// Allocate memory for frame buffer
904	+	the_buffer_size = (aligned_height + 2) * s->pitch;
905	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
906	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
907	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
908	+	}
909	+
910	+	// Hide cursor
911	+	SDL_ShowCursor(0);
912	+
913	+	// Init blitting routines
914	+	SDL_PixelFormat *f = s->format;
915	+	VisualFormat visualFormat;
916	+	visualFormat.depth = depth;
917	+	visualFormat.Rmask = f->Rmask;
918	+	visualFormat.Gmask = f->Gmask;
919	+	visualFormat.Bmask = f->Bmask;
920	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
921	+
922	+	// Load gray ramp to 8->16/32 expand map
923	+	if (!IsDirectMode(mode))
924	+	for (int i=0; i<256; i++)
925	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
926	+
927	+	// Set frame buffer base
928	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
929	+
930	+	// Everything went well
931	+	init_ok = true;
932	+	}
933	+
934	+	// Close display
935	+	driver_fullscreen::~driver_fullscreen()
936	+	{
937	+	#ifdef ENABLE_VOSF
938	+	if (use_vosf)
939	+	the_host_buffer = NULL; // don't free() in driver_base dtor
940	+	#endif
941	+	if (s)
942	+	SDL_FreeSurface(s);
943	+
944	+	// Show cursor
945	+	SDL_ShowCursor(1);
946	+	}
947	+
948	+
949		/*
950		*  Initialization
951		*/
#	Line 522 | Line 977 | static void keycode_init(void)
977		SDL_VideoDriverName(video_driver, sizeof(video_driver));
978		bool video_driver_found = false;
979		char line[256];
980	+	int n_keys = 0;
981		while (fgets(line, sizeof(line) - 1, f)) {
982		// Read line
983		int len = strlen(line);
#	Line 534 | Line 990 | static void keycode_init(void)
990		continue;
991
992		if (video_driver_found) {
993	<	// Skip aliases
994	<	static const char alias_str[] = "alias";
995	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
993	>	// Skip aliases as long as we have read keycodes yet
994	>	// Otherwise, it's another mapping and we have to stop
995	>	static const char sdl_str[] = "sdl";
996	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
997		continue;
998
999		// Read keycode
1000		int x_code, mac_code;
1001		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
1002	<	keycode_table[x_code & 0xff] = mac_code;
1002	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
1003		else
1004		break;
1005		} else {
1006		// Search for SDL video driver string
1007	<	static const char alias_sdl_str[] = "alias SDL";
1008	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
1009	<	char *p = line + sizeof(alias_sdl_str);
1007	>	static const char sdl_str[] = "sdl";
1008	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
1009	>	char *p = line + sizeof(sdl_str);
1010		if (strstr(video_driver, p) == video_driver)
1011		video_driver_found = true;
1012		}
#	Line 567 | Line 1024 | static void keycode_init(void)
1024		WarningAlert(str);
1025		return;
1026		}
1027	+
1028	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
1029		}
1030		}
1031
#	Line 574 | Line 1033 | static void keycode_init(void)
1033		bool SDL_monitor_desc::video_open(void)
1034		{
1035		D(bug("video_open()\n"));
1036	<	const video_mode &mode = get_current_mode();
1036	>	const VIDEO_MODE &mode = get_current_mode();
1037	>	#if DEBUG
1038	>	D(bug("Current video mode:\n"));
1039	>	D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f)));
1040	>	#endif
1041
1042		// Create display driver object of requested type
1043		switch (display_type) {
1044		case DISPLAY_WINDOW:
1045		drv = new(std::nothrow) driver_window(*this);
1046		break;
1047	+	case DISPLAY_SCREEN:
1048	+	drv = new(std::nothrow) driver_fullscreen(*this);
1049	+	break;
1050		}
1051		if (drv == NULL)
1052		return false;
#	Line 590 | Line 1056 | bool SDL_monitor_desc::video_open(void)
1056		return false;
1057		}
1058
1059	<	#ifdef ENABLE_VOSF
1060	<	if (use_vosf) {
1061	<	// Initialize the VOSF system
1062	<	if (!video_vosf_init(*this)) {
1063	<	ErrorAlert(STR_VOSF_INIT_ERR);
598	<	return false;
599	<	}
600	<	}
1059	>	#ifdef WIN32
1060	>	// Chain in a new message handler for WM_DEVICECHANGE
1061	>	HWND the_window = GetMainWindowHandle();
1062	>	sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC);
1063	>	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler);
1064		#endif
1065	<
1065	>
1066		// Initialize VideoRefresh function
1067		VideoRefreshInit();
1068
#	Line 607 | Line 1070 | bool SDL_monitor_desc::video_open(void)
1070		LOCK_FRAME_BUFFER;
1071
1072		// Start redraw/input thread
1073	+	#ifndef USE_CPU_EMUL_SERVICES
1074		redraw_thread_cancel = false;
1075	<	redraw_thread_active = (SDL_CreateThread(redraw_func, NULL) != NULL);
1075	>	redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1076		if (!redraw_thread_active) {
1077		printf("FATAL: cannot create redraw thread\n");
1078		return false;
1079		}
1080	+	#else
1081	+	redraw_thread_active = true;
1082	+	#endif
1083		return true;
1084		}
1085
1086	+	#ifdef SHEEPSHAVER
1087	+	bool VideoInit(void)
1088	+	{
1089	+	const bool classic = false;
1090	+	#else
1091		bool VideoInit(bool classic)
1092		{
1093	+	#endif
1094		classic_mode = classic;
1095
1096		#ifdef ENABLE_VOSF
#	Line 627 | Line 1100 | bool VideoInit(bool classic)
1100		#endif
1101
1102		// Create Mutexes
1103	+	if ((sdl_events_lock = SDL_CreateMutex()) == NULL)
1104	+	return false;
1105		if ((sdl_palette_lock = SDL_CreateMutex()) == NULL)
1106		return false;
1107		if ((frame_buffer_lock = SDL_CreateMutex()) == NULL)
#	Line 641 | Line 1116 | bool VideoInit(bool classic)
1116		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1117
1118		// Get screen mode from preferences
1119	<	const char *mode_str;
1119	>	migrate_screen_prefs();
1120	>	const char *mode_str = NULL;
1121		if (classic_mode)
1122		mode_str = "win/512/342";
1123		else
1124		mode_str = PrefsFindString("screen");
1125
1126		// Determine display type and default dimensions
1127	<	int default_width = 512, default_height = 384;
1127	>	int default_width, default_height;
1128	>	if (classic) {
1129	>	default_width = 512;
1130	>	default_height = 384;
1131	>	}
1132	>	else {
1133	>	default_width = 640;
1134	>	default_height = 480;
1135	>	}
1136		display_type = DISPLAY_WINDOW;
1137		if (mode_str) {
1138		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1139		display_type = DISPLAY_WINDOW;
1140	<	}
1141	<	int max_width = 640, max_height = 480;
658	<	if (display_type == DISPLAY_SCREEN) {
659	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
660	<	if (modes && modes != (SDL_Rect **)-1) {
661	<	max_width = modes[0]->w;
662	<	max_height = modes[0]->h;
663	<	}
1140	>	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1141	>	display_type = DISPLAY_SCREEN;
1142		}
1143		if (default_width <= 0)
1144	<	default_width = max_width;
1144	>	default_width = sdl_display_width();
1145	>	else if (default_width > sdl_display_width())
1146	>	default_width = sdl_display_width();
1147		if (default_height <= 0)
1148	<	default_height = max_height;
1148	>	default_height = sdl_display_height();
1149	>	else if (default_height > sdl_display_height())
1150	>	default_height = sdl_display_height();
1151
1152		// Mac screen depth follows X depth
1153		screen_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
1154	<	video_depth default_depth;
1154	>	int default_depth;
1155		switch (screen_depth) {
1156		case 8:
1157	<	default_depth = VDEPTH_8BIT;
1157	>	default_depth = VIDEO_DEPTH_8BIT;
1158		break;
1159		case 15: case 16:
1160	<	default_depth = VDEPTH_16BIT;
1160	>	default_depth = VIDEO_DEPTH_16BIT;
1161		break;
1162		case 24: case 32:
1163	<	default_depth = VDEPTH_32BIT;
1163	>	default_depth = VIDEO_DEPTH_32BIT;
1164		break;
1165		default:
1166	<	default_depth =  VDEPTH_1BIT;
1166	>	default_depth =  VIDEO_DEPTH_1BIT;
1167		break;
1168		}
1169
1170	+	// Initialize list of video modes to try
1171	+	struct {
1172	+	int w;
1173	+	int h;
1174	+	int resolution_id;
1175	+	}
1176	+	video_modes[] = {
1177	+	{   -1,   -1, 0x80 },
1178	+	{  512,  384, 0x80 },
1179	+	{  640,  480, 0x81 },
1180	+	{  800,  600, 0x82 },
1181	+	{ 1024,  768, 0x83 },
1182	+	{ 1152,  870, 0x84 },
1183	+	{ 1280, 1024, 0x85 },
1184	+	{ 1600, 1200, 0x86 },
1185	+	{ 0, }
1186	+	};
1187	+	video_modes[0].w = default_width;
1188	+	video_modes[0].h = default_height;
1189	+
1190		// Construct list of supported modes
1191		if (display_type == DISPLAY_WINDOW) {
1192		if (classic)
1193	<	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1193	>	add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1194		else {
1195	<	for (int d = VDEPTH_1BIT; d <= default_depth; d++) {
1196	<	int bpp = (d <= VDEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1197	<	if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1198	<	add_window_modes(video_depth(d));
1195	>	for (int i = 0; video_modes[i].w != 0; i++) {
1196	>	const int w = video_modes[i].w;
1197	>	const int h = video_modes[i].h;
1198	>	if (i > 0 && (w >= default_width || h >= default_height))
1199	>	continue;
1200	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1201	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1202		}
1203		}
1204	<	} else
1205	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1204	>	} else if (display_type == DISPLAY_SCREEN) {
1205	>	for (int i = 0; video_modes[i].w != 0; i++) {
1206	>	const int w = video_modes[i].w;
1207	>	const int h = video_modes[i].h;
1208	>	if (i > 0 && (w >= default_width || h >= default_height))
1209	>	continue;
1210	>	if (w == 512 && h == 384)
1211	>	continue;
1212	>	#ifdef ENABLE_VOSF
1213	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1214	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1215	>	#else
1216	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1217	>	#endif
1218	>	}
1219	>	}
1220	>
1221		if (VideoModes.empty()) {
1222		ErrorAlert(STR_NO_XVISUAL_ERR);
1223		return false;
#	Line 705 | Line 1225 | bool VideoInit(bool classic)
1225
1226		// Find requested default mode with specified dimensions
1227		uint32 default_id;
1228	<	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1228	>	std::vector<VIDEO_MODE>::const_iterator i, end = VideoModes.end();
1229		for (i = VideoModes.begin(); i != end; ++i) {
1230	<	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1231	<	default_id = i->resolution_id;
1230	>	const VIDEO_MODE & mode = (*i);
1231	>	if (VIDEO_MODE_X == default_width && VIDEO_MODE_Y == default_height && VIDEO_MODE_DEPTH == default_depth) {
1232	>	default_id = VIDEO_MODE_RESOLUTION;
1233	>	#ifdef SHEEPSHAVER
1234	>	std::vector<VIDEO_MODE>::const_iterator begin = VideoModes.begin();
1235	>	cur_mode = distance(begin, i);
1236	>	#endif
1237		break;
1238		}
1239		}
1240		if (i == end) { // not found, use first available mode
1241	<	default_depth = VideoModes[0].depth;
1242	<	default_id = VideoModes[0].resolution_id;
1241	>	const VIDEO_MODE & mode = VideoModes[0];
1242	>	default_depth = VIDEO_MODE_DEPTH;
1243	>	default_id = VIDEO_MODE_RESOLUTION;
1244	>	#ifdef SHEEPSHAVER
1245	>	cur_mode = 0;
1246	>	#endif
1247		}
1248
1249	+	#ifdef SHEEPSHAVER
1250	+	for (int i = 0; i < VideoModes.size(); i++)
1251	+	VModes[i] = VideoModes[i];
1252	+	VideoInfo *p = &VModes[VideoModes.size()];
1253	+	p->viType = DIS_INVALID;        // End marker
1254	+	p->viRowBytes = 0;
1255	+	p->viXsize = p->viYsize = 0;
1256	+	p->viAppleMode = 0;
1257	+	p->viAppleID = 0;
1258	+	#endif
1259	+
1260		#if DEBUG
1261		D(bug("Available video modes:\n"));
1262		for (i = VideoModes.begin(); i != end; ++i) {
1263	<	int bits = 1 << i->depth;
1263	>	const VIDEO_MODE & mode = (*i);
1264	>	int bits = 1 << VIDEO_MODE_DEPTH;
1265		if (bits == 16)
1266		bits = 15;
1267		else if (bits == 32)
1268		bits = 24;
1269	<	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1269	>	D(bug(" %dx%d (ID %02x), %d colors\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << bits));
1270		}
1271		#endif
1272
1273		// Create SDL_monitor_desc for this (the only) display
1274	<	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, default_depth, default_id);
1274	>	SDL_monitor_desc *monitor = new SDL_monitor_desc(VideoModes, (video_depth)default_depth, default_id);
1275		VideoMonitors.push_back(monitor);
1276
1277		// Open display
#	Line 747 | Line 1288 | void SDL_monitor_desc::video_close(void)
1288		{
1289		D(bug("video_close()\n"));
1290
1291	+	#ifdef WIN32
1292	+	// Remove message handler for WM_DEVICECHANGE
1293	+	HWND the_window = GetMainWindowHandle();
1294	+	SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc);
1295	+	#endif
1296	+
1297		// Stop redraw thread
1298	+	#ifndef USE_CPU_EMUL_SERVICES
1299		if (redraw_thread_active) {
1300		redraw_thread_cancel = true;
1301	<	//              SDL_WaitThread(redraw_thread, NULL); doesn't work
754	<	while (redraw_thread_cancel);
1301	>	SDL_WaitThread(redraw_thread, NULL);
1302		}
1303	+	#endif
1304		redraw_thread_active = false;
1305
1306		// Unlock frame buffer
1307		UNLOCK_FRAME_BUFFER;
1308		D(bug(" frame buffer unlocked\n"));
1309
762	–	#ifdef ENABLE_VOSF
763	–	if (use_vosf) {
764	–	// Deinitialize VOSF
765	–	video_vosf_exit();
766	–	}
767	–	#endif
768	–
1310		// Close display
1311		delete drv;
1312		drv = NULL;
#	Line 783 | Line 1324 | void VideoExit(void)
1324		SDL_DestroyMutex(frame_buffer_lock);
1325		if (sdl_palette_lock)
1326		SDL_DestroyMutex(sdl_palette_lock);
1327	+	if (sdl_events_lock)
1328	+	SDL_DestroyMutex(sdl_events_lock);
1329		}
1330
1331
#	Line 801 | Line 1344 | void VideoQuitFullScreen(void)
1344		*  Mac VBL interrupt
1345		*/
1346
1347	+	/*
1348	+	*  Execute video VBL routine
1349	+	*/
1350	+
1351	+	#ifdef SHEEPSHAVER
1352	+	void VideoVBL(void)
1353	+	{
1354	+	// Emergency quit requested? Then quit
1355	+	if (emerg_quit)
1356	+	QuitEmulator();
1357	+
1358	+	// Temporarily give up frame buffer lock (this is the point where
1359	+	// we are suspended when the user presses Ctrl-Tab)
1360	+	UNLOCK_FRAME_BUFFER;
1361	+	LOCK_FRAME_BUFFER;
1362	+
1363	+	// Execute video VBL
1364	+	if (private_data != NULL && private_data->interruptsEnabled)
1365	+	VSLDoInterruptService(private_data->vslServiceID);
1366	+	}
1367	+	#else
1368		void VideoInterrupt(void)
1369		{
1370		// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
#	Line 815 | Line 1379 | void VideoInterrupt(void)
1379		UNLOCK_FRAME_BUFFER;
1380		LOCK_FRAME_BUFFER;
1381		}
1382	+	#endif
1383
1384
1385		/*
1386		*  Set palette
1387		*/
1388
1389	+	#ifdef SHEEPSHAVER
1390	+	void video_set_palette(void)
1391	+	{
1392	+	monitor_desc * monitor = VideoMonitors[0];
1393	+	int n_colors = palette_size(monitor->get_current_mode().viAppleMode);
1394	+	uint8 pal[256 * 3];
1395	+	for (int c = 0; c < n_colors; c++) {
1396	+	pal[c*3 + 0] = mac_pal[c].red;
1397	+	pal[c*3 + 1] = mac_pal[c].green;
1398	+	pal[c*3 + 2] = mac_pal[c].blue;
1399	+	}
1400	+	monitor->set_palette(pal, n_colors);
1401	+	}
1402	+	#endif
1403	+
1404		void SDL_monitor_desc::set_palette(uint8 *pal, int num_in)
1405		{
1406	<	const video_mode &mode = get_current_mode();
1406	>	const VIDEO_MODE &mode = get_current_mode();
1407
1408		// FIXME: how can we handle the gamma ramp?
1409	<	if (mode.depth > VDEPTH_8BIT)
1409	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1410		return;
1411
1412		LOCK_PALETTE;
#	Line 851 | Line 1431 | void SDL_monitor_desc::set_palette(uint8
1431		}
1432
1433		#ifdef ENABLE_VOSF
1434	<	// We have to redraw everything because the interpretation of pixel values changed
1435	<	LOCK_VOSF;
1436	<	PFLAG_SET_ALL;
1437	<	UNLOCK_VOSF;
1438	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1434	>	if (use_vosf) {
1435	>	// We have to redraw everything because the interpretation of pixel values changed
1436	>	LOCK_VOSF;
1437	>	PFLAG_SET_ALL;
1438	>	UNLOCK_VOSF;
1439	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1440	>	}
1441		#endif
1442		}
1443
#	Line 870 | Line 1452 | void SDL_monitor_desc::set_palette(uint8
1452		*  Switch video mode
1453		*/
1454
1455	+	#ifdef SHEEPSHAVER
1456	+	int16 video_mode_change(VidLocals *csSave, uint32 ParamPtr)
1457	+	{
1458	+	/* return if no mode change */
1459	+	if ((csSave->saveData == ReadMacInt32(ParamPtr + csData)) &&
1460	+	(csSave->saveMode == ReadMacInt16(ParamPtr + csMode))) return noErr;
1461	+
1462	+	/* first find video mode in table */
1463	+	for (int i=0; VModes[i].viType != DIS_INVALID; i++) {
1464	+	if ((ReadMacInt16(ParamPtr + csMode) == VModes[i].viAppleMode) &&
1465	+	(ReadMacInt32(ParamPtr + csData) == VModes[i].viAppleID)) {
1466	+	csSave->saveMode = ReadMacInt16(ParamPtr + csMode);
1467	+	csSave->saveData = ReadMacInt32(ParamPtr + csData);
1468	+	csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1469	+
1470	+	// Disable interrupts and pause redraw thread
1471	+	DisableInterrupt();
1472	+	thread_stop_ack = false;
1473	+	thread_stop_req = true;
1474	+	while (!thread_stop_ack) ;
1475	+
1476	+	cur_mode = i;
1477	+	monitor_desc *monitor = VideoMonitors[0];
1478	+	monitor->switch_to_current_mode();
1479	+
1480	+	WriteMacInt32(ParamPtr + csBaseAddr, screen_base);
1481	+	csSave->saveBaseAddr=screen_base;
1482	+	csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1483	+	csSave->saveMode=VModes[cur_mode].viAppleMode;
1484	+
1485	+	// Enable interrupts and resume redraw thread
1486	+	thread_stop_req = false;
1487	+	EnableInterrupt();
1488	+	return noErr;
1489	+	}
1490	+	}
1491	+	return paramErr;
1492	+	}
1493	+	#endif
1494	+
1495		void SDL_monitor_desc::switch_to_current_mode(void)
1496		{
1497		// Close and reopen display
1498	+	LOCK_EVENTS;
1499		video_close();
1500		video_open();
1501	+	UNLOCK_EVENTS;
1502
1503		if (drv == NULL) {
1504		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 884 | Line 1508 | void SDL_monitor_desc::switch_to_current
1508
1509
1510		/*
1511	<	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1512	<	*  and -2 if the key was recognized as a hotkey
1511	>	*  Can we set the MacOS cursor image into the window?
1512	>	*/
1513	>
1514	>	#ifdef SHEEPSHAVER
1515	>	bool video_can_change_cursor(void)
1516	>	{
1517	>	return (display_type == DISPLAY_WINDOW);
1518	>	}
1519	>	#endif
1520	>
1521	>
1522	>	/*
1523	>	*  Set cursor image for window
1524	>	*/
1525	>
1526	>	#ifdef SHEEPSHAVER
1527	>	void video_set_cursor(void)
1528	>	{
1529	>	cursor_changed = true;
1530	>	}
1531	>	#endif
1532	>
1533	>
1534	>	/*
1535	>	*  Keyboard-related utilify functions
1536		*/
1537
1538	+	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1539	+	{
1540	+	switch (e.keysym.sym) {
1541	+	case SDLK_NUMLOCK:
1542	+	case SDLK_CAPSLOCK:
1543	+	case SDLK_SCROLLOCK:
1544	+	case SDLK_RSHIFT:
1545	+	case SDLK_LSHIFT:
1546	+	case SDLK_RCTRL:
1547	+	case SDLK_LCTRL:
1548	+	case SDLK_RALT:
1549	+	case SDLK_LALT:
1550	+	case SDLK_RMETA:
1551	+	case SDLK_LMETA:
1552	+	case SDLK_LSUPER:
1553	+	case SDLK_RSUPER:
1554	+	case SDLK_MODE:
1555	+	case SDLK_COMPOSE:
1556	+	return true;
1557	+	}
1558	+	return false;
1559	+	}
1560	+
1561		static bool is_ctrl_down(SDL_keysym const & ks)
1562		{
1563		return ctrl_down || (ks.mod & KMOD_CTRL);
1564		}
1565
1566	+
1567	+	/*
1568	+	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1569	+	*  and -2 if the key was recognized as a hotkey
1570	+	*/
1571	+
1572		static int kc_decode(SDL_keysym const & ks, bool key_down)
1573		{
1574		switch (ks.sym) {
#	Line 925 | Line 1601 | static int kc_decode(SDL_keysym const &
1601
1602		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1603		case SDLK_2: case SDLK_AT: return 0x13;
1604	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1604	>	case SDLK_3: case SDLK_HASH: return 0x14;
1605		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1606	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1606	>	case SDLK_5: return 0x17;
1607		case SDLK_6: return 0x16;
1608		case SDLK_7: return 0x1a;
1609		case SDLK_8: return 0x1c;
1610		case SDLK_9: return 0x19;
1611		case SDLK_0: return 0x1d;
1612
1613	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1613	>	case SDLK_BACKQUOTE: return 0x0a;
1614		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1615		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1616	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1617	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1618	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1616	>	case SDLK_LEFTBRACKET: return 0x21;
1617	>	case SDLK_RIGHTBRACKET: return 0x1e;
1618	>	case SDLK_BACKSLASH: return 0x2a;
1619		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1620	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1620	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1621		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1622		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1623		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 962 | Line 1638 | static int kc_decode(SDL_keysym const &
1638		case SDLK_RCTRL: return 0x36;
1639		case SDLK_LSHIFT: return 0x38;
1640		case SDLK_RSHIFT: return 0x38;
1641	+	#if (defined(__APPLE__) && defined(__MACH__))
1642	+	case SDLK_LALT: return 0x3a;
1643	+	case SDLK_RALT: return 0x3a;
1644	+	case SDLK_LMETA: return 0x37;
1645	+	case SDLK_RMETA: return 0x37;
1646	+	#else
1647		case SDLK_LALT: return 0x37;
1648		case SDLK_RALT: return 0x37;
1649		case SDLK_LMETA: return 0x3a;
1650		case SDLK_RMETA: return 0x3a;
1651	+	#endif
1652	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1653	+	case SDLK_RSUPER: return 0x3a;
1654		case SDLK_MENU: return 0x32;
1655		case SDLK_CAPSLOCK: return 0x39;
1656		case SDLK_NUMLOCK: return 0x47;
#	Line 1072 | Line 1757 | static void handle_events(void)
1757		// Keyboard
1758		case SDL_KEYDOWN: {
1759		int code = -1;
1760	<	if (use_keycodes) {
1760	>	if (use_keycodes && !is_modifier_key(event.key)) {
1761		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1762		code = keycode_table[event.key.keysym.scancode & 0xff];
1763		} else
#	Line 1100 | Line 1785 | static void handle_events(void)
1785		}
1786		case SDL_KEYUP: {
1787		int code = -1;
1788	<	if (use_keycodes) {
1788	>	if (use_keycodes && !is_modifier_key(event.key)) {
1789		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1790		code = keycode_table[event.key.keysym.scancode & 0xff];
1791		} else
1792		code = event2keycode(event.key, false);
1793	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1794	<	ADBKeyUp(code);
1793	>	if (code >= 0) {
1794	>	if (code == 0x39) {     // Caps Lock released
1795	>	if (caps_on) {
1796	>	ADBKeyUp(code);
1797	>	caps_on = false;
1798	>	} else {
1799	>	ADBKeyDown(code);
1800	>	caps_on = true;
1801	>	}
1802	>	} else
1803	>	ADBKeyUp(code);
1804		if (code == 0x36)
1805		ctrl_down = false;
1806		}
#	Line 1116 | Line 1810 | static void handle_events(void)
1810		// Hidden parts exposed, force complete refresh of window
1811		case SDL_VIDEOEXPOSE:
1812		if (display_type == DISPLAY_WINDOW) {
1813	<	const video_mode &mode = VideoMonitors[0]->get_current_mode();
1813	>	const VIDEO_MODE &mode = VideoMonitors[0]->get_current_mode();
1814		#ifdef ENABLE_VOSF
1815		if (use_vosf) {                 // VOSF refresh
1816		LOCK_VOSF;
1817		PFLAG_SET_ALL;
1818		UNLOCK_VOSF;
1819	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1819	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1820		}
1821		else
1822		#endif
1823	<	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1823	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1824		}
1825		break;
1826
#	Line 1150 | Line 1844 | static void update_display_static(driver
1844		{
1845		// Incremental update code
1846		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1847	<	const video_mode &mode = drv->mode;
1848	<	int bytes_per_row = mode.bytes_per_row;
1847	>	const VIDEO_MODE &mode = drv->mode;
1848	>	int bytes_per_row = VIDEO_MODE_ROW_BYTES;
1849		uint8 *p, *p2;
1850
1851		// Check for first line from top and first line from bottom that have changed
1852		y1 = 0;
1853	<	for (j=0; j<mode.y; j++) {
1853	>	for (j=0; j<VIDEO_MODE_Y; j++) {
1854		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1855		y1 = j;
1856		break;
1857		}
1858		}
1859		y2 = y1 - 1;
1860	<	for (j=mode.y-1; j>=y1; j--) {
1860	>	for (j=VIDEO_MODE_Y-1; j>=y1; j--) {
1861		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1862		y2 = j;
1863		break;
#	Line 1173 | Line 1867 | static void update_display_static(driver
1867
1868		// Check for first column from left and first column from right that have changed
1869		if (high) {
1870	<	if (mode.depth < VDEPTH_8BIT) {
1870	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1871		const int src_bytes_per_row = bytes_per_row;
1872		const int dst_bytes_per_row = drv->s->pitch;
1873	<	const int pixels_per_byte = mode.x / src_bytes_per_row;
1873	>	const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
1874
1875	<	x1 = mode.x / pixels_per_byte;
1875	>	x1 = VIDEO_MODE_X / pixels_per_byte;
1876		for (j = y1; j <= y2; j++) {
1877		p = &the_buffer[j * bytes_per_row];
1878		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1196 | Line 1890 | static void update_display_static(driver
1890		p2 = &the_buffer_copy[j * bytes_per_row];
1891		p += bytes_per_row;
1892		p2 += bytes_per_row;
1893	<	for (i = (mode.x / pixels_per_byte); i > x2; i--) {
1893	>	for (i = (VIDEO_MODE_X / pixels_per_byte); i > x2; i--) {
1894		p--; p2--;
1895		if (*p != *p2) {
1896		x2 = i;
#	Line 1234 | Line 1928 | static void update_display_static(driver
1928		}
1929
1930		} else {
1931	<	const int bytes_per_pixel = mode.bytes_per_row / mode.x;
1931	>	const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1932
1933	<	x1 = mode.x;
1933	>	x1 = VIDEO_MODE_X;
1934		for (j=y1; j<=y2; j++) {
1935		p = &the_buffer[j * bytes_per_row];
1936		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1254 | Line 1948 | static void update_display_static(driver
1948		p2 = &the_buffer_copy[j * bytes_per_row];
1949		p += bytes_per_row;
1950		p2 += bytes_per_row;
1951	<	for (i=mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1951	>	for (i=VIDEO_MODE_X*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1952		p--;
1953		p2--;
1954		if (*p != *p2) {
#	Line 1350 | Line 2044 | static void video_refresh_dga_vosf(void)
2044		tick_counter = 0;
2045		if (mainBuffer.dirty) {
2046		LOCK_VOSF;
2047	<	update_display_dga_vosf();
2047	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2048		UNLOCK_VOSF;
2049		}
2050		}
#	Line 1414 | Line 2108 | static void VideoRefreshInit(void)
2108		}
2109		}
2110
2111	+	static inline void do_video_refresh(void)
2112	+	{
2113	+	// Handle SDL events
2114	+	handle_events();
2115	+
2116	+	// Update display
2117	+	video_refresh();
2118	+
2119	+	#ifdef SHEEPSHAVER
2120	+	// Set new cursor image if it was changed
2121	+	if (cursor_changed && sdl_cursor) {
2122	+	cursor_changed = false;
2123	+	LOCK_EVENTS;
2124	+	SDL_FreeCursor(sdl_cursor);
2125	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2126	+	if (sdl_cursor)
2127	+	SDL_SetCursor(sdl_cursor);
2128	+	UNLOCK_EVENTS;
2129	+	}
2130	+	#endif
2131	+
2132	+	// Set new palette if it was changed
2133	+	handle_palette_changes();
2134	+	}
2135	+
2136	+	// This function is called on non-threaded platforms from a timer interrupt
2137	+	void VideoRefresh(void)
2138	+	{
2139	+	// We need to check redraw_thread_active to inhibit refreshed during
2140	+	// mode changes on non-threaded platforms
2141	+	if (!redraw_thread_active)
2142	+	return;
2143	+
2144	+	// Process pending events and update display
2145	+	do_video_refresh();
2146	+	}
2147	+
2148	+	const int VIDEO_REFRESH_HZ = 60;
2149	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2150	+
2151	+	#ifndef USE_CPU_EMUL_SERVICES
2152		static int redraw_func(void *arg)
2153		{
2154		uint64 start = GetTicks_usec();
2155		int64 ticks = 0;
2156	+	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2157
2158		while (!redraw_thread_cancel) {
2159
2160		// Wait
2161	<	Delay_usec(16667);
2162	<
2163	<	// Handle SDL events
2164	<	handle_events();
2165	<
2166	<	// Refresh display
1431	<	video_refresh();
2161	>	next += VIDEO_REFRESH_DELAY;
2162	>	int64 delay = next - GetTicks_usec();
2163	>	if (delay > 0)
2164	>	Delay_usec(delay);
2165	>	else if (delay < -VIDEO_REFRESH_DELAY)
2166	>	next = GetTicks_usec();
2167		ticks++;
2168
2169	<	// Set new palette if it was changed
2170	<	handle_palette_changes();
2169	>	#ifdef SHEEPSHAVER
2170	>	// Pause if requested (during video mode switches)
2171	>	if (thread_stop_req) {
2172	>	thread_stop_ack = true;
2173	>	continue;
2174	>	}
2175	>	#endif
2176	>
2177	>	// Process pending events and update display
2178	>	do_video_refresh();
2179		}
2180
2181		uint64 end = GetTicks_usec();
2182		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1440	–	redraw_thread_cancel = false;
2183		return 0;
2184		}
2185	+	#endif

Diff Legend

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