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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.42 by cebix, 2001-06-28T21:20:00Z vs.
Revision 1.72 by gbeauche, 2004-11-08T21:07:07Z

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

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.42 by cebix, 2001-06-28T21:20:00Z vs. Revision 1.72 by gbeauche, 2004-11-08T21:07:07Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.42 by cebix, 2001-06-28T21:20:00Z vs.
Revision 1.72 by gbeauche, 2004-11-08T21:07:07Z