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.52 by cebix, 2001-07-03T19:20:46Z vs.
Revision 1.82 by gbeauche, 2006-01-03T22:03:27Z

#	Line 1 | Line 1
1		/*
2		*  video_x.cpp - Video/graphics emulation, X11 specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2001 Christian Bauer
4	>	*  Basilisk II (C) 1997-2005 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 37 | Line 37
37		#include <sys/shm.h>
38		#include <errno.h>
39
40	+	#include <algorithm>
41	+
42		#ifdef HAVE_PTHREADS
43		# include <pthread.h>
44		#endif
#	Line 60 | Line 62
62		#include "prefs.h"
63		#include "user_strings.h"
64		#include "video.h"
65	+	#include "video_blit.h"
66
67		#define DEBUG 0
68		#include "debug.h"
69
70
71	+	// Supported video modes
72	+	static vector<video_mode> VideoModes;
73	+
74		// Display types
75		enum {
76		DISPLAY_WINDOW, // X11 window, using MIT SHM extensions if possible
#	Line 74 | Line 80 | enum {
80		// Constants
81		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
82
83	<	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ExposureMask | StructureNotifyMask;
83	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
84		static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
85
86
#	Line 87 | Line 93 | static int display_type = DISPLAY_WINDOW
93		static bool local_X11;                                                          // Flag: X server running on local machine?
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	+	static uint32 the_buffer_size;                                          // Size of allocated the_buffer
97
98		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
99		#ifdef HAVE_PTHREADS
100	+	static pthread_attr_t redraw_thread_attr;                       // Redraw thread attributes
101		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
102	+	static volatile bool redraw_thread_cancel_ack;          // Flag: Acknowledge for redraw thread cancellation
103		static pthread_t redraw_thread;                                         // Redraw thread
104		#endif
105
#	Line 115 | Line 124 | static bool use_keycodes = false;                                      //
124		static int keycode_table[256];                                          // X keycode -> Mac keycode translation table
125
126		// X11 variables
127	+	char *x_display_name = NULL;                                            // X11 display name
128	+	Display *x_display = NULL;                                                      // X11 display handle
129		static int screen;                                                                      // Screen number
119	–	static int xdepth;                                                                      // Depth of X screen
130		static Window rootwin;                                                          // Root window and our window
131	<	static XVisualInfo visualInfo;
132	<	static Visual *vis;
123	<	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
131	>	static int num_depths = 0;                                                      // Number of available X depths
132	>	static int *avail_depths = NULL;                                        // List of available X depths
133		static XColor black, white;
134		static unsigned long black_pixel, white_pixel;
135		static int eventmask;
136
137	+	static int xdepth;                                                                      // Depth of X screen
138	+	static VisualFormat visualFormat;
139	+	static XVisualInfo visualInfo;
140	+	static Visual *vis;
141	+	static int color_class;
142	+
143	+	static bool x_native_byte_order;                                                // XImage has native byte order?
144		static int rshift, rloss, gshift, gloss, bshift, bloss; // Pixel format of DirectColor/TrueColor modes
145
146	<	static XColor palette[256];                                                     // Color palette to be used as CLUT and gamma table
147	<	static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
146	>	static Colormap cmap[2] = {0, 0};                                       // Colormaps for indexed modes (DGA needs two of them)
147	>
148	>	static XColor x_palette[256];                                           // Color palette to be used as CLUT and gamma table
149	>	static bool x_palette_changed = false;                          // Flag: Palette changed, redraw thread must set new colors
150
151		#ifdef ENABLE_FBDEV_DGA
152		static int fbdev_fd = -1;
#	Line 141 | Line 159 | static int num_x_video_modes;
159
160		// Mutex to protect palette
161		#ifdef HAVE_PTHREADS
162	<	static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;
163	<	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
164	<	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
162	>	static pthread_mutex_t x_palette_lock = PTHREAD_MUTEX_INITIALIZER;
163	>	#define LOCK_PALETTE pthread_mutex_lock(&x_palette_lock)
164	>	#define UNLOCK_PALETTE pthread_mutex_unlock(&x_palette_lock)
165		#else
166		#define LOCK_PALETTE
167		#define UNLOCK_PALETTE
#	Line 172 | Line 190 | static void (*video_refresh)(void);
190
191		// Prototypes
192		static void *redraw_func(void *arg);
175	–	static int event2keycode(XKeyEvent &ev);
193
194		// From main_unix.cpp
195		extern char *x_display_name;
196		extern Display *x_display;
197	+	extern void *vm_acquire_mac(size_t size);
198
199		// From sys_unix.cpp
200		extern void SysMountFirstFloppy(void);
201
202	+	// From clip_unix.cpp
203	+	extern void ClipboardSelectionClear(XSelectionClearEvent *);
204	+	extern void ClipboardSelectionRequest(XSelectionRequestEvent *);
205	+
206	+
207	+	/*
208	+	*  monitor_desc subclass for X11 display
209	+	*/
210	+
211	+	class X11_monitor_desc : public monitor_desc {
212	+	public:
213	+	X11_monitor_desc(const vector<video_mode> &available_modes, video_depth default_depth, uint32 default_id) : monitor_desc(available_modes, default_depth, default_id) {}
214	+	~X11_monitor_desc() {}
215	+
216	+	virtual void switch_to_current_mode(void);
217	+	virtual void set_palette(uint8 *pal, int num);
218	+
219	+	bool video_open(void);
220	+	void video_close(void);
221	+	};
222	+
223
224		/*
225		*  Utility functions
226		*/
227
228	+	// Map video_mode depth ID to numerical depth value
229	+	static inline int depth_of_video_mode(video_mode const & mode)
230	+	{
231	+	int depth = -1;
232	+	switch (mode.depth) {
233	+	case VDEPTH_1BIT:
234	+	depth = 1;
235	+	break;
236	+	case VDEPTH_2BIT:
237	+	depth = 2;
238	+	break;
239	+	case VDEPTH_4BIT:
240	+	depth = 4;
241	+	break;
242	+	case VDEPTH_8BIT:
243	+	depth = 8;
244	+	break;
245	+	case VDEPTH_16BIT:
246	+	depth = 16;
247	+	break;
248	+	case VDEPTH_32BIT:
249	+	depth = 32;
250	+	break;
251	+	default:
252	+	abort();
253	+	}
254	+	return depth;
255	+	}
256	+
257		// Map RGB color to pixel value (this only works in TrueColor/DirectColor visuals)
258	<	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue)
258	>	static inline uint32 map_rgb(uint8 red, uint8 green, uint8 blue, bool fix_byte_order = false)
259		{
260	<	return ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift);
260	>	uint32 val = ((red >> rloss) << rshift) | ((green >> gloss) << gshift) | ((blue >> bloss) << bshift);
261	>	if (fix_byte_order && !x_native_byte_order) {
262	>	// We have to fix byte order in the ExpandMap[]
263	>	// NOTE: this is only an optimization since Screen_blitter_init()
264	>	// could be arranged to choose an NBO or OBO (with
265	>	// byteswapping) Blit_Expand_X_To_Y() function
266	>	switch (visualFormat.depth) {
267	>	case 15: case 16:
268	>	val = do_byteswap_16(val);
269	>	break;
270	>	case 24: case 32:
271	>	val = do_byteswap_32(val);
272	>	break;
273	>	}
274	>	}
275	>	return val;
276	>	}
277	>
278	>	// Do we have a visual for handling the specified Mac depth? If so, set the
279	>	// global variables "xdepth", "visualInfo", "vis" and "color_class".
280	>	static bool find_visual_for_depth(video_depth depth)
281	>	{
282	>	D(bug("have_visual_for_depth(%d)\n", 1 << depth));
283	>
284	>	// 1-bit works always and uses default visual
285	>	if (depth == VDEPTH_1BIT) {
286	>	vis = DefaultVisual(x_display, screen);
287	>	visualInfo.visualid = XVisualIDFromVisual(vis);
288	>	int num = 0;
289	>	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
290	>	visualInfo = vi[0];
291	>	XFree(vi);
292	>	xdepth = visualInfo.depth;
293	>	color_class = visualInfo.c_class;
294	>	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
295	>	return true;
296	>	}
297	>
298	>	// Calculate minimum and maximum supported X depth
299	>	int min_depth = 1, max_depth = 32;
300	>	switch (depth) {
301	>	#ifdef ENABLE_VOSF
302	>	case VDEPTH_2BIT:
303	>	case VDEPTH_4BIT:       // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
304	>	case VDEPTH_8BIT:
305	>	min_depth = 8;
306	>	max_depth = 32;
307	>	break;
308	>	#else
309	>	case VDEPTH_2BIT:
310	>	case VDEPTH_4BIT:       // 2/4-bit requires VOSF blitters
311	>	return false;
312	>	case VDEPTH_8BIT:       // 8-bit without VOSF requires an 8-bit visual
313	>	min_depth = 8;
314	>	max_depth = 8;
315	>	break;
316	>	#endif
317	>	case VDEPTH_16BIT:      // 16-bit requires a 15/16-bit visual
318	>	min_depth = 15;
319	>	max_depth = 16;
320	>	break;
321	>	case VDEPTH_32BIT:      // 32-bit requires a 24/32-bit visual
322	>	min_depth = 24;
323	>	max_depth = 32;
324	>	break;
325	>	}
326	>	D(bug(" minimum required X depth is %d, maximum supported X depth is %d\n", min_depth, max_depth));
327	>
328	>	// Try to find a visual for one of the color depths
329	>	bool visual_found = false;
330	>	for (int i=0; i<num_depths && !visual_found; i++) {
331	>
332	>	xdepth = avail_depths[i];
333	>	D(bug(" trying to find visual for depth %d\n", xdepth));
334	>	if (xdepth < min_depth || xdepth > max_depth)
335	>	continue;
336	>
337	>	// Determine best color class for this depth
338	>	switch (xdepth) {
339	>	case 1: // Try StaticGray or StaticColor
340	>	if (XMatchVisualInfo(x_display, screen, xdepth, StaticGray, &visualInfo)
341	>	|| XMatchVisualInfo(x_display, screen, xdepth, StaticColor, &visualInfo))
342	>	visual_found = true;
343	>	break;
344	>	case 8: // Need PseudoColor
345	>	if (XMatchVisualInfo(x_display, screen, xdepth, PseudoColor, &visualInfo))
346	>	visual_found = true;
347	>	break;
348	>	case 15:
349	>	case 16:
350	>	case 24:
351	>	case 32: // Try DirectColor first, as this will allow gamma correction
352	>	if (XMatchVisualInfo(x_display, screen, xdepth, DirectColor, &visualInfo)
353	>	|| XMatchVisualInfo(x_display, screen, xdepth, TrueColor, &visualInfo))
354	>	visual_found = true;
355	>	break;
356	>	default:
357	>	D(bug("  not a supported depth\n"));
358	>	break;
359	>	}
360	>	}
361	>	if (!visual_found)
362	>	return false;
363	>
364	>	// Visual was found
365	>	vis = visualInfo.visual;
366	>	color_class = visualInfo.c_class;
367	>	D(bug(" found visual ID 0x%02x, depth %d, class ", visualInfo.visualid, xdepth));
368	>	#if DEBUG
369	>	switch (color_class) {
370	>	case StaticGray: D(bug("StaticGray\n")); break;
371	>	case GrayScale: D(bug("GrayScale\n")); break;
372	>	case StaticColor: D(bug("StaticColor\n")); break;
373	>	case PseudoColor: D(bug("PseudoColor\n")); break;
374	>	case TrueColor: D(bug("TrueColor\n")); break;
375	>	case DirectColor: D(bug("DirectColor\n")); break;
376	>	}
377	>	#endif
378	>	return true;
379		}
380
381		// Add mode to list of supported modes
#	Line 217 | Line 403 | static void add_window_modes(video_depth
403		}
404
405		// Set Mac frame layout and base address (uses the_buffer/MacFrameBaseMac)
406	<	static void set_mac_frame_buffer(video_depth depth, bool native_byte_order)
406	>	static void set_mac_frame_buffer(X11_monitor_desc &monitor, video_depth depth, bool native_byte_order)
407		{
408		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
409		int layout = FLAYOUT_DIRECT;
#	Line 229 | Line 415 | static void set_mac_frame_buffer(video_d
415		MacFrameLayout = layout;
416		else
417		MacFrameLayout = FLAYOUT_DIRECT;
418	<	VideoMonitor.mac_frame_base = MacFrameBaseMac;
418	>	monitor.set_mac_frame_base(MacFrameBaseMac);
419
420		// Set variables used by UAE memory banking
421	+	const video_mode &mode = monitor.get_current_mode();
422		MacFrameBaseHost = the_buffer;
423	<	MacFrameSize = VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y;
423	>	MacFrameSize = mode.bytes_per_row * mode.y;
424		InitFrameBufferMapping();
425		#else
426	<	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
240	<	D(bug("Host frame buffer = %p, ", the_buffer));
426	>	monitor.set_mac_frame_base(Host2MacAddr(the_buffer));
427		#endif
428	<	D(bug("VideoMonitor.mac_frame_base = %08x\n", VideoMonitor.mac_frame_base));
428	>	D(bug("monitor.mac_frame_base = %08x\n", monitor.get_mac_frame_base()));
429		}
430
431		// Set window name and class
#	Line 317 | Line 503 | static int error_handler(Display *d, XEr
503
504		class driver_base {
505		public:
506	<	driver_base();
506	>	driver_base(X11_monitor_desc &m);
507		virtual ~driver_base();
508
509		virtual void update_palette(void);
#	Line 326 | Line 512 | public:
512		virtual void toggle_mouse_grab(void) {}
513		virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
514
515	+	void disable_mouse_accel(void);
516	+	void restore_mouse_accel(void);
517	+
518		virtual void grab_mouse(void) {}
519		virtual void ungrab_mouse(void) {}
520
521		public:
522	+	X11_monitor_desc &monitor; // Associated video monitor
523	+	const video_mode &mode;    // Video mode handled by the driver
524	+
525		bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
526		Window w;               // The window we draw into
527	+
528	+	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
529		};
530
531		class driver_window;
#	Line 345 | Line 539 | class driver_window : public driver_base
539		friend void update_display_static(driver_window *drv);
540
541		public:
542	<	driver_window(const video_mode &mode);
542	>	driver_window(X11_monitor_desc &monitor);
543		~driver_window();
544
545		void toggle_mouse_grab(void);
#	Line 364 | Line 558 | private:
558		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
559		};
560
561	+	class driver_dga;
562	+	static void update_display_dga_vosf(driver_dga *drv);
563	+
564	+	class driver_dga : public driver_base {
565	+	friend void update_display_dga_vosf(driver_dga *drv);
566	+
567	+	public:
568	+	driver_dga(X11_monitor_desc &monitor);
569	+	~driver_dga();
570	+
571	+	void suspend(void);
572	+	void resume(void);
573	+
574	+	protected:
575	+	struct FakeXImage {
576	+	int width, height;              // size of image
577	+	int depth;                              // depth of image
578	+	int bytes_per_line;             // accelerator to next line
579	+
580	+	FakeXImage(int w, int h, int d)
581	+	: width(w), height(h), depth(d)
582	+	{ bytes_per_line = TrivialBytesPerRow(width, DepthModeForPixelDepth(depth)); }
583	+	};
584	+	FakeXImage *img;
585	+
586	+	private:
587	+	Window suspend_win;             // "Suspend" information window
588	+	void *fb_save;                  // Saved frame buffer for suspend/resume
589	+	};
590	+
591		static driver_base *drv = NULL; // Pointer to currently used driver object
592
593		#ifdef ENABLE_VOSF
594		# include "video_vosf.h"
595		#endif
596
597	<	driver_base::driver_base()
598	<	: init_ok(false), w(0)
597	>	driver_base::driver_base(X11_monitor_desc &m)
598	>	: monitor(m), mode(m.get_current_mode()), init_ok(false), w(0)
599		{
600		the_buffer = NULL;
601		the_buffer_copy = NULL;
602	+	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
603		}
604
605		driver_base::~driver_base()
606		{
607		ungrab_mouse();
608	+	restore_mouse_accel();
609
610		if (w) {
611		XUnmapWindow(x_display, w);
#	Line 403 | Line 629 | driver_base::~driver_base()
629		}
630		#ifdef ENABLE_VOSF
631		else {
632	<	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
632	>	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
633	>	if (the_buffer != VM_MAP_FAILED) {
634	>	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
635		vm_release(the_buffer, the_buffer_size);
636		the_buffer = NULL;
637		}
638	<	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
639	<	vm_release(the_buffer_copy, the_buffer_size);
638	>	if (the_host_buffer) {
639	>	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
640	>	free(the_host_buffer);
641	>	the_host_buffer = NULL;
642	>	}
643	>	if (the_buffer_copy) {
644	>	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
645	>	free(the_buffer_copy);
646		the_buffer_copy = NULL;
647		}
648		}
#	Line 418 | Line 652 | driver_base::~driver_base()
652		// Palette has changed
653		void driver_base::update_palette(void)
654		{
655	<	if (cmap[0] && cmap[1]) {
656	<	int num = 256;
657	<	if (IsDirectMode(VideoMonitor.mode))
424	<	num = vis->map_entries; // Palette is gamma table
425	<	else if (vis->c_class == DirectColor)
655	>	if (color_class == PseudoColor || color_class == DirectColor) {
656	>	int num = vis->map_entries;
657	>	if (!IsDirectMode(monitor.get_current_mode()) && color_class == DirectColor)
658		return; // Indexed mode on true color screen, don't set CLUT
659	<	XStoreColors(x_display, cmap[0], palette, num);
660	<	XStoreColors(x_display, cmap[1], palette, num);
659	>	XStoreColors(x_display, cmap[0], x_palette, num);
660	>	XStoreColors(x_display, cmap[1], x_palette, num);
661		}
662		XSync(x_display, false);
663		}
664
665	+	// Disable mouse acceleration
666	+	void driver_base::disable_mouse_accel(void)
667	+	{
668	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
669	+	}
670	+
671	+	// Restore mouse acceleration to original value
672	+	void driver_base::restore_mouse_accel(void)
673	+	{
674	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
675	+	}
676	+
677
678		/*
679		*  Windowed display driver
680		*/
681
682		// Open display
683	<	driver_window::driver_window(const video_mode &mode)
684	<	: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0)
683	>	driver_window::driver_window(X11_monitor_desc &m)
684	>	: driver_base(m), gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false)
685		{
686		int width = mode.x, height = mode.y;
687		int aligned_width = (width + 15) & ~15;
#	Line 446 | Line 690 | driver_window::driver_window(const video
690		// Set absolute mouse mode
691		ADBSetRelMouseMode(mouse_grabbed);
692
693	<	// Create window
693	>	// Create window (setting background_pixel, border_pixel and colormap is
694	>	// mandatory when using a non-default visual; in 1-bit mode we use the
695	>	// default visual, so we can also use the default colormap)
696		XSetWindowAttributes wattr;
697		wattr.event_mask = eventmask = win_eventmask;
698	<	wattr.background_pixel = black_pixel;
699	<	wattr.colormap = (mode.depth == VDEPTH_1BIT && vis->c_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
698	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
699	>	wattr.border_pixel = 0;
700	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
701		w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
702	<	InputOutput, vis, CWEventMask | CWBackPixel | (vis->c_class == PseudoColor || vis->c_class == DirectColor ? CWColormap : 0), &wattr);
702	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWColormap, &wattr);
703	>	D(bug(" window created\n"));
704
705		// Set window name/class
706		set_window_name(w, STR_WINDOW_TITLE);
#	Line 476 | Line 724 | driver_window::driver_window(const video
724		XFree(hints);
725		}
726		}
727	+	D(bug(" window attributes set\n"));
728
729		// Show window
730		XMapWindow(x_display, w);
731		wait_mapped(w);
732	+	D(bug(" window mapped\n"));
733
734		// 1-bit mode is big-endian; if the X server is little-endian, we can't
735		// use SHM because that doesn't allow changing the image byte order
#	Line 490 | Line 740 | driver_window::driver_window(const video
740
741		// Create SHM image ("height + 2" for safety)
742		img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
743	+	D(bug(" shm image created\n"));
744		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
745		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
746		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 504 | Line 755 | driver_window::driver_window(const video
755		if (shm_error) {
756		shmdt(shminfo.shmaddr);
757		XDestroyImage(img);
758	+	img = NULL;
759		shminfo.shmid = -1;
760		} else {
761		have_shm = true;
762		shmctl(shminfo.shmid, IPC_RMID, 0);
763		}
764	+	D(bug(" shm image attached\n"));
765		}
766
767		// Create normal X image if SHM doesn't work ("height + 2" for safety)
#	Line 516 | Line 769 | driver_window::driver_window(const video
769		int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
770		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
771		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);
772	+	D(bug(" X image created\n"));
773		}
774
775		if (need_msb_image) {
#	Line 524 | Line 778 | driver_window::driver_window(const video
778		}
779
780		#ifdef ENABLE_VOSF
781	+	use_vosf = true;
782		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
783		the_host_buffer = the_buffer_copy;
784		the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
785	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
786	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
785	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
786	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
787	>	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
788		#else
789		// Allocate memory for frame buffer
790		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
791	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
792		#endif
793
794		// Create GC
#	Line 546 | Line 803 | driver_window::driver_window(const video
803		XDefineCursor(x_display, w, mac_cursor);
804
805		// Init blitting routines
549	–	bool native_byte_order;
550	–	#ifdef WORDS_BIGENDIAN
551	–	native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
552	–	#else
553	–	native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
554	–	#endif
806		#ifdef ENABLE_VOSF
807	<	Screen_blitter_init(&visualInfo, native_byte_order, mode.depth);
807	>	Screen_blitter_init(visualFormat, x_native_byte_order, depth_of_video_mode(mode));
808		#endif
809
810	<	// Set VideoMonitor
811	<	VideoMonitor.mode = mode;
561	<	set_mac_frame_buffer(mode.depth, native_byte_order);
810	>	// Set frame buffer base
811	>	set_mac_frame_buffer(monitor, mode.depth, x_native_byte_order);
812
813		// Everything went well
814		init_ok = true;
#	Line 567 | Line 817 | driver_window::driver_window(const video
817		// Close display
818		driver_window::~driver_window()
819		{
570	–	if (img)
571	–	XDestroyImage(img);
820		if (have_shm) {
821		XShmDetach(x_display, &shminfo);
822	+	#ifdef ENABLE_VOSF
823	+	the_host_buffer = NULL; // don't free() in driver_base dtor
824	+	#else
825		the_buffer_copy = NULL; // don't free() in driver_base dtor
826	+	#endif
827	+	}
828	+	if (img) {
829	+	if (!have_shm)
830	+	img->data = NULL;
831	+	XDestroyImage(img);
832	+	}
833	+	if (have_shm) {
834	+	shmdt(shminfo.shmaddr);
835	+	shmctl(shminfo.shmid, IPC_RMID, 0);
836		}
837		if (gc)
838		XFreeGC(x_display, gc);
#	Line 598 | Line 859 | void driver_window::grab_mouse(void)
859		Delay_usec(100000);
860		}
861		if (result == GrabSuccess) {
601	–	ADBSetRelMouseMode(mouse_grabbed = true);
862		XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
863	<	XSync(x_display, false);
863	>	ADBSetRelMouseMode(mouse_grabbed = true);
864	>	disable_mouse_accel();
865		}
866		}
867
#	Line 611 | Line 872 | void driver_window::ungrab_mouse(void)
872		XUngrabPointer(x_display, CurrentTime);
873		XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
874		ADBSetRelMouseMode(mouse_grabbed = false);
875	+	restore_mouse_accel();
876		}
877		}
878
#	Line 626 | Line 888 | void driver_window::mouse_moved(int x, i
888		// Warped mouse motion (this code is taken from SDL)
889
890		// Post first mouse event
891	<	int width = VideoMonitor.mode.x, height = VideoMonitor.mode.y;
891	>	int width = monitor.get_current_mode().x, height = monitor.get_current_mode().y;
892		int delta_x = x - mouse_last_x, delta_y = y - mouse_last_y;
893		mouse_last_x = x; mouse_last_y = y;
894		ADBMouseMoved(delta_x, delta_y);
#	Line 661 | Line 923 | void driver_window::mouse_moved(int x, i
923		*  DGA display driver base class
924		*/
925
926	<	class driver_dga : public driver_base {
927	<	public:
666	<	driver_dga();
667	<	~driver_dga();
668	<
669	<	void suspend(void);
670	<	void resume(void);
671	<
672	<	private:
673	<	Window suspend_win;             // "Suspend" information window
674	<	void *fb_save;                  // Saved frame buffer for suspend/resume
675	<	};
676	<
677	<	driver_dga::driver_dga()
678	<	: suspend_win(0), fb_save(NULL)
926	>	driver_dga::driver_dga(X11_monitor_desc &m)
927	>	: driver_base(m), suspend_win(0), fb_save(NULL), img(NULL)
928		{
929		}
930
#	Line 683 | Line 932 | driver_dga::~driver_dga()
932		{
933		XUngrabPointer(x_display, CurrentTime);
934		XUngrabKeyboard(x_display, CurrentTime);
935	+
936	+	if (img)
937	+	delete img;
938		}
939
940		// Suspend emulation
#	Line 696 | Line 948 | void driver_dga::suspend(void)
948		LOCK_FRAME_BUFFER;
949
950		// Save frame buffer
951	<	fb_save = malloc(VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
951	>	fb_save = malloc(mode.y * mode.bytes_per_row);
952		if (fb_save)
953	<	memcpy(fb_save, the_buffer, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
953	>	memcpy(fb_save, the_buffer, mode.y * mode.bytes_per_row);
954
955		// Close full screen display
956		#ifdef ENABLE_XF86_DGA
#	Line 706 | Line 958 | void driver_dga::suspend(void)
958		#endif
959		XUngrabPointer(x_display, CurrentTime);
960		XUngrabKeyboard(x_display, CurrentTime);
961	+	restore_mouse_accel();
962		XUnmapWindow(x_display, w);
963		wait_unmapped(w);
964
#	Line 735 | Line 988 | void driver_dga::resume(void)
988		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
989		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
990		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
991	+	disable_mouse_accel();
992		#ifdef ENABLE_XF86_DGA
993		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
994		XF86DGASetViewPort(x_display, screen, 0, 0);
#	Line 749 | Line 1003 | void driver_dga::resume(void)
1003		LOCK_VOSF;
1004		PFLAG_SET_ALL;
1005		UNLOCK_VOSF;
1006	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1006	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1007		}
1008		#endif
1009
#	Line 759 | Line 1013 | void driver_dga::resume(void)
1013		// Don't copy fb_save to the temporary frame buffer in VOSF mode
1014		if (!use_vosf)
1015		#endif
1016	<	memcpy(the_buffer, fb_save, VideoMonitor.mode.y * VideoMonitor.mode.bytes_per_row);
1016	>	memcpy(the_buffer, fb_save, mode.y * mode.bytes_per_row);
1017		free(fb_save);
1018		fb_save = NULL;
1019		}
#	Line 781 | Line 1035 | const char FBDEVICE_FILE_NAME[] = "/dev/
1035
1036		class driver_fbdev : public driver_dga {
1037		public:
1038	<	driver_fbdev(const video_mode &mode);
1038	>	driver_fbdev(X11_monitor_desc &monitor);
1039		~driver_fbdev();
1040		};
1041
1042		// Open display
1043	<	driver_fbdev::driver_fbdev(const video_mode &mode)
1043	>	driver_fbdev::driver_fbdev(X11_monitor_desc &m) : driver_dga(m)
1044		{
1045		int width = mode.x, height = mode.y;
1046
#	Line 834 | Line 1088 | driver_fbdev::driver_fbdev(const video_m
1088		if ((line[0] == '#') || (line[0] == ';') || (line[0] == '\0'))
1089		continue;
1090
1091	<	if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3)
1091	>	if ((sscanf(line, "%19s %d %x", fb_name, &fb_depth, &fb_offset) == 3)
1092		&& (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) {
1093		device_found = true;
1094		break;
#	Line 881 | Line 1135 | driver_fbdev::driver_fbdev(const video_m
1135		XGrabPointer(x_display, w, True,
1136		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
1137		GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1138	+	disable_mouse_accel();
1139
1140		// Calculate bytes per row
1141		int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1142
1143		// Map frame buffer
1144	<	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1145	<	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1144	>	the_buffer_size = height * bytes_per_row;
1145	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1146	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1147		char str[256];
1148		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1149		ErrorAlert(str);
#	Line 899 | Line 1155 | driver_fbdev::driver_fbdev(const video_m
1155		#if REAL_ADDRESSING || DIRECT_ADDRESSING
1156		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1157		// i.e. the framebuffer update function is not Blit_Copy_Raw
1158	<	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1158	>	use_vosf = Screen_blitter_init(visualFormat, true, mode.depth);
1159
1160		if (use_vosf) {
1161		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1162		the_host_buffer = the_buffer;
1163		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1164	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1165	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1164	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1165	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1166	>
1167	>	// Fake image for DGA/VOSF mode to know about display bounds
1168	>	img = new FakeXImage(width, height, depth_of_video_mode(mode));
1169		}
1170		#else
1171		use_vosf = false;
1172		#endif
1173		#endif
1174
1175	<	// Set VideoMonitor
1176	<	VideoModes[0].bytes_per_row = bytes_per_row;
1177	<	VideoModes[0].depth = DepthModeForPixelDepth(fb_depth);
1178	<	VideoMonitor.mode = mode;
920	<	set_mac_frame_buffer(mode.depth, true);
1175	>	// Set frame buffer base
1176	>	const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1177	>	const_cast<video_mode *>(&mode)->depth = DepthModeForPixelDepth(fb_depth);
1178	>	set_mac_frame_buffer(monitor, mode.depth, true);
1179
1180		// Everything went well
1181		init_ok = true;
#	Line 926 | Line 1184 | driver_fbdev::driver_fbdev(const video_m
1184		// Close display
1185		driver_fbdev::~driver_fbdev()
1186		{
1187	+	if (!use_vosf) {
1188	+	if (the_buffer != MAP_FAILED) {
1189	+	// don't free() the screen buffer in driver_base dtor
1190	+	munmap(the_buffer, the_buffer_size);
1191	+	the_buffer = NULL;
1192	+	}
1193	+	}
1194	+	#ifdef ENABLE_VOSF
1195	+	else {
1196	+	if (the_host_buffer != MAP_FAILED) {
1197	+	// don't free() the screen buffer in driver_base dtor
1198	+	munmap(the_host_buffer, the_buffer_size);
1199	+	the_host_buffer = NULL;
1200	+	}
1201	+	}
1202	+	#endif
1203		}
1204		#endif
1205
#	Line 937 | Line 1211 | driver_fbdev::~driver_fbdev()
1211
1212		class driver_xf86dga : public driver_dga {
1213		public:
1214	<	driver_xf86dga(const video_mode &mode);
1214	>	driver_xf86dga(X11_monitor_desc &monitor);
1215		~driver_xf86dga();
1216
1217		void update_palette(void);
#	Line 948 | Line 1222 | private:
1222		};
1223
1224		// Open display
1225	<	driver_xf86dga::driver_xf86dga(const video_mode &mode)
1226	<	: current_dga_cmap(0)
1225	>	driver_xf86dga::driver_xf86dga(X11_monitor_desc &m)
1226	>	: driver_dga(m), current_dga_cmap(0)
1227		{
1228		int width = mode.x, height = mode.y;
1229
#	Line 976 | Line 1250 | driver_xf86dga::driver_xf86dga(const vid
1250		XSetWindowAttributes wattr;
1251		wattr.event_mask = eventmask = dga_eventmask;
1252		wattr.override_redirect = True;
1253	+	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
1254
1255		w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
1256	<	InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
1256	>	InputOutput, vis, CWEventMask | CWOverrideRedirect |
1257	>	(color_class == DirectColor ? CWColormap : 0), &wattr);
1258
1259		// Set window name/class
1260		set_window_name(w, STR_WINDOW_TITLE);
#	Line 995 | Line 1271 | driver_xf86dga::driver_xf86dga(const vid
1271		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1272		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1273		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1274	+	disable_mouse_accel();
1275
1276		int v_width, v_bank, v_size;
1277		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 1011 | Line 1288 | driver_xf86dga::driver_xf86dga(const vid
1288
1289		// Init blitting routines
1290		int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1291	<	#ifdef VIDEO_VOSF
1291	>	#if ENABLE_VOSF
1292		#if REAL_ADDRESSING || DIRECT_ADDRESSING
1293		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1294		// i.e. the framebuffer update function is not Blit_Copy_Raw
1295	<	use_vosf = Screen_blitter_init(&visualInfo, true, mode.depth);
1295	>	use_vosf = Screen_blitter_init(visualFormat, x_native_byte_order, depth_of_video_mode(mode));
1296
1297		if (use_vosf) {
1298		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1299		the_host_buffer = the_buffer;
1300		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1301	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1302	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1301	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1302	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1303	>
1304	>	// Fake image for DGA/VOSF mode to know about display bounds
1305	>	img = new FakeXImage((v_width + 7) & ~7, height, depth_of_video_mode(mode));
1306		}
1307		#else
1308		use_vosf = false;
1309		#endif
1310		#endif
1311
1312	<	// Set VideoMonitor
1312	>	// Set frame buffer base
1313		const_cast<video_mode *>(&mode)->bytes_per_row = bytes_per_row;
1314	<	VideoMonitor.mode = mode;
1035	<	set_mac_frame_buffer(mode.depth, true);
1314	>	set_mac_frame_buffer(monitor, mode.depth, true);
1315
1316		// Everything went well
1317		init_ok = true;
#	Line 1042 | Line 1321 | driver_xf86dga::driver_xf86dga(const vid
1321		driver_xf86dga::~driver_xf86dga()
1322		{
1323		XF86DGADirectVideo(x_display, screen, 0);
1324	+	if (!use_vosf) {
1325	+	// don't free() the screen buffer in driver_base dtor
1326	+	the_buffer = NULL;
1327	+	}
1328	+	#ifdef ENABLE_VOSF
1329	+	else {
1330	+	// don't free() the screen buffer in driver_base dtor
1331	+	the_host_buffer = NULL;
1332	+	}
1333	+	#endif
1334		#ifdef ENABLE_XF86_VIDMODE
1335		if (has_vidmode)
1336		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
#	Line 1053 | Line 1342 | void driver_xf86dga::update_palette(void
1342		{
1343		driver_dga::update_palette();
1344		current_dga_cmap ^= 1;
1345	<	if (!IsDirectMode(VideoMonitor.mode) && cmap[current_dga_cmap])
1345	>	if (!IsDirectMode(monitor.get_current_mode()) && cmap[current_dga_cmap])
1346		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1347		}
1348
#	Line 1061 | Line 1350 | void driver_xf86dga::update_palette(void
1350		void driver_xf86dga::resume(void)
1351		{
1352		driver_dga::resume();
1353	<	if (!IsDirectMode(VideoMonitor.mode))
1353	>	if (!IsDirectMode(monitor.get_current_mode()))
1354		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1355		}
1356		#endif
#	Line 1095 | Line 1384 | static void keycode_init(void)
1384
1385		// Search for server vendor string, then read keycodes
1386		const char *vendor = ServerVendor(x_display);
1387	+	// Force use of MacX mappings on MacOS X with Apple's X server
1388	+	int dummy;
1389	+	if (XQueryExtension(x_display, "Apple-DRI", &dummy, &dummy, &dummy))
1390	+	vendor = "MacX";
1391		bool vendor_found = false;
1392		char line[256];
1393		while (fgets(line, 255, f)) {
#	Line 1136 | Line 1429 | static void keycode_init(void)
1429		}
1430		}
1431
1432	<	// Open display for specified mode
1433	<	static bool video_open(const video_mode &mode)
1432	>	// Open display for current mode
1433	>	bool X11_monitor_desc::video_open(void)
1434		{
1435	+	D(bug("video_open()\n"));
1436	+	const video_mode &mode = get_current_mode();
1437	+
1438	+	// Find best available X visual
1439	+	if (!find_visual_for_depth(mode.depth)) {
1440	+	ErrorAlert(STR_NO_XVISUAL_ERR);
1441	+	return false;
1442	+	}
1443	+
1444	+	// Determine the byte order of an XImage content
1445	+	#ifdef WORDS_BIGENDIAN
1446	+	x_native_byte_order = (XImageByteOrder(x_display) == MSBFirst);
1447	+	#else
1448	+	x_native_byte_order = (XImageByteOrder(x_display) == LSBFirst);
1449	+	#endif
1450	+
1451	+	// Build up visualFormat structure
1452	+	visualFormat.fullscreen = (display_type == DISPLAY_DGA);
1453	+	visualFormat.depth = visualInfo.depth;
1454	+	visualFormat.Rmask = visualInfo.red_mask;
1455	+	visualFormat.Gmask = visualInfo.green_mask;
1456	+	visualFormat.Bmask = visualInfo.blue_mask;
1457	+
1458	+	// Create color maps
1459	+	if (color_class == PseudoColor || color_class == DirectColor) {
1460	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1461	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1462	+	} else {
1463	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1464	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1465	+	}
1466	+
1467	+	// Find pixel format of direct modes
1468	+	if (color_class == DirectColor || color_class == TrueColor) {
1469	+	rshift = gshift = bshift = 0;
1470	+	rloss = gloss = bloss = 8;
1471	+	uint32 mask;
1472	+	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1473	+	++rshift;
1474	+	for (; mask&1; mask>>=1)
1475	+	--rloss;
1476	+	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1477	+	++gshift;
1478	+	for (; mask&1; mask>>=1)
1479	+	--gloss;
1480	+	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1481	+	++bshift;
1482	+	for (; mask&1; mask>>=1)
1483	+	--bloss;
1484	+	}
1485	+
1486	+	// Preset palette pixel values for CLUT or gamma table
1487	+	if (color_class == DirectColor) {
1488	+	int num = vis->map_entries;
1489	+	for (int i=0; i<num; i++) {
1490	+	int c = (i * 256) / num;
1491	+	x_palette[i].pixel = map_rgb(c, c, c);
1492	+	x_palette[i].flags = DoRed | DoGreen | DoBlue;
1493	+	}
1494	+	} else if (color_class == PseudoColor) {
1495	+	for (int i=0; i<256; i++) {
1496	+	x_palette[i].pixel = i;
1497	+	x_palette[i].flags = DoRed | DoGreen | DoBlue;
1498	+	}
1499	+	}
1500	+
1501		// Load gray ramp to color map
1502	<	int num = (vis->c_class == DirectColor ? vis->map_entries : 256);
1502	>	int num = (color_class == DirectColor ? vis->map_entries : 256);
1503		for (int i=0; i<num; i++) {
1504		int c = (i * 256) / num;
1505	<	palette[i].red = c * 0x0101;
1506	<	palette[i].green = c * 0x0101;
1507	<	palette[i].blue = c * 0x0101;
1508	<	if (vis->c_class == PseudoColor)
1509	<	palette[i].pixel = i;
1510	<	palette[i].flags = DoRed | DoGreen | DoBlue;
1511	<	}
1153	<	if (cmap[0] && cmap[1]) {
1154	<	XStoreColors(x_display, cmap[0], palette, num);
1155	<	XStoreColors(x_display, cmap[1], palette, num);
1505	>	x_palette[i].red = c * 0x0101;
1506	>	x_palette[i].green = c * 0x0101;
1507	>	x_palette[i].blue = c * 0x0101;
1508	>	}
1509	>	if (color_class == PseudoColor || color_class == DirectColor) {
1510	>	XStoreColors(x_display, cmap[0], x_palette, num);
1511	>	XStoreColors(x_display, cmap[1], x_palette, num);
1512		}
1513
1514		#ifdef ENABLE_VOSF
1515		// Load gray ramp to 8->16/32 expand map
1516	<	if (!IsDirectMode(mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor))
1516	>	if (!IsDirectMode(mode) && xdepth > 8)
1517		for (int i=0; i<256; i++)
1518	<	ExpandMap[i] = map_rgb(i, i, i);
1518	>	ExpandMap[i] = map_rgb(i, i, i, true);
1519		#endif
1520
1521		// Create display driver object of requested type
1522		switch (display_type) {
1523		case DISPLAY_WINDOW:
1524	<	drv = new driver_window(mode);
1524	>	drv = new driver_window(*this);
1525		break;
1526		#ifdef ENABLE_FBDEV_DGA
1527		case DISPLAY_DGA:
1528	<	drv = new driver_fbdev(mode);
1528	>	drv = new driver_fbdev(*this);
1529		break;
1530		#endif
1531		#ifdef ENABLE_XF86_DGA
1532		case DISPLAY_DGA:
1533	<	drv = new driver_xf86dga(mode);
1533	>	drv = new driver_xf86dga(*this);
1534		break;
1535		#endif
1536		}
#	Line 1188 | Line 1544 | static bool video_open(const video_mode
1544
1545		#ifdef ENABLE_VOSF
1546		if (use_vosf) {
1547	<	// Initialize the mainBuffer structure
1548	<	if (!video_init_buffer()) {
1547	>	// Initialize the VOSF system
1548	>	if (!video_vosf_init(*this)) {
1549		ErrorAlert(STR_VOSF_INIT_ERR);
1550		return false;
1551		}
1196	–
1197	–	// Initialize the handler for SIGSEGV
1198	–	if (!sigsegv_install_handler(screen_fault_handler)) {
1199	–	ErrorAlert("Could not initialize Video on SEGV signals");
1200	–	return false;
1201	–	}
1552		}
1553		#endif
1554
#	Line 1210 | Line 1560 | static bool video_open(const video_mode
1560		LOCK_FRAME_BUFFER;
1561
1562		// Start redraw/input thread
1563	<	#ifdef HAVE_PTHREADS
1563	>	#ifdef USE_PTHREADS_SERVICES
1564		redraw_thread_cancel = false;
1565	<	redraw_thread_active = (pthread_create(&redraw_thread, NULL, redraw_func, NULL) == 0);
1565	>	Set_pthread_attr(&redraw_thread_attr, 0);
1566	>	redraw_thread_active = (pthread_create(&redraw_thread, &redraw_thread_attr, redraw_func, NULL) == 0);
1567		if (!redraw_thread_active) {
1568		printf("FATAL: cannot create redraw thread\n");
1569		return false;
#	Line 1249 | Line 1600 | bool VideoInit(bool classic)
1600		// Find screen and root window
1601		screen = XDefaultScreen(x_display);
1602		rootwin = XRootWindow(x_display, screen);
1603	<
1604	<	// Get screen depth
1605	<	xdepth = DefaultDepth(x_display, screen);
1603	>
1604	>	// Get sorted list of available depths
1605	>	avail_depths = XListDepths(x_display, screen, &num_depths);
1606	>	if (avail_depths == NULL) {
1607	>	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1608	>	return false;
1609	>	}
1610	>	std::sort(avail_depths, avail_depths + num_depths);
1611
1612		#ifdef ENABLE_FBDEV_DGA
1613		// Frame buffer name
#	Line 1291 | Line 1647 | bool VideoInit(bool classic)
1647		black_pixel = BlackPixel(x_display, screen);
1648		white_pixel = WhitePixel(x_display, screen);
1649
1294	–	// Get appropriate visual
1295	–	int color_class;
1296	–	switch (xdepth) {
1297	–	case 1:
1298	–	color_class = StaticGray;
1299	–	break;
1300	–	case 8:
1301	–	color_class = PseudoColor;
1302	–	break;
1303	–	case 15:
1304	–	case 16:
1305	–	case 24:
1306	–	case 32: // Try DirectColor first, as this will allow gamma correction
1307	–	color_class = DirectColor;
1308	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo))
1309	–	color_class = TrueColor;
1310	–	break;
1311	–	default:
1312	–	ErrorAlert(STR_UNSUPP_DEPTH_ERR);
1313	–	return false;
1314	–	}
1315	–	if (!XMatchVisualInfo(x_display, screen, xdepth, color_class, &visualInfo)) {
1316	–	ErrorAlert(STR_NO_XVISUAL_ERR);
1317	–	return false;
1318	–	}
1319	–	if (visualInfo.depth != xdepth) {
1320	–	ErrorAlert(STR_NO_XVISUAL_ERR);
1321	–	return false;
1322	–	}
1323	–	vis = visualInfo.visual;
1324	–
1325	–	// Create color maps
1326	–	if (color_class == PseudoColor || color_class == DirectColor) {
1327	–	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1328	–	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1329	–	}
1330	–
1331	–	// Find pixel format of direct modes
1332	–	if (color_class == DirectColor || color_class == TrueColor) {
1333	–	rshift = gshift = bshift = 0;
1334	–	rloss = gloss = bloss = 8;
1335	–	uint32 mask;
1336	–	for (mask=vis->red_mask; !(mask&1); mask>>=1)
1337	–	++rshift;
1338	–	for (; mask&1; mask>>=1)
1339	–	--rloss;
1340	–	for (mask=vis->green_mask; !(mask&1); mask>>=1)
1341	–	++gshift;
1342	–	for (; mask&1; mask>>=1)
1343	–	--gloss;
1344	–	for (mask=vis->blue_mask; !(mask&1); mask>>=1)
1345	–	++bshift;
1346	–	for (; mask&1; mask>>=1)
1347	–	--bloss;
1348	–	}
1349	–
1350	–	// Preset palette pixel values for gamma table
1351	–	if (color_class == DirectColor) {
1352	–	int num = vis->map_entries;
1353	–	for (int i=0; i<num; i++) {
1354	–	int c = (i * 256) / num;
1355	–	palette[i].pixel = map_rgb(c, c, c);
1356	–	}
1357	–	}
1358	–
1650		// Get screen mode from preferences
1651		const char *mode_str;
1652		if (classic_mode)
#	Line 1390 | Line 1681 | bool VideoInit(bool classic)
1681		default_height = DisplayHeight(x_display, screen);
1682
1683		// Mac screen depth follows X depth
1684	<	video_depth default_depth = DepthModeForPixelDepth(xdepth);
1684	>	video_depth default_depth = VDEPTH_1BIT;
1685	>	switch (DefaultDepth(x_display, screen)) {
1686	>	case 8:
1687	>	default_depth = VDEPTH_8BIT;
1688	>	break;
1689	>	case 15: case 16:
1690	>	default_depth = VDEPTH_16BIT;
1691	>	break;
1692	>	case 24: case 32:
1693	>	default_depth = VDEPTH_32BIT;
1694	>	break;
1695	>	}
1696
1697		// Construct list of supported modes
1698		if (display_type == DISPLAY_WINDOW) {
1699		if (classic)
1700		add_mode(512, 342, 0x80, 64, VDEPTH_1BIT);
1701		else {
1702	<	if (default_depth != VDEPTH_1BIT)
1703	<	add_window_modes(VDEPTH_1BIT);  // 1-bit modes are always available
1704	<	#ifdef ENABLE_VOSF
1403	<	if (default_depth > VDEPTH_8BIT) {
1404	<	add_window_modes(VDEPTH_2BIT);  // 2, 4 and 8-bit modes are also possible on 16/32-bit screens with VOSF blitters
1405	<	add_window_modes(VDEPTH_4BIT);
1406	<	add_window_modes(VDEPTH_8BIT);
1702	>	for (unsigned d=VDEPTH_1BIT; d<=VDEPTH_32BIT; d++) {
1703	>	if (find_visual_for_depth(video_depth(d)))
1704	>	add_window_modes(video_depth(d));
1705		}
1408	–	#endif
1409	–	add_window_modes(default_depth);
1706		}
1707		} else
1708		add_mode(default_width, default_height, 0x80, TrivialBytesPerRow(default_width, default_depth), default_depth);
1709	<	video_init_depth_list();
1709	>	if (VideoModes.empty()) {
1710	>	ErrorAlert(STR_NO_XVISUAL_ERR);
1711	>	return false;
1712	>	}
1713
1714	<	// Find requested default mode and open display
1715	<	if (VideoModes.size() == 1)
1716	<	return video_open(VideoModes[0]);
1717	<	else {
1718	<	// Find mode with specified dimensions
1719	<	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1720	<	for (i = VideoModes.begin(); i != end; ++i) {
1422	<	if (i->x == default_width && i->y == default_height && i->depth == default_depth)
1423	<	return video_open(*i);
1714	>	// Find requested default mode with specified dimensions
1715	>	uint32 default_id;
1716	>	std::vector<video_mode>::const_iterator i, end = VideoModes.end();
1717	>	for (i = VideoModes.begin(); i != end; ++i) {
1718	>	if (i->x == default_width && i->y == default_height && i->depth == default_depth) {
1719	>	default_id = i->resolution_id;
1720	>	break;
1721		}
1425	–	return video_open(VideoModes[0]);
1722		}
1723	+	if (i == end) { // not found, use first available mode
1724	+	default_depth = VideoModes[0].depth;
1725	+	default_id = VideoModes[0].resolution_id;
1726	+	}
1727	+
1728	+	#if DEBUG
1729	+	D(bug("Available video modes:\n"));
1730	+	for (i = VideoModes.begin(); i != end; ++i) {
1731	+	int bits = 1 << i->depth;
1732	+	if (bits == 16)
1733	+	bits = 15;
1734	+	else if (bits == 32)
1735	+	bits = 24;
1736	+	D(bug(" %dx%d (ID %02x), %d colors\n", i->x, i->y, i->resolution_id, 1 << bits));
1737	+	}
1738	+	#endif
1739	+
1740	+	// Create X11_monitor_desc for this (the only) display
1741	+	X11_monitor_desc *monitor = new X11_monitor_desc(VideoModes, default_depth, default_id);
1742	+	VideoMonitors.push_back(monitor);
1743	+
1744	+	// Open display
1745	+	return monitor->video_open();
1746		}
1747
1748
#	Line 1432 | Line 1751 | bool VideoInit(bool classic)
1751		*/
1752
1753		// Close display
1754	<	static void video_close(void)
1754	>	void X11_monitor_desc::video_close(void)
1755		{
1756	+	D(bug("video_close()\n"));
1757	+
1758		// Stop redraw thread
1759	<	#ifdef HAVE_PTHREADS
1759	>	#ifdef USE_PTHREADS_SERVICES
1760		if (redraw_thread_active) {
1761		redraw_thread_cancel = true;
1762	<	#ifdef HAVE_PTHREAD_CANCEL
1442	<	pthread_cancel(redraw_thread);
1443	<	#endif
1762	>	redraw_thread_cancel_ack = false;
1763		pthread_join(redraw_thread, NULL);
1764	+	while (!redraw_thread_cancel_ack) ;
1765		}
1766		#endif
1767		redraw_thread_active = false;
#	Line 1449 | Line 1769 | static void video_close(void)
1769		// Unlock frame buffer
1770		UNLOCK_FRAME_BUFFER;
1771		XSync(x_display, false);
1772	+	D(bug(" frame buffer unlocked\n"));
1773
1774		#ifdef ENABLE_VOSF
1454	–	// Deinitialize VOSF
1775		if (use_vosf) {
1776	<	if (mainBuffer.pageInfo) {
1777	<	free(mainBuffer.pageInfo);
1458	<	mainBuffer.pageInfo = NULL;
1459	<	}
1460	<	if (mainBuffer.dirtyPages) {
1461	<	free(mainBuffer.dirtyPages);
1462	<	mainBuffer.dirtyPages = NULL;
1463	<	}
1776	>	// Deinitialize VOSF
1777	>	video_vosf_exit();
1778		}
1779		#endif
1780
1781		// Close display
1782		delete drv;
1783		drv = NULL;
1470	–	}
1471	–
1472	–	void VideoExit(void)
1473	–	{
1474	–	// Close display
1475	–	video_close();
1784
1785		// Free colormaps
1786		if (cmap[0]) {
#	Line 1483 | Line 1791 | void VideoExit(void)
1791		XFreeColormap(x_display, cmap[1]);
1792		cmap[1] = 0;
1793		}
1794	+	}
1795	+
1796	+	void VideoExit(void)
1797	+	{
1798	+	// Close displays
1799	+	vector<monitor_desc *>::iterator i, end = VideoMonitors.end();
1800	+	for (i = VideoMonitors.begin(); i != end; ++i)
1801	+	dynamic_cast<X11_monitor_desc *>(*i)->video_close();
1802
1803		#ifdef ENABLE_XF86_VIDMODE
1804		// Free video mode list
#	Line 1499 | Line 1815 | void VideoExit(void)
1815		fbdev_fd = -1;
1816		}
1817		#endif
1818	+
1819	+	// Free depth list
1820	+	if (avail_depths) {
1821	+	XFree(avail_depths);
1822	+	avail_depths = NULL;
1823	+	}
1824		}
1825
1826
#	Line 1534 | Line 1856 | void VideoInterrupt(void)
1856		*  Set palette
1857		*/
1858
1859	<	void video_set_palette(uint8 *pal, int num_in)
1859	>	void X11_monitor_desc::set_palette(uint8 *pal, int num_in)
1860		{
1861	+	const video_mode &mode = get_current_mode();
1862	+
1863		LOCK_PALETTE;
1864
1865		// Convert colors to XColor array
1866		int num_out = 256;
1867	<	if (IsDirectMode(VideoMonitor.mode)) {
1867	>	bool stretch = false;
1868	>	if (IsDirectMode(mode)) {
1869		// If X is in 565 mode we have to stretch the gamma table from 32 to 64 entries
1870		num_out = vis->map_entries;
1871	+	stretch = true;
1872		}
1873	<	XColor *p = palette;
1873	>	XColor *p = x_palette;
1874		for (int i=0; i<num_out; i++) {
1875	<	int c = (i * num_in) / num_out;
1875	>	int c = (stretch ? (i * num_in) / num_out : i);
1876		p->red = pal[c*3 + 0] * 0x0101;
1877		p->green = pal[c*3 + 1] * 0x0101;
1878		p->blue = pal[c*3 + 2] * 0x0101;
1553	–	if (vis->c_class == PseudoColor)
1554	–	p->pixel = i;
1555	–	p->flags = DoRed | DoGreen | DoBlue;
1879		p++;
1880		}
1881
1882		#ifdef ENABLE_VOSF
1883		// Recalculate pixel color expansion map
1884	<	if (!IsDirectMode(VideoMonitor.mode) && (vis->c_class == TrueColor || vis->c_class == DirectColor)) {
1884	>	if (!IsDirectMode(mode) && xdepth > 8) {
1885		for (int i=0; i<256; i++) {
1886		int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1887	<	ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]);
1887	>	ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2], true);
1888		}
1889
1890		// We have to redraw everything because the interpretation of pixel values changed
1891		LOCK_VOSF;
1892		PFLAG_SET_ALL;
1893		UNLOCK_VOSF;
1894	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1894	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
1895		}
1896		#endif
1897
1898		// Tell redraw thread to change palette
1899	<	palette_changed = true;
1899	>	x_palette_changed = true;
1900
1901		UNLOCK_PALETTE;
1902		}
#	Line 1583 | Line 1906 | void video_set_palette(uint8 *pal, int n
1906		*  Switch video mode
1907		*/
1908
1909	<	void video_switch_to_mode(const video_mode &mode)
1909	>	void X11_monitor_desc::switch_to_current_mode(void)
1910		{
1911		// Close and reopen display
1912		video_close();
1913	<	video_open(mode);
1913	>	video_open();
1914
1915		if (drv == NULL) {
1916		ErrorAlert(STR_OPEN_WINDOW_ERR);
#	Line 1766 | Line 2089 | static int event2keycode(XKeyEvent &ev,
2089
2090		static void handle_events(void)
2091		{
2092	<	while (XPending(x_display)) {
2092	>	for (;;) {
2093		XEvent event;
2094	<	XNextEvent(x_display, &event);
2094	>	XDisplayLock();
2095
2096	+	if (!XCheckMaskEvent(x_display, eventmask, &event)) {
2097	+	// Handle clipboard events
2098	+	if (XCheckTypedEvent(x_display, SelectionRequest, &event))
2099	+	ClipboardSelectionRequest(&event.xselectionrequest);
2100	+	else if (XCheckTypedEvent(x_display, SelectionClear, &event))
2101	+	ClipboardSelectionClear(&event.xselectionclear);
2102	+
2103	+	// Window "close" widget clicked
2104	+	else if (XCheckTypedEvent(x_display, ClientMessage, &event)) {
2105	+	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
2106	+	ADBKeyDown(0x7f);       // Power key
2107	+	ADBKeyUp(0x7f);
2108	+	}
2109	+	}
2110	+	XDisplayUnlock();
2111	+	break;
2112	+	}
2113	+
2114		switch (event.type) {
2115	+
2116		// Mouse button
2117		case ButtonPress: {
2118		unsigned int button = event.xbutton.button;
#	Line 1803 | Line 2145 | static void handle_events(void)
2145		drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2146		break;
2147
2148	+	// Mouse entered window
2149	+	case EnterNotify:
2150	+	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2151	+	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2152	+	break;
2153	+
2154		// Keyboard
2155		case KeyPress: {
2156		int code = -1;
#	Line 1850 | Line 2198 | static void handle_events(void)
2198		// Hidden parts exposed, force complete refresh of window
2199		case Expose:
2200		if (display_type == DISPLAY_WINDOW) {
2201	+	const video_mode &mode = VideoMonitors[0]->get_current_mode();
2202		#ifdef ENABLE_VOSF
2203		if (use_vosf) {                 // VOSF refresh
2204		LOCK_VOSF;
2205		PFLAG_SET_ALL;
2206		UNLOCK_VOSF;
2207	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
2207	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
2208		}
2209		else
2210		#endif
#	Line 1866 | Line 2215 | static void handle_events(void)
2215		updt_box[x1][y1] = true;
2216		nr_boxes = 16 * 16;
2217		} else                                  // Static refresh
2218	<	memset(the_buffer_copy, 0, VideoMonitor.mode.bytes_per_row * VideoMonitor.mode.y);
1870	<	}
1871	<	break;
1872	<
1873	<	// Window "close" widget clicked
1874	<	case ClientMessage:
1875	<	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1876	<	ADBKeyDown(0x7f);       // Power key
1877	<	ADBKeyUp(0x7f);
2218	>	memset(the_buffer_copy, 0, mode.bytes_per_row * mode.y);
2219		}
2220		break;
2221		}
2222	+
2223	+	XDisplayUnlock();
2224		}
2225		}
2226
#	Line 1892 | Line 2235 | static void update_display_dynamic(int t
2235		int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
2236		int xil = 0;
2237		int rxm = 0, rxmo = 0;
2238	<	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2239	<	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2240	<	int rx = VideoMonitor.mode.bytes_per_row / 16;
2241	<	int ry = VideoMonitor.mode.y / 16;
2238	>	const video_mode &mode = drv->monitor.get_current_mode();
2239	>	int bytes_per_row = mode.bytes_per_row;
2240	>	int bytes_per_pixel = mode.bytes_per_row / mode.x;
2241	>	int rx = mode.bytes_per_row / 16;
2242	>	int ry = mode.y / 16;
2243		int max_box;
2244
2245		y2s = sm_uptd[ticker % 8];
#	Line 1921 | Line 2265 | static void update_display_dynamic(int t
2265		}
2266		}
2267
2268	+	XDisplayLock();
2269		if ((nr_boxes <= max_box) && (nr_boxes)) {
2270		for (y1=0; y1<16; y1++) {
2271		for (x1=0; x1<16; x1++) {
#	Line 1949 | Line 2294 | static void update_display_dynamic(int t
2294		i = (yi * bytes_per_row) + xi;
2295		for (y2=0; y2 < yil; y2++, i += bytes_per_row)
2296		memcpy(&the_buffer_copy[i], &the_buffer[i], xil);
2297	<	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2297	>	if (mode.depth == VDEPTH_1BIT) {
2298		if (drv->have_shm)
2299		XShmPutImage(x_display, drv->w, drv->gc, drv->img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0);
2300		else
#	Line 1974 | Line 2319 | static void update_display_dynamic(int t
2319		}
2320		nr_boxes = 0;
2321		}
2322	+	XDisplayUnlock();
2323		}
2324
2325		// Static display update (fixed frame rate, but incremental)
2326		static void update_display_static(driver_window *drv)
2327		{
2328		// Incremental update code
2329	<	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2330	<	int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2331	<	int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2329	>	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
2330	>	const video_mode &mode = drv->monitor.get_current_mode();
2331	>	int bytes_per_row = mode.bytes_per_row;
2332	>	int bytes_per_pixel = mode.bytes_per_row / mode.x;
2333		uint8 *p, *p2;
2334
2335		// Check for first line from top and first line from bottom that have changed
2336		y1 = 0;
2337	<	for (j=0; j<VideoMonitor.mode.y; j++) {
2337	>	for (j=0; j<mode.y; j++) {
2338		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2339		y1 = j;
2340		break;
2341		}
2342		}
2343		y2 = y1 - 1;
2344	<	for (j=VideoMonitor.mode.y-1; j>=y1; j--) {
2344	>	for (j=mode.y-1; j>=y1; j--) {
2345		if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
2346		y2 = j;
2347		break;
#	Line 2004 | Line 2351 | static void update_display_static(driver
2351
2352		// Check for first column from left and first column from right that have changed
2353		if (high) {
2354	<	if (VideoMonitor.mode.depth == VDEPTH_1BIT) {
2355	<	x1 = VideoMonitor.mode.x - 1;
2354	>	if (mode.depth == VDEPTH_1BIT) {
2355	>	x1 = mode.x - 1;
2356		for (j=y1; j<=y2; j++) {
2357		p = &the_buffer[j * bytes_per_row];
2358		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 2023 | Line 2370 | static void update_display_static(driver
2370		p2 = &the_buffer_copy[j * bytes_per_row];
2371		p += bytes_per_row;
2372		p2 += bytes_per_row;
2373	<	for (i=(VideoMonitor.mode.x>>3); i>(x2>>3); i--) {
2373	>	for (i=(mode.x>>3); i>(x2>>3); i--) {
2374		p--; p2--;
2375		if (*p != *p2) {
2376		x2 = (i << 3) + 7;
#	Line 2042 | Line 2389 | static void update_display_static(driver
2389		}
2390
2391		} else {
2392	<	x1 = VideoMonitor.mode.x;
2392	>	x1 = mode.x;
2393		for (j=y1; j<=y2; j++) {
2394		p = &the_buffer[j * bytes_per_row];
2395		p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 2060 | Line 2407 | static void update_display_static(driver
2407		p2 = &the_buffer_copy[j * bytes_per_row];
2408		p += bytes_per_row;
2409		p2 += bytes_per_row;
2410	<	for (i=VideoMonitor.mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
2410	>	for (i=mode.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
2411		p--;
2412		p2--;
2413		if (*p != *p2) {
#	Line 2082 | Line 2429 | static void update_display_static(driver
2429		}
2430
2431		// Refresh display
2432	+	XDisplayLock();
2433		if (high && wide) {
2434		if (drv->have_shm)
2435		XShmPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high, 0);
2436		else
2437		XPutImage(x_display, drv->w, drv->gc, drv->img, x1, y1, x1, y1, wide, high);
2438		}
2439	+	XDisplayUnlock();
2440		}
2441
2442
#	Line 2127 | Line 2476 | static inline void handle_palette_change
2476		{
2477		LOCK_PALETTE;
2478
2479	<	if (palette_changed) {
2480	<	palette_changed = false;
2479	>	if (x_palette_changed) {
2480	>	x_palette_changed = false;
2481	>	XDisplayLock();
2482		drv->update_palette();
2483	+	XDisplayUnlock();
2484		}
2485
2486		UNLOCK_PALETTE;
#	Line 2139 | Line 2490 | static void video_refresh_dga(void)
2490		{
2491		// Quit DGA mode if requested
2492		possibly_quit_dga_mode();
2142	–
2143	–	// Handle X events
2144	–	handle_events();
2145	–
2146	–	// Handle palette changes
2147	–	handle_palette_changes();
2493		}
2494
2495		#ifdef ENABLE_VOSF
#	Line 2154 | Line 2499 | static void video_refresh_dga_vosf(void)
2499		// Quit DGA mode if requested
2500		possibly_quit_dga_mode();
2501
2157	–	// Handle X events
2158	–	handle_events();
2159	–
2160	–	// Handle palette changes
2161	–	handle_palette_changes();
2162	–
2502		// Update display (VOSF variant)
2503		static int tick_counter = 0;
2504		if (++tick_counter >= frame_skip) {
2505		tick_counter = 0;
2506		if (mainBuffer.dirty) {
2507		LOCK_VOSF;
2508	<	update_display_dga_vosf();
2508	>	update_display_dga_vosf(static_cast<driver_dga *>(drv));
2509		UNLOCK_VOSF;
2510		}
2511		}
#	Line 2178 | Line 2517 | static void video_refresh_window_vosf(vo
2517		// Ungrab mouse if requested
2518		possibly_ungrab_mouse();
2519
2181	–	// Handle X events
2182	–	handle_events();
2183	–
2184	–	// Handle palette changes
2185	–	handle_palette_changes();
2186	–
2520		// Update display (VOSF variant)
2521		static int tick_counter = 0;
2522		if (++tick_counter >= frame_skip) {
2523		tick_counter = 0;
2524		if (mainBuffer.dirty) {
2525	+	XDisplayLock();
2526		LOCK_VOSF;
2527		update_display_window_vosf(static_cast<driver_window *>(drv));
2528		UNLOCK_VOSF;
2529		XSync(x_display, false); // Let the server catch up
2530	+	XDisplayUnlock();
2531		}
2532		}
2533		}
#	Line 2203 | Line 2538 | static void video_refresh_window_static(
2538		// Ungrab mouse if requested
2539		possibly_ungrab_mouse();
2540
2206	–	// Handle X events
2207	–	handle_events();
2208	–
2209	–	// Handle_palette changes
2210	–	handle_palette_changes();
2211	–
2541		// Update display (static variant)
2542		static int tick_counter = 0;
2543		if (++tick_counter >= frame_skip) {
#	Line 2222 | Line 2551 | static void video_refresh_window_dynamic
2551		// Ungrab mouse if requested
2552		possibly_ungrab_mouse();
2553
2225	–	// Handle X events
2226	–	handle_events();
2227	–
2228	–	// Handle_palette changes
2229	–	handle_palette_changes();
2230	–
2554		// Update display (dynamic variant)
2555		static int tick_counter = 0;
2556		tick_counter++;
#	Line 2263 | Line 2586 | static void VideoRefreshInit(void)
2586		}
2587		}
2588
2589	+	// This function is called on non-threaded platforms from a timer interrupt
2590		void VideoRefresh(void)
2591		{
2592		// We need to check redraw_thread_active to inhibit refreshed during
2593		// mode changes on non-threaded platforms
2594	<	if (redraw_thread_active)
2595	<	video_refresh();
2594	>	if (!redraw_thread_active)
2595	>	return;
2596	>
2597	>	// Handle X events
2598	>	handle_events();
2599	>
2600	>	// Handle palette changes
2601	>	handle_palette_changes();
2602	>
2603	>	// Update display
2604	>	video_refresh();
2605		}
2606
2607	<	#ifdef HAVE_PTHREADS
2607	>	const int VIDEO_REFRESH_HZ = 60;
2608	>	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2609	>
2610	>	#ifdef USE_PTHREADS_SERVICES
2611		static void *redraw_func(void *arg)
2612		{
2613	+	int fd = ConnectionNumber(x_display);
2614	+
2615		uint64 start = GetTicks_usec();
2616		int64 ticks = 0;
2617	<	uint64 next = GetTicks_usec();
2617	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2618	>
2619		while (!redraw_thread_cancel) {
2620	<	video_refresh();
2282	<	next += 16667;
2620	>
2621		int64 delay = next - GetTicks_usec();
2622	<	if (delay > 0)
2623	<	Delay_usec(delay);
2624	<	else if (delay < -16667)
2622	>	if (delay < -VIDEO_REFRESH_DELAY) {
2623	>
2624	>	// We are lagging far behind, so we reset the delay mechanism
2625		next = GetTicks_usec();
2626	<	ticks++;
2626	>
2627	>	} else if (delay <= 0) {
2628	>
2629	>	// Delay expired, refresh display
2630	>	handle_events();
2631	>	handle_palette_changes();
2632	>	video_refresh();
2633	>	next += VIDEO_REFRESH_DELAY;
2634	>	ticks++;
2635	>
2636	>	} else {
2637	>
2638	>	// No display refresh pending, check for X events
2639	>	fd_set readfds;
2640	>	FD_ZERO(&readfds);
2641	>	FD_SET(fd, &readfds);
2642	>	struct timeval timeout;
2643	>	timeout.tv_sec = 0;
2644	>	timeout.tv_usec = delay;
2645	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2646	>	handle_events();
2647	>	}
2648		}
2649	+
2650		uint64 end = GetTicks_usec();
2651	<	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2651	>	D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2652	>
2653	>	redraw_thread_cancel_ack = true;
2654		return NULL;
2655		}
2656		#endif

Diff Legend

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