ViewVC Help

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

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

Comparing SheepShaver/src/Unix/video_x.cpp (file contents):
Revision 1.19 by gbeauche, 2004-04-22T21:45:16Z vs.
Revision 1.42 by gbeauche, 2005-05-12T11:20:00Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  SheepShaver (C) 1997-2004 Marc Hellwig and Christian Bauer
4	>	*  SheepShaver (C) 1997-2005 Marc Hellwig and 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 18 | Line 18
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19		*/
20
21	+	/*
22	+	*  NOTES:
23	+	*    The Ctrl key works like a qualifier for special actions:
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"
31
32		#include <X11/Xlib.h>
#	Line 31 | Line 40
40
41		#include <algorithm>
42
43	+	#ifdef ENABLE_FBDEV_DGA
44	+	# include <linux/fb.h>
45	+	# include <sys/ioctl.h>
46	+	#endif
47	+
48		#ifdef ENABLE_XF86_DGA
49		# include <X11/extensions/xf86dga.h>
50		#endif
#	Line 46 | Line 60
60		#include "about_window.h"
61		#include "video.h"
62		#include "video_defs.h"
63	+	#include "video_blit.h"
64
65		#define DEBUG 0
66		#include "debug.h"
#	Line 57 | Line 72 | using std::sort;
72
73		// Constants
74		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
75	+	static const bool hw_mac_cursor_accl = true;    // Flag: Enable MacOS to X11 copy of cursor?
76
77		// Global variables
78		static int32 frame_skip;
#	Line 64 | Line 80 | static int16 mouse_wheel_mode;
80		static int16 mouse_wheel_lines;
81		static bool redraw_thread_active = false;       // Flag: Redraw thread installed
82		static pthread_attr_t redraw_thread_attr;       // Redraw thread attributes
83	+	static volatile bool redraw_thread_cancel;      // Flag: Cancel Redraw thread
84		static pthread_t redraw_thread;                         // Redraw thread
85
86		static bool local_X11;                                          // Flag: X server running on local machine?
#	Line 81 | Line 98 | static const bool use_vosf = false;                    //
98
99		static bool palette_changed = false;            // Flag: Palette changed, redraw thread must update palette
100		static bool ctrl_down = false;                          // Flag: Ctrl key pressed
101	+	static bool caps_on = false;                            // Flag: Caps Lock on
102		static bool quit_full_screen = false;           // Flag: DGA close requested from redraw thread
103		static volatile bool quit_full_screen_ack = false;      // Acknowledge for quit_full_screen
104		static bool emerg_quit = false;                         // Flag: Ctrl-Esc pressed, emergency quit requested from MacOS thread
#	Line 98 | Line 116 | static int depth;                                                      // Depth of Mac
116		static Window rootwin, the_win;                         // Root window and our window
117		static int num_depths = 0;                                      // Number of available X depths
118		static int *avail_depths = NULL;                        // List of available X depths
119	+	static VisualFormat visualFormat;
120		static XVisualInfo visualInfo;
121		static Visual *vis;
122		static int color_class;
123		static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
124		static Colormap cmap[2];                                        // Two colormaps (DGA) for 8-bit mode
125		static XColor x_palette[256];                           // Color palette to be used as CLUT and gamma table
126	+	static int orig_accel_numer, orig_accel_denom, orig_threshold;  // Original mouse acceleration
127
128		static XColor black, white;
129		static unsigned long black_pixel, white_pixel;
#	Line 126 | Line 146 | static uint8 *the_buffer_copy = NULL;          /
146		static uint32 the_buffer_size;                          // Size of allocated the_buffer
147
148		// Variables for DGA mode
149	+	static bool is_fbdev_dga_mode = false;          // Flag: Use FBDev DGA mode?
150		static int current_dga_cmap;
151
152	+	#ifdef ENABLE_FBDEV_DGA
153	+	static int fb_dev_fd = -1;                                              // Handle to fb device name
154	+	static struct fb_fix_screeninfo fb_finfo;               // Fixed info
155	+	static struct fb_var_screeninfo fb_vinfo;               // Variable info
156	+	static struct fb_var_screeninfo fb_orig_vinfo;  // Variable info to restore later
157	+	static struct fb_cmap fb_oldcmap;                               // Colormap to restore later
158	+	#endif
159	+
160		#ifdef ENABLE_XF86_VIDMODE
161		// Variables for XF86 VidMode support
162		static XF86VidModeModeInfo **x_video_modes;             // Array of all available modes
#	Line 148 | Line 177 | static pthread_mutex_t x_palette_lock =
177		#define UNLOCK_PALETTE
178		#endif
179
180	+	// Mutex to protect frame buffer
181	+	#ifdef HAVE_SPINLOCKS
182	+	static spinlock_t frame_buffer_lock = SPIN_LOCK_UNLOCKED;
183	+	#define LOCK_FRAME_BUFFER spin_lock(&frame_buffer_lock)
184	+	#define UNLOCK_FRAME_BUFFER spin_unlock(&frame_buffer_lock)
185	+	#elif defined(HAVE_PTHREADS)
186	+	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
187	+	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
188	+	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
189	+	#else
190	+	#define LOCK_FRAME_BUFFER
191	+	#define UNLOCK_FRAME_BUFFER
192	+	#endif
193	+
194
195		// Prototypes
196		static void *redraw_func(void *arg);
#	Line 359 | Line 402 | static bool find_visual_for_depth(int de
402		*  Open display (window or fullscreen)
403		*/
404
405	+	// Set window name and class
406	+	static void set_window_name(Window w, int name)
407	+	{
408	+	const char *str = GetString(name);
409	+	XStoreName(x_display, w, str);
410	+	XSetIconName(x_display, w, str);
411	+
412	+	XClassHint *hints;
413	+	hints = XAllocClassHint();
414	+	if (hints) {
415	+	hints->res_name = "SheepShaver";
416	+	hints->res_class = "SheepShaver";
417	+	XSetClassHint(x_display, w, hints);
418	+	XFree(hints);
419	+	}
420	+	}
421	+
422	+	// Set window input focus flag
423	+	static void set_window_focus(Window w)
424	+	{
425	+	XWMHints *hints = XAllocWMHints();
426	+	if (hints) {
427	+	hints->input = True;
428	+	hints->initial_state = NormalState;
429	+	hints->flags = InputHint | StateHint;
430	+	XSetWMHints(x_display, w, hints);
431	+	XFree(hints);
432	+	}
433	+	}
434	+
435		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
436		static Atom WM_DELETE_WINDOW = (Atom)0;
437		static void set_window_delete_protocol(Window w)
#	Line 384 | Line 457 | static void wait_unmapped(Window w)
457		} while ((e.type != UnmapNotify) || (e.xmap.event != w));
458		}
459
460	+	// Disable mouse acceleration
461	+	static void disable_mouse_accel(void)
462	+	{
463	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
464	+	}
465	+
466	+	// Restore mouse acceleration to original value
467	+	static void restore_mouse_accel(void)
468	+	{
469	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
470	+	}
471	+
472		// Trap SHM errors
473		static bool shm_error = false;
474		static int (*old_error_handler)(Display *, XErrorEvent *);
#	Line 416 | Line 501 | static bool open_window(int width, int h
501		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
502		InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWBackingStore | CWColormap, &wattr);
503
504	<	// Set window name
505	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
504	>	// Set window name/class
505	>	set_window_name(the_win, STR_WINDOW_TITLE);
506	>
507	>	// Indicate that we want keyboard input
508	>	set_window_focus(the_win);
509
510		// Set delete protocol property
511		set_window_delete_protocol(the_win);
#	Line 498 | Line 586 | static bool open_window(int width, int h
586		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
587		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
588		#endif
589	<	screen_base = (uint32)the_buffer;
589	>	screen_base = Host2MacAddr(the_buffer);
590
591		// Create GC
592		the_gc = XCreateGC(x_display, the_win, 0, 0);
593		XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
594
595		// Create cursor
596	<	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
597	<	cursor_image->byte_order = MSBFirst;
598	<	cursor_image->bitmap_bit_order = MSBFirst;
599	<	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 36, 16, 16, 16, 2);
600	<	cursor_mask_image->byte_order = MSBFirst;
601	<	cursor_mask_image->bitmap_bit_order = MSBFirst;
602	<	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
603	<	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
604	<	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
605	<	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
606	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
607	<	cursor_changed = false;
596	>	if (hw_mac_cursor_accl) {
597	>	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
598	>	cursor_image->byte_order = MSBFirst;
599	>	cursor_image->bitmap_bit_order = MSBFirst;
600	>	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 36, 16, 16, 16, 2);
601	>	cursor_mask_image->byte_order = MSBFirst;
602	>	cursor_mask_image->bitmap_bit_order = MSBFirst;
603	>	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
604	>	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
605	>	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
606	>	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
607	>	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
608	>	cursor_changed = false;
609	>	}
610	>
611	>	// Create no_cursor
612	>	else {
613	>	mac_cursor = XCreatePixmapCursor(x_display,
614	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
615	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
616	>	&black, &white, 0, 0);
617	>	XDefineCursor(x_display, the_win, mac_cursor);
618	>	}
619
620		// Init blitting routines
621		bool native_byte_order;
#	Line 526 | Line 625 | static bool open_window(int width, int h
625		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
626		#endif
627		#ifdef ENABLE_VOSF
628	<	Screen_blitter_init(&visualInfo, native_byte_order, depth);
628	>	Screen_blitter_init(visualFormat, native_byte_order, depth);
629		#endif
630
631		// Set bytes per row
#	Line 534 | Line 633 | static bool open_window(int width, int h
633		return true;
634		}
635
636	<	// Open DGA display (!! should use X11 VidMode extensions to set mode)
637	<	static bool open_dga(int width, int height)
636	>	// Open FBDev DGA display
637	>	static bool open_fbdev_dga(int width, int height)
638	>	{
639	>	#ifdef ENABLE_FBDEV_DGA
640	>	#ifdef ENABLE_XF86_VIDMODE
641	>	// Switch to best mode
642	>	if (has_vidmode) {
643	>	int best = -1;
644	>	for (int i = 0; i < num_x_video_modes; i++) {
645	>	if (x_video_modes[i]->hdisplay == width && x_video_modes[i]->vdisplay == height) {
646	>	best = i;
647	>	break;
648	>	}
649	>	};
650	>	assert(best != -1);
651	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
652	>	XF86VidModeSetViewPort(x_display, screen, 0, 0);
653	>	D(bug("[fbdev] VideoMode %d: %d x %d @ %d\n", best,
654	>	x_video_modes[best]->hdisplay, x_video_modes[best]->vdisplay,
655	>	1000 * x_video_modes[best]->dotclock / (x_video_modes[best]->htotal * x_video_modes[best]->vtotal)));
656	>	}
657	>	#endif
658	>
659	>	if (ioctl(fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo) != 0) {
660	>	D(bug("[fbdev] Can't get FSCREENINFO: %s\n", strerror(errno)));
661	>	return false;
662	>	}
663	>	D(bug("[fbdev] Device ID: %s\n", fb_finfo.id));
664	>	D(bug("[fbdev] smem_start: %p [%d bytes]\n", fb_finfo.smem_start, fb_finfo.smem_len));
665	>
666	>	int fb_type = fb_finfo.type;
667	>	const char *fb_type_str = NULL;
668	>	switch (fb_type) {
669	>	case FB_TYPE_PACKED_PIXELS:                     fb_type_str = "Packed Pixels";                  break;
670	>	case FB_TYPE_PLANES:                            fb_type_str = "Non interleaved planes"; break;
671	>	case FB_TYPE_INTERLEAVED_PLANES:        fb_type_str = "Interleaved planes";             break;
672	>	case FB_TYPE_TEXT:                                      fb_type_str = "Text/attributes";                break;
673	>	case FB_TYPE_VGA_PLANES:                        fb_type_str = "EGA/VGA planes";                 break;
674	>	default:                                                        fb_type_str = "<unknown>";                              break;
675	>	}
676	>	D(bug("[fbdev] type: %s\n", fb_type_str));
677	>
678	>	if (fb_type != FB_TYPE_PACKED_PIXELS) {
679	>	D(bug("[fbdev] type '%s' not supported\n", fb_type_str));
680	>	return false;
681	>	}
682	>
683	>	int fb_visual = fb_finfo.visual;
684	>	const char *fb_visual_str;
685	>	switch (fb_visual) {
686	>	case FB_VISUAL_MONO01:                          fb_visual_str = "Monochrome 1=Black 0=White";   break;
687	>	case FB_VISUAL_MONO10:                          fb_visual_str = "Monochrome 1=While 0=Black";   break;
688	>	case FB_VISUAL_TRUECOLOR:                       fb_visual_str = "True color";                                   break;
689	>	case FB_VISUAL_PSEUDOCOLOR:                     fb_visual_str = "Pseudo color (like atari)";    break;
690	>	case FB_VISUAL_DIRECTCOLOR:                     fb_visual_str = "Direct color";                                 break;
691	>	case FB_VISUAL_STATIC_PSEUDOCOLOR:      fb_visual_str = "Pseudo color readonly";                break;
692	>	default:                                                        fb_visual_str = "<unknown>";                                    break;
693	>	}
694	>	D(bug("[fbdev] visual: %s\n", fb_visual_str));
695	>
696	>	if (fb_visual != FB_VISUAL_TRUECOLOR) {
697	>	D(bug("[fbdev] visual '%s' not supported\n", fb_visual_str));
698	>	return false;
699	>	}
700	>
701	>	// Map frame buffer
702	>	the_buffer = (uint8 *)mmap(NULL, fb_finfo.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_dev_fd, 0);
703	>	if (the_buffer == MAP_FAILED) {
704	>	D(bug("[fbdev] Can't mmap /dev/fb0: %s\n", strerror(errno)));
705	>	return false;
706	>	}
707	>
708	>	// Set absolute mouse mode
709	>	ADBSetRelMouseMode(false);
710	>
711	>	// Create window
712	>	XSetWindowAttributes wattr;
713	>	wattr.event_mask = eventmask = dga_eventmask;
714	>	wattr.override_redirect = True;
715	>	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
716	>	InputOutput, DefaultVisual(x_display, screen),
717	>	CWEventMask | CWOverrideRedirect, &wattr);
718	>
719	>	// Show window
720	>	XMapRaised(x_display, the_win);
721	>	wait_mapped(the_win);
722	>
723	>	// Grab mouse and keyboard
724	>	XGrabKeyboard(x_display, the_win, True,
725	>	GrabModeAsync, GrabModeAsync, CurrentTime);
726	>	XGrabPointer(x_display, the_win, True,
727	>	PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
728	>	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
729	>	disable_mouse_accel();
730	>
731	>	// Create no_cursor
732	>	mac_cursor = XCreatePixmapCursor(x_display,
733	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
734	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
735	>	&black, &white, 0, 0);
736	>	XDefineCursor(x_display, the_win, mac_cursor);
737	>
738	>	// Init blitting routines
739	>	int bytes_per_row = TrivialBytesPerRow((width + 7) & ~7, DepthModeForPixelDepth(depth));
740	>	#if ENABLE_VOSF
741	>	// Extract current screen color masks (we are in True Color mode)
742	>	VisualFormat visualFormat;
743	>	visualFormat.depth = xdepth = DefaultDepth(x_display, screen);
744	>	XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo);
745	>	assert(visualFormat.depth == visualInfo.depth);
746	>	visualFormat.Rmask = visualInfo.red_mask;
747	>	visualFormat.Gmask = visualInfo.green_mask;
748	>	visualFormat.Bmask = visualInfo.blue_mask;
749	>	D(bug("[fbdev] %d bpp, (%08x,%08x,%08x)\n",
750	>	visualFormat.depth,
751	>	visualFormat.Rmask, visualFormat.Gmask, visualFormat.Bmask));
752	>	D(bug("[fbdev] Mac depth %d bpp\n", depth));
753	>
754	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
755	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
756	>	#ifdef WORDS_BIGENDIAN
757	>	const bool native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
758	>	#else
759	>	const bool native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
760	>	#endif
761	>	Screen_blitter_init(visualFormat, native_byte_order, depth);
762	>
763	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
764	>	use_vosf = true;
765	>	the_host_buffer = the_buffer;
766	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
767	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
768	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
769	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
770	>	#endif
771	>
772	>	// Set frame buffer base
773	>	D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
774	>	screen_base = Host2MacAddr(the_buffer);
775	>	VModes[cur_mode].viRowBytes = bytes_per_row;
776	>	return true;
777	>	#else
778	>	ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
779	>	return false;
780	>	#endif
781	>	}
782	>
783	>	// Open XF86 DGA display (!! should use X11 VidMode extensions to set mode)
784	>	static bool open_xf86_dga(int width, int height)
785		{
786	+	if (is_fbdev_dga_mode)
787	+	return false;
788	+
789		#ifdef ENABLE_XF86_DGA
790		// Set relative mouse mode
791		ADBSetRelMouseMode(true);
#	Line 600 | Line 849 | static bool open_dga(int width, int heig
849		#if REAL_ADDRESSING || DIRECT_ADDRESSING
850		// Screen_blitter_init() returns TRUE if VOSF is mandatory
851		// i.e. the framebuffer update function is not Blit_Copy_Raw
852	<	use_vosf = Screen_blitter_init(&visualInfo, native_byte_order, depth);
852	>	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth);
853
854		if (use_vosf) {
855		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 617 | Line 866 | static bool open_dga(int width, int heig
866
867		// Set frame buffer base
868		D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
869	<	screen_base = (uint32)the_buffer;
869	>	screen_base = Host2MacAddr(the_buffer);
870		VModes[cur_mode].viRowBytes = bytes_per_row;
871		return true;
872		#else
#	Line 626 | Line 875 | static bool open_dga(int width, int heig
875		#endif
876		}
877
878	+	// Open DGA display
879	+	static bool open_dga(int width, int height)
880	+	{
881	+	bool display_open;
882	+
883	+	display_open = open_xf86_dga(width, height);
884	+	#ifdef ENABLE_FBDEV_DGA
885	+	// Try to fallback to FBDev DGA mode
886	+	if (!display_open) {
887	+	is_fbdev_dga_mode = true;
888	+	display_open = open_fbdev_dga(width, height);
889	+	}
890	+	#endif
891	+
892	+	// Common DGA display initialization
893	+	if (display_open) {
894	+
895	+	// Fake image to get display bounds in the refresh function
896	+	if ((img = (XImage *)malloc(sizeof(*img))) == NULL)
897	+	return false;
898	+	img->width = DisplayWidth(x_display, screen);
899	+	img->height = DisplayHeight(x_display, screen);
900	+	img->depth = is_fbdev_dga_mode ? xdepth : depth;
901	+	img->bytes_per_line = TrivialBytesPerRow(img->width, DepthModeForPixelDepth(img->depth));
902	+	}
903	+
904	+	return display_open;
905	+	}
906	+
907		static bool open_display(void)
908		{
909		D(bug("open_display()\n"));
910		const VideoInfo &mode = VModes[cur_mode];
911
912	+	// Get original mouse acceleration
913	+	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
914	+
915		// Find best available X visual
916		if (!find_visual_for_depth(mode.viAppleMode)) {
917		ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
918		return false;
919		}
920
921	+	// Build up visualFormat structure
922	+	visualFormat.fullscreen = (display_type == DIS_SCREEN);
923	+	visualFormat.depth = visualInfo.depth;
924	+	visualFormat.Rmask = visualInfo.red_mask;
925	+	visualFormat.Gmask = visualInfo.green_mask;
926	+	visualFormat.Bmask = visualInfo.blue_mask;
927	+
928		// Create color maps
929		if (color_class == PseudoColor || color_class == DirectColor) {
930		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
#	Line 704 | Line 992 | static bool open_display(void)
992		display_type = mode.viType;
993		depth = depth_of_video_mode(mode.viAppleMode);
994
995	<	bool display_open = false;
996	<	if (display_type == DIS_SCREEN)
995	>	bool display_open;
996	>	switch (display_type) {
997	>	case DIS_SCREEN:
998		display_open = open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
999	<	else if (display_type == DIS_WINDOW)
999	>	break;
1000	>	case DIS_WINDOW:
1001		display_open = open_window(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
1002	+	break;
1003	+	default:
1004	+	display_open = false;
1005	+	break;
1006	+	}
1007
1008		#ifdef ENABLE_VOSF
1009		if (use_vosf) {
1010		// Initialize the VOSF system
1011	+	LOCK_VOSF;
1012		if (!video_vosf_init()) {
1013		ErrorAlert(GetString(STR_VOSF_INIT_ERR));
1014	+	UNLOCK_VOSF;
1015		return false;
1016		}
1017	+	UNLOCK_VOSF;
1018		}
1019		#endif
1020	<
1020	>
1021	>	// Zero screen buffers, viRowBytes is initialized at this stage
1022	>	memset(the_buffer, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1023	>	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1024		return display_open;
1025		}
1026
#	Line 755 | Line 1056 | static void close_window(void)
1056		XSync(x_display, false);
1057		}
1058
1059	<	// Close DGA mode
1060	<	static void close_dga(void)
1059	>	// Close FBDev mode
1060	>	static void close_fbdev_dga(void)
1061	>	{
1062	>	#ifdef ENABLE_FBDEV_DGA
1063	>	uint8 *fb_base;
1064	>	if (!use_vosf)
1065	>	fb_base = the_buffer;
1066	>	#ifdef ENABLE_VOSF
1067	>	else
1068	>	fb_base = the_host_buffer;
1069	>	#endif
1070	>	munmap(fb_base, fb_finfo.smem_len);
1071	>	#endif
1072	>	}
1073	>
1074	>	// Close XF86 DGA mode
1075	>	static void close_xf86_dga(void)
1076		{
1077		#ifdef ENABLE_XF86_DGA
1078		XF86DGADirectVideo(x_display, screen, 0);
1079	+	#endif
1080	+	}
1081	+
1082	+	// Close DGA mode
1083	+	static void close_dga(void)
1084	+	{
1085	+	if (is_fbdev_dga_mode)
1086	+	close_fbdev_dga();
1087	+	else
1088	+	close_xf86_dga();
1089	+
1090		XUngrabPointer(x_display, CurrentTime);
1091		XUngrabKeyboard(x_display, CurrentTime);
765	–	#endif
1092
1093		#ifdef ENABLE_XF86_VIDMODE
1094		if (has_vidmode)
1095		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1096		#endif
1097
1098	+	// Release fake image (it's not a normal XImage!)
1099	+	free(img);
1100	+	img = NULL;
1101	+
1102		if (!use_vosf) {
1103		// don't free() the screen buffer in driver_base dtor
1104		the_buffer = NULL;
#	Line 839 | Line 1169 | static void close_display(void)
1169		}
1170		}
1171		#endif
1172	+
1173	+	// Restore mouse acceleration
1174	+	restore_mouse_accel();
1175		}
1176
1177
#	Line 870 | Line 1203 | static void keycode_init(void)
1203
1204		// Search for server vendor string, then read keycodes
1205		const char *vendor = ServerVendor(x_display);
1206	+	// Force use of MacX mappings on MacOS X with Apple's X server
1207	+	int dummy;
1208	+	if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy))
1209	+	vendor = "MacX";
1210		bool vendor_found = false;
1211		char line[256];
1212		while (fgets(line, 255, f)) {
#	Line 944 | Line 1281 | static int find_mode(int apple_mode, int
1281		return -1;
1282		}
1283
1284	+	// Add custom video mode
1285	+	static void add_custom_mode(VideoInfo *&p, int type, uint32 x, uint32 y, int apple_mode, int apple_id)
1286	+	{
1287	+	p->viType = type;
1288	+	p->viXsize = x;
1289	+	p->viYsize = y;
1290	+	p->viRowBytes = TrivialBytesPerRow(p->viXsize, apple_mode);
1291	+	p->viAppleMode = apple_mode;
1292	+	p->viAppleID = apple_id;
1293	+	p++;
1294	+	}
1295	+
1296		// Add mode to list of supported modes
1297		static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, int apple_mode, int apple_id, int type)
1298		{
1299		if (allow & test) {
1300	<	p->viType = type;
1300	>	uint32 x = 0, y = 0;
1301		switch (apple_id) {
1302		case APPLE_W_640x480:
1303		case APPLE_640x480:
1304	<	p->viXsize = 640;
1305	<	p->viYsize = 480;
1304	>	x = 640;
1305	>	y = 480;
1306		break;
1307		case APPLE_W_800x600:
1308		case APPLE_800x600:
1309	<	p->viXsize = 800;
1310	<	p->viYsize = 600;
1309	>	x = 800;
1310	>	y = 600;
1311		break;
1312		case APPLE_1024x768:
1313	<	p->viXsize = 1024;
1314	<	p->viYsize = 768;
1313	>	x = 1024;
1314	>	y = 768;
1315		break;
1316		case APPLE_1152x768:
1317	<	p->viXsize = 1152;
1318	<	p->viYsize = 768;
1317	>	x = 1152;
1318	>	y = 768;
1319		break;
1320		case APPLE_1152x900:
1321	<	p->viXsize = 1152;
1322	<	p->viYsize = 900;
1321	>	x = 1152;
1322	>	y = 900;
1323		break;
1324		case APPLE_1280x1024:
1325	<	p->viXsize = 1280;
1326	<	p->viYsize = 1024;
1325	>	x = 1280;
1326	>	y = 1024;
1327		break;
1328		case APPLE_1600x1200:
1329	<	p->viXsize = 1600;
1330	<	p->viYsize = 1200;
1329	>	x = 1600;
1330	>	y = 1200;
1331		break;
1332		}
1333	<	p->viRowBytes = TrivialBytesPerRow(p->viXsize, apple_mode);
985	<	p->viAppleMode = apple_mode;
986	<	p->viAppleID = apple_id;
987	<	p++;
1333	>	add_custom_mode(p, type, x, y, apple_mode, apple_id);
1334		}
1335		}
1336
#	Line 998 | Line 1344 | static void add_window_modes(VideoInfo *
1344		static bool has_mode(int x, int y)
1345		{
1346		#ifdef ENABLE_XF86_VIDMODE
1347	<	for (int i=0; i<num_x_video_modes; i++)
1348	<	if (x_video_modes[i]->hdisplay >= x && x_video_modes[i]->vdisplay >= y)
1349	<	return true;
1350	<	return false;
1351	<	#else
1352	<	return DisplayWidth(x_display, screen) >= x && DisplayHeight(x_display, screen) >= y;
1347	>	if (has_vidmode) {
1348	>	for (int i=0; i<num_x_video_modes; i++)
1349	>	if (x_video_modes[i]->hdisplay == x && x_video_modes[i]->vdisplay == y)
1350	>	return true;
1351	>	return false;
1352	>	}
1353		#endif
1354	+	return DisplayWidth(x_display, screen) >= x && DisplayHeight(x_display, screen) >= y;
1355		}
1356
1357		bool VideoInit(void)
#	Line 1053 | Line 1400 | bool VideoInit(void)
1400		#ifdef ENABLE_XF86_DGA
1401		// DGA available?
1402		int event_base, error_base;
1403	+	is_fbdev_dga_mode = false;
1404		if (local_X11 && XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
1405		int dga_flags = 0;
1406		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
1407		has_dga = dga_flags & XF86DGADirectPresent;
1408	+	#if defined(__linux__)
1409	+	// Check r/w permission on /dev/mem for DGA mode to work
1410	+	if (has_dga && access("/dev/mem", R_OK | W_OK) != 0)
1411	+	has_dga = false;
1412	+	#endif
1413		} else
1414		has_dga = false;
1415		#endif
#	Line 1065 | Line 1418 | bool VideoInit(void)
1418		// VidMode available?
1419		int vm_event_base, vm_error_base;
1420		has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
1421	<	if (has_vidmode)
1421	>	if (has_vidmode) {
1422	>	int vm_major_version, vm_minor_version;
1423	>	XF86VidModeQueryVersion(x_display, &vm_major_version, &vm_minor_version);
1424	>	D(bug("VidMode extension %d.%d available\n", vm_major_version, vm_minor_version));
1425		XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
1426	+	}
1427	+	#endif
1428	+
1429	+	#ifdef ENABLE_FBDEV_DGA
1430	+	// FBDev available?
1431	+	bool has_fbdev_dga = false;
1432	+	if (local_X11) {
1433	+	if ((fb_dev_fd = open("/dev/fb0", O_RDWR)) > 0) {
1434	+	if (ioctl(fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo) != 0)
1435	+	close(fb_dev_fd);
1436	+	else {
1437	+	has_fbdev_dga = true;
1438	+	if (!has_dga) {
1439	+	// Fallback to FBDev DGA mode if XF86 DGA is not possible
1440	+	has_dga = true;
1441	+	is_fbdev_dga_mode = true;
1442	+	}
1443	+	fb_orig_vinfo = fb_vinfo;
1444	+	D(bug("Frame buffer device initial resolution: %dx%dx%d\n", fb_vinfo.xres, fb_vinfo.yres, fb_vinfo.bits_per_pixel));
1445	+	}
1446	+	}
1447	+	}
1448		#endif
1449
1450		// Find black and white colors
#	Line 1094 | Line 1472 | bool VideoInit(void)
1472		break;
1473		}
1474
1475	+	// Get screen mode from preferences
1476	+	const char *mode_str = PrefsFindString("screen");
1477	+	int default_width = 640, default_height = 480;
1478	+	if (mode_str) {
1479	+	display_type = DIS_INVALID;
1480	+	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1481	+	display_type = DIS_WINDOW;
1482	+	#ifdef ENABLE_XF86_DGA
1483	+	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1484	+	display_type = DIS_SCREEN;
1485	+	#endif
1486	+	#ifdef ENABLE_FBDEV_DGA
1487	+	else if (has_fbdev_dga && sscanf(mode_str, "fbdev/%d/%d", &default_width, &default_height) == 2) {
1488	+	is_fbdev_dga_mode = true;
1489	+	display_type = DIS_SCREEN;
1490	+	}
1491	+	#endif
1492	+	if (display_type == DIS_INVALID) {
1493	+	D(bug("Invalid screen mode specified, defaulting to old modes selection\n"));
1494	+	mode_str = NULL;
1495	+	}
1496	+	else {
1497	+	if (default_width <= 0)
1498	+	default_width = DisplayWidth(x_display, screen);
1499	+	else if (default_width > DisplayWidth(x_display, screen))
1500	+	default_width = DisplayWidth(x_display, screen);
1501	+	if (default_height <= 0)
1502	+	default_height = DisplayHeight(x_display, screen);
1503	+	else if (default_height > DisplayHeight(x_display, screen))
1504	+	default_height = DisplayHeight(x_display, screen);
1505	+	}
1506	+	}
1507	+
1508		// Construct video mode table
1509		uint32 window_modes = PrefsFindInt32("windowmodes");
1510		uint32 screen_modes = PrefsFindInt32("screenmodes");
1511		if (!has_dga)
1512		screen_modes = 0;
1513	<	if (window_modes == 0 && screen_modes == 0)
1513	>	if (mode_str)
1514	>	window_modes = screen_modes = 0;
1515	>	else if (window_modes == 0 && screen_modes == 0)
1516		window_modes |= 3;      // Allow at least 640x480 and 800x600 window modes
1517
1518		VideoInfo *p = VModes;
1519	<	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1520	<	if (find_visual_for_depth(d))
1521	<	add_window_modes(p, window_modes, d);
1519	>	if (mode_str) {
1520	>	if (display_type == DIS_WINDOW) {
1521	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++) {
1522	>	if (find_visual_for_depth(d)) {
1523	>	if (default_width > 640 && default_height > 480)
1524	>	add_mode(p, 3, 1, d, APPLE_W_640x480, DIS_WINDOW);
1525	>	if (default_width > 800 && default_height > 600)
1526	>	add_mode(p, 3, 2, d, APPLE_W_800x600, DIS_WINDOW);
1527	>	add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1528	>	}
1529	>	}
1530	>	#ifdef ENABLE_VOSF
1531	>	} else if (display_type == DIS_SCREEN && is_fbdev_dga_mode) {
1532	>	for (unsigned int d = APPLE_1_BIT; d <= default_mode; d++)
1533	>	if (find_visual_for_depth(d))
1534	>	add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1535	>	#endif
1536	>	} else
1537	>	add_custom_mode(p, display_type, default_width, default_height, default_mode, APPLE_CUSTOM);
1538
1539	<	if (has_vidmode) {
1539	>	// Add extra VidMode capable modes
1540	>	if (display_type == DIS_SCREEN) {
1541	>	struct {
1542	>	int w;
1543	>	int h;
1544	>	int apple_id;
1545	>	}
1546	>	video_modes[] = {
1547	>	{  640,  480, APPLE_640x480   },
1548	>	{  800,  600, APPLE_800x600   },
1549	>	{ 1024,  768, APPLE_1024x768  },
1550	>	{ 1152,  768, APPLE_1152x768  },
1551	>	{ 1152,  900, APPLE_1152x900  },
1552	>	{ 1280, 1024, APPLE_1280x1024 },
1553	>	{ 1600, 1200, APPLE_1600x1200 },
1554	>	{ 0, }
1555	>	};
1556	>
1557	>	for (int i = 0; video_modes[i].w != 0; i++) {
1558	>	const int w = video_modes[i].w;
1559	>	const int h = video_modes[i].h;
1560	>	if (w >= default_width || h >= default_height)
1561	>	continue;
1562	>	if (has_mode(w, h)) {
1563	>	#ifdef ENABLE_VOSF
1564	>	if (is_fbdev_dga_mode) {
1565	>	for (unsigned int d = APPLE_1_BIT; d <= default_mode; d++)
1566	>	if (find_visual_for_depth(d))
1567	>	add_custom_mode(p, display_type, w, h, d, video_modes[i].apple_id);
1568	>	} else
1569	>	#endif
1570	>	add_custom_mode(p, display_type, w, h, default_mode, video_modes[i].apple_id);
1571	>	}
1572	>	}
1573	>	}
1574	>	} else if (window_modes) {
1575	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1576	>	if (find_visual_for_depth(d))
1577	>	add_window_modes(p, window_modes, d);
1578	>	} else if (has_vidmode) {
1579		if (has_mode(640, 480))
1580		add_mode(p, screen_modes, 1, default_mode, APPLE_640x480, DIS_SCREEN);
1581		if (has_mode(800, 600))
#	Line 1148 | Line 1616 | bool VideoInit(void)
1616		int apple_id = find_apple_resolution(screen_width, screen_height);
1617		if (apple_id != -1)
1618		cur_mode = find_mode(default_mode, apple_id, DIS_SCREEN);
1619	+	} else if (has_dga && mode_str)
1620	+	cur_mode = find_mode(default_mode, APPLE_CUSTOM, DIS_SCREEN);
1621	+
1622	+	if (cur_mode == -1) {
1623	+	// pick up first windowed mode available
1624	+	for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
1625	+	if (p->viType == DIS_WINDOW && p->viAppleMode == default_mode) {
1626	+	cur_mode = p - VModes;
1627	+	break;
1628	+	}
1629	+	}
1630		}
1152	–	if (cur_mode == -1)
1153	–	cur_mode = find_mode(default_mode, APPLE_W_640x480, DIS_WINDOW);
1631		assert(cur_mode != -1);
1632
1633		#if DEBUG
#	Line 1170 | Line 1647 | bool VideoInit(void)
1647		XSetErrorHandler(ignore_errors);
1648		#endif
1649
1650	+	// Lock down frame buffer
1651	+	XSync(x_display, false);
1652	+	LOCK_FRAME_BUFFER;
1653	+
1654		// Start periodic thread
1655		XSync(x_display, false);
1656		Set_pthread_attr(&redraw_thread_attr, 0);
1657	+	redraw_thread_cancel = false;
1658		redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1659		D(bug("Redraw thread installed (%ld)\n", redraw_thread));
1660		return true;
#	Line 1187 | Line 1669 | void VideoExit(void)
1669		{
1670		// Stop redraw thread
1671		if (redraw_thread_active) {
1672	+	redraw_thread_cancel = true;
1673		pthread_cancel(redraw_thread);
1674		pthread_join(redraw_thread, NULL);
1675		redraw_thread_active = false;
1676		}
1677
1678	+	// Unlock frame buffer
1679	+	UNLOCK_FRAME_BUFFER;
1680	+	XSync(x_display, false);
1681	+	D(bug(" frame buffer unlocked\n"));
1682	+
1683		#ifdef ENABLE_VOSF
1684		if (use_vosf) {
1685		// Deinitialize VOSF
#	Line 1206 | Line 1694 | void VideoExit(void)
1694		XFlush(x_display);
1695		XSync(x_display, false);
1696		}
1697	+
1698	+	#ifdef ENABLE_FBDEV_DGA
1699	+	// Close framebuffer device
1700	+	if (fb_dev_fd >= 0) {
1701	+	close(fb_dev_fd);
1702	+	fb_dev_fd = -1;
1703	+	}
1704	+	#endif
1705		}
1706
1707
#	Line 1213 | Line 1709 | void VideoExit(void)
1709		*  Suspend/resume emulator
1710		*/
1711
1216	–	extern void PauseEmulator(void);
1217	–	extern void ResumeEmulator(void);
1218	–
1712		static void suspend_emul(void)
1713		{
1714		if (display_type == DIS_SCREEN) {
#	Line 1223 | Line 1716 | static void suspend_emul(void)
1716		ADBKeyUp(0x36);
1717		ctrl_down = false;
1718
1719	<	// Pause MacOS thread
1720	<	PauseEmulator();
1228	<	emul_suspended = true;
1719	>	// Lock frame buffer (this will stop the MacOS thread)
1720	>	LOCK_FRAME_BUFFER;
1721
1722		// Save frame buffer
1723		fb_save = malloc(VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1724		if (fb_save)
1725	<	memcpy(fb_save, (void *)screen_base, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1725	>	Mac2Host_memcpy(fb_save, screen_base, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1726
1727		// Close full screen display
1728	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1729		#ifdef ENABLE_XF86_DGA
1730	<	XF86DGADirectVideo(x_display, screen, 0);
1730	>	if (!is_fbdev_dga_mode)
1731	>	XF86DGADirectVideo(x_display, screen, 0);
1732	>	#endif
1733		XUngrabPointer(x_display, CurrentTime);
1734		XUngrabKeyboard(x_display, CurrentTime);
1735		#endif
1736	+	restore_mouse_accel();
1737	+	XUnmapWindow(x_display, the_win);
1738	+	wait_unmapped(the_win);
1739		XSync(x_display, false);
1740
1741		// Open "suspend" window
1742		XSetWindowAttributes wattr;
1743		wattr.event_mask = KeyPressMask;
1744	<	wattr.background_pixel = black_pixel;
1247	<	wattr.border_pixel = black_pixel;
1744	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
1745		wattr.backing_store = Always;
1746	<	wattr.backing_planes = xdepth;
1747	<	wattr.colormap = DefaultColormap(x_display, screen);
1251	<	XSync(x_display, false);
1746	>	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
1747	>
1748		suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1749	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
1750	<	CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
1751	<	XSync(x_display, false);
1752	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1753	<	XMapRaised(x_display, suspend_win);
1258	<	XSync(x_display, false);
1749	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBackingStore | CWColormap, &wattr);
1750	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1751	>	set_window_focus(suspend_win);
1752	>	XMapWindow(x_display, suspend_win);
1753	>	emul_suspended = true;
1754		}
1755		}
1756
#	Line 1266 | Line 1761 | static void resume_emul(void)
1761		XSync(x_display, false);
1762
1763		// Reopen full screen display
1764	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1765	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1764	>	XMapRaised(x_display, the_win);
1765	>	wait_mapped(the_win);
1766	>	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1767	>	Window w = is_fbdev_dga_mode ? the_win : rootwin;
1768	>	XGrabKeyboard(x_display, w, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1769	>	XGrabPointer(x_display, w, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, is_fbdev_dga_mode ? w : None, None, CurrentTime);
1770	>	disable_mouse_accel();
1771		#ifdef ENABLE_XF86_DGA
1772	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1773	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1772	>	if (!is_fbdev_dga_mode) {
1773	>	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1774	>	XF86DGASetViewPort(x_display, screen, 0, 0);
1775	>	}
1776		#endif
1777		XSync(x_display, false);
1778
#	Line 1281 | Line 1783 | static void resume_emul(void)
1783		if (use_vosf) {
1784		LOCK_VOSF;
1785		PFLAG_SET_ALL;
1284	–	UNLOCK_VOSF;
1786		memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1787	+	UNLOCK_VOSF;
1788		}
1789		#endif
1790
#	Line 1292 | Line 1794 | static void resume_emul(void)
1794		// Don't copy fb_save to the temporary frame buffer in VOSF mode
1795		if (!use_vosf)
1796		#endif
1797	<	memcpy((void *)screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1797	>	Host2Mac_memcpy(screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1798		free(fb_save);
1799		fb_save = NULL;
1800		}
1299	–	if (depth == 8)
1300	–	palette_changed = true;
1801
1802	<	// Resume MacOS thread
1802	>	// Unlock frame buffer (and continue MacOS thread)
1803	>	UNLOCK_FRAME_BUFFER;
1804		emul_suspended = false;
1304	–	ResumeEmulator();
1805		}
1806
1807
#	Line 1465 | Line 1965 | static int kc_decode(KeySym ks)
1965		return -1;
1966		}
1967
1968	<	static int event2keycode(XKeyEvent &ev)
1968	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1969		{
1970		KeySym ks;
1471	–	int as;
1971		int i = 0;
1972
1973		do {
1974		ks = XLookupKeysym(&ev, i++);
1975	<	as = kc_decode(ks);
1976	<	if (as != -1)
1975	>	int as = kc_decode(ks);
1976	>	if (as >= 0)
1977	>	return as;
1978	>	if (as == -2)
1979		return as;
1980		} while (ks != NoSymbol);
1981
#	Line 1549 | Line 2050 | static void handle_events(void)
2050
2051		// Keyboard
2052		case KeyPress: {
2053	<	int code = event2keycode(event.xkey);
2054	<	if (use_keycodes && code != -1)
2055	<	code = keycode_table[event.xkey.keycode & 0xff];
2056	<	if (code != -1) {
2053	>	int code = -1;
2054	>	if (use_keycodes) {
2055	>	if (event2keycode(event.xkey, true) != -2)      // This is called to process the hotkeys
2056	>	code = keycode_table[event.xkey.keycode & 0xff];
2057	>	} else
2058	>	code = event2keycode(event.xkey, true);
2059	>	if (code >= 0) {
2060		if (!emul_suspended) {
2061	<	ADBKeyDown(code);
2061	>	if (code == 0x39) {     // Caps Lock pressed
2062	>	if (caps_on) {
2063	>	ADBKeyUp(code);
2064	>	caps_on = false;
2065	>	} else {
2066	>	ADBKeyDown(code);
2067	>	caps_on = true;
2068	>	}
2069	>	} else
2070	>	ADBKeyDown(code);
2071		if (code == 0x36)
2072		ctrl_down = true;
2073		} else {
#	Line 1565 | Line 2078 | static void handle_events(void)
2078		break;
2079		}
2080		case KeyRelease: {
2081	<	int code = event2keycode(event.xkey);
2082	<	if (use_keycodes && code != 1)
2083	<	code = keycode_table[event.xkey.keycode & 0xff];
2084	<	if (code != -1) {
2081	>	int code = -1;
2082	>	if (use_keycodes) {
2083	>	if (event2keycode(event.xkey, false) != -2)     // This is called to process the hotkeys
2084	>	code = keycode_table[event.xkey.keycode & 0xff];
2085	>	} else
2086	>	code = event2keycode(event.xkey, false);
2087	>	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
2088		ADBKeyUp(code);
2089		if (code == 0x36)
2090		ctrl_down = false;
#	Line 1582 | Line 2098 | static void handle_events(void)
2098		if (use_vosf) {                 // VOSF refresh
2099		LOCK_VOSF;
2100		PFLAG_SET_ALL;
2101	+	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2102		UNLOCK_VOSF;
2103		}
2104	+	else
2105		#endif
2106	<	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2106	>	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2107		break;
2108		}
2109		}
#	Line 1601 | Line 2119 | void VideoVBL(void)
2119		if (emerg_quit)
2120		QuitEmulator();
2121
2122	+	// Temporarily give up frame buffer lock (this is the point where
2123	+	// we are suspended when the user presses Ctrl-Tab)
2124	+	UNLOCK_FRAME_BUFFER;
2125	+	LOCK_FRAME_BUFFER;
2126	+
2127		// Execute video VBL
2128		if (private_data != NULL && private_data->interruptsEnabled)
2129		VSLDoInterruptService(private_data->vslServiceID);
#	Line 1608 | Line 2131 | void VideoVBL(void)
2131
2132
2133		/*
1611	–	*  Install graphics acceleration
1612	–	*/
1613	–
1614	–	// Rectangle inversion
1615	–	template< int bpp >
1616	–	static inline void do_invrect(uint8 *dest, uint32 length)
1617	–	{
1618	–	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1619	–	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1620	–	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1621	–	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1622	–
1623	–	#ifndef UNALIGNED_PROFITABLE
1624	–	// Align on 16-bit boundaries
1625	–	if (bpp < 16 && (((uintptr)dest) & 1)) {
1626	–	INVERT_1(dest, 0);
1627	–	dest += 1; length -= 1;
1628	–	}
1629	–
1630	–	// Align on 32-bit boundaries
1631	–	if (bpp < 32 && (((uintptr)dest) & 2)) {
1632	–	INVERT_2(dest, 0);
1633	–	dest += 2; length -= 2;
1634	–	}
1635	–	#endif
1636	–
1637	–	// Invert 8-byte words
1638	–	if (length >= 8) {
1639	–	const int r = (length / 8) % 8;
1640	–	dest += r * 8;
1641	–
1642	–	int n = ((length / 8) + 7) / 8;
1643	–	switch (r) {
1644	–	case 0: do {
1645	–	dest += 64;
1646	–	INVERT_8(dest, -8);
1647	–	case 7: INVERT_8(dest, -7);
1648	–	case 6: INVERT_8(dest, -6);
1649	–	case 5: INVERT_8(dest, -5);
1650	–	case 4: INVERT_8(dest, -4);
1651	–	case 3: INVERT_8(dest, -3);
1652	–	case 2: INVERT_8(dest, -2);
1653	–	case 1: INVERT_8(dest, -1);
1654	–	} while (--n > 0);
1655	–	}
1656	–	}
1657	–
1658	–	// 32-bit cell to invert?
1659	–	if (length & 4) {
1660	–	INVERT_4(dest, 0);
1661	–	if (bpp <= 16)
1662	–	dest += 4;
1663	–	}
1664	–
1665	–	// 16-bit cell to invert?
1666	–	if (bpp <= 16 && (length & 2)) {
1667	–	INVERT_2(dest, 0);
1668	–	if (bpp <= 8)
1669	–	dest += 2;
1670	–	}
1671	–
1672	–	// 8-bit cell to invert?
1673	–	if (bpp <= 8 && (length & 1))
1674	–	INVERT_1(dest, 0);
1675	–
1676	–	#undef INVERT_1
1677	–	#undef INVERT_2
1678	–	#undef INVERT_4
1679	–	#undef INVERT_8
1680	–	}
1681	–
1682	–	void NQD_invrect(uint32 p)
1683	–	{
1684	–	D(bug("accl_invrect %08x\n", p));
1685	–
1686	–	// Get inversion parameters
1687	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1688	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1689	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1690	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1691	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1692	–	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1693	–
1694	–	//!!?? pen_mode == 14
1695	–
1696	–	// And perform the inversion
1697	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1698	–	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1699	–	uint8 *dest = (uint8 *)(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1700	–	width *= bpp;
1701	–	switch (bpp) {
1702	–	case 1:
1703	–	for (int i = 0; i < height; i++) {
1704	–	do_invrect<8>(dest, width);
1705	–	dest += dest_row_bytes;
1706	–	}
1707	–	break;
1708	–	case 2:
1709	–	for (int i = 0; i < height; i++) {
1710	–	do_invrect<16>(dest, width);
1711	–	dest += dest_row_bytes;
1712	–	}
1713	–	break;
1714	–	case 4:
1715	–	for (int i = 0; i < height; i++) {
1716	–	do_invrect<32>(dest, width);
1717	–	dest += dest_row_bytes;
1718	–	}
1719	–	break;
1720	–	}
1721	–	}
1722	–
1723	–	// Rectangle filling
1724	–	template< int bpp >
1725	–	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1726	–	{
1727	–	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1728	–	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1729	–	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1730	–	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1731	–
1732	–	#ifndef UNALIGNED_PROFITABLE
1733	–	// Align on 16-bit boundaries
1734	–	if (bpp < 16 && (((uintptr)dest) & 1)) {
1735	–	FILL_1(dest, 0, color);
1736	–	dest += 1; length -= 1;
1737	–	}
1738	–
1739	–	// Align on 32-bit boundaries
1740	–	if (bpp < 32 && (((uintptr)dest) & 2)) {
1741	–	FILL_2(dest, 0, color);
1742	–	dest += 2; length -= 2;
1743	–	}
1744	–	#endif
1745	–
1746	–	// Fill 8-byte words
1747	–	if (length >= 8) {
1748	–	const uint64 c = (((uint64)color) << 32) | color;
1749	–	const int r = (length / 8) % 8;
1750	–	dest += r * 8;
1751	–
1752	–	int n = ((length / 8) + 7) / 8;
1753	–	switch (r) {
1754	–	case 0: do {
1755	–	dest += 64;
1756	–	FILL_8(dest, -8, c);
1757	–	case 7: FILL_8(dest, -7, c);
1758	–	case 6: FILL_8(dest, -6, c);
1759	–	case 5: FILL_8(dest, -5, c);
1760	–	case 4: FILL_8(dest, -4, c);
1761	–	case 3: FILL_8(dest, -3, c);
1762	–	case 2: FILL_8(dest, -2, c);
1763	–	case 1: FILL_8(dest, -1, c);
1764	–	} while (--n > 0);
1765	–	}
1766	–	}
1767	–
1768	–	// 32-bit cell to fill?
1769	–	if (length & 4) {
1770	–	FILL_4(dest, 0, color);
1771	–	if (bpp <= 16)
1772	–	dest += 4;
1773	–	}
1774	–
1775	–	// 16-bit cell to fill?
1776	–	if (bpp <= 16 && (length & 2)) {
1777	–	FILL_2(dest, 0, color);
1778	–	if (bpp <= 8)
1779	–	dest += 2;
1780	–	}
1781	–
1782	–	// 8-bit cell to fill?
1783	–	if (bpp <= 8 && (length & 1))
1784	–	FILL_1(dest, 0, color);
1785	–
1786	–	#undef FILL_1
1787	–	#undef FILL_2
1788	–	#undef FILL_4
1789	–	#undef FILL_8
1790	–	}
1791	–
1792	–	void NQD_fillrect(uint32 p)
1793	–	{
1794	–	D(bug("accl_fillrect %08x\n", p));
1795	–
1796	–	// Get filling parameters
1797	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1798	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1799	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1800	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1801	–	uint32 color = ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen);
1802	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1803	–	D(bug(" width %d, height %d\n", width, height));
1804	–	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1805	–
1806	–	// And perform the fill
1807	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1808	–	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1809	–	uint8 *dest = (uint8 *)(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1810	–	width *= bpp;
1811	–	switch (bpp) {
1812	–	case 1:
1813	–	for (int i = 0; i < height; i++) {
1814	–	memset(dest, color, width);
1815	–	dest += dest_row_bytes;
1816	–	}
1817	–	break;
1818	–	case 2:
1819	–	for (int i = 0; i < height; i++) {
1820	–	do_fillrect<16>(dest, color, width);
1821	–	dest += dest_row_bytes;
1822	–	}
1823	–	break;
1824	–	case 4:
1825	–	for (int i = 0; i < height; i++) {
1826	–	do_fillrect<32>(dest, color, width);
1827	–	dest += dest_row_bytes;
1828	–	}
1829	–	break;
1830	–	}
1831	–	}
1832	–
1833	–	bool NQD_fillrect_hook(uint32 p)
1834	–	{
1835	–	D(bug("accl_fillrect_hook %08x\n", p));
1836	–
1837	–	// Check if we can accelerate this fillrect
1838	–	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1839	–	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1840	–	if (transfer_mode == 8) {
1841	–	// Fill
1842	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1843	–	return true;
1844	–	}
1845	–	else if (transfer_mode == 10) {
1846	–	// Invert
1847	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1848	–	return true;
1849	–	}
1850	–	}
1851	–	return false;
1852	–	}
1853	–
1854	–	// Rectangle blitting
1855	–	// TODO: optimize for VOSF and target pixmap == screen
1856	–	void NQD_bitblt(uint32 p)
1857	–	{
1858	–	D(bug("accl_bitblt %08x\n", p));
1859	–
1860	–	// Get blitting parameters
1861	–	int16 src_X  = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1862	–	int16 src_Y  = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1863	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1864	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1865	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1866	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1867	–	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1868	–	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1869	–	D(bug(" width %d, height %d\n", width, height));
1870	–
1871	–	// And perform the blit
1872	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1873	–	width *= bpp;
1874	–	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1875	–	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1876	–	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1877	–	uint8 *src = (uint8 *)ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp);
1878	–	uint8 *dst = (uint8 *)ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp);
1879	–	for (int i = 0; i < height; i++) {
1880	–	memcpy(dst, src, width);
1881	–	src += src_row_bytes;
1882	–	dst += dst_row_bytes;
1883	–	}
1884	–	}
1885	–	else {
1886	–	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1887	–	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1888	–	uint8 *src = (uint8 *)ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp);
1889	–	uint8 *dst = (uint8 *)ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp);
1890	–	for (int i = height - 1; i >= 0; i--) {
1891	–	memcpy(dst, src, width);
1892	–	src -= src_row_bytes;
1893	–	dst -= dst_row_bytes;
1894	–	}
1895	–	}
1896	–	}
1897	–
1898	–	/*
1899	–	BitBlt transfer modes:
1900	–	0 : srcCopy
1901	–	1 : srcOr
1902	–	2 : srcXor
1903	–	3 : srcBic
1904	–	4 : notSrcCopy
1905	–	5 : notSrcOr
1906	–	6 : notSrcXor
1907	–	7 : notSrcBic
1908	–	32 : blend
1909	–	33 : addPin
1910	–	34 : addOver
1911	–	35 : subPin
1912	–	36 : transparent
1913	–	37 : adMax
1914	–	38 : subOver
1915	–	39 : adMin
1916	–	50 : hilite
1917	–	*/
1918	–
1919	–	bool NQD_bitblt_hook(uint32 p)
1920	–	{
1921	–	D(bug("accl_draw_hook %08x\n", p));
1922	–
1923	–	// Check if we can accelerate this bitblt
1924	–	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1925	–	ReadMacInt32(p + 0x130) == 0 &&
1926	–	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1927	–	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1928	–	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1929	–	ReadMacInt32(p + acclTransferMode) == 0 &&                                                                               // srcCopy?
1930	–	ReadMacInt32(p + 0x15c) > 0) {
1931	–
1932	–	// Yes, set function pointer
1933	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1934	–	return true;
1935	–	}
1936	–	return false;
1937	–	}
1938	–
1939	–	// Wait for graphics operation to finish
1940	–	bool NQD_sync_hook(uint32 arg)
1941	–	{
1942	–	D(bug("accl_sync_hook %08x\n", arg));
1943	–	return true;
1944	–	}
1945	–
1946	–	void VideoInstallAccel(void)
1947	–	{
1948	–	// Temporary hack until it's fixed for e.g. little-endian & 64-bit platforms
1949	–	#ifndef __powerpc__
1950	–	return;
1951	–	#endif
1952	–
1953	–	// Install acceleration hooks
1954	–	if (PrefsFindBool("gfxaccel")) {
1955	–	D(bug("Video: Installing acceleration hooks\n"));
1956	–	uint32 base;
1957	–
1958	–	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1959	–	base = bitblt_hook_info.addr();
1960	–	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1961	–	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1962	–	WriteMacInt32(base + 8, ACCL_BITBLT);
1963	–	NQDMisc(6, bitblt_hook_info.ptr());
1964	–
1965	–	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1966	–	base = fillrect_hook_info.addr();
1967	–	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1968	–	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1969	–	WriteMacInt32(base + 8, ACCL_FILLRECT);
1970	–	NQDMisc(6, fillrect_hook_info.ptr());
1971	–	}
1972	–	}
1973	–
1974	–
1975	–	/*
2134		*  Change video mode
2135		*/
2136
#	Line 2062 | Line 2220 | void video_set_palette(void)
2220		// We have to redraw everything because the interpretation of pixel values changed
2221		LOCK_VOSF;
2222		PFLAG_SET_ALL;
2223	+	if (display_type == DIS_SCREEN)
2224	+	PFLAG_SET_VERY_DIRTY;
2225		UNLOCK_VOSF;
2066	–	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2226		}
2227		#endif
2228
#	Line 2075 | Line 2234 | void video_set_palette(void)
2234
2235
2236		/*
2237	+	*  Can we set the MacOS cursor image into the window?
2238	+	*/
2239	+
2240	+	bool video_can_change_cursor(void)
2241	+	{
2242	+	return hw_mac_cursor_accl && (display_type != DIS_SCREEN);
2243	+	}
2244	+
2245	+
2246	+	/*
2247		*  Set cursor image for window
2248		*/
2249
#	Line 2235 | Line 2404 | static void handle_palette_changes(void)
2404		}
2405
2406		#ifdef ENABLE_XF86_DGA
2407	<	if (display_type == DIS_SCREEN) {
2407	>	if (display_type == DIS_SCREEN && !is_fbdev_dga_mode) {
2408		current_dga_cmap ^= 1;
2409		if (!IsDirectMode(mode) && cmap[current_dga_cmap])
2410		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
#	Line 2254 | Line 2423 | static void *redraw_func(void *arg)
2423		int64 ticks = 0;
2424		uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2425
2426	<	for (;;) {
2426	>	while (!redraw_thread_cancel) {
2427
2428		// Pause if requested (during video mode switches)
2429		while (thread_stop_req)
#	Line 2280 | Line 2449 | static void *redraw_func(void *arg)
2449		quit_full_screen = false;
2450		if (display_type == DIS_SCREEN) {
2451		XDisplayLock();
2452	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2453		#ifdef ENABLE_XF86_DGA
2454	<	XF86DGADirectVideo(x_display, screen, 0);
2454	>	if (!is_fbdev_dga_mode)
2455	>	XF86DGADirectVideo(x_display, screen, 0);
2456	>	#endif
2457		XUngrabPointer(x_display, CurrentTime);
2458		XUngrabKeyboard(x_display, CurrentTime);
2459		XUnmapWindow(x_display, the_win);
#	Line 2319 | Line 2491 | static void *redraw_func(void *arg)
2491		update_display();
2492
2493		// Set new cursor image if it was changed
2494	<	if (cursor_changed) {
2494	>	if (hw_mac_cursor_accl && cursor_changed) {
2495		cursor_changed = false;
2496	<	memcpy(cursor_image->data, MacCursor + 4, 32);
2497	<	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2496	>	uint8 *x_data = (uint8 *)cursor_image->data;
2497	>	uint8 *x_mask = (uint8 *)cursor_mask_image->data;
2498	>	for (int i = 0; i < 32; i++) {
2499	>	x_mask[i] = MacCursor[4 + i] | MacCursor[36 + i];
2500	>	x_data[i] = MacCursor[4 + i];
2501	>	}
2502		XDisplayLock();
2503		XFreeCursor(x_display, mac_cursor);
2504		XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);

Diff Legend

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