ViewVC Help

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

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.15 by cebix, 2000-07-13T13:47:12Z vs.
Revision 1.58 by cebix, 2001-07-10T15:50:57Z

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

Diff Legend

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