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.9 by cebix, 1999-10-21T16:40:49Z vs.
Revision 1.24 by cebix, 2000-10-11T17:55:06Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  Basilisk II (C) 1997-1999 Christian Bauer
4	>	*  Basilisk II (C) 1997-2000 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 <math.h> // log()
57	+	# include <unistd.h>
58	+	# include <signal.h>
59	+	# include <fcntl.h>
60	+	# include <sys/mman.h>
61	+	#endif
62	+
63		#include "cpu_emulation.h"
64		#include "main.h"
65		#include "adb.h"
#	Line 45 | Line 68
68		#include "user_strings.h"
69		#include "video.h"
70
71	<	#define DEBUG 1
71	>	#define DEBUG 0
72		#include "debug.h"
73
51	–	#if ENABLE_XF86_DGA
52	–	#include <X11/extensions/xf86dga.h>
53	–	#endif
54	–
55	–	#if ENABLE_FBDEV_DGA
56	–	#include <sys/mman.h>
57	–	#endif
58	–
59	–
74
75		// Display types
76		enum {
#	Line 64 | Line 78 | enum {
78		DISPLAY_DGA             // DGA fullscreen display
79		};
80
67	–
81		// Constants
82		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
83		const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
84
85
86		// Global variables
87	<	static int32 frame_skip;
87	>	static int32 frame_skip;                                                        // Prefs items
88	>	static int16 mouse_wheel_mode = 1;
89	>	static int16 mouse_wheel_lines = 3;
90	>
91		static int display_type = DISPLAY_WINDOW;                       // See enum above
92	+	static bool local_X11;                                                          // Flag: X server running on local machine?
93		static uint8 *the_buffer;                                                       // Mac frame buffer
94	+
95	+	#ifdef HAVE_PTHREADS
96		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
97		static volatile bool redraw_thread_cancel = false;      // Flag: Cancel Redraw thread
98		static pthread_t redraw_thread;                                         // Redraw thread
99	+	#endif
100
101		static bool has_dga = false;                                            // Flag: Video DGA capable
102	+	static bool has_vidmode = false;                                        // Flag: VidMode extension available
103
104		static bool ctrl_down = false;                                          // Flag: Ctrl key pressed
105		static bool caps_on = false;                                            // Flag: Caps Lock on
#	Line 105 | Line 126 | static int eventmask;
126		static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask;
127		static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
128
108	–	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	+	#endif
134
135		// Variables for window mode
136		static GC the_gc;
137		static XImage *img = NULL;
138		static XShmSegmentInfo shminfo;
116	–	static XImage *cursor_image, *cursor_mask_image;
117	–	static Pixmap cursor_map, cursor_mask_map;
139		static Cursor mac_cursor;
119	–	static GC cursor_gc, cursor_mask_gc;
140		static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer
121	–	static uint8 the_cursor[64];                                            // Cursor image data
141		static bool have_shm = false;                                           // Flag: SHM extensions available
142	+	static bool updt_box[17][17];                                           // Flag for Update
143	+	static int nr_boxes;
144	+	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
145	+	static int sm_no_boxes[] = {1,8,32,64,128,300};
146
147		// Variables for XF86 DGA mode
148		static int current_dga_cmap;                                            // Number (0 or 1) of currently installed DGA colormap
149		static Window suspend_win;                                                      // "Suspend" window
150		static void *fb_save = NULL;                                            // Saved frame buffer for suspend
151	+	#ifdef HAVE_PTHREADS
152		static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
153	+	#endif
154
155		// Variables for fbdev DGA mode
156		const char FBDEVICE_FILE_NAME[] = "/dev/fb";
157		static int fbdev_fd;
158
159	+	#ifdef ENABLE_XF86_VIDMODE
160	+	// Variables for XF86 VidMode support
161	+	static XF86VidModeModeInfo **x_video_modes;                     // Array of all available modes
162	+	static int num_x_video_modes;
163	+	#endif
164	+
165	+	#ifdef ENABLE_VOSF
166	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
167	+	#else
168	+	static const bool use_vosf = false;                                     // Flag: VOSF enabled
169	+	#endif
170	+
171	+	#ifdef ENABLE_VOSF
172	+	static uint8 * the_host_buffer;                                         // Host frame buffer in VOSF mode
173	+	static uint32 the_buffer_size;                                          // Size of allocated the_buffer
174	+	#endif
175	+
176	+	#ifdef ENABLE_VOSF
177	+	// Variables for Video on SEGV support (taken from the Win32 port)
178	+	struct ScreenPageInfo {
179	+	int top, bottom;                    // Mapping between this virtual page and Mac scanlines
180	+	};
181	+
182	+	struct ScreenInfo {
183	+	uint32 memBase;                             // Real start address
184	+	uint32 memStart;                    // Start address aligned to page boundary
185	+	uint32 memEnd;                              // Address of one-past-the-end of the screen
186	+	uint32 memLength;                   // Length of the memory addressed by the screen pages
187	+
188	+	uint32 pageSize;                    // Size of a page
189	+	int pageBits;                               // Shift count to get the page number
190	+	uint32 pageCount;                   // Number of pages allocated to the screen
191	+
192	+	uint8 * dirtyPages;                 // Table of flags set if page was altered
193	+	ScreenPageInfo * pageInfo;  // Table of mappings page -> Mac scanlines
194	+	};
195	+
196	+	static ScreenInfo mainBuffer;
197	+
198	+	#define PFLAG_SET(page)                 mainBuffer.dirtyPages[page] = 1
199	+	#define PFLAG_CLEAR(page)               mainBuffer.dirtyPages[page] = 0
200	+	#define PFLAG_ISSET(page)               mainBuffer.dirtyPages[page]
201	+	#define PFLAG_ISCLEAR(page)             (mainBuffer.dirtyPages[page] == 0)
202	+	#ifdef UNALIGNED_PROFITABLE
203	+	# define PFLAG_ISCLEAR_4(page)  (*((uint32 *)(mainBuffer.dirtyPages + page)) == 0)
204	+	#else
205	+	# define PFLAG_ISCLEAR_4(page)  \
206	+	(mainBuffer.dirtyPages[page  ] == 0) \
207	+	&&      (mainBuffer.dirtyPages[page+1] == 0) \
208	+	&&      (mainBuffer.dirtyPages[page+2] == 0) \
209	+	&&      (mainBuffer.dirtyPages[page+3] == 0)
210	+	#endif
211	+	#define PFLAG_CLEAR_ALL                 memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
212	+	#define PFLAG_SET_ALL                   memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
213	+
214	+	static int zero_fd = -1;
215	+	static bool Screen_fault_handler_init();
216	+	static struct sigaction vosf_sa;
217	+
218	+	#ifdef HAVE_PTHREADS
219	+	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER;    // Mutex to protect frame buffer (dirtyPages in fact)
220	+	#endif
221	+
222	+	#endif
223	+
224	+	// VideoRefresh function
225	+	void VideoRefreshInit(void);
226	+	static void (*video_refresh)(void);
227
228		// Prototypes
229		static void *redraw_func(void *arg);
#	Line 138 | Line 231 | static int event2keycode(XKeyEvent *ev);
231
232
233		// From main_unix.cpp
234	+	extern char *x_display_name;
235		extern Display *x_display;
236
237		// From sys_unix.cpp
238		extern void SysMountFirstFloppy(void);
239
240	+	#ifdef ENABLE_VOSF
241	+	# include "video_vosf.h"
242	+	#endif
243	+
244
245		/*
246		*  Initialization
#	Line 151 | Line 249 | extern void SysMountFirstFloppy(void);
249		// Set VideoMonitor according to video mode
250		void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
251		{
252	+	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
253		int layout = FLAYOUT_DIRECT;
254		switch (depth) {
255		case 1:
256		layout = FLAYOUT_DIRECT;
158	–	VideoMonitor.mode = VMODE_1BIT;
257		break;
258		case 8:
259		layout = FLAYOUT_DIRECT;
162	–	VideoMonitor.mode = VMODE_8BIT;
260		break;
261		case 15:
262		layout = FLAYOUT_HOST_555;
166	–	VideoMonitor.mode = VMODE_16BIT;
263		break;
264		case 16:
265		layout = FLAYOUT_HOST_565;
170	–	VideoMonitor.mode = VMODE_16BIT;
266		break;
267		case 24:
268		case 32:
269		layout = FLAYOUT_HOST_888;
175	–	VideoMonitor.mode = VMODE_32BIT;
270		break;
271		}
178	–	VideoMonitor.x = width;
179	–	VideoMonitor.y = height;
180	–	VideoMonitor.bytes_per_row = bytes_per_row;
272		if (native_byte_order)
273		MacFrameLayout = layout;
274		else
275		MacFrameLayout = FLAYOUT_DIRECT;
276	+	#endif
277	+	switch (depth) {
278	+	case 1:
279	+	VideoMonitor.mode = VMODE_1BIT;
280	+	break;
281	+	case 8:
282	+	VideoMonitor.mode = VMODE_8BIT;
283	+	break;
284	+	case 15:
285	+	VideoMonitor.mode = VMODE_16BIT;
286	+	break;
287	+	case 16:
288	+	VideoMonitor.mode = VMODE_16BIT;
289	+	break;
290	+	case 24:
291	+	case 32:
292	+	VideoMonitor.mode = VMODE_32BIT;
293	+	break;
294	+	}
295	+	VideoMonitor.x = width;
296	+	VideoMonitor.y = height;
297	+	VideoMonitor.bytes_per_row = bytes_per_row;
298		}
299
300		// Trap SHM errors
#	Line 200 | Line 313 | static int error_handler(Display *d, XEr
313		// Init window mode
314		static bool init_window(int width, int height)
315		{
316	+	int aligned_width = (width + 15) & ~15;
317	+	int aligned_height = (height + 15) & ~15;
318	+
319		// Set absolute mouse mode
320		ADBSetRelMouseMode(false);
321
322		// Read frame skip prefs
323		frame_skip = PrefsFindInt32("frameskip");
208	–	if (frame_skip == 0)
209	–	frame_skip = 1;
324
325		// Create window
326		XSetWindowAttributes wattr;
327		wattr.event_mask = eventmask = win_eventmask;
328		wattr.background_pixel = black_pixel;
329		wattr.border_pixel = black_pixel;
330	<	wattr.backing_store = Always;
330	>	wattr.backing_store = NotUseful;
331	>	wattr.save_under = false;
332		wattr.backing_planes = xdepth;
333
334		XSync(x_display, false);
#	Line 245 | Line 360 | static bool init_window(int width, int h
360
361		// Try to create and attach SHM image
362		have_shm = false;
363	<	if (depth != 1 && XShmQueryExtension(x_display)) {
363	>	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
364
365		// Create SHM image ("height + 2" for safety)
366		img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
367	<	shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
368	<	the_buffer = (uint8 *)shmat(shminfo.shmid, 0, 0);
369	<	shminfo.shmaddr = img->data = (char *)the_buffer;
367	>	shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
368	>	the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
369	>	shminfo.shmaddr = img->data = (char *)the_buffer_copy;
370		shminfo.readOnly = False;
371
372		// Try to attach SHM image, catching errors
#	Line 272 | Line 387 | static bool init_window(int width, int h
387
388		// Create normal X image if SHM doesn't work ("height + 2" for safety)
389		if (!have_shm) {
390	<	int bytes_per_row = width;
390	>	int bytes_per_row = aligned_width;
391		switch (depth) {
392		case 1:
393		bytes_per_row /= 8;
#	Line 286 | Line 401 | static bool init_window(int width, int h
401		bytes_per_row *= 4;
402		break;
403		}
404	<	the_buffer = (uint8 *)malloc((height + 2) * bytes_per_row);
405	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer, width, height, 32, bytes_per_row);
404	>	the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
405	>	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
406		}
407
408		// 1-Bit mode is big-endian
#	Line 296 | Line 411 | static bool init_window(int width, int h
411		img->bitmap_bit_order = MSBFirst;
412		}
413
414	<	// Allocate memory for frame buffer copy
415	<	the_buffer_copy = (uint8 *)malloc((height + 2) * img->bytes_per_line);
414	>	#ifdef ENABLE_VOSF
415	>	// Allocate a page-aligned chunk of memory for frame buffer
416	>	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
417	>	the_host_buffer = the_buffer_copy;
418	>
419	>	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
420	>	memset(the_buffer_copy, 0, the_buffer_size);
421	>
422	>	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
423	>	memset(the_buffer, 0, the_buffer_size);
424	>	#else
425	>	// Allocate memory for frame buffer
426	>	the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
427	>	#endif
428
429		// Create GC
430		the_gc = XCreateGC(x_display, the_win, 0, 0);
431		XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
432
433	<	// Create cursor
434	<	cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor, 16, 16, 16, 2);
435	<	cursor_image->byte_order = MSBFirst;
436	<	cursor_image->bitmap_bit_order = MSBFirst;
437	<	cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor+32, 16, 16, 16, 2);
438	<	cursor_mask_image->byte_order = MSBFirst;
312	<	cursor_mask_image->bitmap_bit_order = MSBFirst;
313	<	cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
314	<	cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1);
315	<	cursor_gc = XCreateGC(x_display, cursor_map, 0, 0);
316	<	cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0);
317	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0);
433	>	// Create no_cursor
434	>	mac_cursor = XCreatePixmapCursor(x_display,
435	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
436	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
437	>	&black, &white, 0, 0);
438	>	XDefineCursor(x_display, the_win, mac_cursor);
439
440		// Set VideoMonitor
441	+	bool native_byte_order;
442		#ifdef WORDS_BIGENDIAN
443	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst);
443	>	native_byte_order = (img->bitmap_bit_order == MSBFirst);
444		#else
445	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst);
445	>	native_byte_order = (img->bitmap_bit_order == LSBFirst);
446	>	#endif
447	>	#ifdef ENABLE_VOSF
448	>	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
449		#endif
450	+	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
451
452	<	#if REAL_ADDRESSING
453	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
328	<	MacFrameLayout = FLAYOUT_DIRECT;
452	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
453	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
454		#else
455		VideoMonitor.mac_frame_base = MacFrameBaseMac;
456		#endif
#	Line 335 | Line 460 | static bool init_window(int width, int h
460		// Init fbdev DGA display
461		static bool init_fbdev_dga(char *in_fb_name)
462		{
463	<	#if ENABLE_FBDEV_DGA
463	>	#ifdef ENABLE_FBDEV_DGA
464		// Find the maximum depth available
465		int ndepths, max_depth(0);
466		int *depths = XListDepths(x_display, screen, &ndepths);
#	Line 458 | Line 583 | static bool init_fbdev_dga(char *in_fb_n
583		}
584		}
585
586	+	#if ENABLE_VOSF
587	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
588	+	// If the blit function is null, i.e. just a copy of the buffer,
589	+	// we first try to avoid the allocation of a temporary frame buffer
590	+	use_vosf = true;
591	+	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
592	+	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
593	+	use_vosf = false;
594	+
595	+	if (use_vosf) {
596	+	the_host_buffer = the_buffer;
597	+	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
598	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
599	+	memset(the_buffer_copy, 0, the_buffer_size);
600	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
601	+	memset(the_buffer, 0, the_buffer_size);
602	+	}
603	+	#else
604	+	use_vosf = false;
605	+	#endif
606	+	#endif
607	+
608		set_video_monitor(width, height, bytes_per_row, true);
609	<	#if REAL_ADDRESSING
610	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
464	<	MacFrameLayout = FLAYOUT_DIRECT;
609	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
610	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
611		#else
612		VideoMonitor.mac_frame_base = MacFrameBaseMac;
613		#endif
#	Line 475 | Line 621 | static bool init_fbdev_dga(char *in_fb_n
621		// Init XF86 DGA display
622		static bool init_xf86_dga(int width, int height)
623		{
624	<	#if ENABLE_XF86_DGA
624	>	#ifdef ENABLE_XF86_DGA
625		// Set relative mouse mode
626		ADBSetRelMouseMode(true);
627
628	+	#ifdef ENABLE_XF86_VIDMODE
629	+	// Switch to best mode
630	+	if (has_vidmode) {
631	+	int best = 0;
632	+	for (int i=1; i<num_x_video_modes; i++) {
633	+	if (x_video_modes[i]->hdisplay >= width && x_video_modes[i]->vdisplay >= height &&
634	+	x_video_modes[i]->hdisplay <= x_video_modes[best]->hdisplay && x_video_modes[i]->vdisplay <= x_video_modes[best]->vdisplay) {
635	+	best = i;
636	+	}
637	+	}
638	+	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
639	+	XF86VidModeSetViewPort(x_display, screen, 0, 0);
640	+	}
641	+	#endif
642	+
643		// Create window
644		XSetWindowAttributes wattr;
645		wattr.event_mask = eventmask = dga_eventmask;
#	Line 527 | Line 688 | static bool init_xf86_dga(int width, int
688		bytes_per_row *= 4;
689		break;
690		}
691	+
692	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
693	+	// If the blit function is null, i.e. just a copy of the buffer,
694	+	// we first try to avoid the allocation of a temporary frame buffer
695	+	use_vosf = true;
696	+	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
697	+	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
698	+	use_vosf = false;
699	+
700	+	if (use_vosf) {
701	+	the_host_buffer = the_buffer;
702	+	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
703	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
704	+	memset(the_buffer_copy, 0, the_buffer_size);
705	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
706	+	memset(the_buffer, 0, the_buffer_size);
707	+	}
708	+	#elif defined(ENABLE_VOSF)
709	+	// The UAE memory handlers will already handle color conversion, if needed.
710	+	use_vosf = false;
711	+	#endif
712	+
713		set_video_monitor(width, height, bytes_per_row, true);
714	<	#if REAL_ADDRESSING
715	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
716	<	MacFrameLayout = FLAYOUT_DIRECT;
714	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
715	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
716	>	//      MacFrameLayout = FLAYOUT_DIRECT;
717		#else
718		VideoMonitor.mac_frame_base = MacFrameBaseMac;
719		#endif
#	Line 606 | Line 789 | static void keycode_init(void)
789		}
790		}
791
792	+	bool VideoInitBuffer()
793	+	{
794	+	#ifdef ENABLE_VOSF
795	+	if (use_vosf) {
796	+	const uint32 page_size  = getpagesize();
797	+	const uint32 page_mask  = page_size - 1;
798	+
799	+	mainBuffer.memBase      = (uint32) the_buffer;
800	+	// Align the frame buffer on page boundary
801	+	mainBuffer.memStart             = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
802	+	mainBuffer.memLength    = the_buffer_size;
803	+	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
804	+
805	+	mainBuffer.pageSize     = page_size;
806	+	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
807	+	mainBuffer.pageBits     = int( log(mainBuffer.pageSize) / log(2.0) );
808	+
809	+	if (mainBuffer.dirtyPages != 0)
810	+	free(mainBuffer.dirtyPages);
811	+
812	+	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
813	+
814	+	if (mainBuffer.pageInfo != 0)
815	+	free(mainBuffer.pageInfo);
816	+
817	+	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
818	+
819	+	if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0))
820	+	return false;
821	+
822	+	PFLAG_CLEAR_ALL;
823	+
824	+	uint32 a = 0;
825	+	for (int i = 0; i < mainBuffer.pageCount; i++) {
826	+	int y1 = a / VideoMonitor.bytes_per_row;
827	+	if (y1 >= VideoMonitor.y)
828	+	y1 = VideoMonitor.y - 1;
829	+
830	+	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
831	+	if (y2 >= VideoMonitor.y)
832	+	y2 = VideoMonitor.y - 1;
833	+
834	+	mainBuffer.pageInfo[i].top = y1;
835	+	mainBuffer.pageInfo[i].bottom = y2;
836	+
837	+	a += mainBuffer.pageSize;
838	+	if (a > mainBuffer.memLength)
839	+	a = mainBuffer.memLength;
840	+	}
841	+
842	+	// We can now write-protect the frame buffer
843	+	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
844	+	return false;
845	+	}
846	+	#endif
847	+	return true;
848	+	}
849	+
850		bool VideoInit(bool classic)
851		{
852	+	#ifdef ENABLE_VOSF
853	+	// Open /dev/zero
854	+	zero_fd = open("/dev/zero", O_RDWR);
855	+	if (zero_fd < 0) {
856	+	char str[256];
857	+	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
858	+	ErrorAlert(str);
859	+	return false;
860	+	}
861	+
862	+	// Zero the mainBuffer structure
863	+	mainBuffer.dirtyPages = 0;
864	+	mainBuffer.pageInfo = 0;
865	+	#endif
866	+
867	+	// Check if X server runs on local machine
868	+	local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
869	+	|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
870	+
871		// Init keycode translation
872		keycode_init();
873
874	+	// Read prefs
875	+	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
876	+	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
877	+
878		// Find screen and root window
879		screen = XDefaultScreen(x_display);
880		rootwin = XRootWindow(x_display, screen);
#	Line 618 | Line 882 | bool VideoInit(bool classic)
882		// Get screen depth
883		xdepth = DefaultDepth(x_display, screen);
884
885	<	#if ENABLE_FBDEV_DGA
885	>	#ifdef ENABLE_FBDEV_DGA
886		// Frame buffer name
887		char fb_name[20];
888
#	Line 628 | Line 892 | bool VideoInit(bool classic)
892		else
893		has_dga = false;
894		#endif
895	<
896	<	#if ENABLE_XF86_DGA
895	>
896	>	#ifdef ENABLE_XF86_DGA
897		// DGA available?
898	<	int event_base, error_base;
899	<	if (XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
898	>	int dga_event_base, dga_error_base;
899	>	if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
900		int dga_flags = 0;
901		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
902		has_dga = dga_flags & XF86DGADirectPresent;
#	Line 640 | Line 904 | bool VideoInit(bool classic)
904		has_dga = false;
905		#endif
906
907	+	#ifdef ENABLE_XF86_VIDMODE
908	+	// VidMode available?
909	+	int vm_event_base, vm_error_base;
910	+	has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base);
911	+	if (has_vidmode)
912	+	XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes);
913	+	#endif
914	+
915		// Find black and white colors
916		XParseColor(x_display, DefaultColormap(x_display, screen), "rgb:00/00/00", &black);
917		XAllocColor(x_display, DefaultColormap(x_display, screen), &black);
#	Line 705 | Line 977 | bool VideoInit(bool classic)
977		if (mode_str) {
978		if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
979		display_type = DISPLAY_WINDOW;
980	<	#if ENABLE_FBDEV_DGA
980	>	#ifdef ENABLE_FBDEV_DGA
981		else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
982		#else
983		else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
#	Line 729 | Line 1001 | bool VideoInit(bool classic)
1001		return false;
1002		break;
1003		case DISPLAY_DGA:
1004	<	#if ENABLE_FBDEV_DGA
1004	>	#ifdef ENABLE_FBDEV_DGA
1005		if (!init_fbdev_dga(fb_name))
1006		#else
1007		if (!init_xf86_dga(width, height))
#	Line 738 | Line 1010 | bool VideoInit(bool classic)
1010		break;
1011		}
1012
1013	+	#ifdef HAVE_PTHREADS
1014		// Lock down frame buffer
1015		pthread_mutex_lock(&frame_buffer_lock);
1016	+	#endif
1017
1018	<	#if !REAL_ADDRESSING
1018	>	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1019		// Set variables for UAE memory mapping
1020		MacFrameBaseHost = the_buffer;
1021		MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
#	Line 751 | Line 1025 | bool VideoInit(bool classic)
1025		MacFrameLayout = FLAYOUT_NONE;
1026		#endif
1027
1028	<	// Start redraw/input thread
1028	>	#ifdef ENABLE_VOSF
1029	>	if (use_vosf) {
1030	>	// Initialize the mainBuffer structure
1031	>	if (!VideoInitBuffer()) {
1032	>	// TODO: STR_VOSF_INIT_ERR ?
1033	>	ErrorAlert("Could not initialize Video on SEGV signals");
1034	>	return false;
1035	>	}
1036	>
1037	>	// Initialize the handler for SIGSEGV
1038	>	if (!Screen_fault_handler_init()) {
1039	>	// TODO: STR_VOSF_INIT_ERR ?
1040	>	ErrorAlert("Could not initialize Video on SEGV signals");
1041	>	return false;
1042	>	}
1043	>	}
1044	>	#endif
1045	>
1046	>	// Initialize VideoRefresh function
1047	>	VideoRefreshInit();
1048	>
1049		XSync(x_display, false);
1050	+
1051	+	#ifdef HAVE_PTHREADS
1052	+	// Start redraw/input thread
1053		redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1054	<	if (!redraw_thread_active)
1054	>	if (!redraw_thread_active) {
1055		printf("FATAL: cannot create redraw thread\n");
1056	<	return redraw_thread_active;
1056	>	return false;
1057	>	}
1058	>	#endif
1059	>	return true;
1060		}
1061
1062
#	Line 766 | Line 1066 | bool VideoInit(bool classic)
1066
1067		void VideoExit(void)
1068		{
1069	+	#ifdef HAVE_PTHREADS
1070		// Stop redraw thread
1071		if (redraw_thread_active) {
1072		redraw_thread_cancel = true;
#	Line 775 | Line 1076 | void VideoExit(void)
1076		pthread_join(redraw_thread, NULL);
1077		redraw_thread_active = false;
1078		}
1079	+	#endif
1080
1081	+	#ifdef HAVE_PTHREADS
1082		// Unlock frame buffer
1083		pthread_mutex_unlock(&frame_buffer_lock);
1084	+	#endif
1085
1086		// Close window and server connection
1087		if (x_display != NULL) {
1088		XSync(x_display, false);
1089
1090	<	#if ENABLE_XF86_DGA
1090	>	#ifdef ENABLE_XF86_DGA
1091		if (display_type == DISPLAY_DGA) {
1092		XF86DGADirectVideo(x_display, screen, 0);
1093		XUngrabPointer(x_display, CurrentTime);
#	Line 791 | Line 1095 | void VideoExit(void)
1095		}
1096		#endif
1097
1098	<	#if ENABLE_FBDEV_DGA
1098	>	#ifdef ENABLE_XF86_VIDMODE
1099	>	if (has_vidmode && display_type == DISPLAY_DGA)
1100	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1101	>	#endif
1102	>
1103	>	#ifdef ENABLE_FBDEV_DGA
1104		if (display_type == DISPLAY_DGA) {
1105		XUngrabPointer(x_display, CurrentTime);
1106		XUngrabKeyboard(x_display, CurrentTime);
1107		close(fbdev_fd);
1108		}
1109		#endif
801	–
802	–	if (the_buffer_copy) {
803	–	free(the_buffer_copy);
804	–	the_buffer_copy = NULL;
805	–	}
1110
1111		XFlush(x_display);
1112		XSync(x_display, false);
#	Line 810 | Line 1114 | void VideoExit(void)
1114		XFreeColormap(x_display, cmap[0]);
1115		XFreeColormap(x_display, cmap[1]);
1116		}
1117	+
1118	+	if (!use_vosf) {
1119	+	if (the_buffer) {
1120	+	free(the_buffer);
1121	+	the_buffer = NULL;
1122	+	}
1123	+
1124	+	if (!have_shm && the_buffer_copy) {
1125	+	free(the_buffer_copy);
1126	+	the_buffer_copy = NULL;
1127	+	}
1128	+	}
1129	+	#ifdef ENABLE_VOSF
1130	+	else {
1131	+	if (the_buffer != (uint8 *)MAP_FAILED) {
1132	+	munmap((caddr_t)the_buffer, the_buffer_size);
1133	+	the_buffer = 0;
1134	+	}
1135	+
1136	+	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1137	+	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1138	+	the_buffer_copy = 0;
1139	+	}
1140	+	}
1141	+	#endif
1142		}
1143	+
1144	+	#ifdef ENABLE_VOSF
1145	+	if (use_vosf) {
1146	+	// Clear mainBuffer data
1147	+	if (mainBuffer.pageInfo) {
1148	+	free(mainBuffer.pageInfo);
1149	+	mainBuffer.pageInfo = 0;
1150	+	}
1151	+
1152	+	if (mainBuffer.dirtyPages) {
1153	+	free(mainBuffer.dirtyPages);
1154	+	mainBuffer.dirtyPages = 0;
1155	+	}
1156	+	}
1157	+
1158	+	// Close /dev/zero
1159	+	if (zero_fd > 0)
1160	+	close(zero_fd);
1161	+	#endif
1162		}
1163
1164
#	Line 836 | Line 1184 | void VideoInterrupt(void)
1184		if (emerg_quit)
1185		QuitEmulator();
1186
1187	+	#ifdef HAVE_PTHREADS
1188		// Temporarily give up frame buffer lock (this is the point where
1189		// we are suspended when the user presses Ctrl-Tab)
1190		pthread_mutex_unlock(&frame_buffer_lock);
1191		pthread_mutex_lock(&frame_buffer_lock);
1192	+	#endif
1193		}
1194
1195
#	Line 849 | Line 1199 | void VideoInterrupt(void)
1199
1200		void video_set_palette(uint8 *pal)
1201		{
1202	+	#ifdef HAVE_PTHREDS
1203		pthread_mutex_lock(&palette_lock);
1204	+	#endif
1205
1206		// Convert colors to XColor array
1207		for (int i=0; i<256; i++) {
#	Line 863 | Line 1215 | void video_set_palette(uint8 *pal)
1215		// Tell redraw thread to change palette
1216		palette_changed = true;
1217
1218	+	#ifdef HAVE_PTHREADS
1219		pthread_mutex_unlock(&palette_lock);
1220	+	#endif
1221		}
1222
1223
#	Line 871 | Line 1225 | void video_set_palette(uint8 *pal)
1225		*  Suspend/resume emulator
1226		*/
1227
1228	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1228	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1229		static void suspend_emul(void)
1230		{
1231		if (display_type == DISPLAY_DGA) {
#	Line 879 | Line 1233 | static void suspend_emul(void)
1233		ADBKeyUp(0x36);
1234		ctrl_down = false;
1235
1236	+	#ifdef HAVE_PTHREADS
1237		// Lock frame buffer (this will stop the MacOS thread)
1238		pthread_mutex_lock(&frame_buffer_lock);
1239	+	#endif
1240
1241		// Save frame buffer
1242		fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
#	Line 888 | Line 1244 | static void suspend_emul(void)
1244		memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1245
1246		// Close full screen display
1247	<	#if ENABLE_XF86_DGA
1247	>	#ifdef ENABLE_XF86_DGA
1248		XF86DGADirectVideo(x_display, screen, 0);
1249		#endif
1250		XUngrabPointer(x_display, CurrentTime);
#	Line 929 | Line 1285 | static void resume_emul(void)
1285		XSync(x_display, false);
1286		XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1287		XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1288	<	#if ENABLE_XF86_DGA
1288	>	#ifdef ENABLE_XF86_DGA
1289		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1290		XF86DGASetViewPort(x_display, screen, 0, 0);
1291		#endif
1292		XSync(x_display, false);
1293	<
1293	>
1294	>	// the_buffer already contains the data to restore. i.e. since a temporary
1295	>	// frame buffer is used when VOSF is actually used, fb_save is therefore
1296	>	// not necessary.
1297	>	#ifdef ENABLE_VOSF
1298	>	if (use_vosf) {
1299	>	#ifdef HAVE_PTHREADS
1300	>	pthread_mutex_lock(&Screen_draw_lock);
1301	>	#endif
1302	>	PFLAG_SET_ALL;
1303	>	#ifdef HAVE_PTHREADS
1304	>	pthread_mutex_unlock(&Screen_draw_lock);
1305	>	#endif
1306	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1307	>	}
1308	>	#endif
1309	>
1310		// Restore frame buffer
1311		if (fb_save) {
1312	+	#ifdef ENABLE_VOSF
1313	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1314	+	if (!use_vosf)
1315	+	#endif
1316		memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1317		free(fb_save);
1318		fb_save = NULL;
1319		}
1320
1321	+	#ifdef ENABLE_XF86_DGA
1322		if (depth == 8)
946	–	#if ENABLE_XF86_DGA
1323		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1324		#endif
1325
1326	+	#ifdef HAVE_PTHREADS
1327		// Unlock frame buffer (and continue MacOS thread)
1328		pthread_mutex_unlock(&frame_buffer_lock);
1329		emul_suspended = false;
1330	+	#endif
1331		}
1332		#endif
1333
#	Line 1011 | Line 1389 | static int kc_decode(KeySym ks)
1389		case XK_period: case XK_greater: return 0x2f;
1390		case XK_slash: case XK_question: return 0x2c;
1391
1392	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1392	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1393		case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1394		#else
1395		case XK_Tab: return 0x30;
#	Line 1137 | Line 1515 | static void handle_events(void)
1515		unsigned int button = ((XButtonEvent *)&event)->button;
1516		if (button < 4)
1517		ADBMouseDown(button - 1);
1518	+	else if (button < 6) {  // Wheel mouse
1519	+	if (mouse_wheel_mode == 0) {
1520	+	int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
1521	+	ADBKeyDown(key);
1522	+	ADBKeyUp(key);
1523	+	} else {
1524	+	int key = (button == 5) ? 0x3d : 0x3e;  // Cursor up/down
1525	+	for(int i=0; i<mouse_wheel_lines; i++) {
1526	+	ADBKeyDown(key);
1527	+	ADBKeyUp(key);
1528	+	}
1529	+	}
1530	+	}
1531		break;
1532		}
1533		case ButtonRelease: {
#	Line 1177 | Line 1568 | static void handle_events(void)
1568		if (code == 0x36)
1569		ctrl_down = true;
1570		} else {
1571	<	#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA
1571	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1572		if (code == 0x31)
1573		resume_emul();  // Space wakes us up
1574		#endif
#	Line 1202 | Line 1593 | static void handle_events(void)
1593
1594		// Hidden parts exposed, force complete refresh of window
1595		case Expose:
1596	<	if (display_type == DISPLAY_WINDOW)
1597	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1596	>	if (display_type == DISPLAY_WINDOW) {
1597	>	#ifdef ENABLE_VOSF
1598	>	if (use_vosf) {                 // VOSF refresh
1599	>	#ifdef HAVE_PTHREADS
1600	>	pthread_mutex_lock(&Screen_draw_lock);
1601	>	#endif
1602	>	PFLAG_SET_ALL;
1603	>	#ifdef HAVE_PTHREADS
1604	>	pthread_mutex_unlock(&Screen_draw_lock);
1605	>	#endif
1606	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1607	>	}
1608	>	else
1609	>	#endif
1610	>	if (frame_skip == 0) {  // Dynamic refresh
1611	>	int x1, y1;
1612	>	for (y1=0; y1<16; y1++)
1613	>	for (x1=0; x1<16; x1++)
1614	>	updt_box[x1][y1] = true;
1615	>	nr_boxes = 16 * 16;
1616	>	} else                                  // Static refresh
1617	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1618	>	}
1619		break;
1620		}
1621		}
#	Line 1214 | Line 1626 | static void handle_events(void)
1626		*  Window display update
1627		*/
1628
1629	<	static void update_display(void)
1629	>	// Dynamic display update (variable frame rate for each box)
1630	>	static void update_display_dynamic(int ticker)
1631	>	{
1632	>	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1633	>	int xil = 0;
1634	>	int rxm = 0, rxmo = 0;
1635	>	int bytes_per_row = VideoMonitor.bytes_per_row;
1636	>	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1637	>	int rx = VideoMonitor.bytes_per_row / 16;
1638	>	int ry = VideoMonitor.y / 16;
1639	>	int max_box;
1640	>
1641	>	y2s = sm_uptd[ticker % 8];
1642	>	y2a = 8;
1643	>	for (i = 0; i < 6; i++)
1644	>	if (ticker % (2 << i))
1645	>	break;
1646	>	max_box = sm_no_boxes[i];
1647	>
1648	>	if (y2a) {
1649	>	for (y1=0; y1<16; y1++) {
1650	>	for (y2=y2s; y2 < ry; y2 += y2a) {
1651	>	i = ((y1 * ry) + y2) * bytes_per_row;
1652	>	for (x1=0; x1<16; x1++, i += rx) {
1653	>	if (updt_box[x1][y1] == false) {
1654	>	if (memcmp(&the_buffer_copy[i], &the_buffer[i], rx)) {
1655	>	updt_box[x1][y1] = true;
1656	>	nr_boxes++;
1657	>	}
1658	>	}
1659	>	}
1660	>	}
1661	>	}
1662	>	}
1663	>
1664	>	if ((nr_boxes <= max_box) && (nr_boxes)) {
1665	>	for (y1=0; y1<16; y1++) {
1666	>	for (x1=0; x1<16; x1++) {
1667	>	if (updt_box[x1][y1] == true) {
1668	>	if (rxm == 0)
1669	>	xm = x1;
1670	>	rxm += rx;
1671	>	updt_box[x1][y1] = false;
1672	>	}
1673	>	if (((updt_box[x1+1][y1] == false) || (x1 == 15)) && (rxm)) {
1674	>	if ((rxmo != rxm) || (xmo != xm) || (yo != y1 - 1)) {
1675	>	if (rxmo) {
1676	>	xi = xmo * rx;
1677	>	yi = ymo * ry;
1678	>	xil = rxmo;
1679	>	yil = (yo - ymo +1) * ry;
1680	>	}
1681	>	rxmo = rxm;
1682	>	xmo = xm;
1683	>	ymo = y1;
1684	>	}
1685	>	rxm = 0;
1686	>	yo = y1;
1687	>	}
1688	>	if (xil) {
1689	>	i = (yi * bytes_per_row) + xi;
1690	>	for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1691	>	memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1692	>	if (depth == 1) {
1693	>	if (have_shm)
1694	>	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1695	>	else
1696	>	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1697	>	} else {
1698	>	if (have_shm)
1699	>	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1700	>	else
1701	>	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1702	>	}
1703	>	xil = 0;
1704	>	}
1705	>	if ((x1 == 15) && (y1 == 15) && (rxmo)) {
1706	>	x1--;
1707	>	xi = xmo * rx;
1708	>	yi = ymo * ry;
1709	>	xil = rxmo;
1710	>	yil = (yo - ymo +1) * ry;
1711	>	rxmo = 0;
1712	>	}
1713	>	}
1714	>	}
1715	>	nr_boxes = 0;
1716	>	}
1717	>	}
1718	>
1719	>	// Static display update (fixed frame rate, but incremental)
1720	>	static void update_display_static(void)
1721		{
1219	–	// In classic mode, copy the frame buffer from Mac RAM
1220	–	if (classic_mode)
1221	–	memcpy(the_buffer, Mac2HostAddr(0x3fa700), VideoMonitor.bytes_per_row * VideoMonitor.y);
1222	–
1722		// Incremental update code
1723		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1724		int bytes_per_row = VideoMonitor.bytes_per_row;
#	Line 1246 | Line 1745 | static void update_display(void)
1745		// Check for first column from left and first column from right that have changed
1746		if (high) {
1747		if (depth == 1) {
1748	<	x1 = VideoMonitor.x;
1748	>	x1 = VideoMonitor.x - 1;
1749		for (j=y1; j<=y2; j++) {
1750		p = &the_buffer[j * bytes_per_row];
1751		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1255 | Line 1754 | static void update_display(void)
1754		x1 = i << 3;
1755		break;
1756		}
1757	<	p++;
1259	<	p2++;
1757	>	p++; p2++;
1758		}
1759		}
1760		x2 = x1;
#	Line 1266 | Line 1764 | static void update_display(void)
1764		p += bytes_per_row;
1765		p2 += bytes_per_row;
1766		for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1767	<	p--;
1270	<	p2--;
1767	>	p--; p2--;
1768		if (*p != *p2) {
1769		x2 = i << 3;
1770		break;
#	Line 1280 | Line 1777 | static void update_display(void)
1777		if (high && wide) {
1778		for (j=y1; j<=y2; j++) {
1779		i = j * bytes_per_row + (x1 >> 3);
1780	<	memcpy(&the_buffer_copy[i], &the_buffer[i], wide >> 3);
1780	>	memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3);
1781		}
1782		}
1783
#	Line 1289 | Line 1786 | static void update_display(void)
1786		for (j=y1; j<=y2; j++) {
1787		p = &the_buffer[j * bytes_per_row];
1788		p2 = &the_buffer_copy[j * bytes_per_row];
1789	<	for (i=0; i<x1; i++) {
1790	<	if (memcmp(p, p2, bytes_per_pixel)) {
1791	<	x1 = i;
1789	>	for (i=0; i<x1*bytes_per_pixel; i++) {
1790	>	if (*p != *p2) {
1791	>	x1 = i / bytes_per_pixel;
1792		break;
1793		}
1794	<	p += bytes_per_pixel;
1298	<	p2 += bytes_per_pixel;
1794	>	p++; p2++;
1795		}
1796		}
1797		x2 = x1;
#	Line 1304 | Line 1800 | static void update_display(void)
1800		p2 = &the_buffer_copy[j * bytes_per_row];
1801		p += bytes_per_row;
1802		p2 += bytes_per_row;
1803	<	for (i=VideoMonitor.x; i>x2; i--) {
1804	<	p -= bytes_per_pixel;
1805	<	p2 -= bytes_per_pixel;
1806	<	if (memcmp(p, p2, bytes_per_pixel)) {
1807	<	x2 = i;
1803	>	for (i=VideoMonitor.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1804	>	p--;
1805	>	p2--;
1806	>	if (*p != *p2) {
1807	>	x2 = i / bytes_per_pixel;
1808		break;
1809		}
1810		}
#	Line 1319 | Line 1815 | static void update_display(void)
1815		if (high && wide) {
1816		for (j=y1; j<=y2; j++) {
1817		i = j * bytes_per_row + x1 * bytes_per_pixel;
1818	<	memcpy(&the_buffer_copy[i], &the_buffer[i], bytes_per_pixel * wide);
1818	>	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
1819		}
1820		}
1821		}
#	Line 1332 | Line 1828 | static void update_display(void)
1828		else
1829		XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1830		}
1831	+	}
1832
1336	–	// Has the Mac started? (cursor data is not valid otherwise)
1337	–	if (HasMacStarted()) {
1833
1834	<	// Set new cursor image if it was changed
1835	<	if (memcmp(the_cursor, Mac2HostAddr(0x844), 64)) {
1836	<	memcpy(the_cursor, Mac2HostAddr(0x844), 64);
1837	<	memcpy(cursor_image->data, the_cursor, 32);
1838	<	memcpy(cursor_mask_image->data, the_cursor+32, 32);
1839	<	XFreeCursor(x_display, mac_cursor);
1840	<	XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16);
1841	<	XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16);
1842	<	mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, ReadMacInt8(0x885), ReadMacInt8(0x887));
1843	<	XDefineCursor(x_display, the_win, mac_cursor);
1834	>	/*
1835	>	*      Screen refresh functions
1836	>	*/
1837	>
1838	>	// The specialisations hereunder are meant to enable VOSF with DGA in direct
1839	>	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
1840	>	// not get mapped correctly with respect to the predetermined host frame
1841	>	// buffer base address.
1842	>	//
1843	>	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1844	>	// we first try to "triple allocate" the address spaces according to the real
1845	>	// host frame buffer address. Then, if it fails, we will use a temporary
1846	>	// frame buffer thus making the real host frame buffer updated when pages
1847	>	// of the temp frame buffer are altered.
1848	>	//
1849	>	// As a side effect, a little speed gain in screen updates could be noticed
1850	>	// for other modes than DGA.
1851	>	//
1852	>	// The following two functions below are inline so that a clever compiler
1853	>	// could specialise the code according to the current screen depth and
1854	>	// display type. A more clever compiler would the job by itself though...
1855	>	// (update_display_vosf is inlined as well)
1856	>
1857	>	static inline void possibly_quit_dga_mode()
1858	>	{
1859	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1860	>	// Quit DGA mode if requested
1861	>	if (quit_full_screen) {
1862	>	quit_full_screen = false;
1863	>	#ifdef ENABLE_XF86_DGA
1864	>	XF86DGADirectVideo(x_display, screen, 0);
1865	>	#endif
1866	>	XUngrabPointer(x_display, CurrentTime);
1867	>	XUngrabKeyboard(x_display, CurrentTime);
1868	>	XUnmapWindow(x_display, the_win);
1869	>	XSync(x_display, false);
1870	>	}
1871	>	#endif
1872	>	}
1873	>
1874	>	static inline void handle_palette_changes(int depth, int display_type)
1875	>	{
1876	>	#ifdef HAVE_PTHREADS
1877	>	pthread_mutex_lock(&palette_lock);
1878	>	#endif
1879	>	if (palette_changed) {
1880	>	palette_changed = false;
1881	>	if (depth == 8) {
1882	>	XStoreColors(x_display, cmap[0], palette, 256);
1883	>	XStoreColors(x_display, cmap[1], palette, 256);
1884	>
1885	>	#ifdef ENABLE_XF86_DGA
1886	>	if (display_type == DISPLAY_DGA) {
1887	>	current_dga_cmap ^= 1;
1888	>	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1889	>	}
1890	>	#endif
1891		}
1892		}
1893	+	#ifdef HAVE_PTHREADS
1894	+	pthread_mutex_unlock(&palette_lock);
1895	+	#endif
1896	+	}
1897	+
1898	+	static void video_refresh_dga(void)
1899	+	{
1900	+	// Quit DGA mode if requested
1901	+	possibly_quit_dga_mode();
1902	+
1903	+	// Handle X events
1904	+	handle_events();
1905	+
1906	+	// Handle palette changes
1907	+	handle_palette_changes(depth, DISPLAY_DGA);
1908	+	}
1909	+
1910	+	#ifdef ENABLE_VOSF
1911	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1912	+	static void video_refresh_dga_vosf(void)
1913	+	{
1914	+	// Quit DGA mode if requested
1915	+	possibly_quit_dga_mode();
1916	+
1917	+	// Handle X events
1918	+	handle_events();
1919	+
1920	+	// Handle palette changes
1921	+	handle_palette_changes(depth, DISPLAY_DGA);
1922	+
1923	+	// Update display (VOSF variant)
1924	+	static int tick_counter = 0;
1925	+	if (++tick_counter >= frame_skip) {
1926	+	tick_counter = 0;
1927	+	#ifdef HAVE_PTHREADS
1928	+	pthread_mutex_lock(&Screen_draw_lock);
1929	+	#endif
1930	+	update_display_dga_vosf();
1931	+	#ifdef HAVE_PTHREADS
1932	+	pthread_mutex_unlock(&Screen_draw_lock);
1933	+	#endif
1934	+	}
1935	+	}
1936	+	#endif
1937	+
1938	+	static void video_refresh_window_vosf(void)
1939	+	{
1940	+	// Quit DGA mode if requested
1941	+	possibly_quit_dga_mode();
1942	+
1943	+	// Handle X events
1944	+	handle_events();
1945	+
1946	+	// Handle palette changes
1947	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1948	+
1949	+	// Update display (VOSF variant)
1950	+	static int tick_counter = 0;
1951	+	if (++tick_counter >= frame_skip) {
1952	+	tick_counter = 0;
1953	+	#ifdef HAVE_PTHREADS
1954	+	pthread_mutex_lock(&Screen_draw_lock);
1955	+	#endif
1956	+	update_display_window_vosf();
1957	+	#ifdef HAVE_PTHREADS
1958	+	pthread_mutex_unlock(&Screen_draw_lock);
1959	+	#endif
1960	+	}
1961	+	}
1962	+	#endif // def ENABLE_VOSF
1963	+
1964	+	static void video_refresh_window_static(void)
1965	+	{
1966	+	// Handle X events
1967	+	handle_events();
1968	+
1969	+	// Handle_palette changes
1970	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1971	+
1972	+	// Update display (static variant)
1973	+	static int tick_counter = 0;
1974	+	if (++tick_counter >= frame_skip) {
1975	+	tick_counter = 0;
1976	+	update_display_static();
1977	+	}
1978	+	}
1979	+
1980	+	static void video_refresh_window_dynamic(void)
1981	+	{
1982	+	// Handle X events
1983	+	handle_events();
1984	+
1985	+	// Handle_palette changes
1986	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1987	+
1988	+	// Update display (dynamic variant)
1989	+	static int tick_counter = 0;
1990	+	tick_counter++;
1991	+	update_display_dynamic(tick_counter);
1992		}
1993
1994
#	Line 1355 | Line 1996 | static void update_display(void)
1996		*  Thread for screen refresh, input handling etc.
1997		*/
1998
1999	<	static void *redraw_func(void *arg)
1999	>	void VideoRefreshInit(void)
2000		{
2001	<	int tick_counter = 0;
2001	>	// TODO: set up specialised 8bpp VideoRefresh handlers ?
2002	>	if (display_type == DISPLAY_DGA) {
2003	>	#if ENABLE_VOSF && (REAL_ADDRESSING || DIRECT_ADDRESSING)
2004	>	if (use_vosf)
2005	>	video_refresh = video_refresh_dga_vosf;
2006	>	else
2007	>	#endif
2008	>	video_refresh = video_refresh_dga;
2009	>	}
2010	>	else {
2011	>	#ifdef ENABLE_VOSF
2012	>	if (use_vosf)
2013	>	video_refresh = video_refresh_window_vosf;
2014	>	else
2015	>	#endif
2016	>	if (frame_skip == 0)
2017	>	video_refresh = video_refresh_window_dynamic;
2018	>	else
2019	>	video_refresh = video_refresh_window_static;
2020	>	}
2021	>	}
2022
2023	<	while (!redraw_thread_cancel) {
2023	>	void VideoRefresh(void)
2024	>	{
2025	>	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2026	>	video_refresh();
2027	>	}
2028
2029	<	// Wait
2030	<	#ifdef HAVE_NANOSLEEP
2031	<	struct timespec req = {0, 16666667};
2032	<	nanosleep(&req, NULL);
2033	<	#else
2034	<	usleep(16667);
2029	>	#if 0
2030	>	void VideoRefresh(void)
2031	>	{
2032	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2033	>	// Quit DGA mode if requested
2034	>	if (quit_full_screen) {
2035	>	quit_full_screen = false;
2036	>	if (display_type == DISPLAY_DGA) {
2037	>	#ifdef ENABLE_XF86_DGA
2038	>	XF86DGADirectVideo(x_display, screen, 0);
2039		#endif
2040	<
2041	<	#if ENABLE_XF86_DGA
2042	<	// Quit DGA mode if requested
2043	<	if (quit_full_screen) {
1375	<	quit_full_screen = false;
1376	<	if (display_type == DISPLAY_DGA) {
1377	<	XF86DGADirectVideo(x_display, screen, 0);
1378	<	XUngrabPointer(x_display, CurrentTime);
1379	<	XUngrabKeyboard(x_display, CurrentTime);
1380	<	XUnmapWindow(x_display, the_win);
1381	<	XSync(x_display, false);
1382	<	}
2040	>	XUngrabPointer(x_display, CurrentTime);
2041	>	XUngrabKeyboard(x_display, CurrentTime);
2042	>	XUnmapWindow(x_display, the_win);
2043	>	XSync(x_display, false);
2044		}
2045	+	}
2046		#endif
2047
2048	<	#if ENABLE_FBDEV_DGA
2049	<	// Quit DGA mode if requested
2050	<	if (quit_full_screen) {
2051	<	quit_full_screen = false;
2048	>	// Handle X events
2049	>	handle_events();
2050	>
2051	>	// Handle palette changes
2052	>	#ifdef HAVE_PTHREADS
2053	>	pthread_mutex_lock(&palette_lock);
2054	>	#endif
2055	>	if (palette_changed) {
2056	>	palette_changed = false;
2057	>	if (depth == 8) {
2058	>	XStoreColors(x_display, cmap[0], palette, 256);
2059	>	XStoreColors(x_display, cmap[1], palette, 256);
2060	>
2061	>	#ifdef ENABLE_XF86_DGA
2062		if (display_type == DISPLAY_DGA) {
2063	<	XUngrabPointer(x_display, CurrentTime);
2064	<	XUngrabKeyboard(x_display, CurrentTime);
1393	<	XUnmapWindow(x_display, the_win);
1394	<	XSync(x_display, false);
2063	>	current_dga_cmap ^= 1;
2064	>	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2065		}
2066	+	#endif
2067		}
2068	+	}
2069	+	#ifdef HAVE_PTHREADS
2070	+	pthread_mutex_unlock(&palette_lock);
2071		#endif
1398	–	// Handle X events
1399	–	handle_events();
2072
2073	<	// Handle palette changes
2074	<	pthread_mutex_lock(&palette_lock);
2075	<	if (palette_changed) {
2076	<	palette_changed = false;
2077	<	if (depth == 8) {
2078	<	XStoreColors(x_display, cmap[0], palette, 256);
2079	<	XStoreColors(x_display, cmap[1], palette, 256);
2080	<
2081	<	#if ENABLE_XF86_DGA
1410	<	if (display_type == DISPLAY_DGA) {
1411	<	current_dga_cmap ^= 1;
1412	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1413	<	}
1414	<	#endif
1415	<	}
2073	>	// In window mode, update display
2074	>	static int tick_counter = 0;
2075	>	if (display_type == DISPLAY_WINDOW) {
2076	>	tick_counter++;
2077	>	if (frame_skip == 0)
2078	>	update_display_dynamic(tick_counter);
2079	>	else if (tick_counter >= frame_skip) {
2080	>	tick_counter = 0;
2081	>	update_display_static();
2082		}
2083	<	pthread_mutex_unlock(&palette_lock);
2083	>	}
2084	>	}
2085	>	#endif
2086
2087	<	// In window mode, update display and mouse pointer
2088	<	if (display_type == DISPLAY_WINDOW) {
2089	<	tick_counter++;
2090	<	if (tick_counter >= frame_skip) {
2091	<	tick_counter = 0;
2092	<	update_display();
2093	<	}
2094	<	}
2087	>	#ifdef HAVE_PTHREADS
2088	>	static void *redraw_func(void *arg)
2089	>	{
2090	>	uint64 start = GetTicks_usec();
2091	>	int64 ticks = 0;
2092	>	uint64 next = GetTicks_usec();
2093	>	while (!redraw_thread_cancel) {
2094	>	//              VideoRefresh();
2095	>	video_refresh();
2096	>	next += 16667;
2097	>	int64 delay = next - GetTicks_usec();
2098	>	if (delay > 0)
2099	>	Delay_usec(delay);
2100	>	else if (delay < -16667)
2101	>	next = GetTicks_usec();
2102	>	ticks++;
2103		}
2104	+	uint64 end = GetTicks_usec();
2105	+	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2106		return NULL;
2107		}
2108	+	#endif

Diff Legend

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