[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.77 by gbeauche, 2005-03-21T23:57:34Z

#	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-2005 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		#ifdef HAVE_PTHREADS
43		# include <pthread.h>
44		#endif
#	Line 52 \| Line 55
55		# include <sys/mman.h>
56		#endif
57
55	–	#ifdef ENABLE_VOSF
56	–	# include <unistd.h>
57	–	# include <signal.h>
58	–	# include <fcntl.h>
59	–	# include <sys/mman.h>
60	–	#endif
61	–
58		#include "cpu_emulation.h"
59		#include "main.h"
60		#include "adb.h"
#	Line 66 \| Line 62
62		#include "prefs.h"
63		#include "user_strings.h"
64		#include "video.h"
65	+	#include "video_blit.h"
66
67		#define DEBUG 0
68		#include "debug.h"
69
70
71	+	// Supported video modes
72	+	static vector<video_mode> VideoModes;
73	+
74		// Display types
75		enum {
76		DISPLAY_WINDOW, // X11 window, using MIT SHM extensions if possible
#	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 \| EnterWindowMask \| 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 pthread_attr_t redraw_thread_attr; // Redraw thread attributes
101	>	static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
102	>	static volatile bool redraw_thread_cancel_ack; // Flag: Acknowledge for redraw thread cancellation
103		static pthread_t redraw_thread; // Redraw thread
104		#endif
105
106		static bool has_dga = false; // Flag: Video DGA capable
107		static bool has_vidmode = false; // Flag: VidMode extension available
108
109	+	#ifdef ENABLE_VOSF
110	+	static bool use_vosf = true; // Flag: VOSF enabled
111	+	#else
112	+	static const bool use_vosf = false; // VOSF not possible
113	+	#endif
114	+
115		static bool ctrl_down = false; // Flag: Ctrl key pressed
116		static bool caps_on = false; // Flag: Caps Lock on
117		static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread
#	Line 112 \| Line 124 \| static bool use_keycodes = false; //
124		static int keycode_table[256]; // X keycode -> Mac keycode translation table
125
126		// X11 variables
127	+	char *x_display_name = NULL; // X11 display name
128	+	Display *x_display = NULL; // X11 display handle
129		static int screen; // Screen number
130	<	static int xdepth; // Depth of X screen
131	<	static int depth; // Depth of Mac frame buffer
132	<	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
130	>	static Window rootwin; // Root window and our window
131	>	static int num_depths = 0; // Number of available X depths
132	>	static int *avail_depths = NULL; // List of available X depths
133		static XColor black, white;
134		static unsigned long black_pixel, white_pixel;
135		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;
136
137	<	static XColor palette[256]; // Color palette for 8-bit mode
138	<	static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
139	<	#ifdef HAVE_PTHREADS
140	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
141	<	#endif
137	>	static int xdepth; // Depth of X screen
138	>	static VisualFormat visualFormat;
139	>	static XVisualInfo visualInfo;
140	>	static Visual *vis;
141	>	static int color_class;
142
143	<	// 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};
143	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
144
145	<	// 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
145	>	static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them)
146
147	<	// Variables for fbdev DGA mode
148	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
149	<	static int fbdev_fd;
147	>	static XColor x_palette[256]; // Color palette to be used as CLUT and gamma table
148	>	static bool x_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
149	>
150	>	#ifdef ENABLE_FBDEV_DGA
151	>	static int fbdev_fd = -1;
152	>	#endif
153
154		#ifdef ENABLE_XF86_VIDMODE
155	<	// Variables for XF86 VidMode support
160	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
155	>	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
156		static int num_x_video_modes;
157		#endif
158
159	<	#ifdef ENABLE_VOSF
160	<	static bool use_vosf = true; // Flag: VOSF enabled
159	>	// Mutex to protect palette
160	>	#ifdef HAVE_PTHREADS
161	>	static pthread_mutex_t x_palette_lock = PTHREAD_MUTEX_INITIALIZER;
162	>	#define LOCK_PALETTE pthread_mutex_lock(&x_palette_lock)
163	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&x_palette_lock)
164		#else
165	<	static const bool use_vosf = false; // Flag: VOSF enabled
166	<	#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
165	>	#define LOCK_PALETTE
166	>	#define UNLOCK_PALETTE
167		#endif
168
169	<	#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	<
169	>	// Mutex to protect frame buffer
170		#ifdef HAVE_PTHREADS
171	<	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
171	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
172	>	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
173	>	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
174	>	#else
175	>	#define LOCK_FRAME_BUFFER
176	>	#define UNLOCK_FRAME_BUFFER
177		#endif
178
179	<	static int log_base_2(uint32 x)
180	<	{
181	<	uint32 mask = 0x80000000;
182	<	int l = 31;
183	<	while (l >= 0 && (x & mask) == 0) {
226	<	mask >>= 1;
227	<	l--;
228	<	}
229	<	return l;
230	<	}
231	<
232	<	#endif
179	>	// Variables for non-VOSF incremental refresh
180	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
181	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
182	>	static bool updt_box[17][17];
183	>	static int nr_boxes;
184
185	<	// VideoRefresh function
186	<	void VideoRefreshInit(void);
185	>	// Video refresh function
186	>	static void VideoRefreshInit(void);
187		static void (*video_refresh)(void);
188
189	+
190		// Prototypes
191		static void redraw_func(void arg);
240	–	static int event2keycode(XKeyEvent *ev);
241	–
192
193		// From main_unix.cpp
194		extern char *x_display_name;
195		extern Display *x_display;
196	+	extern void *vm_acquire_mac(size_t size);
197
198		// From sys_unix.cpp
199		extern void SysMountFirstFloppy(void);
200
201	<	#ifdef ENABLE_VOSF
202	<	# include "video_vosf.h"
203	<	#endif
201	>	// From clip_unix.cpp
202	>	extern void ClipboardSelectionClear(XSelectionClearEvent *);
203	>	extern void ClipboardSelectionRequest(XSelectionRequestEvent *);
204
205
206		/*
207	<	* Initialization
207	>	* monitor_desc subclass for X11 display
208		*/
209
210	<	// Set VideoMonitor according to video mode
211	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
210	>	class X11_monitor_desc : public monitor_desc {
211	>	public:
212	>	X11_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
213	>	~X11_monitor_desc() {}
214	>
215	>	virtual void switch_to_current_mode(void);
216	>	virtual void set_palette(uint8 *pal, int num);
217	>
218	>	bool video_open(void);
219	>	void video_close(void);
220	>	};
221	>
222	>
223	>	/*
224	>	* Utility functions
225	>	*/
226	>
227	>	// Map video_mode depth ID to numerical depth value
228	>	static inline int depth_of_video_mode(video_mode const & mode)
229		{
230	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
231	<	int layout = FLAYOUT_DIRECT;
230	>	int depth = -1;
231	>	switch (mode.depth) {
232	>	case VDEPTH_1BIT:
233	>	depth = 1;
234	>	break;
235	>	case VDEPTH_2BIT:
236	>	depth = 2;
237	>	break;
238	>	case VDEPTH_4BIT:
239	>	depth = 4;
240	>	break;
241	>	case VDEPTH_8BIT:
242	>	depth = 8;
243	>	break;
244	>	case VDEPTH_16BIT:
245	>	depth = 16;
246	>	break;
247	>	case VDEPTH_32BIT:
248	>	depth = 32;
249	>	break;
250	>	default:
251	>	abort();
252	>	}
253	>	return depth;
254	>	}
255	>
256	>	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
257	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
258	>	{
259	>	return ((red >> rloss) << rshift) \| ((green >> gloss) << gshift) \| ((blue >> bloss) << bshift);
260	>	}
261	>
262	>	// Do we have a visual for handling the specified Mac depth? If so, set the
263	>	// global variables "xdepth", "visualInfo", "vis" and "color_class".
264	>	static bool find_visual_for_depth(video_depth depth)
265	>	{
266	>	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
267	>
268	>	// 1-bit works always and uses default visual
269	>	if (depth == VDEPTH_1BIT) {
270	>	vis = DefaultVisual(x_display, screen);
271	>	visualInfo.visualid = XVisualIDFromVisual(vis);
272	>	int num = 0;
273	>	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
274	>	visualInfo = vi[0];
275	>	XFree(vi);
276	>	xdepth = visualInfo.depth;
277	>	color_class = visualInfo.c_class;
278	>	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
279	>	return true;
280	>	}
281	>
282	>	// Calculate minimum and maximum supported X depth
283	>	int min_depth = 1, max_depth = 32;
284		switch (depth) {
285	<	case 1:
286	<	layout = FLAYOUT_DIRECT;
287	<	break;
288	<	case 8:
289	<	layout = FLAYOUT_DIRECT;
285	>	#ifdef ENABLE_VOSF
286	>	case VDEPTH_2BIT:
287	>	case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
288	>	case VDEPTH_8BIT:
289	>	min_depth = 8;
290	>	max_depth = 32;
291		break;
292	<	case 15:
293	<	layout = FLAYOUT_HOST_555;
292	>	#else
293	>	case VDEPTH_2BIT:
294	>	case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters
295	>	return false;
296	>	case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual
297	>	min_depth = 8;
298	>	max_depth = 8;
299		break;
300	<	case 16:
301	<	layout = FLAYOUT_HOST_565;
300	>	#endif
301	>	case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual
302	>	min_depth = 15;
303	>	max_depth = 16;
304		break;
305	<	case 24:
306	<	case 32:
307	<	layout = FLAYOUT_HOST_888;
305	>	case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual
306	>	min_depth = 24;
307	>	max_depth = 32;
308		break;
309		}
310	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
311	+
312	+	// Try to find a visual for one of the color depths
313	+	bool visual_found = false;
314	+	for (int i=0; i<num_depths && !visual_found; i++) {
315	+
316	+	xdepth = avail_depths[i];
317	+	D(bug(" trying to find visual for depth %d\n", xdepth));
318	+	if (xdepth < min_depth \|\| xdepth > max_depth)
319	+	continue;
320	+
321	+	// Determine best color class for this depth
322	+	switch (xdepth) {
323	+	case 1: // Try StaticGray or StaticColor
324	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
325	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
326	+	visual_found = true;
327	+	break;
328	+	case 8: // Need PseudoColor
329	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
330	+	visual_found = true;
331	+	break;
332	+	case 15:
333	+	case 16:
334	+	case 24:
335	+	case 32: // Try DirectColor first, as this will allow gamma correction
336	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
337	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
338	+	visual_found = true;
339	+	break;
340	+	default:
341	+	D(bug(" not a supported depth\n"));
342	+	break;
343	+	}
344	+	}
345	+	if (!visual_found)
346	+	return false;
347	+
348	+	// Visual was found
349	+	vis = visualInfo.visual;
350	+	color_class = visualInfo.c_class;
351	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
352	+	#if DEBUG
353	+	switch (color_class) {
354	+	case StaticGray: D(bug("StaticGray\n")); break;
355	+	case GrayScale: D(bug("GrayScale\n")); break;
356	+	case StaticColor: D(bug("StaticColor\n")); break;
357	+	case PseudoColor: D(bug("PseudoColor\n")); break;
358	+	case TrueColor: D(bug("TrueColor\n")); break;
359	+	case DirectColor: D(bug("DirectColor\n")); break;
360	+	}
361	+	#endif
362	+	return true;
363	+	}
364	+
365	+	// Add mode to list of supported modes
366	+	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
367	+	{
368	+	video_mode mode;
369	+	mode.x = width;
370	+	mode.y = height;
371	+	mode.resolution_id = resolution_id;
372	+	mode.bytes_per_row = bytes_per_row;
373	+	mode.depth = depth;
374	+	VideoModes.push_back(mode);
375	+	}
376	+
377	+	// Add standard list of windowed modes for given color depth
378	+	static void add_window_modes(video_depth depth)
379	+	{
380	+	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
381	+	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
382	+	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
383	+	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
384	+	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
385	+	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
386	+	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
387	+	}
388	+
389	+	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
390	+	static void set_mac_frame_buffer(X11_monitor_desc &monitor, video_depth depth, bool native_byte_order)
391	+	{
392	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
393	+	int layout = FLAYOUT_DIRECT;
394	+	if (depth == VDEPTH_16BIT)
395	+	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
396	+	else if (depth == VDEPTH_32BIT)
397	+	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
398		if (native_byte_order)
399		MacFrameLayout = layout;
400		else
401		MacFrameLayout = FLAYOUT_DIRECT;
402	+	monitor.set_mac_frame_base(MacFrameBaseMac);
403	+
404	+	// Set variables used by UAE memory banking
405	+	const video_mode &mode = monitor.get_current_mode();
406	+	MacFrameBaseHost = the_buffer;
407	+	MacFrameSize = mode.bytes_per_row * mode.y;
408	+	InitFrameBufferMapping();
409	+	#else
410	+	monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
411		#endif
412	<	switch (depth) {
413	<	case 1:
414	<	VideoMonitor.mode = VMODE_1BIT;
415	<	break;
416	<	case 8:
417	<	VideoMonitor.mode = VMODE_8BIT;
418	<	break;
419	<	case 15:
420	<	VideoMonitor.mode = VMODE_16BIT;
421	<	break;
422	<	case 16:
423	<	VideoMonitor.mode = VMODE_16BIT;
424	<	break;
425	<	case 24:
426	<	case 32:
427	<	VideoMonitor.mode = VMODE_32BIT;
428	<	break;
412	>	D(bug("monitor.mac_frame_base = %08x\n", monitor.get_mac_frame_base()));
413	>	}
414	>
415	>	// Set window name and class
416	>	static void set_window_name(Window w, int name)
417	>	{
418	>	const char *str = GetString(name);
419	>	XStoreName(x_display, w, str);
420	>	XSetIconName(x_display, w, str);
421	>
422	>	XClassHint *hints;
423	>	hints = XAllocClassHint();
424	>	if (hints) {
425	>	hints->res_name = "BasiliskII";
426	>	hints->res_class = "BasiliskII";
427	>	XSetClassHint(x_display, w, hints);
428	>	XFree(hints);
429	>	}
430	>	}
431	>
432	>	// Set window input focus flag
433	>	static void set_window_focus(Window w)
434	>	{
435	>	XWMHints *hints = XAllocWMHints();
436	>	if (hints) {
437	>	hints->input = True;
438	>	hints->initial_state = NormalState;
439	>	hints->flags = InputHint \| StateHint;
440	>	XSetWMHints(x_display, w, hints);
441	>	XFree(hints);
442		}
443	<	VideoMonitor.x = width;
444	<	VideoMonitor.y = height;
445	<	VideoMonitor.bytes_per_row = bytes_per_row;
443	>	}
444	>
445	>	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
446	>	static Atom WM_DELETE_WINDOW = (Atom)0;
447	>	static void set_window_delete_protocol(Window w)
448	>	{
449	>	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
450	>	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
451	>	}
452	>
453	>	// Wait until window is mapped/unmapped
454	>	void wait_mapped(Window w)
455	>	{
456	>	XEvent e;
457	>	do {
458	>	XMaskEvent(x_display, StructureNotifyMask, &e);
459	>	} while ((e.type != MapNotify) \|\| (e.xmap.event != w));
460	>	}
461	>
462	>	void wait_unmapped(Window w)
463	>	{
464	>	XEvent e;
465	>	do {
466	>	XMaskEvent(x_display, StructureNotifyMask, &e);
467	>	} while ((e.type != UnmapNotify) \|\| (e.xmap.event != w));
468		}
469
470		// Trap SHM errors
#	Line 320 \| Line 480 \| *static int error_handler(Display d, XEr**
480		return old_error_handler(d, e);
481		}
482
483	<	// Init window mode
484	<	static bool init_window(int width, int height)
483	>
484	>	/*
485	>	* Display "driver" classes
486	>	*/
487	>
488	>	class driver_base {
489	>	public:
490	>	driver_base(X11_monitor_desc &m);
491	>	virtual ~driver_base();
492	>
493	>	virtual void update_palette(void);
494	>	virtual void suspend(void) {}
495	>	virtual void resume(void) {}
496	>	virtual void toggle_mouse_grab(void) {}
497	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
498	>
499	>	void disable_mouse_accel(void);
500	>	void restore_mouse_accel(void);
501	>
502	>	virtual void grab_mouse(void) {}
503	>	virtual void ungrab_mouse(void) {}
504	>
505	>	public:
506	>	X11_monitor_desc &monitor; // Associated video monitor
507	>	const video_mode &mode; // Video mode handled by the driver
508	>
509	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
510	>	Window w; // The window we draw into
511	>
512	>	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
513	>	};
514	>
515	>	class driver_window;
516	>	static void update_display_window_vosf(driver_window *drv);
517	>	static void update_display_dynamic(int ticker, driver_window *drv);
518	>	static void update_display_static(driver_window *drv);
519	>
520	>	class driver_window : public driver_base {
521	>	friend void update_display_window_vosf(driver_window *drv);
522	>	friend void update_display_dynamic(int ticker, driver_window *drv);
523	>	friend void update_display_static(driver_window *drv);
524	>
525	>	public:
526	>	driver_window(X11_monitor_desc &monitor);
527	>	~driver_window();
528	>
529	>	void toggle_mouse_grab(void);
530	>	void mouse_moved(int x, int y);
531	>
532	>	void grab_mouse(void);
533	>	void ungrab_mouse(void);
534	>
535	>	private:
536	>	GC gc;
537	>	XImage *img;
538	>	bool have_shm; // Flag: SHM extensions available
539	>	XShmSegmentInfo shminfo;
540	>	Cursor mac_cursor;
541	>	bool mouse_grabbed; // Flag: mouse pointer grabbed, using relative mouse mode
542	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
543	>	};
544	>
545	>	static driver_base *drv = NULL; // Pointer to currently used driver object
546	>
547	>	#ifdef ENABLE_VOSF
548	>	# include "video_vosf.h"
549	>	#endif
550	>
551	>	driver_base::driver_base(X11_monitor_desc &m)
552	>	: monitor(m), mode(m.get_current_mode()), init_ok(false), w(0)
553	>	{
554	>	the_buffer = NULL;
555	>	the_buffer_copy = NULL;
556	>	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
557	>	}
558	>
559	>	driver_base::~driver_base()
560	>	{
561	>	ungrab_mouse();
562	>	restore_mouse_accel();
563	>
564	>	if (w) {
565	>	XUnmapWindow(x_display, w);
566	>	wait_unmapped(w);
567	>	XDestroyWindow(x_display, w);
568	>	}
569	>
570	>	XFlush(x_display);
571	>	XSync(x_display, false);
572	>
573	>	// Free frame buffer(s)
574	>	if (!use_vosf) {
575	>	if (the_buffer) {
576	>	free(the_buffer);
577	>	the_buffer = NULL;
578	>	}
579	>	if (the_buffer_copy) {
580	>	free(the_buffer_copy);
581	>	the_buffer_copy = NULL;
582	>	}
583	>	}
584	>	#ifdef ENABLE_VOSF
585	>	else {
586	>	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
587	>	if (the_buffer != VM_MAP_FAILED) {
588	>	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
589	>	vm_release(the_buffer, the_buffer_size);
590	>	the_buffer = NULL;
591	>	}
592	>	if (the_host_buffer) {
593	>	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
594	>	free(the_host_buffer);
595	>	the_host_buffer = NULL;
596	>	}
597	>	if (the_buffer_copy) {
598	>	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
599	>	free(the_buffer_copy);
600	>	the_buffer_copy = NULL;
601	>	}
602	>	}
603	>	#endif
604	>	}
605	>
606	>	// Palette has changed
607	>	void driver_base::update_palette(void)
608		{
609	+	if (color_class == PseudoColor \|\| color_class == DirectColor) {
610	+	int num = vis->map_entries;
611	+	if (!IsDirectMode(monitor.get_current_mode()) && color_class == DirectColor)
612	+	return; // Indexed mode on true color screen, don't set CLUT
613	+	XStoreColors(x_display, cmap[0], x_palette, num);
614	+	XStoreColors(x_display, cmap[1], x_palette, num);
615	+	}
616	+	XSync(x_display, false);
617	+	}
618	+
619	+	// Disable mouse acceleration
620	+	void driver_base::disable_mouse_accel(void)
621	+	{
622	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
623	+	}
624	+
625	+	// Restore mouse acceleration to original value
626	+	void driver_base::restore_mouse_accel(void)
627	+	{
628	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
629	+	}
630	+
631	+
632	+	/*
633	+	* Windowed display driver
634	+	*/
635	+
636	+	// Open display
637	+	driver_window::driver_window(X11_monitor_desc &m)
638	+	: driver_base(m), gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false)
639	+	{
640	+	int width = mode.x, height = mode.y;
641		int aligned_width = (width + 15) & ~15;
642		int aligned_height = (height + 15) & ~15;
643
644		// Set absolute mouse mode
645	<	ADBSetRelMouseMode(false);
645	>	ADBSetRelMouseMode(mouse_grabbed);
646
647	<	// Read frame skip prefs
648	<	frame_skip = PrefsFindInt32("frameskip");
649	<
335	<	// Create window
647	>	// Create window (setting background_pixel, border_pixel and colormap is
648	>	// mandatory when using a non-default visual; in 1-bit mode we use the
649	>	// default visual, so we can also use the default colormap)
650		XSetWindowAttributes wattr;
651		wattr.event_mask = eventmask = win_eventmask;
652	<	wattr.background_pixel = black_pixel;
653	<	wattr.border_pixel = black_pixel;
654	<	wattr.backing_store = NotUseful;
655	<	wattr.save_under = false;
656	<	wattr.backing_planes = xdepth;
652	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
653	>	wattr.border_pixel = 0;
654	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
655	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
656	>	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \| CWColormap, &wattr);
657	>	D(bug(" window created\n"));
658
659	<	XSync(x_display, false);
660	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
346	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
347	<	CWBackingStore \| CWBackingPlanes, &wattr);
659	>	// Set window name/class
660	>	set_window_name(w, STR_WINDOW_TITLE);
661
662		// Indicate that we want keyboard input
663	<	{
664	<	XWMHints *hints = XAllocWMHints();
665	<	if (hints) {
666	<	hints->input = True;
354	<	hints->flags = InputHint;
355	<	XSetWMHints(x_display, the_win, hints);
356	<	XFree((char *)hints);
357	<	}
358	<	}
663	>	set_window_focus(w);
664	>
665	>	// Set delete protocol property
666	>	set_window_delete_protocol(w);
667
668		// Make window unresizable
669		{
#	Line 366 \| Line 674 \| static bool init_window(int width, int h
674		hints->min_height = height;
675		hints->max_height = height;
676		hints->flags = PMinSize \| PMaxSize;
677	<	XSetWMNormalHints(x_display, the_win, hints);
678	<	XFree((char *)hints);
677	>	XSetWMNormalHints(x_display, w, hints);
678	>	XFree(hints);
679		}
680		}
681	+	D(bug(" window attributes set\n"));
682
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	–
683		// Show window
684	<	XSync(x_display, false);
685	<	XMapRaised(x_display, the_win);
686	<	XFlush(x_display);
687	<
688	<	// Set colormap
689	<	if (depth == 8)
690	<	XSetWindowColormap(x_display, the_win, cmap[0]);
684	>	XMapWindow(x_display, w);
685	>	wait_mapped(w);
686	>	D(bug(" window mapped\n"));
687	>
688	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
689	>	// use SHM because that doesn't allow changing the image byte order
690	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
691
692		// Try to create and attach SHM image
693	<	have_shm = false;
406	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
693	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
694
695		// Create SHM image ("height + 2" for safety)
696	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
696	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
697	>	D(bug(" shm image created\n"));
698		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
699		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
700		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 421 \| Line 709 \| static bool init_window(int width, int h
709		if (shm_error) {
710		shmdt(shminfo.shmaddr);
711		XDestroyImage(img);
712	+	img = NULL;
713		shminfo.shmid = -1;
714		} else {
715		have_shm = true;
716		shmctl(shminfo.shmid, IPC_RMID, 0);
717		}
718	+	D(bug(" shm image attached\n"));
719		}
720
721		// Create normal X image if SHM doesn't work ("height + 2" for safety)
722		if (!have_shm) {
723	<	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	<	}
723	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
724		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
725	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
725	>	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);
726	>	D(bug(" X image created\n"));
727		}
728
729	<	// 1-Bit mode is big-endian
452	<	if (depth == 1) {
729	>	if (need_msb_image) {
730		img->byte_order = MSBFirst;
731		img->bitmap_bit_order = MSBFirst;
732		}
733
734		#ifdef ENABLE_VOSF
735	<	// Allocate a page-aligned chunk of memory for frame buffer
736	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
735	>	use_vosf = true;
736	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
737		the_host_buffer = the_buffer_copy;
738	<
739	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
740	<	memset(the_buffer_copy, 0, the_buffer_size);
741	<
465	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
466	<	memset(the_buffer, 0, the_buffer_size);
738	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
739	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
740	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
741	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
742		#else
743		// Allocate memory for frame buffer
744		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
745	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
746		#endif
747
748		// Create GC
749	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
750	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
749	>	gc = XCreateGC(x_display, w, 0, 0);
750	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
751
752		// Create no_cursor
753		mac_cursor = XCreatePixmapCursor(x_display,
754	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
755	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
754	>	XCreatePixmap(x_display, w, 1, 1, 1),
755	>	XCreatePixmap(x_display, w, 1, 1, 1),
756		&black, &white, 0, 0);
757	<	XDefineCursor(x_display, the_win, mac_cursor);
757	>	XDefineCursor(x_display, w, mac_cursor);
758
759	<	// Set VideoMonitor
759	>	// Init blitting routines
760		bool native_byte_order;
761		#ifdef WORDS_BIGENDIAN
762	<	native_byte_order = (img->bitmap_bit_order == MSBFirst);
762	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
763		#else
764	<	native_byte_order = (img->bitmap_bit_order == LSBFirst);
764	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
765		#endif
766		#ifdef ENABLE_VOSF
767	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
767	>	Screen_blitter_init(visualFormat, native_byte_order, depth_of_video_mode(mode));
768		#endif
769	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
770	<
771	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
772	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
769	>
770	>	// Set frame buffer base
771	>	set_mac_frame_buffer(monitor, mode.depth, native_byte_order);
772	>
773	>	// Everything went well
774	>	init_ok = true;
775	>	}
776	>
777	>	// Close display
778	>	driver_window::~driver_window()
779	>	{
780	>	if (have_shm) {
781	>	XShmDetach(x_display, &shminfo);
782	>	#ifdef ENABLE_VOSF
783	>	the_host_buffer = NULL; // don't free() in driver_base dtor
784		#else
785	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
785	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
786		#endif
787	<	return true;
787	>	}
788	>	if (img) {
789	>	if (!have_shm)
790	>	img->data = NULL;
791	>	XDestroyImage(img);
792	>	}
793	>	if (have_shm) {
794	>	shmdt(shminfo.shmaddr);
795	>	shmctl(shminfo.shmid, IPC_RMID, 0);
796	>	}
797	>	if (gc)
798	>	XFreeGC(x_display, gc);
799	>	}
800	>
801	>	// Toggle mouse grab
802	>	void driver_window::toggle_mouse_grab(void)
803	>	{
804	>	if (mouse_grabbed)
805	>	ungrab_mouse();
806	>	else
807	>	grab_mouse();
808	>	}
809	>
810	>	// Grab mouse, switch to relative mouse mode
811	>	void driver_window::grab_mouse(void)
812	>	{
813	>	int result;
814	>	for (int i=0; i<10; i++) {
815	>	result = XGrabPointer(x_display, w, True, 0,
816	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
817	>	if (result != AlreadyGrabbed)
818	>	break;
819	>	Delay_usec(100000);
820	>	}
821	>	if (result == GrabSuccess) {
822	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
823	>	ADBSetRelMouseMode(mouse_grabbed = true);
824	>	disable_mouse_accel();
825	>	}
826	>	}
827	>
828	>	// Ungrab mouse, switch to absolute mouse mode
829	>	void driver_window::ungrab_mouse(void)
830	>	{
831	>	if (mouse_grabbed) {
832	>	XUngrabPointer(x_display, CurrentTime);
833	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
834	>	ADBSetRelMouseMode(mouse_grabbed = false);
835	>	restore_mouse_accel();
836	>	}
837	>	}
838	>
839	>	// Mouse moved
840	>	void driver_window::mouse_moved(int x, int y)
841	>	{
842	>	if (!mouse_grabbed) {
843	>	mouse_last_x = x; mouse_last_y = y;
844	>	ADBMouseMoved(x, y);
845	>	return;
846	>	}
847	>
848	>	// Warped mouse motion (this code is taken from SDL)
849	>
850	>	// Post first mouse event
851	>	int width = monitor.get_current_mode().x, height = monitor.get_current_mode().y;
852	>	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
853	>	mouse_last_x = x; mouse_last_y = y;
854	>	ADBMouseMoved(delta_x, delta_y);
855	>
856	>	// Only warp the pointer when it has reached the edge
857	>	const int MOUSE_FUDGE_FACTOR = 8;
858	>	if (x < MOUSE_FUDGE_FACTOR \|\| x > (width - MOUSE_FUDGE_FACTOR)
859	>	\|\| y < MOUSE_FUDGE_FACTOR \|\| y > (height - MOUSE_FUDGE_FACTOR)) {
860	>	XEvent event;
861	>	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
862	>	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
863	>	mouse_last_x = x; mouse_last_y = y;
864	>	ADBMouseMoved(delta_x, delta_y);
865	>	}
866	>	mouse_last_x = width/2;
867	>	mouse_last_y = height/2;
868	>	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
869	>	for (int i=0; i<10; i++) {
870	>	XMaskEvent(x_display, PointerMotionMask, &event);
871	>	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
872	>	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
873	>	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
874	>	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
875	>	break;
876	>	}
877	>	}
878		}
879
880	<	// Init fbdev DGA display
881	<	static bool init_fbdev_dga(char *in_fb_name)
880	>
881	>	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
882	>	/*
883	>	* DGA display driver base class
884	>	*/
885	>
886	>	class driver_dga : public driver_base {
887	>	public:
888	>	driver_dga(X11_monitor_desc &monitor);
889	>	~driver_dga();
890	>
891	>	void suspend(void);
892	>	void resume(void);
893	>
894	>	private:
895	>	Window suspend_win; // "Suspend" information window
896	>	void *fb_save; // Saved frame buffer for suspend/resume
897	>	};
898	>
899	>	driver_dga::driver_dga(X11_monitor_desc &m)
900	>	: driver_base(m), suspend_win(0), fb_save(NULL)
901	>	{
902	>	}
903	>
904	>	driver_dga::~driver_dga()
905	>	{
906	>	XUngrabPointer(x_display, CurrentTime);
907	>	XUngrabKeyboard(x_display, CurrentTime);
908	>	}
909	>
910	>	// Suspend emulation
911	>	void driver_dga::suspend(void)
912		{
913	+	// Release ctrl key
914	+	ADBKeyUp(0x36);
915	+	ctrl_down = false;
916	+
917	+	// Lock frame buffer (this will stop the MacOS thread)
918	+	LOCK_FRAME_BUFFER;
919	+
920	+	// Save frame buffer
921	+	fb_save = malloc(mode.y * mode.bytes_per_row);
922	+	if (fb_save)
923	+	memcpy(fb_save, the_buffer, mode.y * mode.bytes_per_row);
924	+
925	+	// Close full screen display
926	+	#ifdef ENABLE_XF86_DGA
927	+	XF86DGADirectVideo(x_display, screen, 0);
928	+	#endif
929	+	XUngrabPointer(x_display, CurrentTime);
930	+	XUngrabKeyboard(x_display, CurrentTime);
931	+	restore_mouse_accel();
932	+	XUnmapWindow(x_display, w);
933	+	wait_unmapped(w);
934	+
935	+	// Open "suspend" window
936	+	XSetWindowAttributes wattr;
937	+	wattr.event_mask = KeyPressMask;
938	+	wattr.background_pixel = black_pixel;
939	+
940	+	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
941	+	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
942	+	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
943	+	set_window_focus(suspend_win);
944	+	XMapWindow(x_display, suspend_win);
945	+	emul_suspended = true;
946	+	}
947	+
948	+	// Resume emulation
949	+	void driver_dga::resume(void)
950	+	{
951	+	// Close "suspend" window
952	+	XDestroyWindow(x_display, suspend_win);
953	+	XSync(x_display, false);
954	+
955	+	// Reopen full screen display
956	+	XMapRaised(x_display, w);
957	+	wait_mapped(w);
958	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
959	+	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
960	+	XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
961	+	disable_mouse_accel();
962	+	#ifdef ENABLE_XF86_DGA
963	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
964	+	XF86DGASetViewPort(x_display, screen, 0, 0);
965	+	#endif
966	+	XSync(x_display, false);
967	+
968	+	// the_buffer already contains the data to restore. i.e. since a temporary
969	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
970	+	// not necessary.
971	+	#ifdef ENABLE_VOSF
972	+	if (use_vosf) {
973	+	LOCK_VOSF;
974	+	PFLAG_SET_ALL;
975	+	UNLOCK_VOSF;
976	+	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
977	+	}
978	+	#endif
979	+
980	+	// Restore frame buffer
981	+	if (fb_save) {
982	+	#ifdef ENABLE_VOSF
983	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
984	+	if (!use_vosf)
985	+	#endif
986	+	memcpy(the_buffer, fb_save, mode.y * mode.bytes_per_row);
987	+	free(fb_save);
988	+	fb_save = NULL;
989	+	}
990	+
991	+	// Unlock frame buffer (and continue MacOS thread)
992	+	UNLOCK_FRAME_BUFFER;
993	+	emul_suspended = false;
994	+	}
995	+	#endif
996	+
997	+
998		#ifdef ENABLE_FBDEV_DGA
999	+	/*
1000	+	* fbdev DGA display driver
1001	+	*/
1002	+
1003	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
1004	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
1005	+
1006	+	class driver_fbdev : public driver_dga {
1007	+	public:
1008	+	driver_fbdev(X11_monitor_desc &monitor);
1009	+	~driver_fbdev();
1010	+	};
1011	+
1012	+	// Open display
1013	+	driver_fbdev::driver_fbdev(X11_monitor_desc &m) : driver_dga(m)
1014	+	{
1015	+	int width = mode.x, height = mode.y;
1016	+
1017	+	// Set absolute mouse mode
1018	+	ADBSetRelMouseMode(false);
1019	+
1020		// Find the maximum depth available
1021		int ndepths, max_depth(0);
1022		int *depths = XListDepths(x_display, screen, &ndepths);
1023		if (depths == NULL) {
1024		printf("FATAL: Could not determine the maximal depth available\n");
1025	<	return false;
1025	>	return;
1026		} else {
1027		while (ndepths-- > 0) {
1028		if (depths[ndepths] > max_depth)
#	Line 526 \| Line 1039 \| *static bool init_fbdev_dga(char in_fb_n**
1039		char str[256];
1040		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
1041		ErrorAlert(str);
1042	<	return false;
1042	>	return;
1043		}
1044
1045		int fb_depth; // supported depth
#	Line 545 \| Line 1058 \| *static bool init_fbdev_dga(char in_fb_n**
1058		if ((line[0] == '#') \|\| (line[0] == ';') \|\| (line[0] == '\0'))
1059		continue;
1060
1061	<	if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
1062	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
1061	>	if ((sscanf(line, "%19s %d %x", fb_name, &fb_depth, &fb_offset) == 3)
1062	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
1063		device_found = true;
1064		break;
1065		}
#	Line 558 \| Line 1071 \| *static bool init_fbdev_dga(char in_fb_n**
1071		// Frame buffer name not found ? Then, display warning
1072		if (!device_found) {
1073		char str[256];
1074	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
1074	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
1075		ErrorAlert(str);
1076	<	return false;
1076	>	return;
1077		}
1078
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	–
1079		// Create window
1080		XSetWindowAttributes wattr;
1081	<	wattr.override_redirect = True;
1082	<	wattr.backing_store = NotUseful;
1083	<	wattr.background_pixel = white_pixel;
1084	<	wattr.border_pixel = black_pixel;
579	<	wattr.event_mask = eventmask = dga_eventmask;
1081	>	wattr.event_mask = eventmask = dga_eventmask;
1082	>	wattr.background_pixel = white_pixel;
1083	>	wattr.override_redirect = True;
1084	>	wattr.colormap = cmap[0];
1085
1086	<	XSync(x_display, false);
582	<	the_win = XCreateWindow(x_display, rootwin,
1086	>	w = XCreateWindow(x_display, rootwin,
1087		0, 0, width, height,
1088		0, xdepth, InputOutput, vis,
1089	<	CWEventMask\|CWBackPixel\|CWBorderPixel\|CWOverrideRedirect\|CWBackingStore,
1089	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
1090		&wattr);
1091	<	XSync(x_display, false);
1092	<	XMapRaised(x_display, the_win);
1093	<	XSync(x_display, false);
1091	>
1092	>	// Set window name/class
1093	>	set_window_name(w, STR_WINDOW_TITLE);
1094	>
1095	>	// Indicate that we want keyboard input
1096	>	set_window_focus(w);
1097	>
1098	>	// Show window
1099	>	XMapRaised(x_display, w);
1100	>	wait_mapped(w);
1101
1102		// Grab mouse and keyboard
1103	<	XGrabKeyboard(x_display, the_win, True,
1103	>	XGrabKeyboard(x_display, w, True,
1104		GrabModeAsync, GrabModeAsync, CurrentTime);
1105	<	XGrabPointer(x_display, the_win, True,
1105	>	XGrabPointer(x_display, w, True,
1106		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
1107	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
1108	<
598	<	// Set colormap
599	<	if (depth == 8)
600	<	XSetWindowColormap(x_display, the_win, cmap[0]);
1107	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1108	>	disable_mouse_accel();
1109
1110	<	// Set VideoMonitor
1111	<	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	<	}
1110	>	// Calculate bytes per row
1111	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1112
1113	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1114	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1113	>	// Map frame buffer
1114	>	the_buffer_size = height * bytes_per_row;
1115	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1116	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1117		char str[256];
1118		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1119		ErrorAlert(str);
1120	<	return false;
1120	>	return;
1121		}
1122		}
1123
1124		#if ENABLE_VOSF
1125		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1126	<	// If the blit function is null, i.e. just a copy of the buffer,
1127	<	// we first try to avoid the allocation of a temporary frame buffer
1128	<	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;
1126	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1127	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1128	>	use_vosf = Screen_blitter_init(visualFormat, true, mode.depth);
1129
1130		if (use_vosf) {
1131	<	the_host_buffer = the_buffer;
1132	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1133	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1134	<	memset(the_buffer_copy, 0, the_buffer_size);
1135	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
642	<	memset(the_buffer, 0, the_buffer_size);
1131	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1132	>	the_host_buffer = the_buffer;
1133	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1134	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1135	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1136		}
1137		#else
1138		use_vosf = false;
1139		#endif
1140		#endif
1141
1142	<	set_video_monitor(width, height, bytes_per_row, true);
1143	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1144	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1145	<	#else
1146	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1147	<	#endif
1148	<	return true;
1149	<	#else
1150	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
1151	<	return false;
1142	>	// Set frame buffer base
1143	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1144	>	const_cast<video_mode *>(&mode)->depth = DepthModeForPixelDepth(fb_depth);
1145	>	set_mac_frame_buffer(monitor, mode.depth, true);
1146	>
1147	>	// Everything went well
1148	>	init_ok = true;
1149	>	}
1150	>
1151	>	// Close display
1152	>	driver_fbdev::~driver_fbdev()
1153	>	{
1154	>	if (!use_vosf) {
1155	>	if (the_buffer != MAP_FAILED) {
1156	>	// don't free() the screen buffer in driver_base dtor
1157	>	munmap(the_buffer, the_buffer_size);
1158	>	the_buffer = NULL;
1159	>	}
1160	>	}
1161	>	#ifdef ENABLE_VOSF
1162	>	else {
1163	>	if (the_host_buffer != MAP_FAILED) {
1164	>	// don't free() the screen buffer in driver_base dtor
1165	>	munmap(the_host_buffer, the_buffer_size);
1166	>	the_host_buffer = NULL;
1167	>	}
1168	>	}
1169		#endif
1170		}
1171	+	#endif
1172	+
1173
662	–	// Init XF86 DGA display
663	–	static bool init_xf86_dga(int width, int height)
664	–	{
1174		#ifdef ENABLE_XF86_DGA
1175	+	/*
1176	+	* XFree86 DGA display driver
1177	+	*/
1178	+
1179	+	class driver_xf86dga : public driver_dga {
1180	+	public:
1181	+	driver_xf86dga(X11_monitor_desc &monitor);
1182	+	~driver_xf86dga();
1183	+
1184	+	void update_palette(void);
1185	+	void resume(void);
1186	+
1187	+	private:
1188	+	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
1189	+	};
1190	+
1191	+	// Open display
1192	+	driver_xf86dga::driver_xf86dga(X11_monitor_desc &m)
1193	+	: driver_dga(m), current_dga_cmap(0)
1194	+	{
1195	+	int width = mode.x, height = mode.y;
1196	+
1197		// Set relative mouse mode
1198		ADBSetRelMouseMode(true);
1199
#	Line 678 \| Line 1209 \| static bool init_xf86_dga(int width, int
1209		}
1210		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
1211		XF86VidModeSetViewPort(x_display, screen, 0, 0);
1212	+	XSync(x_display, false);
1213		}
1214		#endif
1215
1216		// Create window
1217		XSetWindowAttributes wattr;
1218		wattr.event_mask = eventmask = dga_eventmask;
687	–	wattr.border_pixel = black_pixel;
1219		wattr.override_redirect = True;
1220	+	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
1221
1222	<	XSync(x_display, false);
1223	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1224	<	InputOutput, vis, CWEventMask \| CWBorderPixel \| CWOverrideRedirect, &wattr);
1225	<	XSync(x_display, false);
1226	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
1227	<	XMapRaised(x_display, the_win);
1228	<	XSync(x_display, false);
1222	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1223	>	InputOutput, vis, CWEventMask \| CWOverrideRedirect \|
1224	>	(color_class == DirectColor ? CWColormap : 0), &wattr);
1225	>
1226	>	// Set window name/class
1227	>	set_window_name(w, STR_WINDOW_TITLE);
1228	>
1229	>	// Indicate that we want keyboard input
1230	>	set_window_focus(w);
1231	>
1232	>	// Show window
1233	>	XMapRaised(x_display, w);
1234	>	wait_mapped(w);
1235
1236		// Establish direct screen connection
1237	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
1237	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
1238		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1239		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1240		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1241	+	disable_mouse_accel();
1242
1243		int v_width, v_bank, v_size;
1244		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 708 \| Line 1247 \| static bool init_xf86_dga(int width, int
1247		XF86DGASetVidPage(x_display, screen, 0);
1248
1249		// Set colormap
1250	<	if (depth == 8) {
1251	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
1250	>	if (!IsDirectMode(mode)) {
1251	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1252		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1253		}
1254	+	XSync(x_display, false);
1255
1256	<	// Set VideoMonitor
1257	<	int bytes_per_row = (v_width + 7) & ~7;
1258	<	switch (depth) {
1259	<	case 1:
1260	<	bytes_per_row /= 8;
1261	<	break;
1262	<	case 15:
1263	<	case 16:
1264	<	bytes_per_row *= 2;
725	<	break;
726	<	case 24:
727	<	case 32:
728	<	bytes_per_row *= 4;
729	<	break;
730	<	}
731	<
1256	>	// Init blitting routines
1257	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1258	>	#if ENABLE_VOSF
1259	>	bool native_byte_order;
1260	>	#ifdef WORDS_BIGENDIAN
1261	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
1262	>	#else
1263	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
1264	>	#endif
1265		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1266	<	// If the blit function is null, i.e. just a copy of the buffer,
1267	<	// we first try to avoid the allocation of a temporary frame buffer
1268	<	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;
1266	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1267	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1268	>	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth_of_video_mode(mode));
1269
1270		if (use_vosf) {
1271	<	the_host_buffer = the_buffer;
1272	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1273	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1274	<	memset(the_buffer_copy, 0, the_buffer_size);
1275	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
746	<	memset(the_buffer, 0, the_buffer_size);
1271	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1272	>	the_host_buffer = the_buffer;
1273	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1274	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1275	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1276		}
1277	<	#elif defined(ENABLE_VOSF)
749	<	// The UAE memory handlers will already handle color conversion, if needed.
1277	>	#else
1278		use_vosf = false;
1279		#endif
1280	+	#endif
1281
1282	<	set_video_monitor(width, height, bytes_per_row, true);
1283	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1284	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1285	<	// MacFrameLayout = FLAYOUT_DIRECT;
1286	<	#else
1287	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1282	>	// Set frame buffer base
1283	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1284	>	set_mac_frame_buffer(monitor, mode.depth, true);
1285	>
1286	>	// Everything went well
1287	>	init_ok = true;
1288	>	}
1289	>
1290	>	// Close display
1291	>	driver_xf86dga::~driver_xf86dga()
1292	>	{
1293	>	XF86DGADirectVideo(x_display, screen, 0);
1294	>	if (!use_vosf) {
1295	>	// don't free() the screen buffer in driver_base dtor
1296	>	the_buffer = NULL;
1297	>	}
1298	>	#ifdef ENABLE_VOSF
1299	>	else {
1300	>	// don't free() the screen buffer in driver_base dtor
1301	>	the_host_buffer = NULL;
1302	>	}
1303		#endif
1304	<	return true;
1305	<	#else
1306	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
763	<	return false;
1304	>	#ifdef ENABLE_XF86_VIDMODE
1305	>	if (has_vidmode)
1306	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1307		#endif
1308		}
1309
1310	+	// Palette has changed
1311	+	void driver_xf86dga::update_palette(void)
1312	+	{
1313	+	driver_dga::update_palette();
1314	+	current_dga_cmap ^= 1;
1315	+	if (!IsDirectMode(monitor.get_current_mode()) && cmap[current_dga_cmap])
1316	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1317	+	}
1318	+
1319	+	// Resume emulation
1320	+	void driver_xf86dga::resume(void)
1321	+	{
1322	+	driver_dga::resume();
1323	+	if (!IsDirectMode(monitor.get_current_mode()))
1324	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1325	+	}
1326	+	#endif
1327	+
1328	+
1329	+	/*
1330	+	* Initialization
1331	+	*/
1332	+
1333		// Init keycode translation table
1334		static void keycode_init(void)
1335		{
#	Line 788 \| Line 1354 \| static void keycode_init(void)
1354
1355		// Search for server vendor string, then read keycodes
1356		const char *vendor = ServerVendor(x_display);
1357	+	// Force use of MacX mappings on MacOS X with Apple's X server
1358	+	int dummy;
1359	+	if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy))
1360	+	vendor = "MacX";
1361		bool vendor_found = false;
1362		char line[256];
1363		while (fgets(line, 255, f)) {
#	Line 829 \| Line 1399 \| static void keycode_init(void)
1399		}
1400		}
1401
1402	<	bool VideoInitBuffer()
1402	>	// Open display for current mode
1403	>	bool X11_monitor_desc::video_open(void)
1404		{
1405	<	#ifdef ENABLE_VOSF
1406	<	if (use_vosf) {
836	<	const uint32 page_size = getpagesize();
837	<	const uint32 page_mask = page_size - 1;
838	<
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;
1405	>	D(bug("video_open()\n"));
1406	>	const video_mode &mode = get_current_mode();
1407
1408	<	mainBuffer.pageSize = page_size;
1409	<	mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
1410	<	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
1408	>	// Find best available X visual
1409	>	if (!find_visual_for_depth(mode.depth)) {
1410	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1411	>	return false;
1412	>	}
1413
1414	<	if (mainBuffer.dirtyPages != 0)
1415	<	free(mainBuffer.dirtyPages);
1414	>	// Build up visualFormat structure
1415	>	visualFormat.depth = visualInfo.depth;
1416	>	visualFormat.Rmask = visualInfo.red_mask;
1417	>	visualFormat.Gmask = visualInfo.green_mask;
1418	>	visualFormat.Bmask = visualInfo.blue_mask;
1419
1420	<	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
1420	>	// Create color maps
1421	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1422	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1423	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1424	>	} else {
1425	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1426	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1427	>	}
1428
1429	<	if (mainBuffer.pageInfo != 0)
1430	<	free(mainBuffer.pageInfo);
1429	>	// Find pixel format of direct modes
1430	>	if (color_class == DirectColor \|\| color_class == TrueColor) {
1431	>	rshift = gshift = bshift = 0;
1432	>	rloss = gloss = bloss = 8;
1433	>	uint32 mask;
1434	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1435	>	++rshift;
1436	>	for (; mask&1; mask>>=1)
1437	>	--rloss;
1438	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1439	>	++gshift;
1440	>	for (; mask&1; mask>>=1)
1441	>	--gloss;
1442	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1443	>	++bshift;
1444	>	for (; mask&1; mask>>=1)
1445	>	--bloss;
1446	>	}
1447	>
1448	>	// Preset palette pixel values for CLUT or gamma table
1449	>	if (color_class == DirectColor) {
1450	>	int num = vis->map_entries;
1451	>	for (int i=0; i<num; i++) {
1452	>	int c = (i * 256) / num;
1453	>	x_palette[i].pixel = map_rgb(c, c, c);
1454	>	x_palette[i].flags = DoRed \| DoGreen \| DoBlue;
1455	>	}
1456	>	} else if (color_class == PseudoColor) {
1457	>	for (int i=0; i<256; i++) {
1458	>	x_palette[i].pixel = i;
1459	>	x_palette[i].flags = DoRed \| DoGreen \| DoBlue;
1460	>	}
1461	>	}
1462
1463	<	mainBuffer.pageInfo = (ScreenPageInfo ) malloc(mainBuffer.pageCount sizeof(ScreenPageInfo));
1463	>	// Load gray ramp to color map
1464	>	int num = (color_class == DirectColor ? vis->map_entries : 256);
1465	>	for (int i=0; i<num; i++) {
1466	>	int c = (i * 256) / num;
1467	>	x_palette[i].red = c * 0x0101;
1468	>	x_palette[i].green = c * 0x0101;
1469	>	x_palette[i].blue = c * 0x0101;
1470	>	}
1471	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1472	>	XStoreColors(x_display, cmap[0], x_palette, num);
1473	>	XStoreColors(x_display, cmap[1], x_palette, num);
1474	>	}
1475
1476	<	if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
1477	<	return false;
1476	>	#ifdef ENABLE_VOSF
1477	>	// Load gray ramp to 8->16/32 expand map
1478	>	if (!IsDirectMode(mode) && xdepth > 8)
1479	>	for (int i=0; i<256; i++)
1480	>	ExpandMap[i] = map_rgb(i, i, i);
1481	>	#endif
1482
1483	<	PFLAG_CLEAR_ALL;
1483	>	// Create display driver object of requested type
1484	>	switch (display_type) {
1485	>	case DISPLAY_WINDOW:
1486	>	drv = new driver_window(*this);
1487	>	break;
1488	>	#ifdef ENABLE_FBDEV_DGA
1489	>	case DISPLAY_DGA:
1490	>	drv = new driver_fbdev(*this);
1491	>	break;
1492	>	#endif
1493	>	#ifdef ENABLE_XF86_DGA
1494	>	case DISPLAY_DGA:
1495	>	drv = new driver_xf86dga(*this);
1496	>	break;
1497	>	#endif
1498	>	}
1499	>	if (drv == NULL)
1500	>	return false;
1501	>	if (!drv->init_ok) {
1502	>	delete drv;
1503	>	drv = NULL;
1504	>	return false;
1505	>	}
1506
1507	<	uint32 a = 0;
1508	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
1509	<	int y1 = a / VideoMonitor.bytes_per_row;
1510	<	if (y1 >= VideoMonitor.y)
1511	<	y1 = VideoMonitor.y - 1;
1512	<
870	<	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;
1507	>	#ifdef ENABLE_VOSF
1508	>	if (use_vosf) {
1509	>	// Initialize the VOSF system
1510	>	if (!video_vosf_init(*this)) {
1511	>	ErrorAlert(STR_VOSF_INIT_ERR);
1512	>	return false;
1513		}
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;
1514		}
1515		#endif
1516	+
1517	+	// Initialize VideoRefresh function
1518	+	VideoRefreshInit();
1519	+
1520	+	// Lock down frame buffer
1521	+	XSync(x_display, false);
1522	+	LOCK_FRAME_BUFFER;
1523	+
1524	+	// Start redraw/input thread
1525	+	#ifdef HAVE_PTHREADS
1526	+	redraw_thread_cancel = false;
1527	+	Set_pthread_attr(&redraw_thread_attr, 0);
1528	+	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1529	+	if (!redraw_thread_active) {
1530	+	printf("FATAL: cannot create redraw thread\n");
1531	+	return false;
1532	+	}
1533	+	#else
1534	+	redraw_thread_active = true;
1535	+	#endif
1536	+
1537		return true;
1538		}
1539
1540		bool VideoInit(bool classic)
1541		{
1542	+	classic_mode = classic;
1543	+
1544		#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	–
1545		// Zero the mainBuffer structure
1546	<	mainBuffer.dirtyPages = 0;
1547	<	mainBuffer.pageInfo = 0;
1546	>	mainBuffer.dirtyPages = NULL;
1547	>	mainBuffer.pageInfo = NULL;
1548		#endif
1549
1550		// Check if X server runs on local machine
#	Line 912 \| Line 1555 \| bool VideoInit(bool classic)
1555		keycode_init();
1556
1557		// Read prefs
1558	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1559	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1558	>	frame_skip = PrefsFindInt32("frameskip");
1559	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1560	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1561
1562		// Find screen and root window
1563		screen = XDefaultScreen(x_display);
1564		rootwin = XRootWindow(x_display, screen);
1565	<
1566	<	// Get screen depth
1567	<	xdepth = DefaultDepth(x_display, screen);
1565	>
1566	>	// Get sorted list of available depths
1567	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1568	>	if (avail_depths == NULL) {
1569	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1570	>	return false;
1571	>	}
1572	>	std::sort(avail_depths, avail_depths + num_depths);
1573
1574		#ifdef ENABLE_FBDEV_DGA
1575		// Frame buffer name
1576		char fb_name[20];
1577
1578	<	// Could do fbdev dga ?
1578	>	// Could do fbdev DGA?
1579		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1580		has_dga = true;
1581		else
#	Line 960 \| Line 1609 \| bool VideoInit(bool classic)
1609		black_pixel = BlackPixel(x_display, screen);
1610		white_pixel = WhitePixel(x_display, screen);
1611
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	–
1612		// Get screen mode from preferences
1613		const char *mode_str;
1614	<	if (classic)
1614	>	if (classic_mode)
1615		mode_str = "win/512/342";
1616		else
1617		mode_str = PrefsFindString("screen");
1618
1619	<	// Determine type and mode
1620	<	int width = 512, height = 384;
1619	>	// Determine display type and default dimensions
1620	>	int default_width = 512, default_height = 384;
1621		display_type = DISPLAY_WINDOW;
1622		if (mode_str) {
1623	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1623	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1624		display_type = DISPLAY_WINDOW;
1625		#ifdef ENABLE_FBDEV_DGA
1626	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1627	<	#else
1628	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1626	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1627	>	display_type = DISPLAY_DGA;
1628	>	default_width = -1; default_height = -1; // use entire screen
1629		#endif
1630	+	#ifdef ENABLE_XF86_DGA
1631	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1632		display_type = DISPLAY_DGA;
1633	<	if (width > DisplayWidth(x_display, screen))
1634	<	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);
1633	>	#endif
1634	>	}
1635		}
1636	<
1637	<	// Initialize according to display type
1638	<	switch (display_type) {
1639	<	case DISPLAY_WINDOW:
1640	<	if (!init_window(width, height))
1641	<	return false;
1636	>	if (default_width <= 0)
1637	>	default_width = DisplayWidth(x_display, screen);
1638	>	else if (default_width > DisplayWidth(x_display, screen))
1639	>	default_width = DisplayWidth(x_display, screen);
1640	>	if (default_height <= 0)
1641	>	default_height = DisplayHeight(x_display, screen);
1642	>	else if (default_height > DisplayHeight(x_display, screen))
1643	>	default_height = DisplayHeight(x_display, screen);
1644	>
1645	>	// Mac screen depth follows X depth
1646	>	video_depth default_depth = VDEPTH_1BIT;
1647	>	switch (DefaultDepth(x_display, screen)) {
1648	>	case 8:
1649	>	default_depth = VDEPTH_8BIT;
1650		break;
1651	<	case DISPLAY_DGA:
1652	<	#ifdef ENABLE_FBDEV_DGA
1653	<	if (!init_fbdev_dga(fb_name))
1654	<	#else
1655	<	if (!init_xf86_dga(width, height))
1048	<	#endif
1049	<	return false;
1651	>	case 15: case 16:
1652	>	default_depth = VDEPTH_16BIT;
1653	>	break;
1654	>	case 24: case 32:
1655	>	default_depth = VDEPTH_32BIT;
1656		break;
1657		}
1658
1659	<	#ifdef HAVE_PTHREADS
1660	<	// Lock down frame buffer
1661	<	pthread_mutex_lock(&frame_buffer_lock);
1662	<	#endif
1663	<
1664	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1665	<	// Set variables for UAE memory mapping
1666	<	MacFrameBaseHost = the_buffer;
1667	<	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;
1659	>	// Construct list of supported modes
1660	>	if (display_type == DISPLAY_WINDOW) {
1661	>	if (classic)
1662	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1663	>	else {
1664	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1665	>	if (find_visual_for_depth(video_depth(d)))
1666	>	add_window_modes(video_depth(d));
1667	>	}
1668		}
1669	+	} else
1670	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1671	+	if (VideoModes.empty()) {
1672	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1673	+	return false;
1674	+	}
1675
1676	<	// Initialize the handler for SIGSEGV
1677	<	if (!Screen_fault_handler_init()) {
1678	<	// TODO: STR_VOSF_INIT_ERR ?
1679	<	ErrorAlert("Could not initialize Video on SEGV signals");
1680	<	return false;
1676	>	// Find requested default mode with specified dimensions
1677	>	uint32 default_id;
1678	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1679	>	for (i = VideoModes.begin(); i != end; ++i) {
1680	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1681	>	default_id = i->resolution_id;
1682	>	break;
1683		}
1684		}
1685	<	#endif
1686	<
1687	<	// Initialize VideoRefresh function
1688	<	VideoRefreshInit();
1088	<
1089	<	XSync(x_display, false);
1685	>	if (i == end) { // not found, use first available mode
1686	>	default_depth = VideoModes[0].depth;
1687	>	default_id = VideoModes[0].resolution_id;
1688	>	}
1689
1690	<	#ifdef HAVE_PTHREADS
1691	<	// Start redraw/input thread
1692	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1693	<	if (!redraw_thread_active) {
1694	<	printf("FATAL: cannot create redraw thread\n");
1695	<	return false;
1690	>	#if DEBUG
1691	>	D(bug("Available video modes:\n"));
1692	>	for (i = VideoModes.begin(); i != end; ++i) {
1693	>	int bits = 1 << i->depth;
1694	>	if (bits == 16)
1695	>	bits = 15;
1696	>	else if (bits == 32)
1697	>	bits = 24;
1698	>	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1699		}
1700		#endif
1701	<	return true;
1701	>
1702	>	// Create X11_monitor_desc for this (the only) display
1703	>	X11_monitor_desc *monitor = new X11_monitor_desc(VideoModes, default_depth, default_id);
1704	>	VideoMonitors.push_back(monitor);
1705	>
1706	>	// Open display
1707	>	return monitor->video_open();
1708		}
1709
1710
#	Line 1104 \| Line 1712 \| bool VideoInit(bool classic)
1712		* Deinitialization
1713		*/
1714
1715	<	void VideoExit(void)
1715	>	// Close display
1716	>	void X11_monitor_desc::video_close(void)
1717		{
1718	<	#ifdef HAVE_PTHREADS
1718	>	D(bug("video_close()\n"));
1719	>
1720		// Stop redraw thread
1721	+	#ifdef HAVE_PTHREADS
1722		if (redraw_thread_active) {
1723		redraw_thread_cancel = true;
1724	<	#ifdef HAVE_PTHREAD_CANCEL
1114	<	pthread_cancel(redraw_thread);
1115	<	#endif
1724	>	redraw_thread_cancel_ack = false;
1725		pthread_join(redraw_thread, NULL);
1726	<	redraw_thread_active = false;
1726	>	while (!redraw_thread_cancel_ack) ;
1727		}
1728		#endif
1729	+	redraw_thread_active = false;
1730
1121	–	#ifdef HAVE_PTHREADS
1731		// Unlock frame buffer
1732	<	pthread_mutex_unlock(&frame_buffer_lock);
1732	>	UNLOCK_FRAME_BUFFER;
1733	>	XSync(x_display, false);
1734	>	D(bug(" frame buffer unlocked\n"));
1735	>
1736	>	#ifdef ENABLE_VOSF
1737	>	if (use_vosf) {
1738	>	// Deinitialize VOSF
1739	>	video_vosf_exit();
1740	>	}
1741		#endif
1742
1743	<	// Close window and server connection
1744	<	if (x_display != NULL) {
1745	<	XSync(x_display, false);
1743	>	// Close display
1744	>	delete drv;
1745	>	drv = NULL;
1746
1747	<	#ifdef ENABLE_XF86_DGA
1748	<	if (display_type == DISPLAY_DGA) {
1749	<	XF86DGADirectVideo(x_display, screen, 0);
1750	<	XUngrabPointer(x_display, CurrentTime);
1751	<	XUngrabKeyboard(x_display, CurrentTime);
1752	<	}
1753	<	#endif
1747	>	// Free colormaps
1748	>	if (cmap[0]) {
1749	>	XFreeColormap(x_display, cmap[0]);
1750	>	cmap[0] = 0;
1751	>	}
1752	>	if (cmap[1]) {
1753	>	XFreeColormap(x_display, cmap[1]);
1754	>	cmap[1] = 0;
1755	>	}
1756	>	}
1757	>
1758	>	void VideoExit(void)
1759	>	{
1760	>	// Close displays
1761	>	vector<monitor_desc *>::iterator i, end = VideoMonitors.end();
1762	>	for (i = VideoMonitors.begin(); i != end; ++i)
1763	>	dynamic_cast<X11_monitor_desc >(i)->video_close();
1764
1765		#ifdef ENABLE_XF86_VIDMODE
1766	<	if (has_vidmode && display_type == DISPLAY_DGA)
1767	<	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1766	>	// Free video mode list
1767	>	if (x_video_modes) {
1768	>	XFree(x_video_modes);
1769	>	x_video_modes = NULL;
1770	>	}
1771		#endif
1772
1773		#ifdef ENABLE_FBDEV_DGA
1774	<	if (display_type == DISPLAY_DGA) {
1775	<	XUngrabPointer(x_display, CurrentTime);
1776	<	XUngrabKeyboard(x_display, CurrentTime);
1777	<	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
1774	>	// Close framebuffer device
1775	>	if (fbdev_fd >= 0) {
1776	>	close(fbdev_fd);
1777	>	fbdev_fd = -1;
1778		}
1779	<
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	<	}
1779	>	#endif
1780
1781	<	if (mainBuffer.dirtyPages) {
1782	<	free(mainBuffer.dirtyPages);
1783	<	mainBuffer.dirtyPages = 0;
1784	<	}
1781	>	// Free depth list
1782	>	if (avail_depths) {
1783	>	XFree(avail_depths);
1784	>	avail_depths = NULL;
1785		}
1197	–
1198	–	// Close /dev/zero
1199	–	if (zero_fd > 0)
1200	–	close(zero_fd);
1201	–	#endif
1786		}
1787
1788
#	Line 1209 \| Line 1793 \| void VideoExit(void)
1793		void VideoQuitFullScreen(void)
1794		{
1795		D(bug("VideoQuitFullScreen()\n"));
1796	<	if (display_type == DISPLAY_DGA)
1213	<	quit_full_screen = true;
1796	>	quit_full_screen = true;
1797		}
1798
1799
#	Line 1224 \| Line 1807 \| void VideoInterrupt(void)
1807		if (emerg_quit)
1808		QuitEmulator();
1809
1227	–	#ifdef HAVE_PTHREADS
1810		// Temporarily give up frame buffer lock (this is the point where
1811		// we are suspended when the user presses Ctrl-Tab)
1812	<	pthread_mutex_unlock(&frame_buffer_lock);
1813	<	pthread_mutex_lock(&frame_buffer_lock);
1232	<	#endif
1812	>	UNLOCK_FRAME_BUFFER;
1813	>	LOCK_FRAME_BUFFER;
1814		}
1815
1816
#	Line 1237 \| Line 1818 \| void VideoInterrupt(void)
1818		* Set palette
1819		*/
1820
1821	<	void video_set_palette(uint8 *pal)
1821	>	void X11_monitor_desc::set_palette(uint8 *pal, int num_in)
1822		{
1823	<	#ifdef HAVE_PTHREDS
1824	<	pthread_mutex_lock(&palette_lock);
1825	<	#endif
1823	>	const video_mode &mode = get_current_mode();
1824	>
1825	>	LOCK_PALETTE;
1826
1827		// Convert colors to XColor array
1828	<	for (int i=0; i<256; i++) {
1829	<	palette[i].pixel = i;
1830	<	palette[i].red = pal[i3] 0x0101;
1831	<	palette[i].green = pal[i3+1] 0x0101;
1832	<	palette[i].blue = pal[i3+2] 0x0101;
1833	<	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1828	>	int num_out = 256;
1829	>	bool stretch = false;
1830	>	if (IsDirectMode(mode)) {
1831	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1832	>	num_out = vis->map_entries;
1833	>	stretch = true;
1834	>	}
1835	>	XColor *p = x_palette;
1836	>	for (int i=0; i<num_out; i++) {
1837	>	int c = (stretch ? (i * num_in) / num_out : i);
1838	>	p->red = pal[c3 + 0] 0x0101;
1839	>	p->green = pal[c3 + 1] 0x0101;
1840	>	p->blue = pal[c3 + 2] 0x0101;
1841	>	p++;
1842		}
1843
1844	<	// Tell redraw thread to change palette
1845	<	palette_changed = true;
1844	>	#ifdef ENABLE_VOSF
1845	>	// Recalculate pixel color expansion map
1846	>	if (!IsDirectMode(mode) && xdepth > 8) {
1847	>	for (int i=0; i<256; i++) {
1848	>	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1849	>	ExpandMap[i] = map_rgb(pal[c3+0], pal[c3+1], pal[c*3+2]);
1850	>	}
1851
1852	<	#ifdef HAVE_PTHREADS
1853	<	pthread_mutex_unlock(&palette_lock);
1852	>	// We have to redraw everything because the interpretation of pixel values changed
1853	>	LOCK_VOSF;
1854	>	PFLAG_SET_ALL;
1855	>	UNLOCK_VOSF;
1856	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1857	>	}
1858		#endif
1859	+
1860	+	// Tell redraw thread to change palette
1861	+	x_palette_changed = true;
1862	+
1863	+	UNLOCK_PALETTE;
1864		}
1865
1866
1867		/*
1868	<	* Suspend/resume emulator
1868	>	* Switch video mode
1869		*/
1870
1871	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1269	<	static void suspend_emul(void)
1871	>	void X11_monitor_desc::switch_to_current_mode(void)
1872		{
1873	<	if (display_type == DISPLAY_DGA) {
1874	<	// Release ctrl key
1875	<	ADBKeyUp(0x36);
1274	<	ctrl_down = false;
1873	>	// Close and reopen display
1874	>	video_close();
1875	>	video_open();
1876
1877	<	#ifdef HAVE_PTHREADS
1878	<	// Lock frame buffer (this will stop the MacOS thread)
1879	<	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);
1285	<
1286	<	// Close full screen display
1287	<	#ifdef ENABLE_XF86_DGA
1288	<	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;
1877	>	if (drv == NULL) {
1878	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1879	>	QuitEmulator();
1880		}
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
1881		}
1372	–	#endif
1882
1883
1884		/*
1885	<	* Translate key event to Mac keycode
1885	>	* Translate key event to Mac keycode, returns -1 if no keycode was found
1886	>	* and -2 if the key was recognized as a hotkey
1887		*/
1888
1889	<	static int kc_decode(KeySym ks)
1889	>	static int kc_decode(KeySym ks, bool key_down)
1890		{
1891		switch (ks) {
1892		case XK_A: case XK_a: return 0x00;
#	Line 1429 \| Line 1939 \| static int kc_decode(KeySym ks)
1939		case XK_period: case XK_greater: return 0x2f;
1940		case XK_slash: case XK_question: return 0x2c;
1941
1942	<	#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
1942	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1943		case XK_Return: return 0x24;
1944		case XK_space: return 0x31;
1945		case XK_BackSpace: return 0x33;
#	Line 1467 \| Line 1973 \| static int kc_decode(KeySym ks)
1973		case XK_Left: return 0x3b;
1974		case XK_Right: return 0x3c;
1975
1976	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1976	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1977
1978	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1978	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1979		case XK_F2: return 0x78;
1980		case XK_F3: return 0x63;
1981		case XK_F4: return 0x76;
1982	<	case XK_F5: return 0x60;
1982	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1983		case XK_F6: return 0x61;
1984		case XK_F7: return 0x62;
1985		case XK_F8: return 0x64;
#	Line 1521 \| Line 2027 \| static int kc_decode(KeySym ks)
2027		return -1;
2028		}
2029
2030	<	static int event2keycode(XKeyEvent *ev)
2030	>	static int event2keycode(XKeyEvent &ev, bool key_down)
2031		{
2032		KeySym ks;
1527	–	int as;
2033		int i = 0;
2034
2035		do {
2036	<	ks = XLookupKeysym(ev, i++);
2037	<	as = kc_decode(ks);
2038	<	if (as != -1)
2036	>	ks = XLookupKeysym(&ev, i++);
2037	>	int as = kc_decode(ks, key_down);
2038	>	if (as >= 0)
2039	>	return as;
2040	>	if (as == -2)
2041		return as;
2042		} while (ks != NoSymbol);
2043
#	Line 1544 \| Line 2051 \| *static int event2keycode(XKeyEvent ev)**
2051
2052		static void handle_events(void)
2053		{
1547	–	XEvent event;
2054		for (;;) {
2055	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
2056	<	break;
2055	>	XEvent event;
2056	>	XDisplayLock();
2057
2058	+	if (!XCheckMaskEvent(x_display, eventmask, &event)) {
2059	+	// Handle clipboard events
2060	+	if (XCheckTypedEvent(x_display, SelectionRequest, &event))
2061	+	ClipboardSelectionRequest(&event.xselectionrequest);
2062	+	else if (XCheckTypedEvent(x_display, SelectionClear, &event))
2063	+	ClipboardSelectionClear(&event.xselectionclear);
2064	+
2065	+	// Window "close" widget clicked
2066	+	else if (XCheckTypedEvent(x_display, ClientMessage, &event)) {
2067	+	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
2068	+	ADBKeyDown(0x7f); // Power key
2069	+	ADBKeyUp(0x7f);
2070	+	}
2071	+	}
2072	+	XDisplayUnlock();
2073	+	break;
2074	+	}
2075	+
2076		switch (event.type) {
2077	+
2078		// Mouse button
2079		case ButtonPress: {
2080	<	unsigned int button = ((XButtonEvent *)&event)->button;
2080	>	unsigned int button = event.xbutton.button;
2081		if (button < 4)
2082		ADBMouseDown(button - 1);
2083		else if (button < 6) { // Wheel mouse
#	Line 1571 \| Line 2096 \| static void handle_events(void)
2096		break;
2097		}
2098		case ButtonRelease: {
2099	<	unsigned int button = ((XButtonEvent *)&event)->button;
2099	>	unsigned int button = event.xbutton.button;
2100		if (button < 4)
2101		ADBMouseUp(button - 1);
2102		break;
2103		}
2104
2105		// Mouse moved
1581	–	case EnterNotify:
1582	–	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1583	–	break;
2106		case MotionNotify:
2107	<	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
2107	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2108	>	break;
2109	>
2110	>	// Mouse entered window
2111	>	case EnterNotify:
2112	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2113	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2114		break;
2115
2116		// Keyboard
2117		case KeyPress: {
2118	<	int code;
2118	>	int code = -1;
2119		if (use_keycodes) {
2120	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
2121	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
2120	>	if (event2keycode(event.xkey, true) != -2) // This is called to process the hotkeys
2121	>	code = keycode_table[event.xkey.keycode & 0xff];
2122		} else
2123	<	code = event2keycode((XKeyEvent *)&event);
2124	<	if (code != -1) {
2123	>	code = event2keycode(event.xkey, true);
2124	>	if (code >= 0) {
2125		if (!emul_suspended) {
2126		if (code == 0x39) { // Caps Lock pressed
2127		if (caps_on) {
#	Line 1608 \| Line 2136 \| static void handle_events(void)
2136		if (code == 0x36)
2137		ctrl_down = true;
2138		} else {
1611	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2139		if (code == 0x31)
2140	<	resume_emul(); // Space wakes us up
1614	<	#endif
2140	>	drv->resume(); // Space wakes us up
2141		}
2142		}
2143		break;
2144		}
2145		case KeyRelease: {
2146	<	int code;
2146	>	int code = -1;
2147		if (use_keycodes) {
2148	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
2149	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
2148	>	if (event2keycode(event.xkey, false) != -2) // This is called to process the hotkeys
2149	>	code = keycode_table[event.xkey.keycode & 0xff];
2150		} else
2151	<	code = event2keycode((XKeyEvent *)&event);
2152	<	if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
2151	>	code = event2keycode(event.xkey, false);
2152	>	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
2153		ADBKeyUp(code);
2154		if (code == 0x36)
2155		ctrl_down = false;
#	Line 1634 \| Line 2160 \| static void handle_events(void)
2160		// Hidden parts exposed, force complete refresh of window
2161		case Expose:
2162		if (display_type == DISPLAY_WINDOW) {
2163	+	const video_mode &mode = VideoMonitors[0]->get_current_mode();
2164		#ifdef ENABLE_VOSF
2165		if (use_vosf) { // VOSF refresh
2166	<	#ifdef HAVE_PTHREADS
1640	<	pthread_mutex_lock(&Screen_draw_lock);
1641	<	#endif
2166	>	LOCK_VOSF;
2167		PFLAG_SET_ALL;
2168	<	#ifdef HAVE_PTHREADS
2169	<	pthread_mutex_unlock(&Screen_draw_lock);
1645	<	#endif
1646	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2168	>	UNLOCK_VOSF;
2169	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
2170		}
2171		else
2172		#endif
#	Line 1654 \| Line 2177 \| static void handle_events(void)
2177		updt_box[x1][y1] = true;
2178		nr_boxes = 16 * 16;
2179		} else // Static refresh
2180	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2180	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
2181		}
2182		break;
1660	–
1661	–	case FocusIn:
1662	–	case FocusOut:
1663	–	break;
2183		}
2184	+
2185	+	XDisplayUnlock();
2186		}
2187		}
2188
#	Line 1671 \| Line 2192 \| static void handle_events(void)
2192		*/
2193
2194		// Dynamic display update (variable frame rate for each box)
2195	<	static void update_display_dynamic(int ticker)
2195	>	static void update_display_dynamic(int ticker, driver_window *drv)
2196		{
2197		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2198		int xil = 0;
2199		int rxm = 0, rxmo = 0;
2200	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2201	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2202	<	int rx = VideoMonitor.bytes_per_row / 16;
2203	<	int ry = VideoMonitor.y / 16;
2200	>	const video_mode &mode = drv->monitor.get_current_mode();
2201	>	int bytes_per_row = mode.bytes_per_row;
2202	>	int bytes_per_pixel = mode.bytes_per_row / mode.x;
2203	>	int rx = mode.bytes_per_row / 16;
2204	>	int ry = mode.y / 16;
2205		int max_box;
2206
2207		y2s = sm_uptd[ticker % 8];
#	Line 1705 \| Line 2227 \| static void update_display_dynamic(int t
2227		}
2228		}
2229
2230	+	XDisplayLock();
2231		if ((nr_boxes <= max_box) && (nr_boxes)) {
2232		for (y1=0; y1<16; y1++) {
2233		for (x1=0; x1<16; x1++) {
#	Line 1733 \| Line 2256 \| static void update_display_dynamic(int t
2256		i = (yi * bytes_per_row) + xi;
2257		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2258		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2259	<	if (depth == 1) {
2260	<	if (have_shm)
2261	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2259	>	if (mode.depth == VDEPTH_1BIT) {
2260	>	if (drv->have_shm)
2261	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2262		else
2263	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2263	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2264		} else {
2265	<	if (have_shm)
2266	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2265	>	if (drv->have_shm)
2266	>	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);
2267		else
2268	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2268	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2269		}
2270		xil = 0;
2271		}
#	Line 1758 \| Line 2281 \| static void update_display_dynamic(int t
2281		}
2282		nr_boxes = 0;
2283		}
2284	+	XDisplayUnlock();
2285		}
2286
2287		// Static display update (fixed frame rate, but incremental)
2288	<	static void update_display_static(void)
2288	>	static void update_display_static(driver_window *drv)
2289		{
2290		// Incremental update code
2291	<	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2292	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2293	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2291	>	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
2292	>	const video_mode &mode = drv->monitor.get_current_mode();
2293	>	int bytes_per_row = mode.bytes_per_row;
2294	>	int bytes_per_pixel = mode.bytes_per_row / mode.x;
2295		uint8 p, p2;
2296
2297		// Check for first line from top and first line from bottom that have changed
2298		y1 = 0;
2299	<	for (j=0; j<VideoMonitor.y; j++) {
2299	>	for (j=0; j<mode.y; j++) {
2300		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2301		y1 = j;
2302		break;
2303		}
2304		}
2305		y2 = y1 - 1;
2306	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
2306	>	for (j=mode.y-1; j>=y1; j--) {
2307		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2308		y2 = j;
2309		break;
#	Line 1788 \| Line 2313 \| static void update_display_static(void)
2313
2314		// Check for first column from left and first column from right that have changed
2315		if (high) {
2316	<	if (depth == 1) {
2317	<	x1 = VideoMonitor.x - 1;
2316	>	if (mode.depth == VDEPTH_1BIT) {
2317	>	x1 = mode.x - 1;
2318		for (j=y1; j<=y2; j++) {
2319		p = &the_buffer[j * bytes_per_row];
2320		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1807 \| Line 2332 \| static void update_display_static(void)
2332		p2 = &the_buffer_copy[j * bytes_per_row];
2333		p += bytes_per_row;
2334		p2 += bytes_per_row;
2335	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
2335	>	for (i=(mode.x>>3); i>(x2>>3); i--) {
2336		p--; p2--;
2337		if (p != p2) {
2338		x2 = (i << 3) + 7;
#	Line 1826 \| Line 2351 \| static void update_display_static(void)
2351		}
2352
2353		} else {
2354	<	x1 = VideoMonitor.x;
2354	>	x1 = mode.x;
2355		for (j=y1; j<=y2; j++) {
2356		p = &the_buffer[j * bytes_per_row];
2357		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1844 \| Line 2369 \| static void update_display_static(void)
2369		p2 = &the_buffer_copy[j * bytes_per_row];
2370		p += bytes_per_row;
2371		p2 += bytes_per_row;
2372	<	for (i=VideoMonitor.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2372	>	for (i=mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2373		p--;
2374		p2--;
2375		if (p != p2) {
#	Line 1866 \| Line 2391 \| static void update_display_static(void)
2391		}
2392
2393		// Refresh display
2394	+	XDisplayLock();
2395		if (high && wide) {
2396	<	if (have_shm)
2397	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2396	>	if (drv->have_shm)
2397	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2398		else
2399	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2399	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2400		}
2401	+	XDisplayUnlock();
2402		}
2403
2404
#	Line 1879 \| Line 2406 \| static void update_display_static(void)
2406		* Screen refresh functions
2407		*/
2408
2409	<	// The specialisations hereunder are meant to enable VOSF with DGA in direct
2410	<	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
2411	<	// not get mapped correctly with respect to the predetermined host frame
2412	<	// buffer base address.
2413	<	//
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)
2409	>	// We suggest the compiler to inline the next two functions so that it
2410	>	// may specialise the code according to the current screen depth and
2411	>	// display type. A clever compiler would do that job by itself though...
2412	>
2413	>	// NOTE: update_display_vosf is inlined too
2414
2415		static inline void possibly_quit_dga_mode()
2416		{
2417	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2418	<	// Quit DGA mode if requested
2417	>	// Quit DGA mode if requested (something terrible has happened and we
2418	>	// want to give control back to the user)
2419		if (quit_full_screen) {
2420		quit_full_screen = false;
2421	<	#ifdef ENABLE_XF86_DGA
2422	<	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);
2421	>	delete drv;
2422	>	drv = NULL;
2423		}
1915	–	#endif
2424		}
2425
2426	<	static inline void handle_palette_changes(int depth, int display_type)
2426	>	static inline void possibly_ungrab_mouse()
2427		{
2428	<	#ifdef HAVE_PTHREADS
2429	<	pthread_mutex_lock(&palette_lock);
2430	<	#endif
2431	<	if (palette_changed) {
2432	<	palette_changed = false;
2433	<	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	<	}
2428	>	// Ungrab mouse if requested (something terrible has happened and we
2429	>	// want to give control back to the user)
2430	>	if (quit_full_screen) {
2431	>	quit_full_screen = false;
2432	>	if (drv)
2433	>	drv->ungrab_mouse();
2434		}
2435	<	#ifdef HAVE_PTHREADS
2436	<	pthread_mutex_unlock(&palette_lock);
2437	<	#endif
2435	>	}
2436	>
2437	>	static inline void handle_palette_changes(void)
2438	>	{
2439	>	LOCK_PALETTE;
2440	>
2441	>	if (x_palette_changed) {
2442	>	x_palette_changed = false;
2443	>	XDisplayLock();
2444	>	drv->update_palette();
2445	>	XDisplayUnlock();
2446	>	}
2447	>
2448	>	UNLOCK_PALETTE;
2449		}
2450
2451		static void video_refresh_dga(void)
2452		{
2453		// Quit DGA mode if requested
2454		possibly_quit_dga_mode();
1946	–
1947	–	// Handle X events
1948	–	handle_events();
1949	–
1950	–	// Handle palette changes
1951	–	handle_palette_changes(depth, DISPLAY_DGA);
2455		}
2456
2457		#ifdef ENABLE_VOSF
#	Line 1958 \| Line 2461 \| static void video_refresh_dga_vosf(void)
2461		// Quit DGA mode if requested
2462		possibly_quit_dga_mode();
2463
1961	–	// Handle X events
1962	–	handle_events();
1963	–
1964	–	// Handle palette changes
1965	–	handle_palette_changes(depth, DISPLAY_DGA);
1966	–
2464		// Update display (VOSF variant)
2465		static int tick_counter = 0;
2466		if (++tick_counter >= frame_skip) {
2467		tick_counter = 0;
2468	<	#ifdef HAVE_PTHREADS
2469	<	pthread_mutex_lock(&Screen_draw_lock);
2470	<	#endif
2471	<	update_display_dga_vosf();
2472	<	#ifdef HAVE_PTHREADS
1976	<	pthread_mutex_unlock(&Screen_draw_lock);
1977	<	#endif
2468	>	if (mainBuffer.dirty) {
2469	>	LOCK_VOSF;
2470	>	update_display_dga_vosf();
2471	>	UNLOCK_VOSF;
2472	>	}
2473		}
2474		}
2475		#endif
2476
2477		static void video_refresh_window_vosf(void)
2478		{
2479	<	// Quit DGA mode if requested
2480	<	possibly_quit_dga_mode();
1986	<
1987	<	// Handle X events
1988	<	handle_events();
1989	<
1990	<	// Handle palette changes
1991	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2479	>	// Ungrab mouse if requested
2480	>	possibly_ungrab_mouse();
2481
2482		// Update display (VOSF variant)
2483		static int tick_counter = 0;
2484		if (++tick_counter >= frame_skip) {
2485		tick_counter = 0;
2486	<	#ifdef HAVE_PTHREADS
2487	<	pthread_mutex_lock(&Screen_draw_lock);
2488	<	#endif
2489	<	update_display_window_vosf();
2490	<	#ifdef HAVE_PTHREADS
2491	<	pthread_mutex_unlock(&Screen_draw_lock);
2492	<	#endif
2486	>	if (mainBuffer.dirty) {
2487	>	XDisplayLock();
2488	>	LOCK_VOSF;
2489	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2490	>	UNLOCK_VOSF;
2491	>	XSync(x_display, false); // Let the server catch up
2492	>	XDisplayUnlock();
2493	>	}
2494		}
2495		}
2496		#endif // def ENABLE_VOSF
2497
2498		static void video_refresh_window_static(void)
2499		{
2500	<	// Handle X events
2501	<	handle_events();
2502	<
2013	<	// Handle_palette changes
2014	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2015	<
2500	>	// Ungrab mouse if requested
2501	>	possibly_ungrab_mouse();
2502	>
2503		// Update display (static variant)
2504		static int tick_counter = 0;
2505		if (++tick_counter >= frame_skip) {
2506		tick_counter = 0;
2507	<	update_display_static();
2507	>	update_display_static(static_cast<driver_window *>(drv));
2508		}
2509		}
2510
2511		static void video_refresh_window_dynamic(void)
2512		{
2513	<	// Handle X events
2514	<	handle_events();
2515	<
2029	<	// Handle_palette changes
2030	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2031	<
2513	>	// Ungrab mouse if requested
2514	>	possibly_ungrab_mouse();
2515	>
2516		// Update display (dynamic variant)
2517		static int tick_counter = 0;
2518		tick_counter++;
2519	<	update_display_dynamic(tick_counter);
2519	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2520		}
2521
2522
#	Line 2040 \| Line 2524 \| static void video_refresh_window_dynamic
2524		* Thread for screen refresh, input handling etc.
2525		*/
2526
2527	<	void VideoRefreshInit(void)
2527	>	static void VideoRefreshInit(void)
2528		{
2529		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2530		if (display_type == DISPLAY_DGA) {
#	Line 2064 \| Line 2548 \| void VideoRefreshInit(void)
2548		}
2549		}
2550
2551	+	// This function is called on non-threaded platforms from a timer interrupt
2552		void VideoRefresh(void)
2553		{
2554	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2555	<	video_refresh();
2556	<	}
2557	<
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
2554	>	// We need to check redraw_thread_active to inhibit refreshed during
2555	>	// mode changes on non-threaded platforms
2556	>	if (!redraw_thread_active)
2557	>	return;
2558
2559		// Handle X events
2560		handle_events();
2561
2562		// Handle palette changes
2563	<	#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
2563	>	handle_palette_changes();
2564
2565	<	// In window mode, update display
2566	<	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	<	}
2565	>	// Update display
2566	>	video_refresh();
2567		}
2568	<	#endif
2568	>
2569	>	const int VIDEO_REFRESH_HZ = 60;
2570	>	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2571
2572		#ifdef HAVE_PTHREADS
2573		static void redraw_func(void arg)
2574		{
2575	+	int fd = ConnectionNumber(x_display);
2576	+
2577		uint64 start = GetTicks_usec();
2578		int64 ticks = 0;
2579	<	uint64 next = GetTicks_usec();
2579	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2580	>
2581		while (!redraw_thread_cancel) {
2582	<	// VideoRefresh();
2139	<	video_refresh();
2140	<	next += 16667;
2582	>
2583		int64 delay = next - GetTicks_usec();
2584	<	if (delay > 0)
2585	<	Delay_usec(delay);
2586	<	else if (delay < -16667)
2584	>	if (delay < -VIDEO_REFRESH_DELAY) {
2585	>
2586	>	// We are lagging far behind, so we reset the delay mechanism
2587		next = GetTicks_usec();
2588	<	ticks++;
2588	>
2589	>	} else if (delay <= 0) {
2590	>
2591	>	// Delay expired, refresh display
2592	>	handle_events();
2593	>	handle_palette_changes();
2594	>	video_refresh();
2595	>	next += VIDEO_REFRESH_DELAY;
2596	>	ticks++;
2597	>
2598	>	} else {
2599	>
2600	>	// No display refresh pending, check for X events
2601	>	fd_set readfds;
2602	>	FD_ZERO(&readfds);
2603	>	FD_SET(fd, &readfds);
2604	>	struct timeval timeout;
2605	>	timeout.tv_sec = 0;
2606	>	timeout.tv_usec = delay;
2607	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2608	>	handle_events();
2609	>	}
2610		}
2611	+
2612		uint64 end = GetTicks_usec();
2613	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2613	>	D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2614	>
2615	>	redraw_thread_cancel_ack = true;
2616		return NULL;
2617		}
2618		#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.77 by gbeauche, 2005-03-21T23:57:34Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.26 by cebix, 2000-10-27T17:01:40Z vs.
Revision 1.77 by gbeauche, 2005-03-21T23:57:34Z