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.14 by gbeauche, 2004-04-11T10:46:32Z vs.
Revision 1.23 by gbeauche, 2004-05-16T15:48:25Z

#	Line 32 | Line 32
32		#include <algorithm>
33
34		#ifdef ENABLE_XF86_DGA
35	<	#include <X11/extensions/xf86dga.h>
35	>	# include <X11/extensions/xf86dga.h>
36		#endif
37
38		#ifdef ENABLE_XF86_VIDMODE
#	Line 57 | Line 57 | using std::sort;
57
58		// Constants
59		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
60	+	static const bool hw_mac_cursor_accl = true;    // Flag: Enable MacOS to X11 copy of cursor?
61
62		// Global variables
63		static int32 frame_skip;
64		static int16 mouse_wheel_mode;
65		static int16 mouse_wheel_lines;
66		static bool redraw_thread_active = false;       // Flag: Redraw thread installed
67	+	static pthread_attr_t redraw_thread_attr;       // Redraw thread attributes
68		static pthread_t redraw_thread;                         // Redraw thread
69
70		static bool local_X11;                                          // Flag: X server running on local machine?
#	Line 125 | Line 127 | static uint8 *the_buffer_copy = NULL;          /
127		static uint32 the_buffer_size;                          // Size of allocated the_buffer
128
129		// Variables for DGA mode
128	–	static char *dga_screen_base;
129	–	static int dga_fb_width;
130		static int current_dga_cmap;
131
132		#ifdef ENABLE_XF86_VIDMODE
#	Line 196 | Line 196 | static int palette_size(int mode)
196		}
197		}
198
199	+	// Return bits per pixel for requested depth
200	+	static inline int bytes_per_pixel(int depth)
201	+	{
202	+	int bpp;
203	+	switch (depth) {
204	+	case 8:
205	+	bpp = 1;
206	+	break;
207	+	case 15: case 16:
208	+	bpp = 2;
209	+	break;
210	+	case 24: case 32:
211	+	bpp = 4;
212	+	break;
213	+	default:
214	+	abort();
215	+	}
216	+	return bpp;
217	+	}
218	+
219		// Map video_mode depth ID to numerical depth value
220		static inline int depth_of_video_mode(int mode)
221		{
222	<	int depth = -1;
222	>	int depth;
223		switch (mode) {
224		case APPLE_1_BIT:
225		depth = 1;
#	Line 349 | Line 369 | static void set_window_delete_protocol(W
369		}
370
371		// Wait until window is mapped/unmapped
372	<	void wait_mapped(Window w)
372	>	static void wait_mapped(Window w)
373		{
374		XEvent e;
375		do {
#	Line 357 | Line 377 | void wait_mapped(Window w)
377		} while ((e.type != MapNotify) || (e.xmap.event != w));
378		}
379
380	<	void wait_unmapped(Window w)
380	>	static void wait_unmapped(Window w)
381		{
382		XEvent e;
383		do {
#	Line 486 | Line 506 | static bool open_window(int width, int h
506		XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
507
508		// Create cursor
509	<	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
510	<	cursor_image->byte_order = MSBFirst;
511	<	cursor_image->bitmap_bit_order = MSBFirst;
512	<	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 36, 16, 16, 16, 2);
513	<	cursor_mask_image->byte_order = MSBFirst;
514	<	cursor_mask_image->bitmap_bit_order = MSBFirst;
515	<	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
516	<	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
517	<	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
518	<	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
519	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
520	<	cursor_changed = false;
509	>	if (hw_mac_cursor_accl) {
510	>	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
511	>	cursor_image->byte_order = MSBFirst;
512	>	cursor_image->bitmap_bit_order = MSBFirst;
513	>	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 36, 16, 16, 16, 2);
514	>	cursor_mask_image->byte_order = MSBFirst;
515	>	cursor_mask_image->bitmap_bit_order = MSBFirst;
516	>	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
517	>	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
518	>	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
519	>	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
520	>	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
521	>	cursor_changed = false;
522	>	}
523	>
524	>	// Create no_cursor
525	>	else {
526	>	mac_cursor = XCreatePixmapCursor(x_display,
527	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
528	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
529	>	&black, &white, 0, 0);
530	>	XDefineCursor(x_display, the_win, mac_cursor);
531	>	}
532
533		// Init blitting routines
534		bool native_byte_order;
#	Line 522 | Line 553 | static bool open_dga(int width, int heig
553		// Set relative mouse mode
554		ADBSetRelMouseMode(true);
555
556	+	// Create window
557	+	XSetWindowAttributes wattr;
558	+	wattr.event_mask = eventmask = dga_eventmask;
559	+	wattr.override_redirect = True;
560	+	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
561	+	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
562	+	InputOutput, vis, CWEventMask | CWOverrideRedirect |
563	+	(color_class == DirectColor ? CWColormap : 0), &wattr);
564	+
565	+	// Show window
566	+	XMapRaised(x_display, the_win);
567	+	wait_mapped(the_win);
568	+
569		#ifdef ENABLE_XF86_VIDMODE
570		// Switch to best mode
571		if (has_vidmode) {
#	Line 538 | Line 582 | static bool open_dga(int width, int heig
582		#endif
583
584		// Establish direct screen connection
585	+	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
586	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
587		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
588		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
589	+
590	+	int v_width, v_bank, v_size;
591	+	XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
592		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
593		XF86DGASetViewPort(x_display, screen, 0, 0);
594		XF86DGASetVidPage(x_display, screen, 0);
595
596		// Set colormap
597	<	if (depth == 8)
597	>	if (!IsDirectMode(get_current_mode())) {
598	>	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
599		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
600	+	}
601	+	XSync(x_display, false);
602
603	<	// Set bytes per row
604	<	int bytes_per_row = TrivialBytesPerRow((dga_fb_width + 7) & ~7, DepthModeForPixelDepth(depth));
553	<
603	>	// Init blitting routines
604	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, DepthModeForPixelDepth(depth));
605		#if ENABLE_VOSF
606		bool native_byte_order;
607		#ifdef WORDS_BIGENDIAN
#	Line 569 | Line 620 | static bool open_dga(int width, int heig
620		the_buffer_size = page_extend((height + 2) * bytes_per_row);
621		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
622		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
623	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
624		}
625		#else
626		use_vosf = false;
575	–	the_buffer = dga_screen_base;
627		#endif
628		#endif
578	–	screen_base = (uint32)the_buffer;
629
630	+	// Set frame buffer base
631	+	D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
632	+	screen_base = (uint32)the_buffer;
633		VModes[cur_mode].viRowBytes = bytes_per_row;
581	–	XSync(x_display, false);
634		return true;
635		#else
636		ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
#	Line 711 | Line 763 | static void close_window(void)
763		if (the_gc)
764		XFreeGC(x_display, the_gc);
765
714	–	// Close window
715	–	if (the_win) {
716	–	XUnmapWindow(x_display, the_win);
717	–	wait_unmapped(the_win);
718	–	XDestroyWindow(x_display, the_win);
719	–	}
720	–
766		XFlush(x_display);
767		XSync(x_display, false);
768		}
#	Line 755 | Line 800 | static void close_display(void)
800		else if (display_type == DIS_WINDOW)
801		close_window();
802
803	+	// Close window
804	+	if (the_win) {
805	+	XUnmapWindow(x_display, the_win);
806	+	wait_unmapped(the_win);
807	+	XDestroyWindow(x_display, the_win);
808	+	}
809	+
810		// Free colormaps
811		if (cmap[0]) {
812		XFreeColormap(x_display, cmap[0]);
#	Line 871 | Line 923 | static void keycode_init(void)
923		}
924		}
925
926	+	// Find Apple mode matching best specified dimensions
927	+	static int find_apple_resolution(int xsize, int ysize)
928	+	{
929	+	int apple_id;
930	+	if (xsize < 800)
931	+	apple_id = APPLE_640x480;
932	+	else if (xsize < 1024)
933	+	apple_id = APPLE_800x600;
934	+	else if (xsize < 1152)
935	+	apple_id = APPLE_1024x768;
936	+	else if (xsize < 1280) {
937	+	if (ysize < 900)
938	+	apple_id = APPLE_1152x768;
939	+	else
940	+	apple_id = APPLE_1152x900;
941	+	}
942	+	else if (xsize < 1600)
943	+	apple_id = APPLE_1280x1024;
944	+	else
945	+	apple_id = APPLE_1600x1200;
946	+	return apple_id;
947	+	}
948	+
949	+	// Find mode in list of supported modes
950	+	static int find_mode(int apple_mode, int apple_id, int type)
951	+	{
952	+	for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
953	+	if (p->viType == type && p->viAppleID == apple_id && p->viAppleMode == apple_mode)
954	+	return p - VModes;
955	+	}
956	+	return -1;
957	+	}
958	+
959		// Add mode to list of supported modes
960		static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, int apple_mode, int apple_id, int type)
961		{
#	Line 891 | Line 976 | static void add_mode(VideoInfo *&p, uint
976		p->viXsize = 1024;
977		p->viYsize = 768;
978		break;
979	+	case APPLE_1152x768:
980	+	p->viXsize = 1152;
981	+	p->viYsize = 768;
982	+	break;
983		case APPLE_1152x900:
984		p->viXsize = 1152;
985		p->viYsize = 900;
#	Line 1037 | Line 1126 | bool VideoInit(void)
1126		add_mode(p, screen_modes, 2, default_mode, APPLE_800x600, DIS_SCREEN);
1127		if (has_mode(1024, 768))
1128		add_mode(p, screen_modes, 4, default_mode, APPLE_1024x768, DIS_SCREEN);
1129	+	if (has_mode(1152, 768))
1130	+	add_mode(p, screen_modes, 64, default_mode, APPLE_1152x768, DIS_SCREEN);
1131		if (has_mode(1152, 900))
1132		add_mode(p, screen_modes, 8, default_mode, APPLE_1152x900, DIS_SCREEN);
1133		if (has_mode(1280, 1024))
#	Line 1046 | Line 1137 | bool VideoInit(void)
1137		} else if (screen_modes) {
1138		int xsize = DisplayWidth(x_display, screen);
1139		int ysize = DisplayHeight(x_display, screen);
1140	<	int apple_id;
1050	<	if (xsize < 800)
1051	<	apple_id = APPLE_640x480;
1052	<	else if (xsize < 1024)
1053	<	apple_id = APPLE_800x600;
1054	<	else if (xsize < 1152)
1055	<	apple_id = APPLE_1024x768;
1056	<	else if (xsize < 1280)
1057	<	apple_id = APPLE_1152x900;
1058	<	else if (xsize < 1600)
1059	<	apple_id = APPLE_1280x1024;
1060	<	else
1061	<	apple_id = APPLE_1600x1200;
1140	>	int apple_id = find_apple_resolution(xsize, ysize);
1141		p->viType = DIS_SCREEN;
1142		p->viRowBytes = 0;
1143		p->viXsize = xsize;
#	Line 1075 | Line 1154 | bool VideoInit(void)
1154
1155		// Find default mode (window 640x480)
1156		cur_mode = -1;
1157	<	for (p = VModes; p->viType != DIS_INVALID; p++) {
1158	<	if (p->viType == DIS_WINDOW
1159	<	&& p->viAppleID == APPLE_W_640x480
1160	<	&& p->viAppleMode == default_mode) {
1161	<	cur_mode = p - VModes;
1162	<	break;
1084	<	}
1157	>	if (has_dga && screen_modes) {
1158	>	int screen_width = DisplayWidth(x_display, screen);
1159	>	int screen_height = DisplayHeight(x_display, screen);
1160	>	int apple_id = find_apple_resolution(screen_width, screen_height);
1161	>	if (apple_id != -1)
1162	>	cur_mode = find_mode(default_mode, apple_id, DIS_SCREEN);
1163		}
1164	+	if (cur_mode == -1)
1165	+	cur_mode = find_mode(default_mode, APPLE_W_640x480, DIS_WINDOW);
1166		assert(cur_mode != -1);
1167
1168		#if DEBUG
#	Line 1093 | Line 1173 | bool VideoInit(void)
1173		}
1174		#endif
1175
1096	–	#ifdef ENABLE_XF86_DGA
1097	–	if (has_dga && screen_modes) {
1098	–	int v_bank, v_size;
1099	–	XF86DGAGetVideo(x_display, screen, &dga_screen_base, &dga_fb_width, &v_bank, &v_size);
1100	–	D(bug("DGA screen_base %p, v_width %d\n", dga_screen_base, dga_fb_width));
1101	–	}
1102	–	#endif
1103	–
1176		// Open window/screen
1177		if (!open_display())
1178		return false;
#	Line 1112 | Line 1184 | bool VideoInit(void)
1184
1185		// Start periodic thread
1186		XSync(x_display, false);
1187	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1187	>	Set_pthread_attr(&redraw_thread_attr, 0);
1188	>	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1189		D(bug("Redraw thread installed (%ld)\n", redraw_thread));
1190		return true;
1191		}
#	Line 1475 | Line 1548 | static void handle_events(void)
1548		break;
1549		}
1550
1551	<	// Mouse moved
1551	>	// Mouse entered window
1552		case EnterNotify:
1553	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1553	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
1554	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1555		break;
1556	+
1557	+	// Mouse moved
1558		case MotionNotify:
1559	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1559	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1560		break;
1561
1562		// Keyboard
#	Line 1547 | Line 1623 | void VideoVBL(void)
1623		*  Install graphics acceleration
1624		*/
1625
1626	<	#if 0
1627	<	// Rectangle blitting
1628	<	static void accl_bitblt(accl_params *p)
1626	>	// Rectangle inversion
1627	>	template< int bpp >
1628	>	static inline void do_invrect(uint8 *dest, uint32 length)
1629		{
1630	<	D(bug("accl_bitblt\n"));
1630	>	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1631	>	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1632	>	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1633	>	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1634
1635	<	// Get blitting parameters
1636	<	int16 src_X = p->src_rect[1] - p->src_bounds[1];
1637	<	int16 src_Y = p->src_rect[0] - p->src_bounds[0];
1638	<	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1639	<	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1640	<	int16 width = p->dest_rect[3] - p->dest_rect[1] - 1;
1562	<	int16 height = p->dest_rect[2] - p->dest_rect[0] - 1;
1563	<	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1564	<	D(bug(" width %d, height %d\n", width, height));
1635	>	#ifndef UNALIGNED_PROFITABLE
1636	>	// Align on 16-bit boundaries
1637	>	if (bpp < 16 && (((uintptr)dest) & 1)) {
1638	>	INVERT_1(dest, 0);
1639	>	dest += 1; length -= 1;
1640	>	}
1641
1642	<	// And perform the blit
1643	<	bitblt_hook(src_X, src_Y, dest_X, dest_Y, width, height);
1644	<	}
1642	>	// Align on 32-bit boundaries
1643	>	if (bpp < 32 && (((uintptr)dest) & 2)) {
1644	>	INVERT_2(dest, 0);
1645	>	dest += 2; length -= 2;
1646	>	}
1647	>	#endif
1648
1649	<	static bool accl_bitblt_hook(accl_params *p)
1650	<	{
1651	<	D(bug("accl_draw_hook %p\n", p));
1649	>	// Invert 8-byte words
1650	>	if (length >= 8) {
1651	>	const int r = (length / 8) % 8;
1652	>	dest += r * 8;
1653
1654	<	// Check if we can accelerate this bitblt
1655	<	if (p->src_base_addr == screen_base && p->dest_base_addr == screen_base &&
1656	<	display_type == DIS_SCREEN && bitblt_hook != NULL &&
1657	<	((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
1658	<	((uint32 *)p)[0x130 >> 2] == 0 &&
1659	<	p->transfer_mode == 0 &&
1660	<	p->src_row_bytes > 0 && ((uint32 *)p)[0x15c >> 2] > 0) {
1654	>	int n = ((length / 8) + 7) / 8;
1655	>	switch (r) {
1656	>	case 0: do {
1657	>	dest += 64;
1658	>	INVERT_8(dest, -8);
1659	>	case 7: INVERT_8(dest, -7);
1660	>	case 6: INVERT_8(dest, -6);
1661	>	case 5: INVERT_8(dest, -5);
1662	>	case 4: INVERT_8(dest, -4);
1663	>	case 3: INVERT_8(dest, -3);
1664	>	case 2: INVERT_8(dest, -2);
1665	>	case 1: INVERT_8(dest, -1);
1666	>	} while (--n > 0);
1667	>	}
1668	>	}
1669
1670	<	// Yes, set function pointer
1671	<	p->draw_proc = accl_bitblt;
1672	<	return true;
1670	>	// 32-bit cell to invert?
1671	>	if (length & 4) {
1672	>	INVERT_4(dest, 0);
1673	>	if (bpp <= 16)
1674	>	dest += 4;
1675		}
1676	<	return false;
1676	>
1677	>	// 16-bit cell to invert?
1678	>	if (bpp <= 16 && (length & 2)) {
1679	>	INVERT_2(dest, 0);
1680	>	if (bpp <= 8)
1681	>	dest += 2;
1682	>	}
1683	>
1684	>	// 8-bit cell to invert?
1685	>	if (bpp <= 8 && (length & 1))
1686	>	INVERT_1(dest, 0);
1687	>
1688	>	#undef INVERT_1
1689	>	#undef INVERT_2
1690	>	#undef INVERT_4
1691	>	#undef INVERT_8
1692		}
1693
1694	<	// Rectangle filling/inversion
1590	<	static void accl_fillrect8(accl_params *p)
1694	>	void NQD_invrect(uint32 p)
1695		{
1696	<	D(bug("accl_fillrect8\n"));
1696	>	D(bug("accl_invrect %08x\n", p));
1697
1698	<	// Get filling parameters
1699	<	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1700	<	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1701	<	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1702	<	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1599	<	uint8 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1698	>	// Get inversion parameters
1699	>	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1700	>	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1701	>	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1702	>	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1703		D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1704	<	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1704	>	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1705
1706	<	// And perform the fill
1707	<	fillrect8_hook(dest_X, dest_Y, dest_X_max, dest_Y_max, color);
1706	>	//!!?? pen_mode == 14
1707	>
1708	>	// And perform the inversion
1709	>	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1710	>	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1711	>	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1712	>	width *= bpp;
1713	>	switch (bpp) {
1714	>	case 1:
1715	>	for (int i = 0; i < height; i++) {
1716	>	do_invrect<8>(dest, width);
1717	>	dest += dest_row_bytes;
1718	>	}
1719	>	break;
1720	>	case 2:
1721	>	for (int i = 0; i < height; i++) {
1722	>	do_invrect<16>(dest, width);
1723	>	dest += dest_row_bytes;
1724	>	}
1725	>	break;
1726	>	case 4:
1727	>	for (int i = 0; i < height; i++) {
1728	>	do_invrect<32>(dest, width);
1729	>	dest += dest_row_bytes;
1730	>	}
1731	>	break;
1732	>	}
1733		}
1734
1735	<	static void accl_fillrect32(accl_params *p)
1735	>	// Rectangle filling
1736	>	template< int bpp >
1737	>	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1738		{
1739	<	D(bug("accl_fillrect32\n"));
1739	>	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1740	>	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1741	>	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1742	>	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1743
1744	<	// Get filling parameters
1745	<	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1746	<	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1747	<	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1748	<	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1749	<	uint32 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1617	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1618	<	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1744	>	#ifndef UNALIGNED_PROFITABLE
1745	>	// Align on 16-bit boundaries
1746	>	if (bpp < 16 && (((uintptr)dest) & 1)) {
1747	>	FILL_1(dest, 0, color);
1748	>	dest += 1; length -= 1;
1749	>	}
1750
1751	<	// And perform the fill
1752	<	fillrect32_hook(dest_X, dest_Y, dest_X_max, dest_Y_max, color);
1751	>	// Align on 32-bit boundaries
1752	>	if (bpp < 32 && (((uintptr)dest) & 2)) {
1753	>	FILL_2(dest, 0, color);
1754	>	dest += 2; length -= 2;
1755	>	}
1756	>	#endif
1757	>
1758	>	// Fill 8-byte words
1759	>	if (length >= 8) {
1760	>	const uint64 c = (((uint64)color) << 32) | color;
1761	>	const int r = (length / 8) % 8;
1762	>	dest += r * 8;
1763	>
1764	>	int n = ((length / 8) + 7) / 8;
1765	>	switch (r) {
1766	>	case 0: do {
1767	>	dest += 64;
1768	>	FILL_8(dest, -8, c);
1769	>	case 7: FILL_8(dest, -7, c);
1770	>	case 6: FILL_8(dest, -6, c);
1771	>	case 5: FILL_8(dest, -5, c);
1772	>	case 4: FILL_8(dest, -4, c);
1773	>	case 3: FILL_8(dest, -3, c);
1774	>	case 2: FILL_8(dest, -2, c);
1775	>	case 1: FILL_8(dest, -1, c);
1776	>	} while (--n > 0);
1777	>	}
1778	>	}
1779	>
1780	>	// 32-bit cell to fill?
1781	>	if (length & 4) {
1782	>	FILL_4(dest, 0, color);
1783	>	if (bpp <= 16)
1784	>	dest += 4;
1785	>	}
1786	>
1787	>	// 16-bit cell to fill?
1788	>	if (bpp <= 16 && (length & 2)) {
1789	>	FILL_2(dest, 0, color);
1790	>	if (bpp <= 8)
1791	>	dest += 2;
1792	>	}
1793	>
1794	>	// 8-bit cell to fill?
1795	>	if (bpp <= 8 && (length & 1))
1796	>	FILL_1(dest, 0, color);
1797	>
1798	>	#undef FILL_1
1799	>	#undef FILL_2
1800	>	#undef FILL_4
1801	>	#undef FILL_8
1802		}
1803
1804	<	static void accl_invrect(accl_params *p)
1804	>	void NQD_fillrect(uint32 p)
1805		{
1806	<	D(bug("accl_invrect\n"));
1806	>	D(bug("accl_fillrect %08x\n", p));
1807
1808	<	// Get inversion parameters
1809	<	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1810	<	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1811	<	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1812	<	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1808	>	// Get filling parameters
1809	>	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1810	>	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1811	>	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1812	>	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1813	>	uint32 color = ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen);
1814		D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1815	<	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1816	<
1636	<	//!!?? pen_mode == 14
1815	>	D(bug(" width %d, height %d\n", width, height));
1816	>	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1817
1818	<	// And perform the inversion
1819	<	invrect_hook(dest_X, dest_Y, dest_X_max, dest_Y_max);
1818	>	// And perform the fill
1819	>	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1820	>	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1821	>	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1822	>	width *= bpp;
1823	>	switch (bpp) {
1824	>	case 1:
1825	>	for (int i = 0; i < height; i++) {
1826	>	memset(dest, color, width);
1827	>	dest += dest_row_bytes;
1828	>	}
1829	>	break;
1830	>	case 2:
1831	>	for (int i = 0; i < height; i++) {
1832	>	do_fillrect<16>(dest, color, width);
1833	>	dest += dest_row_bytes;
1834	>	}
1835	>	break;
1836	>	case 4:
1837	>	for (int i = 0; i < height; i++) {
1838	>	do_fillrect<32>(dest, color, width);
1839	>	dest += dest_row_bytes;
1840	>	}
1841	>	break;
1842	>	}
1843		}
1844
1845	<	static bool accl_fillrect_hook(accl_params *p)
1845	>	bool NQD_fillrect_hook(uint32 p)
1846		{
1847	<	D(bug("accl_fillrect_hook %p\n", p));
1847	>	D(bug("accl_fillrect_hook %08x\n", p));
1848
1849		// Check if we can accelerate this fillrect
1850	<	if (p->dest_base_addr == screen_base && ((uint32 *)p)[0x284 >> 2] != 0 && display_type == DIS_SCREEN) {
1851	<	if (p->transfer_mode == 8) {
1850	>	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1851	>	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1852	>	if (transfer_mode == 8) {
1853		// Fill
1854	<	if (p->dest_pixel_size == 8 && fillrect8_hook != NULL) {
1855	<	p->draw_proc = accl_fillrect8;
1856	<	return true;
1857	<	} else if (p->dest_pixel_size == 32 && fillrect32_hook != NULL) {
1654	<	p->draw_proc = accl_fillrect32;
1655	<	return true;
1656	<	}
1657	<	} else if (p->transfer_mode == 10 && invrect_hook != NULL) {
1854	>	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1855	>	return true;
1856	>	}
1857	>	else if (transfer_mode == 10) {
1858		// Invert
1859	<	p->draw_proc = accl_invrect;
1859	>	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1860		return true;
1861		}
1862		}
1863		return false;
1864		}
1865
1866	+	// Rectangle blitting
1867	+	// TODO: optimize for VOSF and target pixmap == screen
1868	+	void NQD_bitblt(uint32 p)
1869	+	{
1870	+	D(bug("accl_bitblt %08x\n", p));
1871	+
1872	+	// Get blitting parameters
1873	+	int16 src_X  = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1874	+	int16 src_Y  = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1875	+	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1876	+	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1877	+	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1878	+	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1879	+	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1880	+	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1881	+	D(bug(" width %d, height %d\n", width, height));
1882	+
1883	+	// And perform the blit
1884	+	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1885	+	width *= bpp;
1886	+	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1887	+	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1888	+	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1889	+	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp));
1890	+	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp));
1891	+	for (int i = 0; i < height; i++) {
1892	+	memmove(dst, src, width);
1893	+	src += src_row_bytes;
1894	+	dst += dst_row_bytes;
1895	+	}
1896	+	}
1897	+	else {
1898	+	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1899	+	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1900	+	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp));
1901	+	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp));
1902	+	for (int i = height - 1; i >= 0; i--) {
1903	+	memmove(dst, src, width);
1904	+	src -= src_row_bytes;
1905	+	dst -= dst_row_bytes;
1906	+	}
1907	+	}
1908	+	}
1909	+
1910	+	/*
1911	+	BitBlt transfer modes:
1912	+	0 : srcCopy
1913	+	1 : srcOr
1914	+	2 : srcXor
1915	+	3 : srcBic
1916	+	4 : notSrcCopy
1917	+	5 : notSrcOr
1918	+	6 : notSrcXor
1919	+	7 : notSrcBic
1920	+	32 : blend
1921	+	33 : addPin
1922	+	34 : addOver
1923	+	35 : subPin
1924	+	36 : transparent
1925	+	37 : adMax
1926	+	38 : subOver
1927	+	39 : adMin
1928	+	50 : hilite
1929	+	*/
1930	+
1931	+	bool NQD_bitblt_hook(uint32 p)
1932	+	{
1933	+	D(bug("accl_draw_hook %08x\n", p));
1934	+
1935	+	// Check if we can accelerate this bitblt
1936	+	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1937	+	ReadMacInt32(p + 0x130) == 0 &&
1938	+	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1939	+	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1940	+	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1941	+	ReadMacInt32(p + acclTransferMode) == 0 &&                                                                               // srcCopy?
1942	+	ReadMacInt32(p + 0x15c) > 0) {
1943	+
1944	+	// Yes, set function pointer
1945	+	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1946	+	return true;
1947	+	}
1948	+	return false;
1949	+	}
1950	+
1951		// Wait for graphics operation to finish
1952	<	static bool accl_sync_hook(void *arg)
1952	>	bool NQD_sync_hook(uint32 arg)
1953		{
1954	<	D(bug("accl_sync_hook %p\n", arg));
1670	<	if (sync_hook != NULL)
1671	<	sync_hook();
1954	>	D(bug("accl_sync_hook %08x\n", arg));
1955		return true;
1956		}
1957
1675	–	static struct accl_hook_info bitblt_hook_info = {accl_bitblt_hook, accl_sync_hook, ACCL_BITBLT};
1676	–	static struct accl_hook_info fillrect_hook_info = {accl_fillrect_hook, accl_sync_hook, ACCL_FILLRECT};
1677	–	#endif
1678	–
1958		void VideoInstallAccel(void)
1959		{
1960	+	// Temporary hack until it's fixed for e.g. little-endian & 64-bit platforms
1961	+	#ifndef __powerpc__
1962	+	return;
1963	+	#endif
1964	+
1965		// Install acceleration hooks
1966		if (PrefsFindBool("gfxaccel")) {
1967		D(bug("Video: Installing acceleration hooks\n"));
1968	<	//!!    NQDMisc(6, &bitblt_hook_info);
1969	<	//              NQDMisc(6, &fillrect_hook_info);
1968	>	uint32 base;
1969	>
1970	>	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1971	>	base = bitblt_hook_info.addr();
1972	>	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1973	>	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1974	>	WriteMacInt32(base + 8, ACCL_BITBLT);
1975	>	NQDMisc(6, bitblt_hook_info.ptr());
1976	>
1977	>	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1978	>	base = fillrect_hook_info.addr();
1979	>	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1980	>	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1981	>	WriteMacInt32(base + 8, ACCL_FILLRECT);
1982	>	NQDMisc(6, fillrect_hook_info.ptr());
1983		}
1984		}
1985
#	Line 1790 | Line 2087 | void video_set_palette(void)
2087
2088
2089		/*
2090	+	*  Can we set the MacOS cursor image into the window?
2091	+	*/
2092	+
2093	+	bool video_can_change_cursor(void)
2094	+	{
2095	+	return hw_mac_cursor_accl && (display_type != DIS_SCREEN);
2096	+	}
2097	+
2098	+
2099	+	/*
2100		*  Set cursor image for window
2101		*/
2102
#	Line 1999 | Line 2306 | static void *redraw_func(void *arg)
2306		XF86DGADirectVideo(x_display, screen, 0);
2307		XUngrabPointer(x_display, CurrentTime);
2308		XUngrabKeyboard(x_display, CurrentTime);
2309	+	XUnmapWindow(x_display, the_win);
2310	+	wait_unmapped(the_win);
2311	+	XDestroyWindow(x_display, the_win);
2312		#endif
2313		XSync(x_display, false);
2314		XDisplayUnlock();
#	Line 2031 | Line 2341 | static void *redraw_func(void *arg)
2341		update_display();
2342
2343		// Set new cursor image if it was changed
2344	<	if (cursor_changed) {
2344	>	if (hw_mac_cursor_accl && cursor_changed) {
2345		cursor_changed = false;
2346		memcpy(cursor_image->data, MacCursor + 4, 32);
2347		memcpy(cursor_mask_image->data, MacCursor + 36, 32);

Diff Legend

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