[ViewVC] Diff of: cebix/SheepShaver/src/Unix/video

Comparing SheepShaver/src/Unix/video_x.cpp (file contents):
Revision 1.21 by gbeauche, 2004-05-10T16:42:37Z vs.
Revision 1.31 by gbeauche, 2004-06-30T22:03: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 57 \| Line 58 \| using std::sort;
58
59		// Constants
60		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
61	<	static const bool mac_cursor_enabled = false; // Flag: Enable MacOS to X11 copy of cursor?
61	>	static const bool hw_mac_cursor_accl = true; // Flag: Enable MacOS to X11 copy of cursor?
62
63		// Global variables
64		static int32 frame_skip;
#	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 506 \| Line 510 \| static bool open_window(int width, int h
510		XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
511
512		// Create cursor
513	<	if (mac_cursor_enabled) {
513	>	if (hw_mac_cursor_accl) {
514		cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
515		cursor_image->byte_order = MSBFirst;
516		cursor_image->bitmap_bit_order = MSBFirst;
#	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 1161 \| Line 1177 \| bool VideoInit(void)
1177		if (apple_id != -1)
1178		cur_mode = find_mode(default_mode, apple_id, DIS_SCREEN);
1179		}
1180	<	if (cur_mode == -1)
1181	<	cur_mode = find_mode(default_mode, APPLE_W_640x480, DIS_WINDOW);
1180	>	if (cur_mode == -1) {
1181	>	// pick up first windowed mode available
1182	>	for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
1183	>	if (p->viType == DIS_WINDOW && p->viAppleMode == default_mode) {
1184	>	cur_mode = p - VModes;
1185	>	break;
1186	>	}
1187	>	}
1188	>	}
1189		assert(cur_mode != -1);
1190
1191		#if DEBUG
#	Line 1185 \| 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 1199 \| 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 1477 \| 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;
1483	–	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 1561 \| 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 1577 \| 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 1810 \| Line 1851 \| void NQD_fillrect(uint32 p)
1851		int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1852		int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1853		int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1854	<	uint32 color = ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen);
1854	>	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1855		D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1856		D(bug(" width %d, height %d\n", width, height));
1857		D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
#	Line 1889 \| Line 1930 \| void NQD_bitblt(uint32 p)
1930		uint8 src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y src_row_bytes) + (src_X * bpp));
1931		uint8 dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y dst_row_bytes) + (dest_X * bpp));
1932		for (int i = 0; i < height; i++) {
1933	<	memcpy(dst, src, width);
1933	>	memmove(dst, src, width);
1934		src += src_row_bytes;
1935		dst += dst_row_bytes;
1936		}
#	Line 1900 \| Line 1941 \| void NQD_bitblt(uint32 p)
1941		uint8 src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) src_row_bytes) + (src_X * bpp));
1942		uint8 dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) dst_row_bytes) + (dest_X * bpp));
1943		for (int i = height - 1; i >= 0; i--) {
1944	<	memcpy(dst, src, width);
1944	>	memmove(dst, src, width);
1945		src -= src_row_bytes;
1946		dst -= dst_row_bytes;
1947		}
#	Line 1957 \| Line 1998 \| bool NQD_sync_hook(uint32 arg)
1998
1999		void VideoInstallAccel(void)
2000		{
1960	–	// Temporary hack until it's fixed for e.g. little-endian & 64-bit platforms
1961	–	#ifndef __powerpc__
1962	–	return;
1963	–	#endif
1964	–
2001		// Install acceleration hooks
2002		if (PrefsFindBool("gfxaccel")) {
2003		D(bug("Video: Installing acceleration hooks\n"));
#	Line 2092 \| Line 2128 \| void video_set_palette(void)
2128
2129		bool video_can_change_cursor(void)
2130		{
2131	<	return mac_cursor_enabled && (display_type != DIS_SCREEN);
2131	>	return hw_mac_cursor_accl && (display_type != DIS_SCREEN);
2132		}
2133
2134
#	Line 2276 \| Line 2312 \| *static void redraw_func(void arg)*
2312		int64 ticks = 0;
2313		uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2314
2315	<	for (;;) {
2315	>	while (!redraw_thread_cancel) {
2316
2317		// Pause if requested (during video mode switches)
2318		while (thread_stop_req)
#	Line 2341 \| Line 2377 \| *static void redraw_func(void arg)*
2377		update_display();
2378
2379		// Set new cursor image if it was changed
2380	<	if (mac_cursor_enabled && cursor_changed) {
2380	>	if (hw_mac_cursor_accl && cursor_changed) {
2381		cursor_changed = false;
2382	<	memcpy(cursor_image->data, MacCursor + 4, 32);
2383	<	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2382	>	uint8 x_data = (uint8 )cursor_image->data;
2383	>	uint8 x_mask = (uint8 )cursor_mask_image->data;
2384	>	for (int i = 0; i < 32; i++) {
2385	>	x_mask[i] = MacCursor[4 + i] \| MacCursor[36 + i];
2386	>	x_data[i] = MacCursor[4 + i];
2387	>	}
2388		XDisplayLock();
2389		XFreeCursor(x_display, mac_cursor);
2390		XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);

Diff Legend

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

Comparing SheepShaver/src/Unix/video_x.cpp (file contents): Revision 1.21 by gbeauche, 2004-05-10T16:42:37Z vs. Revision 1.31 by gbeauche, 2004-06-30T22:03:34Z

Diff Legend

Comparing SheepShaver/src/Unix/video_x.cpp (file contents):
Revision 1.21 by gbeauche, 2004-05-10T16:42:37Z vs.
Revision 1.31 by gbeauche, 2004-06-30T22:03:34Z