[ViewVC] Diff of: cebix/BasiliskII/src/Unix/video

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs.
Revision 1.40 by cebix, 2001-06-27T19:03:37Z

#	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 53 \| Line 53
53		#endif
54
55		#ifdef ENABLE_VOSF
56	–	# include <math.h> // log()
57	–	# include <unistd.h>
58	–	# include <signal.h>
56		# include <fcntl.h>
57		# include <sys/mman.h>
58	+	# include "sigsegv.h"
59	+	# include "vm_alloc.h"
60		#endif
61
62		#include "cpu_emulation.h"
#	Line 123 \| Line 122 \| static Colormap cmap[2]; // Two co
122		static XColor black, white;
123		static unsigned long black_pixel, white_pixel;
124		static int eventmask;
125	<	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask;
126	<	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask;
125	>	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| EnterWindowMask \| ExposureMask \| StructureNotifyMask;
126	>	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
127	>	static Atom WM_DELETE_WINDOW = (Atom)0;
128
129		static XColor palette[256]; // Color palette for 8-bit mode
130		static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
131		#ifdef HAVE_PTHREADS
132		static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
133	+	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
134	+	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
135	+	#else
136	+	#define LOCK_PALETTE
137	+	#define UNLOCK_PALETTE
138		#endif
139
140		// Variables for window mode
#	Line 150 \| Line 155 \| static Window suspend_win; // "Sus
155		static void *fb_save = NULL; // Saved frame buffer for suspend
156		#ifdef HAVE_PTHREADS
157		static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
158	+	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
159	+	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
160	+	#else
161	+	#define LOCK_FRAME_BUFFER
162	+	#define UNLOCK_FRAME_BUFFER
163		#endif
164
165		// Variables for fbdev DGA mode
#	Line 169 \| Line 179 \| static const bool use_vosf = false;
179		#endif
180
181		#ifdef ENABLE_VOSF
182	<	static uint8 * the_host_buffer; // Host frame buffer in VOSF mode
182	>	// Variables for Video on SEGV support (taken from the Win32 port)
183	>	static uint8 *the_host_buffer; // Host frame buffer in VOSF mode
184		static uint32 the_buffer_size; // Size of allocated the_buffer
174	–	#endif
185
176	–	#ifdef ENABLE_VOSF
177	–	// Variables for Video on SEGV support (taken from the Win32 port)
186		struct ScreenPageInfo {
187		int top, bottom; // Mapping between this virtual page and Mac scanlines
188		};
189
190		struct ScreenInfo {
191	<	uint32 memBase; // Real start address
192	<	uint32 memStart; // Start address aligned to page boundary
193	<	uint32 memEnd; // Address of one-past-the-end of the screen
191	>	uintptr memBase; // Real start address
192	>	uintptr memStart; // Start address aligned to page boundary
193	>	uintptr memEnd; // Address of one-past-the-end of the screen
194		uint32 memLength; // Length of the memory addressed by the screen pages
195
196		uint32 pageSize; // Size of a page
197		int pageBits; // Shift count to get the page number
198		uint32 pageCount; // Number of pages allocated to the screen
199
200	<	uint8 * dirtyPages; // Table of flags set if page was altered
200	>	bool dirty; // Flag: set if the frame buffer was touched
201	>	char * dirtyPages; // Table of flags set if page was altered
202		ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines
203		};
204
205		static ScreenInfo mainBuffer;
206
207	<	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = 1
208	<	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = 0
209	<	#define PFLAG_ISSET(page) mainBuffer.dirtyPages[page]
210	<	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] == 0)
207	>	#define PFLAG_SET_VALUE 0x00
208	>	#define PFLAG_CLEAR_VALUE 0x01
209	>	#define PFLAG_SET_VALUE_4 0x00000000
210	>	#define PFLAG_CLEAR_VALUE_4 0x01010101
211	>	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = PFLAG_SET_VALUE
212	>	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = PFLAG_CLEAR_VALUE
213	>	#define PFLAG_ISSET(page) (mainBuffer.dirtyPages[page] == PFLAG_SET_VALUE)
214	>	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] != PFLAG_SET_VALUE)
215	>
216		#ifdef UNALIGNED_PROFITABLE
217	<	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + page)) == 0)
217	>	# define PFLAG_ISSET_4(page) (((uint32 )(mainBuffer.dirtyPages + (page))) == PFLAG_SET_VALUE_4)
218	>	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + (page))) == PFLAG_CLEAR_VALUE_4)
219	>	#else
220	>	# define PFLAG_ISSET_4(page) \
221	>	PFLAG_ISSET(page ) && PFLAG_ISSET(page+1) \
222	>	&& PFLAG_ISSET(page+2) && PFLAG_ISSET(page+3)
223	>	# define PFLAG_ISCLEAR_4(page) \
224	>	PFLAG_ISCLEAR(page ) && PFLAG_ISCLEAR(page+1) \
225	>	&& PFLAG_ISCLEAR(page+2) && PFLAG_ISCLEAR(page+3)
226	>	#endif
227	>
228	>	// Set the selected page range [ first_page, last_page [ into the SET state
229	>	#define PFLAG_SET_RANGE(first_page, last_page) \
230	>	memset(mainBuffer.dirtyPages + (first_page), PFLAG_SET_VALUE, \
231	>	(last_page) - (first_page))
232	>
233	>	// Set the selected page range [ first_page, last_page [ into the CLEAR state
234	>	#define PFLAG_CLEAR_RANGE(first_page, last_page) \
235	>	memset(mainBuffer.dirtyPages + (first_page), PFLAG_CLEAR_VALUE, \
236	>	(last_page) - (first_page))
237	>
238	>	#define PFLAG_SET_ALL do { \
239	>	PFLAG_SET_RANGE(0, mainBuffer.pageCount); \
240	>	mainBuffer.dirty = true; \
241	>	} while (0)
242	>
243	>	#define PFLAG_CLEAR_ALL do { \
244	>	PFLAG_CLEAR_RANGE(0, mainBuffer.pageCount); \
245	>	mainBuffer.dirty = false; \
246	>	} while (0)
247	>
248	>	// Set the following macro definition to 1 if your system
249	>	// provides a really fast strchr() implementation
250	>	//#define HAVE_FAST_STRCHR 0
251	>
252	>	static inline int find_next_page_set(int page)
253	>	{
254	>	#if HAVE_FAST_STRCHR
255	>	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_SET_VALUE);
256	>	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
257	>	#else
258	>	while (PFLAG_ISCLEAR_4(page))
259	>	page += 4;
260	>	while (PFLAG_ISCLEAR(page))
261	>	page++;
262	>	return page;
263	>	#endif
264	>	}
265	>
266	>	static inline int find_next_page_clear(int page)
267	>	{
268	>	#if HAVE_FAST_STRCHR
269	>	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_CLEAR_VALUE);
270	>	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
271		#else
272	<	# define PFLAG_ISCLEAR_4(page) \
273	<	(mainBuffer.dirtyPages[page ] == 0) \
274	<	&& (mainBuffer.dirtyPages[page+1] == 0) \
275	<	&& (mainBuffer.dirtyPages[page+2] == 0) \
276	<	&& (mainBuffer.dirtyPages[page+3] == 0)
272	>	while (PFLAG_ISSET_4(page))
273	>	page += 4;
274	>	while (PFLAG_ISSET(page))
275	>	page++;
276	>	return page;
277		#endif
278	<	#define PFLAG_CLEAR_ALL memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
212	<	#define PFLAG_SET_ALL memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
278	>	}
279
280		static int zero_fd = -1;
215	–	static bool Screen_fault_handler_init();
216	–	static struct sigaction vosf_sa;
281
282		#ifdef HAVE_PTHREADS
283	<	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
283	>	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
284	>	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
285	>	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
286	>	#else
287	>	#define LOCK_VOSF
288	>	#define UNLOCK_VOSF
289		#endif
290
291	<	#endif
291	>	static int log_base_2(uint32 x)
292	>	{
293	>	uint32 mask = 0x80000000;
294	>	int l = 31;
295	>	while (l >= 0 && (x & mask) == 0) {
296	>	mask >>= 1;
297	>	l--;
298	>	}
299	>	return l;
300	>	}
301	>	#endif /* ENABLE_VOSF */
302
303		// VideoRefresh function
304		void VideoRefreshInit(void);
#	Line 227 \| Line 306 \| *static void (video_refresh)(void);**
306
307		// Prototypes
308		static void redraw_func(void arg);
309	<	static int event2keycode(XKeyEvent *ev);
309	>	static int event2keycode(XKeyEvent &ev);
310
311
312		// From main_unix.cpp
#	Line 246 \| Line 325 \| extern void SysMountFirstFloppy(void);
325		* Initialization
326		*/
327
328	<	// Set VideoMonitor according to video mode
329	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
328	>	// Add resolution to list of supported modes and set VideoMonitor
329	>	static void set_video_monitor(uint32 width, uint32 height, uint32 bytes_per_row, bool native_byte_order)
330		{
331	+	video_mode mode;
332		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
333		int layout = FLAYOUT_DIRECT;
334		switch (depth) {
#	Line 274 \| Line 354 \| void set_video_monitor(int width, int he
354		else
355		MacFrameLayout = FLAYOUT_DIRECT;
356		#endif
357	+
358	+	mode.x = width;
359	+	mode.y = height;
360	+	mode.resolution_id = 0x80;
361	+	mode.bytes_per_row = bytes_per_row;
362	+
363		switch (depth) {
364		case 1:
365	<	VideoMonitor.mode = VMODE_1BIT;
365	>	mode.depth = VDEPTH_1BIT;
366	>	break;
367	>	case 2:
368	>	mode.depth = VDEPTH_2BIT;
369	>	break;
370	>	case 4:
371	>	mode.depth = VDEPTH_4BIT;
372		break;
373		case 8:
374	<	VideoMonitor.mode = VMODE_8BIT;
374	>	mode.depth = VDEPTH_8BIT;
375		break;
376		case 15:
377	<	VideoMonitor.mode = VMODE_16BIT;
377	>	mode.depth = VDEPTH_16BIT;
378		break;
379		case 16:
380	<	VideoMonitor.mode = VMODE_16BIT;
380	>	mode.depth = VDEPTH_16BIT;
381		break;
382		case 24:
383		case 32:
384	<	VideoMonitor.mode = VMODE_32BIT;
384	>	mode.depth = VDEPTH_32BIT;
385		break;
386		}
387	<	VideoMonitor.x = width;
388	<	VideoMonitor.y = height;
389	<	VideoMonitor.bytes_per_row = bytes_per_row;
387	>
388	>	VideoModes.push_back(mode);
389	>	VideoMonitor.mode = mode;
390	>	}
391	>
392	>	// Set window name and class
393	>	static void set_window_name(Window w, int name)
394	>	{
395	>	const char *str = GetString(name);
396	>	XStoreName(x_display, w, str);
397	>	XSetIconName(x_display, w, str);
398	>
399	>	XClassHint *hints;
400	>	hints = XAllocClassHint();
401	>	if (hints) {
402	>	hints->res_name = "BasiliskII";
403	>	hints->res_class = "BasiliskII";
404	>	XSetClassHint(x_display, w, hints);
405	>	XFree(hints);
406	>	}
407	>	}
408	>
409	>	// Set window input focus flag
410	>	static void set_window_focus(Window w)
411	>	{
412	>	XWMHints *hints = XAllocWMHints();
413	>	if (hints) {
414	>	hints->input = True;
415	>	hints->initial_state = NormalState;
416	>	hints->flags = InputHint \| StateHint;
417	>	XSetWMHints(x_display, w, hints);
418	>	XFree(hints);
419	>	}
420	>	}
421	>
422	>	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
423	>	static void set_window_delete_protocol(Window w)
424	>	{
425	>	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
426	>	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
427	>	}
428	>
429	>	// Wait until window is mapped/unmapped
430	>	void wait_mapped(Window w)
431	>	{
432	>	XEvent e;
433	>	do {
434	>	XMaskEvent(x_display, StructureNotifyMask, &e);
435	>	} while ((e.type != MapNotify) \|\| (e.xmap.event != w));
436	>	}
437	>
438	>	void wait_unmapped(Window w)
439	>	{
440	>	XEvent e;
441	>	do {
442	>	XMaskEvent(x_display, StructureNotifyMask, &e);
443	>	} while ((e.type != UnmapNotify) \|\| (e.xmap.event != w));
444		}
445
446		// Trap SHM errors
#	Line 326 \| Line 472 \| static bool init_window(int width, int h
472		XSetWindowAttributes wattr;
473		wattr.event_mask = eventmask = win_eventmask;
474		wattr.background_pixel = black_pixel;
475	<	wattr.border_pixel = black_pixel;
330	<	wattr.backing_store = NotUseful;
331	<	wattr.save_under = false;
332	<	wattr.backing_planes = xdepth;
475	>	wattr.colormap = cmap[0];
476
334	–	XSync(x_display, false);
477		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
478	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
337	<	CWBackingStore \| CWBackingPlanes, &wattr);
338	<	XSync(x_display, false);
339	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
340	<	XMapRaised(x_display, the_win);
341	<	XSync(x_display, false);
478	>	InputOutput, vis, CWEventMask \| CWBackPixel \| (depth == 8 ? CWColormap : 0), &wattr);
479
480	<	// Set colormap
481	<	if (depth == 8) {
482	<	XSetWindowColormap(x_display, the_win, cmap[0]);
483	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
484	<	}
480	>	// Set window name/class
481	>	set_window_name(the_win, STR_WINDOW_TITLE);
482	>
483	>	// Indicate that we want keyboard input
484	>	set_window_focus(the_win);
485	>
486	>	// Set delete protocol property
487	>	set_window_delete_protocol(the_win);
488
489		// Make window unresizable
490	<	XSizeHints *hints;
491	<	if ((hints = XAllocSizeHints()) != NULL) {
492	<	hints->min_width = width;
493	<	hints->max_width = width;
494	<	hints->min_height = height;
495	<	hints->max_height = height;
496	<	hints->flags = PMinSize \| PMaxSize;
497	<	XSetWMNormalHints(x_display, the_win, hints);
498	<	XFree((char *)hints);
490	>	{
491	>	XSizeHints *hints = XAllocSizeHints();
492	>	if (hints) {
493	>	hints->min_width = width;
494	>	hints->max_width = width;
495	>	hints->min_height = height;
496	>	hints->max_height = height;
497	>	hints->flags = PMinSize \| PMaxSize;
498	>	XSetWMNormalHints(x_display, the_win, hints);
499	>	XFree(hints);
500	>	}
501		}
502
503	+	// Show window
504	+	XMapWindow(x_display, the_win);
505	+	wait_mapped(the_win);
506	+
507		// Try to create and attach SHM image
508		have_shm = false;
509		if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
#	Line 412 \| Line 558 \| static bool init_window(int width, int h
558		}
559
560		#ifdef ENABLE_VOSF
561	<	// 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);
561	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
562		the_host_buffer = the_buffer_copy;
563	<
564	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
565	<	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);
563	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
564	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
565	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
566		#else
567		// Allocate memory for frame buffer
568		the_buffer = (uint8 )malloc((aligned_height + 2) img->bytes_per_line);
#	Line 437 \| Line 579 \| static bool init_window(int width, int h
579		&black, &white, 0, 0);
580		XDefineCursor(x_display, the_win, mac_cursor);
581
582	<	// Set VideoMonitor
582	>	// Add resolution and set VideoMonitor
583		bool native_byte_order;
584		#ifdef WORDS_BIGENDIAN
585	<	native_byte_order = (img->bitmap_bit_order == MSBFirst);
585	>	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
586		#else
587	<	native_byte_order = (img->bitmap_bit_order == LSBFirst);
587	>	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
588		#endif
589		#ifdef ENABLE_VOSF
590	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
590	>	Screen_blitter_init(&visualInfo, native_byte_order);
591		#endif
592		set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
593
#	Line 529 \| Line 671 \| *static bool init_fbdev_dga(char in_fb_n**
671
672		// Create window
673		XSetWindowAttributes wattr;
674	<	wattr.override_redirect = True;
675	<	wattr.backing_store = NotUseful;
676	<	wattr.background_pixel = white_pixel;
677	<	wattr.border_pixel = black_pixel;
536	<	wattr.event_mask = eventmask = dga_eventmask;
674	>	wattr.event_mask = eventmask = dga_eventmask;
675	>	wattr.background_pixel = white_pixel;
676	>	wattr.override_redirect = True;
677	>	wattr.colormap = cmap[0];
678
538	–	XSync(x_display, false);
679		the_win = XCreateWindow(x_display, rootwin,
680		0, 0, width, height,
681		0, xdepth, InputOutput, vis,
682	<	CWEventMask\|CWBackPixel\|CWBorderPixel\|CWOverrideRedirect\|CWBackingStore,
682	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (depth == 8 ? CWColormap : 0),
683		&wattr);
684	<	XSync(x_display, false);
684	>
685	>	// Set window name/class
686	>	set_window_name(the_win, STR_WINDOW_TITLE);
687	>
688	>	// Indicate that we want keyboard input
689	>	set_window_focus(the_win);
690	>
691	>	// Show window
692		XMapRaised(x_display, the_win);
693	<	XSync(x_display, false);
693	>	wait_mapped(the_win);
694
695		// Grab mouse and keyboard
696		XGrabKeyboard(x_display, the_win, True,
#	Line 552 \| Line 699 \| *static bool init_fbdev_dga(char in_fb_n**
699		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
700		GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
701
555	–	// Set colormap
556	–	if (depth == 8) {
557	–	XSetWindowColormap(x_display, the_win, cmap[0]);
558	–	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
559	–	}
560	–
702		// Set VideoMonitor
703		int bytes_per_row = width;
704		switch (depth) {
#	Line 583 \| Line 724 \| *static bool init_fbdev_dga(char in_fb_n**
724		}
725		}
726
727	+	#if ENABLE_VOSF
728		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
729	<	// If the blit function is null, i.e. just a copy of the buffer,
730	<	// we first try to avoid the allocation of a temporary frame buffer
731	<	use_vosf = true;
590	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
591	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
592	<	use_vosf = false;
729	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
730	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
731	>	use_vosf = Screen_blitter_init(&visualInfo, true);
732
733		if (use_vosf) {
734	<	the_host_buffer = the_buffer;
735	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
736	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
737	<	memset(the_buffer_copy, 0, the_buffer_size);
738	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
600	<	memset(the_buffer, 0, the_buffer_size);
734	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
735	>	the_host_buffer = the_buffer;
736	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
737	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
738	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
739		}
740	<	#elif ENABLE_VOSF
740	>	#else
741		use_vosf = false;
742		#endif
743	+	#endif
744
745		set_video_monitor(width, height, bytes_per_row, true);
746		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
#	Line 635 \| Line 774 \| static bool init_xf86_dga(int width, int
774		}
775		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
776		XF86VidModeSetViewPort(x_display, screen, 0, 0);
777	+	XSync(x_display, false);
778		}
779		#endif
780
781		// Create window
782		XSetWindowAttributes wattr;
783		wattr.event_mask = eventmask = dga_eventmask;
644	–	wattr.border_pixel = black_pixel;
784		wattr.override_redirect = True;
785
647	–	XSync(x_display, false);
786		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
787	<	InputOutput, vis, CWEventMask \| CWBorderPixel \| CWOverrideRedirect, &wattr);
788	<	XSync(x_display, false);
789	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
787	>	InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
788	>
789	>	// Set window name/class
790	>	set_window_name(the_win, STR_WINDOW_TITLE);
791	>
792	>	// Indicate that we want keyboard input
793	>	set_window_focus(the_win);
794	>
795	>	// Show window
796		XMapRaised(x_display, the_win);
797	<	XSync(x_display, false);
797	>	wait_mapped(the_win);
798
799		// Establish direct screen connection
800		XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
#	Line 667 \| Line 811 \| static bool init_xf86_dga(int width, int
811		// Set colormap
812		if (depth == 8) {
813		XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
670	–	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
814		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
815		}
816	+	XSync(x_display, false);
817
818		// Set VideoMonitor
819		int bytes_per_row = (v_width + 7) & ~7;
#	Line 686 \| Line 830 \| static bool init_xf86_dga(int width, int
830		bytes_per_row *= 4;
831		break;
832		}
833	<
833	>
834	>	#ifdef VIDEO_VOSF
835		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
836	<	// If the blit function is null, i.e. just a copy of the buffer,
837	<	// we first try to avoid the allocation of a temporary frame buffer
838	<	use_vosf = true;
694	<	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
695	<	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
696	<	use_vosf = false;
836	>	// Screen_blitter_init() returns TRUE if VOSF is mandatory
837	>	// i.e. the framebuffer update function is not Blit_Copy_Raw
838	>	use_vosf = Screen_blitter_init(&visualInfo, true);
839
840		if (use_vosf) {
841	<	the_host_buffer = the_buffer;
842	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
843	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
844	<	memset(the_buffer_copy, 0, the_buffer_size);
845	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
704	<	memset(the_buffer, 0, the_buffer_size);
841	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
842	>	the_host_buffer = the_buffer;
843	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
844	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
845	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
846		}
847	<	#elif defined(ENABLE_VOSF)
707	<	// The UAE memory handlers will already handle color conversion, if needed.
847	>	#else
848		use_vosf = false;
849		#endif
850	+	#endif
851
852		set_video_monitor(width, height, bytes_per_row, true);
853		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
#	Line 794 \| Line 935 \| bool VideoInitBuffer()
935		const uint32 page_size = getpagesize();
936		const uint32 page_mask = page_size - 1;
937
938	<	mainBuffer.memBase = (uint32) the_buffer;
938	>	mainBuffer.memBase = (uintptr) the_buffer;
939		// Align the frame buffer on page boundary
940	<	mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
940	>	mainBuffer.memStart = (uintptr)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
941		mainBuffer.memLength = the_buffer_size;
942		mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength;
943
944		mainBuffer.pageSize = page_size;
945		mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
946	<	mainBuffer.pageBits = int( log(mainBuffer.pageSize) / log(2.0) );
946	>	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
947
948		if (mainBuffer.dirtyPages != 0)
949		free(mainBuffer.dirtyPages);
950
951	<	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
951	>	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
952
953		if (mainBuffer.pageInfo != 0)
954		free(mainBuffer.pageInfo);
#	Line 816 \| Line 957 \| bool VideoInitBuffer()
957
958		if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
959		return false;
960	+
961	+	mainBuffer.dirty = false;
962
963		PFLAG_CLEAR_ALL;
964	+	// Safety net to insure the loops in the update routines will terminate
965	+	// See a discussion in <video_vosf.h> for further details
966	+	PFLAG_CLEAR(mainBuffer.pageCount);
967	+	PFLAG_SET(mainBuffer.pageCount+1);
968
969		uint32 a = 0;
970		for (int i = 0; i < mainBuffer.pageCount; i++) {
971	<	int y1 = a / VideoMonitor.bytes_per_row;
972	<	if (y1 >= VideoMonitor.y)
973	<	y1 = VideoMonitor.y - 1;
974	<
975	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
976	<	if (y2 >= VideoMonitor.y)
977	<	y2 = VideoMonitor.y - 1;
971	>	int y1 = a / VideoMonitor.mode.bytes_per_row;
972	>	if (y1 >= VideoMonitor.mode.y)
973	>	y1 = VideoMonitor.mode.y - 1;
974	>
975	>	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.mode.bytes_per_row;
976	>	if (y2 >= VideoMonitor.mode.y)
977	>	y2 = VideoMonitor.mode.y - 1;
978
979		mainBuffer.pageInfo[i].top = y1;
980		mainBuffer.pageInfo[i].bottom = y2;
#	Line 838 \| Line 985 \| bool VideoInitBuffer()
985		}
986
987		// We can now write-protect the frame buffer
988	<	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
988	>	if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0)
989		return false;
990		}
991		#endif
#	Line 870 \| Line 1017 \| bool VideoInit(bool classic)
1017		keycode_init();
1018
1019		// Read prefs
1020	<	mouse_wheel_mode = PrefsFindInt16("mousewheelmode");
1021	<	mouse_wheel_lines = PrefsFindInt16("mousewheellines");
1020	>	mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1021	>	mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1022
1023		// Find screen and root window
1024		screen = XDefaultScreen(x_display);
#	Line 1008 \| Line 1155 \| bool VideoInit(bool classic)
1155		break;
1156		}
1157
1011	–	#ifdef HAVE_PTHREADS
1158		// Lock down frame buffer
1159	<	pthread_mutex_lock(&frame_buffer_lock);
1014	<	#endif
1159	>	LOCK_FRAME_BUFFER;
1160
1161		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1162		// Set variables for UAE memory mapping
1163		MacFrameBaseHost = the_buffer;
1164	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1164	>	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
1165
1166		// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1167		if (classic)
#	Line 1033 \| Line 1178 \| bool VideoInit(bool classic)
1178		}
1179
1180		// Initialize the handler for SIGSEGV
1181	<	if (!Screen_fault_handler_init()) {
1181	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1182		// TODO: STR_VOSF_INIT_ERR ?
1183		ErrorAlert("Could not initialize Video on SEGV signals");
1184		return false;
#	Line 1076 \| Line 1221 \| void VideoExit(void)
1221		}
1222		#endif
1223
1079	–	#ifdef HAVE_PTHREADS
1224		// Unlock frame buffer
1225	<	pthread_mutex_unlock(&frame_buffer_lock);
1082	<	#endif
1225	>	UNLOCK_FRAME_BUFFER;
1226
1227		// Close window and server connection
1228		if (x_display != NULL) {
#	Line 1126 \| Line 1269 \| void VideoExit(void)
1269		}
1270		#ifdef ENABLE_VOSF
1271		else {
1272	<	if (the_buffer != (uint8 *)MAP_FAILED) {
1273	<	munmap((caddr_t)the_buffer, the_buffer_size);
1272	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
1273	>	vm_release(the_buffer, the_buffer_size);
1274		the_buffer = 0;
1275		}
1276
1277	<	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1278	<	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1277	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
1278	>	vm_release(the_buffer_copy, the_buffer_size);
1279		the_buffer_copy = 0;
1280		}
1281		}
#	Line 1182 \| Line 1325 \| void VideoInterrupt(void)
1325		if (emerg_quit)
1326		QuitEmulator();
1327
1185	–	#ifdef HAVE_PTHREADS
1328		// Temporarily give up frame buffer lock (this is the point where
1329		// we are suspended when the user presses Ctrl-Tab)
1330	<	pthread_mutex_unlock(&frame_buffer_lock);
1331	<	pthread_mutex_lock(&frame_buffer_lock);
1190	<	#endif
1330	>	UNLOCK_FRAME_BUFFER;
1331	>	LOCK_FRAME_BUFFER;
1332		}
1333
1334
#	Line 1197 \| Line 1338 \| void VideoInterrupt(void)
1338
1339		void video_set_palette(uint8 *pal)
1340		{
1341	<	#ifdef HAVE_PTHREDS
1201	<	pthread_mutex_lock(&palette_lock);
1202	<	#endif
1341	>	LOCK_PALETTE;
1342
1343		// Convert colors to XColor array
1344		for (int i=0; i<256; i++) {
#	Line 1213 \| Line 1352 \| *void video_set_palette(uint8 pal)**
1352		// Tell redraw thread to change palette
1353		palette_changed = true;
1354
1355	<	#ifdef HAVE_PTHREADS
1217	<	pthread_mutex_unlock(&palette_lock);
1218	<	#endif
1355	>	UNLOCK_PALETTE;
1356		}
1357
1358
#	Line 1231 \| Line 1368 \| static void suspend_emul(void)
1368		ADBKeyUp(0x36);
1369		ctrl_down = false;
1370
1234	–	#ifdef HAVE_PTHREADS
1371		// Lock frame buffer (this will stop the MacOS thread)
1372	<	pthread_mutex_lock(&frame_buffer_lock);
1237	<	#endif
1372	>	LOCK_FRAME_BUFFER;
1373
1374		// Save frame buffer
1375	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1375	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1376		if (fb_save)
1377	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1377	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1378
1379		// Close full screen display
1380		#ifdef ENABLE_XF86_DGA
#	Line 1248 \| Line 1383 \| static void suspend_emul(void)
1383		XUngrabPointer(x_display, CurrentTime);
1384		XUngrabKeyboard(x_display, CurrentTime);
1385		XUnmapWindow(x_display, the_win);
1386	<	XSync(x_display, false);
1386	>	wait_unmapped(the_win);
1387
1388		// Open "suspend" window
1389		XSetWindowAttributes wattr;
1390		wattr.event_mask = KeyPressMask;
1391		wattr.background_pixel = black_pixel;
1257	–	wattr.border_pixel = black_pixel;
1258	–	wattr.backing_store = Always;
1259	–	wattr.backing_planes = xdepth;
1260	–	wattr.colormap = DefaultColormap(x_display, screen);
1392
1262	–	XSync(x_display, false);
1393		suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1394	<	InputOutput, vis, CWEventMask \| CWBackPixel \| CWBorderPixel \|
1395	<	CWBackingStore \| CWBackingPlanes \| (xdepth == 8 ? CWColormap : 0), &wattr);
1396	<	XSync(x_display, false);
1397	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1268	<	XMapRaised(x_display, suspend_win);
1269	<	XSync(x_display, false);
1394	>	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
1395	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1396	>	set_window_focus(suspend_win);
1397	>	XMapWindow(x_display, suspend_win);
1398		emul_suspended = true;
1399		}
1400		}
#	Line 1279 \| Line 1407 \| static void resume_emul(void)
1407
1408		// Reopen full screen display
1409		XMapRaised(x_display, the_win);
1410	+	wait_mapped(the_win);
1411		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1283	–	XSync(x_display, false);
1412		XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1413		XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1414		#ifdef ENABLE_XF86_DGA
#	Line 1294 \| Line 1422 \| static void resume_emul(void)
1422		// not necessary.
1423		#ifdef ENABLE_VOSF
1424		if (use_vosf) {
1425	<	#ifdef HAVE_PTHREADS
1298	<	pthread_mutex_lock(&Screen_draw_lock);
1299	<	#endif
1425	>	LOCK_VOSF;
1426		PFLAG_SET_ALL;
1427	<	#ifdef HAVE_PTHREADS
1428	<	pthread_mutex_unlock(&Screen_draw_lock);
1303	<	#endif
1304	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1427	>	UNLOCK_VOSF;
1428	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1429		}
1430		#endif
1431
#	Line 1311 \| Line 1435 \| static void resume_emul(void)
1435		// Don't copy fb_save to the temporary frame buffer in VOSF mode
1436		if (!use_vosf)
1437		#endif
1438	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1438	>	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1439		free(fb_save);
1440		fb_save = NULL;
1441		}
#	Line 1321 \| Line 1445 \| static void resume_emul(void)
1445		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1446		#endif
1447
1324	–	#ifdef HAVE_PTHREADS
1448		// Unlock frame buffer (and continue MacOS thread)
1449	<	pthread_mutex_unlock(&frame_buffer_lock);
1449	>	UNLOCK_FRAME_BUFFER;
1450		emul_suspended = false;
1328	–	#endif
1451		}
1452		#endif
1453
#	Line 1479 \| Line 1601 \| static int kc_decode(KeySym ks)
1601		return -1;
1602		}
1603
1604	<	static int event2keycode(XKeyEvent *ev)
1604	>	static int event2keycode(XKeyEvent &ev)
1605		{
1606		KeySym ks;
1607		int as;
1608		int i = 0;
1609
1610		do {
1611	<	ks = XLookupKeysym(ev, i++);
1611	>	ks = XLookupKeysym(&ev, i++);
1612		as = kc_decode(ks);
1613		if (as != -1)
1614		return as;
#	Line 1502 \| Line 1624 \| *static int event2keycode(XKeyEvent ev)**
1624
1625		static void handle_events(void)
1626		{
1627	<	XEvent event;
1628	<	for (;;) {
1629	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1508	<	break;
1627	>	while (XPending(x_display)) {
1628	>	XEvent event;
1629	>	XNextEvent(x_display, &event);
1630
1631		switch (event.type) {
1632		// Mouse button
1633		case ButtonPress: {
1634	<	unsigned int button = ((XButtonEvent *)&event)->button;
1634	>	unsigned int button = event.xbutton.button;
1635		if (button < 4)
1636		ADBMouseDown(button - 1);
1637		else if (button < 6) { // Wheel mouse
#	Line 1529 \| Line 1650 \| static void handle_events(void)
1650		break;
1651		}
1652		case ButtonRelease: {
1653	<	unsigned int button = ((XButtonEvent *)&event)->button;
1653	>	unsigned int button = event.xbutton.button;
1654		if (button < 4)
1655		ADBMouseUp(button - 1);
1656		break;
#	Line 1537 \| Line 1658 \| static void handle_events(void)
1658
1659		// Mouse moved
1660		case EnterNotify:
1540	–	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1541	–	break;
1661		case MotionNotify:
1662	<	ADBMouseMoved(((XMotionEvent )&event)->x, ((XMotionEvent )&event)->y);
1662	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1663		break;
1664
1665		// Keyboard
1666		case KeyPress: {
1667		int code;
1668		if (use_keycodes) {
1669	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1670	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1669	>	event2keycode(event.xkey); // This is called to process the hotkeys
1670	>	code = keycode_table[event.xkey.keycode & 0xff];
1671		} else
1672	<	code = event2keycode((XKeyEvent *)&event);
1672	>	code = event2keycode(event.xkey);
1673		if (code != -1) {
1674		if (!emul_suspended) {
1675		if (code == 0x39) { // Caps Lock pressed
#	Line 1577 \| Line 1696 \| static void handle_events(void)
1696		case KeyRelease: {
1697		int code;
1698		if (use_keycodes) {
1699	<	event2keycode((XKeyEvent *)&event); // This is called to process the hotkeys
1700	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1699	>	event2keycode(event.xkey); // This is called to process the hotkeys
1700	>	code = keycode_table[event.xkey.keycode & 0xff];
1701		} else
1702	<	code = event2keycode((XKeyEvent *)&event);
1702	>	code = event2keycode(event.xkey);
1703		if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
1704		ADBKeyUp(code);
1705		if (code == 0x36)
#	Line 1594 \| Line 1713 \| static void handle_events(void)
1713		if (display_type == DISPLAY_WINDOW) {
1714		#ifdef ENABLE_VOSF
1715		if (use_vosf) { // VOSF refresh
1716	<	#ifdef HAVE_PTHREADS
1598	<	pthread_mutex_lock(&Screen_draw_lock);
1599	<	#endif
1716	>	LOCK_VOSF;
1717		PFLAG_SET_ALL;
1718	<	#ifdef HAVE_PTHREADS
1719	<	pthread_mutex_unlock(&Screen_draw_lock);
1603	<	#endif
1604	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1718	>	UNLOCK_VOSF;
1719	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1720		}
1721		else
1722		#endif
#	Line 1612 \| Line 1727 \| static void handle_events(void)
1727		updt_box[x1][y1] = true;
1728		nr_boxes = 16 * 16;
1729		} else // Static refresh
1730	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1730	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1731	>	}
1732	>	break;
1733	>
1734	>	// Window "close" widget clicked
1735	>	case ClientMessage:
1736	>	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1737	>	ADBKeyDown(0x7f); // Power key
1738	>	ADBKeyUp(0x7f);
1739		}
1740		break;
1741		}
#	Line 1630 \| Line 1753 \| static void update_display_dynamic(int t
1753		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1754		int xil = 0;
1755		int rxm = 0, rxmo = 0;
1756	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1757	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1758	<	int rx = VideoMonitor.bytes_per_row / 16;
1759	<	int ry = VideoMonitor.y / 16;
1756	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1757	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1758	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
1759	>	int ry = VideoMonitor.mode.y / 16;
1760		int max_box;
1761
1762		y2s = sm_uptd[ticker % 8];
#	Line 1719 \| Line 1842 \| static void update_display_static(void)
1842		{
1843		// Incremental update code
1844		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1845	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1846	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1845	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1846	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1847		uint8 p, p2;
1848
1849		// Check for first line from top and first line from bottom that have changed
1850		y1 = 0;
1851	<	for (j=0; j<VideoMonitor.y; j++) {
1851	>	for (j=0; j<VideoMonitor.mode.y; j++) {
1852		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1853		y1 = j;
1854		break;
1855		}
1856		}
1857		y2 = y1 - 1;
1858	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
1858	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
1859		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1860		y2 = j;
1861		break;
#	Line 1743 \| Line 1866 \| static void update_display_static(void)
1866		// Check for first column from left and first column from right that have changed
1867		if (high) {
1868		if (depth == 1) {
1869	<	x1 = VideoMonitor.x;
1869	>	x1 = VideoMonitor.mode.x - 1;
1870		for (j=y1; j<=y2; j++) {
1871		p = &the_buffer[j * bytes_per_row];
1872		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1761 \| Line 1884 \| static void update_display_static(void)
1884		p2 = &the_buffer_copy[j * bytes_per_row];
1885		p += bytes_per_row;
1886		p2 += bytes_per_row;
1887	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1887	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
1888		p--; p2--;
1889		if (p != p2) {
1890	<	x2 = i << 3;
1890	>	x2 = (i << 3) + 7;
1891		break;
1892		}
1893		}
1894		}
1895	<	wide = x2 - x1;
1895	>	wide = x2 - x1 + 1;
1896
1897		// Update copy of the_buffer
1898		if (high && wide) {
#	Line 1780 \| Line 1903 \| static void update_display_static(void)
1903		}
1904
1905		} else {
1906	<	x1 = VideoMonitor.x;
1906	>	x1 = VideoMonitor.mode.x;
1907		for (j=y1; j<=y2; j++) {
1908		p = &the_buffer[j * bytes_per_row];
1909		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1798 \| Line 1921 \| static void update_display_static(void)
1921		p2 = &the_buffer_copy[j * bytes_per_row];
1922		p += bytes_per_row;
1923		p2 += bytes_per_row;
1924	<	for (i=VideoMonitor.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1924	>	for (i=VideoMonitor.mode.xbytes_per_pixel; i>x2bytes_per_pixel; i--) {
1925		p--;
1926		p2--;
1927		if (p != p2) {
#	Line 1833 \| Line 1956 \| static void update_display_static(void)
1956		* Screen refresh functions
1957		*/
1958
1959	<	// The specialisations hereunder are meant to enable VOSF with DGA in direct
1960	<	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
1961	<	// not get mapped correctly with respect to the predetermined host frame
1962	<	// buffer base address.
1963	<	//
1841	<	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1842	<	// we first try to "triple allocate" the address spaces according to the real
1843	<	// host frame buffer address. Then, if it fails, we will use a temporary
1844	<	// frame buffer thus making the real host frame buffer updated when pages
1845	<	// of the temp frame buffer are altered.
1846	<	//
1847	<	// As a side effect, a little speed gain in screen updates could be noticed
1848	<	// for other modes than DGA.
1849	<	//
1850	<	// The following two functions below are inline so that a clever compiler
1851	<	// could specialise the code according to the current screen depth and
1852	<	// display type. A more clever compiler would the job by itself though...
1853	<	// (update_display_vosf is inlined as well)
1959	>	// We suggest the compiler to inline the next two functions so that it
1960	>	// may specialise the code according to the current screen depth and
1961	>	// display type. A clever compiler would do that job by itself though...
1962	>
1963	>	// NOTE: update_display_vosf is inlined too
1964
1965		static inline void possibly_quit_dga_mode()
1966		{
#	Line 1871 \| Line 1981 \| static inline void possibly_quit_dga_mod
1981
1982		static inline void handle_palette_changes(int depth, int display_type)
1983		{
1984	<	#ifdef HAVE_PTHREADS
1985	<	pthread_mutex_lock(&palette_lock);
1876	<	#endif
1984	>	LOCK_PALETTE;
1985	>
1986		if (palette_changed) {
1987		palette_changed = false;
1988		if (depth == 8) {
1989		XStoreColors(x_display, cmap[0], palette, 256);
1990		XStoreColors(x_display, cmap[1], palette, 256);
1991	+	XSync(x_display, false);
1992
1993		#ifdef ENABLE_XF86_DGA
1994		if (display_type == DISPLAY_DGA) {
#	Line 1888 \| Line 1998 \| static inline void handle_palette_change
1998		#endif
1999		}
2000		}
2001	<	#ifdef HAVE_PTHREADS
2002	<	pthread_mutex_unlock(&palette_lock);
1893	<	#endif
2001	>
2002	>	UNLOCK_PALETTE;
2003		}
2004
2005		static void video_refresh_dga(void)
#	Line 1905 \| Line 2014 \| static void video_refresh_dga(void)
2014		handle_palette_changes(depth, DISPLAY_DGA);
2015		}
2016
2017	+	#ifdef ENABLE_VOSF
2018		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
2019		static void video_refresh_dga_vosf(void)
2020		{
#	Line 1921 \| Line 2031 \| static void video_refresh_dga_vosf(void)
2031		static int tick_counter = 0;
2032		if (++tick_counter >= frame_skip) {
2033		tick_counter = 0;
2034	<	#ifdef HAVE_PTHREADS
2035	<	pthread_mutex_lock(&Screen_draw_lock);
2036	<	#endif
2037	<	update_display_dga_vosf();
2038	<	#ifdef HAVE_PTHREADS
1929	<	pthread_mutex_unlock(&Screen_draw_lock);
1930	<	#endif
2034	>	if (mainBuffer.dirty) {
2035	>	LOCK_VOSF;
2036	>	update_display_dga_vosf();
2037	>	UNLOCK_VOSF;
2038	>	}
2039		}
2040		}
2041		#endif
2042
1935	–	#ifdef ENABLE_VOSF
2043		static void video_refresh_window_vosf(void)
2044		{
2045		// Quit DGA mode if requested
#	Line 1948 \| Line 2055 \| static void video_refresh_window_vosf(vo
2055		static int tick_counter = 0;
2056		if (++tick_counter >= frame_skip) {
2057		tick_counter = 0;
2058	<	#ifdef HAVE_PTHREADS
2059	<	pthread_mutex_lock(&Screen_draw_lock);
2060	<	#endif
2061	<	update_display_window_vosf();
2062	<	#ifdef HAVE_PTHREADS
2063	<	pthread_mutex_unlock(&Screen_draw_lock);
1957	<	#endif
2058	>	if (mainBuffer.dirty) {
2059	>	LOCK_VOSF;
2060	>	update_display_window_vosf();
2061	>	UNLOCK_VOSF;
2062	>	XSync(x_display, false); // Let the server catch up
2063	>	}
2064		}
2065		}
2066	<	#endif
2066	>	#endif // def ENABLE_VOSF
2067
2068		static void video_refresh_window_static(void)
2069		{
#	Line 1998 \| Line 2104 \| void VideoRefreshInit(void)
2104		{
2105		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2106		if (display_type == DISPLAY_DGA) {
2107	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
2107	>	#if ENABLE_VOSF && (REAL_ADDRESSING \|\| DIRECT_ADDRESSING)
2108		if (use_vosf)
2109		video_refresh = video_refresh_dga_vosf;
2110		else
#	Line 2024 \| Line 2130 \| void VideoRefresh(void)
2130		video_refresh();
2131		}
2132
2027	–	#if 0
2028	–	void VideoRefresh(void)
2029	–	{
2030	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2031	–	// Quit DGA mode if requested
2032	–	if (quit_full_screen) {
2033	–	quit_full_screen = false;
2034	–	if (display_type == DISPLAY_DGA) {
2035	–	#ifdef ENABLE_XF86_DGA
2036	–	XF86DGADirectVideo(x_display, screen, 0);
2037	–	#endif
2038	–	XUngrabPointer(x_display, CurrentTime);
2039	–	XUngrabKeyboard(x_display, CurrentTime);
2040	–	XUnmapWindow(x_display, the_win);
2041	–	XSync(x_display, false);
2042	–	}
2043	–	}
2044	–	#endif
2045	–
2046	–	// Handle X events
2047	–	handle_events();
2048	–
2049	–	// Handle palette changes
2050	–	#ifdef HAVE_PTHREADS
2051	–	pthread_mutex_lock(&palette_lock);
2052	–	#endif
2053	–	if (palette_changed) {
2054	–	palette_changed = false;
2055	–	if (depth == 8) {
2056	–	XStoreColors(x_display, cmap[0], palette, 256);
2057	–	XStoreColors(x_display, cmap[1], palette, 256);
2058	–
2059	–	#ifdef ENABLE_XF86_DGA
2060	–	if (display_type == DISPLAY_DGA) {
2061	–	current_dga_cmap ^= 1;
2062	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2063	–	}
2064	–	#endif
2065	–	}
2066	–	}
2067	–	#ifdef HAVE_PTHREADS
2068	–	pthread_mutex_unlock(&palette_lock);
2069	–	#endif
2070	–
2071	–	// In window mode, update display
2072	–	static int tick_counter = 0;
2073	–	if (display_type == DISPLAY_WINDOW) {
2074	–	tick_counter++;
2075	–	if (frame_skip == 0)
2076	–	update_display_dynamic(tick_counter);
2077	–	else if (tick_counter >= frame_skip) {
2078	–	tick_counter = 0;
2079	–	update_display_static();
2080	–	}
2081	–	}
2082	–	}
2083	–	#endif
2084	–
2133		#ifdef HAVE_PTHREADS
2134		static void redraw_func(void arg)
2135		{
#	Line 2089 \| Line 2137 \| *static void redraw_func(void arg)*
2137		int64 ticks = 0;
2138		uint64 next = GetTicks_usec();
2139		while (!redraw_thread_cancel) {
2092	–	// VideoRefresh();
2140		video_refresh();
2141		next += 16667;
2142		int64 delay = next - GetTicks_usec();
#	Line 2100 \| Line 2147 \| *static void redraw_func(void arg)*
2147		ticks++;
2148		}
2149		uint64 end = GetTicks_usec();
2150	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2150	>	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2151		return NULL;
2152		}
2153		#endif

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs. Revision 1.40 by cebix, 2001-06-27T19:03:37Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.22 by cebix, 2000-10-08T18:41:35Z vs.
Revision 1.40 by cebix, 2001-06-27T19:03:37Z