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.8 by gbeauche, 2003-12-27T10:37:30Z vs.
Revision 1.18 by gbeauche, 2004-04-22T20:57:30Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  SheepShaver (C) 1997-2002 Marc Hellwig and Christian Bauer
4	>	*  SheepShaver (C) 1997-2004 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 29 | Line 29
29		#include <errno.h>
30		#include <pthread.h>
31
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 48 | Line 50
50		#define DEBUG 0
51		#include "debug.h"
52
53	+	#ifndef NO_STD_NAMESPACE
54	+	using std::sort;
55	+	#endif
56	+
57
58		// Constants
59		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
#	Line 57 | Line 63 | static int32 frame_skip;
63		static int16 mouse_wheel_mode;
64		static int16 mouse_wheel_lines;
65		static bool redraw_thread_active = false;       // Flag: Redraw thread installed
66	+	static pthread_attr_t redraw_thread_attr;       // Redraw thread attributes
67		static pthread_t redraw_thread;                         // Redraw thread
68
69		static bool local_X11;                                          // Flag: X server running on local machine?
#	Line 89 | Line 96 | static int screen;                                                     // Screen numbe
96		static int xdepth;                                                      // Depth of X screen
97		static int depth;                                                       // Depth of Mac frame buffer
98		static Window rootwin, the_win;                         // Root window and our window
99	+	static int num_depths = 0;                                      // Number of available X depths
100	+	static int *avail_depths = NULL;                        // List of available X depths
101		static XVisualInfo visualInfo;
102		static Visual *vis;
103	+	static int color_class;
104	+	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
105		static Colormap cmap[2];                                        // Two colormaps (DGA) for 8-bit mode
106	+	static XColor x_palette[256];                           // Color palette to be used as CLUT and gamma table
107	+
108		static XColor black, white;
109		static unsigned long black_pixel, white_pixel;
110		static int eventmask;
111	<	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask;
112	<	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
111	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
112	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
113
114		// Variables for window mode
115		static GC the_gc;
#	Line 113 | Line 126 | static uint8 *the_buffer_copy = NULL;          /
126		static uint32 the_buffer_size;                          // Size of allocated the_buffer
127
128		// Variables for DGA mode
116	–	static char *dga_screen_base;
117	–	static int dga_fb_width;
129		static int current_dga_cmap;
130
131		#ifdef ENABLE_XF86_VIDMODE
#	Line 123 | Line 134 | static XF86VidModeModeInfo **x_video_mod
134		static int num_x_video_modes;
135		#endif
136
137	+	// Mutex to protect palette
138	+	#ifdef HAVE_SPINLOCKS
139	+	static spinlock_t x_palette_lock = SPIN_LOCK_UNLOCKED;
140	+	#define LOCK_PALETTE spin_lock(&x_palette_lock)
141	+	#define UNLOCK_PALETTE spin_unlock(&x_palette_lock)
142	+	#elif defined(HAVE_PTHREADS)
143	+	static pthread_mutex_t x_palette_lock = PTHREAD_MUTEX_INITIALIZER;
144	+	#define LOCK_PALETTE pthread_mutex_lock(&x_palette_lock)
145	+	#define UNLOCK_PALETTE pthread_mutex_unlock(&x_palette_lock)
146	+	#else
147	+	#define LOCK_PALETTE
148	+	#define UNLOCK_PALETTE
149	+	#endif
150	+
151
152		// Prototypes
153		static void *redraw_func(void *arg);
#	Line 135 | Line 160 | extern Display *x_display;
160		// From sys_unix.cpp
161		extern void SysMountFirstFloppy(void);
162
163	+	// From clip_unix.cpp
164	+	extern void ClipboardSelectionClear(XSelectionClearEvent *);
165	+	extern void ClipboardSelectionRequest(XSelectionRequestEvent *);
166	+
167
168		// Video acceleration through SIGSEGV
169		#ifdef ENABLE_VOSF
#	Line 143 | Line 172 | extern void SysMountFirstFloppy(void);
172
173
174		/*
175	+	*  Utility functions
176	+	*/
177	+
178	+	// Get current video mode
179	+	static inline int get_current_mode(void)
180	+	{
181	+	return VModes[cur_mode].viAppleMode;
182	+	}
183	+
184	+	// Find palette size for given color depth
185	+	static int palette_size(int mode)
186	+	{
187	+	switch (mode) {
188	+	case APPLE_1_BIT: return 2;
189	+	case APPLE_2_BIT: return 4;
190	+	case APPLE_4_BIT: return 16;
191	+	case APPLE_8_BIT: return 256;
192	+	case APPLE_16_BIT: return 32;
193	+	case APPLE_32_BIT: return 256;
194	+	default: return 0;
195	+	}
196	+	}
197	+
198	+	// Return bits per pixel for requested depth
199	+	static inline int bytes_per_pixel(int depth)
200	+	{
201	+	int bpp;
202	+	switch (depth) {
203	+	case 8:
204	+	bpp = 1;
205	+	break;
206	+	case 15: case 16:
207	+	bpp = 2;
208	+	break;
209	+	case 24: case 32:
210	+	bpp = 4;
211	+	break;
212	+	default:
213	+	abort();
214	+	}
215	+	return bpp;
216	+	}
217	+
218	+	// Map video_mode depth ID to numerical depth value
219	+	static inline int depth_of_video_mode(int mode)
220	+	{
221	+	int depth;
222	+	switch (mode) {
223	+	case APPLE_1_BIT:
224	+	depth = 1;
225	+	break;
226	+	case APPLE_2_BIT:
227	+	depth = 2;
228	+	break;
229	+	case APPLE_4_BIT:
230	+	depth = 4;
231	+	break;
232	+	case APPLE_8_BIT:
233	+	depth = 8;
234	+	break;
235	+	case APPLE_16_BIT:
236	+	depth = 16;
237	+	break;
238	+	case APPLE_32_BIT:
239	+	depth = 32;
240	+	break;
241	+	default:
242	+	abort();
243	+	}
244	+	return depth;
245	+	}
246	+
247	+	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
248	+	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
249	+	{
250	+	return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift);
251	+	}
252	+
253	+
254	+	// Do we have a visual for handling the specified Mac depth? If so, set the
255	+	// global variables "xdepth", "visualInfo", "vis" and "color_class".
256	+	static bool find_visual_for_depth(int depth)
257	+	{
258	+	D(bug("have_visual_for_depth(%d)\n", depth_of_video_mode(depth)));
259	+
260	+	// 1-bit works always and uses default visual
261	+	if (depth == APPLE_1_BIT) {
262	+	vis = DefaultVisual(x_display, screen);
263	+	visualInfo.visualid = XVisualIDFromVisual(vis);
264	+	int num = 0;
265	+	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
266	+	visualInfo = vi[0];
267	+	XFree(vi);
268	+	xdepth = visualInfo.depth;
269	+	color_class = visualInfo.c_class;
270	+	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
271	+	return true;
272	+	}
273	+
274	+	// Calculate minimum and maximum supported X depth
275	+	int min_depth = 1, max_depth = 32;
276	+	switch (depth) {
277	+	#ifdef ENABLE_VOSF
278	+	case APPLE_2_BIT:
279	+	case APPLE_4_BIT:       // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
280	+	case APPLE_8_BIT:
281	+	min_depth = 8;
282	+	max_depth = 32;
283	+	break;
284	+	#else
285	+	case APPLE_2_BIT:
286	+	case APPLE_4_BIT:       // 2/4-bit requires VOSF blitters
287	+	return false;
288	+	case APPLE_8_BIT:       // 8-bit without VOSF requires an 8-bit visual
289	+	min_depth = 8;
290	+	max_depth = 8;
291	+	break;
292	+	#endif
293	+	case APPLE_16_BIT:      // 16-bit requires a 15/16-bit visual
294	+	min_depth = 15;
295	+	max_depth = 16;
296	+	break;
297	+	case APPLE_32_BIT:      // 32-bit requires a 24/32-bit visual
298	+	min_depth = 24;
299	+	max_depth = 32;
300	+	break;
301	+	}
302	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
303	+
304	+	// Try to find a visual for one of the color depths
305	+	bool visual_found = false;
306	+	for (int i=0; i<num_depths && !visual_found; i++) {
307	+
308	+	xdepth = avail_depths[i];
309	+	D(bug(" trying to find visual for depth %d\n", xdepth));
310	+	if (xdepth < min_depth || xdepth > max_depth)
311	+	continue;
312	+
313	+	// Determine best color class for this depth
314	+	switch (xdepth) {
315	+	case 1: // Try StaticGray or StaticColor
316	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
317	+	|| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
318	+	visual_found = true;
319	+	break;
320	+	case 8: // Need PseudoColor
321	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
322	+	visual_found = true;
323	+	break;
324	+	case 15:
325	+	case 16:
326	+	case 24:
327	+	case 32: // Try DirectColor first, as this will allow gamma correction
328	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
329	+	|| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
330	+	visual_found = true;
331	+	break;
332	+	default:
333	+	D(bug("  not a supported depth\n"));
334	+	break;
335	+	}
336	+	}
337	+	if (!visual_found)
338	+	return false;
339	+
340	+	// Visual was found
341	+	vis = visualInfo.visual;
342	+	color_class = visualInfo.c_class;
343	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
344	+	#if DEBUG
345	+	switch (color_class) {
346	+	case StaticGray: D(bug("StaticGray\n")); break;
347	+	case GrayScale: D(bug("GrayScale\n")); break;
348	+	case StaticColor: D(bug("StaticColor\n")); break;
349	+	case PseudoColor: D(bug("PseudoColor\n")); break;
350	+	case TrueColor: D(bug("TrueColor\n")); break;
351	+	case DirectColor: D(bug("DirectColor\n")); break;
352	+	}
353	+	#endif
354	+	return true;
355	+	}
356	+
357	+
358	+	/*
359		*  Open display (window or fullscreen)
360		*/
361
362	+	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
363	+	static Atom WM_DELETE_WINDOW = (Atom)0;
364	+	static void set_window_delete_protocol(Window w)
365	+	{
366	+	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
367	+	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
368	+	}
369	+
370	+	// Wait until window is mapped/unmapped
371	+	static void wait_mapped(Window w)
372	+	{
373	+	XEvent e;
374	+	do {
375	+	XMaskEvent(x_display, StructureNotifyMask, &e);
376	+	} while ((e.type != MapNotify) || (e.xmap.event != w));
377	+	}
378	+
379	+	static void wait_unmapped(Window w)
380	+	{
381	+	XEvent e;
382	+	do {
383	+	XMaskEvent(x_display, StructureNotifyMask, &e);
384	+	} while ((e.type != UnmapNotify) || (e.xmap.event != w));
385	+	}
386	+
387		// Trap SHM errors
388		static bool shm_error = false;
389		static int (*old_error_handler)(Display *, XErrorEvent *);
#	Line 171 | Line 409 | static bool open_window(int width, int h
409		// Create window
410		XSetWindowAttributes wattr;
411		wattr.event_mask = eventmask = win_eventmask;
412	<	wattr.background_pixel = black_pixel;
413	<	wattr.border_pixel = black_pixel;
412	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
413	>	wattr.border_pixel = 0;
414		wattr.backing_store = NotUseful;
415	<
178	<	XSync(x_display, false);
415	>	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
416		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
417	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWBackingStore, &wattr);
418	<	XSync(x_display, false);
417	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWBackingStore | CWColormap, &wattr);
418	>
419	>	// Set window name
420		XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
183	–	XMapRaised(x_display, the_win);
184	–	XSync(x_display, false);
421
422	<	// Set colormap
423	<	if (depth == 8) {
188	<	XSetWindowColormap(x_display, the_win, cmap[0]);
189	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
190	<	}
422	>	// Set delete protocol property
423	>	set_window_delete_protocol(the_win);
424
425		// Make window unresizable
426		XSizeHints *hints;
#	Line 201 | Line 434 | static bool open_window(int width, int h
434		XFree((char *)hints);
435		}
436
437	+	// Show window
438	+	XMapWindow(x_display, the_win);
439	+	wait_mapped(the_win);
440	+
441		// 1-bit mode is big-endian; if the X server is little-endian, we can't
442		// use SHM because that doesn't allow changing the image byte order
443		bool need_msb_image = (depth == 1 && XImageByteOrder(x_display) == LSBFirst);
#	Line 211 | Line 448 | static bool open_window(int width, int h
448
449		// Create SHM image ("height + 2" for safety)
450		img = XShmCreateImage(x_display, vis, depth == 1 ? 1 : xdepth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
451	<	shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
451	>	shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
452	>	D(bug(" shm image created\n"));
453		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
454		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
455		shminfo.readOnly = False;
#	Line 230 | Line 468 | static bool open_window(int width, int h
468		have_shm = true;
469		shmctl(shminfo.shmid, IPC_RMID, 0);
470		}
471	+	D(bug(" shm image attached\n"));
472		}
473
474		// Create normal X image if SHM doesn't work ("height + 2" for safety)
475		if (!have_shm) {
476	<	int bytes_per_row = aligned_width;
238	<	switch (depth) {
239	<	case 1:
240	<	bytes_per_row /= 8;
241	<	break;
242	<	case 15:
243	<	case 16:
244	<	bytes_per_row *= 2;
245	<	break;
246	<	case 24:
247	<	case 32:
248	<	bytes_per_row *= 4;
249	<	break;
250	<	}
476	>	int bytes_per_row = depth == 1 ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth));
477		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
478		img = XCreateImage(x_display, vis, depth == 1 ? 1 : xdepth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
479	+	D(bug(" X image created\n"));
480		}
481
482		// 1-Bit mode is big-endian
483	<	if (depth == 1) {
483	>	if (need_msb_image) {
484		img->byte_order = MSBFirst;
485		img->bitmap_bit_order = MSBFirst;
486		}
#	Line 275 | Line 502 | static bool open_window(int width, int h
502
503		// Create GC
504		the_gc = XCreateGC(x_display, the_win, 0, 0);
505	<	XSetForeground(x_display, the_gc, black_pixel);
505	>	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
506
507		// Create cursor
508		cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
#	Line 303 | Line 530 | static bool open_window(int width, int h
530		#endif
531
532		// Set bytes per row
306	–	VModes[cur_mode].viRowBytes = img->bytes_per_line;
533		XSync(x_display, false);
534		return true;
535		}
#	Line 315 | Line 541 | static bool open_dga(int width, int heig
541		// Set relative mouse mode
542		ADBSetRelMouseMode(true);
543
544	+	// Create window
545	+	XSetWindowAttributes wattr;
546	+	wattr.event_mask = eventmask = dga_eventmask;
547	+	wattr.override_redirect = True;
548	+	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
549	+	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
550	+	InputOutput, vis, CWEventMask | CWOverrideRedirect |
551	+	(color_class == DirectColor ? CWColormap : 0), &wattr);
552	+
553	+	// Show window
554	+	XMapRaised(x_display, the_win);
555	+	wait_mapped(the_win);
556	+
557		#ifdef ENABLE_XF86_VIDMODE
558		// Switch to best mode
559		if (has_vidmode) {
#	Line 331 | Line 570 | static bool open_dga(int width, int heig
570		#endif
571
572		// Establish direct screen connection
573	+	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
574	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
575		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
576		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
577	+
578	+	int v_width, v_bank, v_size;
579	+	XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
580		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
581		XF86DGASetViewPort(x_display, screen, 0, 0);
582		XF86DGASetVidPage(x_display, screen, 0);
583
584		// Set colormap
585	<	if (depth == 8)
585	>	if (!IsDirectMode(get_current_mode())) {
586	>	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
587		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
343	–
344	–	// Set bytes per row
345	–	int bytes_per_row = (dga_fb_width + 7) & ~7;
346	–	switch (depth) {
347	–	case 15:
348	–	case 16:
349	–	bytes_per_row *= 2;
350	–	break;
351	–	case 24:
352	–	case 32:
353	–	bytes_per_row *= 4;
354	–	break;
588		}
589	+	XSync(x_display, false);
590
591	+	// Init blitting routines
592	+	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, DepthModeForPixelDepth(depth));
593		#if ENABLE_VOSF
594		bool native_byte_order;
595		#ifdef WORDS_BIGENDIAN
#	Line 372 | Line 608 | static bool open_dga(int width, int heig
608		the_buffer_size = page_extend((height + 2) * bytes_per_row);
609		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
610		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
611	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
612		}
613		#else
614		use_vosf = false;
378	–	the_buffer = dga_screen_base;
615		#endif
616		#endif
381	–	screen_base = (uint32)the_buffer;
617
618	+	// Set frame buffer base
619	+	D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
620	+	screen_base = (uint32)the_buffer;
621		VModes[cur_mode].viRowBytes = bytes_per_row;
384	–	XSync(x_display, false);
622		return true;
623		#else
624		ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
#	Line 391 | Line 628 | static bool open_dga(int width, int heig
628
629		static bool open_display(void)
630		{
631	<	display_type = VModes[cur_mode].viType;
632	<	switch (VModes[cur_mode].viAppleMode) {
633	<	case APPLE_1_BIT:
634	<	depth = 1;
635	<	break;
636	<	case APPLE_2_BIT:
637	<	depth = 2;
638	<	break;
639	<	case APPLE_4_BIT:
640	<	depth = 4;
641	<	break;
642	<	case APPLE_8_BIT:
643	<	depth = 8;
644	<	break;
645	<	case APPLE_16_BIT:
646	<	depth = xdepth == 15 ? 15 : 16;
647	<	break;
648	<	case APPLE_32_BIT:
649	<	depth = 32;
650	<	break;
631	>	D(bug("open_display()\n"));
632	>	const VideoInfo &mode = VModes[cur_mode];
633	>
634	>	// Find best available X visual
635	>	if (!find_visual_for_depth(mode.viAppleMode)) {
636	>	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
637	>	return false;
638	>	}
639	>
640	>	// Create color maps
641	>	if (color_class == PseudoColor || color_class == DirectColor) {
642	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
643	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
644	>	} else {
645	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
646	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
647	>	}
648	>
649	>	// Find pixel format of direct modes
650	>	if (color_class == DirectColor || color_class == TrueColor) {
651	>	rshift = gshift = bshift = 0;
652	>	rloss = gloss = bloss = 8;
653	>	uint32 mask;
654	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
655	>	++rshift;
656	>	for (; mask&1; mask>>=1)
657	>	--rloss;
658	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
659	>	++gshift;
660	>	for (; mask&1; mask>>=1)
661	>	--gloss;
662	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
663	>	++bshift;
664	>	for (; mask&1; mask>>=1)
665	>	--bloss;
666	>	}
667	>
668	>	// Preset palette pixel values for CLUT or gamma table
669	>	if (color_class == DirectColor) {
670	>	int num = vis->map_entries;
671	>	for (int i=0; i<num; i++) {
672	>	int c = (i * 256) / num;
673	>	x_palette[i].pixel = map_rgb(c, c, c);
674	>	x_palette[i].flags = DoRed | DoGreen | DoBlue;
675	>	}
676	>	} else if (color_class == PseudoColor) {
677	>	for (int i=0; i<256; i++) {
678	>	x_palette[i].pixel = i;
679	>	x_palette[i].flags = DoRed | DoGreen | DoBlue;
680	>	}
681		}
682
683	+	// Load gray ramp to color map
684	+	int num = (color_class == DirectColor ? vis->map_entries : 256);
685	+	for (int i=0; i<num; i++) {
686	+	int c = (i * 256) / num;
687	+	x_palette[i].red = c * 0x0101;
688	+	x_palette[i].green = c * 0x0101;
689	+	x_palette[i].blue = c * 0x0101;
690	+	}
691	+	if (color_class == PseudoColor || color_class == DirectColor) {
692	+	XStoreColors(x_display, cmap[0], x_palette, num);
693	+	XStoreColors(x_display, cmap[1], x_palette, num);
694	+	}
695	+
696	+	#ifdef ENABLE_VOSF
697	+	// Load gray ramp to 8->16/32 expand map
698	+	if (!IsDirectMode(get_current_mode()) && xdepth > 8)
699	+	for (int i=0; i<256; i++)
700	+	ExpandMap[i] = map_rgb(i, i, i);
701	+	#endif
702	+
703	+	// Create display of requested type
704	+	display_type = mode.viType;
705	+	depth = depth_of_video_mode(mode.viAppleMode);
706	+
707		bool display_open = false;
708		if (display_type == DIS_SCREEN)
709		display_open = open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
#	Line 460 | Line 751 | static void close_window(void)
751		if (the_gc)
752		XFreeGC(x_display, the_gc);
753
754	<	// Close window
755	<	XDestroyWindow(x_display, the_win);
754	>	XFlush(x_display);
755	>	XSync(x_display, false);
756		}
757
758		// Close DGA mode
#	Line 497 | Line 788 | static void close_display(void)
788		else if (display_type == DIS_WINDOW)
789		close_window();
790
791	+	// Close window
792	+	if (the_win) {
793	+	XUnmapWindow(x_display, the_win);
794	+	wait_unmapped(the_win);
795	+	XDestroyWindow(x_display, the_win);
796	+	}
797	+
798	+	// Free colormaps
799	+	if (cmap[0]) {
800	+	XFreeColormap(x_display, cmap[0]);
801	+	cmap[0] = 0;
802	+	}
803	+	if (cmap[1]) {
804	+	XFreeColormap(x_display, cmap[1]);
805	+	cmap[1] = 0;
806	+	}
807	+
808		#ifdef ENABLE_VOSF
809		if (use_vosf) {
810		// Deinitialize VOSF
#	Line 603 | Line 911 | static void keycode_init(void)
911		}
912		}
913
914	<	static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, long apple_mode, long apple_id, int type)
914	>	// Find Apple mode matching best specified dimensions
915	>	static int find_apple_resolution(int xsize, int ysize)
916	>	{
917	>	int apple_id;
918	>	if (xsize < 800)
919	>	apple_id = APPLE_640x480;
920	>	else if (xsize < 1024)
921	>	apple_id = APPLE_800x600;
922	>	else if (xsize < 1152)
923	>	apple_id = APPLE_1024x768;
924	>	else if (xsize < 1280) {
925	>	if (ysize < 900)
926	>	apple_id = APPLE_1152x768;
927	>	else
928	>	apple_id = APPLE_1152x900;
929	>	}
930	>	else if (xsize < 1600)
931	>	apple_id = APPLE_1280x1024;
932	>	else
933	>	apple_id = APPLE_1600x1200;
934	>	return apple_id;
935	>	}
936	>
937	>	// Find mode in list of supported modes
938	>	static int find_mode(int apple_mode, int apple_id, int type)
939	>	{
940	>	for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
941	>	if (p->viType == type && p->viAppleID == apple_id && p->viAppleMode == apple_mode)
942	>	return p - VModes;
943	>	}
944	>	return -1;
945	>	}
946	>
947	>	// Add mode to list of supported modes
948	>	static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, int apple_mode, int apple_id, int type)
949		{
950		if (allow & test) {
951		p->viType = type;
#	Line 622 | Line 964 | static void add_mode(VideoInfo *&p, uint
964		p->viXsize = 1024;
965		p->viYsize = 768;
966		break;
967	+	case APPLE_1152x768:
968	+	p->viXsize = 1152;
969	+	p->viYsize = 768;
970	+	break;
971		case APPLE_1152x900:
972		p->viXsize = 1152;
973		p->viYsize = 900;
#	Line 635 | Line 981 | static void add_mode(VideoInfo *&p, uint
981		p->viYsize = 1200;
982		break;
983		}
984	<	switch (apple_mode) {
639	<	case APPLE_8_BIT:
640	<	p->viRowBytes = p->viXsize;
641	<	break;
642	<	case APPLE_16_BIT:
643	<	p->viRowBytes = p->viXsize * 2;
644	<	break;
645	<	case APPLE_32_BIT:
646	<	p->viRowBytes = p->viXsize * 4;
647	<	break;
648	<	}
984	>	p->viRowBytes = TrivialBytesPerRow(p->viXsize, apple_mode);
985		p->viAppleMode = apple_mode;
986		p->viAppleID = apple_id;
987		p++;
988		}
989		}
990
991	+	// Add standard list of windowed modes for given color depth
992	+	static void add_window_modes(VideoInfo *&p, int window_modes, int mode)
993	+	{
994	+	add_mode(p, window_modes, 1, mode, APPLE_W_640x480, DIS_WINDOW);
995	+	add_mode(p, window_modes, 2, mode, APPLE_W_800x600, DIS_WINDOW);
996	+	}
997	+
998		static bool has_mode(int x, int y)
999		{
1000		#ifdef ENABLE_XF86_VIDMODE
#	Line 690 | Line 1033 | bool VideoInit(void)
1033
1034		// Init variables
1035		private_data = NULL;
693	–	cur_mode = 0;   // Window 640x480
1036		video_activated = true;
1037
1038		// Find screen and root window
1039		screen = XDefaultScreen(x_display);
1040		rootwin = XRootWindow(x_display, screen);
1041
1042	+	// Get sorted list of available depths
1043	+	avail_depths = XListDepths(x_display, screen, &num_depths);
1044	+	if (avail_depths == NULL) {
1045	+	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1046	+	return false;
1047	+	}
1048	+	sort(avail_depths, avail_depths + num_depths);
1049	+
1050		// Get screen depth
1051		xdepth = DefaultDepth(x_display, screen);
1052
#	Line 727 | Line 1077 | bool VideoInit(void)
1077		black_pixel = BlackPixel(x_display, screen);
1078		white_pixel = WhitePixel(x_display, screen);
1079
730	–	// Get appropriate visual
731	–	int color_class;
732	–	switch (xdepth) {
733	–	#if 0
734	–	case 1:
735	–	color_class = StaticGray;
736	–	break;
737	–	#endif
738	–	case 8:
739	–	color_class = PseudoColor;
740	–	break;
741	–	case 15:
742	–	case 16:
743	–	case 24:
744	–	case 32:
745	–	color_class = TrueColor;
746	–	break;
747	–	default:
748	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
749	–	return false;
750	–	}
751	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
752	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
753	–	return false;
754	–	}
755	–	if (visualInfo.depth != xdepth) {
756	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
757	–	return false;
758	–	}
759	–	vis = visualInfo.visual;
760	–
1080		// Mac screen depth follows X depth (for now)
1081	<	depth = xdepth;
1082	<
1083	<	// Create color maps for 8 bit mode
1084	<	if (depth == 8) {
1085	<	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1086	<	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1087	<	XInstallColormap(x_display, cmap[0]);
1088	<	XInstallColormap(x_display, cmap[1]);
1081	>	int default_mode = APPLE_8_BIT;
1082	>	switch (DefaultDepth(x_display, screen)) {
1083	>	case 1:
1084	>	default_mode = APPLE_1_BIT;
1085	>	break;
1086	>	case 8:
1087	>	default_mode = APPLE_8_BIT;
1088	>	break;
1089	>	case 15: case 16:
1090	>	default_mode = APPLE_16_BIT;
1091	>	break;
1092	>	case 24: case 32:
1093	>	default_mode = APPLE_32_BIT;
1094	>	break;
1095		}
1096
1097		// Construct video mode table
773	–	int mode = APPLE_8_BIT;
774	–	int bpr_mult = 8;
775	–	switch (depth) {
776	–	case 1:
777	–	mode = APPLE_1_BIT;
778	–	bpr_mult = 1;
779	–	break;
780	–	case 8:
781	–	mode = APPLE_8_BIT;
782	–	bpr_mult = 8;
783	–	break;
784	–	case 15:
785	–	case 16:
786	–	mode = APPLE_16_BIT;
787	–	bpr_mult = 16;
788	–	break;
789	–	case 24:
790	–	case 32:
791	–	mode = APPLE_32_BIT;
792	–	bpr_mult = 32;
793	–	break;
794	–	}
795	–
1098		uint32 window_modes = PrefsFindInt32("windowmodes");
1099		uint32 screen_modes = PrefsFindInt32("screenmodes");
1100		if (!has_dga)
#	Line 801 | Line 1103 | bool VideoInit(void)
1103		window_modes |= 3;      // Allow at least 640x480 and 800x600 window modes
1104
1105		VideoInfo *p = VModes;
1106	<	add_mode(p, window_modes, 1, mode, APPLE_W_640x480, DIS_WINDOW);
1107	<	add_mode(p, window_modes, 2, mode, APPLE_W_800x600, DIS_WINDOW);
1106	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1107	>	if (find_visual_for_depth(d))
1108	>	add_window_modes(p, window_modes, d);
1109	>
1110		if (has_vidmode) {
1111		if (has_mode(640, 480))
1112	<	add_mode(p, screen_modes, 1, mode, APPLE_640x480, DIS_SCREEN);
1112	>	add_mode(p, screen_modes, 1, default_mode, APPLE_640x480, DIS_SCREEN);
1113		if (has_mode(800, 600))
1114	<	add_mode(p, screen_modes, 2, mode, APPLE_800x600, DIS_SCREEN);
1114	>	add_mode(p, screen_modes, 2, default_mode, APPLE_800x600, DIS_SCREEN);
1115		if (has_mode(1024, 768))
1116	<	add_mode(p, screen_modes, 4, mode, APPLE_1024x768, DIS_SCREEN);
1116	>	add_mode(p, screen_modes, 4, default_mode, APPLE_1024x768, DIS_SCREEN);
1117	>	if (has_mode(1152, 768))
1118	>	add_mode(p, screen_modes, 64, default_mode, APPLE_1152x768, DIS_SCREEN);
1119		if (has_mode(1152, 900))
1120	<	add_mode(p, screen_modes, 8, mode, APPLE_1152x900, DIS_SCREEN);
1120	>	add_mode(p, screen_modes, 8, default_mode, APPLE_1152x900, DIS_SCREEN);
1121		if (has_mode(1280, 1024))
1122	<	add_mode(p, screen_modes, 16, mode, APPLE_1280x1024, DIS_SCREEN);
1122	>	add_mode(p, screen_modes, 16, default_mode, APPLE_1280x1024, DIS_SCREEN);
1123		if (has_mode(1600, 1200))
1124	<	add_mode(p, screen_modes, 32, mode, APPLE_1600x1200, DIS_SCREEN);
1124	>	add_mode(p, screen_modes, 32, default_mode, APPLE_1600x1200, DIS_SCREEN);
1125		} else if (screen_modes) {
1126		int xsize = DisplayWidth(x_display, screen);
1127		int ysize = DisplayHeight(x_display, screen);
1128	<	int apple_id;
823	<	if (xsize < 800)
824	<	apple_id = APPLE_640x480;
825	<	else if (xsize < 1024)
826	<	apple_id = APPLE_800x600;
827	<	else if (xsize < 1152)
828	<	apple_id = APPLE_1024x768;
829	<	else if (xsize < 1280)
830	<	apple_id = APPLE_1152x900;
831	<	else if (xsize < 1600)
832	<	apple_id = APPLE_1280x1024;
833	<	else
834	<	apple_id = APPLE_1600x1200;
1128	>	int apple_id = find_apple_resolution(xsize, ysize);
1129		p->viType = DIS_SCREEN;
1130		p->viRowBytes = 0;
1131		p->viXsize = xsize;
1132		p->viYsize = ysize;
1133	<	p->viAppleMode = mode;
1133	>	p->viAppleMode = default_mode;
1134		p->viAppleID = apple_id;
1135		p++;
1136		}
#	Line 846 | Line 1140 | bool VideoInit(void)
1140		p->viAppleMode = 0;
1141		p->viAppleID = 0;
1142
1143	<	#ifdef ENABLE_XF86_DGA
1143	>	// Find default mode (window 640x480)
1144	>	cur_mode = -1;
1145		if (has_dga && screen_modes) {
1146	<	int v_bank, v_size;
1147	<	XF86DGAGetVideo(x_display, screen, &dga_screen_base, &dga_fb_width, &v_bank, &v_size);
1148	<	D(bug("DGA screen_base %p, v_width %d\n", dga_screen_base, dga_fb_width));
1146	>	int screen_width = DisplayWidth(x_display, screen);
1147	>	int screen_height = DisplayHeight(x_display, screen);
1148	>	int apple_id = find_apple_resolution(screen_width, screen_height);
1149	>	if (apple_id != -1)
1150	>	cur_mode = find_mode(default_mode, apple_id, DIS_SCREEN);
1151	>	}
1152	>	if (cur_mode == -1)
1153	>	cur_mode = find_mode(default_mode, APPLE_W_640x480, DIS_WINDOW);
1154	>	assert(cur_mode != -1);
1155	>
1156	>	#if DEBUG
1157	>	D(bug("Available video modes:\n"));
1158	>	for (p = VModes; p->viType != DIS_INVALID; p++) {
1159	>	int bits = depth_of_video_mode(p->viAppleMode);
1160	>	D(bug(" %dx%d (ID %02x), %d colors\n", p->viXsize, p->viYsize, p->viAppleID, 1 << bits));
1161		}
1162		#endif
1163
#	Line 865 | Line 1172 | bool VideoInit(void)
1172
1173		// Start periodic thread
1174		XSync(x_display, false);
1175	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1175	>	Set_pthread_attr(&redraw_thread_attr, 0);
1176	>	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1177		D(bug("Redraw thread installed (%ld)\n", redraw_thread));
1178		return true;
1179		}
#	Line 897 | Line 1205 | void VideoExit(void)
1205		close_display();
1206		XFlush(x_display);
1207		XSync(x_display, false);
900	–	if (depth == 8) {
901	–	XFreeColormap(x_display, cmap[0]);
902	–	XFreeColormap(x_display, cmap[1]);
903	–	}
1208		}
1209		}
1210
#	Line 964 | Line 1268 | static void resume_emul(void)
1268		// Reopen full screen display
1269		XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1270		XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1271	+	#ifdef ENABLE_XF86_DGA
1272		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1273		XF86DGASetViewPort(x_display, screen, 0, 0);
1274	+	#endif
1275		XSync(x_display, false);
1276
1277		// the_buffer already contains the data to restore. i.e. since a temporary
#	Line 1181 | Line 1487 | static void handle_events(void)
1487		for (;;) {
1488		XEvent event;
1489
1490	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1490	>	XDisplayLock();
1491	>	if (!XCheckMaskEvent(x_display, eventmask, &event)) {
1492	>	// Handle clipboard events
1493	>	if (XCheckTypedEvent(x_display, SelectionRequest, &event))
1494	>	ClipboardSelectionRequest(&event.xselectionrequest);
1495	>	else if (XCheckTypedEvent(x_display, SelectionClear, &event))
1496	>	ClipboardSelectionClear(&event.xselectionclear);
1497	>
1498	>	// Window "close" widget clicked
1499	>	else if (XCheckTypedEvent(x_display, ClientMessage, &event)) {
1500	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1501	>	ADBKeyDown(0x7f);       // Power key
1502	>	ADBKeyUp(0x7f);
1503	>	}
1504	>	}
1505	>
1506	>	XDisplayUnlock();
1507		break;
1508	+	}
1509	+	XDisplayUnlock();
1510
1511		switch (event.type) {
1512		// Mouse button
#	Line 1212 | Line 1536 | static void handle_events(void)
1536		break;
1537		}
1538
1539	<	// Mouse moved
1539	>	// Mouse entered window
1540		case EnterNotify:
1541	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1541	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
1542	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1543		break;
1544	+
1545	+	// Mouse moved
1546		case MotionNotify:
1547	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1547	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1548		break;
1549
1550		// Keyboard
#	Line 1284 | Line 1611 | void VideoVBL(void)
1611		*  Install graphics acceleration
1612		*/
1613
1614	<	#if 0
1615	<	// Rectangle blitting
1616	<	static void accl_bitblt(accl_params *p)
1614	>	// Rectangle inversion
1615	>	template< int bpp >
1616	>	static inline void do_invrect(uint8 *dest, uint32 length)
1617		{
1618	<	D(bug("accl_bitblt\n"));
1618	>	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1619	>	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1620	>	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1621	>	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1622
1623	<	// Get blitting parameters
1624	<	int16 src_X = p->src_rect[1] - p->src_bounds[1];
1625	<	int16 src_Y = p->src_rect[0] - p->src_bounds[0];
1626	<	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1627	<	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1628	<	int16 width = p->dest_rect[3] - p->dest_rect[1] - 1;
1299	<	int16 height = p->dest_rect[2] - p->dest_rect[0] - 1;
1300	<	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1301	<	D(bug(" width %d, height %d\n", width, height));
1623	>	#ifndef UNALIGNED_PROFITABLE
1624	>	// Align on 16-bit boundaries
1625	>	if (bpp < 16 && (((uintptr)dest) & 1)) {
1626	>	INVERT_1(dest, 0);
1627	>	dest += 1; length -= 1;
1628	>	}
1629
1630	<	// And perform the blit
1631	<	bitblt_hook(src_X, src_Y, dest_X, dest_Y, width, height);
1632	<	}
1630	>	// Align on 32-bit boundaries
1631	>	if (bpp < 32 && (((uintptr)dest) & 2)) {
1632	>	INVERT_2(dest, 0);
1633	>	dest += 2; length -= 2;
1634	>	}
1635	>	#endif
1636
1637	<	static bool accl_bitblt_hook(accl_params *p)
1638	<	{
1639	<	D(bug("accl_draw_hook %p\n", p));
1637	>	// Invert 8-byte words
1638	>	if (length >= 8) {
1639	>	const int r = (length / 8) % 8;
1640	>	dest += r * 8;
1641
1642	<	// Check if we can accelerate this bitblt
1643	<	if (p->src_base_addr == screen_base && p->dest_base_addr == screen_base &&
1644	<	display_type == DIS_SCREEN && bitblt_hook != NULL &&
1645	<	((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
1646	<	((uint32 *)p)[0x130 >> 2] == 0 &&
1647	<	p->transfer_mode == 0 &&
1648	<	p->src_row_bytes > 0 && ((uint32 *)p)[0x15c >> 2] > 0) {
1642	>	int n = ((length / 8) + 7) / 8;
1643	>	switch (r) {
1644	>	case 0: do {
1645	>	dest += 64;
1646	>	INVERT_8(dest, -8);
1647	>	case 7: INVERT_8(dest, -7);
1648	>	case 6: INVERT_8(dest, -6);
1649	>	case 5: INVERT_8(dest, -5);
1650	>	case 4: INVERT_8(dest, -4);
1651	>	case 3: INVERT_8(dest, -3);
1652	>	case 2: INVERT_8(dest, -2);
1653	>	case 1: INVERT_8(dest, -1);
1654	>	} while (--n > 0);
1655	>	}
1656	>	}
1657
1658	<	// Yes, set function pointer
1659	<	p->draw_proc = accl_bitblt;
1660	<	return true;
1658	>	// 32-bit cell to invert?
1659	>	if (length & 4) {
1660	>	INVERT_4(dest, 0);
1661	>	if (bpp <= 16)
1662	>	dest += 4;
1663		}
1664	<	return false;
1664	>
1665	>	// 16-bit cell to invert?
1666	>	if (bpp <= 16 && (length & 2)) {
1667	>	INVERT_2(dest, 0);
1668	>	if (bpp <= 8)
1669	>	dest += 2;
1670	>	}
1671	>
1672	>	// 8-bit cell to invert?
1673	>	if (bpp <= 8 && (length & 1))
1674	>	INVERT_1(dest, 0);
1675	>
1676	>	#undef INVERT_1
1677	>	#undef INVERT_2
1678	>	#undef INVERT_4
1679	>	#undef INVERT_8
1680		}
1681
1682	<	// Rectangle filling/inversion
1327	<	static void accl_fillrect8(accl_params *p)
1682	>	void NQD_invrect(uint32 arg)
1683		{
1684	<	D(bug("accl_fillrect8\n"));
1684	>	D(bug("accl_invrect %08x\n", arg));
1685	>	accl_params *p = (accl_params *)arg;
1686
1687	<	// Get filling parameters
1687	>	// Get inversion parameters
1688		int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1689		int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1690	<	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1691	<	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1336	<	uint8 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1690	>	int16 width  = p->dest_rect[3] - p->dest_rect[1];
1691	>	int16 height = p->dest_rect[2] - p->dest_rect[0];
1692		D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1693	<	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1693	>	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, p->dest_row_bytes));
1694
1695	<	// And perform the fill
1696	<	fillrect8_hook(dest_X, dest_Y, dest_X_max, dest_Y_max, color);
1695	>	//!!?? pen_mode == 14
1696	>
1697	>	// And perform the inversion
1698	>	const int bpp = bytes_per_pixel(p->dest_pixel_size);
1699	>	const int dest_row_bytes = p->dest_row_bytes;
1700	>	uint8 *dest = (uint8 *)(p->dest_base_addr + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1701	>	width *= bpp;
1702	>	switch (bpp) {
1703	>	case 1:
1704	>	for (int i = 0; i < height; i++) {
1705	>	do_invrect<8>(dest, width);
1706	>	dest += dest_row_bytes;
1707	>	}
1708	>	break;
1709	>	case 2:
1710	>	for (int i = 0; i < height; i++) {
1711	>	do_invrect<16>(dest, width);
1712	>	dest += dest_row_bytes;
1713	>	}
1714	>	break;
1715	>	case 4:
1716	>	for (int i = 0; i < height; i++) {
1717	>	do_invrect<32>(dest, width);
1718	>	dest += dest_row_bytes;
1719	>	}
1720	>	break;
1721	>	}
1722		}
1723
1724	<	static void accl_fillrect32(accl_params *p)
1724	>	// Rectangle filling
1725	>	template< int bpp >
1726	>	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1727		{
1728	<	D(bug("accl_fillrect32\n"));
1728	>	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1729	>	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1730	>	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1731	>	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1732
1733	<	// Get filling parameters
1734	<	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1735	<	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1736	<	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1737	<	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1738	<	uint32 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1354	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1355	<	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1733	>	#ifndef UNALIGNED_PROFITABLE
1734	>	// Align on 16-bit boundaries
1735	>	if (bpp < 16 && (((uintptr)dest) & 1)) {
1736	>	FILL_1(dest, 0, color);
1737	>	dest += 1; length -= 1;
1738	>	}
1739
1740	<	// And perform the fill
1741	<	fillrect32_hook(dest_X, dest_Y, dest_X_max, dest_Y_max, color);
1740	>	// Align on 32-bit boundaries
1741	>	if (bpp < 32 && (((uintptr)dest) & 2)) {
1742	>	FILL_2(dest, 0, color);
1743	>	dest += 2; length -= 2;
1744	>	}
1745	>	#endif
1746	>
1747	>	// Fill 8-byte words
1748	>	if (length >= 8) {
1749	>	const uint64 c = (((uint64)color) << 32) | color;
1750	>	const int r = (length / 8) % 8;
1751	>	dest += r * 8;
1752	>
1753	>	int n = ((length / 8) + 7) / 8;
1754	>	switch (r) {
1755	>	case 0: do {
1756	>	dest += 64;
1757	>	FILL_8(dest, -8, c);
1758	>	case 7: FILL_8(dest, -7, c);
1759	>	case 6: FILL_8(dest, -6, c);
1760	>	case 5: FILL_8(dest, -5, c);
1761	>	case 4: FILL_8(dest, -4, c);
1762	>	case 3: FILL_8(dest, -3, c);
1763	>	case 2: FILL_8(dest, -2, c);
1764	>	case 1: FILL_8(dest, -1, c);
1765	>	} while (--n > 0);
1766	>	}
1767	>	}
1768	>
1769	>	// 32-bit cell to fill?
1770	>	if (length & 4) {
1771	>	FILL_4(dest, 0, color);
1772	>	if (bpp <= 16)
1773	>	dest += 4;
1774	>	}
1775	>
1776	>	// 16-bit cell to fill?
1777	>	if (bpp <= 16 && (length & 2)) {
1778	>	FILL_2(dest, 0, color);
1779	>	if (bpp <= 8)
1780	>	dest += 2;
1781	>	}
1782	>
1783	>	// 8-bit cell to fill?
1784	>	if (bpp <= 8 && (length & 1))
1785	>	FILL_1(dest, 0, color);
1786	>
1787	>	#undef FILL_1
1788	>	#undef FILL_2
1789	>	#undef FILL_4
1790	>	#undef FILL_8
1791		}
1792
1793	<	static void accl_invrect(accl_params *p)
1793	>	void NQD_fillrect(uint32 arg)
1794		{
1795	<	D(bug("accl_invrect\n"));
1795	>	D(bug("accl_fillrect %08x\n", arg));
1796	>	accl_params *p = (accl_params *)arg;
1797
1798	<	// Get inversion parameters
1798	>	// Get filling parameters
1799		int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1800		int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1801	<	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1802	<	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1801	>	int16 width  = p->dest_rect[3] - p->dest_rect[1];
1802	>	int16 height = p->dest_rect[2] - p->dest_rect[0];
1803	>	uint32 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1804		D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1805	<	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1806	<
1373	<	//!!?? pen_mode == 14
1805	>	D(bug(" width %d, height %d\n", width, height));
1806	>	D(bug(" bytes_per_row %d color %08x\n", p->dest_row_bytes, color));
1807
1808	<	// And perform the inversion
1809	<	invrect_hook(dest_X, dest_Y, dest_X_max, dest_Y_max);
1808	>	// And perform the fill
1809	>	const int bpp = bytes_per_pixel(p->dest_pixel_size);
1810	>	const int dest_row_bytes = p->dest_row_bytes;
1811	>	uint8 *dest = (uint8 *)(p->dest_base_addr + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1812	>	width *= bpp;
1813	>	switch (bpp) {
1814	>	case 1:
1815	>	for (int i = 0; i < height; i++) {
1816	>	memset(dest, color, width);
1817	>	dest += dest_row_bytes;
1818	>	}
1819	>	break;
1820	>	case 2:
1821	>	for (int i = 0; i < height; i++) {
1822	>	do_fillrect<16>(dest, color, width);
1823	>	dest += dest_row_bytes;
1824	>	}
1825	>	break;
1826	>	case 4:
1827	>	for (int i = 0; i < height; i++) {
1828	>	do_fillrect<32>(dest, color, width);
1829	>	dest += dest_row_bytes;
1830	>	}
1831	>	break;
1832	>	}
1833		}
1834
1835	<	static bool accl_fillrect_hook(accl_params *p)
1835	>	bool NQD_fillrect_hook(uint32 arg)
1836		{
1837	<	D(bug("accl_fillrect_hook %p\n", p));
1837	>	D(bug("accl_fillrect_hook %08x\n", arg));
1838	>	accl_params *p = (accl_params *)arg;
1839
1840		// Check if we can accelerate this fillrect
1841	<	if (p->dest_base_addr == screen_base && ((uint32 *)p)[0x284 >> 2] != 0 && display_type == DIS_SCREEN) {
1841	>	if (((uint32 *)p)[0x284 >> 2] != 0 && p->dest_pixel_size >= 8) {
1842		if (p->transfer_mode == 8) {
1843		// Fill
1844	<	if (p->dest_pixel_size == 8 && fillrect8_hook != NULL) {
1845	<	p->draw_proc = accl_fillrect8;
1846	<	return true;
1847	<	} else if (p->dest_pixel_size == 32 && fillrect32_hook != NULL) {
1391	<	p->draw_proc = accl_fillrect32;
1392	<	return true;
1393	<	}
1394	<	} else if (p->transfer_mode == 10 && invrect_hook != NULL) {
1844	>	p->draw_proc = NativeTVECT(NATIVE_FILLRECT);
1845	>	return true;
1846	>	}
1847	>	else if (p->transfer_mode == 10) {
1848		// Invert
1849	<	p->draw_proc = accl_invrect;
1849	>	p->draw_proc = NativeTVECT(NATIVE_INVRECT);
1850		return true;
1851		}
1852		}
1853		return false;
1854		}
1855
1856	+	// Rectangle blitting
1857	+	// TODO: optimize for VOSF and target pixmap == screen
1858	+	void NQD_bitblt(uint32 arg)
1859	+	{
1860	+	D(bug("accl_bitblt %08x\n", arg));
1861	+	accl_params *p = (accl_params *)arg;
1862	+
1863	+	// Get blitting parameters
1864	+	int16 src_X = p->src_rect[1] - p->src_bounds[1];
1865	+	int16 src_Y = p->src_rect[0] - p->src_bounds[0];
1866	+	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1867	+	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1868	+	int16 width = p->dest_rect[3] - p->dest_rect[1];
1869	+	int16 height = p->dest_rect[2] - p->dest_rect[0];
1870	+	D(bug(" src addr %08x, dest addr %08x\n", p->src_base_addr, p->dest_base_addr));
1871	+	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1872	+	D(bug(" width %d, height %d\n", width, height));
1873	+
1874	+	// And perform the blit
1875	+	const int bpp = bytes_per_pixel(p->src_pixel_size);
1876	+	width *= bpp;
1877	+	if (p->src_row_bytes > 0) {
1878	+	const int src_row_bytes = p->src_row_bytes;
1879	+	const int dst_row_bytes = p->dest_row_bytes;
1880	+	uint8 *src = (uint8 *)p->src_base_addr + (src_Y * src_row_bytes) + (src_X * bpp);
1881	+	uint8 *dst = (uint8 *)p->dest_base_addr + (dest_Y * dst_row_bytes) + (dest_X * bpp);
1882	+	for (int i = 0; i < height; i++) {
1883	+	memcpy(dst, src, width);
1884	+	src += src_row_bytes;
1885	+	dst += dst_row_bytes;
1886	+	}
1887	+	}
1888	+	else {
1889	+	const int src_row_bytes = -p->src_row_bytes;
1890	+	const int dst_row_bytes = -p->dest_row_bytes;
1891	+	uint8 *src = (uint8 *)p->src_base_addr + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp);
1892	+	uint8 *dst = (uint8 *)p->dest_base_addr + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp);
1893	+	for (int i = height - 1; i >= 0; i--) {
1894	+	memcpy(dst, src, width);
1895	+	src -= src_row_bytes;
1896	+	dst -= dst_row_bytes;
1897	+	}
1898	+	}
1899	+	}
1900	+
1901	+	/*
1902	+	BitBlt transfer modes:
1903	+	0 : srcCopy
1904	+	1 : srcOr
1905	+	2 : srcXor
1906	+	3 : srcBic
1907	+	4 : notSrcCopy
1908	+	5 : notSrcOr
1909	+	6 : notSrcXor
1910	+	7 : notSrcBic
1911	+	32 : blend
1912	+	33 : addPin
1913	+	34 : addOver
1914	+	35 : subPin
1915	+	36 : transparent
1916	+	37 : adMax
1917	+	38 : subOver
1918	+	39 : adMin
1919	+	50 : hilite
1920	+	*/
1921	+
1922	+	bool NQD_bitblt_hook(uint32 arg)
1923	+	{
1924	+	D(bug("accl_draw_hook %08x\n", arg));
1925	+	accl_params *p = (accl_params *)arg;
1926	+
1927	+	// Check if we can accelerate this bitblt
1928	+	if (((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
1929	+	((uint32 *)p)[0x130 >> 2] == 0 &&
1930	+	p->src_pixel_size >= 8 && p->src_pixel_size == p->dest_pixel_size &&
1931	+	(p->src_row_bytes ^ p->dest_row_bytes) >= 0 &&  // same sign?
1932	+	p->transfer_mode == 0 &&                                                // srcCopy?
1933	+	((uint32 *)p)[0x15c >> 2] > 0) {
1934	+
1935	+	// Yes, set function pointer
1936	+	p->draw_proc = NativeTVECT(NATIVE_BITBLT);
1937	+	return true;
1938	+	}
1939	+	return false;
1940	+	}
1941	+
1942		// Wait for graphics operation to finish
1943	<	static bool accl_sync_hook(void *arg)
1943	>	bool NQD_sync_hook(uint32 arg)
1944		{
1945	<	D(bug("accl_sync_hook %p\n", arg));
1407	<	if (sync_hook != NULL)
1408	<	sync_hook();
1945	>	D(bug("accl_sync_hook %08x\n", arg));
1946		return true;
1947		}
1948
1412	–	static struct accl_hook_info bitblt_hook_info = {accl_bitblt_hook, accl_sync_hook, ACCL_BITBLT};
1413	–	static struct accl_hook_info fillrect_hook_info = {accl_fillrect_hook, accl_sync_hook, ACCL_FILLRECT};
1414	–	#endif
1415	–
1949		void VideoInstallAccel(void)
1950		{
1951	+	// Temporary hack until it's fixed for e.g. little-endian & 64-bit platforms
1952	+	#ifndef __powerpc__
1953	+	return;
1954	+	#endif
1955	+
1956		// Install acceleration hooks
1957		if (PrefsFindBool("gfxaccel")) {
1958		D(bug("Video: Installing acceleration hooks\n"));
1959	<	//!!    NQDMisc(6, &bitblt_hook_info);
1960	<	//              NQDMisc(6, &fillrect_hook_info);
1959	>	uint32 base;
1960	>
1961	>	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1962	>	base = bitblt_hook_info.addr();
1963	>	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1964	>	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1965	>	WriteMacInt32(base + 8, ACCL_BITBLT);
1966	>	NQDMisc(6, bitblt_hook_info.ptr());
1967	>
1968	>	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1969	>	base = fillrect_hook_info.addr();
1970	>	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1971	>	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1972	>	WriteMacInt32(base + 8, ACCL_FILLRECT);
1973	>	NQDMisc(6, fillrect_hook_info.ptr());
1974		}
1975		}
1976
#	Line 1482 | Line 2033 | int16 video_mode_change(VidLocals *csSav
2033
2034		void video_set_palette(void)
2035		{
2036	+	LOCK_PALETTE;
2037	+
2038	+	// Convert colors to XColor array
2039	+	int mode = get_current_mode();
2040	+	int num_in = palette_size(mode);
2041	+	int num_out = 256;
2042	+	bool stretch = false;
2043	+	if (IsDirectMode(mode)) {
2044	+	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
2045	+	num_out = vis->map_entries;
2046	+	stretch = true;
2047	+	}
2048	+	XColor *p = x_palette;
2049	+	for (int i=0; i<num_out; i++) {
2050	+	int c = (stretch ? (i * num_in) / num_out : i);
2051	+	p->red = mac_pal[c].red * 0x0101;
2052	+	p->green = mac_pal[c].green * 0x0101;
2053	+	p->blue = mac_pal[c].blue * 0x0101;
2054	+	p++;
2055	+	}
2056	+
2057	+	#ifdef ENABLE_VOSF
2058	+	// Recalculate pixel color expansion map
2059	+	if (!IsDirectMode(mode) && xdepth > 8) {
2060	+	for (int i=0; i<256; i++) {
2061	+	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
2062	+	ExpandMap[i] = map_rgb(mac_pal[c].red, mac_pal[c].green, mac_pal[c].blue);
2063	+	}
2064	+
2065	+	// We have to redraw everything because the interpretation of pixel values changed
2066	+	LOCK_VOSF;
2067	+	PFLAG_SET_ALL;
2068	+	UNLOCK_VOSF;
2069	+	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
2070	+	}
2071	+	#endif
2072	+
2073	+	// Tell redraw thread to change palette
2074		palette_changed = true;
2075	+
2076	+	UNLOCK_PALETTE;
2077		}
2078
2079
#	Line 1609 | Line 2200 | static void update_display(void)
2200
2201		// Refresh display
2202		if (high && wide) {
2203	+	XDisplayLock();
2204		if (have_shm)
2205		XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2206		else
2207		XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2208	+	XDisplayUnlock();
2209	+	}
2210	+	}
2211	+
2212	+	const int VIDEO_REFRESH_HZ = 60;
2213	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2214	+
2215	+	static void handle_palette_changes(void)
2216	+	{
2217	+	LOCK_PALETTE;
2218	+
2219	+	if (palette_changed && !emul_suspended) {
2220	+	palette_changed = false;
2221	+
2222	+	int mode = get_current_mode();
2223	+	if (color_class == PseudoColor || color_class == DirectColor) {
2224	+	int num = vis->map_entries;
2225	+	bool set_clut = true;
2226	+	if (!IsDirectMode(mode) && color_class == DirectColor) {
2227	+	if (display_type == DIS_WINDOW)
2228	+	set_clut = false; // Indexed mode on true color screen, don't set CLUT
2229	+	}
2230	+
2231	+	if (set_clut) {
2232	+	XDisplayLock();
2233	+	XStoreColors(x_display, cmap[0], x_palette, num);
2234	+	XStoreColors(x_display, cmap[1], x_palette, num);
2235	+	XSync(x_display, false);
2236	+	XDisplayUnlock();
2237	+	}
2238	+	}
2239	+
2240	+	#ifdef ENABLE_XF86_DGA
2241	+	if (display_type == DIS_SCREEN) {
2242	+	current_dga_cmap ^= 1;
2243	+	if (!IsDirectMode(mode) && cmap[current_dga_cmap])
2244	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2245	+	}
2246	+	#endif
2247		}
2248	+
2249	+	UNLOCK_PALETTE;
2250		}
2251
2252		static void *redraw_func(void *arg)
2253		{
2254	<	int tick_counter = 0;
1622	<	struct timespec req = {0, 16666667};
2254	>	int fd = ConnectionNumber(x_display);
2255
2256	<	for (;;) {
2256	>	uint64 start = GetTicks_usec();
2257	>	int64 ticks = 0;
2258	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2259
2260	<	// Wait
1627	<	nanosleep(&req, NULL);
2260	>	for (;;) {
2261
2262		// Pause if requested (during video mode switches)
2263		while (thread_stop_req)
2264		thread_stop_ack = true;
2265
2266	<	// Handle X11 events
2267	<	handle_events();
2266	>	int64 delay = next - GetTicks_usec();
2267	>	if (delay < -VIDEO_REFRESH_DELAY) {
2268	>
2269	>	// We are lagging far behind, so we reset the delay mechanism
2270	>	next = GetTicks_usec();
2271
2272	<	// Quit DGA mode if requested
2273	<	if (quit_full_screen) {
2274	<	quit_full_screen = false;
2275	<	if (display_type == DIS_SCREEN) {
2272	>	} else if (delay <= 0) {
2273	>
2274	>	// Delay expired, refresh display
2275	>	next += VIDEO_REFRESH_DELAY;
2276	>	ticks++;
2277	>
2278	>	// Handle X11 events
2279	>	handle_events();
2280	>
2281	>	// Quit DGA mode if requested
2282	>	if (quit_full_screen) {
2283	>	quit_full_screen = false;
2284	>	if (display_type == DIS_SCREEN) {
2285	>	XDisplayLock();
2286		#ifdef ENABLE_XF86_DGA
2287	<	XF86DGADirectVideo(x_display, screen, 0);
2288	<	XUngrabPointer(x_display, CurrentTime);
2289	<	XUngrabKeyboard(x_display, CurrentTime);
2290	<	#endif
2291	<	XSync(x_display, false);
2292	<	quit_full_screen_ack = true;
2293	<	return NULL;
2287	>	XF86DGADirectVideo(x_display, screen, 0);
2288	>	XUngrabPointer(x_display, CurrentTime);
2289	>	XUngrabKeyboard(x_display, CurrentTime);
2290	>	XUnmapWindow(x_display, the_win);
2291	>	wait_unmapped(the_win);
2292	>	XDestroyWindow(x_display, the_win);
2293	>	#endif
2294	>	XSync(x_display, false);
2295	>	XDisplayUnlock();
2296	>	quit_full_screen_ack = true;
2297	>	return NULL;
2298	>	}
2299		}
1649	–	}
2300
2301	<	// Refresh display and set cursor image in window mode
2302	<	if (display_type == DIS_WINDOW) {
2303	<	tick_counter++;
2304	<	if (tick_counter >= frame_skip) {
2305	<	tick_counter = 0;
2301	>	// Refresh display and set cursor image in window mode
2302	>	static int tick_counter = 0;
2303	>	if (display_type == DIS_WINDOW) {
2304	>	tick_counter++;
2305	>	if (tick_counter >= frame_skip) {
2306	>	tick_counter = 0;
2307
2308	<	// Update display
2308	>	// Update display
2309		#ifdef ENABLE_VOSF
2310	<	if (use_vosf) {
2311	<	if (mainBuffer.dirty) {
2312	<	LOCK_VOSF;
2313	<	update_display_window_vosf();
2314	<	UNLOCK_VOSF;
2315	<	XSync(x_display, false); // Let the server catch up
2310	>	if (use_vosf) {
2311	>	XDisplayLock();
2312	>	if (mainBuffer.dirty) {
2313	>	LOCK_VOSF;
2314	>	update_display_window_vosf();
2315	>	UNLOCK_VOSF;
2316	>	XSync(x_display, false); // Let the server catch up
2317	>	}
2318	>	XDisplayUnlock();
2319		}
2320	<	}
1667	<	else
2320	>	else
2321		#endif
2322	<	update_display();
2322	>	update_display();
2323
2324	<	// Set new cursor image if it was changed
2325	<	if (cursor_changed) {
2326	<	cursor_changed = false;
2327	<	memcpy(cursor_image->data, MacCursor + 4, 32);
2328	<	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2329	<	XFreeCursor(x_display, mac_cursor);
2330	<	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
2331	<	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
2332	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, MacCursor[2], MacCursor[3]);
2333	<	XDefineCursor(x_display, the_win, mac_cursor);
2324	>	// Set new cursor image if it was changed
2325	>	if (cursor_changed) {
2326	>	cursor_changed = false;
2327	>	memcpy(cursor_image->data, MacCursor + 4, 32);
2328	>	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2329	>	XDisplayLock();
2330	>	XFreeCursor(x_display, mac_cursor);
2331	>	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
2332	>	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
2333	>	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, MacCursor[2], MacCursor[3]);
2334	>	XDefineCursor(x_display, the_win, mac_cursor);
2335	>	XDisplayUnlock();
2336	>	}
2337		}
2338		}
1683	–	}
2339		#ifdef ENABLE_VOSF
2340	<	else if (use_vosf) {
2341	<	// Update display (VOSF variant)
2342	<	static int tick_counter = 0;
2343	<	if (++tick_counter >= frame_skip) {
2344	<	tick_counter = 0;
2345	<	if (mainBuffer.dirty) {
2346	<	LOCK_VOSF;
2347	<	update_display_dga_vosf();
2348	<	UNLOCK_VOSF;
2340	>	else if (use_vosf) {
2341	>	// Update display (VOSF variant)
2342	>	if (++tick_counter >= frame_skip) {
2343	>	tick_counter = 0;
2344	>	if (mainBuffer.dirty) {
2345	>	LOCK_VOSF;
2346	>	update_display_dga_vosf();
2347	>	UNLOCK_VOSF;
2348	>	}
2349		}
2350		}
1696	–	}
2351		#endif
2352
2353	<	// Set new palette if it was changed
2354	<	if (palette_changed && !emul_suspended) {
2355	<	palette_changed = false;
2356	<	XColor c[256];
2357	<	for (int i=0; i<256; i++) {
2358	<	c[i].pixel = i;
2359	<	c[i].red = mac_pal[i].red * 0x0101;
2360	<	c[i].green = mac_pal[i].green * 0x0101;
2361	<	c[i].blue = mac_pal[i].blue * 0x0101;
2362	<	c[i].flags = DoRed | DoGreen | DoBlue;
2363	<	}
2364	<	if (depth == 8) {
2365	<	XStoreColors(x_display, cmap[0], c, 256);
2366	<	XStoreColors(x_display, cmap[1], c, 256);
1713	<	#ifdef ENABLE_XF86_DGA
1714	<	if (display_type == DIS_SCREEN) {
1715	<	current_dga_cmap ^= 1;
1716	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1717	<	}
1718	<	#endif
1719	<	}
2353	>	// Set new palette if it was changed
2354	>	handle_palette_changes();
2355	>
2356	>	} else {
2357	>
2358	>	// No display refresh pending, check for X events
2359	>	fd_set readfds;
2360	>	FD_ZERO(&readfds);
2361	>	FD_SET(fd, &readfds);
2362	>	struct timeval timeout;
2363	>	timeout.tv_sec = 0;
2364	>	timeout.tv_usec = delay;
2365	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2366	>	handle_events();
2367		}
2368		}
2369		return NULL;

Diff Legend

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