ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/video_x.cpp

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.36 by gbeauche, 2001-01-28T14:05:19Z vs.
Revision 1.48 by cebix, 2001-07-01T14:38:03Z

#	Line 52 | Line 52
52		# include <sys/mman.h>
53		#endif
54
55	–	#ifdef ENABLE_VOSF
56	–	# include <unistd.h>
57	–	# include <signal.h>
58	–	# include <fcntl.h>
59	–	# include <sys/mman.h>
60	–	#endif
61	–
55		#include "cpu_emulation.h"
56		#include "main.h"
57		#include "adb.h"
#	Line 79 | Line 72 | enum {
72
73		// Constants
74		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
75	<	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
75	>
76	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
77	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
78
79
80		// Global variables
81		static int32 frame_skip;                                                        // Prefs items
82	<	static int16 mouse_wheel_mode = 1;
83	<	static int16 mouse_wheel_lines = 3;
82	>	static int16 mouse_wheel_mode;
83	>	static int16 mouse_wheel_lines;
84
85		static int display_type = DISPLAY_WINDOW;                       // See enum above
86		static bool local_X11;                                                          // Flag: X server running on local machine?
87	<	static uint8 *the_buffer;                                                       // Mac frame buffer
87	>	static uint8 *the_buffer = NULL;                                        // Mac frame buffer (where MacOS draws into)
88	>	static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer (for refreshed modes)
89
94	–	#ifdef HAVE_PTHREADS
90		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
91	<	static volatile bool redraw_thread_cancel = false;      // Flag: Cancel Redraw thread
91	>	#ifdef HAVE_PTHREADS
92	>	static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
93		static pthread_t redraw_thread;                                         // Redraw thread
94		#endif
95
96		static bool has_dga = false;                                            // Flag: Video DGA capable
97		static bool has_vidmode = false;                                        // Flag: VidMode extension available
98
99	+	#ifdef ENABLE_VOSF
100	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
101	+	#else
102	+	static const bool use_vosf = false;                                     // VOSF not possible
103	+	#endif
104	+
105		static bool ctrl_down = false;                                          // Flag: Ctrl key pressed
106		static bool caps_on = false;                                            // Flag: Caps Lock on
107		static bool quit_full_screen = false;                           // Flag: DGA close requested from redraw thread
#	Line 114 | Line 116 | static int keycode_table[256];                                         // X
116		// X11 variables
117		static int screen;                                                                      // Screen number
118		static int xdepth;                                                                      // Depth of X screen
119	<	static int depth;                                                                       // Depth of Mac frame buffer
118	<	static Window rootwin, the_win;                                         // Root window and our window
119	>	static Window rootwin;                                                          // Root window and our window
120		static XVisualInfo visualInfo;
121		static Visual *vis;
122	<	static Colormap cmap[2];                                                        // Two colormaps (DGA) for 8-bit mode
122	>	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
123		static XColor black, white;
124		static unsigned long black_pixel, white_pixel;
125		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;
126
127	<	static XColor palette[256];                                                     // Color palette for 8-bit mode
127	>	static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
128	>
129	>	static XColor palette[256];                                                     // Color palette to be used as CLUT and gamma table
130		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
131	+
132	+	#ifdef ENABLE_FBDEV_DGA
133	+	static int fbdev_fd = -1;
134	+	#endif
135	+
136	+	#ifdef ENABLE_XF86_VIDMODE
137	+	static XF86VidModeModeInfo **x_video_modes = NULL;      // Array of all available modes
138	+	static int num_x_video_modes;
139	+	#endif
140	+
141	+	// Mutex to protect palette
142		#ifdef HAVE_PTHREADS
143	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
143	>	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
144		#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
145		#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
146		#else
#	Line 137 | Line 148 | static pthread_mutex_t palette_lock = PT
148		#define UNLOCK_PALETTE
149		#endif
150
151	<	// 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
151	>	// Mutex to protect frame buffer
152		#ifdef HAVE_PTHREADS
153	<	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
153	>	static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
154		#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
155		#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
156		#else
#	Line 162 | Line 158 | static pthread_mutex_t frame_buffer_lock
158		#define UNLOCK_FRAME_BUFFER
159		#endif
160
161	<	// Variables for fbdev DGA mode
162	<	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
163	<	static int fbdev_fd;
164	<
165	<	#ifdef ENABLE_XF86_VIDMODE
170	<	// Variables for XF86 VidMode support
171	<	static XF86VidModeModeInfo **x_video_modes;                     // Array of all available modes
172	<	static int num_x_video_modes;
173	<	#endif
174	<
175	<	#ifdef ENABLE_VOSF
176	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
177	<	#else
178	<	static const bool use_vosf = false;                                     // Flag: VOSF enabled
179	<	#endif
180	<
181	<	#ifdef ENABLE_VOSF
182	<	// Variables for Video on SEGV support (taken from the Win32 port)
183	<	static uint8 *the_host_buffer;                                          // Host frame buffer in VOSF mode
184	<	static uint32 the_buffer_size;                                          // Size of allocated the_buffer
185	<
186	<	struct ScreenPageInfo {
187	<	int top, bottom;                    // Mapping between this virtual page and Mac scanlines
188	<	};
189	<
190	<	struct ScreenInfo {
191	<	uint32 memBase;                             // Real start address
192	<	uint32 memStart;                    // Start address aligned to page boundary
193	<	uint32 memEnd;                              // Address of one-past-the-end of the screen
194	<	uint32 memLength;                   // Length of the memory addressed by the screen pages
195	<
196	<	uint32 pageSize;                    // Size of a page
197	<	int pageBits;                               // Shift count to get the page number
198	<	uint32 pageCount;                   // Number of pages allocated to the screen
199	<
200	<	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	<	static bool Screen_fault_handler_init();
282	<	static struct sigaction vosf_sa;
283	<
284	<	#ifdef HAVE_PTHREADS
285	<	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer (dirtyPages in fact)
286	<	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
287	<	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
288	<	#else
289	<	#define LOCK_VOSF
290	<	#define UNLOCK_VOSF
291	<	#endif
292	<
293	<	static int log_base_2(uint32 x)
294	<	{
295	<	uint32 mask = 0x80000000;
296	<	int l = 31;
297	<	while (l >= 0 && (x & mask) == 0) {
298	<	mask >>= 1;
299	<	l--;
300	<	}
301	<	return l;
302	<	}
303	<	#endif /* ENABLE_VOSF */
161	>	// Variables for non-VOSF incremental refresh
162	>	static const int sm_uptd[] = {4,1,6,3,0,5,2,7};
163	>	static int sm_no_boxes[] = {1,8,32,64,128,300};
164	>	static bool updt_box[17][17];
165	>	static int nr_boxes;
166
167	<	// VideoRefresh function
168	<	void VideoRefreshInit(void);
167	>	// Video refresh function
168	>	static void VideoRefreshInit(void);
169		static void (*video_refresh)(void);
170
171	+
172		// Prototypes
173		static void *redraw_func(void *arg);
174		static int event2keycode(XKeyEvent &ev);
175
313	–
176		// From main_unix.cpp
177		extern char *x_display_name;
178		extern Display *x_display;
#	Line 318 | Line 180 | extern Display *x_display;
180		// From sys_unix.cpp
181		extern void SysMountFirstFloppy(void);
182
321	–	#ifdef ENABLE_VOSF
322	–	# include "video_vosf.h"
323	–	#endif
324	–
183
184		/*
185	<	*  Initialization
185	>	*  Utility functions
186		*/
187
188	<	// Set VideoMonitor according to video mode
189	<	void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
188	>	// Add mode to list of supported modes
189	>	static void add_mode(uint32 width, uint32 height, uint32 resolution_id, uint32 bytes_per_row, video_depth depth)
190	>	{
191	>	video_mode mode;
192	>	mode.x = width;
193	>	mode.y = height;
194	>	mode.resolution_id = resolution_id;
195	>	mode.bytes_per_row = bytes_per_row;
196	>	mode.depth = depth;
197	>	VideoModes.push_back(mode);
198	>	}
199	>
200	>	// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
201	>	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
202		{
203		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
204		int layout = FLAYOUT_DIRECT;
205	<	switch (depth) {
206	<	case 1:
207	<	layout = FLAYOUT_DIRECT;
208	<	break;
339	<	case 8:
340	<	layout = FLAYOUT_DIRECT;
341	<	break;
342	<	case 15:
343	<	layout = FLAYOUT_HOST_555;
344	<	break;
345	<	case 16:
346	<	layout = FLAYOUT_HOST_565;
347	<	break;
348	<	case 24:
349	<	case 32:
350	<	layout = FLAYOUT_HOST_888;
351	<	break;
352	<	}
205	>	if (depth == VDEPTH_16BIT)
206	>	layout = (xdepth == 15) ? FLAYOUT_HOST_555 : FLAYOUT_HOST_565;
207	>	else if (depth == VDEPTH_32BIT)
208	>	layout = (xdepth == 24) ? FLAYOUT_HOST_888 : FLAYOUT_DIRECT;
209		if (native_byte_order)
210		MacFrameLayout = layout;
211		else
212		MacFrameLayout = FLAYOUT_DIRECT;
213	+	VideoMonitor.mac_frame_base = MacFrameBaseMac;
214	+
215	+	// Set variables used by UAE memory banking
216	+	MacFrameBaseHost = the_buffer;
217	+	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
218	+	InitFrameBufferMapping();
219	+	#else
220	+	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
221	+	D(bug("Host frame buffer = %p, ", the_buffer));
222		#endif
223	<	switch (depth) {
359	<	case 1:
360	<	VideoMonitor.mode = VMODE_1BIT;
361	<	break;
362	<	case 8:
363	<	VideoMonitor.mode = VMODE_8BIT;
364	<	break;
365	<	case 15:
366	<	VideoMonitor.mode = VMODE_16BIT;
367	<	break;
368	<	case 16:
369	<	VideoMonitor.mode = VMODE_16BIT;
370	<	break;
371	<	case 24:
372	<	case 32:
373	<	VideoMonitor.mode = VMODE_32BIT;
374	<	break;
375	<	}
376	<	VideoMonitor.x = width;
377	<	VideoMonitor.y = height;
378	<	VideoMonitor.bytes_per_row = bytes_per_row;
223	>	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
224		}
225
226		// Set window name and class
#	Line 409 | Line 254 | static void set_window_focus(Window w)
254		}
255
256		// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
257	+	static Atom WM_DELETE_WINDOW = (Atom)0;
258		static void set_window_delete_protocol(Window w)
259		{
260		WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
#	Line 445 | Line 291 | static int error_handler(Display *d, XEr
291		return old_error_handler(d, e);
292		}
293
294	<	// Init window mode
295	<	static bool init_window(int width, int height)
294	>
295	>	/*
296	>	*  Display "driver" classes
297	>	*/
298	>
299	>	class driver_base {
300	>	public:
301	>	driver_base();
302	>	virtual ~driver_base();
303	>
304	>	virtual void update_palette(void);
305	>	virtual void suspend(void) {}
306	>	virtual void resume(void) {}
307	>
308	>	public:
309	>	bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
310	>	Window w;               // The window we draw into
311	>	};
312	>
313	>	class driver_window;
314	>	static void update_display_window_vosf(driver_window *drv);
315	>	static void update_display_dynamic(int ticker, driver_window *drv);
316	>	static void update_display_static(driver_window *drv);
317	>
318	>	class driver_window : public driver_base {
319	>	friend void update_display_window_vosf(driver_window *drv);
320	>	friend void update_display_dynamic(int ticker, driver_window *drv);
321	>	friend void update_display_static(driver_window *drv);
322	>
323	>	public:
324	>	driver_window(const video_mode &mode);
325	>	~driver_window();
326	>
327	>	private:
328	>	GC gc;
329	>	XImage *img;
330	>	bool have_shm;                          // Flag: SHM extensions available
331	>	XShmSegmentInfo shminfo;
332	>	Cursor mac_cursor;
333	>	};
334	>
335	>	static driver_base *drv = NULL; // Pointer to currently used driver object
336	>
337	>	#ifdef ENABLE_VOSF
338	>	# include "video_vosf.h"
339	>	#endif
340	>
341	>	driver_base::driver_base()
342	>	: init_ok(false), w(0)
343	>	{
344	>	the_buffer = NULL;
345	>	the_buffer_copy = NULL;
346	>	}
347	>
348	>	driver_base::~driver_base()
349	>	{
350	>	if (w) {
351	>	XUnmapWindow(x_display, w);
352	>	wait_unmapped(w);
353	>	XDestroyWindow(x_display, w);
354	>	}
355	>
356	>	XFlush(x_display);
357	>	XSync(x_display, false);
358	>
359	>	// Free frame buffer(s)
360	>	if (!use_vosf) {
361	>	if (the_buffer) {
362	>	free(the_buffer);
363	>	the_buffer = NULL;
364	>	}
365	>	if (the_buffer_copy) {
366	>	free(the_buffer_copy);
367	>	the_buffer_copy = NULL;
368	>	}
369	>	}
370	>	#ifdef ENABLE_VOSF
371	>	else {
372	>	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
373	>	vm_release(the_buffer, the_buffer_size);
374	>	the_buffer = NULL;
375	>	}
376	>	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
377	>	vm_release(the_buffer_copy, the_buffer_size);
378	>	the_buffer_copy = NULL;
379	>	}
380	>	}
381	>	#endif
382	>	}
383	>
384	>	// Palette has changed
385	>	void driver_base::update_palette(void)
386		{
387	+	if (cmap[0] && cmap[1]) {
388	+	int num = 256;
389	+	if (IsDirectMode(VideoMonitor.mode))
390	+	num = vis->map_entries; // Palette is gamma table
391	+	else if (vis->c_class == DirectColor)
392	+	return; // Indexed mode on true color screen, don't set CLUT
393	+	XStoreColors(x_display, cmap[0], palette, num);
394	+	XStoreColors(x_display, cmap[1], palette, num);
395	+	}
396	+	XSync(x_display, false);
397	+	}
398	+
399	+
400	+	/*
401	+	*  Windowed display driver
402	+	*/
403	+
404	+	// Open display
405	+	driver_window::driver_window(const video_mode &mode)
406	+	: gc(0), img(NULL), have_shm(false), mac_cursor(0)
407	+	{
408	+	int width = mode.x, height = mode.y;
409		int aligned_width = (width + 15) & ~15;
410		int aligned_height = (height + 15) & ~15;
411
412		// Set absolute mouse mode
413		ADBSetRelMouseMode(false);
414
457	–	// Read frame skip prefs
458	–	frame_skip = PrefsFindInt32("frameskip");
459	–
415		// Create window
416		XSetWindowAttributes wattr;
417		wattr.event_mask = eventmask = win_eventmask;
418		wattr.background_pixel = black_pixel;
419	<	wattr.colormap = cmap[0];
420	<
421	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
467	<	InputOutput, vis, CWEventMask | CWBackPixel | (depth == 8 ? CWColormap : 0), &wattr);
419	>	wattr.colormap = (mode.depth == VDEPTH_1BIT && vis->c_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
420	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
421	>	InputOutput, vis, CWEventMask | CWBackPixel | (vis->c_class == PseudoColor || vis->c_class == DirectColor ? CWColormap : 0), &wattr);
422
423		// Set window name/class
424	<	set_window_name(the_win, STR_WINDOW_TITLE);
424	>	set_window_name(w, STR_WINDOW_TITLE);
425
426		// Indicate that we want keyboard input
427	<	set_window_focus(the_win);
427	>	set_window_focus(w);
428
429		// Set delete protocol property
430	<	set_window_delete_protocol(the_win);
430	>	set_window_delete_protocol(w);
431
432		// Make window unresizable
433		{
#	Line 484 | Line 438 | static bool init_window(int width, int h
438		hints->min_height = height;
439		hints->max_height = height;
440		hints->flags = PMinSize | PMaxSize;
441	<	XSetWMNormalHints(x_display, the_win, hints);
441	>	XSetWMNormalHints(x_display, w, hints);
442		XFree(hints);
443		}
444		}
445
446		// Show window
447	<	XMapWindow(x_display, the_win);
448	<	wait_mapped(the_win);
447	>	XMapWindow(x_display, w);
448	>	wait_mapped(w);
449	>
450	>	// 1-bit mode is big-endian; if the X server is little-endian, we can't
451	>	// use SHM because that doesn't allow changing the image byte order
452	>	bool need_msb_image = (mode.depth == VDEPTH_1BIT && XImageByteOrder(x_display) == LSBFirst);
453
454		// Try to create and attach SHM image
455	<	have_shm = false;
498	<	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
455	>	if (local_X11 && !need_msb_image && XShmQueryExtension(x_display)) {
456
457		// Create SHM image ("height + 2" for safety)
458	<	img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
458	>	img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
459		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
460		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
461		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 522 | Line 479 | static bool init_window(int width, int h
479
480		// Create normal X image if SHM doesn't work ("height + 2" for safety)
481		if (!have_shm) {
482	<	int bytes_per_row = aligned_width;
526	<	switch (depth) {
527	<	case 1:
528	<	bytes_per_row /= 8;
529	<	break;
530	<	case 15:
531	<	case 16:
532	<	bytes_per_row *= 2;
533	<	break;
534	<	case 24:
535	<	case 32:
536	<	bytes_per_row *= 4;
537	<	break;
538	<	}
482	>	int bytes_per_row = TrivialBytesPerRow(aligned_width, mode.depth);
483		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
484	<	img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row);
484	>	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);
485		}
486
487	<	// 1-Bit mode is big-endian
544	<	if (depth == 1) {
487	>	if (need_msb_image) {
488		img->byte_order = MSBFirst;
489		img->bitmap_bit_order = MSBFirst;
490		}
491
492		#ifdef ENABLE_VOSF
493	<	// Allocate a page-aligned chunk of memory for frame buffer
551	<	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
493	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
494		the_host_buffer = the_buffer_copy;
495	<
496	<	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
497	<	memset(the_buffer_copy, 0, the_buffer_size);
556	<
557	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
558	<	memset(the_buffer, 0, the_buffer_size);
495	>	the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
496	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
497	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
498		#else
499		// Allocate memory for frame buffer
500		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
501		#endif
502
503		// Create GC
504	<	the_gc = XCreateGC(x_display, the_win, 0, 0);
505	<	XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
504	>	gc = XCreateGC(x_display, w, 0, 0);
505	>	XSetState(x_display, gc, black_pixel, white_pixel, GXcopy, AllPlanes);
506
507		// Create no_cursor
508		mac_cursor = XCreatePixmapCursor(x_display,
509	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
510	<	XCreatePixmap(x_display, the_win, 1, 1, 1),
509	>	XCreatePixmap(x_display, w, 1, 1, 1),
510	>	XCreatePixmap(x_display, w, 1, 1, 1),
511		&black, &white, 0, 0);
512	<	XDefineCursor(x_display, the_win, mac_cursor);
512	>	XDefineCursor(x_display, w, mac_cursor);
513
514	<	// Set VideoMonitor
514	>	// Init blitting routines
515		bool native_byte_order;
516		#ifdef WORDS_BIGENDIAN
517		native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
#	Line 580 | Line 519 | static bool init_window(int width, int h
519		native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
520		#endif
521		#ifdef ENABLE_VOSF
522	<	Screen_blitter_init(&visualInfo, native_byte_order);
522	>	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
523		#endif
524	<	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
525	<
526	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
527	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
528	<	#else
529	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
524	>
525	>	// Set VideoMonitor
526	>	VideoMonitor.mode = mode;
527	>	set_mac_frame_buffer(mode.depth, native_byte_order);
528	>
529	>	// Everything went well
530	>	init_ok = true;
531	>	}
532	>
533	>	// Close display
534	>	driver_window::~driver_window()
535	>	{
536	>	if (img)
537	>	XDestroyImage(img);
538	>	if (have_shm) {
539	>	XShmDetach(x_display, &shminfo);
540	>	the_buffer_copy = NULL; // don't free() in driver_base dtor
541	>	}
542	>	if (gc)
543	>	XFreeGC(x_display, gc);
544	>	}
545	>
546	>
547	>	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
548	>	/*
549	>	*  DGA display driver base class
550	>	*/
551	>
552	>	class driver_dga : public driver_base {
553	>	public:
554	>	driver_dga();
555	>	~driver_dga();
556	>
557	>	void suspend(void);
558	>	void resume(void);
559	>
560	>	private:
561	>	Window suspend_win;             // "Suspend" information window
562	>	void *fb_save;                  // Saved frame buffer for suspend/resume
563	>	};
564	>
565	>	driver_dga::driver_dga()
566	>	: suspend_win(0), fb_save(NULL)
567	>	{
568	>	}
569	>
570	>	driver_dga::~driver_dga()
571	>	{
572	>	XUngrabPointer(x_display, CurrentTime);
573	>	XUngrabKeyboard(x_display, CurrentTime);
574	>	}
575	>
576	>	// Suspend emulation
577	>	void driver_dga::suspend(void)
578	>	{
579	>	// Release ctrl key
580	>	ADBKeyUp(0x36);
581	>	ctrl_down = false;
582	>
583	>	// Lock frame buffer (this will stop the MacOS thread)
584	>	LOCK_FRAME_BUFFER;
585	>
586	>	// Save frame buffer
587	>	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
588	>	if (fb_save)
589	>	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
590	>
591	>	// Close full screen display
592	>	#ifdef ENABLE_XF86_DGA
593	>	XF86DGADirectVideo(x_display, screen, 0);
594		#endif
595	<	return true;
595	>	XUngrabPointer(x_display, CurrentTime);
596	>	XUngrabKeyboard(x_display, CurrentTime);
597	>	XUnmapWindow(x_display, w);
598	>	wait_unmapped(w);
599	>
600	>	// Open "suspend" window
601	>	XSetWindowAttributes wattr;
602	>	wattr.event_mask = KeyPressMask;
603	>	wattr.background_pixel = black_pixel;
604	>
605	>	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
606	>	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
607	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
608	>	set_window_focus(suspend_win);
609	>	XMapWindow(x_display, suspend_win);
610	>	emul_suspended = true;
611		}
612
613	<	// Init fbdev DGA display
614	<	static bool init_fbdev_dga(char *in_fb_name)
613	>	// Resume emulation
614	>	void driver_dga::resume(void)
615		{
616	+	// Close "suspend" window
617	+	XDestroyWindow(x_display, suspend_win);
618	+	XSync(x_display, false);
619	+
620	+	// Reopen full screen display
621	+	XMapRaised(x_display, w);
622	+	wait_mapped(w);
623	+	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
624	+	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
625	+	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
626	+	#ifdef ENABLE_XF86_DGA
627	+	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
628	+	XF86DGASetViewPort(x_display, screen, 0, 0);
629	+	#endif
630	+	XSync(x_display, false);
631	+
632	+	// the_buffer already contains the data to restore. i.e. since a temporary
633	+	// frame buffer is used when VOSF is actually used, fb_save is therefore
634	+	// not necessary.
635	+	#ifdef ENABLE_VOSF
636	+	if (use_vosf) {
637	+	LOCK_VOSF;
638	+	PFLAG_SET_ALL;
639	+	UNLOCK_VOSF;
640	+	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
641	+	}
642	+	#endif
643	+
644	+	// Restore frame buffer
645	+	if (fb_save) {
646	+	#ifdef ENABLE_VOSF
647	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
648	+	if (!use_vosf)
649	+	#endif
650	+	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
651	+	free(fb_save);
652	+	fb_save = NULL;
653	+	}
654	+
655	+	// Unlock frame buffer (and continue MacOS thread)
656	+	UNLOCK_FRAME_BUFFER;
657	+	emul_suspended = false;
658	+	}
659	+	#endif
660	+
661	+
662		#ifdef ENABLE_FBDEV_DGA
663	+	/*
664	+	*  fbdev DGA display driver
665	+	*/
666	+
667	+	const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices";
668	+	const char FBDEVICE_FILE_NAME[] = "/dev/fb";
669	+
670	+	class driver_fbdev : public driver_dga {
671	+	public:
672	+	driver_fbdev(const video_mode &mode);
673	+	~driver_fbdev();
674	+	};
675	+
676	+	// Open display
677	+	driver_fbdev::driver_fbdev(const video_mode &mode)
678	+	{
679	+	int width = mode.x, height = mode.y;
680	+
681	+	// Set absolute mouse mode
682	+	ADBSetRelMouseMode(false);
683	+
684		// Find the maximum depth available
685		int ndepths, max_depth(0);
686		int *depths = XListDepths(x_display, screen, &ndepths);
687		if (depths == NULL) {
688		printf("FATAL: Could not determine the maximal depth available\n");
689	<	return false;
689	>	return;
690		} else {
691		while (ndepths-- > 0) {
692		if (depths[ndepths] > max_depth)
#	Line 618 | Line 703 | static bool init_fbdev_dga(char *in_fb_n
703		char str[256];
704		sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno));
705		ErrorAlert(str);
706	<	return false;
706	>	return;
707		}
708
709		int fb_depth;           // supported depth
#	Line 638 | Line 723 | static bool init_fbdev_dga(char *in_fb_n
723		continue;
724
725		if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
726	<	&& (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) {
726	>	&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
727		device_found = true;
728		break;
729		}
#	Line 650 | Line 735 | static bool init_fbdev_dga(char *in_fb_n
735		// Frame buffer name not found ? Then, display warning
736		if (!device_found) {
737		char str[256];
738	<	sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth);
738	>	sprintf(str, GetString(STR_FBDEV_NAME_ERR), fb_name, max_depth);
739		ErrorAlert(str);
740	<	return false;
740	>	return;
741		}
742
658	–	int width = DisplayWidth(x_display, screen);
659	–	int height = DisplayHeight(x_display, screen);
660	–	depth = fb_depth; // max_depth
661	–
662	–	// Set relative mouse mode
663	–	ADBSetRelMouseMode(false);
664	–
743		// Create window
744		XSetWindowAttributes wattr;
745		wattr.event_mask = eventmask = dga_eventmask;
#	Line 669 | Line 747 | static bool init_fbdev_dga(char *in_fb_n
747		wattr.override_redirect = True;
748		wattr.colormap = cmap[0];
749
750	<	the_win = XCreateWindow(x_display, rootwin,
750	>	w = XCreateWindow(x_display, rootwin,
751		0, 0, width, height,
752		0, xdepth, InputOutput, vis,
753	<	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
753	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (fb_depth <= 8 ? CWColormap : 0),
754		&wattr);
755
756		// Set window name/class
757	<	set_window_name(the_win, STR_WINDOW_TITLE);
757	>	set_window_name(w, STR_WINDOW_TITLE);
758
759		// Indicate that we want keyboard input
760	<	set_window_focus(the_win);
760	>	set_window_focus(w);
761
762		// Show window
763	<	XMapRaised(x_display, the_win);
764	<	wait_mapped(the_win);
763	>	XMapRaised(x_display, w);
764	>	wait_mapped(w);
765
766		// Grab mouse and keyboard
767	<	XGrabKeyboard(x_display, the_win, True,
767	>	XGrabKeyboard(x_display, w, True,
768		GrabModeAsync, GrabModeAsync, CurrentTime);
769	<	XGrabPointer(x_display, the_win, True,
769	>	XGrabPointer(x_display, w, True,
770		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
771	<	GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
771	>	GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
772
773	<	// Set VideoMonitor
774	<	int bytes_per_row = width;
697	<	switch (depth) {
698	<	case 1:
699	<	bytes_per_row = ((width | 7) & ~7) >> 3;
700	<	break;
701	<	case 15:
702	<	case 16:
703	<	bytes_per_row *= 2;
704	<	break;
705	<	case 24:
706	<	case 32:
707	<	bytes_per_row *= 4;
708	<	break;
709	<	}
773	>	// Calculate bytes per row
774	>	int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
775
776	+	// Map frame buffer
777		if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
778		if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
779		char str[256];
780		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
781		ErrorAlert(str);
782	<	return false;
782	>	return;
783		}
784		}
785
#	Line 721 | Line 787 | static bool init_fbdev_dga(char *in_fb_n
787		#if REAL_ADDRESSING || DIRECT_ADDRESSING
788		// Screen_blitter_init() returns TRUE if VOSF is mandatory
789		// i.e. the framebuffer update function is not Blit_Copy_Raw
790	<	use_vosf = Screen_blitter_init(&visualInfo, true);
790	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
791
792		if (use_vosf) {
793	<	the_host_buffer = the_buffer;
794	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
795	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
796	<	memset(the_buffer_copy, 0, the_buffer_size);
797	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
732	<	memset(the_buffer, 0, the_buffer_size);
793	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
794	>	the_host_buffer = the_buffer;
795	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
796	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
797	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
798		}
799		#else
800		use_vosf = false;
801		#endif
802		#endif
803
804	<	set_video_monitor(width, height, bytes_per_row, true);
805	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
806	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
807	<	#else
808	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
809	<	#endif
810	<	return true;
811	<	#else
747	<	ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled.");
748	<	return false;
749	<	#endif
804	>	// Set VideoMonitor
805	>	VideoModes[0].bytes_per_row = bytes_per_row;
806	>	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
807	>	VideoMonitor.mode = mode;
808	>	set_mac_frame_buffer(mode.depth, true);
809	>
810	>	// Everything went well
811	>	init_ok = true;
812		}
813
814	<	// Init XF86 DGA display
815	<	static bool init_xf86_dga(int width, int height)
814	>	// Close display
815	>	driver_fbdev::~driver_fbdev()
816		{
817	+	}
818	+	#endif
819	+
820	+
821		#ifdef ENABLE_XF86_DGA
822	+	/*
823	+	*  XFree86 DGA display driver
824	+	*/
825	+
826	+	class driver_xf86dga : public driver_dga {
827	+	public:
828	+	driver_xf86dga(const video_mode &mode);
829	+	~driver_xf86dga();
830	+
831	+	void update_palette(void);
832	+	void resume(void);
833	+
834	+	private:
835	+	int current_dga_cmap;                                   // Number (0 or 1) of currently installed DGA colormap
836	+	};
837	+
838	+	// Open display
839	+	driver_xf86dga::driver_xf86dga(const video_mode &mode)
840	+	: current_dga_cmap(0)
841	+	{
842	+	int width = mode.x, height = mode.y;
843	+
844		// Set relative mouse mode
845		ADBSetRelMouseMode(true);
846
#	Line 777 | Line 865 | static bool init_xf86_dga(int width, int
865		wattr.event_mask = eventmask = dga_eventmask;
866		wattr.override_redirect = True;
867
868	<	the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
868	>	w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
869		InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
870
871		// Set window name/class
872	<	set_window_name(the_win, STR_WINDOW_TITLE);
872	>	set_window_name(w, STR_WINDOW_TITLE);
873
874		// Indicate that we want keyboard input
875	<	set_window_focus(the_win);
875	>	set_window_focus(w);
876
877		// Show window
878	<	XMapRaised(x_display, the_win);
879	<	wait_mapped(the_win);
878	>	XMapRaised(x_display, w);
879	>	wait_mapped(w);
880
881		// Establish direct screen connection
882	<	XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
882	>	XMoveResizeWindow(x_display, w, 0, 0, width, height);
883		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
884		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
885		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
#	Line 803 | Line 891 | static bool init_xf86_dga(int width, int
891		XF86DGASetVidPage(x_display, screen, 0);
892
893		// Set colormap
894	<	if (depth == 8) {
895	<	XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
894	>	if (!IsDirectMode(mode)) {
895	>	XSetWindowColormap(x_display, w, cmap[current_dga_cmap = 0]);
896		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
897		}
898		XSync(x_display, false);
899
900	<	// Set VideoMonitor
901	<	int bytes_per_row = (v_width + 7) & ~7;
902	<	switch (depth) {
815	<	case 1:
816	<	bytes_per_row /= 8;
817	<	break;
818	<	case 15:
819	<	case 16:
820	<	bytes_per_row *= 2;
821	<	break;
822	<	case 24:
823	<	case 32:
824	<	bytes_per_row *= 4;
825	<	break;
826	<	}
827	<
900	>	// Init blitting routines
901	>	int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
902	>	#ifdef VIDEO_VOSF
903		#if REAL_ADDRESSING || DIRECT_ADDRESSING
904		// Screen_blitter_init() returns TRUE if VOSF is mandatory
905		// i.e. the framebuffer update function is not Blit_Copy_Raw
906	<	use_vosf = Screen_blitter_init(&visualInfo, true);
906	>	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
907
908		if (use_vosf) {
909	<	the_host_buffer = the_buffer;
910	<	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
911	<	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
912	<	memset(the_buffer_copy, 0, the_buffer_size);
913	<	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
839	<	memset(the_buffer, 0, the_buffer_size);
909	>	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
910	>	the_host_buffer = the_buffer;
911	>	the_buffer_size = page_extend((height + 2) * bytes_per_row);
912	>	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
913	>	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
914		}
915	<	#elif defined(ENABLE_VOSF)
842	<	// The UAE memory handlers will already handle color conversion, if needed.
915	>	#else
916		use_vosf = false;
917		#endif
845	–
846	–	set_video_monitor(width, height, bytes_per_row, true);
847	–	#if REAL_ADDRESSING || DIRECT_ADDRESSING
848	–	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
849	–	//      MacFrameLayout = FLAYOUT_DIRECT;
850	–	#else
851	–	VideoMonitor.mac_frame_base = MacFrameBaseMac;
918		#endif
919	<	return true;
920	<	#else
921	<	ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled.");
922	<	return false;
919	>
920	>	// Set VideoMonitor
921	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
922	>	VideoMonitor.mode = mode;
923	>	set_mac_frame_buffer(mode.depth, true);
924	>
925	>	// Everything went well
926	>	init_ok = true;
927	>	}
928	>
929	>	// Close display
930	>	driver_xf86dga::~driver_xf86dga()
931	>	{
932	>	XF86DGADirectVideo(x_display, screen, 0);
933	>	#ifdef ENABLE_XF86_VIDMODE
934	>	if (has_vidmode)
935	>	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
936		#endif
937		}
938
939	+	// Palette has changed
940	+	void driver_xf86dga::update_palette(void)
941	+	{
942	+	driver_dga::update_palette();
943	+	current_dga_cmap ^= 1;
944	+	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
945	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
946	+	}
947	+
948	+	// Resume emulation
949	+	void driver_xf86dga::resume(void)
950	+	{
951	+	driver_dga::resume();
952	+	if (!IsDirectMode(VideoMonitor.mode))
953	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
954	+	}
955	+	#endif
956	+
957	+
958	+	/*
959	+	*  Initialization
960	+	*/
961	+
962		// Init keycode translation table
963		static void keycode_init(void)
964		{
#	Line 922 | Line 1024 | static void keycode_init(void)
1024		}
1025		}
1026
1027	<	bool VideoInitBuffer()
1027	>	// Open display for specified mode
1028	>	static bool video_open(const video_mode &mode)
1029		{
1030	<	#ifdef ENABLE_VOSF
1031	<	if (use_vosf) {
1032	<	const uint32 page_size  = getpagesize();
1033	<	const uint32 page_mask  = page_size - 1;
1034	<
1035	<	mainBuffer.memBase      = (uint32) the_buffer;
1036	<	// Align the frame buffer on page boundary
1037	<	mainBuffer.memStart             = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
1038	<	mainBuffer.memLength    = the_buffer_size;
1039	<	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
1040	<
1041	<	mainBuffer.pageSize     = page_size;
1042	<	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
1043	<	mainBuffer.pageBits     = log_base_2(mainBuffer.pageSize);
1044	<
942	<	if (mainBuffer.dirtyPages != 0)
943	<	free(mainBuffer.dirtyPages);
944	<
945	<	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
1030	>	// Load gray ramp to color map
1031	>	int num = (vis->c_class == DirectColor ? vis->map_entries : 256);
1032	>	for (int i=0; i<num; i++) {
1033	>	int c = (i * 256) / num;
1034	>	palette[i].red = c * 0x0101;
1035	>	palette[i].green = c * 0x0101;
1036	>	palette[i].blue = c * 0x0101;
1037	>	if (vis->c_class == PseudoColor)
1038	>	palette[i].pixel = i;
1039	>	palette[i].flags = DoRed | DoGreen | DoBlue;
1040	>	}
1041	>	if (cmap[0] && cmap[1]) {
1042	>	XStoreColors(x_display, cmap[0], palette, num);
1043	>	XStoreColors(x_display, cmap[1], palette, num);
1044	>	}
1045
1046	<	if (mainBuffer.pageInfo != 0)
1047	<	free(mainBuffer.pageInfo);
1046	>	// Create display driver object of requested type
1047	>	switch (display_type) {
1048	>	case DISPLAY_WINDOW:
1049	>	drv = new driver_window(mode);
1050	>	break;
1051	>	#ifdef ENABLE_FBDEV_DGA
1052	>	case DISPLAY_DGA:
1053	>	drv = new driver_fbdev(mode);
1054	>	break;
1055	>	#endif
1056	>	#ifdef ENABLE_XF86_DGA
1057	>	case DISPLAY_DGA:
1058	>	drv = new driver_xf86dga(mode);
1059	>	break;
1060	>	#endif
1061	>	}
1062	>	if (drv == NULL)
1063	>	return false;
1064	>	if (!drv->init_ok) {
1065	>	delete drv;
1066	>	drv = NULL;
1067	>	return false;
1068	>	}
1069
1070	<	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
1070	>	#ifdef ENABLE_VOSF
1071	>	if (use_vosf) {
1072	>	// Initialize the mainBuffer structure
1073	>	if (!video_init_buffer()) {
1074	>	ErrorAlert(STR_VOSF_INIT_ERR);
1075	>	return false;
1076	>	}
1077
1078	<	if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0))
1078	>	// Initialize the handler for SIGSEGV
1079	>	if (!sigsegv_install_handler(screen_fault_handler)) {
1080	>	ErrorAlert("Could not initialize Video on SEGV signals");
1081		return false;
954	–
955	–	mainBuffer.dirty = false;
956	–
957	–	PFLAG_CLEAR_ALL;
958	–	// Safety net to insure the loops in the update routines will terminate
959	–	// See a discussion in <video_vosf.h> for further details
960	–	PFLAG_CLEAR(mainBuffer.pageCount);
961	–	PFLAG_SET(mainBuffer.pageCount+1);
962	–
963	–	uint32 a = 0;
964	–	for (int i = 0; i < mainBuffer.pageCount; i++) {
965	–	int y1 = a / VideoMonitor.bytes_per_row;
966	–	if (y1 >= VideoMonitor.y)
967	–	y1 = VideoMonitor.y - 1;
968	–
969	–	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
970	–	if (y2 >= VideoMonitor.y)
971	–	y2 = VideoMonitor.y - 1;
972	–
973	–	mainBuffer.pageInfo[i].top = y1;
974	–	mainBuffer.pageInfo[i].bottom = y2;
975	–
976	–	a += mainBuffer.pageSize;
977	–	if (a > mainBuffer.memLength)
978	–	a = mainBuffer.memLength;
1082		}
980	–
981	–	// We can now write-protect the frame buffer
982	–	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
983	–	return false;
1083		}
1084		#endif
1085	+
1086	+	// Initialize VideoRefresh function
1087	+	VideoRefreshInit();
1088	+
1089	+	// Lock down frame buffer
1090	+	XSync(x_display, false);
1091	+	LOCK_FRAME_BUFFER;
1092	+
1093	+	// Start redraw/input thread
1094	+	#ifdef HAVE_PTHREADS
1095	+	redraw_thread_cancel = false;
1096	+	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1097	+	if (!redraw_thread_active) {
1098	+	printf("FATAL: cannot create redraw thread\n");
1099	+	return false;
1100	+	}
1101	+	#else
1102	+	redraw_thread_active = true;
1103	+	#endif
1104	+
1105		return true;
1106		}
1107
1108		bool VideoInit(bool classic)
1109		{
1110	+	classic_mode = classic;
1111	+
1112		#ifdef ENABLE_VOSF
992	–	// Open /dev/zero
993	–	zero_fd = open("/dev/zero", O_RDWR);
994	–	if (zero_fd < 0) {
995	–	char str[256];
996	–	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
997	–	ErrorAlert(str);
998	–	return false;
999	–	}
1000	–
1113		// Zero the mainBuffer structure
1114	<	mainBuffer.dirtyPages = 0;
1115	<	mainBuffer.pageInfo = 0;
1114	>	mainBuffer.dirtyPages = NULL;
1115	>	mainBuffer.pageInfo = NULL;
1116		#endif
1117
1118		// Check if X server runs on local machine
#	Line 1011 | Line 1123 | bool VideoInit(bool classic)
1123		keycode_init();
1124
1125		// Read prefs
1126	+	frame_skip = PrefsFindInt32("frameskip");
1127		mouse_wheel_mode = PrefsFindInt32("mousewheelmode");
1128		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
1129
#	Line 1025 | Line 1138 | bool VideoInit(bool classic)
1138		// Frame buffer name
1139		char fb_name[20];
1140
1141	<	// Could do fbdev dga ?
1141	>	// Could do fbdev DGA?
1142		if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1)
1143		has_dga = true;
1144		else
#	Line 1071 | Line 1184 | bool VideoInit(bool classic)
1184		case 15:
1185		case 16:
1186		case 24:
1187	<	case 32:
1188	<	color_class = TrueColor;
1187	>	case 32: // Try DirectColor first, as this will allow gamma correction
1188	>	color_class = DirectColor;
1189	>	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo))
1190	>	color_class = TrueColor;
1191		break;
1192		default:
1193	<	ErrorAlert(GetString(STR_UNSUPP_DEPTH_ERR));
1193	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1194		return false;
1195		}
1196		if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1197	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1197	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1198		return false;
1199		}
1200		if (visualInfo.depth != xdepth) {
1201	<	ErrorAlert(GetString(STR_NO_XVISUAL_ERR));
1201	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1202		return false;
1203		}
1204		vis = visualInfo.visual;
1205
1206	<	// Mac screen depth is always 1 bit in Classic mode, but follows X depth otherwise
1207	<	classic_mode = classic;
1093	<	if (classic)
1094	<	depth = 1;
1095	<	else
1096	<	depth = xdepth;
1097	<
1098	<	// Create color maps for 8 bit mode
1099	<	if (depth == 8) {
1206	>	// Create color maps
1207	>	if (color_class == PseudoColor || color_class == DirectColor) {
1208		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1209		cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1210	<	XInstallColormap(x_display, cmap[0]);
1211	<	XInstallColormap(x_display, cmap[1]);
1210	>	}
1211	>
1212	>	// Find pixel format of direct modes
1213	>	if (color_class == DirectColor || color_class == TrueColor) {
1214	>	rshift = gshift = bshift = 0;
1215	>	rloss = gloss = bloss = 8;
1216	>	uint32 mask;
1217	>	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1218	>	++rshift;
1219	>	for (; mask&1; mask>>=1)
1220	>	--rloss;
1221	>	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1222	>	++gshift;
1223	>	for (; mask&1; mask>>=1)
1224	>	--gloss;
1225	>	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1226	>	++bshift;
1227	>	for (; mask&1; mask>>=1)
1228	>	--bloss;
1229	>	}
1230	>
1231	>	// Preset palette pixel values for gamma table
1232	>	if (color_class == DirectColor) {
1233	>	int num = vis->map_entries;
1234	>	for (int i=0; i<num; i++) {
1235	>	int c = (i * 256) / num;
1236	>	palette[i].pixel = ((c >> rloss) << rshift) | ((c >> gloss) << gshift) | ((c >> bloss) << bshift);
1237	>	}
1238		}
1239
1240		// Get screen mode from preferences
1241		const char *mode_str;
1242	<	if (classic)
1242	>	if (classic_mode)
1243		mode_str = "win/512/342";
1244		else
1245		mode_str = PrefsFindString("screen");
1246
1247	<	// Determine type and mode
1248	<	int width = 512, height = 384;
1247	>	// Determine display type and default dimensions
1248	>	int default_width = 512, default_height = 384;
1249		display_type = DISPLAY_WINDOW;
1250		if (mode_str) {
1251	<	if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2)
1251	>	if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) {
1252		display_type = DISPLAY_WINDOW;
1253		#ifdef ENABLE_FBDEV_DGA
1254	<	else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1255	<	#else
1256	<	else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) {
1254	>	} else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) {
1255	>	display_type = DISPLAY_DGA;
1256	>	default_width = -1; default_height = -1; // use entire screen
1257		#endif
1258	+	#ifdef ENABLE_XF86_DGA
1259	+	} else if (has_dga && sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) {
1260		display_type = DISPLAY_DGA;
1125	–	if (width > DisplayWidth(x_display, screen))
1126	–	width = DisplayWidth(x_display, screen);
1127	–	if (height > DisplayHeight(x_display, screen))
1128	–	height = DisplayHeight(x_display, screen);
1129	–	}
1130	–	if (width <= 0)
1131	–	width = DisplayWidth(x_display, screen);
1132	–	if (height <= 0)
1133	–	height = DisplayHeight(x_display, screen);
1134	–	}
1135	–
1136	–	// Initialize according to display type
1137	–	switch (display_type) {
1138	–	case DISPLAY_WINDOW:
1139	–	if (!init_window(width, height))
1140	–	return false;
1141	–	break;
1142	–	case DISPLAY_DGA:
1143	–	#ifdef ENABLE_FBDEV_DGA
1144	–	if (!init_fbdev_dga(fb_name))
1145	–	#else
1146	–	if (!init_xf86_dga(width, height))
1261		#endif
1262	<	return false;
1149	<	break;
1262	>	}
1263		}
1264	<
1265	<	// Lock down frame buffer
1266	<	LOCK_FRAME_BUFFER;
1267	<
1268	<	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1269	<	// Set variables for UAE memory mapping
1270	<	MacFrameBaseHost = the_buffer;
1271	<	MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
1272	<
1273	<	// No special frame buffer in Classic mode (frame buffer is in Mac RAM)
1274	<	if (classic)
1275	<	MacFrameLayout = FLAYOUT_NONE;
1276	<	#endif
1277	<
1278	<	#ifdef ENABLE_VOSF
1279	<	if (use_vosf) {
1280	<	// Initialize the mainBuffer structure
1281	<	if (!VideoInitBuffer()) {
1282	<	// TODO: STR_VOSF_INIT_ERR ?
1283	<	ErrorAlert("Could not initialize Video on SEGV signals");
1284	<	return false;
1264	>	if (default_width <= 0)
1265	>	default_width = DisplayWidth(x_display, screen);
1266	>	else if (default_width > DisplayWidth(x_display, screen))
1267	>	default_width = DisplayWidth(x_display, screen);
1268	>	if (default_height <= 0)
1269	>	default_height = DisplayHeight(x_display, screen);
1270	>	else if (default_height > DisplayHeight(x_display, screen))
1271	>	default_height = DisplayHeight(x_display, screen);
1272	>
1273	>	// Mac screen depth follows X depth
1274	>	video_depth default_depth = DepthModeForPixelDepth(xdepth);
1275	>
1276	>	// Construct list of supported modes
1277	>	if (display_type == DISPLAY_WINDOW) {
1278	>	if (classic)
1279	>	add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1280	>	else {
1281	>	if (default_depth != VDEPTH_1BIT) { // 1-bit modes are always available
1282	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, VDEPTH_1BIT), VDEPTH_1BIT);
1283	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, VDEPTH_1BIT), VDEPTH_1BIT);
1284	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, VDEPTH_1BIT), VDEPTH_1BIT);
1285	>	add_mode(832, 624, 0x83, TrivialBytesPerRow(832, VDEPTH_1BIT), VDEPTH_1BIT);
1286	>	add_mode(1024, 768, 0x84, TrivialBytesPerRow(1024, VDEPTH_1BIT), VDEPTH_1BIT);
1287	>	add_mode(1152, 870, 0x85, TrivialBytesPerRow(1152, VDEPTH_1BIT), VDEPTH_1BIT);
1288	>	add_mode(1280, 1024, 0x86, TrivialBytesPerRow(1280, VDEPTH_1BIT), VDEPTH_1BIT);
1289	>	add_mode(1600, 1200, 0x87, TrivialBytesPerRow(1600, VDEPTH_1BIT), VDEPTH_1BIT);
1290	>	}
1291	>	add_mode(512, 384, 0x80, TrivialBytesPerRow(512, default_depth), default_depth);
1292	>	add_mode(640, 480, 0x81, TrivialBytesPerRow(640, default_depth), default_depth);
1293	>	add_mode(800, 600, 0x82, TrivialBytesPerRow(800, default_depth), default_depth);
1294	>	add_mode(832, 624, 0x83, TrivialBytesPerRow(832, default_depth), default_depth);
1295	>	add_mode(1024, 768, 0x84, TrivialBytesPerRow(1024, default_depth), default_depth);
1296	>	add_mode(1152, 870, 0x85, TrivialBytesPerRow(1152, default_depth), default_depth);
1297	>	add_mode(1280, 1024, 0x86, TrivialBytesPerRow(1280, default_depth), default_depth);
1298	>	add_mode(1600, 1200, 0x87, TrivialBytesPerRow(1600, default_depth), default_depth);
1299		}
1300	+	} else
1301	+	add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1302
1303	<	// Initialize the handler for SIGSEGV
1304	<	if (!Screen_fault_handler_init()) {
1305	<	// TODO: STR_VOSF_INIT_ERR ?
1306	<	ErrorAlert("Could not initialize Video on SEGV signals");
1307	<	return false;
1303	>	// Find requested default mode and open display
1304	>	if (VideoModes.size() == 1)
1305	>	return video_open(VideoModes[0]);
1306	>	else {
1307	>	// Find mode with specified dimensions
1308	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1309	>	for (i = VideoModes.begin(); i != end; ++i) {
1310	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1311	>	return video_open(*i);
1312		}
1313	+	return video_open(VideoModes[0]);
1314		}
1181	–	#endif
1182	–
1183	–	// Initialize VideoRefresh function
1184	–	VideoRefreshInit();
1185	–
1186	–	XSync(x_display, false);
1187	–
1188	–	#ifdef HAVE_PTHREADS
1189	–	// Start redraw/input thread
1190	–	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1191	–	if (!redraw_thread_active) {
1192	–	printf("FATAL: cannot create redraw thread\n");
1193	–	return false;
1194	–	}
1195	–	#endif
1196	–	return true;
1315		}
1316
1317
#	Line 1201 | Line 1319 | bool VideoInit(bool classic)
1319		*  Deinitialization
1320		*/
1321
1322	<	void VideoExit(void)
1322	>	// Close display
1323	>	static void video_close(void)
1324		{
1206	–	#ifdef HAVE_PTHREADS
1325		// Stop redraw thread
1326	+	#ifdef HAVE_PTHREADS
1327		if (redraw_thread_active) {
1328		redraw_thread_cancel = true;
1329		#ifdef HAVE_PTHREAD_CANCEL
1330		pthread_cancel(redraw_thread);
1331		#endif
1332		pthread_join(redraw_thread, NULL);
1214	–	redraw_thread_active = false;
1333		}
1334		#endif
1335	+	redraw_thread_active = false;
1336
1337		// Unlock frame buffer
1338		UNLOCK_FRAME_BUFFER;
1339	+	XSync(x_display, false);
1340
1221	–	// Close window and server connection
1222	–	if (x_display != NULL) {
1223	–	XSync(x_display, false);
1224	–
1225	–	#ifdef ENABLE_XF86_DGA
1226	–	if (display_type == DISPLAY_DGA) {
1227	–	XF86DGADirectVideo(x_display, screen, 0);
1228	–	XUngrabPointer(x_display, CurrentTime);
1229	–	XUngrabKeyboard(x_display, CurrentTime);
1230	–	}
1231	–	#endif
1232	–
1233	–	#ifdef ENABLE_XF86_VIDMODE
1234	–	if (has_vidmode && display_type == DISPLAY_DGA)
1235	–	XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
1236	–	#endif
1237	–
1238	–	#ifdef ENABLE_FBDEV_DGA
1239	–	if (display_type == DISPLAY_DGA) {
1240	–	XUngrabPointer(x_display, CurrentTime);
1241	–	XUngrabKeyboard(x_display, CurrentTime);
1242	–	close(fbdev_fd);
1243	–	}
1244	–	#endif
1245	–
1246	–	XFlush(x_display);
1247	–	XSync(x_display, false);
1248	–	if (depth == 8) {
1249	–	XFreeColormap(x_display, cmap[0]);
1250	–	XFreeColormap(x_display, cmap[1]);
1251	–	}
1252	–
1253	–	if (!use_vosf) {
1254	–	if (the_buffer) {
1255	–	free(the_buffer);
1256	–	the_buffer = NULL;
1257	–	}
1258	–
1259	–	if (!have_shm && the_buffer_copy) {
1260	–	free(the_buffer_copy);
1261	–	the_buffer_copy = NULL;
1262	–	}
1263	–	}
1264	–	#ifdef ENABLE_VOSF
1265	–	else {
1266	–	if (the_buffer != (uint8 *)MAP_FAILED) {
1267	–	munmap((caddr_t)the_buffer, the_buffer_size);
1268	–	the_buffer = 0;
1269	–	}
1270	–
1271	–	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1272	–	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1273	–	the_buffer_copy = 0;
1274	–	}
1275	–	}
1276	–	#endif
1277	–	}
1278	–
1341		#ifdef ENABLE_VOSF
1342	+	// Deinitialize VOSF
1343		if (use_vosf) {
1281	–	// Clear mainBuffer data
1344		if (mainBuffer.pageInfo) {
1345		free(mainBuffer.pageInfo);
1346	<	mainBuffer.pageInfo = 0;
1346	>	mainBuffer.pageInfo = NULL;
1347		}
1286	–
1348		if (mainBuffer.dirtyPages) {
1349		free(mainBuffer.dirtyPages);
1350	<	mainBuffer.dirtyPages = 0;
1350	>	mainBuffer.dirtyPages = NULL;
1351		}
1352		}
1353	+	#endif
1354
1355	<	// Close /dev/zero
1356	<	if (zero_fd > 0)
1357	<	close(zero_fd);
1355	>	// Close display
1356	>	delete drv;
1357	>	drv = NULL;
1358	>	}
1359	>
1360	>	void VideoExit(void)
1361	>	{
1362	>	// Close display
1363	>	video_close();
1364	>
1365	>	// Free colormaps
1366	>	if (cmap[0]) {
1367	>	XFreeColormap(x_display, cmap[0]);
1368	>	cmap[0] = 0;
1369	>	}
1370	>	if (cmap[1]) {
1371	>	XFreeColormap(x_display, cmap[1]);
1372	>	cmap[1] = 0;
1373	>	}
1374	>
1375	>	#ifdef ENABLE_XF86_VIDMODE
1376	>	// Free video mode list
1377	>	if (x_video_modes) {
1378	>	XFree(x_video_modes);
1379	>	x_video_modes = NULL;
1380	>	}
1381	>	#endif
1382	>
1383	>	#ifdef ENABLE_FBDEV_DGA
1384	>	// Close framebuffer device
1385	>	if (fbdev_fd >= 0) {
1386	>	close(fbdev_fd);
1387	>	fbdev_fd = -1;
1388	>	}
1389		#endif
1390		}
1391
#	Line 1304 | Line 1397 | void VideoExit(void)
1397		void VideoQuitFullScreen(void)
1398		{
1399		D(bug("VideoQuitFullScreen()\n"));
1400	<	if (display_type == DISPLAY_DGA)
1308	<	quit_full_screen = true;
1400	>	quit_full_screen = true;
1401		}
1402
1403
#	Line 1335 | Line 1427 | void video_set_palette(uint8 *pal)
1427		LOCK_PALETTE;
1428
1429		// Convert colors to XColor array
1430	<	for (int i=0; i<256; i++) {
1431	<	palette[i].pixel = i;
1432	<	palette[i].red = pal[i*3] * 0x0101;
1433	<	palette[i].green = pal[i*3+1] * 0x0101;
1434	<	palette[i].blue = pal[i*3+2] * 0x0101;
1435	<	palette[i].flags = DoRed | DoGreen | DoBlue;
1430	>	int num_in = 256, num_out = 256;
1431	>	if (VideoMonitor.mode.depth == VDEPTH_16BIT)
1432	>	num_in = 32;
1433	>	if (IsDirectMode(VideoMonitor.mode)) {
1434	>	// If X is in 565 mode we have to stretch the palette from 32 to 64 entries
1435	>	num_out = vis->map_entries;
1436	>	}
1437	>	XColor *p = palette;
1438	>	for (int i=0; i<num_out; i++) {
1439	>	int c = (i * num_in) / num_out;
1440	>	p->red = pal[c*3 + 0] * 0x0101;
1441	>	p->green = pal[c*3 + 1] * 0x0101;
1442	>	p->blue = pal[c*3 + 2] * 0x0101;
1443	>	if (vis->c_class == PseudoColor)
1444	>	p->pixel = i;
1445	>	p->flags = DoRed | DoGreen | DoBlue;
1446	>	p++;
1447		}
1448
1449		// Tell redraw thread to change palette
#	Line 1351 | Line 1454 | void video_set_palette(uint8 *pal)
1454
1455
1456		/*
1457	<	*  Suspend/resume emulator
1457	>	*  Switch video mode
1458		*/
1459
1460	<	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1358	<	static void suspend_emul(void)
1460	>	void video_switch_to_mode(const video_mode &mode)
1461		{
1462	<	if (display_type == DISPLAY_DGA) {
1463	<	// Release ctrl key
1464	<	ADBKeyUp(0x36);
1363	<	ctrl_down = false;
1364	<
1365	<	// Lock frame buffer (this will stop the MacOS thread)
1366	<	LOCK_FRAME_BUFFER;
1367	<
1368	<	// Save frame buffer
1369	<	fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
1370	<	if (fb_save)
1371	<	memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row);
1372	<
1373	<	// Close full screen display
1374	<	#ifdef ENABLE_XF86_DGA
1375	<	XF86DGADirectVideo(x_display, screen, 0);
1376	<	#endif
1377	<	XUngrabPointer(x_display, CurrentTime);
1378	<	XUngrabKeyboard(x_display, CurrentTime);
1379	<	XUnmapWindow(x_display, the_win);
1380	<	wait_unmapped(the_win);
1381	<
1382	<	// Open "suspend" window
1383	<	XSetWindowAttributes wattr;
1384	<	wattr.event_mask = KeyPressMask;
1385	<	wattr.background_pixel = black_pixel;
1386	<
1387	<	suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1388	<	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
1389	<	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1390	<	set_window_focus(suspend_win);
1391	<	XMapWindow(x_display, suspend_win);
1392	<	emul_suspended = true;
1393	<	}
1394	<	}
1462	>	// Close and reopen display
1463	>	video_close();
1464	>	video_open(mode);
1465
1466	<	static void resume_emul(void)
1467	<	{
1468	<	// Close "suspend" window
1399	<	XDestroyWindow(x_display, suspend_win);
1400	<	XSync(x_display, false);
1401	<
1402	<	// Reopen full screen display
1403	<	XMapRaised(x_display, the_win);
1404	<	wait_mapped(the_win);
1405	<	XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1406	<	XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1407	<	XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1408	<	#ifdef ENABLE_XF86_DGA
1409	<	XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
1410	<	XF86DGASetViewPort(x_display, screen, 0, 0);
1411	<	#endif
1412	<	XSync(x_display, false);
1413	<
1414	<	// the_buffer already contains the data to restore. i.e. since a temporary
1415	<	// frame buffer is used when VOSF is actually used, fb_save is therefore
1416	<	// not necessary.
1417	<	#ifdef ENABLE_VOSF
1418	<	if (use_vosf) {
1419	<	LOCK_VOSF;
1420	<	PFLAG_SET_ALL;
1421	<	UNLOCK_VOSF;
1422	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1423	<	}
1424	<	#endif
1425	<
1426	<	// Restore frame buffer
1427	<	if (fb_save) {
1428	<	#ifdef ENABLE_VOSF
1429	<	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1430	<	if (!use_vosf)
1431	<	#endif
1432	<	memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1433	<	free(fb_save);
1434	<	fb_save = NULL;
1466	>	if (drv == NULL) {
1467	>	ErrorAlert(STR_OPEN_WINDOW_ERR);
1468	>	QuitEmulator();
1469		}
1436	–
1437	–	#ifdef ENABLE_XF86_DGA
1438	–	if (depth == 8)
1439	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1440	–	#endif
1441	–
1442	–	// Unlock frame buffer (and continue MacOS thread)
1443	–	UNLOCK_FRAME_BUFFER;
1444	–	emul_suspended = false;
1470		}
1446	–	#endif
1471
1472
1473		/*
#	Line 1504 | Line 1528 | static int kc_decode(KeySym ks)
1528		case XK_slash: case XK_question: return 0x2c;
1529
1530		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1531	<	case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30;
1531	>	case XK_Tab: if (ctrl_down) {drv->suspend(); return -1;} else return 0x30;
1532		#else
1533		case XK_Tab: return 0x30;
1534		#endif
#	Line 1679 | Line 1703 | static void handle_events(void)
1703		if (code == 0x36)
1704		ctrl_down = true;
1705		} else {
1682	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1706		if (code == 0x31)
1707	<	resume_emul();  // Space wakes us up
1685	<	#endif
1707	>	drv->resume();  // Space wakes us up
1708		}
1709		}
1710		break;
#	Line 1710 | Line 1732 | static void handle_events(void)
1732		LOCK_VOSF;
1733		PFLAG_SET_ALL;
1734		UNLOCK_VOSF;
1735	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1735	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1736		}
1737		else
1738		#endif
#	Line 1721 | Line 1743 | static void handle_events(void)
1743		updt_box[x1][y1] = true;
1744		nr_boxes = 16 * 16;
1745		} else                                  // Static refresh
1746	<	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1746	>	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1747		}
1748		break;
1749
#	Line 1742 | Line 1764 | static void handle_events(void)
1764		*/
1765
1766		// Dynamic display update (variable frame rate for each box)
1767	<	static void update_display_dynamic(int ticker)
1767	>	static void update_display_dynamic(int ticker, driver_window *drv)
1768		{
1769		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1770		int xil = 0;
1771		int rxm = 0, rxmo = 0;
1772	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1773	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1774	<	int rx = VideoMonitor.bytes_per_row / 16;
1775	<	int ry = VideoMonitor.y / 16;
1772	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1773	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1774	>	int rx = VideoMonitor.mode.bytes_per_row / 16;
1775	>	int ry = VideoMonitor.mode.y / 16;
1776		int max_box;
1777
1778		y2s = sm_uptd[ticker % 8];
#	Line 1804 | Line 1826 | static void update_display_dynamic(int t
1826		i = (yi * bytes_per_row) + xi;
1827		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
1828		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
1829	<	if (depth == 1) {
1830	<	if (have_shm)
1831	<	XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1829	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1830	>	if (drv->have_shm)
1831	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
1832		else
1833	<	XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1833	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil);
1834		} else {
1835	<	if (have_shm)
1836	<	XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0);
1835	>	if (drv->have_shm)
1836	>	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);
1837		else
1838	<	XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1838	>	XPutImage(x_display, drv->w, drv->gc, drv->img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil);
1839		}
1840		xil = 0;
1841		}
#	Line 1832 | Line 1854 | static void update_display_dynamic(int t
1854		}
1855
1856		// Static display update (fixed frame rate, but incremental)
1857	<	static void update_display_static(void)
1857	>	static void update_display_static(driver_window *drv)
1858		{
1859		// Incremental update code
1860		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1861	<	int bytes_per_row = VideoMonitor.bytes_per_row;
1862	<	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1861	>	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
1862	>	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
1863		uint8 *p, *p2;
1864
1865		// Check for first line from top and first line from bottom that have changed
1866		y1 = 0;
1867	<	for (j=0; j<VideoMonitor.y; j++) {
1867	>	for (j=0; j<VideoMonitor.mode.y; j++) {
1868		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1869		y1 = j;
1870		break;
1871		}
1872		}
1873		y2 = y1 - 1;
1874	<	for (j=VideoMonitor.y-1; j>=y1; j--) {
1874	>	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
1875		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1876		y2 = j;
1877		break;
#	Line 1859 | Line 1881 | static void update_display_static(void)
1881
1882		// Check for first column from left and first column from right that have changed
1883		if (high) {
1884	<	if (depth == 1) {
1885	<	x1 = VideoMonitor.x - 1;
1884	>	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
1885	>	x1 = VideoMonitor.mode.x - 1;
1886		for (j=y1; j<=y2; j++) {
1887		p = &the_buffer[j * bytes_per_row];
1888		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1878 | Line 1900 | static void update_display_static(void)
1900		p2 = &the_buffer_copy[j * bytes_per_row];
1901		p += bytes_per_row;
1902		p2 += bytes_per_row;
1903	<	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1903	>	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
1904		p--; p2--;
1905		if (*p != *p2) {
1906		x2 = (i << 3) + 7;
#	Line 1897 | Line 1919 | static void update_display_static(void)
1919		}
1920
1921		} else {
1922	<	x1 = VideoMonitor.x;
1922	>	x1 = VideoMonitor.mode.x;
1923		for (j=y1; j<=y2; j++) {
1924		p = &the_buffer[j * bytes_per_row];
1925		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 1915 | Line 1937 | static void update_display_static(void)
1937		p2 = &the_buffer_copy[j * bytes_per_row];
1938		p += bytes_per_row;
1939		p2 += bytes_per_row;
1940	<	for (i=VideoMonitor.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1940	>	for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1941		p--;
1942		p2--;
1943		if (*p != *p2) {
#	Line 1938 | Line 1960 | static void update_display_static(void)
1960
1961		// Refresh display
1962		if (high && wide) {
1963	<	if (have_shm)
1964	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1963	>	if (drv->have_shm)
1964	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
1965		else
1966	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1966	>	XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
1967		}
1968		}
1969
#	Line 1958 | Line 1980 | static void update_display_static(void)
1980
1981		static inline void possibly_quit_dga_mode()
1982		{
1961	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1983		// Quit DGA mode if requested
1984		if (quit_full_screen) {
1985		quit_full_screen = false;
1986	<	#ifdef ENABLE_XF86_DGA
1987	<	XF86DGADirectVideo(x_display, screen, 0);
1967	<	#endif
1968	<	XUngrabPointer(x_display, CurrentTime);
1969	<	XUngrabKeyboard(x_display, CurrentTime);
1970	<	XUnmapWindow(x_display, the_win);
1971	<	XSync(x_display, false);
1986	>	delete drv;
1987	>	drv = NULL;
1988		}
1973	–	#endif
1989		}
1990
1991	<	static inline void handle_palette_changes(int depth, int display_type)
1991	>	static inline void handle_palette_changes(void)
1992		{
1993		LOCK_PALETTE;
1994
1995		if (palette_changed) {
1996		palette_changed = false;
1997	<	if (depth == 8) {
1983	<	XStoreColors(x_display, cmap[0], palette, 256);
1984	<	XStoreColors(x_display, cmap[1], palette, 256);
1985	<	XSync(x_display, false);
1986	<
1987	<	#ifdef ENABLE_XF86_DGA
1988	<	if (display_type == DISPLAY_DGA) {
1989	<	current_dga_cmap ^= 1;
1990	<	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1991	<	}
1992	<	#endif
1993	<	}
1997	>	drv->update_palette();
1998		}
1999
2000		UNLOCK_PALETTE;
#	Line 2005 | Line 2009 | static void video_refresh_dga(void)
2009		handle_events();
2010
2011		// Handle palette changes
2012	<	handle_palette_changes(depth, DISPLAY_DGA);
2012	>	handle_palette_changes();
2013		}
2014
2015		#ifdef ENABLE_VOSF
#	Line 2019 | Line 2023 | static void video_refresh_dga_vosf(void)
2023		handle_events();
2024
2025		// Handle palette changes
2026	<	handle_palette_changes(depth, DISPLAY_DGA);
2026	>	handle_palette_changes();
2027
2028		// Update display (VOSF variant)
2029		static int tick_counter = 0;
#	Line 2043 | Line 2047 | static void video_refresh_window_vosf(vo
2047		handle_events();
2048
2049		// Handle palette changes
2050	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2050	>	handle_palette_changes();
2051
2052		// Update display (VOSF variant)
2053		static int tick_counter = 0;
#	Line 2051 | Line 2055 | static void video_refresh_window_vosf(vo
2055		tick_counter = 0;
2056		if (mainBuffer.dirty) {
2057		LOCK_VOSF;
2058	<	update_display_window_vosf();
2058	>	update_display_window_vosf(static_cast<driver_window *>(drv));
2059		UNLOCK_VOSF;
2060	+	XSync(x_display, false); // Let the server catch up
2061		}
2062		}
2063		}
#	Line 2064 | Line 2069 | static void video_refresh_window_static(
2069		handle_events();
2070
2071		// Handle_palette changes
2072	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2072	>	handle_palette_changes();
2073
2074		// Update display (static variant)
2075		static int tick_counter = 0;
2076		if (++tick_counter >= frame_skip) {
2077		tick_counter = 0;
2078	<	update_display_static();
2078	>	update_display_static(static_cast<driver_window *>(drv));
2079		}
2080		}
2081
#	Line 2080 | Line 2085 | static void video_refresh_window_dynamic
2085		handle_events();
2086
2087		// Handle_palette changes
2088	<	handle_palette_changes(depth, DISPLAY_WINDOW);
2088	>	handle_palette_changes();
2089
2090		// Update display (dynamic variant)
2091		static int tick_counter = 0;
2092		tick_counter++;
2093	<	update_display_dynamic(tick_counter);
2093	>	update_display_dynamic(tick_counter, static_cast<driver_window *>(drv));
2094		}
2095
2096
#	Line 2093 | Line 2098 | static void video_refresh_window_dynamic
2098		*  Thread for screen refresh, input handling etc.
2099		*/
2100
2101	<	void VideoRefreshInit(void)
2101	>	static void VideoRefreshInit(void)
2102		{
2103		// TODO: set up specialised 8bpp VideoRefresh handlers ?
2104		if (display_type == DISPLAY_DGA) {
#	Line 2119 | Line 2124 | void VideoRefreshInit(void)
2124
2125		void VideoRefresh(void)
2126		{
2127	<	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2128	<	video_refresh();
2127	>	// We need to check redraw_thread_active to inhibit refreshed during
2128	>	// mode changes on non-threaded platforms
2129	>	if (redraw_thread_active)
2130	>	video_refresh();
2131		}
2132
2133		#ifdef HAVE_PTHREADS
#	Line 2140 | 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, ticks * 1000000 / (end - start));
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