[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.60 by cebix, 2001-07-11T19:26:14Z

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

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.33 by cebix, 2001-01-06T22:15:35Z vs.
Revision 1.60 by cebix, 2001-07-11T19:26:14Z