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.47 by cebix, 2001-07-01T00:46:37Z vs.
Revision 1.63 by cebix, 2002-01-15T14:58:37Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2001 Christian Bauer
4	>	*  Basilisk II (C) 1997-2002 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 24 | Line 24
24		*      Ctrl-Tab = suspend DGA mode
25		*      Ctrl-Esc = emergency quit
26		*      Ctrl-F1 = mount floppy
27	+	*      Ctrl-F5 = grab mouse (in windowed mode)
28		*/
29
30		#include "sysdeps.h"
#	Line 36 | Line 37
37		#include <sys/shm.h>
38		#include <errno.h>
39
40	+	#include <algorithm>
41	+
42	+	#ifndef NO_STD_NAMESPACE
43	+	using std::sort;
44	+	#endif
45	+
46		#ifdef HAVE_PTHREADS
47		# include <pthread.h>
48		#endif
#	Line 86 | Line 93 | static int display_type = DISPLAY_WINDOW
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
98		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
99		#ifdef HAVE_PTHREADS
#	Line 115 | Line 123 | static int keycode_table[256];                                         // X
123
124		// X11 variables
125		static int screen;                                                                      // Screen number
118	–	static int xdepth;                                                                      // Depth of X screen
126		static Window rootwin;                                                          // Root window and our window
127	<	static XVisualInfo visualInfo;
128	<	static Visual *vis;
122	<	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
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;
132
133	<	static XColor palette[256];                                                     // Color palette for indexed modes
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
145		#ifdef ENABLE_FBDEV_DGA
#	Line 169 | Line 184 | static void (*video_refresh)(void);
184
185		// Prototypes
186		static void *redraw_func(void *arg);
172	–	static int event2keycode(XKeyEvent &ev);
187
188		// From main_unix.cpp
189		extern char *x_display_name;
#	Line 183 | Line 197 | extern void SysMountFirstFloppy(void);
197		*  Utility functions
198		*/
199
200	+	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
201	+	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
202	+	{
203	+	return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift);
204	+	}
205	+
206	+	// Do we have a visual for handling the specified Mac depth? If so, set the
207	+	// global variables "xdepth", "visualInfo", "vis" and "color_class".
208	+	static bool find_visual_for_depth(video_depth depth)
209	+	{
210	+	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
211	+
212	+	// 1-bit works always and uses default visual
213	+	if (depth == VDEPTH_1BIT) {
214	+	vis = DefaultVisual(x_display, screen);
215	+	visualInfo.visualid = XVisualIDFromVisual(vis);
216	+	int num = 0;
217	+	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
218	+	visualInfo = vi[0];
219	+	XFree(vi);
220	+	xdepth = visualInfo.depth;
221	+	color_class = visualInfo.c_class;
222	+	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
223	+	return true;
224	+	}
225	+
226	+	// Calculate minimum and maximum supported X depth
227	+	int min_depth = 1, max_depth = 32;
228	+	switch (depth) {
229	+	#ifdef ENABLE_VOSF
230	+	case VDEPTH_2BIT:
231	+	case VDEPTH_4BIT:       // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
232	+	case VDEPTH_8BIT:
233	+	min_depth = 8;
234	+	max_depth = 32;
235	+	break;
236	+	#else
237	+	case VDEPTH_2BIT:
238	+	case VDEPTH_4BIT:       // 2/4-bit requires VOSF blitters
239	+	return false;
240	+	case VDEPTH_8BIT:       // 8-bit without VOSF requires an 8-bit visual
241	+	min_depth = 8;
242	+	max_depth = 8;
243	+	break;
244	+	#endif
245	+	case VDEPTH_16BIT:      // 16-bit requires a 15/16-bit visual
246	+	min_depth = 15;
247	+	max_depth = 16;
248	+	break;
249	+	case VDEPTH_32BIT:      // 32-bit requires a 24/32-bit visual
250	+	min_depth = 24;
251	+	max_depth = 32;
252	+	break;
253	+	}
254	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
255	+
256	+	// Try to find a visual for one of the color depths
257	+	bool visual_found = false;
258	+	for (int i=0; i<num_depths && !visual_found; i++) {
259	+
260	+	xdepth = avail_depths[i];
261	+	D(bug(" trying to find visual for depth %d\n", xdepth));
262	+	if (xdepth < min_depth || xdepth > max_depth)
263	+	continue;
264	+
265	+	// Determine best color class for this depth
266	+	switch (xdepth) {
267	+	case 1: // Try StaticGray or StaticColor
268	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
269	+	|| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
270	+	visual_found = true;
271	+	break;
272	+	case 8: // Need PseudoColor
273	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
274	+	visual_found = true;
275	+	break;
276	+	case 15:
277	+	case 16:
278	+	case 24:
279	+	case 32: // Try DirectColor first, as this will allow gamma correction
280	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
281	+	|| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
282	+	visual_found = true;
283	+	break;
284	+	default:
285	+	D(bug("  not a supported depth\n"));
286	+	break;
287	+	}
288	+	}
289	+	if (!visual_found)
290	+	return false;
291	+
292	+	// Visual was found
293	+	vis = visualInfo.visual;
294	+	color_class = visualInfo.c_class;
295	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
296	+	#if DEBUG
297	+	switch (color_class) {
298	+	case StaticGray: D(bug("StaticGray\n")); break;
299	+	case GrayScale: D(bug("GrayScale\n")); break;
300	+	case StaticColor: D(bug("StaticColor\n")); break;
301	+	case PseudoColor: D(bug("PseudoColor\n")); break;
302	+	case TrueColor: D(bug("TrueColor\n")); break;
303	+	case DirectColor: D(bug("DirectColor\n")); break;
304	+	}
305	+	#endif
306	+	return true;
307	+	}
308	+
309		// Add mode to list of supported modes
310		static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
311		{
#	Line 195 | Line 318 | static void add_mode(uint32 width, uint3
318		VideoModes.push_back(mode);
319		}
320
321	+	// Add standard list of windowed modes for given color depth
322	+	static void add_window_modes(video_depth depth)
323	+	{
324	+	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
325	+	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
326	+	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
327	+	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
328	+	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
329	+	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
330	+	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
331	+	}
332	+
333		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
334		static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
335		{
#	Line 203 | Line 338 | static void set_mac_frame_buffer(video_d
338		if (depth == VDEPTH_16BIT)
339		layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
340		else if (depth == VDEPTH_32BIT)
341	<	layour = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
341	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
342		if (native_byte_order)
343		MacFrameLayout = layout;
344		else
#	Line 216 | Line 351 | static void set_mac_frame_buffer(video_d
351		InitFrameBufferMapping();
352		#else
353		VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
219	–	D(bug("Host frame buffer = %p, ", the_buffer));
354		#endif
355		D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
356		}
#	Line 302 | Line 436 | public:
436		virtual void update_palette(void);
437		virtual void suspend(void) {}
438		virtual void resume(void) {}
439	+	virtual void toggle_mouse_grab(void) {}
440	+	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
441	+
442	+	void disable_mouse_accel(void);
443	+	void restore_mouse_accel(void);
444	+
445	+	virtual void grab_mouse(void) {}
446	+	virtual void ungrab_mouse(void) {}
447
448		public:
449		bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
450		Window w;               // The window we draw into
451	+
452	+	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
453		};
454
455		class driver_window;
#	Line 322 | Line 466 | public:
466		driver_window(const video_mode &mode);
467		~driver_window();
468
469	+	void toggle_mouse_grab(void);
470	+	void mouse_moved(int x, int y);
471	+
472	+	void grab_mouse(void);
473	+	void ungrab_mouse(void);
474	+
475		private:
476		GC gc;
477		XImage *img;
478	<	bool have_shm;                          // Flag: SHM extensions available
478	>	bool have_shm;                                  // Flag: SHM extensions available
479		XShmSegmentInfo shminfo;
480		Cursor mac_cursor;
481	+	bool mouse_grabbed;                             // Flag: mouse pointer grabbed, using relative mouse mode
482	+	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
483		};
484
485		static driver_base *drv = NULL; // Pointer to currently used driver object
#	Line 341 | Line 493 | driver_base::driver_base()
493		{
494		the_buffer = NULL;
495		the_buffer_copy = NULL;
496	+	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
497		}
498
499		driver_base::~driver_base()
500		{
501	+	ungrab_mouse();
502	+	restore_mouse_accel();
503	+
504		if (w) {
505		XUnmapWindow(x_display, w);
506		wait_unmapped(w);
#	Line 367 | Line 523 | driver_base::~driver_base()
523		}
524		#ifdef ENABLE_VOSF
525		else {
526	<	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
526	>	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
527	>	if (the_buffer != VM_MAP_FAILED) {
528	>	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
529		vm_release(the_buffer, the_buffer_size);
530		the_buffer = NULL;
531		}
532	<	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
533	<	vm_release(the_buffer_copy, the_buffer_size);
532	>	if (the_host_buffer) {
533	>	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
534	>	free(the_host_buffer);
535	>	the_host_buffer = NULL;
536	>	}
537	>	if (the_buffer_copy) {
538	>	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
539	>	free(the_buffer_copy);
540		the_buffer_copy = NULL;
541		}
542		}
#	Line 382 | Line 546 | driver_base::~driver_base()
546		// Palette has changed
547		void driver_base::update_palette(void)
548		{
549	<	if (cmap[0] && cmap[1]) {
550	<	int num = 256;
551	<	if (IsDirectMode(VideoMonitor.mode))
388	<	num = vis->map_entries; // Palette is gamma table
389	<	else if (vis->c_class == DirectColor)
549	>	if (color_class == PseudoColor || color_class == DirectColor) {
550	>	int num = vis->map_entries;
551	>	if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor)
552		return; // Indexed mode on true color screen, don't set CLUT
553		XStoreColors(x_display, cmap[0], palette, num);
554		XStoreColors(x_display, cmap[1], palette, num);
#	Line 394 | Line 556 | void driver_base::update_palette(void)
556		XSync(x_display, false);
557		}
558
559	+	// Disable mouse acceleration
560	+	void driver_base::disable_mouse_accel(void)
561	+	{
562	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
563	+	}
564	+
565	+	// Restore mouse acceleration to original value
566	+	void driver_base::restore_mouse_accel(void)
567	+	{
568	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
569	+	}
570	+
571
572		/*
573		*  Windowed display driver
#	Line 401 | Line 575 | void driver_base::update_palette(void)
575
576		// Open display
577		driver_window::driver_window(const video_mode &mode)
578	<	: gc(0), img(NULL), have_shm(false), mac_cursor(0)
578	>	: gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false)
579		{
580		int width = mode.x, height = mode.y;
581		int aligned_width = (width + 15) & ~15;
582		int aligned_height = (height + 15) & ~15;
583
584		// Set absolute mouse mode
585	<	ADBSetRelMouseMode(false);
585	>	ADBSetRelMouseMode(mouse_grabbed);
586
587	<	// Create window
587	>	// Create window (setting background_pixel, border_pixel and colormap is
588	>	// mandatory when using a non-default visual; in 1-bit mode we use the
589	>	// default visual, so we can also use the default colormap)
590		XSetWindowAttributes wattr;
591		wattr.event_mask = eventmask = win_eventmask;
592	<	wattr.background_pixel = black_pixel;
593	<	wattr.colormap = cmap[0];
592	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
593	>	wattr.border_pixel = 0;
594	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
595		w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
596	<	InputOutput, vis, CWEventMask | CWBackPixel | ((mode.depth == VDEPTH_1BIT || cmap[0] == 0) ? 0 : CWColormap), &wattr);
596	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWColormap, &wattr);
597	>	D(bug(" window created\n"));
598
599		// Set window name/class
600		set_window_name(w, STR_WINDOW_TITLE);
#	Line 440 | Line 618 | driver_window::driver_window(const video
618		XFree(hints);
619		}
620		}
621	+	D(bug(" window attributes set\n"));
622
623		// Show window
624		XMapWindow(x_display, w);
625		wait_mapped(w);
626	+	D(bug(" window mapped\n"));
627	+
628	+	// 1-bit mode is big-endian; if the X server is little-endian, we can't
629	+	// use SHM because that doesn't allow changing the image byte order
630	+	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
631
632		// Try to create and attach SHM image
633	<	if (local_X11 && XShmQueryExtension(x_display)) {
633	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
634
635		// Create SHM image ("height + 2" for safety)
636		img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
637	+	D(bug(" shm image created\n"));
638		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
639		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
640		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 464 | Line 649 | driver_window::driver_window(const video
649		if (shm_error) {
650		shmdt(shminfo.shmaddr);
651		XDestroyImage(img);
652	+	img = NULL;
653		shminfo.shmid = -1;
654		} else {
655		have_shm = true;
656		shmctl(shminfo.shmid, IPC_RMID, 0);
657		}
658	+	D(bug(" shm image attached\n"));
659		}
660
661		// Create normal X image if SHM doesn't work ("height + 2" for safety)
662		if (!have_shm) {
663	<	int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth);
663	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
664		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
665		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);
666	+	D(bug(" X image created\n"));
667		}
668
669	<	// 1-Bit mode is big-endian
482	<	if (mode.depth == VDEPTH_1BIT) {
669	>	if (need_msb_image) {
670		img->byte_order = MSBFirst;
671		img->bitmap_bit_order = MSBFirst;
672		}
673
674		#ifdef ENABLE_VOSF
675	+	use_vosf = true;
676		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
677		the_host_buffer = the_buffer_copy;
678		the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
491	–	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
679		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
680	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
681	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
682		#else
683		// Allocate memory for frame buffer
684		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
685	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
686		#endif
687
688		// Create GC
#	Line 514 | Line 704 | driver_window::driver_window(const video
704		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
705		#endif
706		#ifdef ENABLE_VOSF
707	<	Screen_blitter_init(&visualInfo, native_byte_order);
707	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
708		#endif
709
710		// Set VideoMonitor
#	Line 528 | Line 718 | driver_window::driver_window(const video
718		// Close display
719		driver_window::~driver_window()
720		{
531	–	if (img)
532	–	XDestroyImage(img);
721		if (have_shm) {
722		XShmDetach(x_display, &shminfo);
723	+	#ifdef ENABLE_VOSF
724	+	the_host_buffer = NULL; // don't free() in driver_base dtor
725	+	#else
726		the_buffer_copy = NULL; // don't free() in driver_base dtor
727	+	#endif
728	+	}
729	+	if (img) {
730	+	if (!have_shm)
731	+	img->data = NULL;
732	+	XDestroyImage(img);
733	+	}
734	+	if (have_shm) {
735	+	shmdt(shminfo.shmaddr);
736	+	shmctl(shminfo.shmid, IPC_RMID, 0);
737		}
738		if (gc)
739		XFreeGC(x_display, gc);
740		}
741
742	+	// Toggle mouse grab
743	+	void driver_window::toggle_mouse_grab(void)
744	+	{
745	+	if (mouse_grabbed)
746	+	ungrab_mouse();
747	+	else
748	+	grab_mouse();
749	+	}
750	+
751	+	// Grab mouse, switch to relative mouse mode
752	+	void driver_window::grab_mouse(void)
753	+	{
754	+	int result;
755	+	for (int i=0; i<10; i++) {
756	+	result = XGrabPointer(x_display, w, True, 0,
757	+	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
758	+	if (result != AlreadyGrabbed)
759	+	break;
760	+	Delay_usec(100000);
761	+	}
762	+	if (result == GrabSuccess) {
763	+	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
764	+	ADBSetRelMouseMode(mouse_grabbed = true);
765	+	disable_mouse_accel();
766	+	}
767	+	}
768	+
769	+	// Ungrab mouse, switch to absolute mouse mode
770	+	void driver_window::ungrab_mouse(void)
771	+	{
772	+	if (mouse_grabbed) {
773	+	XUngrabPointer(x_display, CurrentTime);
774	+	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
775	+	ADBSetRelMouseMode(mouse_grabbed = false);
776	+	restore_mouse_accel();
777	+	}
778	+	}
779	+
780	+	// Mouse moved
781	+	void driver_window::mouse_moved(int x, int y)
782	+	{
783	+	if (!mouse_grabbed) {
784	+	mouse_last_x = x; mouse_last_y = y;
785	+	ADBMouseMoved(x, y);
786	+	return;
787	+	}
788	+
789	+	// Warped mouse motion (this code is taken from SDL)
790	+
791	+	// Post first mouse event
792	+	int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y;
793	+	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
794	+	mouse_last_x = x; mouse_last_y = y;
795	+	ADBMouseMoved(delta_x, delta_y);
796	+
797	+	// Only warp the pointer when it has reached the edge
798	+	const int MOUSE_FUDGE_FACTOR = 8;
799	+	if (x < MOUSE_FUDGE_FACTOR || x > (width - MOUSE_FUDGE_FACTOR)
800	+	|| y < MOUSE_FUDGE_FACTOR || y > (height - MOUSE_FUDGE_FACTOR)) {
801	+	XEvent event;
802	+	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
803	+	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
804	+	mouse_last_x = x; mouse_last_y = y;
805	+	ADBMouseMoved(delta_x, delta_y);
806	+	}
807	+	mouse_last_x = width/2;
808	+	mouse_last_y = height/2;
809	+	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
810	+	for (int i=0; i<10; i++) {
811	+	XMaskEvent(x_display, PointerMotionMask, &event);
812	+	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
813	+	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
814	+	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
815	+	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
816	+	break;
817	+	}
818	+	}
819	+	}
820	+
821
822		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
823		/*
#	Line 589 | Line 869 | void driver_dga::suspend(void)
869		#endif
870		XUngrabPointer(x_display, CurrentTime);
871		XUngrabKeyboard(x_display, CurrentTime);
872	+	restore_mouse_accel();
873		XUnmapWindow(x_display, w);
874		wait_unmapped(w);
875
#	Line 616 | Line 897 | void driver_dga::resume(void)
897		XMapRaised(x_display, w);
898		wait_mapped(w);
899		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
900	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
901	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
900	>	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
901	>	XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
902	>	disable_mouse_accel();
903		#ifdef ENABLE_XF86_DGA
904		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
905		XF86DGASetViewPort(x_display, screen, 0, 0);
#	Line 764 | Line 1046 | driver_fbdev::driver_fbdev(const video_m
1046		XGrabPointer(x_display, w, True,
1047		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
1048		GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1049	+	disable_mouse_accel();
1050
1051		// Calculate bytes per row
1052		int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1053
1054		// Map frame buffer
1055	<	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1056	<	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1055	>	the_buffer_size = height * bytes_per_row;
1056	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1057	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1058		char str[256];
1059		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1060		ErrorAlert(str);
#	Line 782 | Line 1066 | driver_fbdev::driver_fbdev(const video_m
1066		#if REAL_ADDRESSING || DIRECT_ADDRESSING
1067		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1068		// i.e. the framebuffer update function is not Blit_Copy_Raw
1069	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1069	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1070
1071		if (use_vosf) {
1072		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1073		the_host_buffer = the_buffer;
1074		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1075	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1075	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1076		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1077		}
1078		#else
#	Line 809 | Line 1093 | driver_fbdev::driver_fbdev(const video_m
1093		// Close display
1094		driver_fbdev::~driver_fbdev()
1095		{
1096	+	if (!use_vosf) {
1097	+	if (the_buffer != MAP_FAILED) {
1098	+	// don't free() the screen buffer in driver_base dtor
1099	+	munmap(the_buffer, the_buffer_size);
1100	+	the_buffer = NULL;
1101	+	}
1102	+	}
1103	+	#ifdef ENABLE_VOSF
1104	+	else {
1105	+	if (the_host_buffer != MAP_FAILED) {
1106	+	// don't free() the screen buffer in driver_base dtor
1107	+	munmap(the_host_buffer, the_buffer_size);
1108	+	the_host_buffer = NULL;
1109	+	}
1110	+	}
1111	+	#endif
1112		}
1113		#endif
1114
#	Line 878 | Line 1178 | driver_xf86dga::driver_xf86dga(const vid
1178		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1179		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1180		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1181	+	disable_mouse_accel();
1182
1183		int v_width, v_bank, v_size;
1184		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 894 | Line 1195 | driver_xf86dga::driver_xf86dga(const vid
1195
1196		// Init blitting routines
1197		int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1198	<	#ifdef VIDEO_VOSF
1198	>	#if VIDEO_VOSF
1199		#if REAL_ADDRESSING || DIRECT_ADDRESSING
1200		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1201		// i.e. the framebuffer update function is not Blit_Copy_Raw
1202	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1202	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1203
1204		if (use_vosf) {
1205		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1206		the_host_buffer = the_buffer;
1207		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1208	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1208	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1209		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1210		}
1211		#else
#	Line 925 | Line 1226 | driver_xf86dga::driver_xf86dga(const vid
1226		driver_xf86dga::~driver_xf86dga()
1227		{
1228		XF86DGADirectVideo(x_display, screen, 0);
1229	+	if (!use_vosf) {
1230	+	// don't free() the screen buffer in driver_base dtor
1231	+	the_buffer = NULL;
1232	+	}
1233	+	#ifdef ENABLE_VOSF
1234	+	else {
1235	+	// don't free() the screen buffer in driver_base dtor
1236	+	the_host_buffer = NULL;
1237	+	}
1238	+	#endif
1239		#ifdef ENABLE_XF86_VIDMODE
1240		if (has_vidmode)
1241		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
#	Line 1022 | Line 1333 | static void keycode_init(void)
1333		// Open display for specified mode
1334		static bool video_open(const video_mode &mode)
1335		{
1336	+	D(bug("video_open()\n"));
1337	+
1338	+	// Find best available X visual
1339	+	if (!find_visual_for_depth(mode.depth)) {
1340	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1341	+	return false;
1342	+	}
1343	+
1344	+	// Create color maps
1345	+	if (color_class == PseudoColor || color_class == DirectColor) {
1346	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1347	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1348	+	} else {
1349	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1350	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1351	+	}
1352	+
1353	+	// Find pixel format of direct modes
1354	+	if (color_class == DirectColor || color_class == TrueColor) {
1355	+	rshift = gshift = bshift = 0;
1356	+	rloss = gloss = bloss = 8;
1357	+	uint32 mask;
1358	+	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1359	+	++rshift;
1360	+	for (; mask&1; mask>>=1)
1361	+	--rloss;
1362	+	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1363	+	++gshift;
1364	+	for (; mask&1; mask>>=1)
1365	+	--gloss;
1366	+	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1367	+	++bshift;
1368	+	for (; mask&1; mask>>=1)
1369	+	--bloss;
1370	+	}
1371	+
1372	+	// Preset palette pixel values for CLUT or gamma table
1373	+	if (color_class == DirectColor) {
1374	+	int num = vis->map_entries;
1375	+	for (int i=0; i<num; i++) {
1376	+	int c = (i * 256) / num;
1377	+	palette[i].pixel = map_rgb(c, c, c);
1378	+	palette[i].flags = DoRed | DoGreen | DoBlue;
1379	+	}
1380	+	} else if (color_class == PseudoColor) {
1381	+	for (int i=0; i<256; i++) {
1382	+	palette[i].pixel = i;
1383	+	palette[i].flags = DoRed | DoGreen | DoBlue;
1384	+	}
1385	+	}
1386	+
1387	+	// Load gray ramp to color map
1388	+	int num = (color_class == DirectColor ? vis->map_entries : 256);
1389	+	for (int i=0; i<num; i++) {
1390	+	int c = (i * 256) / num;
1391	+	palette[i].red = c * 0x0101;
1392	+	palette[i].green = c * 0x0101;
1393	+	palette[i].blue = c * 0x0101;
1394	+	}
1395	+	if (color_class == PseudoColor || color_class == DirectColor) {
1396	+	XStoreColors(x_display, cmap[0], palette, num);
1397	+	XStoreColors(x_display, cmap[1], palette, num);
1398	+	}
1399	+
1400	+	#ifdef ENABLE_VOSF
1401	+	// Load gray ramp to 8->16/32 expand map
1402	+	if (!IsDirectMode(mode) && xdepth > 8)
1403	+	for (int i=0; i<256; i++)
1404	+	ExpandMap[i] = map_rgb(i, i, i);
1405	+	#endif
1406	+
1407		// Create display driver object of requested type
1408		switch (display_type) {
1409		case DISPLAY_WINDOW:
#	Line 1048 | Line 1430 | static bool video_open(const video_mode
1430
1431		#ifdef ENABLE_VOSF
1432		if (use_vosf) {
1433	<	// Initialize the mainBuffer structure
1434	<	if (!video_init_buffer()) {
1433	>	// Initialize the VOSF system
1434	>	if (!video_vosf_init()) {
1435		ErrorAlert(STR_VOSF_INIT_ERR);
1436		return false;
1437		}
1056	–
1057	–	// Initialize the handler for SIGSEGV
1058	–	if (!sigsegv_install_handler(screen_fault_handler)) {
1059	–	ErrorAlert("Could not initialize Video on SEGV signals");
1060	–	return false;
1061	–	}
1438		}
1439		#endif
1440
#	Line 1109 | Line 1485 | bool VideoInit(bool classic)
1485		// Find screen and root window
1486		screen = XDefaultScreen(x_display);
1487		rootwin = XRootWindow(x_display, screen);
1488	<
1489	<	// Get screen depth
1490	<	xdepth = DefaultDepth(x_display, screen);
1488	>
1489	>	// Get sorted list of available depths
1490	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1491	>	if (avail_depths == NULL) {
1492	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1493	>	return false;
1494	>	}
1495	>	sort(avail_depths, avail_depths + num_depths);
1496
1497		#ifdef ENABLE_FBDEV_DGA
1498		// Frame buffer name
#	Line 1151 | Line 1532 | bool VideoInit(bool classic)
1532		black_pixel = BlackPixel(x_display, screen);
1533		white_pixel = WhitePixel(x_display, screen);
1534
1154	–	// Get appropriate visual
1155	–	int color_class;
1156	–	switch (xdepth) {
1157	–	case 1:
1158	–	color_class = StaticGray;
1159	–	break;
1160	–	case 8:
1161	–	color_class = PseudoColor;
1162	–	break;
1163	–	case 15:
1164	–	case 16:
1165	–	case 24:
1166	–	case 32: // Try DirectColor first, as this will allow gamma correction
1167	–	color_class = DirectColor;
1168	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo))
1169	–	color_class = TrueColor;
1170	–	break;
1171	–	default:
1172	–	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1173	–	return false;
1174	–	}
1175	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1176	–	ErrorAlert(STR_NO_XVISUAL_ERR);
1177	–	return false;
1178	–	}
1179	–	if (visualInfo.depth != xdepth) {
1180	–	ErrorAlert(STR_NO_XVISUAL_ERR);
1181	–	return false;
1182	–	}
1183	–	vis = visualInfo.visual;
1184	–
1185	–	// Create color maps
1186	–	if (color_class == PseudoColor || color_class == DirectColor) {
1187	–	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1188	–	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1189	–
1190	–	int num = 256;
1191	–	if (color_class == DirectColor) {
1192	–	num = vis->map_entries;
1193	–
1194	–	// Preset pixel values for gamma table
1195	–	uint32 rmask = vis->red_mask, gmask = vis->green_mask, bmask = vis->blue_mask;
1196	–	uint32 mask;
1197	–	int rloss = 8, rshift = 0;
1198	–	for (mask=rmask; !(mask&1); mask>>=1)
1199	–	++rshift;
1200	–	for (; mask&1; mask>>=1)
1201	–	--rloss;
1202	–	int gloss = 8, gshift = 0;
1203	–	for (mask=gmask; !(mask&1); mask>>=1)
1204	–	++gshift;
1205	–	for (; mask&1; mask>>=1)
1206	–	--gloss;
1207	–	int bloss = 8, bshift = 0;
1208	–	for (mask=bmask; !(mask&1); mask>>=1)
1209	–	++bshift;
1210	–	for (; mask&1; mask>>=1)
1211	–	--bloss;
1212	–	for (int i=0; i<num; i++) {
1213	–	int c = (i * 256) / num;
1214	–	palette[i].pixel = ((c >> rloss) << rshift) | ((c >> gloss) << gshift) | ((c >> bloss) << bshift);
1215	–	}
1216	–	}
1217	–
1218	–	// Load gray ramp
1219	–	for (int i=0; i<num; i++) {
1220	–	int c = (i * 256) / num;
1221	–	palette[i].red = c * 0x0101;
1222	–	palette[i].green = c * 0x0101;
1223	–	palette[i].blue = c * 0x0101;
1224	–	if (color_class == PseudoColor)
1225	–	palette[i].pixel = i;
1226	–	palette[i].flags = DoRed | DoGreen | DoBlue;
1227	–	}
1228	–	XStoreColors(x_display, cmap[0], palette, num);
1229	–	}
1230	–
1535		// Get screen mode from preferences
1536		const char *mode_str;
1537		if (classic_mode)
#	Line 1261 | Line 1565 | bool VideoInit(bool classic)
1565		else if (default_height > DisplayHeight(x_display, screen))
1566		default_height = DisplayHeight(x_display, screen);
1567
1568	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1569	<	int depth = (classic_mode ? 1 : xdepth);
1570	<	video_depth depth_mode = DepthModeForPixelDepth(depth);
1568	>	// Mac screen depth follows X depth
1569	>	video_depth default_depth = VDEPTH_1BIT;
1570	>	switch (DefaultDepth(x_display, screen)) {
1571	>	case 8:
1572	>	default_depth = VDEPTH_8BIT;
1573	>	break;
1574	>	case 15: case 16:
1575	>	default_depth = VDEPTH_16BIT;
1576	>	break;
1577	>	case 24: case 32:
1578	>	default_depth = VDEPTH_32BIT;
1579	>	break;
1580	>	}
1581
1582		// Construct list of supported modes
1583		if (display_type == DISPLAY_WINDOW) {
1584		if (classic)
1585	<	add_mode(512, 342, 0x80, 64, depth_mode);
1585	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1586		else {
1587	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth_mode), depth_mode);
1588	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth_mode), depth_mode);
1589	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth_mode), depth_mode);
1590	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth_mode), depth_mode);
1277	<	add_mode(1280, 1024, 0x84, TrivialBytesPerRow(1280, depth_mode), depth_mode);
1587	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1588	>	if (find_visual_for_depth(video_depth(d)))
1589	>	add_window_modes(video_depth(d));
1590	>	}
1591		}
1592		} else
1593	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, depth_mode), depth_mode);
1593	>	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1594	>	if (VideoModes.empty()) {
1595	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1596	>	return false;
1597	>	}
1598	>	video_init_depth_list();
1599	>
1600	>	#if DEBUG
1601	>	D(bug("Available video modes:\n"));
1602	>	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1603	>	while (i != end) {
1604	>	int bits = 1 << i->depth;
1605	>	if (bits == 16)
1606	>	bits = 15;
1607	>	else if (bits == 32)
1608	>	bits = 24;
1609	>	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1610	>	++i;
1611	>	}
1612	>	#endif
1613
1614		// Find requested default mode and open display
1615		if (VideoModes.size() == 1)
1616		return video_open(VideoModes[0]);
1617		else {
1618		// Find mode with specified dimensions
1619	<	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1620	<	while (i != end) {
1621	<	if (i->x == default_width && i->y == default_height)
1619	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1620	>	for (i = VideoModes.begin(); i != end; ++i) {
1621	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1622		return video_open(*i);
1291	–	++i;
1623		}
1624		return video_open(VideoModes[0]);
1625		}
#	Line 1302 | Line 1633 | bool VideoInit(bool classic)
1633		// Close display
1634		static void video_close(void)
1635		{
1636	+	D(bug("video_close()\n"));
1637	+
1638		// Stop redraw thread
1639		#ifdef HAVE_PTHREADS
1640		if (redraw_thread_active) {
#	Line 1317 | Line 1650 | static void video_close(void)
1650		// Unlock frame buffer
1651		UNLOCK_FRAME_BUFFER;
1652		XSync(x_display, false);
1653	+	D(bug(" frame buffer unlocked\n"));
1654
1655		#ifdef ENABLE_VOSF
1322	–	// Deinitialize VOSF
1656		if (use_vosf) {
1657	<	if (mainBuffer.pageInfo) {
1658	<	free(mainBuffer.pageInfo);
1326	<	mainBuffer.pageInfo = NULL;
1327	<	}
1328	<	if (mainBuffer.dirtyPages) {
1329	<	free(mainBuffer.dirtyPages);
1330	<	mainBuffer.dirtyPages = NULL;
1331	<	}
1657	>	// Deinitialize VOSF
1658	>	video_vosf_exit();
1659		}
1660		#endif
1661
1662		// Close display
1663		delete drv;
1664		drv = NULL;
1338	–	}
1339	–
1340	–	void VideoExit(void)
1341	–	{
1342	–	// Close display
1343	–	video_close();
1665
1666		// Free colormaps
1667		if (cmap[0]) {
#	Line 1351 | Line 1672 | void VideoExit(void)
1672		XFreeColormap(x_display, cmap[1]);
1673		cmap[1] = 0;
1674		}
1675	+	}
1676	+
1677	+	void VideoExit(void)
1678	+	{
1679	+	// Close display
1680	+	video_close();
1681
1682		#ifdef ENABLE_XF86_VIDMODE
1683		// Free video mode list
#	Line 1367 | Line 1694 | void VideoExit(void)
1694		fbdev_fd = -1;
1695		}
1696		#endif
1697	+
1698	+	// Free depth list
1699	+	if (avail_depths) {
1700	+	XFree(avail_depths);
1701	+	avail_depths = NULL;
1702	+	}
1703		}
1704
1705
#	Line 1402 | Line 1735 | void VideoInterrupt(void)
1735		*  Set palette
1736		*/
1737
1738	<	void video_set_palette(uint8 *pal)
1738	>	void video_set_palette(uint8 *pal, int num_in)
1739		{
1740		LOCK_PALETTE;
1741
1742		// Convert colors to XColor array
1743	<	int num_in = 256, num_out = 256;
1744	<	if (VideoMonitor.mode.depth == VDEPTH_16BIT)
1412	<	num_in = 32;
1743	>	int num_out = 256;
1744	>	bool stretch = false;
1745		if (IsDirectMode(VideoMonitor.mode)) {
1746	<	// If X is in 565 mode we have to stretch the palette from 32 to 64 entries
1746	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1747		num_out = vis->map_entries;
1748	+	stretch = true;
1749		}
1750		XColor *p = palette;
1751		for (int i=0; i<num_out; i++) {
1752	<	int c = (i * num_in) / num_out;
1752	>	int c = (stretch ? (i * num_in) / num_out : i);
1753		p->red = pal[c*3 + 0] * 0x0101;
1754		p->green = pal[c*3 + 1] * 0x0101;
1755		p->blue = pal[c*3 + 2] * 0x0101;
1423	–	if (!IsDirectMode(VideoMonitor.mode))
1424	–	p->pixel = i;
1425	–	p->flags = DoRed | DoGreen | DoBlue;
1756		p++;
1757		}
1758
1759	+	#ifdef ENABLE_VOSF
1760	+	// Recalculate pixel color expansion map
1761	+	if (!IsDirectMode(VideoMonitor.mode) && xdepth > 8) {
1762	+	for (int i=0; i<256; i++) {
1763	+	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1764	+	ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]);
1765	+	}
1766	+
1767	+	// We have to redraw everything because the interpretation of pixel values changed
1768	+	LOCK_VOSF;
1769	+	PFLAG_SET_ALL;
1770	+	UNLOCK_VOSF;
1771	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1772	+	}
1773	+	#endif
1774	+
1775		// Tell redraw thread to change palette
1776		palette_changed = true;
1777
#	Line 1451 | Line 1797 | void video_switch_to_mode(const video_mo
1797
1798
1799		/*
1800	<	*  Translate key event to Mac keycode
1800	>	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1801	>	*  and -2 if the key was recognized as a hotkey
1802		*/
1803
1804	<	static int kc_decode(KeySym ks)
1804	>	static int kc_decode(KeySym ks, bool key_down)
1805		{
1806		switch (ks) {
1807		case XK_A: case XK_a: return 0x00;
#	Line 1507 | Line 1854 | static int kc_decode(KeySym ks)
1854		case XK_period: case XK_greater: return 0x2f;
1855		case XK_slash: case XK_question: return 0x2c;
1856
1857	<	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1511	<	case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30;
1512	<	#else
1513	<	case XK_Tab: return 0x30;
1514	<	#endif
1857	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1858		case XK_Return: return 0x24;
1859		case XK_space: return 0x31;
1860		case XK_BackSpace: return 0x33;
#	Line 1545 | Line 1888 | static int kc_decode(KeySym ks)
1888		case XK_Left: return 0x3b;
1889		case XK_Right: return 0x3c;
1890
1891	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1891	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1892
1893	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1893	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1894		case XK_F2: return 0x78;
1895		case XK_F3: return 0x63;
1896		case XK_F4: return 0x76;
1897	<	case XK_F5: return 0x60;
1897	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1898		case XK_F6: return 0x61;
1899		case XK_F7: return 0x62;
1900		case XK_F8: return 0x64;
#	Line 1599 | Line 1942 | static int kc_decode(KeySym ks)
1942		return -1;
1943		}
1944
1945	<	static int event2keycode(XKeyEvent &ev)
1945	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1946		{
1947		KeySym ks;
1605	–	int as;
1948		int i = 0;
1949
1950		do {
1951		ks = XLookupKeysym(&ev, i++);
1952	<	as = kc_decode(ks);
1953	<	if (as != -1)
1952	>	int as = kc_decode(ks, key_down);
1953	>	if (as >= 0)
1954	>	return as;
1955	>	if (as == -2)
1956		return as;
1957		} while (ks != NoSymbol);
1958
#	Line 1627 | Line 1971 | static void handle_events(void)
1971		XNextEvent(x_display, &event);
1972
1973		switch (event.type) {
1974	+
1975		// Mouse button
1976		case ButtonPress: {
1977		unsigned int button = event.xbutton.button;
#	Line 1655 | Line 2000 | static void handle_events(void)
2000		}
2001
2002		// Mouse moved
1658	–	case EnterNotify:
2003		case MotionNotify:
2004	<	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
2004	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2005	>	break;
2006	>
2007	>	// Mouse entered window
2008	>	case EnterNotify:
2009	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2010	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2011		break;
2012
2013		// Keyboard
2014		case KeyPress: {
2015	<	int code;
2015	>	int code = -1;
2016		if (use_keycodes) {
2017	<	event2keycode(event.xkey);      // This is called to process the hotkeys
2018	<	code = keycode_table[event.xkey.keycode & 0xff];
2017	>	if (event2keycode(event.xkey, true) != -2)      // This is called to process the hotkeys
2018	>	code = keycode_table[event.xkey.keycode & 0xff];
2019		} else
2020	<	code = event2keycode(event.xkey);
2021	<	if (code != -1) {
2020	>	code = event2keycode(event.xkey, true);
2021	>	if (code >= 0) {
2022		if (!emul_suspended) {
2023		if (code == 0x39) {     // Caps Lock pressed
2024		if (caps_on) {
#	Line 1690 | Line 2040 | static void handle_events(void)
2040		break;
2041		}
2042		case KeyRelease: {
2043	<	int code;
2043	>	int code = -1;
2044		if (use_keycodes) {
2045	<	event2keycode(event.xkey);      // This is called to process the hotkeys
2046	<	code = keycode_table[event.xkey.keycode & 0xff];
2045	>	if (event2keycode(event.xkey, false) != -2)     // This is called to process the hotkeys
2046	>	code = keycode_table[event.xkey.keycode & 0xff];
2047		} else
2048	<	code = event2keycode(event.xkey);
2049	<	if (code != -1 && code != 0x39) {       // Don't propagate Caps Lock releases
2048	>	code = event2keycode(event.xkey, false);
2049	>	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
2050		ADBKeyUp(code);
2051		if (code == 0x36)
2052		ctrl_down = false;
#	Line 1837 | Line 2187 | static void update_display_dynamic(int t
2187		static void update_display_static(driver_window *drv)
2188		{
2189		// Incremental update code
2190	<	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2190	>	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
2191		int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2192		int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2193		uint8 *p, *p2;
#	Line 1960 | Line 2310 | static void update_display_static(driver
2310
2311		static inline void possibly_quit_dga_mode()
2312		{
2313	<	// Quit DGA mode if requested
2313	>	// Quit DGA mode if requested (something terrible has happened and we
2314	>	// want to give control back to the user)
2315		if (quit_full_screen) {
2316		quit_full_screen = false;
2317		delete drv;
#	Line 1968 | Line 2319 | static inline void possibly_quit_dga_mod
2319		}
2320		}
2321
2322	+	static inline void possibly_ungrab_mouse()
2323	+	{
2324	+	// Ungrab mouse if requested (something terrible has happened and we
2325	+	// want to give control back to the user)
2326	+	if (quit_full_screen) {
2327	+	quit_full_screen = false;
2328	+	if (drv)
2329	+	drv->ungrab_mouse();
2330	+	}
2331	+	}
2332	+
2333		static inline void handle_palette_changes(void)
2334		{
2335		LOCK_PALETTE;
#	Line 1984 | Line 2346 | static void video_refresh_dga(void)
2346		{
2347		// Quit DGA mode if requested
2348		possibly_quit_dga_mode();
1987	–
1988	–	// Handle X events
1989	–	handle_events();
1990	–
1991	–	// Handle palette changes
1992	–	handle_palette_changes();
2349		}
2350
2351		#ifdef ENABLE_VOSF
#	Line 1999 | Line 2355 | static void video_refresh_dga_vosf(void)
2355		// Quit DGA mode if requested
2356		possibly_quit_dga_mode();
2357
2002	–	// Handle X events
2003	–	handle_events();
2004	–
2005	–	// Handle palette changes
2006	–	handle_palette_changes();
2007	–
2358		// Update display (VOSF variant)
2359		static int tick_counter = 0;
2360		if (++tick_counter >= frame_skip) {
#	Line 2020 | Line 2370 | static void video_refresh_dga_vosf(void)
2370
2371		static void video_refresh_window_vosf(void)
2372		{
2373	<	// Quit DGA mode if requested
2374	<	possibly_quit_dga_mode();
2025	<
2026	<	// Handle X events
2027	<	handle_events();
2028	<
2029	<	// Handle palette changes
2030	<	handle_palette_changes();
2373	>	// Ungrab mouse if requested
2374	>	possibly_ungrab_mouse();
2375
2376		// Update display (VOSF variant)
2377		static int tick_counter = 0;
#	Line 2045 | Line 2389 | static void video_refresh_window_vosf(vo
2389
2390		static void video_refresh_window_static(void)
2391		{
2392	<	// Handle X events
2393	<	handle_events();
2394	<
2051	<	// Handle_palette changes
2052	<	handle_palette_changes();
2053	<
2392	>	// Ungrab mouse if requested
2393	>	possibly_ungrab_mouse();
2394	>
2395		// Update display (static variant)
2396		static int tick_counter = 0;
2397		if (++tick_counter >= frame_skip) {
#	Line 2061 | Line 2402 | static void video_refresh_window_static(
2402
2403		static void video_refresh_window_dynamic(void)
2404		{
2405	<	// Handle X events
2406	<	handle_events();
2407	<
2067	<	// Handle_palette changes
2068	<	handle_palette_changes();
2069	<
2405	>	// Ungrab mouse if requested
2406	>	possibly_ungrab_mouse();
2407	>
2408		// Update display (dynamic variant)
2409		static int tick_counter = 0;
2410		tick_counter++;
#	Line 2102 | Line 2440 | static void VideoRefreshInit(void)
2440		}
2441		}
2442
2443	+	// This function is called on non-threaded platforms from a timer interrupt
2444		void VideoRefresh(void)
2445		{
2446		// We need to check redraw_thread_active to inhibit refreshed during
2447		// mode changes on non-threaded platforms
2448	<	if (redraw_thread_active)
2449	<	video_refresh();
2448	>	if (!redraw_thread_active)
2449	>	return;
2450	>
2451	>	// Handle X events
2452	>	handle_events();
2453	>
2454	>	// Handle palette changes
2455	>	handle_palette_changes();
2456	>
2457	>	// Update display
2458	>	video_refresh();
2459		}
2460
2461	+	const int VIDEO_REFRESH_HZ = 60;
2462	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2463	+
2464		#ifdef HAVE_PTHREADS
2465		static void *redraw_func(void *arg)
2466		{
2467	+	int fd = ConnectionNumber(x_display);
2468	+
2469		uint64 start = GetTicks_usec();
2470		int64 ticks = 0;
2471	<	uint64 next = GetTicks_usec();
2471	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2472	>
2473		while (!redraw_thread_cancel) {
2474	<	video_refresh();
2121	<	next += 16667;
2474	>
2475		int64 delay = next - GetTicks_usec();
2476	<	if (delay > 0)
2477	<	Delay_usec(delay);
2478	<	else if (delay < -16667)
2476	>	if (delay < -VIDEO_REFRESH_DELAY) {
2477	>
2478	>	// We are lagging far behind, so we reset the delay mechanism
2479		next = GetTicks_usec();
2480	<	ticks++;
2480	>
2481	>	} else if (delay <= 0) {
2482	>
2483	>	// Delay expired, refresh display
2484	>	handle_events();
2485	>	handle_palette_changes();
2486	>	video_refresh();
2487	>	next += VIDEO_REFRESH_DELAY;
2488	>	ticks++;
2489	>
2490	>	} else {
2491	>
2492	>	// No display refresh pending, check for X events
2493	>	fd_set readfds;
2494	>	FD_ZERO(&readfds);
2495	>	FD_SET(fd, &readfds);
2496	>	struct timeval timeout;
2497	>	timeout.tv_sec = 0;
2498	>	timeout.tv_usec = delay;
2499	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2500	>	handle_events();
2501	>	}
2502		}
2503	+
2504		uint64 end = GetTicks_usec();
2505	<	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2505	>	D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2506		return NULL;
2507		}
2508		#endif

Diff Legend

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