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.21 by gbeauche, 2004-05-10T16:42:37Z vs.
Revision 1.22 by gbeauche, 2004-05-14T08:24:31Z

#	Line 57 | Line 57 | using std::sort;
57
58		// Constants
59		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
60	<	static const bool mac_cursor_enabled = false;   // Flag: Enable MacOS to X11 copy of cursor?
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;
#	Line 506 | 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	<	if (mac_cursor_enabled) {
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;
#	Line 2092 | Line 2092 | void video_set_palette(void)
2092
2093		bool video_can_change_cursor(void)
2094		{
2095	<	return mac_cursor_enabled && (display_type != DIS_SCREEN);
2095	>	return hw_mac_cursor_accl && (display_type != DIS_SCREEN);
2096		}
2097
2098
#	Line 2341 | Line 2341 | static void *redraw_func(void *arg)
2341		update_display();
2342
2343		// Set new cursor image if it was changed
2344	<	if (mac_cursor_enabled && 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