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.13 by gbeauche, 2004-04-10T23:15:21Z vs.
Revision 1.39 by gbeauche, 2005-03-28T09:05:28Z

#	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>
49	>	# include <X11/extensions/xf86dga.h>
50		#endif
51
52		#ifdef ENABLE_XF86_VIDMODE
#	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;
79		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 80 | 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 97 | 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 125 | 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 char *dga_screen_base;
129	<	static int dga_fb_width;
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 149 | 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 196 | Line 238 | static int palette_size(int mode)
238		}
239		}
240
241	+	// Return bits per pixel for requested depth
242	+	static inline int bytes_per_pixel(int depth)
243	+	{
244	+	int bpp;
245	+	switch (depth) {
246	+	case 8:
247	+	bpp = 1;
248	+	break;
249	+	case 15: case 16:
250	+	bpp = 2;
251	+	break;
252	+	case 24: case 32:
253	+	bpp = 4;
254	+	break;
255	+	default:
256	+	abort();
257	+	}
258	+	return bpp;
259	+	}
260	+
261		// Map video_mode depth ID to numerical depth value
262		static inline int depth_of_video_mode(int mode)
263		{
264	<	int depth = -1;
264	>	int depth;
265		switch (mode) {
266		case APPLE_1_BIT:
267		depth = 1;
#	Line 340 | 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)
438	+	{
439	+	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
440	+	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
441	+	}
442	+
443		// Wait until window is mapped/unmapped
444	<	void wait_mapped(Window w)
444	>	static void wait_mapped(Window w)
445		{
446		XEvent e;
447		do {
#	Line 349 | Line 449 | void wait_mapped(Window w)
449		} while ((e.type != MapNotify) || (e.xmap.event != w));
450		}
451
452	<	void wait_unmapped(Window w)
452	>	static void wait_unmapped(Window w)
453		{
454		XEvent e;
455		do {
#	Line 357 | Line 457 | 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 389 | 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);
512
513		// Make window unresizable
514		XSizeHints *hints;
#	Line 468 | 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 496 | 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 504 | Line 633 | static bool open_window(int width, int h
633		return true;
634		}
635
636	+	// Open FBDev display
637	+	static bool open_fbdev(int width, int height)
638	+	{
639	+	#ifdef ENABLE_FBDEV_DGA
640	+	if (ioctl(fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo) != 0) {
641	+	D(bug("[fbdev] Can't get FSCREENINFO: %s\n", strerror(errno)));
642	+	return false;
643	+	}
644	+	D(bug("[fbdev] Device ID: %s\n", fb_finfo.id));
645	+	D(bug("[fbdev] smem_start: %p [%d bytes]\n", fb_finfo.smem_start, fb_finfo.smem_len));
646	+	int fb_type = fb_finfo.type;
647	+	const char *fb_type_str = NULL;
648	+	switch (fb_type) {
649	+	case FB_TYPE_PACKED_PIXELS:                     fb_type_str = "Packed Pixels";                  break;
650	+	case FB_TYPE_PLANES:                            fb_type_str = "Non interleaved planes"; break;
651	+	case FB_TYPE_INTERLEAVED_PLANES:        fb_type_str = "Interleaved planes";             break;
652	+	case FB_TYPE_TEXT:                                      fb_type_str = "Text/attributes";                break;
653	+	case FB_TYPE_VGA_PLANES:                        fb_type_str = "EGA/VGA planes";                 break;
654	+	default:                                                        fb_type_str = "<unknown>";                              break;
655	+	}
656	+	D(bug("[fbdev] type: %s\n", fb_type_str));
657	+	int fb_visual = fb_finfo.visual;
658	+	const char *fb_visual_str;
659	+	switch (fb_visual) {
660	+	case FB_VISUAL_MONO01:                          fb_visual_str = "Monochrome 1=Black 0=White";   break;
661	+	case FB_VISUAL_MONO10:                          fb_visual_str = "Monochrome 1=While 0=Black";   break;
662	+	case FB_VISUAL_TRUECOLOR:                       fb_visual_str = "True color";                                   break;
663	+	case FB_VISUAL_PSEUDOCOLOR:                     fb_visual_str = "Pseudo color (like atari)";    break;
664	+	case FB_VISUAL_DIRECTCOLOR:                     fb_visual_str = "Direct color";                                 break;
665	+	case FB_VISUAL_STATIC_PSEUDOCOLOR:      fb_visual_str = "Pseudo color readonly";                break;
666	+	default:                                                        fb_visual_str = "<unknown>";                                    break;
667	+	}
668	+	D(bug("[fbdev] visual: %s\n", fb_visual_str));
669	+
670	+	if (fb_type != FB_TYPE_PACKED_PIXELS) {
671	+	D(bug("[fbdev] type %s not supported\n", fb_type_str));
672	+	return false;
673	+	}
674	+
675	+	// Map frame buffer
676	+	the_buffer = (uint8 *)mmap(NULL, fb_finfo.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_dev_fd, 0);
677	+	if (the_buffer == MAP_FAILED) {
678	+	D(bug("[fbdev] Can't mmap /dev/fb0: %s\n", strerror(errno)));
679	+	return false;
680	+	}
681	+
682	+	// Set absolute mouse mode
683	+	ADBSetRelMouseMode(false);
684	+
685	+	// Create window
686	+	XSetWindowAttributes wattr;
687	+	wattr.event_mask = eventmask = dga_eventmask;
688	+	wattr.override_redirect = True;
689	+	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
690	+	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
691	+	InputOutput, vis, CWEventMask | CWOverrideRedirect |
692	+	(color_class == DirectColor ? CWColormap : 0), &wattr);
693	+
694	+	// Show window
695	+	XMapRaised(x_display, the_win);
696	+	wait_mapped(the_win);
697	+
698	+	// Grab mouse and keyboard
699	+	XGrabKeyboard(x_display, the_win, True,
700	+	GrabModeAsync, GrabModeAsync, CurrentTime);
701	+	XGrabPointer(x_display, the_win, True,
702	+	PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
703	+	GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
704	+	disable_mouse_accel();
705	+
706	+	// Create no_cursor
707	+	mac_cursor = XCreatePixmapCursor(x_display,
708	+	XCreatePixmap(x_display, the_win, 1, 1, 1),
709	+	XCreatePixmap(x_display, the_win, 1, 1, 1),
710	+	&black, &white, 0, 0);
711	+	XDefineCursor(x_display, the_win, mac_cursor);
712	+
713	+	// Init blitting routines
714	+	int bytes_per_row = TrivialBytesPerRow((width + 7) & ~7, DepthModeForPixelDepth(depth));
715	+	#if ENABLE_VOSF
716	+	bool native_byte_order;
717	+	#ifdef WORDS_BIGENDIAN
718	+	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
719	+	#else
720	+	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
721	+	#endif
722	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
723	+	// Screen_blitter_init() returns TRUE if VOSF is mandatory
724	+	// i.e. the framebuffer update function is not Blit_Copy_Raw
725	+	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth);
726	+
727	+	if (use_vosf) {
728	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
729	+	the_host_buffer = the_buffer;
730	+	the_buffer_size = page_extend((height + 2) * bytes_per_row);
731	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
732	+	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
733	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
734	+	}
735	+	#else
736	+	use_vosf = false;
737	+	#endif
738	+	#endif
739	+
740	+	// Set frame buffer base
741	+	D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
742	+	screen_base = Host2MacAddr(the_buffer);
743	+	VModes[cur_mode].viRowBytes = bytes_per_row;
744	+	return true;
745	+	#else
746	+	ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
747	+	return false;
748	+	#endif
749	+	}
750	+
751		// Open DGA display (!! should use X11 VidMode extensions to set mode)
752		static bool open_dga(int width, int height)
753		{
754	+	if (is_fbdev_dga_mode)
755	+	return false;
756	+
757		#ifdef ENABLE_XF86_DGA
758		// Set relative mouse mode
759		ADBSetRelMouseMode(true);
760
761	+	// Create window
762	+	XSetWindowAttributes wattr;
763	+	wattr.event_mask = eventmask = dga_eventmask;
764	+	wattr.override_redirect = True;
765	+	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
766	+	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
767	+	InputOutput, vis, CWEventMask | CWOverrideRedirect |
768	+	(color_class == DirectColor ? CWColormap : 0), &wattr);
769	+
770	+	// Show window
771	+	XMapRaised(x_display, the_win);
772	+	wait_mapped(the_win);
773	+
774		#ifdef ENABLE_XF86_VIDMODE
775		// Switch to best mode
776		if (has_vidmode) {
#	Line 527 | Line 787 | static bool open_dga(int width, int heig
787		#endif
788
789		// Establish direct screen connection
790	+	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
791	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
792		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
793		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
794	+
795	+	int v_width, v_bank, v_size;
796	+	XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
797		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
798		XF86DGASetViewPort(x_display, screen, 0, 0);
799		XF86DGASetVidPage(x_display, screen, 0);
800
801		// Set colormap
802	<	if (depth == 8)
802	>	if (!IsDirectMode(get_current_mode())) {
803	>	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
804		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
805	+	}
806	+	XSync(x_display, false);
807
808	<	// Set bytes per row
809	<	int bytes_per_row = TrivialBytesPerRow((dga_fb_width + 7) & ~7, DepthModeForPixelDepth(depth));
542	<
808	>	// Init blitting routines
809	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, DepthModeForPixelDepth(depth));
810		#if ENABLE_VOSF
811		bool native_byte_order;
812		#ifdef WORDS_BIGENDIAN
#	Line 550 | Line 817 | static bool open_dga(int width, int heig
817		#if REAL_ADDRESSING || DIRECT_ADDRESSING
818		// Screen_blitter_init() returns TRUE if VOSF is mandatory
819		// i.e. the framebuffer update function is not Blit_Copy_Raw
820	<	use_vosf = Screen_blitter_init(&visualInfo, native_byte_order, depth);
820	>	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth);
821
822		if (use_vosf) {
823		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 558 | Line 825 | static bool open_dga(int width, int heig
825		the_buffer_size = page_extend((height + 2) * bytes_per_row);
826		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
827		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
828	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
829		}
830		#else
831		use_vosf = false;
564	–	the_buffer = dga_screen_base;
832		#endif
833		#endif
567	–	screen_base = (uint32)the_buffer;
834
835	+	// Set frame buffer base
836	+	D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
837	+	screen_base = Host2MacAddr(the_buffer);
838		VModes[cur_mode].viRowBytes = bytes_per_row;
570	–	XSync(x_display, false);
839		return true;
840		#else
841		ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
#	Line 580 | Line 848 | static bool open_display(void)
848		D(bug("open_display()\n"));
849		const VideoInfo &mode = VModes[cur_mode];
850
851	+	// Get original mouse acceleration
852	+	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
853	+
854		// Find best available X visual
855		if (!find_visual_for_depth(mode.viAppleMode)) {
856		ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
857		return false;
858		}
859
860	+	// Build up visualFormat structure
861	+	visualFormat.depth = visualInfo.depth;
862	+	visualFormat.Rmask = visualInfo.red_mask;
863	+	visualFormat.Gmask = visualInfo.green_mask;
864	+	visualFormat.Bmask = visualInfo.blue_mask;
865	+
866		// Create color maps
867		if (color_class == PseudoColor || color_class == DirectColor) {
868		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
#	Line 654 | Line 931 | static bool open_display(void)
931		depth = depth_of_video_mode(mode.viAppleMode);
932
933		bool display_open = false;
934	<	if (display_type == DIS_SCREEN)
934	>	if (display_type == DIS_SCREEN) {
935		display_open = open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
936	+	#ifdef ENABLE_FBDEV_DGA
937	+	// Try to fallback to FBDev DGA mode
938	+	if (!display_open) {
939	+	is_fbdev_dga_mode = true;
940	+	display_open = open_fbdev(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
941	+	}
942	+	#endif
943	+
944	+	}
945		else if (display_type == DIS_WINDOW)
946		display_open = open_window(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
947
#	Line 700 | Line 986 | static void close_window(void)
986		if (the_gc)
987		XFreeGC(x_display, the_gc);
988
703	–	// Close window
704	–	if (the_win) {
705	–	XUnmapWindow(x_display, the_win);
706	–	wait_unmapped(the_win);
707	–	XDestroyWindow(x_display, the_win);
708	–	}
709	–
989		XFlush(x_display);
990		XSync(x_display, false);
991		}
992
993	+	// Close FBDev mode
994	+	static void close_fbdev(void)
995	+	{
996	+	#ifdef ENABLE_FBDEV_DGA
997	+	XUngrabPointer(x_display, CurrentTime);
998	+	XUngrabKeyboard(x_display, CurrentTime);
999	+
1000	+	uint8 *fb_base;
1001	+	if (!use_vosf) {
1002	+	// don't free() the screen buffer in driver_base dtor
1003	+	fb_base = the_buffer;
1004	+	the_buffer = NULL;
1005	+	}
1006	+	#ifdef ENABLE_VOSF
1007	+	else {
1008	+	// don't free() the screen buffer in driver_base dtor
1009	+	fb_base = the_host_buffer;
1010	+	the_host_buffer = NULL;
1011	+	}
1012	+	#endif
1013	+	munmap(fb_base, fb_finfo.smem_len);
1014	+	#endif
1015	+	}
1016	+
1017		// Close DGA mode
1018		static void close_dga(void)
1019		{
1020	+	if (is_fbdev_dga_mode)
1021	+	return;
1022	+
1023		#ifdef ENABLE_XF86_DGA
1024		XF86DGADirectVideo(x_display, screen, 0);
1025		XUngrabPointer(x_display, CurrentTime);
#	Line 739 | Line 1045 | static void close_dga(void)
1045
1046		static void close_display(void)
1047		{
1048	<	if (display_type == DIS_SCREEN)
1049	<	close_dga();
1048	>	if (display_type == DIS_SCREEN) {
1049	>	if (is_fbdev_dga_mode)
1050	>	close_fbdev();
1051	>	else
1052	>	close_dga();
1053	>	}
1054		else if (display_type == DIS_WINDOW)
1055		close_window();
1056
1057	+	// Close window
1058	+	if (the_win) {
1059	+	XUnmapWindow(x_display, the_win);
1060	+	wait_unmapped(the_win);
1061	+	XDestroyWindow(x_display, the_win);
1062	+	}
1063	+
1064		// Free colormaps
1065		if (cmap[0]) {
1066		XFreeColormap(x_display, cmap[0]);
#	Line 788 | Line 1105 | static void close_display(void)
1105		}
1106		}
1107		#endif
1108	+
1109	+	// Restore mouse acceleration
1110	+	restore_mouse_accel();
1111		}
1112
1113
#	Line 819 | Line 1139 | static void keycode_init(void)
1139
1140		// Search for server vendor string, then read keycodes
1141		const char *vendor = ServerVendor(x_display);
1142	+	// Force use of MacX mappings on MacOS X with Apple's X server
1143	+	int dummy;
1144	+	if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy))
1145	+	vendor = "MacX";
1146		bool vendor_found = false;
1147		char line[256];
1148		while (fgets(line, 255, f)) {
#	Line 860 | Line 1184 | static void keycode_init(void)
1184		}
1185		}
1186
1187	+	// Find Apple mode matching best specified dimensions
1188	+	static int find_apple_resolution(int xsize, int ysize)
1189	+	{
1190	+	int apple_id;
1191	+	if (xsize < 800)
1192	+	apple_id = APPLE_640x480;
1193	+	else if (xsize < 1024)
1194	+	apple_id = APPLE_800x600;
1195	+	else if (xsize < 1152)
1196	+	apple_id = APPLE_1024x768;
1197	+	else if (xsize < 1280) {
1198	+	if (ysize < 900)
1199	+	apple_id = APPLE_1152x768;
1200	+	else
1201	+	apple_id = APPLE_1152x900;
1202	+	}
1203	+	else if (xsize < 1600)
1204	+	apple_id = APPLE_1280x1024;
1205	+	else
1206	+	apple_id = APPLE_1600x1200;
1207	+	return apple_id;
1208	+	}
1209	+
1210	+	// Find mode in list of supported modes
1211	+	static int find_mode(int apple_mode, int apple_id, int type)
1212	+	{
1213	+	for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
1214	+	if (p->viType == type && p->viAppleID == apple_id && p->viAppleMode == apple_mode)
1215	+	return p - VModes;
1216	+	}
1217	+	return -1;
1218	+	}
1219	+
1220	+	// Add custom video mode
1221	+	static void add_custom_mode(VideoInfo *&p, int type, uint32 x, uint32 y, int apple_mode, int apple_id)
1222	+	{
1223	+	p->viType = type;
1224	+	p->viXsize = x;
1225	+	p->viYsize = y;
1226	+	p->viRowBytes = TrivialBytesPerRow(p->viXsize, apple_mode);
1227	+	p->viAppleMode = apple_mode;
1228	+	p->viAppleID = apple_id;
1229	+	p++;
1230	+	}
1231	+
1232		// Add mode to list of supported modes
1233		static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, int apple_mode, int apple_id, int type)
1234		{
1235		if (allow & test) {
1236	<	p->viType = type;
1236	>	uint32 x = 0, y = 0;
1237		switch (apple_id) {
1238		case APPLE_W_640x480:
1239		case APPLE_640x480:
1240	<	p->viXsize = 640;
1241	<	p->viYsize = 480;
1240	>	x = 640;
1241	>	y = 480;
1242		break;
1243		case APPLE_W_800x600:
1244		case APPLE_800x600:
1245	<	p->viXsize = 800;
1246	<	p->viYsize = 600;
1245	>	x = 800;
1246	>	y = 600;
1247		break;
1248		case APPLE_1024x768:
1249	<	p->viXsize = 1024;
1250	<	p->viYsize = 768;
1249	>	x = 1024;
1250	>	y = 768;
1251	>	break;
1252	>	case APPLE_1152x768:
1253	>	x = 1152;
1254	>	y = 768;
1255		break;
1256		case APPLE_1152x900:
1257	<	p->viXsize = 1152;
1258	<	p->viYsize = 900;
1257	>	x = 1152;
1258	>	y = 900;
1259		break;
1260		case APPLE_1280x1024:
1261	<	p->viXsize = 1280;
1262	<	p->viYsize = 1024;
1261	>	x = 1280;
1262	>	y = 1024;
1263		break;
1264		case APPLE_1600x1200:
1265	<	p->viXsize = 1600;
1266	<	p->viYsize = 1200;
1265	>	x = 1600;
1266	>	y = 1200;
1267		break;
1268		}
1269	<	p->viRowBytes = TrivialBytesPerRow(p->viXsize, apple_mode);
897	<	p->viAppleMode = apple_mode;
898	<	p->viAppleID = apple_id;
899	<	p++;
1269	>	add_custom_mode(p, type, x, y, apple_mode, apple_id);
1270		}
1271		}
1272
#	Line 965 | Line 1335 | bool VideoInit(void)
1335		#ifdef ENABLE_XF86_DGA
1336		// DGA available?
1337		int event_base, error_base;
1338	+	is_fbdev_dga_mode = false;
1339		if (local_X11 && XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
1340		int dga_flags = 0;
1341		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
1342		has_dga = dga_flags & XF86DGADirectPresent;
1343	+	#if defined(__linux__)
1344	+	// Check r/w permission on /dev/mem for DGA mode to work
1345	+	if (has_dga && access("/dev/mem", R_OK | W_OK) != 0)
1346	+	has_dga = false;
1347	+	#endif
1348		} else
1349		has_dga = false;
1350		#endif
#	Line 981 | Line 1357 | bool VideoInit(void)
1357		XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
1358		#endif
1359
1360	+	#ifdef ENABLE_FBDEV_DGA
1361	+	// FBDev available?
1362	+	bool has_fbdev_dga = false;
1363	+	if (local_X11) {
1364	+	if ((fb_dev_fd = open("/dev/fb0", O_RDWR)) > 0) {
1365	+	if (ioctl(fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo) != 0)
1366	+	close(fb_dev_fd);
1367	+	else {
1368	+	has_fbdev_dga = true;
1369	+	if (!has_dga) {
1370	+	// Fallback to FBDev DGA mode if XF86 DGA is not possible
1371	+	has_dga = true;
1372	+	is_fbdev_dga_mode = true;
1373	+	}
1374	+	fb_orig_vinfo = fb_vinfo;
1375	+	D(bug("Frame buffer device initial resolution: %dx%dx%d\n", fb_vinfo.xres, fb_vinfo.yres, fb_vinfo.bits_per_pixel));
1376	+	}
1377	+	}
1378	+	}
1379	+	#endif
1380	+
1381		// Find black and white colors
1382		XParseColor(x_display, DefaultColormap(x_display, screen), "rgb:00/00/00", &black);
1383		XAllocColor(x_display, DefaultColormap(x_display, screen), &black);
#	Line 1006 | Line 1403 | bool VideoInit(void)
1403		break;
1404		}
1405
1406	+	// Get screen mode from preferences
1407	+	const char *mode_str = PrefsFindString("screen");
1408	+	int default_width = 640, default_height = 480;
1409	+	if (mode_str) {
1410	+	display_type = DIS_INVALID;
1411	+	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1412	+	display_type = DIS_WINDOW;
1413	+	#ifdef ENABLE_XF86_DGA
1414	+	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1415	+	display_type = DIS_SCREEN;
1416	+	#endif
1417	+	#ifdef ENABLE_FBDEV_DGA
1418	+	else if (has_fbdev_dga && sscanf(mode_str, "fbdev/%d/%d", &default_width, &default_height) == 2) {
1419	+	is_fbdev_dga_mode = true;
1420	+	display_type = DIS_SCREEN;
1421	+	}
1422	+	#endif
1423	+	if (display_type == DIS_INVALID) {
1424	+	D(bug("Invalid screen mode specified, defaulting to old modes selection\n"));
1425	+	mode_str = NULL;
1426	+	}
1427	+	else {
1428	+	if (default_width <= 0)
1429	+	default_width = DisplayWidth(x_display, screen);
1430	+	else if (default_width > DisplayWidth(x_display, screen))
1431	+	default_width = DisplayWidth(x_display, screen);
1432	+	if (default_height <= 0)
1433	+	default_height = DisplayHeight(x_display, screen);
1434	+	else if (default_height > DisplayHeight(x_display, screen))
1435	+	default_height = DisplayHeight(x_display, screen);
1436	+	}
1437	+	}
1438	+
1439		// Construct video mode table
1440		uint32 window_modes = PrefsFindInt32("windowmodes");
1441		uint32 screen_modes = PrefsFindInt32("screenmodes");
1442		if (!has_dga)
1443		screen_modes = 0;
1444	<	if (window_modes == 0 && screen_modes == 0)
1444	>	if (mode_str)
1445	>	window_modes = screen_modes = 0;
1446	>	else if (window_modes == 0 && screen_modes == 0)
1447		window_modes |= 3;      // Allow at least 640x480 and 800x600 window modes
1448
1449		VideoInfo *p = VModes;
1450	<	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1451	<	if (find_visual_for_depth(d))
1452	<	add_window_modes(p, window_modes, d);
1453	<
1454	<	if (has_vidmode) {
1450	>	if (mode_str) {
1451	>	if (display_type == DIS_WINDOW) {
1452	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++) {
1453	>	if (find_visual_for_depth(d)) {
1454	>	if (default_width > 640 && default_height > 480)
1455	>	add_mode(p, 3, 1, d, APPLE_W_640x480, DIS_WINDOW);
1456	>	if (default_width > 800 && default_height > 600)
1457	>	add_mode(p, 3, 2, d, APPLE_W_800x600, DIS_WINDOW);
1458	>	add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1459	>	}
1460	>	}
1461	>	} else
1462	>	add_custom_mode(p, display_type, default_width, default_height, default_mode, APPLE_CUSTOM);
1463	>	} else if (window_modes) {
1464	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1465	>	if (find_visual_for_depth(d))
1466	>	add_window_modes(p, window_modes, d);
1467	>	} else if (has_vidmode) {
1468		if (has_mode(640, 480))
1469		add_mode(p, screen_modes, 1, default_mode, APPLE_640x480, DIS_SCREEN);
1470		if (has_mode(800, 600))
1471		add_mode(p, screen_modes, 2, default_mode, APPLE_800x600, DIS_SCREEN);
1472		if (has_mode(1024, 768))
1473		add_mode(p, screen_modes, 4, default_mode, APPLE_1024x768, DIS_SCREEN);
1474	+	if (has_mode(1152, 768))
1475	+	add_mode(p, screen_modes, 64, default_mode, APPLE_1152x768, DIS_SCREEN);
1476		if (has_mode(1152, 900))
1477		add_mode(p, screen_modes, 8, default_mode, APPLE_1152x900, DIS_SCREEN);
1478		if (has_mode(1280, 1024))
#	Line 1035 | Line 1482 | bool VideoInit(void)
1482		} else if (screen_modes) {
1483		int xsize = DisplayWidth(x_display, screen);
1484		int ysize = DisplayHeight(x_display, screen);
1485	<	int apple_id;
1039	<	if (xsize < 800)
1040	<	apple_id = APPLE_640x480;
1041	<	else if (xsize < 1024)
1042	<	apple_id = APPLE_800x600;
1043	<	else if (xsize < 1152)
1044	<	apple_id = APPLE_1024x768;
1045	<	else if (xsize < 1280)
1046	<	apple_id = APPLE_1152x900;
1047	<	else if (xsize < 1600)
1048	<	apple_id = APPLE_1280x1024;
1049	<	else
1050	<	apple_id = APPLE_1600x1200;
1485	>	int apple_id = find_apple_resolution(xsize, ysize);
1486		p->viType = DIS_SCREEN;
1487		p->viRowBytes = 0;
1488		p->viXsize = xsize;
#	Line 1064 | Line 1499 | bool VideoInit(void)
1499
1500		// Find default mode (window 640x480)
1501		cur_mode = -1;
1502	<	for (p = VModes; p->viType != DIS_INVALID; p++) {
1503	<	if (p->viType == DIS_WINDOW
1504	<	&& p->viAppleID == APPLE_W_640x480
1505	<	&& p->viAppleMode == default_mode) {
1506	<	cur_mode = p - VModes;
1507	<	break;
1502	>	if (has_dga && screen_modes) {
1503	>	int screen_width = DisplayWidth(x_display, screen);
1504	>	int screen_height = DisplayHeight(x_display, screen);
1505	>	int apple_id = find_apple_resolution(screen_width, screen_height);
1506	>	if (apple_id != -1)
1507	>	cur_mode = find_mode(default_mode, apple_id, DIS_SCREEN);
1508	>	} else if (has_dga && mode_str)
1509	>	cur_mode = find_mode(default_mode, APPLE_CUSTOM, DIS_SCREEN);
1510	>
1511	>	if (cur_mode == -1) {
1512	>	// pick up first windowed mode available
1513	>	for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
1514	>	if (p->viType == DIS_WINDOW && p->viAppleMode == default_mode) {
1515	>	cur_mode = p - VModes;
1516	>	break;
1517	>	}
1518		}
1519		}
1520		assert(cur_mode != -1);
#	Line 1082 | Line 1527 | bool VideoInit(void)
1527		}
1528		#endif
1529
1085	–	#ifdef ENABLE_XF86_DGA
1086	–	if (has_dga && screen_modes) {
1087	–	int v_bank, v_size;
1088	–	XF86DGAGetVideo(x_display, screen, &dga_screen_base, &dga_fb_width, &v_bank, &v_size);
1089	–	D(bug("DGA screen_base %p, v_width %d\n", dga_screen_base, dga_fb_width));
1090	–	}
1091	–	#endif
1092	–
1530		// Open window/screen
1531		if (!open_display())
1532		return false;
#	Line 1099 | Line 1536 | bool VideoInit(void)
1536		XSetErrorHandler(ignore_errors);
1537		#endif
1538
1539	+	// Lock down frame buffer
1540	+	XSync(x_display, false);
1541	+	LOCK_FRAME_BUFFER;
1542	+
1543		// Start periodic thread
1544		XSync(x_display, false);
1545	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1545	>	Set_pthread_attr(&redraw_thread_attr, 0);
1546	>	redraw_thread_cancel = false;
1547	>	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1548		D(bug("Redraw thread installed (%ld)\n", redraw_thread));
1549		return true;
1550		}
#	Line 1115 | Line 1558 | void VideoExit(void)
1558		{
1559		// Stop redraw thread
1560		if (redraw_thread_active) {
1561	+	redraw_thread_cancel = true;
1562		pthread_cancel(redraw_thread);
1563		pthread_join(redraw_thread, NULL);
1564		redraw_thread_active = false;
1565		}
1566
1567	+	// Unlock frame buffer
1568	+	UNLOCK_FRAME_BUFFER;
1569	+	XSync(x_display, false);
1570	+	D(bug(" frame buffer unlocked\n"));
1571	+
1572		#ifdef ENABLE_VOSF
1573		if (use_vosf) {
1574		// Deinitialize VOSF
#	Line 1134 | Line 1583 | void VideoExit(void)
1583		XFlush(x_display);
1584		XSync(x_display, false);
1585		}
1586	+
1587	+	#ifdef ENABLE_FBDEV_DGA
1588	+	// Close framebuffer device
1589	+	if (fb_dev_fd >= 0) {
1590	+	close(fb_dev_fd);
1591	+	fb_dev_fd = -1;
1592	+	}
1593	+	#endif
1594		}
1595
1596
#	Line 1141 | Line 1598 | void VideoExit(void)
1598		*  Suspend/resume emulator
1599		*/
1600
1144	–	extern void PauseEmulator(void);
1145	–	extern void ResumeEmulator(void);
1146	–
1601		static void suspend_emul(void)
1602		{
1603		if (display_type == DIS_SCREEN) {
#	Line 1151 | Line 1605 | static void suspend_emul(void)
1605		ADBKeyUp(0x36);
1606		ctrl_down = false;
1607
1608	<	// Pause MacOS thread
1609	<	PauseEmulator();
1156	<	emul_suspended = true;
1608	>	// Lock frame buffer (this will stop the MacOS thread)
1609	>	LOCK_FRAME_BUFFER;
1610
1611		// Save frame buffer
1612		fb_save = malloc(VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1613		if (fb_save)
1614	<	memcpy(fb_save, (void *)screen_base, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1614	>	Mac2Host_memcpy(fb_save, screen_base, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1615
1616		// Close full screen display
1617	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1618		#ifdef ENABLE_XF86_DGA
1619	<	XF86DGADirectVideo(x_display, screen, 0);
1619	>	if (!is_fbdev_dga_mode)
1620	>	XF86DGADirectVideo(x_display, screen, 0);
1621	>	#endif
1622		XUngrabPointer(x_display, CurrentTime);
1623		XUngrabKeyboard(x_display, CurrentTime);
1624		#endif
1625	+	restore_mouse_accel();
1626	+	XUnmapWindow(x_display, the_win);
1627	+	wait_unmapped(the_win);
1628		XSync(x_display, false);
1629
1630		// Open "suspend" window
1631		XSetWindowAttributes wattr;
1632		wattr.event_mask = KeyPressMask;
1633	<	wattr.background_pixel = black_pixel;
1175	<	wattr.border_pixel = black_pixel;
1633	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
1634		wattr.backing_store = Always;
1635	<	wattr.backing_planes = xdepth;
1636	<	wattr.colormap = DefaultColormap(x_display, screen);
1179	<	XSync(x_display, false);
1635	>	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
1636	>
1637		suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1638	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
1639	<	CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
1640	<	XSync(x_display, false);
1641	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1642	<	XMapRaised(x_display, suspend_win);
1186	<	XSync(x_display, false);
1638	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBackingStore | CWColormap, &wattr);
1639	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1640	>	set_window_focus(suspend_win);
1641	>	XMapWindow(x_display, suspend_win);
1642	>	emul_suspended = true;
1643		}
1644		}
1645
#	Line 1194 | Line 1650 | static void resume_emul(void)
1650		XSync(x_display, false);
1651
1652		// Reopen full screen display
1653	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1654	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1653	>	XMapRaised(x_display, the_win);
1654	>	wait_mapped(the_win);
1655	>	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1656	>	Window w = is_fbdev_dga_mode ? the_win : rootwin;
1657	>	XGrabKeyboard(x_display, w, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1658	>	XGrabPointer(x_display, w, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1659	>	disable_mouse_accel();
1660		#ifdef ENABLE_XF86_DGA
1661	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1662	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1661	>	if (!is_fbdev_dga_mode) {
1662	>	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1663	>	XF86DGASetViewPort(x_display, screen, 0, 0);
1664	>	}
1665		#endif
1666		XSync(x_display, false);
1667
#	Line 1220 | Line 1683 | static void resume_emul(void)
1683		// Don't copy fb_save to the temporary frame buffer in VOSF mode
1684		if (!use_vosf)
1685		#endif
1686	<	memcpy((void *)screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1686	>	Host2Mac_memcpy(screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1687		free(fb_save);
1688		fb_save = NULL;
1689		}
1227	–	if (depth == 8)
1228	–	palette_changed = true;
1690
1691	<	// Resume MacOS thread
1691	>	// Unlock frame buffer (and continue MacOS thread)
1692	>	UNLOCK_FRAME_BUFFER;
1693		emul_suspended = false;
1232	–	ResumeEmulator();
1694		}
1695
1696
#	Line 1393 | Line 1854 | static int kc_decode(KeySym ks)
1854		return -1;
1855		}
1856
1857	<	static int event2keycode(XKeyEvent &ev)
1857	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1858		{
1859		KeySym ks;
1399	–	int as;
1860		int i = 0;
1861
1862		do {
1863		ks = XLookupKeysym(&ev, i++);
1864	<	as = kc_decode(ks);
1865	<	if (as != -1)
1864	>	int as = kc_decode(ks);
1865	>	if (as >= 0)
1866	>	return as;
1867	>	if (as == -2)
1868		return as;
1869		} while (ks != NoSymbol);
1870
#	Line 1423 | Line 1885 | static void handle_events(void)
1885		else if (XCheckTypedEvent(x_display, SelectionClear, &event))
1886		ClipboardSelectionClear(&event.xselectionclear);
1887
1888	+	// Window "close" widget clicked
1889	+	else if (XCheckTypedEvent(x_display, ClientMessage, &event)) {
1890	+	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1891	+	ADBKeyDown(0x7f);       // Power key
1892	+	ADBKeyUp(0x7f);
1893	+	}
1894	+	}
1895	+
1896		XDisplayUnlock();
1897		break;
1898		}
#	Line 1456 | Line 1926 | static void handle_events(void)
1926		break;
1927		}
1928
1929	<	// Mouse moved
1929	>	// Mouse entered window
1930		case EnterNotify:
1931	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1931	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
1932	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1933		break;
1934	+
1935	+	// Mouse moved
1936		case MotionNotify:
1937	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1937	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1938		break;
1939
1940		// Keyboard
1941		case KeyPress: {
1942	<	int code = event2keycode(event.xkey);
1943	<	if (use_keycodes && code != -1)
1944	<	code = keycode_table[event.xkey.keycode & 0xff];
1945	<	if (code != -1) {
1942	>	int code = -1;
1943	>	if (use_keycodes) {
1944	>	if (event2keycode(event.xkey, true) != -2)      // This is called to process the hotkeys
1945	>	code = keycode_table[event.xkey.keycode & 0xff];
1946	>	} else
1947	>	code = event2keycode(event.xkey, true);
1948	>	if (code >= 0) {
1949		if (!emul_suspended) {
1950	<	ADBKeyDown(code);
1950	>	if (code == 0x39) {     // Caps Lock pressed
1951	>	if (caps_on) {
1952	>	ADBKeyUp(code);
1953	>	caps_on = false;
1954	>	} else {
1955	>	ADBKeyDown(code);
1956	>	caps_on = true;
1957	>	}
1958	>	} else
1959	>	ADBKeyDown(code);
1960		if (code == 0x36)
1961		ctrl_down = true;
1962		} else {
#	Line 1482 | Line 1967 | static void handle_events(void)
1967		break;
1968		}
1969		case KeyRelease: {
1970	<	int code = event2keycode(event.xkey);
1971	<	if (use_keycodes && code != 1)
1972	<	code = keycode_table[event.xkey.keycode & 0xff];
1973	<	if (code != -1) {
1970	>	int code = -1;
1971	>	if (use_keycodes) {
1972	>	if (event2keycode(event.xkey, false) != -2)     // This is called to process the hotkeys
1973	>	code = keycode_table[event.xkey.keycode & 0xff];
1974	>	} else
1975	>	code = event2keycode(event.xkey, false);
1976	>	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1977		ADBKeyUp(code);
1978		if (code == 0x36)
1979		ctrl_down = false;
#	Line 1518 | Line 2006 | void VideoVBL(void)
2006		if (emerg_quit)
2007		QuitEmulator();
2008
2009	+	// Temporarily give up frame buffer lock (this is the point where
2010	+	// we are suspended when the user presses Ctrl-Tab)
2011	+	UNLOCK_FRAME_BUFFER;
2012	+	LOCK_FRAME_BUFFER;
2013	+
2014		// Execute video VBL
2015		if (private_data != NULL && private_data->interruptsEnabled)
2016		VSLDoInterruptService(private_data->vslServiceID);
#	Line 1525 | Line 2018 | void VideoVBL(void)
2018
2019
2020		/*
1528	–	*  Install graphics acceleration
1529	–	*/
1530	–
1531	–	#if 0
1532	–	// Rectangle blitting
1533	–	static void accl_bitblt(accl_params *p)
1534	–	{
1535	–	D(bug("accl_bitblt\n"));
1536	–
1537	–	// Get blitting parameters
1538	–	int16 src_X = p->src_rect[1] - p->src_bounds[1];
1539	–	int16 src_Y = p->src_rect[0] - p->src_bounds[0];
1540	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1541	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1542	–	int16 width = p->dest_rect[3] - p->dest_rect[1] - 1;
1543	–	int16 height = p->dest_rect[2] - p->dest_rect[0] - 1;
1544	–	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1545	–	D(bug(" width %d, height %d\n", width, height));
1546	–
1547	–	// And perform the blit
1548	–	bitblt_hook(src_X, src_Y, dest_X, dest_Y, width, height);
1549	–	}
1550	–
1551	–	static bool accl_bitblt_hook(accl_params *p)
1552	–	{
1553	–	D(bug("accl_draw_hook %p\n", p));
1554	–
1555	–	// Check if we can accelerate this bitblt
1556	–	if (p->src_base_addr == screen_base && p->dest_base_addr == screen_base &&
1557	–	display_type == DIS_SCREEN && bitblt_hook != NULL &&
1558	–	((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
1559	–	((uint32 *)p)[0x130 >> 2] == 0 &&
1560	–	p->transfer_mode == 0 &&
1561	–	p->src_row_bytes > 0 && ((uint32 *)p)[0x15c >> 2] > 0) {
1562	–
1563	–	// Yes, set function pointer
1564	–	p->draw_proc = accl_bitblt;
1565	–	return true;
1566	–	}
1567	–	return false;
1568	–	}
1569	–
1570	–	// Rectangle filling/inversion
1571	–	static void accl_fillrect8(accl_params *p)
1572	–	{
1573	–	D(bug("accl_fillrect8\n"));
1574	–
1575	–	// Get filling parameters
1576	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1577	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1578	–	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1579	–	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1580	–	uint8 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1581	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1582	–	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1583	–
1584	–	// And perform the fill
1585	–	fillrect8_hook(dest_X, dest_Y, dest_X_max, dest_Y_max, color);
1586	–	}
1587	–
1588	–	static void accl_fillrect32(accl_params *p)
1589	–	{
1590	–	D(bug("accl_fillrect32\n"));
1591	–
1592	–	// Get filling parameters
1593	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1594	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1595	–	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1596	–	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1597	–	uint32 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1598	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1599	–	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1600	–
1601	–	// And perform the fill
1602	–	fillrect32_hook(dest_X, dest_Y, dest_X_max, dest_Y_max, color);
1603	–	}
1604	–
1605	–	static void accl_invrect(accl_params *p)
1606	–	{
1607	–	D(bug("accl_invrect\n"));
1608	–
1609	–	// Get inversion parameters
1610	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1611	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1612	–	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1613	–	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1614	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1615	–	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1616	–
1617	–	//!!?? pen_mode == 14
1618	–
1619	–	// And perform the inversion
1620	–	invrect_hook(dest_X, dest_Y, dest_X_max, dest_Y_max);
1621	–	}
1622	–
1623	–	static bool accl_fillrect_hook(accl_params *p)
1624	–	{
1625	–	D(bug("accl_fillrect_hook %p\n", p));
1626	–
1627	–	// Check if we can accelerate this fillrect
1628	–	if (p->dest_base_addr == screen_base && ((uint32 *)p)[0x284 >> 2] != 0 && display_type == DIS_SCREEN) {
1629	–	if (p->transfer_mode == 8) {
1630	–	// Fill
1631	–	if (p->dest_pixel_size == 8 && fillrect8_hook != NULL) {
1632	–	p->draw_proc = accl_fillrect8;
1633	–	return true;
1634	–	} else if (p->dest_pixel_size == 32 && fillrect32_hook != NULL) {
1635	–	p->draw_proc = accl_fillrect32;
1636	–	return true;
1637	–	}
1638	–	} else if (p->transfer_mode == 10 && invrect_hook != NULL) {
1639	–	// Invert
1640	–	p->draw_proc = accl_invrect;
1641	–	return true;
1642	–	}
1643	–	}
1644	–	return false;
1645	–	}
1646	–
1647	–	// Wait for graphics operation to finish
1648	–	static bool accl_sync_hook(void *arg)
1649	–	{
1650	–	D(bug("accl_sync_hook %p\n", arg));
1651	–	if (sync_hook != NULL)
1652	–	sync_hook();
1653	–	return true;
1654	–	}
1655	–
1656	–	static struct accl_hook_info bitblt_hook_info = {accl_bitblt_hook, accl_sync_hook, ACCL_BITBLT};
1657	–	static struct accl_hook_info fillrect_hook_info = {accl_fillrect_hook, accl_sync_hook, ACCL_FILLRECT};
1658	–	#endif
1659	–
1660	–	void VideoInstallAccel(void)
1661	–	{
1662	–	// Install acceleration hooks
1663	–	if (PrefsFindBool("gfxaccel")) {
1664	–	D(bug("Video: Installing acceleration hooks\n"));
1665	–	//!!    NQDMisc(6, &bitblt_hook_info);
1666	–	//              NQDMisc(6, &fillrect_hook_info);
1667	–	}
1668	–	}
1669	–
1670	–
1671	–	/*
2021		*  Change video mode
2022		*/
2023
#	Line 1771 | Line 2120 | void video_set_palette(void)
2120
2121
2122		/*
2123	+	*  Can we set the MacOS cursor image into the window?
2124	+	*/
2125	+
2126	+	bool video_can_change_cursor(void)
2127	+	{
2128	+	return hw_mac_cursor_accl && (display_type != DIS_SCREEN);
2129	+	}
2130	+
2131	+
2132	+	/*
2133		*  Set cursor image for window
2134		*/
2135
#	Line 1931 | Line 2290 | static void handle_palette_changes(void)
2290		}
2291
2292		#ifdef ENABLE_XF86_DGA
2293	<	if (display_type == DIS_SCREEN) {
2293	>	if (display_type == DIS_SCREEN && !is_fbdev_dga_mode) {
2294		current_dga_cmap ^= 1;
2295		if (!IsDirectMode(mode) && cmap[current_dga_cmap])
2296		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
#	Line 1950 | Line 2309 | static void *redraw_func(void *arg)
2309		int64 ticks = 0;
2310		uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2311
2312	<	for (;;) {
2312	>	while (!redraw_thread_cancel) {
2313
2314		// Pause if requested (during video mode switches)
2315		while (thread_stop_req)
#	Line 1976 | Line 2335 | static void *redraw_func(void *arg)
2335		quit_full_screen = false;
2336		if (display_type == DIS_SCREEN) {
2337		XDisplayLock();
2338	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2339		#ifdef ENABLE_XF86_DGA
2340	<	XF86DGADirectVideo(x_display, screen, 0);
2340	>	if (is_fbdev_dga_mode)
2341	>	XF86DGADirectVideo(x_display, screen, 0);
2342	>	#endif
2343		XUngrabPointer(x_display, CurrentTime);
2344		XUngrabKeyboard(x_display, CurrentTime);
2345	+	XUnmapWindow(x_display, the_win);
2346	+	wait_unmapped(the_win);
2347	+	XDestroyWindow(x_display, the_win);
2348		#endif
2349		XSync(x_display, false);
2350		XDisplayUnlock();
#	Line 2012 | Line 2377 | static void *redraw_func(void *arg)
2377		update_display();
2378
2379		// Set new cursor image if it was changed
2380	<	if (cursor_changed) {
2380	>	if (hw_mac_cursor_accl && cursor_changed) {
2381		cursor_changed = false;
2382	<	memcpy(cursor_image->data, MacCursor + 4, 32);
2383	<	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2382	>	uint8 *x_data = (uint8 *)cursor_image->data;
2383	>	uint8 *x_mask = (uint8 *)cursor_mask_image->data;
2384	>	for (int i = 0; i < 32; i++) {
2385	>	x_mask[i] = MacCursor[4 + i] | MacCursor[36 + i];
2386	>	x_data[i] = MacCursor[4 + i];
2387	>	}
2388		XDisplayLock();
2389		XFreeCursor(x_display, mac_cursor);
2390		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