ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/video_x.cpp

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.15 by cebix, 2000-07-13T13:47:12Z vs.
Revision 1.82 by gbeauche, 2006-01-03T22:03:27Z

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

Diff Legend

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