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.32 by gbeauche, 2004-07-02T06:06:34Z vs.
Revision 1.44 by gbeauche, 2005-06-22T16:40:24Z

#	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 39 | Line 53
53		# include <X11/extensions/xf86vmode.h>
54		#endif
55
56	+	#ifdef ENABLE_FBDEV_DGA
57	+	# include <sys/mman.h>
58	+	#endif
59	+
60		#include "main.h"
61		#include "adb.h"
62		#include "prefs.h"
#	Line 109 | Line 127 | static int color_class;
127		static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
128		static Colormap cmap[2];                                        // Two colormaps (DGA) for 8-bit mode
129		static XColor x_palette[256];                           // Color palette to be used as CLUT and gamma table
130	+	static int orig_accel_numer, orig_accel_denom, orig_threshold;  // Original mouse acceleration
131
132		static XColor black, white;
133		static unsigned long black_pixel, white_pixel;
#	Line 131 | Line 150 | static uint8 *the_buffer_copy = NULL;          /
150		static uint32 the_buffer_size;                          // Size of allocated the_buffer
151
152		// Variables for DGA mode
153	+	static bool is_fbdev_dga_mode = false;          // Flag: Use FBDev DGA mode?
154		static int current_dga_cmap;
155
156	+	#ifdef ENABLE_FBDEV_DGA
157	+	static int fb_dev_fd = -1;                                              // Handle to fb device name
158	+	static struct fb_fix_screeninfo fb_finfo;               // Fixed info
159	+	static struct fb_var_screeninfo fb_vinfo;               // Variable info
160	+	static struct fb_var_screeninfo fb_orig_vinfo;  // Variable info to restore later
161	+	static struct fb_cmap fb_oldcmap;                               // Colormap to restore later
162	+	#endif
163	+
164		#ifdef ENABLE_XF86_VIDMODE
165		// Variables for XF86 VidMode support
166		static XF86VidModeModeInfo **x_video_modes;             // Array of all available modes
#	Line 153 | Line 181 | static pthread_mutex_t x_palette_lock =
181		#define UNLOCK_PALETTE
182		#endif
183
184	+	// Mutex to protect frame buffer
185	+	#ifdef HAVE_SPINLOCKS
186	+	static spinlock_t frame_buffer_lock = SPIN_LOCK_UNLOCKED;
187	+	#define LOCK_FRAME_BUFFER spin_lock(&frame_buffer_lock)
188	+	#define UNLOCK_FRAME_BUFFER spin_unlock(&frame_buffer_lock)
189	+	#elif defined(HAVE_PTHREADS)
190	+	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
191	+	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
192	+	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
193	+	#else
194	+	#define LOCK_FRAME_BUFFER
195	+	#define UNLOCK_FRAME_BUFFER
196	+	#endif
197	+
198
199		// Prototypes
200		static void *redraw_func(void *arg);
#	Line 364 | Line 406 | static bool find_visual_for_depth(int de
406		*  Open display (window or fullscreen)
407		*/
408
409	+	// Set window name and class
410	+	static void set_window_name(Window w, int name)
411	+	{
412	+	const char *str = GetString(name);
413	+	XStoreName(x_display, w, str);
414	+	XSetIconName(x_display, w, str);
415	+
416	+	XClassHint *hints;
417	+	hints = XAllocClassHint();
418	+	if (hints) {
419	+	hints->res_name = "SheepShaver";
420	+	hints->res_class = "SheepShaver";
421	+	XSetClassHint(x_display, w, hints);
422	+	XFree(hints);
423	+	}
424	+	}
425	+
426	+	// Set window input focus flag
427	+	static void set_window_focus(Window w)
428	+	{
429	+	XWMHints *hints = XAllocWMHints();
430	+	if (hints) {
431	+	hints->input = True;
432	+	hints->initial_state = NormalState;
433	+	hints->flags = InputHint | StateHint;
434	+	XSetWMHints(x_display, w, hints);
435	+	XFree(hints);
436	+	}
437	+	}
438	+
439		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
440		static Atom WM_DELETE_WINDOW = (Atom)0;
441		static void set_window_delete_protocol(Window w)
#	Line 389 | Line 461 | static void wait_unmapped(Window w)
461		} while ((e.type != UnmapNotify) || (e.xmap.event != w));
462		}
463
464	+	// Disable mouse acceleration
465	+	static void disable_mouse_accel(void)
466	+	{
467	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
468	+	}
469	+
470	+	// Restore mouse acceleration to original value
471	+	static void restore_mouse_accel(void)
472	+	{
473	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
474	+	}
475	+
476		// Trap SHM errors
477		static bool shm_error = false;
478		static int (*old_error_handler)(Display *, XErrorEvent *);
#	Line 421 | Line 505 | static bool open_window(int width, int h
505		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
506		InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWBackingStore | CWColormap, &wattr);
507
508	<	// Set window name
509	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
508	>	// Set window name/class
509	>	set_window_name(the_win, STR_WINDOW_TITLE);
510	>
511	>	// Indicate that we want keyboard input
512	>	set_window_focus(the_win);
513
514		// Set delete protocol property
515		set_window_delete_protocol(the_win);
#	Line 503 | Line 590 | static bool open_window(int width, int h
590		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
591		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
592		#endif
593	<	screen_base = (uint32)the_buffer;
593	>	screen_base = Host2MacAddr(the_buffer);
594
595		// Create GC
596		the_gc = XCreateGC(x_display, the_win, 0, 0);
#	Line 550 | Line 637 | static bool open_window(int width, int h
637		return true;
638		}
639
640	<	// Open DGA display (!! should use X11 VidMode extensions to set mode)
641	<	static bool open_dga(int width, int height)
640	>	// Open FBDev DGA display
641	>	static bool open_fbdev_dga(int width, int height)
642		{
643	+	#ifdef ENABLE_FBDEV_DGA
644	+	#ifdef ENABLE_XF86_VIDMODE
645	+	// Switch to best mode
646	+	if (has_vidmode) {
647	+	int best = -1;
648	+	for (int i = 0; i < num_x_video_modes; i++) {
649	+	if (x_video_modes[i]->hdisplay == width && x_video_modes[i]->vdisplay == height) {
650	+	best = i;
651	+	break;
652	+	}
653	+	};
654	+	assert(best != -1);
655	+	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
656	+	XF86VidModeSetViewPort(x_display, screen, 0, 0);
657	+	D(bug("[fbdev] VideoMode %d: %d x %d @ %d\n", best,
658	+	x_video_modes[best]->hdisplay, x_video_modes[best]->vdisplay,
659	+	1000 * x_video_modes[best]->dotclock / (x_video_modes[best]->htotal * x_video_modes[best]->vtotal)));
660	+	}
661	+	#endif
662	+
663	+	if (ioctl(fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo) != 0) {
664	+	D(bug("[fbdev] Can't get FSCREENINFO: %s\n", strerror(errno)));
665	+	return false;
666	+	}
667	+	D(bug("[fbdev] Device ID: %s\n", fb_finfo.id));
668	+	D(bug("[fbdev] smem_start: %p [%d bytes]\n", fb_finfo.smem_start, fb_finfo.smem_len));
669	+
670	+	int fb_type = fb_finfo.type;
671	+	const char *fb_type_str = NULL;
672	+	switch (fb_type) {
673	+	case FB_TYPE_PACKED_PIXELS:                     fb_type_str = "Packed Pixels";                  break;
674	+	case FB_TYPE_PLANES:                            fb_type_str = "Non interleaved planes"; break;
675	+	case FB_TYPE_INTERLEAVED_PLANES:        fb_type_str = "Interleaved planes";             break;
676	+	case FB_TYPE_TEXT:                                      fb_type_str = "Text/attributes";                break;
677	+	case FB_TYPE_VGA_PLANES:                        fb_type_str = "EGA/VGA planes";                 break;
678	+	default:                                                        fb_type_str = "<unknown>";                              break;
679	+	}
680	+	D(bug("[fbdev] type: %s\n", fb_type_str));
681	+
682	+	if (fb_type != FB_TYPE_PACKED_PIXELS) {
683	+	D(bug("[fbdev] type '%s' not supported\n", fb_type_str));
684	+	return false;
685	+	}
686	+
687	+	int fb_visual = fb_finfo.visual;
688	+	const char *fb_visual_str;
689	+	switch (fb_visual) {
690	+	case FB_VISUAL_MONO01:                          fb_visual_str = "Monochrome 1=Black 0=White";   break;
691	+	case FB_VISUAL_MONO10:                          fb_visual_str = "Monochrome 1=While 0=Black";   break;
692	+	case FB_VISUAL_TRUECOLOR:                       fb_visual_str = "True color";                                   break;
693	+	case FB_VISUAL_PSEUDOCOLOR:                     fb_visual_str = "Pseudo color (like atari)";    break;
694	+	case FB_VISUAL_DIRECTCOLOR:                     fb_visual_str = "Direct color";                                 break;
695	+	case FB_VISUAL_STATIC_PSEUDOCOLOR:      fb_visual_str = "Pseudo color readonly";                break;
696	+	default:                                                        fb_visual_str = "<unknown>";                                    break;
697	+	}
698	+	D(bug("[fbdev] visual: %s\n", fb_visual_str));
699	+
700	+	if (fb_visual != FB_VISUAL_TRUECOLOR) {
701	+	D(bug("[fbdev] visual '%s' not supported\n", fb_visual_str));
702	+	return false;
703	+	}
704	+
705	+	// Map frame buffer
706	+	the_buffer = (uint8 *)mmap(NULL, fb_finfo.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_dev_fd, 0);
707	+	if (the_buffer == MAP_FAILED) {
708	+	D(bug("[fbdev] Can't mmap /dev/fb0: %s\n", strerror(errno)));
709	+	return false;
710	+	}
711	+
712	+	// Set absolute mouse mode
713	+	ADBSetRelMouseMode(false);
714	+
715	+	// Create window
716	+	XSetWindowAttributes wattr;
717	+	wattr.event_mask = eventmask = dga_eventmask;
718	+	wattr.override_redirect = True;
719	+	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
720	+	InputOutput, DefaultVisual(x_display, screen),
721	+	CWEventMask | CWOverrideRedirect, &wattr);
722	+
723	+	// Show window
724	+	XMapRaised(x_display, the_win);
725	+	wait_mapped(the_win);
726	+
727	+	// Grab mouse and keyboard
728	+	XGrabKeyboard(x_display, the_win, True,
729	+	GrabModeAsync, GrabModeAsync, CurrentTime);
730	+	XGrabPointer(x_display, the_win, True,
731	+	PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
732	+	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
733	+	disable_mouse_accel();
734	+
735	+	// Create no_cursor
736	+	mac_cursor = XCreatePixmapCursor(x_display,
737	+	XCreatePixmap(x_display, the_win, 1, 1, 1),
738	+	XCreatePixmap(x_display, the_win, 1, 1, 1),
739	+	&black, &white, 0, 0);
740	+	XDefineCursor(x_display, the_win, mac_cursor);
741	+
742	+	// Init blitting routines
743	+	int bytes_per_row = TrivialBytesPerRow((width + 7) & ~7, DepthModeForPixelDepth(depth));
744	+	#if ENABLE_VOSF
745	+	// Extract current screen color masks (we are in True Color mode)
746	+	VisualFormat visualFormat;
747	+	visualFormat.depth = xdepth = DefaultDepth(x_display, screen);
748	+	XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo);
749	+	assert(visualFormat.depth == visualInfo.depth);
750	+	visualFormat.Rmask = visualInfo.red_mask;
751	+	visualFormat.Gmask = visualInfo.green_mask;
752	+	visualFormat.Bmask = visualInfo.blue_mask;
753	+	D(bug("[fbdev] %d bpp, (%08x,%08x,%08x)\n",
754	+	visualFormat.depth,
755	+	visualFormat.Rmask, visualFormat.Gmask, visualFormat.Bmask));
756	+	D(bug("[fbdev] Mac depth %d bpp\n", depth));
757	+
758	+	// Screen_blitter_init() returns TRUE if VOSF is mandatory
759	+	// i.e. the framebuffer update function is not Blit_Copy_Raw
760	+	#ifdef WORDS_BIGENDIAN
761	+	const bool native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
762	+	#else
763	+	const bool native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
764	+	#endif
765	+	Screen_blitter_init(visualFormat, native_byte_order, depth);
766	+
767	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
768	+	use_vosf = true;
769	+	the_host_buffer = the_buffer;
770	+	the_buffer_size = page_extend((height + 2) * bytes_per_row);
771	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
772	+	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
773	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
774	+	#endif
775	+
776	+	// Set frame buffer base
777	+	D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
778	+	screen_base = Host2MacAddr(the_buffer);
779	+	VModes[cur_mode].viRowBytes = bytes_per_row;
780	+	return true;
781	+	#else
782	+	ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
783	+	return false;
784	+	#endif
785	+	}
786	+
787	+	// Open XF86 DGA display (!! should use X11 VidMode extensions to set mode)
788	+	static bool open_xf86_dga(int width, int height)
789	+	{
790	+	if (is_fbdev_dga_mode)
791	+	return false;
792	+
793		#ifdef ENABLE_XF86_DGA
794		// Set relative mouse mode
795		ADBSetRelMouseMode(true);
#	Line 633 | Line 870 | static bool open_dga(int width, int heig
870
871		// Set frame buffer base
872		D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
873	<	screen_base = (uint32)the_buffer;
873	>	screen_base = Host2MacAddr(the_buffer);
874		VModes[cur_mode].viRowBytes = bytes_per_row;
875		return true;
876		#else
#	Line 642 | Line 879 | static bool open_dga(int width, int heig
879		#endif
880		}
881
882	+	// Open DGA display
883	+	static bool open_dga(int width, int height)
884	+	{
885	+	bool display_open;
886	+
887	+	display_open = open_xf86_dga(width, height);
888	+	#ifdef ENABLE_FBDEV_DGA
889	+	// Try to fallback to FBDev DGA mode
890	+	if (!display_open) {
891	+	is_fbdev_dga_mode = true;
892	+	display_open = open_fbdev_dga(width, height);
893	+	}
894	+	#endif
895	+
896	+	// Common DGA display initialization
897	+	if (display_open) {
898	+
899	+	// Fake image to get display bounds in the refresh function
900	+	if ((img = (XImage *)malloc(sizeof(*img))) == NULL)
901	+	return false;
902	+	img->width = DisplayWidth(x_display, screen);
903	+	img->height = DisplayHeight(x_display, screen);
904	+	img->depth = is_fbdev_dga_mode ? xdepth : depth;
905	+	img->bytes_per_line = TrivialBytesPerRow(img->width, DepthModeForPixelDepth(img->depth));
906	+	}
907	+
908	+	return display_open;
909	+	}
910	+
911		static bool open_display(void)
912		{
913		D(bug("open_display()\n"));
914		const VideoInfo &mode = VModes[cur_mode];
915
916	+	// Get original mouse acceleration
917	+	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
918	+
919		// Find best available X visual
920		if (!find_visual_for_depth(mode.viAppleMode)) {
921		ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
#	Line 654 | Line 923 | static bool open_display(void)
923		}
924
925		// Build up visualFormat structure
926	+	visualFormat.fullscreen = (display_type == DIS_SCREEN);
927		visualFormat.depth = visualInfo.depth;
928		visualFormat.Rmask = visualInfo.red_mask;
929		visualFormat.Gmask = visualInfo.green_mask;
#	Line 726 | Line 996 | static bool open_display(void)
996		display_type = mode.viType;
997		depth = depth_of_video_mode(mode.viAppleMode);
998
999	<	bool display_open = false;
1000	<	if (display_type == DIS_SCREEN)
999	>	bool display_open;
1000	>	switch (display_type) {
1001	>	case DIS_SCREEN:
1002		display_open = open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
1003	<	else if (display_type == DIS_WINDOW)
1003	>	break;
1004	>	case DIS_WINDOW:
1005		display_open = open_window(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
1006	+	break;
1007	+	default:
1008	+	display_open = false;
1009	+	break;
1010	+	}
1011
1012		#ifdef ENABLE_VOSF
1013		if (use_vosf) {
1014		// Initialize the VOSF system
1015	+	LOCK_VOSF;
1016		if (!video_vosf_init()) {
1017		ErrorAlert(GetString(STR_VOSF_INIT_ERR));
1018	+	UNLOCK_VOSF;
1019		return false;
1020		}
1021	+	UNLOCK_VOSF;
1022		}
1023		#endif
1024	<
1024	>
1025	>	// Zero screen buffers, viRowBytes is initialized at this stage
1026	>	if (display_open) {
1027	>	memset(the_buffer, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1028	>	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1029	>	}
1030		return display_open;
1031		}
1032
#	Line 777 | Line 1062 | static void close_window(void)
1062		XSync(x_display, false);
1063		}
1064
1065	<	// Close DGA mode
1066	<	static void close_dga(void)
1065	>	// Close FBDev mode
1066	>	static void close_fbdev_dga(void)
1067	>	{
1068	>	#ifdef ENABLE_FBDEV_DGA
1069	>	uint8 *fb_base;
1070	>	if (!use_vosf)
1071	>	fb_base = the_buffer;
1072	>	#ifdef ENABLE_VOSF
1073	>	else
1074	>	fb_base = the_host_buffer;
1075	>	#endif
1076	>	munmap(fb_base, fb_finfo.smem_len);
1077	>	#endif
1078	>	}
1079	>
1080	>	// Close XF86 DGA mode
1081	>	static void close_xf86_dga(void)
1082		{
1083		#ifdef ENABLE_XF86_DGA
1084		XF86DGADirectVideo(x_display, screen, 0);
1085	+	#endif
1086	+	}
1087	+
1088	+	// Close DGA mode
1089	+	static void close_dga(void)
1090	+	{
1091	+	if (is_fbdev_dga_mode)
1092	+	close_fbdev_dga();
1093	+	else
1094	+	close_xf86_dga();
1095	+
1096		XUngrabPointer(x_display, CurrentTime);
1097		XUngrabKeyboard(x_display, CurrentTime);
787	–	#endif
1098
1099		#ifdef ENABLE_XF86_VIDMODE
1100		if (has_vidmode)
1101		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1102		#endif
1103
1104	+	// Release fake image (it's not a normal XImage!)
1105	+	free(img);
1106	+	img = NULL;
1107	+
1108		if (!use_vosf) {
1109		// don't free() the screen buffer in driver_base dtor
1110		the_buffer = NULL;
#	Line 861 | Line 1175 | static void close_display(void)
1175		}
1176		}
1177		#endif
1178	+
1179	+	// Restore mouse acceleration
1180	+	restore_mouse_accel();
1181		}
1182
1183
#	Line 892 | Line 1209 | static void keycode_init(void)
1209
1210		// Search for server vendor string, then read keycodes
1211		const char *vendor = ServerVendor(x_display);
895	–	#if (defined(__APPLE__) && defined(__MACH__))
1212		// Force use of MacX mappings on MacOS X with Apple's X server
1213		int dummy;
1214		if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy))
1215		vendor = "MacX";
900	–	#endif
1216		bool vendor_found = false;
1217		char line[256];
1218		while (fgets(line, 255, f)) {
#	Line 972 | Line 1287 | static int find_mode(int apple_mode, int
1287		return -1;
1288		}
1289
1290	+	// Add custom video mode
1291	+	static void add_custom_mode(VideoInfo *&p, int type, uint32 x, uint32 y, int apple_mode, int apple_id)
1292	+	{
1293	+	p->viType = type;
1294	+	p->viXsize = x;
1295	+	p->viYsize = y;
1296	+	p->viRowBytes = TrivialBytesPerRow(p->viXsize, apple_mode);
1297	+	p->viAppleMode = apple_mode;
1298	+	p->viAppleID = apple_id;
1299	+	p++;
1300	+	}
1301	+
1302		// Add mode to list of supported modes
1303		static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, int apple_mode, int apple_id, int type)
1304		{
1305		if (allow & test) {
1306	<	p->viType = type;
1306	>	uint32 x = 0, y = 0;
1307		switch (apple_id) {
1308		case APPLE_W_640x480:
1309		case APPLE_640x480:
1310	<	p->viXsize = 640;
1311	<	p->viYsize = 480;
1310	>	x = 640;
1311	>	y = 480;
1312		break;
1313		case APPLE_W_800x600:
1314		case APPLE_800x600:
1315	<	p->viXsize = 800;
1316	<	p->viYsize = 600;
1315	>	x = 800;
1316	>	y = 600;
1317		break;
1318		case APPLE_1024x768:
1319	<	p->viXsize = 1024;
1320	<	p->viYsize = 768;
1319	>	x = 1024;
1320	>	y = 768;
1321		break;
1322		case APPLE_1152x768:
1323	<	p->viXsize = 1152;
1324	<	p->viYsize = 768;
1323	>	x = 1152;
1324	>	y = 768;
1325		break;
1326		case APPLE_1152x900:
1327	<	p->viXsize = 1152;
1328	<	p->viYsize = 900;
1327	>	x = 1152;
1328	>	y = 900;
1329		break;
1330		case APPLE_1280x1024:
1331	<	p->viXsize = 1280;
1332	<	p->viYsize = 1024;
1331	>	x = 1280;
1332	>	y = 1024;
1333		break;
1334		case APPLE_1600x1200:
1335	<	p->viXsize = 1600;
1336	<	p->viYsize = 1200;
1335	>	x = 1600;
1336	>	y = 1200;
1337		break;
1338		}
1339	<	p->viRowBytes = TrivialBytesPerRow(p->viXsize, apple_mode);
1013	<	p->viAppleMode = apple_mode;
1014	<	p->viAppleID = apple_id;
1015	<	p++;
1339	>	add_custom_mode(p, type, x, y, apple_mode, apple_id);
1340		}
1341		}
1342
#	Line 1026 | Line 1350 | static void add_window_modes(VideoInfo *
1350		static bool has_mode(int x, int y)
1351		{
1352		#ifdef ENABLE_XF86_VIDMODE
1353	<	for (int i=0; i<num_x_video_modes; i++)
1354	<	if (x_video_modes[i]->hdisplay >= x && x_video_modes[i]->vdisplay >= y)
1355	<	return true;
1356	<	return false;
1357	<	#else
1358	<	return DisplayWidth(x_display, screen) >= x && DisplayHeight(x_display, screen) >= y;
1353	>	if (has_vidmode) {
1354	>	for (int i=0; i<num_x_video_modes; i++)
1355	>	if (x_video_modes[i]->hdisplay == x && x_video_modes[i]->vdisplay == y)
1356	>	return true;
1357	>	return false;
1358	>	}
1359		#endif
1360	+	return DisplayWidth(x_display, screen) >= x && DisplayHeight(x_display, screen) >= y;
1361		}
1362
1363		bool VideoInit(void)
#	Line 1081 | Line 1406 | bool VideoInit(void)
1406		#ifdef ENABLE_XF86_DGA
1407		// DGA available?
1408		int event_base, error_base;
1409	+	is_fbdev_dga_mode = false;
1410		if (local_X11 && XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
1411		int dga_flags = 0;
1412		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
1413		has_dga = dga_flags & XF86DGADirectPresent;
1414	+	#if defined(__linux__)
1415	+	// Check r/w permission on /dev/mem for DGA mode to work
1416	+	if (has_dga && access("/dev/mem", R_OK | W_OK) != 0)
1417	+	has_dga = false;
1418	+	#endif
1419		} else
1420		has_dga = false;
1421		#endif
#	Line 1093 | Line 1424 | bool VideoInit(void)
1424		// VidMode available?
1425		int vm_event_base, vm_error_base;
1426		has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
1427	<	if (has_vidmode)
1427	>	if (has_vidmode) {
1428	>	int vm_major_version, vm_minor_version;
1429	>	XF86VidModeQueryVersion(x_display, &vm_major_version, &vm_minor_version);
1430	>	D(bug("VidMode extension %d.%d available\n", vm_major_version, vm_minor_version));
1431		XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
1432	+	}
1433	+	#endif
1434	+
1435	+	#ifdef ENABLE_FBDEV_DGA
1436	+	// FBDev available?
1437	+	bool has_fbdev_dga = false;
1438	+	if (local_X11) {
1439	+	if ((fb_dev_fd = open("/dev/fb0", O_RDWR)) > 0) {
1440	+	if (ioctl(fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo) != 0)
1441	+	close(fb_dev_fd);
1442	+	else {
1443	+	has_fbdev_dga = true;
1444	+	if (!has_dga) {
1445	+	// Fallback to FBDev DGA mode if XF86 DGA is not possible
1446	+	has_dga = true;
1447	+	is_fbdev_dga_mode = true;
1448	+	}
1449	+	fb_orig_vinfo = fb_vinfo;
1450	+	D(bug("Frame buffer device initial resolution: %dx%dx%d\n", fb_vinfo.xres, fb_vinfo.yres, fb_vinfo.bits_per_pixel));
1451	+	}
1452	+	}
1453	+	}
1454		#endif
1455
1456		// Find black and white colors
#	Line 1122 | Line 1478 | bool VideoInit(void)
1478		break;
1479		}
1480
1481	+	// Get screen mode from preferences
1482	+	const char *mode_str = PrefsFindString("screen");
1483	+	int default_width = 640, default_height = 480;
1484	+	if (mode_str) {
1485	+	display_type = DIS_INVALID;
1486	+	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1487	+	display_type = DIS_WINDOW;
1488	+	#ifdef ENABLE_XF86_DGA
1489	+	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1490	+	display_type = DIS_SCREEN;
1491	+	#endif
1492	+	#ifdef ENABLE_FBDEV_DGA
1493	+	else if (has_fbdev_dga && sscanf(mode_str, "fbdev/%d/%d", &default_width, &default_height) == 2) {
1494	+	is_fbdev_dga_mode = true;
1495	+	display_type = DIS_SCREEN;
1496	+	}
1497	+	#endif
1498	+	if (display_type == DIS_INVALID) {
1499	+	D(bug("Invalid screen mode specified, defaulting to old modes selection\n"));
1500	+	mode_str = NULL;
1501	+	}
1502	+	else {
1503	+	if (default_width <= 0)
1504	+	default_width = DisplayWidth(x_display, screen);
1505	+	else if (default_width > DisplayWidth(x_display, screen))
1506	+	default_width = DisplayWidth(x_display, screen);
1507	+	if (default_height <= 0)
1508	+	default_height = DisplayHeight(x_display, screen);
1509	+	else if (default_height > DisplayHeight(x_display, screen))
1510	+	default_height = DisplayHeight(x_display, screen);
1511	+	}
1512	+	}
1513	+
1514		// Construct video mode table
1515		uint32 window_modes = PrefsFindInt32("windowmodes");
1516		uint32 screen_modes = PrefsFindInt32("screenmodes");
1517		if (!has_dga)
1518		screen_modes = 0;
1519	<	if (window_modes == 0 && screen_modes == 0)
1519	>	if (mode_str)
1520	>	window_modes = screen_modes = 0;
1521	>	else if (window_modes == 0 && screen_modes == 0)
1522		window_modes |= 3;      // Allow at least 640x480 and 800x600 window modes
1523
1524		VideoInfo *p = VModes;
1525	<	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1526	<	if (find_visual_for_depth(d))
1527	<	add_window_modes(p, window_modes, d);
1525	>	if (mode_str) {
1526	>	if (display_type == DIS_WINDOW) {
1527	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++) {
1528	>	if (find_visual_for_depth(d)) {
1529	>	if (default_width > 640 && default_height > 480)
1530	>	add_mode(p, 3, 1, d, APPLE_W_640x480, DIS_WINDOW);
1531	>	if (default_width > 800 && default_height > 600)
1532	>	add_mode(p, 3, 2, d, APPLE_W_800x600, DIS_WINDOW);
1533	>	add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1534	>	}
1535	>	}
1536	>	#ifdef ENABLE_VOSF
1537	>	} else if (display_type == DIS_SCREEN && is_fbdev_dga_mode) {
1538	>	for (unsigned int d = APPLE_1_BIT; d <= default_mode; d++)
1539	>	if (find_visual_for_depth(d))
1540	>	add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1541	>	#endif
1542	>	} else
1543	>	add_custom_mode(p, display_type, default_width, default_height, default_mode, APPLE_CUSTOM);
1544
1545	<	if (has_vidmode) {
1545	>	// Add extra VidMode capable modes
1546	>	if (display_type == DIS_SCREEN) {
1547	>	struct {
1548	>	int w;
1549	>	int h;
1550	>	int apple_id;
1551	>	}
1552	>	video_modes[] = {
1553	>	{  640,  480, APPLE_640x480   },
1554	>	{  800,  600, APPLE_800x600   },
1555	>	{ 1024,  768, APPLE_1024x768  },
1556	>	{ 1152,  768, APPLE_1152x768  },
1557	>	{ 1152,  900, APPLE_1152x900  },
1558	>	{ 1280, 1024, APPLE_1280x1024 },
1559	>	{ 1600, 1200, APPLE_1600x1200 },
1560	>	{ 0, }
1561	>	};
1562	>
1563	>	for (int i = 0; video_modes[i].w != 0; i++) {
1564	>	const int w = video_modes[i].w;
1565	>	const int h = video_modes[i].h;
1566	>	if (w >= default_width || h >= default_height)
1567	>	continue;
1568	>	if (has_mode(w, h)) {
1569	>	#ifdef ENABLE_VOSF
1570	>	if (is_fbdev_dga_mode) {
1571	>	for (unsigned int d = APPLE_1_BIT; d <= default_mode; d++)
1572	>	if (find_visual_for_depth(d))
1573	>	add_custom_mode(p, display_type, w, h, d, video_modes[i].apple_id);
1574	>	} else
1575	>	#endif
1576	>	add_custom_mode(p, display_type, w, h, default_mode, video_modes[i].apple_id);
1577	>	}
1578	>	}
1579	>	}
1580	>	} else if (window_modes) {
1581	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1582	>	if (find_visual_for_depth(d))
1583	>	add_window_modes(p, window_modes, d);
1584	>	} else if (has_vidmode) {
1585		if (has_mode(640, 480))
1586		add_mode(p, screen_modes, 1, default_mode, APPLE_640x480, DIS_SCREEN);
1587		if (has_mode(800, 600))
#	Line 1176 | Line 1622 | bool VideoInit(void)
1622		int apple_id = find_apple_resolution(screen_width, screen_height);
1623		if (apple_id != -1)
1624		cur_mode = find_mode(default_mode, apple_id, DIS_SCREEN);
1625	<	}
1625	>	} else if (has_dga && mode_str)
1626	>	cur_mode = find_mode(default_mode, APPLE_CUSTOM, DIS_SCREEN);
1627	>
1628		if (cur_mode == -1) {
1629		// pick up first windowed mode available
1630		for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
#	Line 1197 | Line 1645 | bool VideoInit(void)
1645		#endif
1646
1647		// Open window/screen
1648	<	if (!open_display())
1648	>	if (!open_display()) {
1649	>	ErrorAlert(GetString(STR_OPEN_WINDOW_ERR));
1650		return false;
1651	+	}
1652
1653		#if 0
1654		// Ignore errors from now on
1655		XSetErrorHandler(ignore_errors);
1656		#endif
1657
1658	+	// Lock down frame buffer
1659	+	XSync(x_display, false);
1660	+	LOCK_FRAME_BUFFER;
1661	+
1662		// Start periodic thread
1663		XSync(x_display, false);
1664		Set_pthread_attr(&redraw_thread_attr, 0);
#	Line 1229 | Line 1683 | void VideoExit(void)
1683		redraw_thread_active = false;
1684		}
1685
1686	+	// Unlock frame buffer
1687	+	UNLOCK_FRAME_BUFFER;
1688	+	XSync(x_display, false);
1689	+	D(bug(" frame buffer unlocked\n"));
1690	+
1691		#ifdef ENABLE_VOSF
1692		if (use_vosf) {
1693		// Deinitialize VOSF
#	Line 1243 | Line 1702 | void VideoExit(void)
1702		XFlush(x_display);
1703		XSync(x_display, false);
1704		}
1705	+
1706	+	#ifdef ENABLE_FBDEV_DGA
1707	+	// Close framebuffer device
1708	+	if (fb_dev_fd >= 0) {
1709	+	close(fb_dev_fd);
1710	+	fb_dev_fd = -1;
1711	+	}
1712	+	#endif
1713		}
1714
1715
#	Line 1250 | Line 1717 | void VideoExit(void)
1717		*  Suspend/resume emulator
1718		*/
1719
1253	–	extern void PauseEmulator(void);
1254	–	extern void ResumeEmulator(void);
1255	–
1720		static void suspend_emul(void)
1721		{
1722		if (display_type == DIS_SCREEN) {
#	Line 1260 | Line 1724 | static void suspend_emul(void)
1724		ADBKeyUp(0x36);
1725		ctrl_down = false;
1726
1727	<	// Pause MacOS thread
1728	<	PauseEmulator();
1265	<	emul_suspended = true;
1727	>	// Lock frame buffer (this will stop the MacOS thread)
1728	>	LOCK_FRAME_BUFFER;
1729
1730		// Save frame buffer
1731		fb_save = malloc(VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1732		if (fb_save)
1733	<	memcpy(fb_save, (void *)screen_base, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1733	>	Mac2Host_memcpy(fb_save, screen_base, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1734
1735		// Close full screen display
1736	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1737		#ifdef ENABLE_XF86_DGA
1738	<	XF86DGADirectVideo(x_display, screen, 0);
1738	>	if (!is_fbdev_dga_mode)
1739	>	XF86DGADirectVideo(x_display, screen, 0);
1740	>	#endif
1741		XUngrabPointer(x_display, CurrentTime);
1742		XUngrabKeyboard(x_display, CurrentTime);
1743		#endif
1744	+	restore_mouse_accel();
1745	+	XUnmapWindow(x_display, the_win);
1746	+	wait_unmapped(the_win);
1747		XSync(x_display, false);
1748
1749		// Open "suspend" window
1750		XSetWindowAttributes wattr;
1751		wattr.event_mask = KeyPressMask;
1752	<	wattr.background_pixel = black_pixel;
1284	<	wattr.border_pixel = black_pixel;
1752	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
1753		wattr.backing_store = Always;
1754	<	wattr.backing_planes = xdepth;
1755	<	wattr.colormap = DefaultColormap(x_display, screen);
1288	<	XSync(x_display, false);
1754	>	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
1755	>
1756		suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1757	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
1758	<	CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
1759	<	XSync(x_display, false);
1760	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1761	<	XMapRaised(x_display, suspend_win);
1295	<	XSync(x_display, false);
1757	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBackingStore | CWColormap, &wattr);
1758	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1759	>	set_window_focus(suspend_win);
1760	>	XMapWindow(x_display, suspend_win);
1761	>	emul_suspended = true;
1762		}
1763		}
1764
#	Line 1303 | Line 1769 | static void resume_emul(void)
1769		XSync(x_display, false);
1770
1771		// Reopen full screen display
1772	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1773	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1772	>	XMapRaised(x_display, the_win);
1773	>	wait_mapped(the_win);
1774	>	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1775	>	Window w = is_fbdev_dga_mode ? the_win : rootwin;
1776	>	XGrabKeyboard(x_display, w, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1777	>	XGrabPointer(x_display, w, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, is_fbdev_dga_mode ? w : None, None, CurrentTime);
1778	>	disable_mouse_accel();
1779		#ifdef ENABLE_XF86_DGA
1780	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1781	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1780	>	if (!is_fbdev_dga_mode) {
1781	>	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1782	>	XF86DGASetViewPort(x_display, screen, 0, 0);
1783	>	}
1784		#endif
1785		XSync(x_display, false);
1786
#	Line 1318 | Line 1791 | static void resume_emul(void)
1791		if (use_vosf) {
1792		LOCK_VOSF;
1793		PFLAG_SET_ALL;
1321	–	UNLOCK_VOSF;
1794		memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1795	+	UNLOCK_VOSF;
1796		}
1797		#endif
1798
#	Line 1329 | Line 1802 | static void resume_emul(void)
1802		// Don't copy fb_save to the temporary frame buffer in VOSF mode
1803		if (!use_vosf)
1804		#endif
1805	<	memcpy((void *)screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1805	>	Host2Mac_memcpy(screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1806		free(fb_save);
1807		fb_save = NULL;
1808		}
1336	–	if (depth == 8)
1337	–	palette_changed = true;
1809
1810	<	// Resume MacOS thread
1810	>	// Unlock frame buffer (and continue MacOS thread)
1811	>	UNLOCK_FRAME_BUFFER;
1812		emul_suspended = false;
1341	–	ResumeEmulator();
1813		}
1814
1815
#	Line 1635 | Line 2106 | static void handle_events(void)
2106		if (use_vosf) {                 // VOSF refresh
2107		LOCK_VOSF;
2108		PFLAG_SET_ALL;
2109	+	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2110		UNLOCK_VOSF;
2111		}
2112	+	else
2113		#endif
2114	<	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2114	>	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2115		break;
2116		}
2117		}
#	Line 1654 | Line 2127 | void VideoVBL(void)
2127		if (emerg_quit)
2128		QuitEmulator();
2129
2130	+	// Temporarily give up frame buffer lock (this is the point where
2131	+	// we are suspended when the user presses Ctrl-Tab)
2132	+	UNLOCK_FRAME_BUFFER;
2133	+	LOCK_FRAME_BUFFER;
2134	+
2135		// Execute video VBL
2136		if (private_data != NULL && private_data->interruptsEnabled)
2137		VSLDoInterruptService(private_data->vslServiceID);
#	Line 1750 | Line 2228 | void video_set_palette(void)
2228		// We have to redraw everything because the interpretation of pixel values changed
2229		LOCK_VOSF;
2230		PFLAG_SET_ALL;
2231	+	if (display_type == DIS_SCREEN)
2232	+	PFLAG_SET_VERY_DIRTY;
2233		UNLOCK_VOSF;
1754	–	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2234		}
2235		#endif
2236
#	Line 1933 | Line 2412 | static void handle_palette_changes(void)
2412		}
2413
2414		#ifdef ENABLE_XF86_DGA
2415	<	if (display_type == DIS_SCREEN) {
2415	>	if (display_type == DIS_SCREEN && !is_fbdev_dga_mode) {
2416		current_dga_cmap ^= 1;
2417		if (!IsDirectMode(mode) && cmap[current_dga_cmap])
2418		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
#	Line 1978 | Line 2457 | static void *redraw_func(void *arg)
2457		quit_full_screen = false;
2458		if (display_type == DIS_SCREEN) {
2459		XDisplayLock();
2460	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2461		#ifdef ENABLE_XF86_DGA
2462	<	XF86DGADirectVideo(x_display, screen, 0);
2462	>	if (!is_fbdev_dga_mode)
2463	>	XF86DGADirectVideo(x_display, screen, 0);
2464	>	#endif
2465		XUngrabPointer(x_display, CurrentTime);
2466		XUngrabKeyboard(x_display, CurrentTime);
2467		XUnmapWindow(x_display, the_win);

Diff Legend

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