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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.38 by gbeauche, 2001-05-20T20:31:50Z vs.
Revision 1.66 by cebix, 2002-04-25T11:00:31Z

#	Line 1 \| Line 1
1		/*
2		* video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	* Basilisk II (C) 1997-2001 Christian Bauer
4	>	* Basilisk II (C) 1997-2002 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 <fcntl.h>
57	–	# include <sys/mman.h>
58	–	# include "sigsegv.h"
59	–	#endif
60	–
58		#include "cpu_emulation.h"
59		#include "main.h"
60		#include "adb.h"
#	Line 70 \| Line 67
67		#include "debug.h"
68
69
70	+	// Supported video modes
71	+	static vector<video_mode> VideoModes;
72	+
73		// Display types
74		enum {
75		DISPLAY_WINDOW, // X11 window, using MIT SHM extensions if possible
#	Line 78 \| Line 78 \| enum {
78
79		// Constants
80		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
81	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
81	>
82	>	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask \| StructureNotifyMask;
83	>	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
84
85
86		// Global variables
87		static int32 frame_skip; // Prefs items
88	<	static int16 mouse_wheel_mode = 1;
89	<	static int16 mouse_wheel_lines = 3;
88	>	static int16 mouse_wheel_mode;
89	>	static int16 mouse_wheel_lines;
90
91		static int display_type = DISPLAY_WINDOW; // See enum above
92		static bool local_X11; // Flag: X server running on local machine?
93	<	static uint8 *the_buffer; // Mac frame buffer
93	>	static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into)
94	>	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes)
95	>	static uint32 the_buffer_size; // Size of allocated the_buffer
96
93	–	#ifdef HAVE_PTHREADS
97		static bool redraw_thread_active = false; // Flag: Redraw thread installed
98	<	static volatile bool redraw_thread_cancel = false; // Flag: Cancel Redraw thread
98	>	#ifdef HAVE_PTHREADS
99	>	static pthread_attr_t redraw_thread_attr; // Redraw thread attributes
100	>	static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
101		static pthread_t redraw_thread; // Redraw thread
102		#endif
103
104		static bool has_dga = false; // Flag: Video DGA capable
105		static bool has_vidmode = false; // Flag: VidMode extension available
106
107	+	#ifdef ENABLE_VOSF
108	+	static bool use_vosf = true; // Flag: VOSF enabled
109	+	#else
110	+	static const bool use_vosf = false; // VOSF not possible
111	+	#endif
112	+
113		static bool ctrl_down = false; // Flag: Ctrl key pressed
114		static bool caps_on = false; // Flag: Caps Lock on
115		static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread
#	Line 112 \| Line 123 \| static int keycode_table[256]; // X
123
124		// X11 variables
125		static int screen; // Screen number
126	<	static int xdepth; // Depth of X screen
127	<	static int depth; // Depth of Mac frame buffer
128	<	static Window rootwin, the_win; // Root window and our window
118	<	static XVisualInfo visualInfo;
119	<	static Visual *vis;
120	<	static Colormap cmap[2]; // Two colormaps (DGA) for 8-bit mode
126	>	static Window rootwin; // Root window and our window
127	>	static int num_depths = 0; // Number of available X depths
128	>	static int *avail_depths = NULL; // List of available X depths
129		static XColor black, white;
130		static unsigned long black_pixel, white_pixel;
131		static int eventmask;
124	–	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask \| StructureNotifyMask;
125	–	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
126	–	static Atom WM_DELETE_WINDOW = (Atom)0;
132
133	<	static XColor palette[256]; // Color palette for 8-bit mode
134	<	static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
135	<	#ifdef HAVE_PTHREADS
136	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
132	<	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
133	<	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
134	<	#else
135	<	#define LOCK_PALETTE
136	<	#define UNLOCK_PALETTE
137	<	#endif
138	<
139	<	// Variables for window mode
140	<	static GC the_gc;
141	<	static XImage *img = NULL;
142	<	static XShmSegmentInfo shminfo;
143	<	static Cursor mac_cursor;
144	<	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
145	<	static bool have_shm = false; // Flag: SHM extensions available
146	<	static bool updt_box[17][17]; // Flag for Update
147	<	static int nr_boxes;
148	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
149	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
133	>	static int xdepth; // Depth of X screen
134	>	static XVisualInfo visualInfo;
135	>	static Visual *vis;
136	>	static int color_class;
137
138	<	// Variables for XF86 DGA mode
152	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
153	<	static Window suspend_win; // "Suspend" window
154	<	static void *fb_save = NULL; // Saved frame buffer for suspend
155	<	#ifdef HAVE_PTHREADS
156	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
157	<	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
158	<	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
159	<	#else
160	<	#define LOCK_FRAME_BUFFER
161	<	#define UNLOCK_FRAME_BUFFER
162	<	#endif
138	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
139
140	<	// Variables for fbdev DGA mode
165	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
166	<	static int fbdev_fd;
140	>	static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them)
141
142	<	#ifdef ENABLE_XF86_VIDMODE
143	<	// Variables for XF86 VidMode support
170	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
171	<	static int num_x_video_modes;
172	<	#endif
142	>	static XColor x_palette[256]; // Color palette to be used as CLUT and gamma table
143	>	static bool x_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
144
145	<	#ifdef ENABLE_VOSF
146	<	static bool use_vosf = true; // Flag: VOSF enabled
176	<	#else
177	<	static const bool use_vosf = false; // Flag: VOSF enabled
145	>	#ifdef ENABLE_FBDEV_DGA
146	>	static int fbdev_fd = -1;
147		#endif
148
149	<	#ifdef ENABLE_VOSF
150	<	// Variables for Video on SEGV support (taken from the Win32 port)
151	<	static uint8 *the_host_buffer; // Host frame buffer in VOSF mode
183	<	static uint32 the_buffer_size; // Size of allocated the_buffer
184	<
185	<	struct ScreenPageInfo {
186	<	int top, bottom; // Mapping between this virtual page and Mac scanlines
187	<	};
188	<
189	<	struct ScreenInfo {
190	<	uint32 memBase; // Real start address
191	<	uint32 memStart; // Start address aligned to page boundary
192	<	uint32 memEnd; // Address of one-past-the-end of the screen
193	<	uint32 memLength; // Length of the memory addressed by the screen pages
194	<
195	<	uint32 pageSize; // Size of a page
196	<	int pageBits; // Shift count to get the page number
197	<	uint32 pageCount; // Number of pages allocated to the screen
198	<
199	<	bool dirty; // Flag: set if the frame buffer was touched
200	<	char * dirtyPages; // Table of flags set if page was altered
201	<	ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines
202	<	};
203	<
204	<	static ScreenInfo mainBuffer;
205	<
206	<	#define PFLAG_SET_VALUE 0x00
207	<	#define PFLAG_CLEAR_VALUE 0x01
208	<	#define PFLAG_SET_VALUE_4 0x00000000
209	<	#define PFLAG_CLEAR_VALUE_4 0x01010101
210	<	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = PFLAG_SET_VALUE
211	<	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = PFLAG_CLEAR_VALUE
212	<	#define PFLAG_ISSET(page) (mainBuffer.dirtyPages[page] == PFLAG_SET_VALUE)
213	<	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] != PFLAG_SET_VALUE)
214	<
215	<	#ifdef UNALIGNED_PROFITABLE
216	<	# define PFLAG_ISSET_4(page) (((uint32 )(mainBuffer.dirtyPages + (page))) == PFLAG_SET_VALUE_4)
217	<	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + (page))) == PFLAG_CLEAR_VALUE_4)
218	<	#else
219	<	# define PFLAG_ISSET_4(page) \
220	<	PFLAG_ISSET(page ) && PFLAG_ISSET(page+1) \
221	<	&& PFLAG_ISSET(page+2) && PFLAG_ISSET(page+3)
222	<	# define PFLAG_ISCLEAR_4(page) \
223	<	PFLAG_ISCLEAR(page ) && PFLAG_ISCLEAR(page+1) \
224	<	&& PFLAG_ISCLEAR(page+2) && PFLAG_ISCLEAR(page+3)
225	<	#endif
226	<
227	<	// Set the selected page range [ first_page, last_page [ into the SET state
228	<	#define PFLAG_SET_RANGE(first_page, last_page) \
229	<	memset(mainBuffer.dirtyPages + (first_page), PFLAG_SET_VALUE, \
230	<	(last_page) - (first_page))
231	<
232	<	// Set the selected page range [ first_page, last_page [ into the CLEAR state
233	<	#define PFLAG_CLEAR_RANGE(first_page, last_page) \
234	<	memset(mainBuffer.dirtyPages + (first_page), PFLAG_CLEAR_VALUE, \
235	<	(last_page) - (first_page))
236	<
237	<	#define PFLAG_SET_ALL do { \
238	<	PFLAG_SET_RANGE(0, mainBuffer.pageCount); \
239	<	mainBuffer.dirty = true; \
240	<	} while (0)
241	<
242	<	#define PFLAG_CLEAR_ALL do { \
243	<	PFLAG_CLEAR_RANGE(0, mainBuffer.pageCount); \
244	<	mainBuffer.dirty = false; \
245	<	} while (0)
246	<
247	<	// Set the following macro definition to 1 if your system
248	<	// provides a really fast strchr() implementation
249	<	//#define HAVE_FAST_STRCHR 0
250	<
251	<	static inline int find_next_page_set(int page)
252	<	{
253	<	#if HAVE_FAST_STRCHR
254	<	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_SET_VALUE);
255	<	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
256	<	#else
257	<	while (PFLAG_ISCLEAR_4(page))
258	<	page += 4;
259	<	while (PFLAG_ISCLEAR(page))
260	<	page++;
261	<	return page;
149	>	#ifdef ENABLE_XF86_VIDMODE
150	>	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
151	>	static int num_x_video_modes;
152		#endif
263	–	}
153
154	<	static inline int find_next_page_clear(int page)
155	<	{
156	<	#if HAVE_FAST_STRCHR
157	<	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_CLEAR_VALUE);
158	<	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
154	>	// Mutex to protect palette
155	>	#ifdef HAVE_PTHREADS
156	>	static pthread_mutex_t x_palette_lock = PTHREAD_MUTEX_INITIALIZER;
157	>	#define LOCK_PALETTE pthread_mutex_lock(&x_palette_lock)
158	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&x_palette_lock)
159		#else
160	<	while (PFLAG_ISSET_4(page))
161	<	page += 4;
273	<	while (PFLAG_ISSET(page))
274	<	page++;
275	<	return page;
160	>	#define LOCK_PALETTE
161	>	#define UNLOCK_PALETTE
162		#endif
277	–	}
278	–
279	–	static int zero_fd = -1;
163
164	+	// Mutex to protect frame buffer
165		#ifdef HAVE_PTHREADS
166	<	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
167	<	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
168	<	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
166	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
167	>	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
168	>	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
169		#else
170	<	#define LOCK_VOSF
171	<	#define UNLOCK_VOSF
170	>	#define LOCK_FRAME_BUFFER
171	>	#define UNLOCK_FRAME_BUFFER
172		#endif
173
174	<	static int log_base_2(uint32 x)
175	<	{
176	<	uint32 mask = 0x80000000;
177	<	int l = 31;
178	<	while (l >= 0 && (x & mask) == 0) {
295	<	mask >>= 1;
296	<	l--;
297	<	}
298	<	return l;
299	<	}
300	<	#endif /* ENABLE_VOSF */
174	>	// Variables for non-VOSF incremental refresh
175	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
176	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
177	>	static bool updt_box[17][17];
178	>	static int nr_boxes;
179
180	<	// VideoRefresh function
181	<	void VideoRefreshInit(void);
180	>	// Video refresh function
181	>	static void VideoRefreshInit(void);
182		static void (*video_refresh)(void);
183
184	+
185		// Prototypes
186		static void redraw_func(void arg);
308	–	static int event2keycode(XKeyEvent &ev);
309	–
187
188		// From main_unix.cpp
189		extern char *x_display_name;
#	Line 315 \| Line 192 \| *extern Display x_display;**
192		// From sys_unix.cpp
193		extern void SysMountFirstFloppy(void);
194
195	<	#ifdef ENABLE_VOSF
196	<	# include "video_vosf.h"
197	<	#endif
195	>
196	>	/*
197	>	* monitor_desc subclass for X11 display
198	>	*/
199	>
200	>	class X11_monitor_desc : public monitor_desc {
201	>	public:
202	>	X11_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
203	>	~X11_monitor_desc() {}
204	>
205	>	virtual void switch_to_current_mode(void);
206	>	virtual void set_palette(uint8 *pal, int num);
207	>
208	>	bool video_open(void);
209	>	void video_close(void);
210	>	};
211
212
213		/*
214	<	* Initialization
214	>	* Utility functions
215		*/
216
217	<	// Set VideoMonitor according to video mode
218	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
217	>	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
218	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
219		{
220	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
221	<	int layout = FLAYOUT_DIRECT;
220	>	return ((red >> rloss) << rshift) \| ((green >> gloss) << gshift) \| ((blue >> bloss) << bshift);
221	>	}
222	>
223	>	// Do we have a visual for handling the specified Mac depth? If so, set the
224	>	// global variables "xdepth", "visualInfo", "vis" and "color_class".
225	>	static bool find_visual_for_depth(video_depth depth)
226	>	{
227	>	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
228	>
229	>	// 1-bit works always and uses default visual
230	>	if (depth == VDEPTH_1BIT) {
231	>	vis = DefaultVisual(x_display, screen);
232	>	visualInfo.visualid = XVisualIDFromVisual(vis);
233	>	int num = 0;
234	>	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
235	>	visualInfo = vi[0];
236	>	XFree(vi);
237	>	xdepth = visualInfo.depth;
238	>	color_class = visualInfo.c_class;
239	>	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
240	>	return true;
241	>	}
242	>
243	>	// Calculate minimum and maximum supported X depth
244	>	int min_depth = 1, max_depth = 32;
245		switch (depth) {
246	<	case 1:
247	<	layout = FLAYOUT_DIRECT;
248	<	break;
249	<	case 8:
250	<	layout = FLAYOUT_DIRECT;
246	>	#ifdef ENABLE_VOSF
247	>	case VDEPTH_2BIT:
248	>	case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
249	>	case VDEPTH_8BIT:
250	>	min_depth = 8;
251	>	max_depth = 32;
252		break;
253	<	case 15:
254	<	layout = FLAYOUT_HOST_555;
253	>	#else
254	>	case VDEPTH_2BIT:
255	>	case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters
256	>	return false;
257	>	case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual
258	>	min_depth = 8;
259	>	max_depth = 8;
260		break;
261	<	case 16:
262	<	layout = FLAYOUT_HOST_565;
261	>	#endif
262	>	case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual
263	>	min_depth = 15;
264	>	max_depth = 16;
265		break;
266	<	case 24:
267	<	case 32:
268	<	layout = FLAYOUT_HOST_888;
266	>	case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual
267	>	min_depth = 24;
268	>	max_depth = 32;
269		break;
270		}
271	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
272	+
273	+	// Try to find a visual for one of the color depths
274	+	bool visual_found = false;
275	+	for (int i=0; i<num_depths && !visual_found; i++) {
276	+
277	+	xdepth = avail_depths[i];
278	+	D(bug(" trying to find visual for depth %d\n", xdepth));
279	+	if (xdepth < min_depth \|\| xdepth > max_depth)
280	+	continue;
281	+
282	+	// Determine best color class for this depth
283	+	switch (xdepth) {
284	+	case 1: // Try StaticGray or StaticColor
285	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
286	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
287	+	visual_found = true;
288	+	break;
289	+	case 8: // Need PseudoColor
290	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
291	+	visual_found = true;
292	+	break;
293	+	case 15:
294	+	case 16:
295	+	case 24:
296	+	case 32: // Try DirectColor first, as this will allow gamma correction
297	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
298	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
299	+	visual_found = true;
300	+	break;
301	+	default:
302	+	D(bug(" not a supported depth\n"));
303	+	break;
304	+	}
305	+	}
306	+	if (!visual_found)
307	+	return false;
308	+
309	+	// Visual was found
310	+	vis = visualInfo.visual;
311	+	color_class = visualInfo.c_class;
312	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
313	+	#if DEBUG
314	+	switch (color_class) {
315	+	case StaticGray: D(bug("StaticGray\n")); break;
316	+	case GrayScale: D(bug("GrayScale\n")); break;
317	+	case StaticColor: D(bug("StaticColor\n")); break;
318	+	case PseudoColor: D(bug("PseudoColor\n")); break;
319	+	case TrueColor: D(bug("TrueColor\n")); break;
320	+	case DirectColor: D(bug("DirectColor\n")); break;
321	+	}
322	+	#endif
323	+	return true;
324	+	}
325	+
326	+	// Add mode to list of supported modes
327	+	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
328	+	{
329	+	video_mode mode;
330	+	mode.x = width;
331	+	mode.y = height;
332	+	mode.resolution_id = resolution_id;
333	+	mode.bytes_per_row = bytes_per_row;
334	+	mode.depth = depth;
335	+	VideoModes.push_back(mode);
336	+	}
337	+
338	+	// Add standard list of windowed modes for given color depth
339	+	static void add_window_modes(video_depth depth)
340	+	{
341	+	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
342	+	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
343	+	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
344	+	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
345	+	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
346	+	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
347	+	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
348	+	}
349	+
350	+	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
351	+	static void set_mac_frame_buffer(X11_monitor_desc &monitor, video_depth depth, bool native_byte_order)
352	+	{
353	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
354	+	int layout = FLAYOUT_DIRECT;
355	+	if (depth == VDEPTH_16BIT)
356	+	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
357	+	else if (depth == VDEPTH_32BIT)
358	+	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
359		if (native_byte_order)
360		MacFrameLayout = layout;
361		else
362		MacFrameLayout = FLAYOUT_DIRECT;
363	+	monitor.set_mac_frame_base(MacFrameBaseMac);
364	+
365	+	// Set variables used by UAE memory banking
366	+	const video_mode &mode = monitor.get_current_mode();
367	+	MacFrameBaseHost = the_buffer;
368	+	MacFrameSize = mode.bytes_per_row * mode.y;
369	+	InitFrameBufferMapping();
370	+	#else
371	+	monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
372		#endif
373	<	switch (depth) {
356	<	case 1:
357	<	VideoMonitor.mode = VMODE_1BIT;
358	<	break;
359	<	case 8:
360	<	VideoMonitor.mode = VMODE_8BIT;
361	<	break;
362	<	case 15:
363	<	VideoMonitor.mode = VMODE_16BIT;
364	<	break;
365	<	case 16:
366	<	VideoMonitor.mode = VMODE_16BIT;
367	<	break;
368	<	case 24:
369	<	case 32:
370	<	VideoMonitor.mode = VMODE_32BIT;
371	<	break;
372	<	}
373	<	VideoMonitor.x = width;
374	<	VideoMonitor.y = height;
375	<	VideoMonitor.bytes_per_row = bytes_per_row;
373	>	D(bug("monitor.mac_frame_base = %08x\n", monitor.get_mac_frame_base()));
374		}
375
376		// Set window name and class
#	Line 406 \| Line 404 \| static void set_window_focus(Window w)
404		}
405
406		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
407	+	static Atom WM_DELETE_WINDOW = (Atom)0;
408		static void set_window_delete_protocol(Window w)
409		{
410		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 442 \| Line 441 \| *static int error_handler(Display d, XEr**
441		return old_error_handler(d, e);
442		}
443
444	<	// Init window mode
445	<	static bool init_window(int width, int height)
444	>
445	>	/*
446	>	* Display "driver" classes
447	>	*/
448	>
449	>	class driver_base {
450	>	public:
451	>	driver_base(X11_monitor_desc &m);
452	>	virtual ~driver_base();
453	>
454	>	virtual void update_palette(void);
455	>	virtual void suspend(void) {}
456	>	virtual void resume(void) {}
457	>	virtual void toggle_mouse_grab(void) {}
458	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
459	>
460	>	void disable_mouse_accel(void);
461	>	void restore_mouse_accel(void);
462	>
463	>	virtual void grab_mouse(void) {}
464	>	virtual void ungrab_mouse(void) {}
465	>
466	>	public:
467	>	X11_monitor_desc &monitor; // Associated video monitor
468	>	const video_mode &mode; // Video mode handled by the driver
469	>
470	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
471	>	Window w; // The window we draw into
472	>
473	>	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
474	>	};
475	>
476	>	class driver_window;
477	>	static void update_display_window_vosf(driver_window *drv);
478	>	static void update_display_dynamic(int ticker, driver_window *drv);
479	>	static void update_display_static(driver_window *drv);
480	>
481	>	class driver_window : public driver_base {
482	>	friend void update_display_window_vosf(driver_window *drv);
483	>	friend void update_display_dynamic(int ticker, driver_window *drv);
484	>	friend void update_display_static(driver_window *drv);
485	>
486	>	public:
487	>	driver_window(X11_monitor_desc &monitor);
488	>	~driver_window();
489	>
490	>	void toggle_mouse_grab(void);
491	>	void mouse_moved(int x, int y);
492	>
493	>	void grab_mouse(void);
494	>	void ungrab_mouse(void);
495	>
496	>	private:
497	>	GC gc;
498	>	XImage *img;
499	>	bool have_shm; // Flag: SHM extensions available
500	>	XShmSegmentInfo shminfo;
501	>	Cursor mac_cursor;
502	>	bool mouse_grabbed; // Flag: mouse pointer grabbed, using relative mouse mode
503	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
504	>	};
505	>
506	>	static driver_base *drv = NULL; // Pointer to currently used driver object
507	>
508	>	#ifdef ENABLE_VOSF
509	>	# include "video_vosf.h"
510	>	#endif
511	>
512	>	driver_base::driver_base(X11_monitor_desc &m)
513	>	: monitor(m), mode(m.get_current_mode()), init_ok(false), w(0)
514	>	{
515	>	the_buffer = NULL;
516	>	the_buffer_copy = NULL;
517	>	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
518	>	}
519	>
520	>	driver_base::~driver_base()
521		{
522	+	ungrab_mouse();
523	+	restore_mouse_accel();
524	+
525	+	if (w) {
526	+	XUnmapWindow(x_display, w);
527	+	wait_unmapped(w);
528	+	XDestroyWindow(x_display, w);
529	+	}
530	+
531	+	XFlush(x_display);
532	+	XSync(x_display, false);
533	+
534	+	// Free frame buffer(s)
535	+	if (!use_vosf) {
536	+	if (the_buffer) {
537	+	free(the_buffer);
538	+	the_buffer = NULL;
539	+	}
540	+	if (the_buffer_copy) {
541	+	free(the_buffer_copy);
542	+	the_buffer_copy = NULL;
543	+	}
544	+	}
545	+	#ifdef ENABLE_VOSF
546	+	else {
547	+	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
548	+	if (the_buffer != VM_MAP_FAILED) {
549	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
550	+	vm_release(the_buffer, the_buffer_size);
551	+	the_buffer = NULL;
552	+	}
553	+	if (the_host_buffer) {
554	+	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
555	+	free(the_host_buffer);
556	+	the_host_buffer = NULL;
557	+	}
558	+	if (the_buffer_copy) {
559	+	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
560	+	free(the_buffer_copy);
561	+	the_buffer_copy = NULL;
562	+	}
563	+	}
564	+	#endif
565	+	}
566	+
567	+	// Palette has changed
568	+	void driver_base::update_palette(void)
569	+	{
570	+	if (color_class == PseudoColor \|\| color_class == DirectColor) {
571	+	int num = vis->map_entries;
572	+	if (!IsDirectMode(monitor.get_current_mode()) && color_class == DirectColor)
573	+	return; // Indexed mode on true color screen, don't set CLUT
574	+	XStoreColors(x_display, cmap[0], x_palette, num);
575	+	XStoreColors(x_display, cmap[1], x_palette, num);
576	+	}
577	+	XSync(x_display, false);
578	+	}
579	+
580	+	// Disable mouse acceleration
581	+	void driver_base::disable_mouse_accel(void)
582	+	{
583	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
584	+	}
585	+
586	+	// Restore mouse acceleration to original value
587	+	void driver_base::restore_mouse_accel(void)
588	+	{
589	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
590	+	}
591	+
592	+
593	+	/*
594	+	* Windowed display driver
595	+	*/
596	+
597	+	// Open display
598	+	driver_window::driver_window(X11_monitor_desc &m)
599	+	: driver_base(m), gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false)
600	+	{
601	+	int width = mode.x, height = mode.y;
602		int aligned_width = (width + 15) & ~15;
603		int aligned_height = (height + 15) & ~15;
604
605		// Set absolute mouse mode
606	<	ADBSetRelMouseMode(false);
606	>	ADBSetRelMouseMode(mouse_grabbed);
607
608	<	// Read frame skip prefs
609	<	frame_skip = PrefsFindInt32("frameskip");
610	<
457	<	// Create window
608	>	// Create window (setting background_pixel, border_pixel and colormap is
609	>	// mandatory when using a non-default visual; in 1-bit mode we use the
610	>	// default visual, so we can also use the default colormap)
611		XSetWindowAttributes wattr;
612		wattr.event_mask = eventmask = win_eventmask;
613	<	wattr.background_pixel = black_pixel;
614	<	wattr.colormap = cmap[0];
615	<
616	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
617	<	InputOutput, vis, CWEventMask \| CWBackPixel \| (depth == 8 ? CWColormap : 0), &wattr);
613	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
614	>	wattr.border_pixel = 0;
615	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
616	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
617	>	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \| CWColormap, &wattr);
618	>	D(bug(" window created\n"));
619
620		// Set window name/class
621	<	set_window_name(the_win, STR_WINDOW_TITLE);
621	>	set_window_name(w, STR_WINDOW_TITLE);
622
623		// Indicate that we want keyboard input
624	<	set_window_focus(the_win);
624	>	set_window_focus(w);
625
626		// Set delete protocol property
627	<	set_window_delete_protocol(the_win);
627	>	set_window_delete_protocol(w);
628
629		// Make window unresizable
630		{
#	Line 481 \| Line 635 \| static bool init_window(int width, int h
635		hints->min_height = height;
636		hints->max_height = height;
637		hints->flags = PMinSize \| PMaxSize;
638	<	XSetWMNormalHints(x_display, the_win, hints);
638	>	XSetWMNormalHints(x_display, w, hints);
639		XFree(hints);
640		}
641		}
642	+	D(bug(" window attributes set\n"));
643
644		// Show window
645	<	XMapWindow(x_display, the_win);
646	<	wait_mapped(the_win);
645	>	XMapWindow(x_display, w);
646	>	wait_mapped(w);
647	>	D(bug(" window mapped\n"));
648	>
649	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
650	>	// use SHM because that doesn't allow changing the image byte order
651	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
652
653		// Try to create and attach SHM image
654	<	have_shm = false;
495	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
654	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
655
656		// Create SHM image ("height + 2" for safety)
657	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
657	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
658	>	D(bug(" shm image created\n"));
659		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
660		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
661		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 510 \| Line 670 \| static bool init_window(int width, int h
670		if (shm_error) {
671		shmdt(shminfo.shmaddr);
672		XDestroyImage(img);
673	+	img = NULL;
674		shminfo.shmid = -1;
675		} else {
676		have_shm = true;
677		shmctl(shminfo.shmid, IPC_RMID, 0);
678		}
679	+	D(bug(" shm image attached\n"));
680		}
681
682		// Create normal X image if SHM doesn't work ("height + 2" for safety)
683		if (!have_shm) {
684	<	int bytes_per_row = aligned_width;
523	<	switch (depth) {
524	<	case 1:
525	<	bytes_per_row /= 8;
526	<	break;
527	<	case 15:
528	<	case 16:
529	<	bytes_per_row *= 2;
530	<	break;
531	<	case 24:
532	<	case 32:
533	<	bytes_per_row *= 4;
534	<	break;
535	<	}
684	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
685		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
686	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
686	>	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);
687	>	D(bug(" X image created\n"));
688		}
689
690	<	// 1-Bit mode is big-endian
541	<	if (depth == 1) {
690	>	if (need_msb_image) {
691		img->byte_order = MSBFirst;
692		img->bitmap_bit_order = MSBFirst;
693		}
694
695		#ifdef ENABLE_VOSF
696	<	// Allocate a page-aligned chunk of memory for frame buffer
697	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
696	>	use_vosf = true;
697	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
698		the_host_buffer = the_buffer_copy;
699	<
700	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
701	<	memset(the_buffer_copy, 0, the_buffer_size);
702	<
554	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
555	<	memset(the_buffer, 0, the_buffer_size);
699	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
700	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
701	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
702	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
703		#else
704		// Allocate memory for frame buffer
705		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
706	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
707		#endif
708
709		// Create GC
710	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
711	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
710	>	gc = XCreateGC(x_display, w, 0, 0);
711	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
712
713		// Create no_cursor
714		mac_cursor = XCreatePixmapCursor(x_display,
715	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
716	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
715	>	XCreatePixmap(x_display, w, 1, 1, 1),
716	>	XCreatePixmap(x_display, w, 1, 1, 1),
717		&black, &white, 0, 0);
718	<	XDefineCursor(x_display, the_win, mac_cursor);
718	>	XDefineCursor(x_display, w, mac_cursor);
719
720	<	// Set VideoMonitor
720	>	// Init blitting routines
721		bool native_byte_order;
722		#ifdef WORDS_BIGENDIAN
723		native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#	Line 577 \| Line 725 \| static bool init_window(int width, int h
725		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
726		#endif
727		#ifdef ENABLE_VOSF
728	<	Screen_blitter_init(&visualInfo, native_byte_order);
728	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
729		#endif
730	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
731	<
732	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
733	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
730	>
731	>	// Set frame buffer base
732	>	set_mac_frame_buffer(monitor, mode.depth, native_byte_order);
733	>
734	>	// Everything went well
735	>	init_ok = true;
736	>	}
737	>
738	>	// Close display
739	>	driver_window::~driver_window()
740	>	{
741	>	if (have_shm) {
742	>	XShmDetach(x_display, &shminfo);
743	>	#ifdef ENABLE_VOSF
744	>	the_host_buffer = NULL; // don't free() in driver_base dtor
745		#else
746	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
746	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
747		#endif
748	<	return true;
748	>	}
749	>	if (img) {
750	>	if (!have_shm)
751	>	img->data = NULL;
752	>	XDestroyImage(img);
753	>	}
754	>	if (have_shm) {
755	>	shmdt(shminfo.shmaddr);
756	>	shmctl(shminfo.shmid, IPC_RMID, 0);
757	>	}
758	>	if (gc)
759	>	XFreeGC(x_display, gc);
760	>	}
761	>
762	>	// Toggle mouse grab
763	>	void driver_window::toggle_mouse_grab(void)
764	>	{
765	>	if (mouse_grabbed)
766	>	ungrab_mouse();
767	>	else
768	>	grab_mouse();
769	>	}
770	>
771	>	// Grab mouse, switch to relative mouse mode
772	>	void driver_window::grab_mouse(void)
773	>	{
774	>	int result;
775	>	for (int i=0; i<10; i++) {
776	>	result = XGrabPointer(x_display, w, True, 0,
777	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
778	>	if (result != AlreadyGrabbed)
779	>	break;
780	>	Delay_usec(100000);
781	>	}
782	>	if (result == GrabSuccess) {
783	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
784	>	ADBSetRelMouseMode(mouse_grabbed = true);
785	>	disable_mouse_accel();
786	>	}
787	>	}
788	>
789	>	// Ungrab mouse, switch to absolute mouse mode
790	>	void driver_window::ungrab_mouse(void)
791	>	{
792	>	if (mouse_grabbed) {
793	>	XUngrabPointer(x_display, CurrentTime);
794	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
795	>	ADBSetRelMouseMode(mouse_grabbed = false);
796	>	restore_mouse_accel();
797	>	}
798	>	}
799	>
800	>	// Mouse moved
801	>	void driver_window::mouse_moved(int x, int y)
802	>	{
803	>	if (!mouse_grabbed) {
804	>	mouse_last_x = x; mouse_last_y = y;
805	>	ADBMouseMoved(x, y);
806	>	return;
807	>	}
808	>
809	>	// Warped mouse motion (this code is taken from SDL)
810	>
811	>	// Post first mouse event
812	>	int width = monitor.get_current_mode().x, height = monitor.get_current_mode().y;
813	>	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
814	>	mouse_last_x = x; mouse_last_y = y;
815	>	ADBMouseMoved(delta_x, delta_y);
816	>
817	>	// Only warp the pointer when it has reached the edge
818	>	const int MOUSE_FUDGE_FACTOR = 8;
819	>	if (x < MOUSE_FUDGE_FACTOR \|\| x > (width - MOUSE_FUDGE_FACTOR)
820	>	\|\| y < MOUSE_FUDGE_FACTOR \|\| y > (height - MOUSE_FUDGE_FACTOR)) {
821	>	XEvent event;
822	>	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
823	>	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
824	>	mouse_last_x = x; mouse_last_y = y;
825	>	ADBMouseMoved(delta_x, delta_y);
826	>	}
827	>	mouse_last_x = width/2;
828	>	mouse_last_y = height/2;
829	>	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
830	>	for (int i=0; i<10; i++) {
831	>	XMaskEvent(x_display, PointerMotionMask, &event);
832	>	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
833	>	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
834	>	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
835	>	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
836	>	break;
837	>	}
838	>	}
839	>	}
840	>
841	>
842	>	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
843	>	/*
844	>	* DGA display driver base class
845	>	*/
846	>
847	>	class driver_dga : public driver_base {
848	>	public:
849	>	driver_dga(X11_monitor_desc &monitor);
850	>	~driver_dga();
851	>
852	>	void suspend(void);
853	>	void resume(void);
854	>
855	>	private:
856	>	Window suspend_win; // "Suspend" information window
857	>	void *fb_save; // Saved frame buffer for suspend/resume
858	>	};
859	>
860	>	driver_dga::driver_dga(X11_monitor_desc &m)
861	>	: driver_base(m), suspend_win(0), fb_save(NULL)
862	>	{
863	>	}
864	>
865	>	driver_dga::~driver_dga()
866	>	{
867	>	XUngrabPointer(x_display, CurrentTime);
868	>	XUngrabKeyboard(x_display, CurrentTime);
869	>	}
870	>
871	>	// Suspend emulation
872	>	void driver_dga::suspend(void)
873	>	{
874	>	// Release ctrl key
875	>	ADBKeyUp(0x36);
876	>	ctrl_down = false;
877	>
878	>	// Lock frame buffer (this will stop the MacOS thread)
879	>	LOCK_FRAME_BUFFER;
880	>
881	>	// Save frame buffer
882	>	fb_save = malloc(mode.y * mode.bytes_per_row);
883	>	if (fb_save)
884	>	memcpy(fb_save, the_buffer, mode.y * mode.bytes_per_row);
885	>
886	>	// Close full screen display
887	>	#ifdef ENABLE_XF86_DGA
888	>	XF86DGADirectVideo(x_display, screen, 0);
889	>	#endif
890	>	XUngrabPointer(x_display, CurrentTime);
891	>	XUngrabKeyboard(x_display, CurrentTime);
892	>	restore_mouse_accel();
893	>	XUnmapWindow(x_display, w);
894	>	wait_unmapped(w);
895	>
896	>	// Open "suspend" window
897	>	XSetWindowAttributes wattr;
898	>	wattr.event_mask = KeyPressMask;
899	>	wattr.background_pixel = black_pixel;
900	>
901	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
902	>	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
903	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
904	>	set_window_focus(suspend_win);
905	>	XMapWindow(x_display, suspend_win);
906	>	emul_suspended = true;
907		}
908
909	<	// Init fbdev DGA display
910	<	static bool init_fbdev_dga(char *in_fb_name)
909	>	// Resume emulation
910	>	void driver_dga::resume(void)
911		{
912	+	// Close "suspend" window
913	+	XDestroyWindow(x_display, suspend_win);
914	+	XSync(x_display, false);
915	+
916	+	// Reopen full screen display
917	+	XMapRaised(x_display, w);
918	+	wait_mapped(w);
919	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
920	+	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
921	+	XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
922	+	disable_mouse_accel();
923	+	#ifdef ENABLE_XF86_DGA
924	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
925	+	XF86DGASetViewPort(x_display, screen, 0, 0);
926	+	#endif
927	+	XSync(x_display, false);
928	+
929	+	// the_buffer already contains the data to restore. i.e. since a temporary
930	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
931	+	// not necessary.
932	+	#ifdef ENABLE_VOSF
933	+	if (use_vosf) {
934	+	LOCK_VOSF;
935	+	PFLAG_SET_ALL;
936	+	UNLOCK_VOSF;
937	+	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
938	+	}
939	+	#endif
940	+
941	+	// Restore frame buffer
942	+	if (fb_save) {
943	+	#ifdef ENABLE_VOSF
944	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
945	+	if (!use_vosf)
946	+	#endif
947	+	memcpy(the_buffer, fb_save, mode.y * mode.bytes_per_row);
948	+	free(fb_save);
949	+	fb_save = NULL;
950	+	}
951	+
952	+	// Unlock frame buffer (and continue MacOS thread)
953	+	UNLOCK_FRAME_BUFFER;
954	+	emul_suspended = false;
955	+	}
956	+	#endif
957	+
958	+
959		#ifdef ENABLE_FBDEV_DGA
960	+	/*
961	+	* fbdev DGA display driver
962	+	*/
963	+
964	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
965	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
966	+
967	+	class driver_fbdev : public driver_dga {
968	+	public:
969	+	driver_fbdev(X11_monitor_desc &monitor);
970	+	~driver_fbdev();
971	+	};
972	+
973	+	// Open display
974	+	driver_fbdev::driver_fbdev(X11_monitor_desc &m) : driver_dga(m)
975	+	{
976	+	int width = mode.x, height = mode.y;
977	+
978	+	// Set absolute mouse mode
979	+	ADBSetRelMouseMode(false);
980	+
981		// Find the maximum depth available
982		int ndepths, max_depth(0);
983		int *depths = XListDepths(x_display, screen, &ndepths);
984		if (depths == NULL) {
985		printf("FATAL: Could not determine the maximal depth available\n");
986	<	return false;
986	>	return;
987		} else {
988		while (ndepths-- > 0) {
989		if (depths[ndepths] > max_depth)
#	Line 615 \| Line 1000 \| *static bool init_fbdev_dga(char in_fb_n**
1000		char str[256];
1001		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
1002		ErrorAlert(str);
1003	<	return false;
1003	>	return;
1004		}
1005
1006		int fb_depth; // supported depth
#	Line 634 \| Line 1019 \| *static bool init_fbdev_dga(char in_fb_n**
1019		if ((line[0] == '#') \|\| (line[0] == ';') \|\| (line[0] == '\0'))
1020		continue;
1021
1022	<	if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
1023	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
1022	>	if ((sscanf(line, "%19s %d %x", fb_name, &fb_depth, &fb_offset) == 3)
1023	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
1024		device_found = true;
1025		break;
1026		}
#	Line 647 \| Line 1032 \| *static bool init_fbdev_dga(char in_fb_n**
1032		// Frame buffer name not found ? Then, display warning
1033		if (!device_found) {
1034		char str[256];
1035	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
1035	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
1036		ErrorAlert(str);
1037	<	return false;
1037	>	return;
1038		}
1039
655	–	int width = DisplayWidth(x_display, screen);
656	–	int height = DisplayHeight(x_display, screen);
657	–	depth = fb_depth; // max_depth
658	–
659	–	// Set relative mouse mode
660	–	ADBSetRelMouseMode(false);
661	–
1040		// Create window
1041		XSetWindowAttributes wattr;
1042		wattr.event_mask = eventmask = dga_eventmask;
#	Line 666 \| Line 1044 \| *static bool init_fbdev_dga(char in_fb_n**
1044		wattr.override_redirect = True;
1045		wattr.colormap = cmap[0];
1046
1047	<	the_win = XCreateWindow(x_display, rootwin,
1047	>	w = XCreateWindow(x_display, rootwin,
1048		0, 0, width, height,
1049		0, xdepth, InputOutput, vis,
1050	<	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (depth == 8 ? CWColormap : 0),
1050	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
1051		&wattr);
1052
1053		// Set window name/class
1054	<	set_window_name(the_win, STR_WINDOW_TITLE);
1054	>	set_window_name(w, STR_WINDOW_TITLE);
1055
1056		// Indicate that we want keyboard input
1057	<	set_window_focus(the_win);
1057	>	set_window_focus(w);
1058
1059		// Show window
1060	<	XMapRaised(x_display, the_win);
1061	<	wait_mapped(the_win);
1060	>	XMapRaised(x_display, w);
1061	>	wait_mapped(w);
1062
1063		// Grab mouse and keyboard
1064	<	XGrabKeyboard(x_display, the_win, True,
1064	>	XGrabKeyboard(x_display, w, True,
1065		GrabModeAsync, GrabModeAsync, CurrentTime);
1066	<	XGrabPointer(x_display, the_win, True,
1066	>	XGrabPointer(x_display, w, True,
1067		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
1068	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
1068	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1069	>	disable_mouse_accel();
1070
1071	<	// Set VideoMonitor
1072	<	int bytes_per_row = width;
694	<	switch (depth) {
695	<	case 1:
696	<	bytes_per_row = ((width \| 7) & ~7) >> 3;
697	<	break;
698	<	case 15:
699	<	case 16:
700	<	bytes_per_row *= 2;
701	<	break;
702	<	case 24:
703	<	case 32:
704	<	bytes_per_row *= 4;
705	<	break;
706	<	}
1071	>	// Calculate bytes per row
1072	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1073
1074	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1075	<	if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1074	>	// Map frame buffer
1075	>	the_buffer_size = height * bytes_per_row;
1076	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1077	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1078		char str[256];
1079		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1080		ErrorAlert(str);
1081	<	return false;
1081	>	return;
1082		}
1083		}
1084
#	Line 718 \| Line 1086 \| *static bool init_fbdev_dga(char in_fb_n**
1086		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1087		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1088		// i.e. the framebuffer update function is not Blit_Copy_Raw
1089	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1089	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1090
1091		if (use_vosf) {
1092	<	the_host_buffer = the_buffer;
1093	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1094	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1095	<	memset(the_buffer_copy, 0, the_buffer_size);
1096	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
729	<	memset(the_buffer, 0, the_buffer_size);
1092	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1093	>	the_host_buffer = the_buffer;
1094	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1095	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1096	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1097		}
1098		#else
1099		use_vosf = false;
1100		#endif
1101		#endif
1102
1103	<	set_video_monitor(width, height, bytes_per_row, true);
1104	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1105	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1106	<	#else
1107	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1108	<	#endif
1109	<	return true;
1110	<	#else
1111	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
1112	<	return false;
1103	>	// Set frame buffer base
1104	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1105	>	const_cast<video_mode *>(&mode)->depth = DepthModeForPixelDepth(fb_depth);
1106	>	set_mac_frame_buffer(mode.depth, true);
1107	>
1108	>	// Everything went well
1109	>	init_ok = true;
1110	>	}
1111	>
1112	>	// Close display
1113	>	driver_fbdev::~driver_fbdev()
1114	>	{
1115	>	if (!use_vosf) {
1116	>	if (the_buffer != MAP_FAILED) {
1117	>	// don't free() the screen buffer in driver_base dtor
1118	>	munmap(the_buffer, the_buffer_size);
1119	>	the_buffer = NULL;
1120	>	}
1121	>	}
1122	>	#ifdef ENABLE_VOSF
1123	>	else {
1124	>	if (the_host_buffer != MAP_FAILED) {
1125	>	// don't free() the screen buffer in driver_base dtor
1126	>	munmap(the_host_buffer, the_buffer_size);
1127	>	the_host_buffer = NULL;
1128	>	}
1129	>	}
1130		#endif
1131		}
1132	+	#endif
1133	+
1134
749	–	// Init XF86 DGA display
750	–	static bool init_xf86_dga(int width, int height)
751	–	{
1135		#ifdef ENABLE_XF86_DGA
1136	+	/*
1137	+	* XFree86 DGA display driver
1138	+	*/
1139	+
1140	+	class driver_xf86dga : public driver_dga {
1141	+	public:
1142	+	driver_xf86dga(X11_monitor_desc &monitor);
1143	+	~driver_xf86dga();
1144	+
1145	+	void update_palette(void);
1146	+	void resume(void);
1147	+
1148	+	private:
1149	+	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
1150	+	};
1151	+
1152	+	// Open display
1153	+	driver_xf86dga::driver_xf86dga(X11_monitor_desc &m)
1154	+	: driver_dga(m), current_dga_cmap(0)
1155	+	{
1156	+	int width = mode.x, height = mode.y;
1157	+
1158		// Set relative mouse mode
1159		ADBSetRelMouseMode(true);
1160
#	Line 774 \| Line 1179 \| static bool init_xf86_dga(int width, int
1179		wattr.event_mask = eventmask = dga_eventmask;
1180		wattr.override_redirect = True;
1181
1182	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1182	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1183		InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
1184
1185		// Set window name/class
1186	<	set_window_name(the_win, STR_WINDOW_TITLE);
1186	>	set_window_name(w, STR_WINDOW_TITLE);
1187
1188		// Indicate that we want keyboard input
1189	<	set_window_focus(the_win);
1189	>	set_window_focus(w);
1190
1191		// Show window
1192	<	XMapRaised(x_display, the_win);
1193	<	wait_mapped(the_win);
1192	>	XMapRaised(x_display, w);
1193	>	wait_mapped(w);
1194
1195		// Establish direct screen connection
1196	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
1196	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
1197		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1198		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1199		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1200	+	disable_mouse_accel();
1201
1202		int v_width, v_bank, v_size;
1203		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 800 \| Line 1206 \| static bool init_xf86_dga(int width, int
1206		XF86DGASetVidPage(x_display, screen, 0);
1207
1208		// Set colormap
1209	<	if (depth == 8) {
1210	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
1209	>	if (!IsDirectMode(mode)) {
1210	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1211		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1212		}
1213		XSync(x_display, false);
1214
1215	<	// Set VideoMonitor
1216	<	int bytes_per_row = (v_width + 7) & ~7;
1217	<	switch (depth) {
812	<	case 1:
813	<	bytes_per_row /= 8;
814	<	break;
815	<	case 15:
816	<	case 16:
817	<	bytes_per_row *= 2;
818	<	break;
819	<	case 24:
820	<	case 32:
821	<	bytes_per_row *= 4;
822	<	break;
823	<	}
824	<
1215	>	// Init blitting routines
1216	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1217	>	#if VIDEO_VOSF
1218		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1219		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1220		// i.e. the framebuffer update function is not Blit_Copy_Raw
1221	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1221	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1222
1223		if (use_vosf) {
1224	<	the_host_buffer = the_buffer;
1225	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1226	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1227	<	memset(the_buffer_copy, 0, the_buffer_size);
1228	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
836	<	memset(the_buffer, 0, the_buffer_size);
1224	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1225	>	the_host_buffer = the_buffer;
1226	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1227	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1228	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1229		}
1230	<	#elif defined(ENABLE_VOSF)
839	<	// The UAE memory handlers will already handle color conversion, if needed.
1230	>	#else
1231		use_vosf = false;
1232		#endif
1233	+	#endif
1234
1235	<	set_video_monitor(width, height, bytes_per_row, true);
1236	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1237	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1238	<	// MacFrameLayout = FLAYOUT_DIRECT;
1239	<	#else
1240	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1235	>	// Set frame buffer base
1236	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1237	>	set_mac_frame_buffer(monitor, mode.depth, true);
1238	>
1239	>	// Everything went well
1240	>	init_ok = true;
1241	>	}
1242	>
1243	>	// Close display
1244	>	driver_xf86dga::~driver_xf86dga()
1245	>	{
1246	>	XF86DGADirectVideo(x_display, screen, 0);
1247	>	if (!use_vosf) {
1248	>	// don't free() the screen buffer in driver_base dtor
1249	>	the_buffer = NULL;
1250	>	}
1251	>	#ifdef ENABLE_VOSF
1252	>	else {
1253	>	// don't free() the screen buffer in driver_base dtor
1254	>	the_host_buffer = NULL;
1255	>	}
1256		#endif
1257	<	return true;
1258	<	#else
1259	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
853	<	return false;
1257	>	#ifdef ENABLE_XF86_VIDMODE
1258	>	if (has_vidmode)
1259	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1260		#endif
1261		}
1262
1263	+	// Palette has changed
1264	+	void driver_xf86dga::update_palette(void)
1265	+	{
1266	+	driver_dga::update_palette();
1267	+	current_dga_cmap ^= 1;
1268	+	if (!IsDirectMode(monitor.get_current_mode()) && cmap[current_dga_cmap])
1269	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1270	+	}
1271	+
1272	+	// Resume emulation
1273	+	void driver_xf86dga::resume(void)
1274	+	{
1275	+	driver_dga::resume();
1276	+	if (!IsDirectMode(monitor.get_current_mode()))
1277	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1278	+	}
1279	+	#endif
1280	+
1281	+
1282	+	/*
1283	+	* Initialization
1284	+	*/
1285	+
1286		// Init keycode translation table
1287		static void keycode_init(void)
1288		{
#	Line 919 \| Line 1348 \| static void keycode_init(void)
1348		}
1349		}
1350
1351	<	bool VideoInitBuffer()
1351	>	// Open display for current mode
1352	>	bool X11_monitor_desc::video_open(void)
1353		{
1354	<	#ifdef ENABLE_VOSF
1355	<	if (use_vosf) {
926	<	const uint32 page_size = getpagesize();
927	<	const uint32 page_mask = page_size - 1;
928	<
929	<	mainBuffer.memBase = (uint32) the_buffer;
930	<	// Align the frame buffer on page boundary
931	<	mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
932	<	mainBuffer.memLength = the_buffer_size;
933	<	mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength;
1354	>	D(bug("video_open()\n"));
1355	>	const video_mode &mode = get_current_mode();
1356
1357	<	mainBuffer.pageSize = page_size;
1358	<	mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
1359	<	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
1357	>	// Find best available X visual
1358	>	if (!find_visual_for_depth(mode.depth)) {
1359	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1360	>	return false;
1361	>	}
1362
1363	<	if (mainBuffer.dirtyPages != 0)
1364	<	free(mainBuffer.dirtyPages);
1363	>	// Create color maps
1364	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1365	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1366	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1367	>	} else {
1368	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1369	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1370	>	}
1371
1372	<	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
1372	>	// Find pixel format of direct modes
1373	>	if (color_class == DirectColor \|\| color_class == TrueColor) {
1374	>	rshift = gshift = bshift = 0;
1375	>	rloss = gloss = bloss = 8;
1376	>	uint32 mask;
1377	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1378	>	++rshift;
1379	>	for (; mask&1; mask>>=1)
1380	>	--rloss;
1381	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1382	>	++gshift;
1383	>	for (; mask&1; mask>>=1)
1384	>	--gloss;
1385	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1386	>	++bshift;
1387	>	for (; mask&1; mask>>=1)
1388	>	--bloss;
1389	>	}
1390	>
1391	>	// Preset palette pixel values for CLUT or gamma table
1392	>	if (color_class == DirectColor) {
1393	>	int num = vis->map_entries;
1394	>	for (int i=0; i<num; i++) {
1395	>	int c = (i * 256) / num;
1396	>	x_palette[i].pixel = map_rgb(c, c, c);
1397	>	x_palette[i].flags = DoRed \| DoGreen \| DoBlue;
1398	>	}
1399	>	} else if (color_class == PseudoColor) {
1400	>	for (int i=0; i<256; i++) {
1401	>	x_palette[i].pixel = i;
1402	>	x_palette[i].flags = DoRed \| DoGreen \| DoBlue;
1403	>	}
1404	>	}
1405
1406	<	if (mainBuffer.pageInfo != 0)
1407	<	free(mainBuffer.pageInfo);
1406	>	// Load gray ramp to color map
1407	>	int num = (color_class == DirectColor ? vis->map_entries : 256);
1408	>	for (int i=0; i<num; i++) {
1409	>	int c = (i * 256) / num;
1410	>	x_palette[i].red = c * 0x0101;
1411	>	x_palette[i].green = c * 0x0101;
1412	>	x_palette[i].blue = c * 0x0101;
1413	>	}
1414	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1415	>	XStoreColors(x_display, cmap[0], x_palette, num);
1416	>	XStoreColors(x_display, cmap[1], x_palette, num);
1417	>	}
1418
1419	<	mainBuffer.pageInfo = (ScreenPageInfo ) malloc(mainBuffer.pageCount sizeof(ScreenPageInfo));
1419	>	#ifdef ENABLE_VOSF
1420	>	// Load gray ramp to 8->16/32 expand map
1421	>	if (!IsDirectMode(mode) && xdepth > 8)
1422	>	for (int i=0; i<256; i++)
1423	>	ExpandMap[i] = map_rgb(i, i, i);
1424	>	#endif
1425
1426	<	if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
1427	<	return false;
1428	<
1429	<	mainBuffer.dirty = false;
1426	>	// Create display driver object of requested type
1427	>	switch (display_type) {
1428	>	case DISPLAY_WINDOW:
1429	>	drv = new driver_window(*this);
1430	>	break;
1431	>	#ifdef ENABLE_FBDEV_DGA
1432	>	case DISPLAY_DGA:
1433	>	drv = new driver_fbdev(*this);
1434	>	break;
1435	>	#endif
1436	>	#ifdef ENABLE_XF86_DGA
1437	>	case DISPLAY_DGA:
1438	>	drv = new driver_xf86dga(*this);
1439	>	break;
1440	>	#endif
1441	>	}
1442	>	if (drv == NULL)
1443	>	return false;
1444	>	if (!drv->init_ok) {
1445	>	delete drv;
1446	>	drv = NULL;
1447	>	return false;
1448	>	}
1449
1450	<	PFLAG_CLEAR_ALL;
1451	<	// Safety net to insure the loops in the update routines will terminate
1452	<	// See a discussion in <video_vosf.h> for further details
1453	<	PFLAG_CLEAR(mainBuffer.pageCount);
1454	<	PFLAG_SET(mainBuffer.pageCount+1);
1455	<
960	<	uint32 a = 0;
961	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
962	<	int y1 = a / VideoMonitor.bytes_per_row;
963	<	if (y1 >= VideoMonitor.y)
964	<	y1 = VideoMonitor.y - 1;
965	<
966	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
967	<	if (y2 >= VideoMonitor.y)
968	<	y2 = VideoMonitor.y - 1;
969	<
970	<	mainBuffer.pageInfo[i].top = y1;
971	<	mainBuffer.pageInfo[i].bottom = y2;
972	<
973	<	a += mainBuffer.pageSize;
974	<	if (a > mainBuffer.memLength)
975	<	a = mainBuffer.memLength;
1450	>	#ifdef ENABLE_VOSF
1451	>	if (use_vosf) {
1452	>	// Initialize the VOSF system
1453	>	if (!video_vosf_init(*this)) {
1454	>	ErrorAlert(STR_VOSF_INIT_ERR);
1455	>	return false;
1456		}
977	–
978	–	// We can now write-protect the frame buffer
979	–	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
980	–	return false;
1457		}
1458		#endif
1459	+
1460	+	// Initialize VideoRefresh function
1461	+	VideoRefreshInit();
1462	+
1463	+	// Lock down frame buffer
1464	+	XSync(x_display, false);
1465	+	LOCK_FRAME_BUFFER;
1466	+
1467	+	// Start redraw/input thread
1468	+	#ifdef HAVE_PTHREADS
1469	+	redraw_thread_cancel = false;
1470	+	Set_pthread_attr(&redraw_thread_attr, 0);
1471	+	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1472	+	if (!redraw_thread_active) {
1473	+	printf("FATAL: cannot create redraw thread\n");
1474	+	return false;
1475	+	}
1476	+	#else
1477	+	redraw_thread_active = true;
1478	+	#endif
1479	+
1480		return true;
1481		}
1482
1483		bool VideoInit(bool classic)
1484		{
1485	+	classic_mode = classic;
1486	+
1487		#ifdef ENABLE_VOSF
989	–	// Open /dev/zero
990	–	zero_fd = open("/dev/zero", O_RDWR);
991	–	if (zero_fd < 0) {
992	–	char str[256];
993	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
994	–	ErrorAlert(str);
995	–	return false;
996	–	}
997	–
1488		// Zero the mainBuffer structure
1489	<	mainBuffer.dirtyPages = 0;
1490	<	mainBuffer.pageInfo = 0;
1489	>	mainBuffer.dirtyPages = NULL;
1490	>	mainBuffer.pageInfo = NULL;
1491		#endif
1492
1493		// Check if X server runs on local machine
#	Line 1008 \| Line 1498 \| bool VideoInit(bool classic)
1498		keycode_init();
1499
1500		// Read prefs
1501	+	frame_skip = PrefsFindInt32("frameskip");
1502		mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1503		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1504
1505		// Find screen and root window
1506		screen = XDefaultScreen(x_display);
1507		rootwin = XRootWindow(x_display, screen);
1508	<
1509	<	// Get screen depth
1510	<	xdepth = DefaultDepth(x_display, screen);
1508	>
1509	>	// Get sorted list of available depths
1510	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1511	>	if (avail_depths == NULL) {
1512	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1513	>	return false;
1514	>	}
1515	>	std::sort(avail_depths, avail_depths + num_depths);
1516
1517		#ifdef ENABLE_FBDEV_DGA
1518		// Frame buffer name
1519		char fb_name[20];
1520
1521	<	// Could do fbdev dga ?
1521	>	// Could do fbdev DGA?
1522		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1523		has_dga = true;
1524		else
#	Line 1056 \| Line 1552 \| bool VideoInit(bool classic)
1552		black_pixel = BlackPixel(x_display, screen);
1553		white_pixel = WhitePixel(x_display, screen);
1554
1059	–	// Get appropriate visual
1060	–	int color_class;
1061	–	switch (xdepth) {
1062	–	case 1:
1063	–	color_class = StaticGray;
1064	–	break;
1065	–	case 8:
1066	–	color_class = PseudoColor;
1067	–	break;
1068	–	case 15:
1069	–	case 16:
1070	–	case 24:
1071	–	case 32:
1072	–	color_class = TrueColor;
1073	–	break;
1074	–	default:
1075	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1076	–	return false;
1077	–	}
1078	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1079	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1080	–	return false;
1081	–	}
1082	–	if (visualInfo.depth != xdepth) {
1083	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1084	–	return false;
1085	–	}
1086	–	vis = visualInfo.visual;
1087	–
1088	–	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1089	–	classic_mode = classic;
1090	–	if (classic)
1091	–	depth = 1;
1092	–	else
1093	–	depth = xdepth;
1094	–
1095	–	// Create color maps for 8 bit mode
1096	–	if (depth == 8) {
1097	–	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1098	–	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1099	–	XInstallColormap(x_display, cmap[0]);
1100	–	XInstallColormap(x_display, cmap[1]);
1101	–	}
1102	–
1555		// Get screen mode from preferences
1556		const char *mode_str;
1557	<	if (classic)
1557	>	if (classic_mode)
1558		mode_str = "win/512/342";
1559		else
1560		mode_str = PrefsFindString("screen");
1561
1562	<	// Determine type and mode
1563	<	int width = 512, height = 384;
1562	>	// Determine display type and default dimensions
1563	>	int default_width = 512, default_height = 384;
1564		display_type = DISPLAY_WINDOW;
1565		if (mode_str) {
1566	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1566	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1567		display_type = DISPLAY_WINDOW;
1568		#ifdef ENABLE_FBDEV_DGA
1569	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1570	<	#else
1571	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1569	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1570	>	display_type = DISPLAY_DGA;
1571	>	default_width = -1; default_height = -1; // use entire screen
1572		#endif
1573	+	#ifdef ENABLE_XF86_DGA
1574	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1575		display_type = DISPLAY_DGA;
1576	<	if (width > DisplayWidth(x_display, screen))
1577	<	width = DisplayWidth(x_display, screen);
1124	<	if (height > DisplayHeight(x_display, screen))
1125	<	height = DisplayHeight(x_display, screen);
1126	<	}
1127	<	if (width <= 0)
1128	<	width = DisplayWidth(x_display, screen);
1129	<	if (height <= 0)
1130	<	height = DisplayHeight(x_display, screen);
1576	>	#endif
1577	>	}
1578		}
1579	<
1580	<	// Initialize according to display type
1581	<	switch (display_type) {
1582	<	case DISPLAY_WINDOW:
1583	<	if (!init_window(width, height))
1584	<	return false;
1579	>	if (default_width <= 0)
1580	>	default_width = DisplayWidth(x_display, screen);
1581	>	else if (default_width > DisplayWidth(x_display, screen))
1582	>	default_width = DisplayWidth(x_display, screen);
1583	>	if (default_height <= 0)
1584	>	default_height = DisplayHeight(x_display, screen);
1585	>	else if (default_height > DisplayHeight(x_display, screen))
1586	>	default_height = DisplayHeight(x_display, screen);
1587	>
1588	>	// Mac screen depth follows X depth
1589	>	video_depth default_depth = VDEPTH_1BIT;
1590	>	switch (DefaultDepth(x_display, screen)) {
1591	>	case 8:
1592	>	default_depth = VDEPTH_8BIT;
1593		break;
1594	<	case DISPLAY_DGA:
1595	<	#ifdef ENABLE_FBDEV_DGA
1596	<	if (!init_fbdev_dga(fb_name))
1597	<	#else
1598	<	if (!init_xf86_dga(width, height))
1144	<	#endif
1145	<	return false;
1594	>	case 15: case 16:
1595	>	default_depth = VDEPTH_16BIT;
1596	>	break;
1597	>	case 24: case 32:
1598	>	default_depth = VDEPTH_32BIT;
1599		break;
1600		}
1601
1602	<	// Lock down frame buffer
1603	<	LOCK_FRAME_BUFFER;
1604	<
1605	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1606	<	// Set variables for UAE memory mapping
1607	<	MacFrameBaseHost = the_buffer;
1608	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1609	<
1610	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1158	<	if (classic)
1159	<	MacFrameLayout = FLAYOUT_NONE;
1160	<	#endif
1161	<
1162	<	#ifdef ENABLE_VOSF
1163	<	if (use_vosf) {
1164	<	// Initialize the mainBuffer structure
1165	<	if (!VideoInitBuffer()) {
1166	<	// TODO: STR_VOSF_INIT_ERR ?
1167	<	ErrorAlert("Could not initialize Video on SEGV signals");
1168	<	return false;
1602	>	// Construct list of supported modes
1603	>	if (display_type == DISPLAY_WINDOW) {
1604	>	if (classic)
1605	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1606	>	else {
1607	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1608	>	if (find_visual_for_depth(video_depth(d)))
1609	>	add_window_modes(video_depth(d));
1610	>	}
1611		}
1612	+	} else
1613	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1614	+	if (VideoModes.empty()) {
1615	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1616	+	return false;
1617	+	}
1618
1619	<	// Initialize the handler for SIGSEGV
1620	<	if (!sigsegv_install_handler(screen_fault_handler)) {
1621	<	// TODO: STR_VOSF_INIT_ERR ?
1622	<	ErrorAlert("Could not initialize Video on SEGV signals");
1623	<	return false;
1619	>	// Find requested default mode with specified dimensions
1620	>	uint32 default_id;
1621	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1622	>	for (i = VideoModes.begin(); i != end; ++i) {
1623	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1624	>	default_id = i->resolution_id;
1625	>	break;
1626		}
1627		}
1628	<	#endif
1629	<
1630	<	// Initialize VideoRefresh function
1631	<	VideoRefreshInit();
1182	<
1183	<	XSync(x_display, false);
1628	>	if (i == end) { // not found, use first available mode
1629	>	default_depth = VideoModes[0].depth;
1630	>	default_id = VideoModes[0].resolution_id;
1631	>	}
1632
1633	<	#ifdef HAVE_PTHREADS
1634	<	// Start redraw/input thread
1635	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1636	<	if (!redraw_thread_active) {
1637	<	printf("FATAL: cannot create redraw thread\n");
1638	<	return false;
1633	>	#if DEBUG
1634	>	D(bug("Available video modes:\n"));
1635	>	for (i = VideoModes.begin(); i != end; ++i) {
1636	>	int bits = 1 << i->depth;
1637	>	if (bits == 16)
1638	>	bits = 15;
1639	>	else if (bits == 32)
1640	>	bits = 24;
1641	>	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1642		}
1643		#endif
1644	<	return true;
1644	>
1645	>	// Create X11_monitor_desc for this (the only) display
1646	>	X11_monitor_desc *monitor = new X11_monitor_desc(VideoModes, default_depth, default_id);
1647	>	VideoMonitors.push_back(monitor);
1648	>
1649	>	// Open display
1650	>	return monitor->video_open();
1651		}
1652
1653
#	Line 1198 \| Line 1655 \| bool VideoInit(bool classic)
1655		* Deinitialization
1656		*/
1657
1658	<	void VideoExit(void)
1658	>	// Close display
1659	>	void X11_monitor_desc::video_close(void)
1660		{
1661	<	#ifdef HAVE_PTHREADS
1661	>	D(bug("video_close()\n"));
1662	>
1663		// Stop redraw thread
1664	+	#ifdef HAVE_PTHREADS
1665		if (redraw_thread_active) {
1666		redraw_thread_cancel = true;
1667		#ifdef HAVE_PTHREAD_CANCEL
1668		pthread_cancel(redraw_thread);
1669		#endif
1670		pthread_join(redraw_thread, NULL);
1211	–	redraw_thread_active = false;
1671		}
1672		#endif
1673	+	redraw_thread_active = false;
1674
1675		// Unlock frame buffer
1676		UNLOCK_FRAME_BUFFER;
1677	+	XSync(x_display, false);
1678	+	D(bug(" frame buffer unlocked\n"));
1679
1680	<	// Close window and server connection
1681	<	if (x_display != NULL) {
1682	<	XSync(x_display, false);
1683	<
1684	<	#ifdef ENABLE_XF86_DGA
1223	<	if (display_type == DISPLAY_DGA) {
1224	<	XF86DGADirectVideo(x_display, screen, 0);
1225	<	XUngrabPointer(x_display, CurrentTime);
1226	<	XUngrabKeyboard(x_display, CurrentTime);
1227	<	}
1680	>	#ifdef ENABLE_VOSF
1681	>	if (use_vosf) {
1682	>	// Deinitialize VOSF
1683	>	video_vosf_exit();
1684	>	}
1685		#endif
1686
1687	<	#ifdef ENABLE_XF86_VIDMODE
1688	<	if (has_vidmode && display_type == DISPLAY_DGA)
1689	<	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1233	<	#endif
1687	>	// Close display
1688	>	delete drv;
1689	>	drv = NULL;
1690
1691	<	#ifdef ENABLE_FBDEV_DGA
1692	<	if (display_type == DISPLAY_DGA) {
1693	<	XUngrabPointer(x_display, CurrentTime);
1694	<	XUngrabKeyboard(x_display, CurrentTime);
1695	<	close(fbdev_fd);
1696	<	}
1697	<	#endif
1691	>	// Free colormaps
1692	>	if (cmap[0]) {
1693	>	XFreeColormap(x_display, cmap[0]);
1694	>	cmap[0] = 0;
1695	>	}
1696	>	if (cmap[1]) {
1697	>	XFreeColormap(x_display, cmap[1]);
1698	>	cmap[1] = 0;
1699	>	}
1700	>	}
1701
1702	<	XFlush(x_display);
1703	<	XSync(x_display, false);
1704	<	if (depth == 8) {
1705	<	XFreeColormap(x_display, cmap[0]);
1706	<	XFreeColormap(x_display, cmap[1]);
1707	<	}
1249	<
1250	<	if (!use_vosf) {
1251	<	if (the_buffer) {
1252	<	free(the_buffer);
1253	<	the_buffer = NULL;
1254	<	}
1702	>	void VideoExit(void)
1703	>	{
1704	>	// Close displays
1705	>	vector<monitor_desc *>::iterator i, end = VideoMonitors.end();
1706	>	for (i = VideoMonitors.begin(); i != end; ++i)
1707	>	dynamic_cast<X11_monitor_desc >(i)->video_close();
1708
1709	<	if (!have_shm && the_buffer_copy) {
1710	<	free(the_buffer_copy);
1711	<	the_buffer_copy = NULL;
1712	<	}
1713	<	}
1261	<	#ifdef ENABLE_VOSF
1262	<	else {
1263	<	if (the_buffer != (uint8 *)MAP_FAILED) {
1264	<	munmap((caddr_t)the_buffer, the_buffer_size);
1265	<	the_buffer = 0;
1266	<	}
1267	<
1268	<	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1269	<	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1270	<	the_buffer_copy = 0;
1271	<	}
1272	<	}
1273	<	#endif
1709	>	#ifdef ENABLE_XF86_VIDMODE
1710	>	// Free video mode list
1711	>	if (x_video_modes) {
1712	>	XFree(x_video_modes);
1713	>	x_video_modes = NULL;
1714		}
1715	<
1276	<	#ifdef ENABLE_VOSF
1277	<	if (use_vosf) {
1278	<	// Clear mainBuffer data
1279	<	if (mainBuffer.pageInfo) {
1280	<	free(mainBuffer.pageInfo);
1281	<	mainBuffer.pageInfo = 0;
1282	<	}
1715	>	#endif
1716
1717	<	if (mainBuffer.dirtyPages) {
1718	<	free(mainBuffer.dirtyPages);
1719	<	mainBuffer.dirtyPages = 0;
1720	<	}
1717	>	#ifdef ENABLE_FBDEV_DGA
1718	>	// Close framebuffer device
1719	>	if (fbdev_fd >= 0) {
1720	>	close(fbdev_fd);
1721	>	fbdev_fd = -1;
1722		}
1289	–
1290	–	// Close /dev/zero
1291	–	if (zero_fd > 0)
1292	–	close(zero_fd);
1723		#endif
1724	+
1725	+	// Free depth list
1726	+	if (avail_depths) {
1727	+	XFree(avail_depths);
1728	+	avail_depths = NULL;
1729	+	}
1730		}
1731
1732
#	Line 1301 \| Line 1737 \| void VideoExit(void)
1737		void VideoQuitFullScreen(void)
1738		{
1739		D(bug("VideoQuitFullScreen()\n"));
1740	<	if (display_type == DISPLAY_DGA)
1305	<	quit_full_screen = true;
1740	>	quit_full_screen = true;
1741		}
1742
1743
#	Line 1327 \| Line 1762 \| void VideoInterrupt(void)
1762		* Set palette
1763		*/
1764
1765	<	void video_set_palette(uint8 *pal)
1765	>	void X11_monitor_desc::set_palette(uint8 *pal, int num_in)
1766		{
1767	+	const video_mode &mode = get_current_mode();
1768	+
1769		LOCK_PALETTE;
1770
1771		// Convert colors to XColor array
1772	<	for (int i=0; i<256; i++) {
1773	<	palette[i].pixel = i;
1774	<	palette[i].red = pal[i3] 0x0101;
1775	<	palette[i].green = pal[i3+1] 0x0101;
1776	<	palette[i].blue = pal[i3+2] 0x0101;
1777	<	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1772	>	int num_out = 256;
1773	>	bool stretch = false;
1774	>	if (IsDirectMode(mode)) {
1775	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1776	>	num_out = vis->map_entries;
1777	>	stretch = true;
1778	>	}
1779	>	XColor *p = x_palette;
1780	>	for (int i=0; i<num_out; i++) {
1781	>	int c = (stretch ? (i * num_in) / num_out : i);
1782	>	p->red = pal[c3 + 0] 0x0101;
1783	>	p->green = pal[c3 + 1] 0x0101;
1784	>	p->blue = pal[c3 + 2] 0x0101;
1785	>	p++;
1786		}
1787
1788	+	#ifdef ENABLE_VOSF
1789	+	// Recalculate pixel color expansion map
1790	+	if (!IsDirectMode(mode) && xdepth > 8) {
1791	+	for (int i=0; i<256; i++) {
1792	+	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1793	+	ExpandMap[i] = map_rgb(pal[c3+0], pal[c3+1], pal[c*3+2]);
1794	+	}
1795	+
1796	+	// We have to redraw everything because the interpretation of pixel values changed
1797	+	LOCK_VOSF;
1798	+	PFLAG_SET_ALL;
1799	+	UNLOCK_VOSF;
1800	+	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1801	+	}
1802	+	#endif
1803	+
1804		// Tell redraw thread to change palette
1805	<	palette_changed = true;
1805	>	x_palette_changed = true;
1806
1807		UNLOCK_PALETTE;
1808		}
1809
1810
1811		/*
1812	<	* Suspend/resume emulator
1812	>	* Switch video mode
1813		*/
1814
1815	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1355	<	static void suspend_emul(void)
1356	<	{
1357	<	if (display_type == DISPLAY_DGA) {
1358	<	// Release ctrl key
1359	<	ADBKeyUp(0x36);
1360	<	ctrl_down = false;
1361	<
1362	<	// Lock frame buffer (this will stop the MacOS thread)
1363	<	LOCK_FRAME_BUFFER;
1364	<
1365	<	// Save frame buffer
1366	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1367	<	if (fb_save)
1368	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1369	<
1370	<	// Close full screen display
1371	<	#ifdef ENABLE_XF86_DGA
1372	<	XF86DGADirectVideo(x_display, screen, 0);
1373	<	#endif
1374	<	XUngrabPointer(x_display, CurrentTime);
1375	<	XUngrabKeyboard(x_display, CurrentTime);
1376	<	XUnmapWindow(x_display, the_win);
1377	<	wait_unmapped(the_win);
1378	<
1379	<	// Open "suspend" window
1380	<	XSetWindowAttributes wattr;
1381	<	wattr.event_mask = KeyPressMask;
1382	<	wattr.background_pixel = black_pixel;
1383	<
1384	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1385	<	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
1386	<	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1387	<	set_window_focus(suspend_win);
1388	<	XMapWindow(x_display, suspend_win);
1389	<	emul_suspended = true;
1390	<	}
1391	<	}
1392	<
1393	<	static void resume_emul(void)
1815	>	void X11_monitor_desc::switch_to_current_mode(void)
1816		{
1817	<	// Close "suspend" window
1818	<	XDestroyWindow(x_display, suspend_win);
1819	<	XSync(x_display, false);
1817	>	// Close and reopen display
1818	>	video_close();
1819	>	video_open();
1820
1821	<	// Reopen full screen display
1822	<	XMapRaised(x_display, the_win);
1823	<	wait_mapped(the_win);
1402	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1403	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1404	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1405	<	#ifdef ENABLE_XF86_DGA
1406	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
1407	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1408	<	#endif
1409	<	XSync(x_display, false);
1410	<
1411	<	// the_buffer already contains the data to restore. i.e. since a temporary
1412	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1413	<	// not necessary.
1414	<	#ifdef ENABLE_VOSF
1415	<	if (use_vosf) {
1416	<	LOCK_VOSF;
1417	<	PFLAG_SET_ALL;
1418	<	UNLOCK_VOSF;
1419	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1420	<	}
1421	<	#endif
1422	<
1423	<	// Restore frame buffer
1424	<	if (fb_save) {
1425	<	#ifdef ENABLE_VOSF
1426	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1427	<	if (!use_vosf)
1428	<	#endif
1429	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1430	<	free(fb_save);
1431	<	fb_save = NULL;
1821	>	if (drv == NULL) {
1822	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1823	>	QuitEmulator();
1824		}
1433	–
1434	–	#ifdef ENABLE_XF86_DGA
1435	–	if (depth == 8)
1436	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1437	–	#endif
1438	–
1439	–	// Unlock frame buffer (and continue MacOS thread)
1440	–	UNLOCK_FRAME_BUFFER;
1441	–	emul_suspended = false;
1825		}
1443	–	#endif
1826
1827
1828		/*
1829	<	* Translate key event to Mac keycode
1829	>	* Translate key event to Mac keycode, returns -1 if no keycode was found
1830	>	* and -2 if the key was recognized as a hotkey
1831		*/
1832
1833	<	static int kc_decode(KeySym ks)
1833	>	static int kc_decode(KeySym ks, bool key_down)
1834		{
1835		switch (ks) {
1836		case XK_A: case XK_a: return 0x00;
#	Line 1500 \| Line 1883 \| static int kc_decode(KeySym ks)
1883		case XK_period: case XK_greater: return 0x2f;
1884		case XK_slash: case XK_question: return 0x2c;
1885
1886	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1504	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1505	<	#else
1506	<	case XK_Tab: return 0x30;
1507	<	#endif
1886	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1887		case XK_Return: return 0x24;
1888		case XK_space: return 0x31;
1889		case XK_BackSpace: return 0x33;
#	Line 1538 \| Line 1917 \| static int kc_decode(KeySym ks)
1917		case XK_Left: return 0x3b;
1918		case XK_Right: return 0x3c;
1919
1920	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1920	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1921
1922	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1922	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1923		case XK_F2: return 0x78;
1924		case XK_F3: return 0x63;
1925		case XK_F4: return 0x76;
1926	<	case XK_F5: return 0x60;
1926	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1927		case XK_F6: return 0x61;
1928		case XK_F7: return 0x62;
1929		case XK_F8: return 0x64;
#	Line 1592 \| Line 1971 \| static int kc_decode(KeySym ks)
1971		return -1;
1972		}
1973
1974	<	static int event2keycode(XKeyEvent &ev)
1974	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1975		{
1976		KeySym ks;
1598	–	int as;
1977		int i = 0;
1978
1979		do {
1980		ks = XLookupKeysym(&ev, i++);
1981	<	as = kc_decode(ks);
1982	<	if (as != -1)
1981	>	int as = kc_decode(ks, key_down);
1982	>	if (as >= 0)
1983	>	return as;
1984	>	if (as == -2)
1985		return as;
1986		} while (ks != NoSymbol);
1987
#	Line 1620 \| Line 2000 \| static void handle_events(void)
2000		XNextEvent(x_display, &event);
2001
2002		switch (event.type) {
2003	+
2004		// Mouse button
2005		case ButtonPress: {
2006		unsigned int button = event.xbutton.button;
#	Line 1648 \| Line 2029 \| static void handle_events(void)
2029		}
2030
2031		// Mouse moved
1651	–	case EnterNotify:
2032		case MotionNotify:
2033	<	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
2033	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2034	>	break;
2035	>
2036	>	// Mouse entered window
2037	>	case EnterNotify:
2038	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2039	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2040		break;
2041
2042		// Keyboard
2043		case KeyPress: {
2044	<	int code;
2044	>	int code = -1;
2045		if (use_keycodes) {
2046	<	event2keycode(event.xkey); // This is called to process the hotkeys
2047	<	code = keycode_table[event.xkey.keycode & 0xff];
2046	>	if (event2keycode(event.xkey, true) != -2) // This is called to process the hotkeys
2047	>	code = keycode_table[event.xkey.keycode & 0xff];
2048		} else
2049	<	code = event2keycode(event.xkey);
2050	<	if (code != -1) {
2049	>	code = event2keycode(event.xkey, true);
2050	>	if (code >= 0) {
2051		if (!emul_suspended) {
2052		if (code == 0x39) { // Caps Lock pressed
2053		if (caps_on) {
#	Line 1676 \| Line 2062 \| static void handle_events(void)
2062		if (code == 0x36)
2063		ctrl_down = true;
2064		} else {
1679	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2065		if (code == 0x31)
2066	<	resume_emul(); // Space wakes us up
1682	<	#endif
2066	>	drv->resume(); // Space wakes us up
2067		}
2068		}
2069		break;
2070		}
2071		case KeyRelease: {
2072	<	int code;
2072	>	int code = -1;
2073		if (use_keycodes) {
2074	<	event2keycode(event.xkey); // This is called to process the hotkeys
2075	<	code = keycode_table[event.xkey.keycode & 0xff];
2074	>	if (event2keycode(event.xkey, false) != -2) // This is called to process the hotkeys
2075	>	code = keycode_table[event.xkey.keycode & 0xff];
2076		} else
2077	<	code = event2keycode(event.xkey);
2078	<	if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
2077	>	code = event2keycode(event.xkey, false);
2078	>	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
2079		ADBKeyUp(code);
2080		if (code == 0x36)
2081		ctrl_down = false;
#	Line 1702 \| Line 2086 \| static void handle_events(void)
2086		// Hidden parts exposed, force complete refresh of window
2087		case Expose:
2088		if (display_type == DISPLAY_WINDOW) {
2089	+	const video_mode &mode = VideoMonitors[0]->get_current_mode();
2090		#ifdef ENABLE_VOSF
2091		if (use_vosf) { // VOSF refresh
2092		LOCK_VOSF;
2093		PFLAG_SET_ALL;
2094		UNLOCK_VOSF;
2095	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2095	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
2096		}
2097		else
2098		#endif
#	Line 1718 \| Line 2103 \| static void handle_events(void)
2103		updt_box[x1][y1] = true;
2104		nr_boxes = 16 * 16;
2105		} else // Static refresh
2106	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2106	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
2107		}
2108		break;
2109
#	Line 1739 \| Line 2124 \| static void handle_events(void)
2124		*/
2125
2126		// Dynamic display update (variable frame rate for each box)
2127	<	static void update_display_dynamic(int ticker)
2127	>	static void update_display_dynamic(int ticker, driver_window *drv)
2128		{
2129		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2130		int xil = 0;
2131		int rxm = 0, rxmo = 0;
2132	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2133	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2134	<	int rx = VideoMonitor.bytes_per_row / 16;
2135	<	int ry = VideoMonitor.y / 16;
2132	>	const video_mode &mode = drv->monitor.get_current_mode();
2133	>	int bytes_per_row = mode.bytes_per_row;
2134	>	int bytes_per_pixel = mode.bytes_per_row / mode.x;
2135	>	int rx = mode.bytes_per_row / 16;
2136	>	int ry = mode.y / 16;
2137		int max_box;
2138
2139		y2s = sm_uptd[ticker % 8];
#	Line 1801 \| Line 2187 \| static void update_display_dynamic(int t
2187		i = (yi * bytes_per_row) + xi;
2188		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2189		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2190	<	if (depth == 1) {
2191	<	if (have_shm)
2192	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2190	>	if (mode.depth == VDEPTH_1BIT) {
2191	>	if (drv->have_shm)
2192	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2193		else
2194	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2194	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2195		} else {
2196	<	if (have_shm)
2197	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2196	>	if (drv->have_shm)
2197	>	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);
2198		else
2199	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2199	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2200		}
2201		xil = 0;
2202		}
#	Line 1829 \| Line 2215 \| static void update_display_dynamic(int t
2215		}
2216
2217		// Static display update (fixed frame rate, but incremental)
2218	<	static void update_display_static(void)
2218	>	static void update_display_static(driver_window *drv)
2219		{
2220		// Incremental update code
2221	<	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2222	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2223	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2221	>	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
2222	>	const video_mode &mode = drv->monitor.get_current_mode();
2223	>	int bytes_per_row = mode.bytes_per_row;
2224	>	int bytes_per_pixel = mode.bytes_per_row / mode.x;
2225		uint8 p, p2;
2226
2227		// Check for first line from top and first line from bottom that have changed
2228		y1 = 0;
2229	<	for (j=0; j<VideoMonitor.y; j++) {
2229	>	for (j=0; j<mode.y; j++) {
2230		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2231		y1 = j;
2232		break;
2233		}
2234		}
2235		y2 = y1 - 1;
2236	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
2236	>	for (j=mode.y-1; j>=y1; j--) {
2237		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2238		y2 = j;
2239		break;
#	Line 1856 \| Line 2243 \| static void update_display_static(void)
2243
2244		// Check for first column from left and first column from right that have changed
2245		if (high) {
2246	<	if (depth == 1) {
2247	<	x1 = VideoMonitor.x - 1;
2246	>	if (mode.depth == VDEPTH_1BIT) {
2247	>	x1 = mode.x - 1;
2248		for (j=y1; j<=y2; j++) {
2249		p = &the_buffer[j * bytes_per_row];
2250		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1875 \| Line 2262 \| static void update_display_static(void)
2262		p2 = &the_buffer_copy[j * bytes_per_row];
2263		p += bytes_per_row;
2264		p2 += bytes_per_row;
2265	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
2265	>	for (i=(mode.x>>3); i>(x2>>3); i--) {
2266		p--; p2--;
2267		if (p != p2) {
2268		x2 = (i << 3) + 7;
#	Line 1894 \| Line 2281 \| static void update_display_static(void)
2281		}
2282
2283		} else {
2284	<	x1 = VideoMonitor.x;
2284	>	x1 = mode.x;
2285		for (j=y1; j<=y2; j++) {
2286		p = &the_buffer[j * bytes_per_row];
2287		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1912 \| Line 2299 \| static void update_display_static(void)
2299		p2 = &the_buffer_copy[j * bytes_per_row];
2300		p += bytes_per_row;
2301		p2 += bytes_per_row;
2302	<	for (i=VideoMonitor.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2302	>	for (i=mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2303		p--;
2304		p2--;
2305		if (p != p2) {
#	Line 1935 \| Line 2322 \| static void update_display_static(void)
2322
2323		// Refresh display
2324		if (high && wide) {
2325	<	if (have_shm)
2326	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2325	>	if (drv->have_shm)
2326	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2327		else
2328	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2328	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2329		}
2330		}
2331
#	Line 1955 \| Line 2342 \| static void update_display_static(void)
2342
2343		static inline void possibly_quit_dga_mode()
2344		{
2345	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2346	<	// Quit DGA mode if requested
2345	>	// Quit DGA mode if requested (something terrible has happened and we
2346	>	// want to give control back to the user)
2347		if (quit_full_screen) {
2348		quit_full_screen = false;
2349	<	#ifdef ENABLE_XF86_DGA
2350	<	XF86DGADirectVideo(x_display, screen, 0);
1964	<	#endif
1965	<	XUngrabPointer(x_display, CurrentTime);
1966	<	XUngrabKeyboard(x_display, CurrentTime);
1967	<	XUnmapWindow(x_display, the_win);
1968	<	XSync(x_display, false);
2349	>	delete drv;
2350	>	drv = NULL;
2351		}
1970	–	#endif
2352		}
2353
2354	<	static inline void handle_palette_changes(int depth, int display_type)
2354	>	static inline void possibly_ungrab_mouse()
2355	>	{
2356	>	// Ungrab mouse if requested (something terrible has happened and we
2357	>	// want to give control back to the user)
2358	>	if (quit_full_screen) {
2359	>	quit_full_screen = false;
2360	>	if (drv)
2361	>	drv->ungrab_mouse();
2362	>	}
2363	>	}
2364	>
2365	>	static inline void handle_palette_changes(void)
2366		{
2367		LOCK_PALETTE;
2368
2369	<	if (palette_changed) {
2370	<	palette_changed = false;
2371	<	if (depth == 8) {
1980	<	XStoreColors(x_display, cmap[0], palette, 256);
1981	<	XStoreColors(x_display, cmap[1], palette, 256);
1982	<	XSync(x_display, false);
1983	<
1984	<	#ifdef ENABLE_XF86_DGA
1985	<	if (display_type == DISPLAY_DGA) {
1986	<	current_dga_cmap ^= 1;
1987	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1988	<	}
1989	<	#endif
1990	<	}
2369	>	if (x_palette_changed) {
2370	>	x_palette_changed = false;
2371	>	drv->update_palette();
2372		}
2373
2374		UNLOCK_PALETTE;
#	Line 1997 \| Line 2378 \| static void video_refresh_dga(void)
2378		{
2379		// Quit DGA mode if requested
2380		possibly_quit_dga_mode();
2000	–
2001	–	// Handle X events
2002	–	handle_events();
2003	–
2004	–	// Handle palette changes
2005	–	handle_palette_changes(depth, DISPLAY_DGA);
2381		}
2382
2383		#ifdef ENABLE_VOSF
#	Line 2012 \| Line 2387 \| static void video_refresh_dga_vosf(void)
2387		// Quit DGA mode if requested
2388		possibly_quit_dga_mode();
2389
2015	–	// Handle X events
2016	–	handle_events();
2017	–
2018	–	// Handle palette changes
2019	–	handle_palette_changes(depth, DISPLAY_DGA);
2020	–
2390		// Update display (VOSF variant)
2391		static int tick_counter = 0;
2392		if (++tick_counter >= frame_skip) {
#	Line 2033 \| Line 2402 \| static void video_refresh_dga_vosf(void)
2402
2403		static void video_refresh_window_vosf(void)
2404		{
2405	<	// Quit DGA mode if requested
2406	<	possibly_quit_dga_mode();
2038	<
2039	<	// Handle X events
2040	<	handle_events();
2041	<
2042	<	// Handle palette changes
2043	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2405	>	// Ungrab mouse if requested
2406	>	possibly_ungrab_mouse();
2407
2408		// Update display (VOSF variant)
2409		static int tick_counter = 0;
#	Line 2048 \| Line 2411 \| static void video_refresh_window_vosf(vo
2411		tick_counter = 0;
2412		if (mainBuffer.dirty) {
2413		LOCK_VOSF;
2414	<	update_display_window_vosf();
2414	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2415		UNLOCK_VOSF;
2416		XSync(x_display, false); // Let the server catch up
2417		}
#	Line 2058 \| Line 2421 \| static void video_refresh_window_vosf(vo
2421
2422		static void video_refresh_window_static(void)
2423		{
2424	<	// Handle X events
2425	<	handle_events();
2426	<
2064	<	// Handle_palette changes
2065	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2066	<
2424	>	// Ungrab mouse if requested
2425	>	possibly_ungrab_mouse();
2426	>
2427		// Update display (static variant)
2428		static int tick_counter = 0;
2429		if (++tick_counter >= frame_skip) {
2430		tick_counter = 0;
2431	<	update_display_static();
2431	>	update_display_static(static_cast<driver_window *>(drv));
2432		}
2433		}
2434
2435		static void video_refresh_window_dynamic(void)
2436		{
2437	<	// Handle X events
2438	<	handle_events();
2439	<
2080	<	// Handle_palette changes
2081	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2082	<
2437	>	// Ungrab mouse if requested
2438	>	possibly_ungrab_mouse();
2439	>
2440		// Update display (dynamic variant)
2441		static int tick_counter = 0;
2442		tick_counter++;
2443	<	update_display_dynamic(tick_counter);
2443	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2444		}
2445
2446
#	Line 2091 \| Line 2448 \| static void video_refresh_window_dynamic
2448		* Thread for screen refresh, input handling etc.
2449		*/
2450
2451	<	void VideoRefreshInit(void)
2451	>	static void VideoRefreshInit(void)
2452		{
2453		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2454		if (display_type == DISPLAY_DGA) {
#	Line 2115 \| Line 2472 \| void VideoRefreshInit(void)
2472		}
2473		}
2474
2475	+	// This function is called on non-threaded platforms from a timer interrupt
2476		void VideoRefresh(void)
2477		{
2478	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2478	>	// We need to check redraw_thread_active to inhibit refreshed during
2479	>	// mode changes on non-threaded platforms
2480	>	if (!redraw_thread_active)
2481	>	return;
2482	>
2483	>	// Handle X events
2484	>	handle_events();
2485	>
2486	>	// Handle palette changes
2487	>	handle_palette_changes();
2488	>
2489	>	// Update display
2490		video_refresh();
2491		}
2492
2493	+	const int VIDEO_REFRESH_HZ = 60;
2494	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2495	+
2496		#ifdef HAVE_PTHREADS
2497		static void redraw_func(void arg)
2498		{
2499	+	int fd = ConnectionNumber(x_display);
2500	+
2501		uint64 start = GetTicks_usec();
2502		int64 ticks = 0;
2503	<	uint64 next = GetTicks_usec();
2503	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2504	>
2505		while (!redraw_thread_cancel) {
2506	<	video_refresh();
2132	<	next += 16667;
2506	>
2507		int64 delay = next - GetTicks_usec();
2508	<	if (delay > 0)
2509	<	Delay_usec(delay);
2510	<	else if (delay < -16667)
2508	>	if (delay < -VIDEO_REFRESH_DELAY) {
2509	>
2510	>	// We are lagging far behind, so we reset the delay mechanism
2511		next = GetTicks_usec();
2512	<	ticks++;
2512	>
2513	>	} else if (delay <= 0) {
2514	>
2515	>	// Delay expired, refresh display
2516	>	handle_events();
2517	>	handle_palette_changes();
2518	>	video_refresh();
2519	>	next += VIDEO_REFRESH_DELAY;
2520	>	ticks++;
2521	>
2522	>	} else {
2523	>
2524	>	// No display refresh pending, check for X events
2525	>	fd_set readfds;
2526	>	FD_ZERO(&readfds);
2527	>	FD_SET(fd, &readfds);
2528	>	struct timeval timeout;
2529	>	timeout.tv_sec = 0;
2530	>	timeout.tv_usec = delay;
2531	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2532	>	handle_events();
2533	>	}
2534		}
2535	+
2536		uint64 end = GetTicks_usec();
2537	<	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2537	>	D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2538		return NULL;
2539		}
2540		#endif

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.38 by gbeauche, 2001-05-20T20:31:50Z vs. Revision 1.66 by cebix, 2002-04-25T11:00:31Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.38 by gbeauche, 2001-05-20T20:31:50Z vs.
Revision 1.66 by cebix, 2002-04-25T11:00:31Z