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.52 by cebix, 2001-07-03T19:20:46Z

#	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 72 | Line 73 | enum {
73
74		// Constants
75		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
76	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
76	>
77	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ExposureMask | StructureNotifyMask;
78	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
79
80
81		// Global variables
82		static int32 frame_skip;                                                        // Prefs items
83	<	static int16 mouse_wheel_mode = 1;
84	<	static int16 mouse_wheel_lines = 3;
83	>	static int16 mouse_wheel_mode;
84	>	static int16 mouse_wheel_lines;
85
86		static int display_type = DISPLAY_WINDOW;                       // See enum above
87		static bool local_X11;                                                          // Flag: X server running on local machine?
88	<	static uint8 *the_buffer;                                                       // Mac frame buffer
88	>	static uint8 *the_buffer = NULL;                                        // Mac frame buffer (where MacOS draws into)
89	>	static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer (for refreshed modes)
90
87	–	#ifdef HAVE_PTHREADS
91		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
92	+	#ifdef HAVE_PTHREADS
93		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
94		static pthread_t redraw_thread;                                         // Redraw thread
95		#endif
#	Line 93 | Line 97 | static pthread_t redraw_thread;                                                //
97		static bool has_dga = false;                                            // Flag: Video DGA capable
98		static bool has_vidmode = false;                                        // Flag: VidMode extension available
99
100	+	#ifdef ENABLE_VOSF
101	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
102	+	#else
103	+	static const bool use_vosf = false;                                     // VOSF not possible
104	+	#endif
105	+
106		static bool ctrl_down = false;                                          // Flag: Ctrl key pressed
107		static bool caps_on = false;                                            // Flag: Caps Lock on
108		static bool quit_full_screen = false;                           // Flag: DGA close requested from redraw thread
#	Line 107 | Line 117 | static int keycode_table[256];                                         // X
117		// X11 variables
118		static int screen;                                                                      // Screen number
119		static int xdepth;                                                                      // Depth of X screen
120	<	static Window rootwin, the_win;                                         // Root window and our window
120	>	static Window rootwin;                                                          // Root window and our window
121		static XVisualInfo visualInfo;
122		static Visual *vis;
123	<	static Colormap cmap[2];                                                        // Two colormaps (DGA) for 8-bit mode
114	<	static bool cmap_allocated = false;
123	>	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
124		static XColor black, white;
125		static unsigned long black_pixel, white_pixel;
126		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;
127
128	<	static XColor palette[256];                                                     // Color palette for 8-bit mode
128	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
129	>
130	>	static XColor palette[256];                                                     // Color palette to be used as CLUT and gamma table
131		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
132	+
133	+	#ifdef ENABLE_FBDEV_DGA
134	+	static int fbdev_fd = -1;
135	+	#endif
136	+
137	+	#ifdef ENABLE_XF86_VIDMODE
138	+	static XF86VidModeModeInfo **x_video_modes = NULL;      // Array of all available modes
139	+	static int num_x_video_modes;
140	+	#endif
141	+
142	+	// Mutex to protect palette
143		#ifdef HAVE_PTHREADS
144	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
144	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
145		#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
146		#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
147		#else
#	Line 130 | Line 149 | static pthread_mutex_t palette_lock = PT
149		#define UNLOCK_PALETTE
150		#endif
151
152	<	// 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
152	>	// Mutex to protect frame buffer
153		#ifdef HAVE_PTHREADS
154	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
154	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
155		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
156		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
157		#else
#	Line 155 | Line 159 | static pthread_mutex_t frame_buffer_lock
159		#define UNLOCK_FRAME_BUFFER
160		#endif
161
162	<	// Variables for fbdev DGA mode
163	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
164	<	static int fbdev_fd;
165	<
166	<	#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
162	>	// Variables for non-VOSF incremental refresh
163	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
164	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
165	>	static bool updt_box[17][17];
166	>	static int nr_boxes;
167
168	<	// VideoRefresh function
168	>	// Video refresh function
169		static void VideoRefreshInit(void);
170		static void (*video_refresh)(void);
171
172	+
173		// Prototypes
174		static void *redraw_func(void *arg);
175		static int event2keycode(XKeyEvent &ev);
#	Line 187 | Line 182 | extern Display *x_display;
182		extern void SysMountFirstFloppy(void);
183
184
190	–	#ifdef ENABLE_VOSF
191	–	# include "video_vosf.h"
192	–	#endif
193	–
194	–
185		/*
186	<	*  Initialization
186	>	*  Utility functions
187		*/
188
189	+	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
190	+	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
191	+	{
192	+	return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift);
193	+	}
194	+
195		// Add mode to list of supported modes
196		static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
197		{
#	Line 208 | Line 204 | static void add_mode(uint32 width, uint3
204		VideoModes.push_back(mode);
205		}
206
207	+	// Add standard list of windowed modes for given color depth
208	+	static void add_window_modes(video_depth depth)
209	+	{
210	+	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
211	+	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
212	+	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
213	+	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
214	+	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
215	+	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
216	+	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
217	+	}
218	+
219		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
220		static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
221		{
#	Line 216 | Line 224 | static void set_mac_frame_buffer(video_d
224		if (depth == VDEPTH_16BIT)
225		layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
226		else if (depth == VDEPTH_32BIT)
227	<	layour = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
227	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
228		if (native_byte_order)
229		MacFrameLayout = layout;
230		else
231		MacFrameLayout = FLAYOUT_DIRECT;
232		VideoMonitor.mac_frame_base = MacFrameBaseMac;
233	+
234	+	// Set variables used by UAE memory banking
235	+	MacFrameBaseHost = the_buffer;
236	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
237	+	InitFrameBufferMapping();
238		#else
239		VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
240		D(bug("Host frame buffer = %p, ", the_buffer));
#	Line 260 | Line 273 | static void set_window_focus(Window w)
273		}
274
275		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
276	+	static Atom WM_DELETE_WINDOW = (Atom)0;
277		static void set_window_delete_protocol(Window w)
278		{
279		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 296 | Line 310 | static int error_handler(Display *d, XEr
310		return old_error_handler(d, e);
311		}
312
313	<	// Init window mode
314	<	static bool init_window(const video_mode &mode)
313	>
314	>	/*
315	>	*  Display "driver" classes
316	>	*/
317	>
318	>	class driver_base {
319	>	public:
320	>	driver_base();
321	>	virtual ~driver_base();
322	>
323	>	virtual void update_palette(void);
324	>	virtual void suspend(void) {}
325	>	virtual void resume(void) {}
326	>	virtual void toggle_mouse_grab(void) {}
327	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
328	>
329	>	virtual void grab_mouse(void) {}
330	>	virtual void ungrab_mouse(void) {}
331	>
332	>	public:
333	>	bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
334	>	Window w;               // The window we draw into
335	>	};
336	>
337	>	class driver_window;
338	>	static void update_display_window_vosf(driver_window *drv);
339	>	static void update_display_dynamic(int ticker, driver_window *drv);
340	>	static void update_display_static(driver_window *drv);
341	>
342	>	class driver_window : public driver_base {
343	>	friend void update_display_window_vosf(driver_window *drv);
344	>	friend void update_display_dynamic(int ticker, driver_window *drv);
345	>	friend void update_display_static(driver_window *drv);
346	>
347	>	public:
348	>	driver_window(const video_mode &mode);
349	>	~driver_window();
350	>
351	>	void toggle_mouse_grab(void);
352	>	void mouse_moved(int x, int y);
353	>
354	>	void grab_mouse(void);
355	>	void ungrab_mouse(void);
356	>
357	>	private:
358	>	GC gc;
359	>	XImage *img;
360	>	bool have_shm;                                  // Flag: SHM extensions available
361	>	XShmSegmentInfo shminfo;
362	>	Cursor mac_cursor;
363	>	bool mouse_grabbed;                             // Flag: mouse pointer grabbed, using relative mouse mode
364	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
365	>	};
366	>
367	>	static driver_base *drv = NULL; // Pointer to currently used driver object
368	>
369	>	#ifdef ENABLE_VOSF
370	>	# include "video_vosf.h"
371	>	#endif
372	>
373	>	driver_base::driver_base()
374	>	: init_ok(false), w(0)
375	>	{
376	>	the_buffer = NULL;
377	>	the_buffer_copy = NULL;
378	>	}
379	>
380	>	driver_base::~driver_base()
381	>	{
382	>	ungrab_mouse();
383	>
384	>	if (w) {
385	>	XUnmapWindow(x_display, w);
386	>	wait_unmapped(w);
387	>	XDestroyWindow(x_display, w);
388	>	}
389	>
390	>	XFlush(x_display);
391	>	XSync(x_display, false);
392	>
393	>	// Free frame buffer(s)
394	>	if (!use_vosf) {
395	>	if (the_buffer) {
396	>	free(the_buffer);
397	>	the_buffer = NULL;
398	>	}
399	>	if (the_buffer_copy) {
400	>	free(the_buffer_copy);
401	>	the_buffer_copy = NULL;
402	>	}
403	>	}
404	>	#ifdef ENABLE_VOSF
405	>	else {
406	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
407	>	vm_release(the_buffer, the_buffer_size);
408	>	the_buffer = NULL;
409	>	}
410	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
411	>	vm_release(the_buffer_copy, the_buffer_size);
412	>	the_buffer_copy = NULL;
413	>	}
414	>	}
415	>	#endif
416	>	}
417	>
418	>	// Palette has changed
419	>	void driver_base::update_palette(void)
420	>	{
421	>	if (cmap[0] && cmap[1]) {
422	>	int num = 256;
423	>	if (IsDirectMode(VideoMonitor.mode))
424	>	num = vis->map_entries; // Palette is gamma table
425	>	else if (vis->c_class == DirectColor)
426	>	return; // Indexed mode on true color screen, don't set CLUT
427	>	XStoreColors(x_display, cmap[0], palette, num);
428	>	XStoreColors(x_display, cmap[1], palette, num);
429	>	}
430	>	XSync(x_display, false);
431	>	}
432	>
433	>
434	>	/*
435	>	*  Windowed display driver
436	>	*/
437	>
438	>	// Open display
439	>	driver_window::driver_window(const video_mode &mode)
440	>	: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0)
441		{
442		int width = mode.x, height = mode.y;
443		int aligned_width = (width + 15) & ~15;
444		int aligned_height = (height + 15) & ~15;
445
446		// Set absolute mouse mode
447	<	ADBSetRelMouseMode(false);
308	<
309	<	// Read frame skip prefs
310	<	frame_skip = PrefsFindInt32("frameskip");
447	>	ADBSetRelMouseMode(mouse_grabbed);
448
449		// Create window
450		XSetWindowAttributes wattr;
451		wattr.event_mask = eventmask = win_eventmask;
452		wattr.background_pixel = black_pixel;
453	<	wattr.colormap = cmap[0];
454	<
455	<	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);
453	>	wattr.colormap = (mode.depth == VDEPTH_1BIT && vis->c_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
454	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
455	>	InputOutput, vis, CWEventMask | CWBackPixel | (vis->c_class == PseudoColor || vis->c_class == DirectColor ? CWColormap : 0), &wattr);
456
457		// Set window name/class
458	<	set_window_name(the_win, STR_WINDOW_TITLE);
458	>	set_window_name(w, STR_WINDOW_TITLE);
459
460		// Indicate that we want keyboard input
461	<	set_window_focus(the_win);
461	>	set_window_focus(w);
462
463		// Set delete protocol property
464	<	set_window_delete_protocol(the_win);
464	>	set_window_delete_protocol(w);
465
466		// Make window unresizable
467		{
#	Line 336 | Line 472 | static bool init_window(const video_mode
472		hints->min_height = height;
473		hints->max_height = height;
474		hints->flags = PMinSize | PMaxSize;
475	<	XSetWMNormalHints(x_display, the_win, hints);
475	>	XSetWMNormalHints(x_display, w, hints);
476		XFree(hints);
477		}
478		}
479
480		// Show window
481	<	XMapWindow(x_display, the_win);
482	<	wait_mapped(the_win);
481	>	XMapWindow(x_display, w);
482	>	wait_mapped(w);
483	>
484	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
485	>	// use SHM because that doesn't allow changing the image byte order
486	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
487
488		// Try to create and attach SHM image
489	<	have_shm = false;
350	<	if (mode.depth != VDEPTH_1BIT && local_X11 && XShmQueryExtension(x_display)) {
489	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
490
491		// Create SHM image ("height + 2" for safety)
492		img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
#	Line 374 | Line 513 | static bool init_window(const video_mode
513
514		// Create normal X image if SHM doesn't work ("height + 2" for safety)
515		if (!have_shm) {
516	<	int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth);
516	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
517		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
518		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);
519		}
520
521	<	// 1-Bit mode is big-endian
383	<	if (mode.depth == VDEPTH_1BIT) {
521	>	if (need_msb_image) {
522		img->byte_order = MSBFirst;
523		img->bitmap_bit_order = MSBFirst;
524		}
#	Line 397 | Line 535 | static bool init_window(const video_mode
535		#endif
536
537		// Create GC
538	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
539	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
538	>	gc = XCreateGC(x_display, w, 0, 0);
539	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
540
541		// Create no_cursor
542		mac_cursor = XCreatePixmapCursor(x_display,
543	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
544	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
543	>	XCreatePixmap(x_display, w, 1, 1, 1),
544	>	XCreatePixmap(x_display, w, 1, 1, 1),
545		&black, &white, 0, 0);
546	<	XDefineCursor(x_display, the_win, mac_cursor);
546	>	XDefineCursor(x_display, w, mac_cursor);
547
548	<	// Add resolution and set VideoMonitor
548	>	// Init blitting routines
549		bool native_byte_order;
550		#ifdef WORDS_BIGENDIAN
551		native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#	Line 415 | Line 553 | static bool init_window(const video_mode
553		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
554		#endif
555		#ifdef ENABLE_VOSF
556	<	Screen_blitter_init(&visualInfo, native_byte_order);
556	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
557		#endif
558	+
559	+	// Set VideoMonitor
560		VideoMonitor.mode = mode;
561		set_mac_frame_buffer(mode.depth, native_byte_order);
562	<	return true;
562	>
563	>	// Everything went well
564	>	init_ok = true;
565	>	}
566	>
567	>	// Close display
568	>	driver_window::~driver_window()
569	>	{
570	>	if (img)
571	>	XDestroyImage(img);
572	>	if (have_shm) {
573	>	XShmDetach(x_display, &shminfo);
574	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
575	>	}
576	>	if (gc)
577	>	XFreeGC(x_display, gc);
578	>	}
579	>
580	>	// Toggle mouse grab
581	>	void driver_window::toggle_mouse_grab(void)
582	>	{
583	>	if (mouse_grabbed)
584	>	ungrab_mouse();
585	>	else
586	>	grab_mouse();
587	>	}
588	>
589	>	// Grab mouse, switch to relative mouse mode
590	>	void driver_window::grab_mouse(void)
591	>	{
592	>	int result;
593	>	for (int i=0; i<10; i++) {
594	>	result = XGrabPointer(x_display, w, True, 0,
595	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
596	>	if (result != AlreadyGrabbed)
597	>	break;
598	>	Delay_usec(100000);
599	>	}
600	>	if (result == GrabSuccess) {
601	>	ADBSetRelMouseMode(mouse_grabbed = true);
602	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
603	>	XSync(x_display, false);
604	>	}
605	>	}
606	>
607	>	// Ungrab mouse, switch to absolute mouse mode
608	>	void driver_window::ungrab_mouse(void)
609	>	{
610	>	if (mouse_grabbed) {
611	>	XUngrabPointer(x_display, CurrentTime);
612	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
613	>	ADBSetRelMouseMode(mouse_grabbed = false);
614	>	}
615	>	}
616	>
617	>	// Mouse moved
618	>	void driver_window::mouse_moved(int x, int y)
619	>	{
620	>	if (!mouse_grabbed) {
621	>	mouse_last_x = x; mouse_last_y = y;
622	>	ADBMouseMoved(x, y);
623	>	return;
624	>	}
625	>
626	>	// Warped mouse motion (this code is taken from SDL)
627	>
628	>	// Post first mouse event
629	>	int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y;
630	>	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
631	>	mouse_last_x = x; mouse_last_y = y;
632	>	ADBMouseMoved(delta_x, delta_y);
633	>
634	>	// Only warp the pointer when it has reached the edge
635	>	const int MOUSE_FUDGE_FACTOR = 8;
636	>	if (x < MOUSE_FUDGE_FACTOR || x > (width - MOUSE_FUDGE_FACTOR)
637	>	|| y < MOUSE_FUDGE_FACTOR || y > (height - MOUSE_FUDGE_FACTOR)) {
638	>	XEvent event;
639	>	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
640	>	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
641	>	mouse_last_x = x; mouse_last_y = y;
642	>	ADBMouseMoved(delta_x, delta_y);
643	>	}
644	>	mouse_last_x = width/2;
645	>	mouse_last_y = height/2;
646	>	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
647	>	for (int i=0; i<10; i++) {
648	>	XMaskEvent(x_display, PointerMotionMask, &event);
649	>	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
650	>	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
651	>	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
652	>	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
653	>	break;
654	>	}
655	>	}
656	>	}
657	>
658	>
659	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
660	>	/*
661	>	*  DGA display driver base class
662	>	*/
663	>
664	>	class driver_dga : public driver_base {
665	>	public:
666	>	driver_dga();
667	>	~driver_dga();
668	>
669	>	void suspend(void);
670	>	void resume(void);
671	>
672	>	private:
673	>	Window suspend_win;             // "Suspend" information window
674	>	void *fb_save;                  // Saved frame buffer for suspend/resume
675	>	};
676	>
677	>	driver_dga::driver_dga()
678	>	: suspend_win(0), fb_save(NULL)
679	>	{
680		}
681
682	<	// Init fbdev DGA display
426	<	static bool init_fbdev_dga(const video_mode &mode)
682	>	driver_dga::~driver_dga()
683		{
684	+	XUngrabPointer(x_display, CurrentTime);
685	+	XUngrabKeyboard(x_display, CurrentTime);
686	+	}
687	+
688	+	// Suspend emulation
689	+	void driver_dga::suspend(void)
690	+	{
691	+	// Release ctrl key
692	+	ADBKeyUp(0x36);
693	+	ctrl_down = false;
694	+
695	+	// Lock frame buffer (this will stop the MacOS thread)
696	+	LOCK_FRAME_BUFFER;
697	+
698	+	// Save frame buffer
699	+	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
700	+	if (fb_save)
701	+	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
702	+
703	+	// Close full screen display
704	+	#ifdef ENABLE_XF86_DGA
705	+	XF86DGADirectVideo(x_display, screen, 0);
706	+	#endif
707	+	XUngrabPointer(x_display, CurrentTime);
708	+	XUngrabKeyboard(x_display, CurrentTime);
709	+	XUnmapWindow(x_display, w);
710	+	wait_unmapped(w);
711	+
712	+	// Open "suspend" window
713	+	XSetWindowAttributes wattr;
714	+	wattr.event_mask = KeyPressMask;
715	+	wattr.background_pixel = black_pixel;
716	+
717	+	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
718	+	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
719	+	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
720	+	set_window_focus(suspend_win);
721	+	XMapWindow(x_display, suspend_win);
722	+	emul_suspended = true;
723	+	}
724	+
725	+	// Resume emulation
726	+	void driver_dga::resume(void)
727	+	{
728	+	// Close "suspend" window
729	+	XDestroyWindow(x_display, suspend_win);
730	+	XSync(x_display, false);
731	+
732	+	// Reopen full screen display
733	+	XMapRaised(x_display, w);
734	+	wait_mapped(w);
735	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
736	+	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
737	+	XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
738	+	#ifdef ENABLE_XF86_DGA
739	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
740	+	XF86DGASetViewPort(x_display, screen, 0, 0);
741	+	#endif
742	+	XSync(x_display, false);
743	+
744	+	// the_buffer already contains the data to restore. i.e. since a temporary
745	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
746	+	// not necessary.
747	+	#ifdef ENABLE_VOSF
748	+	if (use_vosf) {
749	+	LOCK_VOSF;
750	+	PFLAG_SET_ALL;
751	+	UNLOCK_VOSF;
752	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
753	+	}
754	+	#endif
755	+
756	+	// Restore frame buffer
757	+	if (fb_save) {
758	+	#ifdef ENABLE_VOSF
759	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
760	+	if (!use_vosf)
761	+	#endif
762	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
763	+	free(fb_save);
764	+	fb_save = NULL;
765	+	}
766	+
767	+	// Unlock frame buffer (and continue MacOS thread)
768	+	UNLOCK_FRAME_BUFFER;
769	+	emul_suspended = false;
770	+	}
771	+	#endif
772	+
773	+
774		#ifdef ENABLE_FBDEV_DGA
775	+	/*
776	+	*  fbdev DGA display driver
777	+	*/
778	+
779	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
780	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
781	+
782	+	class driver_fbdev : public driver_dga {
783	+	public:
784	+	driver_fbdev(const video_mode &mode);
785	+	~driver_fbdev();
786	+	};
787	+
788	+	// Open display
789	+	driver_fbdev::driver_fbdev(const video_mode &mode)
790	+	{
791		int width = mode.x, height = mode.y;
792
793	+	// Set absolute mouse mode
794	+	ADBSetRelMouseMode(false);
795	+
796		// Find the maximum depth available
797		int ndepths, max_depth(0);
798		int *depths = XListDepths(x_display, screen, &ndepths);
799		if (depths == NULL) {
800		printf("FATAL: Could not determine the maximal depth available\n");
801	<	return false;
801	>	return;
802		} else {
803		while (ndepths-- > 0) {
804		if (depths[ndepths] > max_depth)
#	Line 450 | Line 815 | static bool init_fbdev_dga(const video_m
815		char str[256];
816		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
817		ErrorAlert(str);
818	<	return false;
818	>	return;
819		}
820
821		int fb_depth;           // supported depth
#	Line 470 | Line 835 | static bool init_fbdev_dga(const video_m
835		continue;
836
837		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
838	<	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
838	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
839		device_found = true;
840		break;
841		}
#	Line 484 | Line 849 | static bool init_fbdev_dga(const video_m
849		char str[256];
850		sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
851		ErrorAlert(str);
852	<	return false;
852	>	return;
853		}
854
490	–	depth = fb_depth;
491	–
492	–	// Set relative mouse mode
493	–	ADBSetRelMouseMode(false);
494	–
855		// Create window
856		XSetWindowAttributes wattr;
857		wattr.event_mask = eventmask = dga_eventmask;
#	Line 499 | Line 859 | static bool init_fbdev_dga(const video_m
859		wattr.override_redirect = True;
860		wattr.colormap = cmap[0];
861
862	<	the_win = XCreateWindow(x_display, rootwin,
862	>	w = XCreateWindow(x_display, rootwin,
863		0, 0, width, height,
864		0, xdepth, InputOutput, vis,
865	<	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
865	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (fb_depth <= 8 ? CWColormap : 0),
866		&wattr);
867
868		// Set window name/class
869	<	set_window_name(the_win, STR_WINDOW_TITLE);
869	>	set_window_name(w, STR_WINDOW_TITLE);
870
871		// Indicate that we want keyboard input
872	<	set_window_focus(the_win);
872	>	set_window_focus(w);
873
874		// Show window
875	<	XMapRaised(x_display, the_win);
876	<	wait_mapped(the_win);
875	>	XMapRaised(x_display, w);
876	>	wait_mapped(w);
877
878		// Grab mouse and keyboard
879	<	XGrabKeyboard(x_display, the_win, True,
879	>	XGrabKeyboard(x_display, w, True,
880		GrabModeAsync, GrabModeAsync, CurrentTime);
881	<	XGrabPointer(x_display, the_win, True,
881	>	XGrabPointer(x_display, w, True,
882		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
883	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
883	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
884
885		// Calculate bytes per row
886		int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
#	Line 531 | Line 891 | static bool init_fbdev_dga(const video_m
891		char str[256];
892		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
893		ErrorAlert(str);
894	<	return false;
894	>	return;
895		}
896		}
897
#	Line 539 | Line 899 | static bool init_fbdev_dga(const video_m
899		#if REAL_ADDRESSING || DIRECT_ADDRESSING
900		// Screen_blitter_init() returns TRUE if VOSF is mandatory
901		// i.e. the framebuffer update function is not Blit_Copy_Raw
902	<	use_vosf = Screen_blitter_init(&visualInfo, true);
902	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
903
904		if (use_vosf) {
905		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 554 | Line 914 | static bool init_fbdev_dga(const video_m
914		#endif
915
916		// Set VideoMonitor
917	+	VideoModes[0].bytes_per_row = bytes_per_row;
918	+	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
919		VideoMonitor.mode = mode;
920		set_mac_frame_buffer(mode.depth, true);
921	<	return true;
922	<	#else
923	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
562	<	return false;
563	<	#endif
921	>
922	>	// Everything went well
923	>	init_ok = true;
924		}
925
926	<	// Init XF86 DGA display
927	<	static bool init_xf86_dga(const video_mode &mode)
926	>	// Close display
927	>	driver_fbdev::~driver_fbdev()
928		{
929	<	int width = mode.x, height = mode.y;
929	>	}
930	>	#endif
931	>
932
933		#ifdef ENABLE_XF86_DGA
934	+	/*
935	+	*  XFree86 DGA display driver
936	+	*/
937	+
938	+	class driver_xf86dga : public driver_dga {
939	+	public:
940	+	driver_xf86dga(const video_mode &mode);
941	+	~driver_xf86dga();
942	+
943	+	void update_palette(void);
944	+	void resume(void);
945	+
946	+	private:
947	+	int current_dga_cmap;                                   // Number (0 or 1) of currently installed DGA colormap
948	+	};
949	+
950	+	// Open display
951	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
952	+	: current_dga_cmap(0)
953	+	{
954	+	int width = mode.x, height = mode.y;
955	+
956		// Set relative mouse mode
957		ADBSetRelMouseMode(true);
958
#	Line 593 | Line 977 | static bool init_xf86_dga(const video_mo
977		wattr.event_mask = eventmask = dga_eventmask;
978		wattr.override_redirect = True;
979
980	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
980	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
981		InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
982
983		// Set window name/class
984	<	set_window_name(the_win, STR_WINDOW_TITLE);
984	>	set_window_name(w, STR_WINDOW_TITLE);
985
986		// Indicate that we want keyboard input
987	<	set_window_focus(the_win);
987	>	set_window_focus(w);
988
989		// Show window
990	<	XMapRaised(x_display, the_win);
991	<	wait_mapped(the_win);
990	>	XMapRaised(x_display, w);
991	>	wait_mapped(w);
992
993		// Establish direct screen connection
994	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
994	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
995		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
996		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
997		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 620 | Line 1004 | static bool init_xf86_dga(const video_mo
1004
1005		// Set colormap
1006		if (!IsDirectMode(mode)) {
1007	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
1007	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1008		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1009		}
1010		XSync(x_display, false);
1011
1012	<	// Set VideoMonitor
1012	>	// Init blitting routines
1013		int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
630	–
1014		#ifdef VIDEO_VOSF
1015		#if REAL_ADDRESSING || DIRECT_ADDRESSING
1016		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1017		// i.e. the framebuffer update function is not Blit_Copy_Raw
1018	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1018	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1019
1020		if (use_vosf) {
1021		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 646 | Line 1029 | static bool init_xf86_dga(const video_mo
1029		#endif
1030		#endif
1031
1032	+	// Set VideoMonitor
1033		const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1034		VideoMonitor.mode = mode;
1035		set_mac_frame_buffer(mode.depth, true);
1036	<	return true;
1037	<	#else
1038	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
1039	<	return false;
1036	>
1037	>	// Everything went well
1038	>	init_ok = true;
1039	>	}
1040	>
1041	>	// Close display
1042	>	driver_xf86dga::~driver_xf86dga()
1043	>	{
1044	>	XF86DGADirectVideo(x_display, screen, 0);
1045	>	#ifdef ENABLE_XF86_VIDMODE
1046	>	if (has_vidmode)
1047	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1048		#endif
1049		}
1050
1051	+	// Palette has changed
1052	+	void driver_xf86dga::update_palette(void)
1053	+	{
1054	+	driver_dga::update_palette();
1055	+	current_dga_cmap ^= 1;
1056	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
1057	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1058	+	}
1059	+
1060	+	// Resume emulation
1061	+	void driver_xf86dga::resume(void)
1062	+	{
1063	+	driver_dga::resume();
1064	+	if (!IsDirectMode(VideoMonitor.mode))
1065	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1066	+	}
1067	+	#endif
1068	+
1069	+
1070	+	/*
1071	+	*  Initialization
1072	+	*/
1073	+
1074		// Init keycode translation table
1075		static void keycode_init(void)
1076		{
#	Line 724 | Line 1139 | static void keycode_init(void)
1139		// Open display for specified mode
1140		static bool video_open(const video_mode &mode)
1141		{
1142	<	// Create color maps for 8 bit mode
1143	<	if (!IsDirectMode(mode)) {
1144	<	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1145	<	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1146	<	cmap_allocated = true;
1147	<	XInstallColormap(x_display, cmap[0]);
1148	<	XInstallColormap(x_display, cmap[1]);
1142	>	// Load gray ramp to color map
1143	>	int num = (vis->c_class == DirectColor ? vis->map_entries : 256);
1144	>	for (int i=0; i<num; i++) {
1145	>	int c = (i * 256) / num;
1146	>	palette[i].red = c * 0x0101;
1147	>	palette[i].green = c * 0x0101;
1148	>	palette[i].blue = c * 0x0101;
1149	>	if (vis->c_class == PseudoColor)
1150	>	palette[i].pixel = i;
1151	>	palette[i].flags = DoRed | DoGreen | DoBlue;
1152		}
1153	+	if (cmap[0] && cmap[1]) {
1154	+	XStoreColors(x_display, cmap[0], palette, num);
1155	+	XStoreColors(x_display, cmap[1], palette, num);
1156	+	}
1157	+
1158	+	#ifdef ENABLE_VOSF
1159	+	// Load gray ramp to 8->16/32 expand map
1160	+	if (!IsDirectMode(mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor))
1161	+	for (int i=0; i<256; i++)
1162	+	ExpandMap[i] = map_rgb(i, i, i);
1163	+	#endif
1164
1165	<	// Initialize according to display type
1165	>	// Create display driver object of requested type
1166		switch (display_type) {
1167		case DISPLAY_WINDOW:
1168	<	if (!init_window(mode))
740	<	return false;
1168	>	drv = new driver_window(mode);
1169		break;
742	–	case DISPLAY_DGA:
1170		#ifdef ENABLE_FBDEV_DGA
1171	<	if (!init_fbdev_dga(mode))
1172	<	#else
1173	<	if (!init_xf86_dga(mode))
1171	>	case DISPLAY_DGA:
1172	>	drv = new driver_fbdev(mode);
1173	>	break;
1174		#endif
1175	<	return false;
1175	>	#ifdef ENABLE_XF86_DGA
1176	>	case DISPLAY_DGA:
1177	>	drv = new driver_xf86dga(mode);
1178		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;
1179		#endif
1180	<
1181	<	InitFrameBufferMapping();
1180	>	}
1181	>	if (drv == NULL)
1182	>	return false;
1183	>	if (!drv->init_ok) {
1184	>	delete drv;
1185	>	drv = NULL;
1186	>	return false;
1187	>	}
1188
1189		#ifdef ENABLE_VOSF
1190		if (use_vosf) {
1191		// Initialize the mainBuffer structure
1192		if (!video_init_buffer()) {
1193	<	ErrorAlert(GetString(STR_VOSF_INIT_ERR));
1193	>	ErrorAlert(STR_VOSF_INIT_ERR);
1194		return false;
1195		}
1196
#	Line 782 | Line 1204 | static bool video_open(const video_mode
1204
1205		// Initialize VideoRefresh function
1206		VideoRefreshInit();
1207	<
1207	>
1208	>	// Lock down frame buffer
1209		XSync(x_display, false);
1210	+	LOCK_FRAME_BUFFER;
1211
788	–	#ifdef HAVE_PTHREADS
1212		// Start redraw/input thread
1213	+	#ifdef HAVE_PTHREADS
1214		redraw_thread_cancel = false;
1215		redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1216		if (!redraw_thread_active) {
1217		printf("FATAL: cannot create redraw thread\n");
1218		return false;
1219		}
1220	+	#else
1221	+	redraw_thread_active = true;
1222		#endif
1223
1224		return true;
#	Line 803 | Line 1229 | bool VideoInit(bool classic)
1229		classic_mode = classic;
1230
1231		#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	–
1232		// Zero the mainBuffer structure
1233	<	mainBuffer.dirtyPages = 0;
1234	<	mainBuffer.pageInfo = 0;
1233	>	mainBuffer.dirtyPages = NULL;
1234	>	mainBuffer.pageInfo = NULL;
1235		#endif
1236
1237		// Check if X server runs on local machine
#	Line 825 | Line 1242 | bool VideoInit(bool classic)
1242		keycode_init();
1243
1244		// Read prefs
1245	+	frame_skip = PrefsFindInt32("frameskip");
1246		mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1247		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1248
#	Line 839 | Line 1257 | bool VideoInit(bool classic)
1257		// Frame buffer name
1258		char fb_name[20];
1259
1260	<	// Could do fbdev dga ?
1260	>	// Could do fbdev DGA?
1261		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1262		has_dga = true;
1263		else
#	Line 885 | Line 1303 | bool VideoInit(bool classic)
1303		case 15:
1304		case 16:
1305		case 24:
1306	<	case 32:
1307	<	color_class = TrueColor;
1306	>	case 32: // Try DirectColor first, as this will allow gamma correction
1307	>	color_class = DirectColor;
1308	>	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo))
1309	>	color_class = TrueColor;
1310		break;
1311		default:
1312	<	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1312	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1313		return false;
1314		}
1315		if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1316	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1316	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1317		return false;
1318		}
1319		if (visualInfo.depth != xdepth) {
1320	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1320	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1321		return false;
1322		}
1323		vis = visualInfo.visual;
1324
1325	+	// Create color maps
1326	+	if (color_class == PseudoColor || color_class == DirectColor) {
1327	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1328	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1329	+	}
1330	+
1331	+	// Find pixel format of direct modes
1332	+	if (color_class == DirectColor || color_class == TrueColor) {
1333	+	rshift = gshift = bshift = 0;
1334	+	rloss = gloss = bloss = 8;
1335	+	uint32 mask;
1336	+	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1337	+	++rshift;
1338	+	for (; mask&1; mask>>=1)
1339	+	--rloss;
1340	+	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1341	+	++gshift;
1342	+	for (; mask&1; mask>>=1)
1343	+	--gloss;
1344	+	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1345	+	++bshift;
1346	+	for (; mask&1; mask>>=1)
1347	+	--bloss;
1348	+	}
1349	+
1350	+	// Preset palette pixel values for gamma table
1351	+	if (color_class == DirectColor) {
1352	+	int num = vis->map_entries;
1353	+	for (int i=0; i<num; i++) {
1354	+	int c = (i * 256) / num;
1355	+	palette[i].pixel = map_rgb(c, c, c);
1356	+	}
1357	+	}
1358	+
1359		// Get screen mode from preferences
1360		const char *mode_str;
1361		if (classic_mode)
#	Line 918 | Line 1372 | bool VideoInit(bool classic)
1372		#ifdef ENABLE_FBDEV_DGA
1373		} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1374		display_type = DISPLAY_DGA;
1375	<	default_width = -1; default_height = -1;
1376	<	#else
1375	>	default_width = -1; default_height = -1; // use entire screen
1376	>	#endif
1377	>	#ifdef ENABLE_XF86_DGA
1378		} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1379		display_type = DISPLAY_DGA;
1380		#endif
#	Line 934 | Line 1389 | bool VideoInit(bool classic)
1389		else if (default_height > DisplayHeight(x_display, screen))
1390		default_height = DisplayHeight(x_display, screen);
1391
1392	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1393	<	int depth = (classic_mode ? 1 : xdepth);
939	<	video_depth depth_mode = DepthModeForPixelDepth(depth);
1392	>	// Mac screen depth follows X depth
1393	>	video_depth default_depth = DepthModeForPixelDepth(xdepth);
1394
1395		// Construct list of supported modes
1396		if (display_type == DISPLAY_WINDOW) {
1397		if (classic)
1398	<	add_mode(512, 342, 0x80, 64, depth_mode);
1398	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1399		else {
1400	<	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth_mode), depth_mode);
1401	<	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth_mode), depth_mode);
1402	<	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth_mode), depth_mode);
1403	<	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth_mode), depth_mode);
1404	<	add_mode(1280, 1024, 0x84, TrivialBytesPerRow(1280, depth_mode), depth_mode);
1400	>	if (default_depth != VDEPTH_1BIT)
1401	>	add_window_modes(VDEPTH_1BIT);  // 1-bit modes are always available
1402	>	#ifdef ENABLE_VOSF
1403	>	if (default_depth > VDEPTH_8BIT) {
1404	>	add_window_modes(VDEPTH_2BIT);  // 2, 4 and 8-bit modes are also possible on 16/32-bit screens with VOSF blitters
1405	>	add_window_modes(VDEPTH_4BIT);
1406	>	add_window_modes(VDEPTH_8BIT);
1407	>	}
1408	>	#endif
1409	>	add_window_modes(default_depth);
1410		}
1411		} else
1412	<	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, depth_mode), depth_mode);
1412	>	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1413	>	video_init_depth_list();
1414
1415		// Find requested default mode and open display
1416		if (VideoModes.size() == 1)
1417		return video_open(VideoModes[0]);
1418		else {
1419		// Find mode with specified dimensions
1420	<	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1421	<	while (i != end) {
1422	<	if (i->x == default_width && i->y == default_height)
1420	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1421	>	for (i = VideoModes.begin(); i != end; ++i) {
1422	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1423		return video_open(*i);
964	–	++i;
1424		}
1425		return video_open(VideoModes[0]);
1426		}
#	Line 975 | Line 1434 | bool VideoInit(bool classic)
1434		// Close display
1435		static void video_close(void)
1436		{
978	–	#ifdef HAVE_PTHREADS
1437		// Stop redraw thread
1438	+	#ifdef HAVE_PTHREADS
1439		if (redraw_thread_active) {
1440		redraw_thread_cancel = true;
1441		#ifdef HAVE_PTHREAD_CANCEL
1442		pthread_cancel(redraw_thread);
1443		#endif
1444		pthread_join(redraw_thread, NULL);
986	–	redraw_thread_active = false;
1445		}
1446		#endif
1447	+	redraw_thread_active = false;
1448
1449		// Unlock frame buffer
1450		UNLOCK_FRAME_BUFFER;
1451	+	XSync(x_display, false);
1452
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	–
1453		#ifdef ENABLE_VOSF
1454	+	// Deinitialize VOSF
1455		if (use_vosf) {
1069	–	// Clear mainBuffer data
1456		if (mainBuffer.pageInfo) {
1457		free(mainBuffer.pageInfo);
1458	<	mainBuffer.pageInfo = 0;
1458	>	mainBuffer.pageInfo = NULL;
1459		}
1074	–
1460		if (mainBuffer.dirtyPages) {
1461		free(mainBuffer.dirtyPages);
1462	<	mainBuffer.dirtyPages = 0;
1462	>	mainBuffer.dirtyPages = NULL;
1463		}
1464		}
1465		#endif
1466	+
1467	+	// Close display
1468	+	delete drv;
1469	+	drv = NULL;
1470		}
1471
1472		void VideoExit(void)
1473		{
1474	+	// Close display
1475		video_close();
1476
1477	<	#ifdef ENABLE_VOSF
1478	<	// Close /dev/zero
1479	<	if (zero_fd > 0)
1480	<	close(zero_fd);
1477	>	// Free colormaps
1478	>	if (cmap[0]) {
1479	>	XFreeColormap(x_display, cmap[0]);
1480	>	cmap[0] = 0;
1481	>	}
1482	>	if (cmap[1]) {
1483	>	XFreeColormap(x_display, cmap[1]);
1484	>	cmap[1] = 0;
1485	>	}
1486	>
1487	>	#ifdef ENABLE_XF86_VIDMODE
1488	>	// Free video mode list
1489	>	if (x_video_modes) {
1490	>	XFree(x_video_modes);
1491	>	x_video_modes = NULL;
1492	>	}
1493	>	#endif
1494	>
1495	>	#ifdef ENABLE_FBDEV_DGA
1496	>	// Close framebuffer device
1497	>	if (fbdev_fd >= 0) {
1498	>	close(fbdev_fd);
1499	>	fbdev_fd = -1;
1500	>	}
1501		#endif
1502		}
1503
#	Line 1099 | Line 1509 | void VideoExit(void)
1509		void VideoQuitFullScreen(void)
1510		{
1511		D(bug("VideoQuitFullScreen()\n"));
1512	<	if (display_type == DISPLAY_DGA)
1103	<	quit_full_screen = true;
1512	>	quit_full_screen = true;
1513		}
1514
1515
#	Line 1125 | Line 1534 | void VideoInterrupt(void)
1534		*  Set palette
1535		*/
1536
1537	<	void video_set_palette(uint8 *pal)
1537	>	void video_set_palette(uint8 *pal, int num_in)
1538		{
1539		LOCK_PALETTE;
1540
1541		// Convert colors to XColor array
1542	<	for (int i=0; i<256; i++) {
1543	<	palette[i].pixel = i;
1544	<	palette[i].red = pal[i*3] * 0x0101;
1545	<	palette[i].green = pal[i*3+1] * 0x0101;
1546	<	palette[i].blue = pal[i*3+2] * 0x0101;
1547	<	palette[i].flags = DoRed | DoGreen | DoBlue;
1542	>	int num_out = 256;
1543	>	if (IsDirectMode(VideoMonitor.mode)) {
1544	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1545	>	num_out = vis->map_entries;
1546	>	}
1547	>	XColor *p = palette;
1548	>	for (int i=0; i<num_out; i++) {
1549	>	int c = (i * num_in) / num_out;
1550	>	p->red = pal[c*3 + 0] * 0x0101;
1551	>	p->green = pal[c*3 + 1] * 0x0101;
1552	>	p->blue = pal[c*3 + 2] * 0x0101;
1553	>	if (vis->c_class == PseudoColor)
1554	>	p->pixel = i;
1555	>	p->flags = DoRed | DoGreen | DoBlue;
1556	>	p++;
1557	>	}
1558	>
1559	>	#ifdef ENABLE_VOSF
1560	>	// Recalculate pixel color expansion map
1561	>	if (!IsDirectMode(VideoMonitor.mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor)) {
1562	>	for (int i=0; i<256; i++) {
1563	>	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1564	>	ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]);
1565	>	}
1566	>
1567	>	// We have to redraw everything because the interpretation of pixel values changed
1568	>	LOCK_VOSF;
1569	>	PFLAG_SET_ALL;
1570	>	UNLOCK_VOSF;
1571	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1572		}
1573	+	#endif
1574
1575		// Tell redraw thread to change palette
1576		palette_changed = true;
#	Line 1151 | Line 1585 | void video_set_palette(uint8 *pal)
1585
1586		void video_switch_to_mode(const video_mode &mode)
1587		{
1588	+	// Close and reopen display
1589		video_close();
1590		video_open(mode);
1156	–	}
1157	–
1158	–
1159	–	/*
1160	–	*  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);
1591
1592	<	// Reopen full screen display
1593	<	XMapRaised(x_display, the_win);
1594	<	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;
1592	>	if (drv == NULL) {
1593	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1594	>	QuitEmulator();
1595		}
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;
1596		}
1252	–	#endif
1597
1598
1599		/*
1600	<	*  Translate key event to Mac keycode
1600	>	*  Translate key event to Mac keycode, returns -1 if no keycode was found
1601	>	*  and -2 if the key was recognized as a hotkey
1602		*/
1603
1604	<	static int kc_decode(KeySym ks)
1604	>	static int kc_decode(KeySym ks, bool key_down)
1605		{
1606		switch (ks) {
1607		case XK_A: case XK_a: return 0x00;
#	Line 1309 | Line 1654 | static int kc_decode(KeySym ks)
1654		case XK_period: case XK_greater: return 0x2f;
1655		case XK_slash: case XK_question: return 0x2c;
1656
1657	<	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1313	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1314	<	#else
1315	<	case XK_Tab: return 0x30;
1316	<	#endif
1657	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1658		case XK_Return: return 0x24;
1659		case XK_space: return 0x31;
1660		case XK_BackSpace: return 0x33;
#	Line 1347 | Line 1688 | static int kc_decode(KeySym ks)
1688		case XK_Left: return 0x3b;
1689		case XK_Right: return 0x3c;
1690
1691	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1691	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1692
1693	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1693	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1694		case XK_F2: return 0x78;
1695		case XK_F3: return 0x63;
1696		case XK_F4: return 0x76;
1697	<	case XK_F5: return 0x60;
1697	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1698		case XK_F6: return 0x61;
1699		case XK_F7: return 0x62;
1700		case XK_F8: return 0x64;
#	Line 1401 | Line 1742 | static int kc_decode(KeySym ks)
1742		return -1;
1743		}
1744
1745	<	static int event2keycode(XKeyEvent &ev)
1745	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1746		{
1747		KeySym ks;
1407	–	int as;
1748		int i = 0;
1749
1750		do {
1751		ks = XLookupKeysym(&ev, i++);
1752	<	as = kc_decode(ks);
1753	<	if (as != -1)
1752	>	int as = kc_decode(ks, key_down);
1753	>	if (as >= 0)
1754	>	return as;
1755	>	if (as == -2)
1756		return as;
1757		} while (ks != NoSymbol);
1758
#	Line 1457 | Line 1799 | static void handle_events(void)
1799		}
1800
1801		// Mouse moved
1460	–	case EnterNotify:
1802		case MotionNotify:
1803	<	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1803	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
1804		break;
1805
1806		// Keyboard
1807		case KeyPress: {
1808	<	int code;
1808	>	int code = -1;
1809		if (use_keycodes) {
1810	<	event2keycode(event.xkey);      // This is called to process the hotkeys
1811	<	code = keycode_table[event.xkey.keycode & 0xff];
1810	>	if (event2keycode(event.xkey, true) != -2)      // This is called to process the hotkeys
1811	>	code = keycode_table[event.xkey.keycode & 0xff];
1812		} else
1813	<	code = event2keycode(event.xkey);
1814	<	if (code != -1) {
1813	>	code = event2keycode(event.xkey, true);
1814	>	if (code >= 0) {
1815		if (!emul_suspended) {
1816		if (code == 0x39) {     // Caps Lock pressed
1817		if (caps_on) {
#	Line 1485 | Line 1826 | static void handle_events(void)
1826		if (code == 0x36)
1827		ctrl_down = true;
1828		} else {
1488	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1829		if (code == 0x31)
1830	<	resume_emul();  // Space wakes us up
1491	<	#endif
1830	>	drv->resume();  // Space wakes us up
1831		}
1832		}
1833		break;
1834		}
1835		case KeyRelease: {
1836	<	int code;
1836	>	int code = -1;
1837		if (use_keycodes) {
1838	<	event2keycode(event.xkey);      // This is called to process the hotkeys
1839	<	code = keycode_table[event.xkey.keycode & 0xff];
1838	>	if (event2keycode(event.xkey, false) != -2)     // This is called to process the hotkeys
1839	>	code = keycode_table[event.xkey.keycode & 0xff];
1840		} else
1841	<	code = event2keycode(event.xkey);
1842	<	if (code != -1 && code != 0x39) {       // Don't propagate Caps Lock releases
1841	>	code = event2keycode(event.xkey, false);
1842	>	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1843		ADBKeyUp(code);
1844		if (code == 0x36)
1845		ctrl_down = false;
#	Line 1548 | Line 1887 | static void handle_events(void)
1887		*/
1888
1889		// Dynamic display update (variable frame rate for each box)
1890	<	static void update_display_dynamic(int ticker)
1890	>	static void update_display_dynamic(int ticker, driver_window *drv)
1891		{
1892		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1893		int xil = 0;
#	Line 1611 | Line 1950 | static void update_display_dynamic(int t
1950		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1951		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1952		if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1953	<	if (have_shm)
1954	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1953	>	if (drv->have_shm)
1954	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1955		else
1956	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1956	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1957		} else {
1958	<	if (have_shm)
1959	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1958	>	if (drv->have_shm)
1959	>	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);
1960		else
1961	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1961	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1962		}
1963		xil = 0;
1964		}
#	Line 1638 | Line 1977 | static void update_display_dynamic(int t
1977		}
1978
1979		// Static display update (fixed frame rate, but incremental)
1980	<	static void update_display_static(void)
1980	>	static void update_display_static(driver_window *drv)
1981		{
1982		// Incremental update code
1983		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
#	Line 1744 | Line 2083 | static void update_display_static(void)
2083
2084		// Refresh display
2085		if (high && wide) {
2086	<	if (have_shm)
2087	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2086	>	if (drv->have_shm)
2087	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2088		else
2089	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2089	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2090		}
2091		}
2092
#	Line 1764 | Line 2103 | static void update_display_static(void)
2103
2104		static inline void possibly_quit_dga_mode()
2105		{
2106	<	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2107	<	// Quit DGA mode if requested
2106	>	// Quit DGA mode if requested (something terrible has happened and we
2107	>	// want to give control back to the user)
2108		if (quit_full_screen) {
2109		quit_full_screen = false;
2110	<	#ifdef ENABLE_XF86_DGA
2111	<	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);
2110	>	delete drv;
2111	>	drv = NULL;
2112		}
1779	–	#endif
2113		}
2114
2115	<	static inline void handle_palette_changes(int display_type)
2115	>	static inline void possibly_ungrab_mouse()
2116	>	{
2117	>	// Ungrab mouse if requested (something terrible has happened and we
2118	>	// want to give control back to the user)
2119	>	if (quit_full_screen) {
2120	>	quit_full_screen = false;
2121	>	if (drv)
2122	>	drv->ungrab_mouse();
2123	>	}
2124	>	}
2125	>
2126	>	static inline void handle_palette_changes(void)
2127		{
2128		LOCK_PALETTE;
2129
2130		if (palette_changed) {
2131		palette_changed = false;
2132	<	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	<	}
2132	>	drv->update_palette();
2133		}
2134
2135		UNLOCK_PALETTE;
#	Line 1811 | Line 2144 | static void video_refresh_dga(void)
2144		handle_events();
2145
2146		// Handle palette changes
2147	<	handle_palette_changes(DISPLAY_DGA);
2147	>	handle_palette_changes();
2148		}
2149
2150		#ifdef ENABLE_VOSF
#	Line 1825 | Line 2158 | static void video_refresh_dga_vosf(void)
2158		handle_events();
2159
2160		// Handle palette changes
2161	<	handle_palette_changes(DISPLAY_DGA);
2161	>	handle_palette_changes();
2162
2163		// Update display (VOSF variant)
2164		static int tick_counter = 0;
#	Line 1842 | Line 2175 | static void video_refresh_dga_vosf(void)
2175
2176		static void video_refresh_window_vosf(void)
2177		{
2178	<	// Quit DGA mode if requested
2179	<	possibly_quit_dga_mode();
2178	>	// Ungrab mouse if requested
2179	>	possibly_ungrab_mouse();
2180
2181		// Handle X events
2182		handle_events();
2183
2184		// Handle palette changes
2185	<	handle_palette_changes(DISPLAY_WINDOW);
2185	>	handle_palette_changes();
2186
2187		// Update display (VOSF variant)
2188		static int tick_counter = 0;
#	Line 1857 | Line 2190 | static void video_refresh_window_vosf(vo
2190		tick_counter = 0;
2191		if (mainBuffer.dirty) {
2192		LOCK_VOSF;
2193	<	update_display_window_vosf();
2193	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2194		UNLOCK_VOSF;
2195		XSync(x_display, false); // Let the server catch up
2196		}
#	Line 1867 | Line 2200 | static void video_refresh_window_vosf(vo
2200
2201		static void video_refresh_window_static(void)
2202		{
2203	+	// Ungrab mouse if requested
2204	+	possibly_ungrab_mouse();
2205	+
2206		// Handle X events
2207		handle_events();
2208
2209		// Handle_palette changes
2210	<	handle_palette_changes(DISPLAY_WINDOW);
2210	>	handle_palette_changes();
2211
2212		// Update display (static variant)
2213		static int tick_counter = 0;
2214		if (++tick_counter >= frame_skip) {
2215		tick_counter = 0;
2216	<	update_display_static();
2216	>	update_display_static(static_cast<driver_window *>(drv));
2217		}
2218		}
2219
2220		static void video_refresh_window_dynamic(void)
2221		{
2222	+	// Ungrab mouse if requested
2223	+	possibly_ungrab_mouse();
2224	+
2225		// Handle X events
2226		handle_events();
2227
2228		// Handle_palette changes
2229	<	handle_palette_changes(DISPLAY_WINDOW);
2229	>	handle_palette_changes();
2230
2231		// Update display (dynamic variant)
2232		static int tick_counter = 0;
2233		tick_counter++;
2234	<	update_display_dynamic(tick_counter);
2234	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2235		}
2236
2237
#	Line 1926 | Line 2265 | static void VideoRefreshInit(void)
2265
2266		void VideoRefresh(void)
2267		{
2268	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2269	<	video_refresh();
2268	>	// We need to check redraw_thread_active to inhibit refreshed during
2269	>	// mode changes on non-threaded platforms
2270	>	if (redraw_thread_active)
2271	>	video_refresh();
2272		}
2273
2274		#ifdef HAVE_PTHREADS

Diff Legend

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