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.38 by gbeauche, 2001-05-20T20:31:50Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2000 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	+	#endif
60	+
61		#include "cpu_emulation.h"
62		#include "main.h"
63		#include "adb.h"
#	Line 45 | Line 66
66		#include "user_strings.h"
67		#include "video.h"
68
69	<	#define DEBUG 1
69	>	#define DEBUG 0
70		#include "debug.h"
71
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	–
72
73		// Display types
74		enum {
#	Line 79 | Line 87 | static int16 mouse_wheel_mode = 1;
87		static int16 mouse_wheel_lines = 3;
88
89		static int display_type = DISPLAY_WINDOW;                       // See enum above
90	+	static bool local_X11;                                                          // Flag: X server running on local machine?
91		static uint8 *the_buffer;                                                       // Mac frame buffer
92	+
93	+	#ifdef HAVE_PTHREADS
94		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
95		static volatile bool redraw_thread_cancel = false;      // Flag: Cancel Redraw thread
96		static pthread_t redraw_thread;                                         // Redraw thread
97	+	#endif
98
99		static bool has_dga = false;                                            // Flag: Video DGA capable
100		static bool has_vidmode = false;                                        // Flag: VidMode extension available
#	Line 109 | Line 121 | static Colormap cmap[2];                                                       // Two co
121		static XColor black, white;
122		static unsigned long black_pixel, white_pixel;
123		static int eventmask;
124	<	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask;
125	<	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
124	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
125	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
126	>	static Atom WM_DELETE_WINDOW = (Atom)0;
127
115	–	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
128		static XColor palette[256];                                                     // Color palette for 8-bit mode
129		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
130	+	#ifdef HAVE_PTHREADS
131	+	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
132	+	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
133	+	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
134	+	#else
135	+	#define LOCK_PALETTE
136	+	#define UNLOCK_PALETTE
137	+	#endif
138
139		// Variables for window mode
140		static GC the_gc;
141		static XImage *img = NULL;
142		static XShmSegmentInfo shminfo;
123	–	static XImage *cursor_image, *cursor_mask_image;
124	–	static Pixmap cursor_map, cursor_mask_map;
143		static Cursor mac_cursor;
126	–	static GC cursor_gc, cursor_mask_gc;
144		static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer
128	–	static uint8 the_cursor[64];                                            // Cursor image data
145		static bool have_shm = false;                                           // Flag: SHM extensions available
146		static bool updt_box[17][17];                                           // Flag for Update
147		static int nr_boxes;
#	Line 136 | Line 152 | static int sm_no_boxes[] = {1,8,32,64,12
152		static int current_dga_cmap;                                            // Number (0 or 1) of currently installed DGA colormap
153		static Window suspend_win;                                                      // "Suspend" window
154		static void *fb_save = NULL;                                            // Saved frame buffer for suspend
155	+	#ifdef HAVE_PTHREADS
156		static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
157	+	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
158	+	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
159	+	#else
160	+	#define LOCK_FRAME_BUFFER
161	+	#define UNLOCK_FRAME_BUFFER
162	+	#endif
163
164		// Variables for fbdev DGA mode
165		const char FBDEVICE_FILE_NAME[] = "/dev/fb";
166		static int fbdev_fd;
167
168	<	#if ENABLE_XF86_VIDMODE
168	>	#ifdef ENABLE_XF86_VIDMODE
169		// Variables for XF86 VidMode support
170		static XF86VidModeModeInfo **x_video_modes;                     // Array of all available modes
171		static int num_x_video_modes;
172		#endif
173
174	+	#ifdef ENABLE_VOSF
175	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
176	+	#else
177	+	static const bool use_vosf = false;                                     // Flag: VOSF enabled
178	+	#endif
179	+
180	+	#ifdef ENABLE_VOSF
181	+	// Variables for Video on SEGV support (taken from the Win32 port)
182	+	static uint8 *the_host_buffer;                                          // Host frame buffer in VOSF mode
183	+	static uint32 the_buffer_size;                                          // Size of allocated the_buffer
184	+
185	+	struct ScreenPageInfo {
186	+	int top, bottom;                    // Mapping between this virtual page and Mac scanlines
187	+	};
188	+
189	+	struct ScreenInfo {
190	+	uint32 memBase;                             // Real start address
191	+	uint32 memStart;                    // Start address aligned to page boundary
192	+	uint32 memEnd;                              // Address of one-past-the-end of the screen
193	+	uint32 memLength;                   // Length of the memory addressed by the screen pages
194	+
195	+	uint32 pageSize;                    // Size of a page
196	+	int pageBits;                               // Shift count to get the page number
197	+	uint32 pageCount;                   // Number of pages allocated to the screen
198	+
199	+	bool dirty;                                     // Flag: set if the frame buffer was touched
200	+	char * 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_VALUE                 0x00
207	+	#define PFLAG_CLEAR_VALUE               0x01
208	+	#define PFLAG_SET_VALUE_4               0x00000000
209	+	#define PFLAG_CLEAR_VALUE_4             0x01010101
210	+	#define PFLAG_SET(page)                 mainBuffer.dirtyPages[page] = PFLAG_SET_VALUE
211	+	#define PFLAG_CLEAR(page)               mainBuffer.dirtyPages[page] = PFLAG_CLEAR_VALUE
212	+	#define PFLAG_ISSET(page)               (mainBuffer.dirtyPages[page] == PFLAG_SET_VALUE)
213	+	#define PFLAG_ISCLEAR(page)             (mainBuffer.dirtyPages[page] != PFLAG_SET_VALUE)
214	+
215	+	#ifdef UNALIGNED_PROFITABLE
216	+	# define PFLAG_ISSET_4(page)    (*((uint32 *)(mainBuffer.dirtyPages + (page))) == PFLAG_SET_VALUE_4)
217	+	# define PFLAG_ISCLEAR_4(page)  (*((uint32 *)(mainBuffer.dirtyPages + (page))) == PFLAG_CLEAR_VALUE_4)
218	+	#else
219	+	# define PFLAG_ISSET_4(page) \
220	+	PFLAG_ISSET(page  ) && PFLAG_ISSET(page+1) \
221	+	&&      PFLAG_ISSET(page+2) && PFLAG_ISSET(page+3)
222	+	# define PFLAG_ISCLEAR_4(page) \
223	+	PFLAG_ISCLEAR(page  ) && PFLAG_ISCLEAR(page+1) \
224	+	&&      PFLAG_ISCLEAR(page+2) && PFLAG_ISCLEAR(page+3)
225	+	#endif
226	+
227	+	// Set the selected page range [ first_page, last_page [ into the SET state
228	+	#define PFLAG_SET_RANGE(first_page, last_page) \
229	+	memset(mainBuffer.dirtyPages + (first_page), PFLAG_SET_VALUE, \
230	+	(last_page) - (first_page))
231	+
232	+	// Set the selected page range [ first_page, last_page [ into the CLEAR state
233	+	#define PFLAG_CLEAR_RANGE(first_page, last_page) \
234	+	memset(mainBuffer.dirtyPages + (first_page), PFLAG_CLEAR_VALUE, \
235	+	(last_page) - (first_page))
236	+
237	+	#define PFLAG_SET_ALL do { \
238	+	PFLAG_SET_RANGE(0, mainBuffer.pageCount); \
239	+	mainBuffer.dirty = true; \
240	+	} while (0)
241	+
242	+	#define PFLAG_CLEAR_ALL do { \
243	+	PFLAG_CLEAR_RANGE(0, mainBuffer.pageCount); \
244	+	mainBuffer.dirty = false; \
245	+	} while (0)
246	+
247	+	// Set the following macro definition to 1 if your system
248	+	// provides a really fast strchr() implementation
249	+	//#define HAVE_FAST_STRCHR 0
250	+
251	+	static inline int find_next_page_set(int page)
252	+	{
253	+	#if HAVE_FAST_STRCHR
254	+	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_SET_VALUE);
255	+	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
256	+	#else
257	+	while (PFLAG_ISCLEAR_4(page))
258	+	page += 4;
259	+	while (PFLAG_ISCLEAR(page))
260	+	page++;
261	+	return page;
262	+	#endif
263	+	}
264	+
265	+	static inline int find_next_page_clear(int page)
266	+	{
267	+	#if HAVE_FAST_STRCHR
268	+	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_CLEAR_VALUE);
269	+	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
270	+	#else
271	+	while (PFLAG_ISSET_4(page))
272	+	page += 4;
273	+	while (PFLAG_ISSET(page))
274	+	page++;
275	+	return page;
276	+	#endif
277	+	}
278	+
279	+	static int zero_fd = -1;
280	+
281	+	#ifdef HAVE_PTHREADS
282	+	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer (dirtyPages in fact)
283	+	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
284	+	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
285	+	#else
286	+	#define LOCK_VOSF
287	+	#define UNLOCK_VOSF
288	+	#endif
289	+
290	+	static int log_base_2(uint32 x)
291	+	{
292	+	uint32 mask = 0x80000000;
293	+	int l = 31;
294	+	while (l >= 0 && (x & mask) == 0) {
295	+	mask >>= 1;
296	+	l--;
297	+	}
298	+	return l;
299	+	}
300	+	#endif /* ENABLE_VOSF */
301	+
302	+	// VideoRefresh function
303	+	void VideoRefreshInit(void);
304	+	static void (*video_refresh)(void);
305
306		// Prototypes
307		static void *redraw_func(void *arg);
308	<	static int event2keycode(XKeyEvent *ev);
308	>	static int event2keycode(XKeyEvent &ev);
309
310
311		// From main_unix.cpp
312	+	extern char *x_display_name;
313		extern Display *x_display;
314
315		// From sys_unix.cpp
316		extern void SysMountFirstFloppy(void);
317
318	+	#ifdef ENABLE_VOSF
319	+	# include "video_vosf.h"
320	+	#endif
321	+
322
323		/*
324		*  Initialization
#	Line 168 | Line 327 | extern void SysMountFirstFloppy(void);
327		// Set VideoMonitor according to video mode
328		void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
329		{
330	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
331		int layout = FLAYOUT_DIRECT;
332		switch (depth) {
333		case 1:
334		layout = FLAYOUT_DIRECT;
175	–	VideoMonitor.mode = VMODE_1BIT;
335		break;
336		case 8:
337		layout = FLAYOUT_DIRECT;
179	–	VideoMonitor.mode = VMODE_8BIT;
338		break;
339		case 15:
340		layout = FLAYOUT_HOST_555;
183	–	VideoMonitor.mode = VMODE_16BIT;
341		break;
342		case 16:
343		layout = FLAYOUT_HOST_565;
187	–	VideoMonitor.mode = VMODE_16BIT;
344		break;
345		case 24:
346		case 32:
347		layout = FLAYOUT_HOST_888;
192	–	VideoMonitor.mode = VMODE_32BIT;
348		break;
349		}
195	–	VideoMonitor.x = width;
196	–	VideoMonitor.y = height;
197	–	VideoMonitor.bytes_per_row = bytes_per_row;
350		if (native_byte_order)
351		MacFrameLayout = layout;
352		else
353		MacFrameLayout = FLAYOUT_DIRECT;
354	+	#endif
355	+	switch (depth) {
356	+	case 1:
357	+	VideoMonitor.mode = VMODE_1BIT;
358	+	break;
359	+	case 8:
360	+	VideoMonitor.mode = VMODE_8BIT;
361	+	break;
362	+	case 15:
363	+	VideoMonitor.mode = VMODE_16BIT;
364	+	break;
365	+	case 16:
366	+	VideoMonitor.mode = VMODE_16BIT;
367	+	break;
368	+	case 24:
369	+	case 32:
370	+	VideoMonitor.mode = VMODE_32BIT;
371	+	break;
372	+	}
373	+	VideoMonitor.x = width;
374	+	VideoMonitor.y = height;
375	+	VideoMonitor.bytes_per_row = bytes_per_row;
376	+	}
377	+
378	+	// Set window name and class
379	+	static void set_window_name(Window w, int name)
380	+	{
381	+	const char *str = GetString(name);
382	+	XStoreName(x_display, w, str);
383	+	XSetIconName(x_display, w, str);
384	+
385	+	XClassHint *hints;
386	+	hints = XAllocClassHint();
387	+	if (hints) {
388	+	hints->res_name = "BasiliskII";
389	+	hints->res_class = "BasiliskII";
390	+	XSetClassHint(x_display, w, hints);
391	+	XFree(hints);
392	+	}
393	+	}
394	+
395	+	// Set window input focus flag
396	+	static void set_window_focus(Window w)
397	+	{
398	+	XWMHints *hints = XAllocWMHints();
399	+	if (hints) {
400	+	hints->input = True;
401	+	hints->initial_state = NormalState;
402	+	hints->flags = InputHint | StateHint;
403	+	XSetWMHints(x_display, w, hints);
404	+	XFree(hints);
405	+	}
406	+	}
407	+
408	+	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
409	+	static void set_window_delete_protocol(Window w)
410	+	{
411	+	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
412	+	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
413	+	}
414	+
415	+	// Wait until window is mapped/unmapped
416	+	void wait_mapped(Window w)
417	+	{
418	+	XEvent e;
419	+	do {
420	+	XMaskEvent(x_display, StructureNotifyMask, &e);
421	+	} while ((e.type != MapNotify) || (e.xmap.event != w));
422	+	}
423	+
424	+	void wait_unmapped(Window w)
425	+	{
426	+	XEvent e;
427	+	do {
428	+	XMaskEvent(x_display, StructureNotifyMask, &e);
429	+	} while ((e.type != UnmapNotify) || (e.xmap.event != w));
430		}
431
432		// Trap SHM errors
#	Line 225 | Line 453 | static bool init_window(int width, int h
453
454		// Read frame skip prefs
455		frame_skip = PrefsFindInt32("frameskip");
228	–	if (frame_skip == 0)
229	–	frame_skip = 1;
456
457		// Create window
458		XSetWindowAttributes wattr;
459		wattr.event_mask = eventmask = win_eventmask;
460		wattr.background_pixel = black_pixel;
461	<	wattr.border_pixel = black_pixel;
236	<	wattr.backing_store = NotUseful;
237	<	wattr.save_under = false;
238	<	wattr.backing_planes = xdepth;
461	>	wattr.colormap = cmap[0];
462
240	–	XSync(x_display, false);
463		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
464	<	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);
464	>	InputOutput, vis, CWEventMask | CWBackPixel | (depth == 8 ? CWColormap : 0), &wattr);
465
466	<	// Set colormap
467	<	if (depth == 8) {
468	<	XSetWindowColormap(x_display, the_win, cmap[0]);
469	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
470	<	}
466	>	// Set window name/class
467	>	set_window_name(the_win, STR_WINDOW_TITLE);
468	>
469	>	// Indicate that we want keyboard input
470	>	set_window_focus(the_win);
471	>
472	>	// Set delete protocol property
473	>	set_window_delete_protocol(the_win);
474
475		// Make window unresizable
476	<	XSizeHints *hints;
477	<	if ((hints = XAllocSizeHints()) != NULL) {
478	<	hints->min_width = width;
479	<	hints->max_width = width;
480	<	hints->min_height = height;
481	<	hints->max_height = height;
482	<	hints->flags = PMinSize | PMaxSize;
483	<	XSetWMNormalHints(x_display, the_win, hints);
484	<	XFree((char *)hints);
476	>	{
477	>	XSizeHints *hints = XAllocSizeHints();
478	>	if (hints) {
479	>	hints->min_width = width;
480	>	hints->max_width = width;
481	>	hints->min_height = height;
482	>	hints->max_height = height;
483	>	hints->flags = PMinSize | PMaxSize;
484	>	XSetWMNormalHints(x_display, the_win, hints);
485	>	XFree(hints);
486	>	}
487		}
488
489	+	// Show window
490	+	XMapWindow(x_display, the_win);
491	+	wait_mapped(the_win);
492	+
493		// Try to create and attach SHM image
494		have_shm = false;
495	<	if (depth != 1 && XShmQueryExtension(x_display)) {
495	>	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
496
497		// Create SHM image ("height + 2" for safety)
498		img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
#	Line 317 | Line 543 | static bool init_window(int width, int h
543		img->bitmap_bit_order = MSBFirst;
544		}
545
546	<	// Allocate memory for frame buffer copy
546	>	#ifdef ENABLE_VOSF
547	>	// Allocate a page-aligned chunk of memory for frame buffer
548	>	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
549	>	the_host_buffer = the_buffer_copy;
550	>
551	>	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
552	>	memset(the_buffer_copy, 0, the_buffer_size);
553	>
554	>	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
555	>	memset(the_buffer, 0, the_buffer_size);
556	>	#else
557	>	// Allocate memory for frame buffer
558		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
559	+	#endif
560
561		// Create GC
562		the_gc = XCreateGC(x_display, the_win, 0, 0);
563		XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
564
565		// Create no_cursor
566	<	mac_cursor = XCreatePixmapCursor (x_display,
567	<	XCreatePixmap (x_display, the_win, 1, 1, 1),
568	<	XCreatePixmap (x_display, the_win, 1, 1, 1),
569	<	&black, &white, 0, 0);
570	<	XDefineCursor (x_display, the_win, mac_cursor);
566	>	mac_cursor = XCreatePixmapCursor(x_display,
567	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
568	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
569	>	&black, &white, 0, 0);
570	>	XDefineCursor(x_display, the_win, mac_cursor);
571
572		// Set VideoMonitor
573	+	bool native_byte_order;
574		#ifdef WORDS_BIGENDIAN
575	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst);
575	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
576		#else
577	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst);
577	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
578		#endif
579	+	#ifdef ENABLE_VOSF
580	+	Screen_blitter_init(&visualInfo, native_byte_order);
581	+	#endif
582	+	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
583
584	<	#if REAL_ADDRESSING
585	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
343	<	MacFrameLayout = FLAYOUT_DIRECT;
584	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
585	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
586		#else
587		VideoMonitor.mac_frame_base = MacFrameBaseMac;
588		#endif
#	Line 350 | Line 592 | static bool init_window(int width, int h
592		// Init fbdev DGA display
593		static bool init_fbdev_dga(char *in_fb_name)
594		{
595	<	#if ENABLE_FBDEV_DGA
595	>	#ifdef ENABLE_FBDEV_DGA
596		// Find the maximum depth available
597		int ndepths, max_depth(0);
598		int *depths = XListDepths(x_display, screen, &ndepths);
#	Line 419 | Line 661 | static bool init_fbdev_dga(char *in_fb_n
661
662		// Create window
663		XSetWindowAttributes wattr;
664	<	wattr.override_redirect = True;
665	<	wattr.backing_store             = NotUseful;
666	<	wattr.background_pixel  = white_pixel;
667	<	wattr.border_pixel              = black_pixel;
426	<	wattr.event_mask                = eventmask = dga_eventmask;
664	>	wattr.event_mask = eventmask = dga_eventmask;
665	>	wattr.background_pixel = white_pixel;
666	>	wattr.override_redirect = True;
667	>	wattr.colormap = cmap[0];
668
428	–	XSync(x_display, false);
669		the_win = XCreateWindow(x_display, rootwin,
670		0, 0, width, height,
671		0, xdepth, InputOutput, vis,
672	<	CWEventMask|CWBackPixel|CWBorderPixel|CWOverrideRedirect|CWBackingStore,
672	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
673		&wattr);
674	<	XSync(x_display, false);
674	>
675	>	// Set window name/class
676	>	set_window_name(the_win, STR_WINDOW_TITLE);
677	>
678	>	// Indicate that we want keyboard input
679	>	set_window_focus(the_win);
680	>
681	>	// Show window
682		XMapRaised(x_display, the_win);
683	<	XSync(x_display, false);
683	>	wait_mapped(the_win);
684
685		// Grab mouse and keyboard
686		XGrabKeyboard(x_display, the_win, True,
#	Line 442 | Line 689 | static bool init_fbdev_dga(char *in_fb_n
689		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
690		GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
691
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	–
692		// Set VideoMonitor
693		int bytes_per_row = width;
694		switch (depth) {
#	Line 473 | Line 714 | static bool init_fbdev_dga(char *in_fb_n
714		}
715		}
716
717	+	#if ENABLE_VOSF
718	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
719	+	// Screen_blitter_init() returns TRUE if VOSF is mandatory
720	+	// i.e. the framebuffer update function is not Blit_Copy_Raw
721	+	use_vosf = Screen_blitter_init(&visualInfo, true);
722	+
723	+	if (use_vosf) {
724	+	the_host_buffer = the_buffer;
725	+	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
726	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
727	+	memset(the_buffer_copy, 0, the_buffer_size);
728	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
729	+	memset(the_buffer, 0, the_buffer_size);
730	+	}
731	+	#else
732	+	use_vosf = false;
733	+	#endif
734	+	#endif
735	+
736		set_video_monitor(width, height, bytes_per_row, true);
737	<	#if REAL_ADDRESSING
738	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
479	<	MacFrameLayout = FLAYOUT_DIRECT;
737	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
738	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
739		#else
740		VideoMonitor.mac_frame_base = MacFrameBaseMac;
741		#endif
#	Line 490 | Line 749 | static bool init_fbdev_dga(char *in_fb_n
749		// Init XF86 DGA display
750		static bool init_xf86_dga(int width, int height)
751		{
752	<	#if ENABLE_XF86_DGA
752	>	#ifdef ENABLE_XF86_DGA
753		// Set relative mouse mode
754		ADBSetRelMouseMode(true);
755
756	<	#if ENABLE_XF86_VIDMODE
756	>	#ifdef ENABLE_XF86_VIDMODE
757		// Switch to best mode
758		if (has_vidmode) {
759		int best = 0;
#	Line 506 | Line 765 | static bool init_xf86_dga(int width, int
765		}
766		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
767		XF86VidModeSetViewPort(x_display, screen, 0, 0);
768	+	XSync(x_display, false);
769		}
770		#endif
771
772		// Create window
773		XSetWindowAttributes wattr;
774		wattr.event_mask = eventmask = dga_eventmask;
515	–	wattr.border_pixel = black_pixel;
775		wattr.override_redirect = True;
776
518	–	XSync(x_display, false);
777		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
778	<	InputOutput, vis, CWEventMask | CWBorderPixel | CWOverrideRedirect, &wattr);
779	<	XSync(x_display, false);
780	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
778	>	InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
779	>
780	>	// Set window name/class
781	>	set_window_name(the_win, STR_WINDOW_TITLE);
782	>
783	>	// Indicate that we want keyboard input
784	>	set_window_focus(the_win);
785	>
786	>	// Show window
787		XMapRaised(x_display, the_win);
788	<	XSync(x_display, false);
788	>	wait_mapped(the_win);
789
790		// Establish direct screen connection
791		XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
#	Line 538 | Line 802 | static bool init_xf86_dga(int width, int
802		// Set colormap
803		if (depth == 8) {
804		XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
541	–	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
805		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
806		}
807	+	XSync(x_display, false);
808
809		// Set VideoMonitor
810		int bytes_per_row = (v_width + 7) & ~7;
#	Line 557 | Line 821 | static bool init_xf86_dga(int width, int
821		bytes_per_row *= 4;
822		break;
823		}
824	+
825	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
826	+	// Screen_blitter_init() returns TRUE if VOSF is mandatory
827	+	// i.e. the framebuffer update function is not Blit_Copy_Raw
828	+	use_vosf = Screen_blitter_init(&visualInfo, true);
829	+
830	+	if (use_vosf) {
831	+	the_host_buffer = the_buffer;
832	+	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
833	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
834	+	memset(the_buffer_copy, 0, the_buffer_size);
835	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
836	+	memset(the_buffer, 0, the_buffer_size);
837	+	}
838	+	#elif defined(ENABLE_VOSF)
839	+	// The UAE memory handlers will already handle color conversion, if needed.
840	+	use_vosf = false;
841	+	#endif
842	+
843		set_video_monitor(width, height, bytes_per_row, true);
844	<	#if REAL_ADDRESSING
845	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
846	<	MacFrameLayout = FLAYOUT_DIRECT;
844	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
845	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
846	>	//      MacFrameLayout = FLAYOUT_DIRECT;
847		#else
848		VideoMonitor.mac_frame_base = MacFrameBaseMac;
849		#endif
#	Line 636 | Line 919 | static void keycode_init(void)
919		}
920		}
921
922	+	bool VideoInitBuffer()
923	+	{
924	+	#ifdef ENABLE_VOSF
925	+	if (use_vosf) {
926	+	const uint32 page_size  = getpagesize();
927	+	const uint32 page_mask  = page_size - 1;
928	+
929	+	mainBuffer.memBase      = (uint32) the_buffer;
930	+	// Align the frame buffer on page boundary
931	+	mainBuffer.memStart             = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
932	+	mainBuffer.memLength    = the_buffer_size;
933	+	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
934	+
935	+	mainBuffer.pageSize     = page_size;
936	+	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
937	+	mainBuffer.pageBits     = log_base_2(mainBuffer.pageSize);
938	+
939	+	if (mainBuffer.dirtyPages != 0)
940	+	free(mainBuffer.dirtyPages);
941	+
942	+	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
943	+
944	+	if (mainBuffer.pageInfo != 0)
945	+	free(mainBuffer.pageInfo);
946	+
947	+	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
948	+
949	+	if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0))
950	+	return false;
951	+
952	+	mainBuffer.dirty = false;
953	+
954	+	PFLAG_CLEAR_ALL;
955	+	// Safety net to insure the loops in the update routines will terminate
956	+	// See a discussion in <video_vosf.h> for further details
957	+	PFLAG_CLEAR(mainBuffer.pageCount);
958	+	PFLAG_SET(mainBuffer.pageCount+1);
959	+
960	+	uint32 a = 0;
961	+	for (int i = 0; i < mainBuffer.pageCount; i++) {
962	+	int y1 = a / VideoMonitor.bytes_per_row;
963	+	if (y1 >= VideoMonitor.y)
964	+	y1 = VideoMonitor.y - 1;
965	+
966	+	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
967	+	if (y2 >= VideoMonitor.y)
968	+	y2 = VideoMonitor.y - 1;
969	+
970	+	mainBuffer.pageInfo[i].top = y1;
971	+	mainBuffer.pageInfo[i].bottom = y2;
972	+
973	+	a += mainBuffer.pageSize;
974	+	if (a > mainBuffer.memLength)
975	+	a = mainBuffer.memLength;
976	+	}
977	+
978	+	// We can now write-protect the frame buffer
979	+	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
980	+	return false;
981	+	}
982	+	#endif
983	+	return true;
984	+	}
985	+
986		bool VideoInit(bool classic)
987		{
988	+	#ifdef ENABLE_VOSF
989	+	// Open /dev/zero
990	+	zero_fd = open("/dev/zero", O_RDWR);
991	+	if (zero_fd < 0) {
992	+	char str[256];
993	+	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
994	+	ErrorAlert(str);
995	+	return false;
996	+	}
997	+
998	+	// Zero the mainBuffer structure
999	+	mainBuffer.dirtyPages = 0;
1000	+	mainBuffer.pageInfo = 0;
1001	+	#endif
1002	+
1003	+	// Check if X server runs on local machine
1004	+	local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
1005	+	|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
1006	+
1007		// Init keycode translation
1008		keycode_init();
1009
1010		// Read prefs
1011	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1012	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1011	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1012	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1013
1014		// Find screen and root window
1015		screen = XDefaultScreen(x_display);
#	Line 652 | Line 1018 | bool VideoInit(bool classic)
1018		// Get screen depth
1019		xdepth = DefaultDepth(x_display, screen);
1020
1021	<	#if ENABLE_FBDEV_DGA
1021	>	#ifdef ENABLE_FBDEV_DGA
1022		// Frame buffer name
1023		char fb_name[20];
1024
#	Line 663 | Line 1029 | bool VideoInit(bool classic)
1029		has_dga = false;
1030		#endif
1031
1032	<	#if ENABLE_XF86_DGA
1032	>	#ifdef ENABLE_XF86_DGA
1033		// DGA available?
1034		int dga_event_base, dga_error_base;
1035	<	if (XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
1035	>	if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
1036		int dga_flags = 0;
1037		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
1038		has_dga = dga_flags & XF86DGADirectPresent;
#	Line 674 | Line 1040 | bool VideoInit(bool classic)
1040		has_dga = false;
1041		#endif
1042
1043	<	#if ENABLE_XF86_VIDMODE
1043	>	#ifdef ENABLE_XF86_VIDMODE
1044		// VidMode available?
1045		int vm_event_base, vm_error_base;
1046		has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
#	Line 747 | Line 1113 | bool VideoInit(bool classic)
1113		if (mode_str) {
1114		if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1115		display_type = DISPLAY_WINDOW;
1116	<	#if ENABLE_FBDEV_DGA
1116	>	#ifdef ENABLE_FBDEV_DGA
1117		else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1118		#else
1119		else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
#	Line 771 | Line 1137 | bool VideoInit(bool classic)
1137		return false;
1138		break;
1139		case DISPLAY_DGA:
1140	<	#if ENABLE_FBDEV_DGA
1140	>	#ifdef ENABLE_FBDEV_DGA
1141		if (!init_fbdev_dga(fb_name))
1142		#else
1143		if (!init_xf86_dga(width, height))
#	Line 781 | Line 1147 | bool VideoInit(bool classic)
1147		}
1148
1149		// Lock down frame buffer
1150	<	pthread_mutex_lock(&frame_buffer_lock);
1150	>	LOCK_FRAME_BUFFER;
1151
1152	<	#if !REAL_ADDRESSING
1152	>	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1153		// Set variables for UAE memory mapping
1154		MacFrameBaseHost = the_buffer;
1155		MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
#	Line 793 | Line 1159 | bool VideoInit(bool classic)
1159		MacFrameLayout = FLAYOUT_NONE;
1160		#endif
1161
1162	<	// Start redraw/input thread
1162	>	#ifdef ENABLE_VOSF
1163	>	if (use_vosf) {
1164	>	// Initialize the mainBuffer structure
1165	>	if (!VideoInitBuffer()) {
1166	>	// TODO: STR_VOSF_INIT_ERR ?
1167	>	ErrorAlert("Could not initialize Video on SEGV signals");
1168	>	return false;
1169	>	}
1170	>
1171	>	// Initialize the handler for SIGSEGV
1172	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1173	>	// TODO: STR_VOSF_INIT_ERR ?
1174	>	ErrorAlert("Could not initialize Video on SEGV signals");
1175	>	return false;
1176	>	}
1177	>	}
1178	>	#endif
1179	>
1180	>	// Initialize VideoRefresh function
1181	>	VideoRefreshInit();
1182	>
1183		XSync(x_display, false);
1184	+
1185	+	#ifdef HAVE_PTHREADS
1186	+	// Start redraw/input thread
1187		redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1188	<	if (!redraw_thread_active)
1188	>	if (!redraw_thread_active) {
1189		printf("FATAL: cannot create redraw thread\n");
1190	<	return redraw_thread_active;
1190	>	return false;
1191	>	}
1192	>	#endif
1193	>	return true;
1194		}
1195
1196
#	Line 808 | Line 1200 | bool VideoInit(bool classic)
1200
1201		void VideoExit(void)
1202		{
1203	+	#ifdef HAVE_PTHREADS
1204		// Stop redraw thread
1205		if (redraw_thread_active) {
1206		redraw_thread_cancel = true;
#	Line 817 | Line 1210 | void VideoExit(void)
1210		pthread_join(redraw_thread, NULL);
1211		redraw_thread_active = false;
1212		}
1213	+	#endif
1214
1215		// Unlock frame buffer
1216	<	pthread_mutex_unlock(&frame_buffer_lock);
1216	>	UNLOCK_FRAME_BUFFER;
1217
1218		// Close window and server connection
1219		if (x_display != NULL) {
1220		XSync(x_display, false);
1221
1222	<	#if ENABLE_XF86_DGA
1222	>	#ifdef ENABLE_XF86_DGA
1223		if (display_type == DISPLAY_DGA) {
1224		XF86DGADirectVideo(x_display, screen, 0);
1225		XUngrabPointer(x_display, CurrentTime);
#	Line 833 | Line 1227 | void VideoExit(void)
1227		}
1228		#endif
1229
1230	<	#if ENABLE_XF86_VIDMODE
1230	>	#ifdef ENABLE_XF86_VIDMODE
1231		if (has_vidmode && display_type == DISPLAY_DGA)
1232		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1233		#endif
1234
1235	<	#if ENABLE_FBDEV_DGA
1235	>	#ifdef ENABLE_FBDEV_DGA
1236		if (display_type == DISPLAY_DGA) {
1237		XUngrabPointer(x_display, CurrentTime);
1238		XUngrabKeyboard(x_display, CurrentTime);
#	Line 852 | Line 1246 | void VideoExit(void)
1246		XFreeColormap(x_display, cmap[0]);
1247		XFreeColormap(x_display, cmap[1]);
1248		}
1249	+
1250	+	if (!use_vosf) {
1251	+	if (the_buffer) {
1252	+	free(the_buffer);
1253	+	the_buffer = NULL;
1254	+	}
1255
1256	<	if (the_buffer) {
1257	<	free(the_buffer);
1258	<	the_buffer = NULL;
1256	>	if (!have_shm && the_buffer_copy) {
1257	>	free(the_buffer_copy);
1258	>	the_buffer_copy = NULL;
1259	>	}
1260	>	}
1261	>	#ifdef ENABLE_VOSF
1262	>	else {
1263	>	if (the_buffer != (uint8 *)MAP_FAILED) {
1264	>	munmap((caddr_t)the_buffer, the_buffer_size);
1265	>	the_buffer = 0;
1266	>	}
1267	>
1268	>	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1269	>	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1270	>	the_buffer_copy = 0;
1271	>	}
1272	>	}
1273	>	#endif
1274	>	}
1275	>
1276	>	#ifdef ENABLE_VOSF
1277	>	if (use_vosf) {
1278	>	// Clear mainBuffer data
1279	>	if (mainBuffer.pageInfo) {
1280	>	free(mainBuffer.pageInfo);
1281	>	mainBuffer.pageInfo = 0;
1282		}
1283
1284	<	if (!have_shm && the_buffer_copy) {
1285	<	free(the_buffer_copy);
1286	<	the_buffer_copy = NULL;
1284	>	if (mainBuffer.dirtyPages) {
1285	>	free(mainBuffer.dirtyPages);
1286	>	mainBuffer.dirtyPages = 0;
1287		}
1288		}
1289	+
1290	+	// Close /dev/zero
1291	+	if (zero_fd > 0)
1292	+	close(zero_fd);
1293	+	#endif
1294		}
1295
1296
#	Line 890 | Line 1318 | void VideoInterrupt(void)
1318
1319		// Temporarily give up frame buffer lock (this is the point where
1320		// we are suspended when the user presses Ctrl-Tab)
1321	<	pthread_mutex_unlock(&frame_buffer_lock);
1322	<	pthread_mutex_lock(&frame_buffer_lock);
1321	>	UNLOCK_FRAME_BUFFER;
1322	>	LOCK_FRAME_BUFFER;
1323		}
1324
1325
#	Line 901 | Line 1329 | void VideoInterrupt(void)
1329
1330		void video_set_palette(uint8 *pal)
1331		{
1332	<	pthread_mutex_lock(&palette_lock);
1332	>	LOCK_PALETTE;
1333
1334		// Convert colors to XColor array
1335		for (int i=0; i<256; i++) {
#	Line 915 | Line 1343 | void video_set_palette(uint8 *pal)
1343		// Tell redraw thread to change palette
1344		palette_changed = true;
1345
1346	<	pthread_mutex_unlock(&palette_lock);
1346	>	UNLOCK_PALETTE;
1347		}
1348
1349
#	Line 923 | Line 1351 | void video_set_palette(uint8 *pal)
1351		*  Suspend/resume emulator
1352		*/
1353
1354	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1354	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1355		static void suspend_emul(void)
1356		{
1357		if (display_type == DISPLAY_DGA) {
#	Line 932 | Line 1360 | static void suspend_emul(void)
1360		ctrl_down = false;
1361
1362		// Lock frame buffer (this will stop the MacOS thread)
1363	<	pthread_mutex_lock(&frame_buffer_lock);
1363	>	LOCK_FRAME_BUFFER;
1364
1365		// Save frame buffer
1366		fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
#	Line 940 | Line 1368 | static void suspend_emul(void)
1368		memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1369
1370		// Close full screen display
1371	<	#if ENABLE_XF86_DGA
1371	>	#ifdef ENABLE_XF86_DGA
1372		XF86DGADirectVideo(x_display, screen, 0);
1373		#endif
1374		XUngrabPointer(x_display, CurrentTime);
1375		XUngrabKeyboard(x_display, CurrentTime);
1376		XUnmapWindow(x_display, the_win);
1377	<	XSync(x_display, false);
1377	>	wait_unmapped(the_win);
1378
1379		// Open "suspend" window
1380		XSetWindowAttributes wattr;
1381		wattr.event_mask = KeyPressMask;
1382		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);
1383
960	–	XSync(x_display, false);
1384		suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1385	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
1386	<	CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
1387	<	XSync(x_display, false);
1388	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
966	<	XMapRaised(x_display, suspend_win);
967	<	XSync(x_display, false);
1385	>	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
1386	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1387	>	set_window_focus(suspend_win);
1388	>	XMapWindow(x_display, suspend_win);
1389		emul_suspended = true;
1390		}
1391		}
#	Line 977 | Line 1398 | static void resume_emul(void)
1398
1399		// Reopen full screen display
1400		XMapRaised(x_display, the_win);
1401	+	wait_mapped(the_win);
1402		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
981	–	XSync(x_display, false);
1403		XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1404		XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1405	<	#if ENABLE_XF86_DGA
1405	>	#ifdef ENABLE_XF86_DGA
1406		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1407		XF86DGASetViewPort(x_display, screen, 0, 0);
1408		#endif
1409		XSync(x_display, false);
1410	<
1410	>
1411	>	// the_buffer already contains the data to restore. i.e. since a temporary
1412	>	// frame buffer is used when VOSF is actually used, fb_save is therefore
1413	>	// not necessary.
1414	>	#ifdef ENABLE_VOSF
1415	>	if (use_vosf) {
1416	>	LOCK_VOSF;
1417	>	PFLAG_SET_ALL;
1418	>	UNLOCK_VOSF;
1419	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1420	>	}
1421	>	#endif
1422	>
1423		// Restore frame buffer
1424		if (fb_save) {
1425	+	#ifdef ENABLE_VOSF
1426	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1427	+	if (!use_vosf)
1428	+	#endif
1429		memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1430		free(fb_save);
1431		fb_save = NULL;
1432		}
1433
1434	+	#ifdef ENABLE_XF86_DGA
1435		if (depth == 8)
998	–	#if ENABLE_XF86_DGA
1436		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1437		#endif
1438
1439		// Unlock frame buffer (and continue MacOS thread)
1440	<	pthread_mutex_unlock(&frame_buffer_lock);
1440	>	UNLOCK_FRAME_BUFFER;
1441		emul_suspended = false;
1442		}
1443		#endif
#	Line 1063 | Line 1500 | static int kc_decode(KeySym ks)
1500		case XK_period: case XK_greater: return 0x2f;
1501		case XK_slash: case XK_question: return 0x2c;
1502
1503	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1503	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1504		case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1505		#else
1506		case XK_Tab: return 0x30;
#	Line 1155 | Line 1592 | static int kc_decode(KeySym ks)
1592		return -1;
1593		}
1594
1595	<	static int event2keycode(XKeyEvent *ev)
1595	>	static int event2keycode(XKeyEvent &ev)
1596		{
1597		KeySym ks;
1598		int as;
1599		int i = 0;
1600
1601		do {
1602	<	ks = XLookupKeysym(ev, i++);
1602	>	ks = XLookupKeysym(&ev, i++);
1603		as = kc_decode(ks);
1604		if (as != -1)
1605		return as;
#	Line 1178 | Line 1615 | static int event2keycode(XKeyEvent *ev)
1615
1616		static void handle_events(void)
1617		{
1618	<	XEvent event;
1619	<	for (;;) {
1620	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1184	<	break;
1618	>	while (XPending(x_display)) {
1619	>	XEvent event;
1620	>	XNextEvent(x_display, &event);
1621
1622		switch (event.type) {
1623		// Mouse button
1624		case ButtonPress: {
1625	<	unsigned int button = ((XButtonEvent *)&event)->button;
1625	>	unsigned int button = event.xbutton.button;
1626		if (button < 4)
1627		ADBMouseDown(button - 1);
1628		else if (button < 6) {  // Wheel mouse
#	Line 1205 | Line 1641 | static void handle_events(void)
1641		break;
1642		}
1643		case ButtonRelease: {
1644	<	unsigned int button = ((XButtonEvent *)&event)->button;
1644	>	unsigned int button = event.xbutton.button;
1645		if (button < 4)
1646		ADBMouseUp(button - 1);
1647		break;
#	Line 1213 | Line 1649 | static void handle_events(void)
1649
1650		// Mouse moved
1651		case EnterNotify:
1216	–	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1217	–	break;
1652		case MotionNotify:
1653	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1653	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1654		break;
1655
1656		// Keyboard
1657		case KeyPress: {
1658		int code;
1659		if (use_keycodes) {
1660	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
1661	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1660	>	event2keycode(event.xkey);      // This is called to process the hotkeys
1661	>	code = keycode_table[event.xkey.keycode & 0xff];
1662		} else
1663	<	code = event2keycode((XKeyEvent *)&event);
1663	>	code = event2keycode(event.xkey);
1664		if (code != -1) {
1665		if (!emul_suspended) {
1666		if (code == 0x39) {     // Caps Lock pressed
#	Line 1242 | Line 1676 | static void handle_events(void)
1676		if (code == 0x36)
1677		ctrl_down = true;
1678		} else {
1679	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1679	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1680		if (code == 0x31)
1681		resume_emul();  // Space wakes us up
1682		#endif
#	Line 1253 | Line 1687 | static void handle_events(void)
1687		case KeyRelease: {
1688		int code;
1689		if (use_keycodes) {
1690	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
1691	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1690	>	event2keycode(event.xkey);      // This is called to process the hotkeys
1691	>	code = keycode_table[event.xkey.keycode & 0xff];
1692		} else
1693	<	code = event2keycode((XKeyEvent *)&event);
1693	>	code = event2keycode(event.xkey);
1694		if (code != -1 && code != 0x39) {       // Don't propagate Caps Lock releases
1695		ADBKeyUp(code);
1696		if (code == 0x36)
#	Line 1268 | Line 1702 | static void handle_events(void)
1702		// Hidden parts exposed, force complete refresh of window
1703		case Expose:
1704		if (display_type == DISPLAY_WINDOW) {
1705	<	int x1, y1;
1706	<	for (y1=0; y1<16; y1++)
1707	<	for (x1=0; x1<16; x1++)
1708	<	updt_box[x1][y1] = true;
1709	<	nr_boxes = 16 * 16;
1705	>	#ifdef ENABLE_VOSF
1706	>	if (use_vosf) {                 // VOSF refresh
1707	>	LOCK_VOSF;
1708	>	PFLAG_SET_ALL;
1709	>	UNLOCK_VOSF;
1710	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1711	>	}
1712	>	else
1713	>	#endif
1714	>	if (frame_skip == 0) {  // Dynamic refresh
1715	>	int x1, y1;
1716	>	for (y1=0; y1<16; y1++)
1717	>	for (x1=0; x1<16; x1++)
1718	>	updt_box[x1][y1] = true;
1719	>	nr_boxes = 16 * 16;
1720	>	} else                                  // Static refresh
1721	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1722	>	}
1723	>	break;
1724	>
1725	>	// Window "close" widget clicked
1726	>	case ClientMessage:
1727	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1728	>	ADBKeyDown(0x7f);       // Power key
1729	>	ADBKeyUp(0x7f);
1730		}
1731		break;
1732		}
#	Line 1284 | Line 1738 | static void handle_events(void)
1738		*  Window display update
1739		*/
1740
1741	<	static void update_display(int ticker)
1741	>	// Dynamic display update (variable frame rate for each box)
1742	>	static void update_display_dynamic(int ticker)
1743		{
1744	<	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xic, xicl, xi;
1744	>	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1745		int xil = 0;
1746		int rxm = 0, rxmo = 0;
1747		int bytes_per_row = VideoMonitor.bytes_per_row;
#	Line 1373 | Line 1828 | static void update_display(int ticker)
1828		}
1829		}
1830
1831	+	// Static display update (fixed frame rate, but incremental)
1832	+	static void update_display_static(void)
1833	+	{
1834	+	// Incremental update code
1835	+	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1836	+	int bytes_per_row = VideoMonitor.bytes_per_row;
1837	+	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1838	+	uint8 *p, *p2;
1839	+
1840	+	// Check for first line from top and first line from bottom that have changed
1841	+	y1 = 0;
1842	+	for (j=0; j<VideoMonitor.y; j++) {
1843	+	if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1844	+	y1 = j;
1845	+	break;
1846	+	}
1847	+	}
1848	+	y2 = y1 - 1;
1849	+	for (j=VideoMonitor.y-1; j>=y1; j--) {
1850	+	if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1851	+	y2 = j;
1852	+	break;
1853	+	}
1854	+	}
1855	+	high = y2 - y1 + 1;
1856	+
1857	+	// Check for first column from left and first column from right that have changed
1858	+	if (high) {
1859	+	if (depth == 1) {
1860	+	x1 = VideoMonitor.x - 1;
1861	+	for (j=y1; j<=y2; j++) {
1862	+	p = &the_buffer[j * bytes_per_row];
1863	+	p2 = &the_buffer_copy[j * bytes_per_row];
1864	+	for (i=0; i<(x1>>3); i++) {
1865	+	if (*p != *p2) {
1866	+	x1 = i << 3;
1867	+	break;
1868	+	}
1869	+	p++; p2++;
1870	+	}
1871	+	}
1872	+	x2 = x1;
1873	+	for (j=y1; j<=y2; j++) {
1874	+	p = &the_buffer[j * bytes_per_row];
1875	+	p2 = &the_buffer_copy[j * bytes_per_row];
1876	+	p += bytes_per_row;
1877	+	p2 += bytes_per_row;
1878	+	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1879	+	p--; p2--;
1880	+	if (*p != *p2) {
1881	+	x2 = (i << 3) + 7;
1882	+	break;
1883	+	}
1884	+	}
1885	+	}
1886	+	wide = x2 - x1 + 1;
1887	+
1888	+	// Update copy of the_buffer
1889	+	if (high && wide) {
1890	+	for (j=y1; j<=y2; j++) {
1891	+	i = j * bytes_per_row + (x1 >> 3);
1892	+	memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3);
1893	+	}
1894	+	}
1895	+
1896	+	} else {
1897	+	x1 = VideoMonitor.x;
1898	+	for (j=y1; j<=y2; j++) {
1899	+	p = &the_buffer[j * bytes_per_row];
1900	+	p2 = &the_buffer_copy[j * bytes_per_row];
1901	+	for (i=0; i<x1*bytes_per_pixel; i++) {
1902	+	if (*p != *p2) {
1903	+	x1 = i / bytes_per_pixel;
1904	+	break;
1905	+	}
1906	+	p++; p2++;
1907	+	}
1908	+	}
1909	+	x2 = x1;
1910	+	for (j=y1; j<=y2; j++) {
1911	+	p = &the_buffer[j * bytes_per_row];
1912	+	p2 = &the_buffer_copy[j * bytes_per_row];
1913	+	p += bytes_per_row;
1914	+	p2 += bytes_per_row;
1915	+	for (i=VideoMonitor.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1916	+	p--;
1917	+	p2--;
1918	+	if (*p != *p2) {
1919	+	x2 = i / bytes_per_pixel;
1920	+	break;
1921	+	}
1922	+	}
1923	+	}
1924	+	wide = x2 - x1;
1925	+
1926	+	// Update copy of the_buffer
1927	+	if (high && wide) {
1928	+	for (j=y1; j<=y2; j++) {
1929	+	i = j * bytes_per_row + x1 * bytes_per_pixel;
1930	+	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
1931	+	}
1932	+	}
1933	+	}
1934	+	}
1935	+
1936	+	// Refresh display
1937	+	if (high && wide) {
1938	+	if (have_shm)
1939	+	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1940	+	else
1941	+	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1942	+	}
1943	+	}
1944	+
1945
1946		/*
1947	<	*  Thread for screen refresh, input handling etc.
1947	>	*      Screen refresh functions
1948		*/
1949
1950	<	static void *redraw_func(void *arg)
1951	<	{
1952	<	int tick_counter = 0;
1950	>	// We suggest the compiler to inline the next two functions so that it
1951	>	// may specialise the code according to the current screen depth and
1952	>	// display type. A clever compiler would do that job by itself though...
1953
1954	<	while (!redraw_thread_cancel) {
1954	>	// NOTE: update_display_vosf is inlined too
1955
1956	<	// Wait
1957	<	#ifdef HAVE_NANOSLEEP
1958	<	struct timespec req = {0, 16666667};
1959	<	nanosleep(&req, NULL);
1960	<	#else
1961	<	usleep(16667);
1956	>	static inline void possibly_quit_dga_mode()
1957	>	{
1958	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1959	>	// Quit DGA mode if requested
1960	>	if (quit_full_screen) {
1961	>	quit_full_screen = false;
1962	>	#ifdef ENABLE_XF86_DGA
1963	>	XF86DGADirectVideo(x_display, screen, 0);
1964	>	#endif
1965	>	XUngrabPointer(x_display, CurrentTime);
1966	>	XUngrabKeyboard(x_display, CurrentTime);
1967	>	XUnmapWindow(x_display, the_win);
1968	>	XSync(x_display, false);
1969	>	}
1970		#endif
1971	+	}
1972	+
1973	+	static inline void handle_palette_changes(int depth, int display_type)
1974	+	{
1975	+	LOCK_PALETTE;
1976
1977	<	#if ENABLE_XF86_DGA
1978	<	// Quit DGA mode if requested
1979	<	if (quit_full_screen) {
1980	<	quit_full_screen = false;
1977	>	if (palette_changed) {
1978	>	palette_changed = false;
1979	>	if (depth == 8) {
1980	>	XStoreColors(x_display, cmap[0], palette, 256);
1981	>	XStoreColors(x_display, cmap[1], palette, 256);
1982	>	XSync(x_display, false);
1983	>
1984	>	#ifdef ENABLE_XF86_DGA
1985		if (display_type == DISPLAY_DGA) {
1986	<	XF86DGADirectVideo(x_display, screen, 0);
1987	<	XUngrabPointer(x_display, CurrentTime);
1402	<	XUngrabKeyboard(x_display, CurrentTime);
1403	<	XUnmapWindow(x_display, the_win);
1404	<	XSync(x_display, false);
1986	>	current_dga_cmap ^= 1;
1987	>	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1988		}
1406	–	}
1989		#endif
1990	+	}
1991	+	}
1992
1993	<	#if ENABLE_FBDEV_DGA
1994	<	// Quit DGA mode if requested
1995	<	if (quit_full_screen) {
1996	<	quit_full_screen = false;
1997	<	if (display_type == DISPLAY_DGA) {
1998	<	XUngrabPointer(x_display, CurrentTime);
1999	<	XUngrabKeyboard(x_display, CurrentTime);
2000	<	XUnmapWindow(x_display, the_win);
2001	<	XSync(x_display, false);
2002	<	}
1993	>	UNLOCK_PALETTE;
1994	>	}
1995	>
1996	>	static void video_refresh_dga(void)
1997	>	{
1998	>	// Quit DGA mode if requested
1999	>	possibly_quit_dga_mode();
2000	>
2001	>	// Handle X events
2002	>	handle_events();
2003	>
2004	>	// Handle palette changes
2005	>	handle_palette_changes(depth, DISPLAY_DGA);
2006	>	}
2007	>
2008	>	#ifdef ENABLE_VOSF
2009	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
2010	>	static void video_refresh_dga_vosf(void)
2011	>	{
2012	>	// Quit DGA mode if requested
2013	>	possibly_quit_dga_mode();
2014	>
2015	>	// Handle X events
2016	>	handle_events();
2017	>
2018	>	// Handle palette changes
2019	>	handle_palette_changes(depth, DISPLAY_DGA);
2020	>
2021	>	// Update display (VOSF variant)
2022	>	static int tick_counter = 0;
2023	>	if (++tick_counter >= frame_skip) {
2024	>	tick_counter = 0;
2025	>	if (mainBuffer.dirty) {
2026	>	LOCK_VOSF;
2027	>	update_display_dga_vosf();
2028	>	UNLOCK_VOSF;
2029		}
2030	+	}
2031	+	}
2032		#endif
1421	–	// Handle X events
1422	–	handle_events();
2033
2034	<	// Handle palette changes
2035	<	pthread_mutex_lock(&palette_lock);
2036	<	if (palette_changed) {
2037	<	palette_changed = false;
2038	<	if (depth == 8) {
2039	<	XStoreColors(x_display, cmap[0], palette, 256);
2040	<	XStoreColors(x_display, cmap[1], palette, 256);
2041	<
2042	<	#if ENABLE_XF86_DGA
2043	<	if (display_type == DISPLAY_DGA) {
2044	<	current_dga_cmap ^= 1;
2045	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2046	<	}
2047	<	#endif
2048	<	}
2034	>	static void video_refresh_window_vosf(void)
2035	>	{
2036	>	// Quit DGA mode if requested
2037	>	possibly_quit_dga_mode();
2038	>
2039	>	// Handle X events
2040	>	handle_events();
2041	>
2042	>	// Handle palette changes
2043	>	handle_palette_changes(depth, DISPLAY_WINDOW);
2044	>
2045	>	// Update display (VOSF variant)
2046	>	static int tick_counter = 0;
2047	>	if (++tick_counter >= frame_skip) {
2048	>	tick_counter = 0;
2049	>	if (mainBuffer.dirty) {
2050	>	LOCK_VOSF;
2051	>	update_display_window_vosf();
2052	>	UNLOCK_VOSF;
2053	>	XSync(x_display, false); // Let the server catch up
2054		}
2055	<	pthread_mutex_unlock(&palette_lock);
2055	>	}
2056	>	}
2057	>	#endif // def ENABLE_VOSF
2058
2059	<	// In window mode, update display
2060	<	if (display_type == DISPLAY_WINDOW) {
2061	<	tick_counter++;
2062	<	update_display(tick_counter);
2063	<	}
2059	>	static void video_refresh_window_static(void)
2060	>	{
2061	>	// Handle X events
2062	>	handle_events();
2063	>
2064	>	// Handle_palette changes
2065	>	handle_palette_changes(depth, DISPLAY_WINDOW);
2066	>
2067	>	// Update display (static variant)
2068	>	static int tick_counter = 0;
2069	>	if (++tick_counter >= frame_skip) {
2070	>	tick_counter = 0;
2071	>	update_display_static();
2072		}
2073	+	}
2074	+
2075	+	static void video_refresh_window_dynamic(void)
2076	+	{
2077	+	// Handle X events
2078	+	handle_events();
2079	+
2080	+	// Handle_palette changes
2081	+	handle_palette_changes(depth, DISPLAY_WINDOW);
2082	+
2083	+	// Update display (dynamic variant)
2084	+	static int tick_counter = 0;
2085	+	tick_counter++;
2086	+	update_display_dynamic(tick_counter);
2087	+	}
2088	+
2089	+
2090	+	/*
2091	+	*  Thread for screen refresh, input handling etc.
2092	+	*/
2093	+
2094	+	void VideoRefreshInit(void)
2095	+	{
2096	+	// TODO: set up specialised 8bpp VideoRefresh handlers ?
2097	+	if (display_type == DISPLAY_DGA) {
2098	+	#if ENABLE_VOSF && (REAL_ADDRESSING || DIRECT_ADDRESSING)
2099	+	if (use_vosf)
2100	+	video_refresh = video_refresh_dga_vosf;
2101	+	else
2102	+	#endif
2103	+	video_refresh = video_refresh_dga;
2104	+	}
2105	+	else {
2106	+	#ifdef ENABLE_VOSF
2107	+	if (use_vosf)
2108	+	video_refresh = video_refresh_window_vosf;
2109	+	else
2110	+	#endif
2111	+	if (frame_skip == 0)
2112	+	video_refresh = video_refresh_window_dynamic;
2113	+	else
2114	+	video_refresh = video_refresh_window_static;
2115	+	}
2116	+	}
2117	+
2118	+	void VideoRefresh(void)
2119	+	{
2120	+	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2121	+	video_refresh();
2122	+	}
2123	+
2124	+	#ifdef HAVE_PTHREADS
2125	+	static void *redraw_func(void *arg)
2126	+	{
2127	+	uint64 start = GetTicks_usec();
2128	+	int64 ticks = 0;
2129	+	uint64 next = GetTicks_usec();
2130	+	while (!redraw_thread_cancel) {
2131	+	video_refresh();
2132	+	next += 16667;
2133	+	int64 delay = next - GetTicks_usec();
2134	+	if (delay > 0)
2135	+	Delay_usec(delay);
2136	+	else if (delay < -16667)
2137	+	next = GetTicks_usec();
2138	+	ticks++;
2139	+	}
2140	+	uint64 end = GetTicks_usec();
2141	+	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2142		return NULL;
2143		}
2144	+	#endif

Diff Legend

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