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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs.
Revision 1.74 by gbeauche, 2004-11-15T23:40:23Z

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

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs. Revision 1.74 by gbeauche, 2004-11-15T23:40:23Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs.
Revision 1.74 by gbeauche, 2004-11-15T23:40:23Z