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.26 by gbeauche, 2004-06-05T06:30:58Z vs.
Revision 1.32 by gbeauche, 2004-07-02T06:06:34Z

#	Line 46 | Line 46
46		#include "about_window.h"
47		#include "video.h"
48		#include "video_defs.h"
49	+	#include "video_blit.h"
50
51		#define DEBUG 0
52		#include "debug.h"
#	Line 65 | Line 66 | static int16 mouse_wheel_mode;
66		static int16 mouse_wheel_lines;
67		static bool redraw_thread_active = false;       // Flag: Redraw thread installed
68		static pthread_attr_t redraw_thread_attr;       // Redraw thread attributes
69	+	static volatile bool redraw_thread_cancel;      // Flag: Cancel Redraw thread
70		static pthread_t redraw_thread;                         // Redraw thread
71
72		static bool local_X11;                                          // Flag: X server running on local machine?
#	Line 82 | Line 84 | static const bool use_vosf = false;                    //
84
85		static bool palette_changed = false;            // Flag: Palette changed, redraw thread must update palette
86		static bool ctrl_down = false;                          // Flag: Ctrl key pressed
87	+	static bool caps_on = false;                            // Flag: Caps Lock on
88		static bool quit_full_screen = false;           // Flag: DGA close requested from redraw thread
89		static volatile bool quit_full_screen_ack = false;      // Acknowledge for quit_full_screen
90		static bool emerg_quit = false;                         // Flag: Ctrl-Esc pressed, emergency quit requested from MacOS thread
#	Line 99 | Line 102 | static int depth;                                                      // Depth of Mac
102		static Window rootwin, the_win;                         // Root window and our window
103		static int num_depths = 0;                                      // Number of available X depths
104		static int *avail_depths = NULL;                        // List of available X depths
105	+	static VisualFormat visualFormat;
106		static XVisualInfo visualInfo;
107		static Visual *vis;
108		static int color_class;
#	Line 538 | Line 542 | static bool open_window(int width, int h
542		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
543		#endif
544		#ifdef ENABLE_VOSF
545	<	Screen_blitter_init(&visualInfo, native_byte_order, depth);
545	>	Screen_blitter_init(visualFormat, native_byte_order, depth);
546		#endif
547
548		// Set bytes per row
#	Line 612 | Line 616 | static bool open_dga(int width, int heig
616		#if REAL_ADDRESSING || DIRECT_ADDRESSING
617		// Screen_blitter_init() returns TRUE if VOSF is mandatory
618		// i.e. the framebuffer update function is not Blit_Copy_Raw
619	<	use_vosf = Screen_blitter_init(&visualInfo, native_byte_order, depth);
619	>	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth);
620
621		if (use_vosf) {
622		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 649 | Line 653 | static bool open_display(void)
653		return false;
654		}
655
656	+	// Build up visualFormat structure
657	+	visualFormat.depth = visualInfo.depth;
658	+	visualFormat.Rmask = visualInfo.red_mask;
659	+	visualFormat.Gmask = visualInfo.green_mask;
660	+	visualFormat.Bmask = visualInfo.blue_mask;
661	+
662		// Create color maps
663		if (color_class == PseudoColor || color_class == DirectColor) {
664		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
#	Line 882 | Line 892 | static void keycode_init(void)
892
893		// Search for server vendor string, then read keycodes
894		const char *vendor = ServerVendor(x_display);
895	+	#if (defined(__APPLE__) && defined(__MACH__))
896	+	// Force use of MacX mappings on MacOS X with Apple's X server
897	+	int dummy;
898	+	if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy))
899	+	vendor = "MacX";
900	+	#endif
901		bool vendor_found = false;
902		char line[256];
903		while (fgets(line, 255, f)) {
#	Line 1192 | Line 1208 | bool VideoInit(void)
1208		// Start periodic thread
1209		XSync(x_display, false);
1210		Set_pthread_attr(&redraw_thread_attr, 0);
1211	+	redraw_thread_cancel = false;
1212		redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1213		D(bug("Redraw thread installed (%ld)\n", redraw_thread));
1214		return true;
#	Line 1206 | Line 1223 | void VideoExit(void)
1223		{
1224		// Stop redraw thread
1225		if (redraw_thread_active) {
1226	+	redraw_thread_cancel = true;
1227		pthread_cancel(redraw_thread);
1228		pthread_join(redraw_thread, NULL);
1229		redraw_thread_active = false;
#	Line 1484 | Line 1502 | static int kc_decode(KeySym ks)
1502		return -1;
1503		}
1504
1505	<	static int event2keycode(XKeyEvent &ev)
1505	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1506		{
1507		KeySym ks;
1490	–	int as;
1508		int i = 0;
1509
1510		do {
1511		ks = XLookupKeysym(&ev, i++);
1512	<	as = kc_decode(ks);
1513	<	if (as != -1)
1512	>	int as = kc_decode(ks);
1513	>	if (as >= 0)
1514	>	return as;
1515	>	if (as == -2)
1516		return as;
1517		} while (ks != NoSymbol);
1518
#	Line 1568 | Line 1587 | static void handle_events(void)
1587
1588		// Keyboard
1589		case KeyPress: {
1590	<	int code = event2keycode(event.xkey);
1591	<	if (use_keycodes && code != -1)
1592	<	code = keycode_table[event.xkey.keycode & 0xff];
1593	<	if (code != -1) {
1590	>	int code = -1;
1591	>	if (use_keycodes) {
1592	>	if (event2keycode(event.xkey, true) != -2)      // This is called to process the hotkeys
1593	>	code = keycode_table[event.xkey.keycode & 0xff];
1594	>	} else
1595	>	code = event2keycode(event.xkey, true);
1596	>	if (code >= 0) {
1597		if (!emul_suspended) {
1598	<	ADBKeyDown(code);
1598	>	if (code == 0x39) {     // Caps Lock pressed
1599	>	if (caps_on) {
1600	>	ADBKeyUp(code);
1601	>	caps_on = false;
1602	>	} else {
1603	>	ADBKeyDown(code);
1604	>	caps_on = true;
1605	>	}
1606	>	} else
1607	>	ADBKeyDown(code);
1608		if (code == 0x36)
1609		ctrl_down = true;
1610		} else {
#	Line 1584 | Line 1615 | static void handle_events(void)
1615		break;
1616		}
1617		case KeyRelease: {
1618	<	int code = event2keycode(event.xkey);
1619	<	if (use_keycodes && code != 1)
1620	<	code = keycode_table[event.xkey.keycode & 0xff];
1621	<	if (code != -1) {
1618	>	int code = -1;
1619	>	if (use_keycodes) {
1620	>	if (event2keycode(event.xkey, false) != -2)     // This is called to process the hotkeys
1621	>	code = keycode_table[event.xkey.keycode & 0xff];
1622	>	} else
1623	>	code = event2keycode(event.xkey, false);
1624	>	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1625		ADBKeyUp(code);
1626		if (code == 0x36)
1627		ctrl_down = false;
#	Line 1627 | Line 1661 | void VideoVBL(void)
1661
1662
1663		/*
1630	–	*  Install graphics acceleration
1631	–	*/
1632	–
1633	–	// Rectangle inversion
1634	–	template< int bpp >
1635	–	static inline void do_invrect(uint8 *dest, uint32 length)
1636	–	{
1637	–	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1638	–	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1639	–	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1640	–	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1641	–
1642	–	#ifndef UNALIGNED_PROFITABLE
1643	–	// Align on 16-bit boundaries
1644	–	if (bpp < 16 && (((uintptr)dest) & 1)) {
1645	–	INVERT_1(dest, 0);
1646	–	dest += 1; length -= 1;
1647	–	}
1648	–
1649	–	// Align on 32-bit boundaries
1650	–	if (bpp < 32 && (((uintptr)dest) & 2)) {
1651	–	INVERT_2(dest, 0);
1652	–	dest += 2; length -= 2;
1653	–	}
1654	–	#endif
1655	–
1656	–	// Invert 8-byte words
1657	–	if (length >= 8) {
1658	–	const int r = (length / 8) % 8;
1659	–	dest += r * 8;
1660	–
1661	–	int n = ((length / 8) + 7) / 8;
1662	–	switch (r) {
1663	–	case 0: do {
1664	–	dest += 64;
1665	–	INVERT_8(dest, -8);
1666	–	case 7: INVERT_8(dest, -7);
1667	–	case 6: INVERT_8(dest, -6);
1668	–	case 5: INVERT_8(dest, -5);
1669	–	case 4: INVERT_8(dest, -4);
1670	–	case 3: INVERT_8(dest, -3);
1671	–	case 2: INVERT_8(dest, -2);
1672	–	case 1: INVERT_8(dest, -1);
1673	–	} while (--n > 0);
1674	–	}
1675	–	}
1676	–
1677	–	// 32-bit cell to invert?
1678	–	if (length & 4) {
1679	–	INVERT_4(dest, 0);
1680	–	if (bpp <= 16)
1681	–	dest += 4;
1682	–	}
1683	–
1684	–	// 16-bit cell to invert?
1685	–	if (bpp <= 16 && (length & 2)) {
1686	–	INVERT_2(dest, 0);
1687	–	if (bpp <= 8)
1688	–	dest += 2;
1689	–	}
1690	–
1691	–	// 8-bit cell to invert?
1692	–	if (bpp <= 8 && (length & 1))
1693	–	INVERT_1(dest, 0);
1694	–
1695	–	#undef INVERT_1
1696	–	#undef INVERT_2
1697	–	#undef INVERT_4
1698	–	#undef INVERT_8
1699	–	}
1700	–
1701	–	void NQD_invrect(uint32 p)
1702	–	{
1703	–	D(bug("accl_invrect %08x\n", p));
1704	–
1705	–	// Get inversion parameters
1706	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1707	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1708	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1709	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1710	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1711	–	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1712	–
1713	–	//!!?? pen_mode == 14
1714	–
1715	–	// And perform the inversion
1716	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1717	–	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1718	–	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1719	–	width *= bpp;
1720	–	switch (bpp) {
1721	–	case 1:
1722	–	for (int i = 0; i < height; i++) {
1723	–	do_invrect<8>(dest, width);
1724	–	dest += dest_row_bytes;
1725	–	}
1726	–	break;
1727	–	case 2:
1728	–	for (int i = 0; i < height; i++) {
1729	–	do_invrect<16>(dest, width);
1730	–	dest += dest_row_bytes;
1731	–	}
1732	–	break;
1733	–	case 4:
1734	–	for (int i = 0; i < height; i++) {
1735	–	do_invrect<32>(dest, width);
1736	–	dest += dest_row_bytes;
1737	–	}
1738	–	break;
1739	–	}
1740	–	}
1741	–
1742	–	// Rectangle filling
1743	–	template< int bpp >
1744	–	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1745	–	{
1746	–	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1747	–	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1748	–	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1749	–	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1750	–
1751	–	#ifndef UNALIGNED_PROFITABLE
1752	–	// Align on 16-bit boundaries
1753	–	if (bpp < 16 && (((uintptr)dest) & 1)) {
1754	–	FILL_1(dest, 0, color);
1755	–	dest += 1; length -= 1;
1756	–	}
1757	–
1758	–	// Align on 32-bit boundaries
1759	–	if (bpp < 32 && (((uintptr)dest) & 2)) {
1760	–	FILL_2(dest, 0, color);
1761	–	dest += 2; length -= 2;
1762	–	}
1763	–	#endif
1764	–
1765	–	// Fill 8-byte words
1766	–	if (length >= 8) {
1767	–	const uint64 c = (((uint64)color) << 32) | color;
1768	–	const int r = (length / 8) % 8;
1769	–	dest += r * 8;
1770	–
1771	–	int n = ((length / 8) + 7) / 8;
1772	–	switch (r) {
1773	–	case 0: do {
1774	–	dest += 64;
1775	–	FILL_8(dest, -8, c);
1776	–	case 7: FILL_8(dest, -7, c);
1777	–	case 6: FILL_8(dest, -6, c);
1778	–	case 5: FILL_8(dest, -5, c);
1779	–	case 4: FILL_8(dest, -4, c);
1780	–	case 3: FILL_8(dest, -3, c);
1781	–	case 2: FILL_8(dest, -2, c);
1782	–	case 1: FILL_8(dest, -1, c);
1783	–	} while (--n > 0);
1784	–	}
1785	–	}
1786	–
1787	–	// 32-bit cell to fill?
1788	–	if (length & 4) {
1789	–	FILL_4(dest, 0, color);
1790	–	if (bpp <= 16)
1791	–	dest += 4;
1792	–	}
1793	–
1794	–	// 16-bit cell to fill?
1795	–	if (bpp <= 16 && (length & 2)) {
1796	–	FILL_2(dest, 0, color);
1797	–	if (bpp <= 8)
1798	–	dest += 2;
1799	–	}
1800	–
1801	–	// 8-bit cell to fill?
1802	–	if (bpp <= 8 && (length & 1))
1803	–	FILL_1(dest, 0, color);
1804	–
1805	–	#undef FILL_1
1806	–	#undef FILL_2
1807	–	#undef FILL_4
1808	–	#undef FILL_8
1809	–	}
1810	–
1811	–	void NQD_fillrect(uint32 p)
1812	–	{
1813	–	D(bug("accl_fillrect %08x\n", p));
1814	–
1815	–	// Get filling parameters
1816	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1817	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1818	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1819	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1820	–	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1821	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1822	–	D(bug(" width %d, height %d\n", width, height));
1823	–	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1824	–
1825	–	// And perform the fill
1826	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1827	–	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1828	–	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1829	–	width *= bpp;
1830	–	switch (bpp) {
1831	–	case 1:
1832	–	for (int i = 0; i < height; i++) {
1833	–	memset(dest, color, width);
1834	–	dest += dest_row_bytes;
1835	–	}
1836	–	break;
1837	–	case 2:
1838	–	for (int i = 0; i < height; i++) {
1839	–	do_fillrect<16>(dest, color, width);
1840	–	dest += dest_row_bytes;
1841	–	}
1842	–	break;
1843	–	case 4:
1844	–	for (int i = 0; i < height; i++) {
1845	–	do_fillrect<32>(dest, color, width);
1846	–	dest += dest_row_bytes;
1847	–	}
1848	–	break;
1849	–	}
1850	–	}
1851	–
1852	–	bool NQD_fillrect_hook(uint32 p)
1853	–	{
1854	–	D(bug("accl_fillrect_hook %08x\n", p));
1855	–
1856	–	// Check if we can accelerate this fillrect
1857	–	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1858	–	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1859	–	if (transfer_mode == 8) {
1860	–	// Fill
1861	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1862	–	return true;
1863	–	}
1864	–	else if (transfer_mode == 10) {
1865	–	// Invert
1866	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1867	–	return true;
1868	–	}
1869	–	}
1870	–	return false;
1871	–	}
1872	–
1873	–	// Rectangle blitting
1874	–	// TODO: optimize for VOSF and target pixmap == screen
1875	–	void NQD_bitblt(uint32 p)
1876	–	{
1877	–	D(bug("accl_bitblt %08x\n", p));
1878	–
1879	–	// Get blitting parameters
1880	–	int16 src_X  = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1881	–	int16 src_Y  = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1882	–	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1883	–	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1884	–	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1885	–	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1886	–	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1887	–	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1888	–	D(bug(" width %d, height %d\n", width, height));
1889	–
1890	–	// And perform the blit
1891	–	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1892	–	width *= bpp;
1893	–	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1894	–	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1895	–	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1896	–	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp));
1897	–	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp));
1898	–	for (int i = 0; i < height; i++) {
1899	–	memmove(dst, src, width);
1900	–	src += src_row_bytes;
1901	–	dst += dst_row_bytes;
1902	–	}
1903	–	}
1904	–	else {
1905	–	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1906	–	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1907	–	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp));
1908	–	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp));
1909	–	for (int i = height - 1; i >= 0; i--) {
1910	–	memmove(dst, src, width);
1911	–	src -= src_row_bytes;
1912	–	dst -= dst_row_bytes;
1913	–	}
1914	–	}
1915	–	}
1916	–
1917	–	/*
1918	–	BitBlt transfer modes:
1919	–	0 : srcCopy
1920	–	1 : srcOr
1921	–	2 : srcXor
1922	–	3 : srcBic
1923	–	4 : notSrcCopy
1924	–	5 : notSrcOr
1925	–	6 : notSrcXor
1926	–	7 : notSrcBic
1927	–	32 : blend
1928	–	33 : addPin
1929	–	34 : addOver
1930	–	35 : subPin
1931	–	36 : transparent
1932	–	37 : adMax
1933	–	38 : subOver
1934	–	39 : adMin
1935	–	50 : hilite
1936	–	*/
1937	–
1938	–	bool NQD_bitblt_hook(uint32 p)
1939	–	{
1940	–	D(bug("accl_draw_hook %08x\n", p));
1941	–
1942	–	// Check if we can accelerate this bitblt
1943	–	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1944	–	ReadMacInt32(p + 0x130) == 0 &&
1945	–	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1946	–	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1947	–	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1948	–	ReadMacInt32(p + acclTransferMode) == 0 &&                                                                               // srcCopy?
1949	–	ReadMacInt32(p + 0x15c) > 0) {
1950	–
1951	–	// Yes, set function pointer
1952	–	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1953	–	return true;
1954	–	}
1955	–	return false;
1956	–	}
1957	–
1958	–	// Wait for graphics operation to finish
1959	–	bool NQD_sync_hook(uint32 arg)
1960	–	{
1961	–	D(bug("accl_sync_hook %08x\n", arg));
1962	–	return true;
1963	–	}
1964	–
1965	–	void VideoInstallAccel(void)
1966	–	{
1967	–	// Install acceleration hooks
1968	–	if (PrefsFindBool("gfxaccel")) {
1969	–	D(bug("Video: Installing acceleration hooks\n"));
1970	–	uint32 base;
1971	–
1972	–	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1973	–	base = bitblt_hook_info.addr();
1974	–	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1975	–	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1976	–	WriteMacInt32(base + 8, ACCL_BITBLT);
1977	–	NQDMisc(6, bitblt_hook_info.ptr());
1978	–
1979	–	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1980	–	base = fillrect_hook_info.addr();
1981	–	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1982	–	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1983	–	WriteMacInt32(base + 8, ACCL_FILLRECT);
1984	–	NQDMisc(6, fillrect_hook_info.ptr());
1985	–	}
1986	–	}
1987	–
1988	–
1989	–	/*
1664		*  Change video mode
1665		*/
1666
#	Line 2278 | Line 1952 | static void *redraw_func(void *arg)
1952		int64 ticks = 0;
1953		uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
1954
1955	<	for (;;) {
1955	>	while (!redraw_thread_cancel) {
1956
1957		// Pause if requested (during video mode switches)
1958		while (thread_stop_req)
#	Line 2345 | Line 2019 | static void *redraw_func(void *arg)
2019		// Set new cursor image if it was changed
2020		if (hw_mac_cursor_accl && cursor_changed) {
2021		cursor_changed = false;
2022	<	memcpy(cursor_image->data, MacCursor + 4, 32);
2023	<	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2022	>	uint8 *x_data = (uint8 *)cursor_image->data;
2023	>	uint8 *x_mask = (uint8 *)cursor_mask_image->data;
2024	>	for (int i = 0; i < 32; i++) {
2025	>	x_mask[i] = MacCursor[4 + i] | MacCursor[36 + i];
2026	>	x_data[i] = MacCursor[4 + i];
2027	>	}
2028		XDisplayLock();
2029		XFreeCursor(x_display, mac_cursor);
2030		XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);

Diff Legend

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