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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.11 by cebix, 1999-11-03T10:56:30Z 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-1999 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 34 \| Line 34
34		#include <X11/extensions/XShm.h>
35		#include <sys/ipc.h>
36		#include <sys/shm.h>
37	–	#include <pthread.h>
37		#include <errno.h>
38
39	+	#ifdef HAVE_PTHREADS
40	+	# include <pthread.h>
41	+	#endif
42	+
43	+	#ifdef ENABLE_XF86_DGA
44	+	# include <X11/extensions/xf86dga.h>
45	+	#endif
46	+
47	+	#ifdef ENABLE_XF86_VIDMODE
48	+	# include <X11/extensions/xf86vmode.h>
49	+	#endif
50	+
51	+	#ifdef ENABLE_FBDEV_DGA
52	+	# include <sys/mman.h>
53	+	#endif
54	+
55		#include "cpu_emulation.h"
56		#include "main.h"
57		#include "adb.h"
#	Line 45 \| Line 60
60		#include "user_strings.h"
61		#include "video.h"
62
63	<	#define DEBUG 1
63	>	#define DEBUG 0
64		#include "debug.h"
65
51	–	#if ENABLE_XF86_DGA
52	–	#include <X11/extensions/xf86dga.h>
53	–	#endif
54	–
55	–	#if ENABLE_FBDEV_DGA
56	–	#include <sys/mman.h>
57	–	#endif
58	–
59	–
66
67		// Display types
68		enum {
#	Line 64 \| Line 70 \| enum {
70		DISPLAY_DGA // DGA fullscreen display
71		};
72
67	–
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 uint8 *the_buffer; // Mac frame buffer
86	>	static bool local_X11; // Flag: X server running on local machine?
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	>
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
#	Line 97 \| 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
101	<	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;
108	–	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask;
109	–	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask;
126
127	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
128	<	static XColor palette[256]; // Color palette for 8-bit mode
127	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
128	>
129	>	static XColor palette[256]; // Color palette to be used as CLUT and gamma table
130		static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
131
132	<	// Variables for window mode
133	<	static GC the_gc;
134	<	static XImage *img = NULL;
118	<	static XShmSegmentInfo shminfo;
119	<	static XImage cursor_image, cursor_mask_image;
120	<	static Pixmap cursor_map, cursor_mask_map;
121	<	static Cursor mac_cursor;
122	<	static GC cursor_gc, cursor_mask_gc;
123	<	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
124	<	static uint8 the_cursor[64]; // Cursor image data
125	<	static bool have_shm = false; // Flag: SHM extensions available
126	<
127	<	// Variables for XF86 DGA mode
128	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
129	<	static Window suspend_win; // "Suspend" window
130	<	static void *fb_save = NULL; // Saved frame buffer for suspend
131	<	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
136	<	// Variables for fbdev DGA mode
137	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
138	<	static int fbdev_fd;
136	>	#ifdef ENABLE_XF86_VIDMODE
137	>	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
138	>	static int num_x_video_modes;
139	>	#endif
140	>
141	>	// Mutex to protect palette
142	>	#ifdef HAVE_PTHREADS
143	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
144	>	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
145	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
146	>	#else
147	>	#define LOCK_PALETTE
148	>	#define UNLOCK_PALETTE
149	>	#endif
150	>
151	>	// Mutex to protect frame buffer
152	>	#ifdef HAVE_PTHREADS
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	>	// 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	>	// 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);
141	<
174	>	static int event2keycode(XKeyEvent &ev);
175
176		// From main_unix.cpp
177	+	extern char *x_display_name;
178		extern Display *x_display;
179
180		// From sys_unix.cpp
#	Line 148 \| Line 182 \| extern void SysMountFirstFloppy(void);
182
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	<	VideoMonitor.mode = VMODE_1BIT;
162	<	break;
163	<	case 8:
164	<	layout = FLAYOUT_DIRECT;
165	<	VideoMonitor.mode = VMODE_8BIT;
166	<	break;
167	<	case 15:
168	<	layout = FLAYOUT_HOST_555;
169	<	VideoMonitor.mode = VMODE_16BIT;
170	<	break;
171	<	case 16:
172	<	layout = FLAYOUT_HOST_565;
173	<	VideoMonitor.mode = VMODE_16BIT;
174	<	break;
175	<	case 24:
176	<	case 32:
177	<	layout = FLAYOUT_HOST_888;
178	<	VideoMonitor.mode = VMODE_32BIT;
179	<	break;
180	<	}
181	<	VideoMonitor.x = width;
182	<	VideoMonitor.y = height;
183	<	VideoMonitor.bytes_per_row = bytes_per_row;
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	+	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	+	}
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 200 \| 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
209	–	// Read frame skip prefs
210	–	frame_skip = PrefsFindInt32("frameskip");
211	–	if (frame_skip == 0)
212	–	frame_skip = 1;
213	–
415		// Create window
416		XSetWindowAttributes wattr;
417		wattr.event_mask = eventmask = win_eventmask;
418		wattr.background_pixel = black_pixel;
419	<	wattr.border_pixel = black_pixel;
420	<	wattr.backing_store = Always;
421	<	wattr.backing_planes = xdepth;
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,
224	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
225	<	CWBackingStore \| CWBackingPlanes, &wattr);
226	<	XSync(x_display, false);
227	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
228	<	XMapRaised(x_display, the_win);
229	<	XSync(x_display, false);
423	>	// Set window name/class
424	>	set_window_name(w, STR_WINDOW_TITLE);
425
426	<	// Set colormap
427	<	if (depth == 8) {
428	<	XSetWindowColormap(x_display, the_win, cmap[0]);
429	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
430	<	}
426	>	// Indicate that we want keyboard input
427	>	set_window_focus(w);
428	>
429	>	// Set delete protocol property
430	>	set_window_delete_protocol(w);
431
432		// Make window unresizable
433	<	XSizeHints *hints;
434	<	if ((hints = XAllocSizeHints()) != NULL) {
435	<	hints->min_width = width;
436	<	hints->max_width = width;
437	<	hints->min_height = height;
438	<	hints->max_height = height;
439	<	hints->flags = PMinSize \| PMaxSize;
440	<	XSetWMNormalHints(x_display, the_win, hints);
441	<	XFree((char *)hints);
433	>	{
434	>	XSizeHints *hints = XAllocSizeHints();
435	>	if (hints) {
436	>	hints->min_width = width;
437	>	hints->max_width = width;
438	>	hints->min_height = height;
439	>	hints->max_height = height;
440	>	hints->flags = PMinSize \| PMaxSize;
441	>	XSetWMNormalHints(x_display, w, hints);
442	>	XFree(hints);
443	>	}
444		}
445
446	+	// Show window
447	+	XMapWindow(x_display, w);
448	+	wait_mapped(w);
449	+
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;
251	<	if (depth != 1 && 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);
459	<	shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
460	<	the_buffer = (uint8 *)shmat(shminfo.shmid, 0, 0);
461	<	shminfo.shmaddr = img->data = (char *)the_buffer;
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;
462		shminfo.readOnly = False;
463
464		// Try to attach SHM image, catching errors
#	Line 275 \| 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 = width;
483	<	switch (depth) {
484	<	case 1:
281	<	bytes_per_row /= 8;
282	<	break;
283	<	case 15:
284	<	case 16:
285	<	bytes_per_row *= 2;
286	<	break;
287	<	case 24:
288	<	case 32:
289	<	bytes_per_row *= 4;
290	<	break;
291	<	}
292	<	the_buffer = (uint8 )malloc((height + 2) bytes_per_row);
293	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer, width, height, 32, bytes_per_row);
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, 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
297	<	if (depth == 1) {
487	>	if (need_msb_image) {
488		img->byte_order = MSBFirst;
489		img->bitmap_bit_order = MSBFirst;
490		}
491
492	<	// Allocate memory for frame buffer copy
493	<	the_buffer_copy = (uint8 )malloc((height + 2) img->bytes_per_line);
492	>	#ifdef ENABLE_VOSF
493	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
494	>	the_host_buffer = the_buffer_copy;
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 cursor
508	<	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor, 16, 16, 16, 2);
509	<	cursor_image->byte_order = MSBFirst;
510	<	cursor_image->bitmap_bit_order = MSBFirst;
511	<	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor+32, 16, 16, 16, 2);
512	<	cursor_mask_image->byte_order = MSBFirst;
315	<	cursor_mask_image->bitmap_bit_order = MSBFirst;
316	<	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
317	<	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
318	<	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
319	<	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
320	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
507	>	// Create no_cursor
508	>	mac_cursor = XCreatePixmapCursor(x_display,
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, w, mac_cursor);
513
514	<	// Set VideoMonitor
514	>	// Init blitting routines
515	>	bool native_byte_order;
516		#ifdef WORDS_BIGENDIAN
517	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst);
517	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
518		#else
519	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst);
519	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
520		#endif
521	+	#ifdef ENABLE_VOSF
522	+	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
523	+	#endif
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	+	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	+	// 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	<	#if REAL_ADDRESSING
633	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
634	<	MacFrameLayout = FLAYOUT_DIRECT;
635	<	#else
636	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
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	<	return true;
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	<	// Init fbdev DGA display
668	<	static bool init_fbdev_dga(char *in_fb_name)
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	<	#if ENABLE_FBDEV_DGA
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 361 \| 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 381 \| 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 393 \| 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
401	–	int width = DisplayWidth(x_display, screen);
402	–	int height = DisplayHeight(x_display, screen);
403	–	depth = fb_depth; // max_depth
404	–
405	–	// Set relative mouse mode
406	–	ADBSetRelMouseMode(false);
407	–
743		// Create window
744		XSetWindowAttributes wattr;
745	<	wattr.override_redirect = True;
746	<	wattr.backing_store = NotUseful;
747	<	wattr.background_pixel = white_pixel;
748	<	wattr.border_pixel = black_pixel;
414	<	wattr.event_mask = eventmask = dga_eventmask;
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);
417	<	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\|CWBorderPixel\|CWOverrideRedirect\|CWBackingStore,
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) {
435	<	XSetWindowColormap(x_display, the_win, cmap[0]);
436	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
437	<	}
438	<
439	<	// Set VideoMonitor
440	<	int bytes_per_row = width;
441	<	switch (depth) {
442	<	case 1:
443	<	bytes_per_row = ((width \| 7) & ~7) >> 3;
444	<	break;
445	<	case 15:
446	<	case 16:
447	<	bytes_per_row *= 2;
448	<	break;
449	<	case 24:
450	<	case 32:
451	<	bytes_per_row *= 4;
452	<	break;
453	<	}
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	<	set_video_monitor(width, height, bytes_per_row, true);
787	<	#if REAL_ADDRESSING
788	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
789	<	MacFrameLayout = FLAYOUT_DIRECT;
786	>	#if ENABLE_VOSF
787	>	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
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	>	// 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	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
800	>	use_vosf = false;
801		#endif
471	–	return true;
472	–	#else
473	–	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
474	–	return false;
802		#endif
803	+
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	<	#if ENABLE_XF86_DGA
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
847	+	#ifdef ENABLE_XF86_VIDMODE
848	+	// Switch to best mode
849	+	if (has_vidmode) {
850	+	int best = 0;
851	+	for (int i=1; i<num_x_video_modes; i++) {
852	+	if (x_video_modes[i]->hdisplay >= width && x_video_modes[i]->vdisplay >= height &&
853	+	x_video_modes[i]->hdisplay <= x_video_modes[best]->hdisplay && x_video_modes[i]->vdisplay <= x_video_modes[best]->vdisplay) {
854	+	best = i;
855	+	}
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	+
863		// Create window
864		XSetWindowAttributes wattr;
865		wattr.event_mask = eventmask = dga_eventmask;
488	–	wattr.border_pixel = black_pixel;
866		wattr.override_redirect = True;
867
868	<	XSync(x_display, false);
869	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
870	<	InputOutput, vis, CWEventMask \| CWBorderPixel \| CWOverrideRedirect, &wattr);
871	<	XSync(x_display, false);
872	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
873	<	XMapRaised(x_display, the_win);
874	<	XSync(x_display, false);
868	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
869	>	InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
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 509 \| 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]);
514	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
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) {
903	<	case 1:
904	<	bytes_per_row /= 8;
905	<	break;
906	<	case 15:
907	<	case 16:
908	<	bytes_per_row *= 2;
909	<	break;
910	<	case 24:
911	<	case 32:
912	<	bytes_per_row *= 4;
913	<	break;
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	>	// 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	>	// 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		}
533	–	set_video_monitor(width, height, bytes_per_row, true);
534	–	#if REAL_ADDRESSING
535	–	VideoMonitor.mac_frame_base = (uint32)the_buffer;
536	–	MacFrameLayout = FLAYOUT_DIRECT;
915		#else
916	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
916	>	use_vosf = false;
917		#endif
540	–	return true;
541	–	#else
542	–	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
543	–	return false;
918		#endif
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)
#	Line 609 \| Line 1024 \| static void keycode_init(void)
1024		}
1025		}
1026
1027	+	// Open display for specified mode
1028	+	static bool video_open(const video_mode &mode)
1029	+	{
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	+	// 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	+	#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	+	// 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	+	// Lock down frame buffer
1090	+	XSync(x_display, false);
1091	+	LOCK_FRAME_BUFFER;
1092	+
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
1113	+	// Zero the mainBuffer structure
1114	+	mainBuffer.dirtyPages = NULL;
1115	+	mainBuffer.pageInfo = NULL;
1116	+	#endif
1117	+
1118	+	// Check if X server runs on local machine
1119	+	local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
1120	+	\|\| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
1121	+
1122		// Init keycode translation
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 625 \| Line 1134 \| bool VideoInit(bool classic)
1134		// Get screen depth
1135		xdepth = DefaultDepth(x_display, screen);
1136
1137	<	#if ENABLE_FBDEV_DGA
1137	>	#ifdef ENABLE_FBDEV_DGA
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
1145		has_dga = false;
1146		#endif
1147	<
1148	<	#if ENABLE_XF86_DGA
1147	>
1148	>	#ifdef ENABLE_XF86_DGA
1149		// DGA available?
1150	<	int event_base, error_base;
1151	<	if (XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
1150	>	int dga_event_base, dga_error_base;
1151	>	if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
1152		int dga_flags = 0;
1153		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
1154		has_dga = dga_flags & XF86DGADirectPresent;
#	Line 647 \| Line 1156 \| bool VideoInit(bool classic)
1156		has_dga = false;
1157		#endif
1158
1159	+	#ifdef ENABLE_XF86_VIDMODE
1160	+	// VidMode available?
1161	+	int vm_event_base, vm_error_base;
1162	+	has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
1163	+	if (has_vidmode)
1164	+	XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
1165	+	#endif
1166	+
1167		// Find black and white colors
1168		XParseColor(x_display, DefaultColormap(x_display, screen), "rgb:00/00/00", &black);
1169		XAllocColor(x_display, DefaultColormap(x_display, screen), &black);
#	Line 667 \| 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;
689	<	if (classic)
690	<	depth = 1;
691	<	else
692	<	depth = xdepth;
693	<
694	<	// Create color maps for 8 bit mode
695	<	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	<	#if 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) {
1253	>	#ifdef ENABLE_FBDEV_DGA
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;
721	–	if (width > DisplayWidth(x_display, screen))
722	–	width = DisplayWidth(x_display, screen);
723	–	if (height > DisplayHeight(x_display, screen))
724	–	height = DisplayHeight(x_display, screen);
725	–	}
726	–	if (width <= 0)
727	–	width = DisplayWidth(x_display, screen);
728	–	if (height <= 0)
729	–	height = DisplayHeight(x_display, screen);
730	–	}
731	–
732	–	// Initialize according to display type
733	–	switch (display_type) {
734	–	case DISPLAY_WINDOW:
735	–	if (!init_window(width, height))
736	–	return false;
737	–	break;
738	–	case DISPLAY_DGA:
739	–	#if ENABLE_FBDEV_DGA
740	–	if (!init_fbdev_dga(fb_name))
741	–	#else
742	–	if (!init_xf86_dga(width, height))
1261		#endif
1262	<	return false;
745	<	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	+	// Mac screen depth follows X depth
1274	+	video_depth default_depth = DepthModeForPixelDepth(xdepth);
1275	+
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	<	// Lock down frame buffer
1304	<	pthread_mutex_lock(&frame_buffer_lock);
1305	<
1306	<	#if !REAL_ADDRESSING
1307	<	// Set variables for UAE memory mapping
1308	<	MacFrameBaseHost = the_buffer;
1309	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1310	<
1311	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1312	<	if (classic)
1313	<	MacFrameLayout = FLAYOUT_NONE;
1314	<	#endif
760	<
761	<	// Start redraw/input thread
762	<	XSync(x_display, false);
763	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
764	<	if (!redraw_thread_active)
765	<	printf("FATAL: cannot create redraw thread\n");
766	<	return redraw_thread_active;
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	>	}
1315		}
1316
1317
#	Line 771 \| Line 1319 \| bool VideoInit(bool classic)
1319		* Deinitialization
1320		*/
1321
1322	<	void VideoExit(void)
1322	>	// Close display
1323	>	static void video_close(void)
1324		{
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);
783	–	redraw_thread_active = false;
1333		}
1334	+	#endif
1335	+	redraw_thread_active = false;
1336
1337		// Unlock frame buffer
1338	<	pthread_mutex_unlock(&frame_buffer_lock);
1339	<
789	<	// Close window and server connection
790	<	if (x_display != NULL) {
791	<	XSync(x_display, false);
1338	>	UNLOCK_FRAME_BUFFER;
1339	>	XSync(x_display, false);
1340
1341	<	#if ENABLE_XF86_DGA
1342	<	if (display_type == DISPLAY_DGA) {
1343	<	XF86DGADirectVideo(x_display, screen, 0);
1344	<	XUngrabPointer(x_display, CurrentTime);
1345	<	XUngrabKeyboard(x_display, CurrentTime);
1341	>	#ifdef ENABLE_VOSF
1342	>	// Deinitialize VOSF
1343	>	if (use_vosf) {
1344	>	if (mainBuffer.pageInfo) {
1345	>	free(mainBuffer.pageInfo);
1346	>	mainBuffer.pageInfo = NULL;
1347	>	}
1348	>	if (mainBuffer.dirtyPages) {
1349	>	free(mainBuffer.dirtyPages);
1350	>	mainBuffer.dirtyPages = NULL;
1351		}
1352	+	}
1353		#endif
1354
1355	<	#if ENABLE_FBDEV_DGA
1356	<	if (display_type == DISPLAY_DGA) {
1357	<	XUngrabPointer(x_display, CurrentTime);
1358	<	XUngrabKeyboard(x_display, CurrentTime);
1359	<	close(fbdev_fd);
1360	<	}
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
808	–
809	–	if (the_buffer_copy) {
810	–	free(the_buffer_copy);
811	–	the_buffer_copy = NULL;
812	–	}
1382
1383	<	XFlush(x_display);
1384	<	XSync(x_display, false);
1385	<	if (depth == 8) {
1386	<	XFreeColormap(x_display, cmap[0]);
1387	<	XFreeColormap(x_display, cmap[1]);
819	<	}
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
1392
#	Line 828 \| Line 1397 \| void VideoExit(void)
1397		void VideoQuitFullScreen(void)
1398		{
1399		D(bug("VideoQuitFullScreen()\n"));
1400	<	if (display_type == DISPLAY_DGA)
832	<	quit_full_screen = true;
1400	>	quit_full_screen = true;
1401		}
1402
1403
#	Line 845 \| Line 1413 \| void VideoInterrupt(void)
1413
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);
1416	>	UNLOCK_FRAME_BUFFER;
1417	>	LOCK_FRAME_BUFFER;
1418		}
1419
1420
#	Line 856 \| Line 1424 \| void VideoInterrupt(void)
1424
1425		void video_set_palette(uint8 *pal)
1426		{
1427	<	pthread_mutex_lock(&palette_lock);
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	<	pthread_mutex_unlock(&palette_lock);
1452	>	UNLOCK_PALETTE;
1453		}
1454
1455
1456		/*
1457	<	* Suspend/resume emulator
1457	>	* Switch video mode
1458		*/
1459
1460	<	#if ENABLE_XF86_DGA \|\| ENABLE_FBDEV_DGA
882	<	static void suspend_emul(void)
1460	>	void video_switch_to_mode(const video_mode &mode)
1461		{
1462	<	if (display_type == DISPLAY_DGA) {
1463	<	// Release ctrl key
1464	<	ADBKeyUp(0x36);
887	<	ctrl_down = false;
888	<
889	<	// Lock frame buffer (this will stop the MacOS thread)
890	<	pthread_mutex_lock(&frame_buffer_lock);
891	<
892	<	// Save frame buffer
893	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
894	<	if (fb_save)
895	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
896	<
897	<	// Close full screen display
898	<	#if ENABLE_XF86_DGA
899	<	XF86DGADirectVideo(x_display, screen, 0);
900	<	#endif
901	<	XUngrabPointer(x_display, CurrentTime);
902	<	XUngrabKeyboard(x_display, CurrentTime);
903	<	XUnmapWindow(x_display, the_win);
904	<	XSync(x_display, false);
1462	>	// Close and reopen display
1463	>	video_close();
1464	>	video_open(mode);
1465
1466	<	// Open "suspend" window
1467	<	XSetWindowAttributes wattr;
1468	<	wattr.event_mask = KeyPressMask;
909	<	wattr.background_pixel = black_pixel;
910	<	wattr.border_pixel = black_pixel;
911	<	wattr.backing_store = Always;
912	<	wattr.backing_planes = xdepth;
913	<	wattr.colormap = DefaultColormap(x_display, screen);
914	<
915	<	XSync(x_display, false);
916	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
917	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
918	<	CWBackingStore \| CWBackingPlanes \| (xdepth == 8 ? CWColormap : 0), &wattr);
919	<	XSync(x_display, false);
920	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
921	<	XMapRaised(x_display, suspend_win);
922	<	XSync(x_display, false);
923	<	emul_suspended = true;
924	<	}
925	<	}
926	<
927	<	static void resume_emul(void)
928	<	{
929	<	// Close "suspend" window
930	<	XDestroyWindow(x_display, suspend_win);
931	<	XSync(x_display, false);
932	<
933	<	// Reopen full screen display
934	<	XMapRaised(x_display, the_win);
935	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
936	<	XSync(x_display, false);
937	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
938	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
939	<	#if ENABLE_XF86_DGA
940	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
941	<	XF86DGASetViewPort(x_display, screen, 0, 0);
942	<	#endif
943	<	XSync(x_display, false);
944	<
945	<	// Restore frame buffer
946	<	if (fb_save) {
947	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
948	<	free(fb_save);
949	<	fb_save = NULL;
1466	>	if (drv == NULL) {
1467	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1468	>	QuitEmulator();
1469		}
951	–
952	–	if (depth == 8)
953	–	#if ENABLE_XF86_DGA
954	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
955	–	#endif
956	–
957	–	// Unlock frame buffer (and continue MacOS thread)
958	–	pthread_mutex_unlock(&frame_buffer_lock);
959	–	emul_suspended = false;
1470		}
961	–	#endif
1471
1472
1473		/*
#	Line 1018 \| Line 1527 \| static int kc_decode(KeySym ks)
1527		case XK_period: case XK_greater: return 0x2f;
1528		case XK_slash: case XK_question: return 0x2c;
1529
1530	<	#if ENABLE_XF86_DGA \|\| ENABLE_FBDEV_DGA
1531	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1530	>	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
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 1110 \| 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 1133 \| 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))
1139	<	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 1160 \| 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 1168 \| Line 1676 \| static void handle_events(void)
1676
1677		// Mouse moved
1678		case EnterNotify:
1171	–	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1172	–	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 1197 \| Line 1703 \| static void handle_events(void)
1703		if (code == 0x36)
1704		ctrl_down = true;
1705		} else {
1200	–	#if ENABLE_XF86_DGA \|\| ENABLE_FBDEV_DGA
1706		if (code == 0x31)
1707	<	resume_emul(); // Space wakes us up
1203	<	#endif
1707	>	drv->resume(); // Space wakes us up
1708		}
1709		}
1710		break;
#	Line 1208 \| 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 1222 \| Line 1726 \| static void handle_events(void)
1726
1727		// Hidden parts exposed, force complete refresh of window
1728		case Expose:
1729	<	if (display_type == DISPLAY_WINDOW)
1730	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1729	>	if (display_type == DISPLAY_WINDOW) {
1730	>	#ifdef ENABLE_VOSF
1731	>	if (use_vosf) { // VOSF refresh
1732	>	LOCK_VOSF;
1733	>	PFLAG_SET_ALL;
1734	>	UNLOCK_VOSF;
1735	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1736	>	}
1737	>	else
1738	>	#endif
1739	>	if (frame_skip == 0) { // Dynamic refresh
1740	>	int x1, y1;
1741	>	for (y1=0; y1<16; y1++)
1742	>	for (x1=0; x1<16; x1++)
1743	>	updt_box[x1][y1] = true;
1744	>	nr_boxes = 16 * 16;
1745	>	} else // Static refresh
1746	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1747	>	}
1748	>	break;
1749	>
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 1234 \| Line 1763 \| static void handle_events(void)
1763		* Window display update
1764		*/
1765
1766	<	static void update_display(void)
1766	>	// Dynamic display update (variable frame rate for each box)
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.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];
1779	>	y2a = 8;
1780	>	for (i = 0; i < 6; i++)
1781	>	if (ticker % (2 << i))
1782	>	break;
1783	>	max_box = sm_no_boxes[i];
1784	>
1785	>	if (y2a) {
1786	>	for (y1=0; y1<16; y1++) {
1787	>	for (y2=y2s; y2 < ry; y2 += y2a) {
1788	>	i = ((y1 * ry) + y2) * bytes_per_row;
1789	>	for (x1=0; x1<16; x1++, i += rx) {
1790	>	if (updt_box[x1][y1] == false) {
1791	>	if (memcmp(&the_buffer_copy[i], &the_buffer[i], rx)) {
1792	>	updt_box[x1][y1] = true;
1793	>	nr_boxes++;
1794	>	}
1795	>	}
1796	>	}
1797	>	}
1798	>	}
1799	>	}
1800	>
1801	>	if ((nr_boxes <= max_box) && (nr_boxes)) {
1802	>	for (y1=0; y1<16; y1++) {
1803	>	for (x1=0; x1<16; x1++) {
1804	>	if (updt_box[x1][y1] == true) {
1805	>	if (rxm == 0)
1806	>	xm = x1;
1807	>	rxm += rx;
1808	>	updt_box[x1][y1] = false;
1809	>	}
1810	>	if (((updt_box[x1+1][y1] == false) \|\| (x1 == 15)) && (rxm)) {
1811	>	if ((rxmo != rxm) \|\| (xmo != xm) \|\| (yo != y1 - 1)) {
1812	>	if (rxmo) {
1813	>	xi = xmo * rx;
1814	>	yi = ymo * ry;
1815	>	xil = rxmo;
1816	>	yil = (yo - ymo +1) * ry;
1817	>	}
1818	>	rxmo = rxm;
1819	>	xmo = xm;
1820	>	ymo = y1;
1821	>	}
1822	>	rxm = 0;
1823	>	yo = y1;
1824	>	}
1825	>	if (xil) {
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 (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, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1834	>	} else {
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, 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	>	}
1842	>	if ((x1 == 15) && (y1 == 15) && (rxmo)) {
1843	>	x1--;
1844	>	xi = xmo * rx;
1845	>	yi = ymo * ry;
1846	>	xil = rxmo;
1847	>	yil = (yo - ymo +1) * ry;
1848	>	rxmo = 0;
1849	>	}
1850	>	}
1851	>	}
1852	>	nr_boxes = 0;
1853	>	}
1854	>	}
1855	>
1856	>	// Static display update (fixed frame rate, but incremental)
1857	>	static void update_display_static(driver_window *drv)
1858		{
1239	–	// In classic mode, copy the frame buffer from Mac RAM
1240	–	if (classic_mode)
1241	–	Mac2Host_memcpy(the_buffer, 0x3fa700, VideoMonitor.bytes_per_row * VideoMonitor.y);
1242	–
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 1265 \| Line 1881 \| static void update_display(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;
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 1275 \| Line 1891 \| static void update_display(void)
1891		x1 = i << 3;
1892		break;
1893		}
1894	<	p++;
1279	<	p2++;
1894	>	p++; p2++;
1895		}
1896		}
1897		x2 = x1;
#	Line 1285 \| Line 1900 \| static void update_display(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--) {
1904	<	p--;
1290	<	p2--;
1903	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
1904	>	p--; p2--;
1905		if (p != p2) {
1906	<	x2 = i << 3;
1906	>	x2 = (i << 3) + 7;
1907		break;
1908		}
1909		}
1910		}
1911	<	wide = x2 - x1;
1911	>	wide = x2 - x1 + 1;
1912
1913		// Update copy of the_buffer
1914		if (high && wide) {
1915		for (j=y1; j<=y2; j++) {
1916		i = j * bytes_per_row + (x1 >> 3);
1917	<	memcpy(&the_buffer_copy[i], &the_buffer[i], wide >> 3);
1917	>	memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3);
1918		}
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];
1926	<	for (i=0; i<x1; i++) {
1927	<	if (memcmp(p, p2, bytes_per_pixel)) {
1928	<	x1 = i;
1926	>	for (i=0; i<x1*bytes_per_pixel; i++) {
1927	>	if (p != p2) {
1928	>	x1 = i / bytes_per_pixel;
1929		break;
1930		}
1931	<	p += bytes_per_pixel;
1318	<	p2 += bytes_per_pixel;
1931	>	p++; p2++;
1932		}
1933		}
1934		x2 = x1;
#	Line 1324 \| Line 1937 \| static void update_display(void)
1937		p2 = &the_buffer_copy[j * bytes_per_row];
1938		p += bytes_per_row;
1939		p2 += bytes_per_row;
1940	<	for (i=VideoMonitor.x; i>x2; i--) {
1941	<	p -= bytes_per_pixel;
1942	<	p2 -= bytes_per_pixel;
1943	<	if (memcmp(p, p2, bytes_per_pixel)) {
1944	<	x2 = i;
1940	>	for (i=VideoMonitor.mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1941	>	p--;
1942	>	p2--;
1943	>	if (p != p2) {
1944	>	x2 = i / bytes_per_pixel;
1945		break;
1946		}
1947		}
#	Line 1339 \| Line 1952 \| static void update_display(void)
1952		if (high && wide) {
1953		for (j=y1; j<=y2; j++) {
1954		i = j * bytes_per_row + x1 * bytes_per_pixel;
1955	<	memcpy(&the_buffer_copy[i], &the_buffer[i], bytes_per_pixel * wide);
1955	>	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
1956		}
1957		}
1958		}
#	Line 1347 \| Line 1960 \| static void update_display(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);
1354	<	}
1355	<
1356	<	// Has the Mac started? (cursor data is not valid otherwise)
1357	<	if (HasMacStarted()) {
1358	<
1359	<	// Set new cursor image if it was changed
1360	<	if (memcmp(the_cursor, Mac2HostAddr(0x844), 64)) {
1361	<	Mac2Host_memcpy(the_cursor, 0x844, 64);
1362	<	memcpy(cursor_image->data, the_cursor, 32);
1363	<	memcpy(cursor_mask_image->data, the_cursor+32, 32);
1364	<	XFreeCursor(x_display, mac_cursor);
1365	<	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
1366	<	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
1367	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, ReadMacInt8(0x885), ReadMacInt8(0x887));
1368	<	XDefineCursor(x_display, the_win, mac_cursor);
1369	<	}
1966	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
1967		}
1968		}
1969
1970
1971		/*
1972	<	* Thread for screen refresh, input handling etc.
1972	>	* Screen refresh functions
1973		*/
1974
1975	<	static void redraw_func(void arg)
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		{
1983	<	int tick_counter = 0;
1983	>	// Quit DGA mode if requested
1984	>	if (quit_full_screen) {
1985	>	quit_full_screen = false;
1986	>	delete drv;
1987	>	drv = NULL;
1988	>	}
1989	>	}
1990
1991	<	while (!redraw_thread_cancel) {
1991	>	static inline void handle_palette_changes(void)
1992	>	{
1993	>	LOCK_PALETTE;
1994
1995	<	// Wait
1996	<	#ifdef HAVE_NANOSLEEP
1997	<	struct timespec req = {0, 16666667};
1998	<	nanosleep(&req, NULL);
1388	<	#else
1389	<	usleep(16667);
1390	<	#endif
1995	>	if (palette_changed) {
1996	>	palette_changed = false;
1997	>	drv->update_palette();
1998	>	}
1999
2000	<	#if ENABLE_XF86_DGA
2001	<	// Quit DGA mode if requested
2002	<	if (quit_full_screen) {
2003	<	quit_full_screen = false;
2004	<	if (display_type == DISPLAY_DGA) {
2005	<	XF86DGADirectVideo(x_display, screen, 0);
2006	<	XUngrabPointer(x_display, CurrentTime);
2007	<	XUngrabKeyboard(x_display, CurrentTime);
2008	<	XUnmapWindow(x_display, the_win);
2009	<	XSync(x_display, false);
2010	<	}
2000	>	UNLOCK_PALETTE;
2001	>	}
2002	>
2003	>	static void video_refresh_dga(void)
2004	>	{
2005	>	// Quit DGA mode if requested
2006	>	possibly_quit_dga_mode();
2007	>
2008	>	// Handle X events
2009	>	handle_events();
2010	>
2011	>	// Handle palette changes
2012	>	handle_palette_changes();
2013	>	}
2014	>
2015	>	#ifdef ENABLE_VOSF
2016	>	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
2017	>	static void video_refresh_dga_vosf(void)
2018	>	{
2019	>	// Quit DGA mode if requested
2020	>	possibly_quit_dga_mode();
2021	>
2022	>	// Handle X events
2023	>	handle_events();
2024	>
2025	>	// Handle palette changes
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	>	if (mainBuffer.dirty) {
2033	>	LOCK_VOSF;
2034	>	update_display_dga_vosf();
2035	>	UNLOCK_VOSF;
2036		}
2037	+	}
2038	+	}
2039		#endif
2040
2041	<	#if ENABLE_FBDEV_DGA
2042	<	// Quit DGA mode if requested
2043	<	if (quit_full_screen) {
2044	<	quit_full_screen = false;
2045	<	if (display_type == DISPLAY_DGA) {
2046	<	XUngrabPointer(x_display, CurrentTime);
2047	<	XUngrabKeyboard(x_display, CurrentTime);
2048	<	XUnmapWindow(x_display, the_win);
2049	<	XSync(x_display, false);
2050	<	}
2041	>	static void video_refresh_window_vosf(void)
2042	>	{
2043	>	// Quit DGA mode if requested
2044	>	possibly_quit_dga_mode();
2045	>
2046	>	// Handle X events
2047	>	handle_events();
2048	>
2049	>	// Handle palette changes
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	>	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	<	#endif
2063	<	// Handle X events
2064	<	handle_events();
2062	>	}
2063	>	}
2064	>	#endif // def ENABLE_VOSF
2065
2066	<	// Handle palette changes
2067	<	pthread_mutex_lock(&palette_lock);
2068	<	if (palette_changed) {
2069	<	palette_changed = false;
2070	<	if (depth == 8) {
2071	<	XStoreColors(x_display, cmap[0], palette, 256);
2072	<	XStoreColors(x_display, cmap[1], palette, 256);
2073	<
2074	<	#if ENABLE_XF86_DGA
2075	<	if (display_type == DISPLAY_DGA) {
2076	<	current_dga_cmap ^= 1;
2077	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2078	<	}
2066	>	static void video_refresh_window_static(void)
2067	>	{
2068	>	// Handle X events
2069	>	handle_events();
2070	>
2071	>	// Handle_palette changes
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(static_cast<driver_window *>(drv));
2079	>	}
2080	>	}
2081	>
2082	>	static void video_refresh_window_dynamic(void)
2083	>	{
2084	>	// Handle X events
2085	>	handle_events();
2086	>
2087	>	// Handle_palette changes
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, static_cast<driver_window *>(drv));
2094	>	}
2095	>
2096	>
2097	>	/*
2098	>	* Thread for screen refresh, input handling etc.
2099	>	*/
2100	>
2101	>	static void VideoRefreshInit(void)
2102	>	{
2103	>	// TODO: set up specialised 8bpp VideoRefresh handlers ?
2104	>	if (display_type == DISPLAY_DGA) {
2105	>	#if ENABLE_VOSF && (REAL_ADDRESSING \|\| DIRECT_ADDRESSING)
2106	>	if (use_vosf)
2107	>	video_refresh = video_refresh_dga_vosf;
2108	>	else
2109		#endif
2110	<	}
2111	<	}
2112	<	pthread_mutex_unlock(&palette_lock);
2110	>	video_refresh = video_refresh_dga;
2111	>	}
2112	>	else {
2113	>	#ifdef ENABLE_VOSF
2114	>	if (use_vosf)
2115	>	video_refresh = video_refresh_window_vosf;
2116	>	else
2117	>	#endif
2118	>	if (frame_skip == 0)
2119	>	video_refresh = video_refresh_window_dynamic;
2120	>	else
2121	>	video_refresh = video_refresh_window_static;
2122	>	}
2123	>	}
2124
2125	<	// In window mode, update display and mouse pointer
2126	<	if (display_type == DISPLAY_WINDOW) {
2127	<	tick_counter++;
2128	<	if (tick_counter >= frame_skip) {
2129	<	tick_counter = 0;
2130	<	update_display();
2131	<	}
2132	<	}
2125	>	void VideoRefresh(void)
2126	>	{
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	>	}
2132	>
2133	>	#ifdef HAVE_PTHREADS
2134	>	static void redraw_func(void arg)
2135	>	{
2136	>	uint64 start = GetTicks_usec();
2137	>	int64 ticks = 0;
2138	>	uint64 next = GetTicks_usec();
2139	>	while (!redraw_thread_cancel) {
2140	>	video_refresh();
2141	>	next += 16667;
2142	>	int64 delay = next - GetTicks_usec();
2143	>	if (delay > 0)
2144	>	Delay_usec(delay);
2145	>	else if (delay < -16667)
2146	>	next = GetTicks_usec();
2147	>	ticks++;
2148		}
2149	+	uint64 end = GetTicks_usec();
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.11 by cebix, 1999-11-03T10:56:30Z vs. Revision 1.48 by cebix, 2001-07-01T14:38:03Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.11 by cebix, 1999-11-03T10:56:30Z vs.
Revision 1.48 by cebix, 2001-07-01T14:38:03Z