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.39 by gbeauche, 2005-03-28T09:05:28Z vs.
Revision 1.50 by gbeauche, 2008-01-01T09:47:39Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  SheepShaver (C) 1997-2005 Marc Hellwig and Christian Bauer
4	>	*  SheepShaver (C) 1997-2008 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 37 | Line 37
37		#include <sys/shm.h>
38		#include <errno.h>
39		#include <pthread.h>
40	+	#include <semaphore.h>
41
42		#include <algorithm>
43
#	Line 53 | Line 54
54		# include <X11/extensions/xf86vmode.h>
55		#endif
56
57	+	#ifdef ENABLE_FBDEV_DGA
58	+	# include <sys/mman.h>
59	+	#endif
60	+
61		#include "main.h"
62		#include "adb.h"
63		#include "prefs.h"
#	Line 83 | Line 88 | static pthread_attr_t redraw_thread_attr
88		static volatile bool redraw_thread_cancel;      // Flag: Cancel Redraw thread
89		static pthread_t redraw_thread;                         // Redraw thread
90
86	–	static bool local_X11;                                          // Flag: X server running on local machine?
91		static volatile bool thread_stop_req = false;
92	<	static volatile bool thread_stop_ack = false;   // Acknowledge for thread_stop_req
92	>	static sem_t thread_stop_ack;
93	>	static sem_t thread_resume_req;
94
95	+	static bool local_X11;                                          // Flag: X server running on local machine?
96		static bool has_dga = false;                            // Flag: Video DGA capable
97		static bool has_vidmode = false;                        // Flag: VidMode extension available
98
#	Line 164 | Line 170 | static int num_x_video_modes;
170		#endif
171
172		// Mutex to protect palette
173	<	#ifdef HAVE_SPINLOCKS
168	<	static spinlock_t x_palette_lock = SPIN_LOCK_UNLOCKED;
169	<	#define LOCK_PALETTE spin_lock(&x_palette_lock)
170	<	#define UNLOCK_PALETTE spin_unlock(&x_palette_lock)
171	<	#elif defined(HAVE_PTHREADS)
173	>	#if defined(HAVE_PTHREADS)
174		static pthread_mutex_t x_palette_lock = PTHREAD_MUTEX_INITIALIZER;
175		#define LOCK_PALETTE pthread_mutex_lock(&x_palette_lock)
176		#define UNLOCK_PALETTE pthread_mutex_unlock(&x_palette_lock)
177	+	#elif defined(HAVE_SPINLOCKS)
178	+	static spinlock_t x_palette_lock = SPIN_LOCK_UNLOCKED;
179	+	#define LOCK_PALETTE spin_lock(&x_palette_lock)
180	+	#define UNLOCK_PALETTE spin_unlock(&x_palette_lock)
181		#else
182		#define LOCK_PALETTE
183		#define UNLOCK_PALETTE
184		#endif
185
186		// Mutex to protect frame buffer
187	<	#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)
187	>	#if defined(HAVE_PTHREADS)
188		static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
189		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
190		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
191	+	#elif defined(HAVE_SPINLOCKS)
192	+	static spinlock_t frame_buffer_lock = SPIN_LOCK_UNLOCKED;
193	+	#define LOCK_FRAME_BUFFER spin_lock(&frame_buffer_lock)
194	+	#define UNLOCK_FRAME_BUFFER spin_unlock(&frame_buffer_lock)
195		#else
196		#define LOCK_FRAME_BUFFER
197		#define UNLOCK_FRAME_BUFFER
#	Line 633 | Line 639 | static bool open_window(int width, int h
639		return true;
640		}
641
642	<	// Open FBDev display
643	<	static bool open_fbdev(int width, int height)
642	>	// Open FBDev DGA display
643	>	static bool open_fbdev_dga(int width, int height)
644		{
645		#ifdef ENABLE_FBDEV_DGA
646	+	#ifdef ENABLE_XF86_VIDMODE
647	+	// Switch to best mode
648	+	if (has_vidmode) {
649	+	int best = -1;
650	+	for (int i = 0; i < num_x_video_modes; i++) {
651	+	if (x_video_modes[i]->hdisplay == width && x_video_modes[i]->vdisplay == height) {
652	+	best = i;
653	+	break;
654	+	}
655	+	};
656	+	assert(best != -1);
657	+	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
658	+	XF86VidModeSetViewPort(x_display, screen, 0, 0);
659	+	D(bug("[fbdev] VideoMode %d: %d x %d @ %d\n", best,
660	+	x_video_modes[best]->hdisplay, x_video_modes[best]->vdisplay,
661	+	1000 * x_video_modes[best]->dotclock / (x_video_modes[best]->htotal * x_video_modes[best]->vtotal)));
662	+	}
663	+	#endif
664	+
665		if (ioctl(fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo) != 0) {
666		D(bug("[fbdev] Can't get FSCREENINFO: %s\n", strerror(errno)));
667		return false;
668		}
669		D(bug("[fbdev] Device ID: %s\n", fb_finfo.id));
670		D(bug("[fbdev] smem_start: %p [%d bytes]\n", fb_finfo.smem_start, fb_finfo.smem_len));
671	+
672		int fb_type = fb_finfo.type;
673		const char *fb_type_str = NULL;
674		switch (fb_type) {
#	Line 654 | Line 680 | static bool open_fbdev(int width, int he
680		default:                                                        fb_type_str = "<unknown>";                              break;
681		}
682		D(bug("[fbdev] type: %s\n", fb_type_str));
683	+
684	+	if (fb_type != FB_TYPE_PACKED_PIXELS) {
685	+	D(bug("[fbdev] type '%s' not supported\n", fb_type_str));
686	+	return false;
687	+	}
688	+
689		int fb_visual = fb_finfo.visual;
690		const char *fb_visual_str;
691		switch (fb_visual) {
#	Line 667 | Line 699 | static bool open_fbdev(int width, int he
699		}
700		D(bug("[fbdev] visual: %s\n", fb_visual_str));
701
702	<	if (fb_type != FB_TYPE_PACKED_PIXELS) {
703	<	D(bug("[fbdev] type %s not supported\n", fb_type_str));
702	>	if (fb_visual != FB_VISUAL_TRUECOLOR && fb_visual != FB_VISUAL_DIRECTCOLOR) {
703	>	D(bug("[fbdev] visual '%s' not supported\n", fb_visual_str));
704		return false;
705		}
706
#	Line 686 | Line 718 | static bool open_fbdev(int width, int he
718		XSetWindowAttributes wattr;
719		wattr.event_mask = eventmask = dga_eventmask;
720		wattr.override_redirect = True;
689	–	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
721		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
722	<	InputOutput, vis, CWEventMask | CWOverrideRedirect |
723	<	(color_class == DirectColor ? CWColormap : 0), &wattr);
722	>	InputOutput, DefaultVisual(x_display, screen),
723	>	CWEventMask | CWOverrideRedirect, &wattr);
724
725		// Show window
726		XMapRaised(x_display, the_win);
#	Line 700 | Line 731 | static bool open_fbdev(int width, int he
731		GrabModeAsync, GrabModeAsync, CurrentTime);
732		XGrabPointer(x_display, the_win, True,
733		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
734	<	GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
734	>	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
735		disable_mouse_accel();
736
737		// Create no_cursor
#	Line 713 | Line 744 | static bool open_fbdev(int width, int he
744		// Init blitting routines
745		int bytes_per_row = TrivialBytesPerRow((width + 7) & ~7, DepthModeForPixelDepth(depth));
746		#if ENABLE_VOSF
747	<	bool native_byte_order;
748	<	#ifdef WORDS_BIGENDIAN
749	<	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
750	<	#else
751	<	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
752	<	#endif
753	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
747	>	// Extract current screen color masks (we are in True Color mode)
748	>	VisualFormat visualFormat;
749	>	visualFormat.depth = xdepth = DefaultDepth(x_display, screen);
750	>	XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo);
751	>	assert(visualFormat.depth == visualInfo.depth);
752	>	visualFormat.Rmask = visualInfo.red_mask;
753	>	visualFormat.Gmask = visualInfo.green_mask;
754	>	visualFormat.Bmask = visualInfo.blue_mask;
755	>	D(bug("[fbdev] %d bpp, (%08x,%08x,%08x)\n",
756	>	visualFormat.depth,
757	>	visualFormat.Rmask, visualFormat.Gmask, visualFormat.Bmask));
758	>	D(bug("[fbdev] Mac depth %d bpp\n", depth));
759	>
760		// Screen_blitter_init() returns TRUE if VOSF is mandatory
761		// i.e. the framebuffer update function is not Blit_Copy_Raw
762	<	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth);
763	<
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	<	}
762	>	#ifdef WORDS_BIGENDIAN
763	>	const bool native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
764		#else
765	<	use_vosf = false;
765	>	const bool native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
766		#endif
767	+	Screen_blitter_init(visualFormat, native_byte_order, depth);
768	+
769	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
770	+	use_vosf = true;
771	+	the_host_buffer = the_buffer;
772	+	the_buffer_size = page_extend((height + 2) * bytes_per_row);
773	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
774	+	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
775	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
776		#endif
777
778		// Set frame buffer base
#	Line 748 | Line 786 | static bool open_fbdev(int width, int he
786		#endif
787		}
788
789	<	// Open DGA display (!! should use X11 VidMode extensions to set mode)
790	<	static bool open_dga(int width, int height)
789	>	// Open XF86 DGA display (!! should use X11 VidMode extensions to set mode)
790	>	static bool open_xf86_dga(int width, int height)
791		{
792		if (is_fbdev_dga_mode)
793		return false;
#	Line 843 | Line 881 | static bool open_dga(int width, int heig
881		#endif
882		}
883
884	+	// Open DGA display
885	+	static bool open_dga(int width, int height)
886	+	{
887	+	bool display_open;
888	+
889	+	display_open = open_xf86_dga(width, height);
890	+	#ifdef ENABLE_FBDEV_DGA
891	+	// Try to fallback to FBDev DGA mode
892	+	if (!display_open) {
893	+	is_fbdev_dga_mode = true;
894	+	display_open = open_fbdev_dga(width, height);
895	+	}
896	+	#endif
897	+
898	+	// Common DGA display initialization
899	+	if (display_open) {
900	+
901	+	// Fake image to get display bounds in the refresh function
902	+	if ((img = (XImage *)malloc(sizeof(*img))) == NULL)
903	+	return false;
904	+	img->width = DisplayWidth(x_display, screen);
905	+	img->height = DisplayHeight(x_display, screen);
906	+	img->depth = is_fbdev_dga_mode ? xdepth : depth;
907	+	img->bytes_per_line = TrivialBytesPerRow(img->width, DepthModeForPixelDepth(img->depth));
908	+	}
909	+
910	+	return display_open;
911	+	}
912	+
913		static bool open_display(void)
914		{
915		D(bug("open_display()\n"));
#	Line 858 | Line 925 | static bool open_display(void)
925		}
926
927		// Build up visualFormat structure
928	+	visualFormat.fullscreen = (display_type == DIS_SCREEN);
929		visualFormat.depth = visualInfo.depth;
930		visualFormat.Rmask = visualInfo.red_mask;
931		visualFormat.Gmask = visualInfo.green_mask;
#	Line 930 | Line 998 | static bool open_display(void)
998		display_type = mode.viType;
999		depth = depth_of_video_mode(mode.viAppleMode);
1000
1001	<	bool display_open = false;
1002	<	if (display_type == DIS_SCREEN) {
1001	>	bool display_open;
1002	>	switch (display_type) {
1003	>	case DIS_SCREEN:
1004		display_open = open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
1005	<	#ifdef ENABLE_FBDEV_DGA
1006	<	// 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)
1005	>	break;
1006	>	case DIS_WINDOW:
1007		display_open = open_window(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
1008	+	break;
1009	+	default:
1010	+	display_open = false;
1011	+	break;
1012	+	}
1013
1014		#ifdef ENABLE_VOSF
1015		if (use_vosf) {
1016		// Initialize the VOSF system
1017	+	LOCK_VOSF;
1018		if (!video_vosf_init()) {
1019		ErrorAlert(GetString(STR_VOSF_INIT_ERR));
1020	+	UNLOCK_VOSF;
1021		return false;
1022		}
1023	+	UNLOCK_VOSF;
1024		}
1025		#endif
1026	<
1026	>
1027	>	// Zero screen buffers, viRowBytes is initialized at this stage
1028	>	if (display_open) {
1029	>	memset(the_buffer, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1030	>	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1031	>	}
1032		return display_open;
1033		}
1034
#	Line 991 | Line 1065 | static void close_window(void)
1065		}
1066
1067		// Close FBDev mode
1068	<	static void close_fbdev(void)
1068	>	static void close_fbdev_dga(void)
1069		{
1070		#ifdef ENABLE_FBDEV_DGA
997	–	XUngrabPointer(x_display, CurrentTime);
998	–	XUngrabKeyboard(x_display, CurrentTime);
999	–
1071		uint8 *fb_base;
1072	<	if (!use_vosf) {
1002	<	// don't free() the screen buffer in driver_base dtor
1072	>	if (!use_vosf)
1073		fb_base = the_buffer;
1004	–	the_buffer = NULL;
1005	–	}
1074		#ifdef ENABLE_VOSF
1075	<	else {
1008	<	// don't free() the screen buffer in driver_base dtor
1075	>	else
1076		fb_base = the_host_buffer;
1010	–	the_host_buffer = NULL;
1011	–	}
1077		#endif
1078		munmap(fb_base, fb_finfo.smem_len);
1079		#endif
1080		}
1081
1082	+	// Close XF86 DGA mode
1083	+	static void close_xf86_dga(void)
1084	+	{
1085	+	#ifdef ENABLE_XF86_DGA
1086	+	XF86DGADirectVideo(x_display, screen, 0);
1087	+	#endif
1088	+	}
1089	+
1090		// Close DGA mode
1091		static void close_dga(void)
1092		{
1093		if (is_fbdev_dga_mode)
1094	<	return;
1094	>	close_fbdev_dga();
1095	>	else
1096	>	close_xf86_dga();
1097
1023	–	#ifdef ENABLE_XF86_DGA
1024	–	XF86DGADirectVideo(x_display, screen, 0);
1098		XUngrabPointer(x_display, CurrentTime);
1099		XUngrabKeyboard(x_display, CurrentTime);
1027	–	#endif
1100
1101		#ifdef ENABLE_XF86_VIDMODE
1102		if (has_vidmode)
1103		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1104		#endif
1105
1106	+	// Release fake image (it's not a normal XImage!)
1107	+	free(img);
1108	+	img = NULL;
1109	+
1110		if (!use_vosf) {
1111		// don't free() the screen buffer in driver_base dtor
1112		the_buffer = NULL;
#	Line 1045 | Line 1121 | static void close_dga(void)
1121
1122		static void close_display(void)
1123		{
1124	<	if (display_type == DIS_SCREEN) {
1125	<	if (is_fbdev_dga_mode)
1050	<	close_fbdev();
1051	<	else
1052	<	close_dga();
1053	<	}
1124	>	if (display_type == DIS_SCREEN)
1125	>	close_dga();
1126		else if (display_type == DIS_WINDOW)
1127		close_window();
1128
#	Line 1280 | Line 1352 | static void add_window_modes(VideoInfo *
1352		static bool has_mode(int x, int y)
1353		{
1354		#ifdef ENABLE_XF86_VIDMODE
1355	<	for (int i=0; i<num_x_video_modes; i++)
1356	<	if (x_video_modes[i]->hdisplay >= x && x_video_modes[i]->vdisplay >= y)
1357	<	return true;
1358	<	return false;
1359	<	#else
1360	<	return DisplayWidth(x_display, screen) >= x && DisplayHeight(x_display, screen) >= y;
1355	>	if (has_vidmode) {
1356	>	for (int i=0; i<num_x_video_modes; i++)
1357	>	if (x_video_modes[i]->hdisplay == x && x_video_modes[i]->vdisplay == y)
1358	>	return true;
1359	>	return false;
1360	>	}
1361		#endif
1362	+	return DisplayWidth(x_display, screen) >= x && DisplayHeight(x_display, screen) >= y;
1363		}
1364
1365		bool VideoInit(void)
#	Line 1353 | Line 1426 | bool VideoInit(void)
1426		// VidMode available?
1427		int vm_event_base, vm_error_base;
1428		has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
1429	<	if (has_vidmode)
1429	>	if (has_vidmode) {
1430	>	int vm_major_version, vm_minor_version;
1431	>	XF86VidModeQueryVersion(x_display, &vm_major_version, &vm_minor_version);
1432	>	D(bug("VidMode extension %d.%d available\n", vm_major_version, vm_minor_version));
1433		XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
1434	+	}
1435		#endif
1436
1437		#ifdef ENABLE_FBDEV_DGA
#	Line 1458 | Line 1535 | bool VideoInit(void)
1535		add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1536		}
1537		}
1538	+	#ifdef ENABLE_VOSF
1539	+	} else if (display_type == DIS_SCREEN && is_fbdev_dga_mode) {
1540	+	for (unsigned int d = APPLE_1_BIT; d <= default_mode; d++)
1541	+	if (find_visual_for_depth(d))
1542	+	add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1543	+	#endif
1544		} else
1545		add_custom_mode(p, display_type, default_width, default_height, default_mode, APPLE_CUSTOM);
1546	+
1547	+	// Add extra VidMode capable modes
1548	+	if (display_type == DIS_SCREEN) {
1549	+	struct {
1550	+	int w;
1551	+	int h;
1552	+	int apple_id;
1553	+	}
1554	+	video_modes[] = {
1555	+	{  640,  480, APPLE_640x480   },
1556	+	{  800,  600, APPLE_800x600   },
1557	+	{ 1024,  768, APPLE_1024x768  },
1558	+	{ 1152,  768, APPLE_1152x768  },
1559	+	{ 1152,  900, APPLE_1152x900  },
1560	+	{ 1280, 1024, APPLE_1280x1024 },
1561	+	{ 1600, 1200, APPLE_1600x1200 },
1562	+	{ 0, }
1563	+	};
1564	+
1565	+	for (int i = 0; video_modes[i].w != 0; i++) {
1566	+	const int w = video_modes[i].w;
1567	+	const int h = video_modes[i].h;
1568	+	if (w >= default_width || h >= default_height)
1569	+	continue;
1570	+	if (has_mode(w, h)) {
1571	+	#ifdef ENABLE_VOSF
1572	+	if (is_fbdev_dga_mode) {
1573	+	for (unsigned int d = APPLE_1_BIT; d <= default_mode; d++)
1574	+	if (find_visual_for_depth(d))
1575	+	add_custom_mode(p, display_type, w, h, d, video_modes[i].apple_id);
1576	+	} else
1577	+	#endif
1578	+	add_custom_mode(p, display_type, w, h, default_mode, video_modes[i].apple_id);
1579	+	}
1580	+	}
1581	+	}
1582		} else if (window_modes) {
1583		for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1584		if (find_visual_for_depth(d))
#	Line 1528 | Line 1647 | bool VideoInit(void)
1647		#endif
1648
1649		// Open window/screen
1650	<	if (!open_display())
1650	>	if (!open_display()) {
1651	>	ErrorAlert(GetString(STR_OPEN_WINDOW_ERR));
1652		return false;
1653	+	}
1654
1655		#if 0
1656		// Ignore errors from now on
#	Line 1542 | Line 1663 | bool VideoInit(void)
1663
1664		// Start periodic thread
1665		XSync(x_display, false);
1666	+	if (sem_init(&thread_stop_ack, 0, 0) < 0)
1667	+	return false;
1668	+	if (sem_init(&thread_resume_req, 0, 0) < 0)
1669	+	return false;
1670		Set_pthread_attr(&redraw_thread_attr, 0);
1671		redraw_thread_cancel = false;
1672		redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
#	Line 1561 | Line 1686 | void VideoExit(void)
1686		redraw_thread_cancel = true;
1687		pthread_cancel(redraw_thread);
1688		pthread_join(redraw_thread, NULL);
1689	+	sem_destroy(&thread_stop_ack);
1690	+	sem_destroy(&thread_resume_req);
1691		redraw_thread_active = false;
1692		}
1693
#	Line 1655 | Line 1782 | static void resume_emul(void)
1782		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1783		Window w = is_fbdev_dga_mode ? the_win : rootwin;
1784		XGrabKeyboard(x_display, w, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1785	<	XGrabPointer(x_display, w, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1785	>	XGrabPointer(x_display, w, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, is_fbdev_dga_mode ? w : None, None, CurrentTime);
1786		disable_mouse_accel();
1787		#ifdef ENABLE_XF86_DGA
1788		if (!is_fbdev_dga_mode) {
#	Line 1672 | Line 1799 | static void resume_emul(void)
1799		if (use_vosf) {
1800		LOCK_VOSF;
1801		PFLAG_SET_ALL;
1675	–	UNLOCK_VOSF;
1802		memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1803	+	UNLOCK_VOSF;
1804		}
1805		#endif
1806
#	Line 1987 | Line 2114 | static void handle_events(void)
2114		if (use_vosf) {                 // VOSF refresh
2115		LOCK_VOSF;
2116		PFLAG_SET_ALL;
2117	+	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2118		UNLOCK_VOSF;
2119		}
2120	+	else
2121		#endif
2122	<	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2122	>	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2123		break;
2124		}
2125		}
#	Line 2036 | Line 2165 | int16 video_mode_change(VidLocals *csSav
2165		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
2166
2167		// Disable interrupts and pause redraw thread
2039	–	DisableInterrupt();
2040	–	thread_stop_ack = false;
2168		thread_stop_req = true;
2169	<	while (!thread_stop_ack) ;
2169	>	sem_wait(&thread_stop_ack);
2170	>	thread_stop_req = false;
2171	>	DisableInterrupt();
2172
2173		/* close old display */
2174		close_display();
#	Line 2060 | Line 2189 | int16 video_mode_change(VidLocals *csSav
2189		csSave->saveMode=VModes[cur_mode].viAppleMode;
2190
2191		// Enable interrupts and resume redraw thread
2063	–	thread_stop_req = false;
2192		EnableInterrupt();
2193	+	sem_post(&thread_resume_req);
2194		return noErr;
2195		}
2196		}
#	Line 2107 | Line 2236 | void video_set_palette(void)
2236		// We have to redraw everything because the interpretation of pixel values changed
2237		LOCK_VOSF;
2238		PFLAG_SET_ALL;
2239	+	if (display_type == DIS_SCREEN)
2240	+	PFLAG_SET_VERY_DIRTY;
2241		UNLOCK_VOSF;
2111	–	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2242		}
2243		#endif
2244
#	Line 2312 | Line 2442 | static void *redraw_func(void *arg)
2442		while (!redraw_thread_cancel) {
2443
2444		// Pause if requested (during video mode switches)
2445	<	while (thread_stop_req)
2446	<	thread_stop_ack = true;
2445	>	if (thread_stop_req) {
2446	>	sem_post(&thread_stop_ack);
2447	>	sem_wait(&thread_resume_req);
2448	>	}
2449
2450		int64 delay = next - GetTicks_usec();
2451		if (delay < -VIDEO_REFRESH_DELAY) {
#	Line 2337 | Line 2469 | static void *redraw_func(void *arg)
2469		XDisplayLock();
2470		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2471		#ifdef ENABLE_XF86_DGA
2472	<	if (is_fbdev_dga_mode)
2472	>	if (!is_fbdev_dga_mode)
2473		XF86DGADirectVideo(x_display, screen, 0);
2474		#endif
2475		XUngrabPointer(x_display, CurrentTime);
#	Line 2427 | Line 2559 | static void *redraw_func(void *arg)
2559		}
2560		return NULL;
2561		}
2562	+
2563	+
2564	+	/*
2565	+	*  Record dirty area from NQD
2566	+	*/
2567	+
2568	+	void video_set_dirty_area(int x, int y, int w, int h)
2569	+	{
2570	+	VideoInfo const & mode = VModes[cur_mode];
2571	+	const int screen_width = VIDEO_MODE_X;
2572	+	const int screen_height = VIDEO_MODE_Y;
2573	+	const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2574	+
2575	+	#ifdef ENABLE_VOSF
2576	+	if (use_vosf) {
2577	+	vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2578	+	return;
2579	+	}
2580	+	#endif
2581	+
2582	+	// XXX handle dirty bounding boxes for non-VOSF modes
2583	+	}

Diff Legend

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