[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.67 by cebix, 2002-04-28T12:09:23Z

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

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.42 by cebix, 2001-06-28T21:20:00Z vs. Revision 1.67 by cebix, 2002-04-28T12:09:23Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.42 by cebix, 2001-06-28T21:20:00Z vs.
Revision 1.67 by cebix, 2002-04-28T12:09:23Z