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.14 by cebix, 2000-04-10T18:53:10Z vs.
Revision 1.31 by cebix, 2000-11-30T16:09:03Z

#	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 <unistd.h>
57	+	# include <signal.h>
58	+	# include <fcntl.h>
59	+	# include <sys/mman.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_XF86_DGA
52	–	#include <X11/extensions/xf86dga.h>
53	–	#endif
54	–
55	–	#if ENABLE_XF86_VIDMODE
56	–	#include <X11/extensions/xf86vmode.h>
57	–	#endif
58	–
59	–	#if ENABLE_FBDEV_DGA
60	–	#include <sys/mman.h>
61	–	#endif
62	–
63	–
73
74		// Display types
75		enum {
#	Line 79 | Line 88 | 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
#	Line 109 | 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
115	–	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;
123	–	static XImage *cursor_image, *cursor_mask_image;
124	–	static Pixmap cursor_map, cursor_mask_map;
144		static Cursor mac_cursor;
126	–	static GC cursor_gc, cursor_mask_gc;
145		static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer
128	–	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;
#	Line 136 | Line 153 | static int sm_no_boxes[] = {1,8,32,64,12
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	+	#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	<	#if ENABLE_XF86_VIDMODE
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	+	uint32 memBase;                             // Real start address
192	+	uint32 memStart;                    // Start address aligned to page boundary
193	+	uint32 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	+	uint8 * dirtyPages;                 // Table of flags set if page was altered
201	+	ScreenPageInfo * pageInfo;  // Table of mappings page -> Mac scanlines
202	+	};
203	+
204	+	static ScreenInfo mainBuffer;
205	+
206	+	#define PFLAG_SET(page)                 mainBuffer.dirtyPages[page] = 1
207	+	#define PFLAG_CLEAR(page)               mainBuffer.dirtyPages[page] = 0
208	+	#define PFLAG_ISSET(page)               mainBuffer.dirtyPages[page]
209	+	#define PFLAG_ISCLEAR(page)             (mainBuffer.dirtyPages[page] == 0)
210	+	#ifdef UNALIGNED_PROFITABLE
211	+	# define PFLAG_ISCLEAR_4(page)  (*((uint32 *)(mainBuffer.dirtyPages + page)) == 0)
212	+	#else
213	+	# define PFLAG_ISCLEAR_4(page)  \
214	+	(mainBuffer.dirtyPages[page  ] == 0) \
215	+	&&      (mainBuffer.dirtyPages[page+1] == 0) \
216	+	&&      (mainBuffer.dirtyPages[page+2] == 0) \
217	+	&&      (mainBuffer.dirtyPages[page+3] == 0)
218	+	#endif
219	+	#define PFLAG_CLEAR_ALL                 memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
220	+	#define PFLAG_SET_ALL                   memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
221	+
222	+	static int zero_fd = -1;
223	+	static bool Screen_fault_handler_init();
224	+	static struct sigaction vosf_sa;
225	+
226	+	#ifdef HAVE_PTHREADS
227	+	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer (dirtyPages in fact)
228	+	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
229	+	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
230	+	#else
231	+	#define LOCK_VOSF
232	+	#define UNLOCK_VOSF
233	+	#endif
234	+
235	+	static int log_base_2(uint32 x)
236	+	{
237	+	uint32 mask = 0x80000000;
238	+	int l = 31;
239	+	while (l >= 0 && (x & mask) == 0) {
240	+	mask >>= 1;
241	+	l--;
242	+	}
243	+	return l;
244	+	}
245	+
246	+	#endif
247	+
248	+	// VideoRefresh function
249	+	void VideoRefreshInit(void);
250	+	static void (*video_refresh)(void);
251
252		// Prototypes
253		static void *redraw_func(void *arg);
254	<	static int event2keycode(XKeyEvent *ev);
254	>	static int event2keycode(XKeyEvent &ev);
255
256
257		// From main_unix.cpp
258	+	extern char *x_display_name;
259		extern Display *x_display;
260
261		// From sys_unix.cpp
262		extern void SysMountFirstFloppy(void);
263
264	+	#ifdef ENABLE_VOSF
265	+	# include "video_vosf.h"
266	+	#endif
267	+
268
269		/*
270		*  Initialization
#	Line 168 | Line 273 | extern void SysMountFirstFloppy(void);
273		// Set VideoMonitor according to video mode
274		void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
275		{
276	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
277		int layout = FLAYOUT_DIRECT;
278		switch (depth) {
279		case 1:
280		layout = FLAYOUT_DIRECT;
175	–	VideoMonitor.mode = VMODE_1BIT;
281		break;
282		case 8:
283		layout = FLAYOUT_DIRECT;
179	–	VideoMonitor.mode = VMODE_8BIT;
284		break;
285		case 15:
286		layout = FLAYOUT_HOST_555;
183	–	VideoMonitor.mode = VMODE_16BIT;
287		break;
288		case 16:
289		layout = FLAYOUT_HOST_565;
187	–	VideoMonitor.mode = VMODE_16BIT;
290		break;
291		case 24:
292		case 32:
293		layout = FLAYOUT_HOST_888;
192	–	VideoMonitor.mode = VMODE_32BIT;
294		break;
295		}
195	–	VideoMonitor.x = width;
196	–	VideoMonitor.y = height;
197	–	VideoMonitor.bytes_per_row = bytes_per_row;
296		if (native_byte_order)
297		MacFrameLayout = layout;
298		else
299		MacFrameLayout = FLAYOUT_DIRECT;
300	+	#endif
301	+	switch (depth) {
302	+	case 1:
303	+	VideoMonitor.mode = VMODE_1BIT;
304	+	break;
305	+	case 8:
306	+	VideoMonitor.mode = VMODE_8BIT;
307	+	break;
308	+	case 15:
309	+	VideoMonitor.mode = VMODE_16BIT;
310	+	break;
311	+	case 16:
312	+	VideoMonitor.mode = VMODE_16BIT;
313	+	break;
314	+	case 24:
315	+	case 32:
316	+	VideoMonitor.mode = VMODE_32BIT;
317	+	break;
318	+	}
319	+	VideoMonitor.x = width;
320	+	VideoMonitor.y = height;
321	+	VideoMonitor.bytes_per_row = bytes_per_row;
322	+	}
323	+
324	+	// Set window name and class
325	+	static void set_window_name(Window w, int name)
326	+	{
327	+	const char *str = GetString(name);
328	+	XStoreName(x_display, w, str);
329	+	XSetIconName(x_display, w, str);
330	+
331	+	XClassHint *hints;
332	+	hints = XAllocClassHint();
333	+	if (hints) {
334	+	hints->res_name = "BasiliskII";
335	+	hints->res_class = "BasiliskII";
336	+	XSetClassHint(x_display, w, hints);
337	+	XFree((char *)hints);
338	+	}
339	+	}
340	+
341	+	// Set window input focus flag
342	+	static void set_window_focus(Window w)
343	+	{
344	+	XWMHints *hints = XAllocWMHints();
345	+	if (hints) {
346	+	hints->input = True;
347	+	hints->initial_state = NormalState;
348	+	hints->flags = InputHint | StateHint;
349	+	XSetWMHints(x_display, w, hints);
350	+	XFree((char *)hints);
351	+	}
352	+	}
353	+
354	+	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
355	+	static void set_window_delete_protocol(Window w)
356	+	{
357	+	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
358	+	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
359	+	}
360	+
361	+	// Wait until window is mapped/unmapped
362	+	void wait_mapped(Window w)
363	+	{
364	+	XEvent e;
365	+	do {
366	+	XMaskEvent(x_display, StructureNotifyMask, &e);
367	+	} while ((e.type != MapNotify) || (e.xmap.event != w));
368	+	}
369	+
370	+	void wait_unmapped(Window w)
371	+	{
372	+	XEvent e;
373	+	do {
374	+	XMaskEvent(x_display, StructureNotifyMask, &e);
375	+	} while ((e.type != UnmapNotify) || (e.xmap.event != w));
376		}
377
378		// Trap SHM errors
#	Line 225 | Line 399 | static bool init_window(int width, int h
399
400		// Read frame skip prefs
401		frame_skip = PrefsFindInt32("frameskip");
228	–	if (frame_skip == 0)
229	–	frame_skip = 1;
402
403		// Create window
404		XSetWindowAttributes wattr;
405		wattr.event_mask = eventmask = win_eventmask;
406		wattr.background_pixel = black_pixel;
407	<	wattr.border_pixel = black_pixel;
236	<	wattr.backing_store = NotUseful;
237	<	wattr.save_under = false;
238	<	wattr.backing_planes = xdepth;
407	>	wattr.colormap = cmap[0];
408
240	–	XSync(x_display, false);
409		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
410	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
243	<	CWBackingStore | CWBackingPlanes, &wattr);
244	<	XSync(x_display, false);
245	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
246	<	XMapRaised(x_display, the_win);
247	<	XSync(x_display, false);
410	>	InputOutput, vis, CWEventMask | CWBackPixel | (depth == 8 ? CWColormap : 0), &wattr);
411
412	<	// Set colormap
413	<	if (depth == 8) {
414	<	XSetWindowColormap(x_display, the_win, cmap[0]);
415	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
416	<	}
412	>	// Set window name/class
413	>	set_window_name(the_win, STR_WINDOW_TITLE);
414	>
415	>	// Indicate that we want keyboard input
416	>	set_window_focus(the_win);
417	>
418	>	// Set delete protocol property
419	>	set_window_delete_protocol(the_win);
420
421		// Make window unresizable
422	<	XSizeHints *hints;
423	<	if ((hints = XAllocSizeHints()) != NULL) {
424	<	hints->min_width = width;
425	<	hints->max_width = width;
426	<	hints->min_height = height;
427	<	hints->max_height = height;
428	<	hints->flags = PMinSize | PMaxSize;
429	<	XSetWMNormalHints(x_display, the_win, hints);
430	<	XFree((char *)hints);
422	>	{
423	>	XSizeHints *hints = XAllocSizeHints();
424	>	if (hints) {
425	>	hints->min_width = width;
426	>	hints->max_width = width;
427	>	hints->min_height = height;
428	>	hints->max_height = height;
429	>	hints->flags = PMinSize | PMaxSize;
430	>	XSetWMNormalHints(x_display, the_win, hints);
431	>	XFree((char *)hints);
432	>	}
433		}
434
435	+	// Show window
436	+	XMapWindow(x_display, the_win);
437	+	wait_mapped(the_win);
438	+
439		// Try to create and attach SHM image
440		have_shm = false;
441	<	if (depth != 1 && XShmQueryExtension(x_display)) {
441	>	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
442
443		// Create SHM image ("height + 2" for safety)
444		img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
#	Line 317 | Line 489 | static bool init_window(int width, int h
489		img->bitmap_bit_order = MSBFirst;
490		}
491
492	<	// Allocate memory for frame buffer copy
492	>	#ifdef ENABLE_VOSF
493	>	// Allocate a page-aligned chunk of memory for frame buffer
494	>	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
495	>	the_host_buffer = the_buffer_copy;
496	>
497	>	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
498	>	memset(the_buffer_copy, 0, the_buffer_size);
499	>
500	>	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
501	>	memset(the_buffer, 0, the_buffer_size);
502	>	#else
503	>	// Allocate memory for frame buffer
504		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
505	+	#endif
506
507		// Create GC
508		the_gc = XCreateGC(x_display, the_win, 0, 0);
509		XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
510
511		// Create no_cursor
512	<	mac_cursor = XCreatePixmapCursor (x_display,
513	<	XCreatePixmap (x_display, the_win, 1, 1, 1),
514	<	XCreatePixmap (x_display, the_win, 1, 1, 1),
515	<	&black, &white, 0, 0);
516	<	XDefineCursor (x_display, the_win, mac_cursor);
512	>	mac_cursor = XCreatePixmapCursor(x_display,
513	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
514	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
515	>	&black, &white, 0, 0);
516	>	XDefineCursor(x_display, the_win, mac_cursor);
517
518		// Set VideoMonitor
519	+	bool native_byte_order;
520		#ifdef WORDS_BIGENDIAN
521	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst);
521	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
522		#else
523	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst);
523	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
524		#endif
525	+	#ifdef ENABLE_VOSF
526	+	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
527	+	#endif
528	+	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
529
530	<	#if REAL_ADDRESSING
531	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
343	<	MacFrameLayout = FLAYOUT_DIRECT;
530	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
531	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
532		#else
533		VideoMonitor.mac_frame_base = MacFrameBaseMac;
534		#endif
#	Line 350 | Line 538 | static bool init_window(int width, int h
538		// Init fbdev DGA display
539		static bool init_fbdev_dga(char *in_fb_name)
540		{
541	<	#if ENABLE_FBDEV_DGA
541	>	#ifdef ENABLE_FBDEV_DGA
542		// Find the maximum depth available
543		int ndepths, max_depth(0);
544		int *depths = XListDepths(x_display, screen, &ndepths);
#	Line 419 | Line 607 | static bool init_fbdev_dga(char *in_fb_n
607
608		// Create window
609		XSetWindowAttributes wattr;
610	<	wattr.override_redirect = True;
611	<	wattr.backing_store             = NotUseful;
612	<	wattr.background_pixel  = white_pixel;
613	<	wattr.border_pixel              = black_pixel;
426	<	wattr.event_mask                = eventmask = dga_eventmask;
610	>	wattr.event_mask = eventmask = dga_eventmask;
611	>	wattr.background_pixel = white_pixel;
612	>	wattr.override_redirect = True;
613	>	wattr.colormap = cmap[0];
614
428	–	XSync(x_display, false);
615		the_win = XCreateWindow(x_display, rootwin,
616		0, 0, width, height,
617		0, xdepth, InputOutput, vis,
618	<	CWEventMask|CWBackPixel|CWBorderPixel|CWOverrideRedirect|CWBackingStore,
618	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
619		&wattr);
620	<	XSync(x_display, false);
620	>
621	>	// Set window name/class
622	>	set_window_name(the_win, STR_WINDOW_TITLE);
623	>
624	>	// Indicate that we want keyboard input
625	>	set_window_focus(the_win);
626	>
627	>	// Show window
628		XMapRaised(x_display, the_win);
629	<	XSync(x_display, false);
629	>	wait_mapped(the_win);
630
631		// Grab mouse and keyboard
632		XGrabKeyboard(x_display, the_win, True,
#	Line 442 | Line 635 | static bool init_fbdev_dga(char *in_fb_n
635		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
636		GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
637
445	–	// Set colormap
446	–	if (depth == 8) {
447	–	XSetWindowColormap(x_display, the_win, cmap[0]);
448	–	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
449	–	}
450	–
638		// Set VideoMonitor
639		int bytes_per_row = width;
640		switch (depth) {
#	Line 473 | Line 660 | static bool init_fbdev_dga(char *in_fb_n
660		}
661		}
662
663	+	#if ENABLE_VOSF
664	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
665	+	// If the blit function is null, i.e. just a copy of the buffer,
666	+	// we first try to avoid the allocation of a temporary frame buffer
667	+	use_vosf = true;
668	+	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
669	+	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
670	+	use_vosf = false;
671	+
672	+	if (use_vosf) {
673	+	the_host_buffer = the_buffer;
674	+	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
675	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
676	+	memset(the_buffer_copy, 0, the_buffer_size);
677	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
678	+	memset(the_buffer, 0, the_buffer_size);
679	+	}
680	+	#else
681	+	use_vosf = false;
682	+	#endif
683	+	#endif
684	+
685		set_video_monitor(width, height, bytes_per_row, true);
686	<	#if REAL_ADDRESSING
687	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
479	<	MacFrameLayout = FLAYOUT_DIRECT;
686	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
687	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
688		#else
689		VideoMonitor.mac_frame_base = MacFrameBaseMac;
690		#endif
#	Line 490 | Line 698 | static bool init_fbdev_dga(char *in_fb_n
698		// Init XF86 DGA display
699		static bool init_xf86_dga(int width, int height)
700		{
701	<	#if ENABLE_XF86_DGA
701	>	#ifdef ENABLE_XF86_DGA
702		// Set relative mouse mode
703		ADBSetRelMouseMode(true);
704
705	<	#if ENABLE_XF86_VIDMODE
705	>	#ifdef ENABLE_XF86_VIDMODE
706		// Switch to best mode
707		if (has_vidmode) {
708		int best = 0;
#	Line 506 | Line 714 | static bool init_xf86_dga(int width, int
714		}
715		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
716		XF86VidModeSetViewPort(x_display, screen, 0, 0);
717	+	XSync(x_display, false);
718		}
719		#endif
720
721		// Create window
722		XSetWindowAttributes wattr;
723		wattr.event_mask = eventmask = dga_eventmask;
515	–	wattr.border_pixel = black_pixel;
724		wattr.override_redirect = True;
725
518	–	XSync(x_display, false);
726		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
727	<	InputOutput, vis, CWEventMask | CWBorderPixel | CWOverrideRedirect, &wattr);
728	<	XSync(x_display, false);
729	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
727	>	InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
728	>
729	>	// Set window name/class
730	>	set_window_name(the_win, STR_WINDOW_TITLE);
731	>
732	>	// Indicate that we want keyboard input
733	>	set_window_focus(the_win);
734	>
735	>	// Show window
736		XMapRaised(x_display, the_win);
737	<	XSync(x_display, false);
737	>	wait_mapped(the_win);
738
739		// Establish direct screen connection
740		XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
#	Line 538 | Line 751 | static bool init_xf86_dga(int width, int
751		// Set colormap
752		if (depth == 8) {
753		XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
541	–	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
754		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
755		}
756	+	XSync(x_display, false);
757
758		// Set VideoMonitor
759		int bytes_per_row = (v_width + 7) & ~7;
#	Line 557 | Line 770 | static bool init_xf86_dga(int width, int
770		bytes_per_row *= 4;
771		break;
772		}
773	+
774	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
775	+	// If the blit function is null, i.e. just a copy of the buffer,
776	+	// we first try to avoid the allocation of a temporary frame buffer
777	+	use_vosf = true;
778	+	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
779	+	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
780	+	use_vosf = false;
781	+
782	+	if (use_vosf) {
783	+	the_host_buffer = the_buffer;
784	+	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
785	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
786	+	memset(the_buffer_copy, 0, the_buffer_size);
787	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
788	+	memset(the_buffer, 0, the_buffer_size);
789	+	}
790	+	#elif defined(ENABLE_VOSF)
791	+	// The UAE memory handlers will already handle color conversion, if needed.
792	+	use_vosf = false;
793	+	#endif
794	+
795		set_video_monitor(width, height, bytes_per_row, true);
796	<	#if REAL_ADDRESSING
797	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
798	<	MacFrameLayout = FLAYOUT_DIRECT;
796	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
797	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
798	>	//      MacFrameLayout = FLAYOUT_DIRECT;
799		#else
800		VideoMonitor.mac_frame_base = MacFrameBaseMac;
801		#endif
#	Line 636 | Line 871 | static void keycode_init(void)
871		}
872		}
873
874	+	bool VideoInitBuffer()
875	+	{
876	+	#ifdef ENABLE_VOSF
877	+	if (use_vosf) {
878	+	const uint32 page_size  = getpagesize();
879	+	const uint32 page_mask  = page_size - 1;
880	+
881	+	mainBuffer.memBase      = (uint32) the_buffer;
882	+	// Align the frame buffer on page boundary
883	+	mainBuffer.memStart             = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
884	+	mainBuffer.memLength    = the_buffer_size;
885	+	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
886	+
887	+	mainBuffer.pageSize     = page_size;
888	+	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
889	+	mainBuffer.pageBits     = log_base_2(mainBuffer.pageSize);
890	+
891	+	if (mainBuffer.dirtyPages != 0)
892	+	free(mainBuffer.dirtyPages);
893	+
894	+	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
895	+
896	+	if (mainBuffer.pageInfo != 0)
897	+	free(mainBuffer.pageInfo);
898	+
899	+	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
900	+
901	+	if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0))
902	+	return false;
903	+
904	+	PFLAG_CLEAR_ALL;
905	+
906	+	uint32 a = 0;
907	+	for (int i = 0; i < mainBuffer.pageCount; i++) {
908	+	int y1 = a / VideoMonitor.bytes_per_row;
909	+	if (y1 >= VideoMonitor.y)
910	+	y1 = VideoMonitor.y - 1;
911	+
912	+	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
913	+	if (y2 >= VideoMonitor.y)
914	+	y2 = VideoMonitor.y - 1;
915	+
916	+	mainBuffer.pageInfo[i].top = y1;
917	+	mainBuffer.pageInfo[i].bottom = y2;
918	+
919	+	a += mainBuffer.pageSize;
920	+	if (a > mainBuffer.memLength)
921	+	a = mainBuffer.memLength;
922	+	}
923	+
924	+	// We can now write-protect the frame buffer
925	+	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
926	+	return false;
927	+	}
928	+	#endif
929	+	return true;
930	+	}
931	+
932		bool VideoInit(bool classic)
933		{
934	+	#ifdef ENABLE_VOSF
935	+	// Open /dev/zero
936	+	zero_fd = open("/dev/zero", O_RDWR);
937	+	if (zero_fd < 0) {
938	+	char str[256];
939	+	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
940	+	ErrorAlert(str);
941	+	return false;
942	+	}
943	+
944	+	// Zero the mainBuffer structure
945	+	mainBuffer.dirtyPages = 0;
946	+	mainBuffer.pageInfo = 0;
947	+	#endif
948	+
949	+	// Check if X server runs on local machine
950	+	local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
951	+	|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
952	+
953		// Init keycode translation
954		keycode_init();
955
#	Line 652 | Line 964 | bool VideoInit(bool classic)
964		// Get screen depth
965		xdepth = DefaultDepth(x_display, screen);
966
967	<	#if ENABLE_FBDEV_DGA
967	>	#ifdef ENABLE_FBDEV_DGA
968		// Frame buffer name
969		char fb_name[20];
970
#	Line 663 | Line 975 | bool VideoInit(bool classic)
975		has_dga = false;
976		#endif
977
978	<	#if ENABLE_XF86_DGA
978	>	#ifdef ENABLE_XF86_DGA
979		// DGA available?
980		int dga_event_base, dga_error_base;
981	<	if (XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
981	>	if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
982		int dga_flags = 0;
983		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
984		has_dga = dga_flags & XF86DGADirectPresent;
#	Line 674 | Line 986 | bool VideoInit(bool classic)
986		has_dga = false;
987		#endif
988
989	<	#if ENABLE_XF86_VIDMODE
989	>	#ifdef ENABLE_XF86_VIDMODE
990		// VidMode available?
991		int vm_event_base, vm_error_base;
992		has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
#	Line 747 | Line 1059 | bool VideoInit(bool classic)
1059		if (mode_str) {
1060		if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1061		display_type = DISPLAY_WINDOW;
1062	<	#if ENABLE_FBDEV_DGA
1062	>	#ifdef ENABLE_FBDEV_DGA
1063		else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1064		#else
1065		else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
#	Line 771 | Line 1083 | bool VideoInit(bool classic)
1083		return false;
1084		break;
1085		case DISPLAY_DGA:
1086	<	#if ENABLE_FBDEV_DGA
1086	>	#ifdef ENABLE_FBDEV_DGA
1087		if (!init_fbdev_dga(fb_name))
1088		#else
1089		if (!init_xf86_dga(width, height))
#	Line 781 | Line 1093 | bool VideoInit(bool classic)
1093		}
1094
1095		// Lock down frame buffer
1096	<	pthread_mutex_lock(&frame_buffer_lock);
1096	>	LOCK_FRAME_BUFFER;
1097
1098	<	#if !REAL_ADDRESSING
1098	>	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1099		// Set variables for UAE memory mapping
1100		MacFrameBaseHost = the_buffer;
1101		MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
#	Line 793 | Line 1105 | bool VideoInit(bool classic)
1105		MacFrameLayout = FLAYOUT_NONE;
1106		#endif
1107
1108	<	// Start redraw/input thread
1108	>	#ifdef ENABLE_VOSF
1109	>	if (use_vosf) {
1110	>	// Initialize the mainBuffer structure
1111	>	if (!VideoInitBuffer()) {
1112	>	// TODO: STR_VOSF_INIT_ERR ?
1113	>	ErrorAlert("Could not initialize Video on SEGV signals");
1114	>	return false;
1115	>	}
1116	>
1117	>	// Initialize the handler for SIGSEGV
1118	>	if (!Screen_fault_handler_init()) {
1119	>	// TODO: STR_VOSF_INIT_ERR ?
1120	>	ErrorAlert("Could not initialize Video on SEGV signals");
1121	>	return false;
1122	>	}
1123	>	}
1124	>	#endif
1125	>
1126	>	// Initialize VideoRefresh function
1127	>	VideoRefreshInit();
1128	>
1129		XSync(x_display, false);
1130	+
1131	+	#ifdef HAVE_PTHREADS
1132	+	// Start redraw/input thread
1133		redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1134	<	if (!redraw_thread_active)
1134	>	if (!redraw_thread_active) {
1135		printf("FATAL: cannot create redraw thread\n");
1136	<	return redraw_thread_active;
1136	>	return false;
1137	>	}
1138	>	#endif
1139	>	return true;
1140		}
1141
1142
#	Line 808 | Line 1146 | bool VideoInit(bool classic)
1146
1147		void VideoExit(void)
1148		{
1149	+	#ifdef HAVE_PTHREADS
1150		// Stop redraw thread
1151		if (redraw_thread_active) {
1152		redraw_thread_cancel = true;
#	Line 817 | Line 1156 | void VideoExit(void)
1156		pthread_join(redraw_thread, NULL);
1157		redraw_thread_active = false;
1158		}
1159	+	#endif
1160
1161		// Unlock frame buffer
1162	<	pthread_mutex_unlock(&frame_buffer_lock);
1162	>	UNLOCK_FRAME_BUFFER;
1163
1164		// Close window and server connection
1165		if (x_display != NULL) {
1166		XSync(x_display, false);
1167
1168	<	#if ENABLE_XF86_DGA
1168	>	#ifdef ENABLE_XF86_DGA
1169		if (display_type == DISPLAY_DGA) {
1170		XF86DGADirectVideo(x_display, screen, 0);
1171		XUngrabPointer(x_display, CurrentTime);
#	Line 833 | Line 1173 | void VideoExit(void)
1173		}
1174		#endif
1175
1176	<	#if ENABLE_XF86_VIDMODE
1176	>	#ifdef ENABLE_XF86_VIDMODE
1177		if (has_vidmode && display_type == DISPLAY_DGA)
1178		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1179		#endif
1180
1181	<	#if ENABLE_FBDEV_DGA
1181	>	#ifdef ENABLE_FBDEV_DGA
1182		if (display_type == DISPLAY_DGA) {
1183		XUngrabPointer(x_display, CurrentTime);
1184		XUngrabKeyboard(x_display, CurrentTime);
#	Line 852 | Line 1192 | void VideoExit(void)
1192		XFreeColormap(x_display, cmap[0]);
1193		XFreeColormap(x_display, cmap[1]);
1194		}
1195	+
1196	+	if (!use_vosf) {
1197	+	if (the_buffer) {
1198	+	free(the_buffer);
1199	+	the_buffer = NULL;
1200	+	}
1201
1202	<	if (the_buffer) {
1203	<	free(the_buffer);
1204	<	the_buffer = NULL;
1202	>	if (!have_shm && the_buffer_copy) {
1203	>	free(the_buffer_copy);
1204	>	the_buffer_copy = NULL;
1205	>	}
1206	>	}
1207	>	#ifdef ENABLE_VOSF
1208	>	else {
1209	>	if (the_buffer != (uint8 *)MAP_FAILED) {
1210	>	munmap((caddr_t)the_buffer, the_buffer_size);
1211	>	the_buffer = 0;
1212	>	}
1213	>
1214	>	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1215	>	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1216	>	the_buffer_copy = 0;
1217	>	}
1218	>	}
1219	>	#endif
1220	>	}
1221	>
1222	>	#ifdef ENABLE_VOSF
1223	>	if (use_vosf) {
1224	>	// Clear mainBuffer data
1225	>	if (mainBuffer.pageInfo) {
1226	>	free(mainBuffer.pageInfo);
1227	>	mainBuffer.pageInfo = 0;
1228		}
1229
1230	<	if (!have_shm && the_buffer_copy) {
1231	<	free(the_buffer_copy);
1232	<	the_buffer_copy = NULL;
1230	>	if (mainBuffer.dirtyPages) {
1231	>	free(mainBuffer.dirtyPages);
1232	>	mainBuffer.dirtyPages = 0;
1233		}
1234		}
1235	+
1236	+	// Close /dev/zero
1237	+	if (zero_fd > 0)
1238	+	close(zero_fd);
1239	+	#endif
1240		}
1241
1242
#	Line 890 | Line 1264 | void VideoInterrupt(void)
1264
1265		// Temporarily give up frame buffer lock (this is the point where
1266		// we are suspended when the user presses Ctrl-Tab)
1267	<	pthread_mutex_unlock(&frame_buffer_lock);
1268	<	pthread_mutex_lock(&frame_buffer_lock);
1267	>	UNLOCK_FRAME_BUFFER;
1268	>	LOCK_FRAME_BUFFER;
1269		}
1270
1271
#	Line 901 | Line 1275 | void VideoInterrupt(void)
1275
1276		void video_set_palette(uint8 *pal)
1277		{
1278	<	pthread_mutex_lock(&palette_lock);
1278	>	LOCK_PALETTE;
1279
1280		// Convert colors to XColor array
1281		for (int i=0; i<256; i++) {
#	Line 915 | Line 1289 | void video_set_palette(uint8 *pal)
1289		// Tell redraw thread to change palette
1290		palette_changed = true;
1291
1292	<	pthread_mutex_unlock(&palette_lock);
1292	>	UNLOCK_PALETTE;
1293		}
1294
1295
#	Line 923 | Line 1297 | void video_set_palette(uint8 *pal)
1297		*  Suspend/resume emulator
1298		*/
1299
1300	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1300	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1301		static void suspend_emul(void)
1302		{
1303		if (display_type == DISPLAY_DGA) {
#	Line 932 | Line 1306 | static void suspend_emul(void)
1306		ctrl_down = false;
1307
1308		// Lock frame buffer (this will stop the MacOS thread)
1309	<	pthread_mutex_lock(&frame_buffer_lock);
1309	>	LOCK_FRAME_BUFFER;
1310
1311		// Save frame buffer
1312		fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
#	Line 940 | Line 1314 | static void suspend_emul(void)
1314		memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1315
1316		// Close full screen display
1317	<	#if ENABLE_XF86_DGA
1317	>	#ifdef ENABLE_XF86_DGA
1318		XF86DGADirectVideo(x_display, screen, 0);
1319		#endif
1320		XUngrabPointer(x_display, CurrentTime);
1321		XUngrabKeyboard(x_display, CurrentTime);
1322		XUnmapWindow(x_display, the_win);
1323	<	XSync(x_display, false);
1323	>	wait_unmapped(the_win);
1324
1325		// Open "suspend" window
1326		XSetWindowAttributes wattr;
1327		wattr.event_mask = KeyPressMask;
1328		wattr.background_pixel = black_pixel;
955	–	wattr.border_pixel = black_pixel;
956	–	wattr.backing_store = Always;
957	–	wattr.backing_planes = xdepth;
958	–	wattr.colormap = DefaultColormap(x_display, screen);
1329
960	–	XSync(x_display, false);
1330		suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1331	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
1332	<	CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
1333	<	XSync(x_display, false);
1334	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
966	<	XMapRaised(x_display, suspend_win);
967	<	XSync(x_display, false);
1331	>	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
1332	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1333	>	set_window_focus(suspend_win);
1334	>	XMapWindow(x_display, suspend_win);
1335		emul_suspended = true;
1336		}
1337		}
#	Line 977 | Line 1344 | static void resume_emul(void)
1344
1345		// Reopen full screen display
1346		XMapRaised(x_display, the_win);
1347	+	wait_mapped(the_win);
1348		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
981	–	XSync(x_display, false);
1349		XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1350		XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1351	<	#if ENABLE_XF86_DGA
1351	>	#ifdef ENABLE_XF86_DGA
1352		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1353		XF86DGASetViewPort(x_display, screen, 0, 0);
1354		#endif
1355		XSync(x_display, false);
1356	<
1356	>
1357	>	// the_buffer already contains the data to restore. i.e. since a temporary
1358	>	// frame buffer is used when VOSF is actually used, fb_save is therefore
1359	>	// not necessary.
1360	>	#ifdef ENABLE_VOSF
1361	>	if (use_vosf) {
1362	>	LOCK_VOSF;
1363	>	PFLAG_SET_ALL;
1364	>	UNLOCK_VOSF;
1365	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1366	>	}
1367	>	#endif
1368	>
1369		// Restore frame buffer
1370		if (fb_save) {
1371	+	#ifdef ENABLE_VOSF
1372	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1373	+	if (!use_vosf)
1374	+	#endif
1375		memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1376		free(fb_save);
1377		fb_save = NULL;
1378		}
1379
1380	+	#ifdef ENABLE_XF86_DGA
1381		if (depth == 8)
998	–	#if ENABLE_XF86_DGA
1382		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1383		#endif
1384
1385		// Unlock frame buffer (and continue MacOS thread)
1386	<	pthread_mutex_unlock(&frame_buffer_lock);
1386	>	UNLOCK_FRAME_BUFFER;
1387		emul_suspended = false;
1388		}
1389		#endif
#	Line 1063 | Line 1446 | static int kc_decode(KeySym ks)
1446		case XK_period: case XK_greater: return 0x2f;
1447		case XK_slash: case XK_question: return 0x2c;
1448
1449	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1449	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1450		case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1451		#else
1452		case XK_Tab: return 0x30;
#	Line 1155 | Line 1538 | static int kc_decode(KeySym ks)
1538		return -1;
1539		}
1540
1541	<	static int event2keycode(XKeyEvent *ev)
1541	>	static int event2keycode(XKeyEvent &ev)
1542		{
1543		KeySym ks;
1544		int as;
1545		int i = 0;
1546
1547		do {
1548	<	ks = XLookupKeysym(ev, i++);
1548	>	ks = XLookupKeysym(&ev, i++);
1549		as = kc_decode(ks);
1550		if (as != -1)
1551		return as;
#	Line 1178 | Line 1561 | static int event2keycode(XKeyEvent *ev)
1561
1562		static void handle_events(void)
1563		{
1564	<	XEvent event;
1565	<	for (;;) {
1566	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1184	<	break;
1564	>	while (XPending(x_display)) {
1565	>	XEvent event;
1566	>	XNextEvent(x_display, &event);
1567
1568		switch (event.type) {
1569		// Mouse button
1570		case ButtonPress: {
1571	<	unsigned int button = ((XButtonEvent *)&event)->button;
1571	>	unsigned int button = event.xbutton.button;
1572		if (button < 4)
1573		ADBMouseDown(button - 1);
1574		else if (button < 6) {  // Wheel mouse
#	Line 1205 | Line 1587 | static void handle_events(void)
1587		break;
1588		}
1589		case ButtonRelease: {
1590	<	unsigned int button = ((XButtonEvent *)&event)->button;
1590	>	unsigned int button = event.xbutton.button;
1591		if (button < 4)
1592		ADBMouseUp(button - 1);
1593		break;
#	Line 1213 | Line 1595 | static void handle_events(void)
1595
1596		// Mouse moved
1597		case EnterNotify:
1216	–	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1217	–	break;
1598		case MotionNotify:
1599	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1599	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1600		break;
1601
1602		// Keyboard
1603		case KeyPress: {
1604		int code;
1605		if (use_keycodes) {
1606	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
1607	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1606	>	event2keycode(event.xkey);      // This is called to process the hotkeys
1607	>	code = keycode_table[event.xkey.keycode & 0xff];
1608		} else
1609	<	code = event2keycode((XKeyEvent *)&event);
1609	>	code = event2keycode(event.xkey);
1610		if (code != -1) {
1611		if (!emul_suspended) {
1612		if (code == 0x39) {     // Caps Lock pressed
#	Line 1242 | Line 1622 | static void handle_events(void)
1622		if (code == 0x36)
1623		ctrl_down = true;
1624		} else {
1625	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1625	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1626		if (code == 0x31)
1627		resume_emul();  // Space wakes us up
1628		#endif
#	Line 1253 | Line 1633 | static void handle_events(void)
1633		case KeyRelease: {
1634		int code;
1635		if (use_keycodes) {
1636	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
1637	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1636	>	event2keycode(event.xkey);      // This is called to process the hotkeys
1637	>	code = keycode_table[event.xkey.keycode & 0xff];
1638		} else
1639	<	code = event2keycode((XKeyEvent *)&event);
1639	>	code = event2keycode(event.xkey);
1640		if (code != -1 && code != 0x39) {       // Don't propagate Caps Lock releases
1641		ADBKeyUp(code);
1642		if (code == 0x36)
#	Line 1268 | Line 1648 | static void handle_events(void)
1648		// Hidden parts exposed, force complete refresh of window
1649		case Expose:
1650		if (display_type == DISPLAY_WINDOW) {
1651	<	int x1, y1;
1652	<	for (y1=0; y1<16; y1++)
1653	<	for (x1=0; x1<16; x1++)
1654	<	updt_box[x1][y1] = true;
1655	<	nr_boxes = 16 * 16;
1651	>	#ifdef ENABLE_VOSF
1652	>	if (use_vosf) {                 // VOSF refresh
1653	>	LOCK_VOSF;
1654	>	PFLAG_SET_ALL;
1655	>	UNLOCK_VOSF;
1656	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1657	>	}
1658	>	else
1659	>	#endif
1660	>	if (frame_skip == 0) {  // Dynamic refresh
1661	>	int x1, y1;
1662	>	for (y1=0; y1<16; y1++)
1663	>	for (x1=0; x1<16; x1++)
1664	>	updt_box[x1][y1] = true;
1665	>	nr_boxes = 16 * 16;
1666	>	} else                                  // Static refresh
1667	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1668	>	}
1669	>	break;
1670	>
1671	>	// Window "close" widget clicked
1672	>	case ClientMessage:
1673	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1674	>	ADBKeyDown(0x7f);       // Power key
1675	>	ADBKeyUp(0x7f);
1676		}
1677		break;
1678		}
#	Line 1284 | Line 1684 | static void handle_events(void)
1684		*  Window display update
1685		*/
1686
1687	<	static void update_display(int ticker)
1687	>	// Dynamic display update (variable frame rate for each box)
1688	>	static void update_display_dynamic(int ticker)
1689		{
1690	<	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xic, xicl, xi;
1690	>	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1691		int xil = 0;
1692		int rxm = 0, rxmo = 0;
1693		int bytes_per_row = VideoMonitor.bytes_per_row;
#	Line 1373 | Line 1774 | static void update_display(int ticker)
1774		}
1775		}
1776
1777	+	// Static display update (fixed frame rate, but incremental)
1778	+	static void update_display_static(void)
1779	+	{
1780	+	// Incremental update code
1781	+	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1782	+	int bytes_per_row = VideoMonitor.bytes_per_row;
1783	+	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1784	+	uint8 *p, *p2;
1785
1786	<	/*
1787	<	*  Thread for screen refresh, input handling etc.
1788	<	*/
1786	>	// Check for first line from top and first line from bottom that have changed
1787	>	y1 = 0;
1788	>	for (j=0; j<VideoMonitor.y; j++) {
1789	>	if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1790	>	y1 = j;
1791	>	break;
1792	>	}
1793	>	}
1794	>	y2 = y1 - 1;
1795	>	for (j=VideoMonitor.y-1; j>=y1; j--) {
1796	>	if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1797	>	y2 = j;
1798	>	break;
1799	>	}
1800	>	}
1801	>	high = y2 - y1 + 1;
1802
1803	<	static void *redraw_func(void *arg)
1804	<	{
1805	<	int tick_counter = 0;
1803	>	// Check for first column from left and first column from right that have changed
1804	>	if (high) {
1805	>	if (depth == 1) {
1806	>	x1 = VideoMonitor.x - 1;
1807	>	for (j=y1; j<=y2; j++) {
1808	>	p = &the_buffer[j * bytes_per_row];
1809	>	p2 = &the_buffer_copy[j * bytes_per_row];
1810	>	for (i=0; i<(x1>>3); i++) {
1811	>	if (*p != *p2) {
1812	>	x1 = i << 3;
1813	>	break;
1814	>	}
1815	>	p++; p2++;
1816	>	}
1817	>	}
1818	>	x2 = x1;
1819	>	for (j=y1; j<=y2; j++) {
1820	>	p = &the_buffer[j * bytes_per_row];
1821	>	p2 = &the_buffer_copy[j * bytes_per_row];
1822	>	p += bytes_per_row;
1823	>	p2 += bytes_per_row;
1824	>	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1825	>	p--; p2--;
1826	>	if (*p != *p2) {
1827	>	x2 = (i << 3) + 7;
1828	>	break;
1829	>	}
1830	>	}
1831	>	}
1832	>	wide = x2 - x1 + 1;
1833
1834	<	while (!redraw_thread_cancel) {
1834	>	// Update copy of the_buffer
1835	>	if (high && wide) {
1836	>	for (j=y1; j<=y2; j++) {
1837	>	i = j * bytes_per_row + (x1 >> 3);
1838	>	memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3);
1839	>	}
1840	>	}
1841
1842	<	// Wait
1843	<	#ifdef HAVE_NANOSLEEP
1844	<	struct timespec req = {0, 16666667};
1845	<	nanosleep(&req, NULL);
1846	<	#else
1847	<	usleep(16667);
1848	<	#endif
1842	>	} else {
1843	>	x1 = VideoMonitor.x;
1844	>	for (j=y1; j<=y2; j++) {
1845	>	p = &the_buffer[j * bytes_per_row];
1846	>	p2 = &the_buffer_copy[j * bytes_per_row];
1847	>	for (i=0; i<x1*bytes_per_pixel; i++) {
1848	>	if (*p != *p2) {
1849	>	x1 = i / bytes_per_pixel;
1850	>	break;
1851	>	}
1852	>	p++; p2++;
1853	>	}
1854	>	}
1855	>	x2 = x1;
1856	>	for (j=y1; j<=y2; j++) {
1857	>	p = &the_buffer[j * bytes_per_row];
1858	>	p2 = &the_buffer_copy[j * bytes_per_row];
1859	>	p += bytes_per_row;
1860	>	p2 += bytes_per_row;
1861	>	for (i=VideoMonitor.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1862	>	p--;
1863	>	p2--;
1864	>	if (*p != *p2) {
1865	>	x2 = i / bytes_per_pixel;
1866	>	break;
1867	>	}
1868	>	}
1869	>	}
1870	>	wide = x2 - x1;
1871
1872	<	#if ENABLE_XF86_DGA
1873	<	// Quit DGA mode if requested
1874	<	if (quit_full_screen) {
1875	<	quit_full_screen = false;
1876	<	if (display_type == DISPLAY_DGA) {
1877	<	XF86DGADirectVideo(x_display, screen, 0);
1401	<	XUngrabPointer(x_display, CurrentTime);
1402	<	XUngrabKeyboard(x_display, CurrentTime);
1403	<	XUnmapWindow(x_display, the_win);
1404	<	XSync(x_display, false);
1872	>	// Update copy of the_buffer
1873	>	if (high && wide) {
1874	>	for (j=y1; j<=y2; j++) {
1875	>	i = j * bytes_per_row + x1 * bytes_per_pixel;
1876	>	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
1877	>	}
1878		}
1879		}
1880	+	}
1881	+
1882	+	// Refresh display
1883	+	if (high && wide) {
1884	+	if (have_shm)
1885	+	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1886	+	else
1887	+	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1888	+	}
1889	+	}
1890	+
1891	+
1892	+	/*
1893	+	*      Screen refresh functions
1894	+	*/
1895	+
1896	+	// The specialisations hereunder are meant to enable VOSF with DGA in direct
1897	+	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
1898	+	// not get mapped correctly with respect to the predetermined host frame
1899	+	// buffer base address.
1900	+	//
1901	+	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1902	+	// we first try to "triple allocate" the address spaces according to the real
1903	+	// host frame buffer address. Then, if it fails, we will use a temporary
1904	+	// frame buffer thus making the real host frame buffer updated when pages
1905	+	// of the temp frame buffer are altered.
1906	+	//
1907	+	// As a side effect, a little speed gain in screen updates could be noticed
1908	+	// for other modes than DGA.
1909	+	//
1910	+	// The following two functions below are inline so that a clever compiler
1911	+	// could specialise the code according to the current screen depth and
1912	+	// display type. A more clever compiler would the job by itself though...
1913	+	// (update_display_vosf is inlined as well)
1914	+
1915	+	static inline void possibly_quit_dga_mode()
1916	+	{
1917	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1918	+	// Quit DGA mode if requested
1919	+	if (quit_full_screen) {
1920	+	quit_full_screen = false;
1921	+	#ifdef ENABLE_XF86_DGA
1922	+	XF86DGADirectVideo(x_display, screen, 0);
1923	+	#endif
1924	+	XUngrabPointer(x_display, CurrentTime);
1925	+	XUngrabKeyboard(x_display, CurrentTime);
1926	+	XUnmapWindow(x_display, the_win);
1927	+	XSync(x_display, false);
1928	+	}
1929		#endif
1930	+	}
1931
1932	<	#if ENABLE_FBDEV_DGA
1933	<	// Quit DGA mode if requested
1934	<	if (quit_full_screen) {
1935	<	quit_full_screen = false;
1932	>	static inline void handle_palette_changes(int depth, int display_type)
1933	>	{
1934	>	LOCK_PALETTE;
1935	>
1936	>	if (palette_changed) {
1937	>	palette_changed = false;
1938	>	if (depth == 8) {
1939	>	XStoreColors(x_display, cmap[0], palette, 256);
1940	>	XStoreColors(x_display, cmap[1], palette, 256);
1941	>	XSync(x_display, false);
1942	>
1943	>	#ifdef ENABLE_XF86_DGA
1944		if (display_type == DISPLAY_DGA) {
1945	<	XUngrabPointer(x_display, CurrentTime);
1946	<	XUngrabKeyboard(x_display, CurrentTime);
1416	<	XUnmapWindow(x_display, the_win);
1417	<	XSync(x_display, false);
1945	>	current_dga_cmap ^= 1;
1946	>	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1947		}
1419	–	}
1948		#endif
1949	<	// Handle X events
1950	<	handle_events();
1949	>	}
1950	>	}
1951
1952	<	// Handle palette changes
1953	<	pthread_mutex_lock(&palette_lock);
1954	<	if (palette_changed) {
1955	<	palette_changed = false;
1956	<	if (depth == 8) {
1957	<	XStoreColors(x_display, cmap[0], palette, 256);
1958	<	XStoreColors(x_display, cmap[1], palette, 256);
1959	<
1960	<	#if ENABLE_XF86_DGA
1961	<	if (display_type == DISPLAY_DGA) {
1962	<	current_dga_cmap ^= 1;
1963	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1964	<	}
1952	>	UNLOCK_PALETTE;
1953	>	}
1954	>
1955	>	static void video_refresh_dga(void)
1956	>	{
1957	>	// Quit DGA mode if requested
1958	>	possibly_quit_dga_mode();
1959	>
1960	>	// Handle X events
1961	>	handle_events();
1962	>
1963	>	// Handle palette changes
1964	>	handle_palette_changes(depth, DISPLAY_DGA);
1965	>	}
1966	>
1967	>	#ifdef ENABLE_VOSF
1968	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1969	>	static void video_refresh_dga_vosf(void)
1970	>	{
1971	>	// Quit DGA mode if requested
1972	>	possibly_quit_dga_mode();
1973	>
1974	>	// Handle X events
1975	>	handle_events();
1976	>
1977	>	// Handle palette changes
1978	>	handle_palette_changes(depth, DISPLAY_DGA);
1979	>
1980	>	// Update display (VOSF variant)
1981	>	static int tick_counter = 0;
1982	>	if (++tick_counter >= frame_skip) {
1983	>	tick_counter = 0;
1984	>	LOCK_VOSF;
1985	>	update_display_dga_vosf();
1986	>	UNLOCK_VOSF;
1987	>	}
1988	>	}
1989		#endif
1438	–	}
1439	–	}
1440	–	pthread_mutex_unlock(&palette_lock);
1990
1991	<	// In window mode, update display
1992	<	if (display_type == DISPLAY_WINDOW) {
1993	<	tick_counter++;
1994	<	update_display(tick_counter);
1995	<	}
1991	>	static void video_refresh_window_vosf(void)
1992	>	{
1993	>	// Quit DGA mode if requested
1994	>	possibly_quit_dga_mode();
1995	>
1996	>	// Handle X events
1997	>	handle_events();
1998	>
1999	>	// Handle palette changes
2000	>	handle_palette_changes(depth, DISPLAY_WINDOW);
2001	>
2002	>	// Update display (VOSF variant)
2003	>	static int tick_counter = 0;
2004	>	if (++tick_counter >= frame_skip) {
2005	>	tick_counter = 0;
2006	>	LOCK_VOSF;
2007	>	update_display_window_vosf();
2008	>	UNLOCK_VOSF;
2009	>	}
2010	>	}
2011	>	#endif // def ENABLE_VOSF
2012	>
2013	>	static void video_refresh_window_static(void)
2014	>	{
2015	>	// Handle X events
2016	>	handle_events();
2017	>
2018	>	// Handle_palette changes
2019	>	handle_palette_changes(depth, DISPLAY_WINDOW);
2020	>
2021	>	// Update display (static variant)
2022	>	static int tick_counter = 0;
2023	>	if (++tick_counter >= frame_skip) {
2024	>	tick_counter = 0;
2025	>	update_display_static();
2026	>	}
2027	>	}
2028	>
2029	>	static void video_refresh_window_dynamic(void)
2030	>	{
2031	>	// Handle X events
2032	>	handle_events();
2033	>
2034	>	// Handle_palette changes
2035	>	handle_palette_changes(depth, DISPLAY_WINDOW);
2036	>
2037	>	// Update display (dynamic variant)
2038	>	static int tick_counter = 0;
2039	>	tick_counter++;
2040	>	update_display_dynamic(tick_counter);
2041	>	}
2042	>
2043	>
2044	>	/*
2045	>	*  Thread for screen refresh, input handling etc.
2046	>	*/
2047	>
2048	>	void VideoRefreshInit(void)
2049	>	{
2050	>	// TODO: set up specialised 8bpp VideoRefresh handlers ?
2051	>	if (display_type == DISPLAY_DGA) {
2052	>	#if ENABLE_VOSF && (REAL_ADDRESSING || DIRECT_ADDRESSING)
2053	>	if (use_vosf)
2054	>	video_refresh = video_refresh_dga_vosf;
2055	>	else
2056	>	#endif
2057	>	video_refresh = video_refresh_dga;
2058	>	}
2059	>	else {
2060	>	#ifdef ENABLE_VOSF
2061	>	if (use_vosf)
2062	>	video_refresh = video_refresh_window_vosf;
2063	>	else
2064	>	#endif
2065	>	if (frame_skip == 0)
2066	>	video_refresh = video_refresh_window_dynamic;
2067	>	else
2068	>	video_refresh = video_refresh_window_static;
2069		}
2070	+	}
2071	+
2072	+	void VideoRefresh(void)
2073	+	{
2074	+	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2075	+	video_refresh();
2076	+	}
2077	+
2078	+	#ifdef HAVE_PTHREADS
2079	+	static void *redraw_func(void *arg)
2080	+	{
2081	+	uint64 start = GetTicks_usec();
2082	+	int64 ticks = 0;
2083	+	uint64 next = GetTicks_usec();
2084	+	while (!redraw_thread_cancel) {
2085	+	video_refresh();
2086	+	next += 16667;
2087	+	int64 delay = next - GetTicks_usec();
2088	+	if (delay > 0)
2089	+	Delay_usec(delay);
2090	+	else if (delay < -16667)
2091	+	next = GetTicks_usec();
2092	+	ticks++;
2093	+	}
2094	+	uint64 end = GetTicks_usec();
2095	+	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2096		return NULL;
2097		}
2098	+	#endif

Diff Legend

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