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.1.1.1 by cebix, 2002-02-04T16:58:13Z 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-2002 Marc Hellwig and Christian Bauer
4	>	*  SheepShaver (C) 1997-2004 Marc Hellwig and Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 18
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19		*/
20
21	+	#include "sysdeps.h"
22	+
23		#include <X11/Xlib.h>
24		#include <X11/Xutil.h>
25		#include <X11/keysym.h>
26		#include <X11/extensions/XShm.h>
27		#include <sys/ipc.h>
28		#include <sys/shm.h>
29	+	#include <errno.h>
30		#include <pthread.h>
31
32	<	#include "sysdeps.h"
32	>	#include <algorithm>
33	>
34	>	#ifdef ENABLE_XF86_DGA
35	>	# include <X11/extensions/xf86dga.h>
36	>	#endif
37	>
38	>	#ifdef ENABLE_XF86_VIDMODE
39	>	# include <X11/extensions/xf86vmode.h>
40	>	#endif
41	>
42		#include "main.h"
43		#include "adb.h"
44		#include "prefs.h"
#	Line 38 | Line 50
50		#define DEBUG 0
51		#include "debug.h"
52
53	<	#ifdef ENABLE_XF86_DGA
54	<	#include <X11/extensions/xf86dga.h>
53	>	#ifndef NO_STD_NAMESPACE
54	>	using std::sort;
55		#endif
56
45	–	#ifdef ENABLE_XF86_VIDMODE
46	–	#include <X11/extensions/xf86vmode.h>
47	–	#endif
57
58	+	// Constants
59	+	const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
60
61		// Global variables
62		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?
70		static volatile bool thread_stop_req = false;
71		static volatile bool thread_stop_ack = false;   // Acknowledge for thread_stop_req
72
73		static bool has_dga = false;                            // Flag: Video DGA capable
74		static bool has_vidmode = false;                        // Flag: VidMode extension available
75
76	+	#ifdef ENABLE_VOSF
77	+	static bool use_vosf = true;                            // Flag: VOSF enabled
78	+	#else
79	+	static const bool use_vosf = false;                     // VOSF not possible
80	+	#endif
81	+
82		static bool palette_changed = false;            // Flag: Palette changed, redraw thread must update palette
83		static bool ctrl_down = false;                          // Flag: Ctrl key pressed
84		static bool quit_full_screen = false;           // Flag: DGA close requested from redraw thread
#	Line 67 | Line 88 | static bool emerg_quit = false;                                // Fl
88		static bool emul_suspended = false;                     // Flag: emulator suspended
89		static Window suspend_win;                                      // "Suspend" window
90		static void *fb_save = NULL;                            // Saved frame buffer for suspend
91	+	static bool use_keycodes = false;                       // Flag: Use keycodes rather than keysyms
92	+	static int keycode_table[256];                          // X keycode -> Mac keycode translation table
93
94		// X11 variables
95		static int screen;                                                      // Screen number
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 92 | Line 121 | static Cursor mac_cursor;
121		static GC cursor_gc, cursor_mask_gc;
122		static bool cursor_changed = false;                     // Flag: Cursor changed, window_func must update cursor
123		static bool have_shm = false;                           // Flag: SHM present and usable
124	<	static uint8 *the_buffer;                                       // Pointer to Mac frame buffer
124	>	static uint8 *the_buffer = NULL;                        // Pointer to Mac frame buffer
125		static uint8 *the_buffer_copy = NULL;           // Copy of Mac frame buffer
126	+	static uint32 the_buffer_size;                          // Size of allocated the_buffer
127
128		// Variables for DGA mode
99	–	static char *dga_screen_base;
100	–	static int dga_fb_width;
129		static int current_dga_cmap;
130
131		#ifdef ENABLE_XF86_VIDMODE
#	Line 106 | 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);
154
155
156	<	// From main_linux.cpp
156	>	// From main_unix.cpp
157	>	extern char *x_display_name;
158		extern Display *x_display;
159
160		// From sys_unix.cpp
161		extern void SysMountFirstFloppy(void);
162
163	+	// From clip_unix.cpp
164	+	extern void ClipboardSelectionClear(XSelectionClearEvent *);
165	+	extern void ClipboardSelectionRequest(XSelectionRequestEvent *);
166	+
167	+
168	+	// Video acceleration through SIGSEGV
169	+	#ifdef ENABLE_VOSF
170	+	# include "video_vosf.h"
171	+	#endif
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 138 | Line 400 | static int error_handler(Display *d, XEr
400		// Open window
401		static bool open_window(int width, int height)
402		{
403	+	int aligned_width = (width + 15) & ~15;
404	+	int aligned_height = (height + 15) & ~15;
405	+
406		// Set absolute mouse mode
407		ADBSetRelMouseMode(false);
408
144	–	// Read frame skip prefs
145	–	frame_skip = PrefsFindInt32("frameskip");
146	–	if (frame_skip == 0)
147	–	frame_skip = 1;
148	–
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	<
156	<	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));
161	–	XMapRaised(x_display, the_win);
162	–	XSync(x_display, false);
421
422	<	// Set colormap
423	<	if (depth == 8) {
166	<	XSetWindowColormap(x_display, the_win, cmap[0]);
167	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
168	<	}
422	>	// Set delete protocol property
423	>	set_window_delete_protocol(the_win);
424
425		// Make window unresizable
426		XSizeHints *hints;
#	Line 179 | 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);
444	+
445		// Try to create and attach SHM image
446		have_shm = false;
447	<	if (depth != 1 && XShmQueryExtension(x_display)) {
447	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
448
449		// Create SHM image ("height + 2" for safety)
450	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
451	<	shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
452	<	screen_base = (uint32)shmat(shminfo.shmid, 0, 0);
453	<	the_buffer = (uint8 *)screen_base;
454	<	shminfo.shmaddr = img->data = (char *)screen_base;
450	>	img = XShmCreateImage(x_display, vis, depth == 1 ? 1 : xdepth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
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;
456
457		// Try to attach SHM image, catching errors
#	Line 205 | 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 = width;
477	<	switch (depth) {
478	<	case 1:
479	<	bytes_per_row /= 8;
216	<	break;
217	<	case 15:
218	<	case 16:
219	<	bytes_per_row *= 2;
220	<	break;
221	<	case 24:
222	<	case 32:
223	<	bytes_per_row *= 4;
224	<	break;
225	<	}
226	<	screen_base = (uint32)malloc((height + 2) * bytes_per_row);
227	<	the_buffer = (uint8 *)screen_base;
228	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)screen_base, width, height, 32, bytes_per_row);
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		}
487
488	<	// Allocate memory for frame buffer copy
489	<	the_buffer_copy = (uint8 *)malloc((height + 2) * img->bytes_per_line);
488	>	#ifdef ENABLE_VOSF
489	>	use_vosf = true;
490	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
491	>	the_host_buffer = the_buffer_copy;
492	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
493	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
494	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
495	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
496	>	#else
497	>	// Allocate memory for frame buffer
498	>	the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
499	>	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
500	>	#endif
501	>	screen_base = (uint32)the_buffer;
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 255 | Line 518 | static bool open_window(int width, int h
518		mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
519		cursor_changed = false;
520
521	+	// Init blitting routines
522	+	bool native_byte_order;
523	+	#ifdef WORDS_BIGENDIAN
524	+	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
525	+	#else
526	+	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
527	+	#endif
528	+	#ifdef ENABLE_VOSF
529	+	Screen_blitter_init(&visualInfo, native_byte_order, depth);
530	+	#endif
531	+
532		// Set bytes per row
259	–	VModes[cur_mode].viRowBytes = img->bytes_per_line;
533		XSync(x_display, false);
534		return true;
535		}
#	Line 268 | 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 284 | 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);
292	–	screen_base = (uint32)dga_screen_base;
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]);
588	+	}
589	+	XSync(x_display, false);
590
591	<	// Set bytes per row
592	<	int bytes_per_row = (dga_fb_width + 7) & ~7;
593	<	switch (depth) {
594	<	case 15:
595	<	case 16:
596	<	bytes_per_row *= 2;
597	<	break;
598	<	case 24:
599	<	case 32:
600	<	bytes_per_row *= 4;
601	<	break;
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
596	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
597	>	#else
598	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
599	>	#endif
600	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
601	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
602	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
603	>	use_vosf = Screen_blitter_init(&visualInfo, native_byte_order, depth);
604	>
605	>	if (use_vosf) {
606	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
607	>	the_host_buffer = the_buffer;
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;
615	+	#endif
616	+	#endif
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;
311	–	XSync(x_display, false);
622		return true;
623		#else
624		ErrorAlert("SheepShaver has been compiled with DGA support disabled.");
#	Line 318 | 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 = 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	<	return open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
709	>	display_open = open_dga(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
710		else if (display_type == DIS_WINDOW)
711	<	return open_window(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
712	<	else
713	<	return false;
711	>	display_open = open_window(VModes[cur_mode].viXsize, VModes[cur_mode].viYsize);
712	>
713	>	#ifdef ENABLE_VOSF
714	>	if (use_vosf) {
715	>	// Initialize the VOSF system
716	>	if (!video_vosf_init()) {
717	>	ErrorAlert(GetString(STR_VOSF_INIT_ERR));
718	>	return false;
719	>	}
720	>	}
721	>	#endif
722	>
723	>	return display_open;
724		}
725
726
#	Line 355 | Line 731 | static bool open_display(void)
731		// Close window
732		static void close_window(void)
733		{
734	<	// Close window
735	<	XDestroyWindow(x_display, the_win);
736	<
737	<	// Close frame buffer copy
738	<	if (the_buffer_copy) {
739	<	free(the_buffer_copy);
740	<	the_buffer_copy = NULL;
734	>	if (have_shm) {
735	>	XShmDetach(x_display, &shminfo);
736	>	#ifdef ENABLE_VOSF
737	>	the_host_buffer = NULL; // don't free() in driver_base dtor
738	>	#else
739	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
740	>	#endif
741		}
742	+	if (img) {
743	+	if (!have_shm)
744	+	img->data = NULL;
745	+	XDestroyImage(img);
746	+	}
747	+	if (have_shm) {
748	+	shmdt(shminfo.shmaddr);
749	+	shmctl(shminfo.shmid, IPC_RMID, 0);
750	+	}
751	+	if (the_gc)
752	+	XFreeGC(x_display, the_gc);
753	+
754	+	XFlush(x_display);
755	+	XSync(x_display, false);
756		}
757
758		// Close DGA mode
#	Line 378 | Line 768 | static void close_dga(void)
768		if (has_vidmode)
769		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
770		#endif
771	+
772	+	if (!use_vosf) {
773	+	// don't free() the screen buffer in driver_base dtor
774	+	the_buffer = NULL;
775	+	}
776	+	#ifdef ENABLE_VOSF
777	+	else {
778	+	// don't free() the screen buffer in driver_base dtor
779	+	the_host_buffer = NULL;
780	+	}
781	+	#endif
782		}
783
784		static void close_display(void)
#	Line 386 | Line 787 | static void close_display(void)
787		close_dga();
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
811	+	video_vosf_exit();
812	+	}
813	+	#endif
814	+
815	+	// Free frame buffer(s)
816	+	if (!use_vosf) {
817	+	if (the_buffer_copy) {
818	+	free(the_buffer_copy);
819	+	the_buffer_copy = NULL;
820	+	}
821	+	}
822	+	#ifdef ENABLE_VOSF
823	+	else {
824	+	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
825	+	if (the_buffer != VM_MAP_FAILED) {
826	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
827	+	vm_release(the_buffer, the_buffer_size);
828	+	the_buffer = NULL;
829	+	}
830	+	if (the_host_buffer) {
831	+	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
832	+	free(the_host_buffer);
833	+	the_host_buffer = NULL;
834	+	}
835	+	if (the_buffer_copy) {
836	+	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
837	+	free(the_buffer_copy);
838	+	the_buffer_copy = NULL;
839	+	}
840	+	}
841	+	#endif
842		}
843
844
#	Line 393 | Line 846 | static void close_display(void)
846		*  Initialization
847		*/
848
849	<	static void add_mode(VideoInfo *&p, uint32 allow, uint32 test, long apple_mode, long apple_id, int type)
849	>	// Init keycode translation table
850	>	static void keycode_init(void)
851	>	{
852	>	bool use_kc = PrefsFindBool("keycodes");
853	>	if (use_kc) {
854	>
855	>	// Get keycode file path from preferences
856	>	const char *kc_path = PrefsFindString("keycodefile");
857	>
858	>	// Open keycode table
859	>	FILE *f = fopen(kc_path ? kc_path : KEYCODE_FILE_NAME, "r");
860	>	if (f == NULL) {
861	>	char str[256];
862	>	sprintf(str, GetString(STR_KEYCODE_FILE_WARN), kc_path ? kc_path : KEYCODE_FILE_NAME, strerror(errno));
863	>	WarningAlert(str);
864	>	return;
865	>	}
866	>
867	>	// Default translation table
868	>	for (int i=0; i<256; i++)
869	>	keycode_table[i] = -1;
870	>
871	>	// Search for server vendor string, then read keycodes
872	>	const char *vendor = ServerVendor(x_display);
873	>	bool vendor_found = false;
874	>	char line[256];
875	>	while (fgets(line, 255, f)) {
876	>	// Read line
877	>	int len = strlen(line);
878	>	if (len == 0)
879	>	continue;
880	>	line[len-1] = 0;
881	>
882	>	// Comments begin with "#" or ";"
883	>	if (line[0] == '#' || line[0] == ';' || line[0] == 0)
884	>	continue;
885	>
886	>	if (vendor_found) {
887	>	// Read keycode
888	>	int x_code, mac_code;
889	>	if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
890	>	keycode_table[x_code & 0xff] = mac_code;
891	>	else
892	>	break;
893	>	} else {
894	>	// Search for vendor string
895	>	if (strstr(vendor, line) == vendor)
896	>	vendor_found = true;
897	>	}
898	>	}
899	>
900	>	// Keycode file completely read
901	>	fclose(f);
902	>	use_keycodes = vendor_found;
903	>
904	>	// Vendor not found? Then display warning
905	>	if (!vendor_found) {
906	>	char str[256];
907	>	sprintf(str, GetString(STR_KEYCODE_VENDOR_WARN), vendor, kc_path ? kc_path : KEYCODE_FILE_NAME);
908	>	WarningAlert(str);
909	>	return;
910	>	}
911	>	}
912	>	}
913	>
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 412 | 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 425 | Line 981 | static void add_mode(VideoInfo *&p, uint
981		p->viYsize = 1200;
982		break;
983		}
984	<	switch (apple_mode) {
429	<	case APPLE_8_BIT:
430	<	p->viRowBytes = p->viXsize;
431	<	break;
432	<	case APPLE_16_BIT:
433	<	p->viRowBytes = p->viXsize * 2;
434	<	break;
435	<	case APPLE_32_BIT:
436	<	p->viRowBytes = p->viXsize * 4;
437	<	break;
438	<	}
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 456 | Line 1009 | static bool has_mode(int x, int y)
1009
1010		bool VideoInit(void)
1011		{
1012	+	#ifdef ENABLE_VOSF
1013	+	// Zero the mainBuffer structure
1014	+	mainBuffer.dirtyPages = NULL;
1015	+	mainBuffer.pageInfo = NULL;
1016	+	#endif
1017	+
1018	+	// Check if X server runs on local machine
1019	+	local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
1020	+	|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
1021	+
1022	+	// Init keycode translation
1023	+	keycode_init();
1024	+
1025	+	// Read frame skip prefs
1026	+	frame_skip = PrefsFindInt32("frameskip");
1027	+	if (frame_skip == 0)
1028	+	frame_skip = 1;
1029	+
1030	+	// Read mouse wheel prefs
1031	+	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1032	+	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1033	+
1034		// Init variables
1035		private_data = NULL;
461	–	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
1053		#ifdef ENABLE_XF86_DGA
1054		// DGA available?
1055		int event_base, error_base;
1056	<	if (XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
1056	>	if (local_X11 && XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
1057		int dga_flags = 0;
1058		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
1059		has_dga = dga_flags & XF86DGADirectPresent;
#	Line 495 | Line 1077 | bool VideoInit(void)
1077		black_pixel = BlackPixel(x_display, screen);
1078		white_pixel = WhitePixel(x_display, screen);
1079
498	–	// Get appropriate visual
499	–	int color_class;
500	–	switch (xdepth) {
501	–	#if 0
502	–	case 1:
503	–	color_class = StaticGray;
504	–	break;
505	–	#endif
506	–	case 8:
507	–	color_class = PseudoColor;
508	–	break;
509	–	case 15:
510	–	case 16:
511	–	case 24:
512	–	case 32:
513	–	color_class = TrueColor;
514	–	break;
515	–	default:
516	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
517	–	return false;
518	–	}
519	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
520	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
521	–	return false;
522	–	}
523	–	if (visualInfo.depth != xdepth) {
524	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
525	–	return false;
526	–	}
527	–	vis = visualInfo.visual;
528	–
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
541	–	int mode = APPLE_8_BIT;
542	–	int bpr_mult = 8;
543	–	switch (depth) {
544	–	case 1:
545	–	mode = APPLE_1_BIT;
546	–	bpr_mult = 1;
547	–	break;
548	–	case 8:
549	–	mode = APPLE_8_BIT;
550	–	bpr_mult = 8;
551	–	break;
552	–	case 15:
553	–	case 16:
554	–	mode = APPLE_16_BIT;
555	–	bpr_mult = 16;
556	–	break;
557	–	case 24:
558	–	case 32:
559	–	mode = APPLE_32_BIT;
560	–	bpr_mult = 32;
561	–	break;
562	–	}
563	–
1098		uint32 window_modes = PrefsFindInt32("windowmodes");
1099		uint32 screen_modes = PrefsFindInt32("screenmodes");
1100		if (!has_dga)
#	Line 569 | 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;
591	<	if (xsize < 800)
592	<	apple_id = APPLE_640x480;
593	<	else if (xsize < 1024)
594	<	apple_id = APPLE_800x600;
595	<	else if (xsize < 1152)
596	<	apple_id = APPLE_1024x768;
597	<	else if (xsize < 1280)
598	<	apple_id = APPLE_1152x900;
599	<	else if (xsize < 1600)
600	<	apple_id = APPLE_1280x1024;
601	<	else
602	<	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 614 | 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 633 | 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 652 | Line 1192 | void VideoExit(void)
1192		redraw_thread_active = false;
1193		}
1194
1195	+	#ifdef ENABLE_VOSF
1196	+	if (use_vosf) {
1197	+	// Deinitialize VOSF
1198	+	video_vosf_exit();
1199	+	}
1200	+	#endif
1201	+
1202		// Close window and server connection
1203		if (x_display != NULL) {
1204		XSync(x_display, false);
1205		close_display();
1206		XFlush(x_display);
1207		XSync(x_display, false);
661	–	if (depth == 8) {
662	–	XFreeColormap(x_display, cmap[0]);
663	–	XFreeColormap(x_display, cmap[1]);
664	–	}
1208		}
1209		}
1210
#	Line 725 | 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
1278	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
1279	+	// not necessary.
1280	+	#ifdef ENABLE_VOSF
1281	+	if (use_vosf) {
1282	+	LOCK_VOSF;
1283	+	PFLAG_SET_ALL;
1284	+	UNLOCK_VOSF;
1285	+	memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1286	+	}
1287	+	#endif
1288	+
1289		// Restore frame buffer
1290		if (fb_save) {
1291	+	#ifdef ENABLE_VOSF
1292	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1293	+	if (!use_vosf)
1294	+	#endif
1295		memcpy((void *)screen_base, fb_save, VModes[cur_mode].viYsize * VModes[cur_mode].viRowBytes);
1296		free(fb_save);
1297		fb_save = NULL;
#	Line 904 | Line 1465 | static int kc_decode(KeySym ks)
1465		return -1;
1466		}
1467
1468	<	static int event2keycode(XKeyEvent *ev)
1468	>	static int event2keycode(XKeyEvent &ev)
1469		{
1470		KeySym ks;
1471		int as;
1472		int i = 0;
1473
1474		do {
1475	<	ks = XLookupKeysym(ev, i++);
1475	>	ks = XLookupKeysym(&ev, i++);
1476		as = kc_decode(ks);
1477		if (as != -1)
1478		return as;
#	Line 926 | Line 1487 | static void handle_events(void)
1487		for (;;) {
1488		XEvent event;
1489
1490	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1490	>	XDisplayLock();
1491	>	if (!XCheckMaskEvent(x_display, eventmask, &event)) {
1492	>	// Handle clipboard events
1493	>	if (XCheckTypedEvent(x_display, SelectionRequest, &event))
1494	>	ClipboardSelectionRequest(&event.xselectionrequest);
1495	>	else if (XCheckTypedEvent(x_display, SelectionClear, &event))
1496	>	ClipboardSelectionClear(&event.xselectionclear);
1497	>
1498	>	// Window "close" widget clicked
1499	>	else if (XCheckTypedEvent(x_display, ClientMessage, &event)) {
1500	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1501	>	ADBKeyDown(0x7f);       // Power key
1502	>	ADBKeyUp(0x7f);
1503	>	}
1504	>	}
1505	>
1506	>	XDisplayUnlock();
1507		break;
1508	+	}
1509	+	XDisplayUnlock();
1510
1511		switch (event.type) {
1512		// Mouse button
#	Line 935 | Line 1514 | static void handle_events(void)
1514		unsigned int button = ((XButtonEvent *)&event)->button;
1515		if (button < 4)
1516		ADBMouseDown(button - 1);
1517	+	else if (button < 6) {  // Wheel mouse
1518	+	if (mouse_wheel_mode == 0) {
1519	+	int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
1520	+	ADBKeyDown(key);
1521	+	ADBKeyUp(key);
1522	+	} else {
1523	+	int key = (button == 5) ? 0x3d : 0x3e;  // Cursor up/down
1524	+	for(int i=0; i<mouse_wheel_lines; i++) {
1525	+	ADBKeyDown(key);
1526	+	ADBKeyUp(key);
1527	+	}
1528	+	}
1529	+	}
1530		break;
1531		}
1532		case ButtonRelease: {
#	Line 944 | 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
1551		case KeyPress: {
1552	<	int code;
1553	<	if ((code = event2keycode((XKeyEvent *)&event)) != -1) {
1552	>	int code = event2keycode(event.xkey);
1553	>	if (use_keycodes && code != -1)
1554	>	code = keycode_table[event.xkey.keycode & 0xff];
1555	>	if (code != -1) {
1556		if (!emul_suspended) {
1557		ADBKeyDown(code);
1558		if (code == 0x36)
#	Line 968 | Line 1565 | static void handle_events(void)
1565		break;
1566		}
1567		case KeyRelease: {
1568	<	int code;
1569	<	if ((code = event2keycode((XKeyEvent *)&event)) != -1) {
1568	>	int code = event2keycode(event.xkey);
1569	>	if (use_keycodes && code != 1)
1570	>	code = keycode_table[event.xkey.keycode & 0xff];
1571	>	if (code != -1) {
1572		ADBKeyUp(code);
1573		if (code == 0x36)
1574		ctrl_down = false;
#	Line 979 | Line 1578 | static void handle_events(void)
1578
1579		// Hidden parts exposed, force complete refresh
1580		case Expose:
1581	+	#ifdef ENABLE_VOSF
1582	+	if (use_vosf) {                 // VOSF refresh
1583	+	LOCK_VOSF;
1584	+	PFLAG_SET_ALL;
1585	+	UNLOCK_VOSF;
1586	+	}
1587	+	#endif
1588		memset(the_buffer_copy, 0, VModes[cur_mode].viRowBytes * VModes[cur_mode].viYsize);
1589		break;
1590		}
#	Line 1006 | Line 1612 | void VideoVBL(void)
1612		*/
1613
1614		#if 0
1009	–	// Rectangle blitting
1010	–	static void accl_bitblt(accl_params *p)
1011	–	{
1012	–	D(bug("accl_bitblt\n"));
1013	–
1014	–	// Get blitting parameters
1015	–	int16 src_X = p->src_rect[1] - p->src_bounds[1];
1016	–	int16 src_Y = p->src_rect[0] - p->src_bounds[0];
1017	–	int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
1018	–	int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
1019	–	int16 width = p->dest_rect[3] - p->dest_rect[1] - 1;
1020	–	int16 height = p->dest_rect[2] - p->dest_rect[0] - 1;
1021	–	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1022	–	D(bug(" width %d, height %d\n", width, height));
1023	–
1024	–	// And perform the blit
1025	–	bitblt_hook(src_X, src_Y, dest_X, dest_Y, width, height);
1026	–	}
1027	–
1028	–	static bool accl_bitblt_hook(accl_params *p)
1029	–	{
1030	–	D(bug("accl_draw_hook %p\n", p));
1031	–
1032	–	// Check if we can accelerate this bitblt
1033	–	if (p->src_base_addr == screen_base && p->dest_base_addr == screen_base &&
1034	–	display_type == DIS_SCREEN && bitblt_hook != NULL &&
1035	–	((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
1036	–	((uint32 *)p)[0x130 >> 2] == 0 &&
1037	–	p->transfer_mode == 0 &&
1038	–	p->src_row_bytes > 0 && ((uint32 *)p)[0x15c >> 2] > 0) {
1039	–
1040	–	// Yes, set function pointer
1041	–	p->draw_proc = accl_bitblt;
1042	–	return true;
1043	–	}
1044	–	return false;
1045	–	}
1046	–
1615		// Rectangle filling/inversion
1616		static void accl_fillrect8(accl_params *p)
1617		{
#	Line 1121 | 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));
1128	<	if (sync_hook != NULL)
1129	<	sync_hook();
1763	>	D(bug("accl_sync_hook %08x\n", arg));
1764		return true;
1765		}
1766
1133	–	static struct accl_hook_info bitblt_hook_info = {accl_bitblt_hook, accl_sync_hook, ACCL_BITBLT};
1134	–	static struct accl_hook_info fillrect_hook_info = {accl_fillrect_hook, accl_sync_hook, ACCL_FILLRECT};
1135	–	#endif
1136	–
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 1203 | 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 1330 | 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;
1343	<	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
1348	<	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);
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	<	quit_full_screen_ack = true;
2106	<	return NULL;
2107	<	}
1370	<	}
1371	<
1372	<	// Refresh display and set cursor image in window mode
1373	<	if (display_type == DIS_WINDOW) {
1374	<	tick_counter++;
1375	<	if (tick_counter >= frame_skip) {
1376	<	tick_counter = 0;
1377	<
1378	<	// Update display
1379	<	update_display();
1380	<
1381	<	// Set new cursor image if it was changed
1382	<	if (cursor_changed) {
1383	<	cursor_changed = false;
1384	<	memcpy(cursor_image->data, MacCursor + 4, 32);
1385	<	memcpy(cursor_mask_image->data, MacCursor + 36, 32);
1386	<	XFreeCursor(x_display, mac_cursor);
1387	<	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
1388	<	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
1389	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, MacCursor[2], MacCursor[3]);
1390	<	XDefineCursor(x_display, the_win, mac_cursor);
2104	>	XSync(x_display, false);
2105	>	XDisplayUnlock();
2106	>	quit_full_screen_ack = true;
2107	>	return NULL;
2108		}
2109		}
1393	–	}
2110
2111	<	// Set new palette if it was changed
2112	<	if (palette_changed && !emul_suspended) {
2113	<	palette_changed = false;
2114	<	XColor c[256];
2115	<	for (int i=0; i<256; i++) {
2116	<	c[i].pixel = i;
2117	<	c[i].red = mac_pal[i].red * 0x0101;
2118	<	c[i].green = mac_pal[i].green * 0x0101;
2119	<	c[i].blue = mac_pal[i].blue * 0x0101;
2120	<	c[i].flags = DoRed | DoGreen | DoBlue;
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
2119	>	#ifdef ENABLE_VOSF
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	>	else
2131	>	#endif
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	>	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		}
2149	<	if (depth == 8) {
2150	<	XStoreColors(x_display, cmap[0], c, 256);
2151	<	XStoreColors(x_display, cmap[1], c, 256);
2152	<	#ifdef ENABLE_XF86_DGA
2153	<	if (display_type == DIS_SCREEN) {
2154	<	current_dga_cmap ^= 1;
2155	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2149	>	#ifdef ENABLE_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		}
1414	–	#endif
2160		}
2161	+	#endif
2162	+
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