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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.26 by cebix, 2000-10-27T17:01:40Z vs.
Revision 1.54 by cebix, 2001-07-06T22:00:39Z

#	Line 1 \| Line 1
1		/*
2		* video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	* Basilisk II (C) 1997-2000 Christian Bauer
4	>	* Basilisk II (C) 1997-2001 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	+	#ifndef NO_STD_NAMESPACE
43	+	using std::sort;
44	+	#endif
45	+
46		#ifdef HAVE_PTHREADS
47		# include <pthread.h>
48		#endif
#	Line 52 \| Line 59
59		# include <sys/mman.h>
60		#endif
61
55	–	#ifdef ENABLE_VOSF
56	–	# include <unistd.h>
57	–	# include <signal.h>
58	–	# include <fcntl.h>
59	–	# include <sys/mman.h>
60	–	#endif
61	–
62		#include "cpu_emulation.h"
63		#include "main.h"
64		#include "adb.h"
#	Line 67 \| Line 67
67		#include "user_strings.h"
68		#include "video.h"
69
70	<	#define DEBUG 0
70	>	#define DEBUG 1
71		#include "debug.h"
72
73
#	Line 79 \| Line 79 \| enum {
79
80		// Constants
81		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
82	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
82	>
83	>	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| ExposureMask \| StructureNotifyMask;
84	>	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
85
86
87		// Global variables
88		static int32 frame_skip; // Prefs items
89	<	static int16 mouse_wheel_mode = 1;
90	<	static int16 mouse_wheel_lines = 3;
89	>	static int16 mouse_wheel_mode;
90	>	static int16 mouse_wheel_lines;
91
92		static int display_type = DISPLAY_WINDOW; // See enum above
93		static bool local_X11; // Flag: X server running on local machine?
94	<	static uint8 *the_buffer; // Mac frame buffer
94	>	static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into)
95	>	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes)
96
94	–	#ifdef HAVE_PTHREADS
97		static bool redraw_thread_active = false; // Flag: Redraw thread installed
98	<	static volatile bool redraw_thread_cancel = false; // Flag: Cancel Redraw thread
98	>	#ifdef HAVE_PTHREADS
99	>	static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
100		static pthread_t redraw_thread; // Redraw thread
101		#endif
102
103		static bool has_dga = false; // Flag: Video DGA capable
104		static bool has_vidmode = false; // Flag: VidMode extension available
105
106	+	#ifdef ENABLE_VOSF
107	+	static bool use_vosf = true; // Flag: VOSF enabled
108	+	#else
109	+	static const bool use_vosf = false; // VOSF not possible
110	+	#endif
111	+
112		static bool ctrl_down = false; // Flag: Ctrl key pressed
113		static bool caps_on = false; // Flag: Caps Lock on
114		static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread
#	Line 113 \| Line 122 \| static int keycode_table[256]; // X
122
123		// X11 variables
124		static int screen; // Screen number
125	<	static int xdepth; // Depth of X screen
126	<	static int depth; // Depth of Mac frame buffer
127	<	static Window rootwin, the_win; // Root window and our window
119	<	static XVisualInfo visualInfo;
120	<	static Visual *vis;
121	<	static Colormap cmap[2]; // Two colormaps (DGA) for 8-bit mode
125	>	static Window rootwin; // Root window and our window
126	>	static int num_depths = 0; // Number of available X depths
127	>	static int *avail_depths = NULL; // List of available X depths
128		static XColor black, white;
129		static unsigned long black_pixel, white_pixel;
130		static int eventmask;
125	–	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| FocusChangeMask \| ExposureMask;
126	–	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask;
131
132	<	static XColor palette[256]; // Color palette for 8-bit mode
133	<	static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
134	<	#ifdef HAVE_PTHREADS
135	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
132	<	#endif
132	>	static int xdepth; // Depth of X screen
133	>	static XVisualInfo visualInfo;
134	>	static Visual *vis;
135	>	static int color_class;
136
137	<	// Variables for window mode
135	<	static GC the_gc;
136	<	static XImage *img = NULL;
137	<	static XShmSegmentInfo shminfo;
138	<	static Cursor mac_cursor;
139	<	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
140	<	static bool have_shm = false; // Flag: SHM extensions available
141	<	static bool updt_box[17][17]; // Flag for Update
142	<	static int nr_boxes;
143	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
144	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
137	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
138
139	<	// Variables for XF86 DGA mode
147	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
148	<	static Window suspend_win; // "Suspend" window
149	<	static void *fb_save = NULL; // Saved frame buffer for suspend
150	<	#ifdef HAVE_PTHREADS
151	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
152	<	#endif
139	>	static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them)
140
141	<	// Variables for fbdev DGA mode
142	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
143	<	static int fbdev_fd;
141	>	static XColor palette[256]; // Color palette to be used as CLUT and gamma table
142	>	static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
143	>
144	>	#ifdef ENABLE_FBDEV_DGA
145	>	static int fbdev_fd = -1;
146	>	#endif
147
148		#ifdef ENABLE_XF86_VIDMODE
149	<	// Variables for XF86 VidMode support
160	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
149	>	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
150		static int num_x_video_modes;
151		#endif
152
153	<	#ifdef ENABLE_VOSF
154	<	static bool use_vosf = true; // Flag: VOSF enabled
153	>	// Mutex to protect palette
154	>	#ifdef HAVE_PTHREADS
155	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
156	>	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
157	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
158		#else
159	<	static const bool use_vosf = false; // Flag: VOSF enabled
160	<	#endif
169	<
170	<	#ifdef ENABLE_VOSF
171	<	static uint8 * the_host_buffer; // Host frame buffer in VOSF mode
172	<	static uint32 the_buffer_size; // Size of allocated the_buffer
159	>	#define LOCK_PALETTE
160	>	#define UNLOCK_PALETTE
161		#endif
162
163	<	#ifdef ENABLE_VOSF
176	<	// Variables for Video on SEGV support (taken from the Win32 port)
177	<	struct ScreenPageInfo {
178	<	int top, bottom; // Mapping between this virtual page and Mac scanlines
179	<	};
180	<
181	<	struct ScreenInfo {
182	<	uint32 memBase; // Real start address
183	<	uint32 memStart; // Start address aligned to page boundary
184	<	uint32 memEnd; // Address of one-past-the-end of the screen
185	<	uint32 memLength; // Length of the memory addressed by the screen pages
186	<
187	<	uint32 pageSize; // Size of a page
188	<	int pageBits; // Shift count to get the page number
189	<	uint32 pageCount; // Number of pages allocated to the screen
190	<
191	<	uint8 * dirtyPages; // Table of flags set if page was altered
192	<	ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines
193	<	};
194	<
195	<	static ScreenInfo mainBuffer;
196	<
197	<	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = 1
198	<	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = 0
199	<	#define PFLAG_ISSET(page) mainBuffer.dirtyPages[page]
200	<	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] == 0)
201	<	#ifdef UNALIGNED_PROFITABLE
202	<	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + page)) == 0)
203	<	#else
204	<	# define PFLAG_ISCLEAR_4(page) \
205	<	(mainBuffer.dirtyPages[page ] == 0) \
206	<	&& (mainBuffer.dirtyPages[page+1] == 0) \
207	<	&& (mainBuffer.dirtyPages[page+2] == 0) \
208	<	&& (mainBuffer.dirtyPages[page+3] == 0)
209	<	#endif
210	<	#define PFLAG_CLEAR_ALL memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
211	<	#define PFLAG_SET_ALL memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
212	<
213	<	static int zero_fd = -1;
214	<	static bool Screen_fault_handler_init();
215	<	static struct sigaction vosf_sa;
216	<
163	>	// Mutex to protect frame buffer
164		#ifdef HAVE_PTHREADS
165	<	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
165	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
166	>	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
167	>	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
168	>	#else
169	>	#define LOCK_FRAME_BUFFER
170	>	#define UNLOCK_FRAME_BUFFER
171		#endif
172
173	<	static int log_base_2(uint32 x)
174	<	{
175	<	uint32 mask = 0x80000000;
176	<	int l = 31;
177	<	while (l >= 0 && (x & mask) == 0) {
226	<	mask >>= 1;
227	<	l--;
228	<	}
229	<	return l;
230	<	}
231	<
232	<	#endif
173	>	// Variables for non-VOSF incremental refresh
174	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
175	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
176	>	static bool updt_box[17][17];
177	>	static int nr_boxes;
178
179	<	// VideoRefresh function
180	<	void VideoRefreshInit(void);
179	>	// Video refresh function
180	>	static void VideoRefreshInit(void);
181		static void (*video_refresh)(void);
182
183	+
184		// Prototypes
185		static void redraw_func(void arg);
186	<	static int event2keycode(XKeyEvent *ev);
241	<
186	>	static int event2keycode(XKeyEvent &ev);
187
188		// From main_unix.cpp
189		extern char *x_display_name;
#	Line 247 \| Line 192 \| *extern Display x_display;**
192		// From sys_unix.cpp
193		extern void SysMountFirstFloppy(void);
194
250	–	#ifdef ENABLE_VOSF
251	–	# include "video_vosf.h"
252	–	#endif
253	–
195
196		/*
197	<	* Initialization
197	>	* Utility functions
198		*/
199
200	<	// Set VideoMonitor according to video mode
201	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
200	>	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
201	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
202		{
203	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
204	<	int layout = FLAYOUT_DIRECT;
203	>	return ((red >> rloss) << rshift) \| ((green >> gloss) << gshift) \| ((blue >> bloss) << bshift);
204	>	}
205	>
206	>	// Do we have a visual for handling the specified Mac depth? If so, set the
207	>	// global variables "xdepth", "visualInfo", "vis" and "color_class".
208	>	static bool find_visual_for_depth(video_depth depth)
209	>	{
210	>	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
211	>
212	>	// Calculate minimum and maximum supported X depth
213	>	int min_depth = 1, max_depth = 32;
214		switch (depth) {
215	<	case 1:
216	<	layout = FLAYOUT_DIRECT;
215	>	case VDEPTH_1BIT: // 1-bit works always
216	>	min_depth = 1;
217	>	max_depth = 32;
218		break;
219	<	case 8:
220	<	layout = FLAYOUT_DIRECT;
219	>	#ifdef ENABLE_VOSF
220	>	case VDEPTH_2BIT:
221	>	case VDEPTH_4BIT: // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
222	>	case VDEPTH_8BIT:
223	>	min_depth = 8;
224	>	max_depth = 32;
225		break;
226	<	case 15:
227	<	layout = FLAYOUT_HOST_555;
226	>	#else
227	>	case VDEPTH_2BIT:
228	>	case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters
229	>	return false;
230	>	case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual
231	>	min_depth = 8;
232	>	max_depth = 8;
233		break;
234	<	case 16:
235	<	layout = FLAYOUT_HOST_565;
234	>	#endif
235	>	case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual
236	>	min_depth = 15;
237	>	max_depth = 16;
238		break;
239	<	case 24:
240	<	case 32:
241	<	layout = FLAYOUT_HOST_888;
239	>	case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual
240	>	min_depth = 24;
241	>	max_depth = 32;
242		break;
243		}
244	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
245	+
246	+	// Try to find a visual for one of the color depths
247	+	bool visual_found = false;
248	+	for (int i=0; i<num_depths && !visual_found; i++) {
249	+
250	+	xdepth = avail_depths[i];
251	+	D(bug(" trying to find visual for depth %d\n", xdepth));
252	+	if (xdepth < min_depth \|\| xdepth > max_depth)
253	+	continue;
254	+
255	+	// Determine best color class for this depth
256	+	switch (xdepth) {
257	+	case 1: // Try StaticGray or StaticColor
258	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
259	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
260	+	visual_found = true;
261	+	break;
262	+	case 8: // Need PseudoColor
263	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
264	+	visual_found = true;
265	+	break;
266	+	case 15:
267	+	case 16:
268	+	case 24:
269	+	case 32: // Try DirectColor first, as this will allow gamma correction
270	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
271	+	\|\| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
272	+	visual_found = true;
273	+	break;
274	+	default:
275	+	D(bug(" not a supported depth\n"));
276	+	break;
277	+	}
278	+	}
279	+	if (!visual_found)
280	+	return false;
281	+
282	+	// Visual was found
283	+	vis = visualInfo.visual;
284	+	color_class = visualInfo.c_class;
285	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
286	+	#if DEBUG
287	+	switch (color_class) {
288	+	case StaticGray: D(bug("StaticGray\n")); break;
289	+	case GrayScale: D(bug("GrayScale\n")); break;
290	+	case StaticColor: D(bug("StaticColor\n")); break;
291	+	case PseudoColor: D(bug("PseudoColor\n")); break;
292	+	case TrueColor: D(bug("TrueColor\n")); break;
293	+	case DirectColor: D(bug("DirectColor\n")); break;
294	+	}
295	+	#endif
296	+	}
297	+
298	+	// Add mode to list of supported modes
299	+	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
300	+	{
301	+	video_mode mode;
302	+	mode.x = width;
303	+	mode.y = height;
304	+	mode.resolution_id = resolution_id;
305	+	mode.bytes_per_row = bytes_per_row;
306	+	mode.depth = depth;
307	+	VideoModes.push_back(mode);
308	+	}
309	+
310	+	// Add standard list of windowed modes for given color depth
311	+	static void add_window_modes(video_depth depth)
312	+	{
313	+	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
314	+	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
315	+	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
316	+	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
317	+	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
318	+	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
319	+	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
320	+	}
321	+
322	+	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
323	+	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
324	+	{
325	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
326	+	int layout = FLAYOUT_DIRECT;
327	+	if (depth == VDEPTH_16BIT)
328	+	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
329	+	else if (depth == VDEPTH_32BIT)
330	+	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
331		if (native_byte_order)
332		MacFrameLayout = layout;
333		else
334		MacFrameLayout = FLAYOUT_DIRECT;
335	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
336	+
337	+	// Set variables used by UAE memory banking
338	+	MacFrameBaseHost = the_buffer;
339	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
340	+	InitFrameBufferMapping();
341	+	#else
342	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
343	+	D(bug("Host frame buffer = %p, ", the_buffer));
344		#endif
345	<	switch (depth) {
346	<	case 1:
347	<	VideoMonitor.mode = VMODE_1BIT;
348	<	break;
349	<	case 8:
350	<	VideoMonitor.mode = VMODE_8BIT;
351	<	break;
352	<	case 15:
353	<	VideoMonitor.mode = VMODE_16BIT;
354	<	break;
355	<	case 16:
356	<	VideoMonitor.mode = VMODE_16BIT;
357	<	break;
358	<	case 24:
359	<	case 32:
360	<	VideoMonitor.mode = VMODE_32BIT;
361	<	break;
345	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
346	>	}
347	>
348	>	// Set window name and class
349	>	static void set_window_name(Window w, int name)
350	>	{
351	>	const char *str = GetString(name);
352	>	XStoreName(x_display, w, str);
353	>	XSetIconName(x_display, w, str);
354	>
355	>	XClassHint *hints;
356	>	hints = XAllocClassHint();
357	>	if (hints) {
358	>	hints->res_name = "BasiliskII";
359	>	hints->res_class = "BasiliskII";
360	>	XSetClassHint(x_display, w, hints);
361	>	XFree(hints);
362		}
363	<	VideoMonitor.x = width;
364	<	VideoMonitor.y = height;
365	<	VideoMonitor.bytes_per_row = bytes_per_row;
363	>	}
364	>
365	>	// Set window input focus flag
366	>	static void set_window_focus(Window w)
367	>	{
368	>	XWMHints *hints = XAllocWMHints();
369	>	if (hints) {
370	>	hints->input = True;
371	>	hints->initial_state = NormalState;
372	>	hints->flags = InputHint \| StateHint;
373	>	XSetWMHints(x_display, w, hints);
374	>	XFree(hints);
375	>	}
376	>	}
377	>
378	>	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
379	>	static Atom WM_DELETE_WINDOW = (Atom)0;
380	>	static void set_window_delete_protocol(Window w)
381	>	{
382	>	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
383	>	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
384	>	}
385	>
386	>	// Wait until window is mapped/unmapped
387	>	void wait_mapped(Window w)
388	>	{
389	>	XEvent e;
390	>	do {
391	>	XMaskEvent(x_display, StructureNotifyMask, &e);
392	>	} while ((e.type != MapNotify) \|\| (e.xmap.event != w));
393	>	}
394	>
395	>	void wait_unmapped(Window w)
396	>	{
397	>	XEvent e;
398	>	do {
399	>	XMaskEvent(x_display, StructureNotifyMask, &e);
400	>	} while ((e.type != UnmapNotify) \|\| (e.xmap.event != w));
401		}
402
403		// Trap SHM errors
#	Line 320 \| Line 413 \| *static int error_handler(Display d, XEr**
413		return old_error_handler(d, e);
414		}
415
416	<	// Init window mode
417	<	static bool init_window(int width, int height)
416	>
417	>	/*
418	>	* Display "driver" classes
419	>	*/
420	>
421	>	class driver_base {
422	>	public:
423	>	driver_base();
424	>	virtual ~driver_base();
425	>
426	>	virtual void update_palette(void);
427	>	virtual void suspend(void) {}
428	>	virtual void resume(void) {}
429	>	virtual void toggle_mouse_grab(void) {}
430	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
431	>
432	>	virtual void grab_mouse(void) {}
433	>	virtual void ungrab_mouse(void) {}
434	>
435	>	public:
436	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
437	>	Window w; // The window we draw into
438	>	};
439	>
440	>	class driver_window;
441	>	static void update_display_window_vosf(driver_window *drv);
442	>	static void update_display_dynamic(int ticker, driver_window *drv);
443	>	static void update_display_static(driver_window *drv);
444	>
445	>	class driver_window : public driver_base {
446	>	friend void update_display_window_vosf(driver_window *drv);
447	>	friend void update_display_dynamic(int ticker, driver_window *drv);
448	>	friend void update_display_static(driver_window *drv);
449	>
450	>	public:
451	>	driver_window(const video_mode &mode);
452	>	~driver_window();
453	>
454	>	void toggle_mouse_grab(void);
455	>	void mouse_moved(int x, int y);
456	>
457	>	void grab_mouse(void);
458	>	void ungrab_mouse(void);
459	>
460	>	private:
461	>	GC gc;
462	>	XImage *img;
463	>	bool have_shm; // Flag: SHM extensions available
464	>	XShmSegmentInfo shminfo;
465	>	Cursor mac_cursor;
466	>	bool mouse_grabbed; // Flag: mouse pointer grabbed, using relative mouse mode
467	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
468	>	};
469	>
470	>	static driver_base *drv = NULL; // Pointer to currently used driver object
471	>
472	>	#ifdef ENABLE_VOSF
473	>	# include "video_vosf.h"
474	>	#endif
475	>
476	>	driver_base::driver_base()
477	>	: init_ok(false), w(0)
478	>	{
479	>	the_buffer = NULL;
480	>	the_buffer_copy = NULL;
481	>	}
482	>
483	>	driver_base::~driver_base()
484	>	{
485	>	ungrab_mouse();
486	>
487	>	if (w) {
488	>	XUnmapWindow(x_display, w);
489	>	wait_unmapped(w);
490	>	XDestroyWindow(x_display, w);
491	>	}
492	>
493	>	XFlush(x_display);
494	>	XSync(x_display, false);
495	>
496	>	// Free frame buffer(s)
497	>	if (!use_vosf) {
498	>	if (the_buffer) {
499	>	free(the_buffer);
500	>	the_buffer = NULL;
501	>	}
502	>	if (the_buffer_copy) {
503	>	free(the_buffer_copy);
504	>	the_buffer_copy = NULL;
505	>	}
506	>	}
507	>	#ifdef ENABLE_VOSF
508	>	else {
509	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
510	>	vm_release(the_buffer, the_buffer_size);
511	>	the_buffer = NULL;
512	>	}
513	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
514	>	vm_release(the_buffer_copy, the_buffer_size);
515	>	the_buffer_copy = NULL;
516	>	}
517	>	}
518	>	#endif
519	>	}
520	>
521	>	// Palette has changed
522	>	void driver_base::update_palette(void)
523	>	{
524	>	if (cmap[0] && cmap[1]) {
525	>	int num = vis->map_entries;
526	>	if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor)
527	>	return; // Indexed mode on true color screen, don't set CLUT
528	>	XStoreColors(x_display, cmap[0], palette, num);
529	>	XStoreColors(x_display, cmap[1], palette, num);
530	>	}
531	>	XSync(x_display, false);
532	>	}
533	>
534	>
535	>	/*
536	>	* Windowed display driver
537	>	*/
538	>
539	>	// Open display
540	>	driver_window::driver_window(const video_mode &mode)
541	>	: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0)
542		{
543	+	int width = mode.x, height = mode.y;
544		int aligned_width = (width + 15) & ~15;
545		int aligned_height = (height + 15) & ~15;
546
547		// Set absolute mouse mode
548	<	ADBSetRelMouseMode(false);
331	<
332	<	// Read frame skip prefs
333	<	frame_skip = PrefsFindInt32("frameskip");
548	>	ADBSetRelMouseMode(mouse_grabbed);
549
550		// Create window
551		XSetWindowAttributes wattr;
552		wattr.event_mask = eventmask = win_eventmask;
553		wattr.background_pixel = black_pixel;
554	<	wattr.border_pixel = black_pixel;
555	<	wattr.backing_store = NotUseful;
556	<	wattr.save_under = false;
342	<	wattr.backing_planes = xdepth;
554	>	wattr.colormap = (mode.depth == VDEPTH_1BIT && color_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
555	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
556	>	InputOutput, vis, CWEventMask \| CWBackPixel \| (color_class == PseudoColor \|\| color_class == DirectColor ? CWColormap : 0), &wattr);
557
558	<	XSync(x_display, false);
559	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
346	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
347	<	CWBackingStore \| CWBackingPlanes, &wattr);
558	>	// Set window name/class
559	>	set_window_name(w, STR_WINDOW_TITLE);
560
561		// Indicate that we want keyboard input
562	<	{
563	<	XWMHints *hints = XAllocWMHints();
564	<	if (hints) {
565	<	hints->input = True;
354	<	hints->flags = InputHint;
355	<	XSetWMHints(x_display, the_win, hints);
356	<	XFree((char *)hints);
357	<	}
358	<	}
562	>	set_window_focus(w);
563	>
564	>	// Set delete protocol property
565	>	set_window_delete_protocol(w);
566
567		// Make window unresizable
568		{
#	Line 366 \| Line 573 \| static bool init_window(int width, int h
573		hints->min_height = height;
574		hints->max_height = height;
575		hints->flags = PMinSize \| PMaxSize;
576	<	XSetWMNormalHints(x_display, the_win, hints);
577	<	XFree((char *)hints);
576	>	XSetWMNormalHints(x_display, w, hints);
577	>	XFree(hints);
578		}
579		}
580
374	–	// Set window title
375	–	{
376	–	XTextProperty title_prop;
377	–	const char *title = GetString(STR_WINDOW_TITLE);
378	–	XStringListToTextProperty((char **)&title, 1, &title_prop);
379	–	XSetWMName(x_display, the_win, &title_prop);
380	–	XFree(title_prop.value);
381	–	}
382	–
383	–	// Set window class
384	–	{
385	–	XClassHint *hints;
386	–	hints = XAllocClassHint();
387	–	if (hints) {
388	–	hints->res_name = "BasiliskII";
389	–	hints->res_class = "BasiliskII";
390	–	XSetClassHint(x_display, the_win, hints);
391	–	XFree((char *)hints);
392	–	}
393	–	}
394	–
581		// Show window
582	<	XSync(x_display, false);
583	<	XMapRaised(x_display, the_win);
398	<	XFlush(x_display);
582	>	XMapWindow(x_display, w);
583	>	wait_mapped(w);
584
585	<	// Set colormap
586	<	if (depth == 8)
587	<	XSetWindowColormap(x_display, the_win, cmap[0]);
585	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
586	>	// use SHM because that doesn't allow changing the image byte order
587	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
588
589		// Try to create and attach SHM image
590	<	have_shm = false;
406	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
590	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
591
592		// Create SHM image ("height + 2" for safety)
593	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
593	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
594		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
595		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
596		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 430 \| Line 614 \| static bool init_window(int width, int h
614
615		// Create normal X image if SHM doesn't work ("height + 2" for safety)
616		if (!have_shm) {
617	<	int bytes_per_row = aligned_width;
434	<	switch (depth) {
435	<	case 1:
436	<	bytes_per_row /= 8;
437	<	break;
438	<	case 15:
439	<	case 16:
440	<	bytes_per_row *= 2;
441	<	break;
442	<	case 24:
443	<	case 32:
444	<	bytes_per_row *= 4;
445	<	break;
446	<	}
617	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
618		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
619	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
619	>	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);
620		}
621
622	<	// 1-Bit mode is big-endian
452	<	if (depth == 1) {
622	>	if (need_msb_image) {
623		img->byte_order = MSBFirst;
624		img->bitmap_bit_order = MSBFirst;
625		}
626
627		#ifdef ENABLE_VOSF
628	<	// Allocate a page-aligned chunk of memory for frame buffer
459	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
628	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
629		the_host_buffer = the_buffer_copy;
630	<
631	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
632	<	memset(the_buffer_copy, 0, the_buffer_size);
464	<
465	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
466	<	memset(the_buffer, 0, the_buffer_size);
630	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
631	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
632	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
633		#else
634		// Allocate memory for frame buffer
635		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
636		#endif
637
638		// Create GC
639	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
640	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
639	>	gc = XCreateGC(x_display, w, 0, 0);
640	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
641
642		// Create no_cursor
643		mac_cursor = XCreatePixmapCursor(x_display,
644	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
645	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
644	>	XCreatePixmap(x_display, w, 1, 1, 1),
645	>	XCreatePixmap(x_display, w, 1, 1, 1),
646		&black, &white, 0, 0);
647	<	XDefineCursor(x_display, the_win, mac_cursor);
647	>	XDefineCursor(x_display, w, mac_cursor);
648
649	<	// Set VideoMonitor
649	>	// Init blitting routines
650		bool native_byte_order;
651		#ifdef WORDS_BIGENDIAN
652	<	native_byte_order = (img->bitmap_bit_order == MSBFirst);
652	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
653		#else
654	<	native_byte_order = (img->bitmap_bit_order == LSBFirst);
654	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
655		#endif
656		#ifdef ENABLE_VOSF
657	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
657	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
658		#endif
659	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
660	<
661	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
662	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
663	<	#else
664	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
659	>
660	>	// Set VideoMonitor
661	>	VideoMonitor.mode = mode;
662	>	set_mac_frame_buffer(mode.depth, native_byte_order);
663	>
664	>	// Everything went well
665	>	init_ok = true;
666	>	}
667	>
668	>	// Close display
669	>	driver_window::~driver_window()
670	>	{
671	>	if (img)
672	>	XDestroyImage(img);
673	>	if (have_shm) {
674	>	XShmDetach(x_display, &shminfo);
675	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
676	>	}
677	>	if (gc)
678	>	XFreeGC(x_display, gc);
679	>	}
680	>
681	>	// Toggle mouse grab
682	>	void driver_window::toggle_mouse_grab(void)
683	>	{
684	>	if (mouse_grabbed)
685	>	ungrab_mouse();
686	>	else
687	>	grab_mouse();
688	>	}
689	>
690	>	// Grab mouse, switch to relative mouse mode
691	>	void driver_window::grab_mouse(void)
692	>	{
693	>	int result;
694	>	for (int i=0; i<10; i++) {
695	>	result = XGrabPointer(x_display, w, True, 0,
696	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
697	>	if (result != AlreadyGrabbed)
698	>	break;
699	>	Delay_usec(100000);
700	>	}
701	>	if (result == GrabSuccess) {
702	>	ADBSetRelMouseMode(mouse_grabbed = true);
703	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
704	>	XSync(x_display, false);
705	>	}
706	>	}
707	>
708	>	// Ungrab mouse, switch to absolute mouse mode
709	>	void driver_window::ungrab_mouse(void)
710	>	{
711	>	if (mouse_grabbed) {
712	>	XUngrabPointer(x_display, CurrentTime);
713	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
714	>	ADBSetRelMouseMode(mouse_grabbed = false);
715	>	}
716	>	}
717	>
718	>	// Mouse moved
719	>	void driver_window::mouse_moved(int x, int y)
720	>	{
721	>	if (!mouse_grabbed) {
722	>	mouse_last_x = x; mouse_last_y = y;
723	>	ADBMouseMoved(x, y);
724	>	return;
725	>	}
726	>
727	>	// Warped mouse motion (this code is taken from SDL)
728	>
729	>	// Post first mouse event
730	>	int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y;
731	>	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
732	>	mouse_last_x = x; mouse_last_y = y;
733	>	ADBMouseMoved(delta_x, delta_y);
734	>
735	>	// Only warp the pointer when it has reached the edge
736	>	const int MOUSE_FUDGE_FACTOR = 8;
737	>	if (x < MOUSE_FUDGE_FACTOR \|\| x > (width - MOUSE_FUDGE_FACTOR)
738	>	\|\| y < MOUSE_FUDGE_FACTOR \|\| y > (height - MOUSE_FUDGE_FACTOR)) {
739	>	XEvent event;
740	>	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
741	>	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
742	>	mouse_last_x = x; mouse_last_y = y;
743	>	ADBMouseMoved(delta_x, delta_y);
744	>	}
745	>	mouse_last_x = width/2;
746	>	mouse_last_y = height/2;
747	>	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
748	>	for (int i=0; i<10; i++) {
749	>	XMaskEvent(x_display, PointerMotionMask, &event);
750	>	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
751	>	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
752	>	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
753	>	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
754	>	break;
755	>	}
756	>	}
757	>	}
758	>
759	>
760	>	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
761	>	/*
762	>	* DGA display driver base class
763	>	*/
764	>
765	>	class driver_dga : public driver_base {
766	>	public:
767	>	driver_dga();
768	>	~driver_dga();
769	>
770	>	void suspend(void);
771	>	void resume(void);
772	>
773	>	private:
774	>	Window suspend_win; // "Suspend" information window
775	>	void *fb_save; // Saved frame buffer for suspend/resume
776	>	};
777	>
778	>	driver_dga::driver_dga()
779	>	: suspend_win(0), fb_save(NULL)
780	>	{
781	>	}
782	>
783	>	driver_dga::~driver_dga()
784	>	{
785	>	XUngrabPointer(x_display, CurrentTime);
786	>	XUngrabKeyboard(x_display, CurrentTime);
787	>	}
788	>
789	>	// Suspend emulation
790	>	void driver_dga::suspend(void)
791	>	{
792	>	// Release ctrl key
793	>	ADBKeyUp(0x36);
794	>	ctrl_down = false;
795	>
796	>	// Lock frame buffer (this will stop the MacOS thread)
797	>	LOCK_FRAME_BUFFER;
798	>
799	>	// Save frame buffer
800	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
801	>	if (fb_save)
802	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
803	>
804	>	// Close full screen display
805	>	#ifdef ENABLE_XF86_DGA
806	>	XF86DGADirectVideo(x_display, screen, 0);
807		#endif
808	<	return true;
808	>	XUngrabPointer(x_display, CurrentTime);
809	>	XUngrabKeyboard(x_display, CurrentTime);
810	>	XUnmapWindow(x_display, w);
811	>	wait_unmapped(w);
812	>
813	>	// Open "suspend" window
814	>	XSetWindowAttributes wattr;
815	>	wattr.event_mask = KeyPressMask;
816	>	wattr.background_pixel = black_pixel;
817	>
818	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
819	>	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
820	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
821	>	set_window_focus(suspend_win);
822	>	XMapWindow(x_display, suspend_win);
823	>	emul_suspended = true;
824		}
825
826	<	// Init fbdev DGA display
827	<	static bool init_fbdev_dga(char *in_fb_name)
826	>	// Resume emulation
827	>	void driver_dga::resume(void)
828		{
829	+	// Close "suspend" window
830	+	XDestroyWindow(x_display, suspend_win);
831	+	XSync(x_display, false);
832	+
833	+	// Reopen full screen display
834	+	XMapRaised(x_display, w);
835	+	wait_mapped(w);
836	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
837	+	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
838	+	XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
839	+	#ifdef ENABLE_XF86_DGA
840	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
841	+	XF86DGASetViewPort(x_display, screen, 0, 0);
842	+	#endif
843	+	XSync(x_display, false);
844	+
845	+	// the_buffer already contains the data to restore. i.e. since a temporary
846	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
847	+	// not necessary.
848	+	#ifdef ENABLE_VOSF
849	+	if (use_vosf) {
850	+	LOCK_VOSF;
851	+	PFLAG_SET_ALL;
852	+	UNLOCK_VOSF;
853	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
854	+	}
855	+	#endif
856	+
857	+	// Restore frame buffer
858	+	if (fb_save) {
859	+	#ifdef ENABLE_VOSF
860	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
861	+	if (!use_vosf)
862	+	#endif
863	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
864	+	free(fb_save);
865	+	fb_save = NULL;
866	+	}
867	+
868	+	// Unlock frame buffer (and continue MacOS thread)
869	+	UNLOCK_FRAME_BUFFER;
870	+	emul_suspended = false;
871	+	}
872	+	#endif
873	+
874	+
875		#ifdef ENABLE_FBDEV_DGA
876	+	/*
877	+	* fbdev DGA display driver
878	+	*/
879	+
880	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
881	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
882	+
883	+	class driver_fbdev : public driver_dga {
884	+	public:
885	+	driver_fbdev(const video_mode &mode);
886	+	~driver_fbdev();
887	+	};
888	+
889	+	// Open display
890	+	driver_fbdev::driver_fbdev(const video_mode &mode)
891	+	{
892	+	int width = mode.x, height = mode.y;
893	+
894	+	// Set absolute mouse mode
895	+	ADBSetRelMouseMode(false);
896	+
897		// Find the maximum depth available
898		int ndepths, max_depth(0);
899		int *depths = XListDepths(x_display, screen, &ndepths);
900		if (depths == NULL) {
901		printf("FATAL: Could not determine the maximal depth available\n");
902	<	return false;
902	>	return;
903		} else {
904		while (ndepths-- > 0) {
905		if (depths[ndepths] > max_depth)
#	Line 526 \| Line 916 \| *static bool init_fbdev_dga(char in_fb_n**
916		char str[256];
917		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
918		ErrorAlert(str);
919	<	return false;
919	>	return;
920		}
921
922		int fb_depth; // supported depth
#	Line 546 \| Line 936 \| *static bool init_fbdev_dga(char in_fb_n**
936		continue;
937
938		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
939	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
939	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
940		device_found = true;
941		break;
942		}
#	Line 558 \| Line 948 \| *static bool init_fbdev_dga(char in_fb_n**
948		// Frame buffer name not found ? Then, display warning
949		if (!device_found) {
950		char str[256];
951	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
951	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
952		ErrorAlert(str);
953	<	return false;
953	>	return;
954		}
955
566	–	int width = DisplayWidth(x_display, screen);
567	–	int height = DisplayHeight(x_display, screen);
568	–	depth = fb_depth; // max_depth
569	–
570	–	// Set relative mouse mode
571	–	ADBSetRelMouseMode(false);
572	–
956		// Create window
957		XSetWindowAttributes wattr;
958	<	wattr.override_redirect = True;
959	<	wattr.backing_store = NotUseful;
960	<	wattr.background_pixel = white_pixel;
961	<	wattr.border_pixel = black_pixel;
579	<	wattr.event_mask = eventmask = dga_eventmask;
958	>	wattr.event_mask = eventmask = dga_eventmask;
959	>	wattr.background_pixel = white_pixel;
960	>	wattr.override_redirect = True;
961	>	wattr.colormap = cmap[0];
962
963	<	XSync(x_display, false);
582	<	the_win = XCreateWindow(x_display, rootwin,
963	>	w = XCreateWindow(x_display, rootwin,
964		0, 0, width, height,
965		0, xdepth, InputOutput, vis,
966	<	CWEventMask\|CWBackPixel\|CWBorderPixel\|CWOverrideRedirect\|CWBackingStore,
966	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
967		&wattr);
968	<	XSync(x_display, false);
969	<	XMapRaised(x_display, the_win);
970	<	XSync(x_display, false);
968	>
969	>	// Set window name/class
970	>	set_window_name(w, STR_WINDOW_TITLE);
971	>
972	>	// Indicate that we want keyboard input
973	>	set_window_focus(w);
974	>
975	>	// Show window
976	>	XMapRaised(x_display, w);
977	>	wait_mapped(w);
978
979		// Grab mouse and keyboard
980	<	XGrabKeyboard(x_display, the_win, True,
980	>	XGrabKeyboard(x_display, w, True,
981		GrabModeAsync, GrabModeAsync, CurrentTime);
982	<	XGrabPointer(x_display, the_win, True,
982	>	XGrabPointer(x_display, w, True,
983		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
984	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
597	<
598	<	// Set colormap
599	<	if (depth == 8)
600	<	XSetWindowColormap(x_display, the_win, cmap[0]);
984	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
985
986	<	// Set VideoMonitor
987	<	int bytes_per_row = width;
604	<	switch (depth) {
605	<	case 1:
606	<	bytes_per_row = ((width \| 7) & ~7) >> 3;
607	<	break;
608	<	case 15:
609	<	case 16:
610	<	bytes_per_row *= 2;
611	<	break;
612	<	case 24:
613	<	case 32:
614	<	bytes_per_row *= 4;
615	<	break;
616	<	}
986	>	// Calculate bytes per row
987	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
988
989	+	// Map frame buffer
990		if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
991		if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
992		char str[256];
993		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
994		ErrorAlert(str);
995	<	return false;
995	>	return;
996		}
997		}
998
999		#if ENABLE_VOSF
1000		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1001	<	// If the blit function is null, i.e. just a copy of the buffer,
1002	<	// we first try to avoid the allocation of a temporary frame buffer
1003	<	use_vosf = true;
632	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
633	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
634	<	use_vosf = false;
1001	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1002	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1003	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1004
1005		if (use_vosf) {
1006	<	the_host_buffer = the_buffer;
1007	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1008	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1009	<	memset(the_buffer_copy, 0, the_buffer_size);
1010	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
642	<	memset(the_buffer, 0, the_buffer_size);
1006	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1007	>	the_host_buffer = the_buffer;
1008	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1009	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1010	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1011		}
1012		#else
1013		use_vosf = false;
1014		#endif
1015		#endif
1016
1017	<	set_video_monitor(width, height, bytes_per_row, true);
1018	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1019	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1020	<	#else
1021	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1022	<	#endif
1023	<	return true;
1024	<	#else
657	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
658	<	return false;
659	<	#endif
1017	>	// Set VideoMonitor
1018	>	VideoModes[0].bytes_per_row = bytes_per_row;
1019	>	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
1020	>	VideoMonitor.mode = mode;
1021	>	set_mac_frame_buffer(mode.depth, true);
1022	>
1023	>	// Everything went well
1024	>	init_ok = true;
1025		}
1026
1027	<	// Init XF86 DGA display
1028	<	static bool init_xf86_dga(int width, int height)
1027	>	// Close display
1028	>	driver_fbdev::~driver_fbdev()
1029		{
1030	+	}
1031	+	#endif
1032	+
1033	+
1034		#ifdef ENABLE_XF86_DGA
1035	+	/*
1036	+	* XFree86 DGA display driver
1037	+	*/
1038	+
1039	+	class driver_xf86dga : public driver_dga {
1040	+	public:
1041	+	driver_xf86dga(const video_mode &mode);
1042	+	~driver_xf86dga();
1043	+
1044	+	void update_palette(void);
1045	+	void resume(void);
1046	+
1047	+	private:
1048	+	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
1049	+	};
1050	+
1051	+	// Open display
1052	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
1053	+	: current_dga_cmap(0)
1054	+	{
1055	+	int width = mode.x, height = mode.y;
1056	+
1057		// Set relative mouse mode
1058		ADBSetRelMouseMode(true);
1059
#	Line 678 \| Line 1069 \| static bool init_xf86_dga(int width, int
1069		}
1070		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
1071		XF86VidModeSetViewPort(x_display, screen, 0, 0);
1072	+	XSync(x_display, false);
1073		}
1074		#endif
1075
1076		// Create window
1077		XSetWindowAttributes wattr;
1078		wattr.event_mask = eventmask = dga_eventmask;
687	–	wattr.border_pixel = black_pixel;
1079		wattr.override_redirect = True;
1080
1081	<	XSync(x_display, false);
1082	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1083	<	InputOutput, vis, CWEventMask \| CWBorderPixel \| CWOverrideRedirect, &wattr);
1084	<	XSync(x_display, false);
1085	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
1086	<	XMapRaised(x_display, the_win);
1087	<	XSync(x_display, false);
1081	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1082	>	InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
1083	>
1084	>	// Set window name/class
1085	>	set_window_name(w, STR_WINDOW_TITLE);
1086	>
1087	>	// Indicate that we want keyboard input
1088	>	set_window_focus(w);
1089	>
1090	>	// Show window
1091	>	XMapRaised(x_display, w);
1092	>	wait_mapped(w);
1093
1094		// Establish direct screen connection
1095	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
1095	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
1096		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1097		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1098		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 708 \| Line 1104 \| static bool init_xf86_dga(int width, int
1104		XF86DGASetVidPage(x_display, screen, 0);
1105
1106		// Set colormap
1107	<	if (depth == 8) {
1108	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
1107	>	if (!IsDirectMode(mode)) {
1108	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1109		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1110		}
1111	+	XSync(x_display, false);
1112
1113	<	// Set VideoMonitor
1114	<	int bytes_per_row = (v_width + 7) & ~7;
1115	<	switch (depth) {
719	<	case 1:
720	<	bytes_per_row /= 8;
721	<	break;
722	<	case 15:
723	<	case 16:
724	<	bytes_per_row *= 2;
725	<	break;
726	<	case 24:
727	<	case 32:
728	<	bytes_per_row *= 4;
729	<	break;
730	<	}
731	<
1113	>	// Init blitting routines
1114	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1115	>	#ifdef VIDEO_VOSF
1116		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1117	<	// If the blit function is null, i.e. just a copy of the buffer,
1118	<	// we first try to avoid the allocation of a temporary frame buffer
1119	<	use_vosf = true;
736	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
737	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
738	<	use_vosf = false;
1117	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
1118	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
1119	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1120
1121		if (use_vosf) {
1122	<	the_host_buffer = the_buffer;
1123	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
1124	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1125	<	memset(the_buffer_copy, 0, the_buffer_size);
1126	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
746	<	memset(the_buffer, 0, the_buffer_size);
1122	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1123	>	the_host_buffer = the_buffer;
1124	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
1125	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1126	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1127		}
1128	<	#elif defined(ENABLE_VOSF)
749	<	// The UAE memory handlers will already handle color conversion, if needed.
1128	>	#else
1129		use_vosf = false;
1130		#endif
752	–
753	–	set_video_monitor(width, height, bytes_per_row, true);
754	–	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
755	–	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
756	–	// MacFrameLayout = FLAYOUT_DIRECT;
757	–	#else
758	–	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1131		#endif
1132	<	return true;
1133	<	#else
1134	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
1135	<	return false;
1132	>
1133	>	// Set VideoMonitor
1134	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1135	>	VideoMonitor.mode = mode;
1136	>	set_mac_frame_buffer(mode.depth, true);
1137	>
1138	>	// Everything went well
1139	>	init_ok = true;
1140	>	}
1141	>
1142	>	// Close display
1143	>	driver_xf86dga::~driver_xf86dga()
1144	>	{
1145	>	XF86DGADirectVideo(x_display, screen, 0);
1146	>	#ifdef ENABLE_XF86_VIDMODE
1147	>	if (has_vidmode)
1148	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1149		#endif
1150		}
1151
1152	+	// Palette has changed
1153	+	void driver_xf86dga::update_palette(void)
1154	+	{
1155	+	driver_dga::update_palette();
1156	+	current_dga_cmap ^= 1;
1157	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
1158	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1159	+	}
1160	+
1161	+	// Resume emulation
1162	+	void driver_xf86dga::resume(void)
1163	+	{
1164	+	driver_dga::resume();
1165	+	if (!IsDirectMode(VideoMonitor.mode))
1166	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1167	+	}
1168	+	#endif
1169	+
1170	+
1171	+	/*
1172	+	* Initialization
1173	+	*/
1174	+
1175		// Init keycode translation table
1176		static void keycode_init(void)
1177		{
#	Line 829 \| Line 1237 \| static void keycode_init(void)
1237		}
1238		}
1239
1240	<	bool VideoInitBuffer()
1240	>	// Open display for specified mode
1241	>	static bool video_open(const video_mode &mode)
1242		{
1243	<	#ifdef ENABLE_VOSF
1244	<	if (use_vosf) {
1245	<	const uint32 page_size = getpagesize();
1246	<	const uint32 page_mask = page_size - 1;
1247	<
839	<	mainBuffer.memBase = (uint32) the_buffer;
840	<	// Align the frame buffer on page boundary
841	<	mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
842	<	mainBuffer.memLength = the_buffer_size;
843	<	mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength;
844	<
845	<	mainBuffer.pageSize = page_size;
846	<	mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
847	<	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
848	<
849	<	if (mainBuffer.dirtyPages != 0)
850	<	free(mainBuffer.dirtyPages);
1243	>	// Find best available X visual
1244	>	if (!find_visual_for_depth(mode.depth)) {
1245	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1246	>	return false;
1247	>	}
1248
1249	<	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
1249	>	// Create color maps
1250	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1251	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1252	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1253	>	}
1254
1255	<	if (mainBuffer.pageInfo != 0)
1256	<	free(mainBuffer.pageInfo);
1255	>	// Find pixel format of direct modes
1256	>	if (color_class == DirectColor \|\| color_class == TrueColor) {
1257	>	rshift = gshift = bshift = 0;
1258	>	rloss = gloss = bloss = 8;
1259	>	uint32 mask;
1260	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1261	>	++rshift;
1262	>	for (; mask&1; mask>>=1)
1263	>	--rloss;
1264	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1265	>	++gshift;
1266	>	for (; mask&1; mask>>=1)
1267	>	--gloss;
1268	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1269	>	++bshift;
1270	>	for (; mask&1; mask>>=1)
1271	>	--bloss;
1272	>	}
1273	>
1274	>	// Preset palette pixel values for gamma table
1275	>	if (color_class == DirectColor) {
1276	>	int num = vis->map_entries;
1277	>	for (int i=0; i<num; i++) {
1278	>	int c = (i * 256) / num;
1279	>	palette[i].pixel = map_rgb(c, c, c);
1280	>	}
1281	>	}
1282
1283	<	mainBuffer.pageInfo = (ScreenPageInfo ) malloc(mainBuffer.pageCount sizeof(ScreenPageInfo));
1283	>	// Load gray ramp to color map
1284	>	int num = (color_class == DirectColor ? vis->map_entries : 256);
1285	>	for (int i=0; i<num; i++) {
1286	>	int c = (i * 256) / num;
1287	>	palette[i].red = c * 0x0101;
1288	>	palette[i].green = c * 0x0101;
1289	>	palette[i].blue = c * 0x0101;
1290	>	if (color_class == PseudoColor)
1291	>	palette[i].pixel = i;
1292	>	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1293	>	}
1294	>	if (cmap[0] && cmap[1]) {
1295	>	XStoreColors(x_display, cmap[0], palette, num);
1296	>	XStoreColors(x_display, cmap[1], palette, num);
1297	>	}
1298
1299	<	if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
1300	<	return false;
1299	>	#ifdef ENABLE_VOSF
1300	>	// Load gray ramp to 8->16/32 expand map
1301	>	if (!IsDirectMode(mode) && (color_class == TrueColor \|\| color_class == DirectColor))
1302	>	for (int i=0; i<256; i++)
1303	>	ExpandMap[i] = map_rgb(i, i, i);
1304	>	#endif
1305
1306	<	PFLAG_CLEAR_ALL;
1306	>	// Create display driver object of requested type
1307	>	switch (display_type) {
1308	>	case DISPLAY_WINDOW:
1309	>	drv = new driver_window(mode);
1310	>	break;
1311	>	#ifdef ENABLE_FBDEV_DGA
1312	>	case DISPLAY_DGA:
1313	>	drv = new driver_fbdev(mode);
1314	>	break;
1315	>	#endif
1316	>	#ifdef ENABLE_XF86_DGA
1317	>	case DISPLAY_DGA:
1318	>	drv = new driver_xf86dga(mode);
1319	>	break;
1320	>	#endif
1321	>	}
1322	>	if (drv == NULL)
1323	>	return false;
1324	>	if (!drv->init_ok) {
1325	>	delete drv;
1326	>	drv = NULL;
1327	>	return false;
1328	>	}
1329
1330	<	uint32 a = 0;
1331	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
1332	<	int y1 = a / VideoMonitor.bytes_per_row;
1333	<	if (y1 >= VideoMonitor.y)
1334	<	y1 = VideoMonitor.y - 1;
1335	<
870	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
871	<	if (y2 >= VideoMonitor.y)
872	<	y2 = VideoMonitor.y - 1;
873	<
874	<	mainBuffer.pageInfo[i].top = y1;
875	<	mainBuffer.pageInfo[i].bottom = y2;
876	<
877	<	a += mainBuffer.pageSize;
878	<	if (a > mainBuffer.memLength)
879	<	a = mainBuffer.memLength;
1330	>	#ifdef ENABLE_VOSF
1331	>	if (use_vosf) {
1332	>	// Initialize the mainBuffer structure
1333	>	if (!video_init_buffer()) {
1334	>	ErrorAlert(STR_VOSF_INIT_ERR);
1335	>	return false;
1336		}
1337	<
1338	<	// We can now write-protect the frame buffer
1339	<	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
1337	>
1338	>	// Initialize the handler for SIGSEGV
1339	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1340	>	ErrorAlert("Could not initialize Video on SEGV signals");
1341		return false;
1342	+	}
1343	+	}
1344	+	#endif
1345	+
1346	+	// Initialize VideoRefresh function
1347	+	VideoRefreshInit();
1348	+
1349	+	// Lock down frame buffer
1350	+	XSync(x_display, false);
1351	+	LOCK_FRAME_BUFFER;
1352	+
1353	+	// Start redraw/input thread
1354	+	#ifdef HAVE_PTHREADS
1355	+	redraw_thread_cancel = false;
1356	+	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1357	+	if (!redraw_thread_active) {
1358	+	printf("FATAL: cannot create redraw thread\n");
1359	+	return false;
1360		}
1361	+	#else
1362	+	redraw_thread_active = true;
1363		#endif
1364	+
1365		return true;
1366		}
1367
1368		bool VideoInit(bool classic)
1369		{
1370	+	classic_mode = classic;
1371	+
1372		#ifdef ENABLE_VOSF
893	–	// Open /dev/zero
894	–	zero_fd = open("/dev/zero", O_RDWR);
895	–	if (zero_fd < 0) {
896	–	char str[256];
897	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
898	–	ErrorAlert(str);
899	–	return false;
900	–	}
901	–
1373		// Zero the mainBuffer structure
1374	<	mainBuffer.dirtyPages = 0;
1375	<	mainBuffer.pageInfo = 0;
1374	>	mainBuffer.dirtyPages = NULL;
1375	>	mainBuffer.pageInfo = NULL;
1376		#endif
1377
1378		// Check if X server runs on local machine
#	Line 912 \| Line 1383 \| bool VideoInit(bool classic)
1383		keycode_init();
1384
1385		// Read prefs
1386	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1387	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1386	>	frame_skip = PrefsFindInt32("frameskip");
1387	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1388	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1389
1390		// Find screen and root window
1391		screen = XDefaultScreen(x_display);
1392		rootwin = XRootWindow(x_display, screen);
1393	<
1394	<	// Get screen depth
1395	<	xdepth = DefaultDepth(x_display, screen);
1393	>
1394	>	// Get sorted list of available depths
1395	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1396	>	if (avail_depths == NULL) {
1397	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1398	>	return false;
1399	>	}
1400	>	sort(avail_depths, avail_depths + num_depths);
1401
1402		#ifdef ENABLE_FBDEV_DGA
1403		// Frame buffer name
1404		char fb_name[20];
1405
1406	<	// Could do fbdev dga ?
1406	>	// Could do fbdev DGA?
1407		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1408		has_dga = true;
1409		else
#	Line 960 \| Line 1437 \| bool VideoInit(bool classic)
1437		black_pixel = BlackPixel(x_display, screen);
1438		white_pixel = WhitePixel(x_display, screen);
1439
963	–	// Get appropriate visual
964	–	int color_class;
965	–	switch (xdepth) {
966	–	case 1:
967	–	color_class = StaticGray;
968	–	break;
969	–	case 8:
970	–	color_class = PseudoColor;
971	–	break;
972	–	case 15:
973	–	case 16:
974	–	case 24:
975	–	case 32:
976	–	color_class = TrueColor;
977	–	break;
978	–	default:
979	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
980	–	return false;
981	–	}
982	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
983	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
984	–	return false;
985	–	}
986	–	if (visualInfo.depth != xdepth) {
987	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
988	–	return false;
989	–	}
990	–	vis = visualInfo.visual;
991	–
992	–	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
993	–	classic_mode = classic;
994	–	if (classic)
995	–	depth = 1;
996	–	else
997	–	depth = xdepth;
998	–
999	–	// Create color maps for 8 bit mode
1000	–	if (depth == 8) {
1001	–	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1002	–	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1003	–	XInstallColormap(x_display, cmap[0]);
1004	–	XInstallColormap(x_display, cmap[1]);
1005	–	}
1006	–
1440		// Get screen mode from preferences
1441		const char *mode_str;
1442	<	if (classic)
1442	>	if (classic_mode)
1443		mode_str = "win/512/342";
1444		else
1445		mode_str = PrefsFindString("screen");
1446
1447	<	// Determine type and mode
1448	<	int width = 512, height = 384;
1447	>	// Determine display type and default dimensions
1448	>	int default_width = 512, default_height = 384;
1449		display_type = DISPLAY_WINDOW;
1450		if (mode_str) {
1451	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1451	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1452		display_type = DISPLAY_WINDOW;
1453		#ifdef ENABLE_FBDEV_DGA
1454	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1455	<	#else
1456	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1454	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1455	>	display_type = DISPLAY_DGA;
1456	>	default_width = -1; default_height = -1; // use entire screen
1457		#endif
1458	+	#ifdef ENABLE_XF86_DGA
1459	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1460		display_type = DISPLAY_DGA;
1461	<	if (width > DisplayWidth(x_display, screen))
1462	<	width = DisplayWidth(x_display, screen);
1028	<	if (height > DisplayHeight(x_display, screen))
1029	<	height = DisplayHeight(x_display, screen);
1030	<	}
1031	<	if (width <= 0)
1032	<	width = DisplayWidth(x_display, screen);
1033	<	if (height <= 0)
1034	<	height = DisplayHeight(x_display, screen);
1461	>	#endif
1462	>	}
1463		}
1464	<
1465	<	// Initialize according to display type
1466	<	switch (display_type) {
1467	<	case DISPLAY_WINDOW:
1468	<	if (!init_window(width, height))
1469	<	return false;
1464	>	if (default_width <= 0)
1465	>	default_width = DisplayWidth(x_display, screen);
1466	>	else if (default_width > DisplayWidth(x_display, screen))
1467	>	default_width = DisplayWidth(x_display, screen);
1468	>	if (default_height <= 0)
1469	>	default_height = DisplayHeight(x_display, screen);
1470	>	else if (default_height > DisplayHeight(x_display, screen))
1471	>	default_height = DisplayHeight(x_display, screen);
1472	>
1473	>	// Mac screen depth follows X depth
1474	>	video_depth default_depth = VDEPTH_1BIT;
1475	>	switch (DefaultDepth(x_display, screen)) {
1476	>	case 8:
1477	>	default_depth = VDEPTH_8BIT;
1478		break;
1479	<	case DISPLAY_DGA:
1480	<	#ifdef ENABLE_FBDEV_DGA
1481	<	if (!init_fbdev_dga(fb_name))
1482	<	#else
1483	<	if (!init_xf86_dga(width, height))
1048	<	#endif
1049	<	return false;
1479	>	case 15: case 16:
1480	>	default_depth = VDEPTH_16BIT;
1481	>	break;
1482	>	case 24: case 32:
1483	>	default_depth = VDEPTH_32BIT;
1484		break;
1485		}
1486
1487	<	#ifdef HAVE_PTHREADS
1488	<	// Lock down frame buffer
1489	<	pthread_mutex_lock(&frame_buffer_lock);
1490	<	#endif
1491	<
1492	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1493	<	// Set variables for UAE memory mapping
1494	<	MacFrameBaseHost = the_buffer;
1495	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1062	<
1063	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1064	<	if (classic)
1065	<	MacFrameLayout = FLAYOUT_NONE;
1066	<	#endif
1067	<
1068	<	#ifdef ENABLE_VOSF
1069	<	if (use_vosf) {
1070	<	// Initialize the mainBuffer structure
1071	<	if (!VideoInitBuffer()) {
1072	<	// TODO: STR_VOSF_INIT_ERR ?
1073	<	ErrorAlert("Could not initialize Video on SEGV signals");
1074	<	return false;
1487	>	// Construct list of supported modes
1488	>	if (display_type == DISPLAY_WINDOW) {
1489	>	if (classic)
1490	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1491	>	else {
1492	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1493	>	if (find_visual_for_depth(video_depth(d)))
1494	>	add_window_modes(video_depth(d));
1495	>	}
1496		}
1497	+	} else
1498	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1499	+	if (VideoModes.empty()) {
1500	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1501	+	return false;
1502	+	}
1503	+	video_init_depth_list();
1504
1505	<	// Initialize the handler for SIGSEGV
1506	<	if (!Screen_fault_handler_init()) {
1507	<	// TODO: STR_VOSF_INIT_ERR ?
1508	<	ErrorAlert("Could not initialize Video on SEGV signals");
1509	<	return false;
1510	<	}
1505	>	#if DEBUG
1506	>	D(bug("Available video modes:\n"));
1507	>	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1508	>	while (i != end) {
1509	>	int bits = 1 << i->depth;
1510	>	if (bits == 16)
1511	>	bits = 15;
1512	>	else if (bits == 32)
1513	>	bits = 24;
1514	>	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1515	>	++i;
1516		}
1517		#endif
1085	–
1086	–	// Initialize VideoRefresh function
1087	–	VideoRefreshInit();
1088	–
1089	–	XSync(x_display, false);
1518
1519	<	#ifdef HAVE_PTHREADS
1520	<	// Start redraw/input thread
1521	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1522	<	if (!redraw_thread_active) {
1523	<	printf("FATAL: cannot create redraw thread\n");
1524	<	return false;
1519	>	// Find requested default mode and open display
1520	>	if (VideoModes.size() == 1)
1521	>	return video_open(VideoModes[0]);
1522	>	else {
1523	>	// Find mode with specified dimensions
1524	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1525	>	for (i = VideoModes.begin(); i != end; ++i) {
1526	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1527	>	return video_open(*i);
1528	>	}
1529	>	return video_open(VideoModes[0]);
1530		}
1098	–	#endif
1099	–	return true;
1531		}
1532
1533
#	Line 1104 \| Line 1535 \| bool VideoInit(bool classic)
1535		* Deinitialization
1536		*/
1537
1538	<	void VideoExit(void)
1538	>	// Close display
1539	>	static void video_close(void)
1540		{
1109	–	#ifdef HAVE_PTHREADS
1541		// Stop redraw thread
1542	+	#ifdef HAVE_PTHREADS
1543		if (redraw_thread_active) {
1544		redraw_thread_cancel = true;
1545		#ifdef HAVE_PTHREAD_CANCEL
1546		pthread_cancel(redraw_thread);
1547		#endif
1548		pthread_join(redraw_thread, NULL);
1117	–	redraw_thread_active = false;
1549		}
1550		#endif
1551	+	redraw_thread_active = false;
1552
1121	–	#ifdef HAVE_PTHREADS
1553		// Unlock frame buffer
1554	<	pthread_mutex_unlock(&frame_buffer_lock);
1555	<	#endif
1125	<
1126	<	// Close window and server connection
1127	<	if (x_display != NULL) {
1128	<	XSync(x_display, false);
1129	<
1130	<	#ifdef ENABLE_XF86_DGA
1131	<	if (display_type == DISPLAY_DGA) {
1132	<	XF86DGADirectVideo(x_display, screen, 0);
1133	<	XUngrabPointer(x_display, CurrentTime);
1134	<	XUngrabKeyboard(x_display, CurrentTime);
1135	<	}
1136	<	#endif
1137	<
1138	<	#ifdef ENABLE_XF86_VIDMODE
1139	<	if (has_vidmode && display_type == DISPLAY_DGA)
1140	<	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1141	<	#endif
1142	<
1143	<	#ifdef ENABLE_FBDEV_DGA
1144	<	if (display_type == DISPLAY_DGA) {
1145	<	XUngrabPointer(x_display, CurrentTime);
1146	<	XUngrabKeyboard(x_display, CurrentTime);
1147	<	close(fbdev_fd);
1148	<	}
1149	<	#endif
1150	<
1151	<	XFlush(x_display);
1152	<	XSync(x_display, false);
1153	<	if (depth == 8) {
1154	<	XFreeColormap(x_display, cmap[0]);
1155	<	XFreeColormap(x_display, cmap[1]);
1156	<	}
1157	<
1158	<	if (!use_vosf) {
1159	<	if (the_buffer) {
1160	<	free(the_buffer);
1161	<	the_buffer = NULL;
1162	<	}
1554	>	UNLOCK_FRAME_BUFFER;
1555	>	XSync(x_display, false);
1556
1164	–	if (!have_shm && the_buffer_copy) {
1165	–	free(the_buffer_copy);
1166	–	the_buffer_copy = NULL;
1167	–	}
1168	–	}
1169	–	#ifdef ENABLE_VOSF
1170	–	else {
1171	–	if (the_buffer != (uint8 *)MAP_FAILED) {
1172	–	munmap((caddr_t)the_buffer, the_buffer_size);
1173	–	the_buffer = 0;
1174	–	}
1175	–
1176	–	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1177	–	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1178	–	the_buffer_copy = 0;
1179	–	}
1180	–	}
1181	–	#endif
1182	–	}
1183	–
1557		#ifdef ENABLE_VOSF
1558	+	// Deinitialize VOSF
1559		if (use_vosf) {
1186	–	// Clear mainBuffer data
1560		if (mainBuffer.pageInfo) {
1561		free(mainBuffer.pageInfo);
1562	<	mainBuffer.pageInfo = 0;
1562	>	mainBuffer.pageInfo = NULL;
1563		}
1191	–
1564		if (mainBuffer.dirtyPages) {
1565		free(mainBuffer.dirtyPages);
1566	<	mainBuffer.dirtyPages = 0;
1566	>	mainBuffer.dirtyPages = NULL;
1567		}
1568		}
1569	+	#endif
1570	+
1571	+	// Close display
1572	+	delete drv;
1573	+	drv = NULL;
1574
1575	<	// Close /dev/zero
1576	<	if (zero_fd > 0)
1577	<	close(zero_fd);
1575	>	// Free colormaps
1576	>	if (cmap[0]) {
1577	>	XFreeColormap(x_display, cmap[0]);
1578	>	cmap[0] = 0;
1579	>	}
1580	>	if (cmap[1]) {
1581	>	XFreeColormap(x_display, cmap[1]);
1582	>	cmap[1] = 0;
1583	>	}
1584	>	}
1585	>
1586	>	void VideoExit(void)
1587	>	{
1588	>	// Close display
1589	>	video_close();
1590	>
1591	>	#ifdef ENABLE_XF86_VIDMODE
1592	>	// Free video mode list
1593	>	if (x_video_modes) {
1594	>	XFree(x_video_modes);
1595	>	x_video_modes = NULL;
1596	>	}
1597		#endif
1598	+
1599	+	#ifdef ENABLE_FBDEV_DGA
1600	+	// Close framebuffer device
1601	+	if (fbdev_fd >= 0) {
1602	+	close(fbdev_fd);
1603	+	fbdev_fd = -1;
1604	+	}
1605	+	#endif
1606	+
1607	+	// Free depth list
1608	+	if (avail_depths) {
1609	+	XFree(avail_depths);
1610	+	avail_depths = NULL;
1611	+	}
1612		}
1613
1614
#	Line 1209 \| Line 1619 \| void VideoExit(void)
1619		void VideoQuitFullScreen(void)
1620		{
1621		D(bug("VideoQuitFullScreen()\n"));
1622	<	if (display_type == DISPLAY_DGA)
1213	<	quit_full_screen = true;
1622	>	quit_full_screen = true;
1623		}
1624
1625
#	Line 1224 \| Line 1633 \| void VideoInterrupt(void)
1633		if (emerg_quit)
1634		QuitEmulator();
1635
1227	–	#ifdef HAVE_PTHREADS
1636		// Temporarily give up frame buffer lock (this is the point where
1637		// we are suspended when the user presses Ctrl-Tab)
1638	<	pthread_mutex_unlock(&frame_buffer_lock);
1639	<	pthread_mutex_lock(&frame_buffer_lock);
1232	<	#endif
1638	>	UNLOCK_FRAME_BUFFER;
1639	>	LOCK_FRAME_BUFFER;
1640		}
1641
1642
#	Line 1237 \| Line 1644 \| void VideoInterrupt(void)
1644		* Set palette
1645		*/
1646
1647	<	void video_set_palette(uint8 *pal)
1647	>	void video_set_palette(uint8 *pal, int num_in)
1648		{
1649	<	#ifdef HAVE_PTHREDS
1243	<	pthread_mutex_lock(&palette_lock);
1244	<	#endif
1649	>	LOCK_PALETTE;
1650
1651		// Convert colors to XColor array
1652	<	for (int i=0; i<256; i++) {
1653	<	palette[i].pixel = i;
1654	<	palette[i].red = pal[i3] 0x0101;
1655	<	palette[i].green = pal[i3+1] 0x0101;
1656	<	palette[i].blue = pal[i3+2] 0x0101;
1657	<	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1652	>	int num_out = 256;
1653	>	bool stretch = false;
1654	>	if (IsDirectMode(VideoMonitor.mode)) {
1655	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1656	>	num_out = vis->map_entries;
1657	>	stretch = true;
1658	>	}
1659	>	XColor *p = palette;
1660	>	for (int i=0; i<num_out; i++) {
1661	>	int c = (stretch ? (i * num_in) / num_out : i);
1662	>	p->red = pal[c3 + 0] 0x0101;
1663	>	p->green = pal[c3 + 1] 0x0101;
1664	>	p->blue = pal[c3 + 2] 0x0101;
1665	>	if (color_class == PseudoColor)
1666	>	p->pixel = i;
1667	>	p->flags = DoRed \| DoGreen \| DoBlue;
1668	>	p++;
1669	>	}
1670	>
1671	>	#ifdef ENABLE_VOSF
1672	>	// Recalculate pixel color expansion map
1673	>	if (!IsDirectMode(VideoMonitor.mode) && (color_class == TrueColor \|\| color_class == DirectColor)) {
1674	>	for (int i=0; i<256; i++) {
1675	>	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1676	>	ExpandMap[i] = map_rgb(pal[c3+0], pal[c3+1], pal[c*3+2]);
1677	>	}
1678	>
1679	>	// We have to redraw everything because the interpretation of pixel values changed
1680	>	LOCK_VOSF;
1681	>	PFLAG_SET_ALL;
1682	>	UNLOCK_VOSF;
1683	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1684		}
1685	+	#endif
1686
1687		// Tell redraw thread to change palette
1688		palette_changed = true;
1689
1690	<	#ifdef HAVE_PTHREADS
1259	<	pthread_mutex_unlock(&palette_lock);
1260	<	#endif
1690	>	UNLOCK_PALETTE;
1691		}
1692
1693
1694		/*
1695	<	* Suspend/resume emulator
1695	>	* Switch video mode
1696		*/
1697
1698	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1269	<	static void suspend_emul(void)
1698	>	void video_switch_to_mode(const video_mode &mode)
1699		{
1700	<	if (display_type == DISPLAY_DGA) {
1701	<	// Release ctrl key
1702	<	ADBKeyUp(0x36);
1274	<	ctrl_down = false;
1700	>	// Close and reopen display
1701	>	video_close();
1702	>	video_open(mode);
1703
1704	<	#ifdef HAVE_PTHREADS
1705	<	// Lock frame buffer (this will stop the MacOS thread)
1706	<	pthread_mutex_lock(&frame_buffer_lock);
1279	<	#endif
1280	<
1281	<	// Save frame buffer
1282	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1283	<	if (fb_save)
1284	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1285	<
1286	<	// Close full screen display
1287	<	#ifdef ENABLE_XF86_DGA
1288	<	XF86DGADirectVideo(x_display, screen, 0);
1289	<	#endif
1290	<	XUngrabPointer(x_display, CurrentTime);
1291	<	XUngrabKeyboard(x_display, CurrentTime);
1292	<	XUnmapWindow(x_display, the_win);
1293	<	XSync(x_display, false);
1294	<
1295	<	// Open "suspend" window
1296	<	XSetWindowAttributes wattr;
1297	<	wattr.event_mask = KeyPressMask;
1298	<	wattr.background_pixel = black_pixel;
1299	<	wattr.border_pixel = black_pixel;
1300	<	wattr.backing_store = Always;
1301	<	wattr.backing_planes = xdepth;
1302	<	wattr.colormap = DefaultColormap(x_display, screen);
1303	<
1304	<	XSync(x_display, false);
1305	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1306	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
1307	<	CWBackingStore \| CWBackingPlanes \| (xdepth == 8 ? CWColormap : 0), &wattr);
1308	<	XSync(x_display, false);
1309	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1310	<	XMapRaised(x_display, suspend_win);
1311	<	XSync(x_display, false);
1312	<	emul_suspended = true;
1704	>	if (drv == NULL) {
1705	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1706	>	QuitEmulator();
1707		}
1708		}
1709
1316	–	static void resume_emul(void)
1317	–	{
1318	–	// Close "suspend" window
1319	–	XDestroyWindow(x_display, suspend_win);
1320	–	XSync(x_display, false);
1321	–
1322	–	// Reopen full screen display
1323	–	XMapRaised(x_display, the_win);
1324	–	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1325	–	XSync(x_display, false);
1326	–	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1327	–	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1328	–	#ifdef ENABLE_XF86_DGA
1329	–	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
1330	–	XF86DGASetViewPort(x_display, screen, 0, 0);
1331	–	#endif
1332	–	XSync(x_display, false);
1333	–
1334	–	// the_buffer already contains the data to restore. i.e. since a temporary
1335	–	// frame buffer is used when VOSF is actually used, fb_save is therefore
1336	–	// not necessary.
1337	–	#ifdef ENABLE_VOSF
1338	–	if (use_vosf) {
1339	–	#ifdef HAVE_PTHREADS
1340	–	pthread_mutex_lock(&Screen_draw_lock);
1341	–	#endif
1342	–	PFLAG_SET_ALL;
1343	–	#ifdef HAVE_PTHREADS
1344	–	pthread_mutex_unlock(&Screen_draw_lock);
1345	–	#endif
1346	–	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1347	–	}
1348	–	#endif
1349	–
1350	–	// Restore frame buffer
1351	–	if (fb_save) {
1352	–	#ifdef ENABLE_VOSF
1353	–	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1354	–	if (!use_vosf)
1355	–	#endif
1356	–	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1357	–	free(fb_save);
1358	–	fb_save = NULL;
1359	–	}
1360	–
1361	–	#ifdef ENABLE_XF86_DGA
1362	–	if (depth == 8)
1363	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1364	–	#endif
1365	–
1366	–	#ifdef HAVE_PTHREADS
1367	–	// Unlock frame buffer (and continue MacOS thread)
1368	–	pthread_mutex_unlock(&frame_buffer_lock);
1369	–	emul_suspended = false;
1370	–	#endif
1371	–	}
1372	–	#endif
1373	–
1710
1711		/*
1712	<	* Translate key event to Mac keycode
1712	>	* Translate key event to Mac keycode, returns -1 if no keycode was found
1713	>	* and -2 if the key was recognized as a hotkey
1714		*/
1715
1716	<	static int kc_decode(KeySym ks)
1716	>	static int kc_decode(KeySym ks, bool key_down)
1717		{
1718		switch (ks) {
1719		case XK_A: case XK_a: return 0x00;
#	Line 1429 \| Line 1766 \| static int kc_decode(KeySym ks)
1766		case XK_period: case XK_greater: return 0x2f;
1767		case XK_slash: case XK_question: return 0x2c;
1768
1769	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1433	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1434	<	#else
1435	<	case XK_Tab: return 0x30;
1436	<	#endif
1769	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1770		case XK_Return: return 0x24;
1771		case XK_space: return 0x31;
1772		case XK_BackSpace: return 0x33;
#	Line 1467 \| Line 1800 \| static int kc_decode(KeySym ks)
1800		case XK_Left: return 0x3b;
1801		case XK_Right: return 0x3c;
1802
1803	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1803	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1804
1805	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1805	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1806		case XK_F2: return 0x78;
1807		case XK_F3: return 0x63;
1808		case XK_F4: return 0x76;
1809	<	case XK_F5: return 0x60;
1809	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1810		case XK_F6: return 0x61;
1811		case XK_F7: return 0x62;
1812		case XK_F8: return 0x64;
#	Line 1521 \| Line 1854 \| static int kc_decode(KeySym ks)
1854		return -1;
1855		}
1856
1857	<	static int event2keycode(XKeyEvent *ev)
1857	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1858		{
1859		KeySym ks;
1527	–	int as;
1860		int i = 0;
1861
1862		do {
1863	<	ks = XLookupKeysym(ev, i++);
1864	<	as = kc_decode(ks);
1865	<	if (as != -1)
1863	>	ks = XLookupKeysym(&ev, i++);
1864	>	int as = kc_decode(ks, key_down);
1865	>	if (as >= 0)
1866	>	return as;
1867	>	if (as == -2)
1868		return as;
1869		} while (ks != NoSymbol);
1870
#	Line 1544 \| Line 1878 \| *static int event2keycode(XKeyEvent ev)**
1878
1879		static void handle_events(void)
1880		{
1881	<	XEvent event;
1882	<	for (;;) {
1883	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1550	<	break;
1881	>	while (XPending(x_display)) {
1882	>	XEvent event;
1883	>	XNextEvent(x_display, &event);
1884
1885		switch (event.type) {
1886		// Mouse button
1887		case ButtonPress: {
1888	<	unsigned int button = ((XButtonEvent *)&event)->button;
1888	>	unsigned int button = event.xbutton.button;
1889		if (button < 4)
1890		ADBMouseDown(button - 1);
1891		else if (button < 6) { // Wheel mouse
#	Line 1571 \| Line 1904 \| static void handle_events(void)
1904		break;
1905		}
1906		case ButtonRelease: {
1907	<	unsigned int button = ((XButtonEvent *)&event)->button;
1907	>	unsigned int button = event.xbutton.button;
1908		if (button < 4)
1909		ADBMouseUp(button - 1);
1910		break;
1911		}
1912
1913		// Mouse moved
1581	–	case EnterNotify:
1582	–	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1583	–	break;
1914		case MotionNotify:
1915	<	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1915	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
1916		break;
1917
1918		// Keyboard
1919		case KeyPress: {
1920	<	int code;
1920	>	int code = -1;
1921		if (use_keycodes) {
1922	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1923	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1922	>	if (event2keycode(event.xkey, true) != -2) // This is called to process the hotkeys
1923	>	code = keycode_table[event.xkey.keycode & 0xff];
1924		} else
1925	<	code = event2keycode((XKeyEvent *)&event);
1926	<	if (code != -1) {
1925	>	code = event2keycode(event.xkey, true);
1926	>	if (code >= 0) {
1927		if (!emul_suspended) {
1928		if (code == 0x39) { // Caps Lock pressed
1929		if (caps_on) {
#	Line 1608 \| Line 1938 \| static void handle_events(void)
1938		if (code == 0x36)
1939		ctrl_down = true;
1940		} else {
1611	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1941		if (code == 0x31)
1942	<	resume_emul(); // Space wakes us up
1614	<	#endif
1942	>	drv->resume(); // Space wakes us up
1943		}
1944		}
1945		break;
1946		}
1947		case KeyRelease: {
1948	<	int code;
1948	>	int code = -1;
1949		if (use_keycodes) {
1950	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1951	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1950	>	if (event2keycode(event.xkey, false) != -2) // This is called to process the hotkeys
1951	>	code = keycode_table[event.xkey.keycode & 0xff];
1952		} else
1953	<	code = event2keycode((XKeyEvent *)&event);
1954	<	if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
1953	>	code = event2keycode(event.xkey, false);
1954	>	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
1955		ADBKeyUp(code);
1956		if (code == 0x36)
1957		ctrl_down = false;
#	Line 1636 \| Line 1964 \| static void handle_events(void)
1964		if (display_type == DISPLAY_WINDOW) {
1965		#ifdef ENABLE_VOSF
1966		if (use_vosf) { // VOSF refresh
1967	<	#ifdef HAVE_PTHREADS
1640	<	pthread_mutex_lock(&Screen_draw_lock);
1641	<	#endif
1967	>	LOCK_VOSF;
1968		PFLAG_SET_ALL;
1969	<	#ifdef HAVE_PTHREADS
1970	<	pthread_mutex_unlock(&Screen_draw_lock);
1645	<	#endif
1646	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1969	>	UNLOCK_VOSF;
1970	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1971		}
1972		else
1973		#endif
#	Line 1654 \| Line 1978 \| static void handle_events(void)
1978		updt_box[x1][y1] = true;
1979		nr_boxes = 16 * 16;
1980		} else // Static refresh
1981	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1981	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1982		}
1983		break;
1984
1985	<	case FocusIn:
1986	<	case FocusOut:
1985	>	// Window "close" widget clicked
1986	>	case ClientMessage:
1987	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1988	>	ADBKeyDown(0x7f); // Power key
1989	>	ADBKeyUp(0x7f);
1990	>	}
1991		break;
1992		}
1993		}
#	Line 1671 \| Line 1999 \| static void handle_events(void)
1999		*/
2000
2001		// Dynamic display update (variable frame rate for each box)
2002	<	static void update_display_dynamic(int ticker)
2002	>	static void update_display_dynamic(int ticker, driver_window *drv)
2003		{
2004		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2005		int xil = 0;
2006		int rxm = 0, rxmo = 0;
2007	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2008	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2009	<	int rx = VideoMonitor.bytes_per_row / 16;
2010	<	int ry = VideoMonitor.y / 16;
2007	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2008	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2009	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
2010	>	int ry = VideoMonitor.mode.y / 16;
2011		int max_box;
2012
2013		y2s = sm_uptd[ticker % 8];
#	Line 1733 \| Line 2061 \| static void update_display_dynamic(int t
2061		i = (yi * bytes_per_row) + xi;
2062		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2063		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2064	<	if (depth == 1) {
2065	<	if (have_shm)
2066	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2064	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2065	>	if (drv->have_shm)
2066	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2067		else
2068	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2068	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2069		} else {
2070	<	if (have_shm)
2071	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2070	>	if (drv->have_shm)
2071	>	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);
2072		else
2073	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2073	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2074		}
2075		xil = 0;
2076		}
#	Line 1761 \| Line 2089 \| static void update_display_dynamic(int t
2089		}
2090
2091		// Static display update (fixed frame rate, but incremental)
2092	<	static void update_display_static(void)
2092	>	static void update_display_static(driver_window *drv)
2093		{
2094		// Incremental update code
2095		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2096	<	int bytes_per_row = VideoMonitor.bytes_per_row;
2097	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
2096	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2097	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2098		uint8 p, p2;
2099
2100		// Check for first line from top and first line from bottom that have changed
2101		y1 = 0;
2102	<	for (j=0; j<VideoMonitor.y; j++) {
2102	>	for (j=0; j<VideoMonitor.mode.y; j++) {
2103		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2104		y1 = j;
2105		break;
2106		}
2107		}
2108		y2 = y1 - 1;
2109	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
2109	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
2110		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2111		y2 = j;
2112		break;
#	Line 1788 \| Line 2116 \| static void update_display_static(void)
2116
2117		// Check for first column from left and first column from right that have changed
2118		if (high) {
2119	<	if (depth == 1) {
2120	<	x1 = VideoMonitor.x - 1;
2119	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2120	>	x1 = VideoMonitor.mode.x - 1;
2121		for (j=y1; j<=y2; j++) {
2122		p = &the_buffer[j * bytes_per_row];
2123		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1807 \| Line 2135 \| static void update_display_static(void)
2135		p2 = &the_buffer_copy[j * bytes_per_row];
2136		p += bytes_per_row;
2137		p2 += bytes_per_row;
2138	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
2138	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
2139		p--; p2--;
2140		if (p != p2) {
2141		x2 = (i << 3) + 7;
#	Line 1826 \| Line 2154 \| static void update_display_static(void)
2154		}
2155
2156		} else {
2157	<	x1 = VideoMonitor.x;
2157	>	x1 = VideoMonitor.mode.x;
2158		for (j=y1; j<=y2; j++) {
2159		p = &the_buffer[j * bytes_per_row];
2160		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1844 \| Line 2172 \| static void update_display_static(void)
2172		p2 = &the_buffer_copy[j * bytes_per_row];
2173		p += bytes_per_row;
2174		p2 += bytes_per_row;
2175	<	for (i=VideoMonitor.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2175	>	for (i=VideoMonitor.mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
2176		p--;
2177		p2--;
2178		if (p != p2) {
#	Line 1867 \| Line 2195 \| static void update_display_static(void)
2195
2196		// Refresh display
2197		if (high && wide) {
2198	<	if (have_shm)
2199	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2198	>	if (drv->have_shm)
2199	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2200		else
2201	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2201	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2202		}
2203		}
2204
#	Line 1879 \| Line 2207 \| static void update_display_static(void)
2207		* Screen refresh functions
2208		*/
2209
2210	<	// The specialisations hereunder are meant to enable VOSF with DGA in direct
2211	<	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
2212	<	// not get mapped correctly with respect to the predetermined host frame
2213	<	// buffer base address.
2214	<	//
1887	<	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1888	<	// we first try to "triple allocate" the address spaces according to the real
1889	<	// host frame buffer address. Then, if it fails, we will use a temporary
1890	<	// frame buffer thus making the real host frame buffer updated when pages
1891	<	// of the temp frame buffer are altered.
1892	<	//
1893	<	// As a side effect, a little speed gain in screen updates could be noticed
1894	<	// for other modes than DGA.
1895	<	//
1896	<	// The following two functions below are inline so that a clever compiler
1897	<	// could specialise the code according to the current screen depth and
1898	<	// display type. A more clever compiler would the job by itself though...
1899	<	// (update_display_vosf is inlined as well)
2210	>	// We suggest the compiler to inline the next two functions so that it
2211	>	// may specialise the code according to the current screen depth and
2212	>	// display type. A clever compiler would do that job by itself though...
2213	>
2214	>	// NOTE: update_display_vosf is inlined too
2215
2216		static inline void possibly_quit_dga_mode()
2217		{
2218	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2219	<	// Quit DGA mode if requested
2218	>	// Quit DGA mode if requested (something terrible has happened and we
2219	>	// want to give control back to the user)
2220		if (quit_full_screen) {
2221		quit_full_screen = false;
2222	<	#ifdef ENABLE_XF86_DGA
2223	<	XF86DGADirectVideo(x_display, screen, 0);
1909	<	#endif
1910	<	XUngrabPointer(x_display, CurrentTime);
1911	<	XUngrabKeyboard(x_display, CurrentTime);
1912	<	XUnmapWindow(x_display, the_win);
1913	<	XSync(x_display, false);
2222	>	delete drv;
2223	>	drv = NULL;
2224		}
1915	–	#endif
2225		}
2226
2227	<	static inline void handle_palette_changes(int depth, int display_type)
2227	>	static inline void possibly_ungrab_mouse()
2228		{
2229	<	#ifdef HAVE_PTHREADS
2230	<	pthread_mutex_lock(&palette_lock);
2231	<	#endif
2229	>	// Ungrab mouse if requested (something terrible has happened and we
2230	>	// want to give control back to the user)
2231	>	if (quit_full_screen) {
2232	>	quit_full_screen = false;
2233	>	if (drv)
2234	>	drv->ungrab_mouse();
2235	>	}
2236	>	}
2237	>
2238	>	static inline void handle_palette_changes(void)
2239	>	{
2240	>	LOCK_PALETTE;
2241	>
2242		if (palette_changed) {
2243		palette_changed = false;
2244	<	if (depth == 8) {
1926	<	XStoreColors(x_display, cmap[0], palette, 256);
1927	<	XStoreColors(x_display, cmap[1], palette, 256);
1928	<
1929	<	#ifdef ENABLE_XF86_DGA
1930	<	if (display_type == DISPLAY_DGA) {
1931	<	current_dga_cmap ^= 1;
1932	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1933	<	}
1934	<	#endif
1935	<	}
2244	>	drv->update_palette();
2245		}
2246	<	#ifdef HAVE_PTHREADS
2247	<	pthread_mutex_unlock(&palette_lock);
1939	<	#endif
2246	>
2247	>	UNLOCK_PALETTE;
2248		}
2249
2250		static void video_refresh_dga(void)
#	Line 1948 \| Line 2256 \| static void video_refresh_dga(void)
2256		handle_events();
2257
2258		// Handle palette changes
2259	<	handle_palette_changes(depth, DISPLAY_DGA);
2259	>	handle_palette_changes();
2260		}
2261
2262		#ifdef ENABLE_VOSF
#	Line 1962 \| Line 2270 \| static void video_refresh_dga_vosf(void)
2270		handle_events();
2271
2272		// Handle palette changes
2273	<	handle_palette_changes(depth, DISPLAY_DGA);
2273	>	handle_palette_changes();
2274
2275		// Update display (VOSF variant)
2276		static int tick_counter = 0;
2277		if (++tick_counter >= frame_skip) {
2278		tick_counter = 0;
2279	<	#ifdef HAVE_PTHREADS
2280	<	pthread_mutex_lock(&Screen_draw_lock);
2281	<	#endif
2282	<	update_display_dga_vosf();
2283	<	#ifdef HAVE_PTHREADS
1976	<	pthread_mutex_unlock(&Screen_draw_lock);
1977	<	#endif
2279	>	if (mainBuffer.dirty) {
2280	>	LOCK_VOSF;
2281	>	update_display_dga_vosf();
2282	>	UNLOCK_VOSF;
2283	>	}
2284		}
2285		}
2286		#endif
2287
2288		static void video_refresh_window_vosf(void)
2289		{
2290	<	// Quit DGA mode if requested
2291	<	possibly_quit_dga_mode();
2290	>	// Ungrab mouse if requested
2291	>	possibly_ungrab_mouse();
2292
2293		// Handle X events
2294		handle_events();
2295
2296		// Handle palette changes
2297	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2297	>	handle_palette_changes();
2298
2299		// Update display (VOSF variant)
2300		static int tick_counter = 0;
2301		if (++tick_counter >= frame_skip) {
2302		tick_counter = 0;
2303	<	#ifdef HAVE_PTHREADS
2304	<	pthread_mutex_lock(&Screen_draw_lock);
2305	<	#endif
2306	<	update_display_window_vosf();
2307	<	#ifdef HAVE_PTHREADS
2308	<	pthread_mutex_unlock(&Screen_draw_lock);
2003	<	#endif
2303	>	if (mainBuffer.dirty) {
2304	>	LOCK_VOSF;
2305	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2306	>	UNLOCK_VOSF;
2307	>	XSync(x_display, false); // Let the server catch up
2308	>	}
2309		}
2310		}
2311		#endif // def ENABLE_VOSF
2312
2313		static void video_refresh_window_static(void)
2314		{
2315	+	// Ungrab mouse if requested
2316	+	possibly_ungrab_mouse();
2317	+
2318		// Handle X events
2319		handle_events();
2320
2321		// Handle_palette changes
2322	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2322	>	handle_palette_changes();
2323
2324		// Update display (static variant)
2325		static int tick_counter = 0;
2326		if (++tick_counter >= frame_skip) {
2327		tick_counter = 0;
2328	<	update_display_static();
2328	>	update_display_static(static_cast<driver_window *>(drv));
2329		}
2330		}
2331
2332		static void video_refresh_window_dynamic(void)
2333		{
2334	+	// Ungrab mouse if requested
2335	+	possibly_ungrab_mouse();
2336	+
2337		// Handle X events
2338		handle_events();
2339
2340		// Handle_palette changes
2341	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2341	>	handle_palette_changes();
2342
2343		// Update display (dynamic variant)
2344		static int tick_counter = 0;
2345		tick_counter++;
2346	<	update_display_dynamic(tick_counter);
2346	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2347		}
2348
2349
#	Line 2040 \| Line 2351 \| static void video_refresh_window_dynamic
2351		* Thread for screen refresh, input handling etc.
2352		*/
2353
2354	<	void VideoRefreshInit(void)
2354	>	static void VideoRefreshInit(void)
2355		{
2356		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2357		if (display_type == DISPLAY_DGA) {
#	Line 2066 \| Line 2377 \| void VideoRefreshInit(void)
2377
2378		void VideoRefresh(void)
2379		{
2380	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2381	<	video_refresh();
2382	<	}
2383	<
2073	<	#if 0
2074	<	void VideoRefresh(void)
2075	<	{
2076	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2077	<	// Quit DGA mode if requested
2078	<	if (quit_full_screen) {
2079	<	quit_full_screen = false;
2080	<	if (display_type == DISPLAY_DGA) {
2081	<	#ifdef ENABLE_XF86_DGA
2082	<	XF86DGADirectVideo(x_display, screen, 0);
2083	<	#endif
2084	<	XUngrabPointer(x_display, CurrentTime);
2085	<	XUngrabKeyboard(x_display, CurrentTime);
2086	<	XUnmapWindow(x_display, the_win);
2087	<	XSync(x_display, false);
2088	<	}
2089	<	}
2090	<	#endif
2091	<
2092	<	// Handle X events
2093	<	handle_events();
2094	<
2095	<	// Handle palette changes
2096	<	#ifdef HAVE_PTHREADS
2097	<	pthread_mutex_lock(&palette_lock);
2098	<	#endif
2099	<	if (palette_changed) {
2100	<	palette_changed = false;
2101	<	if (depth == 8) {
2102	<	XStoreColors(x_display, cmap[0], palette, 256);
2103	<	XStoreColors(x_display, cmap[1], palette, 256);
2104	<
2105	<	#ifdef ENABLE_XF86_DGA
2106	<	if (display_type == DISPLAY_DGA) {
2107	<	current_dga_cmap ^= 1;
2108	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2109	<	}
2110	<	#endif
2111	<	}
2112	<	}
2113	<	#ifdef HAVE_PTHREADS
2114	<	pthread_mutex_unlock(&palette_lock);
2115	<	#endif
2116	<
2117	<	// In window mode, update display
2118	<	static int tick_counter = 0;
2119	<	if (display_type == DISPLAY_WINDOW) {
2120	<	tick_counter++;
2121	<	if (frame_skip == 0)
2122	<	update_display_dynamic(tick_counter);
2123	<	else if (tick_counter >= frame_skip) {
2124	<	tick_counter = 0;
2125	<	update_display_static();
2126	<	}
2127	<	}
2380	>	// We need to check redraw_thread_active to inhibit refreshed during
2381	>	// mode changes on non-threaded platforms
2382	>	if (redraw_thread_active)
2383	>	video_refresh();
2384		}
2129	–	#endif
2385
2386		#ifdef HAVE_PTHREADS
2387		static void redraw_func(void arg)
#	Line 2135 \| Line 2390 \| *static void redraw_func(void arg)*
2390		int64 ticks = 0;
2391		uint64 next = GetTicks_usec();
2392		while (!redraw_thread_cancel) {
2138	–	// VideoRefresh();
2393		video_refresh();
2394		next += 16667;
2395		int64 delay = next - GetTicks_usec();
#	Line 2146 \| Line 2400 \| *static void redraw_func(void arg)*
2400		ticks++;
2401		}
2402		uint64 end = GetTicks_usec();
2403	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2403	>	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2404		return NULL;
2405		}
2406		#endif

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.26 by cebix, 2000-10-27T17:01:40Z vs. Revision 1.54 by cebix, 2001-07-06T22:00:39Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.26 by cebix, 2000-10-27T17:01:40Z vs.
Revision 1.54 by cebix, 2001-07-06T22:00:39Z