[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.71 by gbeauche, 2004-06-23T14:30:48Z

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

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs.
Revision 1.71 by gbeauche, 2004-06-23T14:30:48Z