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.11 by cebix, 1999-11-03T10:56:30Z vs.
Revision 1.64 by cebix, 2002-02-07T16:10:55Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  Basilisk II (C) 1997-1999 Christian Bauer
4	>	*  Basilisk II (C) 1997-2002 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 24 | Line 24
24		*      Ctrl-Tab = suspend DGA mode
25		*      Ctrl-Esc = emergency quit
26		*      Ctrl-F1 = mount floppy
27	+	*      Ctrl-F5 = grab mouse (in windowed mode)
28		*/
29
30		#include "sysdeps.h"
#	Line 34 | Line 35
35		#include <X11/extensions/XShm.h>
36		#include <sys/ipc.h>
37		#include <sys/shm.h>
37	–	#include <pthread.h>
38		#include <errno.h>
39
40	+	#include <algorithm>
41	+
42	+	#ifndef NO_STD_NAMESPACE
43	+	using std::sort;
44	+	#endif
45	+
46	+	#ifdef HAVE_PTHREADS
47	+	# include <pthread.h>
48	+	#endif
49	+
50	+	#ifdef ENABLE_XF86_DGA
51	+	# include <X11/extensions/xf86dga.h>
52	+	#endif
53	+
54	+	#ifdef ENABLE_XF86_VIDMODE
55	+	# include <X11/extensions/xf86vmode.h>
56	+	#endif
57	+
58	+	#ifdef ENABLE_FBDEV_DGA
59	+	# include <sys/mman.h>
60	+	#endif
61	+
62		#include "cpu_emulation.h"
63		#include "main.h"
64		#include "adb.h"
#	Line 45 | Line 67
67		#include "user_strings.h"
68		#include "video.h"
69
70	<	#define DEBUG 1
70	>	#define DEBUG 0
71		#include "debug.h"
72
51	–	#if ENABLE_XF86_DGA
52	–	#include <X11/extensions/xf86dga.h>
53	–	#endif
54	–
55	–	#if ENABLE_FBDEV_DGA
56	–	#include <sys/mman.h>
57	–	#endif
58	–
59	–
73
74		// Display types
75		enum {
#	Line 64 | Line 77 | enum {
77		DISPLAY_DGA             // DGA fullscreen display
78		};
79
67	–
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	>
98		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
99	<	static volatile bool redraw_thread_cancel = false;      // Flag: Cancel Redraw thread
99	>	#ifdef HAVE_PTHREADS
100	>	static pthread_attr_t redraw_thread_attr;                       // Redraw thread attributes
101	>	static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
102		static pthread_t redraw_thread;                                         // Redraw thread
103	+	#endif
104
105		static bool has_dga = false;                                            // Flag: Video DGA capable
106	+	static bool has_vidmode = false;                                        // Flag: VidMode extension available
107	+
108	+	#ifdef ENABLE_VOSF
109	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
110	+	#else
111	+	static const bool use_vosf = false;                                     // VOSF not possible
112	+	#endif
113
114		static bool ctrl_down = false;                                          // Flag: Ctrl key pressed
115		static bool caps_on = false;                                            // Flag: Caps Lock on
#	Line 96 | Line 124 | static int keycode_table[256];                                         // X
124
125		// X11 variables
126		static int screen;                                                                      // Screen number
127	<	static int xdepth;                                                                      // Depth of X screen
128	<	static int depth;                                                                       // Depth of Mac frame buffer
129	<	static Window rootwin, the_win;                                         // Root window and our window
102	<	static XVisualInfo visualInfo;
103	<	static Visual *vis;
104	<	static Colormap cmap[2];                                                        // Two colormaps (DGA) for 8-bit mode
127	>	static Window rootwin;                                                          // Root window and our window
128	>	static int num_depths = 0;                                                      // Number of available X depths
129	>	static int *avail_depths = NULL;                                        // List of available X depths
130		static XColor black, white;
131		static unsigned long black_pixel, white_pixel;
132		static int eventmask;
108	–	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask;
109	–	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
133
134	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
135	<	static XColor palette[256];                                                     // Color palette for 8-bit mode
134	>	static int xdepth;                                                                      // Depth of X screen
135	>	static XVisualInfo visualInfo;
136	>	static Visual *vis;
137	>	static int color_class;
138	>
139	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
140	>
141	>	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
142	>
143	>	static XColor palette[256];                                                     // Color palette to be used as CLUT and gamma table
144		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
145
146	<	// Variables for window mode
147	<	static GC the_gc;
148	<	static XImage *img = NULL;
118	<	static XShmSegmentInfo shminfo;
119	<	static XImage *cursor_image, *cursor_mask_image;
120	<	static Pixmap cursor_map, cursor_mask_map;
121	<	static Cursor mac_cursor;
122	<	static GC cursor_gc, cursor_mask_gc;
123	<	static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer
124	<	static uint8 the_cursor[64];                                            // Cursor image data
125	<	static bool have_shm = false;                                           // Flag: SHM extensions available
126	<
127	<	// Variables for XF86 DGA mode
128	<	static int current_dga_cmap;                                            // Number (0 or 1) of currently installed DGA colormap
129	<	static Window suspend_win;                                                      // "Suspend" window
130	<	static void *fb_save = NULL;                                            // Saved frame buffer for suspend
131	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
146	>	#ifdef ENABLE_FBDEV_DGA
147	>	static int fbdev_fd = -1;
148	>	#endif
149
150	<	// Variables for fbdev DGA mode
151	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
152	<	static int fbdev_fd;
150	>	#ifdef ENABLE_XF86_VIDMODE
151	>	static XF86VidModeModeInfo **x_video_modes = NULL;      // Array of all available modes
152	>	static int num_x_video_modes;
153	>	#endif
154	>
155	>	// Mutex to protect palette
156	>	#ifdef HAVE_PTHREADS
157	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
158	>	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
159	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
160	>	#else
161	>	#define LOCK_PALETTE
162	>	#define UNLOCK_PALETTE
163	>	#endif
164	>
165	>	// Mutex to protect frame buffer
166	>	#ifdef HAVE_PTHREADS
167	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
168	>	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
169	>	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
170	>	#else
171	>	#define LOCK_FRAME_BUFFER
172	>	#define UNLOCK_FRAME_BUFFER
173	>	#endif
174	>
175	>	// Variables for non-VOSF incremental refresh
176	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
177	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
178	>	static bool updt_box[17][17];
179	>	static int nr_boxes;
180	>
181	>	// Video refresh function
182	>	static void VideoRefreshInit(void);
183	>	static void (*video_refresh)(void);
184
185
186		// Prototypes
187		static void *redraw_func(void *arg);
140	–	static int event2keycode(XKeyEvent *ev);
141	–
188
189		// From main_unix.cpp
190	+	extern char *x_display_name;
191		extern Display *x_display;
192
193		// From sys_unix.cpp
#	Line 148 | Line 195 | extern void SysMountFirstFloppy(void);
195
196
197		/*
198	<	*  Initialization
198	>	*  Utility functions
199		*/
200
201	<	// Set VideoMonitor according to video mode
202	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
201	>	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
202	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
203		{
204	<	int layout = FLAYOUT_DIRECT;
204	>	return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift);
205	>	}
206	>
207	>	// Do we have a visual for handling the specified Mac depth? If so, set the
208	>	// global variables "xdepth", "visualInfo", "vis" and "color_class".
209	>	static bool find_visual_for_depth(video_depth depth)
210	>	{
211	>	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
212	>
213	>	// 1-bit works always and uses default visual
214	>	if (depth == VDEPTH_1BIT) {
215	>	vis = DefaultVisual(x_display, screen);
216	>	visualInfo.visualid = XVisualIDFromVisual(vis);
217	>	int num = 0;
218	>	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
219	>	visualInfo = vi[0];
220	>	XFree(vi);
221	>	xdepth = visualInfo.depth;
222	>	color_class = visualInfo.c_class;
223	>	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
224	>	return true;
225	>	}
226	>
227	>	// Calculate minimum and maximum supported X depth
228	>	int min_depth = 1, max_depth = 32;
229		switch (depth) {
230	<	case 1:
231	<	layout = FLAYOUT_DIRECT;
232	<	VideoMonitor.mode = VMODE_1BIT;
230	>	#ifdef ENABLE_VOSF
231	>	case VDEPTH_2BIT:
232	>	case VDEPTH_4BIT:       // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
233	>	case VDEPTH_8BIT:
234	>	min_depth = 8;
235	>	max_depth = 32;
236		break;
237	<	case 8:
238	<	layout = FLAYOUT_DIRECT;
239	<	VideoMonitor.mode = VMODE_8BIT;
240	<	break;
241	<	case 15:
242	<	layout = FLAYOUT_HOST_555;
243	<	VideoMonitor.mode = VMODE_16BIT;
237	>	#else
238	>	case VDEPTH_2BIT:
239	>	case VDEPTH_4BIT:       // 2/4-bit requires VOSF blitters
240	>	return false;
241	>	case VDEPTH_8BIT:       // 8-bit without VOSF requires an 8-bit visual
242	>	min_depth = 8;
243	>	max_depth = 8;
244		break;
245	<	case 16:
246	<	layout = FLAYOUT_HOST_565;
247	<	VideoMonitor.mode = VMODE_16BIT;
245	>	#endif
246	>	case VDEPTH_16BIT:      // 16-bit requires a 15/16-bit visual
247	>	min_depth = 15;
248	>	max_depth = 16;
249		break;
250	<	case 24:
251	<	case 32:
252	<	layout = FLAYOUT_HOST_888;
178	<	VideoMonitor.mode = VMODE_32BIT;
250	>	case VDEPTH_32BIT:      // 32-bit requires a 24/32-bit visual
251	>	min_depth = 24;
252	>	max_depth = 32;
253		break;
254		}
255	<	VideoMonitor.x = width;
256	<	VideoMonitor.y = height;
257	<	VideoMonitor.bytes_per_row = bytes_per_row;
255	>	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
256	>
257	>	// Try to find a visual for one of the color depths
258	>	bool visual_found = false;
259	>	for (int i=0; i<num_depths && !visual_found; i++) {
260	>
261	>	xdepth = avail_depths[i];
262	>	D(bug(" trying to find visual for depth %d\n", xdepth));
263	>	if (xdepth < min_depth || xdepth > max_depth)
264	>	continue;
265	>
266	>	// Determine best color class for this depth
267	>	switch (xdepth) {
268	>	case 1: // Try StaticGray or StaticColor
269	>	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
270	>	|| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
271	>	visual_found = true;
272	>	break;
273	>	case 8: // Need PseudoColor
274	>	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
275	>	visual_found = true;
276	>	break;
277	>	case 15:
278	>	case 16:
279	>	case 24:
280	>	case 32: // Try DirectColor first, as this will allow gamma correction
281	>	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
282	>	|| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
283	>	visual_found = true;
284	>	break;
285	>	default:
286	>	D(bug("  not a supported depth\n"));
287	>	break;
288	>	}
289	>	}
290	>	if (!visual_found)
291	>	return false;
292	>
293	>	// Visual was found
294	>	vis = visualInfo.visual;
295	>	color_class = visualInfo.c_class;
296	>	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
297	>	#if DEBUG
298	>	switch (color_class) {
299	>	case StaticGray: D(bug("StaticGray\n")); break;
300	>	case GrayScale: D(bug("GrayScale\n")); break;
301	>	case StaticColor: D(bug("StaticColor\n")); break;
302	>	case PseudoColor: D(bug("PseudoColor\n")); break;
303	>	case TrueColor: D(bug("TrueColor\n")); break;
304	>	case DirectColor: D(bug("DirectColor\n")); break;
305	>	}
306	>	#endif
307	>	return true;
308	>	}
309	>
310	>	// Add mode to list of supported modes
311	>	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
312	>	{
313	>	video_mode mode;
314	>	mode.x = width;
315	>	mode.y = height;
316	>	mode.resolution_id = resolution_id;
317	>	mode.bytes_per_row = bytes_per_row;
318	>	mode.depth = depth;
319	>	VideoModes.push_back(mode);
320	>	}
321	>
322	>	// Add standard list of windowed modes for given color depth
323	>	static void add_window_modes(video_depth depth)
324	>	{
325	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
326	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
327	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
328	>	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
329	>	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
330	>	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
331	>	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
332	>	}
333	>
334	>	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
335	>	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
336	>	{
337	>	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
338	>	int layout = FLAYOUT_DIRECT;
339	>	if (depth == VDEPTH_16BIT)
340	>	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
341	>	else if (depth == VDEPTH_32BIT)
342	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
343		if (native_byte_order)
344		MacFrameLayout = layout;
345		else
346		MacFrameLayout = FLAYOUT_DIRECT;
347	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
348	+
349	+	// Set variables used by UAE memory banking
350	+	MacFrameBaseHost = the_buffer;
351	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
352	+	InitFrameBufferMapping();
353	+	#else
354	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
355	+	#endif
356	+	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
357	+	}
358	+
359	+	// Set window name and class
360	+	static void set_window_name(Window w, int name)
361	+	{
362	+	const char *str = GetString(name);
363	+	XStoreName(x_display, w, str);
364	+	XSetIconName(x_display, w, str);
365	+
366	+	XClassHint *hints;
367	+	hints = XAllocClassHint();
368	+	if (hints) {
369	+	hints->res_name = "BasiliskII";
370	+	hints->res_class = "BasiliskII";
371	+	XSetClassHint(x_display, w, hints);
372	+	XFree(hints);
373	+	}
374	+	}
375	+
376	+	// Set window input focus flag
377	+	static void set_window_focus(Window w)
378	+	{
379	+	XWMHints *hints = XAllocWMHints();
380	+	if (hints) {
381	+	hints->input = True;
382	+	hints->initial_state = NormalState;
383	+	hints->flags = InputHint | StateHint;
384	+	XSetWMHints(x_display, w, hints);
385	+	XFree(hints);
386	+	}
387	+	}
388	+
389	+	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
390	+	static Atom WM_DELETE_WINDOW = (Atom)0;
391	+	static void set_window_delete_protocol(Window w)
392	+	{
393	+	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
394	+	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
395	+	}
396	+
397	+	// Wait until window is mapped/unmapped
398	+	void wait_mapped(Window w)
399	+	{
400	+	XEvent e;
401	+	do {
402	+	XMaskEvent(x_display, StructureNotifyMask, &e);
403	+	} while ((e.type != MapNotify) || (e.xmap.event != w));
404	+	}
405	+
406	+	void wait_unmapped(Window w)
407	+	{
408	+	XEvent e;
409	+	do {
410	+	XMaskEvent(x_display, StructureNotifyMask, &e);
411	+	} while ((e.type != UnmapNotify) || (e.xmap.event != w));
412		}
413
414		// Trap SHM errors
#	Line 200 | Line 424 | static int error_handler(Display *d, XEr
424		return old_error_handler(d, e);
425		}
426
427	<	// Init window mode
428	<	static bool init_window(int width, int height)
427	>
428	>	/*
429	>	*  Display "driver" classes
430	>	*/
431	>
432	>	class driver_base {
433	>	public:
434	>	driver_base();
435	>	virtual ~driver_base();
436	>
437	>	virtual void update_palette(void);
438	>	virtual void suspend(void) {}
439	>	virtual void resume(void) {}
440	>	virtual void toggle_mouse_grab(void) {}
441	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
442	>
443	>	void disable_mouse_accel(void);
444	>	void restore_mouse_accel(void);
445	>
446	>	virtual void grab_mouse(void) {}
447	>	virtual void ungrab_mouse(void) {}
448	>
449	>	public:
450	>	bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
451	>	Window w;               // The window we draw into
452	>
453	>	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
454	>	};
455	>
456	>	class driver_window;
457	>	static void update_display_window_vosf(driver_window *drv);
458	>	static void update_display_dynamic(int ticker, driver_window *drv);
459	>	static void update_display_static(driver_window *drv);
460	>
461	>	class driver_window : public driver_base {
462	>	friend void update_display_window_vosf(driver_window *drv);
463	>	friend void update_display_dynamic(int ticker, driver_window *drv);
464	>	friend void update_display_static(driver_window *drv);
465	>
466	>	public:
467	>	driver_window(const video_mode &mode);
468	>	~driver_window();
469	>
470	>	void toggle_mouse_grab(void);
471	>	void mouse_moved(int x, int y);
472	>
473	>	void grab_mouse(void);
474	>	void ungrab_mouse(void);
475	>
476	>	private:
477	>	GC gc;
478	>	XImage *img;
479	>	bool have_shm;                                  // Flag: SHM extensions available
480	>	XShmSegmentInfo shminfo;
481	>	Cursor mac_cursor;
482	>	bool mouse_grabbed;                             // Flag: mouse pointer grabbed, using relative mouse mode
483	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
484	>	};
485	>
486	>	static driver_base *drv = NULL; // Pointer to currently used driver object
487	>
488	>	#ifdef ENABLE_VOSF
489	>	# include "video_vosf.h"
490	>	#endif
491	>
492	>	driver_base::driver_base()
493	>	: init_ok(false), w(0)
494		{
495	<	// Set absolute mouse mode
496	<	ADBSetRelMouseMode(false);
495	>	the_buffer = NULL;
496	>	the_buffer_copy = NULL;
497	>	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
498	>	}
499
500	<	// Read frame skip prefs
501	<	frame_skip = PrefsFindInt32("frameskip");
502	<	if (frame_skip == 0)
503	<	frame_skip = 1;
500	>	driver_base::~driver_base()
501	>	{
502	>	ungrab_mouse();
503	>	restore_mouse_accel();
504
505	<	// Create window
506	<	XSetWindowAttributes wattr;
507	<	wattr.event_mask = eventmask = win_eventmask;
508	<	wattr.background_pixel = black_pixel;
509	<	wattr.border_pixel = black_pixel;
219	<	wattr.backing_store = Always;
220	<	wattr.backing_planes = xdepth;
505	>	if (w) {
506	>	XUnmapWindow(x_display, w);
507	>	wait_unmapped(w);
508	>	XDestroyWindow(x_display, w);
509	>	}
510
511	<	XSync(x_display, false);
223	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
224	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
225	<	CWBackingStore | CWBackingPlanes, &wattr);
226	<	XSync(x_display, false);
227	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
228	<	XMapRaised(x_display, the_win);
511	>	XFlush(x_display);
512		XSync(x_display, false);
513
514	<	// Set colormap
515	<	if (depth == 8) {
516	<	XSetWindowColormap(x_display, the_win, cmap[0]);
517	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
514	>	// Free frame buffer(s)
515	>	if (!use_vosf) {
516	>	if (the_buffer) {
517	>	free(the_buffer);
518	>	the_buffer = NULL;
519	>	}
520	>	if (the_buffer_copy) {
521	>	free(the_buffer_copy);
522	>	the_buffer_copy = NULL;
523	>	}
524	>	}
525	>	#ifdef ENABLE_VOSF
526	>	else {
527	>	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
528	>	if (the_buffer != VM_MAP_FAILED) {
529	>	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
530	>	vm_release(the_buffer, the_buffer_size);
531	>	the_buffer = NULL;
532	>	}
533	>	if (the_host_buffer) {
534	>	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
535	>	free(the_host_buffer);
536	>	the_host_buffer = NULL;
537	>	}
538	>	if (the_buffer_copy) {
539	>	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
540	>	free(the_buffer_copy);
541	>	the_buffer_copy = NULL;
542	>	}
543		}
544	+	#endif
545	+	}
546
547	<	// Make window unresizable
548	<	XSizeHints *hints;
549	<	if ((hints = XAllocSizeHints()) != NULL) {
550	<	hints->min_width = width;
551	<	hints->max_width = width;
552	<	hints->min_height = height;
553	<	hints->max_height = height;
554	<	hints->flags = PMinSize | PMaxSize;
555	<	XSetWMNormalHints(x_display, the_win, hints);
246	<	XFree((char *)hints);
547	>	// Palette has changed
548	>	void driver_base::update_palette(void)
549	>	{
550	>	if (color_class == PseudoColor || color_class == DirectColor) {
551	>	int num = vis->map_entries;
552	>	if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor)
553	>	return; // Indexed mode on true color screen, don't set CLUT
554	>	XStoreColors(x_display, cmap[0], palette, num);
555	>	XStoreColors(x_display, cmap[1], palette, num);
556		}
557	<
557	>	XSync(x_display, false);
558	>	}
559	>
560	>	// Disable mouse acceleration
561	>	void driver_base::disable_mouse_accel(void)
562	>	{
563	>	XChangePointerControl(x_display, True, False, 1, 1, 0);
564	>	}
565	>
566	>	// Restore mouse acceleration to original value
567	>	void driver_base::restore_mouse_accel(void)
568	>	{
569	>	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
570	>	}
571	>
572	>
573	>	/*
574	>	*  Windowed display driver
575	>	*/
576	>
577	>	// Open display
578	>	driver_window::driver_window(const video_mode &mode)
579	>	: gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false)
580	>	{
581	>	int width = mode.x, height = mode.y;
582	>	int aligned_width = (width + 15) & ~15;
583	>	int aligned_height = (height + 15) & ~15;
584	>
585	>	// Set absolute mouse mode
586	>	ADBSetRelMouseMode(mouse_grabbed);
587	>
588	>	// Create window (setting background_pixel, border_pixel and colormap is
589	>	// mandatory when using a non-default visual; in 1-bit mode we use the
590	>	// default visual, so we can also use the default colormap)
591	>	XSetWindowAttributes wattr;
592	>	wattr.event_mask = eventmask = win_eventmask;
593	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
594	>	wattr.border_pixel = 0;
595	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
596	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
597	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWColormap, &wattr);
598	>	D(bug(" window created\n"));
599	>
600	>	// Set window name/class
601	>	set_window_name(w, STR_WINDOW_TITLE);
602	>
603	>	// Indicate that we want keyboard input
604	>	set_window_focus(w);
605	>
606	>	// Set delete protocol property
607	>	set_window_delete_protocol(w);
608	>
609	>	// Make window unresizable
610	>	{
611	>	XSizeHints *hints = XAllocSizeHints();
612	>	if (hints) {
613	>	hints->min_width = width;
614	>	hints->max_width = width;
615	>	hints->min_height = height;
616	>	hints->max_height = height;
617	>	hints->flags = PMinSize | PMaxSize;
618	>	XSetWMNormalHints(x_display, w, hints);
619	>	XFree(hints);
620	>	}
621	>	}
622	>	D(bug(" window attributes set\n"));
623	>
624	>	// Show window
625	>	XMapWindow(x_display, w);
626	>	wait_mapped(w);
627	>	D(bug(" window mapped\n"));
628	>
629	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
630	>	// use SHM because that doesn't allow changing the image byte order
631	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
632	>
633		// Try to create and attach SHM image
634	<	have_shm = false;
251	<	if (depth != 1 && XShmQueryExtension(x_display)) {
634	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
635
636		// Create SHM image ("height + 2" for safety)
637	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
638	<	shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
639	<	the_buffer = (uint8 *)shmat(shminfo.shmid, 0, 0);
640	<	shminfo.shmaddr = img->data = (char *)the_buffer;
637	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
638	>	D(bug(" shm image created\n"));
639	>	shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
640	>	the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
641	>	shminfo.shmaddr = img->data = (char *)the_buffer_copy;
642		shminfo.readOnly = False;
643
644		// Try to attach SHM image, catching errors
#	Line 266 | Line 650 | static bool init_window(int width, int h
650		if (shm_error) {
651		shmdt(shminfo.shmaddr);
652		XDestroyImage(img);
653	+	img = NULL;
654		shminfo.shmid = -1;
655		} else {
656		have_shm = true;
657		shmctl(shminfo.shmid, IPC_RMID, 0);
658		}
659	+	D(bug(" shm image attached\n"));
660		}
661
662		// Create normal X image if SHM doesn't work ("height + 2" for safety)
663		if (!have_shm) {
664	<	int bytes_per_row = width;
665	<	switch (depth) {
666	<	case 1:
667	<	bytes_per_row /= 8;
282	<	break;
283	<	case 15:
284	<	case 16:
285	<	bytes_per_row *= 2;
286	<	break;
287	<	case 24:
288	<	case 32:
289	<	bytes_per_row *= 4;
290	<	break;
291	<	}
292	<	the_buffer = (uint8 *)malloc((height + 2) * bytes_per_row);
293	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer, width, height, 32, bytes_per_row);
664	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
665	>	the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
666	>	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);
667	>	D(bug(" X image created\n"));
668		}
669
670	<	// 1-Bit mode is big-endian
297	<	if (depth == 1) {
670	>	if (need_msb_image) {
671		img->byte_order = MSBFirst;
672		img->bitmap_bit_order = MSBFirst;
673		}
674
675	<	// Allocate memory for frame buffer copy
676	<	the_buffer_copy = (uint8 *)malloc((height + 2) * img->bytes_per_line);
675	>	#ifdef ENABLE_VOSF
676	>	use_vosf = true;
677	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
678	>	the_host_buffer = the_buffer_copy;
679	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
680	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
681	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
682	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
683	>	#else
684	>	// Allocate memory for frame buffer
685	>	the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
686	>	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
687	>	#endif
688
689		// Create GC
690	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
691	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
690	>	gc = XCreateGC(x_display, w, 0, 0);
691	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
692
693	<	// Create cursor
694	<	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor, 16, 16, 16, 2);
695	<	cursor_image->byte_order = MSBFirst;
696	<	cursor_image->bitmap_bit_order = MSBFirst;
697	<	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor+32, 16, 16, 16, 2);
698	<	cursor_mask_image->byte_order = MSBFirst;
315	<	cursor_mask_image->bitmap_bit_order = MSBFirst;
316	<	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
317	<	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
318	<	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
319	<	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
320	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
693	>	// Create no_cursor
694	>	mac_cursor = XCreatePixmapCursor(x_display,
695	>	XCreatePixmap(x_display, w, 1, 1, 1),
696	>	XCreatePixmap(x_display, w, 1, 1, 1),
697	>	&black, &white, 0, 0);
698	>	XDefineCursor(x_display, w, mac_cursor);
699
700	<	// Set VideoMonitor
700	>	// Init blitting routines
701	>	bool native_byte_order;
702		#ifdef WORDS_BIGENDIAN
703	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst);
703	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
704		#else
705	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst);
705	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
706		#endif
707	<
708	<	#if REAL_ADDRESSING
709	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
710	<	MacFrameLayout = FLAYOUT_DIRECT;
707	>	#ifdef ENABLE_VOSF
708	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
709	>	#endif
710	>
711	>	// Set VideoMonitor
712	>	VideoMonitor.mode = mode;
713	>	set_mac_frame_buffer(mode.depth, native_byte_order);
714	>
715	>	// Everything went well
716	>	init_ok = true;
717	>	}
718	>
719	>	// Close display
720	>	driver_window::~driver_window()
721	>	{
722	>	if (have_shm) {
723	>	XShmDetach(x_display, &shminfo);
724	>	#ifdef ENABLE_VOSF
725	>	the_host_buffer = NULL; // don't free() in driver_base dtor
726		#else
727	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
727	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
728		#endif
729	<	return true;
729	>	}
730	>	if (img) {
731	>	if (!have_shm)
732	>	img->data = NULL;
733	>	XDestroyImage(img);
734	>	}
735	>	if (have_shm) {
736	>	shmdt(shminfo.shmaddr);
737	>	shmctl(shminfo.shmid, IPC_RMID, 0);
738	>	}
739	>	if (gc)
740	>	XFreeGC(x_display, gc);
741	>	}
742	>
743	>	// Toggle mouse grab
744	>	void driver_window::toggle_mouse_grab(void)
745	>	{
746	>	if (mouse_grabbed)
747	>	ungrab_mouse();
748	>	else
749	>	grab_mouse();
750	>	}
751	>
752	>	// Grab mouse, switch to relative mouse mode
753	>	void driver_window::grab_mouse(void)
754	>	{
755	>	int result;
756	>	for (int i=0; i<10; i++) {
757	>	result = XGrabPointer(x_display, w, True, 0,
758	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
759	>	if (result != AlreadyGrabbed)
760	>	break;
761	>	Delay_usec(100000);
762	>	}
763	>	if (result == GrabSuccess) {
764	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
765	>	ADBSetRelMouseMode(mouse_grabbed = true);
766	>	disable_mouse_accel();
767	>	}
768	>	}
769	>
770	>	// Ungrab mouse, switch to absolute mouse mode
771	>	void driver_window::ungrab_mouse(void)
772	>	{
773	>	if (mouse_grabbed) {
774	>	XUngrabPointer(x_display, CurrentTime);
775	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
776	>	ADBSetRelMouseMode(mouse_grabbed = false);
777	>	restore_mouse_accel();
778	>	}
779	>	}
780	>
781	>	// Mouse moved
782	>	void driver_window::mouse_moved(int x, int y)
783	>	{
784	>	if (!mouse_grabbed) {
785	>	mouse_last_x = x; mouse_last_y = y;
786	>	ADBMouseMoved(x, y);
787	>	return;
788	>	}
789	>
790	>	// Warped mouse motion (this code is taken from SDL)
791	>
792	>	// Post first mouse event
793	>	int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y;
794	>	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
795	>	mouse_last_x = x; mouse_last_y = y;
796	>	ADBMouseMoved(delta_x, delta_y);
797	>
798	>	// Only warp the pointer when it has reached the edge
799	>	const int MOUSE_FUDGE_FACTOR = 8;
800	>	if (x < MOUSE_FUDGE_FACTOR || x > (width - MOUSE_FUDGE_FACTOR)
801	>	|| y < MOUSE_FUDGE_FACTOR || y > (height - MOUSE_FUDGE_FACTOR)) {
802	>	XEvent event;
803	>	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
804	>	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
805	>	mouse_last_x = x; mouse_last_y = y;
806	>	ADBMouseMoved(delta_x, delta_y);
807	>	}
808	>	mouse_last_x = width/2;
809	>	mouse_last_y = height/2;
810	>	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
811	>	for (int i=0; i<10; i++) {
812	>	XMaskEvent(x_display, PointerMotionMask, &event);
813	>	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
814	>	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
815	>	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
816	>	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
817	>	break;
818	>	}
819	>	}
820	>	}
821	>
822	>
823	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
824	>	/*
825	>	*  DGA display driver base class
826	>	*/
827	>
828	>	class driver_dga : public driver_base {
829	>	public:
830	>	driver_dga();
831	>	~driver_dga();
832	>
833	>	void suspend(void);
834	>	void resume(void);
835	>
836	>	private:
837	>	Window suspend_win;             // "Suspend" information window
838	>	void *fb_save;                  // Saved frame buffer for suspend/resume
839	>	};
840	>
841	>	driver_dga::driver_dga()
842	>	: suspend_win(0), fb_save(NULL)
843	>	{
844	>	}
845	>
846	>	driver_dga::~driver_dga()
847	>	{
848	>	XUngrabPointer(x_display, CurrentTime);
849	>	XUngrabKeyboard(x_display, CurrentTime);
850	>	}
851	>
852	>	// Suspend emulation
853	>	void driver_dga::suspend(void)
854	>	{
855	>	// Release ctrl key
856	>	ADBKeyUp(0x36);
857	>	ctrl_down = false;
858	>
859	>	// Lock frame buffer (this will stop the MacOS thread)
860	>	LOCK_FRAME_BUFFER;
861	>
862	>	// Save frame buffer
863	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
864	>	if (fb_save)
865	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
866	>
867	>	// Close full screen display
868	>	#ifdef ENABLE_XF86_DGA
869	>	XF86DGADirectVideo(x_display, screen, 0);
870	>	#endif
871	>	XUngrabPointer(x_display, CurrentTime);
872	>	XUngrabKeyboard(x_display, CurrentTime);
873	>	restore_mouse_accel();
874	>	XUnmapWindow(x_display, w);
875	>	wait_unmapped(w);
876	>
877	>	// Open "suspend" window
878	>	XSetWindowAttributes wattr;
879	>	wattr.event_mask = KeyPressMask;
880	>	wattr.background_pixel = black_pixel;
881	>
882	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
883	>	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
884	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
885	>	set_window_focus(suspend_win);
886	>	XMapWindow(x_display, suspend_win);
887	>	emul_suspended = true;
888	>	}
889	>
890	>	// Resume emulation
891	>	void driver_dga::resume(void)
892	>	{
893	>	// Close "suspend" window
894	>	XDestroyWindow(x_display, suspend_win);
895	>	XSync(x_display, false);
896	>
897	>	// Reopen full screen display
898	>	XMapRaised(x_display, w);
899	>	wait_mapped(w);
900	>	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
901	>	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
902	>	XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
903	>	disable_mouse_accel();
904	>	#ifdef ENABLE_XF86_DGA
905	>	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
906	>	XF86DGASetViewPort(x_display, screen, 0, 0);
907	>	#endif
908	>	XSync(x_display, false);
909	>
910	>	// the_buffer already contains the data to restore. i.e. since a temporary
911	>	// frame buffer is used when VOSF is actually used, fb_save is therefore
912	>	// not necessary.
913	>	#ifdef ENABLE_VOSF
914	>	if (use_vosf) {
915	>	LOCK_VOSF;
916	>	PFLAG_SET_ALL;
917	>	UNLOCK_VOSF;
918	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
919	>	}
920	>	#endif
921	>
922	>	// Restore frame buffer
923	>	if (fb_save) {
924	>	#ifdef ENABLE_VOSF
925	>	// Don't copy fb_save to the temporary frame buffer in VOSF mode
926	>	if (!use_vosf)
927	>	#endif
928	>	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
929	>	free(fb_save);
930	>	fb_save = NULL;
931	>	}
932	>
933	>	// Unlock frame buffer (and continue MacOS thread)
934	>	UNLOCK_FRAME_BUFFER;
935	>	emul_suspended = false;
936		}
937	+	#endif
938	+
939	+
940	+	#ifdef ENABLE_FBDEV_DGA
941	+	/*
942	+	*  fbdev DGA display driver
943	+	*/
944	+
945	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
946	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
947	+
948	+	class driver_fbdev : public driver_dga {
949	+	public:
950	+	driver_fbdev(const video_mode &mode);
951	+	~driver_fbdev();
952	+	};
953
954	<	// Init fbdev DGA display
955	<	static bool init_fbdev_dga(char *in_fb_name)
954	>	// Open display
955	>	driver_fbdev::driver_fbdev(const video_mode &mode)
956		{
957	<	#if ENABLE_FBDEV_DGA
957	>	int width = mode.x, height = mode.y;
958	>
959	>	// Set absolute mouse mode
960	>	ADBSetRelMouseMode(false);
961	>
962		// Find the maximum depth available
963		int ndepths, max_depth(0);
964		int *depths = XListDepths(x_display, screen, &ndepths);
965		if (depths == NULL) {
966		printf("FATAL: Could not determine the maximal depth available\n");
967	<	return false;
967	>	return;
968		} else {
969		while (ndepths-- > 0) {
970		if (depths[ndepths] > max_depth)
#	Line 361 | Line 981 | static bool init_fbdev_dga(char *in_fb_n
981		char str[256];
982		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
983		ErrorAlert(str);
984	<	return false;
984	>	return;
985		}
986
987		int fb_depth;           // supported depth
#	Line 381 | Line 1001 | static bool init_fbdev_dga(char *in_fb_n
1001		continue;
1002
1003		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
1004	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
1004	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
1005		device_found = true;
1006		break;
1007		}
#	Line 393 | Line 1013 | static bool init_fbdev_dga(char *in_fb_n
1013		// Frame buffer name not found ? Then, display warning
1014		if (!device_found) {
1015		char str[256];
1016	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
1016	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
1017		ErrorAlert(str);
1018	<	return false;
1018	>	return;
1019		}
1020
401	–	int width = DisplayWidth(x_display, screen);
402	–	int height = DisplayHeight(x_display, screen);
403	–	depth = fb_depth; // max_depth
404	–
405	–	// Set relative mouse mode
406	–	ADBSetRelMouseMode(false);
407	–
1021		// Create window
1022		XSetWindowAttributes wattr;
1023	<	wattr.override_redirect = True;
1024	<	wattr.backing_store             = NotUseful;
1025	<	wattr.background_pixel  = white_pixel;
1026	<	wattr.border_pixel              = black_pixel;
414	<	wattr.event_mask                = eventmask = dga_eventmask;
1023	>	wattr.event_mask = eventmask = dga_eventmask;
1024	>	wattr.background_pixel = white_pixel;
1025	>	wattr.override_redirect = True;
1026	>	wattr.colormap = cmap[0];
1027
1028	<	XSync(x_display, false);
417	<	the_win = XCreateWindow(x_display, rootwin,
1028	>	w = XCreateWindow(x_display, rootwin,
1029		0, 0, width, height,
1030		0, xdepth, InputOutput, vis,
1031	<	CWEventMask|CWBackPixel|CWBorderPixel|CWOverrideRedirect|CWBackingStore,
1031	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (fb_depth <= 8 ? CWColormap : 0),
1032		&wattr);
1033	<	XSync(x_display, false);
1034	<	XMapRaised(x_display, the_win);
1035	<	XSync(x_display, false);
1033	>
1034	>	// Set window name/class
1035	>	set_window_name(w, STR_WINDOW_TITLE);
1036	>
1037	>	// Indicate that we want keyboard input
1038	>	set_window_focus(w);
1039	>
1040	>	// Show window
1041	>	XMapRaised(x_display, w);
1042	>	wait_mapped(w);
1043
1044		// Grab mouse and keyboard
1045	<	XGrabKeyboard(x_display, the_win, True,
1045	>	XGrabKeyboard(x_display, w, True,
1046		GrabModeAsync, GrabModeAsync, CurrentTime);
1047	<	XGrabPointer(x_display, the_win, True,
1047	>	XGrabPointer(x_display, w, True,
1048		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
1049	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
1049	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1050	>	disable_mouse_accel();
1051
1052	<	// Set colormap
1053	<	if (depth == 8) {
435	<	XSetWindowColormap(x_display, the_win, cmap[0]);
436	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
437	<	}
1052	>	// Calculate bytes per row
1053	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1054
1055	<	// Set VideoMonitor
1056	<	int bytes_per_row = width;
1057	<	switch (depth) {
1058	<	case 1:
443	<	bytes_per_row = ((width | 7) & ~7) >> 3;
444	<	break;
445	<	case 15:
446	<	case 16:
447	<	bytes_per_row *= 2;
448	<	break;
449	<	case 24:
450	<	case 32:
451	<	bytes_per_row *= 4;
452	<	break;
453	<	}
454	<
455	<	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
456	<	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1055	>	// Map frame buffer
1056	>	the_buffer_size = height * bytes_per_row;
1057	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1058	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1059		char str[256];
1060		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1061		ErrorAlert(str);
1062	<	return false;
1062	>	return;
1063		}
1064		}
1065
1066	<	set_video_monitor(width, height, bytes_per_row, true);
1067	<	#if REAL_ADDRESSING
1068	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
1069	<	MacFrameLayout = FLAYOUT_DIRECT;
1066	>	#if ENABLE_VOSF
1067	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1068	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1069	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1070	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1071	>
1072	>	if (use_vosf) {
1073	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1074	>	the_host_buffer = the_buffer;
1075	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1076	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1077	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1078	>	}
1079		#else
1080	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1080	>	use_vosf = false;
1081		#endif
1082	<	return true;
1083	<	#else
1084	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
1085	<	return false;
1082	>	#endif
1083	>
1084	>	// Set VideoMonitor
1085	>	VideoModes[0].bytes_per_row = bytes_per_row;
1086	>	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
1087	>	VideoMonitor.mode = mode;
1088	>	set_mac_frame_buffer(mode.depth, true);
1089	>
1090	>	// Everything went well
1091	>	init_ok = true;
1092	>	}
1093	>
1094	>	// Close display
1095	>	driver_fbdev::~driver_fbdev()
1096	>	{
1097	>	if (!use_vosf) {
1098	>	if (the_buffer != MAP_FAILED) {
1099	>	// don't free() the screen buffer in driver_base dtor
1100	>	munmap(the_buffer, the_buffer_size);
1101	>	the_buffer = NULL;
1102	>	}
1103	>	}
1104	>	#ifdef ENABLE_VOSF
1105	>	else {
1106	>	if (the_host_buffer != MAP_FAILED) {
1107	>	// don't free() the screen buffer in driver_base dtor
1108	>	munmap(the_host_buffer, the_buffer_size);
1109	>	the_host_buffer = NULL;
1110	>	}
1111	>	}
1112		#endif
1113		}
1114	+	#endif
1115	+
1116	+
1117	+	#ifdef ENABLE_XF86_DGA
1118	+	/*
1119	+	*  XFree86 DGA display driver
1120	+	*/
1121
1122	<	// Init XF86 DGA display
1123	<	static bool init_xf86_dga(int width, int height)
1122	>	class driver_xf86dga : public driver_dga {
1123	>	public:
1124	>	driver_xf86dga(const video_mode &mode);
1125	>	~driver_xf86dga();
1126	>
1127	>	void update_palette(void);
1128	>	void resume(void);
1129	>
1130	>	private:
1131	>	int current_dga_cmap;                                   // Number (0 or 1) of currently installed DGA colormap
1132	>	};
1133	>
1134	>	// Open display
1135	>	driver_xf86dga::driver_xf86dga(const video_mode &mode)
1136	>	: current_dga_cmap(0)
1137		{
1138	<	#if ENABLE_XF86_DGA
1138	>	int width = mode.x, height = mode.y;
1139	>
1140		// Set relative mouse mode
1141		ADBSetRelMouseMode(true);
1142
1143	+	#ifdef ENABLE_XF86_VIDMODE
1144	+	// Switch to best mode
1145	+	if (has_vidmode) {
1146	+	int best = 0;
1147	+	for (int i=1; i<num_x_video_modes; i++) {
1148	+	if (x_video_modes[i]->hdisplay >= width && x_video_modes[i]->vdisplay >= height &&
1149	+	x_video_modes[i]->hdisplay <= x_video_modes[best]->hdisplay && x_video_modes[i]->vdisplay <= x_video_modes[best]->vdisplay) {
1150	+	best = i;
1151	+	}
1152	+	}
1153	+	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
1154	+	XF86VidModeSetViewPort(x_display, screen, 0, 0);
1155	+	XSync(x_display, false);
1156	+	}
1157	+	#endif
1158	+
1159		// Create window
1160		XSetWindowAttributes wattr;
1161		wattr.event_mask = eventmask = dga_eventmask;
488	–	wattr.border_pixel = black_pixel;
1162		wattr.override_redirect = True;
1163
1164	<	XSync(x_display, false);
1165	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1166	<	InputOutput, vis, CWEventMask | CWBorderPixel | CWOverrideRedirect, &wattr);
1167	<	XSync(x_display, false);
1168	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
1169	<	XMapRaised(x_display, the_win);
1170	<	XSync(x_display, false);
1164	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1165	>	InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
1166	>
1167	>	// Set window name/class
1168	>	set_window_name(w, STR_WINDOW_TITLE);
1169	>
1170	>	// Indicate that we want keyboard input
1171	>	set_window_focus(w);
1172	>
1173	>	// Show window
1174	>	XMapRaised(x_display, w);
1175	>	wait_mapped(w);
1176
1177		// Establish direct screen connection
1178	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
1178	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
1179		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1180		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1181		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1182	+	disable_mouse_accel();
1183
1184		int v_width, v_bank, v_size;
1185		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 509 | Line 1188 | static bool init_xf86_dga(int width, int
1188		XF86DGASetVidPage(x_display, screen, 0);
1189
1190		// Set colormap
1191	<	if (depth == 8) {
1192	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
514	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
1191	>	if (!IsDirectMode(mode)) {
1192	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1193		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1194		}
1195	+	XSync(x_display, false);
1196
1197	<	// Set VideoMonitor
1198	<	int bytes_per_row = (v_width + 7) & ~7;
1199	<	switch (depth) {
1200	<	case 1:
1201	<	bytes_per_row /= 8;
1202	<	break;
1203	<	case 15:
1204	<	case 16:
1205	<	bytes_per_row *= 2;
1206	<	break;
1207	<	case 24:
1208	<	case 32:
1209	<	bytes_per_row *= 4;
1210	<	break;
1197	>	// Init blitting routines
1198	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1199	>	#if VIDEO_VOSF
1200	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1201	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1202	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1203	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1204	>
1205	>	if (use_vosf) {
1206	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1207	>	the_host_buffer = the_buffer;
1208	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1209	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1210	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1211		}
533	–	set_video_monitor(width, height, bytes_per_row, true);
534	–	#if REAL_ADDRESSING
535	–	VideoMonitor.mac_frame_base = (uint32)the_buffer;
536	–	MacFrameLayout = FLAYOUT_DIRECT;
1212		#else
1213	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1213	>	use_vosf = false;
1214		#endif
1215	<	return true;
1216	<	#else
1217	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
1218	<	return false;
1215	>	#endif
1216	>
1217	>	// Set VideoMonitor
1218	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1219	>	VideoMonitor.mode = mode;
1220	>	set_mac_frame_buffer(mode.depth, true);
1221	>
1222	>	// Everything went well
1223	>	init_ok = true;
1224	>	}
1225	>
1226	>	// Close display
1227	>	driver_xf86dga::~driver_xf86dga()
1228	>	{
1229	>	XF86DGADirectVideo(x_display, screen, 0);
1230	>	if (!use_vosf) {
1231	>	// don't free() the screen buffer in driver_base dtor
1232	>	the_buffer = NULL;
1233	>	}
1234	>	#ifdef ENABLE_VOSF
1235	>	else {
1236	>	// don't free() the screen buffer in driver_base dtor
1237	>	the_host_buffer = NULL;
1238	>	}
1239	>	#endif
1240	>	#ifdef ENABLE_XF86_VIDMODE
1241	>	if (has_vidmode)
1242	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1243		#endif
1244		}
1245
1246	+	// Palette has changed
1247	+	void driver_xf86dga::update_palette(void)
1248	+	{
1249	+	driver_dga::update_palette();
1250	+	current_dga_cmap ^= 1;
1251	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
1252	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1253	+	}
1254	+
1255	+	// Resume emulation
1256	+	void driver_xf86dga::resume(void)
1257	+	{
1258	+	driver_dga::resume();
1259	+	if (!IsDirectMode(VideoMonitor.mode))
1260	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1261	+	}
1262	+	#endif
1263	+
1264	+
1265	+	/*
1266	+	*  Initialization
1267	+	*/
1268	+
1269		// Init keycode translation table
1270		static void keycode_init(void)
1271		{
#	Line 609 | Line 1331 | static void keycode_init(void)
1331		}
1332		}
1333
1334	+	// Open display for specified mode
1335	+	static bool video_open(const video_mode &mode)
1336	+	{
1337	+	D(bug("video_open()\n"));
1338	+
1339	+	// Find best available X visual
1340	+	if (!find_visual_for_depth(mode.depth)) {
1341	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1342	+	return false;
1343	+	}
1344	+
1345	+	// Create color maps
1346	+	if (color_class == PseudoColor || color_class == DirectColor) {
1347	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1348	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1349	+	} else {
1350	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1351	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1352	+	}
1353	+
1354	+	// Find pixel format of direct modes
1355	+	if (color_class == DirectColor || color_class == TrueColor) {
1356	+	rshift = gshift = bshift = 0;
1357	+	rloss = gloss = bloss = 8;
1358	+	uint32 mask;
1359	+	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1360	+	++rshift;
1361	+	for (; mask&1; mask>>=1)
1362	+	--rloss;
1363	+	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1364	+	++gshift;
1365	+	for (; mask&1; mask>>=1)
1366	+	--gloss;
1367	+	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1368	+	++bshift;
1369	+	for (; mask&1; mask>>=1)
1370	+	--bloss;
1371	+	}
1372	+
1373	+	// Preset palette pixel values for CLUT or gamma table
1374	+	if (color_class == DirectColor) {
1375	+	int num = vis->map_entries;
1376	+	for (int i=0; i<num; i++) {
1377	+	int c = (i * 256) / num;
1378	+	palette[i].pixel = map_rgb(c, c, c);
1379	+	palette[i].flags = DoRed | DoGreen | DoBlue;
1380	+	}
1381	+	} else if (color_class == PseudoColor) {
1382	+	for (int i=0; i<256; i++) {
1383	+	palette[i].pixel = i;
1384	+	palette[i].flags = DoRed | DoGreen | DoBlue;
1385	+	}
1386	+	}
1387	+
1388	+	// Load gray ramp to color map
1389	+	int num = (color_class == DirectColor ? vis->map_entries : 256);
1390	+	for (int i=0; i<num; i++) {
1391	+	int c = (i * 256) / num;
1392	+	palette[i].red = c * 0x0101;
1393	+	palette[i].green = c * 0x0101;
1394	+	palette[i].blue = c * 0x0101;
1395	+	}
1396	+	if (color_class == PseudoColor || color_class == DirectColor) {
1397	+	XStoreColors(x_display, cmap[0], palette, num);
1398	+	XStoreColors(x_display, cmap[1], palette, num);
1399	+	}
1400	+
1401	+	#ifdef ENABLE_VOSF
1402	+	// Load gray ramp to 8->16/32 expand map
1403	+	if (!IsDirectMode(mode) && xdepth > 8)
1404	+	for (int i=0; i<256; i++)
1405	+	ExpandMap[i] = map_rgb(i, i, i);
1406	+	#endif
1407	+
1408	+	// Create display driver object of requested type
1409	+	switch (display_type) {
1410	+	case DISPLAY_WINDOW:
1411	+	drv = new driver_window(mode);
1412	+	break;
1413	+	#ifdef ENABLE_FBDEV_DGA
1414	+	case DISPLAY_DGA:
1415	+	drv = new driver_fbdev(mode);
1416	+	break;
1417	+	#endif
1418	+	#ifdef ENABLE_XF86_DGA
1419	+	case DISPLAY_DGA:
1420	+	drv = new driver_xf86dga(mode);
1421	+	break;
1422	+	#endif
1423	+	}
1424	+	if (drv == NULL)
1425	+	return false;
1426	+	if (!drv->init_ok) {
1427	+	delete drv;
1428	+	drv = NULL;
1429	+	return false;
1430	+	}
1431	+
1432	+	#ifdef ENABLE_VOSF
1433	+	if (use_vosf) {
1434	+	// Initialize the VOSF system
1435	+	if (!video_vosf_init()) {
1436	+	ErrorAlert(STR_VOSF_INIT_ERR);
1437	+	return false;
1438	+	}
1439	+	}
1440	+	#endif
1441	+
1442	+	// Initialize VideoRefresh function
1443	+	VideoRefreshInit();
1444	+
1445	+	// Lock down frame buffer
1446	+	XSync(x_display, false);
1447	+	LOCK_FRAME_BUFFER;
1448	+
1449	+	// Start redraw/input thread
1450	+	#ifdef HAVE_PTHREADS
1451	+	redraw_thread_cancel = false;
1452	+	Set_pthread_attr(&redraw_thread_attr, 0);
1453	+	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1454	+	if (!redraw_thread_active) {
1455	+	printf("FATAL: cannot create redraw thread\n");
1456	+	return false;
1457	+	}
1458	+	#else
1459	+	redraw_thread_active = true;
1460	+	#endif
1461	+
1462	+	return true;
1463	+	}
1464	+
1465		bool VideoInit(bool classic)
1466		{
1467	+	classic_mode = classic;
1468	+
1469	+	#ifdef ENABLE_VOSF
1470	+	// Zero the mainBuffer structure
1471	+	mainBuffer.dirtyPages = NULL;
1472	+	mainBuffer.pageInfo = NULL;
1473	+	#endif
1474	+
1475	+	// Check if X server runs on local machine
1476	+	local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
1477	+	|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
1478	+
1479		// Init keycode translation
1480		keycode_init();
1481
1482		// Read prefs
1483	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1484	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1483	>	frame_skip = PrefsFindInt32("frameskip");
1484	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1485	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1486
1487		// Find screen and root window
1488		screen = XDefaultScreen(x_display);
1489		rootwin = XRootWindow(x_display, screen);
1490	+
1491	+	// Get sorted list of available depths
1492	+	avail_depths = XListDepths(x_display, screen, &num_depths);
1493	+	if (avail_depths == NULL) {
1494	+	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1495	+	return false;
1496	+	}
1497	+	sort(avail_depths, avail_depths + num_depths);
1498
1499	<	// Get screen depth
626	<	xdepth = DefaultDepth(x_display, screen);
627	<
628	<	#if ENABLE_FBDEV_DGA
1499	>	#ifdef ENABLE_FBDEV_DGA
1500		// Frame buffer name
1501		char fb_name[20];
1502
1503	<	// Could do fbdev dga ?
1503	>	// Could do fbdev DGA?
1504		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1505		has_dga = true;
1506		else
1507		has_dga = false;
1508		#endif
1509	<
1510	<	#if ENABLE_XF86_DGA
1509	>
1510	>	#ifdef ENABLE_XF86_DGA
1511		// DGA available?
1512	<	int event_base, error_base;
1513	<	if (XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
1512	>	int dga_event_base, dga_error_base;
1513	>	if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
1514		int dga_flags = 0;
1515		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
1516		has_dga = dga_flags & XF86DGADirectPresent;
#	Line 647 | Line 1518 | bool VideoInit(bool classic)
1518		has_dga = false;
1519		#endif
1520
1521	+	#ifdef ENABLE_XF86_VIDMODE
1522	+	// VidMode available?
1523	+	int vm_event_base, vm_error_base;
1524	+	has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
1525	+	if (has_vidmode)
1526	+	XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
1527	+	#endif
1528	+
1529		// Find black and white colors
1530		XParseColor(x_display, DefaultColormap(x_display, screen), "rgb:00/00/00", &black);
1531		XAllocColor(x_display, DefaultColormap(x_display, screen), &black);
#	Line 655 | Line 1534 | bool VideoInit(bool classic)
1534		black_pixel = BlackPixel(x_display, screen);
1535		white_pixel = WhitePixel(x_display, screen);
1536
658	–	// Get appropriate visual
659	–	int color_class;
660	–	switch (xdepth) {
661	–	case 1:
662	–	color_class = StaticGray;
663	–	break;
664	–	case 8:
665	–	color_class = PseudoColor;
666	–	break;
667	–	case 15:
668	–	case 16:
669	–	case 24:
670	–	case 32:
671	–	color_class = TrueColor;
672	–	break;
673	–	default:
674	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
675	–	return false;
676	–	}
677	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
678	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
679	–	return false;
680	–	}
681	–	if (visualInfo.depth != xdepth) {
682	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
683	–	return false;
684	–	}
685	–	vis = visualInfo.visual;
686	–
687	–	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
688	–	classic_mode = classic;
689	–	if (classic)
690	–	depth = 1;
691	–	else
692	–	depth = xdepth;
693	–
694	–	// Create color maps for 8 bit mode
695	–	if (depth == 8) {
696	–	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
697	–	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
698	–	XInstallColormap(x_display, cmap[0]);
699	–	XInstallColormap(x_display, cmap[1]);
700	–	}
701	–
1537		// Get screen mode from preferences
1538		const char *mode_str;
1539	<	if (classic)
1539	>	if (classic_mode)
1540		mode_str = "win/512/342";
1541		else
1542		mode_str = PrefsFindString("screen");
1543
1544	<	// Determine type and mode
1545	<	int width = 512, height = 384;
1544	>	// Determine display type and default dimensions
1545	>	int default_width = 512, default_height = 384;
1546		display_type = DISPLAY_WINDOW;
1547		if (mode_str) {
1548	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1548	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1549		display_type = DISPLAY_WINDOW;
1550	<	#if ENABLE_FBDEV_DGA
1551	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1552	<	#else
1553	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1550	>	#ifdef ENABLE_FBDEV_DGA
1551	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1552	>	display_type = DISPLAY_DGA;
1553	>	default_width = -1; default_height = -1; // use entire screen
1554		#endif
1555	+	#ifdef ENABLE_XF86_DGA
1556	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1557		display_type = DISPLAY_DGA;
1558	<	if (width > DisplayWidth(x_display, screen))
1559	<	width = DisplayWidth(x_display, screen);
723	<	if (height > DisplayHeight(x_display, screen))
724	<	height = DisplayHeight(x_display, screen);
725	<	}
726	<	if (width <= 0)
727	<	width = DisplayWidth(x_display, screen);
728	<	if (height <= 0)
729	<	height = DisplayHeight(x_display, screen);
1558	>	#endif
1559	>	}
1560		}
1561	<
1562	<	// Initialize according to display type
1563	<	switch (display_type) {
1564	<	case DISPLAY_WINDOW:
1565	<	if (!init_window(width, height))
1566	<	return false;
1561	>	if (default_width <= 0)
1562	>	default_width = DisplayWidth(x_display, screen);
1563	>	else if (default_width > DisplayWidth(x_display, screen))
1564	>	default_width = DisplayWidth(x_display, screen);
1565	>	if (default_height <= 0)
1566	>	default_height = DisplayHeight(x_display, screen);
1567	>	else if (default_height > DisplayHeight(x_display, screen))
1568	>	default_height = DisplayHeight(x_display, screen);
1569	>
1570	>	// Mac screen depth follows X depth
1571	>	video_depth default_depth = VDEPTH_1BIT;
1572	>	switch (DefaultDepth(x_display, screen)) {
1573	>	case 8:
1574	>	default_depth = VDEPTH_8BIT;
1575		break;
1576	<	case DISPLAY_DGA:
1577	<	#if ENABLE_FBDEV_DGA
1578	<	if (!init_fbdev_dga(fb_name))
1579	<	#else
1580	<	if (!init_xf86_dga(width, height))
743	<	#endif
744	<	return false;
1576	>	case 15: case 16:
1577	>	default_depth = VDEPTH_16BIT;
1578	>	break;
1579	>	case 24: case 32:
1580	>	default_depth = VDEPTH_32BIT;
1581		break;
1582		}
1583
1584	<	// Lock down frame buffer
1585	<	pthread_mutex_lock(&frame_buffer_lock);
1586	<
1587	<	#if !REAL_ADDRESSING
1588	<	// Set variables for UAE memory mapping
1589	<	MacFrameBaseHost = the_buffer;
1590	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1584	>	// Construct list of supported modes
1585	>	if (display_type == DISPLAY_WINDOW) {
1586	>	if (classic)
1587	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1588	>	else {
1589	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1590	>	if (find_visual_for_depth(video_depth(d)))
1591	>	add_window_modes(video_depth(d));
1592	>	}
1593	>	}
1594	>	} else
1595	>	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1596	>	if (VideoModes.empty()) {
1597	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1598	>	return false;
1599	>	}
1600	>	video_init_depth_list();
1601
1602	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1603	<	if (classic)
1604	<	MacFrameLayout = FLAYOUT_NONE;
1602	>	#if DEBUG
1603	>	D(bug("Available video modes:\n"));
1604	>	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1605	>	while (i != end) {
1606	>	int bits = 1 << i->depth;
1607	>	if (bits == 16)
1608	>	bits = 15;
1609	>	else if (bits == 32)
1610	>	bits = 24;
1611	>	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1612	>	++i;
1613	>	}
1614		#endif
1615
1616	<	// Start redraw/input thread
1617	<	XSync(x_display, false);
1618	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1619	<	if (!redraw_thread_active)
1620	<	printf("FATAL: cannot create redraw thread\n");
1621	<	return redraw_thread_active;
1616	>	// Find requested default mode and open display
1617	>	if (VideoModes.size() == 1)
1618	>	return video_open(VideoModes[0]);
1619	>	else {
1620	>	// Find mode with specified dimensions
1621	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1622	>	for (i = VideoModes.begin(); i != end; ++i) {
1623	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1624	>	return video_open(*i);
1625	>	}
1626	>	return video_open(VideoModes[0]);
1627	>	}
1628		}
1629
1630
#	Line 771 | Line 1632 | bool VideoInit(bool classic)
1632		*  Deinitialization
1633		*/
1634
1635	<	void VideoExit(void)
1635	>	// Close display
1636	>	static void video_close(void)
1637		{
1638	+	D(bug("video_close()\n"));
1639	+
1640		// Stop redraw thread
1641	+	#ifdef HAVE_PTHREADS
1642		if (redraw_thread_active) {
1643		redraw_thread_cancel = true;
1644		#ifdef HAVE_PTHREAD_CANCEL
1645		pthread_cancel(redraw_thread);
1646		#endif
1647		pthread_join(redraw_thread, NULL);
783	–	redraw_thread_active = false;
1648		}
1649	+	#endif
1650	+	redraw_thread_active = false;
1651
1652		// Unlock frame buffer
1653	<	pthread_mutex_unlock(&frame_buffer_lock);
1653	>	UNLOCK_FRAME_BUFFER;
1654	>	XSync(x_display, false);
1655	>	D(bug(" frame buffer unlocked\n"));
1656
1657	<	// Close window and server connection
1658	<	if (x_display != NULL) {
1659	<	XSync(x_display, false);
1657	>	#ifdef ENABLE_VOSF
1658	>	if (use_vosf) {
1659	>	// Deinitialize VOSF
1660	>	video_vosf_exit();
1661	>	}
1662	>	#endif
1663
1664	<	#if ENABLE_XF86_DGA
1665	<	if (display_type == DISPLAY_DGA) {
1666	<	XF86DGADirectVideo(x_display, screen, 0);
1667	<	XUngrabPointer(x_display, CurrentTime);
1668	<	XUngrabKeyboard(x_display, CurrentTime);
1669	<	}
1664	>	// Close display
1665	>	delete drv;
1666	>	drv = NULL;
1667	>
1668	>	// Free colormaps
1669	>	if (cmap[0]) {
1670	>	XFreeColormap(x_display, cmap[0]);
1671	>	cmap[0] = 0;
1672	>	}
1673	>	if (cmap[1]) {
1674	>	XFreeColormap(x_display, cmap[1]);
1675	>	cmap[1] = 0;
1676	>	}
1677	>	}
1678	>
1679	>	void VideoExit(void)
1680	>	{
1681	>	// Close display
1682	>	video_close();
1683	>
1684	>	#ifdef ENABLE_XF86_VIDMODE
1685	>	// Free video mode list
1686	>	if (x_video_modes) {
1687	>	XFree(x_video_modes);
1688	>	x_video_modes = NULL;
1689	>	}
1690		#endif
1691
1692	<	#if ENABLE_FBDEV_DGA
1693	<	if (display_type == DISPLAY_DGA) {
1694	<	XUngrabPointer(x_display, CurrentTime);
1695	<	XUngrabKeyboard(x_display, CurrentTime);
1696	<	close(fbdev_fd);
1697	<	}
1692	>	#ifdef ENABLE_FBDEV_DGA
1693	>	// Close framebuffer device
1694	>	if (fbdev_fd >= 0) {
1695	>	close(fbdev_fd);
1696	>	fbdev_fd = -1;
1697	>	}
1698		#endif
808	–
809	–	if (the_buffer_copy) {
810	–	free(the_buffer_copy);
811	–	the_buffer_copy = NULL;
812	–	}
1699
1700	<	XFlush(x_display);
1701	<	XSync(x_display, false);
1702	<	if (depth == 8) {
1703	<	XFreeColormap(x_display, cmap[0]);
818	<	XFreeColormap(x_display, cmap[1]);
819	<	}
1700	>	// Free depth list
1701	>	if (avail_depths) {
1702	>	XFree(avail_depths);
1703	>	avail_depths = NULL;
1704		}
1705		}
1706
#	Line 828 | Line 1712 | void VideoExit(void)
1712		void VideoQuitFullScreen(void)
1713		{
1714		D(bug("VideoQuitFullScreen()\n"));
1715	<	if (display_type == DISPLAY_DGA)
832	<	quit_full_screen = true;
1715	>	quit_full_screen = true;
1716		}
1717
1718
#	Line 845 | Line 1728 | void VideoInterrupt(void)
1728
1729		// Temporarily give up frame buffer lock (this is the point where
1730		// we are suspended when the user presses Ctrl-Tab)
1731	<	pthread_mutex_unlock(&frame_buffer_lock);
1732	<	pthread_mutex_lock(&frame_buffer_lock);
1731	>	UNLOCK_FRAME_BUFFER;
1732	>	LOCK_FRAME_BUFFER;
1733		}
1734
1735
#	Line 854 | Line 1737 | void VideoInterrupt(void)
1737		*  Set palette
1738		*/
1739
1740	<	void video_set_palette(uint8 *pal)
1740	>	void video_set_palette(uint8 *pal, int num_in)
1741		{
1742	<	pthread_mutex_lock(&palette_lock);
1742	>	LOCK_PALETTE;
1743
1744		// Convert colors to XColor array
1745	<	for (int i=0; i<256; i++) {
1746	<	palette[i].pixel = i;
1747	<	palette[i].red = pal[i*3] * 0x0101;
1748	<	palette[i].green = pal[i*3+1] * 0x0101;
1749	<	palette[i].blue = pal[i*3+2] * 0x0101;
1750	<	palette[i].flags = DoRed | DoGreen | DoBlue;
1745	>	int num_out = 256;
1746	>	bool stretch = false;
1747	>	if (IsDirectMode(VideoMonitor.mode)) {
1748	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1749	>	num_out = vis->map_entries;
1750	>	stretch = true;
1751	>	}
1752	>	XColor *p = palette;
1753	>	for (int i=0; i<num_out; i++) {
1754	>	int c = (stretch ? (i * num_in) / num_out : i);
1755	>	p->red = pal[c*3 + 0] * 0x0101;
1756	>	p->green = pal[c*3 + 1] * 0x0101;
1757	>	p->blue = pal[c*3 + 2] * 0x0101;
1758	>	p++;
1759	>	}
1760	>
1761	>	#ifdef ENABLE_VOSF
1762	>	// Recalculate pixel color expansion map
1763	>	if (!IsDirectMode(VideoMonitor.mode) && xdepth > 8) {
1764	>	for (int i=0; i<256; i++) {
1765	>	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1766	>	ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]);
1767	>	}
1768	>
1769	>	// We have to redraw everything because the interpretation of pixel values changed
1770	>	LOCK_VOSF;
1771	>	PFLAG_SET_ALL;
1772	>	UNLOCK_VOSF;
1773	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1774		}
1775	+	#endif
1776
1777		// Tell redraw thread to change palette
1778		palette_changed = true;
1779
1780	<	pthread_mutex_unlock(&palette_lock);
1780	>	UNLOCK_PALETTE;
1781		}
1782
1783
1784		/*
1785	<	*  Suspend/resume emulator
1785	>	*  Switch video mode
1786		*/
1787
1788	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
882	<	static void suspend_emul(void)
1788	>	void video_switch_to_mode(const video_mode &mode)
1789		{
1790	<	if (display_type == DISPLAY_DGA) {
1791	<	// Release ctrl key
1792	<	ADBKeyUp(0x36);
887	<	ctrl_down = false;
888	<
889	<	// Lock frame buffer (this will stop the MacOS thread)
890	<	pthread_mutex_lock(&frame_buffer_lock);
891	<
892	<	// Save frame buffer
893	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
894	<	if (fb_save)
895	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
896	<
897	<	// Close full screen display
898	<	#if ENABLE_XF86_DGA
899	<	XF86DGADirectVideo(x_display, screen, 0);
900	<	#endif
901	<	XUngrabPointer(x_display, CurrentTime);
902	<	XUngrabKeyboard(x_display, CurrentTime);
903	<	XUnmapWindow(x_display, the_win);
904	<	XSync(x_display, false);
905	<
906	<	// Open "suspend" window
907	<	XSetWindowAttributes wattr;
908	<	wattr.event_mask = KeyPressMask;
909	<	wattr.background_pixel = black_pixel;
910	<	wattr.border_pixel = black_pixel;
911	<	wattr.backing_store = Always;
912	<	wattr.backing_planes = xdepth;
913	<	wattr.colormap = DefaultColormap(x_display, screen);
914	<
915	<	XSync(x_display, false);
916	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
917	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
918	<	CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
919	<	XSync(x_display, false);
920	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
921	<	XMapRaised(x_display, suspend_win);
922	<	XSync(x_display, false);
923	<	emul_suspended = true;
924	<	}
925	<	}
926	<
927	<	static void resume_emul(void)
928	<	{
929	<	// Close "suspend" window
930	<	XDestroyWindow(x_display, suspend_win);
931	<	XSync(x_display, false);
1790	>	// Close and reopen display
1791	>	video_close();
1792	>	video_open(mode);
1793
1794	<	// Reopen full screen display
1795	<	XMapRaised(x_display, the_win);
1796	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
936	<	XSync(x_display, false);
937	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
938	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
939	<	#if ENABLE_XF86_DGA
940	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
941	<	XF86DGASetViewPort(x_display, screen, 0, 0);
942	<	#endif
943	<	XSync(x_display, false);
944	<
945	<	// Restore frame buffer
946	<	if (fb_save) {
947	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
948	<	free(fb_save);
949	<	fb_save = NULL;
1794	>	if (drv == NULL) {
1795	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1796	>	QuitEmulator();
1797		}
951	–
952	–	if (depth == 8)
953	–	#if ENABLE_XF86_DGA
954	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
955	–	#endif
956	–
957	–	// Unlock frame buffer (and continue MacOS thread)
958	–	pthread_mutex_unlock(&frame_buffer_lock);
959	–	emul_suspended = false;
1798		}
961	–	#endif
1799
1800
1801		/*
1802	<	*  Translate key event to Mac keycode
1802	>	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1803	>	*  and -2 if the key was recognized as a hotkey
1804		*/
1805
1806	<	static int kc_decode(KeySym ks)
1806	>	static int kc_decode(KeySym ks, bool key_down)
1807		{
1808		switch (ks) {
1809		case XK_A: case XK_a: return 0x00;
#	Line 1018 | Line 1856 | static int kc_decode(KeySym ks)
1856		case XK_period: case XK_greater: return 0x2f;
1857		case XK_slash: case XK_question: return 0x2c;
1858
1859	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1022	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1023	<	#else
1024	<	case XK_Tab: return 0x30;
1025	<	#endif
1859	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1860		case XK_Return: return 0x24;
1861		case XK_space: return 0x31;
1862		case XK_BackSpace: return 0x33;
#	Line 1056 | Line 1890 | static int kc_decode(KeySym ks)
1890		case XK_Left: return 0x3b;
1891		case XK_Right: return 0x3c;
1892
1893	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1893	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1894
1895	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1895	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1896		case XK_F2: return 0x78;
1897		case XK_F3: return 0x63;
1898		case XK_F4: return 0x76;
1899	<	case XK_F5: return 0x60;
1899	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1900		case XK_F6: return 0x61;
1901		case XK_F7: return 0x62;
1902		case XK_F8: return 0x64;
#	Line 1110 | Line 1944 | static int kc_decode(KeySym ks)
1944		return -1;
1945		}
1946
1947	<	static int event2keycode(XKeyEvent *ev)
1947	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1948		{
1949		KeySym ks;
1116	–	int as;
1950		int i = 0;
1951
1952		do {
1953	<	ks = XLookupKeysym(ev, i++);
1954	<	as = kc_decode(ks);
1955	<	if (as != -1)
1953	>	ks = XLookupKeysym(&ev, i++);
1954	>	int as = kc_decode(ks, key_down);
1955	>	if (as >= 0)
1956	>	return as;
1957	>	if (as == -2)
1958		return as;
1959		} while (ks != NoSymbol);
1960
#	Line 1133 | Line 1968 | static int event2keycode(XKeyEvent *ev)
1968
1969		static void handle_events(void)
1970		{
1971	<	XEvent event;
1972	<	for (;;) {
1973	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1139	<	break;
1971	>	while (XPending(x_display)) {
1972	>	XEvent event;
1973	>	XNextEvent(x_display, &event);
1974
1975		switch (event.type) {
1976	+
1977		// Mouse button
1978		case ButtonPress: {
1979	<	unsigned int button = ((XButtonEvent *)&event)->button;
1979	>	unsigned int button = event.xbutton.button;
1980		if (button < 4)
1981		ADBMouseDown(button - 1);
1982		else if (button < 6) {  // Wheel mouse
#	Line 1160 | Line 1995 | static void handle_events(void)
1995		break;
1996		}
1997		case ButtonRelease: {
1998	<	unsigned int button = ((XButtonEvent *)&event)->button;
1998	>	unsigned int button = event.xbutton.button;
1999		if (button < 4)
2000		ADBMouseUp(button - 1);
2001		break;
2002		}
2003
2004		// Mouse moved
1170	–	case EnterNotify:
1171	–	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1172	–	break;
2005		case MotionNotify:
2006	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
2006	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2007	>	break;
2008	>
2009	>	// Mouse entered window
2010	>	case EnterNotify:
2011	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2012	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2013		break;
2014
2015		// Keyboard
2016		case KeyPress: {
2017	<	int code;
2017	>	int code = -1;
2018		if (use_keycodes) {
2019	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
2020	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
2019	>	if (event2keycode(event.xkey, true) != -2)      // This is called to process the hotkeys
2020	>	code = keycode_table[event.xkey.keycode & 0xff];
2021		} else
2022	<	code = event2keycode((XKeyEvent *)&event);
2023	<	if (code != -1) {
2022	>	code = event2keycode(event.xkey, true);
2023	>	if (code >= 0) {
2024		if (!emul_suspended) {
2025		if (code == 0x39) {     // Caps Lock pressed
2026		if (caps_on) {
#	Line 1197 | Line 2035 | static void handle_events(void)
2035		if (code == 0x36)
2036		ctrl_down = true;
2037		} else {
1200	–	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
2038		if (code == 0x31)
2039	<	resume_emul();  // Space wakes us up
1203	<	#endif
2039	>	drv->resume();  // Space wakes us up
2040		}
2041		}
2042		break;
2043		}
2044		case KeyRelease: {
2045	<	int code;
2045	>	int code = -1;
2046		if (use_keycodes) {
2047	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
2048	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
2047	>	if (event2keycode(event.xkey, false) != -2)     // This is called to process the hotkeys
2048	>	code = keycode_table[event.xkey.keycode & 0xff];
2049		} else
2050	<	code = event2keycode((XKeyEvent *)&event);
2051	<	if (code != -1 && code != 0x39) {       // Don't propagate Caps Lock releases
2050	>	code = event2keycode(event.xkey, false);
2051	>	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
2052		ADBKeyUp(code);
2053		if (code == 0x36)
2054		ctrl_down = false;
#	Line 1222 | Line 2058 | static void handle_events(void)
2058
2059		// Hidden parts exposed, force complete refresh of window
2060		case Expose:
2061	<	if (display_type == DISPLAY_WINDOW)
2062	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
2061	>	if (display_type == DISPLAY_WINDOW) {
2062	>	#ifdef ENABLE_VOSF
2063	>	if (use_vosf) {                 // VOSF refresh
2064	>	LOCK_VOSF;
2065	>	PFLAG_SET_ALL;
2066	>	UNLOCK_VOSF;
2067	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
2068	>	}
2069	>	else
2070	>	#endif
2071	>	if (frame_skip == 0) {  // Dynamic refresh
2072	>	int x1, y1;
2073	>	for (y1=0; y1<16; y1++)
2074	>	for (x1=0; x1<16; x1++)
2075	>	updt_box[x1][y1] = true;
2076	>	nr_boxes = 16 * 16;
2077	>	} else                                  // Static refresh
2078	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
2079	>	}
2080	>	break;
2081	>
2082	>	// Window "close" widget clicked
2083	>	case ClientMessage:
2084	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
2085	>	ADBKeyDown(0x7f);       // Power key
2086	>	ADBKeyUp(0x7f);
2087	>	}
2088		break;
2089		}
2090		}
#	Line 1234 | Line 2095 | static void handle_events(void)
2095		*  Window display update
2096		*/
2097
2098	<	static void update_display(void)
2098	>	// Dynamic display update (variable frame rate for each box)
2099	>	static void update_display_dynamic(int ticker, driver_window *drv)
2100	>	{
2101	>	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2102	>	int xil = 0;
2103	>	int rxm = 0, rxmo = 0;
2104	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2105	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2106	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
2107	>	int ry = VideoMonitor.mode.y / 16;
2108	>	int max_box;
2109	>
2110	>	y2s = sm_uptd[ticker % 8];
2111	>	y2a = 8;
2112	>	for (i = 0; i < 6; i++)
2113	>	if (ticker % (2 << i))
2114	>	break;
2115	>	max_box = sm_no_boxes[i];
2116	>
2117	>	if (y2a) {
2118	>	for (y1=0; y1<16; y1++) {
2119	>	for (y2=y2s; y2 < ry; y2 += y2a) {
2120	>	i = ((y1 * ry) + y2) * bytes_per_row;
2121	>	for (x1=0; x1<16; x1++, i += rx) {
2122	>	if (updt_box[x1][y1] == false) {
2123	>	if (memcmp(&the_buffer_copy[i], &the_buffer[i], rx)) {
2124	>	updt_box[x1][y1] = true;
2125	>	nr_boxes++;
2126	>	}
2127	>	}
2128	>	}
2129	>	}
2130	>	}
2131	>	}
2132	>
2133	>	if ((nr_boxes <= max_box) && (nr_boxes)) {
2134	>	for (y1=0; y1<16; y1++) {
2135	>	for (x1=0; x1<16; x1++) {
2136	>	if (updt_box[x1][y1] == true) {
2137	>	if (rxm == 0)
2138	>	xm = x1;
2139	>	rxm += rx;
2140	>	updt_box[x1][y1] = false;
2141	>	}
2142	>	if (((updt_box[x1+1][y1] == false) || (x1 == 15)) && (rxm)) {
2143	>	if ((rxmo != rxm) || (xmo != xm) || (yo != y1 - 1)) {
2144	>	if (rxmo) {
2145	>	xi = xmo * rx;
2146	>	yi = ymo * ry;
2147	>	xil = rxmo;
2148	>	yil = (yo - ymo +1) * ry;
2149	>	}
2150	>	rxmo = rxm;
2151	>	xmo = xm;
2152	>	ymo = y1;
2153	>	}
2154	>	rxm = 0;
2155	>	yo = y1;
2156	>	}
2157	>	if (xil) {
2158	>	i = (yi * bytes_per_row) + xi;
2159	>	for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2160	>	memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2161	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2162	>	if (drv->have_shm)
2163	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2164	>	else
2165	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2166	>	} else {
2167	>	if (drv->have_shm)
2168	>	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);
2169	>	else
2170	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2171	>	}
2172	>	xil = 0;
2173	>	}
2174	>	if ((x1 == 15) && (y1 == 15) && (rxmo)) {
2175	>	x1--;
2176	>	xi = xmo * rx;
2177	>	yi = ymo * ry;
2178	>	xil = rxmo;
2179	>	yil = (yo - ymo +1) * ry;
2180	>	rxmo = 0;
2181	>	}
2182	>	}
2183	>	}
2184	>	nr_boxes = 0;
2185	>	}
2186	>	}
2187	>
2188	>	// Static display update (fixed frame rate, but incremental)
2189	>	static void update_display_static(driver_window *drv)
2190		{
1239	–	// In classic mode, copy the frame buffer from Mac RAM
1240	–	if (classic_mode)
1241	–	Mac2Host_memcpy(the_buffer, 0x3fa700, VideoMonitor.bytes_per_row * VideoMonitor.y);
1242	–
2191		// Incremental update code
2192	<	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2193	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2194	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2192	>	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
2193	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2194	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2195		uint8 *p, *p2;
2196
2197		// Check for first line from top and first line from bottom that have changed
2198		y1 = 0;
2199	<	for (j=0; j<VideoMonitor.y; j++) {
2199	>	for (j=0; j<VideoMonitor.mode.y; j++) {
2200		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2201		y1 = j;
2202		break;
2203		}
2204		}
2205		y2 = y1 - 1;
2206	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
2206	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
2207		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2208		y2 = j;
2209		break;
#	Line 1265 | Line 2213 | static void update_display(void)
2213
2214		// Check for first column from left and first column from right that have changed
2215		if (high) {
2216	<	if (depth == 1) {
2217	<	x1 = VideoMonitor.x;
2216	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2217	>	x1 = VideoMonitor.mode.x - 1;
2218		for (j=y1; j<=y2; j++) {
2219		p = &the_buffer[j * bytes_per_row];
2220		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1275 | Line 2223 | static void update_display(void)
2223		x1 = i << 3;
2224		break;
2225		}
2226	<	p++;
1279	<	p2++;
2226	>	p++; p2++;
2227		}
2228		}
2229		x2 = x1;
#	Line 1285 | Line 2232 | static void update_display(void)
2232		p2 = &the_buffer_copy[j * bytes_per_row];
2233		p += bytes_per_row;
2234		p2 += bytes_per_row;
2235	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
2236	<	p--;
1290	<	p2--;
2235	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
2236	>	p--; p2--;
2237		if (*p != *p2) {
2238	<	x2 = i << 3;
2238	>	x2 = (i << 3) + 7;
2239		break;
2240		}
2241		}
2242		}
2243	<	wide = x2 - x1;
2243	>	wide = x2 - x1 + 1;
2244
2245		// Update copy of the_buffer
2246		if (high && wide) {
2247		for (j=y1; j<=y2; j++) {
2248		i = j * bytes_per_row + (x1 >> 3);
2249	<	memcpy(&the_buffer_copy[i], &the_buffer[i], wide >> 3);
2249	>	memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3);
2250		}
2251		}
2252
2253		} else {
2254	<	x1 = VideoMonitor.x;
2254	>	x1 = VideoMonitor.mode.x;
2255		for (j=y1; j<=y2; j++) {
2256		p = &the_buffer[j * bytes_per_row];
2257		p2 = &the_buffer_copy[j * bytes_per_row];
2258	<	for (i=0; i<x1; i++) {
2259	<	if (memcmp(p, p2, bytes_per_pixel)) {
2260	<	x1 = i;
2258	>	for (i=0; i<x1*bytes_per_pixel; i++) {
2259	>	if (*p != *p2) {
2260	>	x1 = i / bytes_per_pixel;
2261		break;
2262		}
2263	<	p += bytes_per_pixel;
1318	<	p2 += bytes_per_pixel;
2263	>	p++; p2++;
2264		}
2265		}
2266		x2 = x1;
#	Line 1324 | Line 2269 | static void update_display(void)
2269		p2 = &the_buffer_copy[j * bytes_per_row];
2270		p += bytes_per_row;
2271		p2 += bytes_per_row;
2272	<	for (i=VideoMonitor.x; i>x2; i--) {
2273	<	p -= bytes_per_pixel;
2274	<	p2 -= bytes_per_pixel;
2275	<	if (memcmp(p, p2, bytes_per_pixel)) {
2276	<	x2 = i;
2272	>	for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
2273	>	p--;
2274	>	p2--;
2275	>	if (*p != *p2) {
2276	>	x2 = i / bytes_per_pixel;
2277		break;
2278		}
2279		}
#	Line 1339 | Line 2284 | static void update_display(void)
2284		if (high && wide) {
2285		for (j=y1; j<=y2; j++) {
2286		i = j * bytes_per_row + x1 * bytes_per_pixel;
2287	<	memcpy(&the_buffer_copy[i], &the_buffer[i], bytes_per_pixel * wide);
2287	>	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
2288		}
2289		}
2290		}
#	Line 1347 | Line 2292 | static void update_display(void)
2292
2293		// Refresh display
2294		if (high && wide) {
2295	<	if (have_shm)
2296	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2295	>	if (drv->have_shm)
2296	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2297		else
2298	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2298	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2299	>	}
2300	>	}
2301	>
2302	>
2303	>	/*
2304	>	*      Screen refresh functions
2305	>	*/
2306	>
2307	>	// We suggest the compiler to inline the next two functions so that it
2308	>	// may specialise the code according to the current screen depth and
2309	>	// display type. A clever compiler would do that job by itself though...
2310	>
2311	>	// NOTE: update_display_vosf is inlined too
2312	>
2313	>	static inline void possibly_quit_dga_mode()
2314	>	{
2315	>	// Quit DGA mode if requested (something terrible has happened and we
2316	>	// want to give control back to the user)
2317	>	if (quit_full_screen) {
2318	>	quit_full_screen = false;
2319	>	delete drv;
2320	>	drv = NULL;
2321	>	}
2322	>	}
2323	>
2324	>	static inline void possibly_ungrab_mouse()
2325	>	{
2326	>	// Ungrab mouse if requested (something terrible has happened and we
2327	>	// want to give control back to the user)
2328	>	if (quit_full_screen) {
2329	>	quit_full_screen = false;
2330	>	if (drv)
2331	>	drv->ungrab_mouse();
2332	>	}
2333	>	}
2334	>
2335	>	static inline void handle_palette_changes(void)
2336	>	{
2337	>	LOCK_PALETTE;
2338	>
2339	>	if (palette_changed) {
2340	>	palette_changed = false;
2341	>	drv->update_palette();
2342		}
2343
2344	<	// Has the Mac started? (cursor data is not valid otherwise)
2345	<	if (HasMacStarted()) {
2344	>	UNLOCK_PALETTE;
2345	>	}
2346
2347	<	// Set new cursor image if it was changed
2348	<	if (memcmp(the_cursor, Mac2HostAddr(0x844), 64)) {
2349	<	Mac2Host_memcpy(the_cursor, 0x844, 64);
2350	<	memcpy(cursor_image->data, the_cursor, 32);
2351	<	memcpy(cursor_mask_image->data, the_cursor+32, 32);
2352	<	XFreeCursor(x_display, mac_cursor);
2353	<	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
2354	<	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
2355	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, ReadMacInt8(0x885), ReadMacInt8(0x887));
2356	<	XDefineCursor(x_display, the_win, mac_cursor);
2347	>	static void video_refresh_dga(void)
2348	>	{
2349	>	// Quit DGA mode if requested
2350	>	possibly_quit_dga_mode();
2351	>	}
2352	>
2353	>	#ifdef ENABLE_VOSF
2354	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
2355	>	static void video_refresh_dga_vosf(void)
2356	>	{
2357	>	// Quit DGA mode if requested
2358	>	possibly_quit_dga_mode();
2359	>
2360	>	// Update display (VOSF variant)
2361	>	static int tick_counter = 0;
2362	>	if (++tick_counter >= frame_skip) {
2363	>	tick_counter = 0;
2364	>	if (mainBuffer.dirty) {
2365	>	LOCK_VOSF;
2366	>	update_display_dga_vosf();
2367	>	UNLOCK_VOSF;
2368		}
2369		}
2370		}
2371	+	#endif
2372	+
2373	+	static void video_refresh_window_vosf(void)
2374	+	{
2375	+	// Ungrab mouse if requested
2376	+	possibly_ungrab_mouse();
2377	+
2378	+	// Update display (VOSF variant)
2379	+	static int tick_counter = 0;
2380	+	if (++tick_counter >= frame_skip) {
2381	+	tick_counter = 0;
2382	+	if (mainBuffer.dirty) {
2383	+	LOCK_VOSF;
2384	+	update_display_window_vosf(static_cast<driver_window *>(drv));
2385	+	UNLOCK_VOSF;
2386	+	XSync(x_display, false); // Let the server catch up
2387	+	}
2388	+	}
2389	+	}
2390	+	#endif // def ENABLE_VOSF
2391	+
2392	+	static void video_refresh_window_static(void)
2393	+	{
2394	+	// Ungrab mouse if requested
2395	+	possibly_ungrab_mouse();
2396	+
2397	+	// Update display (static variant)
2398	+	static int tick_counter = 0;
2399	+	if (++tick_counter >= frame_skip) {
2400	+	tick_counter = 0;
2401	+	update_display_static(static_cast<driver_window *>(drv));
2402	+	}
2403	+	}
2404	+
2405	+	static void video_refresh_window_dynamic(void)
2406	+	{
2407	+	// Ungrab mouse if requested
2408	+	possibly_ungrab_mouse();
2409	+
2410	+	// Update display (dynamic variant)
2411	+	static int tick_counter = 0;
2412	+	tick_counter++;
2413	+	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2414	+	}
2415
2416
2417		/*
2418		*  Thread for screen refresh, input handling etc.
2419		*/
2420
2421	+	static void VideoRefreshInit(void)
2422	+	{
2423	+	// TODO: set up specialised 8bpp VideoRefresh handlers ?
2424	+	if (display_type == DISPLAY_DGA) {
2425	+	#if ENABLE_VOSF && (REAL_ADDRESSING || DIRECT_ADDRESSING)
2426	+	if (use_vosf)
2427	+	video_refresh = video_refresh_dga_vosf;
2428	+	else
2429	+	#endif
2430	+	video_refresh = video_refresh_dga;
2431	+	}
2432	+	else {
2433	+	#ifdef ENABLE_VOSF
2434	+	if (use_vosf)
2435	+	video_refresh = video_refresh_window_vosf;
2436	+	else
2437	+	#endif
2438	+	if (frame_skip == 0)
2439	+	video_refresh = video_refresh_window_dynamic;
2440	+	else
2441	+	video_refresh = video_refresh_window_static;
2442	+	}
2443	+	}
2444	+
2445	+	// This function is called on non-threaded platforms from a timer interrupt
2446	+	void VideoRefresh(void)
2447	+	{
2448	+	// We need to check redraw_thread_active to inhibit refreshed during
2449	+	// mode changes on non-threaded platforms
2450	+	if (!redraw_thread_active)
2451	+	return;
2452	+
2453	+	// Handle X events
2454	+	handle_events();
2455	+
2456	+	// Handle palette changes
2457	+	handle_palette_changes();
2458	+
2459	+	// Update display
2460	+	video_refresh();
2461	+	}
2462	+
2463	+	const int VIDEO_REFRESH_HZ = 60;
2464	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2465	+
2466	+	#ifdef HAVE_PTHREADS
2467		static void *redraw_func(void *arg)
2468		{
2469	<	int tick_counter = 0;
2469	>	int fd = ConnectionNumber(x_display);
2470	>
2471	>	uint64 start = GetTicks_usec();
2472	>	int64 ticks = 0;
2473	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2474
2475		while (!redraw_thread_cancel) {
2476
2477	<	// Wait
2478	<	#ifdef HAVE_NANOSLEEP
1386	<	struct timespec req = {0, 16666667};
1387	<	nanosleep(&req, NULL);
1388	<	#else
1389	<	usleep(16667);
1390	<	#endif
2477	>	int64 delay = next - GetTicks_usec();
2478	>	if (delay < -VIDEO_REFRESH_DELAY) {
2479
2480	<	#if ENABLE_XF86_DGA
2481	<	// Quit DGA mode if requested
1394	<	if (quit_full_screen) {
1395	<	quit_full_screen = false;
1396	<	if (display_type == DISPLAY_DGA) {
1397	<	XF86DGADirectVideo(x_display, screen, 0);
1398	<	XUngrabPointer(x_display, CurrentTime);
1399	<	XUngrabKeyboard(x_display, CurrentTime);
1400	<	XUnmapWindow(x_display, the_win);
1401	<	XSync(x_display, false);
1402	<	}
1403	<	}
1404	<	#endif
2480	>	// We are lagging far behind, so we reset the delay mechanism
2481	>	next = GetTicks_usec();
2482
2483	<	#if ENABLE_FBDEV_DGA
1407	<	// Quit DGA mode if requested
1408	<	if (quit_full_screen) {
1409	<	quit_full_screen = false;
1410	<	if (display_type == DISPLAY_DGA) {
1411	<	XUngrabPointer(x_display, CurrentTime);
1412	<	XUngrabKeyboard(x_display, CurrentTime);
1413	<	XUnmapWindow(x_display, the_win);
1414	<	XSync(x_display, false);
1415	<	}
1416	<	}
1417	<	#endif
1418	<	// Handle X events
1419	<	handle_events();
2483	>	} else if (delay <= 0) {
2484
2485	<	// Handle palette changes
2486	<	pthread_mutex_lock(&palette_lock);
2487	<	if (palette_changed) {
2488	<	palette_changed = false;
2489	<	if (depth == 8) {
2490	<	XStoreColors(x_display, cmap[0], palette, 256);
1427	<	XStoreColors(x_display, cmap[1], palette, 256);
1428	<
1429	<	#if ENABLE_XF86_DGA
1430	<	if (display_type == DISPLAY_DGA) {
1431	<	current_dga_cmap ^= 1;
1432	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1433	<	}
1434	<	#endif
1435	<	}
1436	<	}
1437	<	pthread_mutex_unlock(&palette_lock);
2485	>	// Delay expired, refresh display
2486	>	handle_events();
2487	>	handle_palette_changes();
2488	>	video_refresh();
2489	>	next += VIDEO_REFRESH_DELAY;
2490	>	ticks++;
2491
2492	<	// In window mode, update display and mouse pointer
2493	<	if (display_type == DISPLAY_WINDOW) {
2494	<	tick_counter++;
2495	<	if (tick_counter >= frame_skip) {
2496	<	tick_counter = 0;
2497	<	update_display();
2498	<	}
2492	>	} else {
2493	>
2494	>	// No display refresh pending, check for X events
2495	>	fd_set readfds;
2496	>	FD_ZERO(&readfds);
2497	>	FD_SET(fd, &readfds);
2498	>	struct timeval timeout;
2499	>	timeout.tv_sec = 0;
2500	>	timeout.tv_usec = delay;
2501	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2502	>	handle_events();
2503		}
2504		}
2505	+
2506	+	uint64 end = GetTicks_usec();
2507	+	D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2508		return NULL;
2509		}
2510	+	#endif

Diff Legend

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