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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs.
Revision 1.45 by cebix, 2001-06-30T20:18:36Z

#	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 <math.h> // log()
57	–	# include <unistd.h>
58	–	# include <signal.h>
59	–	# include <fcntl.h>
60	–	# include <sys/mman.h>
61	–	#endif
62	–
55		#include "cpu_emulation.h"
56		#include "main.h"
57		#include "adb.h"
#	Line 80 \| 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
95	–	#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 115 \| 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
119	<	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;
126	–	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask;
127	–	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask;
126
127	<	static XColor palette[256]; // Color palette for 8-bit mode
127	>	static XColor palette[256]; // Color palette for indexed modes
128		static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
131	–	#ifdef HAVE_PTHREADS
132	–	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
133	–	#endif
134	–
135	–	// Variables for window mode
136	–	static GC the_gc;
137	–	static XImage *img = NULL;
138	–	static XShmSegmentInfo shminfo;
139	–	static Cursor mac_cursor;
140	–	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
141	–	static bool have_shm = false; // Flag: SHM extensions available
142	–	static bool updt_box[17][17]; // Flag for Update
143	–	static int nr_boxes;
144	–	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
145	–	static int sm_no_boxes[] = {1,8,32,64,128,300};
129
130	<	// Variables for XF86 DGA mode
131	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
149	<	static Window suspend_win; // "Suspend" window
150	<	static void *fb_save = NULL; // Saved frame buffer for suspend
151	<	#ifdef HAVE_PTHREADS
152	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
130	>	#ifdef ENABLE_FBDEV_DGA
131	>	static int fbdev_fd = -1;
132		#endif
133
155	–	// Variables for fbdev DGA mode
156	–	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
157	–	static int fbdev_fd;
158	–
134		#ifdef ENABLE_XF86_VIDMODE
135	<	// Variables for XF86 VidMode support
161	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
135	>	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
136		static int num_x_video_modes;
137		#endif
138
139	<	#ifdef ENABLE_VOSF
140	<	static bool use_vosf = true; // Flag: VOSF enabled
139	>	// Mutex to protect palette
140	>	#ifdef HAVE_PTHREADS
141	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
142	>	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
143	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
144		#else
145	<	static const bool use_vosf = false; // Flag: VOSF enabled
145	>	#define LOCK_PALETTE
146	>	#define UNLOCK_PALETTE
147		#endif
148
149	<	#ifdef ENABLE_VOSF
172	<	static uint8 * the_host_buffer; // Host frame buffer in VOSF mode
173	<	static uint32 the_buffer_size; // Size of allocated the_buffer
174	<	#endif
175	<
176	<	#ifdef ENABLE_VOSF
177	<	// Variables for Video on SEGV support (taken from the Win32 port)
178	<	struct ScreenPageInfo {
179	<	int top, bottom; // Mapping between this virtual page and Mac scanlines
180	<	};
181	<
182	<	struct ScreenInfo {
183	<	uint32 memBase; // Real start address
184	<	uint32 memStart; // Start address aligned to page boundary
185	<	uint32 memEnd; // Address of one-past-the-end of the screen
186	<	uint32 memLength; // Length of the memory addressed by the screen pages
187	<
188	<	uint32 pageSize; // Size of a page
189	<	int pageBits; // Shift count to get the page number
190	<	uint32 pageCount; // Number of pages allocated to the screen
191	<
192	<	uint8 * dirtyPages; // Table of flags set if page was altered
193	<	ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines
194	<	};
195	<
196	<	static ScreenInfo mainBuffer;
197	<
198	<	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = 1
199	<	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = 0
200	<	#define PFLAG_ISSET(page) mainBuffer.dirtyPages[page]
201	<	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] == 0)
202	<	#ifdef UNALIGNED_PROFITABLE
203	<	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + page)) == 0)
204	<	#else
205	<	# define PFLAG_ISCLEAR_4(page) \
206	<	(mainBuffer.dirtyPages[page ] == 0) \
207	<	&& (mainBuffer.dirtyPages[page+1] == 0) \
208	<	&& (mainBuffer.dirtyPages[page+2] == 0) \
209	<	&& (mainBuffer.dirtyPages[page+3] == 0)
210	<	#endif
211	<	#define PFLAG_CLEAR_ALL memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
212	<	#define PFLAG_SET_ALL memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
213	<
214	<	static int zero_fd = -1;
215	<	static bool Screen_fault_handler_init();
216	<	static struct sigaction vosf_sa;
217	<
149	>	// Mutex to protect frame buffer
150		#ifdef HAVE_PTHREADS
151	<	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
151	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
152	>	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
153	>	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
154	>	#else
155	>	#define LOCK_FRAME_BUFFER
156	>	#define UNLOCK_FRAME_BUFFER
157		#endif
158
159	<	#endif
159	>	// Variables for non-VOSF incremental refresh
160	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
161	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
162	>	static bool updt_box[17][17];
163	>	static int nr_boxes;
164
165	<	// VideoRefresh function
166	<	void VideoRefreshInit(void);
165	>	// Video refresh function
166	>	static void VideoRefreshInit(void);
167		static void (*video_refresh)(void);
168
169	+
170		// Prototypes
171		static void redraw_func(void arg);
172	<	static int event2keycode(XKeyEvent *ev);
231	<
172	>	static int event2keycode(XKeyEvent &ev);
173
174		// From main_unix.cpp
175		extern char *x_display_name;
#	Line 237 \| Line 178 \| *extern Display x_display;**
178		// From sys_unix.cpp
179		extern void SysMountFirstFloppy(void);
180
240	–	#ifdef ENABLE_VOSF
241	–	# include "video_vosf.h"
242	–	#endif
243	–
181
182		/*
183	<	* Initialization
183	>	* Utility functions
184		*/
185
186	<	// Set VideoMonitor according to video mode
187	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
186	>	// Add mode to list of supported modes
187	>	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
188	>	{
189	>	video_mode mode;
190	>	mode.x = width;
191	>	mode.y = height;
192	>	mode.resolution_id = resolution_id;
193	>	mode.bytes_per_row = bytes_per_row;
194	>	mode.depth = depth;
195	>	VideoModes.push_back(mode);
196	>	}
197	>
198	>	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
199	>	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
200		{
201		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
202		int layout = FLAYOUT_DIRECT;
203	<	switch (depth) {
204	<	case 1:
205	<	layout = FLAYOUT_DIRECT;
206	<	break;
258	<	case 8:
259	<	layout = FLAYOUT_DIRECT;
260	<	break;
261	<	case 15:
262	<	layout = FLAYOUT_HOST_555;
263	<	break;
264	<	case 16:
265	<	layout = FLAYOUT_HOST_565;
266	<	break;
267	<	case 24:
268	<	case 32:
269	<	layout = FLAYOUT_HOST_888;
270	<	break;
271	<	}
203	>	if (depth == VDEPTH_16BIT)
204	>	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
205	>	else if (depth == VDEPTH_32BIT)
206	>	layour = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
207		if (native_byte_order)
208		MacFrameLayout = layout;
209		else
210		MacFrameLayout = FLAYOUT_DIRECT;
211	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
212	+
213	+	// Set variables used by UAE memory banking
214	+	MacFrameBaseHost = the_buffer;
215	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
216	+	InitFrameBufferMapping();
217	+	#else
218	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
219	+	D(bug("Host frame buffer = %p, ", the_buffer));
220		#endif
221	<	switch (depth) {
222	<	case 1:
223	<	VideoMonitor.mode = VMODE_1BIT;
224	<	break;
225	<	case 8:
226	<	VideoMonitor.mode = VMODE_8BIT;
227	<	break;
228	<	case 15:
229	<	VideoMonitor.mode = VMODE_16BIT;
230	<	break;
231	<	case 16:
232	<	VideoMonitor.mode = VMODE_16BIT;
233	<	break;
234	<	case 24:
235	<	case 32:
236	<	VideoMonitor.mode = VMODE_32BIT;
237	<	break;
221	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
222	>	}
223	>
224	>	// Set window name and class
225	>	static void set_window_name(Window w, int name)
226	>	{
227	>	const char *str = GetString(name);
228	>	XStoreName(x_display, w, str);
229	>	XSetIconName(x_display, w, str);
230	>
231	>	XClassHint *hints;
232	>	hints = XAllocClassHint();
233	>	if (hints) {
234	>	hints->res_name = "BasiliskII";
235	>	hints->res_class = "BasiliskII";
236	>	XSetClassHint(x_display, w, hints);
237	>	XFree(hints);
238	>	}
239	>	}
240	>
241	>	// Set window input focus flag
242	>	static void set_window_focus(Window w)
243	>	{
244	>	XWMHints *hints = XAllocWMHints();
245	>	if (hints) {
246	>	hints->input = True;
247	>	hints->initial_state = NormalState;
248	>	hints->flags = InputHint \| StateHint;
249	>	XSetWMHints(x_display, w, hints);
250	>	XFree(hints);
251		}
252	<	VideoMonitor.x = width;
253	<	VideoMonitor.y = height;
254	<	VideoMonitor.bytes_per_row = bytes_per_row;
252	>	}
253	>
254	>	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
255	>	static Atom WM_DELETE_WINDOW = (Atom)0;
256	>	static void set_window_delete_protocol(Window w)
257	>	{
258	>	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
259	>	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
260	>	}
261	>
262	>	// Wait until window is mapped/unmapped
263	>	void wait_mapped(Window w)
264	>	{
265	>	XEvent e;
266	>	do {
267	>	XMaskEvent(x_display, StructureNotifyMask, &e);
268	>	} while ((e.type != MapNotify) \|\| (e.xmap.event != w));
269	>	}
270	>
271	>	void wait_unmapped(Window w)
272	>	{
273	>	XEvent e;
274	>	do {
275	>	XMaskEvent(x_display, StructureNotifyMask, &e);
276	>	} while ((e.type != UnmapNotify) \|\| (e.xmap.event != w));
277		}
278
279		// Trap SHM errors
#	Line 310 \| Line 289 \| *static int error_handler(Display d, XEr**
289		return old_error_handler(d, e);
290		}
291
292	<	// Init window mode
293	<	static bool init_window(int width, int height)
292	>
293	>	/*
294	>	* Display "driver" classes
295	>	*/
296	>
297	>	class driver_base {
298	>	public:
299	>	driver_base();
300	>	virtual ~driver_base();
301	>
302	>	virtual void update_palette(void);
303	>	virtual void suspend(void) {}
304	>	virtual void resume(void) {}
305	>
306	>	public:
307	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
308	>	Window w; // The window we draw into
309	>	};
310	>
311	>	class driver_window;
312	>	static void update_display_window_vosf(driver_window *drv);
313	>	static void update_display_dynamic(int ticker, driver_window *drv);
314	>	static void update_display_static(driver_window *drv);
315	>
316	>	class driver_window : public driver_base {
317	>	friend void update_display_window_vosf(driver_window *drv);
318	>	friend void update_display_dynamic(int ticker, driver_window *drv);
319	>	friend void update_display_static(driver_window *drv);
320	>
321	>	public:
322	>	driver_window(const video_mode &mode);
323	>	~driver_window();
324	>
325	>	private:
326	>	GC gc;
327	>	XImage *img;
328	>	bool have_shm; // Flag: SHM extensions available
329	>	XShmSegmentInfo shminfo;
330	>	Cursor mac_cursor;
331	>	};
332	>
333	>	static driver_base *drv = NULL; // Pointer to currently used driver object
334	>
335	>	#ifdef ENABLE_VOSF
336	>	# include "video_vosf.h"
337	>	#endif
338	>
339	>	driver_base::driver_base()
340	>	: init_ok(false), w(0)
341	>	{
342	>	the_buffer = NULL;
343	>	the_buffer_copy = NULL;
344	>	}
345	>
346	>	driver_base::~driver_base()
347	>	{
348	>	if (w) {
349	>	XUnmapWindow(x_display, w);
350	>	wait_unmapped(w);
351	>	XDestroyWindow(x_display, w);
352	>	}
353	>
354	>	XFlush(x_display);
355	>	XSync(x_display, false);
356	>
357	>	// Free frame buffer(s)
358	>	if (!use_vosf) {
359	>	if (the_buffer) {
360	>	free(the_buffer);
361	>	the_buffer = NULL;
362	>	}
363	>	if (the_buffer_copy) {
364	>	free(the_buffer_copy);
365	>	the_buffer_copy = NULL;
366	>	}
367	>	}
368	>	#ifdef ENABLE_VOSF
369	>	else {
370	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
371	>	vm_release(the_buffer, the_buffer_size);
372	>	the_buffer = NULL;
373	>	}
374	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
375	>	vm_release(the_buffer_copy, the_buffer_size);
376	>	the_buffer_copy = NULL;
377	>	}
378	>	}
379	>	#endif
380	>	}
381	>
382	>	// Palette has changed
383	>	void driver_base::update_palette(void)
384		{
385	+	if (cmap[0] && cmap[1]) {
386	+	int num = 256;
387	+	if (xdepth == 15)
388	+	num = 32;
389	+	else if (xdepth == 16)
390	+	num = 64;
391	+	XStoreColors(x_display, cmap[0], palette, num);
392	+	XStoreColors(x_display, cmap[1], palette, num);
393	+	}
394	+	XSync(x_display, false);
395	+	}
396	+
397	+
398	+	/*
399	+	* Windowed display driver
400	+	*/
401	+
402	+	// Open display
403	+	driver_window::driver_window(const video_mode &mode)
404	+	: gc(0), img(NULL), have_shm(false), mac_cursor(0)
405	+	{
406	+	int width = mode.x, height = mode.y;
407		int aligned_width = (width + 15) & ~15;
408		int aligned_height = (height + 15) & ~15;
409
410		// Set absolute mouse mode
411		ADBSetRelMouseMode(false);
412
322	–	// Read frame skip prefs
323	–	frame_skip = PrefsFindInt32("frameskip");
324	–
413		// Create window
414		XSetWindowAttributes wattr;
415		wattr.event_mask = eventmask = win_eventmask;
416		wattr.background_pixel = black_pixel;
417	<	wattr.border_pixel = black_pixel;
418	<	wattr.backing_store = NotUseful;
419	<	wattr.save_under = false;
332	<	wattr.backing_planes = xdepth;
417	>	wattr.colormap = cmap[0];
418	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
419	>	InputOutput, vis, CWEventMask \| CWBackPixel \| ((mode.depth == VDEPTH_1BIT \|\| cmap[0] == 0) ? 0 : CWColormap), &wattr);
420
421	<	XSync(x_display, false);
422	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
336	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
337	<	CWBackingStore \| CWBackingPlanes, &wattr);
338	<	XSync(x_display, false);
339	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
340	<	XMapRaised(x_display, the_win);
341	<	XSync(x_display, false);
421	>	// Set window name/class
422	>	set_window_name(w, STR_WINDOW_TITLE);
423
424	<	// Set colormap
425	<	if (depth == 8) {
426	<	XSetWindowColormap(x_display, the_win, cmap[0]);
427	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
428	<	}
424	>	// Indicate that we want keyboard input
425	>	set_window_focus(w);
426	>
427	>	// Set delete protocol property
428	>	set_window_delete_protocol(w);
429
430		// Make window unresizable
431	<	XSizeHints *hints;
432	<	if ((hints = XAllocSizeHints()) != NULL) {
433	<	hints->min_width = width;
434	<	hints->max_width = width;
435	<	hints->min_height = height;
436	<	hints->max_height = height;
437	<	hints->flags = PMinSize \| PMaxSize;
438	<	XSetWMNormalHints(x_display, the_win, hints);
439	<	XFree((char *)hints);
431	>	{
432	>	XSizeHints *hints = XAllocSizeHints();
433	>	if (hints) {
434	>	hints->min_width = width;
435	>	hints->max_width = width;
436	>	hints->min_height = height;
437	>	hints->max_height = height;
438	>	hints->flags = PMinSize \| PMaxSize;
439	>	XSetWMNormalHints(x_display, w, hints);
440	>	XFree(hints);
441	>	}
442		}
443
444	+	// Show window
445	+	XMapWindow(x_display, w);
446	+	wait_mapped(w);
447	+
448		// Try to create and attach SHM image
449	<	have_shm = false;
363	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
449	>	if (local_X11 && XShmQueryExtension(x_display)) {
450
451		// Create SHM image ("height + 2" for safety)
452	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
452	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
453		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
454		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
455		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 387 \| Line 473 \| static bool init_window(int width, int h
473
474		// Create normal X image if SHM doesn't work ("height + 2" for safety)
475		if (!have_shm) {
476	<	int bytes_per_row = aligned_width;
391	<	switch (depth) {
392	<	case 1:
393	<	bytes_per_row /= 8;
394	<	break;
395	<	case 15:
396	<	case 16:
397	<	bytes_per_row *= 2;
398	<	break;
399	<	case 24:
400	<	case 32:
401	<	bytes_per_row *= 4;
402	<	break;
403	<	}
476	>	int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth);
477		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
478	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
478	>	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);
479		}
480
481		// 1-Bit mode is big-endian
482	<	if (depth == 1) {
482	>	if (mode.depth == VDEPTH_1BIT) {
483		img->byte_order = MSBFirst;
484		img->bitmap_bit_order = MSBFirst;
485		}
486
487		#ifdef ENABLE_VOSF
488	<	// Allocate a page-aligned chunk of memory for frame buffer
416	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
488	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
489		the_host_buffer = the_buffer_copy;
490	<
491	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
492	<	memset(the_buffer_copy, 0, the_buffer_size);
421	<
422	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
423	<	memset(the_buffer, 0, the_buffer_size);
490	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
491	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
492	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
493		#else
494		// Allocate memory for frame buffer
495		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
496		#endif
497
498		// Create GC
499	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
500	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
499	>	gc = XCreateGC(x_display, w, 0, 0);
500	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
501
502		// Create no_cursor
503		mac_cursor = XCreatePixmapCursor(x_display,
504	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
505	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
504	>	XCreatePixmap(x_display, w, 1, 1, 1),
505	>	XCreatePixmap(x_display, w, 1, 1, 1),
506		&black, &white, 0, 0);
507	<	XDefineCursor(x_display, the_win, mac_cursor);
507	>	XDefineCursor(x_display, w, mac_cursor);
508
509	<	// Set VideoMonitor
509	>	// Init blitting routines
510		bool native_byte_order;
511		#ifdef WORDS_BIGENDIAN
512	<	native_byte_order = (img->bitmap_bit_order == MSBFirst);
512	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
513		#else
514	<	native_byte_order = (img->bitmap_bit_order == LSBFirst);
514	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
515		#endif
516		#ifdef ENABLE_VOSF
517	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
517	>	Screen_blitter_init(&visualInfo, native_byte_order);
518		#endif
519	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
520	<
521	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
522	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
523	<	#else
524	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
519	>
520	>	// Set VideoMonitor
521	>	VideoMonitor.mode = mode;
522	>	set_mac_frame_buffer(mode.depth, native_byte_order);
523	>
524	>	// Everything went well
525	>	init_ok = true;
526	>	}
527	>
528	>	// Close display
529	>	driver_window::~driver_window()
530	>	{
531	>	if (img)
532	>	XDestroyImage(img);
533	>	if (have_shm) {
534	>	XShmDetach(x_display, &shminfo);
535	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
536	>	}
537	>	if (gc)
538	>	XFreeGC(x_display, gc);
539	>	}
540	>
541	>
542	>	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
543	>	/*
544	>	* DGA display driver base class
545	>	*/
546	>
547	>	class driver_dga : public driver_base {
548	>	public:
549	>	driver_dga();
550	>	~driver_dga();
551	>
552	>	void suspend(void);
553	>	void resume(void);
554	>
555	>	private:
556	>	Window suspend_win; // "Suspend" information window
557	>	void *fb_save; // Saved frame buffer for suspend/resume
558	>	};
559	>
560	>	driver_dga::driver_dga()
561	>	: suspend_win(0), fb_save(NULL)
562	>	{
563	>	}
564	>
565	>	driver_dga::~driver_dga()
566	>	{
567	>	XUngrabPointer(x_display, CurrentTime);
568	>	XUngrabKeyboard(x_display, CurrentTime);
569	>	}
570	>
571	>	// Suspend emulation
572	>	void driver_dga::suspend(void)
573	>	{
574	>	// Release ctrl key
575	>	ADBKeyUp(0x36);
576	>	ctrl_down = false;
577	>
578	>	// Lock frame buffer (this will stop the MacOS thread)
579	>	LOCK_FRAME_BUFFER;
580	>
581	>	// Save frame buffer
582	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
583	>	if (fb_save)
584	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
585	>
586	>	// Close full screen display
587	>	#ifdef ENABLE_XF86_DGA
588	>	XF86DGADirectVideo(x_display, screen, 0);
589		#endif
590	<	return true;
590	>	XUngrabPointer(x_display, CurrentTime);
591	>	XUngrabKeyboard(x_display, CurrentTime);
592	>	XUnmapWindow(x_display, w);
593	>	wait_unmapped(w);
594	>
595	>	// Open "suspend" window
596	>	XSetWindowAttributes wattr;
597	>	wattr.event_mask = KeyPressMask;
598	>	wattr.background_pixel = black_pixel;
599	>
600	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
601	>	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
602	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
603	>	set_window_focus(suspend_win);
604	>	XMapWindow(x_display, suspend_win);
605	>	emul_suspended = true;
606		}
607
608	<	// Init fbdev DGA display
609	<	static bool init_fbdev_dga(char *in_fb_name)
608	>	// Resume emulation
609	>	void driver_dga::resume(void)
610		{
611	+	// Close "suspend" window
612	+	XDestroyWindow(x_display, suspend_win);
613	+	XSync(x_display, false);
614	+
615	+	// Reopen full screen display
616	+	XMapRaised(x_display, w);
617	+	wait_mapped(w);
618	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
619	+	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
620	+	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
621	+	#ifdef ENABLE_XF86_DGA
622	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
623	+	XF86DGASetViewPort(x_display, screen, 0, 0);
624	+	#endif
625	+	XSync(x_display, false);
626	+
627	+	// the_buffer already contains the data to restore. i.e. since a temporary
628	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
629	+	// not necessary.
630	+	#ifdef ENABLE_VOSF
631	+	if (use_vosf) {
632	+	LOCK_VOSF;
633	+	PFLAG_SET_ALL;
634	+	UNLOCK_VOSF;
635	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
636	+	}
637	+	#endif
638	+
639	+	// Restore frame buffer
640	+	if (fb_save) {
641	+	#ifdef ENABLE_VOSF
642	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
643	+	if (!use_vosf)
644	+	#endif
645	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
646	+	free(fb_save);
647	+	fb_save = NULL;
648	+	}
649	+
650	+	// Unlock frame buffer (and continue MacOS thread)
651	+	UNLOCK_FRAME_BUFFER;
652	+	emul_suspended = false;
653	+	}
654	+	#endif
655	+
656	+
657		#ifdef ENABLE_FBDEV_DGA
658	+	/*
659	+	* fbdev DGA display driver
660	+	*/
661	+
662	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
663	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
664	+
665	+	class driver_fbdev : public driver_dga {
666	+	public:
667	+	driver_fbdev(const video_mode &mode);
668	+	~driver_fbdev();
669	+	};
670	+
671	+	// Open display
672	+	driver_fbdev::driver_fbdev(const video_mode &mode)
673	+	{
674	+	int width = mode.x, height = mode.y;
675	+
676	+	// Set absolute mouse mode
677	+	ADBSetRelMouseMode(false);
678	+
679		// Find the maximum depth available
680		int ndepths, max_depth(0);
681		int *depths = XListDepths(x_display, screen, &ndepths);
682		if (depths == NULL) {
683		printf("FATAL: Could not determine the maximal depth available\n");
684	<	return false;
684	>	return;
685		} else {
686		while (ndepths-- > 0) {
687		if (depths[ndepths] > max_depth)
#	Line 483 \| Line 698 \| *static bool init_fbdev_dga(char in_fb_n**
698		char str[256];
699		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
700		ErrorAlert(str);
701	<	return false;
701	>	return;
702		}
703
704		int fb_depth; // supported depth
#	Line 503 \| Line 718 \| *static bool init_fbdev_dga(char in_fb_n**
718		continue;
719
720		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
721	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
721	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
722		device_found = true;
723		break;
724		}
#	Line 515 \| Line 730 \| *static bool init_fbdev_dga(char in_fb_n**
730		// Frame buffer name not found ? Then, display warning
731		if (!device_found) {
732		char str[256];
733	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
733	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
734		ErrorAlert(str);
735	<	return false;
735	>	return;
736		}
737
523	–	int width = DisplayWidth(x_display, screen);
524	–	int height = DisplayHeight(x_display, screen);
525	–	depth = fb_depth; // max_depth
526	–
527	–	// Set relative mouse mode
528	–	ADBSetRelMouseMode(false);
529	–
738		// Create window
739		XSetWindowAttributes wattr;
740	<	wattr.override_redirect = True;
741	<	wattr.backing_store = NotUseful;
742	<	wattr.background_pixel = white_pixel;
743	<	wattr.border_pixel = black_pixel;
536	<	wattr.event_mask = eventmask = dga_eventmask;
740	>	wattr.event_mask = eventmask = dga_eventmask;
741	>	wattr.background_pixel = white_pixel;
742	>	wattr.override_redirect = True;
743	>	wattr.colormap = cmap[0];
744
745	<	XSync(x_display, false);
539	<	the_win = XCreateWindow(x_display, rootwin,
745	>	w = XCreateWindow(x_display, rootwin,
746		0, 0, width, height,
747		0, xdepth, InputOutput, vis,
748	<	CWEventMask\|CWBackPixel\|CWBorderPixel\|CWOverrideRedirect\|CWBackingStore,
748	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
749		&wattr);
750	<	XSync(x_display, false);
751	<	XMapRaised(x_display, the_win);
752	<	XSync(x_display, false);
750	>
751	>	// Set window name/class
752	>	set_window_name(w, STR_WINDOW_TITLE);
753	>
754	>	// Indicate that we want keyboard input
755	>	set_window_focus(w);
756	>
757	>	// Show window
758	>	XMapRaised(x_display, w);
759	>	wait_mapped(w);
760
761		// Grab mouse and keyboard
762	<	XGrabKeyboard(x_display, the_win, True,
762	>	XGrabKeyboard(x_display, w, True,
763		GrabModeAsync, GrabModeAsync, CurrentTime);
764	<	XGrabPointer(x_display, the_win, True,
764	>	XGrabPointer(x_display, w, True,
765		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
766	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
766	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
767
768	<	// Set colormap
769	<	if (depth == 8) {
557	<	XSetWindowColormap(x_display, the_win, cmap[0]);
558	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
559	<	}
560	<
561	<	// Set VideoMonitor
562	<	int bytes_per_row = width;
563	<	switch (depth) {
564	<	case 1:
565	<	bytes_per_row = ((width \| 7) & ~7) >> 3;
566	<	break;
567	<	case 15:
568	<	case 16:
569	<	bytes_per_row *= 2;
570	<	break;
571	<	case 24:
572	<	case 32:
573	<	bytes_per_row *= 4;
574	<	break;
575	<	}
768	>	// Calculate bytes per row
769	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
770
771	+	// Map frame buffer
772		if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
773		if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
774		char str[256];
775		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
776		ErrorAlert(str);
777	<	return false;
777	>	return;
778		}
779		}
780
781	+	#if ENABLE_VOSF
782		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
783	<	// If the blit function is null, i.e. just a copy of the buffer,
784	<	// we first try to avoid the allocation of a temporary frame buffer
785	<	use_vosf = true;
590	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
591	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
592	<	use_vosf = false;
783	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
784	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
785	>	use_vosf = Screen_blitter_init(&visualInfo, true);
786
787		if (use_vosf) {
788	<	the_host_buffer = the_buffer;
789	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
790	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
791	<	memset(the_buffer_copy, 0, the_buffer_size);
792	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
600	<	memset(the_buffer, 0, the_buffer_size);
788	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
789	>	the_host_buffer = the_buffer;
790	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
791	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
792	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
793		}
602	–	#elif ENABLE_VOSF
603	–	use_vosf = false;
604	–	#endif
605	–
606	–	set_video_monitor(width, height, bytes_per_row, true);
607	–	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
608	–	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
794		#else
795	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
795	>	use_vosf = false;
796		#endif
612	–	return true;
613	–	#else
614	–	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
615	–	return false;
797		#endif
798	+
799	+	// Set VideoMonitor
800	+	VideoModes[0].bytes_per_row = bytes_per_row;
801	+	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
802	+	VideoMonitor.mode = mode;
803	+	set_mac_frame_buffer(mode.depth, true);
804	+
805	+	// Everything went well
806	+	init_ok = true;
807		}
808
809	<	// Init XF86 DGA display
810	<	static bool init_xf86_dga(int width, int height)
809	>	// Close display
810	>	driver_fbdev::~driver_fbdev()
811		{
812	+	}
813	+	#endif
814	+
815	+
816		#ifdef ENABLE_XF86_DGA
817	+	/*
818	+	* XFree86 DGA display driver
819	+	*/
820	+
821	+	class driver_xf86dga : public driver_dga {
822	+	public:
823	+	driver_xf86dga(const video_mode &mode);
824	+	~driver_xf86dga();
825	+
826	+	void update_palette(void);
827	+	void resume(void);
828	+
829	+	private:
830	+	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
831	+	};
832	+
833	+	// Open display
834	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
835	+	: current_dga_cmap(0)
836	+	{
837	+	int width = mode.x, height = mode.y;
838	+
839		// Set relative mouse mode
840		ADBSetRelMouseMode(true);
841
#	Line 635 \| Line 851 \| static bool init_xf86_dga(int width, int
851		}
852		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
853		XF86VidModeSetViewPort(x_display, screen, 0, 0);
854	+	XSync(x_display, false);
855		}
856		#endif
857
858		// Create window
859		XSetWindowAttributes wattr;
860		wattr.event_mask = eventmask = dga_eventmask;
644	–	wattr.border_pixel = black_pixel;
861		wattr.override_redirect = True;
862
863	<	XSync(x_display, false);
864	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
865	<	InputOutput, vis, CWEventMask \| CWBorderPixel \| CWOverrideRedirect, &wattr);
866	<	XSync(x_display, false);
867	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
868	<	XMapRaised(x_display, the_win);
869	<	XSync(x_display, false);
863	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
864	>	InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
865	>
866	>	// Set window name/class
867	>	set_window_name(w, STR_WINDOW_TITLE);
868	>
869	>	// Indicate that we want keyboard input
870	>	set_window_focus(w);
871	>
872	>	// Show window
873	>	XMapRaised(x_display, w);
874	>	wait_mapped(w);
875
876		// Establish direct screen connection
877	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
877	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
878		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
879		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
880		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 665 \| Line 886 \| static bool init_xf86_dga(int width, int
886		XF86DGASetVidPage(x_display, screen, 0);
887
888		// Set colormap
889	<	if (depth == 8) {
890	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
670	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
889	>	if (!IsDirectMode(mode)) {
890	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
891		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
892		}
893	+	XSync(x_display, false);
894
895	<	// Set VideoMonitor
896	<	int bytes_per_row = (v_width + 7) & ~7;
897	<	switch (depth) {
677	<	case 1:
678	<	bytes_per_row /= 8;
679	<	break;
680	<	case 15:
681	<	case 16:
682	<	bytes_per_row *= 2;
683	<	break;
684	<	case 24:
685	<	case 32:
686	<	bytes_per_row *= 4;
687	<	break;
688	<	}
689	<
895	>	// Init blitting routines
896	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
897	>	#ifdef VIDEO_VOSF
898		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
899	<	// If the blit function is null, i.e. just a copy of the buffer,
900	<	// we first try to avoid the allocation of a temporary frame buffer
901	<	use_vosf = true;
694	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
695	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
696	<	use_vosf = false;
899	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
900	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
901	>	use_vosf = Screen_blitter_init(&visualInfo, true);
902
903		if (use_vosf) {
904	<	the_host_buffer = the_buffer;
905	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
906	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
907	<	memset(the_buffer_copy, 0, the_buffer_size);
908	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
704	<	memset(the_buffer, 0, the_buffer_size);
904	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
905	>	the_host_buffer = the_buffer;
906	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
907	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
908	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
909		}
910	<	#elif defined(ENABLE_VOSF)
707	<	// The UAE memory handlers will already handle color conversion, if needed.
910	>	#else
911		use_vosf = false;
912		#endif
710	–
711	–	set_video_monitor(width, height, bytes_per_row, true);
712	–	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
713	–	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
714	–	// MacFrameLayout = FLAYOUT_DIRECT;
715	–	#else
716	–	VideoMonitor.mac_frame_base = MacFrameBaseMac;
913		#endif
914	<	return true;
915	<	#else
916	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
917	<	return false;
914	>
915	>	// Set VideoMonitor
916	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
917	>	VideoMonitor.mode = mode;
918	>	set_mac_frame_buffer(mode.depth, true);
919	>
920	>	// Everything went well
921	>	init_ok = true;
922	>	}
923	>
924	>	// Close display
925	>	driver_xf86dga::~driver_xf86dga()
926	>	{
927	>	XF86DGADirectVideo(x_display, screen, 0);
928	>	#ifdef ENABLE_XF86_VIDMODE
929	>	if (has_vidmode)
930	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
931		#endif
932		}
933
934	+	// Palette has changed
935	+	void driver_xf86dga::update_palette(void)
936	+	{
937	+	driver_dga::update_palette();
938	+	current_dga_cmap ^= 1;
939	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
940	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
941	+	}
942	+
943	+	// Resume emulation
944	+	void driver_xf86dga::resume(void)
945	+	{
946	+	driver_dga::resume();
947	+	if (!IsDirectMode(VideoMonitor.mode))
948	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
949	+	}
950	+	#endif
951	+
952	+
953	+	/*
954	+	* Initialization
955	+	*/
956	+
957		// Init keycode translation table
958		static void keycode_init(void)
959		{
#	Line 787 \| Line 1019 \| static void keycode_init(void)
1019		}
1020		}
1021
1022	<	bool VideoInitBuffer()
1022	>	// Open display for specified mode
1023	>	static bool video_open(const video_mode &mode)
1024		{
1025	+	// Create display driver object of requested type
1026	+	switch (display_type) {
1027	+	case DISPLAY_WINDOW:
1028	+	drv = new driver_window(mode);
1029	+	break;
1030	+	#ifdef ENABLE_FBDEV_DGA
1031	+	case DISPLAY_DGA:
1032	+	drv = new driver_fbdev(mode);
1033	+	break;
1034	+	#endif
1035	+	#ifdef ENABLE_XF86_DGA
1036	+	case DISPLAY_DGA:
1037	+	drv = new driver_xf86dga(mode);
1038	+	break;
1039	+	#endif
1040	+	}
1041	+	if (drv == NULL)
1042	+	return false;
1043	+	if (!drv->init_ok) {
1044	+	delete drv;
1045	+	drv = NULL;
1046	+	return false;
1047	+	}
1048	+
1049		#ifdef ENABLE_VOSF
1050		if (use_vosf) {
1051	<	const uint32 page_size = getpagesize();
1052	<	const uint32 page_mask = page_size - 1;
1053	<
1054	<	mainBuffer.memBase = (uint32) the_buffer;
1055	<	// Align the frame buffer on page boundary
799	<	mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
800	<	mainBuffer.memLength = the_buffer_size;
801	<	mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength;
802	<
803	<	mainBuffer.pageSize = page_size;
804	<	mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
805	<	mainBuffer.pageBits = int( log(mainBuffer.pageSize) / log(2.0) );
806	<
807	<	if (mainBuffer.dirtyPages != 0)
808	<	free(mainBuffer.dirtyPages);
809	<
810	<	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
811	<
812	<	if (mainBuffer.pageInfo != 0)
813	<	free(mainBuffer.pageInfo);
814	<
815	<	mainBuffer.pageInfo = (ScreenPageInfo ) malloc(mainBuffer.pageCount sizeof(ScreenPageInfo));
1051	>	// Initialize the mainBuffer structure
1052	>	if (!video_init_buffer()) {
1053	>	ErrorAlert(STR_VOSF_INIT_ERR);
1054	>	return false;
1055	>	}
1056
1057	<	if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
1057	>	// Initialize the handler for SIGSEGV
1058	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1059	>	ErrorAlert("Could not initialize Video on SEGV signals");
1060		return false;
1061	+	}
1062	+	}
1063	+	#endif
1064	+
1065	+	// Initialize VideoRefresh function
1066	+	VideoRefreshInit();
1067
1068	<	PFLAG_CLEAR_ALL;
1068	>	// Lock down frame buffer
1069	>	XSync(x_display, false);
1070	>	LOCK_FRAME_BUFFER;
1071
1072	<	uint32 a = 0;
1073	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
1074	<	int y1 = a / VideoMonitor.bytes_per_row;
1075	<	if (y1 >= VideoMonitor.y)
1076	<	y1 = VideoMonitor.y - 1;
1077	<
1078	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
829	<	if (y2 >= VideoMonitor.y)
830	<	y2 = VideoMonitor.y - 1;
831	<
832	<	mainBuffer.pageInfo[i].top = y1;
833	<	mainBuffer.pageInfo[i].bottom = y2;
834	<
835	<	a += mainBuffer.pageSize;
836	<	if (a > mainBuffer.memLength)
837	<	a = mainBuffer.memLength;
838	<	}
839	<
840	<	// We can now write-protect the frame buffer
841	<	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
842	<	return false;
1072	>	// Start redraw/input thread
1073	>	#ifdef HAVE_PTHREADS
1074	>	redraw_thread_cancel = false;
1075	>	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1076	>	if (!redraw_thread_active) {
1077	>	printf("FATAL: cannot create redraw thread\n");
1078	>	return false;
1079		}
1080	+	#else
1081	+	redraw_thread_active = true;
1082		#endif
1083	+
1084		return true;
1085		}
1086
1087		bool VideoInit(bool classic)
1088		{
1089	+	classic_mode = classic;
1090	+
1091		#ifdef ENABLE_VOSF
851	–	// Open /dev/zero
852	–	zero_fd = open("/dev/zero", O_RDWR);
853	–	if (zero_fd < 0) {
854	–	char str[256];
855	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
856	–	ErrorAlert(str);
857	–	return false;
858	–	}
859	–
1092		// Zero the mainBuffer structure
1093	<	mainBuffer.dirtyPages = 0;
1094	<	mainBuffer.pageInfo = 0;
1093	>	mainBuffer.dirtyPages = NULL;
1094	>	mainBuffer.pageInfo = NULL;
1095		#endif
1096
1097		// Check if X server runs on local machine
#	Line 870 \| Line 1102 \| bool VideoInit(bool classic)
1102		keycode_init();
1103
1104		// Read prefs
1105	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1106	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1105	>	frame_skip = PrefsFindInt32("frameskip");
1106	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1107	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1108
1109		// Find screen and root window
1110		screen = XDefaultScreen(x_display);
#	Line 884 \| Line 1117 \| bool VideoInit(bool classic)
1117		// Frame buffer name
1118		char fb_name[20];
1119
1120	<	// Could do fbdev dga ?
1120	>	// Could do fbdev DGA?
1121		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1122		has_dga = true;
1123		else
#	Line 930 \| Line 1163 \| bool VideoInit(bool classic)
1163		case 15:
1164		case 16:
1165		case 24:
1166	<	case 32:
1167	<	color_class = TrueColor;
1166	>	case 32: // Try DirectColor first, as this will allow gamma correction
1167	>	if (!XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo))
1168	>	color_class = TrueColor;
1169		break;
1170		default:
1171	<	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1171	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1172		return false;
1173		}
1174		if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1175	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1175	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1176		return false;
1177		}
1178		if (visualInfo.depth != xdepth) {
1179	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1179	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1180		return false;
1181		}
1182		vis = visualInfo.visual;
1183
1184	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1185	<	classic_mode = classic;
952	<	if (classic)
953	<	depth = 1;
954	<	else
955	<	depth = xdepth;
956	<
957	<	// Create color maps for 8 bit mode
958	<	if (depth == 8) {
1184	>	// Create color maps
1185	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1186		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1187		cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
961	–	XInstallColormap(x_display, cmap[0]);
962	–	XInstallColormap(x_display, cmap[1]);
1188		}
1189
1190		// Get screen mode from preferences
1191		const char *mode_str;
1192	<	if (classic)
1192	>	if (classic_mode)
1193		mode_str = "win/512/342";
1194		else
1195		mode_str = PrefsFindString("screen");
1196
1197	<	// Determine type and mode
1198	<	int width = 512, height = 384;
1197	>	// Determine display type and default dimensions
1198	>	int default_width = 512, default_height = 384;
1199		display_type = DISPLAY_WINDOW;
1200		if (mode_str) {
1201	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1201	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1202		display_type = DISPLAY_WINDOW;
1203		#ifdef ENABLE_FBDEV_DGA
1204	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1205	<	#else
1206	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1204	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1205	>	display_type = DISPLAY_DGA;
1206	>	default_width = -1; default_height = -1; // use entire screen
1207		#endif
1208	+	#ifdef ENABLE_XF86_DGA
1209	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1210		display_type = DISPLAY_DGA;
984	–	if (width > DisplayWidth(x_display, screen))
985	–	width = DisplayWidth(x_display, screen);
986	–	if (height > DisplayHeight(x_display, screen))
987	–	height = DisplayHeight(x_display, screen);
988	–	}
989	–	if (width <= 0)
990	–	width = DisplayWidth(x_display, screen);
991	–	if (height <= 0)
992	–	height = DisplayHeight(x_display, screen);
993	–	}
994	–
995	–	// Initialize according to display type
996	–	switch (display_type) {
997	–	case DISPLAY_WINDOW:
998	–	if (!init_window(width, height))
999	–	return false;
1000	–	break;
1001	–	case DISPLAY_DGA:
1002	–	#ifdef ENABLE_FBDEV_DGA
1003	–	if (!init_fbdev_dga(fb_name))
1004	–	#else
1005	–	if (!init_xf86_dga(width, height))
1211		#endif
1212	<	return false;
1008	<	break;
1212	>	}
1213		}
1214	+	if (default_width <= 0)
1215	+	default_width = DisplayWidth(x_display, screen);
1216	+	else if (default_width > DisplayWidth(x_display, screen))
1217	+	default_width = DisplayWidth(x_display, screen);
1218	+	if (default_height <= 0)
1219	+	default_height = DisplayHeight(x_display, screen);
1220	+	else if (default_height > DisplayHeight(x_display, screen))
1221	+	default_height = DisplayHeight(x_display, screen);
1222
1223	<	#ifdef HAVE_PTHREADS
1224	<	// Lock down frame buffer
1225	<	pthread_mutex_lock(&frame_buffer_lock);
1014	<	#endif
1015	<
1016	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1017	<	// Set variables for UAE memory mapping
1018	<	MacFrameBaseHost = the_buffer;
1019	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1020	<
1021	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1022	<	if (classic)
1023	<	MacFrameLayout = FLAYOUT_NONE;
1024	<	#endif
1223	>	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1224	>	int depth = (classic_mode ? 1 : xdepth);
1225	>	video_depth depth_mode = DepthModeForPixelDepth(depth);
1226
1227	<	#ifdef ENABLE_VOSF
1228	<	if (use_vosf) {
1229	<	// Initialize the mainBuffer structure
1230	<	if (!VideoInitBuffer()) {
1231	<	// TODO: STR_VOSF_INIT_ERR ?
1232	<	ErrorAlert("Could not initialize Video on SEGV signals");
1233	<	return false;
1227	>	// Construct list of supported modes
1228	>	if (display_type == DISPLAY_WINDOW) {
1229	>	if (classic)
1230	>	add_mode(512, 342, 0x80, 64, depth_mode);
1231	>	else {
1232	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth_mode), depth_mode);
1233	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth_mode), depth_mode);
1234	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth_mode), depth_mode);
1235	>	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth_mode), depth_mode);
1236	>	add_mode(1280, 1024, 0x84, TrivialBytesPerRow(1280, depth_mode), depth_mode);
1237		}
1238	+	} else
1239	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, depth_mode), depth_mode);
1240
1241	<	// Initialize the handler for SIGSEGV
1242	<	if (!Screen_fault_handler_init()) {
1243	<	// TODO: STR_VOSF_INIT_ERR ?
1244	<	ErrorAlert("Could not initialize Video on SEGV signals");
1245	<	return false;
1241	>	// Find requested default mode and open display
1242	>	if (VideoModes.size() == 1)
1243	>	return video_open(VideoModes[0]);
1244	>	else {
1245	>	// Find mode with specified dimensions
1246	>	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1247	>	while (i != end) {
1248	>	if (i->x == default_width && i->y == default_height)
1249	>	return video_open(*i);
1250	>	++i;
1251		}
1252	+	return video_open(VideoModes[0]);
1253		}
1042	–	#endif
1043	–
1044	–	// Initialize VideoRefresh function
1045	–	VideoRefreshInit();
1046	–
1047	–	XSync(x_display, false);
1048	–
1049	–	#ifdef HAVE_PTHREADS
1050	–	// Start redraw/input thread
1051	–	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1052	–	if (!redraw_thread_active) {
1053	–	printf("FATAL: cannot create redraw thread\n");
1054	–	return false;
1055	–	}
1056	–	#endif
1057	–	return true;
1254		}
1255
1256
#	Line 1062 \| Line 1258 \| bool VideoInit(bool classic)
1258		* Deinitialization
1259		*/
1260
1261	<	void VideoExit(void)
1261	>	// Close display
1262	>	static void video_close(void)
1263		{
1067	–	#ifdef HAVE_PTHREADS
1264		// Stop redraw thread
1265	+	#ifdef HAVE_PTHREADS
1266		if (redraw_thread_active) {
1267		redraw_thread_cancel = true;
1268		#ifdef HAVE_PTHREAD_CANCEL
1269		pthread_cancel(redraw_thread);
1270		#endif
1271		pthread_join(redraw_thread, NULL);
1075	–	redraw_thread_active = false;
1272		}
1273		#endif
1274	+	redraw_thread_active = false;
1275
1079	–	#ifdef HAVE_PTHREADS
1276		// Unlock frame buffer
1277	<	pthread_mutex_unlock(&frame_buffer_lock);
1278	<	#endif
1083	<
1084	<	// Close window and server connection
1085	<	if (x_display != NULL) {
1086	<	XSync(x_display, false);
1087	<
1088	<	#ifdef ENABLE_XF86_DGA
1089	<	if (display_type == DISPLAY_DGA) {
1090	<	XF86DGADirectVideo(x_display, screen, 0);
1091	<	XUngrabPointer(x_display, CurrentTime);
1092	<	XUngrabKeyboard(x_display, CurrentTime);
1093	<	}
1094	<	#endif
1095	<
1096	<	#ifdef ENABLE_XF86_VIDMODE
1097	<	if (has_vidmode && display_type == DISPLAY_DGA)
1098	<	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1099	<	#endif
1100	<
1101	<	#ifdef ENABLE_FBDEV_DGA
1102	<	if (display_type == DISPLAY_DGA) {
1103	<	XUngrabPointer(x_display, CurrentTime);
1104	<	XUngrabKeyboard(x_display, CurrentTime);
1105	<	close(fbdev_fd);
1106	<	}
1107	<	#endif
1108	<
1109	<	XFlush(x_display);
1110	<	XSync(x_display, false);
1111	<	if (depth == 8) {
1112	<	XFreeColormap(x_display, cmap[0]);
1113	<	XFreeColormap(x_display, cmap[1]);
1114	<	}
1115	<
1116	<	if (!use_vosf) {
1117	<	if (the_buffer) {
1118	<	free(the_buffer);
1119	<	the_buffer = NULL;
1120	<	}
1277	>	UNLOCK_FRAME_BUFFER;
1278	>	XSync(x_display, false);
1279
1122	–	if (!have_shm && the_buffer_copy) {
1123	–	free(the_buffer_copy);
1124	–	the_buffer_copy = NULL;
1125	–	}
1126	–	}
1127	–	#ifdef ENABLE_VOSF
1128	–	else {
1129	–	if (the_buffer != (uint8 *)MAP_FAILED) {
1130	–	munmap((caddr_t)the_buffer, the_buffer_size);
1131	–	the_buffer = 0;
1132	–	}
1133	–
1134	–	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1135	–	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1136	–	the_buffer_copy = 0;
1137	–	}
1138	–	}
1139	–	#endif
1140	–	}
1141	–
1280		#ifdef ENABLE_VOSF
1281	+	// Deinitialize VOSF
1282		if (use_vosf) {
1144	–	// Clear mainBuffer data
1283		if (mainBuffer.pageInfo) {
1284		free(mainBuffer.pageInfo);
1285	<	mainBuffer.pageInfo = 0;
1285	>	mainBuffer.pageInfo = NULL;
1286		}
1149	–
1287		if (mainBuffer.dirtyPages) {
1288		free(mainBuffer.dirtyPages);
1289	<	mainBuffer.dirtyPages = 0;
1289	>	mainBuffer.dirtyPages = NULL;
1290		}
1291		}
1292	+	#endif
1293
1294	<	// Close /dev/zero
1295	<	if (zero_fd > 0)
1296	<	close(zero_fd);
1294	>	// Close display
1295	>	delete drv;
1296	>	drv = NULL;
1297	>	}
1298	>
1299	>	void VideoExit(void)
1300	>	{
1301	>	// Close display
1302	>	video_close();
1303	>
1304	>	// Free colormaps
1305	>	if (cmap[0]) {
1306	>	XFreeColormap(x_display, cmap[0]);
1307	>	cmap[0] = 0;
1308	>	}
1309	>	if (cmap[1]) {
1310	>	XFreeColormap(x_display, cmap[1]);
1311	>	cmap[1] = 0;
1312	>	}
1313	>
1314	>	#ifdef ENABLE_XF86_VIDMODE
1315	>	// Free video mode list
1316	>	if (x_video_modes) {
1317	>	XFree(x_video_modes);
1318	>	x_video_modes = NULL;
1319	>	}
1320	>	#endif
1321	>
1322	>	#ifdef ENABLE_FBDEV_DGA
1323	>	// Close framebuffer device
1324	>	if (fbdev_fd >= 0) {
1325	>	close(fbdev_fd);
1326	>	fbdev_fd = -1;
1327	>	}
1328		#endif
1329		}
1330
#	Line 1167 \| Line 1336 \| void VideoExit(void)
1336		void VideoQuitFullScreen(void)
1337		{
1338		D(bug("VideoQuitFullScreen()\n"));
1339	<	if (display_type == DISPLAY_DGA)
1171	<	quit_full_screen = true;
1339	>	quit_full_screen = true;
1340		}
1341
1342
#	Line 1182 \| Line 1350 \| void VideoInterrupt(void)
1350		if (emerg_quit)
1351		QuitEmulator();
1352
1185	–	#ifdef HAVE_PTHREADS
1353		// Temporarily give up frame buffer lock (this is the point where
1354		// we are suspended when the user presses Ctrl-Tab)
1355	<	pthread_mutex_unlock(&frame_buffer_lock);
1356	<	pthread_mutex_lock(&frame_buffer_lock);
1190	<	#endif
1355	>	UNLOCK_FRAME_BUFFER;
1356	>	LOCK_FRAME_BUFFER;
1357		}
1358
1359
#	Line 1197 \| Line 1363 \| void VideoInterrupt(void)
1363
1364		void video_set_palette(uint8 *pal)
1365		{
1366	<	#ifdef HAVE_PTHREDS
1201	<	pthread_mutex_lock(&palette_lock);
1202	<	#endif
1366	>	LOCK_PALETTE;
1367
1368		// Convert colors to XColor array
1369		for (int i=0; i<256; i++) {
1206	–	palette[i].pixel = i;
1370		palette[i].red = pal[i3] 0x0101;
1371		palette[i].green = pal[i3+1] 0x0101;
1372		palette[i].blue = pal[i3+2] 0x0101;
1373	+	palette[i].pixel = i;
1374		palette[i].flags = DoRed \| DoGreen \| DoBlue;
1375		}
1376
1377		// Tell redraw thread to change palette
1378		palette_changed = true;
1379
1380	<	#ifdef HAVE_PTHREADS
1217	<	pthread_mutex_unlock(&palette_lock);
1218	<	#endif
1380	>	UNLOCK_PALETTE;
1381		}
1382
1383
1384		/*
1385	<	* Suspend/resume emulator
1385	>	* Switch video mode
1386		*/
1387
1388	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1227	<	static void suspend_emul(void)
1388	>	void video_switch_to_mode(const video_mode &mode)
1389		{
1390	<	if (display_type == DISPLAY_DGA) {
1391	<	// Release ctrl key
1392	<	ADBKeyUp(0x36);
1232	<	ctrl_down = false;
1390	>	// Close and reopen display
1391	>	video_close();
1392	>	video_open(mode);
1393
1394	<	#ifdef HAVE_PTHREADS
1395	<	// Lock frame buffer (this will stop the MacOS thread)
1396	<	pthread_mutex_lock(&frame_buffer_lock);
1237	<	#endif
1238	<
1239	<	// Save frame buffer
1240	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1241	<	if (fb_save)
1242	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1243	<
1244	<	// Close full screen display
1245	<	#ifdef ENABLE_XF86_DGA
1246	<	XF86DGADirectVideo(x_display, screen, 0);
1247	<	#endif
1248	<	XUngrabPointer(x_display, CurrentTime);
1249	<	XUngrabKeyboard(x_display, CurrentTime);
1250	<	XUnmapWindow(x_display, the_win);
1251	<	XSync(x_display, false);
1252	<
1253	<	// Open "suspend" window
1254	<	XSetWindowAttributes wattr;
1255	<	wattr.event_mask = KeyPressMask;
1256	<	wattr.background_pixel = black_pixel;
1257	<	wattr.border_pixel = black_pixel;
1258	<	wattr.backing_store = Always;
1259	<	wattr.backing_planes = xdepth;
1260	<	wattr.colormap = DefaultColormap(x_display, screen);
1261	<
1262	<	XSync(x_display, false);
1263	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1264	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
1265	<	CWBackingStore \| CWBackingPlanes \| (xdepth == 8 ? CWColormap : 0), &wattr);
1266	<	XSync(x_display, false);
1267	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1268	<	XMapRaised(x_display, suspend_win);
1269	<	XSync(x_display, false);
1270	<	emul_suspended = true;
1394	>	if (drv == NULL) {
1395	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1396	>	QuitEmulator();
1397		}
1398		}
1399
1274	–	static void resume_emul(void)
1275	–	{
1276	–	// Close "suspend" window
1277	–	XDestroyWindow(x_display, suspend_win);
1278	–	XSync(x_display, false);
1279	–
1280	–	// Reopen full screen display
1281	–	XMapRaised(x_display, the_win);
1282	–	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1283	–	XSync(x_display, false);
1284	–	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1285	–	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1286	–	#ifdef ENABLE_XF86_DGA
1287	–	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
1288	–	XF86DGASetViewPort(x_display, screen, 0, 0);
1289	–	#endif
1290	–	XSync(x_display, false);
1291	–
1292	–	// the_buffer already contains the data to restore. i.e. since a temporary
1293	–	// frame buffer is used when VOSF is actually used, fb_save is therefore
1294	–	// not necessary.
1295	–	#ifdef ENABLE_VOSF
1296	–	if (use_vosf) {
1297	–	#ifdef HAVE_PTHREADS
1298	–	pthread_mutex_lock(&Screen_draw_lock);
1299	–	#endif
1300	–	PFLAG_SET_ALL;
1301	–	#ifdef HAVE_PTHREADS
1302	–	pthread_mutex_unlock(&Screen_draw_lock);
1303	–	#endif
1304	–	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1305	–	}
1306	–	#endif
1307	–
1308	–	// Restore frame buffer
1309	–	if (fb_save) {
1310	–	#ifdef ENABLE_VOSF
1311	–	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1312	–	if (!use_vosf)
1313	–	#endif
1314	–	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1315	–	free(fb_save);
1316	–	fb_save = NULL;
1317	–	}
1318	–
1319	–	#ifdef ENABLE_XF86_DGA
1320	–	if (depth == 8)
1321	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1322	–	#endif
1323	–
1324	–	#ifdef HAVE_PTHREADS
1325	–	// Unlock frame buffer (and continue MacOS thread)
1326	–	pthread_mutex_unlock(&frame_buffer_lock);
1327	–	emul_suspended = false;
1328	–	#endif
1329	–	}
1330	–	#endif
1331	–
1400
1401		/*
1402		* Translate key event to Mac keycode
#	Line 1388 \| Line 1456 \| static int kc_decode(KeySym ks)
1456		case XK_slash: case XK_question: return 0x2c;
1457
1458		#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1459	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1459	>	case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30;
1460		#else
1461		case XK_Tab: return 0x30;
1462		#endif
#	Line 1479 \| Line 1547 \| static int kc_decode(KeySym ks)
1547		return -1;
1548		}
1549
1550	<	static int event2keycode(XKeyEvent *ev)
1550	>	static int event2keycode(XKeyEvent &ev)
1551		{
1552		KeySym ks;
1553		int as;
1554		int i = 0;
1555
1556		do {
1557	<	ks = XLookupKeysym(ev, i++);
1557	>	ks = XLookupKeysym(&ev, i++);
1558		as = kc_decode(ks);
1559		if (as != -1)
1560		return as;
#	Line 1502 \| Line 1570 \| *static int event2keycode(XKeyEvent ev)**
1570
1571		static void handle_events(void)
1572		{
1573	<	XEvent event;
1574	<	for (;;) {
1575	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1508	<	break;
1573	>	while (XPending(x_display)) {
1574	>	XEvent event;
1575	>	XNextEvent(x_display, &event);
1576
1577		switch (event.type) {
1578		// Mouse button
1579		case ButtonPress: {
1580	<	unsigned int button = ((XButtonEvent *)&event)->button;
1580	>	unsigned int button = event.xbutton.button;
1581		if (button < 4)
1582		ADBMouseDown(button - 1);
1583		else if (button < 6) { // Wheel mouse
#	Line 1529 \| Line 1596 \| static void handle_events(void)
1596		break;
1597		}
1598		case ButtonRelease: {
1599	<	unsigned int button = ((XButtonEvent *)&event)->button;
1599	>	unsigned int button = event.xbutton.button;
1600		if (button < 4)
1601		ADBMouseUp(button - 1);
1602		break;
#	Line 1537 \| Line 1604 \| static void handle_events(void)
1604
1605		// Mouse moved
1606		case EnterNotify:
1540	–	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1541	–	break;
1607		case MotionNotify:
1608	<	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1608	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1609		break;
1610
1611		// Keyboard
1612		case KeyPress: {
1613		int code;
1614		if (use_keycodes) {
1615	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1616	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1615	>	event2keycode(event.xkey); // This is called to process the hotkeys
1616	>	code = keycode_table[event.xkey.keycode & 0xff];
1617		} else
1618	<	code = event2keycode((XKeyEvent *)&event);
1618	>	code = event2keycode(event.xkey);
1619		if (code != -1) {
1620		if (!emul_suspended) {
1621		if (code == 0x39) { // Caps Lock pressed
#	Line 1566 \| Line 1631 \| static void handle_events(void)
1631		if (code == 0x36)
1632		ctrl_down = true;
1633		} else {
1569	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1634		if (code == 0x31)
1635	<	resume_emul(); // Space wakes us up
1572	<	#endif
1635	>	drv->resume(); // Space wakes us up
1636		}
1637		}
1638		break;
#	Line 1577 \| Line 1640 \| static void handle_events(void)
1640		case KeyRelease: {
1641		int code;
1642		if (use_keycodes) {
1643	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1644	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1643	>	event2keycode(event.xkey); // This is called to process the hotkeys
1644	>	code = keycode_table[event.xkey.keycode & 0xff];
1645		} else
1646	<	code = event2keycode((XKeyEvent *)&event);
1646	>	code = event2keycode(event.xkey);
1647		if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
1648		ADBKeyUp(code);
1649		if (code == 0x36)
#	Line 1594 \| Line 1657 \| static void handle_events(void)
1657		if (display_type == DISPLAY_WINDOW) {
1658		#ifdef ENABLE_VOSF
1659		if (use_vosf) { // VOSF refresh
1660	<	#ifdef HAVE_PTHREADS
1598	<	pthread_mutex_lock(&Screen_draw_lock);
1599	<	#endif
1660	>	LOCK_VOSF;
1661		PFLAG_SET_ALL;
1662	<	#ifdef HAVE_PTHREADS
1663	<	pthread_mutex_unlock(&Screen_draw_lock);
1603	<	#endif
1604	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1662	>	UNLOCK_VOSF;
1663	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1664		}
1665		else
1666		#endif
#	Line 1612 \| Line 1671 \| static void handle_events(void)
1671		updt_box[x1][y1] = true;
1672		nr_boxes = 16 * 16;
1673		} else // Static refresh
1674	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1674	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1675	>	}
1676	>	break;
1677	>
1678	>	// Window "close" widget clicked
1679	>	case ClientMessage:
1680	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1681	>	ADBKeyDown(0x7f); // Power key
1682	>	ADBKeyUp(0x7f);
1683		}
1684		break;
1685		}
#	Line 1625 \| Line 1692 \| static void handle_events(void)
1692		*/
1693
1694		// Dynamic display update (variable frame rate for each box)
1695	<	static void update_display_dynamic(int ticker)
1695	>	static void update_display_dynamic(int ticker, driver_window *drv)
1696		{
1697		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1698		int xil = 0;
1699		int rxm = 0, rxmo = 0;
1700	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1701	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1702	<	int rx = VideoMonitor.bytes_per_row / 16;
1703	<	int ry = VideoMonitor.y / 16;
1700	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1701	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1702	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
1703	>	int ry = VideoMonitor.mode.y / 16;
1704		int max_box;
1705
1706		y2s = sm_uptd[ticker % 8];
#	Line 1687 \| Line 1754 \| static void update_display_dynamic(int t
1754		i = (yi * bytes_per_row) + xi;
1755		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1756		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1757	<	if (depth == 1) {
1758	<	if (have_shm)
1759	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1757	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1758	>	if (drv->have_shm)
1759	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1760		else
1761	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1761	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1762		} else {
1763	<	if (have_shm)
1764	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1763	>	if (drv->have_shm)
1764	>	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);
1765		else
1766	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1766	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1767		}
1768		xil = 0;
1769		}
#	Line 1715 \| Line 1782 \| static void update_display_dynamic(int t
1782		}
1783
1784		// Static display update (fixed frame rate, but incremental)
1785	<	static void update_display_static(void)
1785	>	static void update_display_static(driver_window *drv)
1786		{
1787		// Incremental update code
1788		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1789	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1790	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1789	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1790	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1791		uint8 p, p2;
1792
1793		// Check for first line from top and first line from bottom that have changed
1794		y1 = 0;
1795	<	for (j=0; j<VideoMonitor.y; j++) {
1795	>	for (j=0; j<VideoMonitor.mode.y; j++) {
1796		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1797		y1 = j;
1798		break;
1799		}
1800		}
1801		y2 = y1 - 1;
1802	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
1802	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
1803		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1804		y2 = j;
1805		break;
#	Line 1742 \| Line 1809 \| static void update_display_static(void)
1809
1810		// Check for first column from left and first column from right that have changed
1811		if (high) {
1812	<	if (depth == 1) {
1813	<	x1 = VideoMonitor.x;
1812	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1813	>	x1 = VideoMonitor.mode.x - 1;
1814		for (j=y1; j<=y2; j++) {
1815		p = &the_buffer[j * bytes_per_row];
1816		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1761 \| Line 1828 \| static void update_display_static(void)
1828		p2 = &the_buffer_copy[j * bytes_per_row];
1829		p += bytes_per_row;
1830		p2 += bytes_per_row;
1831	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1831	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
1832		p--; p2--;
1833		if (p != p2) {
1834	<	x2 = i << 3;
1834	>	x2 = (i << 3) + 7;
1835		break;
1836		}
1837		}
1838		}
1839	<	wide = x2 - x1;
1839	>	wide = x2 - x1 + 1;
1840
1841		// Update copy of the_buffer
1842		if (high && wide) {
#	Line 1780 \| Line 1847 \| static void update_display_static(void)
1847		}
1848
1849		} else {
1850	<	x1 = VideoMonitor.x;
1850	>	x1 = VideoMonitor.mode.x;
1851		for (j=y1; j<=y2; j++) {
1852		p = &the_buffer[j * bytes_per_row];
1853		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1798 \| Line 1865 \| static void update_display_static(void)
1865		p2 = &the_buffer_copy[j * bytes_per_row];
1866		p += bytes_per_row;
1867		p2 += bytes_per_row;
1868	<	for (i=VideoMonitor.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1868	>	for (i=VideoMonitor.mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1869		p--;
1870		p2--;
1871		if (p != p2) {
#	Line 1821 \| Line 1888 \| static void update_display_static(void)
1888
1889		// Refresh display
1890		if (high && wide) {
1891	<	if (have_shm)
1892	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1891	>	if (drv->have_shm)
1892	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
1893		else
1894	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1894	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
1895		}
1896		}
1897
#	Line 1833 \| Line 1900 \| static void update_display_static(void)
1900		* Screen refresh functions
1901		*/
1902
1903	<	// The specialisations hereunder are meant to enable VOSF with DGA in direct
1904	<	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
1905	<	// not get mapped correctly with respect to the predetermined host frame
1906	<	// buffer base address.
1907	<	//
1841	<	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1842	<	// we first try to "triple allocate" the address spaces according to the real
1843	<	// host frame buffer address. Then, if it fails, we will use a temporary
1844	<	// frame buffer thus making the real host frame buffer updated when pages
1845	<	// of the temp frame buffer are altered.
1846	<	//
1847	<	// As a side effect, a little speed gain in screen updates could be noticed
1848	<	// for other modes than DGA.
1849	<	//
1850	<	// The following two functions below are inline so that a clever compiler
1851	<	// could specialise the code according to the current screen depth and
1852	<	// display type. A more clever compiler would the job by itself though...
1853	<	// (update_display_vosf is inlined as well)
1903	>	// We suggest the compiler to inline the next two functions so that it
1904	>	// may specialise the code according to the current screen depth and
1905	>	// display type. A clever compiler would do that job by itself though...
1906	>
1907	>	// NOTE: update_display_vosf is inlined too
1908
1909		static inline void possibly_quit_dga_mode()
1910		{
1857	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1911		// Quit DGA mode if requested
1912		if (quit_full_screen) {
1913		quit_full_screen = false;
1914	<	#ifdef ENABLE_XF86_DGA
1915	<	XF86DGADirectVideo(x_display, screen, 0);
1863	<	#endif
1864	<	XUngrabPointer(x_display, CurrentTime);
1865	<	XUngrabKeyboard(x_display, CurrentTime);
1866	<	XUnmapWindow(x_display, the_win);
1867	<	XSync(x_display, false);
1914	>	delete drv;
1915	>	drv = NULL;
1916		}
1869	–	#endif
1917		}
1918
1919	<	static inline void handle_palette_changes(int depth, int display_type)
1919	>	static inline void handle_palette_changes(void)
1920		{
1921	<	#ifdef HAVE_PTHREADS
1922	<	pthread_mutex_lock(&palette_lock);
1876	<	#endif
1921	>	LOCK_PALETTE;
1922	>
1923		if (palette_changed) {
1924		palette_changed = false;
1925	<	if (depth == 8) {
1880	<	XStoreColors(x_display, cmap[0], palette, 256);
1881	<	XStoreColors(x_display, cmap[1], palette, 256);
1882	<
1883	<	#ifdef ENABLE_XF86_DGA
1884	<	if (display_type == DISPLAY_DGA) {
1885	<	current_dga_cmap ^= 1;
1886	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1887	<	}
1888	<	#endif
1889	<	}
1925	>	drv->update_palette();
1926		}
1927	<	#ifdef HAVE_PTHREADS
1928	<	pthread_mutex_unlock(&palette_lock);
1893	<	#endif
1927	>
1928	>	UNLOCK_PALETTE;
1929		}
1930
1931		static void video_refresh_dga(void)
#	Line 1902 \| Line 1937 \| static void video_refresh_dga(void)
1937		handle_events();
1938
1939		// Handle palette changes
1940	<	handle_palette_changes(depth, DISPLAY_DGA);
1940	>	handle_palette_changes();
1941		}
1942
1943	+	#ifdef ENABLE_VOSF
1944		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1945		static void video_refresh_dga_vosf(void)
1946		{
#	Line 1915 \| Line 1951 \| static void video_refresh_dga_vosf(void)
1951		handle_events();
1952
1953		// Handle palette changes
1954	<	handle_palette_changes(depth, DISPLAY_DGA);
1954	>	handle_palette_changes();
1955
1956		// Update display (VOSF variant)
1957		static int tick_counter = 0;
1958		if (++tick_counter >= frame_skip) {
1959		tick_counter = 0;
1960	<	#ifdef HAVE_PTHREADS
1961	<	pthread_mutex_lock(&Screen_draw_lock);
1962	<	#endif
1963	<	update_display_dga_vosf();
1964	<	#ifdef HAVE_PTHREADS
1929	<	pthread_mutex_unlock(&Screen_draw_lock);
1930	<	#endif
1960	>	if (mainBuffer.dirty) {
1961	>	LOCK_VOSF;
1962	>	update_display_dga_vosf();
1963	>	UNLOCK_VOSF;
1964	>	}
1965		}
1966		}
1967		#endif
1968
1935	–	#ifdef ENABLE_VOSF
1969		static void video_refresh_window_vosf(void)
1970		{
1971		// Quit DGA mode if requested
#	Line 1942 \| Line 1975 \| static void video_refresh_window_vosf(vo
1975		handle_events();
1976
1977		// Handle palette changes
1978	<	handle_palette_changes(depth, DISPLAY_WINDOW);
1978	>	handle_palette_changes();
1979
1980		// Update display (VOSF variant)
1981		static int tick_counter = 0;
1982		if (++tick_counter >= frame_skip) {
1983		tick_counter = 0;
1984	<	#ifdef HAVE_PTHREADS
1985	<	pthread_mutex_lock(&Screen_draw_lock);
1986	<	#endif
1987	<	update_display_window_vosf();
1988	<	#ifdef HAVE_PTHREADS
1989	<	pthread_mutex_unlock(&Screen_draw_lock);
1957	<	#endif
1984	>	if (mainBuffer.dirty) {
1985	>	LOCK_VOSF;
1986	>	update_display_window_vosf(static_cast<driver_window *>(drv));
1987	>	UNLOCK_VOSF;
1988	>	XSync(x_display, false); // Let the server catch up
1989	>	}
1990		}
1991		}
1992	<	#endif
1992	>	#endif // def ENABLE_VOSF
1993
1994		static void video_refresh_window_static(void)
1995		{
#	Line 1965 \| Line 1997 \| static void video_refresh_window_static(
1997		handle_events();
1998
1999		// Handle_palette changes
2000	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2000	>	handle_palette_changes();
2001
2002		// Update display (static variant)
2003		static int tick_counter = 0;
2004		if (++tick_counter >= frame_skip) {
2005		tick_counter = 0;
2006	<	update_display_static();
2006	>	update_display_static(static_cast<driver_window *>(drv));
2007		}
2008		}
2009
#	Line 1981 \| Line 2013 \| static void video_refresh_window_dynamic
2013		handle_events();
2014
2015		// Handle_palette changes
2016	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2016	>	handle_palette_changes();
2017
2018		// Update display (dynamic variant)
2019		static int tick_counter = 0;
2020		tick_counter++;
2021	<	update_display_dynamic(tick_counter);
2021	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2022		}
2023
2024
#	Line 1994 \| Line 2026 \| static void video_refresh_window_dynamic
2026		* Thread for screen refresh, input handling etc.
2027		*/
2028
2029	<	void VideoRefreshInit(void)
2029	>	static void VideoRefreshInit(void)
2030		{
2031		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2032		if (display_type == DISPLAY_DGA) {
2033	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
2033	>	#if ENABLE_VOSF && (REAL_ADDRESSING \|\| DIRECT_ADDRESSING)
2034		if (use_vosf)
2035		video_refresh = video_refresh_dga_vosf;
2036		else
#	Line 2020 \| Line 2052 \| void VideoRefreshInit(void)
2052
2053		void VideoRefresh(void)
2054		{
2055	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2056	<	video_refresh();
2057	<	}
2058	<
2027	<	#if 0
2028	<	void VideoRefresh(void)
2029	<	{
2030	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2031	<	// Quit DGA mode if requested
2032	<	if (quit_full_screen) {
2033	<	quit_full_screen = false;
2034	<	if (display_type == DISPLAY_DGA) {
2035	<	#ifdef ENABLE_XF86_DGA
2036	<	XF86DGADirectVideo(x_display, screen, 0);
2037	<	#endif
2038	<	XUngrabPointer(x_display, CurrentTime);
2039	<	XUngrabKeyboard(x_display, CurrentTime);
2040	<	XUnmapWindow(x_display, the_win);
2041	<	XSync(x_display, false);
2042	<	}
2043	<	}
2044	<	#endif
2045	<
2046	<	// Handle X events
2047	<	handle_events();
2048	<
2049	<	// Handle palette changes
2050	<	#ifdef HAVE_PTHREADS
2051	<	pthread_mutex_lock(&palette_lock);
2052	<	#endif
2053	<	if (palette_changed) {
2054	<	palette_changed = false;
2055	<	if (depth == 8) {
2056	<	XStoreColors(x_display, cmap[0], palette, 256);
2057	<	XStoreColors(x_display, cmap[1], palette, 256);
2058	<
2059	<	#ifdef ENABLE_XF86_DGA
2060	<	if (display_type == DISPLAY_DGA) {
2061	<	current_dga_cmap ^= 1;
2062	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2063	<	}
2064	<	#endif
2065	<	}
2066	<	}
2067	<	#ifdef HAVE_PTHREADS
2068	<	pthread_mutex_unlock(&palette_lock);
2069	<	#endif
2070	<
2071	<	// In window mode, update display
2072	<	static int tick_counter = 0;
2073	<	if (display_type == DISPLAY_WINDOW) {
2074	<	tick_counter++;
2075	<	if (frame_skip == 0)
2076	<	update_display_dynamic(tick_counter);
2077	<	else if (tick_counter >= frame_skip) {
2078	<	tick_counter = 0;
2079	<	update_display_static();
2080	<	}
2081	<	}
2055	>	// We need to check redraw_thread_active to inhibit refreshed during
2056	>	// mode changes on non-threaded platforms
2057	>	if (redraw_thread_active)
2058	>	video_refresh();
2059		}
2083	–	#endif
2060
2061		#ifdef HAVE_PTHREADS
2062		static void redraw_func(void arg)
#	Line 2089 \| Line 2065 \| *static void redraw_func(void arg)*
2065		int64 ticks = 0;
2066		uint64 next = GetTicks_usec();
2067		while (!redraw_thread_cancel) {
2092	–	// VideoRefresh();
2068		video_refresh();
2069		next += 16667;
2070		int64 delay = next - GetTicks_usec();
#	Line 2100 \| Line 2075 \| *static void redraw_func(void arg)*
2075		ticks++;
2076		}
2077		uint64 end = GetTicks_usec();
2078	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2078	>	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2079		return NULL;
2080		}
2081		#endif

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs. Revision 1.45 by cebix, 2001-06-30T20:18:36Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs.
Revision 1.45 by cebix, 2001-06-30T20:18:36Z