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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.33 by cebix, 2001-01-06T22:15:35Z vs.
Revision 1.63 by cebix, 2002-01-15T14:58:37Z

#	Line 1 \| Line 1
1		/*
2		* video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	* Basilisk II (C) 1997-2000 Christian Bauer
4	>	* Basilisk II (C) 1997-2002 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	+	#ifndef NO_STD_NAMESPACE
43	+	using std::sort;
44	+	#endif
45	+
46		#ifdef HAVE_PTHREADS
47		# include <pthread.h>
48		#endif
#	Line 52 \| Line 59
59		# include <sys/mman.h>
60		#endif
61
55	–	#ifdef ENABLE_VOSF
56	–	# include <unistd.h>
57	–	# include <signal.h>
58	–	# include <fcntl.h>
59	–	# include <sys/mman.h>
60	–	#endif
61	–
62		#include "cpu_emulation.h"
63		#include "main.h"
64		#include "adb.h"
#	Line 79 \| 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
94	–	#ifdef HAVE_PTHREADS
98		static bool redraw_thread_active = false; // Flag: Redraw thread installed
99	<	static volatile bool redraw_thread_cancel = false; // Flag: Cancel Redraw thread
99	>	#ifdef HAVE_PTHREADS
100	>	static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
101		static pthread_t redraw_thread; // Redraw thread
102		#endif
103
104		static bool has_dga = false; // Flag: Video DGA capable
105		static bool has_vidmode = false; // Flag: VidMode extension available
106
107	+	#ifdef ENABLE_VOSF
108	+	static bool use_vosf = true; // Flag: VOSF enabled
109	+	#else
110	+	static const bool use_vosf = false; // VOSF not possible
111	+	#endif
112	+
113		static bool ctrl_down = false; // Flag: Ctrl key pressed
114		static bool caps_on = false; // Flag: Caps Lock on
115		static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread
#	Line 113 \| Line 123 \| static int keycode_table[256]; // X
123
124		// X11 variables
125		static int screen; // Screen number
126	<	static int xdepth; // Depth of X screen
127	<	static int depth; // Depth of Mac frame buffer
128	<	static Window rootwin, the_win; // Root window and our window
119	<	static XVisualInfo visualInfo;
120	<	static Visual *vis;
121	<	static Colormap cmap[2]; // Two colormaps (DGA) for 8-bit mode
126	>	static Window rootwin; // Root window and our window
127	>	static int num_depths = 0; // Number of available X depths
128	>	static int *avail_depths = NULL; // List of available X depths
129		static XColor black, white;
130		static unsigned long black_pixel, white_pixel;
131		static int eventmask;
125	–	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask \| StructureNotifyMask;
126	–	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
127	–	static Atom WM_DELETE_WINDOW = (Atom)0;
132
133	<	static XColor palette[256]; // Color palette for 8-bit mode
133	>	static int xdepth; // Depth of X screen
134	>	static XVisualInfo visualInfo;
135	>	static Visual *vis;
136	>	static int color_class;
137	>
138	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
139	>
140	>	static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them)
141	>
142	>	static XColor palette[256]; // Color palette to be used as CLUT and gamma table
143		static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
144	+
145	+	#ifdef ENABLE_FBDEV_DGA
146	+	static int fbdev_fd = -1;
147	+	#endif
148	+
149	+	#ifdef ENABLE_XF86_VIDMODE
150	+	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
151	+	static int num_x_video_modes;
152	+	#endif
153	+
154	+	// Mutex to protect palette
155		#ifdef HAVE_PTHREADS
156	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
156	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
157		#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
158		#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
159		#else
#	Line 137 \| Line 161 \| static pthread_mutex_t palette_lock = PT
161		#define UNLOCK_PALETTE
162		#endif
163
164	<	// Variables for window mode
141	<	static GC the_gc;
142	<	static XImage *img = NULL;
143	<	static XShmSegmentInfo shminfo;
144	<	static Cursor mac_cursor;
145	<	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
146	<	static bool have_shm = false; // Flag: SHM extensions available
147	<	static bool updt_box[17][17]; // Flag for Update
148	<	static int nr_boxes;
149	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
150	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
151	<
152	<	// Variables for XF86 DGA mode
153	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
154	<	static Window suspend_win; // "Suspend" window
155	<	static void *fb_save = NULL; // Saved frame buffer for suspend
164	>	// Mutex to protect frame buffer
165		#ifdef HAVE_PTHREADS
166	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
166	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
167		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
168		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
169		#else
#	Line 162 \| Line 171 \| static pthread_mutex_t frame_buffer_lock
171		#define UNLOCK_FRAME_BUFFER
172		#endif
173
174	<	// Variables for fbdev DGA mode
175	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
176	<	static int fbdev_fd;
177	<
178	<	#ifdef ENABLE_XF86_VIDMODE
170	<	// Variables for XF86 VidMode support
171	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
172	<	static int num_x_video_modes;
173	<	#endif
174	<
175	<	#ifdef ENABLE_VOSF
176	<	static bool use_vosf = true; // Flag: VOSF enabled
177	<	#else
178	<	static const bool use_vosf = false; // Flag: VOSF enabled
179	<	#endif
180	<
181	<	#ifdef ENABLE_VOSF
182	<	// Variables for Video on SEGV support (taken from the Win32 port)
183	<	static uint8 *the_host_buffer; // Host frame buffer in VOSF mode
184	<	static uint32 the_buffer_size; // Size of allocated the_buffer
185	<
186	<	struct ScreenPageInfo {
187	<	int top, bottom; // Mapping between this virtual page and Mac scanlines
188	<	};
189	<
190	<	struct ScreenInfo {
191	<	uint32 memBase; // Real start address
192	<	uint32 memStart; // Start address aligned to page boundary
193	<	uint32 memEnd; // Address of one-past-the-end of the screen
194	<	uint32 memLength; // Length of the memory addressed by the screen pages
195	<
196	<	uint32 pageSize; // Size of a page
197	<	int pageBits; // Shift count to get the page number
198	<	uint32 pageCount; // Number of pages allocated to the screen
199	<
200	<	uint8 * dirtyPages; // Table of flags set if page was altered
201	<	ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines
202	<	};
203	<
204	<	static ScreenInfo mainBuffer;
205	<
206	<	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = 1
207	<	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = 0
208	<	#define PFLAG_ISSET(page) mainBuffer.dirtyPages[page]
209	<	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] == 0)
210	<	#ifdef UNALIGNED_PROFITABLE
211	<	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + page)) == 0)
212	<	#else
213	<	# define PFLAG_ISCLEAR_4(page) \
214	<	(mainBuffer.dirtyPages[page ] == 0) \
215	<	&& (mainBuffer.dirtyPages[page+1] == 0) \
216	<	&& (mainBuffer.dirtyPages[page+2] == 0) \
217	<	&& (mainBuffer.dirtyPages[page+3] == 0)
218	<	#endif
219	<	#define PFLAG_CLEAR_ALL memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
220	<	#define PFLAG_SET_ALL memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
221	<
222	<	static int zero_fd = -1;
223	<	static bool Screen_fault_handler_init();
224	<	static struct sigaction vosf_sa;
225	<
226	<	#ifdef HAVE_PTHREADS
227	<	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
228	<	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
229	<	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
230	<	#else
231	<	#define LOCK_VOSF
232	<	#define UNLOCK_VOSF
233	<	#endif
234	<
235	<	static int log_base_2(uint32 x)
236	<	{
237	<	uint32 mask = 0x80000000;
238	<	int l = 31;
239	<	while (l >= 0 && (x & mask) == 0) {
240	<	mask >>= 1;
241	<	l--;
242	<	}
243	<	return l;
244	<	}
245	<
246	<	#endif
174	>	// Variables for non-VOSF incremental refresh
175	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
176	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
177	>	static bool updt_box[17][17];
178	>	static int nr_boxes;
179
180	<	// VideoRefresh function
181	<	void VideoRefreshInit(void);
180	>	// Video refresh function
181	>	static void VideoRefreshInit(void);
182		static void (*video_refresh)(void);
183
184	+
185		// Prototypes
186		static void redraw_func(void arg);
254	–	static int event2keycode(XKeyEvent &ev);
255	–
187
188		// From main_unix.cpp
189		extern char *x_display_name;
#	Line 261 \| Line 192 \| *extern Display x_display;**
192		// From sys_unix.cpp
193		extern void SysMountFirstFloppy(void);
194
264	–	#ifdef ENABLE_VOSF
265	–	# include "video_vosf.h"
266	–	#endif
267	–
195
196		/*
197	<	* Initialization
197	>	* Utility functions
198		*/
199
200	<	// Set VideoMonitor according to video mode
201	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
200	>	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
201	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
202		{
203	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
204	<	int layout = FLAYOUT_DIRECT;
203	>	return ((red >> rloss) << rshift) \| ((green >> gloss) << gshift) \| ((blue >> bloss) << bshift);
204	>	}
205	>
206	>	// Do we have a visual for handling the specified Mac depth? If so, set the
207	>	// global variables "xdepth", "visualInfo", "vis" and "color_class".
208	>	static bool find_visual_for_depth(video_depth depth)
209	>	{
210	>	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
211	>
212	>	// 1-bit works always and uses default visual
213	>	if (depth == VDEPTH_1BIT) {
214	>	vis = DefaultVisual(x_display, screen);
215	>	visualInfo.visualid = XVisualIDFromVisual(vis);
216	>	int num = 0;
217	>	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
218	>	visualInfo = vi[0];
219	>	XFree(vi);
220	>	xdepth = visualInfo.depth;
221	>	color_class = visualInfo.c_class;
222	>	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
223	>	return true;
224	>	}
225	>
226	>	// Calculate minimum and maximum supported X depth
227	>	int min_depth = 1, max_depth = 32;
228		switch (depth) {
229	<	case 1:
230	<	layout = FLAYOUT_DIRECT;
231	<	break;
232	<	case 8:
233	<	layout = FLAYOUT_DIRECT;
229	>	#ifdef ENABLE_VOSF
230	>	case VDEPTH_2BIT:
231	>	case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
232	>	case VDEPTH_8BIT:
233	>	min_depth = 8;
234	>	max_depth = 32;
235		break;
236	<	case 15:
237	<	layout = FLAYOUT_HOST_555;
236	>	#else
237	>	case VDEPTH_2BIT:
238	>	case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters
239	>	return false;
240	>	case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual
241	>	min_depth = 8;
242	>	max_depth = 8;
243		break;
244	<	case 16:
245	<	layout = FLAYOUT_HOST_565;
244	>	#endif
245	>	case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual
246	>	min_depth = 15;
247	>	max_depth = 16;
248		break;
249	<	case 24:
250	<	case 32:
251	<	layout = FLAYOUT_HOST_888;
249	>	case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual
250	>	min_depth = 24;
251	>	max_depth = 32;
252		break;
253		}
254	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
255	+
256	+	// Try to find a visual for one of the color depths
257	+	bool visual_found = false;
258	+	for (int i=0; i<num_depths && !visual_found; i++) {
259	+
260	+	xdepth = avail_depths[i];
261	+	D(bug(" trying to find visual for depth %d\n", xdepth));
262	+	if (xdepth < min_depth \|\| xdepth > max_depth)
263	+	continue;
264	+
265	+	// Determine best color class for this depth
266	+	switch (xdepth) {
267	+	case 1: // Try StaticGray or StaticColor
268	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
269	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
270	+	visual_found = true;
271	+	break;
272	+	case 8: // Need PseudoColor
273	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
274	+	visual_found = true;
275	+	break;
276	+	case 15:
277	+	case 16:
278	+	case 24:
279	+	case 32: // Try DirectColor first, as this will allow gamma correction
280	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
281	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
282	+	visual_found = true;
283	+	break;
284	+	default:
285	+	D(bug(" not a supported depth\n"));
286	+	break;
287	+	}
288	+	}
289	+	if (!visual_found)
290	+	return false;
291	+
292	+	// Visual was found
293	+	vis = visualInfo.visual;
294	+	color_class = visualInfo.c_class;
295	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
296	+	#if DEBUG
297	+	switch (color_class) {
298	+	case StaticGray: D(bug("StaticGray\n")); break;
299	+	case GrayScale: D(bug("GrayScale\n")); break;
300	+	case StaticColor: D(bug("StaticColor\n")); break;
301	+	case PseudoColor: D(bug("PseudoColor\n")); break;
302	+	case TrueColor: D(bug("TrueColor\n")); break;
303	+	case DirectColor: D(bug("DirectColor\n")); break;
304	+	}
305	+	#endif
306	+	return true;
307	+	}
308	+
309	+	// Add mode to list of supported modes
310	+	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
311	+	{
312	+	video_mode mode;
313	+	mode.x = width;
314	+	mode.y = height;
315	+	mode.resolution_id = resolution_id;
316	+	mode.bytes_per_row = bytes_per_row;
317	+	mode.depth = depth;
318	+	VideoModes.push_back(mode);
319	+	}
320	+
321	+	// Add standard list of windowed modes for given color depth
322	+	static void add_window_modes(video_depth depth)
323	+	{
324	+	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
325	+	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
326	+	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
327	+	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
328	+	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
329	+	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
330	+	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
331	+	}
332	+
333	+	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
334	+	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
335	+	{
336	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
337	+	int layout = FLAYOUT_DIRECT;
338	+	if (depth == VDEPTH_16BIT)
339	+	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
340	+	else if (depth == VDEPTH_32BIT)
341	+	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
342		if (native_byte_order)
343		MacFrameLayout = layout;
344		else
345		MacFrameLayout = FLAYOUT_DIRECT;
346	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
347	+
348	+	// Set variables used by UAE memory banking
349	+	MacFrameBaseHost = the_buffer;
350	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
351	+	InitFrameBufferMapping();
352	+	#else
353	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
354		#endif
355	<	switch (depth) {
302	<	case 1:
303	<	VideoMonitor.mode = VMODE_1BIT;
304	<	break;
305	<	case 8:
306	<	VideoMonitor.mode = VMODE_8BIT;
307	<	break;
308	<	case 15:
309	<	VideoMonitor.mode = VMODE_16BIT;
310	<	break;
311	<	case 16:
312	<	VideoMonitor.mode = VMODE_16BIT;
313	<	break;
314	<	case 24:
315	<	case 32:
316	<	VideoMonitor.mode = VMODE_32BIT;
317	<	break;
318	<	}
319	<	VideoMonitor.x = width;
320	<	VideoMonitor.y = height;
321	<	VideoMonitor.bytes_per_row = bytes_per_row;
355	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
356		}
357
358		// Set window name and class
#	Line 352 \| Line 386 \| static void set_window_focus(Window w)
386		}
387
388		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
389	+	static Atom WM_DELETE_WINDOW = (Atom)0;
390		static void set_window_delete_protocol(Window w)
391		{
392		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 388 \| Line 423 \| *static int error_handler(Display d, XEr**
423		return old_error_handler(d, e);
424		}
425
426	<	// Init window mode
427	<	static bool init_window(int width, int height)
426	>
427	>	/*
428	>	* Display "driver" classes
429	>	*/
430	>
431	>	class driver_base {
432	>	public:
433	>	driver_base();
434	>	virtual ~driver_base();
435	>
436	>	virtual void update_palette(void);
437	>	virtual void suspend(void) {}
438	>	virtual void resume(void) {}
439	>	virtual void toggle_mouse_grab(void) {}
440	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
441	>
442	>	void disable_mouse_accel(void);
443	>	void restore_mouse_accel(void);
444	>
445	>	virtual void grab_mouse(void) {}
446	>	virtual void ungrab_mouse(void) {}
447	>
448	>	public:
449	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
450	>	Window w; // The window we draw into
451	>
452	>	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
453	>	};
454	>
455	>	class driver_window;
456	>	static void update_display_window_vosf(driver_window *drv);
457	>	static void update_display_dynamic(int ticker, driver_window *drv);
458	>	static void update_display_static(driver_window *drv);
459	>
460	>	class driver_window : public driver_base {
461	>	friend void update_display_window_vosf(driver_window *drv);
462	>	friend void update_display_dynamic(int ticker, driver_window *drv);
463	>	friend void update_display_static(driver_window *drv);
464	>
465	>	public:
466	>	driver_window(const video_mode &mode);
467	>	~driver_window();
468	>
469	>	void toggle_mouse_grab(void);
470	>	void mouse_moved(int x, int y);
471	>
472	>	void grab_mouse(void);
473	>	void ungrab_mouse(void);
474	>
475	>	private:
476	>	GC gc;
477	>	XImage *img;
478	>	bool have_shm; // Flag: SHM extensions available
479	>	XShmSegmentInfo shminfo;
480	>	Cursor mac_cursor;
481	>	bool mouse_grabbed; // Flag: mouse pointer grabbed, using relative mouse mode
482	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
483	>	};
484	>
485	>	static driver_base *drv = NULL; // Pointer to currently used driver object
486	>
487	>	#ifdef ENABLE_VOSF
488	>	# include "video_vosf.h"
489	>	#endif
490	>
491	>	driver_base::driver_base()
492	>	: init_ok(false), w(0)
493	>	{
494	>	the_buffer = NULL;
495	>	the_buffer_copy = NULL;
496	>	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
497	>	}
498	>
499	>	driver_base::~driver_base()
500		{
501	+	ungrab_mouse();
502	+	restore_mouse_accel();
503	+
504	+	if (w) {
505	+	XUnmapWindow(x_display, w);
506	+	wait_unmapped(w);
507	+	XDestroyWindow(x_display, w);
508	+	}
509	+
510	+	XFlush(x_display);
511	+	XSync(x_display, false);
512	+
513	+	// Free frame buffer(s)
514	+	if (!use_vosf) {
515	+	if (the_buffer) {
516	+	free(the_buffer);
517	+	the_buffer = NULL;
518	+	}
519	+	if (the_buffer_copy) {
520	+	free(the_buffer_copy);
521	+	the_buffer_copy = NULL;
522	+	}
523	+	}
524	+	#ifdef ENABLE_VOSF
525	+	else {
526	+	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
527	+	if (the_buffer != VM_MAP_FAILED) {
528	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
529	+	vm_release(the_buffer, the_buffer_size);
530	+	the_buffer = NULL;
531	+	}
532	+	if (the_host_buffer) {
533	+	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
534	+	free(the_host_buffer);
535	+	the_host_buffer = NULL;
536	+	}
537	+	if (the_buffer_copy) {
538	+	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
539	+	free(the_buffer_copy);
540	+	the_buffer_copy = NULL;
541	+	}
542	+	}
543	+	#endif
544	+	}
545	+
546	+	// Palette has changed
547	+	void driver_base::update_palette(void)
548	+	{
549	+	if (color_class == PseudoColor \|\| color_class == DirectColor) {
550	+	int num = vis->map_entries;
551	+	if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor)
552	+	return; // Indexed mode on true color screen, don't set CLUT
553	+	XStoreColors(x_display, cmap[0], palette, num);
554	+	XStoreColors(x_display, cmap[1], palette, num);
555	+	}
556	+	XSync(x_display, false);
557	+	}
558	+
559	+	// Disable mouse acceleration
560	+	void driver_base::disable_mouse_accel(void)
561	+	{
562	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
563	+	}
564	+
565	+	// Restore mouse acceleration to original value
566	+	void driver_base::restore_mouse_accel(void)
567	+	{
568	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
569	+	}
570	+
571	+
572	+	/*
573	+	* Windowed display driver
574	+	*/
575	+
576	+	// Open display
577	+	driver_window::driver_window(const video_mode &mode)
578	+	: gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false)
579	+	{
580	+	int width = mode.x, height = mode.y;
581		int aligned_width = (width + 15) & ~15;
582		int aligned_height = (height + 15) & ~15;
583
584		// Set absolute mouse mode
585	<	ADBSetRelMouseMode(false);
585	>	ADBSetRelMouseMode(mouse_grabbed);
586
587	<	// Read frame skip prefs
588	<	frame_skip = PrefsFindInt32("frameskip");
589	<
403	<	// Create window
587	>	// Create window (setting background_pixel, border_pixel and colormap is
588	>	// mandatory when using a non-default visual; in 1-bit mode we use the
589	>	// default visual, so we can also use the default colormap)
590		XSetWindowAttributes wattr;
591		wattr.event_mask = eventmask = win_eventmask;
592	<	wattr.background_pixel = black_pixel;
593	<	wattr.colormap = cmap[0];
594	<
595	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
596	<	InputOutput, vis, CWEventMask \| CWBackPixel \| (depth == 8 ? CWColormap : 0), &wattr);
592	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
593	>	wattr.border_pixel = 0;
594	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
595	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
596	>	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \| CWColormap, &wattr);
597	>	D(bug(" window created\n"));
598
599		// Set window name/class
600	<	set_window_name(the_win, STR_WINDOW_TITLE);
600	>	set_window_name(w, STR_WINDOW_TITLE);
601
602		// Indicate that we want keyboard input
603	<	set_window_focus(the_win);
603	>	set_window_focus(w);
604
605		// Set delete protocol property
606	<	set_window_delete_protocol(the_win);
606	>	set_window_delete_protocol(w);
607
608		// Make window unresizable
609		{
#	Line 427 \| Line 614 \| static bool init_window(int width, int h
614		hints->min_height = height;
615		hints->max_height = height;
616		hints->flags = PMinSize \| PMaxSize;
617	<	XSetWMNormalHints(x_display, the_win, hints);
617	>	XSetWMNormalHints(x_display, w, hints);
618		XFree(hints);
619		}
620		}
621	+	D(bug(" window attributes set\n"));
622
623		// Show window
624	<	XMapWindow(x_display, the_win);
625	<	wait_mapped(the_win);
624	>	XMapWindow(x_display, w);
625	>	wait_mapped(w);
626	>	D(bug(" window mapped\n"));
627	>
628	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
629	>	// use SHM because that doesn't allow changing the image byte order
630	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
631
632		// Try to create and attach SHM image
633	<	have_shm = false;
441	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
633	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
634
635		// Create SHM image ("height + 2" for safety)
636	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
636	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
637	>	D(bug(" shm image created\n"));
638		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
639		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
640		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 456 \| Line 649 \| static bool init_window(int width, int h
649		if (shm_error) {
650		shmdt(shminfo.shmaddr);
651		XDestroyImage(img);
652	+	img = NULL;
653		shminfo.shmid = -1;
654		} else {
655		have_shm = true;
656		shmctl(shminfo.shmid, IPC_RMID, 0);
657		}
658	+	D(bug(" shm image attached\n"));
659		}
660
661		// Create normal X image if SHM doesn't work ("height + 2" for safety)
662		if (!have_shm) {
663	<	int bytes_per_row = aligned_width;
469	<	switch (depth) {
470	<	case 1:
471	<	bytes_per_row /= 8;
472	<	break;
473	<	case 15:
474	<	case 16:
475	<	bytes_per_row *= 2;
476	<	break;
477	<	case 24:
478	<	case 32:
479	<	bytes_per_row *= 4;
480	<	break;
481	<	}
663	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
664		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
665	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
665	>	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);
666	>	D(bug(" X image created\n"));
667		}
668
669	<	// 1-Bit mode is big-endian
487	<	if (depth == 1) {
669	>	if (need_msb_image) {
670		img->byte_order = MSBFirst;
671		img->bitmap_bit_order = MSBFirst;
672		}
673
674		#ifdef ENABLE_VOSF
675	<	// Allocate a page-aligned chunk of memory for frame buffer
676	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
675	>	use_vosf = true;
676	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
677		the_host_buffer = the_buffer_copy;
678	<
679	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
680	<	memset(the_buffer_copy, 0, the_buffer_size);
681	<
500	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
501	<	memset(the_buffer, 0, the_buffer_size);
678	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
679	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
680	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
681	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
682		#else
683		// Allocate memory for frame buffer
684		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
685	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
686		#endif
687
688		// Create GC
689	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
690	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
689	>	gc = XCreateGC(x_display, w, 0, 0);
690	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
691
692		// Create no_cursor
693		mac_cursor = XCreatePixmapCursor(x_display,
694	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
695	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
694	>	XCreatePixmap(x_display, w, 1, 1, 1),
695	>	XCreatePixmap(x_display, w, 1, 1, 1),
696		&black, &white, 0, 0);
697	<	XDefineCursor(x_display, the_win, mac_cursor);
697	>	XDefineCursor(x_display, w, mac_cursor);
698
699	<	// Set VideoMonitor
699	>	// Init blitting routines
700		bool native_byte_order;
701		#ifdef WORDS_BIGENDIAN
702		native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#	Line 523 \| Line 704 \| static bool init_window(int width, int h
704		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
705		#endif
706		#ifdef ENABLE_VOSF
707	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
707	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
708		#endif
709	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
710	<
711	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
712	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
709	>
710	>	// Set VideoMonitor
711	>	VideoMonitor.mode = mode;
712	>	set_mac_frame_buffer(mode.depth, native_byte_order);
713	>
714	>	// Everything went well
715	>	init_ok = true;
716	>	}
717	>
718	>	// Close display
719	>	driver_window::~driver_window()
720	>	{
721	>	if (have_shm) {
722	>	XShmDetach(x_display, &shminfo);
723	>	#ifdef ENABLE_VOSF
724	>	the_host_buffer = NULL; // don't free() in driver_base dtor
725		#else
726	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
726	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
727		#endif
728	<	return true;
728	>	}
729	>	if (img) {
730	>	if (!have_shm)
731	>	img->data = NULL;
732	>	XDestroyImage(img);
733	>	}
734	>	if (have_shm) {
735	>	shmdt(shminfo.shmaddr);
736	>	shmctl(shminfo.shmid, IPC_RMID, 0);
737	>	}
738	>	if (gc)
739	>	XFreeGC(x_display, gc);
740		}
741
742	<	// Init fbdev DGA display
743	<	static bool init_fbdev_dga(char *in_fb_name)
742	>	// Toggle mouse grab
743	>	void driver_window::toggle_mouse_grab(void)
744		{
745	+	if (mouse_grabbed)
746	+	ungrab_mouse();
747	+	else
748	+	grab_mouse();
749	+	}
750	+
751	+	// Grab mouse, switch to relative mouse mode
752	+	void driver_window::grab_mouse(void)
753	+	{
754	+	int result;
755	+	for (int i=0; i<10; i++) {
756	+	result = XGrabPointer(x_display, w, True, 0,
757	+	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
758	+	if (result != AlreadyGrabbed)
759	+	break;
760	+	Delay_usec(100000);
761	+	}
762	+	if (result == GrabSuccess) {
763	+	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
764	+	ADBSetRelMouseMode(mouse_grabbed = true);
765	+	disable_mouse_accel();
766	+	}
767	+	}
768	+
769	+	// Ungrab mouse, switch to absolute mouse mode
770	+	void driver_window::ungrab_mouse(void)
771	+	{
772	+	if (mouse_grabbed) {
773	+	XUngrabPointer(x_display, CurrentTime);
774	+	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
775	+	ADBSetRelMouseMode(mouse_grabbed = false);
776	+	restore_mouse_accel();
777	+	}
778	+	}
779	+
780	+	// Mouse moved
781	+	void driver_window::mouse_moved(int x, int y)
782	+	{
783	+	if (!mouse_grabbed) {
784	+	mouse_last_x = x; mouse_last_y = y;
785	+	ADBMouseMoved(x, y);
786	+	return;
787	+	}
788	+
789	+	// Warped mouse motion (this code is taken from SDL)
790	+
791	+	// Post first mouse event
792	+	int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y;
793	+	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
794	+	mouse_last_x = x; mouse_last_y = y;
795	+	ADBMouseMoved(delta_x, delta_y);
796	+
797	+	// Only warp the pointer when it has reached the edge
798	+	const int MOUSE_FUDGE_FACTOR = 8;
799	+	if (x < MOUSE_FUDGE_FACTOR \|\| x > (width - MOUSE_FUDGE_FACTOR)
800	+	\|\| y < MOUSE_FUDGE_FACTOR \|\| y > (height - MOUSE_FUDGE_FACTOR)) {
801	+	XEvent event;
802	+	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
803	+	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
804	+	mouse_last_x = x; mouse_last_y = y;
805	+	ADBMouseMoved(delta_x, delta_y);
806	+	}
807	+	mouse_last_x = width/2;
808	+	mouse_last_y = height/2;
809	+	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
810	+	for (int i=0; i<10; i++) {
811	+	XMaskEvent(x_display, PointerMotionMask, &event);
812	+	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
813	+	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
814	+	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
815	+	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
816	+	break;
817	+	}
818	+	}
819	+	}
820	+
821	+
822	+	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
823	+	/*
824	+	* DGA display driver base class
825	+	*/
826	+
827	+	class driver_dga : public driver_base {
828	+	public:
829	+	driver_dga();
830	+	~driver_dga();
831	+
832	+	void suspend(void);
833	+	void resume(void);
834	+
835	+	private:
836	+	Window suspend_win; // "Suspend" information window
837	+	void *fb_save; // Saved frame buffer for suspend/resume
838	+	};
839	+
840	+	driver_dga::driver_dga()
841	+	: suspend_win(0), fb_save(NULL)
842	+	{
843	+	}
844	+
845	+	driver_dga::~driver_dga()
846	+	{
847	+	XUngrabPointer(x_display, CurrentTime);
848	+	XUngrabKeyboard(x_display, CurrentTime);
849	+	}
850	+
851	+	// Suspend emulation
852	+	void driver_dga::suspend(void)
853	+	{
854	+	// Release ctrl key
855	+	ADBKeyUp(0x36);
856	+	ctrl_down = false;
857	+
858	+	// Lock frame buffer (this will stop the MacOS thread)
859	+	LOCK_FRAME_BUFFER;
860	+
861	+	// Save frame buffer
862	+	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
863	+	if (fb_save)
864	+	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
865	+
866	+	// Close full screen display
867	+	#ifdef ENABLE_XF86_DGA
868	+	XF86DGADirectVideo(x_display, screen, 0);
869	+	#endif
870	+	XUngrabPointer(x_display, CurrentTime);
871	+	XUngrabKeyboard(x_display, CurrentTime);
872	+	restore_mouse_accel();
873	+	XUnmapWindow(x_display, w);
874	+	wait_unmapped(w);
875	+
876	+	// Open "suspend" window
877	+	XSetWindowAttributes wattr;
878	+	wattr.event_mask = KeyPressMask;
879	+	wattr.background_pixel = black_pixel;
880	+
881	+	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
882	+	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
883	+	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
884	+	set_window_focus(suspend_win);
885	+	XMapWindow(x_display, suspend_win);
886	+	emul_suspended = true;
887	+	}
888	+
889	+	// Resume emulation
890	+	void driver_dga::resume(void)
891	+	{
892	+	// Close "suspend" window
893	+	XDestroyWindow(x_display, suspend_win);
894	+	XSync(x_display, false);
895	+
896	+	// Reopen full screen display
897	+	XMapRaised(x_display, w);
898	+	wait_mapped(w);
899	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
900	+	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
901	+	XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
902	+	disable_mouse_accel();
903	+	#ifdef ENABLE_XF86_DGA
904	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
905	+	XF86DGASetViewPort(x_display, screen, 0, 0);
906	+	#endif
907	+	XSync(x_display, false);
908	+
909	+	// the_buffer already contains the data to restore. i.e. since a temporary
910	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
911	+	// not necessary.
912	+	#ifdef ENABLE_VOSF
913	+	if (use_vosf) {
914	+	LOCK_VOSF;
915	+	PFLAG_SET_ALL;
916	+	UNLOCK_VOSF;
917	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
918	+	}
919	+	#endif
920	+
921	+	// Restore frame buffer
922	+	if (fb_save) {
923	+	#ifdef ENABLE_VOSF
924	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
925	+	if (!use_vosf)
926	+	#endif
927	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
928	+	free(fb_save);
929	+	fb_save = NULL;
930	+	}
931	+
932	+	// Unlock frame buffer (and continue MacOS thread)
933	+	UNLOCK_FRAME_BUFFER;
934	+	emul_suspended = false;
935	+	}
936	+	#endif
937	+
938	+
939		#ifdef ENABLE_FBDEV_DGA
940	+	/*
941	+	* fbdev DGA display driver
942	+	*/
943	+
944	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
945	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
946	+
947	+	class driver_fbdev : public driver_dga {
948	+	public:
949	+	driver_fbdev(const video_mode &mode);
950	+	~driver_fbdev();
951	+	};
952	+
953	+	// Open display
954	+	driver_fbdev::driver_fbdev(const video_mode &mode)
955	+	{
956	+	int width = mode.x, height = mode.y;
957	+
958	+	// Set absolute mouse mode
959	+	ADBSetRelMouseMode(false);
960	+
961		// Find the maximum depth available
962		int ndepths, max_depth(0);
963		int *depths = XListDepths(x_display, screen, &ndepths);
964		if (depths == NULL) {
965		printf("FATAL: Could not determine the maximal depth available\n");
966	<	return false;
966	>	return;
967		} else {
968		while (ndepths-- > 0) {
969		if (depths[ndepths] > max_depth)
#	Line 561 \| Line 980 \| *static bool init_fbdev_dga(char in_fb_n**
980		char str[256];
981		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
982		ErrorAlert(str);
983	<	return false;
983	>	return;
984		}
985
986		int fb_depth; // supported depth
#	Line 581 \| Line 1000 \| *static bool init_fbdev_dga(char in_fb_n**
1000		continue;
1001
1002		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
1003	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
1003	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
1004		device_found = true;
1005		break;
1006		}
#	Line 593 \| Line 1012 \| *static bool init_fbdev_dga(char in_fb_n**
1012		// Frame buffer name not found ? Then, display warning
1013		if (!device_found) {
1014		char str[256];
1015	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
1015	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
1016		ErrorAlert(str);
1017	<	return false;
1017	>	return;
1018		}
1019
601	–	int width = DisplayWidth(x_display, screen);
602	–	int height = DisplayHeight(x_display, screen);
603	–	depth = fb_depth; // max_depth
604	–
605	–	// Set relative mouse mode
606	–	ADBSetRelMouseMode(false);
607	–
1020		// Create window
1021		XSetWindowAttributes wattr;
1022		wattr.event_mask = eventmask = dga_eventmask;
#	Line 612 \| Line 1024 \| *static bool init_fbdev_dga(char in_fb_n**
1024		wattr.override_redirect = True;
1025		wattr.colormap = cmap[0];
1026
1027	<	the_win = XCreateWindow(x_display, rootwin,
1027	>	w = XCreateWindow(x_display, rootwin,
1028		0, 0, width, height,
1029		0, xdepth, InputOutput, vis,
1030	<	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (depth == 8 ? CWColormap : 0),
1030	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
1031		&wattr);
1032
1033		// Set window name/class
1034	<	set_window_name(the_win, STR_WINDOW_TITLE);
1034	>	set_window_name(w, STR_WINDOW_TITLE);
1035
1036		// Indicate that we want keyboard input
1037	<	set_window_focus(the_win);
1037	>	set_window_focus(w);
1038
1039		// Show window
1040	<	XMapRaised(x_display, the_win);
1041	<	wait_mapped(the_win);
1040	>	XMapRaised(x_display, w);
1041	>	wait_mapped(w);
1042
1043		// Grab mouse and keyboard
1044	<	XGrabKeyboard(x_display, the_win, True,
1044	>	XGrabKeyboard(x_display, w, True,
1045		GrabModeAsync, GrabModeAsync, CurrentTime);
1046	<	XGrabPointer(x_display, the_win, True,
1046	>	XGrabPointer(x_display, w, True,
1047		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
1048	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
1048	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1049	>	disable_mouse_accel();
1050
1051	<	// Set VideoMonitor
1052	<	int bytes_per_row = width;
640	<	switch (depth) {
641	<	case 1:
642	<	bytes_per_row = ((width \| 7) & ~7) >> 3;
643	<	break;
644	<	case 15:
645	<	case 16:
646	<	bytes_per_row *= 2;
647	<	break;
648	<	case 24:
649	<	case 32:
650	<	bytes_per_row *= 4;
651	<	break;
652	<	}
1051	>	// Calculate bytes per row
1052	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1053
1054	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1055	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1054	>	// Map frame buffer
1055	>	the_buffer_size = height * bytes_per_row;
1056	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1057	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1058		char str[256];
1059		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1060		ErrorAlert(str);
1061	<	return false;
1061	>	return;
1062		}
1063		}
1064
1065		#if ENABLE_VOSF
1066		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1067	<	// If the blit function is null, i.e. just a copy of the buffer,
1068	<	// we first try to avoid the allocation of a temporary frame buffer
1069	<	use_vosf = true;
668	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
669	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
670	<	use_vosf = false;
1067	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1068	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1069	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1070
1071		if (use_vosf) {
1072	<	the_host_buffer = the_buffer;
1073	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1074	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1075	<	memset(the_buffer_copy, 0, the_buffer_size);
1076	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
678	<	memset(the_buffer, 0, the_buffer_size);
1072	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1073	>	the_host_buffer = the_buffer;
1074	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1075	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1076	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1077		}
1078		#else
1079		use_vosf = false;
1080		#endif
1081		#endif
1082
1083	<	set_video_monitor(width, height, bytes_per_row, true);
1084	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1085	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1086	<	#else
1087	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1088	<	#endif
1089	<	return true;
1090	<	#else
1091	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
1092	<	return false;
1083	>	// Set VideoMonitor
1084	>	VideoModes[0].bytes_per_row = bytes_per_row;
1085	>	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
1086	>	VideoMonitor.mode = mode;
1087	>	set_mac_frame_buffer(mode.depth, true);
1088	>
1089	>	// Everything went well
1090	>	init_ok = true;
1091	>	}
1092	>
1093	>	// Close display
1094	>	driver_fbdev::~driver_fbdev()
1095	>	{
1096	>	if (!use_vosf) {
1097	>	if (the_buffer != MAP_FAILED) {
1098	>	// don't free() the screen buffer in driver_base dtor
1099	>	munmap(the_buffer, the_buffer_size);
1100	>	the_buffer = NULL;
1101	>	}
1102	>	}
1103	>	#ifdef ENABLE_VOSF
1104	>	else {
1105	>	if (the_host_buffer != MAP_FAILED) {
1106	>	// don't free() the screen buffer in driver_base dtor
1107	>	munmap(the_host_buffer, the_buffer_size);
1108	>	the_host_buffer = NULL;
1109	>	}
1110	>	}
1111		#endif
1112		}
1113	+	#endif
1114	+
1115
698	–	// Init XF86 DGA display
699	–	static bool init_xf86_dga(int width, int height)
700	–	{
1116		#ifdef ENABLE_XF86_DGA
1117	+	/*
1118	+	* XFree86 DGA display driver
1119	+	*/
1120	+
1121	+	class driver_xf86dga : public driver_dga {
1122	+	public:
1123	+	driver_xf86dga(const video_mode &mode);
1124	+	~driver_xf86dga();
1125	+
1126	+	void update_palette(void);
1127	+	void resume(void);
1128	+
1129	+	private:
1130	+	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
1131	+	};
1132	+
1133	+	// Open display
1134	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
1135	+	: current_dga_cmap(0)
1136	+	{
1137	+	int width = mode.x, height = mode.y;
1138	+
1139		// Set relative mouse mode
1140		ADBSetRelMouseMode(true);
1141
#	Line 723 \| Line 1160 \| static bool init_xf86_dga(int width, int
1160		wattr.event_mask = eventmask = dga_eventmask;
1161		wattr.override_redirect = True;
1162
1163	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1163	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1164		InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
1165
1166		// Set window name/class
1167	<	set_window_name(the_win, STR_WINDOW_TITLE);
1167	>	set_window_name(w, STR_WINDOW_TITLE);
1168
1169		// Indicate that we want keyboard input
1170	<	set_window_focus(the_win);
1170	>	set_window_focus(w);
1171
1172		// Show window
1173	<	XMapRaised(x_display, the_win);
1174	<	wait_mapped(the_win);
1173	>	XMapRaised(x_display, w);
1174	>	wait_mapped(w);
1175
1176		// Establish direct screen connection
1177	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
1177	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
1178		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1179		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1180		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1181	+	disable_mouse_accel();
1182
1183		int v_width, v_bank, v_size;
1184		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 749 \| Line 1187 \| static bool init_xf86_dga(int width, int
1187		XF86DGASetVidPage(x_display, screen, 0);
1188
1189		// Set colormap
1190	<	if (depth == 8) {
1191	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
1190	>	if (!IsDirectMode(mode)) {
1191	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1192		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1193		}
1194		XSync(x_display, false);
1195
1196	<	// Set VideoMonitor
1197	<	int bytes_per_row = (v_width + 7) & ~7;
1198	<	switch (depth) {
761	<	case 1:
762	<	bytes_per_row /= 8;
763	<	break;
764	<	case 15:
765	<	case 16:
766	<	bytes_per_row *= 2;
767	<	break;
768	<	case 24:
769	<	case 32:
770	<	bytes_per_row *= 4;
771	<	break;
772	<	}
773	<
1196	>	// Init blitting routines
1197	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1198	>	#if VIDEO_VOSF
1199		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1200	<	// If the blit function is null, i.e. just a copy of the buffer,
1201	<	// we first try to avoid the allocation of a temporary frame buffer
1202	<	use_vosf = true;
778	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
779	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
780	<	use_vosf = false;
1200	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1201	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1202	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1203
1204		if (use_vosf) {
1205	<	the_host_buffer = the_buffer;
1206	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1207	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1208	<	memset(the_buffer_copy, 0, the_buffer_size);
1209	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
788	<	memset(the_buffer, 0, the_buffer_size);
1205	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1206	>	the_host_buffer = the_buffer;
1207	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1208	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1209	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1210		}
1211	<	#elif defined(ENABLE_VOSF)
791	<	// The UAE memory handlers will already handle color conversion, if needed.
1211	>	#else
1212		use_vosf = false;
1213		#endif
1214	+	#endif
1215
1216	<	set_video_monitor(width, height, bytes_per_row, true);
1217	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1218	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1219	<	// MacFrameLayout = FLAYOUT_DIRECT;
1220	<	#else
1221	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1216	>	// Set VideoMonitor
1217	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1218	>	VideoMonitor.mode = mode;
1219	>	set_mac_frame_buffer(mode.depth, true);
1220	>
1221	>	// Everything went well
1222	>	init_ok = true;
1223	>	}
1224	>
1225	>	// Close display
1226	>	driver_xf86dga::~driver_xf86dga()
1227	>	{
1228	>	XF86DGADirectVideo(x_display, screen, 0);
1229	>	if (!use_vosf) {
1230	>	// don't free() the screen buffer in driver_base dtor
1231	>	the_buffer = NULL;
1232	>	}
1233	>	#ifdef ENABLE_VOSF
1234	>	else {
1235	>	// don't free() the screen buffer in driver_base dtor
1236	>	the_host_buffer = NULL;
1237	>	}
1238		#endif
1239	<	return true;
1240	<	#else
1241	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
805	<	return false;
1239	>	#ifdef ENABLE_XF86_VIDMODE
1240	>	if (has_vidmode)
1241	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1242		#endif
1243		}
1244
1245	+	// Palette has changed
1246	+	void driver_xf86dga::update_palette(void)
1247	+	{
1248	+	driver_dga::update_palette();
1249	+	current_dga_cmap ^= 1;
1250	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
1251	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1252	+	}
1253	+
1254	+	// Resume emulation
1255	+	void driver_xf86dga::resume(void)
1256	+	{
1257	+	driver_dga::resume();
1258	+	if (!IsDirectMode(VideoMonitor.mode))
1259	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1260	+	}
1261	+	#endif
1262	+
1263	+
1264	+	/*
1265	+	* Initialization
1266	+	*/
1267	+
1268		// Init keycode translation table
1269		static void keycode_init(void)
1270		{
#	Line 871 \| Line 1330 \| static void keycode_init(void)
1330		}
1331		}
1332
1333	<	bool VideoInitBuffer()
1333	>	// Open display for specified mode
1334	>	static bool video_open(const video_mode &mode)
1335		{
1336	<	#ifdef ENABLE_VOSF
877	<	if (use_vosf) {
878	<	const uint32 page_size = getpagesize();
879	<	const uint32 page_mask = page_size - 1;
880	<
881	<	mainBuffer.memBase = (uint32) the_buffer;
882	<	// Align the frame buffer on page boundary
883	<	mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
884	<	mainBuffer.memLength = the_buffer_size;
885	<	mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength;
886	<
887	<	mainBuffer.pageSize = page_size;
888	<	mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
889	<	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
1336	>	D(bug("video_open()\n"));
1337
1338	<	if (mainBuffer.dirtyPages != 0)
1339	<	free(mainBuffer.dirtyPages);
1338	>	// Find best available X visual
1339	>	if (!find_visual_for_depth(mode.depth)) {
1340	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1341	>	return false;
1342	>	}
1343
1344	<	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
1344	>	// Create color maps
1345	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1346	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1347	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1348	>	} else {
1349	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1350	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1351	>	}
1352
1353	<	if (mainBuffer.pageInfo != 0)
1354	<	free(mainBuffer.pageInfo);
1353	>	// Find pixel format of direct modes
1354	>	if (color_class == DirectColor \|\| color_class == TrueColor) {
1355	>	rshift = gshift = bshift = 0;
1356	>	rloss = gloss = bloss = 8;
1357	>	uint32 mask;
1358	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1359	>	++rshift;
1360	>	for (; mask&1; mask>>=1)
1361	>	--rloss;
1362	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1363	>	++gshift;
1364	>	for (; mask&1; mask>>=1)
1365	>	--gloss;
1366	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1367	>	++bshift;
1368	>	for (; mask&1; mask>>=1)
1369	>	--bloss;
1370	>	}
1371	>
1372	>	// Preset palette pixel values for CLUT or gamma table
1373	>	if (color_class == DirectColor) {
1374	>	int num = vis->map_entries;
1375	>	for (int i=0; i<num; i++) {
1376	>	int c = (i * 256) / num;
1377	>	palette[i].pixel = map_rgb(c, c, c);
1378	>	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1379	>	}
1380	>	} else if (color_class == PseudoColor) {
1381	>	for (int i=0; i<256; i++) {
1382	>	palette[i].pixel = i;
1383	>	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1384	>	}
1385	>	}
1386
1387	<	mainBuffer.pageInfo = (ScreenPageInfo ) malloc(mainBuffer.pageCount sizeof(ScreenPageInfo));
1387	>	// Load gray ramp to color map
1388	>	int num = (color_class == DirectColor ? vis->map_entries : 256);
1389	>	for (int i=0; i<num; i++) {
1390	>	int c = (i * 256) / num;
1391	>	palette[i].red = c * 0x0101;
1392	>	palette[i].green = c * 0x0101;
1393	>	palette[i].blue = c * 0x0101;
1394	>	}
1395	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1396	>	XStoreColors(x_display, cmap[0], palette, num);
1397	>	XStoreColors(x_display, cmap[1], palette, num);
1398	>	}
1399
1400	<	if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
1401	<	return false;
1400	>	#ifdef ENABLE_VOSF
1401	>	// Load gray ramp to 8->16/32 expand map
1402	>	if (!IsDirectMode(mode) && xdepth > 8)
1403	>	for (int i=0; i<256; i++)
1404	>	ExpandMap[i] = map_rgb(i, i, i);
1405	>	#endif
1406
1407	<	PFLAG_CLEAR_ALL;
1407	>	// Create display driver object of requested type
1408	>	switch (display_type) {
1409	>	case DISPLAY_WINDOW:
1410	>	drv = new driver_window(mode);
1411	>	break;
1412	>	#ifdef ENABLE_FBDEV_DGA
1413	>	case DISPLAY_DGA:
1414	>	drv = new driver_fbdev(mode);
1415	>	break;
1416	>	#endif
1417	>	#ifdef ENABLE_XF86_DGA
1418	>	case DISPLAY_DGA:
1419	>	drv = new driver_xf86dga(mode);
1420	>	break;
1421	>	#endif
1422	>	}
1423	>	if (drv == NULL)
1424	>	return false;
1425	>	if (!drv->init_ok) {
1426	>	delete drv;
1427	>	drv = NULL;
1428	>	return false;
1429	>	}
1430
1431	<	uint32 a = 0;
1432	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
1433	<	int y1 = a / VideoMonitor.bytes_per_row;
1434	<	if (y1 >= VideoMonitor.y)
1435	<	y1 = VideoMonitor.y - 1;
1436	<
912	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
913	<	if (y2 >= VideoMonitor.y)
914	<	y2 = VideoMonitor.y - 1;
915	<
916	<	mainBuffer.pageInfo[i].top = y1;
917	<	mainBuffer.pageInfo[i].bottom = y2;
918	<
919	<	a += mainBuffer.pageSize;
920	<	if (a > mainBuffer.memLength)
921	<	a = mainBuffer.memLength;
1431	>	#ifdef ENABLE_VOSF
1432	>	if (use_vosf) {
1433	>	// Initialize the VOSF system
1434	>	if (!video_vosf_init()) {
1435	>	ErrorAlert(STR_VOSF_INIT_ERR);
1436	>	return false;
1437		}
923	–
924	–	// We can now write-protect the frame buffer
925	–	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
926	–	return false;
1438		}
1439		#endif
1440	+
1441	+	// Initialize VideoRefresh function
1442	+	VideoRefreshInit();
1443	+
1444	+	// Lock down frame buffer
1445	+	XSync(x_display, false);
1446	+	LOCK_FRAME_BUFFER;
1447	+
1448	+	// Start redraw/input thread
1449	+	#ifdef HAVE_PTHREADS
1450	+	redraw_thread_cancel = false;
1451	+	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1452	+	if (!redraw_thread_active) {
1453	+	printf("FATAL: cannot create redraw thread\n");
1454	+	return false;
1455	+	}
1456	+	#else
1457	+	redraw_thread_active = true;
1458	+	#endif
1459	+
1460		return true;
1461		}
1462
1463		bool VideoInit(bool classic)
1464		{
1465	+	classic_mode = classic;
1466	+
1467		#ifdef ENABLE_VOSF
935	–	// Open /dev/zero
936	–	zero_fd = open("/dev/zero", O_RDWR);
937	–	if (zero_fd < 0) {
938	–	char str[256];
939	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
940	–	ErrorAlert(str);
941	–	return false;
942	–	}
943	–
1468		// Zero the mainBuffer structure
1469	<	mainBuffer.dirtyPages = 0;
1470	<	mainBuffer.pageInfo = 0;
1469	>	mainBuffer.dirtyPages = NULL;
1470	>	mainBuffer.pageInfo = NULL;
1471		#endif
1472
1473		// Check if X server runs on local machine
#	Line 954 \| Line 1478 \| bool VideoInit(bool classic)
1478		keycode_init();
1479
1480		// Read prefs
1481	+	frame_skip = PrefsFindInt32("frameskip");
1482		mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1483		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1484
1485		// Find screen and root window
1486		screen = XDefaultScreen(x_display);
1487		rootwin = XRootWindow(x_display, screen);
1488	<
1489	<	// Get screen depth
1490	<	xdepth = DefaultDepth(x_display, screen);
1488	>
1489	>	// Get sorted list of available depths
1490	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1491	>	if (avail_depths == NULL) {
1492	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1493	>	return false;
1494	>	}
1495	>	sort(avail_depths, avail_depths + num_depths);
1496
1497		#ifdef ENABLE_FBDEV_DGA
1498		// Frame buffer name
1499		char fb_name[20];
1500
1501	<	// Could do fbdev dga ?
1501	>	// Could do fbdev DGA?
1502		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1503		has_dga = true;
1504		else
#	Line 1002 \| Line 1532 \| bool VideoInit(bool classic)
1532		black_pixel = BlackPixel(x_display, screen);
1533		white_pixel = WhitePixel(x_display, screen);
1534
1005	–	// Get appropriate visual
1006	–	int color_class;
1007	–	switch (xdepth) {
1008	–	case 1:
1009	–	color_class = StaticGray;
1010	–	break;
1011	–	case 8:
1012	–	color_class = PseudoColor;
1013	–	break;
1014	–	case 15:
1015	–	case 16:
1016	–	case 24:
1017	–	case 32:
1018	–	color_class = TrueColor;
1019	–	break;
1020	–	default:
1021	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1022	–	return false;
1023	–	}
1024	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1025	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1026	–	return false;
1027	–	}
1028	–	if (visualInfo.depth != xdepth) {
1029	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1030	–	return false;
1031	–	}
1032	–	vis = visualInfo.visual;
1033	–
1034	–	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1035	–	classic_mode = classic;
1036	–	if (classic)
1037	–	depth = 1;
1038	–	else
1039	–	depth = xdepth;
1040	–
1041	–	// Create color maps for 8 bit mode
1042	–	if (depth == 8) {
1043	–	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1044	–	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1045	–	XInstallColormap(x_display, cmap[0]);
1046	–	XInstallColormap(x_display, cmap[1]);
1047	–	}
1048	–
1535		// Get screen mode from preferences
1536		const char *mode_str;
1537	<	if (classic)
1537	>	if (classic_mode)
1538		mode_str = "win/512/342";
1539		else
1540		mode_str = PrefsFindString("screen");
1541
1542	<	// Determine type and mode
1543	<	int width = 512, height = 384;
1542	>	// Determine display type and default dimensions
1543	>	int default_width = 512, default_height = 384;
1544		display_type = DISPLAY_WINDOW;
1545		if (mode_str) {
1546	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1546	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1547		display_type = DISPLAY_WINDOW;
1548		#ifdef ENABLE_FBDEV_DGA
1549	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1550	<	#else
1551	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1549	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1550	>	display_type = DISPLAY_DGA;
1551	>	default_width = -1; default_height = -1; // use entire screen
1552		#endif
1553	+	#ifdef ENABLE_XF86_DGA
1554	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1555		display_type = DISPLAY_DGA;
1556	<	if (width > DisplayWidth(x_display, screen))
1557	<	width = DisplayWidth(x_display, screen);
1070	<	if (height > DisplayHeight(x_display, screen))
1071	<	height = DisplayHeight(x_display, screen);
1072	<	}
1073	<	if (width <= 0)
1074	<	width = DisplayWidth(x_display, screen);
1075	<	if (height <= 0)
1076	<	height = DisplayHeight(x_display, screen);
1556	>	#endif
1557	>	}
1558		}
1559	<
1560	<	// Initialize according to display type
1561	<	switch (display_type) {
1562	<	case DISPLAY_WINDOW:
1563	<	if (!init_window(width, height))
1564	<	return false;
1559	>	if (default_width <= 0)
1560	>	default_width = DisplayWidth(x_display, screen);
1561	>	else if (default_width > DisplayWidth(x_display, screen))
1562	>	default_width = DisplayWidth(x_display, screen);
1563	>	if (default_height <= 0)
1564	>	default_height = DisplayHeight(x_display, screen);
1565	>	else if (default_height > DisplayHeight(x_display, screen))
1566	>	default_height = DisplayHeight(x_display, screen);
1567	>
1568	>	// Mac screen depth follows X depth
1569	>	video_depth default_depth = VDEPTH_1BIT;
1570	>	switch (DefaultDepth(x_display, screen)) {
1571	>	case 8:
1572	>	default_depth = VDEPTH_8BIT;
1573		break;
1574	<	case DISPLAY_DGA:
1575	<	#ifdef ENABLE_FBDEV_DGA
1576	<	if (!init_fbdev_dga(fb_name))
1577	<	#else
1578	<	if (!init_xf86_dga(width, height))
1090	<	#endif
1091	<	return false;
1574	>	case 15: case 16:
1575	>	default_depth = VDEPTH_16BIT;
1576	>	break;
1577	>	case 24: case 32:
1578	>	default_depth = VDEPTH_32BIT;
1579		break;
1580		}
1581
1582	<	// Lock down frame buffer
1583	<	LOCK_FRAME_BUFFER;
1584	<
1585	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1586	<	// Set variables for UAE memory mapping
1587	<	MacFrameBaseHost = the_buffer;
1588	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1589	<
1590	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1104	<	if (classic)
1105	<	MacFrameLayout = FLAYOUT_NONE;
1106	<	#endif
1107	<
1108	<	#ifdef ENABLE_VOSF
1109	<	if (use_vosf) {
1110	<	// Initialize the mainBuffer structure
1111	<	if (!VideoInitBuffer()) {
1112	<	// TODO: STR_VOSF_INIT_ERR ?
1113	<	ErrorAlert("Could not initialize Video on SEGV signals");
1114	<	return false;
1582	>	// Construct list of supported modes
1583	>	if (display_type == DISPLAY_WINDOW) {
1584	>	if (classic)
1585	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1586	>	else {
1587	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1588	>	if (find_visual_for_depth(video_depth(d)))
1589	>	add_window_modes(video_depth(d));
1590	>	}
1591		}
1592	+	} else
1593	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1594	+	if (VideoModes.empty()) {
1595	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1596	+	return false;
1597	+	}
1598	+	video_init_depth_list();
1599
1600	<	// Initialize the handler for SIGSEGV
1601	<	if (!Screen_fault_handler_init()) {
1602	<	// TODO: STR_VOSF_INIT_ERR ?
1603	<	ErrorAlert("Could not initialize Video on SEGV signals");
1604	<	return false;
1605	<	}
1600	>	#if DEBUG
1601	>	D(bug("Available video modes:\n"));
1602	>	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1603	>	while (i != end) {
1604	>	int bits = 1 << i->depth;
1605	>	if (bits == 16)
1606	>	bits = 15;
1607	>	else if (bits == 32)
1608	>	bits = 24;
1609	>	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1610	>	++i;
1611		}
1612		#endif
1125	–
1126	–	// Initialize VideoRefresh function
1127	–	VideoRefreshInit();
1128	–
1129	–	XSync(x_display, false);
1613
1614	<	#ifdef HAVE_PTHREADS
1615	<	// Start redraw/input thread
1616	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1617	<	if (!redraw_thread_active) {
1618	<	printf("FATAL: cannot create redraw thread\n");
1619	<	return false;
1614	>	// Find requested default mode and open display
1615	>	if (VideoModes.size() == 1)
1616	>	return video_open(VideoModes[0]);
1617	>	else {
1618	>	// Find mode with specified dimensions
1619	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1620	>	for (i = VideoModes.begin(); i != end; ++i) {
1621	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1622	>	return video_open(*i);
1623	>	}
1624	>	return video_open(VideoModes[0]);
1625		}
1138	–	#endif
1139	–	return true;
1626		}
1627
1628
#	Line 1144 \| Line 1630 \| bool VideoInit(bool classic)
1630		* Deinitialization
1631		*/
1632
1633	<	void VideoExit(void)
1633	>	// Close display
1634	>	static void video_close(void)
1635		{
1636	<	#ifdef HAVE_PTHREADS
1636	>	D(bug("video_close()\n"));
1637	>
1638		// Stop redraw thread
1639	+	#ifdef HAVE_PTHREADS
1640		if (redraw_thread_active) {
1641		redraw_thread_cancel = true;
1642		#ifdef HAVE_PTHREAD_CANCEL
1643		pthread_cancel(redraw_thread);
1644		#endif
1645		pthread_join(redraw_thread, NULL);
1157	–	redraw_thread_active = false;
1646		}
1647		#endif
1648	+	redraw_thread_active = false;
1649
1650		// Unlock frame buffer
1651		UNLOCK_FRAME_BUFFER;
1652	+	XSync(x_display, false);
1653	+	D(bug(" frame buffer unlocked\n"));
1654
1655	<	// Close window and server connection
1656	<	if (x_display != NULL) {
1657	<	XSync(x_display, false);
1658	<
1659	<	#ifdef ENABLE_XF86_DGA
1169	<	if (display_type == DISPLAY_DGA) {
1170	<	XF86DGADirectVideo(x_display, screen, 0);
1171	<	XUngrabPointer(x_display, CurrentTime);
1172	<	XUngrabKeyboard(x_display, CurrentTime);
1173	<	}
1655	>	#ifdef ENABLE_VOSF
1656	>	if (use_vosf) {
1657	>	// Deinitialize VOSF
1658	>	video_vosf_exit();
1659	>	}
1660		#endif
1661
1662	<	#ifdef ENABLE_XF86_VIDMODE
1663	<	if (has_vidmode && display_type == DISPLAY_DGA)
1664	<	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1179	<	#endif
1662	>	// Close display
1663	>	delete drv;
1664	>	drv = NULL;
1665
1666	<	#ifdef ENABLE_FBDEV_DGA
1667	<	if (display_type == DISPLAY_DGA) {
1668	<	XUngrabPointer(x_display, CurrentTime);
1669	<	XUngrabKeyboard(x_display, CurrentTime);
1670	<	close(fbdev_fd);
1671	<	}
1672	<	#endif
1666	>	// Free colormaps
1667	>	if (cmap[0]) {
1668	>	XFreeColormap(x_display, cmap[0]);
1669	>	cmap[0] = 0;
1670	>	}
1671	>	if (cmap[1]) {
1672	>	XFreeColormap(x_display, cmap[1]);
1673	>	cmap[1] = 0;
1674	>	}
1675	>	}
1676
1677	<	XFlush(x_display);
1678	<	XSync(x_display, false);
1679	<	if (depth == 8) {
1680	<	XFreeColormap(x_display, cmap[0]);
1193	<	XFreeColormap(x_display, cmap[1]);
1194	<	}
1195	<
1196	<	if (!use_vosf) {
1197	<	if (the_buffer) {
1198	<	free(the_buffer);
1199	<	the_buffer = NULL;
1200	<	}
1677	>	void VideoExit(void)
1678	>	{
1679	>	// Close display
1680	>	video_close();
1681
1682	<	if (!have_shm && the_buffer_copy) {
1683	<	free(the_buffer_copy);
1684	<	the_buffer_copy = NULL;
1685	<	}
1686	<	}
1207	<	#ifdef ENABLE_VOSF
1208	<	else {
1209	<	if (the_buffer != (uint8 *)MAP_FAILED) {
1210	<	munmap((caddr_t)the_buffer, the_buffer_size);
1211	<	the_buffer = 0;
1212	<	}
1213	<
1214	<	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1215	<	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1216	<	the_buffer_copy = 0;
1217	<	}
1218	<	}
1219	<	#endif
1682	>	#ifdef ENABLE_XF86_VIDMODE
1683	>	// Free video mode list
1684	>	if (x_video_modes) {
1685	>	XFree(x_video_modes);
1686	>	x_video_modes = NULL;
1687		}
1688	<
1222	<	#ifdef ENABLE_VOSF
1223	<	if (use_vosf) {
1224	<	// Clear mainBuffer data
1225	<	if (mainBuffer.pageInfo) {
1226	<	free(mainBuffer.pageInfo);
1227	<	mainBuffer.pageInfo = 0;
1228	<	}
1688	>	#endif
1689
1690	<	if (mainBuffer.dirtyPages) {
1691	<	free(mainBuffer.dirtyPages);
1692	<	mainBuffer.dirtyPages = 0;
1693	<	}
1690	>	#ifdef ENABLE_FBDEV_DGA
1691	>	// Close framebuffer device
1692	>	if (fbdev_fd >= 0) {
1693	>	close(fbdev_fd);
1694	>	fbdev_fd = -1;
1695		}
1235	–
1236	–	// Close /dev/zero
1237	–	if (zero_fd > 0)
1238	–	close(zero_fd);
1696		#endif
1697	+
1698	+	// Free depth list
1699	+	if (avail_depths) {
1700	+	XFree(avail_depths);
1701	+	avail_depths = NULL;
1702	+	}
1703		}
1704
1705
#	Line 1247 \| Line 1710 \| void VideoExit(void)
1710		void VideoQuitFullScreen(void)
1711		{
1712		D(bug("VideoQuitFullScreen()\n"));
1713	<	if (display_type == DISPLAY_DGA)
1251	<	quit_full_screen = true;
1713	>	quit_full_screen = true;
1714		}
1715
1716
#	Line 1273 \| Line 1735 \| void VideoInterrupt(void)
1735		* Set palette
1736		*/
1737
1738	<	void video_set_palette(uint8 *pal)
1738	>	void video_set_palette(uint8 *pal, int num_in)
1739		{
1740		LOCK_PALETTE;
1741
1742		// Convert colors to XColor array
1743	<	for (int i=0; i<256; i++) {
1744	<	palette[i].pixel = i;
1745	<	palette[i].red = pal[i3] 0x0101;
1746	<	palette[i].green = pal[i3+1] 0x0101;
1747	<	palette[i].blue = pal[i3+2] 0x0101;
1748	<	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1743	>	int num_out = 256;
1744	>	bool stretch = false;
1745	>	if (IsDirectMode(VideoMonitor.mode)) {
1746	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1747	>	num_out = vis->map_entries;
1748	>	stretch = true;
1749	>	}
1750	>	XColor *p = palette;
1751	>	for (int i=0; i<num_out; i++) {
1752	>	int c = (stretch ? (i * num_in) / num_out : i);
1753	>	p->red = pal[c3 + 0] 0x0101;
1754	>	p->green = pal[c3 + 1] 0x0101;
1755	>	p->blue = pal[c3 + 2] 0x0101;
1756	>	p++;
1757		}
1758
1759	+	#ifdef ENABLE_VOSF
1760	+	// Recalculate pixel color expansion map
1761	+	if (!IsDirectMode(VideoMonitor.mode) && xdepth > 8) {
1762	+	for (int i=0; i<256; i++) {
1763	+	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1764	+	ExpandMap[i] = map_rgb(pal[c3+0], pal[c3+1], pal[c*3+2]);
1765	+	}
1766	+
1767	+	// We have to redraw everything because the interpretation of pixel values changed
1768	+	LOCK_VOSF;
1769	+	PFLAG_SET_ALL;
1770	+	UNLOCK_VOSF;
1771	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1772	+	}
1773	+	#endif
1774	+
1775		// Tell redraw thread to change palette
1776		palette_changed = true;
1777
#	Line 1294 \| Line 1780 \| *void video_set_palette(uint8 pal)**
1780
1781
1782		/*
1783	<	* Suspend/resume emulator
1783	>	* Switch video mode
1784		*/
1785
1786	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1301	<	static void suspend_emul(void)
1786	>	void video_switch_to_mode(const video_mode &mode)
1787		{
1788	<	if (display_type == DISPLAY_DGA) {
1789	<	// Release ctrl key
1790	<	ADBKeyUp(0x36);
1306	<	ctrl_down = false;
1307	<
1308	<	// Lock frame buffer (this will stop the MacOS thread)
1309	<	LOCK_FRAME_BUFFER;
1310	<
1311	<	// Save frame buffer
1312	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1313	<	if (fb_save)
1314	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1788	>	// Close and reopen display
1789	>	video_close();
1790	>	video_open(mode);
1791
1792	<	// Close full screen display
1793	<	#ifdef ENABLE_XF86_DGA
1794	<	XF86DGADirectVideo(x_display, screen, 0);
1319	<	#endif
1320	<	XUngrabPointer(x_display, CurrentTime);
1321	<	XUngrabKeyboard(x_display, CurrentTime);
1322	<	XUnmapWindow(x_display, the_win);
1323	<	wait_unmapped(the_win);
1324	<
1325	<	// Open "suspend" window
1326	<	XSetWindowAttributes wattr;
1327	<	wattr.event_mask = KeyPressMask;
1328	<	wattr.background_pixel = black_pixel;
1329	<
1330	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1331	<	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
1332	<	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1333	<	set_window_focus(suspend_win);
1334	<	XMapWindow(x_display, suspend_win);
1335	<	emul_suspended = true;
1336	<	}
1337	<	}
1338	<
1339	<	static void resume_emul(void)
1340	<	{
1341	<	// Close "suspend" window
1342	<	XDestroyWindow(x_display, suspend_win);
1343	<	XSync(x_display, false);
1344	<
1345	<	// Reopen full screen display
1346	<	XMapRaised(x_display, the_win);
1347	<	wait_mapped(the_win);
1348	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1349	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1350	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1351	<	#ifdef ENABLE_XF86_DGA
1352	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
1353	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1354	<	#endif
1355	<	XSync(x_display, false);
1356	<
1357	<	// the_buffer already contains the data to restore. i.e. since a temporary
1358	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1359	<	// not necessary.
1360	<	#ifdef ENABLE_VOSF
1361	<	if (use_vosf) {
1362	<	LOCK_VOSF;
1363	<	PFLAG_SET_ALL;
1364	<	UNLOCK_VOSF;
1365	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1366	<	}
1367	<	#endif
1368	<
1369	<	// Restore frame buffer
1370	<	if (fb_save) {
1371	<	#ifdef ENABLE_VOSF
1372	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1373	<	if (!use_vosf)
1374	<	#endif
1375	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1376	<	free(fb_save);
1377	<	fb_save = NULL;
1792	>	if (drv == NULL) {
1793	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1794	>	QuitEmulator();
1795		}
1379	–
1380	–	#ifdef ENABLE_XF86_DGA
1381	–	if (depth == 8)
1382	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1383	–	#endif
1384	–
1385	–	// Unlock frame buffer (and continue MacOS thread)
1386	–	UNLOCK_FRAME_BUFFER;
1387	–	emul_suspended = false;
1796		}
1389	–	#endif
1797
1798
1799		/*
1800	<	* Translate key event to Mac keycode
1800	>	* Translate key event to Mac keycode, returns -1 if no keycode was found
1801	>	* and -2 if the key was recognized as a hotkey
1802		*/
1803
1804	<	static int kc_decode(KeySym ks)
1804	>	static int kc_decode(KeySym ks, bool key_down)
1805		{
1806		switch (ks) {
1807		case XK_A: case XK_a: return 0x00;
#	Line 1446 \| Line 1854 \| static int kc_decode(KeySym ks)
1854		case XK_period: case XK_greater: return 0x2f;
1855		case XK_slash: case XK_question: return 0x2c;
1856
1857	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1450	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1451	<	#else
1452	<	case XK_Tab: return 0x30;
1453	<	#endif
1857	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1858		case XK_Return: return 0x24;
1859		case XK_space: return 0x31;
1860		case XK_BackSpace: return 0x33;
#	Line 1484 \| Line 1888 \| static int kc_decode(KeySym ks)
1888		case XK_Left: return 0x3b;
1889		case XK_Right: return 0x3c;
1890
1891	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1891	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1892
1893	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1893	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1894		case XK_F2: return 0x78;
1895		case XK_F3: return 0x63;
1896		case XK_F4: return 0x76;
1897	<	case XK_F5: return 0x60;
1897	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1898		case XK_F6: return 0x61;
1899		case XK_F7: return 0x62;
1900		case XK_F8: return 0x64;
#	Line 1538 \| Line 1942 \| static int kc_decode(KeySym ks)
1942		return -1;
1943		}
1944
1945	<	static int event2keycode(XKeyEvent &ev)
1945	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1946		{
1947		KeySym ks;
1544	–	int as;
1948		int i = 0;
1949
1950		do {
1951		ks = XLookupKeysym(&ev, i++);
1952	<	as = kc_decode(ks);
1953	<	if (as != -1)
1952	>	int as = kc_decode(ks, key_down);
1953	>	if (as >= 0)
1954	>	return as;
1955	>	if (as == -2)
1956		return as;
1957		} while (ks != NoSymbol);
1958
#	Line 1566 \| Line 1971 \| static void handle_events(void)
1971		XNextEvent(x_display, &event);
1972
1973		switch (event.type) {
1974	+
1975		// Mouse button
1976		case ButtonPress: {
1977		unsigned int button = event.xbutton.button;
#	Line 1594 \| Line 2000 \| static void handle_events(void)
2000		}
2001
2002		// Mouse moved
1597	–	case EnterNotify:
2003		case MotionNotify:
2004	<	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
2004	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2005	>	break;
2006	>
2007	>	// Mouse entered window
2008	>	case EnterNotify:
2009	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2010	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2011		break;
2012
2013		// Keyboard
2014		case KeyPress: {
2015	<	int code;
2015	>	int code = -1;
2016		if (use_keycodes) {
2017	<	event2keycode(event.xkey); // This is called to process the hotkeys
2018	<	code = keycode_table[event.xkey.keycode & 0xff];
2017	>	if (event2keycode(event.xkey, true) != -2) // This is called to process the hotkeys
2018	>	code = keycode_table[event.xkey.keycode & 0xff];
2019		} else
2020	<	code = event2keycode(event.xkey);
2021	<	if (code != -1) {
2020	>	code = event2keycode(event.xkey, true);
2021	>	if (code >= 0) {
2022		if (!emul_suspended) {
2023		if (code == 0x39) { // Caps Lock pressed
2024		if (caps_on) {
#	Line 1622 \| Line 2033 \| static void handle_events(void)
2033		if (code == 0x36)
2034		ctrl_down = true;
2035		} else {
1625	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2036		if (code == 0x31)
2037	<	resume_emul(); // Space wakes us up
1628	<	#endif
2037	>	drv->resume(); // Space wakes us up
2038		}
2039		}
2040		break;
2041		}
2042		case KeyRelease: {
2043	<	int code;
2043	>	int code = -1;
2044		if (use_keycodes) {
2045	<	event2keycode(event.xkey); // This is called to process the hotkeys
2046	<	code = keycode_table[event.xkey.keycode & 0xff];
2045	>	if (event2keycode(event.xkey, false) != -2) // This is called to process the hotkeys
2046	>	code = keycode_table[event.xkey.keycode & 0xff];
2047		} else
2048	<	code = event2keycode(event.xkey);
2049	<	if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
2048	>	code = event2keycode(event.xkey, false);
2049	>	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
2050		ADBKeyUp(code);
2051		if (code == 0x36)
2052		ctrl_down = false;
#	Line 1653 \| Line 2062 \| static void handle_events(void)
2062		LOCK_VOSF;
2063		PFLAG_SET_ALL;
2064		UNLOCK_VOSF;
2065	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2065	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
2066		}
2067		else
2068		#endif
#	Line 1664 \| Line 2073 \| static void handle_events(void)
2073		updt_box[x1][y1] = true;
2074		nr_boxes = 16 * 16;
2075		} else // Static refresh
2076	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2076	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
2077		}
2078		break;
2079
#	Line 1685 \| Line 2094 \| static void handle_events(void)
2094		*/
2095
2096		// Dynamic display update (variable frame rate for each box)
2097	<	static void update_display_dynamic(int ticker)
2097	>	static void update_display_dynamic(int ticker, driver_window *drv)
2098		{
2099		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2100		int xil = 0;
2101		int rxm = 0, rxmo = 0;
2102	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2103	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2104	<	int rx = VideoMonitor.bytes_per_row / 16;
2105	<	int ry = VideoMonitor.y / 16;
2102	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2103	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2104	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
2105	>	int ry = VideoMonitor.mode.y / 16;
2106		int max_box;
2107
2108		y2s = sm_uptd[ticker % 8];
#	Line 1747 \| Line 2156 \| static void update_display_dynamic(int t
2156		i = (yi * bytes_per_row) + xi;
2157		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2158		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2159	<	if (depth == 1) {
2160	<	if (have_shm)
2161	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2159	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2160	>	if (drv->have_shm)
2161	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2162		else
2163	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2163	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2164		} else {
2165	<	if (have_shm)
2166	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2165	>	if (drv->have_shm)
2166	>	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);
2167		else
2168	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2168	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2169		}
2170		xil = 0;
2171		}
#	Line 1775 \| Line 2184 \| static void update_display_dynamic(int t
2184		}
2185
2186		// Static display update (fixed frame rate, but incremental)
2187	<	static void update_display_static(void)
2187	>	static void update_display_static(driver_window *drv)
2188		{
2189		// Incremental update code
2190	<	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2191	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2192	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2190	>	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
2191	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2192	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2193		uint8 p, p2;
2194
2195		// Check for first line from top and first line from bottom that have changed
2196		y1 = 0;
2197	<	for (j=0; j<VideoMonitor.y; j++) {
2197	>	for (j=0; j<VideoMonitor.mode.y; j++) {
2198		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2199		y1 = j;
2200		break;
2201		}
2202		}
2203		y2 = y1 - 1;
2204	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
2204	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
2205		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2206		y2 = j;
2207		break;
#	Line 1802 \| Line 2211 \| static void update_display_static(void)
2211
2212		// Check for first column from left and first column from right that have changed
2213		if (high) {
2214	<	if (depth == 1) {
2215	<	x1 = VideoMonitor.x - 1;
2214	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2215	>	x1 = VideoMonitor.mode.x - 1;
2216		for (j=y1; j<=y2; j++) {
2217		p = &the_buffer[j * bytes_per_row];
2218		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1821 \| Line 2230 \| static void update_display_static(void)
2230		p2 = &the_buffer_copy[j * bytes_per_row];
2231		p += bytes_per_row;
2232		p2 += bytes_per_row;
2233	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
2233	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
2234		p--; p2--;
2235		if (p != p2) {
2236		x2 = (i << 3) + 7;
#	Line 1840 \| Line 2249 \| static void update_display_static(void)
2249		}
2250
2251		} else {
2252	<	x1 = VideoMonitor.x;
2252	>	x1 = VideoMonitor.mode.x;
2253		for (j=y1; j<=y2; j++) {
2254		p = &the_buffer[j * bytes_per_row];
2255		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1858 \| Line 2267 \| static void update_display_static(void)
2267		p2 = &the_buffer_copy[j * bytes_per_row];
2268		p += bytes_per_row;
2269		p2 += bytes_per_row;
2270	<	for (i=VideoMonitor.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2270	>	for (i=VideoMonitor.mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2271		p--;
2272		p2--;
2273		if (p != p2) {
#	Line 1881 \| Line 2290 \| static void update_display_static(void)
2290
2291		// Refresh display
2292		if (high && wide) {
2293	<	if (have_shm)
2294	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2293	>	if (drv->have_shm)
2294	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2295		else
2296	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2296	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2297		}
2298		}
2299
#	Line 1893 \| Line 2302 \| static void update_display_static(void)
2302		* Screen refresh functions
2303		*/
2304
2305	<	// The specialisations hereunder are meant to enable VOSF with DGA in direct
2306	<	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
2307	<	// not get mapped correctly with respect to the predetermined host frame
2308	<	// buffer base address.
2309	<	//
1901	<	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1902	<	// we first try to "triple allocate" the address spaces according to the real
1903	<	// host frame buffer address. Then, if it fails, we will use a temporary
1904	<	// frame buffer thus making the real host frame buffer updated when pages
1905	<	// of the temp frame buffer are altered.
1906	<	//
1907	<	// As a side effect, a little speed gain in screen updates could be noticed
1908	<	// for other modes than DGA.
1909	<	//
1910	<	// The following two functions below are inline so that a clever compiler
1911	<	// could specialise the code according to the current screen depth and
1912	<	// display type. A more clever compiler would the job by itself though...
1913	<	// (update_display_vosf is inlined as well)
2305	>	// We suggest the compiler to inline the next two functions so that it
2306	>	// may specialise the code according to the current screen depth and
2307	>	// display type. A clever compiler would do that job by itself though...
2308	>
2309	>	// NOTE: update_display_vosf is inlined too
2310
2311		static inline void possibly_quit_dga_mode()
2312		{
2313	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2314	<	// Quit DGA mode if requested
2313	>	// Quit DGA mode if requested (something terrible has happened and we
2314	>	// want to give control back to the user)
2315		if (quit_full_screen) {
2316		quit_full_screen = false;
2317	<	#ifdef ENABLE_XF86_DGA
2318	<	XF86DGADirectVideo(x_display, screen, 0);
2319	<	#endif
2320	<	XUngrabPointer(x_display, CurrentTime);
2321	<	XUngrabKeyboard(x_display, CurrentTime);
2322	<	XUnmapWindow(x_display, the_win);
2323	<	XSync(x_display, false);
2317	>	delete drv;
2318	>	drv = NULL;
2319	>	}
2320	>	}
2321	>
2322	>	static inline void possibly_ungrab_mouse()
2323	>	{
2324	>	// Ungrab mouse if requested (something terrible has happened and we
2325	>	// want to give control back to the user)
2326	>	if (quit_full_screen) {
2327	>	quit_full_screen = false;
2328	>	if (drv)
2329	>	drv->ungrab_mouse();
2330		}
1929	–	#endif
2331		}
2332
2333	<	static inline void handle_palette_changes(int depth, int display_type)
2333	>	static inline void handle_palette_changes(void)
2334		{
2335		LOCK_PALETTE;
2336
2337		if (palette_changed) {
2338		palette_changed = false;
2339	<	if (depth == 8) {
1939	<	XStoreColors(x_display, cmap[0], palette, 256);
1940	<	XStoreColors(x_display, cmap[1], palette, 256);
1941	<	XSync(x_display, false);
1942	<
1943	<	#ifdef ENABLE_XF86_DGA
1944	<	if (display_type == DISPLAY_DGA) {
1945	<	current_dga_cmap ^= 1;
1946	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1947	<	}
1948	<	#endif
1949	<	}
2339	>	drv->update_palette();
2340		}
2341
2342		UNLOCK_PALETTE;
#	Line 1956 \| Line 2346 \| static void video_refresh_dga(void)
2346		{
2347		// Quit DGA mode if requested
2348		possibly_quit_dga_mode();
1959	–
1960	–	// Handle X events
1961	–	handle_events();
1962	–
1963	–	// Handle palette changes
1964	–	handle_palette_changes(depth, DISPLAY_DGA);
2349		}
2350
2351		#ifdef ENABLE_VOSF
#	Line 1971 \| Line 2355 \| static void video_refresh_dga_vosf(void)
2355		// Quit DGA mode if requested
2356		possibly_quit_dga_mode();
2357
1974	–	// Handle X events
1975	–	handle_events();
1976	–
1977	–	// Handle palette changes
1978	–	handle_palette_changes(depth, DISPLAY_DGA);
1979	–
2358		// Update display (VOSF variant)
2359		static int tick_counter = 0;
2360		if (++tick_counter >= frame_skip) {
2361		tick_counter = 0;
2362	<	LOCK_VOSF;
2363	<	update_display_dga_vosf();
2364	<	UNLOCK_VOSF;
2362	>	if (mainBuffer.dirty) {
2363	>	LOCK_VOSF;
2364	>	update_display_dga_vosf();
2365	>	UNLOCK_VOSF;
2366	>	}
2367		}
2368		}
2369		#endif
2370
2371		static void video_refresh_window_vosf(void)
2372		{
2373	<	// Quit DGA mode if requested
2374	<	possibly_quit_dga_mode();
1995	<
1996	<	// Handle X events
1997	<	handle_events();
1998	<
1999	<	// Handle palette changes
2000	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2373	>	// Ungrab mouse if requested
2374	>	possibly_ungrab_mouse();
2375
2376		// Update display (VOSF variant)
2377		static int tick_counter = 0;
2378		if (++tick_counter >= frame_skip) {
2379		tick_counter = 0;
2380	<	LOCK_VOSF;
2381	<	update_display_window_vosf();
2382	<	UNLOCK_VOSF;
2380	>	if (mainBuffer.dirty) {
2381	>	LOCK_VOSF;
2382	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2383	>	UNLOCK_VOSF;
2384	>	XSync(x_display, false); // Let the server catch up
2385	>	}
2386		}
2387		}
2388		#endif // def ENABLE_VOSF
2389
2390		static void video_refresh_window_static(void)
2391		{
2392	<	// Handle X events
2393	<	handle_events();
2394	<
2018	<	// Handle_palette changes
2019	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2020	<
2392	>	// Ungrab mouse if requested
2393	>	possibly_ungrab_mouse();
2394	>
2395		// Update display (static variant)
2396		static int tick_counter = 0;
2397		if (++tick_counter >= frame_skip) {
2398		tick_counter = 0;
2399	<	update_display_static();
2399	>	update_display_static(static_cast<driver_window *>(drv));
2400		}
2401		}
2402
2403		static void video_refresh_window_dynamic(void)
2404		{
2405	<	// Handle X events
2406	<	handle_events();
2407	<
2034	<	// Handle_palette changes
2035	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2036	<
2405	>	// Ungrab mouse if requested
2406	>	possibly_ungrab_mouse();
2407	>
2408		// Update display (dynamic variant)
2409		static int tick_counter = 0;
2410		tick_counter++;
2411	<	update_display_dynamic(tick_counter);
2411	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2412		}
2413
2414
#	Line 2045 \| Line 2416 \| static void video_refresh_window_dynamic
2416		* Thread for screen refresh, input handling etc.
2417		*/
2418
2419	<	void VideoRefreshInit(void)
2419	>	static void VideoRefreshInit(void)
2420		{
2421		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2422		if (display_type == DISPLAY_DGA) {
#	Line 2069 \| Line 2440 \| void VideoRefreshInit(void)
2440		}
2441		}
2442
2443	+	// This function is called on non-threaded platforms from a timer interrupt
2444		void VideoRefresh(void)
2445		{
2446	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2446	>	// We need to check redraw_thread_active to inhibit refreshed during
2447	>	// mode changes on non-threaded platforms
2448	>	if (!redraw_thread_active)
2449	>	return;
2450	>
2451	>	// Handle X events
2452	>	handle_events();
2453	>
2454	>	// Handle palette changes
2455	>	handle_palette_changes();
2456	>
2457	>	// Update display
2458		video_refresh();
2459		}
2460
2461	+	const int VIDEO_REFRESH_HZ = 60;
2462	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2463	+
2464		#ifdef HAVE_PTHREADS
2465		static void redraw_func(void arg)
2466		{
2467	+	int fd = ConnectionNumber(x_display);
2468	+
2469		uint64 start = GetTicks_usec();
2470		int64 ticks = 0;
2471	<	uint64 next = GetTicks_usec();
2471	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2472	>
2473		while (!redraw_thread_cancel) {
2474	<	video_refresh();
2086	<	next += 16667;
2474	>
2475		int64 delay = next - GetTicks_usec();
2476	<	if (delay > 0)
2477	<	Delay_usec(delay);
2478	<	else if (delay < -16667)
2476	>	if (delay < -VIDEO_REFRESH_DELAY) {
2477	>
2478	>	// We are lagging far behind, so we reset the delay mechanism
2479		next = GetTicks_usec();
2480	<	ticks++;
2480	>
2481	>	} else if (delay <= 0) {
2482	>
2483	>	// Delay expired, refresh display
2484	>	handle_events();
2485	>	handle_palette_changes();
2486	>	video_refresh();
2487	>	next += VIDEO_REFRESH_DELAY;
2488	>	ticks++;
2489	>
2490	>	} else {
2491	>
2492	>	// No display refresh pending, check for X events
2493	>	fd_set readfds;
2494	>	FD_ZERO(&readfds);
2495	>	FD_SET(fd, &readfds);
2496	>	struct timeval timeout;
2497	>	timeout.tv_sec = 0;
2498	>	timeout.tv_usec = delay;
2499	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2500	>	handle_events();
2501	>	}
2502		}
2503	+
2504		uint64 end = GetTicks_usec();
2505	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2505	>	D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2506		return NULL;
2507		}
2508		#endif

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.33 by cebix, 2001-01-06T22:15:35Z vs. Revision 1.63 by cebix, 2002-01-15T14:58:37Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.33 by cebix, 2001-01-06T22:15:35Z vs.
Revision 1.63 by cebix, 2002-01-15T14:58:37Z