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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.35 by gbeauche, 2001-01-11T18:00:40Z vs.
Revision 1.72 by gbeauche, 2004-11-08T21:07:07Z

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

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.35 by gbeauche, 2001-01-11T18:00:40Z vs. Revision 1.72 by gbeauche, 2004-11-08T21:07:07Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.35 by gbeauche, 2001-01-11T18:00:40Z vs.
Revision 1.72 by gbeauche, 2004-11-08T21:07:07Z