ViewVC Help

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

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.37 by cebix, 2001-03-06T18:41:12Z vs.
Revision 1.44 by cebix, 2001-06-30T17:21:54Z

#	Line 52 | Line 52
52		# include <sys/mman.h>
53		#endif
54
55	–	#ifdef ENABLE_VOSF
56	–	# include <unistd.h>
57	–	# include <signal.h>
58	–	# include <fcntl.h>
59	–	# include <sys/mman.h>
60	–	#endif
61	–
55		#include "cpu_emulation.h"
56		#include "main.h"
57		#include "adb.h"
#	Line 79 | Line 72 | enum {
72
73		// Constants
74		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
75	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
75	>
76	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
77	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
78
79
80		// Global variables
81		static int32 frame_skip;                                                        // Prefs items
82	<	static int16 mouse_wheel_mode = 1;
83	<	static int16 mouse_wheel_lines = 3;
82	>	static int16 mouse_wheel_mode;
83	>	static int16 mouse_wheel_lines;
84
85		static int display_type = DISPLAY_WINDOW;                       // See enum above
86		static bool local_X11;                                                          // Flag: X server running on local machine?
87	<	static uint8 *the_buffer;                                                       // Mac frame buffer
87	>	static uint8 *the_buffer = NULL;                                        // Mac frame buffer (where MacOS draws into)
88	>	static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer (for refreshed modes)
89
90		#ifdef HAVE_PTHREADS
91		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
92	<	static volatile bool redraw_thread_cancel = false;      // Flag: Cancel Redraw thread
92	>	static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
93		static pthread_t redraw_thread;                                         // Redraw thread
94		#endif
95
96		static bool has_dga = false;                                            // Flag: Video DGA capable
97		static bool has_vidmode = false;                                        // Flag: VidMode extension available
98
99	+	#ifdef ENABLE_VOSF
100	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
101	+	#else
102	+	static const bool use_vosf = false;                                     // VOSF not possible
103	+	#endif
104	+
105		static bool ctrl_down = false;                                          // Flag: Ctrl key pressed
106		static bool caps_on = false;                                            // Flag: Caps Lock on
107		static bool quit_full_screen = false;                           // Flag: DGA close requested from redraw thread
#	Line 114 | Line 116 | static int keycode_table[256];                                         // X
116		// X11 variables
117		static int screen;                                                                      // Screen number
118		static int xdepth;                                                                      // Depth of X screen
119	<	static int depth;                                                                       // Depth of Mac frame buffer
118	<	static Window rootwin, the_win;                                         // Root window and our window
119	>	static Window rootwin;                                                          // Root window and our window
120		static XVisualInfo visualInfo;
121		static Visual *vis;
122	<	static Colormap cmap[2];                                                        // Two colormaps (DGA) for 8-bit mode
122	>	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
123		static XColor black, white;
124		static unsigned long black_pixel, white_pixel;
125		static int eventmask;
125	–	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
126	–	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
127	–	static Atom WM_DELETE_WINDOW = (Atom)0;
126
127	<	static XColor palette[256];                                                     // Color palette for 8-bit mode
127	>	static XColor palette[256];                                                     // Color palette for indexed modes
128		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
129	+
130	+	#ifdef ENABLE_FBDEV_DGA
131	+	static int fbdev_fd = -1;
132	+	#endif
133	+
134	+	#ifdef ENABLE_XF86_VIDMODE
135	+	static XF86VidModeModeInfo **x_video_modes = NULL;      // Array of all available modes
136	+	static int num_x_video_modes;
137	+	#endif
138	+
139	+	// Mutex to protect palette
140		#ifdef HAVE_PTHREADS
141	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
141	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
142		#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
143		#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
144		#else
#	Line 137 | Line 146 | static pthread_mutex_t palette_lock = PT
146		#define UNLOCK_PALETTE
147		#endif
148
149	<	// Variables for window mode
141	<	static GC the_gc;
142	<	static XImage *img = NULL;
143	<	static XShmSegmentInfo shminfo;
144	<	static Cursor mac_cursor;
145	<	static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer
146	<	static bool have_shm = false;                                           // Flag: SHM extensions available
147	<	static bool updt_box[17][17];                                           // Flag for Update
148	<	static int nr_boxes;
149	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
150	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
151	<
152	<	// Variables for XF86 DGA mode
153	<	static int current_dga_cmap;                                            // Number (0 or 1) of currently installed DGA colormap
154	<	static Window suspend_win;                                                      // "Suspend" window
155	<	static void *fb_save = NULL;                                            // Saved frame buffer for suspend
149	>	// Mutex to protect frame buffer
150		#ifdef HAVE_PTHREADS
151	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
151	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
152		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
153		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
154		#else
#	Line 162 | Line 156 | static pthread_mutex_t frame_buffer_lock
156		#define UNLOCK_FRAME_BUFFER
157		#endif
158
159	<	// Variables for fbdev DGA mode
160	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
161	<	static int fbdev_fd;
162	<
163	<	#ifdef ENABLE_XF86_VIDMODE
170	<	// Variables for XF86 VidMode support
171	<	static XF86VidModeModeInfo **x_video_modes;                     // Array of all available modes
172	<	static int num_x_video_modes;
173	<	#endif
174	<
175	<	#ifdef ENABLE_VOSF
176	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
177	<	#else
178	<	static const bool use_vosf = false;                                     // Flag: VOSF enabled
179	<	#endif
180	<
181	<	#ifdef ENABLE_VOSF
182	<	// Variables for Video on SEGV support (taken from the Win32 port)
183	<	static uint8 *the_host_buffer;                                          // Host frame buffer in VOSF mode
184	<	static uint32 the_buffer_size;                                          // Size of allocated the_buffer
185	<
186	<	struct ScreenPageInfo {
187	<	int top, bottom;                    // Mapping between this virtual page and Mac scanlines
188	<	};
189	<
190	<	struct ScreenInfo {
191	<	uint32 memBase;                             // Real start address
192	<	uint32 memStart;                    // Start address aligned to page boundary
193	<	uint32 memEnd;                              // Address of one-past-the-end of the screen
194	<	uint32 memLength;                   // Length of the memory addressed by the screen pages
195	<
196	<	uint32 pageSize;                    // Size of a page
197	<	int pageBits;                               // Shift count to get the page number
198	<	uint32 pageCount;                   // Number of pages allocated to the screen
199	<
200	<	bool dirty;                                     // Flag: set if the frame buffer was touched
201	<	char * dirtyPages;                  // Table of flags set if page was altered
202	<	ScreenPageInfo * pageInfo;  // Table of mappings page -> Mac scanlines
203	<	};
204	<
205	<	static ScreenInfo mainBuffer;
206	<
207	<	#define PFLAG_SET_VALUE                 0x00
208	<	#define PFLAG_CLEAR_VALUE               0x01
209	<	#define PFLAG_SET_VALUE_4               0x00000000
210	<	#define PFLAG_CLEAR_VALUE_4             0x01010101
211	<	#define PFLAG_SET(page)                 mainBuffer.dirtyPages[page] = PFLAG_SET_VALUE
212	<	#define PFLAG_CLEAR(page)               mainBuffer.dirtyPages[page] = PFLAG_CLEAR_VALUE
213	<	#define PFLAG_ISSET(page)               (mainBuffer.dirtyPages[page] == PFLAG_SET_VALUE)
214	<	#define PFLAG_ISCLEAR(page)             (mainBuffer.dirtyPages[page] != PFLAG_SET_VALUE)
215	<
216	<	#ifdef UNALIGNED_PROFITABLE
217	<	# define PFLAG_ISSET_4(page)    (*((uint32 *)(mainBuffer.dirtyPages + (page))) == PFLAG_SET_VALUE_4)
218	<	# define PFLAG_ISCLEAR_4(page)  (*((uint32 *)(mainBuffer.dirtyPages + (page))) == PFLAG_CLEAR_VALUE_4)
219	<	#else
220	<	# define PFLAG_ISSET_4(page) \
221	<	PFLAG_ISSET(page  ) && PFLAG_ISSET(page+1) \
222	<	&&      PFLAG_ISSET(page+2) && PFLAG_ISSET(page+3)
223	<	# define PFLAG_ISCLEAR_4(page) \
224	<	PFLAG_ISCLEAR(page  ) && PFLAG_ISCLEAR(page+1) \
225	<	&&      PFLAG_ISCLEAR(page+2) && PFLAG_ISCLEAR(page+3)
226	<	#endif
227	<
228	<	// Set the selected page range [ first_page, last_page [ into the SET state
229	<	#define PFLAG_SET_RANGE(first_page, last_page) \
230	<	memset(mainBuffer.dirtyPages + (first_page), PFLAG_SET_VALUE, \
231	<	(last_page) - (first_page))
232	<
233	<	// Set the selected page range [ first_page, last_page [ into the CLEAR state
234	<	#define PFLAG_CLEAR_RANGE(first_page, last_page) \
235	<	memset(mainBuffer.dirtyPages + (first_page), PFLAG_CLEAR_VALUE, \
236	<	(last_page) - (first_page))
237	<
238	<	#define PFLAG_SET_ALL do { \
239	<	PFLAG_SET_RANGE(0, mainBuffer.pageCount); \
240	<	mainBuffer.dirty = true; \
241	<	} while (0)
242	<
243	<	#define PFLAG_CLEAR_ALL do { \
244	<	PFLAG_CLEAR_RANGE(0, mainBuffer.pageCount); \
245	<	mainBuffer.dirty = false; \
246	<	} while (0)
247	<
248	<	// Set the following macro definition to 1 if your system
249	<	// provides a really fast strchr() implementation
250	<	//#define HAVE_FAST_STRCHR 0
251	<
252	<	static inline int find_next_page_set(int page)
253	<	{
254	<	#if HAVE_FAST_STRCHR
255	<	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_SET_VALUE);
256	<	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
257	<	#else
258	<	while (PFLAG_ISCLEAR_4(page))
259	<	page += 4;
260	<	while (PFLAG_ISCLEAR(page))
261	<	page++;
262	<	return page;
263	<	#endif
264	<	}
265	<
266	<	static inline int find_next_page_clear(int page)
267	<	{
268	<	#if HAVE_FAST_STRCHR
269	<	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_CLEAR_VALUE);
270	<	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
271	<	#else
272	<	while (PFLAG_ISSET_4(page))
273	<	page += 4;
274	<	while (PFLAG_ISSET(page))
275	<	page++;
276	<	return page;
277	<	#endif
278	<	}
279	<
280	<	static int zero_fd = -1;
281	<	static bool Screen_fault_handler_init();
282	<	static struct sigaction vosf_sa;
283	<
284	<	#ifdef HAVE_PTHREADS
285	<	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer (dirtyPages in fact)
286	<	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
287	<	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
288	<	#else
289	<	#define LOCK_VOSF
290	<	#define UNLOCK_VOSF
291	<	#endif
292	<
293	<	static int log_base_2(uint32 x)
294	<	{
295	<	uint32 mask = 0x80000000;
296	<	int l = 31;
297	<	while (l >= 0 && (x & mask) == 0) {
298	<	mask >>= 1;
299	<	l--;
300	<	}
301	<	return l;
302	<	}
303	<	#endif /* ENABLE_VOSF */
159	>	// Variables for non-VOSF incremental refresh
160	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
161	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
162	>	static bool updt_box[17][17];
163	>	static int nr_boxes;
164
165	<	// VideoRefresh function
166	<	void VideoRefreshInit(void);
165	>	// Video refresh function
166	>	static void VideoRefreshInit(void);
167		static void (*video_refresh)(void);
168
169	+
170		// Prototypes
171		static void *redraw_func(void *arg);
172		static int event2keycode(XKeyEvent &ev);
173
313	–
174		// From main_unix.cpp
175		extern char *x_display_name;
176		extern Display *x_display;
#	Line 318 | Line 178 | extern Display *x_display;
178		// From sys_unix.cpp
179		extern void SysMountFirstFloppy(void);
180
321	–	#ifdef ENABLE_VOSF
322	–	# include "video_vosf.h"
323	–	#endif
324	–
181
182		/*
183	<	*  Initialization
183	>	*  Utility functions
184		*/
185
186	<	// Set VideoMonitor according to video mode
187	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
186	>	// Add mode to list of supported modes
187	>	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
188	>	{
189	>	video_mode mode;
190	>	mode.x = width;
191	>	mode.y = height;
192	>	mode.resolution_id = resolution_id;
193	>	mode.bytes_per_row = bytes_per_row;
194	>	mode.depth = depth;
195	>	VideoModes.push_back(mode);
196	>	}
197	>
198	>	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
199	>	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
200		{
201		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
202		int layout = FLAYOUT_DIRECT;
203	<	switch (depth) {
204	<	case 1:
205	<	layout = FLAYOUT_DIRECT;
206	<	break;
339	<	case 8:
340	<	layout = FLAYOUT_DIRECT;
341	<	break;
342	<	case 15:
343	<	layout = FLAYOUT_HOST_555;
344	<	break;
345	<	case 16:
346	<	layout = FLAYOUT_HOST_565;
347	<	break;
348	<	case 24:
349	<	case 32:
350	<	layout = FLAYOUT_HOST_888;
351	<	break;
352	<	}
203	>	if (depth == VDEPTH_16BIT)
204	>	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
205	>	else if (depth == VDEPTH_32BIT)
206	>	layour = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
207		if (native_byte_order)
208		MacFrameLayout = layout;
209		else
210		MacFrameLayout = FLAYOUT_DIRECT;
211	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
212	+
213	+	// Set variables used by UAE memory banking
214	+	MacFrameBaseHost = the_buffer;
215	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
216	+	InitFrameBufferMapping();
217	+	#else
218	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
219	+	D(bug("Host frame buffer = %p, ", the_buffer));
220		#endif
221	<	switch (depth) {
359	<	case 1:
360	<	VideoMonitor.mode = VMODE_1BIT;
361	<	break;
362	<	case 8:
363	<	VideoMonitor.mode = VMODE_8BIT;
364	<	break;
365	<	case 15:
366	<	VideoMonitor.mode = VMODE_16BIT;
367	<	break;
368	<	case 16:
369	<	VideoMonitor.mode = VMODE_16BIT;
370	<	break;
371	<	case 24:
372	<	case 32:
373	<	VideoMonitor.mode = VMODE_32BIT;
374	<	break;
375	<	}
376	<	VideoMonitor.x = width;
377	<	VideoMonitor.y = height;
378	<	VideoMonitor.bytes_per_row = bytes_per_row;
221	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
222		}
223
224		// Set window name and class
#	Line 409 | Line 252 | static void set_window_focus(Window w)
252		}
253
254		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
255	+	static Atom WM_DELETE_WINDOW = (Atom)0;
256		static void set_window_delete_protocol(Window w)
257		{
258		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 445 | Line 289 | static int error_handler(Display *d, XEr
289		return old_error_handler(d, e);
290		}
291
292	<	// Init window mode
293	<	static bool init_window(int width, int height)
292	>
293	>	/*
294	>	*  Display "driver" classes
295	>	*/
296	>
297	>	class driver_base {
298	>	public:
299	>	driver_base();
300	>	virtual ~driver_base();
301	>
302	>	virtual void update_palette(void);
303	>	virtual void suspend(void) {}
304	>	virtual void resume(void) {}
305	>
306	>	public:
307	>	bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
308	>	Window w;               // The window we draw into
309	>	};
310	>
311	>	class driver_window;
312	>	static void update_display_window_vosf(driver_window *drv);
313	>	static void update_display_dynamic(int ticker, driver_window *drv);
314	>	static void update_display_static(driver_window *drv);
315	>
316	>	class driver_window : public driver_base {
317	>	friend void update_display_window_vosf(driver_window *drv);
318	>	friend void update_display_dynamic(int ticker, driver_window *drv);
319	>	friend void update_display_static(driver_window *drv);
320	>
321	>	public:
322	>	driver_window(const video_mode &mode);
323	>	~driver_window();
324	>
325	>	private:
326	>	GC gc;
327	>	XImage *img;
328	>	bool have_shm;                          // Flag: SHM extensions available
329	>	XShmSegmentInfo shminfo;
330	>	Cursor mac_cursor;
331	>	};
332	>
333	>	static driver_base *drv = NULL; // Pointer to currently used driver object
334	>
335	>	#ifdef ENABLE_VOSF
336	>	# include "video_vosf.h"
337	>	#endif
338	>
339	>	driver_base::driver_base()
340	>	: init_ok(false), w(0)
341	>	{
342	>	the_buffer = NULL;
343	>	the_buffer_copy = NULL;
344	>	}
345	>
346	>	driver_base::~driver_base()
347		{
348	+	XFlush(x_display);
349	+	XSync(x_display, false);
350	+
351	+	if (w) {
352	+	XUnmapWindow(x_display, w);
353	+	wait_unmapped(w);
354	+	XDestroyWindow(x_display, w);
355	+	}
356	+
357	+	// Free frame buffer(s)
358	+	if (!use_vosf) {
359	+	if (the_buffer) {
360	+	free(the_buffer);
361	+	the_buffer = NULL;
362	+	}
363	+	if (the_buffer_copy) {
364	+	free(the_buffer_copy);
365	+	the_buffer_copy = NULL;
366	+	}
367	+	}
368	+	#ifdef ENABLE_VOSF
369	+	else {
370	+	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
371	+	vm_release(the_buffer, the_buffer_size);
372	+	the_buffer = NULL;
373	+	}
374	+	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
375	+	vm_release(the_buffer_copy, the_buffer_size);
376	+	the_buffer_copy = NULL;
377	+	}
378	+	}
379	+	#endif
380	+	}
381	+
382	+	// Palette has changed
383	+	void driver_base::update_palette(void)
384	+	{
385	+	if (cmap[0] && cmap[1]) {
386	+	int num = 256;
387	+	if (xdepth == 15)
388	+	num = 32;
389	+	else if (xdepth == 16)
390	+	num = 64;
391	+	XStoreColors(x_display, cmap[0], palette, num);
392	+	XStoreColors(x_display, cmap[1], palette, num);
393	+	}
394	+	XSync(x_display, false);
395	+	}
396	+
397	+
398	+	/*
399	+	*  Windowed display driver
400	+	*/
401	+
402	+	// Open display
403	+	driver_window::driver_window(const video_mode &mode)
404	+	: gc(0), img(NULL), have_shm(false), mac_cursor(0)
405	+	{
406	+	int width = mode.x, height = mode.y;
407		int aligned_width = (width + 15) & ~15;
408		int aligned_height = (height + 15) & ~15;
409
410		// Set absolute mouse mode
411		ADBSetRelMouseMode(false);
412
457	–	// Read frame skip prefs
458	–	frame_skip = PrefsFindInt32("frameskip");
459	–
413		// Create window
414		XSetWindowAttributes wattr;
415		wattr.event_mask = eventmask = win_eventmask;
416		wattr.background_pixel = black_pixel;
417		wattr.colormap = cmap[0];
418	<
419	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
467	<	InputOutput, vis, CWEventMask | CWBackPixel | (depth == 8 ? CWColormap : 0), &wattr);
418	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
419	>	InputOutput, vis, CWEventMask | CWBackPixel | ((mode.depth == VDEPTH_1BIT || cmap[0] == 0) ? 0 : CWColormap), &wattr);
420
421		// Set window name/class
422	<	set_window_name(the_win, STR_WINDOW_TITLE);
422	>	set_window_name(w, STR_WINDOW_TITLE);
423
424		// Indicate that we want keyboard input
425	<	set_window_focus(the_win);
425	>	set_window_focus(w);
426
427		// Set delete protocol property
428	<	set_window_delete_protocol(the_win);
428	>	set_window_delete_protocol(w);
429
430		// Make window unresizable
431		{
#	Line 484 | Line 436 | static bool init_window(int width, int h
436		hints->min_height = height;
437		hints->max_height = height;
438		hints->flags = PMinSize | PMaxSize;
439	<	XSetWMNormalHints(x_display, the_win, hints);
439	>	XSetWMNormalHints(x_display, w, hints);
440		XFree(hints);
441		}
442		}
443
444		// Show window
445	<	XMapWindow(x_display, the_win);
446	<	wait_mapped(the_win);
445	>	XMapWindow(x_display, w);
446	>	wait_mapped(w);
447
448		// Try to create and attach SHM image
449	<	have_shm = false;
498	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
449	>	if (local_X11 && mode.depth != VDEPTH_1BIT && XShmQueryExtension(x_display)) {
450
451		// Create SHM image ("height + 2" for safety)
452	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
452	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
453		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
454		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
455		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 522 | Line 473 | static bool init_window(int width, int h
473
474		// Create normal X image if SHM doesn't work ("height + 2" for safety)
475		if (!have_shm) {
476	<	int bytes_per_row = aligned_width;
526	<	switch (depth) {
527	<	case 1:
528	<	bytes_per_row /= 8;
529	<	break;
530	<	case 15:
531	<	case 16:
532	<	bytes_per_row *= 2;
533	<	break;
534	<	case 24:
535	<	case 32:
536	<	bytes_per_row *= 4;
537	<	break;
538	<	}
476	>	int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth);
477		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
478	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
478	>	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);
479		}
480
481		// 1-Bit mode is big-endian
482	<	if (depth == 1) {
482	>	if (mode.depth == VDEPTH_1BIT) {
483		img->byte_order = MSBFirst;
484		img->bitmap_bit_order = MSBFirst;
485		}
486
487		#ifdef ENABLE_VOSF
488	<	// Allocate a page-aligned chunk of memory for frame buffer
551	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
488	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
489		the_host_buffer = the_buffer_copy;
490	<
491	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
492	<	memset(the_buffer_copy, 0, the_buffer_size);
556	<
557	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
558	<	memset(the_buffer, 0, the_buffer_size);
490	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
491	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
492	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
493		#else
494		// Allocate memory for frame buffer
495		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
496		#endif
497
498		// Create GC
499	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
500	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
499	>	gc = XCreateGC(x_display, w, 0, 0);
500	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
501
502		// Create no_cursor
503		mac_cursor = XCreatePixmapCursor(x_display,
504	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
505	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
504	>	XCreatePixmap(x_display, w, 1, 1, 1),
505	>	XCreatePixmap(x_display, w, 1, 1, 1),
506		&black, &white, 0, 0);
507	<	XDefineCursor(x_display, the_win, mac_cursor);
507	>	XDefineCursor(x_display, w, mac_cursor);
508
509	<	// Set VideoMonitor
509	>	// Init blitting routines
510		bool native_byte_order;
511		#ifdef WORDS_BIGENDIAN
512		native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#	Line 582 | Line 516 | static bool init_window(int width, int h
516		#ifdef ENABLE_VOSF
517		Screen_blitter_init(&visualInfo, native_byte_order);
518		#endif
519	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
520	<
521	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
522	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
523	<	#else
524	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
519	>
520	>	// Set VideoMonitor
521	>	VideoMonitor.mode = mode;
522	>	set_mac_frame_buffer(mode.depth, native_byte_order);
523	>
524	>	// Everything went well
525	>	init_ok = true;
526	>	}
527	>
528	>	// Close display
529	>	driver_window::~driver_window()
530	>	{
531	>	if (img)
532	>	XDestroyImage(img);
533	>	if (have_shm) {
534	>	XShmDetach(x_display, &shminfo);
535	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
536	>	}
537	>	if (gc)
538	>	XFreeGC(x_display, gc);
539	>	}
540	>
541	>
542	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
543	>	/*
544	>	*  DGA display driver base class
545	>	*/
546	>
547	>	class driver_dga : public driver_base {
548	>	public:
549	>	driver_dga();
550	>	~driver_dga();
551	>
552	>	void suspend(void);
553	>	void resume(void);
554	>
555	>	private:
556	>	Window suspend_win;             // "Suspend" information window
557	>	void *fb_save;                  // Saved frame buffer for suspend/resume
558	>	};
559	>
560	>	driver_dga::driver_dga()
561	>	: suspend_win(0), fb_save(NULL)
562	>	{
563	>	}
564	>
565	>	driver_dga::~driver_dga()
566	>	{
567	>	XUngrabPointer(x_display, CurrentTime);
568	>	XUngrabKeyboard(x_display, CurrentTime);
569	>	}
570	>
571	>	// Suspend emulation
572	>	void driver_dga::suspend(void)
573	>	{
574	>	// Release ctrl key
575	>	ADBKeyUp(0x36);
576	>	ctrl_down = false;
577	>
578	>	// Lock frame buffer (this will stop the MacOS thread)
579	>	LOCK_FRAME_BUFFER;
580	>
581	>	// Save frame buffer
582	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
583	>	if (fb_save)
584	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
585	>
586	>	// Close full screen display
587	>	#ifdef ENABLE_XF86_DGA
588	>	XF86DGADirectVideo(x_display, screen, 0);
589		#endif
590	<	return true;
590	>	XUngrabPointer(x_display, CurrentTime);
591	>	XUngrabKeyboard(x_display, CurrentTime);
592	>	XUnmapWindow(x_display, w);
593	>	wait_unmapped(w);
594	>
595	>	// Open "suspend" window
596	>	XSetWindowAttributes wattr;
597	>	wattr.event_mask = KeyPressMask;
598	>	wattr.background_pixel = black_pixel;
599	>
600	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
601	>	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
602	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
603	>	set_window_focus(suspend_win);
604	>	XMapWindow(x_display, suspend_win);
605	>	emul_suspended = true;
606		}
607
608	<	// Init fbdev DGA display
609	<	static bool init_fbdev_dga(char *in_fb_name)
608	>	// Resume emulation
609	>	void driver_dga::resume(void)
610		{
611	+	// Close "suspend" window
612	+	XDestroyWindow(x_display, suspend_win);
613	+	XSync(x_display, false);
614	+
615	+	// Reopen full screen display
616	+	XMapRaised(x_display, w);
617	+	wait_mapped(w);
618	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
619	+	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
620	+	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
621	+	#ifdef ENABLE_XF86_DGA
622	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
623	+	XF86DGASetViewPort(x_display, screen, 0, 0);
624	+	#endif
625	+	XSync(x_display, false);
626	+
627	+	// the_buffer already contains the data to restore. i.e. since a temporary
628	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
629	+	// not necessary.
630	+	#ifdef ENABLE_VOSF
631	+	if (use_vosf) {
632	+	LOCK_VOSF;
633	+	PFLAG_SET_ALL;
634	+	UNLOCK_VOSF;
635	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
636	+	}
637	+	#endif
638	+
639	+	// Restore frame buffer
640	+	if (fb_save) {
641	+	#ifdef ENABLE_VOSF
642	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
643	+	if (!use_vosf)
644	+	#endif
645	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
646	+	free(fb_save);
647	+	fb_save = NULL;
648	+	}
649	+
650	+	// Unlock frame buffer (and continue MacOS thread)
651	+	UNLOCK_FRAME_BUFFER;
652	+	emul_suspended = false;
653	+	}
654	+	#endif
655	+
656	+
657		#ifdef ENABLE_FBDEV_DGA
658	+	/*
659	+	*  fbdev DGA display driver
660	+	*/
661	+
662	+	class driver_fbdev : public driver_dga {
663	+	public:
664	+	driver_fbdev(const video_mode &mode);
665	+	~driver_fbdev();
666	+
667	+	private:
668	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
669	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
670	+	};
671	+
672	+	// Open display
673	+	driver_fbdev::driver_fbdev(const video_mode &mode)
674	+	{
675	+	int width = mode.x, height = mode.y;
676	+
677	+	// Set absolute mouse mode
678	+	ADBSetRelMouseMode(false);
679	+
680		// Find the maximum depth available
681		int ndepths, max_depth(0);
682		int *depths = XListDepths(x_display, screen, &ndepths);
683		if (depths == NULL) {
684		printf("FATAL: Could not determine the maximal depth available\n");
685	<	return false;
685	>	return;
686		} else {
687		while (ndepths-- > 0) {
688		if (depths[ndepths] > max_depth)
#	Line 618 | Line 699 | static bool init_fbdev_dga(char *in_fb_n
699		char str[256];
700		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
701		ErrorAlert(str);
702	<	return false;
702	>	return;
703		}
704
705		int fb_depth;           // supported depth
#	Line 638 | Line 719 | static bool init_fbdev_dga(char *in_fb_n
719		continue;
720
721		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
722	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
722	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
723		device_found = true;
724		break;
725		}
#	Line 650 | Line 731 | static bool init_fbdev_dga(char *in_fb_n
731		// Frame buffer name not found ? Then, display warning
732		if (!device_found) {
733		char str[256];
734	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
734	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
735		ErrorAlert(str);
736	<	return false;
736	>	return;
737		}
738
658	–	int width = DisplayWidth(x_display, screen);
659	–	int height = DisplayHeight(x_display, screen);
660	–	depth = fb_depth; // max_depth
661	–
662	–	// Set relative mouse mode
663	–	ADBSetRelMouseMode(false);
664	–
739		// Create window
740		XSetWindowAttributes wattr;
741		wattr.event_mask = eventmask = dga_eventmask;
#	Line 669 | Line 743 | static bool init_fbdev_dga(char *in_fb_n
743		wattr.override_redirect = True;
744		wattr.colormap = cmap[0];
745
746	<	the_win = XCreateWindow(x_display, rootwin,
746	>	w = XCreateWindow(x_display, rootwin,
747		0, 0, width, height,
748		0, xdepth, InputOutput, vis,
749	<	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
749	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (fb_depth <= 8 ? CWColormap : 0),
750		&wattr);
751
752		// Set window name/class
753	<	set_window_name(the_win, STR_WINDOW_TITLE);
753	>	set_window_name(w, STR_WINDOW_TITLE);
754
755		// Indicate that we want keyboard input
756	<	set_window_focus(the_win);
756	>	set_window_focus(w);
757
758		// Show window
759	<	XMapRaised(x_display, the_win);
760	<	wait_mapped(the_win);
759	>	XMapRaised(x_display, w);
760	>	wait_mapped(w);
761
762		// Grab mouse and keyboard
763	<	XGrabKeyboard(x_display, the_win, True,
763	>	XGrabKeyboard(x_display, w, True,
764		GrabModeAsync, GrabModeAsync, CurrentTime);
765	<	XGrabPointer(x_display, the_win, True,
765	>	XGrabPointer(x_display, w, True,
766		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
767	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
767	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
768
769	<	// Set VideoMonitor
770	<	int bytes_per_row = width;
697	<	switch (depth) {
698	<	case 1:
699	<	bytes_per_row = ((width | 7) & ~7) >> 3;
700	<	break;
701	<	case 15:
702	<	case 16:
703	<	bytes_per_row *= 2;
704	<	break;
705	<	case 24:
706	<	case 32:
707	<	bytes_per_row *= 4;
708	<	break;
709	<	}
769	>	// Calculate bytes per row
770	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
771
772	+	// Map frame buffer
773		if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
774		if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
775		char str[256];
776		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
777		ErrorAlert(str);
778	<	return false;
778	>	return;
779		}
780		}
781
#	Line 724 | Line 786 | static bool init_fbdev_dga(char *in_fb_n
786		use_vosf = Screen_blitter_init(&visualInfo, true);
787
788		if (use_vosf) {
789	<	the_host_buffer = the_buffer;
790	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
791	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
792	<	memset(the_buffer_copy, 0, the_buffer_size);
793	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
732	<	memset(the_buffer, 0, the_buffer_size);
789	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
790	>	the_host_buffer = the_buffer;
791	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
792	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
793	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
794		}
795		#else
796		use_vosf = false;
797		#endif
798		#endif
799
800	<	set_video_monitor(width, height, bytes_per_row, true);
801	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
802	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
803	<	#else
804	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
805	<	#endif
806	<	return true;
807	<	#else
747	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
748	<	return false;
749	<	#endif
800	>	// Set VideoMonitor
801	>	VideoModes[0].bytes_per_row = bytes_per_row;
802	>	VideoModes[0].depth = DepthModeForPixelDepth();
803	>	VideoMonitor.mode = mode;
804	>	set_mac_frame_buffer(mode.depth, true);
805	>
806	>	// Everything went well
807	>	init_ok = true;
808		}
809
810	<	// Init XF86 DGA display
811	<	static bool init_xf86_dga(int width, int height)
810	>	// Close display
811	>	driver_fbdev::~driver_fbdev()
812		{
813	+	}
814	+	#endif
815	+
816	+
817		#ifdef ENABLE_XF86_DGA
818	+	/*
819	+	*  XFree86 DGA display driver
820	+	*/
821	+
822	+	class driver_xf86dga : public driver_dga {
823	+	public:
824	+	driver_xf86dga(const video_mode &mode);
825	+	~driver_xf86dga();
826	+
827	+	void update_palette(void);
828	+	void resume(void);
829	+
830	+	private:
831	+	int current_dga_cmap;                                   // Number (0 or 1) of currently installed DGA colormap
832	+	};
833	+
834	+	// Open display
835	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
836	+	: current_dga_cmap(0)
837	+	{
838	+	int width = mode.x, height = mode.y;
839	+
840		// Set relative mouse mode
841		ADBSetRelMouseMode(true);
842
#	Line 777 | Line 861 | static bool init_xf86_dga(int width, int
861		wattr.event_mask = eventmask = dga_eventmask;
862		wattr.override_redirect = True;
863
864	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
864	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
865		InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
866
867		// Set window name/class
868	<	set_window_name(the_win, STR_WINDOW_TITLE);
868	>	set_window_name(w, STR_WINDOW_TITLE);
869
870		// Indicate that we want keyboard input
871	<	set_window_focus(the_win);
871	>	set_window_focus(w);
872
873		// Show window
874	<	XMapRaised(x_display, the_win);
875	<	wait_mapped(the_win);
874	>	XMapRaised(x_display, w);
875	>	wait_mapped(w);
876
877		// Establish direct screen connection
878	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
878	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
879		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
880		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
881		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 803 | Line 887 | static bool init_xf86_dga(int width, int
887		XF86DGASetVidPage(x_display, screen, 0);
888
889		// Set colormap
890	<	if (depth == 8) {
891	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
890	>	if (!IsDirectMode(mode)) {
891	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
892		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
893		}
894		XSync(x_display, false);
895
896	<	// Set VideoMonitor
897	<	int bytes_per_row = (v_width + 7) & ~7;
898	<	switch (depth) {
815	<	case 1:
816	<	bytes_per_row /= 8;
817	<	break;
818	<	case 15:
819	<	case 16:
820	<	bytes_per_row *= 2;
821	<	break;
822	<	case 24:
823	<	case 32:
824	<	bytes_per_row *= 4;
825	<	break;
826	<	}
827	<
896	>	// Init blitting routines
897	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
898	>	#ifdef VIDEO_VOSF
899		#if REAL_ADDRESSING || DIRECT_ADDRESSING
900		// Screen_blitter_init() returns TRUE if VOSF is mandatory
901		// i.e. the framebuffer update function is not Blit_Copy_Raw
902		use_vosf = Screen_blitter_init(&visualInfo, true);
903
904		if (use_vosf) {
905	<	the_host_buffer = the_buffer;
906	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
907	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
908	<	memset(the_buffer_copy, 0, the_buffer_size);
909	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
839	<	memset(the_buffer, 0, the_buffer_size);
905	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
906	>	the_host_buffer = the_buffer;
907	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
908	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
909	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
910		}
911	<	#elif defined(ENABLE_VOSF)
842	<	// The UAE memory handlers will already handle color conversion, if needed.
911	>	#else
912		use_vosf = false;
913		#endif
845	–
846	–	set_video_monitor(width, height, bytes_per_row, true);
847	–	#if REAL_ADDRESSING || DIRECT_ADDRESSING
848	–	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
849	–	//      MacFrameLayout = FLAYOUT_DIRECT;
850	–	#else
851	–	VideoMonitor.mac_frame_base = MacFrameBaseMac;
914		#endif
915	<	return true;
916	<	#else
917	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
918	<	return false;
915	>
916	>	// Set VideoMonitor
917	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
918	>	VideoMonitor.mode = mode;
919	>	set_mac_frame_buffer(mode.depth, true);
920	>
921	>	// Everything went well
922	>	init_ok = true;
923	>	}
924	>
925	>	// Close display
926	>	driver_xf86dga::~driver_xf86dga()
927	>	{
928	>	XF86DGADirectVideo(x_display, screen, 0);
929	>	#ifdef ENABLE_XF86_VIDMODE
930	>	if (has_vidmode)
931	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
932		#endif
933		}
934
935	+	// Palette has changed
936	+	void driver_xf86dga::update_palette(void)
937	+	{
938	+	driver_dga::update_palette();
939	+	current_dga_cmap ^= 1;
940	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
941	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
942	+	}
943	+
944	+	// Resume emulation
945	+	void driver_xf86dga::resume(void)
946	+	{
947	+	driver_dga::resume();
948	+	if (!IsDirectMode(VideoMonitor.mode))
949	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
950	+	}
951	+	#endif
952	+
953	+
954	+	/*
955	+	*  Initialization
956	+	*/
957	+
958		// Init keycode translation table
959		static void keycode_init(void)
960		{
#	Line 922 | Line 1020 | static void keycode_init(void)
1020		}
1021		}
1022
1023	<	bool VideoInitBuffer()
1023	>	// Open display for specified mode
1024	>	static bool video_open(const video_mode &mode)
1025		{
1026	+	// Create display driver object of requested type
1027	+	switch (display_type) {
1028	+	case DISPLAY_WINDOW:
1029	+	drv = new driver_window(mode);
1030	+	break;
1031	+	#ifdef ENABLE_FBDEV_DGA
1032	+	case DISPLAY_DGA:
1033	+	drv = new driver_fbdev(mode);
1034	+	break;
1035	+	#endif
1036	+	#ifdef ENABLE_XF86_DGA
1037	+	case DISPLAY_DGA:
1038	+	drv = new driver_xf86dga(mode);
1039	+	break;
1040	+	#endif
1041	+	}
1042	+	if (drv == NULL)
1043	+	return false;
1044	+	if (!drv->init_ok) {
1045	+	delete drv;
1046	+	drv = NULL;
1047	+	return false;
1048	+	}
1049	+
1050		#ifdef ENABLE_VOSF
1051		if (use_vosf) {
1052	<	const uint32 page_size  = getpagesize();
1053	<	const uint32 page_mask  = page_size - 1;
1054	<
1055	<	mainBuffer.memBase      = (uint32) the_buffer;
1056	<	// Align the frame buffer on page boundary
934	<	mainBuffer.memStart             = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
935	<	mainBuffer.memLength    = the_buffer_size;
936	<	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
937	<
938	<	mainBuffer.pageSize     = page_size;
939	<	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
940	<	mainBuffer.pageBits     = log_base_2(mainBuffer.pageSize);
941	<
942	<	if (mainBuffer.dirtyPages != 0)
943	<	free(mainBuffer.dirtyPages);
944	<
945	<	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
946	<
947	<	if (mainBuffer.pageInfo != 0)
948	<	free(mainBuffer.pageInfo);
949	<
950	<	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
1052	>	// Initialize the mainBuffer structure
1053	>	if (!video_init_buffer()) {
1054	>	ErrorAlert(STR_VOSF_INIT_ERR);
1055	>	return false;
1056	>	}
1057
1058	<	if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0))
1058	>	// Initialize the handler for SIGSEGV
1059	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1060	>	ErrorAlert("Could not initialize Video on SEGV signals");
1061		return false;
954	–
955	–	mainBuffer.dirty = false;
956	–
957	–	PFLAG_CLEAR_ALL;
958	–	// Safety net to insure the loops in the update routines will terminate
959	–	// See a discussion in <video_vosf.h> for further details
960	–	PFLAG_CLEAR(mainBuffer.pageCount);
961	–	PFLAG_SET(mainBuffer.pageCount+1);
962	–
963	–	uint32 a = 0;
964	–	for (int i = 0; i < mainBuffer.pageCount; i++) {
965	–	int y1 = a / VideoMonitor.bytes_per_row;
966	–	if (y1 >= VideoMonitor.y)
967	–	y1 = VideoMonitor.y - 1;
968	–
969	–	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
970	–	if (y2 >= VideoMonitor.y)
971	–	y2 = VideoMonitor.y - 1;
972	–
973	–	mainBuffer.pageInfo[i].top = y1;
974	–	mainBuffer.pageInfo[i].bottom = y2;
975	–
976	–	a += mainBuffer.pageSize;
977	–	if (a > mainBuffer.memLength)
978	–	a = mainBuffer.memLength;
1062		}
980	–
981	–	// We can now write-protect the frame buffer
982	–	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
983	–	return false;
1063		}
1064		#endif
1065	+
1066	+	// Initialize VideoRefresh function
1067	+	VideoRefreshInit();
1068	+
1069	+	// Lock down frame buffer
1070	+	XSync(x_display, false);
1071	+	LOCK_FRAME_BUFFER;
1072	+
1073	+	#ifdef HAVE_PTHREADS
1074	+	// Start redraw/input thread
1075	+	redraw_thread_cancel = false;
1076	+	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1077	+	if (!redraw_thread_active) {
1078	+	printf("FATAL: cannot create redraw thread\n");
1079	+	return false;
1080	+	}
1081	+	#endif
1082	+
1083		return true;
1084		}
1085
1086		bool VideoInit(bool classic)
1087		{
1088	+	classic_mode = classic;
1089	+
1090		#ifdef ENABLE_VOSF
992	–	// Open /dev/zero
993	–	zero_fd = open("/dev/zero", O_RDWR);
994	–	if (zero_fd < 0) {
995	–	char str[256];
996	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
997	–	ErrorAlert(str);
998	–	return false;
999	–	}
1000	–
1091		// Zero the mainBuffer structure
1092	<	mainBuffer.dirtyPages = 0;
1093	<	mainBuffer.pageInfo = 0;
1092	>	mainBuffer.dirtyPages = NULL;
1093	>	mainBuffer.pageInfo = NULL;
1094		#endif
1095
1096		// Check if X server runs on local machine
#	Line 1011 | Line 1101 | bool VideoInit(bool classic)
1101		keycode_init();
1102
1103		// Read prefs
1104	+	frame_skip = PrefsFindInt32("frameskip");
1105		mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1106		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1107
#	Line 1025 | Line 1116 | bool VideoInit(bool classic)
1116		// Frame buffer name
1117		char fb_name[20];
1118
1119	<	// Could do fbdev dga ?
1119	>	// Could do fbdev DGA?
1120		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1121		has_dga = true;
1122		else
#	Line 1071 | Line 1162 | bool VideoInit(bool classic)
1162		case 15:
1163		case 16:
1164		case 24:
1165	<	case 32:
1166	<	color_class = TrueColor;
1165	>	case 32: // Try DirectColor first, as this will allow gamma correction
1166	>	if (!XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo))
1167	>	color_class = TrueColor;
1168		break;
1169		default:
1170	<	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1170	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1171		return false;
1172		}
1173		if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1174	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1174	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1175		return false;
1176		}
1177		if (visualInfo.depth != xdepth) {
1178	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1178	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1179		return false;
1180		}
1181		vis = visualInfo.visual;
1182
1183	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1184	<	classic_mode = classic;
1093	<	if (classic)
1094	<	depth = 1;
1095	<	else
1096	<	depth = xdepth;
1097	<
1098	<	// Create color maps for 8 bit mode
1099	<	if (depth == 8) {
1183	>	// Create color maps
1184	>	if (color_class == PseudoColor || color_class == DirectColor) {
1185		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1186		cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1102	–	XInstallColormap(x_display, cmap[0]);
1103	–	XInstallColormap(x_display, cmap[1]);
1187		}
1188
1189		// Get screen mode from preferences
1190		const char *mode_str;
1191	<	if (classic)
1191	>	if (classic_mode)
1192		mode_str = "win/512/342";
1193		else
1194		mode_str = PrefsFindString("screen");
1195
1196	<	// Determine type and mode
1197	<	int width = 512, height = 384;
1196	>	// Determine display type and default dimensions
1197	>	int default_width = 512, default_height = 384;
1198		display_type = DISPLAY_WINDOW;
1199		if (mode_str) {
1200	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1200	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1201		display_type = DISPLAY_WINDOW;
1202		#ifdef ENABLE_FBDEV_DGA
1203	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1204	<	#else
1205	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1203	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1204	>	display_type = DISPLAY_DGA;
1205	>	default_width = -1; default_height = -1; // use entire screen
1206		#endif
1207	+	#ifdef ENABLE_XF86_DGA
1208	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1209		display_type = DISPLAY_DGA;
1125	–	if (width > DisplayWidth(x_display, screen))
1126	–	width = DisplayWidth(x_display, screen);
1127	–	if (height > DisplayHeight(x_display, screen))
1128	–	height = DisplayHeight(x_display, screen);
1129	–	}
1130	–	if (width <= 0)
1131	–	width = DisplayWidth(x_display, screen);
1132	–	if (height <= 0)
1133	–	height = DisplayHeight(x_display, screen);
1134	–	}
1135	–
1136	–	// Initialize according to display type
1137	–	switch (display_type) {
1138	–	case DISPLAY_WINDOW:
1139	–	if (!init_window(width, height))
1140	–	return false;
1141	–	break;
1142	–	case DISPLAY_DGA:
1143	–	#ifdef ENABLE_FBDEV_DGA
1144	–	if (!init_fbdev_dga(fb_name))
1145	–	#else
1146	–	if (!init_xf86_dga(width, height))
1210		#endif
1211	<	return false;
1149	<	break;
1211	>	}
1212		}
1213	+	if (default_width <= 0)
1214	+	default_width = DisplayWidth(x_display, screen);
1215	+	else if (default_width > DisplayWidth(x_display, screen))
1216	+	default_width = DisplayWidth(x_display, screen);
1217	+	if (default_height <= 0)
1218	+	default_height = DisplayHeight(x_display, screen);
1219	+	else if (default_height > DisplayHeight(x_display, screen))
1220	+	default_height = DisplayHeight(x_display, screen);
1221
1222	<	// Lock down frame buffer
1223	<	LOCK_FRAME_BUFFER;
1224	<
1155	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1156	<	// Set variables for UAE memory mapping
1157	<	MacFrameBaseHost = the_buffer;
1158	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1159	<
1160	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1161	<	if (classic)
1162	<	MacFrameLayout = FLAYOUT_NONE;
1163	<	#endif
1222	>	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1223	>	int depth = (classic_mode ? 1 : xdepth);
1224	>	video_depth depth_mode = DepthModeForPixelDepth(depth);
1225
1226	<	#ifdef ENABLE_VOSF
1227	<	if (use_vosf) {
1228	<	// Initialize the mainBuffer structure
1229	<	if (!VideoInitBuffer()) {
1230	<	// TODO: STR_VOSF_INIT_ERR ?
1231	<	ErrorAlert("Could not initialize Video on SEGV signals");
1232	<	return false;
1226	>	// Construct list of supported modes
1227	>	if (display_type == DISPLAY_WINDOW) {
1228	>	if (classic)
1229	>	add_mode(512, 342, 0x80, 64, depth_mode);
1230	>	else {
1231	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth_mode), depth_mode);
1232	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth_mode), depth_mode);
1233	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth_mode), depth_mode);
1234	>	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth_mode), depth_mode);
1235	>	add_mode(1280, 1024, 0x84, TrivialBytesPerRow(1280, depth_mode), depth_mode);
1236		}
1237	+	} else
1238	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, depth_mode), depth_mode);
1239
1240	<	// Initialize the handler for SIGSEGV
1241	<	if (!Screen_fault_handler_init()) {
1242	<	// TODO: STR_VOSF_INIT_ERR ?
1243	<	ErrorAlert("Could not initialize Video on SEGV signals");
1244	<	return false;
1240	>	// Find requested default mode and open display
1241	>	if (VideoModes.size() == 1)
1242	>	return video_open(VideoModes[0]);
1243	>	else {
1244	>	// Find mode with specified dimensions
1245	>	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1246	>	while (i != end) {
1247	>	if (i->x == default_width && i->y == default_height)
1248	>	return video_open(*i);
1249	>	++i;
1250		}
1251	+	return video_open(VideoModes[0]);
1252		}
1181	–	#endif
1182	–
1183	–	// Initialize VideoRefresh function
1184	–	VideoRefreshInit();
1185	–
1186	–	XSync(x_display, false);
1187	–
1188	–	#ifdef HAVE_PTHREADS
1189	–	// Start redraw/input thread
1190	–	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1191	–	if (!redraw_thread_active) {
1192	–	printf("FATAL: cannot create redraw thread\n");
1193	–	return false;
1194	–	}
1195	–	#endif
1196	–	return true;
1253		}
1254
1255
#	Line 1201 | Line 1257 | bool VideoInit(bool classic)
1257		*  Deinitialization
1258		*/
1259
1260	<	void VideoExit(void)
1260	>	// Close display
1261	>	static void video_close(void)
1262		{
1263		#ifdef HAVE_PTHREADS
1264		// Stop redraw thread
#	Line 1217 | Line 1274 | void VideoExit(void)
1274
1275		// Unlock frame buffer
1276		UNLOCK_FRAME_BUFFER;
1277	+	XSync(x_display, false);
1278
1221	–	// Close window and server connection
1222	–	if (x_display != NULL) {
1223	–	XSync(x_display, false);
1224	–
1225	–	#ifdef ENABLE_XF86_DGA
1226	–	if (display_type == DISPLAY_DGA) {
1227	–	XF86DGADirectVideo(x_display, screen, 0);
1228	–	XUngrabPointer(x_display, CurrentTime);
1229	–	XUngrabKeyboard(x_display, CurrentTime);
1230	–	}
1231	–	#endif
1232	–
1233	–	#ifdef ENABLE_XF86_VIDMODE
1234	–	if (has_vidmode && display_type == DISPLAY_DGA)
1235	–	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1236	–	#endif
1237	–
1238	–	#ifdef ENABLE_FBDEV_DGA
1239	–	if (display_type == DISPLAY_DGA) {
1240	–	XUngrabPointer(x_display, CurrentTime);
1241	–	XUngrabKeyboard(x_display, CurrentTime);
1242	–	close(fbdev_fd);
1243	–	}
1244	–	#endif
1245	–
1246	–	XFlush(x_display);
1247	–	XSync(x_display, false);
1248	–	if (depth == 8) {
1249	–	XFreeColormap(x_display, cmap[0]);
1250	–	XFreeColormap(x_display, cmap[1]);
1251	–	}
1252	–
1253	–	if (!use_vosf) {
1254	–	if (the_buffer) {
1255	–	free(the_buffer);
1256	–	the_buffer = NULL;
1257	–	}
1258	–
1259	–	if (!have_shm && the_buffer_copy) {
1260	–	free(the_buffer_copy);
1261	–	the_buffer_copy = NULL;
1262	–	}
1263	–	}
1264	–	#ifdef ENABLE_VOSF
1265	–	else {
1266	–	if (the_buffer != (uint8 *)MAP_FAILED) {
1267	–	munmap((caddr_t)the_buffer, the_buffer_size);
1268	–	the_buffer = 0;
1269	–	}
1270	–
1271	–	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1272	–	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1273	–	the_buffer_copy = 0;
1274	–	}
1275	–	}
1276	–	#endif
1277	–	}
1278	–
1279		#ifdef ENABLE_VOSF
1280	+	// Deinitialize VOSF
1281		if (use_vosf) {
1281	–	// Clear mainBuffer data
1282		if (mainBuffer.pageInfo) {
1283		free(mainBuffer.pageInfo);
1284	<	mainBuffer.pageInfo = 0;
1284	>	mainBuffer.pageInfo = NULL;
1285		}
1286	–
1286		if (mainBuffer.dirtyPages) {
1287		free(mainBuffer.dirtyPages);
1288	<	mainBuffer.dirtyPages = 0;
1288	>	mainBuffer.dirtyPages = NULL;
1289		}
1290		}
1291	+	#endif
1292	+
1293	+	// Close display
1294	+	delete drv;
1295	+	drv = NULL;
1296	+	}
1297
1298	<	// Close /dev/zero
1299	<	if (zero_fd > 0)
1300	<	close(zero_fd);
1298	>	void VideoExit(void)
1299	>	{
1300	>	// Close display
1301	>	video_close();
1302	>
1303	>	// Free colormaps
1304	>	if (cmap[0]) {
1305	>	XFreeColormap(x_display, cmap[0]);
1306	>	cmap[0] = 0;
1307	>	}
1308	>	if (cmap[1]) {
1309	>	XFreeColormap(x_display, cmap[1]);
1310	>	cmap[1] = 0;
1311	>	}
1312	>
1313	>	#ifdef ENABLE_XF86_VIDMODE
1314	>	// Free video mode list
1315	>	if (x_video_modes) {
1316	>	XFree(x_video_modes);
1317	>	x_video_modes = NULL;
1318	>	}
1319	>	#endif
1320	>
1321	>	#ifdef ENABLE_FBDEV_DGA
1322	>	// Close framebuffer device
1323	>	if (fbdev_fd >= 0) {
1324	>	close(fbdev_fd);
1325	>	fbdev_fd = -1;
1326	>	}
1327		#endif
1328		}
1329
#	Line 1304 | Line 1335 | void VideoExit(void)
1335		void VideoQuitFullScreen(void)
1336		{
1337		D(bug("VideoQuitFullScreen()\n"));
1338	<	if (display_type == DISPLAY_DGA)
1308	<	quit_full_screen = true;
1338	>	quit_full_screen = true;
1339		}
1340
1341
#	Line 1336 | Line 1366 | void video_set_palette(uint8 *pal)
1366
1367		// Convert colors to XColor array
1368		for (int i=0; i<256; i++) {
1339	–	palette[i].pixel = i;
1369		palette[i].red = pal[i*3] * 0x0101;
1370		palette[i].green = pal[i*3+1] * 0x0101;
1371		palette[i].blue = pal[i*3+2] * 0x0101;
1372	+	palette[i].pixel = i;
1373		palette[i].flags = DoRed | DoGreen | DoBlue;
1374		}
1375
#	Line 1351 | Line 1381 | void video_set_palette(uint8 *pal)
1381
1382
1383		/*
1384	<	*  Suspend/resume emulator
1384	>	*  Switch video mode
1385		*/
1386
1387	<	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1358	<	static void suspend_emul(void)
1387	>	void video_switch_to_mode(const video_mode &mode)
1388		{
1389	<	if (display_type == DISPLAY_DGA) {
1390	<	// Release ctrl key
1391	<	ADBKeyUp(0x36);
1363	<	ctrl_down = false;
1364	<
1365	<	// Lock frame buffer (this will stop the MacOS thread)
1366	<	LOCK_FRAME_BUFFER;
1367	<
1368	<	// Save frame buffer
1369	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1370	<	if (fb_save)
1371	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1372	<
1373	<	// Close full screen display
1374	<	#ifdef ENABLE_XF86_DGA
1375	<	XF86DGADirectVideo(x_display, screen, 0);
1376	<	#endif
1377	<	XUngrabPointer(x_display, CurrentTime);
1378	<	XUngrabKeyboard(x_display, CurrentTime);
1379	<	XUnmapWindow(x_display, the_win);
1380	<	wait_unmapped(the_win);
1381	<
1382	<	// Open "suspend" window
1383	<	XSetWindowAttributes wattr;
1384	<	wattr.event_mask = KeyPressMask;
1385	<	wattr.background_pixel = black_pixel;
1386	<
1387	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1388	<	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
1389	<	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1390	<	set_window_focus(suspend_win);
1391	<	XMapWindow(x_display, suspend_win);
1392	<	emul_suspended = true;
1393	<	}
1394	<	}
1395	<
1396	<	static void resume_emul(void)
1397	<	{
1398	<	// Close "suspend" window
1399	<	XDestroyWindow(x_display, suspend_win);
1400	<	XSync(x_display, false);
1389	>	// Close and reopen display
1390	>	video_close();
1391	>	video_open(mode);
1392
1393	<	// Reopen full screen display
1394	<	XMapRaised(x_display, the_win);
1395	<	wait_mapped(the_win);
1405	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1406	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1407	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1408	<	#ifdef ENABLE_XF86_DGA
1409	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1410	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1411	<	#endif
1412	<	XSync(x_display, false);
1413	<
1414	<	// the_buffer already contains the data to restore. i.e. since a temporary
1415	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1416	<	// not necessary.
1417	<	#ifdef ENABLE_VOSF
1418	<	if (use_vosf) {
1419	<	LOCK_VOSF;
1420	<	PFLAG_SET_ALL;
1421	<	UNLOCK_VOSF;
1422	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1423	<	}
1424	<	#endif
1425	<
1426	<	// Restore frame buffer
1427	<	if (fb_save) {
1428	<	#ifdef ENABLE_VOSF
1429	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1430	<	if (!use_vosf)
1431	<	#endif
1432	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1433	<	free(fb_save);
1434	<	fb_save = NULL;
1393	>	if (drv == NULL) {
1394	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1395	>	QuitEmulator();
1396		}
1436	–
1437	–	#ifdef ENABLE_XF86_DGA
1438	–	if (depth == 8)
1439	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1440	–	#endif
1441	–
1442	–	// Unlock frame buffer (and continue MacOS thread)
1443	–	UNLOCK_FRAME_BUFFER;
1444	–	emul_suspended = false;
1397		}
1446	–	#endif
1398
1399
1400		/*
#	Line 1504 | Line 1455 | static int kc_decode(KeySym ks)
1455		case XK_slash: case XK_question: return 0x2c;
1456
1457		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1458	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1458	>	case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30;
1459		#else
1460		case XK_Tab: return 0x30;
1461		#endif
#	Line 1679 | Line 1630 | static void handle_events(void)
1630		if (code == 0x36)
1631		ctrl_down = true;
1632		} else {
1682	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1633		if (code == 0x31)
1634	<	resume_emul();  // Space wakes us up
1685	<	#endif
1634	>	drv->resume();  // Space wakes us up
1635		}
1636		}
1637		break;
#	Line 1710 | Line 1659 | static void handle_events(void)
1659		LOCK_VOSF;
1660		PFLAG_SET_ALL;
1661		UNLOCK_VOSF;
1662	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1662	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1663		}
1664		else
1665		#endif
#	Line 1721 | Line 1670 | static void handle_events(void)
1670		updt_box[x1][y1] = true;
1671		nr_boxes = 16 * 16;
1672		} else                                  // Static refresh
1673	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1673	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1674		}
1675		break;
1676
#	Line 1742 | Line 1691 | static void handle_events(void)
1691		*/
1692
1693		// Dynamic display update (variable frame rate for each box)
1694	<	static void update_display_dynamic(int ticker)
1694	>	static void update_display_dynamic(int ticker, driver_window *drv)
1695		{
1696		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1697		int xil = 0;
1698		int rxm = 0, rxmo = 0;
1699	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1700	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1701	<	int rx = VideoMonitor.bytes_per_row / 16;
1702	<	int ry = VideoMonitor.y / 16;
1699	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1700	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1701	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
1702	>	int ry = VideoMonitor.mode.y / 16;
1703		int max_box;
1704
1705		y2s = sm_uptd[ticker % 8];
#	Line 1804 | Line 1753 | static void update_display_dynamic(int t
1753		i = (yi * bytes_per_row) + xi;
1754		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1755		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1756	<	if (depth == 1) {
1757	<	if (have_shm)
1758	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1756	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1757	>	if (drv->have_shm)
1758	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1759		else
1760	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1760	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1761		} else {
1762	<	if (have_shm)
1763	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1762	>	if (drv->have_shm)
1763	>	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);
1764		else
1765	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1765	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1766		}
1767		xil = 0;
1768		}
#	Line 1832 | Line 1781 | static void update_display_dynamic(int t
1781		}
1782
1783		// Static display update (fixed frame rate, but incremental)
1784	<	static void update_display_static(void)
1784	>	static void update_display_static(driver_window *drv)
1785		{
1786		// Incremental update code
1787		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1788	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1789	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1788	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1789	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1790		uint8 *p, *p2;
1791
1792		// Check for first line from top and first line from bottom that have changed
1793		y1 = 0;
1794	<	for (j=0; j<VideoMonitor.y; j++) {
1794	>	for (j=0; j<VideoMonitor.mode.y; j++) {
1795		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1796		y1 = j;
1797		break;
1798		}
1799		}
1800		y2 = y1 - 1;
1801	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
1801	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
1802		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1803		y2 = j;
1804		break;
#	Line 1859 | Line 1808 | static void update_display_static(void)
1808
1809		// Check for first column from left and first column from right that have changed
1810		if (high) {
1811	<	if (depth == 1) {
1812	<	x1 = VideoMonitor.x - 1;
1811	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1812	>	x1 = VideoMonitor.mode.x - 1;
1813		for (j=y1; j<=y2; j++) {
1814		p = &the_buffer[j * bytes_per_row];
1815		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1878 | Line 1827 | static void update_display_static(void)
1827		p2 = &the_buffer_copy[j * bytes_per_row];
1828		p += bytes_per_row;
1829		p2 += bytes_per_row;
1830	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1830	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
1831		p--; p2--;
1832		if (*p != *p2) {
1833		x2 = (i << 3) + 7;
#	Line 1897 | Line 1846 | static void update_display_static(void)
1846		}
1847
1848		} else {
1849	<	x1 = VideoMonitor.x;
1849	>	x1 = VideoMonitor.mode.x;
1850		for (j=y1; j<=y2; j++) {
1851		p = &the_buffer[j * bytes_per_row];
1852		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1915 | Line 1864 | static void update_display_static(void)
1864		p2 = &the_buffer_copy[j * bytes_per_row];
1865		p += bytes_per_row;
1866		p2 += bytes_per_row;
1867	<	for (i=VideoMonitor.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1867	>	for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1868		p--;
1869		p2--;
1870		if (*p != *p2) {
#	Line 1938 | Line 1887 | static void update_display_static(void)
1887
1888		// Refresh display
1889		if (high && wide) {
1890	<	if (have_shm)
1891	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1890	>	if (drv->have_shm)
1891	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
1892		else
1893	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1893	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
1894		}
1895		}
1896
#	Line 1958 | Line 1907 | static void update_display_static(void)
1907
1908		static inline void possibly_quit_dga_mode()
1909		{
1961	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1910		// Quit DGA mode if requested
1911		if (quit_full_screen) {
1912		quit_full_screen = false;
1913	<	#ifdef ENABLE_XF86_DGA
1914	<	XF86DGADirectVideo(x_display, screen, 0);
1967	<	#endif
1968	<	XUngrabPointer(x_display, CurrentTime);
1969	<	XUngrabKeyboard(x_display, CurrentTime);
1970	<	XUnmapWindow(x_display, the_win);
1971	<	XSync(x_display, false);
1913	>	delete drv;
1914	>	drv = NULL;
1915		}
1973	–	#endif
1916		}
1917
1918	<	static inline void handle_palette_changes(int depth, int display_type)
1918	>	static inline void handle_palette_changes(void)
1919		{
1920		LOCK_PALETTE;
1921
1922		if (palette_changed) {
1923		palette_changed = false;
1924	<	if (depth == 8) {
1983	<	XStoreColors(x_display, cmap[0], palette, 256);
1984	<	XStoreColors(x_display, cmap[1], palette, 256);
1985	<	XSync(x_display, false);
1986	<
1987	<	#ifdef ENABLE_XF86_DGA
1988	<	if (display_type == DISPLAY_DGA) {
1989	<	current_dga_cmap ^= 1;
1990	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1991	<	}
1992	<	#endif
1993	<	}
1924	>	drv->update_palette();
1925		}
1926
1927		UNLOCK_PALETTE;
#	Line 2005 | Line 1936 | static void video_refresh_dga(void)
1936		handle_events();
1937
1938		// Handle palette changes
1939	<	handle_palette_changes(depth, DISPLAY_DGA);
1939	>	handle_palette_changes();
1940		}
1941
1942		#ifdef ENABLE_VOSF
#	Line 2019 | Line 1950 | static void video_refresh_dga_vosf(void)
1950		handle_events();
1951
1952		// Handle palette changes
1953	<	handle_palette_changes(depth, DISPLAY_DGA);
1953	>	handle_palette_changes();
1954
1955		// Update display (VOSF variant)
1956		static int tick_counter = 0;
#	Line 2043 | Line 1974 | static void video_refresh_window_vosf(vo
1974		handle_events();
1975
1976		// Handle palette changes
1977	<	handle_palette_changes(depth, DISPLAY_WINDOW);
1977	>	handle_palette_changes();
1978
1979		// Update display (VOSF variant)
1980		static int tick_counter = 0;
#	Line 2051 | Line 1982 | static void video_refresh_window_vosf(vo
1982		tick_counter = 0;
1983		if (mainBuffer.dirty) {
1984		LOCK_VOSF;
1985	<	update_display_window_vosf();
1985	>	update_display_window_vosf(static_cast<driver_window *>(drv));
1986		UNLOCK_VOSF;
1987		XSync(x_display, false); // Let the server catch up
1988		}
#	Line 2065 | Line 1996 | static void video_refresh_window_static(
1996		handle_events();
1997
1998		// Handle_palette changes
1999	<	handle_palette_changes(depth, DISPLAY_WINDOW);
1999	>	handle_palette_changes();
2000
2001		// Update display (static variant)
2002		static int tick_counter = 0;
2003		if (++tick_counter >= frame_skip) {
2004		tick_counter = 0;
2005	<	update_display_static();
2005	>	update_display_static(static_cast<driver_window *>(drv));
2006		}
2007		}
2008
#	Line 2081 | Line 2012 | static void video_refresh_window_dynamic
2012		handle_events();
2013
2014		// Handle_palette changes
2015	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2015	>	handle_palette_changes();
2016
2017		// Update display (dynamic variant)
2018		static int tick_counter = 0;
2019		tick_counter++;
2020	<	update_display_dynamic(tick_counter);
2020	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2021		}
2022
2023
#	Line 2094 | Line 2025 | static void video_refresh_window_dynamic
2025		*  Thread for screen refresh, input handling etc.
2026		*/
2027
2028	<	void VideoRefreshInit(void)
2028	>	static void VideoRefreshInit(void)
2029		{
2030		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2031		if (display_type == DISPLAY_DGA) {

Diff Legend

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