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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.41 by cebix, 2001-06-27T20:05:30Z vs.
Revision 1.53 by cebix, 2001-07-06T20:49:53Z

#	Line 24 \| Line 24
24		* Ctrl-Tab = suspend DGA mode
25		* Ctrl-Esc = emergency quit
26		* Ctrl-F1 = mount floppy
27	+	* Ctrl-F5 = grab mouse (in windowed mode)
28		*/
29
30		#include "sysdeps.h"
#	Line 36 \| Line 37
37		#include <sys/shm.h>
38		#include <errno.h>
39
40	+	#include <algorithm>
41	+
42	+	#ifndef NO_STD_NAMESPACE
43	+	using std::sort;
44	+	#endif
45	+
46		#ifdef HAVE_PTHREADS
47		# include <pthread.h>
48		#endif
#	Line 52 \| Line 59
59		# include <sys/mman.h>
60		#endif
61
55	–	#ifdef ENABLE_VOSF
56	–	# include <fcntl.h>
57	–	# include <sys/mman.h>
58	–	# include "sigsegv.h"
59	–	# include "vm_alloc.h"
60	–	#endif
61	–
62		#include "cpu_emulation.h"
63		#include "main.h"
64		#include "adb.h"
#	Line 79 \| Line 79 \| enum {
79
80		// Constants
81		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
82	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
82	>
83	>	static const int win_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| ExposureMask \| StructureNotifyMask;
84	>	static const int dga_eventmask = KeyPressMask \| KeyReleaseMask \| ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask \| StructureNotifyMask;
85
86
87		// Global variables
88		static int32 frame_skip; // Prefs items
89	<	static int16 mouse_wheel_mode = 1;
90	<	static int16 mouse_wheel_lines = 3;
89	>	static int16 mouse_wheel_mode;
90	>	static int16 mouse_wheel_lines;
91
92		static int display_type = DISPLAY_WINDOW; // See enum above
93		static bool local_X11; // Flag: X server running on local machine?
94	<	static uint8 *the_buffer; // Mac frame buffer
94	>	static uint8 *the_buffer = NULL; // Mac frame buffer (where MacOS draws into)
95	>	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer (for refreshed modes)
96
94	–	#ifdef HAVE_PTHREADS
97		static bool redraw_thread_active = false; // Flag: Redraw thread installed
98	<	static volatile bool redraw_thread_cancel = false; // Flag: Cancel Redraw thread
98	>	#ifdef HAVE_PTHREADS
99	>	static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
100		static pthread_t redraw_thread; // Redraw thread
101		#endif
102
103		static bool has_dga = false; // Flag: Video DGA capable
104		static bool has_vidmode = false; // Flag: VidMode extension available
105
106	+	#ifdef ENABLE_VOSF
107	+	static bool use_vosf = true; // Flag: VOSF enabled
108	+	#else
109	+	static const bool use_vosf = false; // VOSF not possible
110	+	#endif
111	+
112		static bool ctrl_down = false; // Flag: Ctrl key pressed
113		static bool caps_on = false; // Flag: Caps Lock on
114		static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread
#	Line 113 \| Line 122 \| static int keycode_table[256]; // X
122
123		// X11 variables
124		static int screen; // Screen number
125	<	static int xdepth; // Depth of X screen
126	<	static int depth; // Depth of Mac frame buffer
127	<	static Window rootwin, the_win; // Root window and our window
119	<	static XVisualInfo visualInfo;
120	<	static Visual *vis;
121	<	static Colormap cmap[2]; // Two colormaps (DGA) for 8-bit mode
125	>	static Window rootwin; // Root window and our window
126	>	static int num_depths = 0; // Number of available X depths
127	>	static int *avail_depths = NULL; // List of available X depths
128		static XColor black, white;
129		static unsigned long black_pixel, white_pixel;
130		static int eventmask;
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;
131
132	<	static XColor palette[256]; // Color palette for 8-bit mode
132	>	static int xdepth; // Depth of X screen
133	>	static XVisualInfo visualInfo;
134	>	static Visual *vis;
135	>	static int color_class;
136	>
137	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
138	>
139	>	static Colormap cmap[2] = {0, 0}; // Colormaps for indexed modes (DGA needs two of them)
140	>
141	>	static XColor palette[256]; // Color palette to be used as CLUT and gamma table
142		static bool palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
143	+
144	+	#ifdef ENABLE_FBDEV_DGA
145	+	static int fbdev_fd = -1;
146	+	#endif
147	+
148	+	#ifdef ENABLE_XF86_VIDMODE
149	+	static XF86VidModeModeInfo **x_video_modes = NULL; // Array of all available modes
150	+	static int num_x_video_modes;
151	+	#endif
152	+
153	+	// Mutex to protect palette
154		#ifdef HAVE_PTHREADS
155	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect palette
155	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
156		#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
157		#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
158		#else
#	Line 137 \| Line 160 \| static pthread_mutex_t palette_lock = PT
160		#define UNLOCK_PALETTE
161		#endif
162
163	<	// Variables for window mode
141	<	static GC the_gc;
142	<	static XImage *img = NULL;
143	<	static XShmSegmentInfo shminfo;
144	<	static Cursor mac_cursor;
145	<	static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer
146	<	static bool have_shm = false; // Flag: SHM extensions available
147	<	static bool updt_box[17][17]; // Flag for Update
148	<	static int nr_boxes;
149	<	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
150	<	static int sm_no_boxes[] = {1,8,32,64,128,300};
151	<
152	<	// Variables for XF86 DGA mode
153	<	static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
154	<	static Window suspend_win; // "Suspend" window
155	<	static void *fb_save = NULL; // Saved frame buffer for suspend
163	>	// Mutex to protect frame buffer
164		#ifdef HAVE_PTHREADS
165	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer
165	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
166		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
167		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
168		#else
#	Line 162 \| Line 170 \| static pthread_mutex_t frame_buffer_lock
170		#define UNLOCK_FRAME_BUFFER
171		#endif
172
173	<	// Variables for fbdev DGA mode
174	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
175	<	static int fbdev_fd;
176	<
177	<	#ifdef ENABLE_XF86_VIDMODE
170	<	// Variables for XF86 VidMode support
171	<	static XF86VidModeModeInfo **x_video_modes; // Array of all available modes
172	<	static int num_x_video_modes;
173	<	#endif
174	<
175	<	#ifdef ENABLE_VOSF
176	<	static bool use_vosf = true; // Flag: VOSF enabled
177	<	#else
178	<	static const bool use_vosf = false; // Flag: VOSF enabled
179	<	#endif
180	<
181	<	#ifdef ENABLE_VOSF
182	<	// Variables for Video on SEGV support (taken from the Win32 port)
183	<	static uint8 *the_host_buffer; // Host frame buffer in VOSF mode
184	<	static uint32 the_buffer_size; // Size of allocated the_buffer
185	<
186	<	struct ScreenPageInfo {
187	<	int top, bottom; // Mapping between this virtual page and Mac scanlines
188	<	};
189	<
190	<	struct ScreenInfo {
191	<	uintptr memBase; // Real start address
192	<	uintptr memStart; // Start address aligned to page boundary
193	<	uintptr memEnd; // Address of one-past-the-end of the screen
194	<	uint32 memLength; // Length of the memory addressed by the screen pages
195	<
196	<	uint32 pageSize; // Size of a page
197	<	int pageBits; // Shift count to get the page number
198	<	uint32 pageCount; // Number of pages allocated to the screen
199	<
200	<	bool dirty; // Flag: set if the frame buffer was touched
201	<	char * dirtyPages; // Table of flags set if page was altered
202	<	ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines
203	<	};
204	<
205	<	static ScreenInfo mainBuffer;
206	<
207	<	#define PFLAG_SET_VALUE 0x00
208	<	#define PFLAG_CLEAR_VALUE 0x01
209	<	#define PFLAG_SET_VALUE_4 0x00000000
210	<	#define PFLAG_CLEAR_VALUE_4 0x01010101
211	<	#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = PFLAG_SET_VALUE
212	<	#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = PFLAG_CLEAR_VALUE
213	<	#define PFLAG_ISSET(page) (mainBuffer.dirtyPages[page] == PFLAG_SET_VALUE)
214	<	#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] != PFLAG_SET_VALUE)
215	<
216	<	#ifdef UNALIGNED_PROFITABLE
217	<	# define PFLAG_ISSET_4(page) (((uint32 )(mainBuffer.dirtyPages + (page))) == PFLAG_SET_VALUE_4)
218	<	# define PFLAG_ISCLEAR_4(page) (((uint32 )(mainBuffer.dirtyPages + (page))) == PFLAG_CLEAR_VALUE_4)
219	<	#else
220	<	# define PFLAG_ISSET_4(page) \
221	<	PFLAG_ISSET(page ) && PFLAG_ISSET(page+1) \
222	<	&& PFLAG_ISSET(page+2) && PFLAG_ISSET(page+3)
223	<	# define PFLAG_ISCLEAR_4(page) \
224	<	PFLAG_ISCLEAR(page ) && PFLAG_ISCLEAR(page+1) \
225	<	&& PFLAG_ISCLEAR(page+2) && PFLAG_ISCLEAR(page+3)
226	<	#endif
227	<
228	<	// Set the selected page range [ first_page, last_page [ into the SET state
229	<	#define PFLAG_SET_RANGE(first_page, last_page) \
230	<	memset(mainBuffer.dirtyPages + (first_page), PFLAG_SET_VALUE, \
231	<	(last_page) - (first_page))
232	<
233	<	// Set the selected page range [ first_page, last_page [ into the CLEAR state
234	<	#define PFLAG_CLEAR_RANGE(first_page, last_page) \
235	<	memset(mainBuffer.dirtyPages + (first_page), PFLAG_CLEAR_VALUE, \
236	<	(last_page) - (first_page))
237	<
238	<	#define PFLAG_SET_ALL do { \
239	<	PFLAG_SET_RANGE(0, mainBuffer.pageCount); \
240	<	mainBuffer.dirty = true; \
241	<	} while (0)
242	<
243	<	#define PFLAG_CLEAR_ALL do { \
244	<	PFLAG_CLEAR_RANGE(0, mainBuffer.pageCount); \
245	<	mainBuffer.dirty = false; \
246	<	} while (0)
247	<
248	<	// Set the following macro definition to 1 if your system
249	<	// provides a really fast strchr() implementation
250	<	//#define HAVE_FAST_STRCHR 0
251	<
252	<	static inline int find_next_page_set(int page)
253	<	{
254	<	#if HAVE_FAST_STRCHR
255	<	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_SET_VALUE);
256	<	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
257	<	#else
258	<	while (PFLAG_ISCLEAR_4(page))
259	<	page += 4;
260	<	while (PFLAG_ISCLEAR(page))
261	<	page++;
262	<	return page;
263	<	#endif
264	<	}
265	<
266	<	static inline int find_next_page_clear(int page)
267	<	{
268	<	#if HAVE_FAST_STRCHR
269	<	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_CLEAR_VALUE);
270	<	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
271	<	#else
272	<	while (PFLAG_ISSET_4(page))
273	<	page += 4;
274	<	while (PFLAG_ISSET(page))
275	<	page++;
276	<	return page;
277	<	#endif
278	<	}
279	<
280	<	static int zero_fd = -1;
281	<
282	<	#ifdef HAVE_PTHREADS
283	<	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact)
284	<	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
285	<	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
286	<	#else
287	<	#define LOCK_VOSF
288	<	#define UNLOCK_VOSF
289	<	#endif
290	<
291	<	static int log_base_2(uint32 x)
292	<	{
293	<	uint32 mask = 0x80000000;
294	<	int l = 31;
295	<	while (l >= 0 && (x & mask) == 0) {
296	<	mask >>= 1;
297	<	l--;
298	<	}
299	<	return l;
300	<	}
301	<	#endif /* ENABLE_VOSF */
173	>	// Variables for non-VOSF incremental refresh
174	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
175	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
176	>	static bool updt_box[17][17];
177	>	static int nr_boxes;
178
179	<	// VideoRefresh function
180	<	void VideoRefreshInit(void);
179	>	// Video refresh function
180	>	static void VideoRefreshInit(void);
181		static void (*video_refresh)(void);
182
183	+
184		// Prototypes
185		static void redraw_func(void arg);
186		static int event2keycode(XKeyEvent &ev);
187
311	–
188		// From main_unix.cpp
189		extern char *x_display_name;
190		extern Display *x_display;
#	Line 316 \| Line 192 \| *extern Display x_display;**
192		// From sys_unix.cpp
193		extern void SysMountFirstFloppy(void);
194
319	–	#ifdef ENABLE_VOSF
320	–	# include "video_vosf.h"
321	–	#endif
322	–
195
196		/*
197	<	* Initialization
197	>	* Utility functions
198		*/
199
200	<	// Add resolution to list of supported modes and set VideoMonitor
201	<	static void set_video_monitor(uint32 width, uint32 height, uint32 bytes_per_row, bool native_byte_order)
200	>	// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
201	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
202		{
203	<	video_mode mode;
204	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
205	<	int layout = FLAYOUT_DIRECT;
203	>	return ((red >> rloss) << rshift) \| ((green >> gloss) << gshift) \| ((blue >> bloss) << bshift);
204	>	}
205	>
206	>	// Do we have a visual for handling the specified Mac depth? If so, set the
207	>	// global variables "xdepth", "visualInfo", "vis" and "color_class".
208	>	static bool find_visual_for_depth(video_depth depth)
209	>	{
210	>	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
211	>
212	>	// Calculate minimum and maximum supported X depth
213	>	int min_depth = 1, max_depth = 32;
214		switch (depth) {
215	<	case 1:
216	<	layout = FLAYOUT_DIRECT;
215	>	case VDEPTH_1BIT: // 1-bit works always
216	>	min_depth = 1;
217	>	max_depth = 32;
218		break;
219	<	case 8:
220	<	layout = FLAYOUT_DIRECT;
219	>	#ifdef ENABLE_VOSF
220	>	case VDEPTH_2BIT:
221	>	case VDEPTH_4BIT: // VOSF blitters can convert 2/4-bit -> 16/32-bit
222	>	min_depth = 15;
223	>	max_depth = 32;
224	>	break;
225	>	case VDEPTH_8BIT: // VOSF blitters can convert 8-bit -> 16/32-bit
226	>	min_depth = 8;
227	>	max_depth = 32;
228		break;
229	<	case 15:
230	<	layout = FLAYOUT_HOST_555;
229	>	#else
230	>	case VDEPTH_2BIT:
231	>	case VDEPTH_4BIT: // 2/4-bit requires VOSF blitters
232	>	return false;
233	>	case VDEPTH_8BIT: // 8-bit without VOSF requires an 8-bit visual
234	>	min_depth = 8;
235	>	max_depth = 8;
236		break;
237	<	case 16:
238	<	layout = FLAYOUT_HOST_565;
237	>	#endif
238	>	case VDEPTH_16BIT: // 16-bit requires a 15/16-bit visual
239	>	min_depth = 15;
240	>	max_depth = 16;
241		break;
242	<	case 24:
243	<	case 32:
244	<	layout = FLAYOUT_HOST_888;
242	>	case VDEPTH_32BIT: // 32-bit requires a 24/32-bit visual
243	>	min_depth = 24;
244	>	max_depth = 32;
245		break;
246		}
247	<	if (native_byte_order)
248	<	MacFrameLayout = layout;
249	<	else
250	<	MacFrameLayout = FLAYOUT_DIRECT;
247	>	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
248	>
249	>	// Try to find a visual for one of the color depths
250	>	bool visual_found = false;
251	>	for (int i=0; i<num_depths && !visual_found; i++) {
252	>
253	>	xdepth = avail_depths[i];
254	>	D(bug(" trying to find visual for depth %d\n", xdepth));
255	>	if (xdepth < min_depth \|\| xdepth > max_depth)
256	>	continue;
257	>
258	>	// Determine best color class for this depth
259	>	switch (xdepth) {
260	>	case 1: // Try StaticGray or StaticColor
261	>	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
262	>	\|\| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
263	>	visual_found = true;
264	>	break;
265	>	case 8: // Need PseudoColor
266	>	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
267	>	visual_found = true;
268	>	break;
269	>	case 15:
270	>	case 16:
271	>	case 24:
272	>	case 32: // Try DirectColor first, as this will allow gamma correction
273	>	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
274	>	\|\| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
275	>	visual_found = true;
276	>	break;
277	>	default:
278	>	D(bug(" not a supported depth\n"));
279	>	break;
280	>	}
281	>	}
282	>	if (!visual_found)
283	>	return false;
284	>
285	>	// Visual was found
286	>	vis = visualInfo.visual;
287	>	color_class = visualInfo.c_class;
288	>	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
289	>	#if DEBUG
290	>	switch (color_class) {
291	>	case StaticGray: D(bug("StaticGray\n")); break;
292	>	case GrayScale: D(bug("GrayScale\n")); break;
293	>	case StaticColor: D(bug("StaticColor\n")); break;
294	>	case PseudoColor: D(bug("PseudoColor\n")); break;
295	>	case TrueColor: D(bug("TrueColor\n")); break;
296	>	case DirectColor: D(bug("DirectColor\n")); break;
297	>	}
298		#endif
299	+	}
300
301	+	// Add mode to list of supported modes
302	+	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
303	+	{
304	+	video_mode mode;
305		mode.x = width;
306		mode.y = height;
307	<	mode.resolution_id = 0x80;
307	>	mode.resolution_id = resolution_id;
308		mode.bytes_per_row = bytes_per_row;
309	+	mode.depth = depth;
310	+	VideoModes.push_back(mode);
311	+	}
312
313	<	switch (depth) {
314	<	case 1:
315	<	mode.depth = VDEPTH_1BIT;
316	<	break;
317	<	case 2:
318	<	mode.depth = VDEPTH_2BIT;
319	<	break;
320	<	case 4:
321	<	mode.depth = VDEPTH_4BIT;
322	<	break;
323	<	case 8:
374	<	mode.depth = VDEPTH_8BIT;
375	<	break;
376	<	case 15:
377	<	mode.depth = VDEPTH_16BIT;
378	<	break;
379	<	case 16:
380	<	mode.depth = VDEPTH_16BIT;
381	<	break;
382	<	case 24:
383	<	case 32:
384	<	mode.depth = VDEPTH_32BIT;
385	<	break;
386	<	}
313	>	// Add standard list of windowed modes for given color depth
314	>	static void add_window_modes(video_depth depth)
315	>	{
316	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, depth), depth);
317	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, depth), depth);
318	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, depth), depth);
319	>	add_mode(1024, 768, 0x83, TrivialBytesPerRow(1024, depth), depth);
320	>	add_mode(1152, 870, 0x84, TrivialBytesPerRow(1152, depth), depth);
321	>	add_mode(1280, 1024, 0x85, TrivialBytesPerRow(1280, depth), depth);
322	>	add_mode(1600, 1200, 0x86, TrivialBytesPerRow(1600, depth), depth);
323	>	}
324
325	<	VideoModes.push_back(mode);
326	<	VideoMonitor.mode = mode;
325	>	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
326	>	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
327	>	{
328	>	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
329	>	int layout = FLAYOUT_DIRECT;
330	>	if (depth == VDEPTH_16BIT)
331	>	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
332	>	else if (depth == VDEPTH_32BIT)
333	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
334	>	if (native_byte_order)
335	>	MacFrameLayout = layout;
336	>	else
337	>	MacFrameLayout = FLAYOUT_DIRECT;
338	>	VideoMonitor.mac_frame_base = MacFrameBaseMac;
339	>
340	>	// Set variables used by UAE memory banking
341	>	MacFrameBaseHost = the_buffer;
342	>	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
343	>	InitFrameBufferMapping();
344	>	#else
345	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
346	>	D(bug("Host frame buffer = %p, ", the_buffer));
347	>	#endif
348	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
349		}
350
351		// Set window name and class
#	Line 420 \| Line 379 \| static void set_window_focus(Window w)
379		}
380
381		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
382	+	static Atom WM_DELETE_WINDOW = (Atom)0;
383		static void set_window_delete_protocol(Window w)
384		{
385		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 456 \| Line 416 \| *static int error_handler(Display d, XEr**
416		return old_error_handler(d, e);
417		}
418
419	<	// Init window mode
420	<	static bool init_window(int width, int height)
419	>
420	>	/*
421	>	* Display "driver" classes
422	>	*/
423	>
424	>	class driver_base {
425	>	public:
426	>	driver_base();
427	>	virtual ~driver_base();
428	>
429	>	virtual void update_palette(void);
430	>	virtual void suspend(void) {}
431	>	virtual void resume(void) {}
432	>	virtual void toggle_mouse_grab(void) {}
433	>	virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
434	>
435	>	virtual void grab_mouse(void) {}
436	>	virtual void ungrab_mouse(void) {}
437	>
438	>	public:
439	>	bool init_ok; // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
440	>	Window w; // The window we draw into
441	>	};
442	>
443	>	class driver_window;
444	>	static void update_display_window_vosf(driver_window *drv);
445	>	static void update_display_dynamic(int ticker, driver_window *drv);
446	>	static void update_display_static(driver_window *drv);
447	>
448	>	class driver_window : public driver_base {
449	>	friend void update_display_window_vosf(driver_window *drv);
450	>	friend void update_display_dynamic(int ticker, driver_window *drv);
451	>	friend void update_display_static(driver_window *drv);
452	>
453	>	public:
454	>	driver_window(const video_mode &mode);
455	>	~driver_window();
456	>
457	>	void toggle_mouse_grab(void);
458	>	void mouse_moved(int x, int y);
459	>
460	>	void grab_mouse(void);
461	>	void ungrab_mouse(void);
462	>
463	>	private:
464	>	GC gc;
465	>	XImage *img;
466	>	bool have_shm; // Flag: SHM extensions available
467	>	XShmSegmentInfo shminfo;
468	>	Cursor mac_cursor;
469	>	bool mouse_grabbed; // Flag: mouse pointer grabbed, using relative mouse mode
470	>	int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
471	>	};
472	>
473	>	static driver_base *drv = NULL; // Pointer to currently used driver object
474	>
475	>	#ifdef ENABLE_VOSF
476	>	# include "video_vosf.h"
477	>	#endif
478	>
479	>	driver_base::driver_base()
480	>	: init_ok(false), w(0)
481	>	{
482	>	the_buffer = NULL;
483	>	the_buffer_copy = NULL;
484	>	}
485	>
486	>	driver_base::~driver_base()
487	>	{
488	>	ungrab_mouse();
489	>
490	>	if (w) {
491	>	XUnmapWindow(x_display, w);
492	>	wait_unmapped(w);
493	>	XDestroyWindow(x_display, w);
494	>	}
495	>
496	>	XFlush(x_display);
497	>	XSync(x_display, false);
498	>
499	>	// Free frame buffer(s)
500	>	if (!use_vosf) {
501	>	if (the_buffer) {
502	>	free(the_buffer);
503	>	the_buffer = NULL;
504	>	}
505	>	if (the_buffer_copy) {
506	>	free(the_buffer_copy);
507	>	the_buffer_copy = NULL;
508	>	}
509	>	}
510	>	#ifdef ENABLE_VOSF
511	>	else {
512	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
513	>	vm_release(the_buffer, the_buffer_size);
514	>	the_buffer = NULL;
515	>	}
516	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
517	>	vm_release(the_buffer_copy, the_buffer_size);
518	>	the_buffer_copy = NULL;
519	>	}
520	>	}
521	>	#endif
522	>	}
523	>
524	>	// Palette has changed
525	>	void driver_base::update_palette(void)
526		{
527	+	if (cmap[0] && cmap[1]) {
528	+	int num = 256;
529	+	if (IsDirectMode(VideoMonitor.mode))
530	+	num = vis->map_entries; // Palette is gamma table
531	+	else if (color_class == DirectColor)
532	+	return; // Indexed mode on true color screen, don't set CLUT
533	+	XStoreColors(x_display, cmap[0], palette, num);
534	+	XStoreColors(x_display, cmap[1], palette, num);
535	+	}
536	+	XSync(x_display, false);
537	+	}
538	+
539	+
540	+	/*
541	+	* Windowed display driver
542	+	*/
543	+
544	+	// Open display
545	+	driver_window::driver_window(const video_mode &mode)
546	+	: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0)
547	+	{
548	+	int width = mode.x, height = mode.y;
549		int aligned_width = (width + 15) & ~15;
550		int aligned_height = (height + 15) & ~15;
551
552		// Set absolute mouse mode
553	<	ADBSetRelMouseMode(false);
467	<
468	<	// Read frame skip prefs
469	<	frame_skip = PrefsFindInt32("frameskip");
553	>	ADBSetRelMouseMode(mouse_grabbed);
554
555		// Create window
556		XSetWindowAttributes wattr;
557		wattr.event_mask = eventmask = win_eventmask;
558		wattr.background_pixel = black_pixel;
559	<	wattr.colormap = cmap[0];
560	<
561	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
478	<	InputOutput, vis, CWEventMask \| CWBackPixel \| (depth == 8 ? CWColormap : 0), &wattr);
559	>	wattr.colormap = (mode.depth == VDEPTH_1BIT && color_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
560	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
561	>	InputOutput, vis, CWEventMask \| CWBackPixel \| (color_class == PseudoColor \|\| color_class == DirectColor ? CWColormap : 0), &wattr);
562
563		// Set window name/class
564	<	set_window_name(the_win, STR_WINDOW_TITLE);
564	>	set_window_name(w, STR_WINDOW_TITLE);
565
566		// Indicate that we want keyboard input
567	<	set_window_focus(the_win);
567	>	set_window_focus(w);
568
569		// Set delete protocol property
570	<	set_window_delete_protocol(the_win);
570	>	set_window_delete_protocol(w);
571
572		// Make window unresizable
573		{
#	Line 495 \| Line 578 \| static bool init_window(int width, int h
578		hints->min_height = height;
579		hints->max_height = height;
580		hints->flags = PMinSize \| PMaxSize;
581	<	XSetWMNormalHints(x_display, the_win, hints);
581	>	XSetWMNormalHints(x_display, w, hints);
582		XFree(hints);
583		}
584		}
585
586		// Show window
587	<	XMapWindow(x_display, the_win);
588	<	wait_mapped(the_win);
587	>	XMapWindow(x_display, w);
588	>	wait_mapped(w);
589	>
590	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
591	>	// use SHM because that doesn't allow changing the image byte order
592	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
593
594		// Try to create and attach SHM image
595	<	have_shm = false;
509	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
595	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
596
597		// Create SHM image ("height + 2" for safety)
598	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
598	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
599		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT \| 0777);
600		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
601		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 533 \| Line 619 \| static bool init_window(int width, int h
619
620		// Create normal X image if SHM doesn't work ("height + 2" for safety)
621		if (!have_shm) {
622	<	int bytes_per_row = aligned_width;
537	<	switch (depth) {
538	<	case 1:
539	<	bytes_per_row /= 8;
540	<	break;
541	<	case 15:
542	<	case 16:
543	<	bytes_per_row *= 2;
544	<	break;
545	<	case 24:
546	<	case 32:
547	<	bytes_per_row *= 4;
548	<	break;
549	<	}
622	>	int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
623		the_buffer_copy = (uint8 )malloc((aligned_height + 2) bytes_per_row);
624	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
624	>	img = XCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
625		}
626
627	<	// 1-Bit mode is big-endian
555	<	if (depth == 1) {
627	>	if (need_msb_image) {
628		img->byte_order = MSBFirst;
629		img->bitmap_bit_order = MSBFirst;
630		}
#	Line 569 \| Line 641 \| static bool init_window(int width, int h
641		#endif
642
643		// Create GC
644	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
645	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
644	>	gc = XCreateGC(x_display, w, 0, 0);
645	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
646
647		// Create no_cursor
648		mac_cursor = XCreatePixmapCursor(x_display,
649	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
650	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
649	>	XCreatePixmap(x_display, w, 1, 1, 1),
650	>	XCreatePixmap(x_display, w, 1, 1, 1),
651		&black, &white, 0, 0);
652	<	XDefineCursor(x_display, the_win, mac_cursor);
652	>	XDefineCursor(x_display, w, mac_cursor);
653
654	<	// Add resolution and set VideoMonitor
654	>	// Init blitting routines
655		bool native_byte_order;
656		#ifdef WORDS_BIGENDIAN
657		native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#	Line 587 \| Line 659 \| static bool init_window(int width, int h
659		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
660		#endif
661		#ifdef ENABLE_VOSF
662	<	Screen_blitter_init(&visualInfo, native_byte_order);
662	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
663		#endif
664	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
665	<
666	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
667	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
668	<	#else
669	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
664	>
665	>	// Set VideoMonitor
666	>	VideoMonitor.mode = mode;
667	>	set_mac_frame_buffer(mode.depth, native_byte_order);
668	>
669	>	// Everything went well
670	>	init_ok = true;
671	>	}
672	>
673	>	// Close display
674	>	driver_window::~driver_window()
675	>	{
676	>	if (img)
677	>	XDestroyImage(img);
678	>	if (have_shm) {
679	>	XShmDetach(x_display, &shminfo);
680	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
681	>	}
682	>	if (gc)
683	>	XFreeGC(x_display, gc);
684	>	}
685	>
686	>	// Toggle mouse grab
687	>	void driver_window::toggle_mouse_grab(void)
688	>	{
689	>	if (mouse_grabbed)
690	>	ungrab_mouse();
691	>	else
692	>	grab_mouse();
693	>	}
694	>
695	>	// Grab mouse, switch to relative mouse mode
696	>	void driver_window::grab_mouse(void)
697	>	{
698	>	int result;
699	>	for (int i=0; i<10; i++) {
700	>	result = XGrabPointer(x_display, w, True, 0,
701	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
702	>	if (result != AlreadyGrabbed)
703	>	break;
704	>	Delay_usec(100000);
705	>	}
706	>	if (result == GrabSuccess) {
707	>	ADBSetRelMouseMode(mouse_grabbed = true);
708	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
709	>	XSync(x_display, false);
710	>	}
711	>	}
712	>
713	>	// Ungrab mouse, switch to absolute mouse mode
714	>	void driver_window::ungrab_mouse(void)
715	>	{
716	>	if (mouse_grabbed) {
717	>	XUngrabPointer(x_display, CurrentTime);
718	>	XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
719	>	ADBSetRelMouseMode(mouse_grabbed = false);
720	>	}
721	>	}
722	>
723	>	// Mouse moved
724	>	void driver_window::mouse_moved(int x, int y)
725	>	{
726	>	if (!mouse_grabbed) {
727	>	mouse_last_x = x; mouse_last_y = y;
728	>	ADBMouseMoved(x, y);
729	>	return;
730	>	}
731	>
732	>	// Warped mouse motion (this code is taken from SDL)
733	>
734	>	// Post first mouse event
735	>	int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y;
736	>	int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
737	>	mouse_last_x = x; mouse_last_y = y;
738	>	ADBMouseMoved(delta_x, delta_y);
739	>
740	>	// Only warp the pointer when it has reached the edge
741	>	const int MOUSE_FUDGE_FACTOR = 8;
742	>	if (x < MOUSE_FUDGE_FACTOR \|\| x > (width - MOUSE_FUDGE_FACTOR)
743	>	\|\| y < MOUSE_FUDGE_FACTOR \|\| y > (height - MOUSE_FUDGE_FACTOR)) {
744	>	XEvent event;
745	>	while (XCheckTypedEvent(x_display, MotionNotify, &event)) {
746	>	delta_x = x - mouse_last_x; delta_y = y - mouse_last_y;
747	>	mouse_last_x = x; mouse_last_y = y;
748	>	ADBMouseMoved(delta_x, delta_y);
749	>	}
750	>	mouse_last_x = width/2;
751	>	mouse_last_y = height/2;
752	>	XWarpPointer(x_display, None, w, 0, 0, 0, 0, mouse_last_x, mouse_last_y);
753	>	for (int i=0; i<10; i++) {
754	>	XMaskEvent(x_display, PointerMotionMask, &event);
755	>	if (event.xmotion.x > (mouse_last_x - MOUSE_FUDGE_FACTOR)
756	>	&& event.xmotion.x < (mouse_last_x + MOUSE_FUDGE_FACTOR)
757	>	&& event.xmotion.y > (mouse_last_y - MOUSE_FUDGE_FACTOR)
758	>	&& event.xmotion.y < (mouse_last_y + MOUSE_FUDGE_FACTOR))
759	>	break;
760	>	}
761	>	}
762	>	}
763	>
764	>
765	>	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
766	>	/*
767	>	* DGA display driver base class
768	>	*/
769	>
770	>	class driver_dga : public driver_base {
771	>	public:
772	>	driver_dga();
773	>	~driver_dga();
774	>
775	>	void suspend(void);
776	>	void resume(void);
777	>
778	>	private:
779	>	Window suspend_win; // "Suspend" information window
780	>	void *fb_save; // Saved frame buffer for suspend/resume
781	>	};
782	>
783	>	driver_dga::driver_dga()
784	>	: suspend_win(0), fb_save(NULL)
785	>	{
786	>	}
787	>
788	>	driver_dga::~driver_dga()
789	>	{
790	>	XUngrabPointer(x_display, CurrentTime);
791	>	XUngrabKeyboard(x_display, CurrentTime);
792	>	}
793	>
794	>	// Suspend emulation
795	>	void driver_dga::suspend(void)
796	>	{
797	>	// Release ctrl key
798	>	ADBKeyUp(0x36);
799	>	ctrl_down = false;
800	>
801	>	// Lock frame buffer (this will stop the MacOS thread)
802	>	LOCK_FRAME_BUFFER;
803	>
804	>	// Save frame buffer
805	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
806	>	if (fb_save)
807	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
808	>
809	>	// Close full screen display
810	>	#ifdef ENABLE_XF86_DGA
811	>	XF86DGADirectVideo(x_display, screen, 0);
812		#endif
813	<	return true;
813	>	XUngrabPointer(x_display, CurrentTime);
814	>	XUngrabKeyboard(x_display, CurrentTime);
815	>	XUnmapWindow(x_display, w);
816	>	wait_unmapped(w);
817	>
818	>	// Open "suspend" window
819	>	XSetWindowAttributes wattr;
820	>	wattr.event_mask = KeyPressMask;
821	>	wattr.background_pixel = black_pixel;
822	>
823	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
824	>	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
825	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
826	>	set_window_focus(suspend_win);
827	>	XMapWindow(x_display, suspend_win);
828	>	emul_suspended = true;
829		}
830
831	<	// Init fbdev DGA display
832	<	static bool init_fbdev_dga(char *in_fb_name)
831	>	// Resume emulation
832	>	void driver_dga::resume(void)
833		{
834	+	// Close "suspend" window
835	+	XDestroyWindow(x_display, suspend_win);
836	+	XSync(x_display, false);
837	+
838	+	// Reopen full screen display
839	+	XMapRaised(x_display, w);
840	+	wait_mapped(w);
841	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
842	+	XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
843	+	XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
844	+	#ifdef ENABLE_XF86_DGA
845	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
846	+	XF86DGASetViewPort(x_display, screen, 0, 0);
847	+	#endif
848	+	XSync(x_display, false);
849	+
850	+	// the_buffer already contains the data to restore. i.e. since a temporary
851	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
852	+	// not necessary.
853	+	#ifdef ENABLE_VOSF
854	+	if (use_vosf) {
855	+	LOCK_VOSF;
856	+	PFLAG_SET_ALL;
857	+	UNLOCK_VOSF;
858	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
859	+	}
860	+	#endif
861	+
862	+	// Restore frame buffer
863	+	if (fb_save) {
864	+	#ifdef ENABLE_VOSF
865	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
866	+	if (!use_vosf)
867	+	#endif
868	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
869	+	free(fb_save);
870	+	fb_save = NULL;
871	+	}
872	+
873	+	// Unlock frame buffer (and continue MacOS thread)
874	+	UNLOCK_FRAME_BUFFER;
875	+	emul_suspended = false;
876	+	}
877	+	#endif
878	+
879	+
880		#ifdef ENABLE_FBDEV_DGA
881	+	/*
882	+	* fbdev DGA display driver
883	+	*/
884	+
885	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
886	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
887	+
888	+	class driver_fbdev : public driver_dga {
889	+	public:
890	+	driver_fbdev(const video_mode &mode);
891	+	~driver_fbdev();
892	+	};
893	+
894	+	// Open display
895	+	driver_fbdev::driver_fbdev(const video_mode &mode)
896	+	{
897	+	int width = mode.x, height = mode.y;
898	+
899	+	// Set absolute mouse mode
900	+	ADBSetRelMouseMode(false);
901	+
902		// Find the maximum depth available
903		int ndepths, max_depth(0);
904		int *depths = XListDepths(x_display, screen, &ndepths);
905		if (depths == NULL) {
906		printf("FATAL: Could not determine the maximal depth available\n");
907	<	return false;
907	>	return;
908		} else {
909		while (ndepths-- > 0) {
910		if (depths[ndepths] > max_depth)
#	Line 625 \| Line 921 \| *static bool init_fbdev_dga(char in_fb_n**
921		char str[256];
922		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
923		ErrorAlert(str);
924	<	return false;
924	>	return;
925		}
926
927		int fb_depth; // supported depth
#	Line 645 \| Line 941 \| *static bool init_fbdev_dga(char in_fb_n**
941		continue;
942
943		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
944	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
944	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
945		device_found = true;
946		break;
947		}
#	Line 657 \| Line 953 \| *static bool init_fbdev_dga(char in_fb_n**
953		// Frame buffer name not found ? Then, display warning
954		if (!device_found) {
955		char str[256];
956	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
956	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
957		ErrorAlert(str);
958	<	return false;
958	>	return;
959		}
960
665	–	int width = DisplayWidth(x_display, screen);
666	–	int height = DisplayHeight(x_display, screen);
667	–	depth = fb_depth; // max_depth
668	–
669	–	// Set relative mouse mode
670	–	ADBSetRelMouseMode(false);
671	–
961		// Create window
962		XSetWindowAttributes wattr;
963		wattr.event_mask = eventmask = dga_eventmask;
#	Line 676 \| Line 965 \| *static bool init_fbdev_dga(char in_fb_n**
965		wattr.override_redirect = True;
966		wattr.colormap = cmap[0];
967
968	<	the_win = XCreateWindow(x_display, rootwin,
968	>	w = XCreateWindow(x_display, rootwin,
969		0, 0, width, height,
970		0, xdepth, InputOutput, vis,
971	<	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (depth == 8 ? CWColormap : 0),
971	>	CWEventMask \| CWBackPixel \| CWOverrideRedirect \| (fb_depth <= 8 ? CWColormap : 0),
972		&wattr);
973
974		// Set window name/class
975	<	set_window_name(the_win, STR_WINDOW_TITLE);
975	>	set_window_name(w, STR_WINDOW_TITLE);
976
977		// Indicate that we want keyboard input
978	<	set_window_focus(the_win);
978	>	set_window_focus(w);
979
980		// Show window
981	<	XMapRaised(x_display, the_win);
982	<	wait_mapped(the_win);
981	>	XMapRaised(x_display, w);
982	>	wait_mapped(w);
983
984		// Grab mouse and keyboard
985	<	XGrabKeyboard(x_display, the_win, True,
985	>	XGrabKeyboard(x_display, w, True,
986		GrabModeAsync, GrabModeAsync, CurrentTime);
987	<	XGrabPointer(x_display, the_win, True,
987	>	XGrabPointer(x_display, w, True,
988		PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask,
989	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
989	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
990
991	<	// Set VideoMonitor
992	<	int bytes_per_row = width;
704	<	switch (depth) {
705	<	case 1:
706	<	bytes_per_row = ((width \| 7) & ~7) >> 3;
707	<	break;
708	<	case 15:
709	<	case 16:
710	<	bytes_per_row *= 2;
711	<	break;
712	<	case 24:
713	<	case 32:
714	<	bytes_per_row *= 4;
715	<	break;
716	<	}
991	>	// Calculate bytes per row
992	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
993
994	+	// Map frame buffer
995		if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
996		if ((the_buffer = (uint8 ) mmap(NULL, height bytes_per_row, PROT_READ \| PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
997		char str[256];
998		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
999		ErrorAlert(str);
1000	<	return false;
1000	>	return;
1001		}
1002		}
1003
#	Line 728 \| Line 1005 \| *static bool init_fbdev_dga(char in_fb_n**
1005		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1006		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1007		// i.e. the framebuffer update function is not Blit_Copy_Raw
1008	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1008	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1009
1010		if (use_vosf) {
1011		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 742 \| Line 1019 \| *static bool init_fbdev_dga(char in_fb_n**
1019		#endif
1020		#endif
1021
1022	<	set_video_monitor(width, height, bytes_per_row, true);
1023	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1024	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1025	<	#else
1026	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1027	<	#endif
1028	<	return true;
1029	<	#else
753	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
754	<	return false;
755	<	#endif
1022	>	// Set VideoMonitor
1023	>	VideoModes[0].bytes_per_row = bytes_per_row;
1024	>	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
1025	>	VideoMonitor.mode = mode;
1026	>	set_mac_frame_buffer(mode.depth, true);
1027	>
1028	>	// Everything went well
1029	>	init_ok = true;
1030		}
1031
1032	<	// Init XF86 DGA display
1033	<	static bool init_xf86_dga(int width, int height)
1032	>	// Close display
1033	>	driver_fbdev::~driver_fbdev()
1034		{
1035	+	}
1036	+	#endif
1037	+
1038	+
1039		#ifdef ENABLE_XF86_DGA
1040	+	/*
1041	+	* XFree86 DGA display driver
1042	+	*/
1043	+
1044	+	class driver_xf86dga : public driver_dga {
1045	+	public:
1046	+	driver_xf86dga(const video_mode &mode);
1047	+	~driver_xf86dga();
1048	+
1049	+	void update_palette(void);
1050	+	void resume(void);
1051	+
1052	+	private:
1053	+	int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap
1054	+	};
1055	+
1056	+	// Open display
1057	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
1058	+	: current_dga_cmap(0)
1059	+	{
1060	+	int width = mode.x, height = mode.y;
1061	+
1062		// Set relative mouse mode
1063		ADBSetRelMouseMode(true);
1064
#	Line 783 \| Line 1083 \| static bool init_xf86_dga(int width, int
1083		wattr.event_mask = eventmask = dga_eventmask;
1084		wattr.override_redirect = True;
1085
1086	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1086	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1087		InputOutput, vis, CWEventMask \| CWOverrideRedirect, &wattr);
1088
1089		// Set window name/class
1090	<	set_window_name(the_win, STR_WINDOW_TITLE);
1090	>	set_window_name(w, STR_WINDOW_TITLE);
1091
1092		// Indicate that we want keyboard input
1093	<	set_window_focus(the_win);
1093	>	set_window_focus(w);
1094
1095		// Show window
1096	<	XMapRaised(x_display, the_win);
1097	<	wait_mapped(the_win);
1096	>	XMapRaised(x_display, w);
1097	>	wait_mapped(w);
1098
1099		// Establish direct screen connection
1100	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
1100	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
1101		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1102		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1103		XGrabPointer(x_display, rootwin, True, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 809 \| Line 1109 \| static bool init_xf86_dga(int width, int
1109		XF86DGASetVidPage(x_display, screen, 0);
1110
1111		// Set colormap
1112	<	if (depth == 8) {
1113	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
1112	>	if (!IsDirectMode(mode)) {
1113	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
1114		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1115		}
1116		XSync(x_display, false);
1117
1118	<	// Set VideoMonitor
1119	<	int bytes_per_row = (v_width + 7) & ~7;
820	<	switch (depth) {
821	<	case 1:
822	<	bytes_per_row /= 8;
823	<	break;
824	<	case 15:
825	<	case 16:
826	<	bytes_per_row *= 2;
827	<	break;
828	<	case 24:
829	<	case 32:
830	<	bytes_per_row *= 4;
831	<	break;
832	<	}
833	<
1118	>	// Init blitting routines
1119	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1120		#ifdef VIDEO_VOSF
1121		#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1122		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1123		// i.e. the framebuffer update function is not Blit_Copy_Raw
1124	<	use_vosf = Screen_blitter_init(&visualInfo, true);
1124	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1125
1126		if (use_vosf) {
1127		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 849 \| Line 1135 \| static bool init_xf86_dga(int width, int
1135		#endif
1136		#endif
1137
1138	<	set_video_monitor(width, height, bytes_per_row, true);
1139	<	#if REAL_ADDRESSING \|\| DIRECT_ADDRESSING
1140	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
1141	<	// MacFrameLayout = FLAYOUT_DIRECT;
1142	<	#else
1143	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
1144	<	#endif
1145	<	return true;
1146	<	#else
1147	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
1148	<	return false;
1138	>	// Set VideoMonitor
1139	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1140	>	VideoMonitor.mode = mode;
1141	>	set_mac_frame_buffer(mode.depth, true);
1142	>
1143	>	// Everything went well
1144	>	init_ok = true;
1145	>	}
1146	>
1147	>	// Close display
1148	>	driver_xf86dga::~driver_xf86dga()
1149	>	{
1150	>	XF86DGADirectVideo(x_display, screen, 0);
1151	>	#ifdef ENABLE_XF86_VIDMODE
1152	>	if (has_vidmode)
1153	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1154		#endif
1155		}
1156
1157	+	// Palette has changed
1158	+	void driver_xf86dga::update_palette(void)
1159	+	{
1160	+	driver_dga::update_palette();
1161	+	current_dga_cmap ^= 1;
1162	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
1163	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1164	+	}
1165	+
1166	+	// Resume emulation
1167	+	void driver_xf86dga::resume(void)
1168	+	{
1169	+	driver_dga::resume();
1170	+	if (!IsDirectMode(VideoMonitor.mode))
1171	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1172	+	}
1173	+	#endif
1174	+
1175	+
1176	+	/*
1177	+	* Initialization
1178	+	*/
1179	+
1180		// Init keycode translation table
1181		static void keycode_init(void)
1182		{
#	Line 928 \| Line 1242 \| static void keycode_init(void)
1242		}
1243		}
1244
1245	<	bool VideoInitBuffer()
1245	>	// Open display for specified mode
1246	>	static bool video_open(const video_mode &mode)
1247		{
1248	<	#ifdef ENABLE_VOSF
1249	<	if (use_vosf) {
1250	<	const uint32 page_size = getpagesize();
1251	<	const uint32 page_mask = page_size - 1;
1252	<
938	<	mainBuffer.memBase = (uintptr) the_buffer;
939	<	// Align the frame buffer on page boundary
940	<	mainBuffer.memStart = (uintptr)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
941	<	mainBuffer.memLength = the_buffer_size;
942	<	mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength;
943	<
944	<	mainBuffer.pageSize = page_size;
945	<	mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
946	<	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
1248	>	// Find best available X visual
1249	>	if (!find_visual_for_depth(mode.depth)) {
1250	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1251	>	return false;
1252	>	}
1253
1254	<	if (mainBuffer.dirtyPages != 0)
1255	<	free(mainBuffer.dirtyPages);
1254	>	// Create color maps
1255	>	if (color_class == PseudoColor \|\| color_class == DirectColor) {
1256	>	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1257	>	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1258	>	}
1259
1260	<	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
1260	>	// Find pixel format of direct modes
1261	>	if (color_class == DirectColor \|\| color_class == TrueColor) {
1262	>	rshift = gshift = bshift = 0;
1263	>	rloss = gloss = bloss = 8;
1264	>	uint32 mask;
1265	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1266	>	++rshift;
1267	>	for (; mask&1; mask>>=1)
1268	>	--rloss;
1269	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1270	>	++gshift;
1271	>	for (; mask&1; mask>>=1)
1272	>	--gloss;
1273	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1274	>	++bshift;
1275	>	for (; mask&1; mask>>=1)
1276	>	--bloss;
1277	>	}
1278	>
1279	>	// Preset palette pixel values for gamma table
1280	>	if (color_class == DirectColor) {
1281	>	int num = vis->map_entries;
1282	>	for (int i=0; i<num; i++) {
1283	>	int c = (i * 256) / num;
1284	>	palette[i].pixel = map_rgb(c, c, c);
1285	>	}
1286	>	}
1287
1288	<	if (mainBuffer.pageInfo != 0)
1289	<	free(mainBuffer.pageInfo);
1288	>	// Load gray ramp to color map
1289	>	int num = (color_class == DirectColor ? vis->map_entries : 256);
1290	>	for (int i=0; i<num; i++) {
1291	>	int c = (i * 256) / num;
1292	>	palette[i].red = c * 0x0101;
1293	>	palette[i].green = c * 0x0101;
1294	>	palette[i].blue = c * 0x0101;
1295	>	if (color_class == PseudoColor)
1296	>	palette[i].pixel = i;
1297	>	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1298	>	}
1299	>	if (cmap[0] && cmap[1]) {
1300	>	XStoreColors(x_display, cmap[0], palette, num);
1301	>	XStoreColors(x_display, cmap[1], palette, num);
1302	>	}
1303
1304	<	mainBuffer.pageInfo = (ScreenPageInfo ) malloc(mainBuffer.pageCount sizeof(ScreenPageInfo));
1304	>	#ifdef ENABLE_VOSF
1305	>	// Load gray ramp to 8->16/32 expand map
1306	>	if (!IsDirectMode(mode) && (color_class == TrueColor \|\| color_class == DirectColor))
1307	>	for (int i=0; i<256; i++)
1308	>	ExpandMap[i] = map_rgb(i, i, i);
1309	>	#endif
1310
1311	<	if ((mainBuffer.dirtyPages == 0) \|\| (mainBuffer.pageInfo == 0))
1312	<	return false;
1313	<
1314	<	mainBuffer.dirty = false;
1311	>	// Create display driver object of requested type
1312	>	switch (display_type) {
1313	>	case DISPLAY_WINDOW:
1314	>	drv = new driver_window(mode);
1315	>	break;
1316	>	#ifdef ENABLE_FBDEV_DGA
1317	>	case DISPLAY_DGA:
1318	>	drv = new driver_fbdev(mode);
1319	>	break;
1320	>	#endif
1321	>	#ifdef ENABLE_XF86_DGA
1322	>	case DISPLAY_DGA:
1323	>	drv = new driver_xf86dga(mode);
1324	>	break;
1325	>	#endif
1326	>	}
1327	>	if (drv == NULL)
1328	>	return false;
1329	>	if (!drv->init_ok) {
1330	>	delete drv;
1331	>	drv = NULL;
1332	>	return false;
1333	>	}
1334
1335	<	PFLAG_CLEAR_ALL;
1336	<	// Safety net to insure the loops in the update routines will terminate
1337	<	// See a discussion in <video_vosf.h> for further details
1338	<	PFLAG_CLEAR(mainBuffer.pageCount);
1339	<	PFLAG_SET(mainBuffer.pageCount+1);
1340	<
969	<	uint32 a = 0;
970	<	for (int i = 0; i < mainBuffer.pageCount; i++) {
971	<	int y1 = a / VideoMonitor.mode.bytes_per_row;
972	<	if (y1 >= VideoMonitor.mode.y)
973	<	y1 = VideoMonitor.mode.y - 1;
974	<
975	<	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.mode.bytes_per_row;
976	<	if (y2 >= VideoMonitor.mode.y)
977	<	y2 = VideoMonitor.mode.y - 1;
978	<
979	<	mainBuffer.pageInfo[i].top = y1;
980	<	mainBuffer.pageInfo[i].bottom = y2;
981	<
982	<	a += mainBuffer.pageSize;
983	<	if (a > mainBuffer.memLength)
984	<	a = mainBuffer.memLength;
1335	>	#ifdef ENABLE_VOSF
1336	>	if (use_vosf) {
1337	>	// Initialize the mainBuffer structure
1338	>	if (!video_init_buffer()) {
1339	>	ErrorAlert(STR_VOSF_INIT_ERR);
1340	>	return false;
1341		}
1342	<
1343	<	// We can now write-protect the frame buffer
1344	<	if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0)
1342	>
1343	>	// Initialize the handler for SIGSEGV
1344	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1345	>	ErrorAlert("Could not initialize Video on SEGV signals");
1346		return false;
1347	+	}
1348	+	}
1349	+	#endif
1350	+
1351	+	// Initialize VideoRefresh function
1352	+	VideoRefreshInit();
1353	+
1354	+	// Lock down frame buffer
1355	+	XSync(x_display, false);
1356	+	LOCK_FRAME_BUFFER;
1357	+
1358	+	// Start redraw/input thread
1359	+	#ifdef HAVE_PTHREADS
1360	+	redraw_thread_cancel = false;
1361	+	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1362	+	if (!redraw_thread_active) {
1363	+	printf("FATAL: cannot create redraw thread\n");
1364	+	return false;
1365		}
1366	+	#else
1367	+	redraw_thread_active = true;
1368		#endif
1369	+
1370		return true;
1371		}
1372
1373		bool VideoInit(bool classic)
1374		{
1375	+	classic_mode = classic;
1376	+
1377		#ifdef ENABLE_VOSF
998	–	// Open /dev/zero
999	–	zero_fd = open("/dev/zero", O_RDWR);
1000	–	if (zero_fd < 0) {
1001	–	char str[256];
1002	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
1003	–	ErrorAlert(str);
1004	–	return false;
1005	–	}
1006	–
1378		// Zero the mainBuffer structure
1379	<	mainBuffer.dirtyPages = 0;
1380	<	mainBuffer.pageInfo = 0;
1379	>	mainBuffer.dirtyPages = NULL;
1380	>	mainBuffer.pageInfo = NULL;
1381		#endif
1382
1383		// Check if X server runs on local machine
#	Line 1017 \| Line 1388 \| bool VideoInit(bool classic)
1388		keycode_init();
1389
1390		// Read prefs
1391	+	frame_skip = PrefsFindInt32("frameskip");
1392		mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1393		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1394
1395		// Find screen and root window
1396		screen = XDefaultScreen(x_display);
1397		rootwin = XRootWindow(x_display, screen);
1398	<
1399	<	// Get screen depth
1400	<	xdepth = DefaultDepth(x_display, screen);
1398	>
1399	>	// Get sorted list of available depths
1400	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1401	>	if (avail_depths == NULL) {
1402	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1403	>	return false;
1404	>	}
1405	>	sort(avail_depths, avail_depths + num_depths);
1406
1407		#ifdef ENABLE_FBDEV_DGA
1408		// Frame buffer name
1409		char fb_name[20];
1410
1411	<	// Could do fbdev dga ?
1411	>	// Could do fbdev DGA?
1412		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1413		has_dga = true;
1414		else
#	Line 1065 \| Line 1442 \| bool VideoInit(bool classic)
1442		black_pixel = BlackPixel(x_display, screen);
1443		white_pixel = WhitePixel(x_display, screen);
1444
1068	–	// Get appropriate visual
1069	–	int color_class;
1070	–	switch (xdepth) {
1071	–	case 1:
1072	–	color_class = StaticGray;
1073	–	break;
1074	–	case 8:
1075	–	color_class = PseudoColor;
1076	–	break;
1077	–	case 15:
1078	–	case 16:
1079	–	case 24:
1080	–	case 32:
1081	–	color_class = TrueColor;
1082	–	break;
1083	–	default:
1084	–	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1085	–	return false;
1086	–	}
1087	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1088	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1089	–	return false;
1090	–	}
1091	–	if (visualInfo.depth != xdepth) {
1092	–	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1093	–	return false;
1094	–	}
1095	–	vis = visualInfo.visual;
1096	–
1097	–	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1098	–	classic_mode = classic;
1099	–	if (classic)
1100	–	depth = 1;
1101	–	else
1102	–	depth = xdepth;
1103	–
1104	–	// Create color maps for 8 bit mode
1105	–	if (depth == 8) {
1106	–	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1107	–	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1108	–	XInstallColormap(x_display, cmap[0]);
1109	–	XInstallColormap(x_display, cmap[1]);
1110	–	}
1111	–
1445		// Get screen mode from preferences
1446		const char *mode_str;
1447	<	if (classic)
1447	>	if (classic_mode)
1448		mode_str = "win/512/342";
1449		else
1450		mode_str = PrefsFindString("screen");
1451
1452	<	// Determine type and mode
1453	<	int width = 512, height = 384;
1452	>	// Determine display type and default dimensions
1453	>	int default_width = 512, default_height = 384;
1454		display_type = DISPLAY_WINDOW;
1455		if (mode_str) {
1456	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1456	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1457		display_type = DISPLAY_WINDOW;
1458		#ifdef ENABLE_FBDEV_DGA
1459	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1460	<	#else
1461	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1459	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1460	>	display_type = DISPLAY_DGA;
1461	>	default_width = -1; default_height = -1; // use entire screen
1462		#endif
1463	+	#ifdef ENABLE_XF86_DGA
1464	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1465		display_type = DISPLAY_DGA;
1466	<	if (width > DisplayWidth(x_display, screen))
1467	<	width = DisplayWidth(x_display, screen);
1133	<	if (height > DisplayHeight(x_display, screen))
1134	<	height = DisplayHeight(x_display, screen);
1135	<	}
1136	<	if (width <= 0)
1137	<	width = DisplayWidth(x_display, screen);
1138	<	if (height <= 0)
1139	<	height = DisplayHeight(x_display, screen);
1466	>	#endif
1467	>	}
1468		}
1469	<
1470	<	// Initialize according to display type
1471	<	switch (display_type) {
1472	<	case DISPLAY_WINDOW:
1473	<	if (!init_window(width, height))
1474	<	return false;
1469	>	if (default_width <= 0)
1470	>	default_width = DisplayWidth(x_display, screen);
1471	>	else if (default_width > DisplayWidth(x_display, screen))
1472	>	default_width = DisplayWidth(x_display, screen);
1473	>	if (default_height <= 0)
1474	>	default_height = DisplayHeight(x_display, screen);
1475	>	else if (default_height > DisplayHeight(x_display, screen))
1476	>	default_height = DisplayHeight(x_display, screen);
1477	>
1478	>	// Mac screen depth follows X depth
1479	>	video_depth default_depth = VDEPTH_1BIT;
1480	>	switch (DefaultDepth(x_display, screen)) {
1481	>	case 8:
1482	>	default_depth = VDEPTH_8BIT;
1483		break;
1484	<	case DISPLAY_DGA:
1485	<	#ifdef ENABLE_FBDEV_DGA
1486	<	if (!init_fbdev_dga(fb_name))
1487	<	#else
1488	<	if (!init_xf86_dga(width, height))
1153	<	#endif
1154	<	return false;
1484	>	case 15: case 16:
1485	>	default_depth = VDEPTH_16BIT;
1486	>	break;
1487	>	case 24: case 32:
1488	>	default_depth = VDEPTH_32BIT;
1489		break;
1490		}
1491
1492	<	// Lock down frame buffer
1493	<	LOCK_FRAME_BUFFER;
1494	<
1495	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1496	<	// Set variables for UAE memory mapping
1497	<	MacFrameBaseHost = the_buffer;
1498	<	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
1499	<
1500	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1167	<	if (classic)
1168	<	MacFrameLayout = FLAYOUT_NONE;
1169	<	#endif
1170	<
1171	<	#ifdef ENABLE_VOSF
1172	<	if (use_vosf) {
1173	<	// Initialize the mainBuffer structure
1174	<	if (!VideoInitBuffer()) {
1175	<	// TODO: STR_VOSF_INIT_ERR ?
1176	<	ErrorAlert("Could not initialize Video on SEGV signals");
1177	<	return false;
1492	>	// Construct list of supported modes
1493	>	if (display_type == DISPLAY_WINDOW) {
1494	>	if (classic)
1495	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1496	>	else {
1497	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1498	>	if (find_visual_for_depth(video_depth(d)))
1499	>	add_window_modes(video_depth(d));
1500	>	}
1501		}
1502	+	} else
1503	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1504	+	if (VideoModes.empty()) {
1505	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1506	+	return false;
1507	+	}
1508	+	video_init_depth_list();
1509
1510	<	// Initialize the handler for SIGSEGV
1511	<	if (!sigsegv_install_handler(screen_fault_handler)) {
1512	<	// TODO: STR_VOSF_INIT_ERR ?
1513	<	ErrorAlert("Could not initialize Video on SEGV signals");
1514	<	return false;
1515	<	}
1510	>	#if DEBUG
1511	>	D(bug("Available video modes:\n"));
1512	>	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
1513	>	while (i != end) {
1514	>	int bits = 1 << i->depth;
1515	>	if (bits == 16)
1516	>	bits = 15;
1517	>	else if (bits == 32)
1518	>	bits = 24;
1519	>	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1520	>	++i;
1521		}
1522		#endif
1188	–
1189	–	// Initialize VideoRefresh function
1190	–	VideoRefreshInit();
1191	–
1192	–	XSync(x_display, false);
1523
1524	<	#ifdef HAVE_PTHREADS
1525	<	// Start redraw/input thread
1526	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1527	<	if (!redraw_thread_active) {
1528	<	printf("FATAL: cannot create redraw thread\n");
1529	<	return false;
1524	>	// Find requested default mode and open display
1525	>	if (VideoModes.size() == 1)
1526	>	return video_open(VideoModes[0]);
1527	>	else {
1528	>	// Find mode with specified dimensions
1529	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1530	>	for (i = VideoModes.begin(); i != end; ++i) {
1531	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1532	>	return video_open(*i);
1533	>	}
1534	>	return video_open(VideoModes[0]);
1535		}
1201	–	#endif
1202	–	return true;
1536		}
1537
1538
#	Line 1207 \| Line 1540 \| bool VideoInit(bool classic)
1540		* Deinitialization
1541		*/
1542
1543	<	void VideoExit(void)
1543	>	// Close display
1544	>	static void video_close(void)
1545		{
1212	–	#ifdef HAVE_PTHREADS
1546		// Stop redraw thread
1547	+	#ifdef HAVE_PTHREADS
1548		if (redraw_thread_active) {
1549		redraw_thread_cancel = true;
1550		#ifdef HAVE_PTHREAD_CANCEL
1551		pthread_cancel(redraw_thread);
1552		#endif
1553		pthread_join(redraw_thread, NULL);
1220	–	redraw_thread_active = false;
1554		}
1555		#endif
1556	+	redraw_thread_active = false;
1557
1558		// Unlock frame buffer
1559		UNLOCK_FRAME_BUFFER;
1560	+	XSync(x_display, false);
1561
1227	–	// Close window and server connection
1228	–	if (x_display != NULL) {
1229	–	XSync(x_display, false);
1230	–
1231	–	#ifdef ENABLE_XF86_DGA
1232	–	if (display_type == DISPLAY_DGA) {
1233	–	XF86DGADirectVideo(x_display, screen, 0);
1234	–	XUngrabPointer(x_display, CurrentTime);
1235	–	XUngrabKeyboard(x_display, CurrentTime);
1236	–	}
1237	–	#endif
1238	–
1239	–	#ifdef ENABLE_XF86_VIDMODE
1240	–	if (has_vidmode && display_type == DISPLAY_DGA)
1241	–	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1242	–	#endif
1243	–
1244	–	#ifdef ENABLE_FBDEV_DGA
1245	–	if (display_type == DISPLAY_DGA) {
1246	–	XUngrabPointer(x_display, CurrentTime);
1247	–	XUngrabKeyboard(x_display, CurrentTime);
1248	–	close(fbdev_fd);
1249	–	}
1250	–	#endif
1251	–
1252	–	XFlush(x_display);
1253	–	XSync(x_display, false);
1254	–	if (depth == 8) {
1255	–	XFreeColormap(x_display, cmap[0]);
1256	–	XFreeColormap(x_display, cmap[1]);
1257	–	}
1258	–
1259	–	if (!use_vosf) {
1260	–	if (the_buffer) {
1261	–	free(the_buffer);
1262	–	the_buffer = NULL;
1263	–	}
1264	–
1265	–	if (!have_shm && the_buffer_copy) {
1266	–	free(the_buffer_copy);
1267	–	the_buffer_copy = NULL;
1268	–	}
1269	–	}
1270	–	#ifdef ENABLE_VOSF
1271	–	else {
1272	–	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
1273	–	vm_release(the_buffer, the_buffer_size);
1274	–	the_buffer = 0;
1275	–	}
1276	–
1277	–	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
1278	–	vm_release(the_buffer_copy, the_buffer_size);
1279	–	the_buffer_copy = 0;
1280	–	}
1281	–	}
1282	–	#endif
1283	–	}
1284	–
1562		#ifdef ENABLE_VOSF
1563	+	// Deinitialize VOSF
1564		if (use_vosf) {
1287	–	// Clear mainBuffer data
1565		if (mainBuffer.pageInfo) {
1566		free(mainBuffer.pageInfo);
1567	<	mainBuffer.pageInfo = 0;
1567	>	mainBuffer.pageInfo = NULL;
1568		}
1292	–
1569		if (mainBuffer.dirtyPages) {
1570		free(mainBuffer.dirtyPages);
1571	<	mainBuffer.dirtyPages = 0;
1571	>	mainBuffer.dirtyPages = NULL;
1572		}
1573		}
1574	+	#endif
1575	+
1576	+	// Close display
1577	+	delete drv;
1578	+	drv = NULL;
1579	+
1580	+	// Free colormaps
1581	+	if (cmap[0]) {
1582	+	XFreeColormap(x_display, cmap[0]);
1583	+	cmap[0] = 0;
1584	+	}
1585	+	if (cmap[1]) {
1586	+	XFreeColormap(x_display, cmap[1]);
1587	+	cmap[1] = 0;
1588	+	}
1589	+	}
1590	+
1591	+	void VideoExit(void)
1592	+	{
1593	+	// Close display
1594	+	video_close();
1595	+
1596	+	#ifdef ENABLE_XF86_VIDMODE
1597	+	// Free video mode list
1598	+	if (x_video_modes) {
1599	+	XFree(x_video_modes);
1600	+	x_video_modes = NULL;
1601	+	}
1602	+	#endif
1603
1604	<	// Close /dev/zero
1605	<	if (zero_fd > 0)
1606	<	close(zero_fd);
1604	>	#ifdef ENABLE_FBDEV_DGA
1605	>	// Close framebuffer device
1606	>	if (fbdev_fd >= 0) {
1607	>	close(fbdev_fd);
1608	>	fbdev_fd = -1;
1609	>	}
1610		#endif
1611	+
1612	+	// Free depth list
1613	+	if (avail_depths) {
1614	+	XFree(avail_depths);
1615	+	avail_depths = NULL;
1616	+	}
1617		}
1618
1619
#	Line 1310 \| Line 1624 \| void VideoExit(void)
1624		void VideoQuitFullScreen(void)
1625		{
1626		D(bug("VideoQuitFullScreen()\n"));
1627	<	if (display_type == DISPLAY_DGA)
1314	<	quit_full_screen = true;
1627	>	quit_full_screen = true;
1628		}
1629
1630
#	Line 1336 \| Line 1649 \| void VideoInterrupt(void)
1649		* Set palette
1650		*/
1651
1652	<	void video_set_palette(uint8 *pal)
1652	>	void video_set_palette(uint8 *pal, int num_in)
1653		{
1654		LOCK_PALETTE;
1655
1656		// Convert colors to XColor array
1657	<	for (int i=0; i<256; i++) {
1658	<	palette[i].pixel = i;
1659	<	palette[i].red = pal[i3] 0x0101;
1660	<	palette[i].green = pal[i3+1] 0x0101;
1661	<	palette[i].blue = pal[i3+2] 0x0101;
1662	<	palette[i].flags = DoRed \| DoGreen \| DoBlue;
1657	>	int num_out = 256;
1658	>	if (IsDirectMode(VideoMonitor.mode)) {
1659	>	// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1660	>	num_out = vis->map_entries;
1661	>	}
1662	>	XColor *p = palette;
1663	>	for (int i=0; i<num_out; i++) {
1664	>	int c = (i * num_in) / num_out;
1665	>	p->red = pal[c3 + 0] 0x0101;
1666	>	p->green = pal[c3 + 1] 0x0101;
1667	>	p->blue = pal[c3 + 2] 0x0101;
1668	>	if (color_class == PseudoColor)
1669	>	p->pixel = i;
1670	>	p->flags = DoRed \| DoGreen \| DoBlue;
1671	>	p++;
1672		}
1673
1674	+	#ifdef ENABLE_VOSF
1675	+	// Recalculate pixel color expansion map
1676	+	if (!IsDirectMode(VideoMonitor.mode) && (color_class == TrueColor \|\| color_class == DirectColor)) {
1677	+	for (int i=0; i<256; i++) {
1678	+	int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1679	+	ExpandMap[i] = map_rgb(pal[c3+0], pal[c3+1], pal[c*3+2]);
1680	+	}
1681	+
1682	+	// We have to redraw everything because the interpretation of pixel values changed
1683	+	LOCK_VOSF;
1684	+	PFLAG_SET_ALL;
1685	+	UNLOCK_VOSF;
1686	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1687	+	}
1688	+	#endif
1689	+
1690		// Tell redraw thread to change palette
1691		palette_changed = true;
1692
#	Line 1362 \| Line 1700 \| *void video_set_palette(uint8 pal)**
1700
1701		void video_switch_to_mode(const video_mode &mode)
1702		{
1703	<	}
1704	<
1705	<
1368	<	/*
1369	<	* Suspend/resume emulator
1370	<	*/
1371	<
1372	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1373	<	static void suspend_emul(void)
1374	<	{
1375	<	if (display_type == DISPLAY_DGA) {
1376	<	// Release ctrl key
1377	<	ADBKeyUp(0x36);
1378	<	ctrl_down = false;
1379	<
1380	<	// Lock frame buffer (this will stop the MacOS thread)
1381	<	LOCK_FRAME_BUFFER;
1382	<
1383	<	// Save frame buffer
1384	<	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1385	<	if (fb_save)
1386	<	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1387	<
1388	<	// Close full screen display
1389	<	#ifdef ENABLE_XF86_DGA
1390	<	XF86DGADirectVideo(x_display, screen, 0);
1391	<	#endif
1392	<	XUngrabPointer(x_display, CurrentTime);
1393	<	XUngrabKeyboard(x_display, CurrentTime);
1394	<	XUnmapWindow(x_display, the_win);
1395	<	wait_unmapped(the_win);
1396	<
1397	<	// Open "suspend" window
1398	<	XSetWindowAttributes wattr;
1399	<	wattr.event_mask = KeyPressMask;
1400	<	wattr.background_pixel = black_pixel;
1401	<
1402	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1403	<	InputOutput, vis, CWEventMask \| CWBackPixel, &wattr);
1404	<	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1405	<	set_window_focus(suspend_win);
1406	<	XMapWindow(x_display, suspend_win);
1407	<	emul_suspended = true;
1408	<	}
1409	<	}
1703	>	// Close and reopen display
1704	>	video_close();
1705	>	video_open(mode);
1706
1707	<	static void resume_emul(void)
1708	<	{
1709	<	// Close "suspend" window
1414	<	XDestroyWindow(x_display, suspend_win);
1415	<	XSync(x_display, false);
1416	<
1417	<	// Reopen full screen display
1418	<	XMapRaised(x_display, the_win);
1419	<	wait_mapped(the_win);
1420	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1421	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1422	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask \| ButtonPressMask \| ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1423	<	#ifdef ENABLE_XF86_DGA
1424	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics \| XF86DGADirectKeyb \| XF86DGADirectMouse);
1425	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1426	<	#endif
1427	<	XSync(x_display, false);
1428	<
1429	<	// the_buffer already contains the data to restore. i.e. since a temporary
1430	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1431	<	// not necessary.
1432	<	#ifdef ENABLE_VOSF
1433	<	if (use_vosf) {
1434	<	LOCK_VOSF;
1435	<	PFLAG_SET_ALL;
1436	<	UNLOCK_VOSF;
1437	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1438	<	}
1439	<	#endif
1440	<
1441	<	// Restore frame buffer
1442	<	if (fb_save) {
1443	<	#ifdef ENABLE_VOSF
1444	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1445	<	if (!use_vosf)
1446	<	#endif
1447	<	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1448	<	free(fb_save);
1449	<	fb_save = NULL;
1707	>	if (drv == NULL) {
1708	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1709	>	QuitEmulator();
1710		}
1451	–
1452	–	#ifdef ENABLE_XF86_DGA
1453	–	if (depth == 8)
1454	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1455	–	#endif
1456	–
1457	–	// Unlock frame buffer (and continue MacOS thread)
1458	–	UNLOCK_FRAME_BUFFER;
1459	–	emul_suspended = false;
1711		}
1461	–	#endif
1712
1713
1714		/*
1715	<	* Translate key event to Mac keycode
1715	>	* Translate key event to Mac keycode, returns -1 if no keycode was found
1716	>	* and -2 if the key was recognized as a hotkey
1717		*/
1718
1719	<	static int kc_decode(KeySym ks)
1719	>	static int kc_decode(KeySym ks, bool key_down)
1720		{
1721		switch (ks) {
1722		case XK_A: case XK_a: return 0x00;
#	Line 1518 \| Line 1769 \| static int kc_decode(KeySym ks)
1769		case XK_period: case XK_greater: return 0x2f;
1770		case XK_slash: case XK_question: return 0x2c;
1771
1772	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1522	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1523	<	#else
1524	<	case XK_Tab: return 0x30;
1525	<	#endif
1772	>	case XK_Tab: if (ctrl_down) {if (key_down) drv->suspend(); return -2;} else return 0x30;
1773		case XK_Return: return 0x24;
1774		case XK_space: return 0x31;
1775		case XK_BackSpace: return 0x33;
#	Line 1556 \| Line 1803 \| static int kc_decode(KeySym ks)
1803		case XK_Left: return 0x3b;
1804		case XK_Right: return 0x3c;
1805
1806	<	case XK_Escape: if (ctrl_down) {quit_full_screen = true; emerg_quit = true; return -1;} else return 0x35;
1806	>	case XK_Escape: if (ctrl_down) {if (key_down) { quit_full_screen = true; emerg_quit = true; } return -2;} else return 0x35;
1807
1808	<	case XK_F1: if (ctrl_down) {SysMountFirstFloppy(); return -1;} else return 0x7a;
1808	>	case XK_F1: if (ctrl_down) {if (key_down) SysMountFirstFloppy(); return -2;} else return 0x7a;
1809		case XK_F2: return 0x78;
1810		case XK_F3: return 0x63;
1811		case XK_F4: return 0x76;
1812	<	case XK_F5: return 0x60;
1812	>	case XK_F5: if (ctrl_down) {if (key_down) drv->toggle_mouse_grab(); return -2;} else return 0x60;
1813		case XK_F6: return 0x61;
1814		case XK_F7: return 0x62;
1815		case XK_F8: return 0x64;
#	Line 1610 \| Line 1857 \| static int kc_decode(KeySym ks)
1857		return -1;
1858		}
1859
1860	<	static int event2keycode(XKeyEvent &ev)
1860	>	static int event2keycode(XKeyEvent &ev, bool key_down)
1861		{
1862		KeySym ks;
1616	–	int as;
1863		int i = 0;
1864
1865		do {
1866		ks = XLookupKeysym(&ev, i++);
1867	<	as = kc_decode(ks);
1868	<	if (as != -1)
1867	>	int as = kc_decode(ks, key_down);
1868	>	if (as >= 0)
1869	>	return as;
1870	>	if (as == -2)
1871		return as;
1872		} while (ks != NoSymbol);
1873
#	Line 1666 \| Line 1914 \| static void handle_events(void)
1914		}
1915
1916		// Mouse moved
1669	–	case EnterNotify:
1917		case MotionNotify:
1918	<	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1918	>	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
1919		break;
1920
1921		// Keyboard
1922		case KeyPress: {
1923	<	int code;
1923	>	int code = -1;
1924		if (use_keycodes) {
1925	<	event2keycode(event.xkey); // This is called to process the hotkeys
1926	<	code = keycode_table[event.xkey.keycode & 0xff];
1925	>	if (event2keycode(event.xkey, true) != -2) // This is called to process the hotkeys
1926	>	code = keycode_table[event.xkey.keycode & 0xff];
1927		} else
1928	<	code = event2keycode(event.xkey);
1929	<	if (code != -1) {
1928	>	code = event2keycode(event.xkey, true);
1929	>	if (code >= 0) {
1930		if (!emul_suspended) {
1931		if (code == 0x39) { // Caps Lock pressed
1932		if (caps_on) {
#	Line 1694 \| Line 1941 \| static void handle_events(void)
1941		if (code == 0x36)
1942		ctrl_down = true;
1943		} else {
1697	–	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
1944		if (code == 0x31)
1945	<	resume_emul(); // Space wakes us up
1700	<	#endif
1945	>	drv->resume(); // Space wakes us up
1946		}
1947		}
1948		break;
1949		}
1950		case KeyRelease: {
1951	<	int code;
1951	>	int code = -1;
1952		if (use_keycodes) {
1953	<	event2keycode(event.xkey); // This is called to process the hotkeys
1954	<	code = keycode_table[event.xkey.keycode & 0xff];
1953	>	if (event2keycode(event.xkey, false) != -2) // This is called to process the hotkeys
1954	>	code = keycode_table[event.xkey.keycode & 0xff];
1955		} else
1956	<	code = event2keycode(event.xkey);
1957	<	if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases
1956	>	code = event2keycode(event.xkey, false);
1957	>	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
1958		ADBKeyUp(code);
1959		if (code == 0x36)
1960		ctrl_down = false;
#	Line 1757 \| Line 2002 \| static void handle_events(void)
2002		*/
2003
2004		// Dynamic display update (variable frame rate for each box)
2005	<	static void update_display_dynamic(int ticker)
2005	>	static void update_display_dynamic(int ticker, driver_window *drv)
2006		{
2007		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2008		int xil = 0;
#	Line 1819 \| Line 2064 \| static void update_display_dynamic(int t
2064		i = (yi * bytes_per_row) + xi;
2065		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2066		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2067	<	if (depth == 1) {
2068	<	if (have_shm)
2069	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2067	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2068	>	if (drv->have_shm)
2069	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2070		else
2071	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2071	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
2072		} else {
2073	<	if (have_shm)
2074	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2073	>	if (drv->have_shm)
2074	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
2075		else
2076	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2076	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
2077		}
2078		xil = 0;
2079		}
#	Line 1847 \| Line 2092 \| static void update_display_dynamic(int t
2092		}
2093
2094		// Static display update (fixed frame rate, but incremental)
2095	<	static void update_display_static(void)
2095	>	static void update_display_static(driver_window *drv)
2096		{
2097		// Incremental update code
2098		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
#	Line 1874 \| Line 2119 \| static void update_display_static(void)
2119
2120		// Check for first column from left and first column from right that have changed
2121		if (high) {
2122	<	if (depth == 1) {
2122	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2123		x1 = VideoMonitor.mode.x - 1;
2124		for (j=y1; j<=y2; j++) {
2125		p = &the_buffer[j * bytes_per_row];
#	Line 1953 \| Line 2198 \| static void update_display_static(void)
2198
2199		// Refresh display
2200		if (high && wide) {
2201	<	if (have_shm)
2202	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
2201	>	if (drv->have_shm)
2202	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2203		else
2204	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
2204	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2205		}
2206		}
2207
#	Line 1973 \| Line 2218 \| static void update_display_static(void)
2218
2219		static inline void possibly_quit_dga_mode()
2220		{
2221	<	#if defined(ENABLE_XF86_DGA) \|\| defined(ENABLE_FBDEV_DGA)
2222	<	// Quit DGA mode if requested
2221	>	// Quit DGA mode if requested (something terrible has happened and we
2222	>	// want to give control back to the user)
2223		if (quit_full_screen) {
2224		quit_full_screen = false;
2225	<	#ifdef ENABLE_XF86_DGA
2226	<	XF86DGADirectVideo(x_display, screen, 0);
1982	<	#endif
1983	<	XUngrabPointer(x_display, CurrentTime);
1984	<	XUngrabKeyboard(x_display, CurrentTime);
1985	<	XUnmapWindow(x_display, the_win);
1986	<	XSync(x_display, false);
2225	>	delete drv;
2226	>	drv = NULL;
2227		}
1988	–	#endif
2228		}
2229
2230	<	static inline void handle_palette_changes(int depth, int display_type)
2230	>	static inline void possibly_ungrab_mouse()
2231	>	{
2232	>	// Ungrab mouse if requested (something terrible has happened and we
2233	>	// want to give control back to the user)
2234	>	if (quit_full_screen) {
2235	>	quit_full_screen = false;
2236	>	if (drv)
2237	>	drv->ungrab_mouse();
2238	>	}
2239	>	}
2240	>
2241	>	static inline void handle_palette_changes(void)
2242		{
2243		LOCK_PALETTE;
2244
2245		if (palette_changed) {
2246		palette_changed = false;
2247	<	if (depth == 8) {
1998	<	XStoreColors(x_display, cmap[0], palette, 256);
1999	<	XStoreColors(x_display, cmap[1], palette, 256);
2000	<	XSync(x_display, false);
2001	<
2002	<	#ifdef ENABLE_XF86_DGA
2003	<	if (display_type == DISPLAY_DGA) {
2004	<	current_dga_cmap ^= 1;
2005	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2006	<	}
2007	<	#endif
2008	<	}
2247	>	drv->update_palette();
2248		}
2249
2250		UNLOCK_PALETTE;
#	Line 2020 \| Line 2259 \| static void video_refresh_dga(void)
2259		handle_events();
2260
2261		// Handle palette changes
2262	<	handle_palette_changes(depth, DISPLAY_DGA);
2262	>	handle_palette_changes();
2263		}
2264
2265		#ifdef ENABLE_VOSF
#	Line 2034 \| Line 2273 \| static void video_refresh_dga_vosf(void)
2273		handle_events();
2274
2275		// Handle palette changes
2276	<	handle_palette_changes(depth, DISPLAY_DGA);
2276	>	handle_palette_changes();
2277
2278		// Update display (VOSF variant)
2279		static int tick_counter = 0;
#	Line 2051 \| Line 2290 \| static void video_refresh_dga_vosf(void)
2290
2291		static void video_refresh_window_vosf(void)
2292		{
2293	<	// Quit DGA mode if requested
2294	<	possibly_quit_dga_mode();
2293	>	// Ungrab mouse if requested
2294	>	possibly_ungrab_mouse();
2295
2296		// Handle X events
2297		handle_events();
2298
2299		// Handle palette changes
2300	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2300	>	handle_palette_changes();
2301
2302		// Update display (VOSF variant)
2303		static int tick_counter = 0;
#	Line 2066 \| Line 2305 \| static void video_refresh_window_vosf(vo
2305		tick_counter = 0;
2306		if (mainBuffer.dirty) {
2307		LOCK_VOSF;
2308	<	update_display_window_vosf();
2308	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2309		UNLOCK_VOSF;
2310		XSync(x_display, false); // Let the server catch up
2311		}
#	Line 2076 \| Line 2315 \| static void video_refresh_window_vosf(vo
2315
2316		static void video_refresh_window_static(void)
2317		{
2318	+	// Ungrab mouse if requested
2319	+	possibly_ungrab_mouse();
2320	+
2321		// Handle X events
2322		handle_events();
2323
2324		// Handle_palette changes
2325	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2325	>	handle_palette_changes();
2326
2327		// Update display (static variant)
2328		static int tick_counter = 0;
2329		if (++tick_counter >= frame_skip) {
2330		tick_counter = 0;
2331	<	update_display_static();
2331	>	update_display_static(static_cast<driver_window *>(drv));
2332		}
2333		}
2334
2335		static void video_refresh_window_dynamic(void)
2336		{
2337	+	// Ungrab mouse if requested
2338	+	possibly_ungrab_mouse();
2339	+
2340		// Handle X events
2341		handle_events();
2342
2343		// Handle_palette changes
2344	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2344	>	handle_palette_changes();
2345
2346		// Update display (dynamic variant)
2347		static int tick_counter = 0;
2348		tick_counter++;
2349	<	update_display_dynamic(tick_counter);
2349	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2350		}
2351
2352
#	Line 2109 \| Line 2354 \| static void video_refresh_window_dynamic
2354		* Thread for screen refresh, input handling etc.
2355		*/
2356
2357	<	void VideoRefreshInit(void)
2357	>	static void VideoRefreshInit(void)
2358		{
2359		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2360		if (display_type == DISPLAY_DGA) {
#	Line 2135 \| Line 2380 \| void VideoRefreshInit(void)
2380
2381		void VideoRefresh(void)
2382		{
2383	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2384	<	video_refresh();
2383	>	// We need to check redraw_thread_active to inhibit refreshed during
2384	>	// mode changes on non-threaded platforms
2385	>	if (redraw_thread_active)
2386	>	video_refresh();
2387		}
2388
2389		#ifdef HAVE_PTHREADS

Diff Legend

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents): Revision 1.41 by cebix, 2001-06-27T20:05:30Z vs. Revision 1.53 by cebix, 2001-07-06T20:49:53Z

Diff Legend

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.41 by cebix, 2001-06-27T20:05:30Z vs.
Revision 1.53 by cebix, 2001-07-06T20:49:53Z