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.42 by cebix, 2001-06-28T21:20:00Z vs.
Revision 1.48 by cebix, 2001-07-01T14:38:03Z

#	Line 72 | Line 72 | enum {
72
73		// Constants
74		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
75	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
75	>
76	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
77	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
78
79
80		// Global variables
81		static int32 frame_skip;                                                        // Prefs items
82	<	static int16 mouse_wheel_mode = 1;
83	<	static int16 mouse_wheel_lines = 3;
82	>	static int16 mouse_wheel_mode;
83	>	static int16 mouse_wheel_lines;
84
85		static int display_type = DISPLAY_WINDOW;                       // See enum above
86		static bool local_X11;                                                          // Flag: X server running on local machine?
87	<	static uint8 *the_buffer;                                                       // Mac frame buffer
87	>	static uint8 *the_buffer = NULL;                                        // Mac frame buffer (where MacOS draws into)
88	>	static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer (for refreshed modes)
89
87	–	#ifdef HAVE_PTHREADS
90		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
91	+	#ifdef HAVE_PTHREADS
92		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
93		static pthread_t redraw_thread;                                         // Redraw thread
94		#endif
#	Line 93 | Line 96 | static pthread_t redraw_thread;                                                //
96		static bool has_dga = false;                                            // Flag: Video DGA capable
97		static bool has_vidmode = false;                                        // Flag: VidMode extension available
98
99	+	#ifdef ENABLE_VOSF
100	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
101	+	#else
102	+	static const bool use_vosf = false;                                     // VOSF not possible
103	+	#endif
104	+
105		static bool ctrl_down = false;                                          // Flag: Ctrl key pressed
106		static bool caps_on = false;                                            // Flag: Caps Lock on
107		static bool quit_full_screen = false;                           // Flag: DGA close requested from redraw thread
#	Line 107 | Line 116 | static int keycode_table[256];                                         // X
116		// X11 variables
117		static int screen;                                                                      // Screen number
118		static int xdepth;                                                                      // Depth of X screen
119	<	static Window rootwin, the_win;                                         // Root window and our window
119	>	static Window rootwin;                                                          // Root window and our window
120		static XVisualInfo visualInfo;
121		static Visual *vis;
122	<	static Colormap cmap[2];                                                        // Two colormaps (DGA) for 8-bit mode
114	<	static bool cmap_allocated = false;
122	>	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
123		static XColor black, white;
124		static unsigned long black_pixel, white_pixel;
125		static int eventmask;
118	–	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
119	–	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
120	–	static Atom WM_DELETE_WINDOW = (Atom)0;
126
127	<	static XColor palette[256];                                                     // Color palette for 8-bit mode
127	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
128	>
129	>	static XColor palette[256];                                                     // Color palette to be used as CLUT and gamma table
130		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
131	+
132	+	#ifdef ENABLE_FBDEV_DGA
133	+	static int fbdev_fd = -1;
134	+	#endif
135	+
136	+	#ifdef ENABLE_XF86_VIDMODE
137	+	static XF86VidModeModeInfo **x_video_modes = NULL;      // Array of all available modes
138	+	static int num_x_video_modes;
139	+	#endif
140	+
141	+	// Mutex to protect palette
142		#ifdef HAVE_PTHREADS
143	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
143	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
144		#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
145		#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
146		#else
#	Line 130 | Line 148 | static pthread_mutex_t palette_lock = PT
148		#define UNLOCK_PALETTE
149		#endif
150
151	<	// Variables for window mode
134	<	static GC the_gc;
135	<	static XImage *img = NULL;
136	<	static XShmSegmentInfo shminfo;
137	<	static Cursor mac_cursor;
138	<	static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer
139	<	static bool have_shm = false;                                           // Flag: SHM extensions available
140	<	static bool updt_box[17][17];                                           // Flag for Update
141	<	static int nr_boxes;
142	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
143	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
144	<
145	<	// Variables for XF86 DGA mode
146	<	static int current_dga_cmap;                                            // Number (0 or 1) of currently installed DGA colormap
147	<	static Window suspend_win;                                                      // "Suspend" window
148	<	static void *fb_save = NULL;                                            // Saved frame buffer for suspend
151	>	// Mutex to protect frame buffer
152		#ifdef HAVE_PTHREADS
153	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
153	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
154		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
155		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
156		#else
#	Line 155 | Line 158 | static pthread_mutex_t frame_buffer_lock
158		#define UNLOCK_FRAME_BUFFER
159		#endif
160
161	<	// Variables for fbdev DGA mode
162	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
163	<	static int fbdev_fd;
164	<
165	<	#ifdef ENABLE_XF86_VIDMODE
163	<	// Variables for XF86 VidMode support
164	<	static XF86VidModeModeInfo **x_video_modes;                     // Array of all available modes
165	<	static int num_x_video_modes;
166	<	#endif
167	<
168	<	#ifdef ENABLE_VOSF
169	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
170	<	#else
171	<	static const bool use_vosf = false;                                     // Flag: VOSF enabled
172	<	#endif
161	>	// Variables for non-VOSF incremental refresh
162	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
163	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
164	>	static bool updt_box[17][17];
165	>	static int nr_boxes;
166
167	<	// VideoRefresh function
167	>	// Video refresh function
168		static void VideoRefreshInit(void);
169		static void (*video_refresh)(void);
170
171	+
172		// Prototypes
173		static void *redraw_func(void *arg);
174		static int event2keycode(XKeyEvent &ev);
#	Line 187 | Line 181 | extern Display *x_display;
181		extern void SysMountFirstFloppy(void);
182
183
190	–	#ifdef ENABLE_VOSF
191	–	# include "video_vosf.h"
192	–	#endif
193	–
194	–
184		/*
185	<	*  Initialization
185	>	*  Utility functions
186		*/
187
188		// Add mode to list of supported modes
#	Line 216 | Line 205 | static void set_mac_frame_buffer(video_d
205		if (depth == VDEPTH_16BIT)
206		layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
207		else if (depth == VDEPTH_32BIT)
208	<	layour = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
208	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
209		if (native_byte_order)
210		MacFrameLayout = layout;
211		else
212		MacFrameLayout = FLAYOUT_DIRECT;
213		VideoMonitor.mac_frame_base = MacFrameBaseMac;
214	+
215	+	// Set variables used by UAE memory banking
216	+	MacFrameBaseHost = the_buffer;
217	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
218	+	InitFrameBufferMapping();
219		#else
220		VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
221		D(bug("Host frame buffer = %p, ", the_buffer));
#	Line 260 | Line 254 | static void set_window_focus(Window w)
254		}
255
256		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
257	+	static Atom WM_DELETE_WINDOW = (Atom)0;
258		static void set_window_delete_protocol(Window w)
259		{
260		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 296 | Line 291 | static int error_handler(Display *d, XEr
291		return old_error_handler(d, e);
292		}
293
294	<	// Init window mode
295	<	static bool init_window(const video_mode &mode)
294	>
295	>	/*
296	>	*  Display "driver" classes
297	>	*/
298	>
299	>	class driver_base {
300	>	public:
301	>	driver_base();
302	>	virtual ~driver_base();
303	>
304	>	virtual void update_palette(void);
305	>	virtual void suspend(void) {}
306	>	virtual void resume(void) {}
307	>
308	>	public:
309	>	bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
310	>	Window w;               // The window we draw into
311	>	};
312	>
313	>	class driver_window;
314	>	static void update_display_window_vosf(driver_window *drv);
315	>	static void update_display_dynamic(int ticker, driver_window *drv);
316	>	static void update_display_static(driver_window *drv);
317	>
318	>	class driver_window : public driver_base {
319	>	friend void update_display_window_vosf(driver_window *drv);
320	>	friend void update_display_dynamic(int ticker, driver_window *drv);
321	>	friend void update_display_static(driver_window *drv);
322	>
323	>	public:
324	>	driver_window(const video_mode &mode);
325	>	~driver_window();
326	>
327	>	private:
328	>	GC gc;
329	>	XImage *img;
330	>	bool have_shm;                          // Flag: SHM extensions available
331	>	XShmSegmentInfo shminfo;
332	>	Cursor mac_cursor;
333	>	};
334	>
335	>	static driver_base *drv = NULL; // Pointer to currently used driver object
336	>
337	>	#ifdef ENABLE_VOSF
338	>	# include "video_vosf.h"
339	>	#endif
340	>
341	>	driver_base::driver_base()
342	>	: init_ok(false), w(0)
343	>	{
344	>	the_buffer = NULL;
345	>	the_buffer_copy = NULL;
346	>	}
347	>
348	>	driver_base::~driver_base()
349	>	{
350	>	if (w) {
351	>	XUnmapWindow(x_display, w);
352	>	wait_unmapped(w);
353	>	XDestroyWindow(x_display, w);
354	>	}
355	>
356	>	XFlush(x_display);
357	>	XSync(x_display, false);
358	>
359	>	// Free frame buffer(s)
360	>	if (!use_vosf) {
361	>	if (the_buffer) {
362	>	free(the_buffer);
363	>	the_buffer = NULL;
364	>	}
365	>	if (the_buffer_copy) {
366	>	free(the_buffer_copy);
367	>	the_buffer_copy = NULL;
368	>	}
369	>	}
370	>	#ifdef ENABLE_VOSF
371	>	else {
372	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
373	>	vm_release(the_buffer, the_buffer_size);
374	>	the_buffer = NULL;
375	>	}
376	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
377	>	vm_release(the_buffer_copy, the_buffer_size);
378	>	the_buffer_copy = NULL;
379	>	}
380	>	}
381	>	#endif
382	>	}
383	>
384	>	// Palette has changed
385	>	void driver_base::update_palette(void)
386	>	{
387	>	if (cmap[0] && cmap[1]) {
388	>	int num = 256;
389	>	if (IsDirectMode(VideoMonitor.mode))
390	>	num = vis->map_entries; // Palette is gamma table
391	>	else if (vis->c_class == DirectColor)
392	>	return; // Indexed mode on true color screen, don't set CLUT
393	>	XStoreColors(x_display, cmap[0], palette, num);
394	>	XStoreColors(x_display, cmap[1], palette, num);
395	>	}
396	>	XSync(x_display, false);
397	>	}
398	>
399	>
400	>	/*
401	>	*  Windowed display driver
402	>	*/
403	>
404	>	// Open display
405	>	driver_window::driver_window(const video_mode &mode)
406	>	: gc(0), img(NULL), have_shm(false), mac_cursor(0)
407		{
408		int width = mode.x, height = mode.y;
409		int aligned_width = (width + 15) & ~15;
#	Line 306 | Line 412 | static bool init_window(const video_mode
412		// Set absolute mouse mode
413		ADBSetRelMouseMode(false);
414
309	–	// Read frame skip prefs
310	–	frame_skip = PrefsFindInt32("frameskip");
311	–
415		// Create window
416		XSetWindowAttributes wattr;
417		wattr.event_mask = eventmask = win_eventmask;
418		wattr.background_pixel = black_pixel;
419	<	wattr.colormap = cmap[0];
420	<
421	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
319	<	InputOutput, vis, CWEventMask | CWBackPixel | ((IsDirectMode(mode) || mode.depth == VDEPTH_1BIT) ? 0 : CWColormap), &wattr);
419	>	wattr.colormap = (mode.depth == VDEPTH_1BIT && vis->c_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
420	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
421	>	InputOutput, vis, CWEventMask | CWBackPixel | (vis->c_class == PseudoColor || vis->c_class == DirectColor ? CWColormap : 0), &wattr);
422
423		// Set window name/class
424	<	set_window_name(the_win, STR_WINDOW_TITLE);
424	>	set_window_name(w, STR_WINDOW_TITLE);
425
426		// Indicate that we want keyboard input
427	<	set_window_focus(the_win);
427	>	set_window_focus(w);
428
429		// Set delete protocol property
430	<	set_window_delete_protocol(the_win);
430	>	set_window_delete_protocol(w);
431
432		// Make window unresizable
433		{
#	Line 336 | Line 438 | static bool init_window(const video_mode
438		hints->min_height = height;
439		hints->max_height = height;
440		hints->flags = PMinSize | PMaxSize;
441	<	XSetWMNormalHints(x_display, the_win, hints);
441	>	XSetWMNormalHints(x_display, w, hints);
442		XFree(hints);
443		}
444		}
445
446		// Show window
447	<	XMapWindow(x_display, the_win);
448	<	wait_mapped(the_win);
447	>	XMapWindow(x_display, w);
448	>	wait_mapped(w);
449	>
450	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
451	>	// use SHM because that doesn't allow changing the image byte order
452	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
453
454		// Try to create and attach SHM image
455	<	have_shm = false;
350	<	if (mode.depth != VDEPTH_1BIT && local_X11 && XShmQueryExtension(x_display)) {
455	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
456
457		// Create SHM image ("height + 2" for safety)
458		img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
#	Line 379 | Line 484 | static bool init_window(const video_mode
484		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);
485		}
486
487	<	// 1-Bit mode is big-endian
383	<	if (mode.depth == VDEPTH_1BIT) {
487	>	if (need_msb_image) {
488		img->byte_order = MSBFirst;
489		img->bitmap_bit_order = MSBFirst;
490		}
#	Line 397 | Line 501 | static bool init_window(const video_mode
501		#endif
502
503		// Create GC
504	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
505	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
504	>	gc = XCreateGC(x_display, w, 0, 0);
505	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
506
507		// Create no_cursor
508		mac_cursor = XCreatePixmapCursor(x_display,
509	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
510	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
509	>	XCreatePixmap(x_display, w, 1, 1, 1),
510	>	XCreatePixmap(x_display, w, 1, 1, 1),
511		&black, &white, 0, 0);
512	<	XDefineCursor(x_display, the_win, mac_cursor);
512	>	XDefineCursor(x_display, w, mac_cursor);
513
514	<	// Add resolution and set VideoMonitor
514	>	// Init blitting routines
515		bool native_byte_order;
516		#ifdef WORDS_BIGENDIAN
517		native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#	Line 415 | Line 519 | static bool init_window(const video_mode
519		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
520		#endif
521		#ifdef ENABLE_VOSF
522	<	Screen_blitter_init(&visualInfo, native_byte_order);
522	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
523		#endif
524	+
525	+	// Set VideoMonitor
526		VideoMonitor.mode = mode;
527		set_mac_frame_buffer(mode.depth, native_byte_order);
528	<	return true;
528	>
529	>	// Everything went well
530	>	init_ok = true;
531		}
532
533	<	// Init fbdev DGA display
534	<	static bool init_fbdev_dga(const video_mode &mode)
533	>	// Close display
534	>	driver_window::~driver_window()
535		{
536	+	if (img)
537	+	XDestroyImage(img);
538	+	if (have_shm) {
539	+	XShmDetach(x_display, &shminfo);
540	+	the_buffer_copy = NULL; // don't free() in driver_base dtor
541	+	}
542	+	if (gc)
543	+	XFreeGC(x_display, gc);
544	+	}
545	+
546	+
547	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
548	+	/*
549	+	*  DGA display driver base class
550	+	*/
551	+
552	+	class driver_dga : public driver_base {
553	+	public:
554	+	driver_dga();
555	+	~driver_dga();
556	+
557	+	void suspend(void);
558	+	void resume(void);
559	+
560	+	private:
561	+	Window suspend_win;             // "Suspend" information window
562	+	void *fb_save;                  // Saved frame buffer for suspend/resume
563	+	};
564	+
565	+	driver_dga::driver_dga()
566	+	: suspend_win(0), fb_save(NULL)
567	+	{
568	+	}
569	+
570	+	driver_dga::~driver_dga()
571	+	{
572	+	XUngrabPointer(x_display, CurrentTime);
573	+	XUngrabKeyboard(x_display, CurrentTime);
574	+	}
575	+
576	+	// Suspend emulation
577	+	void driver_dga::suspend(void)
578	+	{
579	+	// Release ctrl key
580	+	ADBKeyUp(0x36);
581	+	ctrl_down = false;
582	+
583	+	// Lock frame buffer (this will stop the MacOS thread)
584	+	LOCK_FRAME_BUFFER;
585	+
586	+	// Save frame buffer
587	+	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
588	+	if (fb_save)
589	+	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
590	+
591	+	// Close full screen display
592	+	#ifdef ENABLE_XF86_DGA
593	+	XF86DGADirectVideo(x_display, screen, 0);
594	+	#endif
595	+	XUngrabPointer(x_display, CurrentTime);
596	+	XUngrabKeyboard(x_display, CurrentTime);
597	+	XUnmapWindow(x_display, w);
598	+	wait_unmapped(w);
599	+
600	+	// Open "suspend" window
601	+	XSetWindowAttributes wattr;
602	+	wattr.event_mask = KeyPressMask;
603	+	wattr.background_pixel = black_pixel;
604	+
605	+	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
606	+	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
607	+	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
608	+	set_window_focus(suspend_win);
609	+	XMapWindow(x_display, suspend_win);
610	+	emul_suspended = true;
611	+	}
612	+
613	+	// Resume emulation
614	+	void driver_dga::resume(void)
615	+	{
616	+	// Close "suspend" window
617	+	XDestroyWindow(x_display, suspend_win);
618	+	XSync(x_display, false);
619	+
620	+	// Reopen full screen display
621	+	XMapRaised(x_display, w);
622	+	wait_mapped(w);
623	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
624	+	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
625	+	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
626	+	#ifdef ENABLE_XF86_DGA
627	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
628	+	XF86DGASetViewPort(x_display, screen, 0, 0);
629	+	#endif
630	+	XSync(x_display, false);
631	+
632	+	// the_buffer already contains the data to restore. i.e. since a temporary
633	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
634	+	// not necessary.
635	+	#ifdef ENABLE_VOSF
636	+	if (use_vosf) {
637	+	LOCK_VOSF;
638	+	PFLAG_SET_ALL;
639	+	UNLOCK_VOSF;
640	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
641	+	}
642	+	#endif
643	+
644	+	// Restore frame buffer
645	+	if (fb_save) {
646	+	#ifdef ENABLE_VOSF
647	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
648	+	if (!use_vosf)
649	+	#endif
650	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
651	+	free(fb_save);
652	+	fb_save = NULL;
653	+	}
654	+
655	+	// Unlock frame buffer (and continue MacOS thread)
656	+	UNLOCK_FRAME_BUFFER;
657	+	emul_suspended = false;
658	+	}
659	+	#endif
660	+
661	+
662		#ifdef ENABLE_FBDEV_DGA
663	+	/*
664	+	*  fbdev DGA display driver
665	+	*/
666	+
667	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
668	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
669	+
670	+	class driver_fbdev : public driver_dga {
671	+	public:
672	+	driver_fbdev(const video_mode &mode);
673	+	~driver_fbdev();
674	+	};
675	+
676	+	// Open display
677	+	driver_fbdev::driver_fbdev(const video_mode &mode)
678	+	{
679		int width = mode.x, height = mode.y;
680
681	+	// Set absolute mouse mode
682	+	ADBSetRelMouseMode(false);
683	+
684		// Find the maximum depth available
685		int ndepths, max_depth(0);
686		int *depths = XListDepths(x_display, screen, &ndepths);
687		if (depths == NULL) {
688		printf("FATAL: Could not determine the maximal depth available\n");
689	<	return false;
689	>	return;
690		} else {
691		while (ndepths-- > 0) {
692		if (depths[ndepths] > max_depth)
#	Line 450 | Line 703 | static bool init_fbdev_dga(const video_m
703		char str[256];
704		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
705		ErrorAlert(str);
706	<	return false;
706	>	return;
707		}
708
709		int fb_depth;           // supported depth
#	Line 470 | Line 723 | static bool init_fbdev_dga(const video_m
723		continue;
724
725		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
726	<	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
726	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
727		device_found = true;
728		break;
729		}
#	Line 484 | Line 737 | static bool init_fbdev_dga(const video_m
737		char str[256];
738		sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
739		ErrorAlert(str);
740	<	return false;
740	>	return;
741		}
742
490	–	depth = fb_depth;
491	–
492	–	// Set relative mouse mode
493	–	ADBSetRelMouseMode(false);
494	–
743		// Create window
744		XSetWindowAttributes wattr;
745		wattr.event_mask = eventmask = dga_eventmask;
#	Line 499 | Line 747 | static bool init_fbdev_dga(const video_m
747		wattr.override_redirect = True;
748		wattr.colormap = cmap[0];
749
750	<	the_win = XCreateWindow(x_display, rootwin,
750	>	w = XCreateWindow(x_display, rootwin,
751		0, 0, width, height,
752		0, xdepth, InputOutput, vis,
753	<	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
753	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (fb_depth <= 8 ? CWColormap : 0),
754		&wattr);
755
756		// Set window name/class
757	<	set_window_name(the_win, STR_WINDOW_TITLE);
757	>	set_window_name(w, STR_WINDOW_TITLE);
758
759		// Indicate that we want keyboard input
760	<	set_window_focus(the_win);
760	>	set_window_focus(w);
761
762		// Show window
763	<	XMapRaised(x_display, the_win);
764	<	wait_mapped(the_win);
763	>	XMapRaised(x_display, w);
764	>	wait_mapped(w);
765
766		// Grab mouse and keyboard
767	<	XGrabKeyboard(x_display, the_win, True,
767	>	XGrabKeyboard(x_display, w, True,
768		GrabModeAsync, GrabModeAsync, CurrentTime);
769	<	XGrabPointer(x_display, the_win, True,
769	>	XGrabPointer(x_display, w, True,
770		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
771	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
771	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
772
773		// Calculate bytes per row
774		int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
#	Line 531 | Line 779 | static bool init_fbdev_dga(const video_m
779		char str[256];
780		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
781		ErrorAlert(str);
782	<	return false;
782	>	return;
783		}
784		}
785
#	Line 539 | Line 787 | static bool init_fbdev_dga(const video_m
787		#if REAL_ADDRESSING || DIRECT_ADDRESSING
788		// Screen_blitter_init() returns TRUE if VOSF is mandatory
789		// i.e. the framebuffer update function is not Blit_Copy_Raw
790	<	use_vosf = Screen_blitter_init(&visualInfo, true);
790	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
791
792		if (use_vosf) {
793		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 554 | Line 802 | static bool init_fbdev_dga(const video_m
802		#endif
803
804		// Set VideoMonitor
805	+	VideoModes[0].bytes_per_row = bytes_per_row;
806	+	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
807		VideoMonitor.mode = mode;
808		set_mac_frame_buffer(mode.depth, true);
809	<	return true;
810	<	#else
811	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
562	<	return false;
563	<	#endif
809	>
810	>	// Everything went well
811	>	init_ok = true;
812		}
813
814	<	// Init XF86 DGA display
815	<	static bool init_xf86_dga(const video_mode &mode)
814	>	// Close display
815	>	driver_fbdev::~driver_fbdev()
816		{
817	<	int width = mode.x, height = mode.y;
817	>	}
818	>	#endif
819	>
820
821		#ifdef ENABLE_XF86_DGA
822	+	/*
823	+	*  XFree86 DGA display driver
824	+	*/
825	+
826	+	class driver_xf86dga : public driver_dga {
827	+	public:
828	+	driver_xf86dga(const video_mode &mode);
829	+	~driver_xf86dga();
830	+
831	+	void update_palette(void);
832	+	void resume(void);
833	+
834	+	private:
835	+	int current_dga_cmap;                                   // Number (0 or 1) of currently installed DGA colormap
836	+	};
837	+
838	+	// Open display
839	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
840	+	: current_dga_cmap(0)
841	+	{
842	+	int width = mode.x, height = mode.y;
843	+
844		// Set relative mouse mode
845		ADBSetRelMouseMode(true);
846
#	Line 593 | Line 865 | static bool init_xf86_dga(const video_mo
865		wattr.event_mask = eventmask = dga_eventmask;
866		wattr.override_redirect = True;
867
868	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
868	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
869		InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
870
871		// Set window name/class
872	<	set_window_name(the_win, STR_WINDOW_TITLE);
872	>	set_window_name(w, STR_WINDOW_TITLE);
873
874		// Indicate that we want keyboard input
875	<	set_window_focus(the_win);
875	>	set_window_focus(w);
876
877		// Show window
878	<	XMapRaised(x_display, the_win);
879	<	wait_mapped(the_win);
878	>	XMapRaised(x_display, w);
879	>	wait_mapped(w);
880
881		// Establish direct screen connection
882	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
882	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
883		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
884		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
885		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 620 | Line 892 | static bool init_xf86_dga(const video_mo
892
893		// Set colormap
894		if (!IsDirectMode(mode)) {
895	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
895	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
896		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
897		}
898		XSync(x_display, false);
899
900	<	// Set VideoMonitor
900	>	// Init blitting routines
901		int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
630	–
902		#ifdef VIDEO_VOSF
903		#if REAL_ADDRESSING || DIRECT_ADDRESSING
904		// Screen_blitter_init() returns TRUE if VOSF is mandatory
905		// i.e. the framebuffer update function is not Blit_Copy_Raw
906	<	use_vosf = Screen_blitter_init(&visualInfo, true);
906	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
907
908		if (use_vosf) {
909		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 646 | Line 917 | static bool init_xf86_dga(const video_mo
917		#endif
918		#endif
919
920	+	// Set VideoMonitor
921		const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
922		VideoMonitor.mode = mode;
923		set_mac_frame_buffer(mode.depth, true);
924	<	return true;
925	<	#else
926	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
927	<	return false;
924	>
925	>	// Everything went well
926	>	init_ok = true;
927	>	}
928	>
929	>	// Close display
930	>	driver_xf86dga::~driver_xf86dga()
931	>	{
932	>	XF86DGADirectVideo(x_display, screen, 0);
933	>	#ifdef ENABLE_XF86_VIDMODE
934	>	if (has_vidmode)
935	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
936		#endif
937		}
938
939	+	// Palette has changed
940	+	void driver_xf86dga::update_palette(void)
941	+	{
942	+	driver_dga::update_palette();
943	+	current_dga_cmap ^= 1;
944	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
945	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
946	+	}
947	+
948	+	// Resume emulation
949	+	void driver_xf86dga::resume(void)
950	+	{
951	+	driver_dga::resume();
952	+	if (!IsDirectMode(VideoMonitor.mode))
953	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
954	+	}
955	+	#endif
956	+
957	+
958	+	/*
959	+	*  Initialization
960	+	*/
961	+
962		// Init keycode translation table
963		static void keycode_init(void)
964		{
#	Line 724 | Line 1027 | static void keycode_init(void)
1027		// Open display for specified mode
1028		static bool video_open(const video_mode &mode)
1029		{
1030	<	// Create color maps for 8 bit mode
1031	<	if (!IsDirectMode(mode)) {
1032	<	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1033	<	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1034	<	cmap_allocated = true;
1035	<	XInstallColormap(x_display, cmap[0]);
1036	<	XInstallColormap(x_display, cmap[1]);
1030	>	// Load gray ramp to color map
1031	>	int num = (vis->c_class == DirectColor ? vis->map_entries : 256);
1032	>	for (int i=0; i<num; i++) {
1033	>	int c = (i * 256) / num;
1034	>	palette[i].red = c * 0x0101;
1035	>	palette[i].green = c * 0x0101;
1036	>	palette[i].blue = c * 0x0101;
1037	>	if (vis->c_class == PseudoColor)
1038	>	palette[i].pixel = i;
1039	>	palette[i].flags = DoRed | DoGreen | DoBlue;
1040	>	}
1041	>	if (cmap[0] && cmap[1]) {
1042	>	XStoreColors(x_display, cmap[0], palette, num);
1043	>	XStoreColors(x_display, cmap[1], palette, num);
1044		}
1045
1046	<	// Initialize according to display type
1046	>	// Create display driver object of requested type
1047		switch (display_type) {
1048		case DISPLAY_WINDOW:
1049	<	if (!init_window(mode))
740	<	return false;
1049	>	drv = new driver_window(mode);
1050		break;
742	–	case DISPLAY_DGA:
1051		#ifdef ENABLE_FBDEV_DGA
1052	<	if (!init_fbdev_dga(mode))
1053	<	#else
1054	<	if (!init_xf86_dga(mode))
1052	>	case DISPLAY_DGA:
1053	>	drv = new driver_fbdev(mode);
1054	>	break;
1055		#endif
1056	<	return false;
1056	>	#ifdef ENABLE_XF86_DGA
1057	>	case DISPLAY_DGA:
1058	>	drv = new driver_xf86dga(mode);
1059		break;
750	–	}
751	–
752	–	// Lock down frame buffer
753	–	LOCK_FRAME_BUFFER;
754	–
755	–	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
756	–	// Set variables for UAE memory mapping
757	–	MacFrameBaseHost = the_buffer;
758	–	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
759	–
760	–	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
761	–	if (classic)
762	–	MacFrameLayout = FLAYOUT_NONE;
1060		#endif
1061	<
1062	<	InitFrameBufferMapping();
1061	>	}
1062	>	if (drv == NULL)
1063	>	return false;
1064	>	if (!drv->init_ok) {
1065	>	delete drv;
1066	>	drv = NULL;
1067	>	return false;
1068	>	}
1069
1070		#ifdef ENABLE_VOSF
1071		if (use_vosf) {
1072		// Initialize the mainBuffer structure
1073		if (!video_init_buffer()) {
1074	<	ErrorAlert(GetString(STR_VOSF_INIT_ERR));
1074	>	ErrorAlert(STR_VOSF_INIT_ERR);
1075		return false;
1076		}
1077
#	Line 782 | Line 1085 | static bool video_open(const video_mode
1085
1086		// Initialize VideoRefresh function
1087		VideoRefreshInit();
1088	<
1088	>
1089	>	// Lock down frame buffer
1090		XSync(x_display, false);
1091	+	LOCK_FRAME_BUFFER;
1092
788	–	#ifdef HAVE_PTHREADS
1093		// Start redraw/input thread
1094	+	#ifdef HAVE_PTHREADS
1095		redraw_thread_cancel = false;
1096		redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1097		if (!redraw_thread_active) {
1098		printf("FATAL: cannot create redraw thread\n");
1099		return false;
1100		}
1101	+	#else
1102	+	redraw_thread_active = true;
1103		#endif
1104
1105		return true;
#	Line 803 | Line 1110 | bool VideoInit(bool classic)
1110		classic_mode = classic;
1111
1112		#ifdef ENABLE_VOSF
806	–	// Open /dev/zero
807	–	zero_fd = open("/dev/zero", O_RDWR);
808	–	if (zero_fd < 0) {
809	–	char str[256];
810	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
811	–	ErrorAlert(str);
812	–	return false;
813	–	}
814	–
1113		// Zero the mainBuffer structure
1114	<	mainBuffer.dirtyPages = 0;
1115	<	mainBuffer.pageInfo = 0;
1114	>	mainBuffer.dirtyPages = NULL;
1115	>	mainBuffer.pageInfo = NULL;
1116		#endif
1117
1118		// Check if X server runs on local machine
#	Line 825 | Line 1123 | bool VideoInit(bool classic)
1123		keycode_init();
1124
1125		// Read prefs
1126	+	frame_skip = PrefsFindInt32("frameskip");
1127		mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1128		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1129
#	Line 839 | Line 1138 | bool VideoInit(bool classic)
1138		// Frame buffer name
1139		char fb_name[20];
1140
1141	<	// Could do fbdev dga ?
1141	>	// Could do fbdev DGA?
1142		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1143		has_dga = true;
1144		else
#	Line 885 | Line 1184 | bool VideoInit(bool classic)
1184		case 15:
1185		case 16:
1186		case 24:
1187	<	case 32:
1188	<	color_class = TrueColor;
1187	>	case 32: // Try DirectColor first, as this will allow gamma correction
1188	>	color_class = DirectColor;
1189	>	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo))
1190	>	color_class = TrueColor;
1191		break;
1192		default:
1193	<	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1193	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1194		return false;
1195		}
1196		if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1197	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1197	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1198		return false;
1199		}
1200		if (visualInfo.depth != xdepth) {
1201	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1201	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1202		return false;
1203		}
1204		vis = visualInfo.visual;
1205
1206	+	// Create color maps
1207	+	if (color_class == PseudoColor || color_class == DirectColor) {
1208	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1209	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1210	+	}
1211	+
1212	+	// Find pixel format of direct modes
1213	+	if (color_class == DirectColor || color_class == TrueColor) {
1214	+	rshift = gshift = bshift = 0;
1215	+	rloss = gloss = bloss = 8;
1216	+	uint32 mask;
1217	+	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1218	+	++rshift;
1219	+	for (; mask&1; mask>>=1)
1220	+	--rloss;
1221	+	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1222	+	++gshift;
1223	+	for (; mask&1; mask>>=1)
1224	+	--gloss;
1225	+	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1226	+	++bshift;
1227	+	for (; mask&1; mask>>=1)
1228	+	--bloss;
1229	+	}
1230	+
1231	+	// Preset palette pixel values for gamma table
1232	+	if (color_class == DirectColor) {
1233	+	int num = vis->map_entries;
1234	+	for (int i=0; i<num; i++) {
1235	+	int c = (i * 256) / num;
1236	+	palette[i].pixel = ((c >> rloss) << rshift) | ((c >> gloss) << gshift) | ((c >> bloss) << bshift);
1237	+	}
1238	+	}
1239	+
1240		// Get screen mode from preferences
1241		const char *mode_str;
1242		if (classic_mode)
#	Line 918 | Line 1253 | bool VideoInit(bool classic)
1253		#ifdef ENABLE_FBDEV_DGA
1254		} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1255		display_type = DISPLAY_DGA;
1256	<	default_width = -1; default_height = -1;
1257	<	#else
1256	>	default_width = -1; default_height = -1; // use entire screen
1257	>	#endif
1258	>	#ifdef ENABLE_XF86_DGA
1259		} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1260		display_type = DISPLAY_DGA;
1261		#endif
#	Line 934 | Line 1270 | bool VideoInit(bool classic)
1270		else if (default_height > DisplayHeight(x_display, screen))
1271		default_height = DisplayHeight(x_display, screen);
1272
1273	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1274	<	int depth = (classic_mode ? 1 : xdepth);
939	<	video_depth depth_mode = DepthModeForPixelDepth(depth);
1273	>	// Mac screen depth follows X depth
1274	>	video_depth default_depth = DepthModeForPixelDepth(xdepth);
1275
1276		// Construct list of supported modes
1277		if (display_type == DISPLAY_WINDOW) {
1278		if (classic)
1279	<	add_mode(512, 342, 0x80, 64, depth_mode);
1279	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1280		else {
1281	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth_mode), depth_mode);
1282	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth_mode), depth_mode);
1283	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth_mode), depth_mode);
1284	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth_mode), depth_mode);
1285	<	add_mode(1280, 1024, 0x84, TrivialBytesPerRow(1280, depth_mode), depth_mode);
1281	>	if (default_depth != VDEPTH_1BIT) { // 1-bit modes are always available
1282	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, VDEPTH_1BIT), VDEPTH_1BIT);
1283	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, VDEPTH_1BIT), VDEPTH_1BIT);
1284	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, VDEPTH_1BIT), VDEPTH_1BIT);
1285	>	add_mode(832, 624, 0x83, TrivialBytesPerRow(832, VDEPTH_1BIT), VDEPTH_1BIT);
1286	>	add_mode(1024, 768, 0x84, TrivialBytesPerRow(1024, VDEPTH_1BIT), VDEPTH_1BIT);
1287	>	add_mode(1152, 870, 0x85, TrivialBytesPerRow(1152, VDEPTH_1BIT), VDEPTH_1BIT);
1288	>	add_mode(1280, 1024, 0x86, TrivialBytesPerRow(1280, VDEPTH_1BIT), VDEPTH_1BIT);
1289	>	add_mode(1600, 1200, 0x87, TrivialBytesPerRow(1600, VDEPTH_1BIT), VDEPTH_1BIT);
1290	>	}
1291	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, default_depth), default_depth);
1292	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, default_depth), default_depth);
1293	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, default_depth), default_depth);
1294	>	add_mode(832, 624, 0x83, TrivialBytesPerRow(832, default_depth), default_depth);
1295	>	add_mode(1024, 768, 0x84, TrivialBytesPerRow(1024, default_depth), default_depth);
1296	>	add_mode(1152, 870, 0x85, TrivialBytesPerRow(1152, default_depth), default_depth);
1297	>	add_mode(1280, 1024, 0x86, TrivialBytesPerRow(1280, default_depth), default_depth);
1298	>	add_mode(1600, 1200, 0x87, TrivialBytesPerRow(1600, default_depth), default_depth);
1299		}
1300		} else
1301	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, depth_mode), depth_mode);
1301	>	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1302
1303		// Find requested default mode and open display
1304		if (VideoModes.size() == 1)
1305		return video_open(VideoModes[0]);
1306		else {
1307		// Find mode with specified dimensions
1308	<	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1309	<	while (i != end) {
1310	<	if (i->x == default_width && i->y == default_height)
1308	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1309	>	for (i = VideoModes.begin(); i != end; ++i) {
1310	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1311		return video_open(*i);
964	–	++i;
1312		}
1313		return video_open(VideoModes[0]);
1314		}
#	Line 975 | Line 1322 | bool VideoInit(bool classic)
1322		// Close display
1323		static void video_close(void)
1324		{
978	–	#ifdef HAVE_PTHREADS
1325		// Stop redraw thread
1326	+	#ifdef HAVE_PTHREADS
1327		if (redraw_thread_active) {
1328		redraw_thread_cancel = true;
1329		#ifdef HAVE_PTHREAD_CANCEL
1330		pthread_cancel(redraw_thread);
1331		#endif
1332		pthread_join(redraw_thread, NULL);
986	–	redraw_thread_active = false;
1333		}
1334		#endif
1335	+	redraw_thread_active = false;
1336
1337		// Unlock frame buffer
1338		UNLOCK_FRAME_BUFFER;
1339	+	XSync(x_display, false);
1340
993	–	// Close window and server connection
994	–	if (x_display != NULL) {
995	–	XSync(x_display, false);
996	–
997	–	#ifdef ENABLE_XF86_DGA
998	–	if (display_type == DISPLAY_DGA) {
999	–	XF86DGADirectVideo(x_display, screen, 0);
1000	–	XUngrabPointer(x_display, CurrentTime);
1001	–	XUngrabKeyboard(x_display, CurrentTime);
1002	–	}
1003	–	#endif
1004	–
1005	–	#ifdef ENABLE_XF86_VIDMODE
1006	–	if (has_vidmode && display_type == DISPLAY_DGA)
1007	–	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1008	–	#endif
1009	–
1010	–	#ifdef ENABLE_FBDEV_DGA
1011	–	if (display_type == DISPLAY_DGA) {
1012	–	XUngrabPointer(x_display, CurrentTime);
1013	–	XUngrabKeyboard(x_display, CurrentTime);
1014	–	close(fbdev_fd);
1015	–	}
1016	–	#endif
1017	–
1018	–	XFlush(x_display);
1019	–	XSync(x_display, false);
1020	–	XUnmapWindow(x_display, the_win);
1021	–	wait_unmapped(the_win);
1022	–	XDestroyWindow(x_display, the_win);
1023	–
1024	–	if (have_shm) {
1025	–	XDestroyImage(img);
1026	–	XShmDetach(x_display, &shminfo);
1027	–	have_shm = false;
1028	–	} else {
1029	–	//!! free img
1030	–	}
1031	–	//!! free the_gc
1032	–
1033	–	if (cmap_allocated) {
1034	–	XFreeColormap(x_display, cmap[0]);
1035	–	XFreeColormap(x_display, cmap[1]);
1036	–	cmap_allocated = false;
1037	–	}
1038	–
1039	–	if (!use_vosf) {
1040	–	if (the_buffer) {
1041	–	free(the_buffer);
1042	–	the_buffer = NULL;
1043	–	}
1044	–
1045	–	if (!have_shm && the_buffer_copy) {
1046	–	free(the_buffer_copy);
1047	–	the_buffer_copy = NULL;
1048	–	}
1049	–	}
1050	–	#ifdef ENABLE_VOSF
1051	–	else {
1052	–	//!! uninstall SEGV handler?
1053	–
1054	–	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
1055	–	vm_release(the_buffer, the_buffer_size);
1056	–	the_buffer = 0;
1057	–	}
1058	–
1059	–	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
1060	–	vm_release(the_buffer_copy, the_buffer_size);
1061	–	the_buffer_copy = 0;
1062	–	}
1063	–	}
1064	–	#endif
1065	–	}
1066	–
1341		#ifdef ENABLE_VOSF
1342	+	// Deinitialize VOSF
1343		if (use_vosf) {
1069	–	// Clear mainBuffer data
1344		if (mainBuffer.pageInfo) {
1345		free(mainBuffer.pageInfo);
1346	<	mainBuffer.pageInfo = 0;
1346	>	mainBuffer.pageInfo = NULL;
1347		}
1074	–
1348		if (mainBuffer.dirtyPages) {
1349		free(mainBuffer.dirtyPages);
1350	<	mainBuffer.dirtyPages = 0;
1350	>	mainBuffer.dirtyPages = NULL;
1351		}
1352		}
1353		#endif
1354	+
1355	+	// Close display
1356	+	delete drv;
1357	+	drv = NULL;
1358		}
1359
1360		void VideoExit(void)
1361		{
1362	+	// Close display
1363		video_close();
1364
1365	<	#ifdef ENABLE_VOSF
1366	<	// Close /dev/zero
1367	<	if (zero_fd > 0)
1368	<	close(zero_fd);
1365	>	// Free colormaps
1366	>	if (cmap[0]) {
1367	>	XFreeColormap(x_display, cmap[0]);
1368	>	cmap[0] = 0;
1369	>	}
1370	>	if (cmap[1]) {
1371	>	XFreeColormap(x_display, cmap[1]);
1372	>	cmap[1] = 0;
1373	>	}
1374	>
1375	>	#ifdef ENABLE_XF86_VIDMODE
1376	>	// Free video mode list
1377	>	if (x_video_modes) {
1378	>	XFree(x_video_modes);
1379	>	x_video_modes = NULL;
1380	>	}
1381	>	#endif
1382	>
1383	>	#ifdef ENABLE_FBDEV_DGA
1384	>	// Close framebuffer device
1385	>	if (fbdev_fd >= 0) {
1386	>	close(fbdev_fd);
1387	>	fbdev_fd = -1;
1388	>	}
1389		#endif
1390		}
1391
#	Line 1099 | Line 1397 | void VideoExit(void)
1397		void VideoQuitFullScreen(void)
1398		{
1399		D(bug("VideoQuitFullScreen()\n"));
1400	<	if (display_type == DISPLAY_DGA)
1103	<	quit_full_screen = true;
1400	>	quit_full_screen = true;
1401		}
1402
1403
#	Line 1130 | Line 1427 | void video_set_palette(uint8 *pal)
1427		LOCK_PALETTE;
1428
1429		// Convert colors to XColor array
1430	<	for (int i=0; i<256; i++) {
1431	<	palette[i].pixel = i;
1432	<	palette[i].red = pal[i*3] * 0x0101;
1433	<	palette[i].green = pal[i*3+1] * 0x0101;
1434	<	palette[i].blue = pal[i*3+2] * 0x0101;
1435	<	palette[i].flags = DoRed | DoGreen | DoBlue;
1430	>	int num_in = 256, num_out = 256;
1431	>	if (VideoMonitor.mode.depth == VDEPTH_16BIT)
1432	>	num_in = 32;
1433	>	if (IsDirectMode(VideoMonitor.mode)) {
1434	>	// If X is in 565 mode we have to stretch the palette from 32 to 64 entries
1435	>	num_out = vis->map_entries;
1436	>	}
1437	>	XColor *p = palette;
1438	>	for (int i=0; i<num_out; i++) {
1439	>	int c = (i * num_in) / num_out;
1440	>	p->red = pal[c*3 + 0] * 0x0101;
1441	>	p->green = pal[c*3 + 1] * 0x0101;
1442	>	p->blue = pal[c*3 + 2] * 0x0101;
1443	>	if (vis->c_class == PseudoColor)
1444	>	p->pixel = i;
1445	>	p->flags = DoRed | DoGreen | DoBlue;
1446	>	p++;
1447		}
1448
1449		// Tell redraw thread to change palette
#	Line 1151 | Line 1459 | void video_set_palette(uint8 *pal)
1459
1460		void video_switch_to_mode(const video_mode &mode)
1461		{
1462	+	// Close and reopen display
1463		video_close();
1464		video_open(mode);
1156	–	}
1465
1466	<
1467	<	/*
1468	<	*  Suspend/resume emulator
1161	<	*/
1162	<
1163	<	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1164	<	static void suspend_emul(void)
1165	<	{
1166	<	if (display_type == DISPLAY_DGA) {
1167	<	// Release ctrl key
1168	<	ADBKeyUp(0x36);
1169	<	ctrl_down = false;
1170	<
1171	<	// Lock frame buffer (this will stop the MacOS thread)
1172	<	LOCK_FRAME_BUFFER;
1173	<
1174	<	// Save frame buffer
1175	<	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1176	<	if (fb_save)
1177	<	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1178	<
1179	<	// Close full screen display
1180	<	#ifdef ENABLE_XF86_DGA
1181	<	XF86DGADirectVideo(x_display, screen, 0);
1182	<	#endif
1183	<	XUngrabPointer(x_display, CurrentTime);
1184	<	XUngrabKeyboard(x_display, CurrentTime);
1185	<	XUnmapWindow(x_display, the_win);
1186	<	wait_unmapped(the_win);
1187	<
1188	<	// Open "suspend" window
1189	<	XSetWindowAttributes wattr;
1190	<	wattr.event_mask = KeyPressMask;
1191	<	wattr.background_pixel = black_pixel;
1192	<
1193	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1194	<	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
1195	<	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1196	<	set_window_focus(suspend_win);
1197	<	XMapWindow(x_display, suspend_win);
1198	<	emul_suspended = true;
1199	<	}
1200	<	}
1201	<
1202	<	static void resume_emul(void)
1203	<	{
1204	<	// Close "suspend" window
1205	<	XDestroyWindow(x_display, suspend_win);
1206	<	XSync(x_display, false);
1207	<
1208	<	// Reopen full screen display
1209	<	XMapRaised(x_display, the_win);
1210	<	wait_mapped(the_win);
1211	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1212	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1213	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1214	<	#ifdef ENABLE_XF86_DGA
1215	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1216	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1217	<	#endif
1218	<	XSync(x_display, false);
1219	<
1220	<	// the_buffer already contains the data to restore. i.e. since a temporary
1221	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1222	<	// not necessary.
1223	<	#ifdef ENABLE_VOSF
1224	<	if (use_vosf) {
1225	<	LOCK_VOSF;
1226	<	PFLAG_SET_ALL;
1227	<	UNLOCK_VOSF;
1228	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1229	<	}
1230	<	#endif
1231	<
1232	<	// Restore frame buffer
1233	<	if (fb_save) {
1234	<	#ifdef ENABLE_VOSF
1235	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1236	<	if (!use_vosf)
1237	<	#endif
1238	<	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1239	<	free(fb_save);
1240	<	fb_save = NULL;
1466	>	if (drv == NULL) {
1467	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1468	>	QuitEmulator();
1469		}
1242	–
1243	–	#ifdef ENABLE_XF86_DGA
1244	–	if (!IsDirectMode(VideoMonitor.mode))
1245	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1246	–	#endif
1247	–
1248	–	// Unlock frame buffer (and continue MacOS thread)
1249	–	UNLOCK_FRAME_BUFFER;
1250	–	emul_suspended = false;
1470		}
1252	–	#endif
1471
1472
1473		/*
#	Line 1310 | Line 1528 | static int kc_decode(KeySym ks)
1528		case XK_slash: case XK_question: return 0x2c;
1529
1530		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1531	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1531	>	case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30;
1532		#else
1533		case XK_Tab: return 0x30;
1534		#endif
#	Line 1485 | Line 1703 | static void handle_events(void)
1703		if (code == 0x36)
1704		ctrl_down = true;
1705		} else {
1488	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1706		if (code == 0x31)
1707	<	resume_emul();  // Space wakes us up
1491	<	#endif
1707	>	drv->resume();  // Space wakes us up
1708		}
1709		}
1710		break;
#	Line 1548 | Line 1764 | static void handle_events(void)
1764		*/
1765
1766		// Dynamic display update (variable frame rate for each box)
1767	<	static void update_display_dynamic(int ticker)
1767	>	static void update_display_dynamic(int ticker, driver_window *drv)
1768		{
1769		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1770		int xil = 0;
#	Line 1611 | Line 1827 | static void update_display_dynamic(int t
1827		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1828		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1829		if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1830	<	if (have_shm)
1831	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1830	>	if (drv->have_shm)
1831	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1832		else
1833	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1833	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1834		} else {
1835	<	if (have_shm)
1836	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1835	>	if (drv->have_shm)
1836	>	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);
1837		else
1838	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1838	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1839		}
1840		xil = 0;
1841		}
#	Line 1638 | Line 1854 | static void update_display_dynamic(int t
1854		}
1855
1856		// Static display update (fixed frame rate, but incremental)
1857	<	static void update_display_static(void)
1857	>	static void update_display_static(driver_window *drv)
1858		{
1859		// Incremental update code
1860		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
#	Line 1744 | Line 1960 | static void update_display_static(void)
1960
1961		// Refresh display
1962		if (high && wide) {
1963	<	if (have_shm)
1964	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1963	>	if (drv->have_shm)
1964	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
1965		else
1966	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1966	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
1967		}
1968		}
1969
#	Line 1764 | Line 1980 | static void update_display_static(void)
1980
1981		static inline void possibly_quit_dga_mode()
1982		{
1767	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1983		// Quit DGA mode if requested
1984		if (quit_full_screen) {
1985		quit_full_screen = false;
1986	<	#ifdef ENABLE_XF86_DGA
1987	<	XF86DGADirectVideo(x_display, screen, 0);
1773	<	#endif
1774	<	XUngrabPointer(x_display, CurrentTime);
1775	<	XUngrabKeyboard(x_display, CurrentTime);
1776	<	XUnmapWindow(x_display, the_win);
1777	<	wait_unmapped(the_win);
1986	>	delete drv;
1987	>	drv = NULL;
1988		}
1779	–	#endif
1989		}
1990
1991	<	static inline void handle_palette_changes(int display_type)
1991	>	static inline void handle_palette_changes(void)
1992		{
1993		LOCK_PALETTE;
1994
1995		if (palette_changed) {
1996		palette_changed = false;
1997	<	if (!IsDirectMode(VideoMonitor.mode)) {
1789	<	XStoreColors(x_display, cmap[0], palette, 256);
1790	<	XStoreColors(x_display, cmap[1], palette, 256);
1791	<	XSync(x_display, false);
1792	<
1793	<	#ifdef ENABLE_XF86_DGA
1794	<	if (display_type == DISPLAY_DGA) {
1795	<	current_dga_cmap ^= 1;
1796	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1797	<	}
1798	<	#endif
1799	<	}
1997	>	drv->update_palette();
1998		}
1999
2000		UNLOCK_PALETTE;
#	Line 1811 | Line 2009 | static void video_refresh_dga(void)
2009		handle_events();
2010
2011		// Handle palette changes
2012	<	handle_palette_changes(DISPLAY_DGA);
2012	>	handle_palette_changes();
2013		}
2014
2015		#ifdef ENABLE_VOSF
#	Line 1825 | Line 2023 | static void video_refresh_dga_vosf(void)
2023		handle_events();
2024
2025		// Handle palette changes
2026	<	handle_palette_changes(DISPLAY_DGA);
2026	>	handle_palette_changes();
2027
2028		// Update display (VOSF variant)
2029		static int tick_counter = 0;
#	Line 1849 | Line 2047 | static void video_refresh_window_vosf(vo
2047		handle_events();
2048
2049		// Handle palette changes
2050	<	handle_palette_changes(DISPLAY_WINDOW);
2050	>	handle_palette_changes();
2051
2052		// Update display (VOSF variant)
2053		static int tick_counter = 0;
#	Line 1857 | Line 2055 | static void video_refresh_window_vosf(vo
2055		tick_counter = 0;
2056		if (mainBuffer.dirty) {
2057		LOCK_VOSF;
2058	<	update_display_window_vosf();
2058	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2059		UNLOCK_VOSF;
2060		XSync(x_display, false); // Let the server catch up
2061		}
#	Line 1871 | Line 2069 | static void video_refresh_window_static(
2069		handle_events();
2070
2071		// Handle_palette changes
2072	<	handle_palette_changes(DISPLAY_WINDOW);
2072	>	handle_palette_changes();
2073
2074		// Update display (static variant)
2075		static int tick_counter = 0;
2076		if (++tick_counter >= frame_skip) {
2077		tick_counter = 0;
2078	<	update_display_static();
2078	>	update_display_static(static_cast<driver_window *>(drv));
2079		}
2080		}
2081
#	Line 1887 | Line 2085 | static void video_refresh_window_dynamic
2085		handle_events();
2086
2087		// Handle_palette changes
2088	<	handle_palette_changes(DISPLAY_WINDOW);
2088	>	handle_palette_changes();
2089
2090		// Update display (dynamic variant)
2091		static int tick_counter = 0;
2092		tick_counter++;
2093	<	update_display_dynamic(tick_counter);
2093	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2094		}
2095
2096
#	Line 1926 | Line 2124 | static void VideoRefreshInit(void)
2124
2125		void VideoRefresh(void)
2126		{
2127	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2128	<	video_refresh();
2127	>	// We need to check redraw_thread_active to inhibit refreshed during
2128	>	// mode changes on non-threaded platforms
2129	>	if (redraw_thread_active)
2130	>	video_refresh();
2131		}
2132
2133		#ifdef HAVE_PTHREADS

Diff Legend

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