ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/video_x.cpp

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.30 by cebix, 2000-11-03T18:27:55Z vs.
Revision 1.50 by cebix, 2001-07-01T21:09:29Z

#	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 52 | Line 52
52		# include <sys/mman.h>
53		#endif
54
55	–	#ifdef ENABLE_VOSF
56	–	# include <unistd.h>
57	–	# include <signal.h>
58	–	# include <fcntl.h>
59	–	# include <sys/mman.h>
60	–	#endif
61	–
55		#include "cpu_emulation.h"
56		#include "main.h"
57		#include "adb.h"
#	Line 79 | Line 72 | enum {
72
73		// Constants
74		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
75	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
75	>
76	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
77	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
78
79
80		// Global variables
81		static int32 frame_skip;                                                        // Prefs items
82	<	static int16 mouse_wheel_mode = 1;
83	<	static int16 mouse_wheel_lines = 3;
82	>	static int16 mouse_wheel_mode;
83	>	static int16 mouse_wheel_lines;
84
85		static int display_type = DISPLAY_WINDOW;                       // See enum above
86		static bool local_X11;                                                          // Flag: X server running on local machine?
87	<	static uint8 *the_buffer;                                                       // Mac frame buffer
87	>	static uint8 *the_buffer = NULL;                                        // Mac frame buffer (where MacOS draws into)
88	>	static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer (for refreshed modes)
89
94	–	#ifdef HAVE_PTHREADS
90		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
91	<	static volatile bool redraw_thread_cancel = false;      // Flag: Cancel Redraw thread
91	>	#ifdef HAVE_PTHREADS
92	>	static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
93		static pthread_t redraw_thread;                                         // Redraw thread
94		#endif
95
96		static bool has_dga = false;                                            // Flag: Video DGA capable
97		static bool has_vidmode = false;                                        // Flag: VidMode extension available
98
99	+	#ifdef ENABLE_VOSF
100	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
101	+	#else
102	+	static const bool use_vosf = false;                                     // VOSF not possible
103	+	#endif
104	+
105		static bool ctrl_down = false;                                          // Flag: Ctrl key pressed
106		static bool caps_on = false;                                            // Flag: Caps Lock on
107		static bool quit_full_screen = false;                           // Flag: DGA close requested from redraw thread
#	Line 114 | Line 116 | static int keycode_table[256];                                         // X
116		// X11 variables
117		static int screen;                                                                      // Screen number
118		static int xdepth;                                                                      // Depth of X screen
119	<	static int depth;                                                                       // Depth of Mac frame buffer
118	<	static Window rootwin, the_win;                                         // Root window and our window
119	>	static Window rootwin;                                                          // Root window and our window
120		static XVisualInfo visualInfo;
121		static Visual *vis;
122	<	static Colormap cmap[2];                                                        // Two colormaps (DGA) for 8-bit mode
122	>	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
123		static XColor black, white;
124		static unsigned long black_pixel, white_pixel;
125		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;
126
127	<	static XColor palette[256];                                                     // Color palette for 8-bit mode
127	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
128	>
129	>	static XColor palette[256];                                                     // Color palette to be used as CLUT and gamma table
130		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
131	+
132	+	#ifdef ENABLE_FBDEV_DGA
133	+	static int fbdev_fd = -1;
134	+	#endif
135	+
136	+	#ifdef ENABLE_XF86_VIDMODE
137	+	static XF86VidModeModeInfo **x_video_modes = NULL;      // Array of all available modes
138	+	static int num_x_video_modes;
139	+	#endif
140	+
141	+	// Mutex to protect palette
142		#ifdef HAVE_PTHREADS
143	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
143	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
144		#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
145		#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
146		#else
#	Line 137 | Line 148 | static pthread_mutex_t palette_lock = PT
148		#define UNLOCK_PALETTE
149		#endif
150
151	<	// 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
151	>	// Mutex to protect frame buffer
152		#ifdef HAVE_PTHREADS
153	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
153	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
154		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
155		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
156		#else
#	Line 162 | Line 158 | static pthread_mutex_t frame_buffer_lock
158		#define UNLOCK_FRAME_BUFFER
159		#endif
160
161	<	// Variables for fbdev DGA mode
162	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
163	<	static int fbdev_fd;
164	<
165	<	#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
161	>	// Variables for non-VOSF incremental refresh
162	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
163	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
164	>	static bool updt_box[17][17];
165	>	static int nr_boxes;
166
167	<	// VideoRefresh function
168	<	void VideoRefreshInit(void);
167	>	// Video refresh function
168	>	static void VideoRefreshInit(void);
169		static void (*video_refresh)(void);
170
171	+
172		// Prototypes
173		static void *redraw_func(void *arg);
174		static int event2keycode(XKeyEvent &ev);
175
256	–
176		// From main_unix.cpp
177		extern char *x_display_name;
178		extern Display *x_display;
#	Line 261 | Line 180 | extern Display *x_display;
180		// From sys_unix.cpp
181		extern void SysMountFirstFloppy(void);
182
264	–	#ifdef ENABLE_VOSF
265	–	# include "video_vosf.h"
266	–	#endif
267	–
183
184		/*
185	<	*  Initialization
185	>	*  Utility functions
186		*/
187
188	<	// Set VideoMonitor according to video mode
189	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
188	>	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
189	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
190	>	{
191	>	return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift);
192	>	}
193	>
194	>	// Add mode to list of supported modes
195	>	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
196	>	{
197	>	video_mode mode;
198	>	mode.x = width;
199	>	mode.y = height;
200	>	mode.resolution_id = resolution_id;
201	>	mode.bytes_per_row = bytes_per_row;
202	>	mode.depth = depth;
203	>	VideoModes.push_back(mode);
204	>	}
205	>
206	>	// Add standard list of windowed modes for given color depth
207	>	static void add_window_modes(video_depth depth)
208	>	{
209	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
210	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
211	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
212	>	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
213	>	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
214	>	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
215	>	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
216	>	}
217	>
218	>	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
219	>	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
220		{
221		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
222		int layout = FLAYOUT_DIRECT;
223	<	switch (depth) {
224	<	case 1:
225	<	layout = FLAYOUT_DIRECT;
226	<	break;
282	<	case 8:
283	<	layout = FLAYOUT_DIRECT;
284	<	break;
285	<	case 15:
286	<	layout = FLAYOUT_HOST_555;
287	<	break;
288	<	case 16:
289	<	layout = FLAYOUT_HOST_565;
290	<	break;
291	<	case 24:
292	<	case 32:
293	<	layout = FLAYOUT_HOST_888;
294	<	break;
295	<	}
223	>	if (depth == VDEPTH_16BIT)
224	>	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
225	>	else if (depth == VDEPTH_32BIT)
226	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
227		if (native_byte_order)
228		MacFrameLayout = layout;
229		else
230		MacFrameLayout = FLAYOUT_DIRECT;
231	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
232	+
233	+	// Set variables used by UAE memory banking
234	+	MacFrameBaseHost = the_buffer;
235	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
236	+	InitFrameBufferMapping();
237	+	#else
238	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
239	+	D(bug("Host frame buffer = %p, ", the_buffer));
240		#endif
241	<	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;
241	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
242		}
243
244		// Set window name and class
#	Line 334 | Line 254 | static void set_window_name(Window w, in
254		hints->res_name = "BasiliskII";
255		hints->res_class = "BasiliskII";
256		XSetClassHint(x_display, w, hints);
257	<	XFree((char *)hints);
257	>	XFree(hints);
258		}
259		}
260
#	Line 347 | Line 267 | static void set_window_focus(Window w)
267		hints->initial_state = NormalState;
268		hints->flags = InputHint | StateHint;
269		XSetWMHints(x_display, w, hints);
270	<	XFree((char *)hints);
270	>	XFree(hints);
271		}
272		}
273
274		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
275	+	static Atom WM_DELETE_WINDOW = (Atom)0;
276		static void set_window_delete_protocol(Window w)
277		{
278		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 388 | Line 309 | static int error_handler(Display *d, XEr
309		return old_error_handler(d, e);
310		}
311
312	<	// Init window mode
313	<	static bool init_window(int width, int height)
312	>
313	>	/*
314	>	*  Display "driver" classes
315	>	*/
316	>
317	>	class driver_base {
318	>	public:
319	>	driver_base();
320	>	virtual ~driver_base();
321	>
322	>	virtual void update_palette(void);
323	>	virtual void suspend(void) {}
324	>	virtual void resume(void) {}
325	>
326	>	public:
327	>	bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
328	>	Window w;               // The window we draw into
329	>	};
330	>
331	>	class driver_window;
332	>	static void update_display_window_vosf(driver_window *drv);
333	>	static void update_display_dynamic(int ticker, driver_window *drv);
334	>	static void update_display_static(driver_window *drv);
335	>
336	>	class driver_window : public driver_base {
337	>	friend void update_display_window_vosf(driver_window *drv);
338	>	friend void update_display_dynamic(int ticker, driver_window *drv);
339	>	friend void update_display_static(driver_window *drv);
340	>
341	>	public:
342	>	driver_window(const video_mode &mode);
343	>	~driver_window();
344	>
345	>	private:
346	>	GC gc;
347	>	XImage *img;
348	>	bool have_shm;                          // Flag: SHM extensions available
349	>	XShmSegmentInfo shminfo;
350	>	Cursor mac_cursor;
351	>	};
352	>
353	>	static driver_base *drv = NULL; // Pointer to currently used driver object
354	>
355	>	#ifdef ENABLE_VOSF
356	>	# include "video_vosf.h"
357	>	#endif
358	>
359	>	driver_base::driver_base()
360	>	: init_ok(false), w(0)
361	>	{
362	>	the_buffer = NULL;
363	>	the_buffer_copy = NULL;
364	>	}
365	>
366	>	driver_base::~driver_base()
367	>	{
368	>	if (w) {
369	>	XUnmapWindow(x_display, w);
370	>	wait_unmapped(w);
371	>	XDestroyWindow(x_display, w);
372	>	}
373	>
374	>	XFlush(x_display);
375	>	XSync(x_display, false);
376	>
377	>	// Free frame buffer(s)
378	>	if (!use_vosf) {
379	>	if (the_buffer) {
380	>	free(the_buffer);
381	>	the_buffer = NULL;
382	>	}
383	>	if (the_buffer_copy) {
384	>	free(the_buffer_copy);
385	>	the_buffer_copy = NULL;
386	>	}
387	>	}
388	>	#ifdef ENABLE_VOSF
389	>	else {
390	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
391	>	vm_release(the_buffer, the_buffer_size);
392	>	the_buffer = NULL;
393	>	}
394	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
395	>	vm_release(the_buffer_copy, the_buffer_size);
396	>	the_buffer_copy = NULL;
397	>	}
398	>	}
399	>	#endif
400	>	}
401	>
402	>	// Palette has changed
403	>	void driver_base::update_palette(void)
404	>	{
405	>	if (cmap[0] && cmap[1]) {
406	>	int num = 256;
407	>	if (IsDirectMode(VideoMonitor.mode))
408	>	num = vis->map_entries; // Palette is gamma table
409	>	else if (vis->c_class == DirectColor)
410	>	return; // Indexed mode on true color screen, don't set CLUT
411	>	XStoreColors(x_display, cmap[0], palette, num);
412	>	XStoreColors(x_display, cmap[1], palette, num);
413	>	}
414	>	XSync(x_display, false);
415	>	}
416	>
417	>
418	>	/*
419	>	*  Windowed display driver
420	>	*/
421	>
422	>	// Open display
423	>	driver_window::driver_window(const video_mode &mode)
424	>	: gc(0), img(NULL), have_shm(false), mac_cursor(0)
425		{
426	+	int width = mode.x, height = mode.y;
427		int aligned_width = (width + 15) & ~15;
428		int aligned_height = (height + 15) & ~15;
429
430		// Set absolute mouse mode
431		ADBSetRelMouseMode(false);
432
400	–	// Read frame skip prefs
401	–	frame_skip = PrefsFindInt32("frameskip");
402	–
433		// Create window
434		XSetWindowAttributes wattr;
435		wattr.event_mask = eventmask = win_eventmask;
436		wattr.background_pixel = black_pixel;
437	<	wattr.colormap = cmap[0];
438	<
439	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
410	<	InputOutput, vis, CWEventMask | CWBackPixel | (depth == 8 ? CWColormap : 0), &wattr);
437	>	wattr.colormap = (mode.depth == VDEPTH_1BIT && vis->c_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
438	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
439	>	InputOutput, vis, CWEventMask | CWBackPixel | (vis->c_class == PseudoColor || vis->c_class == DirectColor ? CWColormap : 0), &wattr);
440
441		// Set window name/class
442	<	set_window_name(the_win, STR_WINDOW_TITLE);
442	>	set_window_name(w, STR_WINDOW_TITLE);
443
444		// Indicate that we want keyboard input
445	<	set_window_focus(the_win);
445	>	set_window_focus(w);
446
447		// Set delete protocol property
448	<	set_window_delete_protocol(the_win);
448	>	set_window_delete_protocol(w);
449
450		// Make window unresizable
451		{
#	Line 427 | Line 456 | static bool init_window(int width, int h
456		hints->min_height = height;
457		hints->max_height = height;
458		hints->flags = PMinSize | PMaxSize;
459	<	XSetWMNormalHints(x_display, the_win, hints);
460	<	XFree((char *)hints);
459	>	XSetWMNormalHints(x_display, w, hints);
460	>	XFree(hints);
461		}
462		}
463
464		// Show window
465	<	XMapWindow(x_display, the_win);
466	<	wait_mapped(the_win);
465	>	XMapWindow(x_display, w);
466	>	wait_mapped(w);
467	>
468	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
469	>	// use SHM because that doesn't allow changing the image byte order
470	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
471
472		// Try to create and attach SHM image
473	<	have_shm = false;
441	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
473	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
474
475		// Create SHM image ("height + 2" for safety)
476	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
476	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
477		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
478		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
479		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 465 | Line 497 | static bool init_window(int width, int h
497
498		// Create normal X image if SHM doesn't work ("height + 2" for safety)
499		if (!have_shm) {
500	<	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	<	}
500	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
501		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
502	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
502	>	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);
503		}
504
505	<	// 1-Bit mode is big-endian
487	<	if (depth == 1) {
505	>	if (need_msb_image) {
506		img->byte_order = MSBFirst;
507		img->bitmap_bit_order = MSBFirst;
508		}
509
510		#ifdef ENABLE_VOSF
511	<	// Allocate a page-aligned chunk of memory for frame buffer
494	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
511	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
512		the_host_buffer = the_buffer_copy;
513	<
514	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
515	<	memset(the_buffer_copy, 0, the_buffer_size);
499	<
500	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
501	<	memset(the_buffer, 0, the_buffer_size);
513	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
514	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
515	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
516		#else
517		// Allocate memory for frame buffer
518		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
519		#endif
520
521		// Create GC
522	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
523	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
522	>	gc = XCreateGC(x_display, w, 0, 0);
523	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
524
525		// Create no_cursor
526		mac_cursor = XCreatePixmapCursor(x_display,
527	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
528	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
527	>	XCreatePixmap(x_display, w, 1, 1, 1),
528	>	XCreatePixmap(x_display, w, 1, 1, 1),
529		&black, &white, 0, 0);
530	<	XDefineCursor(x_display, the_win, mac_cursor);
530	>	XDefineCursor(x_display, w, mac_cursor);
531
532	<	// Set VideoMonitor
532	>	// Init blitting routines
533		bool native_byte_order;
534		#ifdef WORDS_BIGENDIAN
535	<	native_byte_order = (img->bitmap_bit_order == MSBFirst);
535	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
536		#else
537	<	native_byte_order = (img->bitmap_bit_order == LSBFirst);
537	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
538		#endif
539		#ifdef ENABLE_VOSF
540	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
540	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
541		#endif
542	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
543	<
544	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
545	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
546	<	#else
547	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
542	>
543	>	// Set VideoMonitor
544	>	VideoMonitor.mode = mode;
545	>	set_mac_frame_buffer(mode.depth, native_byte_order);
546	>
547	>	// Everything went well
548	>	init_ok = true;
549	>	}
550	>
551	>	// Close display
552	>	driver_window::~driver_window()
553	>	{
554	>	if (img)
555	>	XDestroyImage(img);
556	>	if (have_shm) {
557	>	XShmDetach(x_display, &shminfo);
558	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
559	>	}
560	>	if (gc)
561	>	XFreeGC(x_display, gc);
562	>	}
563	>
564	>
565	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
566	>	/*
567	>	*  DGA display driver base class
568	>	*/
569	>
570	>	class driver_dga : public driver_base {
571	>	public:
572	>	driver_dga();
573	>	~driver_dga();
574	>
575	>	void suspend(void);
576	>	void resume(void);
577	>
578	>	private:
579	>	Window suspend_win;             // "Suspend" information window
580	>	void *fb_save;                  // Saved frame buffer for suspend/resume
581	>	};
582	>
583	>	driver_dga::driver_dga()
584	>	: suspend_win(0), fb_save(NULL)
585	>	{
586	>	}
587	>
588	>	driver_dga::~driver_dga()
589	>	{
590	>	XUngrabPointer(x_display, CurrentTime);
591	>	XUngrabKeyboard(x_display, CurrentTime);
592	>	}
593	>
594	>	// Suspend emulation
595	>	void driver_dga::suspend(void)
596	>	{
597	>	// Release ctrl key
598	>	ADBKeyUp(0x36);
599	>	ctrl_down = false;
600	>
601	>	// Lock frame buffer (this will stop the MacOS thread)
602	>	LOCK_FRAME_BUFFER;
603	>
604	>	// Save frame buffer
605	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
606	>	if (fb_save)
607	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
608	>
609	>	// Close full screen display
610	>	#ifdef ENABLE_XF86_DGA
611	>	XF86DGADirectVideo(x_display, screen, 0);
612		#endif
613	<	return true;
613	>	XUngrabPointer(x_display, CurrentTime);
614	>	XUngrabKeyboard(x_display, CurrentTime);
615	>	XUnmapWindow(x_display, w);
616	>	wait_unmapped(w);
617	>
618	>	// Open "suspend" window
619	>	XSetWindowAttributes wattr;
620	>	wattr.event_mask = KeyPressMask;
621	>	wattr.background_pixel = black_pixel;
622	>
623	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
624	>	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
625	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
626	>	set_window_focus(suspend_win);
627	>	XMapWindow(x_display, suspend_win);
628	>	emul_suspended = true;
629		}
630
631	<	// Init fbdev DGA display
632	<	static bool init_fbdev_dga(char *in_fb_name)
631	>	// Resume emulation
632	>	void driver_dga::resume(void)
633		{
634	+	// Close "suspend" window
635	+	XDestroyWindow(x_display, suspend_win);
636	+	XSync(x_display, false);
637	+
638	+	// Reopen full screen display
639	+	XMapRaised(x_display, w);
640	+	wait_mapped(w);
641	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
642	+	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
643	+	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
644	+	#ifdef ENABLE_XF86_DGA
645	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
646	+	XF86DGASetViewPort(x_display, screen, 0, 0);
647	+	#endif
648	+	XSync(x_display, false);
649	+
650	+	// the_buffer already contains the data to restore. i.e. since a temporary
651	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
652	+	// not necessary.
653	+	#ifdef ENABLE_VOSF
654	+	if (use_vosf) {
655	+	LOCK_VOSF;
656	+	PFLAG_SET_ALL;
657	+	UNLOCK_VOSF;
658	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
659	+	}
660	+	#endif
661	+
662	+	// Restore frame buffer
663	+	if (fb_save) {
664	+	#ifdef ENABLE_VOSF
665	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
666	+	if (!use_vosf)
667	+	#endif
668	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
669	+	free(fb_save);
670	+	fb_save = NULL;
671	+	}
672	+
673	+	// Unlock frame buffer (and continue MacOS thread)
674	+	UNLOCK_FRAME_BUFFER;
675	+	emul_suspended = false;
676	+	}
677	+	#endif
678	+
679	+
680		#ifdef ENABLE_FBDEV_DGA
681	+	/*
682	+	*  fbdev DGA display driver
683	+	*/
684	+
685	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
686	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
687	+
688	+	class driver_fbdev : public driver_dga {
689	+	public:
690	+	driver_fbdev(const video_mode &mode);
691	+	~driver_fbdev();
692	+	};
693	+
694	+	// Open display
695	+	driver_fbdev::driver_fbdev(const video_mode &mode)
696	+	{
697	+	int width = mode.x, height = mode.y;
698	+
699	+	// Set absolute mouse mode
700	+	ADBSetRelMouseMode(false);
701	+
702		// Find the maximum depth available
703		int ndepths, max_depth(0);
704		int *depths = XListDepths(x_display, screen, &ndepths);
705		if (depths == NULL) {
706		printf("FATAL: Could not determine the maximal depth available\n");
707	<	return false;
707	>	return;
708		} else {
709		while (ndepths-- > 0) {
710		if (depths[ndepths] > max_depth)
#	Line 561 | Line 721 | static bool init_fbdev_dga(char *in_fb_n
721		char str[256];
722		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
723		ErrorAlert(str);
724	<	return false;
724	>	return;
725		}
726
727		int fb_depth;           // supported depth
#	Line 581 | Line 741 | static bool init_fbdev_dga(char *in_fb_n
741		continue;
742
743		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
744	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
744	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
745		device_found = true;
746		break;
747		}
#	Line 593 | Line 753 | static bool init_fbdev_dga(char *in_fb_n
753		// Frame buffer name not found ? Then, display warning
754		if (!device_found) {
755		char str[256];
756	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
756	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
757		ErrorAlert(str);
758	<	return false;
758	>	return;
759		}
760
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	–
761		// Create window
762		XSetWindowAttributes wattr;
763		wattr.event_mask = eventmask = dga_eventmask;
#	Line 612 | Line 765 | static bool init_fbdev_dga(char *in_fb_n
765		wattr.override_redirect = True;
766		wattr.colormap = cmap[0];
767
768	<	the_win = XCreateWindow(x_display, rootwin,
768	>	w = XCreateWindow(x_display, rootwin,
769		0, 0, width, height,
770		0, xdepth, InputOutput, vis,
771	<	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
771	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (fb_depth <= 8 ? CWColormap : 0),
772		&wattr);
773
774		// Set window name/class
775	<	set_window_name(the_win, STR_WINDOW_TITLE);
775	>	set_window_name(w, STR_WINDOW_TITLE);
776
777		// Indicate that we want keyboard input
778	<	set_window_focus(the_win);
778	>	set_window_focus(w);
779
780		// Show window
781	<	XMapRaised(x_display, the_win);
782	<	wait_mapped(the_win);
781	>	XMapRaised(x_display, w);
782	>	wait_mapped(w);
783
784		// Grab mouse and keyboard
785	<	XGrabKeyboard(x_display, the_win, True,
785	>	XGrabKeyboard(x_display, w, True,
786		GrabModeAsync, GrabModeAsync, CurrentTime);
787	<	XGrabPointer(x_display, the_win, True,
787	>	XGrabPointer(x_display, w, True,
788		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
789	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
789	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
790
791	<	// Set VideoMonitor
792	<	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	<	}
791	>	// Calculate bytes per row
792	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
793
794	+	// Map frame buffer
795		if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
796		if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
797		char str[256];
798		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
799		ErrorAlert(str);
800	<	return false;
800	>	return;
801		}
802		}
803
804		#if ENABLE_VOSF
805		#if REAL_ADDRESSING || DIRECT_ADDRESSING
806	<	// If the blit function is null, i.e. just a copy of the buffer,
807	<	// we first try to avoid the allocation of a temporary frame buffer
808	<	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;
806	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
807	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
808	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
809
810		if (use_vosf) {
811	<	the_host_buffer = the_buffer;
812	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
813	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
814	<	memset(the_buffer_copy, 0, the_buffer_size);
815	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
678	<	memset(the_buffer, 0, the_buffer_size);
811	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
812	>	the_host_buffer = the_buffer;
813	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
814	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
815	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
816		}
817		#else
818		use_vosf = false;
819		#endif
820		#endif
821
822	<	set_video_monitor(width, height, bytes_per_row, true);
823	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
824	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
825	<	#else
826	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
827	<	#endif
828	<	return true;
829	<	#else
693	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
694	<	return false;
695	<	#endif
822	>	// Set VideoMonitor
823	>	VideoModes[0].bytes_per_row = bytes_per_row;
824	>	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
825	>	VideoMonitor.mode = mode;
826	>	set_mac_frame_buffer(mode.depth, true);
827	>
828	>	// Everything went well
829	>	init_ok = true;
830		}
831
832	<	// Init XF86 DGA display
833	<	static bool init_xf86_dga(int width, int height)
832	>	// Close display
833	>	driver_fbdev::~driver_fbdev()
834		{
835	+	}
836	+	#endif
837	+
838	+
839		#ifdef ENABLE_XF86_DGA
840	+	/*
841	+	*  XFree86 DGA display driver
842	+	*/
843	+
844	+	class driver_xf86dga : public driver_dga {
845	+	public:
846	+	driver_xf86dga(const video_mode &mode);
847	+	~driver_xf86dga();
848	+
849	+	void update_palette(void);
850	+	void resume(void);
851	+
852	+	private:
853	+	int current_dga_cmap;                                   // Number (0 or 1) of currently installed DGA colormap
854	+	};
855	+
856	+	// Open display
857	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
858	+	: current_dga_cmap(0)
859	+	{
860	+	int width = mode.x, height = mode.y;
861	+
862		// Set relative mouse mode
863		ADBSetRelMouseMode(true);
864
#	Line 723 | Line 883 | static bool init_xf86_dga(int width, int
883		wattr.event_mask = eventmask = dga_eventmask;
884		wattr.override_redirect = True;
885
886	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
886	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
887		InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
888
889		// Set window name/class
890	<	set_window_name(the_win, STR_WINDOW_TITLE);
890	>	set_window_name(w, STR_WINDOW_TITLE);
891
892		// Indicate that we want keyboard input
893	<	set_window_focus(the_win);
893	>	set_window_focus(w);
894
895		// Show window
896	<	XMapRaised(x_display, the_win);
897	<	wait_mapped(the_win);
896	>	XMapRaised(x_display, w);
897	>	wait_mapped(w);
898
899		// Establish direct screen connection
900	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
900	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
901		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
902		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
903		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 749 | Line 909 | static bool init_xf86_dga(int width, int
909		XF86DGASetVidPage(x_display, screen, 0);
910
911		// Set colormap
912	<	if (depth == 8) {
913	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
912	>	if (!IsDirectMode(mode)) {
913	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
914		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
915		}
916		XSync(x_display, false);
917
918	<	// Set VideoMonitor
919	<	int bytes_per_row = (v_width + 7) & ~7;
920	<	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	<
918	>	// Init blitting routines
919	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
920	>	#ifdef VIDEO_VOSF
921		#if REAL_ADDRESSING || DIRECT_ADDRESSING
922	<	// If the blit function is null, i.e. just a copy of the buffer,
923	<	// we first try to avoid the allocation of a temporary frame buffer
924	<	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;
922	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
923	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
924	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
925
926		if (use_vosf) {
927	<	the_host_buffer = the_buffer;
928	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
929	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
930	<	memset(the_buffer_copy, 0, the_buffer_size);
931	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
788	<	memset(the_buffer, 0, the_buffer_size);
927	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
928	>	the_host_buffer = the_buffer;
929	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
930	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
931	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
932		}
933	<	#elif defined(ENABLE_VOSF)
791	<	// The UAE memory handlers will already handle color conversion, if needed.
933	>	#else
934		use_vosf = false;
935		#endif
794	–
795	–	set_video_monitor(width, height, bytes_per_row, true);
796	–	#if REAL_ADDRESSING || DIRECT_ADDRESSING
797	–	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
798	–	//      MacFrameLayout = FLAYOUT_DIRECT;
799	–	#else
800	–	VideoMonitor.mac_frame_base = MacFrameBaseMac;
936		#endif
937	<	return true;
938	<	#else
939	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
940	<	return false;
937	>
938	>	// Set VideoMonitor
939	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
940	>	VideoMonitor.mode = mode;
941	>	set_mac_frame_buffer(mode.depth, true);
942	>
943	>	// Everything went well
944	>	init_ok = true;
945	>	}
946	>
947	>	// Close display
948	>	driver_xf86dga::~driver_xf86dga()
949	>	{
950	>	XF86DGADirectVideo(x_display, screen, 0);
951	>	#ifdef ENABLE_XF86_VIDMODE
952	>	if (has_vidmode)
953	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
954		#endif
955		}
956
957	+	// Palette has changed
958	+	void driver_xf86dga::update_palette(void)
959	+	{
960	+	driver_dga::update_palette();
961	+	current_dga_cmap ^= 1;
962	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
963	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
964	+	}
965	+
966	+	// Resume emulation
967	+	void driver_xf86dga::resume(void)
968	+	{
969	+	driver_dga::resume();
970	+	if (!IsDirectMode(VideoMonitor.mode))
971	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
972	+	}
973	+	#endif
974	+
975	+
976	+	/*
977	+	*  Initialization
978	+	*/
979	+
980		// Init keycode translation table
981		static void keycode_init(void)
982		{
#	Line 871 | Line 1042 | static void keycode_init(void)
1042		}
1043		}
1044
1045	<	bool VideoInitBuffer()
1045	>	// Open display for specified mode
1046	>	static bool video_open(const video_mode &mode)
1047		{
1048	<	#ifdef ENABLE_VOSF
1049	<	if (use_vosf) {
1050	<	const uint32 page_size  = getpagesize();
1051	<	const uint32 page_mask  = page_size - 1;
1052	<
1053	<	mainBuffer.memBase      = (uint32) the_buffer;
1054	<	// Align the frame buffer on page boundary
1055	<	mainBuffer.memStart             = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
1056	<	mainBuffer.memLength    = the_buffer_size;
1057	<	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
1058	<
1059	<	mainBuffer.pageSize     = page_size;
1060	<	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
1061	<	mainBuffer.pageBits     = log_base_2(mainBuffer.pageSize);
1062	<
891	<	if (mainBuffer.dirtyPages != 0)
892	<	free(mainBuffer.dirtyPages);
1048	>	// Load gray ramp to color map
1049	>	int num = (vis->c_class == DirectColor ? vis->map_entries : 256);
1050	>	for (int i=0; i<num; i++) {
1051	>	int c = (i * 256) / num;
1052	>	palette[i].red = c * 0x0101;
1053	>	palette[i].green = c * 0x0101;
1054	>	palette[i].blue = c * 0x0101;
1055	>	if (vis->c_class == PseudoColor)
1056	>	palette[i].pixel = i;
1057	>	palette[i].flags = DoRed | DoGreen | DoBlue;
1058	>	}
1059	>	if (cmap[0] && cmap[1]) {
1060	>	XStoreColors(x_display, cmap[0], palette, num);
1061	>	XStoreColors(x_display, cmap[1], palette, num);
1062	>	}
1063
1064	<	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
1064	>	#ifdef ENABLE_VOSF
1065	>	// Load gray ramp to 8->16/32 expand map
1066	>	if (!IsDirectMode(mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor))
1067	>	for (int i=0; i<256; i++)
1068	>	ExpandMap[i] = map_rgb(i, i, i);
1069	>	#endif
1070
1071	<	if (mainBuffer.pageInfo != 0)
1072	<	free(mainBuffer.pageInfo);
1071	>	// Create display driver object of requested type
1072	>	switch (display_type) {
1073	>	case DISPLAY_WINDOW:
1074	>	drv = new driver_window(mode);
1075	>	break;
1076	>	#ifdef ENABLE_FBDEV_DGA
1077	>	case DISPLAY_DGA:
1078	>	drv = new driver_fbdev(mode);
1079	>	break;
1080	>	#endif
1081	>	#ifdef ENABLE_XF86_DGA
1082	>	case DISPLAY_DGA:
1083	>	drv = new driver_xf86dga(mode);
1084	>	break;
1085	>	#endif
1086	>	}
1087	>	if (drv == NULL)
1088	>	return false;
1089	>	if (!drv->init_ok) {
1090	>	delete drv;
1091	>	drv = NULL;
1092	>	return false;
1093	>	}
1094
1095	<	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
1095	>	#ifdef ENABLE_VOSF
1096	>	if (use_vosf) {
1097	>	// Initialize the mainBuffer structure
1098	>	if (!video_init_buffer()) {
1099	>	ErrorAlert(STR_VOSF_INIT_ERR);
1100	>	return false;
1101	>	}
1102
1103	<	if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0))
1103	>	// Initialize the handler for SIGSEGV
1104	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1105	>	ErrorAlert("Could not initialize Video on SEGV signals");
1106		return false;
1107	+	}
1108	+	}
1109	+	#endif
1110	+
1111	+	// Initialize VideoRefresh function
1112	+	VideoRefreshInit();
1113
1114	<	PFLAG_CLEAR_ALL;
1114	>	// Lock down frame buffer
1115	>	XSync(x_display, false);
1116	>	LOCK_FRAME_BUFFER;
1117
1118	<	uint32 a = 0;
1119	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
1120	<	int y1 = a / VideoMonitor.bytes_per_row;
1121	<	if (y1 >= VideoMonitor.y)
1122	<	y1 = VideoMonitor.y - 1;
1123	<
1124	<	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;
1118	>	// Start redraw/input thread
1119	>	#ifdef HAVE_PTHREADS
1120	>	redraw_thread_cancel = false;
1121	>	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1122	>	if (!redraw_thread_active) {
1123	>	printf("FATAL: cannot create redraw thread\n");
1124	>	return false;
1125		}
1126	+	#else
1127	+	redraw_thread_active = true;
1128		#endif
1129	+
1130		return true;
1131		}
1132
1133		bool VideoInit(bool classic)
1134		{
1135	+	classic_mode = classic;
1136	+
1137		#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	–
1138		// Zero the mainBuffer structure
1139	<	mainBuffer.dirtyPages = 0;
1140	<	mainBuffer.pageInfo = 0;
1139	>	mainBuffer.dirtyPages = NULL;
1140	>	mainBuffer.pageInfo = NULL;
1141		#endif
1142
1143		// Check if X server runs on local machine
#	Line 954 | Line 1148 | bool VideoInit(bool classic)
1148		keycode_init();
1149
1150		// Read prefs
1151	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1152	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1151	>	frame_skip = PrefsFindInt32("frameskip");
1152	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1153	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1154
1155		// Find screen and root window
1156		screen = XDefaultScreen(x_display);
#	Line 968 | Line 1163 | bool VideoInit(bool classic)
1163		// Frame buffer name
1164		char fb_name[20];
1165
1166	<	// Could do fbdev dga ?
1166	>	// Could do fbdev DGA?
1167		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1168		has_dga = true;
1169		else
#	Line 1014 | Line 1209 | bool VideoInit(bool classic)
1209		case 15:
1210		case 16:
1211		case 24:
1212	<	case 32:
1213	<	color_class = TrueColor;
1212	>	case 32: // Try DirectColor first, as this will allow gamma correction
1213	>	color_class = DirectColor;
1214	>	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo))
1215	>	color_class = TrueColor;
1216		break;
1217		default:
1218	<	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1218	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1219		return false;
1220		}
1221		if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1222	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1222	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1223		return false;
1224		}
1225		if (visualInfo.depth != xdepth) {
1226	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1226	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1227		return false;
1228		}
1229		vis = visualInfo.visual;
1230
1231	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1232	<	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) {
1231	>	// Create color maps
1232	>	if (color_class == PseudoColor || color_class == DirectColor) {
1233		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1234		cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1235	<	XInstallColormap(x_display, cmap[0]);
1236	<	XInstallColormap(x_display, cmap[1]);
1235	>	}
1236	>
1237	>	// Find pixel format of direct modes
1238	>	if (color_class == DirectColor || color_class == TrueColor) {
1239	>	rshift = gshift = bshift = 0;
1240	>	rloss = gloss = bloss = 8;
1241	>	uint32 mask;
1242	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1243	>	++rshift;
1244	>	for (; mask&1; mask>>=1)
1245	>	--rloss;
1246	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1247	>	++gshift;
1248	>	for (; mask&1; mask>>=1)
1249	>	--gloss;
1250	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1251	>	++bshift;
1252	>	for (; mask&1; mask>>=1)
1253	>	--bloss;
1254	>	}
1255	>
1256	>	// Preset palette pixel values for gamma table
1257	>	if (color_class == DirectColor) {
1258	>	int num = vis->map_entries;
1259	>	for (int i=0; i<num; i++) {
1260	>	int c = (i * 256) / num;
1261	>	palette[i].pixel = map_rgb(c, c, c);
1262	>	}
1263		}
1264
1265		// Get screen mode from preferences
1266		const char *mode_str;
1267	<	if (classic)
1267	>	if (classic_mode)
1268		mode_str = "win/512/342";
1269		else
1270		mode_str = PrefsFindString("screen");
1271
1272	<	// Determine type and mode
1273	<	int width = 512, height = 384;
1272	>	// Determine display type and default dimensions
1273	>	int default_width = 512, default_height = 384;
1274		display_type = DISPLAY_WINDOW;
1275		if (mode_str) {
1276	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1276	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1277		display_type = DISPLAY_WINDOW;
1278		#ifdef ENABLE_FBDEV_DGA
1279	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1280	<	#else
1281	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1279	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1280	>	display_type = DISPLAY_DGA;
1281	>	default_width = -1; default_height = -1; // use entire screen
1282		#endif
1283	+	#ifdef ENABLE_XF86_DGA
1284	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1285		display_type = DISPLAY_DGA;
1068	–	if (width > DisplayWidth(x_display, screen))
1069	–	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);
1077	–	}
1078	–
1079	–	// Initialize according to display type
1080	–	switch (display_type) {
1081	–	case DISPLAY_WINDOW:
1082	–	if (!init_window(width, height))
1083	–	return false;
1084	–	break;
1085	–	case DISPLAY_DGA:
1086	–	#ifdef ENABLE_FBDEV_DGA
1087	–	if (!init_fbdev_dga(fb_name))
1088	–	#else
1089	–	if (!init_xf86_dga(width, height))
1286		#endif
1287	<	return false;
1092	<	break;
1287	>	}
1288		}
1289	<
1290	<	// Lock down frame buffer
1291	<	LOCK_FRAME_BUFFER;
1292	<
1293	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1294	<	// Set variables for UAE memory mapping
1295	<	MacFrameBaseHost = the_buffer;
1296	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1297	<
1298	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1299	<	if (classic)
1300	<	MacFrameLayout = FLAYOUT_NONE;
1301	<	#endif
1302	<
1289	>	if (default_width <= 0)
1290	>	default_width = DisplayWidth(x_display, screen);
1291	>	else if (default_width > DisplayWidth(x_display, screen))
1292	>	default_width = DisplayWidth(x_display, screen);
1293	>	if (default_height <= 0)
1294	>	default_height = DisplayHeight(x_display, screen);
1295	>	else if (default_height > DisplayHeight(x_display, screen))
1296	>	default_height = DisplayHeight(x_display, screen);
1297	>
1298	>	// Mac screen depth follows X depth
1299	>	video_depth default_depth = DepthModeForPixelDepth(xdepth);
1300	>
1301	>	// Construct list of supported modes
1302	>	if (display_type == DISPLAY_WINDOW) {
1303	>	if (classic)
1304	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1305	>	else {
1306	>	if (default_depth != VDEPTH_1BIT)
1307	>	add_window_modes(VDEPTH_1BIT);  // 1-bit modes are always available
1308		#ifdef ENABLE_VOSF
1309	<	if (use_vosf) {
1310	<	// Initialize the mainBuffer structure
1311	<	if (!VideoInitBuffer()) {
1312	<	// TODO: STR_VOSF_INIT_ERR ?
1313	<	ErrorAlert("Could not initialize Video on SEGV signals");
1314	<	return false;
1309	>	if (default_depth > VDEPTH_8BIT) {
1310	>	add_window_modes(VDEPTH_2BIT);  // 2, 4 and 8-bit modes are also possible on 16/32-bit screens with VOSF blitters
1311	>	add_window_modes(VDEPTH_4BIT);
1312	>	add_window_modes(VDEPTH_8BIT);
1313	>	}
1314	>	#endif
1315	>	add_window_modes(default_depth);
1316		}
1317	+	} else
1318	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1319
1320	<	// Initialize the handler for SIGSEGV
1321	<	if (!Screen_fault_handler_init()) {
1322	<	// TODO: STR_VOSF_INIT_ERR ?
1323	<	ErrorAlert("Could not initialize Video on SEGV signals");
1324	<	return false;
1320	>	// Find requested default mode and open display
1321	>	if (VideoModes.size() == 1)
1322	>	return video_open(VideoModes[0]);
1323	>	else {
1324	>	// Find mode with specified dimensions
1325	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1326	>	for (i = VideoModes.begin(); i != end; ++i) {
1327	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1328	>	return video_open(*i);
1329		}
1330	+	return video_open(VideoModes[0]);
1331		}
1124	–	#endif
1125	–
1126	–	// Initialize VideoRefresh function
1127	–	VideoRefreshInit();
1128	–
1129	–	XSync(x_display, false);
1130	–
1131	–	#ifdef HAVE_PTHREADS
1132	–	// Start redraw/input thread
1133	–	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1134	–	if (!redraw_thread_active) {
1135	–	printf("FATAL: cannot create redraw thread\n");
1136	–	return false;
1137	–	}
1138	–	#endif
1139	–	return true;
1332		}
1333
1334
#	Line 1144 | Line 1336 | bool VideoInit(bool classic)
1336		*  Deinitialization
1337		*/
1338
1339	<	void VideoExit(void)
1339	>	// Close display
1340	>	static void video_close(void)
1341		{
1149	–	#ifdef HAVE_PTHREADS
1342		// Stop redraw thread
1343	+	#ifdef HAVE_PTHREADS
1344		if (redraw_thread_active) {
1345		redraw_thread_cancel = true;
1346		#ifdef HAVE_PTHREAD_CANCEL
1347		pthread_cancel(redraw_thread);
1348		#endif
1349		pthread_join(redraw_thread, NULL);
1157	–	redraw_thread_active = false;
1350		}
1351		#endif
1352	+	redraw_thread_active = false;
1353
1354		// Unlock frame buffer
1355		UNLOCK_FRAME_BUFFER;
1356	+	XSync(x_display, false);
1357
1164	–	// Close window and server connection
1165	–	if (x_display != NULL) {
1166	–	XSync(x_display, false);
1167	–
1168	–	#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	–	}
1174	–	#endif
1175	–
1176	–	#ifdef ENABLE_XF86_VIDMODE
1177	–	if (has_vidmode && display_type == DISPLAY_DGA)
1178	–	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1179	–	#endif
1180	–
1181	–	#ifdef ENABLE_FBDEV_DGA
1182	–	if (display_type == DISPLAY_DGA) {
1183	–	XUngrabPointer(x_display, CurrentTime);
1184	–	XUngrabKeyboard(x_display, CurrentTime);
1185	–	close(fbdev_fd);
1186	–	}
1187	–	#endif
1188	–
1189	–	XFlush(x_display);
1190	–	XSync(x_display, false);
1191	–	if (depth == 8) {
1192	–	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	–	}
1201	–
1202	–	if (!have_shm && the_buffer_copy) {
1203	–	free(the_buffer_copy);
1204	–	the_buffer_copy = NULL;
1205	–	}
1206	–	}
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
1220	–	}
1221	–
1358		#ifdef ENABLE_VOSF
1359	+	// Deinitialize VOSF
1360		if (use_vosf) {
1224	–	// Clear mainBuffer data
1361		if (mainBuffer.pageInfo) {
1362		free(mainBuffer.pageInfo);
1363	<	mainBuffer.pageInfo = 0;
1363	>	mainBuffer.pageInfo = NULL;
1364		}
1229	–
1365		if (mainBuffer.dirtyPages) {
1366		free(mainBuffer.dirtyPages);
1367	<	mainBuffer.dirtyPages = 0;
1367	>	mainBuffer.dirtyPages = NULL;
1368		}
1369		}
1370	+	#endif
1371	+
1372	+	// Close display
1373	+	delete drv;
1374	+	drv = NULL;
1375	+	}
1376	+
1377	+	void VideoExit(void)
1378	+	{
1379	+	// Close display
1380	+	video_close();
1381	+
1382	+	// Free colormaps
1383	+	if (cmap[0]) {
1384	+	XFreeColormap(x_display, cmap[0]);
1385	+	cmap[0] = 0;
1386	+	}
1387	+	if (cmap[1]) {
1388	+	XFreeColormap(x_display, cmap[1]);
1389	+	cmap[1] = 0;
1390	+	}
1391
1392	<	// Close /dev/zero
1393	<	if (zero_fd > 0)
1394	<	close(zero_fd);
1392	>	#ifdef ENABLE_XF86_VIDMODE
1393	>	// Free video mode list
1394	>	if (x_video_modes) {
1395	>	XFree(x_video_modes);
1396	>	x_video_modes = NULL;
1397	>	}
1398	>	#endif
1399	>
1400	>	#ifdef ENABLE_FBDEV_DGA
1401	>	// Close framebuffer device
1402	>	if (fbdev_fd >= 0) {
1403	>	close(fbdev_fd);
1404	>	fbdev_fd = -1;
1405	>	}
1406		#endif
1407		}
1408
#	Line 1247 | Line 1414 | void VideoExit(void)
1414		void VideoQuitFullScreen(void)
1415		{
1416		D(bug("VideoQuitFullScreen()\n"));
1417	<	if (display_type == DISPLAY_DGA)
1251	<	quit_full_screen = true;
1417	>	quit_full_screen = true;
1418		}
1419
1420
#	Line 1273 | Line 1439 | void VideoInterrupt(void)
1439		*  Set palette
1440		*/
1441
1442	<	void video_set_palette(uint8 *pal)
1442	>	void video_set_palette(uint8 *pal, int num_in)
1443		{
1444		LOCK_PALETTE;
1445
1446		// Convert colors to XColor array
1447	<	for (int i=0; i<256; i++) {
1448	<	palette[i].pixel = i;
1449	<	palette[i].red = pal[i*3] * 0x0101;
1450	<	palette[i].green = pal[i*3+1] * 0x0101;
1451	<	palette[i].blue = pal[i*3+2] * 0x0101;
1452	<	palette[i].flags = DoRed | DoGreen | DoBlue;
1447	>	int num_out = 256;
1448	>	if (IsDirectMode(VideoMonitor.mode)) {
1449	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1450	>	num_out = vis->map_entries;
1451	>	}
1452	>	XColor *p = palette;
1453	>	for (int i=0; i<num_out; i++) {
1454	>	int c = (i * num_in) / num_out;
1455	>	p->red = pal[c*3 + 0] * 0x0101;
1456	>	p->green = pal[c*3 + 1] * 0x0101;
1457	>	p->blue = pal[c*3 + 2] * 0x0101;
1458	>	if (vis->c_class == PseudoColor)
1459	>	p->pixel = i;
1460	>	p->flags = DoRed | DoGreen | DoBlue;
1461	>	p++;
1462	>	}
1463	>
1464	>	#ifdef ENABLE_VOSF
1465	>	// Recalculate pixel color expansion map
1466	>	if (!IsDirectMode(VideoMonitor.mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor)) {
1467	>	for (int i=0; i<256; i++) {
1468	>	int c = i % num_in; // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1469	>	ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]);
1470	>	}
1471	>
1472	>	// We have to redraw everything because the interpretation of pixel values changed
1473	>	LOCK_VOSF;
1474	>	PFLAG_SET_ALL;
1475	>	UNLOCK_VOSF;
1476	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1477		}
1478	+	#endif
1479
1480		// Tell redraw thread to change palette
1481		palette_changed = true;
#	Line 1294 | Line 1485 | void video_set_palette(uint8 *pal)
1485
1486
1487		/*
1488	<	*  Suspend/resume emulator
1488	>	*  Switch video mode
1489		*/
1490
1491	<	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1301	<	static void suspend_emul(void)
1302	<	{
1303	<	if (display_type == DISPLAY_DGA) {
1304	<	// Release ctrl key
1305	<	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);
1315	<
1316	<	// Close full screen display
1317	<	#ifdef ENABLE_XF86_DGA
1318	<	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)
1491	>	void video_switch_to_mode(const video_mode &mode)
1492		{
1493	<	// Close "suspend" window
1494	<	XDestroyWindow(x_display, suspend_win);
1495	<	XSync(x_display, false);
1493	>	// Close and reopen display
1494	>	video_close();
1495	>	video_open(mode);
1496
1497	<	// Reopen full screen display
1498	<	XMapRaised(x_display, the_win);
1499	<	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;
1497	>	if (drv == NULL) {
1498	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1499	>	QuitEmulator();
1500		}
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;
1501		}
1389	–	#endif
1502
1503
1504		/*
#	Line 1447 | Line 1559 | static int kc_decode(KeySym ks)
1559		case XK_slash: case XK_question: return 0x2c;
1560
1561		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1562	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1562	>	case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30;
1563		#else
1564		case XK_Tab: return 0x30;
1565		#endif
#	Line 1622 | Line 1734 | static void handle_events(void)
1734		if (code == 0x36)
1735		ctrl_down = true;
1736		} else {
1625	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1737		if (code == 0x31)
1738	<	resume_emul();  // Space wakes us up
1628	<	#endif
1738	>	drv->resume();  // Space wakes us up
1739		}
1740		}
1741		break;
#	Line 1653 | Line 1763 | static void handle_events(void)
1763		LOCK_VOSF;
1764		PFLAG_SET_ALL;
1765		UNLOCK_VOSF;
1766	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1766	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1767		}
1768		else
1769		#endif
#	Line 1664 | Line 1774 | static void handle_events(void)
1774		updt_box[x1][y1] = true;
1775		nr_boxes = 16 * 16;
1776		} else                                  // Static refresh
1777	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1777	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1778		}
1779		break;
1780
#	Line 1685 | Line 1795 | static void handle_events(void)
1795		*/
1796
1797		// Dynamic display update (variable frame rate for each box)
1798	<	static void update_display_dynamic(int ticker)
1798	>	static void update_display_dynamic(int ticker, driver_window *drv)
1799		{
1800		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1801		int xil = 0;
1802		int rxm = 0, rxmo = 0;
1803	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1804	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1805	<	int rx = VideoMonitor.bytes_per_row / 16;
1806	<	int ry = VideoMonitor.y / 16;
1803	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1804	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1805	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
1806	>	int ry = VideoMonitor.mode.y / 16;
1807		int max_box;
1808
1809		y2s = sm_uptd[ticker % 8];
#	Line 1747 | Line 1857 | static void update_display_dynamic(int t
1857		i = (yi * bytes_per_row) + xi;
1858		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1859		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1860	<	if (depth == 1) {
1861	<	if (have_shm)
1862	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1860	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1861	>	if (drv->have_shm)
1862	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1863		else
1864	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1864	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1865		} else {
1866	<	if (have_shm)
1867	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1866	>	if (drv->have_shm)
1867	>	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);
1868		else
1869	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1869	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1870		}
1871		xil = 0;
1872		}
#	Line 1775 | Line 1885 | static void update_display_dynamic(int t
1885		}
1886
1887		// Static display update (fixed frame rate, but incremental)
1888	<	static void update_display_static(void)
1888	>	static void update_display_static(driver_window *drv)
1889		{
1890		// Incremental update code
1891		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1892	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1893	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1892	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1893	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1894		uint8 *p, *p2;
1895
1896		// Check for first line from top and first line from bottom that have changed
1897		y1 = 0;
1898	<	for (j=0; j<VideoMonitor.y; j++) {
1898	>	for (j=0; j<VideoMonitor.mode.y; j++) {
1899		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1900		y1 = j;
1901		break;
1902		}
1903		}
1904		y2 = y1 - 1;
1905	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
1905	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
1906		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1907		y2 = j;
1908		break;
#	Line 1802 | Line 1912 | static void update_display_static(void)
1912
1913		// Check for first column from left and first column from right that have changed
1914		if (high) {
1915	<	if (depth == 1) {
1916	<	x1 = VideoMonitor.x - 1;
1915	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1916	>	x1 = VideoMonitor.mode.x - 1;
1917		for (j=y1; j<=y2; j++) {
1918		p = &the_buffer[j * bytes_per_row];
1919		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1821 | Line 1931 | static void update_display_static(void)
1931		p2 = &the_buffer_copy[j * bytes_per_row];
1932		p += bytes_per_row;
1933		p2 += bytes_per_row;
1934	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1934	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
1935		p--; p2--;
1936		if (*p != *p2) {
1937		x2 = (i << 3) + 7;
#	Line 1840 | Line 1950 | static void update_display_static(void)
1950		}
1951
1952		} else {
1953	<	x1 = VideoMonitor.x;
1953	>	x1 = VideoMonitor.mode.x;
1954		for (j=y1; j<=y2; j++) {
1955		p = &the_buffer[j * bytes_per_row];
1956		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1858 | Line 1968 | static void update_display_static(void)
1968		p2 = &the_buffer_copy[j * bytes_per_row];
1969		p += bytes_per_row;
1970		p2 += bytes_per_row;
1971	<	for (i=VideoMonitor.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1971	>	for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1972		p--;
1973		p2--;
1974		if (*p != *p2) {
#	Line 1881 | Line 1991 | static void update_display_static(void)
1991
1992		// Refresh display
1993		if (high && wide) {
1994	<	if (have_shm)
1995	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1994	>	if (drv->have_shm)
1995	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
1996		else
1997	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1997	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
1998		}
1999		}
2000
#	Line 1893 | Line 2003 | static void update_display_static(void)
2003		*      Screen refresh functions
2004		*/
2005
2006	<	// The specialisations hereunder are meant to enable VOSF with DGA in direct
2007	<	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
2008	<	// not get mapped correctly with respect to the predetermined host frame
2009	<	// buffer base address.
2010	<	//
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)
2006	>	// We suggest the compiler to inline the next two functions so that it
2007	>	// may specialise the code according to the current screen depth and
2008	>	// display type. A clever compiler would do that job by itself though...
2009	>
2010	>	// NOTE: update_display_vosf is inlined too
2011
2012		static inline void possibly_quit_dga_mode()
2013		{
1917	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2014		// Quit DGA mode if requested
2015		if (quit_full_screen) {
2016		quit_full_screen = false;
2017	<	#ifdef ENABLE_XF86_DGA
2018	<	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);
2017	>	delete drv;
2018	>	drv = NULL;
2019		}
1929	–	#endif
2020		}
2021
2022	<	static inline void handle_palette_changes(int depth, int display_type)
2022	>	static inline void handle_palette_changes(void)
2023		{
2024		LOCK_PALETTE;
2025
2026		if (palette_changed) {
2027		palette_changed = false;
2028	<	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	<	}
2028	>	drv->update_palette();
2029		}
2030
2031		UNLOCK_PALETTE;
#	Line 1961 | Line 2040 | static void video_refresh_dga(void)
2040		handle_events();
2041
2042		// Handle palette changes
2043	<	handle_palette_changes(depth, DISPLAY_DGA);
2043	>	handle_palette_changes();
2044		}
2045
2046		#ifdef ENABLE_VOSF
#	Line 1975 | Line 2054 | static void video_refresh_dga_vosf(void)
2054		handle_events();
2055
2056		// Handle palette changes
2057	<	handle_palette_changes(depth, DISPLAY_DGA);
2057	>	handle_palette_changes();
2058
2059		// Update display (VOSF variant)
2060		static int tick_counter = 0;
2061		if (++tick_counter >= frame_skip) {
2062		tick_counter = 0;
2063	<	LOCK_VOSF;
2064	<	update_display_dga_vosf();
2065	<	UNLOCK_VOSF;
2063	>	if (mainBuffer.dirty) {
2064	>	LOCK_VOSF;
2065	>	update_display_dga_vosf();
2066	>	UNLOCK_VOSF;
2067	>	}
2068		}
2069		}
2070		#endif
#	Line 1997 | Line 2078 | static void video_refresh_window_vosf(vo
2078		handle_events();
2079
2080		// Handle palette changes
2081	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2081	>	handle_palette_changes();
2082
2083		// Update display (VOSF variant)
2084		static int tick_counter = 0;
2085		if (++tick_counter >= frame_skip) {
2086		tick_counter = 0;
2087	<	LOCK_VOSF;
2088	<	update_display_window_vosf();
2089	<	UNLOCK_VOSF;
2087	>	if (mainBuffer.dirty) {
2088	>	LOCK_VOSF;
2089	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2090	>	UNLOCK_VOSF;
2091	>	XSync(x_display, false); // Let the server catch up
2092	>	}
2093		}
2094		}
2095		#endif // def ENABLE_VOSF
#	Line 2016 | Line 2100 | static void video_refresh_window_static(
2100		handle_events();
2101
2102		// Handle_palette changes
2103	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2103	>	handle_palette_changes();
2104
2105		// Update display (static variant)
2106		static int tick_counter = 0;
2107		if (++tick_counter >= frame_skip) {
2108		tick_counter = 0;
2109	<	update_display_static();
2109	>	update_display_static(static_cast<driver_window *>(drv));
2110		}
2111		}
2112
#	Line 2032 | Line 2116 | static void video_refresh_window_dynamic
2116		handle_events();
2117
2118		// Handle_palette changes
2119	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2119	>	handle_palette_changes();
2120
2121		// Update display (dynamic variant)
2122		static int tick_counter = 0;
2123		tick_counter++;
2124	<	update_display_dynamic(tick_counter);
2124	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2125		}
2126
2127
#	Line 2045 | Line 2129 | static void video_refresh_window_dynamic
2129		*  Thread for screen refresh, input handling etc.
2130		*/
2131
2132	<	void VideoRefreshInit(void)
2132	>	static void VideoRefreshInit(void)
2133		{
2134		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2135		if (display_type == DISPLAY_DGA) {
#	Line 2071 | Line 2155 | void VideoRefreshInit(void)
2155
2156		void VideoRefresh(void)
2157		{
2158	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2159	<	video_refresh();
2158	>	// We need to check redraw_thread_active to inhibit refreshed during
2159	>	// mode changes on non-threaded platforms
2160	>	if (redraw_thread_active)
2161	>	video_refresh();
2162		}
2163
2164		#ifdef HAVE_PTHREADS
#	Line 2092 | Line 2178 | static void *redraw_func(void *arg)
2178		ticks++;
2179		}
2180		uint64 end = GetTicks_usec();
2181	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2181	>	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2182		return NULL;
2183		}
2184		#endif

Diff Legend

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