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.7 by gbeauche, 2003-12-04T22:29:15Z vs.
Revision 1.37 by gbeauche, 2005-03-27T14:53:04Z

#	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-2005 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 44 | Line 46
46		#include "about_window.h"
47		#include "video.h"
48		#include "video_defs.h"
49	+	#include "video_blit.h"
50
51		#define DEBUG 0
52		#include "debug.h"
53
54	+	#ifndef NO_STD_NAMESPACE
55	+	using std::sort;
56	+	#endif
57	+
58
59		// Constants
60		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
61	+	static const bool hw_mac_cursor_accl = true;    // Flag: Enable MacOS to X11 copy of cursor?
62
63		// Global variables
64		static int32 frame_skip;
65	+	static int16 mouse_wheel_mode;
66	+	static int16 mouse_wheel_lines;
67		static bool redraw_thread_active = false;       // Flag: Redraw thread installed
68	+	static pthread_attr_t redraw_thread_attr;       // Redraw thread attributes
69	+	static volatile bool redraw_thread_cancel;      // Flag: Cancel Redraw thread
70		static pthread_t redraw_thread;                         // Redraw thread
71
72		static bool local_X11;                                          // Flag: X server running on local machine?
#	Line 72 | Line 84 | static const bool use_vosf = false;                    //
84
85		static bool palette_changed = false;            // Flag: Palette changed, redraw thread must update palette
86		static bool ctrl_down = false;                          // Flag: Ctrl key pressed
87	+	static bool caps_on = false;                            // Flag: Caps Lock on
88		static bool quit_full_screen = false;           // Flag: DGA close requested from redraw thread
89		static volatile bool quit_full_screen_ack = false;      // Acknowledge for quit_full_screen
90		static bool emerg_quit = false;                         // Flag: Ctrl-Esc pressed, emergency quit requested from MacOS thread
#	Line 87 | Line 100 | static int screen;                                                     // Screen numbe
100		static int xdepth;                                                      // Depth of X screen
101		static int depth;                                                       // Depth of Mac frame buffer
102		static Window rootwin, the_win;                         // Root window and our window
103	+	static int num_depths = 0;                                      // Number of available X depths
104	+	static int *avail_depths = NULL;                        // List of available X depths
105	+	static VisualFormat visualFormat;
106		static XVisualInfo visualInfo;
107		static Visual *vis;
108	+	static int color_class;
109	+	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
110		static Colormap cmap[2];                                        // Two colormaps (DGA) for 8-bit mode
111	+	static XColor x_palette[256];                           // Color palette to be used as CLUT and gamma table
112	+
113		static XColor black, white;
114		static unsigned long black_pixel, white_pixel;
115		static int eventmask;
116	<	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask;
117	<	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
116	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
117	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
118
119		// Variables for window mode
120		static GC the_gc;
#	Line 111 | Line 131 | static uint8 *the_buffer_copy = NULL;          /
131		static uint32 the_buffer_size;                          // Size of allocated the_buffer
132
133		// Variables for DGA mode
114	–	static char *dga_screen_base;
115	–	static int dga_fb_width;
134		static int current_dga_cmap;
135
136		#ifdef ENABLE_XF86_VIDMODE
#	Line 121 | Line 139 | static XF86VidModeModeInfo **x_video_mod
139		static int num_x_video_modes;
140		#endif
141
142	+	// Mutex to protect palette
143	+	#ifdef HAVE_SPINLOCKS
144	+	static spinlock_t x_palette_lock = SPIN_LOCK_UNLOCKED;
145	+	#define LOCK_PALETTE spin_lock(&x_palette_lock)
146	+	#define UNLOCK_PALETTE spin_unlock(&x_palette_lock)
147	+	#elif defined(HAVE_PTHREADS)
148	+	static pthread_mutex_t x_palette_lock = PTHREAD_MUTEX_INITIALIZER;
149	+	#define LOCK_PALETTE pthread_mutex_lock(&x_palette_lock)
150	+	#define UNLOCK_PALETTE pthread_mutex_unlock(&x_palette_lock)
151	+	#else
152	+	#define LOCK_PALETTE
153	+	#define UNLOCK_PALETTE
154	+	#endif
155	+
156
157		// Prototypes
158		static void *redraw_func(void *arg);
#	Line 133 | Line 165 | extern Display *x_display;
165		// From sys_unix.cpp
166		extern void SysMountFirstFloppy(void);
167
168	+	// From clip_unix.cpp
169	+	extern void ClipboardSelectionClear(XSelectionClearEvent *);
170	+	extern void ClipboardSelectionRequest(XSelectionRequestEvent *);
171	+
172
173		// Video acceleration through SIGSEGV
174		#ifdef ENABLE_VOSF
#	Line 141 | Line 177 | extern void SysMountFirstFloppy(void);
177
178
179		/*
180	+	*  Utility functions
181	+	*/
182	+
183	+	// Get current video mode
184	+	static inline int get_current_mode(void)
185	+	{
186	+	return VModes[cur_mode].viAppleMode;
187	+	}
188	+
189	+	// Find palette size for given color depth
190	+	static int palette_size(int mode)
191	+	{
192	+	switch (mode) {
193	+	case APPLE_1_BIT: return 2;
194	+	case APPLE_2_BIT: return 4;
195	+	case APPLE_4_BIT: return 16;
196	+	case APPLE_8_BIT: return 256;
197	+	case APPLE_16_BIT: return 32;
198	+	case APPLE_32_BIT: return 256;
199	+	default: return 0;
200	+	}
201	+	}
202	+
203	+	// Return bits per pixel for requested depth
204	+	static inline int bytes_per_pixel(int depth)
205	+	{
206	+	int bpp;
207	+	switch (depth) {
208	+	case 8:
209	+	bpp = 1;
210	+	break;
211	+	case 15: case 16:
212	+	bpp = 2;
213	+	break;
214	+	case 24: case 32:
215	+	bpp = 4;
216	+	break;
217	+	default:
218	+	abort();
219	+	}
220	+	return bpp;
221	+	}
222	+
223	+	// Map video_mode depth ID to numerical depth value
224	+	static inline int depth_of_video_mode(int mode)
225	+	{
226	+	int depth;
227	+	switch (mode) {
228	+	case APPLE_1_BIT:
229	+	depth = 1;
230	+	break;
231	+	case APPLE_2_BIT:
232	+	depth = 2;
233	+	break;
234	+	case APPLE_4_BIT:
235	+	depth = 4;
236	+	break;
237	+	case APPLE_8_BIT:
238	+	depth = 8;
239	+	break;
240	+	case APPLE_16_BIT:
241	+	depth = 16;
242	+	break;
243	+	case APPLE_32_BIT:
244	+	depth = 32;
245	+	break;
246	+	default:
247	+	abort();
248	+	}
249	+	return depth;
250	+	}
251	+
252	+	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
253	+	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
254	+	{
255	+	return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift);
256	+	}
257	+
258	+
259	+	// Do we have a visual for handling the specified Mac depth? If so, set the
260	+	// global variables "xdepth", "visualInfo", "vis" and "color_class".
261	+	static bool find_visual_for_depth(int depth)
262	+	{
263	+	D(bug("have_visual_for_depth(%d)\n", depth_of_video_mode(depth)));
264	+
265	+	// 1-bit works always and uses default visual
266	+	if (depth == APPLE_1_BIT) {
267	+	vis = DefaultVisual(x_display, screen);
268	+	visualInfo.visualid = XVisualIDFromVisual(vis);
269	+	int num = 0;
270	+	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
271	+	visualInfo = vi[0];
272	+	XFree(vi);
273	+	xdepth = visualInfo.depth;
274	+	color_class = visualInfo.c_class;
275	+	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
276	+	return true;
277	+	}
278	+
279	+	// Calculate minimum and maximum supported X depth
280	+	int min_depth = 1, max_depth = 32;
281	+	switch (depth) {
282	+	#ifdef ENABLE_VOSF
283	+	case APPLE_2_BIT:
284	+	case APPLE_4_BIT:       // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
285	+	case APPLE_8_BIT:
286	+	min_depth = 8;
287	+	max_depth = 32;
288	+	break;
289	+	#else
290	+	case APPLE_2_BIT:
291	+	case APPLE_4_BIT:       // 2/4-bit requires VOSF blitters
292	+	return false;
293	+	case APPLE_8_BIT:       // 8-bit without VOSF requires an 8-bit visual
294	+	min_depth = 8;
295	+	max_depth = 8;
296	+	break;
297	+	#endif
298	+	case APPLE_16_BIT:      // 16-bit requires a 15/16-bit visual
299	+	min_depth = 15;
300	+	max_depth = 16;
301	+	break;
302	+	case APPLE_32_BIT:      // 32-bit requires a 24/32-bit visual
303	+	min_depth = 24;
304	+	max_depth = 32;
305	+	break;
306	+	}
307	+	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
308	+
309	+	// Try to find a visual for one of the color depths
310	+	bool visual_found = false;
311	+	for (int i=0; i<num_depths && !visual_found; i++) {
312	+
313	+	xdepth = avail_depths[i];
314	+	D(bug(" trying to find visual for depth %d\n", xdepth));
315	+	if (xdepth < min_depth || xdepth > max_depth)
316	+	continue;
317	+
318	+	// Determine best color class for this depth
319	+	switch (xdepth) {
320	+	case 1: // Try StaticGray or StaticColor
321	+	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
322	+	|| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
323	+	visual_found = true;
324	+	break;
325	+	case 8: // Need PseudoColor
326	+	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
327	+	visual_found = true;
328	+	break;
329	+	case 15:
330	+	case 16:
331	+	case 24:
332	+	case 32: // Try DirectColor first, as this will allow gamma correction
333	+	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
334	+	|| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
335	+	visual_found = true;
336	+	break;
337	+	default:
338	+	D(bug("  not a supported depth\n"));
339	+	break;
340	+	}
341	+	}
342	+	if (!visual_found)
343	+	return false;
344	+
345	+	// Visual was found
346	+	vis = visualInfo.visual;
347	+	color_class = visualInfo.c_class;
348	+	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
349	+	#if DEBUG
350	+	switch (color_class) {
351	+	case StaticGray: D(bug("StaticGray\n")); break;
352	+	case GrayScale: D(bug("GrayScale\n")); break;
353	+	case StaticColor: D(bug("StaticColor\n")); break;
354	+	case PseudoColor: D(bug("PseudoColor\n")); break;
355	+	case TrueColor: D(bug("TrueColor\n")); break;
356	+	case DirectColor: D(bug("DirectColor\n")); break;
357	+	}
358	+	#endif
359	+	return true;
360	+	}
361	+
362	+
363	+	/*
364		*  Open display (window or fullscreen)
365		*/
366
367	+	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
368	+	static Atom WM_DELETE_WINDOW = (Atom)0;
369	+	static void set_window_delete_protocol(Window w)
370	+	{
371	+	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
372	+	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
373	+	}
374	+
375	+	// Wait until window is mapped/unmapped
376	+	static void wait_mapped(Window w)
377	+	{
378	+	XEvent e;
379	+	do {
380	+	XMaskEvent(x_display, StructureNotifyMask, &e);
381	+	} while ((e.type != MapNotify) || (e.xmap.event != w));
382	+	}
383	+
384	+	static void wait_unmapped(Window w)
385	+	{
386	+	XEvent e;
387	+	do {
388	+	XMaskEvent(x_display, StructureNotifyMask, &e);
389	+	} while ((e.type != UnmapNotify) || (e.xmap.event != w));
390	+	}
391	+
392		// Trap SHM errors
393		static bool shm_error = false;
394		static int (*old_error_handler)(Display *, XErrorEvent *);
#	Line 166 | Line 411 | static bool open_window(int width, int h
411		// Set absolute mouse mode
412		ADBSetRelMouseMode(false);
413
169	–	// Read frame skip prefs
170	–	frame_skip = PrefsFindInt32("frameskip");
171	–	if (frame_skip == 0)
172	–	frame_skip = 1;
173	–
414		// Create window
415		XSetWindowAttributes wattr;
416		wattr.event_mask = eventmask = win_eventmask;
417	<	wattr.background_pixel = black_pixel;
418	<	wattr.border_pixel = black_pixel;
417	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
418	>	wattr.border_pixel = 0;
419		wattr.backing_store = NotUseful;
420	<
181	<	XSync(x_display, false);
420	>	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
421		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
422	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWBackingStore, &wattr);
423	<	XSync(x_display, false);
422	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWBackingStore | CWColormap, &wattr);
423	>
424	>	// Set window name
425		XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
186	–	XMapRaised(x_display, the_win);
187	–	XSync(x_display, false);
426
427	<	// Set colormap
428	<	if (depth == 8) {
191	<	XSetWindowColormap(x_display, the_win, cmap[0]);
192	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
193	<	}
427	>	// Set delete protocol property
428	>	set_window_delete_protocol(the_win);
429
430		// Make window unresizable
431		XSizeHints *hints;
#	Line 204 | Line 439 | static bool open_window(int width, int h
439		XFree((char *)hints);
440		}
441
442	+	// Show window
443	+	XMapWindow(x_display, the_win);
444	+	wait_mapped(the_win);
445	+
446		// 1-bit mode is big-endian; if the X server is little-endian, we can't
447		// use SHM because that doesn't allow changing the image byte order
448		bool need_msb_image = (depth == 1 && XImageByteOrder(x_display) == LSBFirst);
#	Line 214 | Line 453 | static bool open_window(int width, int h
453
454		// Create SHM image ("height + 2" for safety)
455		img = XShmCreateImage(x_display, vis, depth == 1 ? 1 : xdepth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
456	<	shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
456	>	shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
457	>	D(bug(" shm image created\n"));
458		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
459		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
460		shminfo.readOnly = False;
#	Line 233 | Line 473 | static bool open_window(int width, int h
473		have_shm = true;
474		shmctl(shminfo.shmid, IPC_RMID, 0);
475		}
476	+	D(bug(" shm image attached\n"));
477		}
478
479		// Create normal X image if SHM doesn't work ("height + 2" for safety)
480		if (!have_shm) {
481	<	int bytes_per_row = aligned_width;
241	<	switch (depth) {
242	<	case 1:
243	<	bytes_per_row /= 8;
244	<	break;
245	<	case 15:
246	<	case 16:
247	<	bytes_per_row *= 2;
248	<	break;
249	<	case 24:
250	<	case 32:
251	<	bytes_per_row *= 4;
252	<	break;
253	<	}
481	>	int bytes_per_row = depth == 1 ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth));
482		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
483		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);
484	+	D(bug(" X image created\n"));
485		}
486
487		// 1-Bit mode is big-endian
488	<	if (depth == 1) {
488	>	if (need_msb_image) {
489		img->byte_order = MSBFirst;
490		img->bitmap_bit_order = MSBFirst;
491		}
#	Line 274 | Line 503 | static bool open_window(int width, int h
503		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
504		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
505		#endif
506	<	screen_base = (uint32)the_buffer;
506	>	screen_base = Host2MacAddr(the_buffer);
507
508		// Create GC
509		the_gc = XCreateGC(x_display, the_win, 0, 0);
510	<	XSetForeground(x_display, the_gc, black_pixel);
510	>	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
511
512		// Create cursor
513	<	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
514	<	cursor_image->byte_order = MSBFirst;
515	<	cursor_image->bitmap_bit_order = MSBFirst;
516	<	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 36, 16, 16, 16, 2);
517	<	cursor_mask_image->byte_order = MSBFirst;
518	<	cursor_mask_image->bitmap_bit_order = MSBFirst;
519	<	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
520	<	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
521	<	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
522	<	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
523	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
524	<	cursor_changed = false;
513	>	if (hw_mac_cursor_accl) {
514	>	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
515	>	cursor_image->byte_order = MSBFirst;
516	>	cursor_image->bitmap_bit_order = MSBFirst;
517	>	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 36, 16, 16, 16, 2);
518	>	cursor_mask_image->byte_order = MSBFirst;
519	>	cursor_mask_image->bitmap_bit_order = MSBFirst;
520	>	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
521	>	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
522	>	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
523	>	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
524	>	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
525	>	cursor_changed = false;
526	>	}
527	>
528	>	// Create no_cursor
529	>	else {
530	>	mac_cursor = XCreatePixmapCursor(x_display,
531	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
532	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
533	>	&black, &white, 0, 0);
534	>	XDefineCursor(x_display, the_win, mac_cursor);
535	>	}
536
537		// Init blitting routines
538		bool native_byte_order;
#	Line 302 | Line 542 | static bool open_window(int width, int h
542		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
543		#endif
544		#ifdef ENABLE_VOSF
545	<	Screen_blitter_init(&visualInfo, native_byte_order, depth);
545	>	Screen_blitter_init(visualFormat, native_byte_order, depth);
546		#endif
547
548		// Set bytes per row
309	–	VModes[cur_mode].viRowBytes = img->bytes_per_line;
549		XSync(x_display, false);
550		return true;
551		}
#	Line 318 | Line 557 | static bool open_dga(int width, int heig
557		// Set relative mouse mode
558		ADBSetRelMouseMode(true);
559
560	+	// Create window
561	+	XSetWindowAttributes wattr;
562	+	wattr.event_mask = eventmask = dga_eventmask;
563	+	wattr.override_redirect = True;
564	+	wattr.colormap = (depth == 1 ? DefaultColormap(x_display, screen) : cmap[0]);
565	+	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
566	+	InputOutput, vis, CWEventMask | CWOverrideRedirect |
567	+	(color_class == DirectColor ? CWColormap : 0), &wattr);
568	+
569	+	// Show window
570	+	XMapRaised(x_display, the_win);
571	+	wait_mapped(the_win);
572	+
573		#ifdef ENABLE_XF86_VIDMODE
574		// Switch to best mode
575		if (has_vidmode) {
#	Line 334 | Line 586 | static bool open_dga(int width, int heig
586		#endif
587
588		// Establish direct screen connection
589	+	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
590	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
591		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
592		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
593	+
594	+	int v_width, v_bank, v_size;
595	+	XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
596		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
597		XF86DGASetViewPort(x_display, screen, 0, 0);
598		XF86DGASetVidPage(x_display, screen, 0);
599
600		// Set colormap
601	<	if (depth == 8)
601	>	if (!IsDirectMode(get_current_mode())) {
602	>	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
603		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
346	–
347	–	// Set bytes per row
348	–	int bytes_per_row = (dga_fb_width + 7) & ~7;
349	–	switch (depth) {
350	–	case 15:
351	–	case 16:
352	–	bytes_per_row *= 2;
353	–	break;
354	–	case 24:
355	–	case 32:
356	–	bytes_per_row *= 4;
357	–	break;
604		}
605	+	XSync(x_display, false);
606
607	+	// Init blitting routines
608	+	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, DepthModeForPixelDepth(depth));
609		#if ENABLE_VOSF
610		bool native_byte_order;
611		#ifdef WORDS_BIGENDIAN
#	Line 367 | Line 616 | static bool open_dga(int width, int heig
616		#if REAL_ADDRESSING || DIRECT_ADDRESSING
617		// Screen_blitter_init() returns TRUE if VOSF is mandatory
618		// i.e. the framebuffer update function is not Blit_Copy_Raw
619	<	use_vosf = Screen_blitter_init(&visualInfo, native_byte_order, depth);
619	>	use_vosf = Screen_blitter_init(visualFormat, native_byte_order, depth);
620
621		if (use_vosf) {
622		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 375 | Line 624 | static bool open_dga(int width, int heig
624		the_buffer_size = page_extend((height + 2) * bytes_per_row);
625		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
626		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
627	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
628		}
629		#else
630		use_vosf = false;
381	–	the_buffer = dga_screen_base;
631		#endif
632		#endif
384	–	screen_base = (uint32)the_buffer;
633
634	+	// Set frame buffer base
635	+	D(bug("the_buffer = %p, use_vosf = %d\n", the_buffer, use_vosf));
636	+	screen_base = Host2MacAddr(the_buffer);
637		VModes[cur_mode].viRowBytes = bytes_per_row;
387	–	XSync(x_display, false);
638		return true;
639		#else
640		ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
#	Line 394 | Line 644 | static bool open_dga(int width, int heig
644
645		static bool open_display(void)
646		{
647	<	display_type = VModes[cur_mode].viType;
648	<	switch (VModes[cur_mode].viAppleMode) {
649	<	case APPLE_1_BIT:
650	<	depth = 1;
651	<	break;
652	<	case APPLE_2_BIT:
653	<	depth = 2;
654	<	break;
655	<	case APPLE_4_BIT:
656	<	depth = 4;
657	<	break;
658	<	case APPLE_8_BIT:
659	<	depth = 8;
660	<	break;
661	<	case APPLE_16_BIT:
662	<	depth = xdepth == 15 ? 15 : 16;
663	<	break;
664	<	case APPLE_32_BIT:
665	<	depth = 32;
666	<	break;
647	>	D(bug("open_display()\n"));
648	>	const VideoInfo &mode = VModes[cur_mode];
649	>
650	>	// Find best available X visual
651	>	if (!find_visual_for_depth(mode.viAppleMode)) {
652	>	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
653	>	return false;
654	>	}
655	>
656	>	// Build up visualFormat structure
657	>	visualFormat.depth = visualInfo.depth;
658	>	visualFormat.Rmask = visualInfo.red_mask;
659	>	visualFormat.Gmask = visualInfo.green_mask;
660	>	visualFormat.Bmask = visualInfo.blue_mask;
661	>
662	>	// Create color maps
663	>	if (color_class == PseudoColor || color_class == DirectColor) {
664	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
665	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
666	>	} else {
667	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
668	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
669	>	}
670	>
671	>	// Find pixel format of direct modes
672	>	if (color_class == DirectColor || color_class == TrueColor) {
673	>	rshift = gshift = bshift = 0;
674	>	rloss = gloss = bloss = 8;
675	>	uint32 mask;
676	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
677	>	++rshift;
678	>	for (; mask&1; mask>>=1)
679	>	--rloss;
680	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
681	>	++gshift;
682	>	for (; mask&1; mask>>=1)
683	>	--gloss;
684	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
685	>	++bshift;
686	>	for (; mask&1; mask>>=1)
687	>	--bloss;
688	>	}
689	>
690	>	// Preset palette pixel values for CLUT or gamma table
691	>	if (color_class == DirectColor) {
692	>	int num = vis->map_entries;
693	>	for (int i=0; i<num; i++) {
694	>	int c = (i * 256) / num;
695	>	x_palette[i].pixel = map_rgb(c, c, c);
696	>	x_palette[i].flags = DoRed | DoGreen | DoBlue;
697	>	}
698	>	} else if (color_class == PseudoColor) {
699	>	for (int i=0; i<256; i++) {
700	>	x_palette[i].pixel = i;
701	>	x_palette[i].flags = DoRed | DoGreen | DoBlue;
702	>	}
703		}
704
705	+	// Load gray ramp to color map
706	+	int num = (color_class == DirectColor ? vis->map_entries : 256);
707	+	for (int i=0; i<num; i++) {
708	+	int c = (i * 256) / num;
709	+	x_palette[i].red = c * 0x0101;
710	+	x_palette[i].green = c * 0x0101;
711	+	x_palette[i].blue = c * 0x0101;
712	+	}
713	+	if (color_class == PseudoColor || color_class == DirectColor) {
714	+	XStoreColors(x_display, cmap[0], x_palette, num);
715	+	XStoreColors(x_display, cmap[1], x_palette, num);
716	+	}
717	+
718	+	#ifdef ENABLE_VOSF
719	+	// Load gray ramp to 8->16/32 expand map
720	+	if (!IsDirectMode(get_current_mode()) && xdepth > 8)
721	+	for (int i=0; i<256; i++)
722	+	ExpandMap[i] = map_rgb(i, i, i);
723	+	#endif
724	+
725	+	// Create display of requested type
726	+	display_type = mode.viType;
727	+	depth = depth_of_video_mode(mode.viAppleMode);
728	+
729		bool display_open = false;
730		if (display_type == DIS_SCREEN)
731		display_open = open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
#	Line 463 | Line 773 | static void close_window(void)
773		if (the_gc)
774		XFreeGC(x_display, the_gc);
775
776	<	// Close window
777	<	XDestroyWindow(x_display, the_win);
776	>	XFlush(x_display);
777	>	XSync(x_display, false);
778		}
779
780		// Close DGA mode
#	Line 500 | Line 810 | static void close_display(void)
810		else if (display_type == DIS_WINDOW)
811		close_window();
812
813	+	// Close window
814	+	if (the_win) {
815	+	XUnmapWindow(x_display, the_win);
816	+	wait_unmapped(the_win);
817	+	XDestroyWindow(x_display, the_win);
818	+	}
819	+
820	+	// Free colormaps
821	+	if (cmap[0]) {
822	+	XFreeColormap(x_display, cmap[0]);
823	+	cmap[0] = 0;
824	+	}
825	+	if (cmap[1]) {
826	+	XFreeColormap(x_display, cmap[1]);
827	+	cmap[1] = 0;
828	+	}
829	+
830		#ifdef ENABLE_VOSF
831		if (use_vosf) {
832		// Deinitialize VOSF
#	Line 565 | Line 892 | static void keycode_init(void)
892
893		// Search for server vendor string, then read keycodes
894		const char *vendor = ServerVendor(x_display);
895	+	// Force use of MacX mappings on MacOS X with Apple's X server
896	+	int dummy;
897	+	if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy))
898	+	vendor = "MacX";
899		bool vendor_found = false;
900		char line[256];
901		while (fgets(line, 255, f)) {
#	Line 606 | Line 937 | static void keycode_init(void)
937		}
938		}
939
940	<	static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, long apple_mode, long apple_id, int type)
940	>	// Find Apple mode matching best specified dimensions
941	>	static int find_apple_resolution(int xsize, int ysize)
942	>	{
943	>	int apple_id;
944	>	if (xsize < 800)
945	>	apple_id = APPLE_640x480;
946	>	else if (xsize < 1024)
947	>	apple_id = APPLE_800x600;
948	>	else if (xsize < 1152)
949	>	apple_id = APPLE_1024x768;
950	>	else if (xsize < 1280) {
951	>	if (ysize < 900)
952	>	apple_id = APPLE_1152x768;
953	>	else
954	>	apple_id = APPLE_1152x900;
955	>	}
956	>	else if (xsize < 1600)
957	>	apple_id = APPLE_1280x1024;
958	>	else
959	>	apple_id = APPLE_1600x1200;
960	>	return apple_id;
961	>	}
962	>
963	>	// Find mode in list of supported modes
964	>	static int find_mode(int apple_mode, int apple_id, int type)
965	>	{
966	>	for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
967	>	if (p->viType == type && p->viAppleID == apple_id && p->viAppleMode == apple_mode)
968	>	return p - VModes;
969	>	}
970	>	return -1;
971	>	}
972	>
973	>	// Add custom video mode
974	>	static void add_custom_mode(VideoInfo *&p, int type, uint32 x, uint32 y, int apple_mode, int apple_id)
975	>	{
976	>	p->viType = type;
977	>	p->viXsize = x;
978	>	p->viYsize = y;
979	>	p->viRowBytes = TrivialBytesPerRow(p->viXsize, apple_mode);
980	>	p->viAppleMode = apple_mode;
981	>	p->viAppleID = apple_id;
982	>	p++;
983	>	}
984	>
985	>	// Add mode to list of supported modes
986	>	static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, int apple_mode, int apple_id, int type)
987		{
988		if (allow & test) {
989	<	p->viType = type;
989	>	uint32 x = 0, y = 0;
990		switch (apple_id) {
991		case APPLE_W_640x480:
992		case APPLE_640x480:
993	<	p->viXsize = 640;
994	<	p->viYsize = 480;
993	>	x = 640;
994	>	y = 480;
995		break;
996		case APPLE_W_800x600:
997		case APPLE_800x600:
998	<	p->viXsize = 800;
999	<	p->viYsize = 600;
998	>	x = 800;
999	>	y = 600;
1000		break;
1001		case APPLE_1024x768:
1002	<	p->viXsize = 1024;
1003	<	p->viYsize = 768;
1002	>	x = 1024;
1003	>	y = 768;
1004	>	break;
1005	>	case APPLE_1152x768:
1006	>	x = 1152;
1007	>	y = 768;
1008		break;
1009		case APPLE_1152x900:
1010	<	p->viXsize = 1152;
1011	<	p->viYsize = 900;
1010	>	x = 1152;
1011	>	y = 900;
1012		break;
1013		case APPLE_1280x1024:
1014	<	p->viXsize = 1280;
1015	<	p->viYsize = 1024;
1014	>	x = 1280;
1015	>	y = 1024;
1016		break;
1017		case APPLE_1600x1200:
1018	<	p->viXsize = 1600;
1019	<	p->viYsize = 1200;
1018	>	x = 1600;
1019	>	y = 1200;
1020		break;
1021		}
1022	<	switch (apple_mode) {
642	<	case APPLE_8_BIT:
643	<	p->viRowBytes = p->viXsize;
644	<	break;
645	<	case APPLE_16_BIT:
646	<	p->viRowBytes = p->viXsize * 2;
647	<	break;
648	<	case APPLE_32_BIT:
649	<	p->viRowBytes = p->viXsize * 4;
650	<	break;
651	<	}
652	<	p->viAppleMode = apple_mode;
653	<	p->viAppleID = apple_id;
654	<	p++;
1022	>	add_custom_mode(p, type, x, y, apple_mode, apple_id);
1023		}
1024		}
1025
1026	+	// Add standard list of windowed modes for given color depth
1027	+	static void add_window_modes(VideoInfo *&p, int window_modes, int mode)
1028	+	{
1029	+	add_mode(p, window_modes, 1, mode, APPLE_W_640x480, DIS_WINDOW);
1030	+	add_mode(p, window_modes, 2, mode, APPLE_W_800x600, DIS_WINDOW);
1031	+	}
1032	+
1033		static bool has_mode(int x, int y)
1034		{
1035		#ifdef ENABLE_XF86_VIDMODE
#	Line 682 | Line 1057 | bool VideoInit(void)
1057		// Init keycode translation
1058		keycode_init();
1059
1060	+	// Read frame skip prefs
1061	+	frame_skip = PrefsFindInt32("frameskip");
1062	+	if (frame_skip == 0)
1063	+	frame_skip = 1;
1064	+
1065	+	// Read mouse wheel prefs
1066	+	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1067	+	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1068	+
1069		// Init variables
1070		private_data = NULL;
687	–	cur_mode = 0;   // Window 640x480
1071		video_activated = true;
1072
1073		// Find screen and root window
1074		screen = XDefaultScreen(x_display);
1075		rootwin = XRootWindow(x_display, screen);
1076
1077	+	// Get sorted list of available depths
1078	+	avail_depths = XListDepths(x_display, screen, &num_depths);
1079	+	if (avail_depths == NULL) {
1080	+	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1081	+	return false;
1082	+	}
1083	+	sort(avail_depths, avail_depths + num_depths);
1084	+
1085		// Get screen depth
1086		xdepth = DefaultDepth(x_display, screen);
1087
#	Line 721 | Line 1112 | bool VideoInit(void)
1112		black_pixel = BlackPixel(x_display, screen);
1113		white_pixel = WhitePixel(x_display, screen);
1114
724	–	// Get appropriate visual
725	–	int color_class;
726	–	switch (xdepth) {
727	–	#if 0
728	–	case 1:
729	–	color_class = StaticGray;
730	–	break;
731	–	#endif
732	–	case 8:
733	–	color_class = PseudoColor;
734	–	break;
735	–	case 15:
736	–	case 16:
737	–	case 24:
738	–	case 32:
739	–	color_class = TrueColor;
740	–	break;
741	–	default:
742	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
743	–	return false;
744	–	}
745	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
746	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
747	–	return false;
748	–	}
749	–	if (visualInfo.depth != xdepth) {
750	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
751	–	return false;
752	–	}
753	–	vis = visualInfo.visual;
754	–
1115		// Mac screen depth follows X depth (for now)
1116	<	depth = xdepth;
1117	<
1118	<	// Create color maps for 8 bit mode
1119	<	if (depth == 8) {
1120	<	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1121	<	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1122	<	XInstallColormap(x_display, cmap[0]);
1123	<	XInstallColormap(x_display, cmap[1]);
1116	>	int default_mode = APPLE_8_BIT;
1117	>	switch (DefaultDepth(x_display, screen)) {
1118	>	case 1:
1119	>	default_mode = APPLE_1_BIT;
1120	>	break;
1121	>	case 8:
1122	>	default_mode = APPLE_8_BIT;
1123	>	break;
1124	>	case 15: case 16:
1125	>	default_mode = APPLE_16_BIT;
1126	>	break;
1127	>	case 24: case 32:
1128	>	default_mode = APPLE_32_BIT;
1129	>	break;
1130	>	}
1131	>
1132	>	// Get screen mode from preferences
1133	>	const char *mode_str = PrefsFindString("screen");
1134	>	int default_width = 640, default_height = 480;
1135	>	if (mode_str) {
1136	>	display_type = DIS_INVALID;
1137	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1138	>	display_type = DIS_WINDOW;
1139	>	#ifdef ENABLE_XF86_DGA
1140	>	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1141	>	display_type = DIS_SCREEN;
1142	>	#endif
1143	>	if (display_type == DIS_INVALID) {
1144	>	D(bug("Invalid screen mode specified, defaulting to old modes selection\n"));
1145	>	mode_str = NULL;
1146	>	}
1147	>	else {
1148	>	if (default_width <= 0)
1149	>	default_width = DisplayWidth(x_display, screen);
1150	>	else if (default_width > DisplayWidth(x_display, screen))
1151	>	default_width = DisplayWidth(x_display, screen);
1152	>	if (default_height <= 0)
1153	>	default_height = DisplayHeight(x_display, screen);
1154	>	else if (default_height > DisplayHeight(x_display, screen))
1155	>	default_height = DisplayHeight(x_display, screen);
1156	>	}
1157		}
1158
1159		// Construct video mode table
767	–	int mode = APPLE_8_BIT;
768	–	int bpr_mult = 8;
769	–	switch (depth) {
770	–	case 1:
771	–	mode = APPLE_1_BIT;
772	–	bpr_mult = 1;
773	–	break;
774	–	case 8:
775	–	mode = APPLE_8_BIT;
776	–	bpr_mult = 8;
777	–	break;
778	–	case 15:
779	–	case 16:
780	–	mode = APPLE_16_BIT;
781	–	bpr_mult = 16;
782	–	break;
783	–	case 24:
784	–	case 32:
785	–	mode = APPLE_32_BIT;
786	–	bpr_mult = 32;
787	–	break;
788	–	}
789	–
1160		uint32 window_modes = PrefsFindInt32("windowmodes");
1161		uint32 screen_modes = PrefsFindInt32("screenmodes");
1162		if (!has_dga)
1163		screen_modes = 0;
1164	<	if (window_modes == 0 && screen_modes == 0)
1164	>	if (mode_str)
1165	>	window_modes = screen_modes = 0;
1166	>	else if (window_modes == 0 && screen_modes == 0)
1167		window_modes |= 3;      // Allow at least 640x480 and 800x600 window modes
1168
1169		VideoInfo *p = VModes;
1170	<	add_mode(p, window_modes, 1, mode, APPLE_W_640x480, DIS_WINDOW);
1171	<	add_mode(p, window_modes, 2, mode, APPLE_W_800x600, DIS_WINDOW);
1172	<	if (has_vidmode) {
1170	>	if (mode_str) {
1171	>	if (display_type == DIS_WINDOW) {
1172	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++) {
1173	>	if (find_visual_for_depth(d)) {
1174	>	if (default_width > 640 && default_height > 480)
1175	>	add_mode(p, 3, 1, d, APPLE_W_640x480, DIS_WINDOW);
1176	>	if (default_width > 800 && default_height > 600)
1177	>	add_mode(p, 3, 2, d, APPLE_W_800x600, DIS_WINDOW);
1178	>	add_custom_mode(p, display_type, default_width, default_height, d, APPLE_CUSTOM);
1179	>	}
1180	>	}
1181	>	} else
1182	>	add_custom_mode(p, display_type, default_width, default_height, default_mode, APPLE_CUSTOM);
1183	>	} else if (window_modes) {
1184	>	for (unsigned int d = APPLE_1_BIT; d <= APPLE_32_BIT; d++)
1185	>	if (find_visual_for_depth(d))
1186	>	add_window_modes(p, window_modes, d);
1187	>	} else if (has_vidmode) {
1188		if (has_mode(640, 480))
1189	<	add_mode(p, screen_modes, 1, mode, APPLE_640x480, DIS_SCREEN);
1189	>	add_mode(p, screen_modes, 1, default_mode, APPLE_640x480, DIS_SCREEN);
1190		if (has_mode(800, 600))
1191	<	add_mode(p, screen_modes, 2, mode, APPLE_800x600, DIS_SCREEN);
1191	>	add_mode(p, screen_modes, 2, default_mode, APPLE_800x600, DIS_SCREEN);
1192		if (has_mode(1024, 768))
1193	<	add_mode(p, screen_modes, 4, mode, APPLE_1024x768, DIS_SCREEN);
1193	>	add_mode(p, screen_modes, 4, default_mode, APPLE_1024x768, DIS_SCREEN);
1194	>	if (has_mode(1152, 768))
1195	>	add_mode(p, screen_modes, 64, default_mode, APPLE_1152x768, DIS_SCREEN);
1196		if (has_mode(1152, 900))
1197	<	add_mode(p, screen_modes, 8, mode, APPLE_1152x900, DIS_SCREEN);
1197	>	add_mode(p, screen_modes, 8, default_mode, APPLE_1152x900, DIS_SCREEN);
1198		if (has_mode(1280, 1024))
1199	<	add_mode(p, screen_modes, 16, mode, APPLE_1280x1024, DIS_SCREEN);
1199	>	add_mode(p, screen_modes, 16, default_mode, APPLE_1280x1024, DIS_SCREEN);
1200		if (has_mode(1600, 1200))
1201	<	add_mode(p, screen_modes, 32, mode, APPLE_1600x1200, DIS_SCREEN);
1201	>	add_mode(p, screen_modes, 32, default_mode, APPLE_1600x1200, DIS_SCREEN);
1202		} else if (screen_modes) {
1203		int xsize = DisplayWidth(x_display, screen);
1204		int ysize = DisplayHeight(x_display, screen);
1205	<	int apple_id;
817	<	if (xsize < 800)
818	<	apple_id = APPLE_640x480;
819	<	else if (xsize < 1024)
820	<	apple_id = APPLE_800x600;
821	<	else if (xsize < 1152)
822	<	apple_id = APPLE_1024x768;
823	<	else if (xsize < 1280)
824	<	apple_id = APPLE_1152x900;
825	<	else if (xsize < 1600)
826	<	apple_id = APPLE_1280x1024;
827	<	else
828	<	apple_id = APPLE_1600x1200;
1205	>	int apple_id = find_apple_resolution(xsize, ysize);
1206		p->viType = DIS_SCREEN;
1207		p->viRowBytes = 0;
1208		p->viXsize = xsize;
1209		p->viYsize = ysize;
1210	<	p->viAppleMode = mode;
1210	>	p->viAppleMode = default_mode;
1211		p->viAppleID = apple_id;
1212		p++;
1213		}
#	Line 840 | Line 1217 | bool VideoInit(void)
1217		p->viAppleMode = 0;
1218		p->viAppleID = 0;
1219
1220	<	#ifdef ENABLE_XF86_DGA
1220	>	// Find default mode (window 640x480)
1221	>	cur_mode = -1;
1222		if (has_dga && screen_modes) {
1223	<	int v_bank, v_size;
1224	<	XF86DGAGetVideo(x_display, screen, &dga_screen_base, &dga_fb_width, &v_bank, &v_size);
1225	<	D(bug("DGA screen_base %p, v_width %d\n", dga_screen_base, dga_fb_width));
1223	>	int screen_width = DisplayWidth(x_display, screen);
1224	>	int screen_height = DisplayHeight(x_display, screen);
1225	>	int apple_id = find_apple_resolution(screen_width, screen_height);
1226	>	if (apple_id != -1)
1227	>	cur_mode = find_mode(default_mode, apple_id, DIS_SCREEN);
1228	>	} else if (has_dga && mode_str)
1229	>	cur_mode = find_mode(default_mode, APPLE_CUSTOM, DIS_SCREEN);
1230	>
1231	>	if (cur_mode == -1) {
1232	>	// pick up first windowed mode available
1233	>	for (VideoInfo *p = VModes; p->viType != DIS_INVALID; p++) {
1234	>	if (p->viType == DIS_WINDOW && p->viAppleMode == default_mode) {
1235	>	cur_mode = p - VModes;
1236	>	break;
1237	>	}
1238	>	}
1239	>	}
1240	>	assert(cur_mode != -1);
1241	>
1242	>	#if DEBUG
1243	>	D(bug("Available video modes:\n"));
1244	>	for (p = VModes; p->viType != DIS_INVALID; p++) {
1245	>	int bits = depth_of_video_mode(p->viAppleMode);
1246	>	D(bug(" %dx%d (ID %02x), %d colors\n", p->viXsize, p->viYsize, p->viAppleID, 1 << bits));
1247		}
1248		#endif
1249
#	Line 859 | Line 1258 | bool VideoInit(void)
1258
1259		// Start periodic thread
1260		XSync(x_display, false);
1261	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1261	>	Set_pthread_attr(&redraw_thread_attr, 0);
1262	>	redraw_thread_cancel = false;
1263	>	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1264		D(bug("Redraw thread installed (%ld)\n", redraw_thread));
1265		return true;
1266		}
#	Line 873 | Line 1274 | void VideoExit(void)
1274		{
1275		// Stop redraw thread
1276		if (redraw_thread_active) {
1277	+	redraw_thread_cancel = true;
1278		pthread_cancel(redraw_thread);
1279		pthread_join(redraw_thread, NULL);
1280		redraw_thread_active = false;
#	Line 891 | Line 1293 | void VideoExit(void)
1293		close_display();
1294		XFlush(x_display);
1295		XSync(x_display, false);
894	–	if (depth == 8) {
895	–	XFreeColormap(x_display, cmap[0]);
896	–	XFreeColormap(x_display, cmap[1]);
897	–	}
1296		}
1297		}
1298
#	Line 920 | Line 1318 | static void suspend_emul(void)
1318		// Save frame buffer
1319		fb_save = malloc(VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1320		if (fb_save)
1321	<	memcpy(fb_save, (void *)screen_base, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1321	>	Mac2Host_memcpy(fb_save, screen_base, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1322
1323		// Close full screen display
1324		#ifdef ENABLE_XF86_DGA
#	Line 958 | Line 1356 | static void resume_emul(void)
1356		// Reopen full screen display
1357		XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1358		XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1359	+	#ifdef ENABLE_XF86_DGA
1360		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1361		XF86DGASetViewPort(x_display, screen, 0, 0);
1362	+	#endif
1363		XSync(x_display, false);
1364
1365		// the_buffer already contains the data to restore. i.e. since a temporary
#	Line 980 | Line 1380 | static void resume_emul(void)
1380		// Don't copy fb_save to the temporary frame buffer in VOSF mode
1381		if (!use_vosf)
1382		#endif
1383	<	memcpy((void *)screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1383	>	Host2Mac_memcpy(screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1384		free(fb_save);
1385		fb_save = NULL;
1386		}
#	Line 1153 | Line 1553 | static int kc_decode(KeySym ks)
1553		return -1;
1554		}
1555
1556	<	static int event2keycode(XKeyEvent &ev)
1556	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1557		{
1558		KeySym ks;
1159	–	int as;
1559		int i = 0;
1560
1561		do {
1562		ks = XLookupKeysym(&ev, i++);
1563	<	as = kc_decode(ks);
1564	<	if (as != -1)
1563	>	int as = kc_decode(ks);
1564	>	if (as >= 0)
1565	>	return as;
1566	>	if (as == -2)
1567		return as;
1568		} while (ks != NoSymbol);
1569
#	Line 1175 | Line 1576 | static void handle_events(void)
1576		for (;;) {
1577		XEvent event;
1578
1579	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1579	>	XDisplayLock();
1580	>	if (!XCheckMaskEvent(x_display, eventmask, &event)) {
1581	>	// Handle clipboard events
1582	>	if (XCheckTypedEvent(x_display, SelectionRequest, &event))
1583	>	ClipboardSelectionRequest(&event.xselectionrequest);
1584	>	else if (XCheckTypedEvent(x_display, SelectionClear, &event))
1585	>	ClipboardSelectionClear(&event.xselectionclear);
1586	>
1587	>	// Window "close" widget clicked
1588	>	else if (XCheckTypedEvent(x_display, ClientMessage, &event)) {
1589	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1590	>	ADBKeyDown(0x7f);       // Power key
1591	>	ADBKeyUp(0x7f);
1592	>	}
1593	>	}
1594	>
1595	>	XDisplayUnlock();
1596		break;
1597	+	}
1598	+	XDisplayUnlock();
1599
1600		switch (event.type) {
1601		// Mouse button
#	Line 1184 | Line 1603 | static void handle_events(void)
1603		unsigned int button = ((XButtonEvent *)&event)->button;
1604		if (button < 4)
1605		ADBMouseDown(button - 1);
1606	+	else if (button < 6) {  // Wheel mouse
1607	+	if (mouse_wheel_mode == 0) {
1608	+	int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
1609	+	ADBKeyDown(key);
1610	+	ADBKeyUp(key);
1611	+	} else {
1612	+	int key = (button == 5) ? 0x3d : 0x3e;  // Cursor up/down
1613	+	for(int i=0; i<mouse_wheel_lines; i++) {
1614	+	ADBKeyDown(key);
1615	+	ADBKeyUp(key);
1616	+	}
1617	+	}
1618	+	}
1619		break;
1620		}
1621		case ButtonRelease: {
#	Line 1193 | Line 1625 | static void handle_events(void)
1625		break;
1626		}
1627
1628	<	// Mouse moved
1628	>	// Mouse entered window
1629		case EnterNotify:
1630	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1630	>	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
1631	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1632		break;
1633	+
1634	+	// Mouse moved
1635		case MotionNotify:
1636	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1636	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1637		break;
1638
1639		// Keyboard
1640		case KeyPress: {
1641	<	int code = event2keycode(event.xkey);
1642	<	if (use_keycodes && code != -1)
1643	<	code = keycode_table[event.xkey.keycode & 0xff];
1644	<	if (code != -1) {
1641	>	int code = -1;
1642	>	if (use_keycodes) {
1643	>	if (event2keycode(event.xkey, true) != -2)      // This is called to process the hotkeys
1644	>	code = keycode_table[event.xkey.keycode & 0xff];
1645	>	} else
1646	>	code = event2keycode(event.xkey, true);
1647	>	if (code >= 0) {
1648		if (!emul_suspended) {
1649	<	ADBKeyDown(code);
1649	>	if (code == 0x39) {     // Caps Lock pressed
1650	>	if (caps_on) {
1651	>	ADBKeyUp(code);
1652	>	caps_on = false;
1653	>	} else {
1654	>	ADBKeyDown(code);
1655	>	caps_on = true;
1656	>	}
1657	>	} else
1658	>	ADBKeyDown(code);
1659		if (code == 0x36)
1660		ctrl_down = true;
1661		} else {
#	Line 1219 | Line 1666 | static void handle_events(void)
1666		break;
1667		}
1668		case KeyRelease: {
1669	<	int code = event2keycode(event.xkey);
1670	<	if (use_keycodes && code != 1)
1671	<	code = keycode_table[event.xkey.keycode & 0xff];
1672	<	if (code != -1) {
1669	>	int code = -1;
1670	>	if (use_keycodes) {
1671	>	if (event2keycode(event.xkey, false) != -2)     // This is called to process the hotkeys
1672	>	code = keycode_table[event.xkey.keycode & 0xff];
1673	>	} else
1674	>	code = event2keycode(event.xkey, false);
1675	>	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1676		ADBKeyUp(code);
1677		if (code == 0x36)
1678		ctrl_down = false;
#	Line 1262 | Line 1712 | void VideoVBL(void)
1712
1713
1714		/*
1265	–	*  Install graphics acceleration
1266	–	*/
1267	–
1268	–	#if 0
1269	–	// Rectangle blitting
1270	–	static void accl_bitblt(accl_params *p)
1271	–	{
1272	–	D(bug("accl_bitblt\n"));
1273	–
1274	–	// Get blitting parameters
1275	–	int16 src_X = p->src_rect[1] - p->src_bounds[1];
1276	–	int16 src_Y = p->src_rect[0] - p->src_bounds[0];
1277	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1278	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1279	–	int16 width = p->dest_rect[3] - p->dest_rect[1] - 1;
1280	–	int16 height = p->dest_rect[2] - p->dest_rect[0] - 1;
1281	–	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1282	–	D(bug(" width %d, height %d\n", width, height));
1283	–
1284	–	// And perform the blit
1285	–	bitblt_hook(src_X, src_Y, dest_X, dest_Y, width, height);
1286	–	}
1287	–
1288	–	static bool accl_bitblt_hook(accl_params *p)
1289	–	{
1290	–	D(bug("accl_draw_hook %p\n", p));
1291	–
1292	–	// Check if we can accelerate this bitblt
1293	–	if (p->src_base_addr == screen_base && p->dest_base_addr == screen_base &&
1294	–	display_type == DIS_SCREEN && bitblt_hook != NULL &&
1295	–	((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
1296	–	((uint32 *)p)[0x130 >> 2] == 0 &&
1297	–	p->transfer_mode == 0 &&
1298	–	p->src_row_bytes > 0 && ((uint32 *)p)[0x15c >> 2] > 0) {
1299	–
1300	–	// Yes, set function pointer
1301	–	p->draw_proc = accl_bitblt;
1302	–	return true;
1303	–	}
1304	–	return false;
1305	–	}
1306	–
1307	–	// Rectangle filling/inversion
1308	–	static void accl_fillrect8(accl_params *p)
1309	–	{
1310	–	D(bug("accl_fillrect8\n"));
1311	–
1312	–	// Get filling parameters
1313	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1314	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1315	–	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1316	–	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1317	–	uint8 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1318	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1319	–	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1320	–
1321	–	// And perform the fill
1322	–	fillrect8_hook(dest_X, dest_Y, dest_X_max, dest_Y_max, color);
1323	–	}
1324	–
1325	–	static void accl_fillrect32(accl_params *p)
1326	–	{
1327	–	D(bug("accl_fillrect32\n"));
1328	–
1329	–	// Get filling parameters
1330	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1331	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1332	–	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1333	–	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1334	–	uint32 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
1335	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1336	–	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1337	–
1338	–	// And perform the fill
1339	–	fillrect32_hook(dest_X, dest_Y, dest_X_max, dest_Y_max, color);
1340	–	}
1341	–
1342	–	static void accl_invrect(accl_params *p)
1343	–	{
1344	–	D(bug("accl_invrect\n"));
1345	–
1346	–	// Get inversion parameters
1347	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1348	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1349	–	int16 dest_X_max = p->dest_rect[3] - p->dest_bounds[1] - 1;
1350	–	int16 dest_Y_max = p->dest_rect[2] - p->dest_bounds[0] - 1;
1351	–	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1352	–	D(bug(" dest X max %d, dest Y max %d\n", dest_X_max, dest_Y_max));
1353	–
1354	–	//!!?? pen_mode == 14
1355	–
1356	–	// And perform the inversion
1357	–	invrect_hook(dest_X, dest_Y, dest_X_max, dest_Y_max);
1358	–	}
1359	–
1360	–	static bool accl_fillrect_hook(accl_params *p)
1361	–	{
1362	–	D(bug("accl_fillrect_hook %p\n", p));
1363	–
1364	–	// Check if we can accelerate this fillrect
1365	–	if (p->dest_base_addr == screen_base && ((uint32 *)p)[0x284 >> 2] != 0 && display_type == DIS_SCREEN) {
1366	–	if (p->transfer_mode == 8) {
1367	–	// Fill
1368	–	if (p->dest_pixel_size == 8 && fillrect8_hook != NULL) {
1369	–	p->draw_proc = accl_fillrect8;
1370	–	return true;
1371	–	} else if (p->dest_pixel_size == 32 && fillrect32_hook != NULL) {
1372	–	p->draw_proc = accl_fillrect32;
1373	–	return true;
1374	–	}
1375	–	} else if (p->transfer_mode == 10 && invrect_hook != NULL) {
1376	–	// Invert
1377	–	p->draw_proc = accl_invrect;
1378	–	return true;
1379	–	}
1380	–	}
1381	–	return false;
1382	–	}
1383	–
1384	–	// Wait for graphics operation to finish
1385	–	static bool accl_sync_hook(void *arg)
1386	–	{
1387	–	D(bug("accl_sync_hook %p\n", arg));
1388	–	if (sync_hook != NULL)
1389	–	sync_hook();
1390	–	return true;
1391	–	}
1392	–
1393	–	static struct accl_hook_info bitblt_hook_info = {accl_bitblt_hook, accl_sync_hook, ACCL_BITBLT};
1394	–	static struct accl_hook_info fillrect_hook_info = {accl_fillrect_hook, accl_sync_hook, ACCL_FILLRECT};
1395	–	#endif
1396	–
1397	–	void VideoInstallAccel(void)
1398	–	{
1399	–	// Install acceleration hooks
1400	–	if (PrefsFindBool("gfxaccel")) {
1401	–	D(bug("Video: Installing acceleration hooks\n"));
1402	–	//!!    NQDMisc(6, &bitblt_hook_info);
1403	–	//              NQDMisc(6, &fillrect_hook_info);
1404	–	}
1405	–	}
1406	–
1407	–
1408	–	/*
1715		*  Change video mode
1716		*/
1717
#	Line 1463 | Line 1769 | int16 video_mode_change(VidLocals *csSav
1769
1770		void video_set_palette(void)
1771		{
1772	+	LOCK_PALETTE;
1773	+
1774	+	// Convert colors to XColor array
1775	+	int mode = get_current_mode();
1776	+	int num_in = palette_size(mode);
1777	+	int num_out = 256;
1778	+	bool stretch = false;
1779	+	if (IsDirectMode(mode)) {
1780	+	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1781	+	num_out = vis->map_entries;
1782	+	stretch = true;
1783	+	}
1784	+	XColor *p = x_palette;
1785	+	for (int i=0; i<num_out; i++) {
1786	+	int c = (stretch ? (i * num_in) / num_out : i);
1787	+	p->red = mac_pal[c].red * 0x0101;
1788	+	p->green = mac_pal[c].green * 0x0101;
1789	+	p->blue = mac_pal[c].blue * 0x0101;
1790	+	p++;
1791	+	}
1792	+
1793	+	#ifdef ENABLE_VOSF
1794	+	// Recalculate pixel color expansion map
1795	+	if (!IsDirectMode(mode) && xdepth > 8) {
1796	+	for (int i=0; i<256; i++) {
1797	+	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1798	+	ExpandMap[i] = map_rgb(mac_pal[c].red, mac_pal[c].green, mac_pal[c].blue);
1799	+	}
1800	+
1801	+	// We have to redraw everything because the interpretation of pixel values changed
1802	+	LOCK_VOSF;
1803	+	PFLAG_SET_ALL;
1804	+	UNLOCK_VOSF;
1805	+	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1806	+	}
1807	+	#endif
1808	+
1809	+	// Tell redraw thread to change palette
1810		palette_changed = true;
1811	+
1812	+	UNLOCK_PALETTE;
1813	+	}
1814	+
1815	+
1816	+	/*
1817	+	*  Can we set the MacOS cursor image into the window?
1818	+	*/
1819	+
1820	+	bool video_can_change_cursor(void)
1821	+	{
1822	+	return hw_mac_cursor_accl && (display_type != DIS_SCREEN);
1823		}
1824
1825
#	Line 1590 | Line 1946 | static void update_display(void)
1946
1947		// Refresh display
1948		if (high && wide) {
1949	+	XDisplayLock();
1950		if (have_shm)
1951		XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1952		else
1953		XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1954	+	XDisplayUnlock();
1955		}
1956		}
1957
1958	+	const int VIDEO_REFRESH_HZ = 60;
1959	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
1960	+
1961	+	static void handle_palette_changes(void)
1962	+	{
1963	+	LOCK_PALETTE;
1964	+
1965	+	if (palette_changed && !emul_suspended) {
1966	+	palette_changed = false;
1967	+
1968	+	int mode = get_current_mode();
1969	+	if (color_class == PseudoColor || color_class == DirectColor) {
1970	+	int num = vis->map_entries;
1971	+	bool set_clut = true;
1972	+	if (!IsDirectMode(mode) && color_class == DirectColor) {
1973	+	if (display_type == DIS_WINDOW)
1974	+	set_clut = false; // Indexed mode on true color screen, don't set CLUT
1975	+	}
1976	+
1977	+	if (set_clut) {
1978	+	XDisplayLock();
1979	+	XStoreColors(x_display, cmap[0], x_palette, num);
1980	+	XStoreColors(x_display, cmap[1], x_palette, num);
1981	+	XSync(x_display, false);
1982	+	XDisplayUnlock();
1983	+	}
1984	+	}
1985	+
1986	+	#ifdef ENABLE_XF86_DGA
1987	+	if (display_type == DIS_SCREEN) {
1988	+	current_dga_cmap ^= 1;
1989	+	if (!IsDirectMode(mode) && cmap[current_dga_cmap])
1990	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1991	+	}
1992	+	#endif
1993	+	}
1994	+
1995	+	UNLOCK_PALETTE;
1996	+	}
1997	+
1998		static void *redraw_func(void *arg)
1999		{
2000	<	int tick_counter = 0;
1603	<	struct timespec req = {0, 16666667};
2000	>	int fd = ConnectionNumber(x_display);
2001
2002	<	for (;;) {
2002	>	uint64 start = GetTicks_usec();
2003	>	int64 ticks = 0;
2004	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2005
2006	<	// Wait
1608	<	nanosleep(&req, NULL);
2006	>	while (!redraw_thread_cancel) {
2007
2008		// Pause if requested (during video mode switches)
2009		while (thread_stop_req)
2010		thread_stop_ack = true;
2011
2012	<	// Handle X11 events
2013	<	handle_events();
2012	>	int64 delay = next - GetTicks_usec();
2013	>	if (delay < -VIDEO_REFRESH_DELAY) {
2014	>
2015	>	// We are lagging far behind, so we reset the delay mechanism
2016	>	next = GetTicks_usec();
2017	>
2018	>	} else if (delay <= 0) {
2019
2020	<	// Quit DGA mode if requested
2021	<	if (quit_full_screen) {
2022	<	quit_full_screen = false;
2023	<	if (display_type == DIS_SCREEN) {
2020	>	// Delay expired, refresh display
2021	>	next += VIDEO_REFRESH_DELAY;
2022	>	ticks++;
2023	>
2024	>	// Handle X11 events
2025	>	handle_events();
2026	>
2027	>	// Quit DGA mode if requested
2028	>	if (quit_full_screen) {
2029	>	quit_full_screen = false;
2030	>	if (display_type == DIS_SCREEN) {
2031	>	XDisplayLock();
2032		#ifdef ENABLE_XF86_DGA
2033	<	XF86DGADirectVideo(x_display, screen, 0);
2034	<	XUngrabPointer(x_display, CurrentTime);
2035	<	XUngrabKeyboard(x_display, CurrentTime);
2036	<	#endif
2037	<	XSync(x_display, false);
2038	<	quit_full_screen_ack = true;
2039	<	return NULL;
2033	>	XF86DGADirectVideo(x_display, screen, 0);
2034	>	XUngrabPointer(x_display, CurrentTime);
2035	>	XUngrabKeyboard(x_display, CurrentTime);
2036	>	XUnmapWindow(x_display, the_win);
2037	>	wait_unmapped(the_win);
2038	>	XDestroyWindow(x_display, the_win);
2039	>	#endif
2040	>	XSync(x_display, false);
2041	>	XDisplayUnlock();
2042	>	quit_full_screen_ack = true;
2043	>	return NULL;
2044	>	}
2045		}
1630	–	}
2046
2047	<	// Refresh display and set cursor image in window mode
2048	<	if (display_type == DIS_WINDOW) {
2049	<	tick_counter++;
2050	<	if (tick_counter >= frame_skip) {
2051	<	tick_counter = 0;
2047	>	// Refresh display and set cursor image in window mode
2048	>	static int tick_counter = 0;
2049	>	if (display_type == DIS_WINDOW) {
2050	>	tick_counter++;
2051	>	if (tick_counter >= frame_skip) {
2052	>	tick_counter = 0;
2053
2054	<	// Update display
2054	>	// Update display
2055		#ifdef ENABLE_VOSF
2056	<	if (use_vosf) {
2057	<	if (mainBuffer.dirty) {
2058	<	LOCK_VOSF;
2059	<	update_display_window_vosf();
2060	<	UNLOCK_VOSF;
2061	<	XSync(x_display, false); // Let the server catch up
2056	>	if (use_vosf) {
2057	>	XDisplayLock();
2058	>	if (mainBuffer.dirty) {
2059	>	LOCK_VOSF;
2060	>	update_display_window_vosf();
2061	>	UNLOCK_VOSF;
2062	>	XSync(x_display, false); // Let the server catch up
2063	>	}
2064	>	XDisplayUnlock();
2065		}
2066	<	}
1648	<	else
2066	>	else
2067		#endif
2068	<	update_display();
2068	>	update_display();
2069
2070	<	// Set new cursor image if it was changed
2071	<	if (cursor_changed) {
2072	<	cursor_changed = false;
2073	<	memcpy(cursor_image->data, MacCursor + 4, 32);
2074	<	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
2075	<	XFreeCursor(x_display, mac_cursor);
2076	<	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
2077	<	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
2078	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, MacCursor[2], MacCursor[3]);
2079	<	XDefineCursor(x_display, the_win, mac_cursor);
2070	>	// Set new cursor image if it was changed
2071	>	if (hw_mac_cursor_accl && cursor_changed) {
2072	>	cursor_changed = false;
2073	>	uint8 *x_data = (uint8 *)cursor_image->data;
2074	>	uint8 *x_mask = (uint8 *)cursor_mask_image->data;
2075	>	for (int i = 0; i < 32; i++) {
2076	>	x_mask[i] = MacCursor[4 + i] | MacCursor[36 + i];
2077	>	x_data[i] = MacCursor[4 + i];
2078	>	}
2079	>	XDisplayLock();
2080	>	XFreeCursor(x_display, mac_cursor);
2081	>	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
2082	>	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
2083	>	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, MacCursor[2], MacCursor[3]);
2084	>	XDefineCursor(x_display, the_win, mac_cursor);
2085	>	XDisplayUnlock();
2086	>	}
2087		}
2088		}
1664	–	}
2089		#ifdef ENABLE_VOSF
2090	<	else if (use_vosf) {
2091	<	// Update display (VOSF variant)
2092	<	static int tick_counter = 0;
2093	<	if (++tick_counter >= frame_skip) {
2094	<	tick_counter = 0;
2095	<	if (mainBuffer.dirty) {
2096	<	LOCK_VOSF;
2097	<	update_display_dga_vosf();
2098	<	UNLOCK_VOSF;
2090	>	else if (use_vosf) {
2091	>	// Update display (VOSF variant)
2092	>	if (++tick_counter >= frame_skip) {
2093	>	tick_counter = 0;
2094	>	if (mainBuffer.dirty) {
2095	>	LOCK_VOSF;
2096	>	update_display_dga_vosf();
2097	>	UNLOCK_VOSF;
2098	>	}
2099		}
2100		}
1677	–	}
2101		#endif
2102
2103	<	// Set new palette if it was changed
2104	<	if (palette_changed && !emul_suspended) {
2105	<	palette_changed = false;
2106	<	XColor c[256];
2107	<	for (int i=0; i<256; i++) {
2108	<	c[i].pixel = i;
2109	<	c[i].red = mac_pal[i].red * 0x0101;
2110	<	c[i].green = mac_pal[i].green * 0x0101;
2111	<	c[i].blue = mac_pal[i].blue * 0x0101;
2112	<	c[i].flags = DoRed | DoGreen | DoBlue;
2113	<	}
2114	<	if (depth == 8) {
2115	<	XStoreColors(x_display, cmap[0], c, 256);
2116	<	XStoreColors(x_display, cmap[1], c, 256);
1694	<	#ifdef ENABLE_XF86_DGA
1695	<	if (display_type == DIS_SCREEN) {
1696	<	current_dga_cmap ^= 1;
1697	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1698	<	}
1699	<	#endif
1700	<	}
2103	>	// Set new palette if it was changed
2104	>	handle_palette_changes();
2105	>
2106	>	} else {
2107	>
2108	>	// No display refresh pending, check for X events
2109	>	fd_set readfds;
2110	>	FD_ZERO(&readfds);
2111	>	FD_SET(fd, &readfds);
2112	>	struct timeval timeout;
2113	>	timeout.tv_sec = 0;
2114	>	timeout.tv_usec = delay;
2115	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2116	>	handle_events();
2117		}
2118		}
2119		return NULL;

Diff Legend

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