[ViewVC] Diff of: cebix/BasiliskII/src/Unix/video

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.42 by cebix, 2001-06-28T21:20:00Z vs.
Revision 1.80 by gbeauche, 2005-06-11T06:43:24Z

#	Line 1 \| Line 1
1		/*
2		* video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	* Basilisk II (C) 1997-2001 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 24 \| Line 24
24		* Ctrl-Tab = suspend DGA mode
25		* Ctrl-Esc = emergency quit
26		* Ctrl-F1 = mount floppy
27	+	* Ctrl-F5 = grab mouse (in windowed mode)
28		*/
29
30		#include "sysdeps.h"
#	Line 36 \| Line 37
37		#include <sys/shm.h>
38		#include <errno.h>
39
40	+	#include <algorithm>
41	+
42		#ifdef HAVE_PTHREADS
43		# include <pthread.h>
44		#endif
#	Line 59 \| Line 62
62		#include "prefs.h"
63		#include "user_strings.h"
64		#include "video.h"
65	+	#include "video_blit.h"
66
67		#define DEBUG 0
68		#include "debug.h"
69
70
71	+	// Supported video modes
72	+	static vector<video_mode> VideoModes;
73	+
74		// Display types
75		enum {
76		DISPLAY_WINDOW, // X11 window, using MIT SHM extensions if possible
#	Line 72 \| Line 79 \| enum {
79
80		// Constants
81		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
82	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
82	>
83	>	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask \| StructureNotifyMask;
84	>	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
85
86
87		// Global variables
88		static int32 frame_skip; // Prefs items
89	<	static int16 mouse_wheel_mode = 1;
90	<	static int16 mouse_wheel_lines = 3;
89	>	static int16 mouse_wheel_mode;
90	>	static int16 mouse_wheel_lines;
91
92		static int display_type = DISPLAY_WINDOW; // See enum above
93		static bool local_X11; // Flag: X server running on local machine?
94	<	static uint8 *the_buffer; // Mac frame buffer
94	>	static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into)
95	>	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes)
96	>	static uint32 the_buffer_size; // Size of allocated the_buffer
97
87	–	#ifdef HAVE_PTHREADS
98		static bool redraw_thread_active = false; // Flag: Redraw thread installed
99	+	#ifdef HAVE_PTHREADS
100	+	static pthread_attr_t redraw_thread_attr; // Redraw thread attributes
101		static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
102	+	static volatile bool redraw_thread_cancel_ack; // Flag: Acknowledge for redraw thread cancellation
103		static pthread_t redraw_thread; // Redraw thread
104		#endif
105
106		static bool has_dga = false; // Flag: Video DGA capable
107		static bool has_vidmode = false; // Flag: VidMode extension available
108
109	+	#ifdef ENABLE_VOSF
110	+	static bool use_vosf = true; // Flag: VOSF enabled
111	+	#else
112	+	static const bool use_vosf = false; // VOSF not possible
113	+	#endif
114	+
115		static bool ctrl_down = false; // Flag: Ctrl key pressed
116		static bool caps_on = false; // Flag: Caps Lock on
117		static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread
#	Line 105 \| Line 124 \| static bool use_keycodes = false; //
124		static int keycode_table[256]; // X keycode -> Mac keycode translation table
125
126		// X11 variables
127	+	char *x_display_name = NULL; // X11 display name
128	+	Display *x_display = NULL; // X11 display handle
129		static int screen; // Screen number
130	<	static int xdepth; // Depth of X screen
131	<	static Window rootwin, the_win; // Root window and our window
132	<	static XVisualInfo visualInfo;
112	<	static Visual *vis;
113	<	static Colormap cmap[2]; // Two colormaps (DGA) for 8-bit mode
114	<	static bool cmap_allocated = false;
130	>	static Window rootwin; // Root window and our window
131	>	static int num_depths = 0; // Number of available X depths
132	>	static int *avail_depths = NULL; // List of available X depths
133		static XColor black, white;
134		static unsigned long black_pixel, white_pixel;
135		static int eventmask;
118	–	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask \| StructureNotifyMask;
119	–	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
120	–	static Atom WM_DELETE_WINDOW = (Atom)0;
136
137	<	static XColor palette[256]; // Color palette for 8-bit mode
138	<	static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
137	>	static int xdepth; // Depth of X screen
138	>	static VisualFormat visualFormat;
139	>	static XVisualInfo visualInfo;
140	>	static Visual *vis;
141	>	static int color_class;
142	>
143	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
144	>
145	>	static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them)
146	>
147	>	static XColor x_palette[256]; // Color palette to be used as CLUT and gamma table
148	>	static bool x_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
149	>
150	>	#ifdef ENABLE_FBDEV_DGA
151	>	static int fbdev_fd = -1;
152	>	#endif
153	>
154	>	#ifdef ENABLE_XF86_VIDMODE
155	>	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
156	>	static int num_x_video_modes;
157	>	#endif
158	>
159	>	// Mutex to protect palette
160		#ifdef HAVE_PTHREADS
161	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
162	<	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
163	<	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
161	>	static pthread_mutex_t x_palette_lock = PTHREAD_MUTEX_INITIALIZER;
162	>	#define LOCK_PALETTE pthread_mutex_lock(&x_palette_lock)
163	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&x_palette_lock)
164		#else
165		#define LOCK_PALETTE
166		#define UNLOCK_PALETTE
167		#endif
168
169	<	// Variables for window mode
134	<	static GC the_gc;
135	<	static XImage *img = NULL;
136	<	static XShmSegmentInfo shminfo;
137	<	static Cursor mac_cursor;
138	<	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
139	<	static bool have_shm = false; // Flag: SHM extensions available
140	<	static bool updt_box[17][17]; // Flag for Update
141	<	static int nr_boxes;
142	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
143	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
144	<
145	<	// Variables for XF86 DGA mode
146	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
147	<	static Window suspend_win; // "Suspend" window
148	<	static void *fb_save = NULL; // Saved frame buffer for suspend
169	>	// Mutex to protect frame buffer
170		#ifdef HAVE_PTHREADS
171	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
171	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
172		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
173		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
174		#else
#	Line 155 \| Line 176 \| static pthread_mutex_t frame_buffer_lock
176		#define UNLOCK_FRAME_BUFFER
177		#endif
178
179	<	// Variables for fbdev DGA mode
180	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
181	<	static int fbdev_fd;
182	<
183	<	#ifdef ENABLE_XF86_VIDMODE
163	<	// Variables for XF86 VidMode support
164	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
165	<	static int num_x_video_modes;
166	<	#endif
167	<
168	<	#ifdef ENABLE_VOSF
169	<	static bool use_vosf = true; // Flag: VOSF enabled
170	<	#else
171	<	static const bool use_vosf = false; // Flag: VOSF enabled
172	<	#endif
179	>	// Variables for non-VOSF incremental refresh
180	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
181	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
182	>	static bool updt_box[17][17];
183	>	static int nr_boxes;
184
185	<	// VideoRefresh function
185	>	// Video refresh function
186		static void VideoRefreshInit(void);
187		static void (*video_refresh)(void);
188
189	+
190		// Prototypes
191		static void redraw_func(void arg);
180	–	static int event2keycode(XKeyEvent &ev);
192
193		// From main_unix.cpp
194		extern char *x_display_name;
195		extern Display *x_display;
196	+	extern void *vm_acquire_mac(size_t size);
197
198		// From sys_unix.cpp
199		extern void SysMountFirstFloppy(void);
200
201	+	// From clip_unix.cpp
202	+	extern void ClipboardSelectionClear(XSelectionClearEvent *);
203	+	extern void ClipboardSelectionRequest(XSelectionRequestEvent *);
204
205	<	#ifdef ENABLE_VOSF
206	<	# include "video_vosf.h"
207	<	#endif
205	>
206	>	/*
207	>	* monitor_desc subclass for X11 display
208	>	*/
209	>
210	>	class X11_monitor_desc : public monitor_desc {
211	>	public:
212	>	X11_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
213	>	~X11_monitor_desc() {}
214	>
215	>	virtual void switch_to_current_mode(void);
216	>	virtual void set_palette(uint8 *pal, int num);
217	>
218	>	bool video_open(void);
219	>	void video_close(void);
220	>	};
221
222
223		/*
224	<	* Initialization
224	>	* Utility functions
225		*/
226
227	+	// Map video_mode depth ID to numerical depth value
228	+	static inline int depth_of_video_mode(video_mode const & mode)
229	+	{
230	+	int depth = -1;
231	+	switch (mode.depth) {
232	+	case VDEPTH_1BIT:
233	+	depth = 1;
234	+	break;
235	+	case VDEPTH_2BIT:
236	+	depth = 2;
237	+	break;
238	+	case VDEPTH_4BIT:
239	+	depth = 4;
240	+	break;
241	+	case VDEPTH_8BIT:
242	+	depth = 8;
243	+	break;
244	+	case VDEPTH_16BIT:
245	+	depth = 16;
246	+	break;
247	+	case VDEPTH_32BIT:
248	+	depth = 32;
249	+	break;
250	+	default:
251	+	abort();
252	+	}
253	+	return depth;
254	+	}
255	+
256	+	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
257	+	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
258	+	{
259	+	return ((red >> rloss) << rshift) \| ((green >> gloss) << gshift) \| ((blue >> bloss) << bshift);
260	+	}
261	+
262	+	// Do we have a visual for handling the specified Mac depth? If so, set the
263	+	// global variables "xdepth", "visualInfo", "vis" and "color_class".
264	+	static bool find_visual_for_depth(video_depth depth)
265	+	{
266	+	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
267	+
268	+	// 1-bit works always and uses default visual
269	+	if (depth == VDEPTH_1BIT) {
270	+	vis = DefaultVisual(x_display, screen);
271	+	visualInfo.visualid = XVisualIDFromVisual(vis);
272	+	int num = 0;
273	+	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
274	+	visualInfo = vi[0];
275	+	XFree(vi);
276	+	xdepth = visualInfo.depth;
277	+	color_class = visualInfo.c_class;
278	+	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
279	+	return true;
280	+	}
281	+
282	+	// Calculate minimum and maximum supported X depth
283	+	int min_depth = 1, max_depth = 32;
284	+	switch (depth) {
285	+	#ifdef ENABLE_VOSF
286	+	case VDEPTH_2BIT:
287	+	case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
288	+	case VDEPTH_8BIT:
289	+	min_depth = 8;
290	+	max_depth = 32;
291	+	break;
292	+	#else
293	+	case VDEPTH_2BIT:
294	+	case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters
295	+	return false;
296	+	case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual
297	+	min_depth = 8;
298	+	max_depth = 8;
299	+	break;
300	+	#endif
301	+	case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual
302	+	min_depth = 15;
303	+	max_depth = 16;
304	+	break;
305	+	case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual
306	+	min_depth = 24;
307	+	max_depth = 32;
308	+	break;
309	+	}
310	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
311	+
312	+	// Try to find a visual for one of the color depths
313	+	bool visual_found = false;
314	+	for (int i=0; i<num_depths && !visual_found; i++) {
315	+
316	+	xdepth = avail_depths[i];
317	+	D(bug(" trying to find visual for depth %d\n", xdepth));
318	+	if (xdepth < min_depth \|\| xdepth > max_depth)
319	+	continue;
320	+
321	+	// Determine best color class for this depth
322	+	switch (xdepth) {
323	+	case 1: // Try StaticGray or StaticColor
324	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
325	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
326	+	visual_found = true;
327	+	break;
328	+	case 8: // Need PseudoColor
329	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
330	+	visual_found = true;
331	+	break;
332	+	case 15:
333	+	case 16:
334	+	case 24:
335	+	case 32: // Try DirectColor first, as this will allow gamma correction
336	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
337	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
338	+	visual_found = true;
339	+	break;
340	+	default:
341	+	D(bug(" not a supported depth\n"));
342	+	break;
343	+	}
344	+	}
345	+	if (!visual_found)
346	+	return false;
347	+
348	+	// Visual was found
349	+	vis = visualInfo.visual;
350	+	color_class = visualInfo.c_class;
351	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
352	+	#if DEBUG
353	+	switch (color_class) {
354	+	case StaticGray: D(bug("StaticGray\n")); break;
355	+	case GrayScale: D(bug("GrayScale\n")); break;
356	+	case StaticColor: D(bug("StaticColor\n")); break;
357	+	case PseudoColor: D(bug("PseudoColor\n")); break;
358	+	case TrueColor: D(bug("TrueColor\n")); break;
359	+	case DirectColor: D(bug("DirectColor\n")); break;
360	+	}
361	+	#endif
362	+	return true;
363	+	}
364	+
365		// Add mode to list of supported modes
366		static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
367		{
#	Line 208 \| Line 374 \| static void add_mode(uint32 width, uint3
374		VideoModes.push_back(mode);
375		}
376
377	+	// Add standard list of windowed modes for given color depth
378	+	static void add_window_modes(video_depth depth)
379	+	{
380	+	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
381	+	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
382	+	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
383	+	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
384	+	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
385	+	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
386	+	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
387	+	}
388	+
389		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
390	<	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
390	>	static void set_mac_frame_buffer(X11_monitor_desc &monitor, video_depth depth, bool native_byte_order)
391		{
392		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
393		int layout = FLAYOUT_DIRECT;
394		if (depth == VDEPTH_16BIT)
395		layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
396		else if (depth == VDEPTH_32BIT)
397	<	layour = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
397	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
398		if (native_byte_order)
399		MacFrameLayout = layout;
400		else
401		MacFrameLayout = FLAYOUT_DIRECT;
402	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
402	>	monitor.set_mac_frame_base(MacFrameBaseMac);
403	>
404	>	// Set variables used by UAE memory banking
405	>	const video_mode &mode = monitor.get_current_mode();
406	>	MacFrameBaseHost = the_buffer;
407	>	MacFrameSize = mode.bytes_per_row * mode.y;
408	>	InitFrameBufferMapping();
409		#else
410	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
227	<	D(bug("Host frame buffer = %p, ", the_buffer));
410	>	monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
411		#endif
412	<	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
412	>	D(bug("monitor.mac_frame_base = %08x\n", monitor.get_mac_frame_base()));
413		}
414
415		// Set window name and class
#	Line 260 \| Line 443 \| static void set_window_focus(Window w)
443		}
444
445		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
446	+	static Atom WM_DELETE_WINDOW = (Atom)0;
447		static void set_window_delete_protocol(Window w)
448		{
449		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 296 \| Line 480 \| *static int error_handler(Display d, XEr**
480		return old_error_handler(d, e);
481		}
482
483	<	// Init window mode
484	<	static bool init_window(const video_mode &mode)
483	>
484	>	/*
485	>	* Display "driver" classes
486	>	*/
487	>
488	>	class driver_base {
489	>	public:
490	>	driver_base(X11_monitor_desc &m);
491	>	virtual ~driver_base();
492	>
493	>	virtual void update_palette(void);
494	>	virtual void suspend(void) {}
495	>	virtual void resume(void) {}
496	>	virtual void toggle_mouse_grab(void) {}
497	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
498	>
499	>	void disable_mouse_accel(void);
500	>	void restore_mouse_accel(void);
501	>
502	>	virtual void grab_mouse(void) {}
503	>	virtual void ungrab_mouse(void) {}
504	>
505	>	public:
506	>	X11_monitor_desc &monitor; // Associated video monitor
507	>	const video_mode &mode; // Video mode handled by the driver
508	>
509	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
510	>	Window w; // The window we draw into
511	>
512	>	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
513	>	};
514	>
515	>	class driver_window;
516	>	static void update_display_window_vosf(driver_window *drv);
517	>	static void update_display_dynamic(int ticker, driver_window *drv);
518	>	static void update_display_static(driver_window *drv);
519	>
520	>	class driver_window : public driver_base {
521	>	friend void update_display_window_vosf(driver_window *drv);
522	>	friend void update_display_dynamic(int ticker, driver_window *drv);
523	>	friend void update_display_static(driver_window *drv);
524	>
525	>	public:
526	>	driver_window(X11_monitor_desc &monitor);
527	>	~driver_window();
528	>
529	>	void toggle_mouse_grab(void);
530	>	void mouse_moved(int x, int y);
531	>
532	>	void grab_mouse(void);
533	>	void ungrab_mouse(void);
534	>
535	>	private:
536	>	GC gc;
537	>	XImage *img;
538	>	bool have_shm; // Flag: SHM extensions available
539	>	XShmSegmentInfo shminfo;
540	>	Cursor mac_cursor;
541	>	bool mouse_grabbed; // Flag: mouse pointer grabbed, using relative mouse mode
542	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
543	>	};
544	>
545	>	class driver_dga;
546	>	static void update_display_dga_vosf(driver_dga *drv);
547	>
548	>	class driver_dga : public driver_base {
549	>	friend void update_display_dga_vosf(driver_dga *drv);
550	>
551	>	public:
552	>	driver_dga(X11_monitor_desc &monitor);
553	>	~driver_dga();
554	>
555	>	void suspend(void);
556	>	void resume(void);
557	>
558	>	protected:
559	>	struct FakeXImage {
560	>	int width, height; // size of image
561	>	int depth; // depth of image
562	>	int bytes_per_line; // accelerator to next line
563	>
564	>	FakeXImage(int w, int h, int d)
565	>	: width(w), height(h), depth(d)
566	>	{ bytes_per_line = TrivialBytesPerRow(width, DepthModeForPixelDepth(depth)); }
567	>	};
568	>	FakeXImage *img;
569	>
570	>	private:
571	>	Window suspend_win; // "Suspend" information window
572	>	void *fb_save; // Saved frame buffer for suspend/resume
573	>	};
574	>
575	>	static driver_base *drv = NULL; // Pointer to currently used driver object
576	>
577	>	#ifdef ENABLE_VOSF
578	>	# include "video_vosf.h"
579	>	#endif
580	>
581	>	driver_base::driver_base(X11_monitor_desc &m)
582	>	: monitor(m), mode(m.get_current_mode()), init_ok(false), w(0)
583	>	{
584	>	the_buffer = NULL;
585	>	the_buffer_copy = NULL;
586	>	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
587	>	}
588	>
589	>	driver_base::~driver_base()
590	>	{
591	>	ungrab_mouse();
592	>	restore_mouse_accel();
593	>
594	>	if (w) {
595	>	XUnmapWindow(x_display, w);
596	>	wait_unmapped(w);
597	>	XDestroyWindow(x_display, w);
598	>	}
599	>
600	>	XFlush(x_display);
601	>	XSync(x_display, false);
602	>
603	>	// Free frame buffer(s)
604	>	if (!use_vosf) {
605	>	if (the_buffer) {
606	>	free(the_buffer);
607	>	the_buffer = NULL;
608	>	}
609	>	if (the_buffer_copy) {
610	>	free(the_buffer_copy);
611	>	the_buffer_copy = NULL;
612	>	}
613	>	}
614	>	#ifdef ENABLE_VOSF
615	>	else {
616	>	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
617	>	if (the_buffer != VM_MAP_FAILED) {
618	>	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
619	>	vm_release(the_buffer, the_buffer_size);
620	>	the_buffer = NULL;
621	>	}
622	>	if (the_host_buffer) {
623	>	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
624	>	free(the_host_buffer);
625	>	the_host_buffer = NULL;
626	>	}
627	>	if (the_buffer_copy) {
628	>	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
629	>	free(the_buffer_copy);
630	>	the_buffer_copy = NULL;
631	>	}
632	>	}
633	>	#endif
634	>	}
635	>
636	>	// Palette has changed
637	>	void driver_base::update_palette(void)
638	>	{
639	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
640	>	int num = vis->map_entries;
641	>	if (!IsDirectMode(monitor.get_current_mode()) && color_class == DirectColor)
642	>	return; // Indexed mode on true color screen, don't set CLUT
643	>	XStoreColors(x_display, cmap[0], x_palette, num);
644	>	XStoreColors(x_display, cmap[1], x_palette, num);
645	>	}
646	>	XSync(x_display, false);
647	>	}
648	>
649	>	// Disable mouse acceleration
650	>	void driver_base::disable_mouse_accel(void)
651	>	{
652	>	XChangePointerControl(x_display, True, False, 1, 1, 0);
653	>	}
654	>
655	>	// Restore mouse acceleration to original value
656	>	void driver_base::restore_mouse_accel(void)
657	>	{
658	>	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
659	>	}
660	>
661	>
662	>	/*
663	>	* Windowed display driver
664	>	*/
665	>
666	>	// Open display
667	>	driver_window::driver_window(X11_monitor_desc &m)
668	>	: driver_base(m), gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false)
669		{
670		int width = mode.x, height = mode.y;
671		int aligned_width = (width + 15) & ~15;
672		int aligned_height = (height + 15) & ~15;
673
674		// Set absolute mouse mode
675	<	ADBSetRelMouseMode(false);
675	>	ADBSetRelMouseMode(mouse_grabbed);
676
677	<	// Read frame skip prefs
678	<	frame_skip = PrefsFindInt32("frameskip");
679	<
312	<	// Create window
677	>	// Create window (setting background_pixel, border_pixel and colormap is
678	>	// mandatory when using a non-default visual; in 1-bit mode we use the
679	>	// default visual, so we can also use the default colormap)
680		XSetWindowAttributes wattr;
681		wattr.event_mask = eventmask = win_eventmask;
682	<	wattr.background_pixel = black_pixel;
683	<	wattr.colormap = cmap[0];
684	<
685	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
686	<	InputOutput, vis, CWEventMask \| CWBackPixel \| ((IsDirectMode(mode) \|\| mode.depth == VDEPTH_1BIT) ? 0 : CWColormap), &wattr);
682	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
683	>	wattr.border_pixel = 0;
684	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
685	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
686	>	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \| CWColormap, &wattr);
687	>	D(bug(" window created\n"));
688
689		// Set window name/class
690	<	set_window_name(the_win, STR_WINDOW_TITLE);
690	>	set_window_name(w, STR_WINDOW_TITLE);
691
692		// Indicate that we want keyboard input
693	<	set_window_focus(the_win);
693	>	set_window_focus(w);
694
695		// Set delete protocol property
696	<	set_window_delete_protocol(the_win);
696	>	set_window_delete_protocol(w);
697
698		// Make window unresizable
699		{
#	Line 336 \| Line 704 \| static bool init_window(const video_mode
704		hints->min_height = height;
705		hints->max_height = height;
706		hints->flags = PMinSize \| PMaxSize;
707	<	XSetWMNormalHints(x_display, the_win, hints);
707	>	XSetWMNormalHints(x_display, w, hints);
708		XFree(hints);
709		}
710		}
711	+	D(bug(" window attributes set\n"));
712
713		// Show window
714	<	XMapWindow(x_display, the_win);
715	<	wait_mapped(the_win);
714	>	XMapWindow(x_display, w);
715	>	wait_mapped(w);
716	>	D(bug(" window mapped\n"));
717	>
718	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
719	>	// use SHM because that doesn't allow changing the image byte order
720	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
721
722		// Try to create and attach SHM image
723	<	have_shm = false;
350	<	if (mode.depth != VDEPTH_1BIT && local_X11 && XShmQueryExtension(x_display)) {
723	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
724
725		// Create SHM image ("height + 2" for safety)
726		img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
727	+	D(bug(" shm image created\n"));
728		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
729		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
730		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 365 \| Line 739 \| static bool init_window(const video_mode
739		if (shm_error) {
740		shmdt(shminfo.shmaddr);
741		XDestroyImage(img);
742	+	img = NULL;
743		shminfo.shmid = -1;
744		} else {
745		have_shm = true;
746		shmctl(shminfo.shmid, IPC_RMID, 0);
747		}
748	+	D(bug(" shm image attached\n"));
749		}
750
751		// Create normal X image if SHM doesn't work ("height + 2" for safety)
752		if (!have_shm) {
753	<	int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth);
753	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
754		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
755		img = XCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
756	+	D(bug(" X image created\n"));
757		}
758
759	<	// 1-Bit mode is big-endian
383	<	if (mode.depth == VDEPTH_1BIT) {
759	>	if (need_msb_image) {
760		img->byte_order = MSBFirst;
761		img->bitmap_bit_order = MSBFirst;
762		}
763
764		#ifdef ENABLE_VOSF
765	+	use_vosf = true;
766		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
767		the_host_buffer = the_buffer_copy;
768		the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
769	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
770	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
769	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
770	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
771	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
772		#else
773		// Allocate memory for frame buffer
774		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
775	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
776		#endif
777
778		// Create GC
779	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
780	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
779	>	gc = XCreateGC(x_display, w, 0, 0);
780	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
781
782		// Create no_cursor
783		mac_cursor = XCreatePixmapCursor(x_display,
784	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
785	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
784	>	XCreatePixmap(x_display, w, 1, 1, 1),
785	>	XCreatePixmap(x_display, w, 1, 1, 1),
786		&black, &white, 0, 0);
787	<	XDefineCursor(x_display, the_win, mac_cursor);
787	>	XDefineCursor(x_display, w, mac_cursor);
788
789	<	// Add resolution and set VideoMonitor
789	>	// Init blitting routines
790		bool native_byte_order;
791		#ifdef WORDS_BIGENDIAN
792		native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#	Line 415 \| Line 794 \| static bool init_window(const video_mode
794		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
795		#endif
796		#ifdef ENABLE_VOSF
797	<	Screen_blitter_init(&visualInfo, native_byte_order);
797	>	Screen_blitter_init(visualFormat, native_byte_order, depth_of_video_mode(mode));
798		#endif
799	<	VideoMonitor.mode = mode;
800	<	set_mac_frame_buffer(mode.depth, native_byte_order);
801	<	return true;
799	>
800	>	// Set frame buffer base
801	>	set_mac_frame_buffer(monitor, mode.depth, native_byte_order);
802	>
803	>	// Everything went well
804	>	init_ok = true;
805	>	}
806	>
807	>	// Close display
808	>	driver_window::~driver_window()
809	>	{
810	>	if (have_shm) {
811	>	XShmDetach(x_display, &shminfo);
812	>	#ifdef ENABLE_VOSF
813	>	the_host_buffer = NULL; // don't free() in driver_base dtor
814	>	#else
815	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
816	>	#endif
817	>	}
818	>	if (img) {
819	>	if (!have_shm)
820	>	img->data = NULL;
821	>	XDestroyImage(img);
822	>	}
823	>	if (have_shm) {
824	>	shmdt(shminfo.shmaddr);
825	>	shmctl(shminfo.shmid, IPC_RMID, 0);
826	>	}
827	>	if (gc)
828	>	XFreeGC(x_display, gc);
829		}
830
831	<	// Init fbdev DGA display
832	<	static bool init_fbdev_dga(const video_mode &mode)
831	>	// Toggle mouse grab
832	>	void driver_window::toggle_mouse_grab(void)
833		{
834	+	if (mouse_grabbed)
835	+	ungrab_mouse();
836	+	else
837	+	grab_mouse();
838	+	}
839	+
840	+	// Grab mouse, switch to relative mouse mode
841	+	void driver_window::grab_mouse(void)
842	+	{
843	+	int result;
844	+	for (int i=0; i<10; i++) {
845	+	result = XGrabPointer(x_display, w, True, 0,
846	+	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
847	+	if (result != AlreadyGrabbed)
848	+	break;
849	+	Delay_usec(100000);
850	+	}
851	+	if (result == GrabSuccess) {
852	+	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
853	+	ADBSetRelMouseMode(mouse_grabbed = true);
854	+	disable_mouse_accel();
855	+	}
856	+	}
857	+
858	+	// Ungrab mouse, switch to absolute mouse mode
859	+	void driver_window::ungrab_mouse(void)
860	+	{
861	+	if (mouse_grabbed) {
862	+	XUngrabPointer(x_display, CurrentTime);
863	+	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
864	+	ADBSetRelMouseMode(mouse_grabbed = false);
865	+	restore_mouse_accel();
866	+	}
867	+	}
868	+
869	+	// Mouse moved
870	+	void driver_window::mouse_moved(int x, int y)
871	+	{
872	+	if (!mouse_grabbed) {
873	+	mouse_last_x = x; mouse_last_y = y;
874	+	ADBMouseMoved(x, y);
875	+	return;
876	+	}
877	+
878	+	// Warped mouse motion (this code is taken from SDL)
879	+
880	+	// Post first mouse event
881	+	int width = monitor.get_current_mode().x, height = monitor.get_current_mode().y;
882	+	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
883	+	mouse_last_x = x; mouse_last_y = y;
884	+	ADBMouseMoved(delta_x, delta_y);
885	+
886	+	// Only warp the pointer when it has reached the edge
887	+	const int MOUSE_FUDGE_FACTOR = 8;
888	+	if (x < MOUSE_FUDGE_FACTOR \|\| x > (width - MOUSE_FUDGE_FACTOR)
889	+	\|\| y < MOUSE_FUDGE_FACTOR \|\| y > (height - MOUSE_FUDGE_FACTOR)) {
890	+	XEvent event;
891	+	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
892	+	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
893	+	mouse_last_x = x; mouse_last_y = y;
894	+	ADBMouseMoved(delta_x, delta_y);
895	+	}
896	+	mouse_last_x = width/2;
897	+	mouse_last_y = height/2;
898	+	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
899	+	for (int i=0; i<10; i++) {
900	+	XMaskEvent(x_display, PointerMotionMask, &event);
901	+	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
902	+	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
903	+	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
904	+	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
905	+	break;
906	+	}
907	+	}
908	+	}
909	+
910	+
911	+	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
912	+	/*
913	+	* DGA display driver base class
914	+	*/
915	+
916	+	driver_dga::driver_dga(X11_monitor_desc &m)
917	+	: driver_base(m), suspend_win(0), fb_save(NULL), img(NULL)
918	+	{
919	+	}
920	+
921	+	driver_dga::~driver_dga()
922	+	{
923	+	XUngrabPointer(x_display, CurrentTime);
924	+	XUngrabKeyboard(x_display, CurrentTime);
925	+
926	+	if (img)
927	+	delete img;
928	+	}
929	+
930	+	// Suspend emulation
931	+	void driver_dga::suspend(void)
932	+	{
933	+	// Release ctrl key
934	+	ADBKeyUp(0x36);
935	+	ctrl_down = false;
936	+
937	+	// Lock frame buffer (this will stop the MacOS thread)
938	+	LOCK_FRAME_BUFFER;
939	+
940	+	// Save frame buffer
941	+	fb_save = malloc(mode.y * mode.bytes_per_row);
942	+	if (fb_save)
943	+	memcpy(fb_save, the_buffer, mode.y * mode.bytes_per_row);
944	+
945	+	// Close full screen display
946	+	#ifdef ENABLE_XF86_DGA
947	+	XF86DGADirectVideo(x_display, screen, 0);
948	+	#endif
949	+	XUngrabPointer(x_display, CurrentTime);
950	+	XUngrabKeyboard(x_display, CurrentTime);
951	+	restore_mouse_accel();
952	+	XUnmapWindow(x_display, w);
953	+	wait_unmapped(w);
954	+
955	+	// Open "suspend" window
956	+	XSetWindowAttributes wattr;
957	+	wattr.event_mask = KeyPressMask;
958	+	wattr.background_pixel = black_pixel;
959	+
960	+	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
961	+	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
962	+	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
963	+	set_window_focus(suspend_win);
964	+	XMapWindow(x_display, suspend_win);
965	+	emul_suspended = true;
966	+	}
967	+
968	+	// Resume emulation
969	+	void driver_dga::resume(void)
970	+	{
971	+	// Close "suspend" window
972	+	XDestroyWindow(x_display, suspend_win);
973	+	XSync(x_display, false);
974	+
975	+	// Reopen full screen display
976	+	XMapRaised(x_display, w);
977	+	wait_mapped(w);
978	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
979	+	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
980	+	XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
981	+	disable_mouse_accel();
982	+	#ifdef ENABLE_XF86_DGA
983	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
984	+	XF86DGASetViewPort(x_display, screen, 0, 0);
985	+	#endif
986	+	XSync(x_display, false);
987	+
988	+	// the_buffer already contains the data to restore. i.e. since a temporary
989	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
990	+	// not necessary.
991	+	#ifdef ENABLE_VOSF
992	+	if (use_vosf) {
993	+	LOCK_VOSF;
994	+	PFLAG_SET_ALL;
995	+	UNLOCK_VOSF;
996	+	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
997	+	}
998	+	#endif
999	+
1000	+	// Restore frame buffer
1001	+	if (fb_save) {
1002	+	#ifdef ENABLE_VOSF
1003	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1004	+	if (!use_vosf)
1005	+	#endif
1006	+	memcpy(the_buffer, fb_save, mode.y * mode.bytes_per_row);
1007	+	free(fb_save);
1008	+	fb_save = NULL;
1009	+	}
1010	+
1011	+	// Unlock frame buffer (and continue MacOS thread)
1012	+	UNLOCK_FRAME_BUFFER;
1013	+	emul_suspended = false;
1014	+	}
1015	+	#endif
1016	+
1017	+
1018		#ifdef ENABLE_FBDEV_DGA
1019	+	/*
1020	+	* fbdev DGA display driver
1021	+	*/
1022	+
1023	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
1024	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
1025	+
1026	+	class driver_fbdev : public driver_dga {
1027	+	public:
1028	+	driver_fbdev(X11_monitor_desc &monitor);
1029	+	~driver_fbdev();
1030	+	};
1031	+
1032	+	// Open display
1033	+	driver_fbdev::driver_fbdev(X11_monitor_desc &m) : driver_dga(m)
1034	+	{
1035		int width = mode.x, height = mode.y;
1036
1037	+	// Set absolute mouse mode
1038	+	ADBSetRelMouseMode(false);
1039	+
1040		// Find the maximum depth available
1041		int ndepths, max_depth(0);
1042		int *depths = XListDepths(x_display, screen, &ndepths);
1043		if (depths == NULL) {
1044		printf("FATAL: Could not determine the maximal depth available\n");
1045	<	return false;
1045	>	return;
1046		} else {
1047		while (ndepths-- > 0) {
1048		if (depths[ndepths] > max_depth)
#	Line 450 \| Line 1059 \| static bool init_fbdev_dga(const video_m
1059		char str[256];
1060		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
1061		ErrorAlert(str);
1062	<	return false;
1062	>	return;
1063		}
1064
1065		int fb_depth; // supported depth
#	Line 469 \| Line 1078 \| static bool init_fbdev_dga(const video_m
1078		if ((line[0] == '#') \|\| (line[0] == ';') \|\| (line[0] == '\0'))
1079		continue;
1080
1081	<	if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
1082	<	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
1081	>	if ((sscanf(line, "%19s %d %x", fb_name, &fb_depth, &fb_offset) == 3)
1082	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
1083		device_found = true;
1084		break;
1085		}
#	Line 484 \| Line 1093 \| static bool init_fbdev_dga(const video_m
1093		char str[256];
1094		sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
1095		ErrorAlert(str);
1096	<	return false;
1096	>	return;
1097		}
1098
490	–	depth = fb_depth;
491	–
492	–	// Set relative mouse mode
493	–	ADBSetRelMouseMode(false);
494	–
1099		// Create window
1100		XSetWindowAttributes wattr;
1101		wattr.event_mask = eventmask = dga_eventmask;
#	Line 499 \| Line 1103 \| static bool init_fbdev_dga(const video_m
1103		wattr.override_redirect = True;
1104		wattr.colormap = cmap[0];
1105
1106	<	the_win = XCreateWindow(x_display, rootwin,
1106	>	w = XCreateWindow(x_display, rootwin,
1107		0, 0, width, height,
1108		0, xdepth, InputOutput, vis,
1109	<	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (depth == 8 ? CWColormap : 0),
1109	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
1110		&wattr);
1111
1112		// Set window name/class
1113	<	set_window_name(the_win, STR_WINDOW_TITLE);
1113	>	set_window_name(w, STR_WINDOW_TITLE);
1114
1115		// Indicate that we want keyboard input
1116	<	set_window_focus(the_win);
1116	>	set_window_focus(w);
1117
1118		// Show window
1119	<	XMapRaised(x_display, the_win);
1120	<	wait_mapped(the_win);
1119	>	XMapRaised(x_display, w);
1120	>	wait_mapped(w);
1121
1122		// Grab mouse and keyboard
1123	<	XGrabKeyboard(x_display, the_win, True,
1123	>	XGrabKeyboard(x_display, w, True,
1124		GrabModeAsync, GrabModeAsync, CurrentTime);
1125	<	XGrabPointer(x_display, the_win, True,
1125	>	XGrabPointer(x_display, w, True,
1126		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
1127	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
1127	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1128	>	disable_mouse_accel();
1129
1130		// Calculate bytes per row
1131		int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1132
1133		// Map frame buffer
1134	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1135	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1134	>	the_buffer_size = height * bytes_per_row;
1135	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1136	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1137		char str[256];
1138		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1139		ErrorAlert(str);
1140	<	return false;
1140	>	return;
1141		}
1142		}
1143
#	Line 539 \| Line 1145 \| static bool init_fbdev_dga(const video_m
1145		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1146		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1147		// i.e. the framebuffer update function is not Blit_Copy_Raw
1148	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1148	>	use_vosf = Screen_blitter_init(visualFormat, true, mode.depth);
1149
1150		if (use_vosf) {
1151		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1152		the_host_buffer = the_buffer;
1153		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1154	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1155	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1154	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1155	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1156	>
1157	>	// Fake image for DGA/VOSF mode to know about display bounds
1158	>	img = new FakeXImage(width, height, depth_of_video_mode(mode));
1159		}
1160		#else
1161		use_vosf = false;
1162		#endif
1163		#endif
1164
1165	<	// Set VideoMonitor
1166	<	VideoMonitor.mode = mode;
1167	<	set_mac_frame_buffer(mode.depth, true);
1168	<	return true;
1169	<	#else
1170	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
1171	<	return false;
1165	>	// Set frame buffer base
1166	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1167	>	const_cast<video_mode *>(&mode)->depth = DepthModeForPixelDepth(fb_depth);
1168	>	set_mac_frame_buffer(monitor, mode.depth, true);
1169	>
1170	>	// Everything went well
1171	>	init_ok = true;
1172	>	}
1173	>
1174	>	// Close display
1175	>	driver_fbdev::~driver_fbdev()
1176	>	{
1177	>	if (!use_vosf) {
1178	>	if (the_buffer != MAP_FAILED) {
1179	>	// don't free() the screen buffer in driver_base dtor
1180	>	munmap(the_buffer, the_buffer_size);
1181	>	the_buffer = NULL;
1182	>	}
1183	>	}
1184	>	#ifdef ENABLE_VOSF
1185	>	else {
1186	>	if (the_host_buffer != MAP_FAILED) {
1187	>	// don't free() the screen buffer in driver_base dtor
1188	>	munmap(the_host_buffer, the_buffer_size);
1189	>	the_host_buffer = NULL;
1190	>	}
1191	>	}
1192		#endif
1193		}
1194	+	#endif
1195	+
1196	+
1197	+	#ifdef ENABLE_XF86_DGA
1198	+	/*
1199	+	* XFree86 DGA display driver
1200	+	*/
1201	+
1202	+	class driver_xf86dga : public driver_dga {
1203	+	public:
1204	+	driver_xf86dga(X11_monitor_desc &monitor);
1205	+	~driver_xf86dga();
1206	+
1207	+	void update_palette(void);
1208	+	void resume(void);
1209
1210	<	// Init XF86 DGA display
1211	<	static bool init_xf86_dga(const video_mode &mode)
1210	>	private:
1211	>	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
1212	>	};
1213	>
1214	>	// Open display
1215	>	driver_xf86dga::driver_xf86dga(X11_monitor_desc &m)
1216	>	: driver_dga(m), current_dga_cmap(0)
1217		{
1218		int width = mode.x, height = mode.y;
1219
571	–	#ifdef ENABLE_XF86_DGA
1220		// Set relative mouse mode
1221		ADBSetRelMouseMode(true);
1222
#	Line 592 \| Line 1240 \| static bool init_xf86_dga(const video_mo
1240		XSetWindowAttributes wattr;
1241		wattr.event_mask = eventmask = dga_eventmask;
1242		wattr.override_redirect = True;
1243	+	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
1244
1245	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1246	<	InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
1245	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1246	>	InputOutput, vis, CWEventMask \| CWOverrideRedirect \|
1247	>	(color_class == DirectColor ? CWColormap : 0), &wattr);
1248
1249		// Set window name/class
1250	<	set_window_name(the_win, STR_WINDOW_TITLE);
1250	>	set_window_name(w, STR_WINDOW_TITLE);
1251
1252		// Indicate that we want keyboard input
1253	<	set_window_focus(the_win);
1253	>	set_window_focus(w);
1254
1255		// Show window
1256	<	XMapRaised(x_display, the_win);
1257	<	wait_mapped(the_win);
1256	>	XMapRaised(x_display, w);
1257	>	wait_mapped(w);
1258
1259		// Establish direct screen connection
1260	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
1260	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
1261		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1262		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1263		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1264	+	disable_mouse_accel();
1265
1266		int v_width, v_bank, v_size;
1267		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 620 \| Line 1271 \| static bool init_xf86_dga(const video_mo
1271
1272		// Set colormap
1273		if (!IsDirectMode(mode)) {
1274	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
1274	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1275		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1276		}
1277		XSync(x_display, false);
1278
1279	<	// Set VideoMonitor
1279	>	// Init blitting routines
1280		int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1281	<
1282	<	#ifdef VIDEO_VOSF
1281	>	#if ENABLE_VOSF
1282	>	bool native_byte_order;
1283	>	#ifdef WORDS_BIGENDIAN
1284	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
1285	>	#else
1286	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
1287	>	#endif
1288		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1289		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1290		// i.e. the framebuffer update function is not Blit_Copy_Raw
1291	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1291	>	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth_of_video_mode(mode));
1292
1293		if (use_vosf) {
1294		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1295		the_host_buffer = the_buffer;
1296		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1297	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1298	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1297	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1298	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1299	>
1300	>	// Fake image for DGA/VOSF mode to know about display bounds
1301	>	img = new FakeXImage((v_width + 7) & ~7, height, depth_of_video_mode(mode));
1302		}
1303		#else
1304		use_vosf = false;
1305		#endif
1306		#endif
1307
1308	+	// Set frame buffer base
1309		const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1310	<	VideoMonitor.mode = mode;
1311	<	set_mac_frame_buffer(mode.depth, true);
1312	<	return true;
1313	<	#else
1314	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
1315	<	return false;
1310	>	set_mac_frame_buffer(monitor, mode.depth, true);
1311	>
1312	>	// Everything went well
1313	>	init_ok = true;
1314	>	}
1315	>
1316	>	// Close display
1317	>	driver_xf86dga::~driver_xf86dga()
1318	>	{
1319	>	XF86DGADirectVideo(x_display, screen, 0);
1320	>	if (!use_vosf) {
1321	>	// don't free() the screen buffer in driver_base dtor
1322	>	the_buffer = NULL;
1323	>	}
1324	>	#ifdef ENABLE_VOSF
1325	>	else {
1326	>	// don't free() the screen buffer in driver_base dtor
1327	>	the_host_buffer = NULL;
1328	>	}
1329	>	#endif
1330	>	#ifdef ENABLE_XF86_VIDMODE
1331	>	if (has_vidmode)
1332	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1333		#endif
1334		}
1335
1336	+	// Palette has changed
1337	+	void driver_xf86dga::update_palette(void)
1338	+	{
1339	+	driver_dga::update_palette();
1340	+	current_dga_cmap ^= 1;
1341	+	if (!IsDirectMode(monitor.get_current_mode()) && cmap[current_dga_cmap])
1342	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1343	+	}
1344	+
1345	+	// Resume emulation
1346	+	void driver_xf86dga::resume(void)
1347	+	{
1348	+	driver_dga::resume();
1349	+	if (!IsDirectMode(monitor.get_current_mode()))
1350	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1351	+	}
1352	+	#endif
1353	+
1354	+
1355	+	/*
1356	+	* Initialization
1357	+	*/
1358	+
1359		// Init keycode translation table
1360		static void keycode_init(void)
1361		{
#	Line 680 \| Line 1380 \| static void keycode_init(void)
1380
1381		// Search for server vendor string, then read keycodes
1382		const char *vendor = ServerVendor(x_display);
1383	+	// Force use of MacX mappings on MacOS X with Apple's X server
1384	+	int dummy;
1385	+	if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy))
1386	+	vendor = "MacX";
1387		bool vendor_found = false;
1388		char line[256];
1389		while (fgets(line, 255, f)) {
#	Line 721 \| Line 1425 \| static void keycode_init(void)
1425		}
1426		}
1427
1428	<	// Open display for specified mode
1429	<	static bool video_open(const video_mode &mode)
1428	>	// Open display for current mode
1429	>	bool X11_monitor_desc::video_open(void)
1430		{
1431	<	// Create color maps for 8 bit mode
1432	<	if (!IsDirectMode(mode)) {
1431	>	D(bug("video_open()\n"));
1432	>	const video_mode &mode = get_current_mode();
1433	>
1434	>	// Find best available X visual
1435	>	if (!find_visual_for_depth(mode.depth)) {
1436	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1437	>	return false;
1438	>	}
1439	>
1440	>	// Build up visualFormat structure
1441	>	visualFormat.fullscreen = (display_type == DISPLAY_DGA);
1442	>	visualFormat.depth = visualInfo.depth;
1443	>	visualFormat.Rmask = visualInfo.red_mask;
1444	>	visualFormat.Gmask = visualInfo.green_mask;
1445	>	visualFormat.Bmask = visualInfo.blue_mask;
1446	>
1447	>	// Create color maps
1448	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1449		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1450		cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1451	<	cmap_allocated = true;
1452	<	XInstallColormap(x_display, cmap[0]);
1453	<	XInstallColormap(x_display, cmap[1]);
1451	>	} else {
1452	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1453	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1454	>	}
1455	>
1456	>	// Find pixel format of direct modes
1457	>	if (color_class == DirectColor \|\| color_class == TrueColor) {
1458	>	rshift = gshift = bshift = 0;
1459	>	rloss = gloss = bloss = 8;
1460	>	uint32 mask;
1461	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1462	>	++rshift;
1463	>	for (; mask&1; mask>>=1)
1464	>	--rloss;
1465	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1466	>	++gshift;
1467	>	for (; mask&1; mask>>=1)
1468	>	--gloss;
1469	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1470	>	++bshift;
1471	>	for (; mask&1; mask>>=1)
1472	>	--bloss;
1473	>	}
1474	>
1475	>	// Preset palette pixel values for CLUT or gamma table
1476	>	if (color_class == DirectColor) {
1477	>	int num = vis->map_entries;
1478	>	for (int i=0; i<num; i++) {
1479	>	int c = (i * 256) / num;
1480	>	x_palette[i].pixel = map_rgb(c, c, c);
1481	>	x_palette[i].flags = DoRed \| DoGreen \| DoBlue;
1482	>	}
1483	>	} else if (color_class == PseudoColor) {
1484	>	for (int i=0; i<256; i++) {
1485	>	x_palette[i].pixel = i;
1486	>	x_palette[i].flags = DoRed \| DoGreen \| DoBlue;
1487	>	}
1488	>	}
1489	>
1490	>	// Load gray ramp to color map
1491	>	int num = (color_class == DirectColor ? vis->map_entries : 256);
1492	>	for (int i=0; i<num; i++) {
1493	>	int c = (i * 256) / num;
1494	>	x_palette[i].red = c * 0x0101;
1495	>	x_palette[i].green = c * 0x0101;
1496	>	x_palette[i].blue = c * 0x0101;
1497	>	}
1498	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1499	>	XStoreColors(x_display, cmap[0], x_palette, num);
1500	>	XStoreColors(x_display, cmap[1], x_palette, num);
1501		}
1502
1503	<	// Initialize according to display type
1503	>	#ifdef ENABLE_VOSF
1504	>	// Load gray ramp to 8->16/32 expand map
1505	>	if (!IsDirectMode(mode) && xdepth > 8)
1506	>	for (int i=0; i<256; i++)
1507	>	ExpandMap[i] = map_rgb(i, i, i);
1508	>	#endif
1509	>
1510	>	// Create display driver object of requested type
1511		switch (display_type) {
1512		case DISPLAY_WINDOW:
1513	<	if (!init_window(mode))
740	<	return false;
1513	>	drv = new driver_window(*this);
1514		break;
742	–	case DISPLAY_DGA:
1515		#ifdef ENABLE_FBDEV_DGA
1516	<	if (!init_fbdev_dga(mode))
1517	<	#else
1518	<	if (!init_xf86_dga(mode))
1516	>	case DISPLAY_DGA:
1517	>	drv = new driver_fbdev(*this);
1518	>	break;
1519		#endif
1520	<	return false;
1520	>	#ifdef ENABLE_XF86_DGA
1521	>	case DISPLAY_DGA:
1522	>	drv = new driver_xf86dga(*this);
1523		break;
750	–	}
751	–
752	–	// Lock down frame buffer
753	–	LOCK_FRAME_BUFFER;
754	–
755	–	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
756	–	// Set variables for UAE memory mapping
757	–	MacFrameBaseHost = the_buffer;
758	–	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
759	–
760	–	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
761	–	if (classic)
762	–	MacFrameLayout = FLAYOUT_NONE;
1524		#endif
1525	<
1526	<	InitFrameBufferMapping();
1525	>	}
1526	>	if (drv == NULL)
1527	>	return false;
1528	>	if (!drv->init_ok) {
1529	>	delete drv;
1530	>	drv = NULL;
1531	>	return false;
1532	>	}
1533
1534		#ifdef ENABLE_VOSF
1535		if (use_vosf) {
1536	<	// Initialize the mainBuffer structure
1537	<	if (!video_init_buffer()) {
1538	<	ErrorAlert(GetString(STR_VOSF_INIT_ERR));
1536	>	// Initialize the VOSF system
1537	>	if (!video_vosf_init(*this)) {
1538	>	ErrorAlert(STR_VOSF_INIT_ERR);
1539		return false;
1540		}
774	–
775	–	// Initialize the handler for SIGSEGV
776	–	if (!sigsegv_install_handler(screen_fault_handler)) {
777	–	ErrorAlert("Could not initialize Video on SEGV signals");
778	–	return false;
779	–	}
1541		}
1542		#endif
1543
1544		// Initialize VideoRefresh function
1545		VideoRefreshInit();
1546	<
1546	>
1547	>	// Lock down frame buffer
1548		XSync(x_display, false);
1549	+	LOCK_FRAME_BUFFER;
1550
788	–	#ifdef HAVE_PTHREADS
1551		// Start redraw/input thread
1552	+	#ifdef USE_PTHREADS_SERVICES
1553		redraw_thread_cancel = false;
1554	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1554	>	Set_pthread_attr(&redraw_thread_attr, 0);
1555	>	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1556		if (!redraw_thread_active) {
1557		printf("FATAL: cannot create redraw thread\n");
1558		return false;
1559		}
1560	+	#else
1561	+	redraw_thread_active = true;
1562		#endif
1563
1564		return true;
#	Line 803 \| Line 1569 \| bool VideoInit(bool classic)
1569		classic_mode = classic;
1570
1571		#ifdef ENABLE_VOSF
806	–	// Open /dev/zero
807	–	zero_fd = open("/dev/zero", O_RDWR);
808	–	if (zero_fd < 0) {
809	–	char str[256];
810	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
811	–	ErrorAlert(str);
812	–	return false;
813	–	}
814	–
1572		// Zero the mainBuffer structure
1573	<	mainBuffer.dirtyPages = 0;
1574	<	mainBuffer.pageInfo = 0;
1573	>	mainBuffer.dirtyPages = NULL;
1574	>	mainBuffer.pageInfo = NULL;
1575		#endif
1576
1577		// Check if X server runs on local machine
#	Line 825 \| Line 1582 \| bool VideoInit(bool classic)
1582		keycode_init();
1583
1584		// Read prefs
1585	+	frame_skip = PrefsFindInt32("frameskip");
1586		mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1587		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1588
1589		// Find screen and root window
1590		screen = XDefaultScreen(x_display);
1591		rootwin = XRootWindow(x_display, screen);
1592	<
1593	<	// Get screen depth
1594	<	xdepth = DefaultDepth(x_display, screen);
1592	>
1593	>	// Get sorted list of available depths
1594	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1595	>	if (avail_depths == NULL) {
1596	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1597	>	return false;
1598	>	}
1599	>	std::sort(avail_depths, avail_depths + num_depths);
1600
1601		#ifdef ENABLE_FBDEV_DGA
1602		// Frame buffer name
1603		char fb_name[20];
1604
1605	<	// Could do fbdev dga ?
1605	>	// Could do fbdev DGA?
1606		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1607		has_dga = true;
1608		else
#	Line 873 \| Line 1636 \| bool VideoInit(bool classic)
1636		black_pixel = BlackPixel(x_display, screen);
1637		white_pixel = WhitePixel(x_display, screen);
1638
876	–	// Get appropriate visual
877	–	int color_class;
878	–	switch (xdepth) {
879	–	case 1:
880	–	color_class = StaticGray;
881	–	break;
882	–	case 8:
883	–	color_class = PseudoColor;
884	–	break;
885	–	case 15:
886	–	case 16:
887	–	case 24:
888	–	case 32:
889	–	color_class = TrueColor;
890	–	break;
891	–	default:
892	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
893	–	return false;
894	–	}
895	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
896	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
897	–	return false;
898	–	}
899	–	if (visualInfo.depth != xdepth) {
900	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
901	–	return false;
902	–	}
903	–	vis = visualInfo.visual;
904	–
1639		// Get screen mode from preferences
1640		const char *mode_str;
1641		if (classic_mode)
#	Line 918 \| Line 1652 \| bool VideoInit(bool classic)
1652		#ifdef ENABLE_FBDEV_DGA
1653		} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1654		display_type = DISPLAY_DGA;
1655	<	default_width = -1; default_height = -1;
1656	<	#else
1655	>	default_width = -1; default_height = -1; // use entire screen
1656	>	#endif
1657	>	#ifdef ENABLE_XF86_DGA
1658		} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1659		display_type = DISPLAY_DGA;
1660		#endif
#	Line 934 \| Line 1669 \| bool VideoInit(bool classic)
1669		else if (default_height > DisplayHeight(x_display, screen))
1670		default_height = DisplayHeight(x_display, screen);
1671
1672	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1673	<	int depth = (classic_mode ? 1 : xdepth);
1674	<	video_depth depth_mode = DepthModeForPixelDepth(depth);
1672	>	// Mac screen depth follows X depth
1673	>	video_depth default_depth = VDEPTH_1BIT;
1674	>	switch (DefaultDepth(x_display, screen)) {
1675	>	case 8:
1676	>	default_depth = VDEPTH_8BIT;
1677	>	break;
1678	>	case 15: case 16:
1679	>	default_depth = VDEPTH_16BIT;
1680	>	break;
1681	>	case 24: case 32:
1682	>	default_depth = VDEPTH_32BIT;
1683	>	break;
1684	>	}
1685
1686		// Construct list of supported modes
1687		if (display_type == DISPLAY_WINDOW) {
1688		if (classic)
1689	<	add_mode(512, 342, 0x80, 64, depth_mode);
1689	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1690		else {
1691	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth_mode), depth_mode);
1692	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth_mode), depth_mode);
1693	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth_mode), depth_mode);
1694	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth_mode), depth_mode);
950	<	add_mode(1280, 1024, 0x84, TrivialBytesPerRow(1280, depth_mode), depth_mode);
1691	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1692	>	if (find_visual_for_depth(video_depth(d)))
1693	>	add_window_modes(video_depth(d));
1694	>	}
1695		}
1696		} else
1697	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, depth_mode), depth_mode);
1697	>	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1698	>	if (VideoModes.empty()) {
1699	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1700	>	return false;
1701	>	}
1702
1703	<	// Find requested default mode and open display
1704	<	if (VideoModes.size() == 1)
1705	<	return video_open(VideoModes[0]);
1706	<	else {
1707	<	// Find mode with specified dimensions
1708	<	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1709	<	while (i != end) {
962	<	if (i->x == default_width && i->y == default_height)
963	<	return video_open(*i);
964	<	++i;
1703	>	// Find requested default mode with specified dimensions
1704	>	uint32 default_id;
1705	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1706	>	for (i = VideoModes.begin(); i != end; ++i) {
1707	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1708	>	default_id = i->resolution_id;
1709	>	break;
1710		}
966	–	return video_open(VideoModes[0]);
1711		}
1712	+	if (i == end) { // not found, use first available mode
1713	+	default_depth = VideoModes[0].depth;
1714	+	default_id = VideoModes[0].resolution_id;
1715	+	}
1716	+
1717	+	#if DEBUG
1718	+	D(bug("Available video modes:\n"));
1719	+	for (i = VideoModes.begin(); i != end; ++i) {
1720	+	int bits = 1 << i->depth;
1721	+	if (bits == 16)
1722	+	bits = 15;
1723	+	else if (bits == 32)
1724	+	bits = 24;
1725	+	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1726	+	}
1727	+	#endif
1728	+
1729	+	// Create X11_monitor_desc for this (the only) display
1730	+	X11_monitor_desc *monitor = new X11_monitor_desc(VideoModes, default_depth, default_id);
1731	+	VideoMonitors.push_back(monitor);
1732	+
1733	+	// Open display
1734	+	return monitor->video_open();
1735		}
1736
1737
#	Line 973 \| Line 1740 \| bool VideoInit(bool classic)
1740		*/
1741
1742		// Close display
1743	<	static void video_close(void)
1743	>	void X11_monitor_desc::video_close(void)
1744		{
1745	<	#ifdef HAVE_PTHREADS
1745	>	D(bug("video_close()\n"));
1746	>
1747		// Stop redraw thread
1748	+	#ifdef USE_PTHREADS_SERVICES
1749		if (redraw_thread_active) {
1750		redraw_thread_cancel = true;
1751	<	#ifdef HAVE_PTHREAD_CANCEL
983	<	pthread_cancel(redraw_thread);
984	<	#endif
1751	>	redraw_thread_cancel_ack = false;
1752		pthread_join(redraw_thread, NULL);
1753	<	redraw_thread_active = false;
1753	>	while (!redraw_thread_cancel_ack) ;
1754		}
1755		#endif
1756	+	redraw_thread_active = false;
1757
1758		// Unlock frame buffer
1759		UNLOCK_FRAME_BUFFER;
1760	+	XSync(x_display, false);
1761	+	D(bug(" frame buffer unlocked\n"));
1762
1763	<	// Close window and server connection
1764	<	if (x_display != NULL) {
1765	<	XSync(x_display, false);
1766	<
1767	<	#ifdef ENABLE_XF86_DGA
998	<	if (display_type == DISPLAY_DGA) {
999	<	XF86DGADirectVideo(x_display, screen, 0);
1000	<	XUngrabPointer(x_display, CurrentTime);
1001	<	XUngrabKeyboard(x_display, CurrentTime);
1002	<	}
1003	<	#endif
1004	<
1005	<	#ifdef ENABLE_XF86_VIDMODE
1006	<	if (has_vidmode && display_type == DISPLAY_DGA)
1007	<	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1008	<	#endif
1009	<
1010	<	#ifdef ENABLE_FBDEV_DGA
1011	<	if (display_type == DISPLAY_DGA) {
1012	<	XUngrabPointer(x_display, CurrentTime);
1013	<	XUngrabKeyboard(x_display, CurrentTime);
1014	<	close(fbdev_fd);
1015	<	}
1763	>	#ifdef ENABLE_VOSF
1764	>	if (use_vosf) {
1765	>	// Deinitialize VOSF
1766	>	video_vosf_exit();
1767	>	}
1768		#endif
1769
1770	<	XFlush(x_display);
1771	<	XSync(x_display, false);
1772	<	XUnmapWindow(x_display, the_win);
1021	<	wait_unmapped(the_win);
1022	<	XDestroyWindow(x_display, the_win);
1023	<
1024	<	if (have_shm) {
1025	<	XDestroyImage(img);
1026	<	XShmDetach(x_display, &shminfo);
1027	<	have_shm = false;
1028	<	} else {
1029	<	//!! free img
1030	<	}
1031	<	//!! free the_gc
1032	<
1033	<	if (cmap_allocated) {
1034	<	XFreeColormap(x_display, cmap[0]);
1035	<	XFreeColormap(x_display, cmap[1]);
1036	<	cmap_allocated = false;
1037	<	}
1038	<
1039	<	if (!use_vosf) {
1040	<	if (the_buffer) {
1041	<	free(the_buffer);
1042	<	the_buffer = NULL;
1043	<	}
1044	<
1045	<	if (!have_shm && the_buffer_copy) {
1046	<	free(the_buffer_copy);
1047	<	the_buffer_copy = NULL;
1048	<	}
1049	<	}
1050	<	#ifdef ENABLE_VOSF
1051	<	else {
1052	<	//!! uninstall SEGV handler?
1770	>	// Close display
1771	>	delete drv;
1772	>	drv = NULL;
1773
1774	<	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
1775	<	vm_release(the_buffer, the_buffer_size);
1776	<	the_buffer = 0;
1777	<	}
1058	<
1059	<	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
1060	<	vm_release(the_buffer_copy, the_buffer_size);
1061	<	the_buffer_copy = 0;
1062	<	}
1063	<	}
1064	<	#endif
1774	>	// Free colormaps
1775	>	if (cmap[0]) {
1776	>	XFreeColormap(x_display, cmap[0]);
1777	>	cmap[0] = 0;
1778		}
1779	<
1780	<	#ifdef ENABLE_VOSF
1781	<	if (use_vosf) {
1069	<	// Clear mainBuffer data
1070	<	if (mainBuffer.pageInfo) {
1071	<	free(mainBuffer.pageInfo);
1072	<	mainBuffer.pageInfo = 0;
1073	<	}
1074	<
1075	<	if (mainBuffer.dirtyPages) {
1076	<	free(mainBuffer.dirtyPages);
1077	<	mainBuffer.dirtyPages = 0;
1078	<	}
1779	>	if (cmap[1]) {
1780	>	XFreeColormap(x_display, cmap[1]);
1781	>	cmap[1] = 0;
1782		}
1080	–	#endif
1783		}
1784
1785		void VideoExit(void)
1786		{
1787	<	video_close();
1787	>	// Close displays
1788	>	vector<monitor_desc *>::iterator i, end = VideoMonitors.end();
1789	>	for (i = VideoMonitors.begin(); i != end; ++i)
1790	>	dynamic_cast<X11_monitor_desc >(i)->video_close();
1791
1792	<	#ifdef ENABLE_VOSF
1793	<	// Close /dev/zero
1794	<	if (zero_fd > 0)
1795	<	close(zero_fd);
1792	>	#ifdef ENABLE_XF86_VIDMODE
1793	>	// Free video mode list
1794	>	if (x_video_modes) {
1795	>	XFree(x_video_modes);
1796	>	x_video_modes = NULL;
1797	>	}
1798		#endif
1799	+
1800	+	#ifdef ENABLE_FBDEV_DGA
1801	+	// Close framebuffer device
1802	+	if (fbdev_fd >= 0) {
1803	+	close(fbdev_fd);
1804	+	fbdev_fd = -1;
1805	+	}
1806	+	#endif
1807	+
1808	+	// Free depth list
1809	+	if (avail_depths) {
1810	+	XFree(avail_depths);
1811	+	avail_depths = NULL;
1812	+	}
1813		}
1814
1815
#	Line 1099 \| Line 1820 \| void VideoExit(void)
1820		void VideoQuitFullScreen(void)
1821		{
1822		D(bug("VideoQuitFullScreen()\n"));
1823	<	if (display_type == DISPLAY_DGA)
1103	<	quit_full_screen = true;
1823	>	quit_full_screen = true;
1824		}
1825
1826
#	Line 1125 \| Line 1845 \| void VideoInterrupt(void)
1845		* Set palette
1846		*/
1847
1848	<	void video_set_palette(uint8 *pal)
1848	>	void X11_monitor_desc::set_palette(uint8 *pal, int num_in)
1849		{
1850	+	const video_mode &mode = get_current_mode();
1851	+
1852		LOCK_PALETTE;
1853
1854		// Convert colors to XColor array
1855	<	for (int i=0; i<256; i++) {
1856	<	palette[i].pixel = i;
1857	<	palette[i].red = pal[i3] 0x0101;
1858	<	palette[i].green = pal[i3+1] 0x0101;
1859	<	palette[i].blue = pal[i3+2] 0x0101;
1860	<	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1855	>	int num_out = 256;
1856	>	bool stretch = false;
1857	>	if (IsDirectMode(mode)) {
1858	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1859	>	num_out = vis->map_entries;
1860	>	stretch = true;
1861	>	}
1862	>	XColor *p = x_palette;
1863	>	for (int i=0; i<num_out; i++) {
1864	>	int c = (stretch ? (i * num_in) / num_out : i);
1865	>	p->red = pal[c3 + 0] 0x0101;
1866	>	p->green = pal[c3 + 1] 0x0101;
1867	>	p->blue = pal[c3 + 2] 0x0101;
1868	>	p++;
1869		}
1870
1871	+	#ifdef ENABLE_VOSF
1872	+	// Recalculate pixel color expansion map
1873	+	if (!IsDirectMode(mode) && xdepth > 8) {
1874	+	for (int i=0; i<256; i++) {
1875	+	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1876	+	ExpandMap[i] = map_rgb(pal[c3+0], pal[c3+1], pal[c*3+2]);
1877	+	}
1878	+
1879	+	// We have to redraw everything because the interpretation of pixel values changed
1880	+	LOCK_VOSF;
1881	+	PFLAG_SET_ALL;
1882	+	UNLOCK_VOSF;
1883	+	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1884	+	}
1885	+	#endif
1886	+
1887		// Tell redraw thread to change palette
1888	<	palette_changed = true;
1888	>	x_palette_changed = true;
1889
1890		UNLOCK_PALETTE;
1891		}
#	Line 1149 \| Line 1895 \| *void video_set_palette(uint8 pal)**
1895		* Switch video mode
1896		*/
1897
1898	<	void video_switch_to_mode(const video_mode &mode)
1898	>	void X11_monitor_desc::switch_to_current_mode(void)
1899		{
1900	+	// Close and reopen display
1901		video_close();
1902	<	video_open(mode);
1156	<	}
1157	<
1158	<
1159	<	/*
1160	<	* Suspend/resume emulator
1161	<	*/
1902	>	video_open();
1903
1904	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1905	<	static void suspend_emul(void)
1906	<	{
1166	<	if (display_type == DISPLAY_DGA) {
1167	<	// Release ctrl key
1168	<	ADBKeyUp(0x36);
1169	<	ctrl_down = false;
1170	<
1171	<	// Lock frame buffer (this will stop the MacOS thread)
1172	<	LOCK_FRAME_BUFFER;
1173	<
1174	<	// Save frame buffer
1175	<	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1176	<	if (fb_save)
1177	<	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1178	<
1179	<	// Close full screen display
1180	<	#ifdef ENABLE_XF86_DGA
1181	<	XF86DGADirectVideo(x_display, screen, 0);
1182	<	#endif
1183	<	XUngrabPointer(x_display, CurrentTime);
1184	<	XUngrabKeyboard(x_display, CurrentTime);
1185	<	XUnmapWindow(x_display, the_win);
1186	<	wait_unmapped(the_win);
1187	<
1188	<	// Open "suspend" window
1189	<	XSetWindowAttributes wattr;
1190	<	wattr.event_mask = KeyPressMask;
1191	<	wattr.background_pixel = black_pixel;
1192	<
1193	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1194	<	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
1195	<	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1196	<	set_window_focus(suspend_win);
1197	<	XMapWindow(x_display, suspend_win);
1198	<	emul_suspended = true;
1199	<	}
1200	<	}
1201	<
1202	<	static void resume_emul(void)
1203	<	{
1204	<	// Close "suspend" window
1205	<	XDestroyWindow(x_display, suspend_win);
1206	<	XSync(x_display, false);
1207	<
1208	<	// Reopen full screen display
1209	<	XMapRaised(x_display, the_win);
1210	<	wait_mapped(the_win);
1211	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1212	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1213	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1214	<	#ifdef ENABLE_XF86_DGA
1215	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
1216	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1217	<	#endif
1218	<	XSync(x_display, false);
1219	<
1220	<	// the_buffer already contains the data to restore. i.e. since a temporary
1221	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1222	<	// not necessary.
1223	<	#ifdef ENABLE_VOSF
1224	<	if (use_vosf) {
1225	<	LOCK_VOSF;
1226	<	PFLAG_SET_ALL;
1227	<	UNLOCK_VOSF;
1228	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1229	<	}
1230	<	#endif
1231	<
1232	<	// Restore frame buffer
1233	<	if (fb_save) {
1234	<	#ifdef ENABLE_VOSF
1235	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1236	<	if (!use_vosf)
1237	<	#endif
1238	<	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1239	<	free(fb_save);
1240	<	fb_save = NULL;
1904	>	if (drv == NULL) {
1905	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1906	>	QuitEmulator();
1907		}
1242	–
1243	–	#ifdef ENABLE_XF86_DGA
1244	–	if (!IsDirectMode(VideoMonitor.mode))
1245	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1246	–	#endif
1247	–
1248	–	// Unlock frame buffer (and continue MacOS thread)
1249	–	UNLOCK_FRAME_BUFFER;
1250	–	emul_suspended = false;
1908		}
1252	–	#endif
1909
1910
1911		/*
1912	<	* Translate key event to Mac keycode
1912	>	* Translate key event to Mac keycode, returns -1 if no keycode was found
1913	>	* and -2 if the key was recognized as a hotkey
1914		*/
1915
1916	<	static int kc_decode(KeySym ks)
1916	>	static int kc_decode(KeySym ks, bool key_down)
1917		{
1918		switch (ks) {
1919		case XK_A: case XK_a: return 0x00;
#	Line 1309 \| Line 1966 \| static int kc_decode(KeySym ks)
1966		case XK_period: case XK_greater: return 0x2f;
1967		case XK_slash: case XK_question: return 0x2c;
1968
1969	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1313	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1314	<	#else
1315	<	case XK_Tab: return 0x30;
1316	<	#endif
1969	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1970		case XK_Return: return 0x24;
1971		case XK_space: return 0x31;
1972		case XK_BackSpace: return 0x33;
#	Line 1347 \| Line 2000 \| static int kc_decode(KeySym ks)
2000		case XK_Left: return 0x3b;
2001		case XK_Right: return 0x3c;
2002
2003	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
2003	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
2004
2005	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
2005	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
2006		case XK_F2: return 0x78;
2007		case XK_F3: return 0x63;
2008		case XK_F4: return 0x76;
2009	<	case XK_F5: return 0x60;
2009	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
2010		case XK_F6: return 0x61;
2011		case XK_F7: return 0x62;
2012		case XK_F8: return 0x64;
#	Line 1401 \| Line 2054 \| static int kc_decode(KeySym ks)
2054		return -1;
2055		}
2056
2057	<	static int event2keycode(XKeyEvent &ev)
2057	>	static int event2keycode(XKeyEvent &ev, bool key_down)
2058		{
2059		KeySym ks;
1407	–	int as;
2060		int i = 0;
2061
2062		do {
2063		ks = XLookupKeysym(&ev, i++);
2064	<	as = kc_decode(ks);
2065	<	if (as != -1)
2064	>	int as = kc_decode(ks, key_down);
2065	>	if (as >= 0)
2066	>	return as;
2067	>	if (as == -2)
2068		return as;
2069		} while (ks != NoSymbol);
2070
#	Line 1424 \| Line 2078 \| static int event2keycode(XKeyEvent &ev)
2078
2079		static void handle_events(void)
2080		{
2081	<	while (XPending(x_display)) {
2081	>	for (;;) {
2082		XEvent event;
2083	<	XNextEvent(x_display, &event);
2083	>	XDisplayLock();
2084	>
2085	>	if (!XCheckMaskEvent(x_display, eventmask, &event)) {
2086	>	// Handle clipboard events
2087	>	if (XCheckTypedEvent(x_display, SelectionRequest, &event))
2088	>	ClipboardSelectionRequest(&event.xselectionrequest);
2089	>	else if (XCheckTypedEvent(x_display, SelectionClear, &event))
2090	>	ClipboardSelectionClear(&event.xselectionclear);
2091
2092	+	// Window "close" widget clicked
2093	+	else if (XCheckTypedEvent(x_display, ClientMessage, &event)) {
2094	+	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
2095	+	ADBKeyDown(0x7f); // Power key
2096	+	ADBKeyUp(0x7f);
2097	+	}
2098	+	}
2099	+	XDisplayUnlock();
2100	+	break;
2101	+	}
2102	+
2103		switch (event.type) {
2104	+
2105		// Mouse button
2106		case ButtonPress: {
2107		unsigned int button = event.xbutton.button;
#	Line 1457 \| Line 2130 \| static void handle_events(void)
2130		}
2131
2132		// Mouse moved
1460	–	case EnterNotify:
2133		case MotionNotify:
2134	<	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
2134	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2135	>	break;
2136	>
2137	>	// Mouse entered window
2138	>	case EnterNotify:
2139	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2140	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2141		break;
2142
2143		// Keyboard
2144		case KeyPress: {
2145	<	int code;
2145	>	int code = -1;
2146		if (use_keycodes) {
2147	<	event2keycode(event.xkey); // This is called to process the hotkeys
2148	<	code = keycode_table[event.xkey.keycode & 0xff];
2147	>	if (event2keycode(event.xkey, true) != -2) // This is called to process the hotkeys
2148	>	code = keycode_table[event.xkey.keycode & 0xff];
2149		} else
2150	<	code = event2keycode(event.xkey);
2151	<	if (code != -1) {
2150	>	code = event2keycode(event.xkey, true);
2151	>	if (code >= 0) {
2152		if (!emul_suspended) {
2153		if (code == 0x39) { // Caps Lock pressed
2154		if (caps_on) {
#	Line 1485 \| Line 2163 \| static void handle_events(void)
2163		if (code == 0x36)
2164		ctrl_down = true;
2165		} else {
1488	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2166		if (code == 0x31)
2167	<	resume_emul(); // Space wakes us up
1491	<	#endif
2167	>	drv->resume(); // Space wakes us up
2168		}
2169		}
2170		break;
2171		}
2172		case KeyRelease: {
2173	<	int code;
2173	>	int code = -1;
2174		if (use_keycodes) {
2175	<	event2keycode(event.xkey); // This is called to process the hotkeys
2176	<	code = keycode_table[event.xkey.keycode & 0xff];
2175	>	if (event2keycode(event.xkey, false) != -2) // This is called to process the hotkeys
2176	>	code = keycode_table[event.xkey.keycode & 0xff];
2177		} else
2178	<	code = event2keycode(event.xkey);
2179	<	if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
2178	>	code = event2keycode(event.xkey, false);
2179	>	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
2180		ADBKeyUp(code);
2181		if (code == 0x36)
2182		ctrl_down = false;
#	Line 1511 \| Line 2187 \| static void handle_events(void)
2187		// Hidden parts exposed, force complete refresh of window
2188		case Expose:
2189		if (display_type == DISPLAY_WINDOW) {
2190	+	const video_mode &mode = VideoMonitors[0]->get_current_mode();
2191		#ifdef ENABLE_VOSF
2192		if (use_vosf) { // VOSF refresh
2193		LOCK_VOSF;
2194		PFLAG_SET_ALL;
2195		UNLOCK_VOSF;
2196	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
2196	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
2197		}
2198		else
2199		#endif
#	Line 1527 \| Line 2204 \| static void handle_events(void)
2204		updt_box[x1][y1] = true;
2205		nr_boxes = 16 * 16;
2206		} else // Static refresh
2207	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1531	<	}
1532	<	break;
1533	<
1534	<	// Window "close" widget clicked
1535	<	case ClientMessage:
1536	<	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1537	<	ADBKeyDown(0x7f); // Power key
1538	<	ADBKeyUp(0x7f);
2207	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
2208		}
2209		break;
2210		}
2211	+
2212	+	XDisplayUnlock();
2213		}
2214		}
2215
#	Line 1548 \| Line 2219 \| static void handle_events(void)
2219		*/
2220
2221		// Dynamic display update (variable frame rate for each box)
2222	<	static void update_display_dynamic(int ticker)
2222	>	static void update_display_dynamic(int ticker, driver_window *drv)
2223		{
2224		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2225		int xil = 0;
2226		int rxm = 0, rxmo = 0;
2227	<	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2228	<	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2229	<	int rx = VideoMonitor.mode.bytes_per_row / 16;
2230	<	int ry = VideoMonitor.mode.y / 16;
2227	>	const video_mode &mode = drv->monitor.get_current_mode();
2228	>	int bytes_per_row = mode.bytes_per_row;
2229	>	int bytes_per_pixel = mode.bytes_per_row / mode.x;
2230	>	int rx = mode.bytes_per_row / 16;
2231	>	int ry = mode.y / 16;
2232		int max_box;
2233
2234		y2s = sm_uptd[ticker % 8];
#	Line 1582 \| Line 2254 \| static void update_display_dynamic(int t
2254		}
2255		}
2256
2257	+	XDisplayLock();
2258		if ((nr_boxes <= max_box) && (nr_boxes)) {
2259		for (y1=0; y1<16; y1++) {
2260		for (x1=0; x1<16; x1++) {
#	Line 1610 \| Line 2283 \| static void update_display_dynamic(int t
2283		i = (yi * bytes_per_row) + xi;
2284		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2285		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2286	<	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2287	<	if (have_shm)
2288	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2286	>	if (mode.depth == VDEPTH_1BIT) {
2287	>	if (drv->have_shm)
2288	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2289		else
2290	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2290	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2291		} else {
2292	<	if (have_shm)
2293	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2292	>	if (drv->have_shm)
2293	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2294		else
2295	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2295	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2296		}
2297		xil = 0;
2298		}
#	Line 1635 \| Line 2308 \| static void update_display_dynamic(int t
2308		}
2309		nr_boxes = 0;
2310		}
2311	+	XDisplayUnlock();
2312		}
2313
2314		// Static display update (fixed frame rate, but incremental)
2315	<	static void update_display_static(void)
2315	>	static void update_display_static(driver_window *drv)
2316		{
2317		// Incremental update code
2318	<	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2319	<	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2320	<	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2318	>	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
2319	>	const video_mode &mode = drv->monitor.get_current_mode();
2320	>	int bytes_per_row = mode.bytes_per_row;
2321	>	int bytes_per_pixel = mode.bytes_per_row / mode.x;
2322		uint8 p, p2;
2323
2324		// Check for first line from top and first line from bottom that have changed
2325		y1 = 0;
2326	<	for (j=0; j<VideoMonitor.mode.y; j++) {
2326	>	for (j=0; j<mode.y; j++) {
2327		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2328		y1 = j;
2329		break;
2330		}
2331		}
2332		y2 = y1 - 1;
2333	<	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
2333	>	for (j=mode.y-1; j>=y1; j--) {
2334		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2335		y2 = j;
2336		break;
#	Line 1665 \| Line 2340 \| static void update_display_static(void)
2340
2341		// Check for first column from left and first column from right that have changed
2342		if (high) {
2343	<	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2344	<	x1 = VideoMonitor.mode.x - 1;
2343	>	if (mode.depth == VDEPTH_1BIT) {
2344	>	x1 = mode.x - 1;
2345		for (j=y1; j<=y2; j++) {
2346		p = &the_buffer[j * bytes_per_row];
2347		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1684 \| Line 2359 \| static void update_display_static(void)
2359		p2 = &the_buffer_copy[j * bytes_per_row];
2360		p += bytes_per_row;
2361		p2 += bytes_per_row;
2362	<	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
2362	>	for (i=(mode.x>>3); i>(x2>>3); i--) {
2363		p--; p2--;
2364		if (p != p2) {
2365		x2 = (i << 3) + 7;
#	Line 1703 \| Line 2378 \| static void update_display_static(void)
2378		}
2379
2380		} else {
2381	<	x1 = VideoMonitor.mode.x;
2381	>	x1 = mode.x;
2382		for (j=y1; j<=y2; j++) {
2383		p = &the_buffer[j * bytes_per_row];
2384		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1721 \| Line 2396 \| static void update_display_static(void)
2396		p2 = &the_buffer_copy[j * bytes_per_row];
2397		p += bytes_per_row;
2398		p2 += bytes_per_row;
2399	<	for (i=VideoMonitor.mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2399	>	for (i=mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2400		p--;
2401		p2--;
2402		if (p != p2) {
#	Line 1743 \| Line 2418 \| static void update_display_static(void)
2418		}
2419
2420		// Refresh display
2421	+	XDisplayLock();
2422		if (high && wide) {
2423	<	if (have_shm)
2424	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2423	>	if (drv->have_shm)
2424	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2425		else
2426	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2426	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2427		}
2428	+	XDisplayUnlock();
2429		}
2430
2431
#	Line 1764 \| Line 2441 \| static void update_display_static(void)
2441
2442		static inline void possibly_quit_dga_mode()
2443		{
2444	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2445	<	// Quit DGA mode if requested
2444	>	// Quit DGA mode if requested (something terrible has happened and we
2445	>	// want to give control back to the user)
2446		if (quit_full_screen) {
2447		quit_full_screen = false;
2448	<	#ifdef ENABLE_XF86_DGA
2449	<	XF86DGADirectVideo(x_display, screen, 0);
2450	<	#endif
2451	<	XUngrabPointer(x_display, CurrentTime);
2452	<	XUngrabKeyboard(x_display, CurrentTime);
2453	<	XUnmapWindow(x_display, the_win);
2454	<	wait_unmapped(the_win);
2448	>	delete drv;
2449	>	drv = NULL;
2450	>	}
2451	>	}
2452	>
2453	>	static inline void possibly_ungrab_mouse()
2454	>	{
2455	>	// Ungrab mouse if requested (something terrible has happened and we
2456	>	// want to give control back to the user)
2457	>	if (quit_full_screen) {
2458	>	quit_full_screen = false;
2459	>	if (drv)
2460	>	drv->ungrab_mouse();
2461		}
1779	–	#endif
2462		}
2463
2464	<	static inline void handle_palette_changes(int display_type)
2464	>	static inline void handle_palette_changes(void)
2465		{
2466		LOCK_PALETTE;
2467
2468	<	if (palette_changed) {
2469	<	palette_changed = false;
2470	<	if (!IsDirectMode(VideoMonitor.mode)) {
2471	<	XStoreColors(x_display, cmap[0], palette, 256);
2472	<	XStoreColors(x_display, cmap[1], palette, 256);
1791	<	XSync(x_display, false);
1792	<
1793	<	#ifdef ENABLE_XF86_DGA
1794	<	if (display_type == DISPLAY_DGA) {
1795	<	current_dga_cmap ^= 1;
1796	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1797	<	}
1798	<	#endif
1799	<	}
2468	>	if (x_palette_changed) {
2469	>	x_palette_changed = false;
2470	>	XDisplayLock();
2471	>	drv->update_palette();
2472	>	XDisplayUnlock();
2473		}
2474
2475		UNLOCK_PALETTE;
#	Line 1806 \| Line 2479 \| static void video_refresh_dga(void)
2479		{
2480		// Quit DGA mode if requested
2481		possibly_quit_dga_mode();
1809	–
1810	–	// Handle X events
1811	–	handle_events();
1812	–
1813	–	// Handle palette changes
1814	–	handle_palette_changes(DISPLAY_DGA);
2482		}
2483
2484		#ifdef ENABLE_VOSF
#	Line 1821 \| Line 2488 \| static void video_refresh_dga_vosf(void)
2488		// Quit DGA mode if requested
2489		possibly_quit_dga_mode();
2490
1824	–	// Handle X events
1825	–	handle_events();
1826	–
1827	–	// Handle palette changes
1828	–	handle_palette_changes(DISPLAY_DGA);
1829	–
2491		// Update display (VOSF variant)
2492		static int tick_counter = 0;
2493		if (++tick_counter >= frame_skip) {
2494		tick_counter = 0;
2495		if (mainBuffer.dirty) {
2496		LOCK_VOSF;
2497	<	update_display_dga_vosf();
2497	>	update_display_dga_vosf(static_cast<driver_dga *>(drv));
2498		UNLOCK_VOSF;
2499		}
2500		}
#	Line 1842 \| Line 2503 \| static void video_refresh_dga_vosf(void)
2503
2504		static void video_refresh_window_vosf(void)
2505		{
2506	<	// Quit DGA mode if requested
2507	<	possibly_quit_dga_mode();
1847	<
1848	<	// Handle X events
1849	<	handle_events();
1850	<
1851	<	// Handle palette changes
1852	<	handle_palette_changes(DISPLAY_WINDOW);
2506	>	// Ungrab mouse if requested
2507	>	possibly_ungrab_mouse();
2508
2509		// Update display (VOSF variant)
2510		static int tick_counter = 0;
2511		if (++tick_counter >= frame_skip) {
2512		tick_counter = 0;
2513		if (mainBuffer.dirty) {
2514	+	XDisplayLock();
2515		LOCK_VOSF;
2516	<	update_display_window_vosf();
2516	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2517		UNLOCK_VOSF;
2518		XSync(x_display, false); // Let the server catch up
2519	+	XDisplayUnlock();
2520		}
2521		}
2522		}
#	Line 1867 \| Line 2524 \| static void video_refresh_window_vosf(vo
2524
2525		static void video_refresh_window_static(void)
2526		{
2527	<	// Handle X events
2528	<	handle_events();
2529	<
1873	<	// Handle_palette changes
1874	<	handle_palette_changes(DISPLAY_WINDOW);
1875	<
2527	>	// Ungrab mouse if requested
2528	>	possibly_ungrab_mouse();
2529	>
2530		// Update display (static variant)
2531		static int tick_counter = 0;
2532		if (++tick_counter >= frame_skip) {
2533		tick_counter = 0;
2534	<	update_display_static();
2534	>	update_display_static(static_cast<driver_window *>(drv));
2535		}
2536		}
2537
2538		static void video_refresh_window_dynamic(void)
2539		{
2540	<	// Handle X events
2541	<	handle_events();
2542	<
1889	<	// Handle_palette changes
1890	<	handle_palette_changes(DISPLAY_WINDOW);
1891	<
2540	>	// Ungrab mouse if requested
2541	>	possibly_ungrab_mouse();
2542	>
2543		// Update display (dynamic variant)
2544		static int tick_counter = 0;
2545		tick_counter++;
2546	<	update_display_dynamic(tick_counter);
2546	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2547		}
2548
2549
#	Line 1924 \| Line 2575 \| static void VideoRefreshInit(void)
2575		}
2576		}
2577
2578	+	// This function is called on non-threaded platforms from a timer interrupt
2579		void VideoRefresh(void)
2580		{
2581	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2581	>	// We need to check redraw_thread_active to inhibit refreshed during
2582	>	// mode changes on non-threaded platforms
2583	>	if (!redraw_thread_active)
2584	>	return;
2585	>
2586	>	// Handle X events
2587	>	handle_events();
2588	>
2589	>	// Handle palette changes
2590	>	handle_palette_changes();
2591	>
2592	>	// Update display
2593		video_refresh();
2594		}
2595
2596	<	#ifdef HAVE_PTHREADS
2596	>	const int VIDEO_REFRESH_HZ = 60;
2597	>	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2598	>
2599	>	#ifdef USE_PTHREADS_SERVICES
2600		static void redraw_func(void arg)
2601		{
2602	+	int fd = ConnectionNumber(x_display);
2603	+
2604		uint64 start = GetTicks_usec();
2605		int64 ticks = 0;
2606	<	uint64 next = GetTicks_usec();
2606	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2607	>
2608		while (!redraw_thread_cancel) {
2609	<	video_refresh();
1941	<	next += 16667;
2609	>
2610		int64 delay = next - GetTicks_usec();
2611	<	if (delay > 0)
2612	<	Delay_usec(delay);
2613	<	else if (delay < -16667)
2611	>	if (delay < -VIDEO_REFRESH_DELAY) {
2612	>
2613	>	// We are lagging far behind, so we reset the delay mechanism
2614		next = GetTicks_usec();
2615	<	ticks++;
2615	>
2616	>	} else if (delay <= 0) {
2617	>
2618	>	// Delay expired, refresh display
2619	>	handle_events();
2620	>	handle_palette_changes();
2621	>	video_refresh();
2622	>	next += VIDEO_REFRESH_DELAY;
2623	>	ticks++;
2624	>
2625	>	} else {
2626	>
2627	>	// No display refresh pending, check for X events
2628	>	fd_set readfds;
2629	>	FD_ZERO(&readfds);
2630	>	FD_SET(fd, &readfds);
2631	>	struct timeval timeout;
2632	>	timeout.tv_sec = 0;
2633	>	timeout.tv_usec = delay;
2634	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2635	>	handle_events();
2636	>	}
2637		}
2638	+
2639		uint64 end = GetTicks_usec();
2640	<	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2640	>	D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2641	>
2642	>	redraw_thread_cancel_ack = true;
2643		return NULL;
2644		}
2645		#endif

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.42 by cebix, 2001-06-28T21:20:00Z vs. Revision 1.80 by gbeauche, 2005-06-11T06:43:24Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.42 by cebix, 2001-06-28T21:20:00Z vs.
Revision 1.80 by gbeauche, 2005-06-11T06:43:24Z