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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.26 by cebix, 2000-10-27T17:01:40Z vs.
Revision 1.56 by gbeauche, 2001-07-07T09:14:47Z

#	Line 1 \| Line 1
1		/*
2		* video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	* Basilisk II (C) 1997-2000 Christian Bauer
4	>	* Basilisk II (C) 1997-2001 Christian Bauer
5		*
6		* This program is free software; you can redistribute it and/or modify
7		* it under the terms of the GNU General Public License as published by
#	Line 24 \| Line 24
24		* Ctrl-Tab = suspend DGA mode
25		* Ctrl-Esc = emergency quit
26		* Ctrl-F1 = mount floppy
27	+	* Ctrl-F5 = grab mouse (in windowed mode)
28		*/
29
30		#include "sysdeps.h"
#	Line 36 \| Line 37
37		#include <sys/shm.h>
38		#include <errno.h>
39
40	+	#include <algorithm>
41	+
42	+	#ifndef NO_STD_NAMESPACE
43	+	using std::sort;
44	+	#endif
45	+
46		#ifdef HAVE_PTHREADS
47		# include <pthread.h>
48		#endif
#	Line 52 \| Line 59
59		# include <sys/mman.h>
60		#endif
61
55	–	#ifdef ENABLE_VOSF
56	–	# include <unistd.h>
57	–	# include <signal.h>
58	–	# include <fcntl.h>
59	–	# include <sys/mman.h>
60	–	#endif
61	–
62		#include "cpu_emulation.h"
63		#include "main.h"
64		#include "adb.h"
#	Line 79 \| Line 79 \| enum {
79
80		// Constants
81		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
82	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
82	>
83	>	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| ExposureMask \| StructureNotifyMask;
84	>	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
85
86
87		// Global variables
88		static int32 frame_skip; // Prefs items
89	<	static int16 mouse_wheel_mode = 1;
90	<	static int16 mouse_wheel_lines = 3;
89	>	static int16 mouse_wheel_mode;
90	>	static int16 mouse_wheel_lines;
91
92		static int display_type = DISPLAY_WINDOW; // See enum above
93		static bool local_X11; // Flag: X server running on local machine?
94	<	static uint8 *the_buffer; // Mac frame buffer
94	>	static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into)
95	>	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes)
96	>	static uint32 the_buffer_size; // Size of allocated the_buffer
97
94	–	#ifdef HAVE_PTHREADS
98		static bool redraw_thread_active = false; // Flag: Redraw thread installed
99	<	static volatile bool redraw_thread_cancel = false; // Flag: Cancel Redraw thread
99	>	#ifdef HAVE_PTHREADS
100	>	static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
101		static pthread_t redraw_thread; // Redraw thread
102		#endif
103
104		static bool has_dga = false; // Flag: Video DGA capable
105		static bool has_vidmode = false; // Flag: VidMode extension available
106
107	+	#ifdef ENABLE_VOSF
108	+	static bool use_vosf = true; // Flag: VOSF enabled
109	+	#else
110	+	static const bool use_vosf = false; // VOSF not possible
111	+	#endif
112	+
113		static bool ctrl_down = false; // Flag: Ctrl key pressed
114		static bool caps_on = false; // Flag: Caps Lock on
115		static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread
#	Line 113 \| Line 123 \| static int keycode_table[256]; // X
123
124		// X11 variables
125		static int screen; // Screen number
126	<	static int xdepth; // Depth of X screen
127	<	static int depth; // Depth of Mac frame buffer
128	<	static Window rootwin, the_win; // Root window and our window
119	<	static XVisualInfo visualInfo;
120	<	static Visual *vis;
121	<	static Colormap cmap[2]; // Two colormaps (DGA) for 8-bit mode
126	>	static Window rootwin; // Root window and our window
127	>	static int num_depths = 0; // Number of available X depths
128	>	static int *avail_depths = NULL; // List of available X depths
129		static XColor black, white;
130		static unsigned long black_pixel, white_pixel;
131		static int eventmask;
125	–	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| FocusChangeMask \| ExposureMask;
126	–	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask;
132
133	<	static XColor palette[256]; // Color palette for 8-bit mode
134	<	static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
135	<	#ifdef HAVE_PTHREADS
136	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
132	<	#endif
133	>	static int xdepth; // Depth of X screen
134	>	static XVisualInfo visualInfo;
135	>	static Visual *vis;
136	>	static int color_class;
137
138	<	// Variables for window mode
135	<	static GC the_gc;
136	<	static XImage *img = NULL;
137	<	static XShmSegmentInfo shminfo;
138	<	static Cursor mac_cursor;
139	<	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
140	<	static bool have_shm = false; // Flag: SHM extensions available
141	<	static bool updt_box[17][17]; // Flag for Update
142	<	static int nr_boxes;
143	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
144	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
138	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
139
140	<	// Variables for XF86 DGA mode
147	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
148	<	static Window suspend_win; // "Suspend" window
149	<	static void *fb_save = NULL; // Saved frame buffer for suspend
150	<	#ifdef HAVE_PTHREADS
151	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
152	<	#endif
140	>	static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them)
141
142	<	// Variables for fbdev DGA mode
143	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
144	<	static int fbdev_fd;
142	>	static XColor palette[256]; // Color palette to be used as CLUT and gamma table
143	>	static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
144	>
145	>	#ifdef ENABLE_FBDEV_DGA
146	>	static int fbdev_fd = -1;
147	>	#endif
148
149		#ifdef ENABLE_XF86_VIDMODE
150	<	// Variables for XF86 VidMode support
160	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
150	>	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
151		static int num_x_video_modes;
152		#endif
153
154	<	#ifdef ENABLE_VOSF
155	<	static bool use_vosf = true; // Flag: VOSF enabled
154	>	// Mutex to protect palette
155	>	#ifdef HAVE_PTHREADS
156	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
157	>	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
158	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
159		#else
160	<	static const bool use_vosf = false; // Flag: VOSF enabled
161	<	#endif
169	<
170	<	#ifdef ENABLE_VOSF
171	<	static uint8 * the_host_buffer; // Host frame buffer in VOSF mode
172	<	static uint32 the_buffer_size; // Size of allocated the_buffer
160	>	#define LOCK_PALETTE
161	>	#define UNLOCK_PALETTE
162		#endif
163
164	<	#ifdef ENABLE_VOSF
176	<	// Variables for Video on SEGV support (taken from the Win32 port)
177	<	struct ScreenPageInfo {
178	<	int top, bottom; // Mapping between this virtual page and Mac scanlines
179	<	};
180	<
181	<	struct ScreenInfo {
182	<	uint32 memBase; // Real start address
183	<	uint32 memStart; // Start address aligned to page boundary
184	<	uint32 memEnd; // Address of one-past-the-end of the screen
185	<	uint32 memLength; // Length of the memory addressed by the screen pages
186	<
187	<	uint32 pageSize; // Size of a page
188	<	int pageBits; // Shift count to get the page number
189	<	uint32 pageCount; // Number of pages allocated to the screen
190	<
191	<	uint8 * dirtyPages; // Table of flags set if page was altered
192	<	ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines
193	<	};
194	<
195	<	static ScreenInfo mainBuffer;
196	<
197	<	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = 1
198	<	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = 0
199	<	#define PFLAG_ISSET(page) mainBuffer.dirtyPages[page]
200	<	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] == 0)
201	<	#ifdef UNALIGNED_PROFITABLE
202	<	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + page)) == 0)
203	<	#else
204	<	# define PFLAG_ISCLEAR_4(page) \
205	<	(mainBuffer.dirtyPages[page ] == 0) \
206	<	&& (mainBuffer.dirtyPages[page+1] == 0) \
207	<	&& (mainBuffer.dirtyPages[page+2] == 0) \
208	<	&& (mainBuffer.dirtyPages[page+3] == 0)
209	<	#endif
210	<	#define PFLAG_CLEAR_ALL memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
211	<	#define PFLAG_SET_ALL memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
212	<
213	<	static int zero_fd = -1;
214	<	static bool Screen_fault_handler_init();
215	<	static struct sigaction vosf_sa;
216	<
164	>	// Mutex to protect frame buffer
165		#ifdef HAVE_PTHREADS
166	<	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
166	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
167	>	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
168	>	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
169	>	#else
170	>	#define LOCK_FRAME_BUFFER
171	>	#define UNLOCK_FRAME_BUFFER
172		#endif
173
174	<	static int log_base_2(uint32 x)
175	<	{
176	<	uint32 mask = 0x80000000;
177	<	int l = 31;
178	<	while (l >= 0 && (x & mask) == 0) {
226	<	mask >>= 1;
227	<	l--;
228	<	}
229	<	return l;
230	<	}
231	<
232	<	#endif
174	>	// Variables for non-VOSF incremental refresh
175	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
176	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
177	>	static bool updt_box[17][17];
178	>	static int nr_boxes;
179
180	<	// VideoRefresh function
181	<	void VideoRefreshInit(void);
180	>	// Video refresh function
181	>	static void VideoRefreshInit(void);
182		static void (*video_refresh)(void);
183
184	+
185		// Prototypes
186		static void redraw_func(void arg);
187	<	static int event2keycode(XKeyEvent *ev);
241	<
187	>	static int event2keycode(XKeyEvent &ev);
188
189		// From main_unix.cpp
190		extern char *x_display_name;
#	Line 247 \| Line 193 \| *extern Display x_display;**
193		// From sys_unix.cpp
194		extern void SysMountFirstFloppy(void);
195
250	–	#ifdef ENABLE_VOSF
251	–	# include "video_vosf.h"
252	–	#endif
253	–
196
197		/*
198	<	* Initialization
198	>	* Utility functions
199		*/
200
201	<	// Set VideoMonitor according to video mode
202	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
201	>	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
202	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
203		{
204	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
205	<	int layout = FLAYOUT_DIRECT;
204	>	return ((red >> rloss) << rshift) \| ((green >> gloss) << gshift) \| ((blue >> bloss) << bshift);
205	>	}
206	>
207	>	// Do we have a visual for handling the specified Mac depth? If so, set the
208	>	// global variables "xdepth", "visualInfo", "vis" and "color_class".
209	>	static bool find_visual_for_depth(video_depth depth)
210	>	{
211	>	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
212	>
213	>	// Calculate minimum and maximum supported X depth
214	>	int min_depth = 1, max_depth = 32;
215		switch (depth) {
216	<	case 1:
217	<	layout = FLAYOUT_DIRECT;
216	>	case VDEPTH_1BIT: // 1-bit works always
217	>	min_depth = 1;
218	>	max_depth = 32;
219		break;
220	<	case 8:
221	<	layout = FLAYOUT_DIRECT;
220	>	#ifdef ENABLE_VOSF
221	>	case VDEPTH_2BIT:
222	>	case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
223	>	case VDEPTH_8BIT:
224	>	min_depth = 8;
225	>	max_depth = 32;
226		break;
227	<	case 15:
228	<	layout = FLAYOUT_HOST_555;
227	>	#else
228	>	case VDEPTH_2BIT:
229	>	case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters
230	>	return false;
231	>	case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual
232	>	min_depth = 8;
233	>	max_depth = 8;
234		break;
235	<	case 16:
236	<	layout = FLAYOUT_HOST_565;
235	>	#endif
236	>	case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual
237	>	min_depth = 15;
238	>	max_depth = 16;
239		break;
240	<	case 24:
241	<	case 32:
242	<	layout = FLAYOUT_HOST_888;
240	>	case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual
241	>	min_depth = 24;
242	>	max_depth = 32;
243		break;
244		}
245	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
246	+
247	+	// Try to find a visual for one of the color depths
248	+	bool visual_found = false;
249	+	for (int i=0; i<num_depths && !visual_found; i++) {
250	+
251	+	xdepth = avail_depths[i];
252	+	D(bug(" trying to find visual for depth %d\n", xdepth));
253	+	if (xdepth < min_depth \|\| xdepth > max_depth)
254	+	continue;
255	+
256	+	// Determine best color class for this depth
257	+	switch (xdepth) {
258	+	case 1: // Try StaticGray or StaticColor
259	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
260	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
261	+	visual_found = true;
262	+	break;
263	+	case 8: // Need PseudoColor
264	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
265	+	visual_found = true;
266	+	break;
267	+	case 15:
268	+	case 16:
269	+	case 24:
270	+	case 32: // Try DirectColor first, as this will allow gamma correction
271	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
272	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
273	+	visual_found = true;
274	+	break;
275	+	default:
276	+	D(bug(" not a supported depth\n"));
277	+	break;
278	+	}
279	+	}
280	+	if (!visual_found)
281	+	return false;
282	+
283	+	// Visual was found
284	+	vis = visualInfo.visual;
285	+	color_class = visualInfo.c_class;
286	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
287	+	#if DEBUG
288	+	switch (color_class) {
289	+	case StaticGray: D(bug("StaticGray\n")); break;
290	+	case GrayScale: D(bug("GrayScale\n")); break;
291	+	case StaticColor: D(bug("StaticColor\n")); break;
292	+	case PseudoColor: D(bug("PseudoColor\n")); break;
293	+	case TrueColor: D(bug("TrueColor\n")); break;
294	+	case DirectColor: D(bug("DirectColor\n")); break;
295	+	}
296	+	#endif
297	+	}
298	+
299	+	// Add mode to list of supported modes
300	+	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
301	+	{
302	+	video_mode mode;
303	+	mode.x = width;
304	+	mode.y = height;
305	+	mode.resolution_id = resolution_id;
306	+	mode.bytes_per_row = bytes_per_row;
307	+	mode.depth = depth;
308	+	VideoModes.push_back(mode);
309	+	}
310	+
311	+	// Add standard list of windowed modes for given color depth
312	+	static void add_window_modes(video_depth depth)
313	+	{
314	+	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
315	+	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
316	+	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
317	+	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
318	+	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
319	+	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
320	+	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
321	+	}
322	+
323	+	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
324	+	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
325	+	{
326	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
327	+	int layout = FLAYOUT_DIRECT;
328	+	if (depth == VDEPTH_16BIT)
329	+	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
330	+	else if (depth == VDEPTH_32BIT)
331	+	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
332		if (native_byte_order)
333		MacFrameLayout = layout;
334		else
335		MacFrameLayout = FLAYOUT_DIRECT;
336	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
337	+
338	+	// Set variables used by UAE memory banking
339	+	MacFrameBaseHost = the_buffer;
340	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
341	+	InitFrameBufferMapping();
342	+	#else
343	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
344		#endif
345	<	switch (depth) {
346	<	case 1:
347	<	VideoMonitor.mode = VMODE_1BIT;
348	<	break;
349	<	case 8:
350	<	VideoMonitor.mode = VMODE_8BIT;
351	<	break;
352	<	case 15:
353	<	VideoMonitor.mode = VMODE_16BIT;
354	<	break;
355	<	case 16:
356	<	VideoMonitor.mode = VMODE_16BIT;
357	<	break;
358	<	case 24:
359	<	case 32:
360	<	VideoMonitor.mode = VMODE_32BIT;
361	<	break;
345	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
346	>	}
347	>
348	>	// Set window name and class
349	>	static void set_window_name(Window w, int name)
350	>	{
351	>	const char *str = GetString(name);
352	>	XStoreName(x_display, w, str);
353	>	XSetIconName(x_display, w, str);
354	>
355	>	XClassHint *hints;
356	>	hints = XAllocClassHint();
357	>	if (hints) {
358	>	hints->res_name = "BasiliskII";
359	>	hints->res_class = "BasiliskII";
360	>	XSetClassHint(x_display, w, hints);
361	>	XFree(hints);
362		}
363	<	VideoMonitor.x = width;
364	<	VideoMonitor.y = height;
365	<	VideoMonitor.bytes_per_row = bytes_per_row;
363	>	}
364	>
365	>	// Set window input focus flag
366	>	static void set_window_focus(Window w)
367	>	{
368	>	XWMHints *hints = XAllocWMHints();
369	>	if (hints) {
370	>	hints->input = True;
371	>	hints->initial_state = NormalState;
372	>	hints->flags = InputHint \| StateHint;
373	>	XSetWMHints(x_display, w, hints);
374	>	XFree(hints);
375	>	}
376	>	}
377	>
378	>	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
379	>	static Atom WM_DELETE_WINDOW = (Atom)0;
380	>	static void set_window_delete_protocol(Window w)
381	>	{
382	>	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
383	>	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
384	>	}
385	>
386	>	// Wait until window is mapped/unmapped
387	>	void wait_mapped(Window w)
388	>	{
389	>	XEvent e;
390	>	do {
391	>	XMaskEvent(x_display, StructureNotifyMask, &e);
392	>	} while ((e.type != MapNotify) \|\| (e.xmap.event != w));
393	>	}
394	>
395	>	void wait_unmapped(Window w)
396	>	{
397	>	XEvent e;
398	>	do {
399	>	XMaskEvent(x_display, StructureNotifyMask, &e);
400	>	} while ((e.type != UnmapNotify) \|\| (e.xmap.event != w));
401		}
402
403		// Trap SHM errors
#	Line 320 \| Line 413 \| *static int error_handler(Display d, XEr**
413		return old_error_handler(d, e);
414		}
415
416	<	// Init window mode
417	<	static bool init_window(int width, int height)
416	>
417	>	/*
418	>	* Display "driver" classes
419	>	*/
420	>
421	>	class driver_base {
422	>	public:
423	>	driver_base();
424	>	virtual ~driver_base();
425	>
426	>	virtual void update_palette(void);
427	>	virtual void suspend(void) {}
428	>	virtual void resume(void) {}
429	>	virtual void toggle_mouse_grab(void) {}
430	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
431	>
432	>	virtual void grab_mouse(void) {}
433	>	virtual void ungrab_mouse(void) {}
434	>
435	>	public:
436	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
437	>	Window w; // The window we draw into
438	>	};
439	>
440	>	class driver_window;
441	>	static void update_display_window_vosf(driver_window *drv);
442	>	static void update_display_dynamic(int ticker, driver_window *drv);
443	>	static void update_display_static(driver_window *drv);
444	>
445	>	class driver_window : public driver_base {
446	>	friend void update_display_window_vosf(driver_window *drv);
447	>	friend void update_display_dynamic(int ticker, driver_window *drv);
448	>	friend void update_display_static(driver_window *drv);
449	>
450	>	public:
451	>	driver_window(const video_mode &mode);
452	>	~driver_window();
453	>
454	>	void toggle_mouse_grab(void);
455	>	void mouse_moved(int x, int y);
456	>
457	>	void grab_mouse(void);
458	>	void ungrab_mouse(void);
459	>
460	>	private:
461	>	GC gc;
462	>	XImage *img;
463	>	bool have_shm; // Flag: SHM extensions available
464	>	XShmSegmentInfo shminfo;
465	>	Cursor mac_cursor;
466	>	bool mouse_grabbed; // Flag: mouse pointer grabbed, using relative mouse mode
467	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
468	>	};
469	>
470	>	static driver_base *drv = NULL; // Pointer to currently used driver object
471	>
472	>	#ifdef ENABLE_VOSF
473	>	# include "video_vosf.h"
474	>	#endif
475	>
476	>	driver_base::driver_base()
477	>	: init_ok(false), w(0)
478	>	{
479	>	the_buffer = NULL;
480	>	the_buffer_copy = NULL;
481	>	}
482	>
483	>	driver_base::~driver_base()
484	>	{
485	>	ungrab_mouse();
486	>
487	>	if (w) {
488	>	XUnmapWindow(x_display, w);
489	>	wait_unmapped(w);
490	>	XDestroyWindow(x_display, w);
491	>	}
492	>
493	>	XFlush(x_display);
494	>	XSync(x_display, false);
495	>
496	>	// Free frame buffer(s)
497	>	if (!use_vosf) {
498	>	if (the_buffer) {
499	>	free(the_buffer);
500	>	the_buffer = NULL;
501	>	}
502	>	if (the_buffer_copy) {
503	>	free(the_buffer_copy);
504	>	the_buffer_copy = NULL;
505	>	}
506	>	}
507	>	#ifdef ENABLE_VOSF
508	>	else {
509	>	if (the_host_buffer) {
510	>	free(the_host_buffer);
511	>	the_host_buffer = NULL;
512	>	}
513	>	if (the_buffer) {
514	>	free(the_buffer);
515	>	the_buffer = NULL;
516	>	}
517	>	if (the_buffer_copy) {
518	>	free(the_buffer_copy);
519	>	the_buffer_copy = NULL;
520	>	}
521	>	}
522	>	#endif
523	>	}
524	>
525	>	// Palette has changed
526	>	void driver_base::update_palette(void)
527	>	{
528	>	if (cmap[0] && cmap[1]) {
529	>	int num = vis->map_entries;
530	>	if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor)
531	>	return; // Indexed mode on true color screen, don't set CLUT
532	>	XStoreColors(x_display, cmap[0], palette, num);
533	>	XStoreColors(x_display, cmap[1], palette, num);
534	>	}
535	>	XSync(x_display, false);
536	>	}
537	>
538	>
539	>	/*
540	>	* Windowed display driver
541	>	*/
542	>
543	>	// Open display
544	>	driver_window::driver_window(const video_mode &mode)
545	>	: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0)
546		{
547	+	int width = mode.x, height = mode.y;
548		int aligned_width = (width + 15) & ~15;
549		int aligned_height = (height + 15) & ~15;
550
551		// Set absolute mouse mode
552	<	ADBSetRelMouseMode(false);
331	<
332	<	// Read frame skip prefs
333	<	frame_skip = PrefsFindInt32("frameskip");
552	>	ADBSetRelMouseMode(mouse_grabbed);
553
554		// Create window
555		XSetWindowAttributes wattr;
556		wattr.event_mask = eventmask = win_eventmask;
557		wattr.background_pixel = black_pixel;
558	<	wattr.border_pixel = black_pixel;
559	<	wattr.backing_store = NotUseful;
560	<	wattr.save_under = false;
342	<	wattr.backing_planes = xdepth;
558	>	wattr.colormap = (mode.depth == VDEPTH_1BIT && color_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
559	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
560	>	InputOutput, vis, CWEventMask \| CWBackPixel \| (color_class == PseudoColor \|\| color_class == DirectColor ? CWColormap : 0), &wattr);
561
562	<	XSync(x_display, false);
563	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
346	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
347	<	CWBackingStore \| CWBackingPlanes, &wattr);
562	>	// Set window name/class
563	>	set_window_name(w, STR_WINDOW_TITLE);
564
565		// Indicate that we want keyboard input
566	<	{
567	<	XWMHints *hints = XAllocWMHints();
568	<	if (hints) {
569	<	hints->input = True;
354	<	hints->flags = InputHint;
355	<	XSetWMHints(x_display, the_win, hints);
356	<	XFree((char *)hints);
357	<	}
358	<	}
566	>	set_window_focus(w);
567	>
568	>	// Set delete protocol property
569	>	set_window_delete_protocol(w);
570
571		// Make window unresizable
572		{
#	Line 366 \| Line 577 \| static bool init_window(int width, int h
577		hints->min_height = height;
578		hints->max_height = height;
579		hints->flags = PMinSize \| PMaxSize;
580	<	XSetWMNormalHints(x_display, the_win, hints);
581	<	XFree((char *)hints);
580	>	XSetWMNormalHints(x_display, w, hints);
581	>	XFree(hints);
582		}
583		}
584
374	–	// Set window title
375	–	{
376	–	XTextProperty title_prop;
377	–	const char *title = GetString(STR_WINDOW_TITLE);
378	–	XStringListToTextProperty((char **)&title, 1, &title_prop);
379	–	XSetWMName(x_display, the_win, &title_prop);
380	–	XFree(title_prop.value);
381	–	}
382	–
383	–	// Set window class
384	–	{
385	–	XClassHint *hints;
386	–	hints = XAllocClassHint();
387	–	if (hints) {
388	–	hints->res_name = "BasiliskII";
389	–	hints->res_class = "BasiliskII";
390	–	XSetClassHint(x_display, the_win, hints);
391	–	XFree((char *)hints);
392	–	}
393	–	}
394	–
585		// Show window
586	<	XSync(x_display, false);
587	<	XMapRaised(x_display, the_win);
398	<	XFlush(x_display);
586	>	XMapWindow(x_display, w);
587	>	wait_mapped(w);
588
589	<	// Set colormap
590	<	if (depth == 8)
591	<	XSetWindowColormap(x_display, the_win, cmap[0]);
589	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
590	>	// use SHM because that doesn't allow changing the image byte order
591	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
592
593		// Try to create and attach SHM image
594	<	have_shm = false;
406	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
594	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
595
596		// Create SHM image ("height + 2" for safety)
597	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
597	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
598		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
599		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
600		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 421 \| Line 609 \| static bool init_window(int width, int h
609		if (shm_error) {
610		shmdt(shminfo.shmaddr);
611		XDestroyImage(img);
612	+	img = NULL;
613		shminfo.shmid = -1;
614		} else {
615		have_shm = true;
#	Line 430 \| Line 619 \| static bool init_window(int width, int h
619
620		// Create normal X image if SHM doesn't work ("height + 2" for safety)
621		if (!have_shm) {
622	<	int bytes_per_row = aligned_width;
434	<	switch (depth) {
435	<	case 1:
436	<	bytes_per_row /= 8;
437	<	break;
438	<	case 15:
439	<	case 16:
440	<	bytes_per_row *= 2;
441	<	break;
442	<	case 24:
443	<	case 32:
444	<	bytes_per_row *= 4;
445	<	break;
446	<	}
622	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
623		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
624	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
624	>	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);
625		}
626
627	<	// 1-Bit mode is big-endian
452	<	if (depth == 1) {
627	>	if (need_msb_image) {
628		img->byte_order = MSBFirst;
629		img->bitmap_bit_order = MSBFirst;
630		}
631
632		#ifdef ENABLE_VOSF
633	<	// Allocate a page-aligned chunk of memory for frame buffer
634	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
633	>	use_vosf = true;
634	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
635		the_host_buffer = the_buffer_copy;
636	<
637	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
638	<	memset(the_buffer_copy, 0, the_buffer_size);
639	<
465	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
466	<	memset(the_buffer, 0, the_buffer_size);
636	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
637	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
638	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
639	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
640		#else
641		// Allocate memory for frame buffer
642		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
643	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
644		#endif
645
646		// Create GC
647	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
648	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
647	>	gc = XCreateGC(x_display, w, 0, 0);
648	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
649
650		// Create no_cursor
651		mac_cursor = XCreatePixmapCursor(x_display,
652	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
653	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
652	>	XCreatePixmap(x_display, w, 1, 1, 1),
653	>	XCreatePixmap(x_display, w, 1, 1, 1),
654		&black, &white, 0, 0);
655	<	XDefineCursor(x_display, the_win, mac_cursor);
655	>	XDefineCursor(x_display, w, mac_cursor);
656
657	<	// Set VideoMonitor
657	>	// Init blitting routines
658		bool native_byte_order;
659		#ifdef WORDS_BIGENDIAN
660	<	native_byte_order = (img->bitmap_bit_order == MSBFirst);
660	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
661		#else
662	<	native_byte_order = (img->bitmap_bit_order == LSBFirst);
662	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
663		#endif
664		#ifdef ENABLE_VOSF
665	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
665	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
666		#endif
667	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
668	<
669	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
670	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
667	>
668	>	// Set VideoMonitor
669	>	VideoMonitor.mode = mode;
670	>	set_mac_frame_buffer(mode.depth, native_byte_order);
671	>
672	>	// Everything went well
673	>	init_ok = true;
674	>	}
675	>
676	>	// Close display
677	>	driver_window::~driver_window()
678	>	{
679	>	if (have_shm) {
680	>	XShmDetach(x_display, &shminfo);
681	>	#ifdef ENABLE_VOSF
682	>	the_host_buffer = NULL; // don't free() in driver_base dtor
683		#else
684	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
684	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
685		#endif
686	<	return true;
686	>	}
687	>	#ifdef ENABLE_VOSF
688	>	if (use_vosf) {
689	>	// don't free() memory mapped buffers in driver_base dtor
690	>	if (the_buffer != VM_MAP_FAILED) {
691	>	vm_release(the_buffer, the_buffer_size);
692	>	the_buffer = NULL;
693	>	}
694	>	if (the_buffer_copy != VM_MAP_FAILED) {
695	>	vm_release(the_buffer_copy, the_buffer_size);
696	>	the_buffer_copy = NULL;
697	>	}
698	>	}
699	>	#endif
700	>	if (img)
701	>	XDestroyImage(img);
702	>	if (have_shm) {
703	>	shmdt(shminfo.shmaddr);
704	>	shmctl(shminfo.shmid, IPC_RMID, 0);
705	>	}
706	>	if (gc)
707	>	XFreeGC(x_display, gc);
708	>	}
709	>
710	>	// Toggle mouse grab
711	>	void driver_window::toggle_mouse_grab(void)
712	>	{
713	>	if (mouse_grabbed)
714	>	ungrab_mouse();
715	>	else
716	>	grab_mouse();
717	>	}
718	>
719	>	// Grab mouse, switch to relative mouse mode
720	>	void driver_window::grab_mouse(void)
721	>	{
722	>	int result;
723	>	for (int i=0; i<10; i++) {
724	>	result = XGrabPointer(x_display, w, True, 0,
725	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
726	>	if (result != AlreadyGrabbed)
727	>	break;
728	>	Delay_usec(100000);
729	>	}
730	>	if (result == GrabSuccess) {
731	>	ADBSetRelMouseMode(mouse_grabbed = true);
732	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
733	>	XSync(x_display, false);
734	>	}
735		}
736
737	<	// Init fbdev DGA display
738	<	static bool init_fbdev_dga(char *in_fb_name)
737	>	// Ungrab mouse, switch to absolute mouse mode
738	>	void driver_window::ungrab_mouse(void)
739		{
740	+	if (mouse_grabbed) {
741	+	XUngrabPointer(x_display, CurrentTime);
742	+	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
743	+	ADBSetRelMouseMode(mouse_grabbed = false);
744	+	}
745	+	}
746	+
747	+	// Mouse moved
748	+	void driver_window::mouse_moved(int x, int y)
749	+	{
750	+	if (!mouse_grabbed) {
751	+	mouse_last_x = x; mouse_last_y = y;
752	+	ADBMouseMoved(x, y);
753	+	return;
754	+	}
755	+
756	+	// Warped mouse motion (this code is taken from SDL)
757	+
758	+	// Post first mouse event
759	+	int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y;
760	+	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
761	+	mouse_last_x = x; mouse_last_y = y;
762	+	ADBMouseMoved(delta_x, delta_y);
763	+
764	+	// Only warp the pointer when it has reached the edge
765	+	const int MOUSE_FUDGE_FACTOR = 8;
766	+	if (x < MOUSE_FUDGE_FACTOR \|\| x > (width - MOUSE_FUDGE_FACTOR)
767	+	\|\| y < MOUSE_FUDGE_FACTOR \|\| y > (height - MOUSE_FUDGE_FACTOR)) {
768	+	XEvent event;
769	+	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
770	+	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
771	+	mouse_last_x = x; mouse_last_y = y;
772	+	ADBMouseMoved(delta_x, delta_y);
773	+	}
774	+	mouse_last_x = width/2;
775	+	mouse_last_y = height/2;
776	+	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
777	+	for (int i=0; i<10; i++) {
778	+	XMaskEvent(x_display, PointerMotionMask, &event);
779	+	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
780	+	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
781	+	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
782	+	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
783	+	break;
784	+	}
785	+	}
786	+	}
787	+
788	+
789	+	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
790	+	/*
791	+	* DGA display driver base class
792	+	*/
793	+
794	+	class driver_dga : public driver_base {
795	+	public:
796	+	driver_dga();
797	+	~driver_dga();
798	+
799	+	void suspend(void);
800	+	void resume(void);
801	+
802	+	private:
803	+	Window suspend_win; // "Suspend" information window
804	+	void *fb_save; // Saved frame buffer for suspend/resume
805	+	};
806	+
807	+	driver_dga::driver_dga()
808	+	: suspend_win(0), fb_save(NULL)
809	+	{
810	+	}
811	+
812	+	driver_dga::~driver_dga()
813	+	{
814	+	XUngrabPointer(x_display, CurrentTime);
815	+	XUngrabKeyboard(x_display, CurrentTime);
816	+	}
817	+
818	+	// Suspend emulation
819	+	void driver_dga::suspend(void)
820	+	{
821	+	// Release ctrl key
822	+	ADBKeyUp(0x36);
823	+	ctrl_down = false;
824	+
825	+	// Lock frame buffer (this will stop the MacOS thread)
826	+	LOCK_FRAME_BUFFER;
827	+
828	+	// Save frame buffer
829	+	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
830	+	if (fb_save)
831	+	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
832	+
833	+	// Close full screen display
834	+	#ifdef ENABLE_XF86_DGA
835	+	XF86DGADirectVideo(x_display, screen, 0);
836	+	#endif
837	+	XUngrabPointer(x_display, CurrentTime);
838	+	XUngrabKeyboard(x_display, CurrentTime);
839	+	XUnmapWindow(x_display, w);
840	+	wait_unmapped(w);
841	+
842	+	// Open "suspend" window
843	+	XSetWindowAttributes wattr;
844	+	wattr.event_mask = KeyPressMask;
845	+	wattr.background_pixel = black_pixel;
846	+
847	+	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
848	+	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
849	+	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
850	+	set_window_focus(suspend_win);
851	+	XMapWindow(x_display, suspend_win);
852	+	emul_suspended = true;
853	+	}
854	+
855	+	// Resume emulation
856	+	void driver_dga::resume(void)
857	+	{
858	+	// Close "suspend" window
859	+	XDestroyWindow(x_display, suspend_win);
860	+	XSync(x_display, false);
861	+
862	+	// Reopen full screen display
863	+	XMapRaised(x_display, w);
864	+	wait_mapped(w);
865	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
866	+	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
867	+	XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
868	+	#ifdef ENABLE_XF86_DGA
869	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
870	+	XF86DGASetViewPort(x_display, screen, 0, 0);
871	+	#endif
872	+	XSync(x_display, false);
873	+
874	+	// the_buffer already contains the data to restore. i.e. since a temporary
875	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
876	+	// not necessary.
877	+	#ifdef ENABLE_VOSF
878	+	if (use_vosf) {
879	+	LOCK_VOSF;
880	+	PFLAG_SET_ALL;
881	+	UNLOCK_VOSF;
882	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
883	+	}
884	+	#endif
885	+
886	+	// Restore frame buffer
887	+	if (fb_save) {
888	+	#ifdef ENABLE_VOSF
889	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
890	+	if (!use_vosf)
891	+	#endif
892	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
893	+	free(fb_save);
894	+	fb_save = NULL;
895	+	}
896	+
897	+	// Unlock frame buffer (and continue MacOS thread)
898	+	UNLOCK_FRAME_BUFFER;
899	+	emul_suspended = false;
900	+	}
901	+	#endif
902	+
903	+
904		#ifdef ENABLE_FBDEV_DGA
905	+	/*
906	+	* fbdev DGA display driver
907	+	*/
908	+
909	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
910	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
911	+
912	+	class driver_fbdev : public driver_dga {
913	+	public:
914	+	driver_fbdev(const video_mode &mode);
915	+	~driver_fbdev();
916	+	};
917	+
918	+	// Open display
919	+	driver_fbdev::driver_fbdev(const video_mode &mode)
920	+	{
921	+	int width = mode.x, height = mode.y;
922	+
923	+	// Set absolute mouse mode
924	+	ADBSetRelMouseMode(false);
925	+
926		// Find the maximum depth available
927		int ndepths, max_depth(0);
928		int *depths = XListDepths(x_display, screen, &ndepths);
929		if (depths == NULL) {
930		printf("FATAL: Could not determine the maximal depth available\n");
931	<	return false;
931	>	return;
932		} else {
933		while (ndepths-- > 0) {
934		if (depths[ndepths] > max_depth)
#	Line 526 \| Line 945 \| *static bool init_fbdev_dga(char in_fb_n**
945		char str[256];
946		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
947		ErrorAlert(str);
948	<	return false;
948	>	return;
949		}
950
951		int fb_depth; // supported depth
#	Line 546 \| Line 965 \| *static bool init_fbdev_dga(char in_fb_n**
965		continue;
966
967		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
968	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
968	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
969		device_found = true;
970		break;
971		}
#	Line 558 \| Line 977 \| *static bool init_fbdev_dga(char in_fb_n**
977		// Frame buffer name not found ? Then, display warning
978		if (!device_found) {
979		char str[256];
980	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
980	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
981		ErrorAlert(str);
982	<	return false;
982	>	return;
983		}
984
566	–	int width = DisplayWidth(x_display, screen);
567	–	int height = DisplayHeight(x_display, screen);
568	–	depth = fb_depth; // max_depth
569	–
570	–	// Set relative mouse mode
571	–	ADBSetRelMouseMode(false);
572	–
985		// Create window
986		XSetWindowAttributes wattr;
987	<	wattr.override_redirect = True;
988	<	wattr.backing_store = NotUseful;
989	<	wattr.background_pixel = white_pixel;
990	<	wattr.border_pixel = black_pixel;
579	<	wattr.event_mask = eventmask = dga_eventmask;
987	>	wattr.event_mask = eventmask = dga_eventmask;
988	>	wattr.background_pixel = white_pixel;
989	>	wattr.override_redirect = True;
990	>	wattr.colormap = cmap[0];
991
992	<	XSync(x_display, false);
582	<	the_win = XCreateWindow(x_display, rootwin,
992	>	w = XCreateWindow(x_display, rootwin,
993		0, 0, width, height,
994		0, xdepth, InputOutput, vis,
995	<	CWEventMask\|CWBackPixel\|CWBorderPixel\|CWOverrideRedirect\|CWBackingStore,
995	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
996		&wattr);
997	<	XSync(x_display, false);
998	<	XMapRaised(x_display, the_win);
999	<	XSync(x_display, false);
997	>
998	>	// Set window name/class
999	>	set_window_name(w, STR_WINDOW_TITLE);
1000	>
1001	>	// Indicate that we want keyboard input
1002	>	set_window_focus(w);
1003	>
1004	>	// Show window
1005	>	XMapRaised(x_display, w);
1006	>	wait_mapped(w);
1007
1008		// Grab mouse and keyboard
1009	<	XGrabKeyboard(x_display, the_win, True,
1009	>	XGrabKeyboard(x_display, w, True,
1010		GrabModeAsync, GrabModeAsync, CurrentTime);
1011	<	XGrabPointer(x_display, the_win, True,
1011	>	XGrabPointer(x_display, w, True,
1012		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
1013	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
597	<
598	<	// Set colormap
599	<	if (depth == 8)
600	<	XSetWindowColormap(x_display, the_win, cmap[0]);
1013	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1014
1015	<	// Set VideoMonitor
1016	<	int bytes_per_row = width;
604	<	switch (depth) {
605	<	case 1:
606	<	bytes_per_row = ((width \| 7) & ~7) >> 3;
607	<	break;
608	<	case 15:
609	<	case 16:
610	<	bytes_per_row *= 2;
611	<	break;
612	<	case 24:
613	<	case 32:
614	<	bytes_per_row *= 4;
615	<	break;
616	<	}
1015	>	// Calculate bytes per row
1016	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1017
1018	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1019	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1018	>	// Map frame buffer
1019	>	the_buffer_size = height * bytes_per_row;
1020	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1021	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1022		char str[256];
1023		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1024		ErrorAlert(str);
1025	<	return false;
1025	>	return;
1026		}
1027		}
1028
1029		#if ENABLE_VOSF
1030		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1031	<	// If the blit function is null, i.e. just a copy of the buffer,
1032	<	// we first try to avoid the allocation of a temporary frame buffer
1033	<	use_vosf = true;
632	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
633	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
634	<	use_vosf = false;
1031	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1032	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1033	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1034
1035		if (use_vosf) {
1036	<	the_host_buffer = the_buffer;
1037	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1038	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1039	<	memset(the_buffer_copy, 0, the_buffer_size);
1040	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
642	<	memset(the_buffer, 0, the_buffer_size);
1036	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1037	>	the_host_buffer = the_buffer;
1038	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1039	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1040	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1041		}
1042		#else
1043		use_vosf = false;
1044		#endif
1045		#endif
1046
1047	<	set_video_monitor(width, height, bytes_per_row, true);
1048	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1049	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1050	<	#else
1051	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1052	<	#endif
1053	<	return true;
1054	<	#else
1055	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
1056	<	return false;
1047	>	// Set VideoMonitor
1048	>	VideoModes[0].bytes_per_row = bytes_per_row;
1049	>	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
1050	>	VideoMonitor.mode = mode;
1051	>	set_mac_frame_buffer(mode.depth, true);
1052	>
1053	>	// Everything went well
1054	>	init_ok = true;
1055	>	}
1056	>
1057	>	// Close display
1058	>	driver_fbdev::~driver_fbdev()
1059	>	{
1060	>	if (!use_vosf) {
1061	>	if (the_buffer != MAP_FAILED) {
1062	>	// don't free() the screen buffer in driver_base dtor
1063	>	munmap(the_buffer, the_buffer_size);
1064	>	the_buffer = NULL;
1065	>	}
1066	>	}
1067	>	#ifdef ENABLE_VOSF
1068	>	else {
1069	>	if (the_host_buffer != MAP_FAILED) {
1070	>	// don't free() the screen buffer in driver_base dtor
1071	>	munmap(the_host_buffer, the_buffer_size);
1072	>	the_host_buffer = NULL;
1073	>	}
1074	>	if (the_buffer_copy != VM_MAP_FAILED) {
1075	>	vm_release(the_buffer_copy, the_buffer_size);
1076	>	the_buffer_copy = NULL;
1077	>	}
1078	>	if (the_buffer != VM_MAP_FAILED) {
1079	>	vm_release(the_buffer, the_buffer_size);
1080	>	the_buffer = NULL;
1081	>	}
1082	>	}
1083		#endif
1084		}
1085	+	#endif
1086	+
1087
662	–	// Init XF86 DGA display
663	–	static bool init_xf86_dga(int width, int height)
664	–	{
1088		#ifdef ENABLE_XF86_DGA
1089	+	/*
1090	+	* XFree86 DGA display driver
1091	+	*/
1092	+
1093	+	class driver_xf86dga : public driver_dga {
1094	+	public:
1095	+	driver_xf86dga(const video_mode &mode);
1096	+	~driver_xf86dga();
1097	+
1098	+	void update_palette(void);
1099	+	void resume(void);
1100	+
1101	+	private:
1102	+	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
1103	+	};
1104	+
1105	+	// Open display
1106	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
1107	+	: current_dga_cmap(0)
1108	+	{
1109	+	int width = mode.x, height = mode.y;
1110	+
1111		// Set relative mouse mode
1112		ADBSetRelMouseMode(true);
1113
#	Line 678 \| Line 1123 \| static bool init_xf86_dga(int width, int
1123		}
1124		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
1125		XF86VidModeSetViewPort(x_display, screen, 0, 0);
1126	+	XSync(x_display, false);
1127		}
1128		#endif
1129
1130		// Create window
1131		XSetWindowAttributes wattr;
1132		wattr.event_mask = eventmask = dga_eventmask;
687	–	wattr.border_pixel = black_pixel;
1133		wattr.override_redirect = True;
1134
1135	<	XSync(x_display, false);
1136	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1137	<	InputOutput, vis, CWEventMask \| CWBorderPixel \| CWOverrideRedirect, &wattr);
1138	<	XSync(x_display, false);
1139	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
1140	<	XMapRaised(x_display, the_win);
1141	<	XSync(x_display, false);
1135	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1136	>	InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
1137	>
1138	>	// Set window name/class
1139	>	set_window_name(w, STR_WINDOW_TITLE);
1140	>
1141	>	// Indicate that we want keyboard input
1142	>	set_window_focus(w);
1143	>
1144	>	// Show window
1145	>	XMapRaised(x_display, w);
1146	>	wait_mapped(w);
1147
1148		// Establish direct screen connection
1149	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
1149	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
1150		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1151		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1152		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 708 \| Line 1158 \| static bool init_xf86_dga(int width, int
1158		XF86DGASetVidPage(x_display, screen, 0);
1159
1160		// Set colormap
1161	<	if (depth == 8) {
1162	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
1161	>	if (!IsDirectMode(mode)) {
1162	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1163		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1164		}
1165	+	XSync(x_display, false);
1166
1167	<	// Set VideoMonitor
1168	<	int bytes_per_row = (v_width + 7) & ~7;
1169	<	switch (depth) {
719	<	case 1:
720	<	bytes_per_row /= 8;
721	<	break;
722	<	case 15:
723	<	case 16:
724	<	bytes_per_row *= 2;
725	<	break;
726	<	case 24:
727	<	case 32:
728	<	bytes_per_row *= 4;
729	<	break;
730	<	}
731	<
1167	>	// Init blitting routines
1168	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1169	>	#if VIDEO_VOSF
1170		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1171	<	// If the blit function is null, i.e. just a copy of the buffer,
1172	<	// we first try to avoid the allocation of a temporary frame buffer
1173	<	use_vosf = true;
736	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
737	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
738	<	use_vosf = false;
1171	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1172	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1173	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1174
1175		if (use_vosf) {
1176	<	the_host_buffer = the_buffer;
1177	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1178	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1179	<	memset(the_buffer_copy, 0, the_buffer_size);
1180	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
746	<	memset(the_buffer, 0, the_buffer_size);
1176	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1177	>	the_host_buffer = the_buffer;
1178	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1179	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1180	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1181		}
1182	<	#elif defined(ENABLE_VOSF)
749	<	// The UAE memory handlers will already handle color conversion, if needed.
1182	>	#else
1183		use_vosf = false;
1184		#endif
1185	+	#endif
1186
1187	<	set_video_monitor(width, height, bytes_per_row, true);
1188	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1189	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1190	<	// MacFrameLayout = FLAYOUT_DIRECT;
1191	<	#else
1192	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1187	>	// Set VideoMonitor
1188	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1189	>	VideoMonitor.mode = mode;
1190	>	set_mac_frame_buffer(mode.depth, true);
1191	>
1192	>	// Everything went well
1193	>	init_ok = true;
1194	>	}
1195	>
1196	>	// Close display
1197	>	driver_xf86dga::~driver_xf86dga()
1198	>	{
1199	>	XF86DGADirectVideo(x_display, screen, 0);
1200	>	if (!use_vosf) {
1201	>	// don't free() the screen buffer in driver_base dtor
1202	>	the_buffer = NULL;
1203	>	}
1204	>	#ifdef ENABLE_VOSF
1205	>	else {
1206	>	// don't free() the screen buffer in driver_base dtor
1207	>	the_host_buffer = NULL;
1208	>
1209	>	if (the_buffer_copy != VM_MAP_FAILED) {
1210	>	vm_release(the_buffer_copy, the_buffer_size);
1211	>	the_buffer_copy = NULL;
1212	>	}
1213	>	if (the_buffer != VM_MAP_FAILED) {
1214	>	vm_release(the_buffer, the_buffer_size);
1215	>	the_buffer = NULL;
1216	>	}
1217	>	}
1218		#endif
1219	<	return true;
1220	<	#else
1221	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
763	<	return false;
1219	>	#ifdef ENABLE_XF86_VIDMODE
1220	>	if (has_vidmode)
1221	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1222		#endif
1223		}
1224
1225	+	// Palette has changed
1226	+	void driver_xf86dga::update_palette(void)
1227	+	{
1228	+	driver_dga::update_palette();
1229	+	current_dga_cmap ^= 1;
1230	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
1231	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1232	+	}
1233	+
1234	+	// Resume emulation
1235	+	void driver_xf86dga::resume(void)
1236	+	{
1237	+	driver_dga::resume();
1238	+	if (!IsDirectMode(VideoMonitor.mode))
1239	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1240	+	}
1241	+	#endif
1242	+
1243	+
1244	+	/*
1245	+	* Initialization
1246	+	*/
1247	+
1248		// Init keycode translation table
1249		static void keycode_init(void)
1250		{
#	Line 829 \| Line 1310 \| static void keycode_init(void)
1310		}
1311		}
1312
1313	<	bool VideoInitBuffer()
1313	>	// Open display for specified mode
1314	>	static bool video_open(const video_mode &mode)
1315		{
1316	<	#ifdef ENABLE_VOSF
1317	<	if (use_vosf) {
1318	<	const uint32 page_size = getpagesize();
1319	<	const uint32 page_mask = page_size - 1;
1320	<
839	<	mainBuffer.memBase = (uint32) the_buffer;
840	<	// Align the frame buffer on page boundary
841	<	mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
842	<	mainBuffer.memLength = the_buffer_size;
843	<	mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength;
1316	>	// Find best available X visual
1317	>	if (!find_visual_for_depth(mode.depth)) {
1318	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1319	>	return false;
1320	>	}
1321
1322	<	mainBuffer.pageSize = page_size;
1323	<	mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
1324	<	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
1322	>	// Create color maps
1323	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1324	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1325	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1326	>	}
1327
1328	<	if (mainBuffer.dirtyPages != 0)
1329	<	free(mainBuffer.dirtyPages);
1328	>	// Find pixel format of direct modes
1329	>	if (color_class == DirectColor \|\| color_class == TrueColor) {
1330	>	rshift = gshift = bshift = 0;
1331	>	rloss = gloss = bloss = 8;
1332	>	uint32 mask;
1333	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1334	>	++rshift;
1335	>	for (; mask&1; mask>>=1)
1336	>	--rloss;
1337	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1338	>	++gshift;
1339	>	for (; mask&1; mask>>=1)
1340	>	--gloss;
1341	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1342	>	++bshift;
1343	>	for (; mask&1; mask>>=1)
1344	>	--bloss;
1345	>	}
1346	>
1347	>	// Preset palette pixel values for gamma table
1348	>	if (color_class == DirectColor) {
1349	>	int num = vis->map_entries;
1350	>	for (int i=0; i<num; i++) {
1351	>	int c = (i * 256) / num;
1352	>	palette[i].pixel = map_rgb(c, c, c);
1353	>	}
1354	>	}
1355
1356	<	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
1356	>	// Load gray ramp to color map
1357	>	int num = (color_class == DirectColor ? vis->map_entries : 256);
1358	>	for (int i=0; i<num; i++) {
1359	>	int c = (i * 256) / num;
1360	>	palette[i].red = c * 0x0101;
1361	>	palette[i].green = c * 0x0101;
1362	>	palette[i].blue = c * 0x0101;
1363	>	if (color_class == PseudoColor)
1364	>	palette[i].pixel = i;
1365	>	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1366	>	}
1367	>	if (cmap[0] && cmap[1]) {
1368	>	XStoreColors(x_display, cmap[0], palette, num);
1369	>	XStoreColors(x_display, cmap[1], palette, num);
1370	>	}
1371
1372	<	if (mainBuffer.pageInfo != 0)
1373	<	free(mainBuffer.pageInfo);
1372	>	#ifdef ENABLE_VOSF
1373	>	// Load gray ramp to 8->16/32 expand map
1374	>	if (!IsDirectMode(mode) && (color_class == TrueColor \|\| color_class == DirectColor))
1375	>	for (int i=0; i<256; i++)
1376	>	ExpandMap[i] = map_rgb(i, i, i);
1377	>	#endif
1378
1379	<	mainBuffer.pageInfo = (ScreenPageInfo ) malloc(mainBuffer.pageCount sizeof(ScreenPageInfo));
1379	>	// Create display driver object of requested type
1380	>	switch (display_type) {
1381	>	case DISPLAY_WINDOW:
1382	>	drv = new driver_window(mode);
1383	>	break;
1384	>	#ifdef ENABLE_FBDEV_DGA
1385	>	case DISPLAY_DGA:
1386	>	drv = new driver_fbdev(mode);
1387	>	break;
1388	>	#endif
1389	>	#ifdef ENABLE_XF86_DGA
1390	>	case DISPLAY_DGA:
1391	>	drv = new driver_xf86dga(mode);
1392	>	break;
1393	>	#endif
1394	>	}
1395	>	if (drv == NULL)
1396	>	return false;
1397	>	if (!drv->init_ok) {
1398	>	delete drv;
1399	>	drv = NULL;
1400	>	return false;
1401	>	}
1402
1403	<	if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
1404	<	return false;
1403	>	#ifdef ENABLE_VOSF
1404	>	if (use_vosf) {
1405	>	// Initialize the VOSF system
1406	>	if (!video_vosf_init()) {
1407	>	ErrorAlert(STR_VOSF_INIT_ERR);
1408	>	return false;
1409	>	}
1410	>	}
1411	>	#endif
1412	>
1413	>	// Initialize VideoRefresh function
1414	>	VideoRefreshInit();
1415
1416	<	PFLAG_CLEAR_ALL;
1416	>	// Lock down frame buffer
1417	>	XSync(x_display, false);
1418	>	LOCK_FRAME_BUFFER;
1419
1420	<	uint32 a = 0;
1421	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
1422	<	int y1 = a / VideoMonitor.bytes_per_row;
1423	<	if (y1 >= VideoMonitor.y)
1424	<	y1 = VideoMonitor.y - 1;
1425	<
1426	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
871	<	if (y2 >= VideoMonitor.y)
872	<	y2 = VideoMonitor.y - 1;
873	<
874	<	mainBuffer.pageInfo[i].top = y1;
875	<	mainBuffer.pageInfo[i].bottom = y2;
876	<
877	<	a += mainBuffer.pageSize;
878	<	if (a > mainBuffer.memLength)
879	<	a = mainBuffer.memLength;
880	<	}
881	<
882	<	// We can now write-protect the frame buffer
883	<	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
884	<	return false;
1420	>	// Start redraw/input thread
1421	>	#ifdef HAVE_PTHREADS
1422	>	redraw_thread_cancel = false;
1423	>	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1424	>	if (!redraw_thread_active) {
1425	>	printf("FATAL: cannot create redraw thread\n");
1426	>	return false;
1427		}
1428	+	#else
1429	+	redraw_thread_active = true;
1430		#endif
1431	+
1432		return true;
1433		}
1434
1435		bool VideoInit(bool classic)
1436		{
1437	+	classic_mode = classic;
1438	+
1439		#ifdef ENABLE_VOSF
893	–	// Open /dev/zero
894	–	zero_fd = open("/dev/zero", O_RDWR);
895	–	if (zero_fd < 0) {
896	–	char str[256];
897	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
898	–	ErrorAlert(str);
899	–	return false;
900	–	}
901	–
1440		// Zero the mainBuffer structure
1441	<	mainBuffer.dirtyPages = 0;
1442	<	mainBuffer.pageInfo = 0;
1441	>	mainBuffer.dirtyPages = NULL;
1442	>	mainBuffer.pageInfo = NULL;
1443		#endif
1444
1445		// Check if X server runs on local machine
#	Line 912 \| Line 1450 \| bool VideoInit(bool classic)
1450		keycode_init();
1451
1452		// Read prefs
1453	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1454	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1453	>	frame_skip = PrefsFindInt32("frameskip");
1454	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1455	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1456
1457		// Find screen and root window
1458		screen = XDefaultScreen(x_display);
1459		rootwin = XRootWindow(x_display, screen);
1460	<
1461	<	// Get screen depth
1462	<	xdepth = DefaultDepth(x_display, screen);
1460	>
1461	>	// Get sorted list of available depths
1462	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1463	>	if (avail_depths == NULL) {
1464	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1465	>	return false;
1466	>	}
1467	>	sort(avail_depths, avail_depths + num_depths);
1468
1469		#ifdef ENABLE_FBDEV_DGA
1470		// Frame buffer name
1471		char fb_name[20];
1472
1473	<	// Could do fbdev dga ?
1473	>	// Could do fbdev DGA?
1474		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1475		has_dga = true;
1476		else
#	Line 960 \| Line 1504 \| bool VideoInit(bool classic)
1504		black_pixel = BlackPixel(x_display, screen);
1505		white_pixel = WhitePixel(x_display, screen);
1506
963	–	// Get appropriate visual
964	–	int color_class;
965	–	switch (xdepth) {
966	–	case 1:
967	–	color_class = StaticGray;
968	–	break;
969	–	case 8:
970	–	color_class = PseudoColor;
971	–	break;
972	–	case 15:
973	–	case 16:
974	–	case 24:
975	–	case 32:
976	–	color_class = TrueColor;
977	–	break;
978	–	default:
979	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
980	–	return false;
981	–	}
982	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
983	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
984	–	return false;
985	–	}
986	–	if (visualInfo.depth != xdepth) {
987	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
988	–	return false;
989	–	}
990	–	vis = visualInfo.visual;
991	–
992	–	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
993	–	classic_mode = classic;
994	–	if (classic)
995	–	depth = 1;
996	–	else
997	–	depth = xdepth;
998	–
999	–	// Create color maps for 8 bit mode
1000	–	if (depth == 8) {
1001	–	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1002	–	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1003	–	XInstallColormap(x_display, cmap[0]);
1004	–	XInstallColormap(x_display, cmap[1]);
1005	–	}
1006	–
1507		// Get screen mode from preferences
1508		const char *mode_str;
1509	<	if (classic)
1509	>	if (classic_mode)
1510		mode_str = "win/512/342";
1511		else
1512		mode_str = PrefsFindString("screen");
1513
1514	<	// Determine type and mode
1515	<	int width = 512, height = 384;
1514	>	// Determine display type and default dimensions
1515	>	int default_width = 512, default_height = 384;
1516		display_type = DISPLAY_WINDOW;
1517		if (mode_str) {
1518	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1518	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1519		display_type = DISPLAY_WINDOW;
1520		#ifdef ENABLE_FBDEV_DGA
1521	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1522	<	#else
1523	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1521	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1522	>	display_type = DISPLAY_DGA;
1523	>	default_width = -1; default_height = -1; // use entire screen
1524		#endif
1525	+	#ifdef ENABLE_XF86_DGA
1526	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1527		display_type = DISPLAY_DGA;
1528	<	if (width > DisplayWidth(x_display, screen))
1529	<	width = DisplayWidth(x_display, screen);
1028	<	if (height > DisplayHeight(x_display, screen))
1029	<	height = DisplayHeight(x_display, screen);
1030	<	}
1031	<	if (width <= 0)
1032	<	width = DisplayWidth(x_display, screen);
1033	<	if (height <= 0)
1034	<	height = DisplayHeight(x_display, screen);
1528	>	#endif
1529	>	}
1530		}
1531	<
1532	<	// Initialize according to display type
1533	<	switch (display_type) {
1534	<	case DISPLAY_WINDOW:
1535	<	if (!init_window(width, height))
1536	<	return false;
1531	>	if (default_width <= 0)
1532	>	default_width = DisplayWidth(x_display, screen);
1533	>	else if (default_width > DisplayWidth(x_display, screen))
1534	>	default_width = DisplayWidth(x_display, screen);
1535	>	if (default_height <= 0)
1536	>	default_height = DisplayHeight(x_display, screen);
1537	>	else if (default_height > DisplayHeight(x_display, screen))
1538	>	default_height = DisplayHeight(x_display, screen);
1539	>
1540	>	// Mac screen depth follows X depth
1541	>	video_depth default_depth = VDEPTH_1BIT;
1542	>	switch (DefaultDepth(x_display, screen)) {
1543	>	case 8:
1544	>	default_depth = VDEPTH_8BIT;
1545		break;
1546	<	case DISPLAY_DGA:
1547	<	#ifdef ENABLE_FBDEV_DGA
1548	<	if (!init_fbdev_dga(fb_name))
1549	<	#else
1550	<	if (!init_xf86_dga(width, height))
1048	<	#endif
1049	<	return false;
1546	>	case 15: case 16:
1547	>	default_depth = VDEPTH_16BIT;
1548	>	break;
1549	>	case 24: case 32:
1550	>	default_depth = VDEPTH_32BIT;
1551		break;
1552		}
1553
1554	<	#ifdef HAVE_PTHREADS
1555	<	// Lock down frame buffer
1556	<	pthread_mutex_lock(&frame_buffer_lock);
1557	<	#endif
1558	<
1559	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1560	<	// Set variables for UAE memory mapping
1561	<	MacFrameBaseHost = the_buffer;
1562	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1062	<
1063	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1064	<	if (classic)
1065	<	MacFrameLayout = FLAYOUT_NONE;
1066	<	#endif
1067	<
1068	<	#ifdef ENABLE_VOSF
1069	<	if (use_vosf) {
1070	<	// Initialize the mainBuffer structure
1071	<	if (!VideoInitBuffer()) {
1072	<	// TODO: STR_VOSF_INIT_ERR ?
1073	<	ErrorAlert("Could not initialize Video on SEGV signals");
1074	<	return false;
1554	>	// Construct list of supported modes
1555	>	if (display_type == DISPLAY_WINDOW) {
1556	>	if (classic)
1557	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1558	>	else {
1559	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1560	>	if (find_visual_for_depth(video_depth(d)))
1561	>	add_window_modes(video_depth(d));
1562	>	}
1563		}
1564	+	} else
1565	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1566	+	if (VideoModes.empty()) {
1567	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1568	+	return false;
1569	+	}
1570	+	video_init_depth_list();
1571
1572	<	// Initialize the handler for SIGSEGV
1573	<	if (!Screen_fault_handler_init()) {
1574	<	// TODO: STR_VOSF_INIT_ERR ?
1575	<	ErrorAlert("Could not initialize Video on SEGV signals");
1576	<	return false;
1577	<	}
1572	>	#if DEBUG
1573	>	D(bug("Available video modes:\n"));
1574	>	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1575	>	while (i != end) {
1576	>	int bits = 1 << i->depth;
1577	>	if (bits == 16)
1578	>	bits = 15;
1579	>	else if (bits == 32)
1580	>	bits = 24;
1581	>	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1582	>	++i;
1583		}
1584		#endif
1085	–
1086	–	// Initialize VideoRefresh function
1087	–	VideoRefreshInit();
1088	–
1089	–	XSync(x_display, false);
1585
1586	<	#ifdef HAVE_PTHREADS
1587	<	// Start redraw/input thread
1588	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1589	<	if (!redraw_thread_active) {
1590	<	printf("FATAL: cannot create redraw thread\n");
1591	<	return false;
1586	>	// Find requested default mode and open display
1587	>	if (VideoModes.size() == 1)
1588	>	return video_open(VideoModes[0]);
1589	>	else {
1590	>	// Find mode with specified dimensions
1591	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1592	>	for (i = VideoModes.begin(); i != end; ++i) {
1593	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1594	>	return video_open(*i);
1595	>	}
1596	>	return video_open(VideoModes[0]);
1597		}
1098	–	#endif
1099	–	return true;
1598		}
1599
1600
#	Line 1104 \| Line 1602 \| bool VideoInit(bool classic)
1602		* Deinitialization
1603		*/
1604
1605	<	void VideoExit(void)
1605	>	// Close display
1606	>	static void video_close(void)
1607		{
1109	–	#ifdef HAVE_PTHREADS
1608		// Stop redraw thread
1609	+	#ifdef HAVE_PTHREADS
1610		if (redraw_thread_active) {
1611		redraw_thread_cancel = true;
1612		#ifdef HAVE_PTHREAD_CANCEL
1613		pthread_cancel(redraw_thread);
1614		#endif
1615		pthread_join(redraw_thread, NULL);
1117	–	redraw_thread_active = false;
1616		}
1617		#endif
1618	+	redraw_thread_active = false;
1619
1121	–	#ifdef HAVE_PTHREADS
1620		// Unlock frame buffer
1621	<	pthread_mutex_unlock(&frame_buffer_lock);
1621	>	UNLOCK_FRAME_BUFFER;
1622	>	XSync(x_display, false);
1623	>
1624	>	#ifdef ENABLE_VOSF
1625	>	if (use_vosf) {
1626	>	// Deinitialize VOSF
1627	>	video_vosf_exit();
1628	>	}
1629		#endif
1630
1631	<	// Close window and server connection
1632	<	if (x_display != NULL) {
1633	<	XSync(x_display, false);
1631	>	// Close display
1632	>	delete drv;
1633	>	drv = NULL;
1634
1635	<	#ifdef ENABLE_XF86_DGA
1636	<	if (display_type == DISPLAY_DGA) {
1637	<	XF86DGADirectVideo(x_display, screen, 0);
1638	<	XUngrabPointer(x_display, CurrentTime);
1639	<	XUngrabKeyboard(x_display, CurrentTime);
1640	<	}
1641	<	#endif
1635	>	// Free colormaps
1636	>	if (cmap[0]) {
1637	>	XFreeColormap(x_display, cmap[0]);
1638	>	cmap[0] = 0;
1639	>	}
1640	>	if (cmap[1]) {
1641	>	XFreeColormap(x_display, cmap[1]);
1642	>	cmap[1] = 0;
1643	>	}
1644	>	}
1645	>
1646	>	void VideoExit(void)
1647	>	{
1648	>	// Close display
1649	>	video_close();
1650
1651		#ifdef ENABLE_XF86_VIDMODE
1652	<	if (has_vidmode && display_type == DISPLAY_DGA)
1653	<	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1652	>	// Free video mode list
1653	>	if (x_video_modes) {
1654	>	XFree(x_video_modes);
1655	>	x_video_modes = NULL;
1656	>	}
1657		#endif
1658
1659		#ifdef ENABLE_FBDEV_DGA
1660	<	if (display_type == DISPLAY_DGA) {
1661	<	XUngrabPointer(x_display, CurrentTime);
1662	<	XUngrabKeyboard(x_display, CurrentTime);
1663	<	close(fbdev_fd);
1148	<	}
1149	<	#endif
1150	<
1151	<	XFlush(x_display);
1152	<	XSync(x_display, false);
1153	<	if (depth == 8) {
1154	<	XFreeColormap(x_display, cmap[0]);
1155	<	XFreeColormap(x_display, cmap[1]);
1156	<	}
1157	<
1158	<	if (!use_vosf) {
1159	<	if (the_buffer) {
1160	<	free(the_buffer);
1161	<	the_buffer = NULL;
1162	<	}
1163	<
1164	<	if (!have_shm && the_buffer_copy) {
1165	<	free(the_buffer_copy);
1166	<	the_buffer_copy = NULL;
1167	<	}
1168	<	}
1169	<	#ifdef ENABLE_VOSF
1170	<	else {
1171	<	if (the_buffer != (uint8 *)MAP_FAILED) {
1172	<	munmap((caddr_t)the_buffer, the_buffer_size);
1173	<	the_buffer = 0;
1174	<	}
1175	<
1176	<	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1177	<	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1178	<	the_buffer_copy = 0;
1179	<	}
1180	<	}
1181	<	#endif
1660	>	// Close framebuffer device
1661	>	if (fbdev_fd >= 0) {
1662	>	close(fbdev_fd);
1663	>	fbdev_fd = -1;
1664		}
1665	<
1184	<	#ifdef ENABLE_VOSF
1185	<	if (use_vosf) {
1186	<	// Clear mainBuffer data
1187	<	if (mainBuffer.pageInfo) {
1188	<	free(mainBuffer.pageInfo);
1189	<	mainBuffer.pageInfo = 0;
1190	<	}
1665	>	#endif
1666
1667	<	if (mainBuffer.dirtyPages) {
1668	<	free(mainBuffer.dirtyPages);
1669	<	mainBuffer.dirtyPages = 0;
1670	<	}
1667	>	// Free depth list
1668	>	if (avail_depths) {
1669	>	XFree(avail_depths);
1670	>	avail_depths = NULL;
1671		}
1197	–
1198	–	// Close /dev/zero
1199	–	if (zero_fd > 0)
1200	–	close(zero_fd);
1201	–	#endif
1672		}
1673
1674
#	Line 1209 \| Line 1679 \| void VideoExit(void)
1679		void VideoQuitFullScreen(void)
1680		{
1681		D(bug("VideoQuitFullScreen()\n"));
1682	<	if (display_type == DISPLAY_DGA)
1213	<	quit_full_screen = true;
1682	>	quit_full_screen = true;
1683		}
1684
1685
#	Line 1224 \| Line 1693 \| void VideoInterrupt(void)
1693		if (emerg_quit)
1694		QuitEmulator();
1695
1227	–	#ifdef HAVE_PTHREADS
1696		// Temporarily give up frame buffer lock (this is the point where
1697		// we are suspended when the user presses Ctrl-Tab)
1698	<	pthread_mutex_unlock(&frame_buffer_lock);
1699	<	pthread_mutex_lock(&frame_buffer_lock);
1232	<	#endif
1698	>	UNLOCK_FRAME_BUFFER;
1699	>	LOCK_FRAME_BUFFER;
1700		}
1701
1702
#	Line 1237 \| Line 1704 \| void VideoInterrupt(void)
1704		* Set palette
1705		*/
1706
1707	<	void video_set_palette(uint8 *pal)
1707	>	void video_set_palette(uint8 *pal, int num_in)
1708		{
1709	<	#ifdef HAVE_PTHREDS
1243	<	pthread_mutex_lock(&palette_lock);
1244	<	#endif
1709	>	LOCK_PALETTE;
1710
1711		// Convert colors to XColor array
1712	<	for (int i=0; i<256; i++) {
1713	<	palette[i].pixel = i;
1714	<	palette[i].red = pal[i3] 0x0101;
1715	<	palette[i].green = pal[i3+1] 0x0101;
1716	<	palette[i].blue = pal[i3+2] 0x0101;
1717	<	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1712	>	int num_out = 256;
1713	>	bool stretch = false;
1714	>	if (IsDirectMode(VideoMonitor.mode)) {
1715	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1716	>	num_out = vis->map_entries;
1717	>	stretch = true;
1718	>	}
1719	>	XColor *p = palette;
1720	>	for (int i=0; i<num_out; i++) {
1721	>	int c = (stretch ? (i * num_in) / num_out : i);
1722	>	p->red = pal[c3 + 0] 0x0101;
1723	>	p->green = pal[c3 + 1] 0x0101;
1724	>	p->blue = pal[c3 + 2] 0x0101;
1725	>	if (color_class == PseudoColor)
1726	>	p->pixel = i;
1727	>	p->flags = DoRed \| DoGreen \| DoBlue;
1728	>	p++;
1729	>	}
1730	>
1731	>	#ifdef ENABLE_VOSF
1732	>	// Recalculate pixel color expansion map
1733	>	if (!IsDirectMode(VideoMonitor.mode) && (color_class == TrueColor \|\| color_class == DirectColor)) {
1734	>	for (int i=0; i<256; i++) {
1735	>	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1736	>	ExpandMap[i] = map_rgb(pal[c3+0], pal[c3+1], pal[c*3+2]);
1737	>	}
1738	>
1739	>	// We have to redraw everything because the interpretation of pixel values changed
1740	>	LOCK_VOSF;
1741	>	PFLAG_SET_ALL;
1742	>	UNLOCK_VOSF;
1743	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1744		}
1745	+	#endif
1746
1747		// Tell redraw thread to change palette
1748		palette_changed = true;
1749
1750	<	#ifdef HAVE_PTHREADS
1259	<	pthread_mutex_unlock(&palette_lock);
1260	<	#endif
1750	>	UNLOCK_PALETTE;
1751		}
1752
1753
1754		/*
1755	<	* Suspend/resume emulator
1755	>	* Switch video mode
1756		*/
1757
1758	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1269	<	static void suspend_emul(void)
1758	>	void video_switch_to_mode(const video_mode &mode)
1759		{
1760	<	if (display_type == DISPLAY_DGA) {
1761	<	// Release ctrl key
1762	<	ADBKeyUp(0x36);
1274	<	ctrl_down = false;
1275	<
1276	<	#ifdef HAVE_PTHREADS
1277	<	// Lock frame buffer (this will stop the MacOS thread)
1278	<	pthread_mutex_lock(&frame_buffer_lock);
1279	<	#endif
1280	<
1281	<	// Save frame buffer
1282	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1283	<	if (fb_save)
1284	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1760	>	// Close and reopen display
1761	>	video_close();
1762	>	video_open(mode);
1763
1764	<	// Close full screen display
1765	<	#ifdef ENABLE_XF86_DGA
1766	<	XF86DGADirectVideo(x_display, screen, 0);
1289	<	#endif
1290	<	XUngrabPointer(x_display, CurrentTime);
1291	<	XUngrabKeyboard(x_display, CurrentTime);
1292	<	XUnmapWindow(x_display, the_win);
1293	<	XSync(x_display, false);
1294	<
1295	<	// Open "suspend" window
1296	<	XSetWindowAttributes wattr;
1297	<	wattr.event_mask = KeyPressMask;
1298	<	wattr.background_pixel = black_pixel;
1299	<	wattr.border_pixel = black_pixel;
1300	<	wattr.backing_store = Always;
1301	<	wattr.backing_planes = xdepth;
1302	<	wattr.colormap = DefaultColormap(x_display, screen);
1303	<
1304	<	XSync(x_display, false);
1305	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1306	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
1307	<	CWBackingStore \| CWBackingPlanes \| (xdepth == 8 ? CWColormap : 0), &wattr);
1308	<	XSync(x_display, false);
1309	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1310	<	XMapRaised(x_display, suspend_win);
1311	<	XSync(x_display, false);
1312	<	emul_suspended = true;
1313	<	}
1314	<	}
1315	<
1316	<	static void resume_emul(void)
1317	<	{
1318	<	// Close "suspend" window
1319	<	XDestroyWindow(x_display, suspend_win);
1320	<	XSync(x_display, false);
1321	<
1322	<	// Reopen full screen display
1323	<	XMapRaised(x_display, the_win);
1324	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1325	<	XSync(x_display, false);
1326	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1327	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1328	<	#ifdef ENABLE_XF86_DGA
1329	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
1330	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1331	<	#endif
1332	<	XSync(x_display, false);
1333	<
1334	<	// the_buffer already contains the data to restore. i.e. since a temporary
1335	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1336	<	// not necessary.
1337	<	#ifdef ENABLE_VOSF
1338	<	if (use_vosf) {
1339	<	#ifdef HAVE_PTHREADS
1340	<	pthread_mutex_lock(&Screen_draw_lock);
1341	<	#endif
1342	<	PFLAG_SET_ALL;
1343	<	#ifdef HAVE_PTHREADS
1344	<	pthread_mutex_unlock(&Screen_draw_lock);
1345	<	#endif
1346	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1347	<	}
1348	<	#endif
1349	<
1350	<	// Restore frame buffer
1351	<	if (fb_save) {
1352	<	#ifdef ENABLE_VOSF
1353	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1354	<	if (!use_vosf)
1355	<	#endif
1356	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1357	<	free(fb_save);
1358	<	fb_save = NULL;
1764	>	if (drv == NULL) {
1765	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1766	>	QuitEmulator();
1767		}
1360	–
1361	–	#ifdef ENABLE_XF86_DGA
1362	–	if (depth == 8)
1363	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1364	–	#endif
1365	–
1366	–	#ifdef HAVE_PTHREADS
1367	–	// Unlock frame buffer (and continue MacOS thread)
1368	–	pthread_mutex_unlock(&frame_buffer_lock);
1369	–	emul_suspended = false;
1370	–	#endif
1768		}
1372	–	#endif
1769
1770
1771		/*
1772	<	* Translate key event to Mac keycode
1772	>	* Translate key event to Mac keycode, returns -1 if no keycode was found
1773	>	* and -2 if the key was recognized as a hotkey
1774		*/
1775
1776	<	static int kc_decode(KeySym ks)
1776	>	static int kc_decode(KeySym ks, bool key_down)
1777		{
1778		switch (ks) {
1779		case XK_A: case XK_a: return 0x00;
#	Line 1429 \| Line 1826 \| static int kc_decode(KeySym ks)
1826		case XK_period: case XK_greater: return 0x2f;
1827		case XK_slash: case XK_question: return 0x2c;
1828
1829	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1433	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1434	<	#else
1435	<	case XK_Tab: return 0x30;
1436	<	#endif
1829	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1830		case XK_Return: return 0x24;
1831		case XK_space: return 0x31;
1832		case XK_BackSpace: return 0x33;
#	Line 1467 \| Line 1860 \| static int kc_decode(KeySym ks)
1860		case XK_Left: return 0x3b;
1861		case XK_Right: return 0x3c;
1862
1863	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1863	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1864
1865	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1865	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1866		case XK_F2: return 0x78;
1867		case XK_F3: return 0x63;
1868		case XK_F4: return 0x76;
1869	<	case XK_F5: return 0x60;
1869	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1870		case XK_F6: return 0x61;
1871		case XK_F7: return 0x62;
1872		case XK_F8: return 0x64;
#	Line 1521 \| Line 1914 \| static int kc_decode(KeySym ks)
1914		return -1;
1915		}
1916
1917	<	static int event2keycode(XKeyEvent *ev)
1917	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1918		{
1919		KeySym ks;
1527	–	int as;
1920		int i = 0;
1921
1922		do {
1923	<	ks = XLookupKeysym(ev, i++);
1924	<	as = kc_decode(ks);
1925	<	if (as != -1)
1923	>	ks = XLookupKeysym(&ev, i++);
1924	>	int as = kc_decode(ks, key_down);
1925	>	if (as >= 0)
1926	>	return as;
1927	>	if (as == -2)
1928		return as;
1929		} while (ks != NoSymbol);
1930
#	Line 1544 \| Line 1938 \| *static int event2keycode(XKeyEvent ev)**
1938
1939		static void handle_events(void)
1940		{
1941	<	XEvent event;
1942	<	for (;;) {
1943	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1550	<	break;
1941	>	while (XPending(x_display)) {
1942	>	XEvent event;
1943	>	XNextEvent(x_display, &event);
1944
1945		switch (event.type) {
1946		// Mouse button
1947		case ButtonPress: {
1948	<	unsigned int button = ((XButtonEvent *)&event)->button;
1948	>	unsigned int button = event.xbutton.button;
1949		if (button < 4)
1950		ADBMouseDown(button - 1);
1951		else if (button < 6) { // Wheel mouse
#	Line 1571 \| Line 1964 \| static void handle_events(void)
1964		break;
1965		}
1966		case ButtonRelease: {
1967	<	unsigned int button = ((XButtonEvent *)&event)->button;
1967	>	unsigned int button = event.xbutton.button;
1968		if (button < 4)
1969		ADBMouseUp(button - 1);
1970		break;
1971		}
1972
1973		// Mouse moved
1581	–	case EnterNotify:
1582	–	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1583	–	break;
1974		case MotionNotify:
1975	<	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1975	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
1976		break;
1977
1978		// Keyboard
1979		case KeyPress: {
1980	<	int code;
1980	>	int code = -1;
1981		if (use_keycodes) {
1982	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1983	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1982	>	if (event2keycode(event.xkey, true) != -2) // This is called to process the hotkeys
1983	>	code = keycode_table[event.xkey.keycode & 0xff];
1984		} else
1985	<	code = event2keycode((XKeyEvent *)&event);
1986	<	if (code != -1) {
1985	>	code = event2keycode(event.xkey, true);
1986	>	if (code >= 0) {
1987		if (!emul_suspended) {
1988		if (code == 0x39) { // Caps Lock pressed
1989		if (caps_on) {
#	Line 1608 \| Line 1998 \| static void handle_events(void)
1998		if (code == 0x36)
1999		ctrl_down = true;
2000		} else {
1611	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2001		if (code == 0x31)
2002	<	resume_emul(); // Space wakes us up
1614	<	#endif
2002	>	drv->resume(); // Space wakes us up
2003		}
2004		}
2005		break;
2006		}
2007		case KeyRelease: {
2008	<	int code;
2008	>	int code = -1;
2009		if (use_keycodes) {
2010	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
2011	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
2010	>	if (event2keycode(event.xkey, false) != -2) // This is called to process the hotkeys
2011	>	code = keycode_table[event.xkey.keycode & 0xff];
2012		} else
2013	<	code = event2keycode((XKeyEvent *)&event);
2014	<	if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
2013	>	code = event2keycode(event.xkey, false);
2014	>	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
2015		ADBKeyUp(code);
2016		if (code == 0x36)
2017		ctrl_down = false;
#	Line 1636 \| Line 2024 \| static void handle_events(void)
2024		if (display_type == DISPLAY_WINDOW) {
2025		#ifdef ENABLE_VOSF
2026		if (use_vosf) { // VOSF refresh
2027	<	#ifdef HAVE_PTHREADS
1640	<	pthread_mutex_lock(&Screen_draw_lock);
1641	<	#endif
2027	>	LOCK_VOSF;
2028		PFLAG_SET_ALL;
2029	<	#ifdef HAVE_PTHREADS
2030	<	pthread_mutex_unlock(&Screen_draw_lock);
1645	<	#endif
1646	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2029	>	UNLOCK_VOSF;
2030	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
2031		}
2032		else
2033		#endif
#	Line 1654 \| Line 2038 \| static void handle_events(void)
2038		updt_box[x1][y1] = true;
2039		nr_boxes = 16 * 16;
2040		} else // Static refresh
2041	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2041	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
2042		}
2043		break;
2044
2045	<	case FocusIn:
2046	<	case FocusOut:
2045	>	// Window "close" widget clicked
2046	>	case ClientMessage:
2047	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
2048	>	ADBKeyDown(0x7f); // Power key
2049	>	ADBKeyUp(0x7f);
2050	>	}
2051		break;
2052		}
2053		}
#	Line 1671 \| Line 2059 \| static void handle_events(void)
2059		*/
2060
2061		// Dynamic display update (variable frame rate for each box)
2062	<	static void update_display_dynamic(int ticker)
2062	>	static void update_display_dynamic(int ticker, driver_window *drv)
2063		{
2064		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2065		int xil = 0;
2066		int rxm = 0, rxmo = 0;
2067	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2068	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2069	<	int rx = VideoMonitor.bytes_per_row / 16;
2070	<	int ry = VideoMonitor.y / 16;
2067	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2068	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2069	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
2070	>	int ry = VideoMonitor.mode.y / 16;
2071		int max_box;
2072
2073		y2s = sm_uptd[ticker % 8];
#	Line 1733 \| Line 2121 \| static void update_display_dynamic(int t
2121		i = (yi * bytes_per_row) + xi;
2122		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2123		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2124	<	if (depth == 1) {
2125	<	if (have_shm)
2126	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2124	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2125	>	if (drv->have_shm)
2126	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2127		else
2128	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2128	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2129		} else {
2130	<	if (have_shm)
2131	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2130	>	if (drv->have_shm)
2131	>	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);
2132		else
2133	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2133	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2134		}
2135		xil = 0;
2136		}
#	Line 1761 \| Line 2149 \| static void update_display_dynamic(int t
2149		}
2150
2151		// Static display update (fixed frame rate, but incremental)
2152	<	static void update_display_static(void)
2152	>	static void update_display_static(driver_window *drv)
2153		{
2154		// Incremental update code
2155		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2156	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2157	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2156	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2157	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2158		uint8 p, p2;
2159
2160		// Check for first line from top and first line from bottom that have changed
2161		y1 = 0;
2162	<	for (j=0; j<VideoMonitor.y; j++) {
2162	>	for (j=0; j<VideoMonitor.mode.y; j++) {
2163		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2164		y1 = j;
2165		break;
2166		}
2167		}
2168		y2 = y1 - 1;
2169	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
2169	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
2170		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2171		y2 = j;
2172		break;
#	Line 1788 \| Line 2176 \| static void update_display_static(void)
2176
2177		// Check for first column from left and first column from right that have changed
2178		if (high) {
2179	<	if (depth == 1) {
2180	<	x1 = VideoMonitor.x - 1;
2179	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2180	>	x1 = VideoMonitor.mode.x - 1;
2181		for (j=y1; j<=y2; j++) {
2182		p = &the_buffer[j * bytes_per_row];
2183		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1807 \| Line 2195 \| static void update_display_static(void)
2195		p2 = &the_buffer_copy[j * bytes_per_row];
2196		p += bytes_per_row;
2197		p2 += bytes_per_row;
2198	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
2198	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
2199		p--; p2--;
2200		if (p != p2) {
2201		x2 = (i << 3) + 7;
#	Line 1826 \| Line 2214 \| static void update_display_static(void)
2214		}
2215
2216		} else {
2217	<	x1 = VideoMonitor.x;
2217	>	x1 = VideoMonitor.mode.x;
2218		for (j=y1; j<=y2; j++) {
2219		p = &the_buffer[j * bytes_per_row];
2220		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1844 \| Line 2232 \| static void update_display_static(void)
2232		p2 = &the_buffer_copy[j * bytes_per_row];
2233		p += bytes_per_row;
2234		p2 += bytes_per_row;
2235	<	for (i=VideoMonitor.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2235	>	for (i=VideoMonitor.mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2236		p--;
2237		p2--;
2238		if (p != p2) {
#	Line 1867 \| Line 2255 \| static void update_display_static(void)
2255
2256		// Refresh display
2257		if (high && wide) {
2258	<	if (have_shm)
2259	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2258	>	if (drv->have_shm)
2259	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2260		else
2261	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2261	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2262		}
2263		}
2264
#	Line 1879 \| Line 2267 \| static void update_display_static(void)
2267		* Screen refresh functions
2268		*/
2269
2270	<	// The specialisations hereunder are meant to enable VOSF with DGA in direct
2271	<	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
2272	<	// not get mapped correctly with respect to the predetermined host frame
2273	<	// buffer base address.
2274	<	//
1887	<	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1888	<	// we first try to "triple allocate" the address spaces according to the real
1889	<	// host frame buffer address. Then, if it fails, we will use a temporary
1890	<	// frame buffer thus making the real host frame buffer updated when pages
1891	<	// of the temp frame buffer are altered.
1892	<	//
1893	<	// As a side effect, a little speed gain in screen updates could be noticed
1894	<	// for other modes than DGA.
1895	<	//
1896	<	// The following two functions below are inline so that a clever compiler
1897	<	// could specialise the code according to the current screen depth and
1898	<	// display type. A more clever compiler would the job by itself though...
1899	<	// (update_display_vosf is inlined as well)
2270	>	// We suggest the compiler to inline the next two functions so that it
2271	>	// may specialise the code according to the current screen depth and
2272	>	// display type. A clever compiler would do that job by itself though...
2273	>
2274	>	// NOTE: update_display_vosf is inlined too
2275
2276		static inline void possibly_quit_dga_mode()
2277		{
2278	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2279	<	// Quit DGA mode if requested
2278	>	// Quit DGA mode if requested (something terrible has happened and we
2279	>	// want to give control back to the user)
2280		if (quit_full_screen) {
2281		quit_full_screen = false;
2282	<	#ifdef ENABLE_XF86_DGA
2283	<	XF86DGADirectVideo(x_display, screen, 0);
1909	<	#endif
1910	<	XUngrabPointer(x_display, CurrentTime);
1911	<	XUngrabKeyboard(x_display, CurrentTime);
1912	<	XUnmapWindow(x_display, the_win);
1913	<	XSync(x_display, false);
2282	>	delete drv;
2283	>	drv = NULL;
2284		}
1915	–	#endif
2285		}
2286
2287	<	static inline void handle_palette_changes(int depth, int display_type)
2287	>	static inline void possibly_ungrab_mouse()
2288		{
2289	<	#ifdef HAVE_PTHREADS
2290	<	pthread_mutex_lock(&palette_lock);
2291	<	#endif
2289	>	// Ungrab mouse if requested (something terrible has happened and we
2290	>	// want to give control back to the user)
2291	>	if (quit_full_screen) {
2292	>	quit_full_screen = false;
2293	>	if (drv)
2294	>	drv->ungrab_mouse();
2295	>	}
2296	>	}
2297	>
2298	>	static inline void handle_palette_changes(void)
2299	>	{
2300	>	LOCK_PALETTE;
2301	>
2302		if (palette_changed) {
2303		palette_changed = false;
2304	<	if (depth == 8) {
1926	<	XStoreColors(x_display, cmap[0], palette, 256);
1927	<	XStoreColors(x_display, cmap[1], palette, 256);
1928	<
1929	<	#ifdef ENABLE_XF86_DGA
1930	<	if (display_type == DISPLAY_DGA) {
1931	<	current_dga_cmap ^= 1;
1932	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1933	<	}
1934	<	#endif
1935	<	}
2304	>	drv->update_palette();
2305		}
2306	<	#ifdef HAVE_PTHREADS
2307	<	pthread_mutex_unlock(&palette_lock);
1939	<	#endif
2306	>
2307	>	UNLOCK_PALETTE;
2308		}
2309
2310		static void video_refresh_dga(void)
#	Line 1948 \| Line 2316 \| static void video_refresh_dga(void)
2316		handle_events();
2317
2318		// Handle palette changes
2319	<	handle_palette_changes(depth, DISPLAY_DGA);
2319	>	handle_palette_changes();
2320		}
2321
2322		#ifdef ENABLE_VOSF
#	Line 1962 \| Line 2330 \| static void video_refresh_dga_vosf(void)
2330		handle_events();
2331
2332		// Handle palette changes
2333	<	handle_palette_changes(depth, DISPLAY_DGA);
2333	>	handle_palette_changes();
2334
2335		// Update display (VOSF variant)
2336		static int tick_counter = 0;
2337		if (++tick_counter >= frame_skip) {
2338		tick_counter = 0;
2339	<	#ifdef HAVE_PTHREADS
2340	<	pthread_mutex_lock(&Screen_draw_lock);
2341	<	#endif
2342	<	update_display_dga_vosf();
2343	<	#ifdef HAVE_PTHREADS
1976	<	pthread_mutex_unlock(&Screen_draw_lock);
1977	<	#endif
2339	>	if (mainBuffer.dirty) {
2340	>	LOCK_VOSF;
2341	>	update_display_dga_vosf();
2342	>	UNLOCK_VOSF;
2343	>	}
2344		}
2345		}
2346		#endif
2347
2348		static void video_refresh_window_vosf(void)
2349		{
2350	<	// Quit DGA mode if requested
2351	<	possibly_quit_dga_mode();
2350	>	// Ungrab mouse if requested
2351	>	possibly_ungrab_mouse();
2352
2353		// Handle X events
2354		handle_events();
2355
2356		// Handle palette changes
2357	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2357	>	handle_palette_changes();
2358
2359		// Update display (VOSF variant)
2360		static int tick_counter = 0;
2361		if (++tick_counter >= frame_skip) {
2362		tick_counter = 0;
2363	<	#ifdef HAVE_PTHREADS
2364	<	pthread_mutex_lock(&Screen_draw_lock);
2365	<	#endif
2366	<	update_display_window_vosf();
2367	<	#ifdef HAVE_PTHREADS
2368	<	pthread_mutex_unlock(&Screen_draw_lock);
2003	<	#endif
2363	>	if (mainBuffer.dirty) {
2364	>	LOCK_VOSF;
2365	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2366	>	UNLOCK_VOSF;
2367	>	XSync(x_display, false); // Let the server catch up
2368	>	}
2369		}
2370		}
2371		#endif // def ENABLE_VOSF
2372
2373		static void video_refresh_window_static(void)
2374		{
2375	+	// Ungrab mouse if requested
2376	+	possibly_ungrab_mouse();
2377	+
2378		// Handle X events
2379		handle_events();
2380
2381		// Handle_palette changes
2382	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2382	>	handle_palette_changes();
2383
2384		// Update display (static variant)
2385		static int tick_counter = 0;
2386		if (++tick_counter >= frame_skip) {
2387		tick_counter = 0;
2388	<	update_display_static();
2388	>	update_display_static(static_cast<driver_window *>(drv));
2389		}
2390		}
2391
2392		static void video_refresh_window_dynamic(void)
2393		{
2394	+	// Ungrab mouse if requested
2395	+	possibly_ungrab_mouse();
2396	+
2397		// Handle X events
2398		handle_events();
2399
2400		// Handle_palette changes
2401	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2401	>	handle_palette_changes();
2402
2403		// Update display (dynamic variant)
2404		static int tick_counter = 0;
2405		tick_counter++;
2406	<	update_display_dynamic(tick_counter);
2406	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2407		}
2408
2409
#	Line 2040 \| Line 2411 \| static void video_refresh_window_dynamic
2411		* Thread for screen refresh, input handling etc.
2412		*/
2413
2414	<	void VideoRefreshInit(void)
2414	>	static void VideoRefreshInit(void)
2415		{
2416		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2417		if (display_type == DISPLAY_DGA) {
#	Line 2066 \| Line 2437 \| void VideoRefreshInit(void)
2437
2438		void VideoRefresh(void)
2439		{
2440	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2441	<	video_refresh();
2442	<	}
2443	<
2073	<	#if 0
2074	<	void VideoRefresh(void)
2075	<	{
2076	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2077	<	// Quit DGA mode if requested
2078	<	if (quit_full_screen) {
2079	<	quit_full_screen = false;
2080	<	if (display_type == DISPLAY_DGA) {
2081	<	#ifdef ENABLE_XF86_DGA
2082	<	XF86DGADirectVideo(x_display, screen, 0);
2083	<	#endif
2084	<	XUngrabPointer(x_display, CurrentTime);
2085	<	XUngrabKeyboard(x_display, CurrentTime);
2086	<	XUnmapWindow(x_display, the_win);
2087	<	XSync(x_display, false);
2088	<	}
2089	<	}
2090	<	#endif
2091	<
2092	<	// Handle X events
2093	<	handle_events();
2094	<
2095	<	// Handle palette changes
2096	<	#ifdef HAVE_PTHREADS
2097	<	pthread_mutex_lock(&palette_lock);
2098	<	#endif
2099	<	if (palette_changed) {
2100	<	palette_changed = false;
2101	<	if (depth == 8) {
2102	<	XStoreColors(x_display, cmap[0], palette, 256);
2103	<	XStoreColors(x_display, cmap[1], palette, 256);
2104	<
2105	<	#ifdef ENABLE_XF86_DGA
2106	<	if (display_type == DISPLAY_DGA) {
2107	<	current_dga_cmap ^= 1;
2108	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2109	<	}
2110	<	#endif
2111	<	}
2112	<	}
2113	<	#ifdef HAVE_PTHREADS
2114	<	pthread_mutex_unlock(&palette_lock);
2115	<	#endif
2116	<
2117	<	// In window mode, update display
2118	<	static int tick_counter = 0;
2119	<	if (display_type == DISPLAY_WINDOW) {
2120	<	tick_counter++;
2121	<	if (frame_skip == 0)
2122	<	update_display_dynamic(tick_counter);
2123	<	else if (tick_counter >= frame_skip) {
2124	<	tick_counter = 0;
2125	<	update_display_static();
2126	<	}
2127	<	}
2440	>	// We need to check redraw_thread_active to inhibit refreshed during
2441	>	// mode changes on non-threaded platforms
2442	>	if (redraw_thread_active)
2443	>	video_refresh();
2444		}
2129	–	#endif
2445
2446		#ifdef HAVE_PTHREADS
2447		static void redraw_func(void arg)
#	Line 2135 \| Line 2450 \| *static void redraw_func(void arg)*
2450		int64 ticks = 0;
2451		uint64 next = GetTicks_usec();
2452		while (!redraw_thread_cancel) {
2138	–	// VideoRefresh();
2453		video_refresh();
2454		next += 16667;
2455		int64 delay = next - GetTicks_usec();
#	Line 2146 \| Line 2460 \| *static void redraw_func(void arg)*
2460		ticks++;
2461		}
2462		uint64 end = GetTicks_usec();
2463	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2463	>	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2464		return NULL;
2465		}
2466		#endif

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.26 by cebix, 2000-10-27T17:01:40Z vs. Revision 1.56 by gbeauche, 2001-07-07T09:14:47Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.26 by cebix, 2000-10-27T17:01:40Z vs.
Revision 1.56 by gbeauche, 2001-07-07T09:14:47Z