ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/video_x.cpp

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.6 by cebix, 1999-10-07T13:15:15Z vs.
Revision 1.41 by cebix, 2001-06-27T20:05:30Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  Basilisk II (C) 1997-1999 Christian Bauer
4	>	*  Basilisk II (C) 1997-2001 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 34 | Line 34
34		#include <X11/extensions/XShm.h>
35		#include <sys/ipc.h>
36		#include <sys/shm.h>
37	–	#include <pthread.h>
37		#include <errno.h>
38
39	+	#ifdef HAVE_PTHREADS
40	+	# include <pthread.h>
41	+	#endif
42	+
43	+	#ifdef ENABLE_XF86_DGA
44	+	# include <X11/extensions/xf86dga.h>
45	+	#endif
46	+
47	+	#ifdef ENABLE_XF86_VIDMODE
48	+	# include <X11/extensions/xf86vmode.h>
49	+	#endif
50	+
51	+	#ifdef ENABLE_FBDEV_DGA
52	+	# include <sys/mman.h>
53	+	#endif
54	+
55	+	#ifdef ENABLE_VOSF
56	+	# include <fcntl.h>
57	+	# include <sys/mman.h>
58	+	# include "sigsegv.h"
59	+	# include "vm_alloc.h"
60	+	#endif
61	+
62		#include "cpu_emulation.h"
63		#include "main.h"
64		#include "adb.h"
#	Line 45 | Line 67
67		#include "user_strings.h"
68		#include "video.h"
69
70	<	#define DEBUG 1
70	>	#define DEBUG 0
71		#include "debug.h"
72
51	–	#if ENABLE_DGA
52	–	#include <X11/extensions/xf86dga.h>
53	–	#endif
54	–
73
74		// Display types
75		enum {
#	Line 59 | Line 77 | enum {
77		DISPLAY_DGA             // DGA fullscreen display
78		};
79
62	–
80		// Constants
81		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
82	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
83
84
85		// Global variables
86	<	static int32 frame_skip;
86	>	static int32 frame_skip;                                                        // Prefs items
87	>	static int16 mouse_wheel_mode = 1;
88	>	static int16 mouse_wheel_lines = 3;
89	>
90		static int display_type = DISPLAY_WINDOW;                       // See enum above
91	+	static bool local_X11;                                                          // Flag: X server running on local machine?
92		static uint8 *the_buffer;                                                       // Mac frame buffer
93	+
94	+	#ifdef HAVE_PTHREADS
95		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
96		static volatile bool redraw_thread_cancel = false;      // Flag: Cancel Redraw thread
97		static pthread_t redraw_thread;                                         // Redraw thread
98	+	#endif
99
100		static bool has_dga = false;                                            // Flag: Video DGA capable
101	+	static bool has_vidmode = false;                                        // Flag: VidMode extension available
102
103		static bool ctrl_down = false;                                          // Flag: Ctrl key pressed
104		static bool caps_on = false;                                            // Flag: Caps Lock on
#	Line 96 | Line 122 | static Colormap cmap[2];                                                       // Two co
122		static XColor black, white;
123		static unsigned long black_pixel, white_pixel;
124		static int eventmask;
125	<	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask;
126	<	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
125	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
126	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
127	>	static Atom WM_DELETE_WINDOW = (Atom)0;
128
102	–	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
129		static XColor palette[256];                                                     // Color palette for 8-bit mode
130		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
131	+	#ifdef HAVE_PTHREADS
132	+	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
133	+	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
134	+	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
135	+	#else
136	+	#define LOCK_PALETTE
137	+	#define UNLOCK_PALETTE
138	+	#endif
139
140		// Variables for window mode
141		static GC the_gc;
142		static XImage *img = NULL;
143		static XShmSegmentInfo shminfo;
110	–	static XImage *cursor_image, *cursor_mask_image;
111	–	static Pixmap cursor_map, cursor_mask_map;
144		static Cursor mac_cursor;
113	–	static GC cursor_gc, cursor_mask_gc;
145		static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer
115	–	static uint8 the_cursor[64];                                            // Cursor image data
146		static bool have_shm = false;                                           // Flag: SHM extensions available
147	+	static bool updt_box[17][17];                                           // Flag for Update
148	+	static int nr_boxes;
149	+	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
150	+	static int sm_no_boxes[] = {1,8,32,64,128,300};
151
152	<	// Variables for DGA mode
152	>	// Variables for XF86 DGA mode
153		static int current_dga_cmap;                                            // Number (0 or 1) of currently installed DGA colormap
154		static Window suspend_win;                                                      // "Suspend" window
155		static void *fb_save = NULL;                                            // Saved frame buffer for suspend
156	<
156	>	#ifdef HAVE_PTHREADS
157		static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
158	+	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
159	+	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
160	+	#else
161	+	#define LOCK_FRAME_BUFFER
162	+	#define UNLOCK_FRAME_BUFFER
163	+	#endif
164	+
165	+	// Variables for fbdev DGA mode
166	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
167	+	static int fbdev_fd;
168	+
169	+	#ifdef ENABLE_XF86_VIDMODE
170	+	// Variables for XF86 VidMode support
171	+	static XF86VidModeModeInfo **x_video_modes;                     // Array of all available modes
172	+	static int num_x_video_modes;
173	+	#endif
174	+
175	+	#ifdef ENABLE_VOSF
176	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
177	+	#else
178	+	static const bool use_vosf = false;                                     // Flag: VOSF enabled
179	+	#endif
180	+
181	+	#ifdef ENABLE_VOSF
182	+	// Variables for Video on SEGV support (taken from the Win32 port)
183	+	static uint8 *the_host_buffer;                                          // Host frame buffer in VOSF mode
184	+	static uint32 the_buffer_size;                                          // Size of allocated the_buffer
185	+
186	+	struct ScreenPageInfo {
187	+	int top, bottom;                    // Mapping between this virtual page and Mac scanlines
188	+	};
189	+
190	+	struct ScreenInfo {
191	+	uintptr memBase;                    // Real start address
192	+	uintptr memStart;                   // Start address aligned to page boundary
193	+	uintptr memEnd;                             // Address of one-past-the-end of the screen
194	+	uint32 memLength;                   // Length of the memory addressed by the screen pages
195	+
196	+	uint32 pageSize;                    // Size of a page
197	+	int pageBits;                               // Shift count to get the page number
198	+	uint32 pageCount;                   // Number of pages allocated to the screen
199	+
200	+	bool dirty;                                     // Flag: set if the frame buffer was touched
201	+	char * dirtyPages;                  // Table of flags set if page was altered
202	+	ScreenPageInfo * pageInfo;  // Table of mappings page -> Mac scanlines
203	+	};
204	+
205	+	static ScreenInfo mainBuffer;
206	+
207	+	#define PFLAG_SET_VALUE                 0x00
208	+	#define PFLAG_CLEAR_VALUE               0x01
209	+	#define PFLAG_SET_VALUE_4               0x00000000
210	+	#define PFLAG_CLEAR_VALUE_4             0x01010101
211	+	#define PFLAG_SET(page)                 mainBuffer.dirtyPages[page] = PFLAG_SET_VALUE
212	+	#define PFLAG_CLEAR(page)               mainBuffer.dirtyPages[page] = PFLAG_CLEAR_VALUE
213	+	#define PFLAG_ISSET(page)               (mainBuffer.dirtyPages[page] == PFLAG_SET_VALUE)
214	+	#define PFLAG_ISCLEAR(page)             (mainBuffer.dirtyPages[page] != PFLAG_SET_VALUE)
215	+
216	+	#ifdef UNALIGNED_PROFITABLE
217	+	# define PFLAG_ISSET_4(page)    (*((uint32 *)(mainBuffer.dirtyPages + (page))) == PFLAG_SET_VALUE_4)
218	+	# define PFLAG_ISCLEAR_4(page)  (*((uint32 *)(mainBuffer.dirtyPages + (page))) == PFLAG_CLEAR_VALUE_4)
219	+	#else
220	+	# define PFLAG_ISSET_4(page) \
221	+	PFLAG_ISSET(page  ) && PFLAG_ISSET(page+1) \
222	+	&&      PFLAG_ISSET(page+2) && PFLAG_ISSET(page+3)
223	+	# define PFLAG_ISCLEAR_4(page) \
224	+	PFLAG_ISCLEAR(page  ) && PFLAG_ISCLEAR(page+1) \
225	+	&&      PFLAG_ISCLEAR(page+2) && PFLAG_ISCLEAR(page+3)
226	+	#endif
227	+
228	+	// Set the selected page range [ first_page, last_page [ into the SET state
229	+	#define PFLAG_SET_RANGE(first_page, last_page) \
230	+	memset(mainBuffer.dirtyPages + (first_page), PFLAG_SET_VALUE, \
231	+	(last_page) - (first_page))
232	+
233	+	// Set the selected page range [ first_page, last_page [ into the CLEAR state
234	+	#define PFLAG_CLEAR_RANGE(first_page, last_page) \
235	+	memset(mainBuffer.dirtyPages + (first_page), PFLAG_CLEAR_VALUE, \
236	+	(last_page) - (first_page))
237	+
238	+	#define PFLAG_SET_ALL do { \
239	+	PFLAG_SET_RANGE(0, mainBuffer.pageCount); \
240	+	mainBuffer.dirty = true; \
241	+	} while (0)
242	+
243	+	#define PFLAG_CLEAR_ALL do { \
244	+	PFLAG_CLEAR_RANGE(0, mainBuffer.pageCount); \
245	+	mainBuffer.dirty = false; \
246	+	} while (0)
247	+
248	+	// Set the following macro definition to 1 if your system
249	+	// provides a really fast strchr() implementation
250	+	//#define HAVE_FAST_STRCHR 0
251	+
252	+	static inline int find_next_page_set(int page)
253	+	{
254	+	#if HAVE_FAST_STRCHR
255	+	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_SET_VALUE);
256	+	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
257	+	#else
258	+	while (PFLAG_ISCLEAR_4(page))
259	+	page += 4;
260	+	while (PFLAG_ISCLEAR(page))
261	+	page++;
262	+	return page;
263	+	#endif
264	+	}
265	+
266	+	static inline int find_next_page_clear(int page)
267	+	{
268	+	#if HAVE_FAST_STRCHR
269	+	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_CLEAR_VALUE);
270	+	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
271	+	#else
272	+	while (PFLAG_ISSET_4(page))
273	+	page += 4;
274	+	while (PFLAG_ISSET(page))
275	+	page++;
276	+	return page;
277	+	#endif
278	+	}
279	+
280	+	static int zero_fd = -1;
281	+
282	+	#ifdef HAVE_PTHREADS
283	+	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer (dirtyPages in fact)
284	+	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
285	+	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
286	+	#else
287	+	#define LOCK_VOSF
288	+	#define UNLOCK_VOSF
289	+	#endif
290
291	+	static int log_base_2(uint32 x)
292	+	{
293	+	uint32 mask = 0x80000000;
294	+	int l = 31;
295	+	while (l >= 0 && (x & mask) == 0) {
296	+	mask >>= 1;
297	+	l--;
298	+	}
299	+	return l;
300	+	}
301	+	#endif /* ENABLE_VOSF */
302	+
303	+	// VideoRefresh function
304	+	void VideoRefreshInit(void);
305	+	static void (*video_refresh)(void);
306
307		// Prototypes
308		static void *redraw_func(void *arg);
309	<	static int event2keycode(XKeyEvent *ev);
309	>	static int event2keycode(XKeyEvent &ev);
310
311
312		// From main_unix.cpp
313	+	extern char *x_display_name;
314		extern Display *x_display;
315
316		// From sys_unix.cpp
317		extern void SysMountFirstFloppy(void);
318
319	+	#ifdef ENABLE_VOSF
320	+	# include "video_vosf.h"
321	+	#endif
322	+
323
324		/*
325		*  Initialization
326		*/
327
328	<	// Set VideoMonitor according to video mode
329	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
328	>	// Add resolution to list of supported modes and set VideoMonitor
329	>	static void set_video_monitor(uint32 width, uint32 height, uint32 bytes_per_row, bool native_byte_order)
330		{
331	+	video_mode mode;
332	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
333		int layout = FLAYOUT_DIRECT;
334		switch (depth) {
335		case 1:
336		layout = FLAYOUT_DIRECT;
149	–	VideoMonitor.mode = VMODE_1BIT;
337		break;
338		case 8:
339		layout = FLAYOUT_DIRECT;
153	–	VideoMonitor.mode = VMODE_8BIT;
340		break;
341		case 15:
342		layout = FLAYOUT_HOST_555;
157	–	VideoMonitor.mode = VMODE_16BIT;
343		break;
344		case 16:
345		layout = FLAYOUT_HOST_565;
161	–	VideoMonitor.mode = VMODE_16BIT;
346		break;
347		case 24:
348		case 32:
349		layout = FLAYOUT_HOST_888;
166	–	VideoMonitor.mode = VMODE_32BIT;
350		break;
351		}
169	–	VideoMonitor.x = width;
170	–	VideoMonitor.y = height;
171	–	VideoMonitor.bytes_per_row = bytes_per_row;
352		if (native_byte_order)
353		MacFrameLayout = layout;
354		else
355		MacFrameLayout = FLAYOUT_DIRECT;
356	+	#endif
357	+
358	+	mode.x = width;
359	+	mode.y = height;
360	+	mode.resolution_id = 0x80;
361	+	mode.bytes_per_row = bytes_per_row;
362	+
363	+	switch (depth) {
364	+	case 1:
365	+	mode.depth = VDEPTH_1BIT;
366	+	break;
367	+	case 2:
368	+	mode.depth = VDEPTH_2BIT;
369	+	break;
370	+	case 4:
371	+	mode.depth = VDEPTH_4BIT;
372	+	break;
373	+	case 8:
374	+	mode.depth = VDEPTH_8BIT;
375	+	break;
376	+	case 15:
377	+	mode.depth = VDEPTH_16BIT;
378	+	break;
379	+	case 16:
380	+	mode.depth = VDEPTH_16BIT;
381	+	break;
382	+	case 24:
383	+	case 32:
384	+	mode.depth = VDEPTH_32BIT;
385	+	break;
386	+	}
387	+
388	+	VideoModes.push_back(mode);
389	+	VideoMonitor.mode = mode;
390	+	}
391	+
392	+	// Set window name and class
393	+	static void set_window_name(Window w, int name)
394	+	{
395	+	const char *str = GetString(name);
396	+	XStoreName(x_display, w, str);
397	+	XSetIconName(x_display, w, str);
398	+
399	+	XClassHint *hints;
400	+	hints = XAllocClassHint();
401	+	if (hints) {
402	+	hints->res_name = "BasiliskII";
403	+	hints->res_class = "BasiliskII";
404	+	XSetClassHint(x_display, w, hints);
405	+	XFree(hints);
406	+	}
407	+	}
408	+
409	+	// Set window input focus flag
410	+	static void set_window_focus(Window w)
411	+	{
412	+	XWMHints *hints = XAllocWMHints();
413	+	if (hints) {
414	+	hints->input = True;
415	+	hints->initial_state = NormalState;
416	+	hints->flags = InputHint | StateHint;
417	+	XSetWMHints(x_display, w, hints);
418	+	XFree(hints);
419	+	}
420	+	}
421	+
422	+	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
423	+	static void set_window_delete_protocol(Window w)
424	+	{
425	+	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
426	+	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
427	+	}
428	+
429	+	// Wait until window is mapped/unmapped
430	+	void wait_mapped(Window w)
431	+	{
432	+	XEvent e;
433	+	do {
434	+	XMaskEvent(x_display, StructureNotifyMask, &e);
435	+	} while ((e.type != MapNotify) || (e.xmap.event != w));
436	+	}
437	+
438	+	void wait_unmapped(Window w)
439	+	{
440	+	XEvent e;
441	+	do {
442	+	XMaskEvent(x_display, StructureNotifyMask, &e);
443	+	} while ((e.type != UnmapNotify) || (e.xmap.event != w));
444		}
445
446		// Trap SHM errors
#	Line 191 | Line 459 | static int error_handler(Display *d, XEr
459		// Init window mode
460		static bool init_window(int width, int height)
461		{
462	+	int aligned_width = (width + 15) & ~15;
463	+	int aligned_height = (height + 15) & ~15;
464	+
465		// Set absolute mouse mode
466		ADBSetRelMouseMode(false);
467
468		// Read frame skip prefs
469		frame_skip = PrefsFindInt32("frameskip");
199	–	if (frame_skip == 0)
200	–	frame_skip = 1;
470
471		// Create window
472		XSetWindowAttributes wattr;
473		wattr.event_mask = eventmask = win_eventmask;
474		wattr.background_pixel = black_pixel;
475	<	wattr.border_pixel = black_pixel;
207	<	wattr.backing_store = NotUseful;
475	>	wattr.colormap = cmap[0];
476
209	–	XSync(x_display, false);
477		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
478	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWBackingStore, &wattr);
212	<	XSync(x_display, false);
213	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
214	<	XMapRaised(x_display, the_win);
215	<	XSync(x_display, false);
478	>	InputOutput, vis, CWEventMask | CWBackPixel | (depth == 8 ? CWColormap : 0), &wattr);
479
480	<	// Set colormap
481	<	if (depth == 8) {
482	<	XSetWindowColormap(x_display, the_win, cmap[0]);
483	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
484	<	}
480	>	// Set window name/class
481	>	set_window_name(the_win, STR_WINDOW_TITLE);
482	>
483	>	// Indicate that we want keyboard input
484	>	set_window_focus(the_win);
485	>
486	>	// Set delete protocol property
487	>	set_window_delete_protocol(the_win);
488
489		// Make window unresizable
490	<	XSizeHints *hints;
491	<	if ((hints = XAllocSizeHints()) != NULL) {
492	<	hints->min_width = width;
493	<	hints->max_width = width;
494	<	hints->min_height = height;
495	<	hints->max_height = height;
496	<	hints->flags = PMinSize | PMaxSize;
497	<	XSetWMNormalHints(x_display, the_win, hints);
498	<	XFree((char *)hints);
490	>	{
491	>	XSizeHints *hints = XAllocSizeHints();
492	>	if (hints) {
493	>	hints->min_width = width;
494	>	hints->max_width = width;
495	>	hints->min_height = height;
496	>	hints->max_height = height;
497	>	hints->flags = PMinSize | PMaxSize;
498	>	XSetWMNormalHints(x_display, the_win, hints);
499	>	XFree(hints);
500	>	}
501		}
502	+
503	+	// Show window
504	+	XMapWindow(x_display, the_win);
505	+	wait_mapped(the_win);
506
507		// Try to create and attach SHM image
508		have_shm = false;
509	<	if (depth != 1 && XShmQueryExtension(x_display)) {
509	>	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
510
511		// Create SHM image ("height + 2" for safety)
512		img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
513	<	shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
514	<	the_buffer = (uint8 *)shmat(shminfo.shmid, 0, 0);
515	<	shminfo.shmaddr = img->data = (char *)the_buffer;
513	>	shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
514	>	the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
515	>	shminfo.shmaddr = img->data = (char *)the_buffer_copy;
516		shminfo.readOnly = False;
517
518		// Try to attach SHM image, catching errors
#	Line 258 | Line 530 | static bool init_window(int width, int h
530		shmctl(shminfo.shmid, IPC_RMID, 0);
531		}
532		}
533	<
533	>
534		// Create normal X image if SHM doesn't work ("height + 2" for safety)
535		if (!have_shm) {
536	<	int bytes_per_row = width;
536	>	int bytes_per_row = aligned_width;
537		switch (depth) {
538		case 1:
539		bytes_per_row /= 8;
#	Line 275 | Line 547 | static bool init_window(int width, int h
547		bytes_per_row *= 4;
548		break;
549		}
550	<	the_buffer = (uint8 *)malloc((height + 2) * bytes_per_row);
551	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer, width, height, 32, bytes_per_row);
550	>	the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
551	>	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
552		}
553
554		// 1-Bit mode is big-endian
#	Line 285 | Line 557 | static bool init_window(int width, int h
557		img->bitmap_bit_order = MSBFirst;
558		}
559
560	<	// Allocate memory for frame buffer copy
561	<	the_buffer_copy = (uint8 *)malloc((height + 2) * img->bytes_per_line);
560	>	#ifdef ENABLE_VOSF
561	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
562	>	the_host_buffer = the_buffer_copy;
563	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
564	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
565	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
566	>	#else
567	>	// Allocate memory for frame buffer
568	>	the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
569	>	#endif
570
571		// Create GC
572		the_gc = XCreateGC(x_display, the_win, 0, 0);
573		XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
574
575	<	// Create cursor
576	<	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor, 16, 16, 16, 2);
577	<	cursor_image->byte_order = MSBFirst;
578	<	cursor_image->bitmap_bit_order = MSBFirst;
579	<	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor+32, 16, 16, 16, 2);
580	<	cursor_mask_image->byte_order = MSBFirst;
301	<	cursor_mask_image->bitmap_bit_order = MSBFirst;
302	<	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
303	<	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
304	<	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
305	<	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
306	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
575	>	// Create no_cursor
576	>	mac_cursor = XCreatePixmapCursor(x_display,
577	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
578	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
579	>	&black, &white, 0, 0);
580	>	XDefineCursor(x_display, the_win, mac_cursor);
581
582	<	// Set VideoMonitor
582	>	// Add resolution and set VideoMonitor
583	>	bool native_byte_order;
584		#ifdef WORDS_BIGENDIAN
585	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst);
585	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
586		#else
587	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst);
587	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
588	>	#endif
589	>	#ifdef ENABLE_VOSF
590	>	Screen_blitter_init(&visualInfo, native_byte_order);
591		#endif
592	<	#if REAL_ADDRESSING
593	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
594	<	MacFrameLayout = FLAYOUT_DIRECT;
592	>	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
593	>
594	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
595	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
596		#else
597		VideoMonitor.mac_frame_base = MacFrameBaseMac;
598		#endif
599		return true;
600		}
601
602	<	// Init DGA display
603	<	static bool init_dga(int width, int height)
602	>	// Init fbdev DGA display
603	>	static bool init_fbdev_dga(char *in_fb_name)
604		{
605	<	#if ENABLE_DGA
605	>	#ifdef ENABLE_FBDEV_DGA
606	>	// Find the maximum depth available
607	>	int ndepths, max_depth(0);
608	>	int *depths = XListDepths(x_display, screen, &ndepths);
609	>	if (depths == NULL) {
610	>	printf("FATAL: Could not determine the maximal depth available\n");
611	>	return false;
612	>	} else {
613	>	while (ndepths-- > 0) {
614	>	if (depths[ndepths] > max_depth)
615	>	max_depth = depths[ndepths];
616	>	}
617	>	}
618	>
619	>	// Get fbdevices file path from preferences
620	>	const char *fbd_path = PrefsFindString("fbdevicefile");
621	>
622	>	// Open fbdevices file
623	>	FILE *fp = fopen(fbd_path ? fbd_path : FBDEVICES_FILE_NAME, "r");
624	>	if (fp == NULL) {
625	>	char str[256];
626	>	sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
627	>	ErrorAlert(str);
628	>	return false;
629	>	}
630	>
631	>	int fb_depth;           // supported depth
632	>	uint32 fb_offset;       // offset used for mmap(2)
633	>	char fb_name[20];
634	>	char line[256];
635	>	bool device_found = false;
636	>	while (fgets(line, 255, fp)) {
637	>	// Read line
638	>	int len = strlen(line);
639	>	if (len == 0)
640	>	continue;
641	>	line[len - 1] = '\0';
642	>
643	>	// Comments begin with "#" or ";"
644	>	if ((line[0] == '#') || (line[0] == ';') || (line[0] == '\0'))
645	>	continue;
646	>
647	>	if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
648	>	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
649	>	device_found = true;
650	>	break;
651	>	}
652	>	}
653	>
654	>	// fbdevices file completely read
655	>	fclose(fp);
656	>
657	>	// Frame buffer name not found ? Then, display warning
658	>	if (!device_found) {
659	>	char str[256];
660	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
661	>	ErrorAlert(str);
662	>	return false;
663	>	}
664	>
665	>	int width = DisplayWidth(x_display, screen);
666	>	int height = DisplayHeight(x_display, screen);
667	>	depth = fb_depth; // max_depth
668	>
669	>	// Set relative mouse mode
670	>	ADBSetRelMouseMode(false);
671	>
672	>	// Create window
673	>	XSetWindowAttributes wattr;
674	>	wattr.event_mask = eventmask = dga_eventmask;
675	>	wattr.background_pixel = white_pixel;
676	>	wattr.override_redirect = True;
677	>	wattr.colormap = cmap[0];
678	>
679	>	the_win = XCreateWindow(x_display, rootwin,
680	>	0, 0, width, height,
681	>	0, xdepth, InputOutput, vis,
682	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
683	>	&wattr);
684	>
685	>	// Set window name/class
686	>	set_window_name(the_win, STR_WINDOW_TITLE);
687	>
688	>	// Indicate that we want keyboard input
689	>	set_window_focus(the_win);
690	>
691	>	// Show window
692	>	XMapRaised(x_display, the_win);
693	>	wait_mapped(the_win);
694	>
695	>	// Grab mouse and keyboard
696	>	XGrabKeyboard(x_display, the_win, True,
697	>	GrabModeAsync, GrabModeAsync, CurrentTime);
698	>	XGrabPointer(x_display, the_win, True,
699	>	PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
700	>	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
701	>
702	>	// Set VideoMonitor
703	>	int bytes_per_row = width;
704	>	switch (depth) {
705	>	case 1:
706	>	bytes_per_row = ((width | 7) & ~7) >> 3;
707	>	break;
708	>	case 15:
709	>	case 16:
710	>	bytes_per_row *= 2;
711	>	break;
712	>	case 24:
713	>	case 32:
714	>	bytes_per_row *= 4;
715	>	break;
716	>	}
717	>
718	>	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
719	>	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
720	>	char str[256];
721	>	sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
722	>	ErrorAlert(str);
723	>	return false;
724	>	}
725	>	}
726	>
727	>	#if ENABLE_VOSF
728	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
729	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
730	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
731	>	use_vosf = Screen_blitter_init(&visualInfo, true);
732	>
733	>	if (use_vosf) {
734	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
735	>	the_host_buffer = the_buffer;
736	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
737	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
738	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
739	>	}
740	>	#else
741	>	use_vosf = false;
742	>	#endif
743	>	#endif
744	>
745	>	set_video_monitor(width, height, bytes_per_row, true);
746	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
747	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
748	>	#else
749	>	VideoMonitor.mac_frame_base = MacFrameBaseMac;
750	>	#endif
751	>	return true;
752	>	#else
753	>	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
754	>	return false;
755	>	#endif
756	>	}
757	>
758	>	// Init XF86 DGA display
759	>	static bool init_xf86_dga(int width, int height)
760	>	{
761	>	#ifdef ENABLE_XF86_DGA
762		// Set relative mouse mode
763		ADBSetRelMouseMode(true);
764
765	+	#ifdef ENABLE_XF86_VIDMODE
766	+	// Switch to best mode
767	+	if (has_vidmode) {
768	+	int best = 0;
769	+	for (int i=1; i<num_x_video_modes; i++) {
770	+	if (x_video_modes[i]->hdisplay >= width && x_video_modes[i]->vdisplay >= height &&
771	+	x_video_modes[i]->hdisplay <= x_video_modes[best]->hdisplay && x_video_modes[i]->vdisplay <= x_video_modes[best]->vdisplay) {
772	+	best = i;
773	+	}
774	+	}
775	+	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
776	+	XF86VidModeSetViewPort(x_display, screen, 0, 0);
777	+	XSync(x_display, false);
778	+	}
779	+	#endif
780	+
781		// Create window
782		XSetWindowAttributes wattr;
783		wattr.event_mask = eventmask = dga_eventmask;
333	–	wattr.border_pixel = black_pixel;
784		wattr.override_redirect = True;
785
336	–	XSync(x_display, false);
786		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
787	<	InputOutput, vis, CWEventMask | CWBorderPixel | CWOverrideRedirect, &wattr);
788	<	XSync(x_display, false);
789	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
787	>	InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
788	>
789	>	// Set window name/class
790	>	set_window_name(the_win, STR_WINDOW_TITLE);
791	>
792	>	// Indicate that we want keyboard input
793	>	set_window_focus(the_win);
794	>
795	>	// Show window
796		XMapRaised(x_display, the_win);
797	<	XSync(x_display, false);
797	>	wait_mapped(the_win);
798
799		// Establish direct screen connection
800		XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
#	Line 356 | Line 811 | static bool init_dga(int width, int heig
811		// Set colormap
812		if (depth == 8) {
813		XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
359	–	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
814		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
815		}
816	+	XSync(x_display, false);
817
818		// Set VideoMonitor
819		int bytes_per_row = (v_width + 7) & ~7;
#	Line 375 | Line 830 | static bool init_dga(int width, int heig
830		bytes_per_row *= 4;
831		break;
832		}
833	+
834	+	#ifdef VIDEO_VOSF
835	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
836	+	// Screen_blitter_init() returns TRUE if VOSF is mandatory
837	+	// i.e. the framebuffer update function is not Blit_Copy_Raw
838	+	use_vosf = Screen_blitter_init(&visualInfo, true);
839	+
840	+	if (use_vosf) {
841	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
842	+	the_host_buffer = the_buffer;
843	+	the_buffer_size = page_extend((height + 2) * bytes_per_row);
844	+	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
845	+	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
846	+	}
847	+	#else
848	+	use_vosf = false;
849	+	#endif
850	+	#endif
851	+
852		set_video_monitor(width, height, bytes_per_row, true);
853	<	#if REAL_ADDRESSING
854	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
855	<	MacFrameLayout = FLAYOUT_DIRECT;
853	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
854	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
855	>	//      MacFrameLayout = FLAYOUT_DIRECT;
856		#else
857		VideoMonitor.mac_frame_base = MacFrameBaseMac;
858		#endif
859		return true;
860		#else
861	<	ErrorAlert("Basilisk II has been compiled with DGA support disabled.");
861	>	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
862		return false;
863		#endif
864		}
#	Line 454 | Line 928 | static void keycode_init(void)
928		}
929		}
930
931	+	bool VideoInitBuffer()
932	+	{
933	+	#ifdef ENABLE_VOSF
934	+	if (use_vosf) {
935	+	const uint32 page_size  = getpagesize();
936	+	const uint32 page_mask  = page_size - 1;
937	+
938	+	mainBuffer.memBase      = (uintptr) the_buffer;
939	+	// Align the frame buffer on page boundary
940	+	mainBuffer.memStart             = (uintptr)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
941	+	mainBuffer.memLength    = the_buffer_size;
942	+	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
943	+
944	+	mainBuffer.pageSize     = page_size;
945	+	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
946	+	mainBuffer.pageBits     = log_base_2(mainBuffer.pageSize);
947	+
948	+	if (mainBuffer.dirtyPages != 0)
949	+	free(mainBuffer.dirtyPages);
950	+
951	+	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
952	+
953	+	if (mainBuffer.pageInfo != 0)
954	+	free(mainBuffer.pageInfo);
955	+
956	+	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
957	+
958	+	if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0))
959	+	return false;
960	+
961	+	mainBuffer.dirty = false;
962	+
963	+	PFLAG_CLEAR_ALL;
964	+	// Safety net to insure the loops in the update routines will terminate
965	+	// See a discussion in <video_vosf.h> for further details
966	+	PFLAG_CLEAR(mainBuffer.pageCount);
967	+	PFLAG_SET(mainBuffer.pageCount+1);
968	+
969	+	uint32 a = 0;
970	+	for (int i = 0; i < mainBuffer.pageCount; i++) {
971	+	int y1 = a / VideoMonitor.mode.bytes_per_row;
972	+	if (y1 >= VideoMonitor.mode.y)
973	+	y1 = VideoMonitor.mode.y - 1;
974	+
975	+	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.mode.bytes_per_row;
976	+	if (y2 >= VideoMonitor.mode.y)
977	+	y2 = VideoMonitor.mode.y - 1;
978	+
979	+	mainBuffer.pageInfo[i].top = y1;
980	+	mainBuffer.pageInfo[i].bottom = y2;
981	+
982	+	a += mainBuffer.pageSize;
983	+	if (a > mainBuffer.memLength)
984	+	a = mainBuffer.memLength;
985	+	}
986	+
987	+	// We can now write-protect the frame buffer
988	+	if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0)
989	+	return false;
990	+	}
991	+	#endif
992	+	return true;
993	+	}
994	+
995		bool VideoInit(bool classic)
996		{
997	+	#ifdef ENABLE_VOSF
998	+	// Open /dev/zero
999	+	zero_fd = open("/dev/zero", O_RDWR);
1000	+	if (zero_fd < 0) {
1001	+	char str[256];
1002	+	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
1003	+	ErrorAlert(str);
1004	+	return false;
1005	+	}
1006	+
1007	+	// Zero the mainBuffer structure
1008	+	mainBuffer.dirtyPages = 0;
1009	+	mainBuffer.pageInfo = 0;
1010	+	#endif
1011	+
1012	+	// Check if X server runs on local machine
1013	+	local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
1014	+	|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
1015	+
1016		// Init keycode translation
1017		keycode_init();
1018
1019	+	// Read prefs
1020	+	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1021	+	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1022	+
1023		// Find screen and root window
1024		screen = XDefaultScreen(x_display);
1025		rootwin = XRootWindow(x_display, screen);
1026	<
1026	>
1027		// Get screen depth
1028		xdepth = DefaultDepth(x_display, screen);
1029	+
1030	+	#ifdef ENABLE_FBDEV_DGA
1031	+	// Frame buffer name
1032	+	char fb_name[20];
1033	+
1034	+	// Could do fbdev dga ?
1035	+	if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1036	+	has_dga = true;
1037	+	else
1038	+	has_dga = false;
1039	+	#endif
1040
1041	<	#if ENABLE_DGA
1041	>	#ifdef ENABLE_XF86_DGA
1042		// DGA available?
1043	<	int event_base, error_base;
1044	<	if (XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
1043	>	int dga_event_base, dga_error_base;
1044	>	if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
1045		int dga_flags = 0;
1046		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
1047		has_dga = dga_flags & XF86DGADirectPresent;
#	Line 477 | Line 1049 | bool VideoInit(bool classic)
1049		has_dga = false;
1050		#endif
1051
1052	+	#ifdef ENABLE_XF86_VIDMODE
1053	+	// VidMode available?
1054	+	int vm_event_base, vm_error_base;
1055	+	has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
1056	+	if (has_vidmode)
1057	+	XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
1058	+	#endif
1059	+
1060		// Find black and white colors
1061		XParseColor(x_display, DefaultColormap(x_display, screen), "rgb:00/00/00", &black);
1062		XAllocColor(x_display, DefaultColormap(x_display, screen), &black);
#	Line 542 | Line 1122 | bool VideoInit(bool classic)
1122		if (mode_str) {
1123		if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1124		display_type = DISPLAY_WINDOW;
1125	+	#ifdef ENABLE_FBDEV_DGA
1126	+	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1127	+	#else
1128		else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1129	+	#endif
1130		display_type = DISPLAY_DGA;
1131		if (width > DisplayWidth(x_display, screen))
1132		width = DisplayWidth(x_display, screen);
#	Line 562 | Line 1146 | bool VideoInit(bool classic)
1146		return false;
1147		break;
1148		case DISPLAY_DGA:
1149	<	if (!init_dga(width, height))
1149	>	#ifdef ENABLE_FBDEV_DGA
1150	>	if (!init_fbdev_dga(fb_name))
1151	>	#else
1152	>	if (!init_xf86_dga(width, height))
1153	>	#endif
1154		return false;
1155		break;
1156		}
1157
1158		// Lock down frame buffer
1159	<	pthread_mutex_lock(&frame_buffer_lock);
1159	>	LOCK_FRAME_BUFFER;
1160
1161	<	#if !REAL_ADDRESSING
1161	>	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1162		// Set variables for UAE memory mapping
1163		MacFrameBaseHost = the_buffer;
1164	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1164	>	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
1165
1166		// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1167		if (classic)
1168		MacFrameLayout = FLAYOUT_NONE;
1169		#endif
1170
1171	<	// Start redraw/input thread
1171	>	#ifdef ENABLE_VOSF
1172	>	if (use_vosf) {
1173	>	// Initialize the mainBuffer structure
1174	>	if (!VideoInitBuffer()) {
1175	>	// TODO: STR_VOSF_INIT_ERR ?
1176	>	ErrorAlert("Could not initialize Video on SEGV signals");
1177	>	return false;
1178	>	}
1179	>
1180	>	// Initialize the handler for SIGSEGV
1181	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1182	>	// TODO: STR_VOSF_INIT_ERR ?
1183	>	ErrorAlert("Could not initialize Video on SEGV signals");
1184	>	return false;
1185	>	}
1186	>	}
1187	>	#endif
1188	>
1189	>	// Initialize VideoRefresh function
1190	>	VideoRefreshInit();
1191	>
1192		XSync(x_display, false);
1193	+
1194	+	#ifdef HAVE_PTHREADS
1195	+	// Start redraw/input thread
1196		redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1197	<	if (!redraw_thread_active)
1197	>	if (!redraw_thread_active) {
1198		printf("FATAL: cannot create redraw thread\n");
1199	<	return redraw_thread_active;
1199	>	return false;
1200	>	}
1201	>	#endif
1202	>	return true;
1203		}
1204
1205
#	Line 595 | Line 1209 | bool VideoInit(bool classic)
1209
1210		void VideoExit(void)
1211		{
1212	+	#ifdef HAVE_PTHREADS
1213		// Stop redraw thread
1214		if (redraw_thread_active) {
1215		redraw_thread_cancel = true;
#	Line 604 | Line 1219 | void VideoExit(void)
1219		pthread_join(redraw_thread, NULL);
1220		redraw_thread_active = false;
1221		}
1222	+	#endif
1223
1224		// Unlock frame buffer
1225	<	pthread_mutex_unlock(&frame_buffer_lock);
1225	>	UNLOCK_FRAME_BUFFER;
1226
1227		// Close window and server connection
1228		if (x_display != NULL) {
1229		XSync(x_display, false);
1230
1231	<	#if ENABLE_DGA
1231	>	#ifdef ENABLE_XF86_DGA
1232		if (display_type == DISPLAY_DGA) {
1233		XF86DGADirectVideo(x_display, screen, 0);
1234		XUngrabPointer(x_display, CurrentTime);
#	Line 620 | Line 1236 | void VideoExit(void)
1236		}
1237		#endif
1238
1239	<	if (the_buffer_copy) {
1240	<	free(the_buffer_copy);
1241	<	the_buffer_copy = NULL;
1239	>	#ifdef ENABLE_XF86_VIDMODE
1240	>	if (has_vidmode && display_type == DISPLAY_DGA)
1241	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1242	>	#endif
1243	>
1244	>	#ifdef ENABLE_FBDEV_DGA
1245	>	if (display_type == DISPLAY_DGA) {
1246	>	XUngrabPointer(x_display, CurrentTime);
1247	>	XUngrabKeyboard(x_display, CurrentTime);
1248	>	close(fbdev_fd);
1249		}
1250	+	#endif
1251
1252		XFlush(x_display);
1253		XSync(x_display, false);
#	Line 631 | Line 1255 | void VideoExit(void)
1255		XFreeColormap(x_display, cmap[0]);
1256		XFreeColormap(x_display, cmap[1]);
1257		}
1258	+
1259	+	if (!use_vosf) {
1260	+	if (the_buffer) {
1261	+	free(the_buffer);
1262	+	the_buffer = NULL;
1263	+	}
1264	+
1265	+	if (!have_shm && the_buffer_copy) {
1266	+	free(the_buffer_copy);
1267	+	the_buffer_copy = NULL;
1268	+	}
1269	+	}
1270	+	#ifdef ENABLE_VOSF
1271	+	else {
1272	+	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
1273	+	vm_release(the_buffer, the_buffer_size);
1274	+	the_buffer = 0;
1275	+	}
1276	+
1277	+	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
1278	+	vm_release(the_buffer_copy, the_buffer_size);
1279	+	the_buffer_copy = 0;
1280	+	}
1281	+	}
1282	+	#endif
1283	+	}
1284	+
1285	+	#ifdef ENABLE_VOSF
1286	+	if (use_vosf) {
1287	+	// Clear mainBuffer data
1288	+	if (mainBuffer.pageInfo) {
1289	+	free(mainBuffer.pageInfo);
1290	+	mainBuffer.pageInfo = 0;
1291	+	}
1292	+
1293	+	if (mainBuffer.dirtyPages) {
1294	+	free(mainBuffer.dirtyPages);
1295	+	mainBuffer.dirtyPages = 0;
1296	+	}
1297		}
1298	+
1299	+	// Close /dev/zero
1300	+	if (zero_fd > 0)
1301	+	close(zero_fd);
1302	+	#endif
1303		}
1304
1305
#	Line 659 | Line 1327 | void VideoInterrupt(void)
1327
1328		// Temporarily give up frame buffer lock (this is the point where
1329		// we are suspended when the user presses Ctrl-Tab)
1330	<	pthread_mutex_unlock(&frame_buffer_lock);
1331	<	pthread_mutex_lock(&frame_buffer_lock);
1330	>	UNLOCK_FRAME_BUFFER;
1331	>	LOCK_FRAME_BUFFER;
1332		}
1333
1334
#	Line 670 | Line 1338 | void VideoInterrupt(void)
1338
1339		void video_set_palette(uint8 *pal)
1340		{
1341	<	pthread_mutex_lock(&palette_lock);
1341	>	LOCK_PALETTE;
1342
1343		// Convert colors to XColor array
1344		for (int i=0; i<256; i++) {
#	Line 684 | Line 1352 | void video_set_palette(uint8 *pal)
1352		// Tell redraw thread to change palette
1353		palette_changed = true;
1354
1355	<	pthread_mutex_unlock(&palette_lock);
1355	>	UNLOCK_PALETTE;
1356	>	}
1357	>
1358	>
1359	>	/*
1360	>	*  Switch video mode
1361	>	*/
1362	>
1363	>	void video_switch_to_mode(const video_mode &mode)
1364	>	{
1365		}
1366
1367
#	Line 692 | Line 1369 | void video_set_palette(uint8 *pal)
1369		*  Suspend/resume emulator
1370		*/
1371
1372	<	#if ENABLE_DGA
1372	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1373		static void suspend_emul(void)
1374		{
1375		if (display_type == DISPLAY_DGA) {
#	Line 701 | Line 1378 | static void suspend_emul(void)
1378		ctrl_down = false;
1379
1380		// Lock frame buffer (this will stop the MacOS thread)
1381	<	pthread_mutex_lock(&frame_buffer_lock);
1381	>	LOCK_FRAME_BUFFER;
1382
1383		// Save frame buffer
1384	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1384	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1385		if (fb_save)
1386	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1386	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1387
1388		// Close full screen display
1389	+	#ifdef ENABLE_XF86_DGA
1390		XF86DGADirectVideo(x_display, screen, 0);
1391	+	#endif
1392		XUngrabPointer(x_display, CurrentTime);
1393		XUngrabKeyboard(x_display, CurrentTime);
1394		XUnmapWindow(x_display, the_win);
1395	<	XSync(x_display, false);
1395	>	wait_unmapped(the_win);
1396
1397		// Open "suspend" window
1398		XSetWindowAttributes wattr;
1399		wattr.event_mask = KeyPressMask;
1400		wattr.background_pixel = black_pixel;
1401	<	wattr.border_pixel = black_pixel;
723	<	wattr.backing_store = Always;
724	<	wattr.backing_planes = xdepth;
725	<	wattr.colormap = DefaultColormap(x_display, screen);
726	<	XSync(x_display, false);
1401	>
1402		suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1403	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
1404	<	CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
1405	<	XSync(x_display, false);
1406	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
732	<	XMapRaised(x_display, suspend_win);
733	<	XSync(x_display, false);
1403	>	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
1404	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1405	>	set_window_focus(suspend_win);
1406	>	XMapWindow(x_display, suspend_win);
1407		emul_suspended = true;
1408		}
1409		}
#	Line 743 | Line 1416 | static void resume_emul(void)
1416
1417		// Reopen full screen display
1418		XMapRaised(x_display, the_win);
1419	+	wait_mapped(the_win);
1420		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
747	–	XSync(x_display, false);
1421		XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1422		XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1423	+	#ifdef ENABLE_XF86_DGA
1424		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1425		XF86DGASetViewPort(x_display, screen, 0, 0);
1426	+	#endif
1427		XSync(x_display, false);
1428	<
1428	>
1429	>	// the_buffer already contains the data to restore. i.e. since a temporary
1430	>	// frame buffer is used when VOSF is actually used, fb_save is therefore
1431	>	// not necessary.
1432	>	#ifdef ENABLE_VOSF
1433	>	if (use_vosf) {
1434	>	LOCK_VOSF;
1435	>	PFLAG_SET_ALL;
1436	>	UNLOCK_VOSF;
1437	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1438	>	}
1439	>	#endif
1440	>
1441		// Restore frame buffer
1442		if (fb_save) {
1443	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1443	>	#ifdef ENABLE_VOSF
1444	>	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1445	>	if (!use_vosf)
1446	>	#endif
1447	>	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1448		free(fb_save);
1449		fb_save = NULL;
1450		}
1451	+
1452	+	#ifdef ENABLE_XF86_DGA
1453		if (depth == 8)
1454		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1455	+	#endif
1456
1457		// Unlock frame buffer (and continue MacOS thread)
1458	<	pthread_mutex_unlock(&frame_buffer_lock);
1458	>	UNLOCK_FRAME_BUFFER;
1459		emul_suspended = false;
1460		}
1461		#endif
#	Line 824 | Line 1518 | static int kc_decode(KeySym ks)
1518		case XK_period: case XK_greater: return 0x2f;
1519		case XK_slash: case XK_question: return 0x2c;
1520
1521	<	#if ENABLE_DGA
1521	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1522		case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1523		#else
1524		case XK_Tab: return 0x30;
#	Line 916 | Line 1610 | static int kc_decode(KeySym ks)
1610		return -1;
1611		}
1612
1613	<	static int event2keycode(XKeyEvent *ev)
1613	>	static int event2keycode(XKeyEvent &ev)
1614		{
1615		KeySym ks;
1616		int as;
1617		int i = 0;
1618
1619		do {
1620	<	ks = XLookupKeysym(ev, i++);
1620	>	ks = XLookupKeysym(&ev, i++);
1621		as = kc_decode(ks);
1622		if (as != -1)
1623		return as;
#	Line 939 | Line 1633 | static int event2keycode(XKeyEvent *ev)
1633
1634		static void handle_events(void)
1635		{
1636	<	XEvent event;
1637	<	for (;;) {
1638	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
945	<	break;
1636	>	while (XPending(x_display)) {
1637	>	XEvent event;
1638	>	XNextEvent(x_display, &event);
1639
1640		switch (event.type) {
1641		// Mouse button
1642		case ButtonPress: {
1643	<	unsigned int button = ((XButtonEvent *)&event)->button;
1643	>	unsigned int button = event.xbutton.button;
1644		if (button < 4)
1645		ADBMouseDown(button - 1);
1646	+	else if (button < 6) {  // Wheel mouse
1647	+	if (mouse_wheel_mode == 0) {
1648	+	int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
1649	+	ADBKeyDown(key);
1650	+	ADBKeyUp(key);
1651	+	} else {
1652	+	int key = (button == 5) ? 0x3d : 0x3e;  // Cursor up/down
1653	+	for(int i=0; i<mouse_wheel_lines; i++) {
1654	+	ADBKeyDown(key);
1655	+	ADBKeyUp(key);
1656	+	}
1657	+	}
1658	+	}
1659		break;
1660		}
1661		case ButtonRelease: {
1662	<	unsigned int button = ((XButtonEvent *)&event)->button;
1662	>	unsigned int button = event.xbutton.button;
1663		if (button < 4)
1664		ADBMouseUp(button - 1);
1665		break;
#	Line 961 | Line 1667 | static void handle_events(void)
1667
1668		// Mouse moved
1669		case EnterNotify:
964	–	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
965	–	break;
1670		case MotionNotify:
1671	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1671	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1672		break;
1673
1674		// Keyboard
1675		case KeyPress: {
1676		int code;
1677		if (use_keycodes) {
1678	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
1679	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1678	>	event2keycode(event.xkey);      // This is called to process the hotkeys
1679	>	code = keycode_table[event.xkey.keycode & 0xff];
1680		} else
1681	<	code = event2keycode((XKeyEvent *)&event);
1681	>	code = event2keycode(event.xkey);
1682		if (code != -1) {
1683		if (!emul_suspended) {
1684		if (code == 0x39) {     // Caps Lock pressed
#	Line 990 | Line 1694 | static void handle_events(void)
1694		if (code == 0x36)
1695		ctrl_down = true;
1696		} else {
1697	<	#if ENABLE_DGA
1697	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1698		if (code == 0x31)
1699		resume_emul();  // Space wakes us up
1700		#endif
#	Line 1001 | Line 1705 | static void handle_events(void)
1705		case KeyRelease: {
1706		int code;
1707		if (use_keycodes) {
1708	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
1709	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1708	>	event2keycode(event.xkey);      // This is called to process the hotkeys
1709	>	code = keycode_table[event.xkey.keycode & 0xff];
1710		} else
1711	<	code = event2keycode((XKeyEvent *)&event);
1711	>	code = event2keycode(event.xkey);
1712		if (code != -1 && code != 0x39) {       // Don't propagate Caps Lock releases
1713		ADBKeyUp(code);
1714		if (code == 0x36)
#	Line 1015 | Line 1719 | static void handle_events(void)
1719
1720		// Hidden parts exposed, force complete refresh of window
1721		case Expose:
1722	<	if (display_type == DISPLAY_WINDOW)
1723	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1722	>	if (display_type == DISPLAY_WINDOW) {
1723	>	#ifdef ENABLE_VOSF
1724	>	if (use_vosf) {                 // VOSF refresh
1725	>	LOCK_VOSF;
1726	>	PFLAG_SET_ALL;
1727	>	UNLOCK_VOSF;
1728	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1729	>	}
1730	>	else
1731	>	#endif
1732	>	if (frame_skip == 0) {  // Dynamic refresh
1733	>	int x1, y1;
1734	>	for (y1=0; y1<16; y1++)
1735	>	for (x1=0; x1<16; x1++)
1736	>	updt_box[x1][y1] = true;
1737	>	nr_boxes = 16 * 16;
1738	>	} else                                  // Static refresh
1739	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1740	>	}
1741	>	break;
1742	>
1743	>	// Window "close" widget clicked
1744	>	case ClientMessage:
1745	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1746	>	ADBKeyDown(0x7f);       // Power key
1747	>	ADBKeyUp(0x7f);
1748	>	}
1749		break;
1750		}
1751		}
#	Line 1027 | Line 1756 | static void handle_events(void)
1756		*  Window display update
1757		*/
1758
1759	<	static void update_display(void)
1759	>	// Dynamic display update (variable frame rate for each box)
1760	>	static void update_display_dynamic(int ticker)
1761		{
1762	<	// In classic mode, copy the frame buffer from Mac RAM
1763	<	if (classic_mode)
1764	<	memcpy(the_buffer, Mac2HostAddr(0x3fa700), VideoMonitor.bytes_per_row * VideoMonitor.y);
1762	>	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1763	>	int xil = 0;
1764	>	int rxm = 0, rxmo = 0;
1765	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1766	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1767	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
1768	>	int ry = VideoMonitor.mode.y / 16;
1769	>	int max_box;
1770	>
1771	>	y2s = sm_uptd[ticker % 8];
1772	>	y2a = 8;
1773	>	for (i = 0; i < 6; i++)
1774	>	if (ticker % (2 << i))
1775	>	break;
1776	>	max_box = sm_no_boxes[i];
1777
1778	+	if (y2a) {
1779	+	for (y1=0; y1<16; y1++) {
1780	+	for (y2=y2s; y2 < ry; y2 += y2a) {
1781	+	i = ((y1 * ry) + y2) * bytes_per_row;
1782	+	for (x1=0; x1<16; x1++, i += rx) {
1783	+	if (updt_box[x1][y1] == false) {
1784	+	if (memcmp(&the_buffer_copy[i], &the_buffer[i], rx)) {
1785	+	updt_box[x1][y1] = true;
1786	+	nr_boxes++;
1787	+	}
1788	+	}
1789	+	}
1790	+	}
1791	+	}
1792	+	}
1793	+
1794	+	if ((nr_boxes <= max_box) && (nr_boxes)) {
1795	+	for (y1=0; y1<16; y1++) {
1796	+	for (x1=0; x1<16; x1++) {
1797	+	if (updt_box[x1][y1] == true) {
1798	+	if (rxm == 0)
1799	+	xm = x1;
1800	+	rxm += rx;
1801	+	updt_box[x1][y1] = false;
1802	+	}
1803	+	if (((updt_box[x1+1][y1] == false) || (x1 == 15)) && (rxm)) {
1804	+	if ((rxmo != rxm) || (xmo != xm) || (yo != y1 - 1)) {
1805	+	if (rxmo) {
1806	+	xi = xmo * rx;
1807	+	yi = ymo * ry;
1808	+	xil = rxmo;
1809	+	yil = (yo - ymo +1) * ry;
1810	+	}
1811	+	rxmo = rxm;
1812	+	xmo = xm;
1813	+	ymo = y1;
1814	+	}
1815	+	rxm = 0;
1816	+	yo = y1;
1817	+	}
1818	+	if (xil) {
1819	+	i = (yi * bytes_per_row) + xi;
1820	+	for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1821	+	memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1822	+	if (depth == 1) {
1823	+	if (have_shm)
1824	+	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1825	+	else
1826	+	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1827	+	} else {
1828	+	if (have_shm)
1829	+	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1830	+	else
1831	+	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1832	+	}
1833	+	xil = 0;
1834	+	}
1835	+	if ((x1 == 15) && (y1 == 15) && (rxmo)) {
1836	+	x1--;
1837	+	xi = xmo * rx;
1838	+	yi = ymo * ry;
1839	+	xil = rxmo;
1840	+	yil = (yo - ymo +1) * ry;
1841	+	rxmo = 0;
1842	+	}
1843	+	}
1844	+	}
1845	+	nr_boxes = 0;
1846	+	}
1847	+	}
1848	+
1849	+	// Static display update (fixed frame rate, but incremental)
1850	+	static void update_display_static(void)
1851	+	{
1852		// Incremental update code
1853		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1854	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1855	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1854	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1855	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1856		uint8 *p, *p2;
1857
1858		// Check for first line from top and first line from bottom that have changed
1859		y1 = 0;
1860	<	for (j=0; j<VideoMonitor.y; j++) {
1860	>	for (j=0; j<VideoMonitor.mode.y; j++) {
1861		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1862		y1 = j;
1863		break;
1864		}
1865		}
1866		y2 = y1 - 1;
1867	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
1867	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
1868		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1869		y2 = j;
1870		break;
#	Line 1059 | Line 1875 | static void update_display(void)
1875		// Check for first column from left and first column from right that have changed
1876		if (high) {
1877		if (depth == 1) {
1878	<	x1 = VideoMonitor.x;
1878	>	x1 = VideoMonitor.mode.x - 1;
1879		for (j=y1; j<=y2; j++) {
1880		p = &the_buffer[j * bytes_per_row];
1881		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1068 | Line 1884 | static void update_display(void)
1884		x1 = i << 3;
1885		break;
1886		}
1887	<	p++;
1072	<	p2++;
1887	>	p++; p2++;
1888		}
1889		}
1890		x2 = x1;
#	Line 1078 | Line 1893 | static void update_display(void)
1893		p2 = &the_buffer_copy[j * bytes_per_row];
1894		p += bytes_per_row;
1895		p2 += bytes_per_row;
1896	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1897	<	p--;
1083	<	p2--;
1896	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
1897	>	p--; p2--;
1898		if (*p != *p2) {
1899	<	x2 = i << 3;
1899	>	x2 = (i << 3) + 7;
1900		break;
1901		}
1902		}
1903		}
1904	<	wide = x2 - x1;
1904	>	wide = x2 - x1 + 1;
1905
1906		// Update copy of the_buffer
1907		if (high && wide) {
1908		for (j=y1; j<=y2; j++) {
1909		i = j * bytes_per_row + (x1 >> 3);
1910	<	memcpy(&the_buffer_copy[i], &the_buffer[i], wide >> 3);
1910	>	memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3);
1911		}
1912		}
1913
1914		} else {
1915	<	x1 = VideoMonitor.x;
1915	>	x1 = VideoMonitor.mode.x;
1916		for (j=y1; j<=y2; j++) {
1917		p = &the_buffer[j * bytes_per_row];
1918		p2 = &the_buffer_copy[j * bytes_per_row];
1919	<	for (i=0; i<x1; i++) {
1920	<	if (memcmp(p, p2, bytes_per_pixel)) {
1921	<	x1 = i;
1919	>	for (i=0; i<x1*bytes_per_pixel; i++) {
1920	>	if (*p != *p2) {
1921	>	x1 = i / bytes_per_pixel;
1922		break;
1923		}
1924	<	p += bytes_per_pixel;
1111	<	p2 += bytes_per_pixel;
1924	>	p++; p2++;
1925		}
1926		}
1927		x2 = x1;
#	Line 1117 | Line 1930 | static void update_display(void)
1930		p2 = &the_buffer_copy[j * bytes_per_row];
1931		p += bytes_per_row;
1932		p2 += bytes_per_row;
1933	<	for (i=VideoMonitor.x; i>x2; i--) {
1934	<	p -= bytes_per_pixel;
1935	<	p2 -= bytes_per_pixel;
1936	<	if (memcmp(p, p2, bytes_per_pixel)) {
1937	<	x2 = i;
1933	>	for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1934	>	p--;
1935	>	p2--;
1936	>	if (*p != *p2) {
1937	>	x2 = i / bytes_per_pixel;
1938		break;
1939		}
1940		}
#	Line 1132 | Line 1945 | static void update_display(void)
1945		if (high && wide) {
1946		for (j=y1; j<=y2; j++) {
1947		i = j * bytes_per_row + x1 * bytes_per_pixel;
1948	<	memcpy(&the_buffer_copy[i], &the_buffer[i], bytes_per_pixel * wide);
1948	>	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
1949		}
1950		}
1951		}
#	Line 1145 | Line 1958 | static void update_display(void)
1958		else
1959		XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1960		}
1148	–
1149	–	// Has the Mac started? (cursor data is not valid otherwise)
1150	–	if (HasMacStarted()) {
1151	–
1152	–	// Set new cursor image if it was changed
1153	–	if (memcmp(the_cursor, Mac2HostAddr(0x844), 64)) {
1154	–	memcpy(the_cursor, Mac2HostAddr(0x844), 64);
1155	–	memcpy(cursor_image->data, the_cursor, 32);
1156	–	memcpy(cursor_mask_image->data, the_cursor+32, 32);
1157	–	XFreeCursor(x_display, mac_cursor);
1158	–	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
1159	–	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
1160	–	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, ReadMacInt8(0x885), ReadMacInt8(0x887));
1161	–	XDefineCursor(x_display, the_win, mac_cursor);
1162	–	}
1163	–	}
1961		}
1962
1963
1964		/*
1965	<	*  Thread for screen refresh, input handling etc.
1965	>	*      Screen refresh functions
1966		*/
1967
1968	<	static void *redraw_func(void *arg)
1969	<	{
1970	<	int tick_counter = 0;
1968	>	// We suggest the compiler to inline the next two functions so that it
1969	>	// may specialise the code according to the current screen depth and
1970	>	// display type. A clever compiler would do that job by itself though...
1971
1972	<	while (!redraw_thread_cancel) {
1972	>	// NOTE: update_display_vosf is inlined too
1973
1974	<	// Wait
1975	<	#ifdef HAVE_NANOSLEEP
1976	<	struct timespec req = {0, 16666667};
1977	<	nanosleep(&req, NULL);
1978	<	#else
1979	<	usleep(16667);
1974	>	static inline void possibly_quit_dga_mode()
1975	>	{
1976	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1977	>	// Quit DGA mode if requested
1978	>	if (quit_full_screen) {
1979	>	quit_full_screen = false;
1980	>	#ifdef ENABLE_XF86_DGA
1981	>	XF86DGADirectVideo(x_display, screen, 0);
1982		#endif
1983	+	XUngrabPointer(x_display, CurrentTime);
1984	+	XUngrabKeyboard(x_display, CurrentTime);
1985	+	XUnmapWindow(x_display, the_win);
1986	+	XSync(x_display, false);
1987	+	}
1988	+	#endif
1989	+	}
1990	+
1991	+	static inline void handle_palette_changes(int depth, int display_type)
1992	+	{
1993	+	LOCK_PALETTE;
1994
1995	<	#if ENABLE_DGA
1996	<	// Quit DGA mode if requested
1997	<	if (quit_full_screen) {
1998	<	quit_full_screen = false;
1995	>	if (palette_changed) {
1996	>	palette_changed = false;
1997	>	if (depth == 8) {
1998	>	XStoreColors(x_display, cmap[0], palette, 256);
1999	>	XStoreColors(x_display, cmap[1], palette, 256);
2000	>	XSync(x_display, false);
2001	>
2002	>	#ifdef ENABLE_XF86_DGA
2003		if (display_type == DISPLAY_DGA) {
2004	<	XF86DGADirectVideo(x_display, screen, 0);
2005	<	XUngrabPointer(x_display, CurrentTime);
1192	<	XUngrabKeyboard(x_display, CurrentTime);
1193	<	XUnmapWindow(x_display, the_win);
1194	<	XSync(x_display, false);
2004	>	current_dga_cmap ^= 1;
2005	>	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2006		}
1196	–	}
2007		#endif
2008	+	}
2009	+	}
2010
2011	<	// Handle X events
2012	<	handle_events();
2011	>	UNLOCK_PALETTE;
2012	>	}
2013
2014	<	// Handle palette changes
2015	<	pthread_mutex_lock(&palette_lock);
2016	<	if (palette_changed) {
2017	<	palette_changed = false;
2018	<	if (depth == 8) {
2019	<	XStoreColors(x_display, cmap[0], palette, 256);
2020	<	XStoreColors(x_display, cmap[1], palette, 256);
2021	<	#if ENABLE_DGA
2022	<	if (display_type == DISPLAY_DGA) {
2023	<	current_dga_cmap ^= 1;
2024	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2025	<	}
2026	<	#endif
2027	<	}
2014	>	static void video_refresh_dga(void)
2015	>	{
2016	>	// Quit DGA mode if requested
2017	>	possibly_quit_dga_mode();
2018	>
2019	>	// Handle X events
2020	>	handle_events();
2021	>
2022	>	// Handle palette changes
2023	>	handle_palette_changes(depth, DISPLAY_DGA);
2024	>	}
2025	>
2026	>	#ifdef ENABLE_VOSF
2027	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
2028	>	static void video_refresh_dga_vosf(void)
2029	>	{
2030	>	// Quit DGA mode if requested
2031	>	possibly_quit_dga_mode();
2032	>
2033	>	// Handle X events
2034	>	handle_events();
2035	>
2036	>	// Handle palette changes
2037	>	handle_palette_changes(depth, DISPLAY_DGA);
2038	>
2039	>	// Update display (VOSF variant)
2040	>	static int tick_counter = 0;
2041	>	if (++tick_counter >= frame_skip) {
2042	>	tick_counter = 0;
2043	>	if (mainBuffer.dirty) {
2044	>	LOCK_VOSF;
2045	>	update_display_dga_vosf();
2046	>	UNLOCK_VOSF;
2047		}
2048	<	pthread_mutex_unlock(&palette_lock);
2048	>	}
2049	>	}
2050	>	#endif
2051
2052	<	// In window mode, update display and mouse pointer
2053	<	if (display_type == DISPLAY_WINDOW) {
2054	<	tick_counter++;
2055	<	if (tick_counter >= frame_skip) {
2056	<	tick_counter = 0;
2057	<	update_display();
2058	<	}
2052	>	static void video_refresh_window_vosf(void)
2053	>	{
2054	>	// Quit DGA mode if requested
2055	>	possibly_quit_dga_mode();
2056	>
2057	>	// Handle X events
2058	>	handle_events();
2059	>
2060	>	// Handle palette changes
2061	>	handle_palette_changes(depth, DISPLAY_WINDOW);
2062	>
2063	>	// Update display (VOSF variant)
2064	>	static int tick_counter = 0;
2065	>	if (++tick_counter >= frame_skip) {
2066	>	tick_counter = 0;
2067	>	if (mainBuffer.dirty) {
2068	>	LOCK_VOSF;
2069	>	update_display_window_vosf();
2070	>	UNLOCK_VOSF;
2071	>	XSync(x_display, false); // Let the server catch up
2072		}
2073		}
2074	+	}
2075	+	#endif // def ENABLE_VOSF
2076	+
2077	+	static void video_refresh_window_static(void)
2078	+	{
2079	+	// Handle X events
2080	+	handle_events();
2081	+
2082	+	// Handle_palette changes
2083	+	handle_palette_changes(depth, DISPLAY_WINDOW);
2084	+
2085	+	// Update display (static variant)
2086	+	static int tick_counter = 0;
2087	+	if (++tick_counter >= frame_skip) {
2088	+	tick_counter = 0;
2089	+	update_display_static();
2090	+	}
2091	+	}
2092	+
2093	+	static void video_refresh_window_dynamic(void)
2094	+	{
2095	+	// Handle X events
2096	+	handle_events();
2097	+
2098	+	// Handle_palette changes
2099	+	handle_palette_changes(depth, DISPLAY_WINDOW);
2100	+
2101	+	// Update display (dynamic variant)
2102	+	static int tick_counter = 0;
2103	+	tick_counter++;
2104	+	update_display_dynamic(tick_counter);
2105	+	}
2106	+
2107	+
2108	+	/*
2109	+	*  Thread for screen refresh, input handling etc.
2110	+	*/
2111	+
2112	+	void VideoRefreshInit(void)
2113	+	{
2114	+	// TODO: set up specialised 8bpp VideoRefresh handlers ?
2115	+	if (display_type == DISPLAY_DGA) {
2116	+	#if ENABLE_VOSF && (REAL_ADDRESSING || DIRECT_ADDRESSING)
2117	+	if (use_vosf)
2118	+	video_refresh = video_refresh_dga_vosf;
2119	+	else
2120	+	#endif
2121	+	video_refresh = video_refresh_dga;
2122	+	}
2123	+	else {
2124	+	#ifdef ENABLE_VOSF
2125	+	if (use_vosf)
2126	+	video_refresh = video_refresh_window_vosf;
2127	+	else
2128	+	#endif
2129	+	if (frame_skip == 0)
2130	+	video_refresh = video_refresh_window_dynamic;
2131	+	else
2132	+	video_refresh = video_refresh_window_static;
2133	+	}
2134	+	}
2135	+
2136	+	void VideoRefresh(void)
2137	+	{
2138	+	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2139	+	video_refresh();
2140	+	}
2141	+
2142	+	#ifdef HAVE_PTHREADS
2143	+	static void *redraw_func(void *arg)
2144	+	{
2145	+	uint64 start = GetTicks_usec();
2146	+	int64 ticks = 0;
2147	+	uint64 next = GetTicks_usec();
2148	+	while (!redraw_thread_cancel) {
2149	+	video_refresh();
2150	+	next += 16667;
2151	+	int64 delay = next - GetTicks_usec();
2152	+	if (delay > 0)
2153	+	Delay_usec(delay);
2154	+	else if (delay < -16667)
2155	+	next = GetTicks_usec();
2156	+	ticks++;
2157	+	}
2158	+	uint64 end = GetTicks_usec();
2159	+	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2160		return NULL;
2161		}
2162	+	#endif

Diff Legend

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