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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.28 by cebix, 2000-11-03T12:23:49Z vs.
Revision 1.48 by cebix, 2001-07-01T14:38:03Z

#	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 \| FocusChangeMask \| ExposureMask;
126	–	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask;
126
127	<	static XColor palette[256]; // Color palette for 8-bit mode
129	<	static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
130	<	#ifdef HAVE_PTHREADS
131	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
132	<	#endif
127	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
128
129	<	// Variables for window mode
130	<	static GC the_gc;
136	<	static XImage *img = NULL;
137	<	static XShmSegmentInfo shminfo;
138	<	static Cursor mac_cursor;
139	<	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
140	<	static bool have_shm = false; // Flag: SHM extensions available
141	<	static bool updt_box[17][17]; // Flag for Update
142	<	static int nr_boxes;
143	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
144	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
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	<	// Variables for XF86 DGA mode
133	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
148	<	static Window suspend_win; // "Suspend" window
149	<	static void *fb_save = NULL; // Saved frame buffer for suspend
150	<	#ifdef HAVE_PTHREADS
151	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
132	>	#ifdef ENABLE_FBDEV_DGA
133	>	static int fbdev_fd = -1;
134		#endif
135
154	–	// Variables for fbdev DGA mode
155	–	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
156	–	static int fbdev_fd;
157	–
136		#ifdef ENABLE_XF86_VIDMODE
137	<	// Variables for XF86 VidMode support
160	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
137	>	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
138		static int num_x_video_modes;
139		#endif
140
141	<	#ifdef ENABLE_VOSF
142	<	static bool use_vosf = true; // Flag: VOSF enabled
141	>	// Mutex to protect palette
142	>	#ifdef HAVE_PTHREADS
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
147	<	static const bool use_vosf = false; // Flag: VOSF enabled
147	>	#define LOCK_PALETTE
148	>	#define UNLOCK_PALETTE
149		#endif
150
151	<	#ifdef ENABLE_VOSF
171	<	static uint8 * the_host_buffer; // Host frame buffer in VOSF mode
172	<	static uint32 the_buffer_size; // Size of allocated the_buffer
173	<	#endif
174	<
175	<	#ifdef ENABLE_VOSF
176	<	// Variables for Video on SEGV support (taken from the Win32 port)
177	<	struct ScreenPageInfo {
178	<	int top, bottom; // Mapping between this virtual page and Mac scanlines
179	<	};
180	<
181	<	struct ScreenInfo {
182	<	uint32 memBase; // Real start address
183	<	uint32 memStart; // Start address aligned to page boundary
184	<	uint32 memEnd; // Address of one-past-the-end of the screen
185	<	uint32 memLength; // Length of the memory addressed by the screen pages
186	<
187	<	uint32 pageSize; // Size of a page
188	<	int pageBits; // Shift count to get the page number
189	<	uint32 pageCount; // Number of pages allocated to the screen
190	<
191	<	uint8 * dirtyPages; // Table of flags set if page was altered
192	<	ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines
193	<	};
194	<
195	<	static ScreenInfo mainBuffer;
196	<
197	<	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = 1
198	<	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = 0
199	<	#define PFLAG_ISSET(page) mainBuffer.dirtyPages[page]
200	<	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] == 0)
201	<	#ifdef UNALIGNED_PROFITABLE
202	<	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + page)) == 0)
203	<	#else
204	<	# define PFLAG_ISCLEAR_4(page) \
205	<	(mainBuffer.dirtyPages[page ] == 0) \
206	<	&& (mainBuffer.dirtyPages[page+1] == 0) \
207	<	&& (mainBuffer.dirtyPages[page+2] == 0) \
208	<	&& (mainBuffer.dirtyPages[page+3] == 0)
209	<	#endif
210	<	#define PFLAG_CLEAR_ALL memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
211	<	#define PFLAG_SET_ALL memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
212	<
213	<	static int zero_fd = -1;
214	<	static bool Screen_fault_handler_init();
215	<	static struct sigaction vosf_sa;
216	<
151	>	// Mutex to protect frame buffer
152		#ifdef HAVE_PTHREADS
153	<	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
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
157	>	#define LOCK_FRAME_BUFFER
158	>	#define UNLOCK_FRAME_BUFFER
159		#endif
160
161	<	static int log_base_2(uint32 x)
162	<	{
163	<	uint32 mask = 0x80000000;
164	<	int l = 31;
165	<	while (l >= 0 && (x & mask) == 0) {
226	<	mask >>= 1;
227	<	l--;
228	<	}
229	<	return l;
230	<	}
231	<
232	<	#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);
241	<
174	>	static int event2keycode(XKeyEvent &ev);
175
176		// From main_unix.cpp
177		extern char *x_display_name;
#	Line 247 \| Line 180 \| *extern Display x_display;**
180		// From sys_unix.cpp
181		extern void SysMountFirstFloppy(void);
182
250	–	#ifdef ENABLE_VOSF
251	–	# include "video_vosf.h"
252	–	#endif
253	–
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	>	// Add mode to list of supported modes
189	>	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
190	>	{
191	>	video_mode mode;
192	>	mode.x = width;
193	>	mode.y = height;
194	>	mode.resolution_id = resolution_id;
195	>	mode.bytes_per_row = bytes_per_row;
196	>	mode.depth = depth;
197	>	VideoModes.push_back(mode);
198	>	}
199	>
200	>	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
201	>	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
202		{
203		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
204		int layout = FLAYOUT_DIRECT;
205	<	switch (depth) {
206	<	case 1:
207	<	layout = FLAYOUT_DIRECT;
208	<	break;
268	<	case 8:
269	<	layout = FLAYOUT_DIRECT;
270	<	break;
271	<	case 15:
272	<	layout = FLAYOUT_HOST_555;
273	<	break;
274	<	case 16:
275	<	layout = FLAYOUT_HOST_565;
276	<	break;
277	<	case 24:
278	<	case 32:
279	<	layout = FLAYOUT_HOST_888;
280	<	break;
281	<	}
205	>	if (depth == VDEPTH_16BIT)
206	>	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
207	>	else if (depth == VDEPTH_32BIT)
208	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
209		if (native_byte_order)
210		MacFrameLayout = layout;
211		else
212		MacFrameLayout = FLAYOUT_DIRECT;
213	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
214	+
215	+	// Set variables used by UAE memory banking
216	+	MacFrameBaseHost = the_buffer;
217	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
218	+	InitFrameBufferMapping();
219	+	#else
220	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
221	+	D(bug("Host frame buffer = %p, ", the_buffer));
222		#endif
223	<	switch (depth) {
224	<	case 1:
225	<	VideoMonitor.mode = VMODE_1BIT;
226	<	break;
227	<	case 8:
228	<	VideoMonitor.mode = VMODE_8BIT;
229	<	break;
230	<	case 15:
231	<	VideoMonitor.mode = VMODE_16BIT;
232	<	break;
233	<	case 16:
234	<	VideoMonitor.mode = VMODE_16BIT;
235	<	break;
236	<	case 24:
237	<	case 32:
238	<	VideoMonitor.mode = VMODE_32BIT;
239	<	break;
223	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
224	>	}
225	>
226	>	// Set window name and class
227	>	static void set_window_name(Window w, int name)
228	>	{
229	>	const char *str = GetString(name);
230	>	XStoreName(x_display, w, str);
231	>	XSetIconName(x_display, w, str);
232	>
233	>	XClassHint *hints;
234	>	hints = XAllocClassHint();
235	>	if (hints) {
236	>	hints->res_name = "BasiliskII";
237	>	hints->res_class = "BasiliskII";
238	>	XSetClassHint(x_display, w, hints);
239	>	XFree(hints);
240		}
241	<	VideoMonitor.x = width;
242	<	VideoMonitor.y = height;
243	<	VideoMonitor.bytes_per_row = bytes_per_row;
241	>	}
242	>
243	>	// Set window input focus flag
244	>	static void set_window_focus(Window w)
245	>	{
246	>	XWMHints *hints = XAllocWMHints();
247	>	if (hints) {
248	>	hints->input = True;
249	>	hints->initial_state = NormalState;
250	>	hints->flags = InputHint \| StateHint;
251	>	XSetWMHints(x_display, w, hints);
252	>	XFree(hints);
253	>	}
254	>	}
255	>
256	>	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
257	>	static Atom WM_DELETE_WINDOW = (Atom)0;
258	>	static void set_window_delete_protocol(Window w)
259	>	{
260	>	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
261	>	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
262	>	}
263	>
264	>	// Wait until window is mapped/unmapped
265	>	void wait_mapped(Window w)
266	>	{
267	>	XEvent e;
268	>	do {
269	>	XMaskEvent(x_display, StructureNotifyMask, &e);
270	>	} while ((e.type != MapNotify) \|\| (e.xmap.event != w));
271	>	}
272	>
273	>	void wait_unmapped(Window w)
274	>	{
275	>	XEvent e;
276	>	do {
277	>	XMaskEvent(x_display, StructureNotifyMask, &e);
278	>	} while ((e.type != UnmapNotify) \|\| (e.xmap.event != w));
279		}
280
281		// Trap SHM errors
#	Line 320 \| Line 291 \| *static int error_handler(Display d, XEr**
291		return old_error_handler(d, e);
292		}
293
294	<	// Init window mode
295	<	static bool init_window(int width, int height)
294	>
295	>	/*
296	>	* Display "driver" classes
297	>	*/
298	>
299	>	class driver_base {
300	>	public:
301	>	driver_base();
302	>	virtual ~driver_base();
303	>
304	>	virtual void update_palette(void);
305	>	virtual void suspend(void) {}
306	>	virtual void resume(void) {}
307	>
308	>	public:
309	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
310	>	Window w; // The window we draw into
311	>	};
312	>
313	>	class driver_window;
314	>	static void update_display_window_vosf(driver_window *drv);
315	>	static void update_display_dynamic(int ticker, driver_window *drv);
316	>	static void update_display_static(driver_window *drv);
317	>
318	>	class driver_window : public driver_base {
319	>	friend void update_display_window_vosf(driver_window *drv);
320	>	friend void update_display_dynamic(int ticker, driver_window *drv);
321	>	friend void update_display_static(driver_window *drv);
322	>
323	>	public:
324	>	driver_window(const video_mode &mode);
325	>	~driver_window();
326	>
327	>	private:
328	>	GC gc;
329	>	XImage *img;
330	>	bool have_shm; // Flag: SHM extensions available
331	>	XShmSegmentInfo shminfo;
332	>	Cursor mac_cursor;
333	>	};
334	>
335	>	static driver_base *drv = NULL; // Pointer to currently used driver object
336	>
337	>	#ifdef ENABLE_VOSF
338	>	# include "video_vosf.h"
339	>	#endif
340	>
341	>	driver_base::driver_base()
342	>	: init_ok(false), w(0)
343	>	{
344	>	the_buffer = NULL;
345	>	the_buffer_copy = NULL;
346	>	}
347	>
348	>	driver_base::~driver_base()
349	>	{
350	>	if (w) {
351	>	XUnmapWindow(x_display, w);
352	>	wait_unmapped(w);
353	>	XDestroyWindow(x_display, w);
354	>	}
355	>
356	>	XFlush(x_display);
357	>	XSync(x_display, false);
358	>
359	>	// Free frame buffer(s)
360	>	if (!use_vosf) {
361	>	if (the_buffer) {
362	>	free(the_buffer);
363	>	the_buffer = NULL;
364	>	}
365	>	if (the_buffer_copy) {
366	>	free(the_buffer_copy);
367	>	the_buffer_copy = NULL;
368	>	}
369	>	}
370	>	#ifdef ENABLE_VOSF
371	>	else {
372	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
373	>	vm_release(the_buffer, the_buffer_size);
374	>	the_buffer = NULL;
375	>	}
376	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
377	>	vm_release(the_buffer_copy, the_buffer_size);
378	>	the_buffer_copy = NULL;
379	>	}
380	>	}
381	>	#endif
382	>	}
383	>
384	>	// Palette has changed
385	>	void driver_base::update_palette(void)
386		{
387	+	if (cmap[0] && cmap[1]) {
388	+	int num = 256;
389	+	if (IsDirectMode(VideoMonitor.mode))
390	+	num = vis->map_entries; // Palette is gamma table
391	+	else if (vis->c_class == DirectColor)
392	+	return; // Indexed mode on true color screen, don't set CLUT
393	+	XStoreColors(x_display, cmap[0], palette, num);
394	+	XStoreColors(x_display, cmap[1], palette, num);
395	+	}
396	+	XSync(x_display, false);
397	+	}
398	+
399	+
400	+	/*
401	+	* Windowed display driver
402	+	*/
403	+
404	+	// Open display
405	+	driver_window::driver_window(const video_mode &mode)
406	+	: gc(0), img(NULL), have_shm(false), mac_cursor(0)
407	+	{
408	+	int width = mode.x, height = mode.y;
409		int aligned_width = (width + 15) & ~15;
410		int aligned_height = (height + 15) & ~15;
411
412		// Set absolute mouse mode
413		ADBSetRelMouseMode(false);
414
332	–	// Read frame skip prefs
333	–	frame_skip = PrefsFindInt32("frameskip");
334	–
415		// Create window
416		XSetWindowAttributes wattr;
417		wattr.event_mask = eventmask = win_eventmask;
418		wattr.background_pixel = black_pixel;
419	+	wattr.colormap = (mode.depth == VDEPTH_1BIT && vis->c_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
420	+	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
421	+	InputOutput, vis, CWEventMask \| CWBackPixel \| (vis->c_class == PseudoColor \|\| vis->c_class == DirectColor ? CWColormap : 0), &wattr);
422
423	<	XSync(x_display, false);
424	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
342	<	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
423	>	// Set window name/class
424	>	set_window_name(w, STR_WINDOW_TITLE);
425
426		// Indicate that we want keyboard input
427	<	{
428	<	XWMHints *hints = XAllocWMHints();
429	<	if (hints) {
430	<	hints->input = True;
349	<	hints->flags = InputHint;
350	<	XSetWMHints(x_display, the_win, hints);
351	<	XFree((char *)hints);
352	<	}
353	<	}
427	>	set_window_focus(w);
428	>
429	>	// Set delete protocol property
430	>	set_window_delete_protocol(w);
431
432		// Make window unresizable
433		{
#	Line 361 \| Line 438 \| static bool init_window(int width, int h
438		hints->min_height = height;
439		hints->max_height = height;
440		hints->flags = PMinSize \| PMaxSize;
441	<	XSetWMNormalHints(x_display, the_win, hints);
442	<	XFree((char *)hints);
441	>	XSetWMNormalHints(x_display, w, hints);
442	>	XFree(hints);
443		}
444		}
445
369	–	// Set window title
370	–	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
371	–
372	–	// Set window class
373	–	{
374	–	XClassHint *hints;
375	–	hints = XAllocClassHint();
376	–	if (hints) {
377	–	hints->res_name = "BasiliskII";
378	–	hints->res_class = "BasiliskII";
379	–	XSetClassHint(x_display, the_win, hints);
380	–	XFree((char *)hints);
381	–	}
382	–	}
383	–
446		// Show window
447	<	XSync(x_display, false);
448	<	XMapRaised(x_display, the_win);
387	<	XFlush(x_display);
447	>	XMapWindow(x_display, w);
448	>	wait_mapped(w);
449
450	<	// Set colormap
451	<	if (depth == 8)
452	<	XSetWindowColormap(x_display, the_win, cmap[0]);
450	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
451	>	// use SHM because that doesn't allow changing the image byte order
452	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
453
454		// Try to create and attach SHM image
455	<	have_shm = false;
395	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
455	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
456
457		// Create SHM image ("height + 2" for safety)
458	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
458	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
459		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
460		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
461		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 419 \| Line 479 \| static bool init_window(int width, int h
479
480		// Create normal X image if SHM doesn't work ("height + 2" for safety)
481		if (!have_shm) {
482	<	int bytes_per_row = aligned_width;
423	<	switch (depth) {
424	<	case 1:
425	<	bytes_per_row /= 8;
426	<	break;
427	<	case 15:
428	<	case 16:
429	<	bytes_per_row *= 2;
430	<	break;
431	<	case 24:
432	<	case 32:
433	<	bytes_per_row *= 4;
434	<	break;
435	<	}
482	>	int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth);
483		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
484	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
484	>	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);
485		}
486
487	<	// 1-Bit mode is big-endian
441	<	if (depth == 1) {
487	>	if (need_msb_image) {
488		img->byte_order = MSBFirst;
489		img->bitmap_bit_order = MSBFirst;
490		}
491
492		#ifdef ENABLE_VOSF
493	<	// Allocate a page-aligned chunk of memory for frame buffer
448	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
493	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
494		the_host_buffer = the_buffer_copy;
495	<
496	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
497	<	memset(the_buffer_copy, 0, the_buffer_size);
453	<
454	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
455	<	memset(the_buffer, 0, the_buffer_size);
495	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
496	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
497	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
498		#else
499		// Allocate memory for frame buffer
500		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
501		#endif
502
503		// Create GC
504	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
505	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
504	>	gc = XCreateGC(x_display, w, 0, 0);
505	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
506
507		// Create no_cursor
508		mac_cursor = XCreatePixmapCursor(x_display,
509	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
510	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
509	>	XCreatePixmap(x_display, w, 1, 1, 1),
510	>	XCreatePixmap(x_display, w, 1, 1, 1),
511		&black, &white, 0, 0);
512	<	XDefineCursor(x_display, the_win, mac_cursor);
512	>	XDefineCursor(x_display, w, mac_cursor);
513
514	<	// Set VideoMonitor
514	>	// Init blitting routines
515		bool native_byte_order;
516		#ifdef WORDS_BIGENDIAN
517	<	native_byte_order = (img->bitmap_bit_order == MSBFirst);
517	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
518		#else
519	<	native_byte_order = (img->bitmap_bit_order == LSBFirst);
519	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
520		#endif
521		#ifdef ENABLE_VOSF
522	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
522	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
523		#endif
524	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
525	<
526	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
527	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
528	<	#else
529	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
524	>
525	>	// Set VideoMonitor
526	>	VideoMonitor.mode = mode;
527	>	set_mac_frame_buffer(mode.depth, native_byte_order);
528	>
529	>	// Everything went well
530	>	init_ok = true;
531	>	}
532	>
533	>	// Close display
534	>	driver_window::~driver_window()
535	>	{
536	>	if (img)
537	>	XDestroyImage(img);
538	>	if (have_shm) {
539	>	XShmDetach(x_display, &shminfo);
540	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
541	>	}
542	>	if (gc)
543	>	XFreeGC(x_display, gc);
544	>	}
545	>
546	>
547	>	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
548	>	/*
549	>	* DGA display driver base class
550	>	*/
551	>
552	>	class driver_dga : public driver_base {
553	>	public:
554	>	driver_dga();
555	>	~driver_dga();
556	>
557	>	void suspend(void);
558	>	void resume(void);
559	>
560	>	private:
561	>	Window suspend_win; // "Suspend" information window
562	>	void *fb_save; // Saved frame buffer for suspend/resume
563	>	};
564	>
565	>	driver_dga::driver_dga()
566	>	: suspend_win(0), fb_save(NULL)
567	>	{
568	>	}
569	>
570	>	driver_dga::~driver_dga()
571	>	{
572	>	XUngrabPointer(x_display, CurrentTime);
573	>	XUngrabKeyboard(x_display, CurrentTime);
574	>	}
575	>
576	>	// Suspend emulation
577	>	void driver_dga::suspend(void)
578	>	{
579	>	// Release ctrl key
580	>	ADBKeyUp(0x36);
581	>	ctrl_down = false;
582	>
583	>	// Lock frame buffer (this will stop the MacOS thread)
584	>	LOCK_FRAME_BUFFER;
585	>
586	>	// Save frame buffer
587	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
588	>	if (fb_save)
589	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
590	>
591	>	// Close full screen display
592	>	#ifdef ENABLE_XF86_DGA
593	>	XF86DGADirectVideo(x_display, screen, 0);
594		#endif
595	<	return true;
595	>	XUngrabPointer(x_display, CurrentTime);
596	>	XUngrabKeyboard(x_display, CurrentTime);
597	>	XUnmapWindow(x_display, w);
598	>	wait_unmapped(w);
599	>
600	>	// Open "suspend" window
601	>	XSetWindowAttributes wattr;
602	>	wattr.event_mask = KeyPressMask;
603	>	wattr.background_pixel = black_pixel;
604	>
605	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
606	>	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
607	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
608	>	set_window_focus(suspend_win);
609	>	XMapWindow(x_display, suspend_win);
610	>	emul_suspended = true;
611		}
612
613	<	// Init fbdev DGA display
614	<	static bool init_fbdev_dga(char *in_fb_name)
613	>	// Resume emulation
614	>	void driver_dga::resume(void)
615		{
616	+	// Close "suspend" window
617	+	XDestroyWindow(x_display, suspend_win);
618	+	XSync(x_display, false);
619	+
620	+	// Reopen full screen display
621	+	XMapRaised(x_display, w);
622	+	wait_mapped(w);
623	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
624	+	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
625	+	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
626	+	#ifdef ENABLE_XF86_DGA
627	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
628	+	XF86DGASetViewPort(x_display, screen, 0, 0);
629	+	#endif
630	+	XSync(x_display, false);
631	+
632	+	// the_buffer already contains the data to restore. i.e. since a temporary
633	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
634	+	// not necessary.
635	+	#ifdef ENABLE_VOSF
636	+	if (use_vosf) {
637	+	LOCK_VOSF;
638	+	PFLAG_SET_ALL;
639	+	UNLOCK_VOSF;
640	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
641	+	}
642	+	#endif
643	+
644	+	// Restore frame buffer
645	+	if (fb_save) {
646	+	#ifdef ENABLE_VOSF
647	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
648	+	if (!use_vosf)
649	+	#endif
650	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
651	+	free(fb_save);
652	+	fb_save = NULL;
653	+	}
654	+
655	+	// Unlock frame buffer (and continue MacOS thread)
656	+	UNLOCK_FRAME_BUFFER;
657	+	emul_suspended = false;
658	+	}
659	+	#endif
660	+
661	+
662		#ifdef ENABLE_FBDEV_DGA
663	+	/*
664	+	* fbdev DGA display driver
665	+	*/
666	+
667	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
668	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
669	+
670	+	class driver_fbdev : public driver_dga {
671	+	public:
672	+	driver_fbdev(const video_mode &mode);
673	+	~driver_fbdev();
674	+	};
675	+
676	+	// Open display
677	+	driver_fbdev::driver_fbdev(const video_mode &mode)
678	+	{
679	+	int width = mode.x, height = mode.y;
680	+
681	+	// Set absolute mouse mode
682	+	ADBSetRelMouseMode(false);
683	+
684		// Find the maximum depth available
685		int ndepths, max_depth(0);
686		int *depths = XListDepths(x_display, screen, &ndepths);
687		if (depths == NULL) {
688		printf("FATAL: Could not determine the maximal depth available\n");
689	<	return false;
689	>	return;
690		} else {
691		while (ndepths-- > 0) {
692		if (depths[ndepths] > max_depth)
#	Line 515 \| Line 703 \| *static bool init_fbdev_dga(char in_fb_n**
703		char str[256];
704		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
705		ErrorAlert(str);
706	<	return false;
706	>	return;
707		}
708
709		int fb_depth; // supported depth
#	Line 535 \| Line 723 \| *static bool init_fbdev_dga(char in_fb_n**
723		continue;
724
725		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
726	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
726	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
727		device_found = true;
728		break;
729		}
#	Line 547 \| Line 735 \| *static bool init_fbdev_dga(char in_fb_n**
735		// Frame buffer name not found ? Then, display warning
736		if (!device_found) {
737		char str[256];
738	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
738	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
739		ErrorAlert(str);
740	<	return false;
740	>	return;
741		}
742
555	–	int width = DisplayWidth(x_display, screen);
556	–	int height = DisplayHeight(x_display, screen);
557	–	depth = fb_depth; // max_depth
558	–
559	–	// Set relative mouse mode
560	–	ADBSetRelMouseMode(false);
561	–
743		// Create window
744		XSetWindowAttributes wattr;
745	<	wattr.event_mask = eventmask = dga_eventmask;
746	<	wattr.background_pixel = white_pixel;
747	<	wattr.override_redirect = True;
745	>	wattr.event_mask = eventmask = dga_eventmask;
746	>	wattr.background_pixel = white_pixel;
747	>	wattr.override_redirect = True;
748	>	wattr.colormap = cmap[0];
749
750	<	XSync(x_display, false);
569	<	the_win = XCreateWindow(x_display, rootwin,
750	>	w = XCreateWindow(x_display, rootwin,
751		0, 0, width, height,
752		0, xdepth, InputOutput, vis,
753	<	CWEventMask \| CWBackPixel \| CWOverrideRedirect,
753	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
754		&wattr);
755	<	XSync(x_display, false);
756	<	XMapRaised(x_display, the_win);
757	<	XSync(x_display, false);
755	>
756	>	// Set window name/class
757	>	set_window_name(w, STR_WINDOW_TITLE);
758	>
759	>	// Indicate that we want keyboard input
760	>	set_window_focus(w);
761	>
762	>	// Show window
763	>	XMapRaised(x_display, w);
764	>	wait_mapped(w);
765
766		// Grab mouse and keyboard
767	<	XGrabKeyboard(x_display, the_win, True,
767	>	XGrabKeyboard(x_display, w, True,
768		GrabModeAsync, GrabModeAsync, CurrentTime);
769	<	XGrabPointer(x_display, the_win, True,
769	>	XGrabPointer(x_display, w, True,
770		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
771	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
771	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
772
773	<	// Set colormap
774	<	if (depth == 8)
587	<	XSetWindowColormap(x_display, the_win, cmap[0]);
588	<
589	<	// Set VideoMonitor
590	<	int bytes_per_row = width;
591	<	switch (depth) {
592	<	case 1:
593	<	bytes_per_row = ((width \| 7) & ~7) >> 3;
594	<	break;
595	<	case 15:
596	<	case 16:
597	<	bytes_per_row *= 2;
598	<	break;
599	<	case 24:
600	<	case 32:
601	<	bytes_per_row *= 4;
602	<	break;
603	<	}
773	>	// Calculate bytes per row
774	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
775
776	+	// Map frame buffer
777		if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
778		if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
779		char str[256];
780		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
781		ErrorAlert(str);
782	<	return false;
782	>	return;
783		}
784		}
785
786		#if ENABLE_VOSF
787		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
788	<	// If the blit function is null, i.e. just a copy of the buffer,
789	<	// we first try to avoid the allocation of a temporary frame buffer
790	<	use_vosf = true;
619	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
620	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
621	<	use_vosf = false;
788	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
789	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
790	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
791
792		if (use_vosf) {
793	<	the_host_buffer = the_buffer;
794	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
795	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
796	<	memset(the_buffer_copy, 0, the_buffer_size);
797	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
629	<	memset(the_buffer, 0, the_buffer_size);
793	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
794	>	the_host_buffer = the_buffer;
795	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
796	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
797	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
798		}
799		#else
800		use_vosf = false;
801		#endif
802		#endif
803
804	<	set_video_monitor(width, height, bytes_per_row, true);
805	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
806	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
807	<	#else
808	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
809	<	#endif
810	<	return true;
811	<	#else
644	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
645	<	return false;
646	<	#endif
804	>	// Set VideoMonitor
805	>	VideoModes[0].bytes_per_row = bytes_per_row;
806	>	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
807	>	VideoMonitor.mode = mode;
808	>	set_mac_frame_buffer(mode.depth, true);
809	>
810	>	// Everything went well
811	>	init_ok = true;
812		}
813
814	<	// Init XF86 DGA display
815	<	static bool init_xf86_dga(int width, int height)
814	>	// Close display
815	>	driver_fbdev::~driver_fbdev()
816		{
817	+	}
818	+	#endif
819	+
820	+
821		#ifdef ENABLE_XF86_DGA
822	+	/*
823	+	* XFree86 DGA display driver
824	+	*/
825	+
826	+	class driver_xf86dga : public driver_dga {
827	+	public:
828	+	driver_xf86dga(const video_mode &mode);
829	+	~driver_xf86dga();
830	+
831	+	void update_palette(void);
832	+	void resume(void);
833	+
834	+	private:
835	+	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
836	+	};
837	+
838	+	// Open display
839	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
840	+	: current_dga_cmap(0)
841	+	{
842	+	int width = mode.x, height = mode.y;
843	+
844		// Set relative mouse mode
845		ADBSetRelMouseMode(true);
846
#	Line 665 \| Line 856 \| static bool init_xf86_dga(int width, int
856		}
857		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
858		XF86VidModeSetViewPort(x_display, screen, 0, 0);
859	+	XSync(x_display, false);
860		}
861		#endif
862
#	Line 673 \| Line 865 \| static bool init_xf86_dga(int width, int
865		wattr.event_mask = eventmask = dga_eventmask;
866		wattr.override_redirect = True;
867
868	<	XSync(x_display, false);
677	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
868	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
869		InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
870	<	XSync(x_display, false);
871	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
872	<	XMapRaised(x_display, the_win);
873	<	XSync(x_display, false);
870	>
871	>	// Set window name/class
872	>	set_window_name(w, STR_WINDOW_TITLE);
873	>
874	>	// Indicate that we want keyboard input
875	>	set_window_focus(w);
876	>
877	>	// Show window
878	>	XMapRaised(x_display, w);
879	>	wait_mapped(w);
880
881		// Establish direct screen connection
882	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
882	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
883		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
884		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
885		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 694 \| Line 891 \| static bool init_xf86_dga(int width, int
891		XF86DGASetVidPage(x_display, screen, 0);
892
893		// Set colormap
894	<	if (depth == 8) {
895	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
894	>	if (!IsDirectMode(mode)) {
895	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
896		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
897		}
898	+	XSync(x_display, false);
899
900	<	// Set VideoMonitor
901	<	int bytes_per_row = (v_width + 7) & ~7;
902	<	switch (depth) {
705	<	case 1:
706	<	bytes_per_row /= 8;
707	<	break;
708	<	case 15:
709	<	case 16:
710	<	bytes_per_row *= 2;
711	<	break;
712	<	case 24:
713	<	case 32:
714	<	bytes_per_row *= 4;
715	<	break;
716	<	}
717	<
900	>	// Init blitting routines
901	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
902	>	#ifdef VIDEO_VOSF
903		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
904	<	// If the blit function is null, i.e. just a copy of the buffer,
905	<	// we first try to avoid the allocation of a temporary frame buffer
906	<	use_vosf = true;
722	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
723	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
724	<	use_vosf = false;
904	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
905	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
906	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
907
908		if (use_vosf) {
909	<	the_host_buffer = the_buffer;
910	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
911	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
912	<	memset(the_buffer_copy, 0, the_buffer_size);
913	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
732	<	memset(the_buffer, 0, the_buffer_size);
909	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
910	>	the_host_buffer = the_buffer;
911	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
912	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
913	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
914		}
915	<	#elif defined(ENABLE_VOSF)
735	<	// The UAE memory handlers will already handle color conversion, if needed.
915	>	#else
916		use_vosf = false;
917		#endif
738	–
739	–	set_video_monitor(width, height, bytes_per_row, true);
740	–	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
741	–	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
742	–	// MacFrameLayout = FLAYOUT_DIRECT;
743	–	#else
744	–	VideoMonitor.mac_frame_base = MacFrameBaseMac;
918		#endif
919	<	return true;
920	<	#else
921	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
922	<	return false;
919	>
920	>	// Set VideoMonitor
921	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
922	>	VideoMonitor.mode = mode;
923	>	set_mac_frame_buffer(mode.depth, true);
924	>
925	>	// Everything went well
926	>	init_ok = true;
927	>	}
928	>
929	>	// Close display
930	>	driver_xf86dga::~driver_xf86dga()
931	>	{
932	>	XF86DGADirectVideo(x_display, screen, 0);
933	>	#ifdef ENABLE_XF86_VIDMODE
934	>	if (has_vidmode)
935	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
936		#endif
937		}
938
939	+	// Palette has changed
940	+	void driver_xf86dga::update_palette(void)
941	+	{
942	+	driver_dga::update_palette();
943	+	current_dga_cmap ^= 1;
944	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
945	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
946	+	}
947	+
948	+	// Resume emulation
949	+	void driver_xf86dga::resume(void)
950	+	{
951	+	driver_dga::resume();
952	+	if (!IsDirectMode(VideoMonitor.mode))
953	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
954	+	}
955	+	#endif
956	+
957	+
958	+	/*
959	+	* Initialization
960	+	*/
961	+
962		// Init keycode translation table
963		static void keycode_init(void)
964		{
#	Line 815 \| Line 1024 \| static void keycode_init(void)
1024		}
1025		}
1026
1027	<	bool VideoInitBuffer()
1027	>	// Open display for specified mode
1028	>	static bool video_open(const video_mode &mode)
1029		{
1030	<	#ifdef ENABLE_VOSF
1031	<	if (use_vosf) {
1032	<	const uint32 page_size = getpagesize();
1033	<	const uint32 page_mask = page_size - 1;
1034	<
1035	<	mainBuffer.memBase = (uint32) the_buffer;
1036	<	// Align the frame buffer on page boundary
1037	<	mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
1038	<	mainBuffer.memLength = the_buffer_size;
1039	<	mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength;
1040	<
1041	<	mainBuffer.pageSize = page_size;
1042	<	mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
1043	<	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
1044	<
835	<	if (mainBuffer.dirtyPages != 0)
836	<	free(mainBuffer.dirtyPages);
837	<
838	<	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
1030	>	// Load gray ramp to color map
1031	>	int num = (vis->c_class == DirectColor ? vis->map_entries : 256);
1032	>	for (int i=0; i<num; i++) {
1033	>	int c = (i * 256) / num;
1034	>	palette[i].red = c * 0x0101;
1035	>	palette[i].green = c * 0x0101;
1036	>	palette[i].blue = c * 0x0101;
1037	>	if (vis->c_class == PseudoColor)
1038	>	palette[i].pixel = i;
1039	>	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1040	>	}
1041	>	if (cmap[0] && cmap[1]) {
1042	>	XStoreColors(x_display, cmap[0], palette, num);
1043	>	XStoreColors(x_display, cmap[1], palette, num);
1044	>	}
1045
1046	<	if (mainBuffer.pageInfo != 0)
1047	<	free(mainBuffer.pageInfo);
1046	>	// Create display driver object of requested type
1047	>	switch (display_type) {
1048	>	case DISPLAY_WINDOW:
1049	>	drv = new driver_window(mode);
1050	>	break;
1051	>	#ifdef ENABLE_FBDEV_DGA
1052	>	case DISPLAY_DGA:
1053	>	drv = new driver_fbdev(mode);
1054	>	break;
1055	>	#endif
1056	>	#ifdef ENABLE_XF86_DGA
1057	>	case DISPLAY_DGA:
1058	>	drv = new driver_xf86dga(mode);
1059	>	break;
1060	>	#endif
1061	>	}
1062	>	if (drv == NULL)
1063	>	return false;
1064	>	if (!drv->init_ok) {
1065	>	delete drv;
1066	>	drv = NULL;
1067	>	return false;
1068	>	}
1069
1070	<	mainBuffer.pageInfo = (ScreenPageInfo ) malloc(mainBuffer.pageCount sizeof(ScreenPageInfo));
1070	>	#ifdef ENABLE_VOSF
1071	>	if (use_vosf) {
1072	>	// Initialize the mainBuffer structure
1073	>	if (!video_init_buffer()) {
1074	>	ErrorAlert(STR_VOSF_INIT_ERR);
1075	>	return false;
1076	>	}
1077
1078	<	if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
1078	>	// Initialize the handler for SIGSEGV
1079	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1080	>	ErrorAlert("Could not initialize Video on SEGV signals");
1081		return false;
1082	+	}
1083	+	}
1084	+	#endif
1085	+
1086	+	// Initialize VideoRefresh function
1087	+	VideoRefreshInit();
1088
1089	<	PFLAG_CLEAR_ALL;
1089	>	// Lock down frame buffer
1090	>	XSync(x_display, false);
1091	>	LOCK_FRAME_BUFFER;
1092
1093	<	uint32 a = 0;
1094	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
1095	<	int y1 = a / VideoMonitor.bytes_per_row;
1096	<	if (y1 >= VideoMonitor.y)
1097	<	y1 = VideoMonitor.y - 1;
1098	<
1099	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
857	<	if (y2 >= VideoMonitor.y)
858	<	y2 = VideoMonitor.y - 1;
859	<
860	<	mainBuffer.pageInfo[i].top = y1;
861	<	mainBuffer.pageInfo[i].bottom = y2;
862	<
863	<	a += mainBuffer.pageSize;
864	<	if (a > mainBuffer.memLength)
865	<	a = mainBuffer.memLength;
866	<	}
867	<
868	<	// We can now write-protect the frame buffer
869	<	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
870	<	return false;
1093	>	// Start redraw/input thread
1094	>	#ifdef HAVE_PTHREADS
1095	>	redraw_thread_cancel = false;
1096	>	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1097	>	if (!redraw_thread_active) {
1098	>	printf("FATAL: cannot create redraw thread\n");
1099	>	return false;
1100		}
1101	+	#else
1102	+	redraw_thread_active = true;
1103		#endif
1104	+
1105		return true;
1106		}
1107
1108		bool VideoInit(bool classic)
1109		{
1110	+	classic_mode = classic;
1111	+
1112		#ifdef ENABLE_VOSF
879	–	// Open /dev/zero
880	–	zero_fd = open("/dev/zero", O_RDWR);
881	–	if (zero_fd < 0) {
882	–	char str[256];
883	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
884	–	ErrorAlert(str);
885	–	return false;
886	–	}
887	–
1113		// Zero the mainBuffer structure
1114	<	mainBuffer.dirtyPages = 0;
1115	<	mainBuffer.pageInfo = 0;
1114	>	mainBuffer.dirtyPages = NULL;
1115	>	mainBuffer.pageInfo = NULL;
1116		#endif
1117
1118		// Check if X server runs on local machine
#	Line 898 \| Line 1123 \| bool VideoInit(bool classic)
1123		keycode_init();
1124
1125		// Read prefs
1126	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1127	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1126	>	frame_skip = PrefsFindInt32("frameskip");
1127	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1128	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1129
1130		// Find screen and root window
1131		screen = XDefaultScreen(x_display);
#	Line 912 \| Line 1138 \| bool VideoInit(bool classic)
1138		// Frame buffer name
1139		char fb_name[20];
1140
1141	<	// Could do fbdev dga ?
1141	>	// Could do fbdev DGA?
1142		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1143		has_dga = true;
1144		else
#	Line 958 \| Line 1184 \| bool VideoInit(bool classic)
1184		case 15:
1185		case 16:
1186		case 24:
1187	<	case 32:
1188	<	color_class = TrueColor;
1187	>	case 32: // Try DirectColor first, as this will allow gamma correction
1188	>	color_class = DirectColor;
1189	>	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo))
1190	>	color_class = TrueColor;
1191		break;
1192		default:
1193	<	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1193	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1194		return false;
1195		}
1196		if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1197	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1197	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1198		return false;
1199		}
1200		if (visualInfo.depth != xdepth) {
1201	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1201	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1202		return false;
1203		}
1204		vis = visualInfo.visual;
1205
1206	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1207	<	classic_mode = classic;
980	<	if (classic)
981	<	depth = 1;
982	<	else
983	<	depth = xdepth;
984	<
985	<	// Create color maps for 8 bit mode
986	<	if (depth == 8) {
1206	>	// Create color maps
1207	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1208		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1209		cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1210	<	XInstallColormap(x_display, cmap[0]);
1211	<	XInstallColormap(x_display, cmap[1]);
1210	>	}
1211	>
1212	>	// Find pixel format of direct modes
1213	>	if (color_class == DirectColor \|\| color_class == TrueColor) {
1214	>	rshift = gshift = bshift = 0;
1215	>	rloss = gloss = bloss = 8;
1216	>	uint32 mask;
1217	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1218	>	++rshift;
1219	>	for (; mask&1; mask>>=1)
1220	>	--rloss;
1221	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1222	>	++gshift;
1223	>	for (; mask&1; mask>>=1)
1224	>	--gloss;
1225	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1226	>	++bshift;
1227	>	for (; mask&1; mask>>=1)
1228	>	--bloss;
1229	>	}
1230	>
1231	>	// Preset palette pixel values for gamma table
1232	>	if (color_class == DirectColor) {
1233	>	int num = vis->map_entries;
1234	>	for (int i=0; i<num; i++) {
1235	>	int c = (i * 256) / num;
1236	>	palette[i].pixel = ((c >> rloss) << rshift) \| ((c >> gloss) << gshift) \| ((c >> bloss) << bshift);
1237	>	}
1238		}
1239
1240		// Get screen mode from preferences
1241		const char *mode_str;
1242	<	if (classic)
1242	>	if (classic_mode)
1243		mode_str = "win/512/342";
1244		else
1245		mode_str = PrefsFindString("screen");
1246
1247	<	// Determine type and mode
1248	<	int width = 512, height = 384;
1247	>	// Determine display type and default dimensions
1248	>	int default_width = 512, default_height = 384;
1249		display_type = DISPLAY_WINDOW;
1250		if (mode_str) {
1251	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1251	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1252		display_type = DISPLAY_WINDOW;
1253		#ifdef ENABLE_FBDEV_DGA
1254	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1255	<	#else
1256	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1254	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1255	>	display_type = DISPLAY_DGA;
1256	>	default_width = -1; default_height = -1; // use entire screen
1257		#endif
1258	+	#ifdef ENABLE_XF86_DGA
1259	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1260		display_type = DISPLAY_DGA;
1012	–	if (width > DisplayWidth(x_display, screen))
1013	–	width = DisplayWidth(x_display, screen);
1014	–	if (height > DisplayHeight(x_display, screen))
1015	–	height = DisplayHeight(x_display, screen);
1016	–	}
1017	–	if (width <= 0)
1018	–	width = DisplayWidth(x_display, screen);
1019	–	if (height <= 0)
1020	–	height = DisplayHeight(x_display, screen);
1021	–	}
1022	–
1023	–	// Initialize according to display type
1024	–	switch (display_type) {
1025	–	case DISPLAY_WINDOW:
1026	–	if (!init_window(width, height))
1027	–	return false;
1028	–	break;
1029	–	case DISPLAY_DGA:
1030	–	#ifdef ENABLE_FBDEV_DGA
1031	–	if (!init_fbdev_dga(fb_name))
1032	–	#else
1033	–	if (!init_xf86_dga(width, height))
1261		#endif
1262	<	return false;
1036	<	break;
1262	>	}
1263		}
1264	+	if (default_width <= 0)
1265	+	default_width = DisplayWidth(x_display, screen);
1266	+	else if (default_width > DisplayWidth(x_display, screen))
1267	+	default_width = DisplayWidth(x_display, screen);
1268	+	if (default_height <= 0)
1269	+	default_height = DisplayHeight(x_display, screen);
1270	+	else if (default_height > DisplayHeight(x_display, screen))
1271	+	default_height = DisplayHeight(x_display, screen);
1272
1273	<	#ifdef HAVE_PTHREADS
1274	<	// Lock down frame buffer
1041	<	pthread_mutex_lock(&frame_buffer_lock);
1042	<	#endif
1043	<
1044	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1045	<	// Set variables for UAE memory mapping
1046	<	MacFrameBaseHost = the_buffer;
1047	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1273	>	// Mac screen depth follows X depth
1274	>	video_depth default_depth = DepthModeForPixelDepth(xdepth);
1275
1276	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1277	<	if (classic)
1278	<	MacFrameLayout = FLAYOUT_NONE;
1279	<	#endif
1280	<
1281	<	#ifdef ENABLE_VOSF
1282	<	if (use_vosf) {
1283	<	// Initialize the mainBuffer structure
1284	<	if (!VideoInitBuffer()) {
1285	<	// TODO: STR_VOSF_INIT_ERR ?
1286	<	ErrorAlert("Could not initialize Video on SEGV signals");
1287	<	return false;
1276	>	// Construct list of supported modes
1277	>	if (display_type == DISPLAY_WINDOW) {
1278	>	if (classic)
1279	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1280	>	else {
1281	>	if (default_depth != VDEPTH_1BIT) { // 1-bit modes are always available
1282	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, VDEPTH_1BIT), VDEPTH_1BIT);
1283	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, VDEPTH_1BIT), VDEPTH_1BIT);
1284	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, VDEPTH_1BIT), VDEPTH_1BIT);
1285	>	add_mode(832, 624, 0x83, TrivialBytesPerRow(832, VDEPTH_1BIT), VDEPTH_1BIT);
1286	>	add_mode(1024, 768, 0x84, TrivialBytesPerRow(1024, VDEPTH_1BIT), VDEPTH_1BIT);
1287	>	add_mode(1152, 870, 0x85, TrivialBytesPerRow(1152, VDEPTH_1BIT), VDEPTH_1BIT);
1288	>	add_mode(1280, 1024, 0x86, TrivialBytesPerRow(1280, VDEPTH_1BIT), VDEPTH_1BIT);
1289	>	add_mode(1600, 1200, 0x87, TrivialBytesPerRow(1600, VDEPTH_1BIT), VDEPTH_1BIT);
1290	>	}
1291	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, default_depth), default_depth);
1292	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, default_depth), default_depth);
1293	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, default_depth), default_depth);
1294	>	add_mode(832, 624, 0x83, TrivialBytesPerRow(832, default_depth), default_depth);
1295	>	add_mode(1024, 768, 0x84, TrivialBytesPerRow(1024, default_depth), default_depth);
1296	>	add_mode(1152, 870, 0x85, TrivialBytesPerRow(1152, default_depth), default_depth);
1297	>	add_mode(1280, 1024, 0x86, TrivialBytesPerRow(1280, default_depth), default_depth);
1298	>	add_mode(1600, 1200, 0x87, TrivialBytesPerRow(1600, default_depth), default_depth);
1299		}
1300	+	} else
1301	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1302
1303	<	// Initialize the handler for SIGSEGV
1304	<	if (!Screen_fault_handler_init()) {
1305	<	// TODO: STR_VOSF_INIT_ERR ?
1306	<	ErrorAlert("Could not initialize Video on SEGV signals");
1307	<	return false;
1303	>	// Find requested default mode and open display
1304	>	if (VideoModes.size() == 1)
1305	>	return video_open(VideoModes[0]);
1306	>	else {
1307	>	// Find mode with specified dimensions
1308	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1309	>	for (i = VideoModes.begin(); i != end; ++i) {
1310	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1311	>	return video_open(*i);
1312		}
1313	+	return video_open(VideoModes[0]);
1314		}
1070	–	#endif
1071	–
1072	–	// Initialize VideoRefresh function
1073	–	VideoRefreshInit();
1074	–
1075	–	XSync(x_display, false);
1076	–
1077	–	#ifdef HAVE_PTHREADS
1078	–	// Start redraw/input thread
1079	–	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1080	–	if (!redraw_thread_active) {
1081	–	printf("FATAL: cannot create redraw thread\n");
1082	–	return false;
1083	–	}
1084	–	#endif
1085	–	return true;
1315		}
1316
1317
#	Line 1090 \| Line 1319 \| bool VideoInit(bool classic)
1319		* Deinitialization
1320		*/
1321
1322	<	void VideoExit(void)
1322	>	// Close display
1323	>	static void video_close(void)
1324		{
1095	–	#ifdef HAVE_PTHREADS
1325		// Stop redraw thread
1326	+	#ifdef HAVE_PTHREADS
1327		if (redraw_thread_active) {
1328		redraw_thread_cancel = true;
1329		#ifdef HAVE_PTHREAD_CANCEL
1330		pthread_cancel(redraw_thread);
1331		#endif
1332		pthread_join(redraw_thread, NULL);
1103	–	redraw_thread_active = false;
1333		}
1334		#endif
1335	+	redraw_thread_active = false;
1336
1107	–	#ifdef HAVE_PTHREADS
1337		// Unlock frame buffer
1338	<	pthread_mutex_unlock(&frame_buffer_lock);
1339	<	#endif
1111	<
1112	<	// Close window and server connection
1113	<	if (x_display != NULL) {
1114	<	XSync(x_display, false);
1115	<
1116	<	#ifdef ENABLE_XF86_DGA
1117	<	if (display_type == DISPLAY_DGA) {
1118	<	XF86DGADirectVideo(x_display, screen, 0);
1119	<	XUngrabPointer(x_display, CurrentTime);
1120	<	XUngrabKeyboard(x_display, CurrentTime);
1121	<	}
1122	<	#endif
1123	<
1124	<	#ifdef ENABLE_XF86_VIDMODE
1125	<	if (has_vidmode && display_type == DISPLAY_DGA)
1126	<	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1127	<	#endif
1128	<
1129	<	#ifdef ENABLE_FBDEV_DGA
1130	<	if (display_type == DISPLAY_DGA) {
1131	<	XUngrabPointer(x_display, CurrentTime);
1132	<	XUngrabKeyboard(x_display, CurrentTime);
1133	<	close(fbdev_fd);
1134	<	}
1135	<	#endif
1136	<
1137	<	XFlush(x_display);
1138	<	XSync(x_display, false);
1139	<	if (depth == 8) {
1140	<	XFreeColormap(x_display, cmap[0]);
1141	<	XFreeColormap(x_display, cmap[1]);
1142	<	}
1143	<
1144	<	if (!use_vosf) {
1145	<	if (the_buffer) {
1146	<	free(the_buffer);
1147	<	the_buffer = NULL;
1148	<	}
1338	>	UNLOCK_FRAME_BUFFER;
1339	>	XSync(x_display, false);
1340
1150	–	if (!have_shm && the_buffer_copy) {
1151	–	free(the_buffer_copy);
1152	–	the_buffer_copy = NULL;
1153	–	}
1154	–	}
1155	–	#ifdef ENABLE_VOSF
1156	–	else {
1157	–	if (the_buffer != (uint8 *)MAP_FAILED) {
1158	–	munmap((caddr_t)the_buffer, the_buffer_size);
1159	–	the_buffer = 0;
1160	–	}
1161	–
1162	–	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1163	–	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1164	–	the_buffer_copy = 0;
1165	–	}
1166	–	}
1167	–	#endif
1168	–	}
1169	–
1341		#ifdef ENABLE_VOSF
1342	+	// Deinitialize VOSF
1343		if (use_vosf) {
1172	–	// Clear mainBuffer data
1344		if (mainBuffer.pageInfo) {
1345		free(mainBuffer.pageInfo);
1346	<	mainBuffer.pageInfo = 0;
1346	>	mainBuffer.pageInfo = NULL;
1347		}
1177	–
1348		if (mainBuffer.dirtyPages) {
1349		free(mainBuffer.dirtyPages);
1350	<	mainBuffer.dirtyPages = 0;
1350	>	mainBuffer.dirtyPages = NULL;
1351		}
1352		}
1353	+	#endif
1354	+
1355	+	// Close display
1356	+	delete drv;
1357	+	drv = NULL;
1358	+	}
1359	+
1360	+	void VideoExit(void)
1361	+	{
1362	+	// Close display
1363	+	video_close();
1364	+
1365	+	// Free colormaps
1366	+	if (cmap[0]) {
1367	+	XFreeColormap(x_display, cmap[0]);
1368	+	cmap[0] = 0;
1369	+	}
1370	+	if (cmap[1]) {
1371	+	XFreeColormap(x_display, cmap[1]);
1372	+	cmap[1] = 0;
1373	+	}
1374	+
1375	+	#ifdef ENABLE_XF86_VIDMODE
1376	+	// Free video mode list
1377	+	if (x_video_modes) {
1378	+	XFree(x_video_modes);
1379	+	x_video_modes = NULL;
1380	+	}
1381	+	#endif
1382
1383	<	// Close /dev/zero
1384	<	if (zero_fd > 0)
1385	<	close(zero_fd);
1383	>	#ifdef ENABLE_FBDEV_DGA
1384	>	// Close framebuffer device
1385	>	if (fbdev_fd >= 0) {
1386	>	close(fbdev_fd);
1387	>	fbdev_fd = -1;
1388	>	}
1389		#endif
1390		}
1391
#	Line 1195 \| Line 1397 \| void VideoExit(void)
1397		void VideoQuitFullScreen(void)
1398		{
1399		D(bug("VideoQuitFullScreen()\n"));
1400	<	if (display_type == DISPLAY_DGA)
1199	<	quit_full_screen = true;
1400	>	quit_full_screen = true;
1401		}
1402
1403
#	Line 1210 \| Line 1411 \| void VideoInterrupt(void)
1411		if (emerg_quit)
1412		QuitEmulator();
1413
1213	–	#ifdef HAVE_PTHREADS
1414		// Temporarily give up frame buffer lock (this is the point where
1415		// we are suspended when the user presses Ctrl-Tab)
1416	<	pthread_mutex_unlock(&frame_buffer_lock);
1417	<	pthread_mutex_lock(&frame_buffer_lock);
1218	<	#endif
1416	>	UNLOCK_FRAME_BUFFER;
1417	>	LOCK_FRAME_BUFFER;
1418		}
1419
1420
#	Line 1225 \| Line 1424 \| void VideoInterrupt(void)
1424
1425		void video_set_palette(uint8 *pal)
1426		{
1427	<	#ifdef HAVE_PTHREADS
1229	<	pthread_mutex_lock(&palette_lock);
1230	<	#endif
1427	>	LOCK_PALETTE;
1428
1429		// Convert colors to XColor array
1430	<	for (int i=0; i<256; i++) {
1431	<	palette[i].pixel = i;
1432	<	palette[i].red = pal[i3] 0x0101;
1433	<	palette[i].green = pal[i3+1] 0x0101;
1434	<	palette[i].blue = pal[i3+2] 0x0101;
1435	<	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1430	>	int num_in = 256, num_out = 256;
1431	>	if (VideoMonitor.mode.depth == VDEPTH_16BIT)
1432	>	num_in = 32;
1433	>	if (IsDirectMode(VideoMonitor.mode)) {
1434	>	// If X is in 565 mode we have to stretch the palette from 32 to 64 entries
1435	>	num_out = vis->map_entries;
1436	>	}
1437	>	XColor *p = palette;
1438	>	for (int i=0; i<num_out; i++) {
1439	>	int c = (i * num_in) / num_out;
1440	>	p->red = pal[c3 + 0] 0x0101;
1441	>	p->green = pal[c3 + 1] 0x0101;
1442	>	p->blue = pal[c3 + 2] 0x0101;
1443	>	if (vis->c_class == PseudoColor)
1444	>	p->pixel = i;
1445	>	p->flags = DoRed \| DoGreen \| DoBlue;
1446	>	p++;
1447		}
1448
1449		// Tell redraw thread to change palette
1450		palette_changed = true;
1451
1452	<	#ifdef HAVE_PTHREADS
1245	<	pthread_mutex_unlock(&palette_lock);
1246	<	#endif
1452	>	UNLOCK_PALETTE;
1453		}
1454
1455
1456		/*
1457	<	* Suspend/resume emulator
1457	>	* Switch video mode
1458		*/
1459
1460	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1255	<	static void suspend_emul(void)
1256	<	{
1257	<	if (display_type == DISPLAY_DGA) {
1258	<	// Release ctrl key
1259	<	ADBKeyUp(0x36);
1260	<	ctrl_down = false;
1261	<
1262	<	#ifdef HAVE_PTHREADS
1263	<	// Lock frame buffer (this will stop the MacOS thread)
1264	<	pthread_mutex_lock(&frame_buffer_lock);
1265	<	#endif
1266	<
1267	<	// Save frame buffer
1268	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1269	<	if (fb_save)
1270	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1271	<
1272	<	// Close full screen display
1273	<	#ifdef ENABLE_XF86_DGA
1274	<	XF86DGADirectVideo(x_display, screen, 0);
1275	<	#endif
1276	<	XUngrabPointer(x_display, CurrentTime);
1277	<	XUngrabKeyboard(x_display, CurrentTime);
1278	<	XUnmapWindow(x_display, the_win);
1279	<	XSync(x_display, false);
1280	<
1281	<	// Open "suspend" window
1282	<	XSetWindowAttributes wattr;
1283	<	wattr.event_mask = KeyPressMask;
1284	<	wattr.background_pixel = black_pixel;
1285	<	wattr.backing_store = WhenMapped;
1286	<	wattr.backing_planes = xdepth;
1287	<	wattr.colormap = DefaultColormap(x_display, screen);
1288	<
1289	<	XSync(x_display, false);
1290	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1291	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBackingStore \|
1292	<	CWBackingPlanes \| (xdepth == 8 ? CWColormap : 0), &wattr);
1293	<	XSync(x_display, false);
1294	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1295	<	XMapRaised(x_display, suspend_win);
1296	<	XSync(x_display, false);
1297	<	emul_suspended = true;
1298	<	}
1299	<	}
1300	<
1301	<	static void resume_emul(void)
1460	>	void video_switch_to_mode(const video_mode &mode)
1461		{
1462	<	// Close "suspend" window
1463	<	XDestroyWindow(x_display, suspend_win);
1464	<	XSync(x_display, false);
1462	>	// Close and reopen display
1463	>	video_close();
1464	>	video_open(mode);
1465
1466	<	// Reopen full screen display
1467	<	XMapRaised(x_display, the_win);
1468	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1310	<	XSync(x_display, false);
1311	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1312	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1313	<	#ifdef ENABLE_XF86_DGA
1314	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
1315	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1316	<	#endif
1317	<	XSync(x_display, false);
1318	<
1319	<	// the_buffer already contains the data to restore. i.e. since a temporary
1320	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1321	<	// not necessary.
1322	<	#ifdef ENABLE_VOSF
1323	<	if (use_vosf) {
1324	<	#ifdef HAVE_PTHREADS
1325	<	pthread_mutex_lock(&Screen_draw_lock);
1326	<	#endif
1327	<	PFLAG_SET_ALL;
1328	<	#ifdef HAVE_PTHREADS
1329	<	pthread_mutex_unlock(&Screen_draw_lock);
1330	<	#endif
1331	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1332	<	}
1333	<	#endif
1334	<
1335	<	// Restore frame buffer
1336	<	if (fb_save) {
1337	<	#ifdef ENABLE_VOSF
1338	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1339	<	if (!use_vosf)
1340	<	#endif
1341	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1342	<	free(fb_save);
1343	<	fb_save = NULL;
1466	>	if (drv == NULL) {
1467	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1468	>	QuitEmulator();
1469		}
1345	–
1346	–	#ifdef ENABLE_XF86_DGA
1347	–	if (depth == 8)
1348	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1349	–	#endif
1350	–
1351	–	#ifdef HAVE_PTHREADS
1352	–	// Unlock frame buffer (and continue MacOS thread)
1353	–	pthread_mutex_unlock(&frame_buffer_lock);
1354	–	emul_suspended = false;
1355	–	#endif
1470		}
1357	–	#endif
1471
1472
1473		/*
#	Line 1415 \| Line 1528 \| static int kc_decode(KeySym ks)
1528		case XK_slash: case XK_question: return 0x2c;
1529
1530		#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1531	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1531	>	case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30;
1532		#else
1533		case XK_Tab: return 0x30;
1534		#endif
#	Line 1506 \| Line 1619 \| static int kc_decode(KeySym ks)
1619		return -1;
1620		}
1621
1622	<	static int event2keycode(XKeyEvent *ev)
1622	>	static int event2keycode(XKeyEvent &ev)
1623		{
1624		KeySym ks;
1625		int as;
1626		int i = 0;
1627
1628		do {
1629	<	ks = XLookupKeysym(ev, i++);
1629	>	ks = XLookupKeysym(&ev, i++);
1630		as = kc_decode(ks);
1631		if (as != -1)
1632		return as;
#	Line 1529 \| Line 1642 \| *static int event2keycode(XKeyEvent ev)**
1642
1643		static void handle_events(void)
1644		{
1645	<	XEvent event;
1646	<	for (;;) {
1647	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1535	<	break;
1645	>	while (XPending(x_display)) {
1646	>	XEvent event;
1647	>	XNextEvent(x_display, &event);
1648
1649		switch (event.type) {
1650		// Mouse button
1651		case ButtonPress: {
1652	<	unsigned int button = ((XButtonEvent *)&event)->button;
1652	>	unsigned int button = event.xbutton.button;
1653		if (button < 4)
1654		ADBMouseDown(button - 1);
1655		else if (button < 6) { // Wheel mouse
#	Line 1556 \| Line 1668 \| static void handle_events(void)
1668		break;
1669		}
1670		case ButtonRelease: {
1671	<	unsigned int button = ((XButtonEvent *)&event)->button;
1671	>	unsigned int button = event.xbutton.button;
1672		if (button < 4)
1673		ADBMouseUp(button - 1);
1674		break;
#	Line 1564 \| Line 1676 \| static void handle_events(void)
1676
1677		// Mouse moved
1678		case EnterNotify:
1567	–	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1568	–	break;
1679		case MotionNotify:
1680	<	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1680	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1681		break;
1682
1683		// Keyboard
1684		case KeyPress: {
1685		int code;
1686		if (use_keycodes) {
1687	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1688	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1687	>	event2keycode(event.xkey); // This is called to process the hotkeys
1688	>	code = keycode_table[event.xkey.keycode & 0xff];
1689		} else
1690	<	code = event2keycode((XKeyEvent *)&event);
1690	>	code = event2keycode(event.xkey);
1691		if (code != -1) {
1692		if (!emul_suspended) {
1693		if (code == 0x39) { // Caps Lock pressed
#	Line 1593 \| Line 1703 \| static void handle_events(void)
1703		if (code == 0x36)
1704		ctrl_down = true;
1705		} else {
1596	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1706		if (code == 0x31)
1707	<	resume_emul(); // Space wakes us up
1599	<	#endif
1707	>	drv->resume(); // Space wakes us up
1708		}
1709		}
1710		break;
#	Line 1604 \| Line 1712 \| static void handle_events(void)
1712		case KeyRelease: {
1713		int code;
1714		if (use_keycodes) {
1715	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1716	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1715	>	event2keycode(event.xkey); // This is called to process the hotkeys
1716	>	code = keycode_table[event.xkey.keycode & 0xff];
1717		} else
1718	<	code = event2keycode((XKeyEvent *)&event);
1718	>	code = event2keycode(event.xkey);
1719		if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
1720		ADBKeyUp(code);
1721		if (code == 0x36)
#	Line 1621 \| Line 1729 \| static void handle_events(void)
1729		if (display_type == DISPLAY_WINDOW) {
1730		#ifdef ENABLE_VOSF
1731		if (use_vosf) { // VOSF refresh
1732	<	#ifdef HAVE_PTHREADS
1625	<	pthread_mutex_lock(&Screen_draw_lock);
1626	<	#endif
1732	>	LOCK_VOSF;
1733		PFLAG_SET_ALL;
1734	<	#ifdef HAVE_PTHREADS
1735	<	pthread_mutex_unlock(&Screen_draw_lock);
1630	<	#endif
1631	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1734	>	UNLOCK_VOSF;
1735	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1736		}
1737		else
1738		#endif
#	Line 1639 \| Line 1743 \| static void handle_events(void)
1743		updt_box[x1][y1] = true;
1744		nr_boxes = 16 * 16;
1745		} else // Static refresh
1746	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1746	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1747		}
1748		break;
1749
1750	<	case FocusIn:
1751	<	case FocusOut:
1750	>	// Window "close" widget clicked
1751	>	case ClientMessage:
1752	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1753	>	ADBKeyDown(0x7f); // Power key
1754	>	ADBKeyUp(0x7f);
1755	>	}
1756		break;
1757		}
1758		}
#	Line 1656 \| Line 1764 \| static void handle_events(void)
1764		*/
1765
1766		// Dynamic display update (variable frame rate for each box)
1767	<	static void update_display_dynamic(int ticker)
1767	>	static void update_display_dynamic(int ticker, driver_window *drv)
1768		{
1769		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1770		int xil = 0;
1771		int rxm = 0, rxmo = 0;
1772	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1773	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1774	<	int rx = VideoMonitor.bytes_per_row / 16;
1775	<	int ry = VideoMonitor.y / 16;
1772	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1773	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1774	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
1775	>	int ry = VideoMonitor.mode.y / 16;
1776		int max_box;
1777
1778		y2s = sm_uptd[ticker % 8];
#	Line 1718 \| Line 1826 \| static void update_display_dynamic(int t
1826		i = (yi * bytes_per_row) + xi;
1827		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1828		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1829	<	if (depth == 1) {
1830	<	if (have_shm)
1831	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1829	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1830	>	if (drv->have_shm)
1831	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1832		else
1833	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1833	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1834		} else {
1835	<	if (have_shm)
1836	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1835	>	if (drv->have_shm)
1836	>	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);
1837		else
1838	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1838	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1839		}
1840		xil = 0;
1841		}
#	Line 1746 \| Line 1854 \| static void update_display_dynamic(int t
1854		}
1855
1856		// Static display update (fixed frame rate, but incremental)
1857	<	static void update_display_static(void)
1857	>	static void update_display_static(driver_window *drv)
1858		{
1859		// Incremental update code
1860		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1861	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1862	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1861	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1862	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1863		uint8 p, p2;
1864
1865		// Check for first line from top and first line from bottom that have changed
1866		y1 = 0;
1867	<	for (j=0; j<VideoMonitor.y; j++) {
1867	>	for (j=0; j<VideoMonitor.mode.y; j++) {
1868		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1869		y1 = j;
1870		break;
1871		}
1872		}
1873		y2 = y1 - 1;
1874	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
1874	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
1875		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1876		y2 = j;
1877		break;
#	Line 1773 \| Line 1881 \| static void update_display_static(void)
1881
1882		// Check for first column from left and first column from right that have changed
1883		if (high) {
1884	<	if (depth == 1) {
1885	<	x1 = VideoMonitor.x - 1;
1884	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1885	>	x1 = VideoMonitor.mode.x - 1;
1886		for (j=y1; j<=y2; j++) {
1887		p = &the_buffer[j * bytes_per_row];
1888		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1792 \| Line 1900 \| static void update_display_static(void)
1900		p2 = &the_buffer_copy[j * bytes_per_row];
1901		p += bytes_per_row;
1902		p2 += bytes_per_row;
1903	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1903	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
1904		p--; p2--;
1905		if (p != p2) {
1906		x2 = (i << 3) + 7;
#	Line 1811 \| Line 1919 \| static void update_display_static(void)
1919		}
1920
1921		} else {
1922	<	x1 = VideoMonitor.x;
1922	>	x1 = VideoMonitor.mode.x;
1923		for (j=y1; j<=y2; j++) {
1924		p = &the_buffer[j * bytes_per_row];
1925		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1829 \| Line 1937 \| static void update_display_static(void)
1937		p2 = &the_buffer_copy[j * bytes_per_row];
1938		p += bytes_per_row;
1939		p2 += bytes_per_row;
1940	<	for (i=VideoMonitor.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1940	>	for (i=VideoMonitor.mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1941		p--;
1942		p2--;
1943		if (p != p2) {
#	Line 1852 \| Line 1960 \| static void update_display_static(void)
1960
1961		// Refresh display
1962		if (high && wide) {
1963	<	if (have_shm)
1964	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1963	>	if (drv->have_shm)
1964	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
1965		else
1966	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1966	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
1967		}
1968		}
1969
#	Line 1864 \| Line 1972 \| static void update_display_static(void)
1972		* Screen refresh functions
1973		*/
1974
1975	<	// The specialisations hereunder are meant to enable VOSF with DGA in direct
1976	<	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
1977	<	// not get mapped correctly with respect to the predetermined host frame
1978	<	// buffer base address.
1979	<	//
1872	<	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1873	<	// we first try to "triple allocate" the address spaces according to the real
1874	<	// host frame buffer address. Then, if it fails, we will use a temporary
1875	<	// frame buffer thus making the real host frame buffer updated when pages
1876	<	// of the temp frame buffer are altered.
1877	<	//
1878	<	// As a side effect, a little speed gain in screen updates could be noticed
1879	<	// for other modes than DGA.
1880	<	//
1881	<	// The following two functions below are inline so that a clever compiler
1882	<	// could specialise the code according to the current screen depth and
1883	<	// display type. A more clever compiler would the job by itself though...
1884	<	// (update_display_vosf is inlined as well)
1975	>	// We suggest the compiler to inline the next two functions so that it
1976	>	// may specialise the code according to the current screen depth and
1977	>	// display type. A clever compiler would do that job by itself though...
1978	>
1979	>	// NOTE: update_display_vosf is inlined too
1980
1981		static inline void possibly_quit_dga_mode()
1982		{
1888	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1983		// Quit DGA mode if requested
1984		if (quit_full_screen) {
1985		quit_full_screen = false;
1986	<	#ifdef ENABLE_XF86_DGA
1987	<	XF86DGADirectVideo(x_display, screen, 0);
1894	<	#endif
1895	<	XUngrabPointer(x_display, CurrentTime);
1896	<	XUngrabKeyboard(x_display, CurrentTime);
1897	<	XUnmapWindow(x_display, the_win);
1898	<	XSync(x_display, false);
1986	>	delete drv;
1987	>	drv = NULL;
1988		}
1900	–	#endif
1989		}
1990
1991	<	static inline void handle_palette_changes(int depth, int display_type)
1991	>	static inline void handle_palette_changes(void)
1992		{
1993	<	#ifdef HAVE_PTHREADS
1994	<	pthread_mutex_lock(&palette_lock);
1907	<	#endif
1993	>	LOCK_PALETTE;
1994	>
1995		if (palette_changed) {
1996		palette_changed = false;
1997	<	if (depth == 8) {
1911	<	XStoreColors(x_display, cmap[0], palette, 256);
1912	<	XStoreColors(x_display, cmap[1], palette, 256);
1913	<
1914	<	#ifdef ENABLE_XF86_DGA
1915	<	if (display_type == DISPLAY_DGA) {
1916	<	current_dga_cmap ^= 1;
1917	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1918	<	}
1919	<	#endif
1920	<	}
1997	>	drv->update_palette();
1998		}
1999	<	#ifdef HAVE_PTHREADS
2000	<	pthread_mutex_unlock(&palette_lock);
1924	<	#endif
1999	>
2000	>	UNLOCK_PALETTE;
2001		}
2002
2003		static void video_refresh_dga(void)
#	Line 1933 \| Line 2009 \| static void video_refresh_dga(void)
2009		handle_events();
2010
2011		// Handle palette changes
2012	<	handle_palette_changes(depth, DISPLAY_DGA);
2012	>	handle_palette_changes();
2013		}
2014
2015		#ifdef ENABLE_VOSF
#	Line 1947 \| Line 2023 \| static void video_refresh_dga_vosf(void)
2023		handle_events();
2024
2025		// Handle palette changes
2026	<	handle_palette_changes(depth, DISPLAY_DGA);
2026	>	handle_palette_changes();
2027
2028		// Update display (VOSF variant)
2029		static int tick_counter = 0;
2030		if (++tick_counter >= frame_skip) {
2031		tick_counter = 0;
2032	<	#ifdef HAVE_PTHREADS
2033	<	pthread_mutex_lock(&Screen_draw_lock);
2034	<	#endif
2035	<	update_display_dga_vosf();
2036	<	#ifdef HAVE_PTHREADS
1961	<	pthread_mutex_unlock(&Screen_draw_lock);
1962	<	#endif
2032	>	if (mainBuffer.dirty) {
2033	>	LOCK_VOSF;
2034	>	update_display_dga_vosf();
2035	>	UNLOCK_VOSF;
2036	>	}
2037		}
2038		}
2039		#endif
#	Line 1973 \| Line 2047 \| static void video_refresh_window_vosf(vo
2047		handle_events();
2048
2049		// Handle palette changes
2050	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2050	>	handle_palette_changes();
2051
2052		// Update display (VOSF variant)
2053		static int tick_counter = 0;
2054		if (++tick_counter >= frame_skip) {
2055		tick_counter = 0;
2056	<	#ifdef HAVE_PTHREADS
2057	<	pthread_mutex_lock(&Screen_draw_lock);
2058	<	#endif
2059	<	update_display_window_vosf();
2060	<	#ifdef HAVE_PTHREADS
2061	<	pthread_mutex_unlock(&Screen_draw_lock);
1988	<	#endif
2056	>	if (mainBuffer.dirty) {
2057	>	LOCK_VOSF;
2058	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2059	>	UNLOCK_VOSF;
2060	>	XSync(x_display, false); // Let the server catch up
2061	>	}
2062		}
2063		}
2064		#endif // def ENABLE_VOSF
#	Line 1996 \| Line 2069 \| static void video_refresh_window_static(
2069		handle_events();
2070
2071		// Handle_palette changes
2072	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2072	>	handle_palette_changes();
2073
2074		// Update display (static variant)
2075		static int tick_counter = 0;
2076		if (++tick_counter >= frame_skip) {
2077		tick_counter = 0;
2078	<	update_display_static();
2078	>	update_display_static(static_cast<driver_window *>(drv));
2079		}
2080		}
2081
#	Line 2012 \| Line 2085 \| static void video_refresh_window_dynamic
2085		handle_events();
2086
2087		// Handle_palette changes
2088	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2088	>	handle_palette_changes();
2089
2090		// Update display (dynamic variant)
2091		static int tick_counter = 0;
2092		tick_counter++;
2093	<	update_display_dynamic(tick_counter);
2093	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2094		}
2095
2096
#	Line 2025 \| Line 2098 \| static void video_refresh_window_dynamic
2098		* Thread for screen refresh, input handling etc.
2099		*/
2100
2101	<	void VideoRefreshInit(void)
2101	>	static void VideoRefreshInit(void)
2102		{
2103		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2104		if (display_type == DISPLAY_DGA) {
#	Line 2051 \| Line 2124 \| void VideoRefreshInit(void)
2124
2125		void VideoRefresh(void)
2126		{
2127	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2128	<	video_refresh();
2129	<	}
2130	<
2058	<	#if 0
2059	<	void VideoRefresh(void)
2060	<	{
2061	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2062	<	// Quit DGA mode if requested
2063	<	if (quit_full_screen) {
2064	<	quit_full_screen = false;
2065	<	if (display_type == DISPLAY_DGA) {
2066	<	#ifdef ENABLE_XF86_DGA
2067	<	XF86DGADirectVideo(x_display, screen, 0);
2068	<	#endif
2069	<	XUngrabPointer(x_display, CurrentTime);
2070	<	XUngrabKeyboard(x_display, CurrentTime);
2071	<	XUnmapWindow(x_display, the_win);
2072	<	XSync(x_display, false);
2073	<	}
2074	<	}
2075	<	#endif
2076	<
2077	<	// Handle X events
2078	<	handle_events();
2079	<
2080	<	// Handle palette changes
2081	<	#ifdef HAVE_PTHREADS
2082	<	pthread_mutex_lock(&palette_lock);
2083	<	#endif
2084	<	if (palette_changed) {
2085	<	palette_changed = false;
2086	<	if (depth == 8) {
2087	<	XStoreColors(x_display, cmap[0], palette, 256);
2088	<	XStoreColors(x_display, cmap[1], palette, 256);
2089	<
2090	<	#ifdef ENABLE_XF86_DGA
2091	<	if (display_type == DISPLAY_DGA) {
2092	<	current_dga_cmap ^= 1;
2093	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2094	<	}
2095	<	#endif
2096	<	}
2097	<	}
2098	<	#ifdef HAVE_PTHREADS
2099	<	pthread_mutex_unlock(&palette_lock);
2100	<	#endif
2101	<
2102	<	// In window mode, update display
2103	<	static int tick_counter = 0;
2104	<	if (display_type == DISPLAY_WINDOW) {
2105	<	tick_counter++;
2106	<	if (frame_skip == 0)
2107	<	update_display_dynamic(tick_counter);
2108	<	else if (tick_counter >= frame_skip) {
2109	<	tick_counter = 0;
2110	<	update_display_static();
2111	<	}
2112	<	}
2127	>	// We need to check redraw_thread_active to inhibit refreshed during
2128	>	// mode changes on non-threaded platforms
2129	>	if (redraw_thread_active)
2130	>	video_refresh();
2131		}
2114	–	#endif
2132
2133		#ifdef HAVE_PTHREADS
2134		static void redraw_func(void arg)
#	Line 2120 \| Line 2137 \| *static void redraw_func(void arg)*
2137		int64 ticks = 0;
2138		uint64 next = GetTicks_usec();
2139		while (!redraw_thread_cancel) {
2123	–	// VideoRefresh();
2140		video_refresh();
2141		next += 16667;
2142		int64 delay = next - GetTicks_usec();
#	Line 2131 \| Line 2147 \| *static void redraw_func(void arg)*
2147		ticks++;
2148		}
2149		uint64 end = GetTicks_usec();
2150	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2150	>	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2151		return NULL;
2152		}
2153		#endif

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.28 by cebix, 2000-11-03T12:23:49Z vs. Revision 1.48 by cebix, 2001-07-01T14:38:03Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.28 by cebix, 2000-11-03T12:23:49Z vs.
Revision 1.48 by cebix, 2001-07-01T14:38:03Z