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.9 by gbeauche, 2003-12-31T11:37:26Z vs.
Revision 1.17 by gbeauche, 2004-04-18T23:17:54Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  SheepShaver (C) 1997-2003 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 138 | Line 163 | extern void SysMountFirstFloppy(void);
163		// From clip_unix.cpp
164		extern void ClipboardSelectionClear(XSelectionClearEvent *);
165		extern void ClipboardSelectionRequest(XSelectionRequestEvent *);
141	–	extern void ClipboardSelectionNotify(XSelectionEvent *req);
166
167
168		// Video acceleration through SIGSEGV
#	Line 148 | Line 172 | extern void ClipboardSelectionNotify(XSe
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 176 | 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	<
183	<	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));
188	–	XMapRaised(x_display, the_win);
189	–	XSync(x_display, false);
421
422	<	// Set colormap
423	<	if (depth == 8) {
193	<	XSetWindowColormap(x_display, the_win, cmap[0]);
194	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
195	<	}
422	>	// Set delete protocol property
423	>	set_window_delete_protocol(the_win);
424
425		// Make window unresizable
426		XSizeHints *hints;
#	Line 206 | 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 216 | 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 235 | 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;
243	<	switch (depth) {
244	<	case 1:
245	<	bytes_per_row /= 8;
246	<	break;
247	<	case 15:
248	<	case 16:
249	<	bytes_per_row *= 2;
250	<	break;
251	<	case 24:
252	<	case 32:
253	<	bytes_per_row *= 4;
254	<	break;
255	<	}
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 280 | 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 308 | Line 530 | static bool open_window(int width, int h
530		#endif
531
532		// Set bytes per row
311	–	VModes[cur_mode].viRowBytes = img->bytes_per_line;
533		XSync(x_display, false);
534		return true;
535		}
#	Line 320 | 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 336 | 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]);
348	–
349	–	// Set bytes per row
350	–	int bytes_per_row = (dga_fb_width + 7) & ~7;
351	–	switch (depth) {
352	–	case 15:
353	–	case 16:
354	–	bytes_per_row *= 2;
355	–	break;
356	–	case 24:
357	–	case 32:
358	–	bytes_per_row *= 4;
359	–	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 377 | 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;
383	–	the_buffer = dga_screen_base;
615		#endif
616		#endif
386	–	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;
389	–	XSync(x_display, false);
622		return true;
623		#else
624		ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
#	Line 396 | 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 465 | 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 502 | 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 608 | 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 627 | 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 640 | Line 981 | static void add_mode(VideoInfo *&p, uint
981		p->viYsize = 1200;
982		break;
983		}
984	<	switch (apple_mode) {
644	<	case APPLE_8_BIT:
645	<	p->viRowBytes = p->viXsize;
646	<	break;
647	<	case APPLE_16_BIT:
648	<	p->viRowBytes = p->viXsize * 2;
649	<	break;
650	<	case APPLE_32_BIT:
651	<	p->viRowBytes = p->viXsize * 4;
652	<	break;
653	<	}
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 695 | Line 1033 | bool VideoInit(void)
1033
1034		// Init variables
1035		private_data = NULL;
698	–	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 732 | Line 1077 | bool VideoInit(void)
1077		black_pixel = BlackPixel(x_display, screen);
1078		white_pixel = WhitePixel(x_display, screen);
1079
735	–	// Get appropriate visual
736	–	int color_class;
737	–	switch (xdepth) {
738	–	#if 0
739	–	case 1:
740	–	color_class = StaticGray;
741	–	break;
742	–	#endif
743	–	case 8:
744	–	color_class = PseudoColor;
745	–	break;
746	–	case 15:
747	–	case 16:
748	–	case 24:
749	–	case 32:
750	–	color_class = TrueColor;
751	–	break;
752	–	default:
753	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
754	–	return false;
755	–	}
756	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
757	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
758	–	return false;
759	–	}
760	–	if (visualInfo.depth != xdepth) {
761	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
762	–	return false;
763	–	}
764	–	vis = visualInfo.visual;
765	–
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
778	–	int mode = APPLE_8_BIT;
779	–	int bpr_mult = 8;
780	–	switch (depth) {
781	–	case 1:
782	–	mode = APPLE_1_BIT;
783	–	bpr_mult = 1;
784	–	break;
785	–	case 8:
786	–	mode = APPLE_8_BIT;
787	–	bpr_mult = 8;
788	–	break;
789	–	case 15:
790	–	case 16:
791	–	mode = APPLE_16_BIT;
792	–	bpr_mult = 16;
793	–	break;
794	–	case 24:
795	–	case 32:
796	–	mode = APPLE_32_BIT;
797	–	bpr_mult = 32;
798	–	break;
799	–	}
800	–
1098		uint32 window_modes = PrefsFindInt32("windowmodes");
1099		uint32 screen_modes = PrefsFindInt32("screenmodes");
1100		if (!has_dga)
#	Line 806 | 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;
828	<	if (xsize < 800)
829	<	apple_id = APPLE_640x480;
830	<	else if (xsize < 1024)
831	<	apple_id = APPLE_800x600;
832	<	else if (xsize < 1152)
833	<	apple_id = APPLE_1024x768;
834	<	else if (xsize < 1280)
835	<	apple_id = APPLE_1152x900;
836	<	else if (xsize < 1600)
837	<	apple_id = APPLE_1280x1024;
838	<	else
839	<	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 851 | 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 870 | 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 902 | Line 1205 | void VideoExit(void)
1205		close_display();
1206		XFlush(x_display);
1207		XSync(x_display, false);
905	–	if (depth == 8) {
906	–	XFreeColormap(x_display, cmap[0]);
907	–	XFreeColormap(x_display, cmap[1]);
908	–	}
1208		}
1209		}
1210
#	Line 969 | 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 1186 | Line 1487 | static void handle_events(void)
1487		for (;;) {
1488		XEvent event;
1489
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	<	else if (XCheckTypedEvent(x_display, SelectionNotify, &event))
1498	<	ClipboardSelectionNotify(&event.xselection);
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 1225 | 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 1298 | Line 1612 | void VideoVBL(void)
1612		*/
1613
1614		#if 0
1301	–	// Rectangle blitting
1302	–	static void accl_bitblt(accl_params *p)
1303	–	{
1304	–	D(bug("accl_bitblt\n"));
1305	–
1306	–	// Get blitting parameters
1307	–	int16 src_X = p->src_rect[1] - p->src_bounds[1];
1308	–	int16 src_Y = p->src_rect[0] - p->src_bounds[0];
1309	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1310	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1311	–	int16 width = p->dest_rect[3] - p->dest_rect[1] - 1;
1312	–	int16 height = p->dest_rect[2] - p->dest_rect[0] - 1;
1313	–	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1314	–	D(bug(" width %d, height %d\n", width, height));
1315	–
1316	–	// And perform the blit
1317	–	bitblt_hook(src_X, src_Y, dest_X, dest_Y, width, height);
1318	–	}
1319	–
1320	–	static bool accl_bitblt_hook(accl_params *p)
1321	–	{
1322	–	D(bug("accl_draw_hook %p\n", p));
1323	–
1324	–	// Check if we can accelerate this bitblt
1325	–	if (p->src_base_addr == screen_base && p->dest_base_addr == screen_base &&
1326	–	display_type == DIS_SCREEN && bitblt_hook != NULL &&
1327	–	((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
1328	–	((uint32 *)p)[0x130 >> 2] == 0 &&
1329	–	p->transfer_mode == 0 &&
1330	–	p->src_row_bytes > 0 && ((uint32 *)p)[0x15c >> 2] > 0) {
1331	–
1332	–	// Yes, set function pointer
1333	–	p->draw_proc = accl_bitblt;
1334	–	return true;
1335	–	}
1336	–	return false;
1337	–	}
1338	–
1615		// Rectangle filling/inversion
1616		static void accl_fillrect8(accl_params *p)
1617		{
#	Line 1413 | Line 1689 | static bool accl_fillrect_hook(accl_para
1689		return false;
1690		}
1691
1692	+	static struct accl_hook_info fillrect_hook_info = {accl_fillrect_hook, accl_sync_hook, ACCL_FILLRECT};
1693	+	#endif
1694	+
1695	+	// Rectangle blitting
1696	+	// TODO: optimize for VOSF and target pixmap == screen
1697	+	void NQD_bitblt(uint32 arg)
1698	+	{
1699	+	D(bug("accl_bitblt %08x\n", arg));
1700	+	accl_params *p = (accl_params *)arg;
1701	+
1702	+	// Get blitting parameters
1703	+	int16 src_X = p->src_rect[1] - p->src_bounds[1];
1704	+	int16 src_Y = p->src_rect[0] - p->src_bounds[0];
1705	+	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1706	+	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1707	+	int16 width = p->dest_rect[3] - p->dest_rect[1];
1708	+	int16 height = p->dest_rect[2] - p->dest_rect[0];
1709	+	D(bug(" src addr %08x, dest addr %08x\n", p->src_base_addr, p->dest_base_addr));
1710	+	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1711	+	D(bug(" width %d, height %d\n", width, height));
1712	+
1713	+	// And perform the blit
1714	+	const int bpp = bytes_per_pixel(p->src_pixel_size);
1715	+	width *= bpp;
1716	+	if (p->src_row_bytes > 0) {
1717	+	const int src_row_bytes = p->src_row_bytes;
1718	+	const int dst_row_bytes = p->dest_row_bytes;
1719	+	uint8 *src = (uint8 *)p->src_base_addr + (src_Y * src_row_bytes) + (src_X * bpp);
1720	+	uint8 *dst = (uint8 *)p->dest_base_addr + (dest_Y * dst_row_bytes) + (dest_X * bpp);
1721	+	for (int i = 0; i < height; i++) {
1722	+	memcpy(dst, src, width);
1723	+	src += src_row_bytes;
1724	+	dst += dst_row_bytes;
1725	+	}
1726	+	}
1727	+	else {
1728	+	const int src_row_bytes = -p->src_row_bytes;
1729	+	const int dst_row_bytes = -p->dest_row_bytes;
1730	+	uint8 *src = (uint8 *)p->src_base_addr + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp);
1731	+	uint8 *dst = (uint8 *)p->dest_base_addr + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp);
1732	+	for (int i = height - 1; i >= 0; i--) {
1733	+	memcpy(dst, src, width);
1734	+	src -= src_row_bytes;
1735	+	dst -= dst_row_bytes;
1736	+	}
1737	+	}
1738	+	}
1739	+
1740	+	bool NQD_bitblt_hook(uint32 arg)
1741	+	{
1742	+	D(bug("accl_draw_hook %08x\n", arg));
1743	+	accl_params *p = (accl_params *)arg;
1744	+
1745	+	// Check if we can accelerate this bitblt
1746	+	if (((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
1747	+	((uint32 *)p)[0x130 >> 2] == 0 &&
1748	+	p->src_pixel_size >= 8 && p->src_pixel_size == p->dest_pixel_size &&
1749	+	((p->src_row_bytes ^ p->dest_row_bytes) >> 31) == 0 &&
1750	+	p->transfer_mode == 0 &&
1751	+	((uint32 *)p)[0x15c >> 2] > 0) {
1752	+
1753	+	// Yes, set function pointer
1754	+	p->draw_proc = NativeTVECT(NATIVE_BITBLT);
1755	+	return true;
1756	+	}
1757	+	return false;
1758	+	}
1759	+
1760		// Wait for graphics operation to finish
1761	<	static bool accl_sync_hook(void *arg)
1761	>	bool NQD_sync_hook(uint32 arg)
1762		{
1763	<	D(bug("accl_sync_hook %p\n", arg));
1420	<	if (sync_hook != NULL)
1421	<	sync_hook();
1763	>	D(bug("accl_sync_hook %08x\n", arg));
1764		return true;
1765		}
1766
1425	–	static struct accl_hook_info bitblt_hook_info = {accl_bitblt_hook, accl_sync_hook, ACCL_BITBLT};
1426	–	static struct accl_hook_info fillrect_hook_info = {accl_fillrect_hook, accl_sync_hook, ACCL_FILLRECT};
1427	–	#endif
1428	–
1767		void VideoInstallAccel(void)
1768		{
1769		// Install acceleration hooks
1770		if (PrefsFindBool("gfxaccel")) {
1771		D(bug("Video: Installing acceleration hooks\n"));
1772	<	//!!    NQDMisc(6, &bitblt_hook_info);
1772	>	uint32 base;
1773	>
1774	>	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1775	>	base = bitblt_hook_info.addr();
1776	>	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1777	>	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1778	>	WriteMacInt32(base + 8, ACCL_BITBLT);
1779	>	#if defined(__powerpc__) // Temporary hack until it's fixed for e.g. little-endian & 64-bit platforms
1780	>	NQDMisc(6, bitblt_hook_info.ptr());
1781	>	#endif
1782	>
1783		//              NQDMisc(6, &fillrect_hook_info);
1784		}
1785		}
#	Line 1495 | Line 1843 | int16 video_mode_change(VidLocals *csSav
1843
1844		void video_set_palette(void)
1845		{
1846	+	LOCK_PALETTE;
1847	+
1848	+	// Convert colors to XColor array
1849	+	int mode = get_current_mode();
1850	+	int num_in = palette_size(mode);
1851	+	int num_out = 256;
1852	+	bool stretch = false;
1853	+	if (IsDirectMode(mode)) {
1854	+	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1855	+	num_out = vis->map_entries;
1856	+	stretch = true;
1857	+	}
1858	+	XColor *p = x_palette;
1859	+	for (int i=0; i<num_out; i++) {
1860	+	int c = (stretch ? (i * num_in) / num_out : i);
1861	+	p->red = mac_pal[c].red * 0x0101;
1862	+	p->green = mac_pal[c].green * 0x0101;
1863	+	p->blue = mac_pal[c].blue * 0x0101;
1864	+	p++;
1865	+	}
1866	+
1867	+	#ifdef ENABLE_VOSF
1868	+	// Recalculate pixel color expansion map
1869	+	if (!IsDirectMode(mode) && xdepth > 8) {
1870	+	for (int i=0; i<256; i++) {
1871	+	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1872	+	ExpandMap[i] = map_rgb(mac_pal[c].red, mac_pal[c].green, mac_pal[c].blue);
1873	+	}
1874	+
1875	+	// We have to redraw everything because the interpretation of pixel values changed
1876	+	LOCK_VOSF;
1877	+	PFLAG_SET_ALL;
1878	+	UNLOCK_VOSF;
1879	+	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1880	+	}
1881	+	#endif
1882	+
1883	+	// Tell redraw thread to change palette
1884		palette_changed = true;
1885	+
1886	+	UNLOCK_PALETTE;
1887		}
1888
1889
#	Line 1622 | Line 2010 | static void update_display(void)
2010
2011		// Refresh display
2012		if (high && wide) {
2013	+	XDisplayLock();
2014		if (have_shm)
2015		XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2016		else
2017		XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2018	+	XDisplayUnlock();
2019	+	}
2020	+	}
2021	+
2022	+	const int VIDEO_REFRESH_HZ = 60;
2023	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2024	+
2025	+	static void handle_palette_changes(void)
2026	+	{
2027	+	LOCK_PALETTE;
2028	+
2029	+	if (palette_changed && !emul_suspended) {
2030	+	palette_changed = false;
2031	+
2032	+	int mode = get_current_mode();
2033	+	if (color_class == PseudoColor || color_class == DirectColor) {
2034	+	int num = vis->map_entries;
2035	+	bool set_clut = true;
2036	+	if (!IsDirectMode(mode) && color_class == DirectColor) {
2037	+	if (display_type == DIS_WINDOW)
2038	+	set_clut = false; // Indexed mode on true color screen, don't set CLUT
2039	+	}
2040	+
2041	+	if (set_clut) {
2042	+	XDisplayLock();
2043	+	XStoreColors(x_display, cmap[0], x_palette, num);
2044	+	XStoreColors(x_display, cmap[1], x_palette, num);
2045	+	XSync(x_display, false);
2046	+	XDisplayUnlock();
2047	+	}
2048	+	}
2049	+
2050	+	#ifdef ENABLE_XF86_DGA
2051	+	if (display_type == DIS_SCREEN) {
2052	+	current_dga_cmap ^= 1;
2053	+	if (!IsDirectMode(mode) && cmap[current_dga_cmap])
2054	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2055	+	}
2056	+	#endif
2057		}
2058	+
2059	+	UNLOCK_PALETTE;
2060		}
2061
2062		static void *redraw_func(void *arg)
2063		{
2064	<	int tick_counter = 0;
1635	<	struct timespec req = {0, 16666667};
2064	>	int fd = ConnectionNumber(x_display);
2065
2066	<	for (;;) {
2066	>	uint64 start = GetTicks_usec();
2067	>	int64 ticks = 0;
2068	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2069
2070	<	// Wait
1640	<	nanosleep(&req, NULL);
2070	>	for (;;) {
2071
2072		// Pause if requested (during video mode switches)
2073		while (thread_stop_req)
2074		thread_stop_ack = true;
2075
2076	<	// Handle X11 events
2077	<	handle_events();
2076	>	int64 delay = next - GetTicks_usec();
2077	>	if (delay < -VIDEO_REFRESH_DELAY) {
2078
2079	<	// Quit DGA mode if requested
2080	<	if (quit_full_screen) {
2081	<	quit_full_screen = false;
2082	<	if (display_type == DIS_SCREEN) {
2079	>	// We are lagging far behind, so we reset the delay mechanism
2080	>	next = GetTicks_usec();
2081	>
2082	>	} else if (delay <= 0) {
2083	>
2084	>	// Delay expired, refresh display
2085	>	next += VIDEO_REFRESH_DELAY;
2086	>	ticks++;
2087	>
2088	>	// Handle X11 events
2089	>	handle_events();
2090	>
2091	>	// Quit DGA mode if requested
2092	>	if (quit_full_screen) {
2093	>	quit_full_screen = false;
2094	>	if (display_type == DIS_SCREEN) {
2095	>	XDisplayLock();
2096		#ifdef ENABLE_XF86_DGA
2097	<	XF86DGADirectVideo(x_display, screen, 0);
2098	<	XUngrabPointer(x_display, CurrentTime);
2099	<	XUngrabKeyboard(x_display, CurrentTime);
2100	<	#endif
2101	<	XSync(x_display, false);
2102	<	quit_full_screen_ack = true;
2103	<	return NULL;
2097	>	XF86DGADirectVideo(x_display, screen, 0);
2098	>	XUngrabPointer(x_display, CurrentTime);
2099	>	XUngrabKeyboard(x_display, CurrentTime);
2100	>	XUnmapWindow(x_display, the_win);
2101	>	wait_unmapped(the_win);
2102	>	XDestroyWindow(x_display, the_win);
2103	>	#endif
2104	>	XSync(x_display, false);
2105	>	XDisplayUnlock();
2106	>	quit_full_screen_ack = true;
2107	>	return NULL;
2108	>	}
2109		}
1662	–	}
2110
2111	<	// Refresh display and set cursor image in window mode
2112	<	if (display_type == DIS_WINDOW) {
2113	<	tick_counter++;
2114	<	if (tick_counter >= frame_skip) {
2115	<	tick_counter = 0;
2111	>	// Refresh display and set cursor image in window mode
2112	>	static int tick_counter = 0;
2113	>	if (display_type == DIS_WINDOW) {
2114	>	tick_counter++;
2115	>	if (tick_counter >= frame_skip) {
2116	>	tick_counter = 0;
2117
2118	<	// Update display
2118	>	// Update display
2119		#ifdef ENABLE_VOSF
2120	<	if (use_vosf) {
2121	<	if (mainBuffer.dirty) {
2122	<	LOCK_VOSF;
2123	<	update_display_window_vosf();
2124	<	UNLOCK_VOSF;
2125	<	XSync(x_display, false); // Let the server catch up
2120	>	if (use_vosf) {
2121	>	XDisplayLock();
2122	>	if (mainBuffer.dirty) {
2123	>	LOCK_VOSF;
2124	>	update_display_window_vosf();
2125	>	UNLOCK_VOSF;
2126	>	XSync(x_display, false); // Let the server catch up
2127	>	}
2128	>	XDisplayUnlock();
2129		}
2130	<	}
1680	<	else
2130	>	else
2131		#endif
2132	<	update_display();
2132	>	update_display();
2133
2134	<	// Set new cursor image if it was changed
2135	<	if (cursor_changed) {
2136	<	cursor_changed = false;
2137	<	memcpy(cursor_image->data, MacCursor + 4, 32);
2138	<	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2139	<	XFreeCursor(x_display, mac_cursor);
2140	<	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
2141	<	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
2142	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, MacCursor[2], MacCursor[3]);
2143	<	XDefineCursor(x_display, the_win, mac_cursor);
2134	>	// Set new cursor image if it was changed
2135	>	if (cursor_changed) {
2136	>	cursor_changed = false;
2137	>	memcpy(cursor_image->data, MacCursor + 4, 32);
2138	>	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2139	>	XDisplayLock();
2140	>	XFreeCursor(x_display, mac_cursor);
2141	>	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
2142	>	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
2143	>	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, MacCursor[2], MacCursor[3]);
2144	>	XDefineCursor(x_display, the_win, mac_cursor);
2145	>	XDisplayUnlock();
2146	>	}
2147		}
2148		}
1696	–	}
2149		#ifdef ENABLE_VOSF
2150	<	else if (use_vosf) {
2151	<	// Update display (VOSF variant)
2152	<	static int tick_counter = 0;
2153	<	if (++tick_counter >= frame_skip) {
2154	<	tick_counter = 0;
2155	<	if (mainBuffer.dirty) {
2156	<	LOCK_VOSF;
2157	<	update_display_dga_vosf();
2158	<	UNLOCK_VOSF;
2150	>	else if (use_vosf) {
2151	>	// Update display (VOSF variant)
2152	>	if (++tick_counter >= frame_skip) {
2153	>	tick_counter = 0;
2154	>	if (mainBuffer.dirty) {
2155	>	LOCK_VOSF;
2156	>	update_display_dga_vosf();
2157	>	UNLOCK_VOSF;
2158	>	}
2159		}
2160		}
1709	–	}
2161		#endif
2162
2163	<	// Set new palette if it was changed
2164	<	if (palette_changed && !emul_suspended) {
2165	<	palette_changed = false;
2166	<	XColor c[256];
2167	<	for (int i=0; i<256; i++) {
2168	<	c[i].pixel = i;
2169	<	c[i].red = mac_pal[i].red * 0x0101;
2170	<	c[i].green = mac_pal[i].green * 0x0101;
2171	<	c[i].blue = mac_pal[i].blue * 0x0101;
2172	<	c[i].flags = DoRed | DoGreen | DoBlue;
2173	<	}
2174	<	if (depth == 8) {
2175	<	XStoreColors(x_display, cmap[0], c, 256);
2176	<	XStoreColors(x_display, cmap[1], c, 256);
1726	<	#ifdef ENABLE_XF86_DGA
1727	<	if (display_type == DIS_SCREEN) {
1728	<	current_dga_cmap ^= 1;
1729	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1730	<	}
1731	<	#endif
1732	<	}
2163	>	// Set new palette if it was changed
2164	>	handle_palette_changes();
2165	>
2166	>	} else {
2167	>
2168	>	// No display refresh pending, check for X events
2169	>	fd_set readfds;
2170	>	FD_ZERO(&readfds);
2171	>	FD_SET(fd, &readfds);
2172	>	struct timeval timeout;
2173	>	timeout.tv_sec = 0;
2174	>	timeout.tv_usec = delay;
2175	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2176	>	handle_events();
2177		}
2178		}
2179		return NULL;

Diff Legend

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