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.24 by cebix, 2000-10-11T17:55:06Z vs.
Revision 1.30 by cebix, 2000-11-03T18:27:55Z

#	Line 53 | Line 53
53		#endif
54
55		#ifdef ENABLE_VOSF
56	–	# include <math.h> // log()
56		# include <unistd.h>
57		# include <signal.h>
58		# include <fcntl.h>
#	Line 123 | Line 122 | static Colormap cmap[2];                                                       // Two co
122		static XColor black, white;
123		static unsigned long black_pixel, white_pixel;
124		static int eventmask;
125	<	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask;
126	<	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
125	>	static const int win_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | ExposureMask | StructureNotifyMask;
126	>	static const int dga_eventmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | StructureNotifyMask;
127	>	static Atom WM_DELETE_WINDOW = (Atom)0;
128
129		static XColor palette[256];                                                     // Color palette for 8-bit mode
130		static bool palette_changed = false;                            // Flag: Palette changed, redraw thread must set new colors
131		#ifdef HAVE_PTHREADS
132		static pthread_mutex_t palette_lock = PTHREAD_MUTEX_INITIALIZER;        // Mutex to protect palette
133	+	#define LOCK_PALETTE pthread_mutex_lock(&palette_lock)
134	+	#define UNLOCK_PALETTE pthread_mutex_unlock(&palette_lock)
135	+	#else
136	+	#define LOCK_PALETTE
137	+	#define UNLOCK_PALETTE
138		#endif
139
140		// Variables for window mode
#	Line 150 | Line 155 | static Window suspend_win;                                                     // "Sus
155		static void *fb_save = NULL;                                            // Saved frame buffer for suspend
156		#ifdef HAVE_PTHREADS
157		static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer
158	+	#define LOCK_FRAME_BUFFER pthread_mutex_lock(&frame_buffer_lock);
159	+	#define UNLOCK_FRAME_BUFFER pthread_mutex_unlock(&frame_buffer_lock);
160	+	#else
161	+	#define LOCK_FRAME_BUFFER
162	+	#define UNLOCK_FRAME_BUFFER
163		#endif
164
165		// Variables for fbdev DGA mode
#	Line 169 | Line 179 | static const bool use_vosf = false;
179		#endif
180
181		#ifdef ENABLE_VOSF
182	<	static uint8 * the_host_buffer;                                         // Host frame buffer in VOSF mode
182	>	// Variables for Video on SEGV support (taken from the Win32 port)
183	>	static uint8 *the_host_buffer;                                          // Host frame buffer in VOSF mode
184		static uint32 the_buffer_size;                                          // Size of allocated the_buffer
174	–	#endif
185
176	–	#ifdef ENABLE_VOSF
177	–	// Variables for Video on SEGV support (taken from the Win32 port)
186		struct ScreenPageInfo {
187		int top, bottom;                    // Mapping between this virtual page and Mac scanlines
188		};
#	Line 216 | Line 224 | static bool Screen_fault_handler_init();
224		static struct sigaction vosf_sa;
225
226		#ifdef HAVE_PTHREADS
227	<	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER;    // Mutex to protect frame buffer (dirtyPages in fact)
227	>	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer (dirtyPages in fact)
228	>	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
229	>	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
230	>	#else
231	>	#define LOCK_VOSF
232	>	#define UNLOCK_VOSF
233		#endif
234
235	+	static int log_base_2(uint32 x)
236	+	{
237	+	uint32 mask = 0x80000000;
238	+	int l = 31;
239	+	while (l >= 0 && (x & mask) == 0) {
240	+	mask >>= 1;
241	+	l--;
242	+	}
243	+	return l;
244	+	}
245	+
246		#endif
247
248		// VideoRefresh function
#	Line 227 | Line 251 | static void (*video_refresh)(void);
251
252		// Prototypes
253		static void *redraw_func(void *arg);
254	<	static int event2keycode(XKeyEvent *ev);
254	>	static int event2keycode(XKeyEvent &ev);
255
256
257		// From main_unix.cpp
#	Line 297 | Line 321 | void set_video_monitor(int width, int he
321		VideoMonitor.bytes_per_row = bytes_per_row;
322		}
323
324	+	// Set window name and class
325	+	static void set_window_name(Window w, int name)
326	+	{
327	+	const char *str = GetString(name);
328	+	XStoreName(x_display, w, str);
329	+	XSetIconName(x_display, w, str);
330	+
331	+	XClassHint *hints;
332	+	hints = XAllocClassHint();
333	+	if (hints) {
334	+	hints->res_name = "BasiliskII";
335	+	hints->res_class = "BasiliskII";
336	+	XSetClassHint(x_display, w, hints);
337	+	XFree((char *)hints);
338	+	}
339	+	}
340	+
341	+	// Set window input focus flag
342	+	static void set_window_focus(Window w)
343	+	{
344	+	XWMHints *hints = XAllocWMHints();
345	+	if (hints) {
346	+	hints->input = True;
347	+	hints->initial_state = NormalState;
348	+	hints->flags = InputHint | StateHint;
349	+	XSetWMHints(x_display, w, hints);
350	+	XFree((char *)hints);
351	+	}
352	+	}
353	+
354	+	// Set WM_DELETE_WINDOW protocol on window (preventing it from being destroyed by the WM when clicking on the "close" widget)
355	+	static void set_window_delete_protocol(Window w)
356	+	{
357	+	WM_DELETE_WINDOW = XInternAtom(x_display, "WM_DELETE_WINDOW", false);
358	+	XSetWMProtocols(x_display, w, &WM_DELETE_WINDOW, 1);
359	+	}
360	+
361	+	// Wait until window is mapped/unmapped
362	+	void wait_mapped(Window w)
363	+	{
364	+	XEvent e;
365	+	do {
366	+	XMaskEvent(x_display, StructureNotifyMask, &e);
367	+	} while ((e.type != MapNotify) || (e.xmap.event != w));
368	+	}
369	+
370	+	void wait_unmapped(Window w)
371	+	{
372	+	XEvent e;
373	+	do {
374	+	XMaskEvent(x_display, StructureNotifyMask, &e);
375	+	} while ((e.type != UnmapNotify) || (e.xmap.event != w));
376	+	}
377	+
378		// Trap SHM errors
379		static bool shm_error = false;
380		static int (*old_error_handler)(Display *, XErrorEvent *);
#	Line 326 | Line 404 | static bool init_window(int width, int h
404		XSetWindowAttributes wattr;
405		wattr.event_mask = eventmask = win_eventmask;
406		wattr.background_pixel = black_pixel;
407	<	wattr.border_pixel = black_pixel;
330	<	wattr.backing_store = NotUseful;
331	<	wattr.save_under = false;
332	<	wattr.backing_planes = xdepth;
407	>	wattr.colormap = cmap[0];
408
334	–	XSync(x_display, false);
409		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
410	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
337	<	CWBackingStore | CWBackingPlanes, &wattr);
338	<	XSync(x_display, false);
339	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
340	<	XMapRaised(x_display, the_win);
341	<	XSync(x_display, false);
410	>	InputOutput, vis, CWEventMask | CWBackPixel | (depth == 8 ? CWColormap : 0), &wattr);
411
412	<	// Set colormap
413	<	if (depth == 8) {
414	<	XSetWindowColormap(x_display, the_win, cmap[0]);
415	<	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
416	<	}
412	>	// Set window name/class
413	>	set_window_name(the_win, STR_WINDOW_TITLE);
414	>
415	>	// Indicate that we want keyboard input
416	>	set_window_focus(the_win);
417	>
418	>	// Set delete protocol property
419	>	set_window_delete_protocol(the_win);
420
421		// Make window unresizable
422	<	XSizeHints *hints;
423	<	if ((hints = XAllocSizeHints()) != NULL) {
424	<	hints->min_width = width;
425	<	hints->max_width = width;
426	<	hints->min_height = height;
427	<	hints->max_height = height;
428	<	hints->flags = PMinSize | PMaxSize;
429	<	XSetWMNormalHints(x_display, the_win, hints);
430	<	XFree((char *)hints);
422	>	{
423	>	XSizeHints *hints = XAllocSizeHints();
424	>	if (hints) {
425	>	hints->min_width = width;
426	>	hints->max_width = width;
427	>	hints->min_height = height;
428	>	hints->max_height = height;
429	>	hints->flags = PMinSize | PMaxSize;
430	>	XSetWMNormalHints(x_display, the_win, hints);
431	>	XFree((char *)hints);
432	>	}
433		}
434
435	+	// Show window
436	+	XMapWindow(x_display, the_win);
437	+	wait_mapped(the_win);
438	+
439		// Try to create and attach SHM image
440		have_shm = false;
441		if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
#	Line 529 | Line 607 | static bool init_fbdev_dga(char *in_fb_n
607
608		// Create window
609		XSetWindowAttributes wattr;
610	<	wattr.override_redirect = True;
611	<	wattr.backing_store             = NotUseful;
612	<	wattr.background_pixel  = white_pixel;
613	<	wattr.border_pixel              = black_pixel;
536	<	wattr.event_mask                = eventmask = dga_eventmask;
610	>	wattr.event_mask = eventmask = dga_eventmask;
611	>	wattr.background_pixel = white_pixel;
612	>	wattr.override_redirect = True;
613	>	wattr.colormap = cmap[0];
614
538	–	XSync(x_display, false);
615		the_win = XCreateWindow(x_display, rootwin,
616		0, 0, width, height,
617		0, xdepth, InputOutput, vis,
618	<	CWEventMask|CWBackPixel|CWBorderPixel|CWOverrideRedirect|CWBackingStore,
618	>	CWEventMask | CWBackPixel | CWOverrideRedirect | (depth == 8 ? CWColormap : 0),
619		&wattr);
620	<	XSync(x_display, false);
620	>
621	>	// Set window name/class
622	>	set_window_name(the_win, STR_WINDOW_TITLE);
623	>
624	>	// Indicate that we want keyboard input
625	>	set_window_focus(the_win);
626	>
627	>	// Show window
628		XMapRaised(x_display, the_win);
629	<	XSync(x_display, false);
629	>	wait_mapped(the_win);
630
631		// Grab mouse and keyboard
632		XGrabKeyboard(x_display, the_win, True,
#	Line 552 | Line 635 | static bool init_fbdev_dga(char *in_fb_n
635		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
636		GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime);
637
555	–	// Set colormap
556	–	if (depth == 8) {
557	–	XSetWindowColormap(x_display, the_win, cmap[0]);
558	–	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
559	–	}
560	–
638		// Set VideoMonitor
639		int bytes_per_row = width;
640		switch (depth) {
#	Line 637 | Line 714 | static bool init_xf86_dga(int width, int
714		}
715		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]);
716		XF86VidModeSetViewPort(x_display, screen, 0, 0);
717	+	XSync(x_display, false);
718		}
719		#endif
720
721		// Create window
722		XSetWindowAttributes wattr;
723		wattr.event_mask = eventmask = dga_eventmask;
646	–	wattr.border_pixel = black_pixel;
724		wattr.override_redirect = True;
725
649	–	XSync(x_display, false);
726		the_win = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
727	<	InputOutput, vis, CWEventMask | CWBorderPixel | CWOverrideRedirect, &wattr);
728	<	XSync(x_display, false);
729	<	XStoreName(x_display, the_win, GetString(STR_WINDOW_TITLE));
727	>	InputOutput, vis, CWEventMask | CWOverrideRedirect, &wattr);
728	>
729	>	// Set window name/class
730	>	set_window_name(the_win, STR_WINDOW_TITLE);
731	>
732	>	// Indicate that we want keyboard input
733	>	set_window_focus(the_win);
734	>
735	>	// Show window
736		XMapRaised(x_display, the_win);
737	<	XSync(x_display, false);
737	>	wait_mapped(the_win);
738
739		// Establish direct screen connection
740		XMoveResizeWindow(x_display, the_win, 0, 0, width, height);
#	Line 669 | Line 751 | static bool init_xf86_dga(int width, int
751		// Set colormap
752		if (depth == 8) {
753		XSetWindowColormap(x_display, the_win, cmap[current_dga_cmap = 0]);
672	–	XSetWMColormapWindows(x_display, the_win, &the_win, 1);
754		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
755		}
756	+	XSync(x_display, false);
757
758		// Set VideoMonitor
759		int bytes_per_row = (v_width + 7) & ~7;
#	Line 804 | Line 886 | bool VideoInitBuffer()
886
887		mainBuffer.pageSize     = page_size;
888		mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
889	<	mainBuffer.pageBits     = int( log(mainBuffer.pageSize) / log(2.0) );
889	>	mainBuffer.pageBits     = log_base_2(mainBuffer.pageSize);
890
891		if (mainBuffer.dirtyPages != 0)
892		free(mainBuffer.dirtyPages);
#	Line 1010 | Line 1092 | bool VideoInit(bool classic)
1092		break;
1093		}
1094
1013	–	#ifdef HAVE_PTHREADS
1095		// Lock down frame buffer
1096	<	pthread_mutex_lock(&frame_buffer_lock);
1016	<	#endif
1096	>	LOCK_FRAME_BUFFER;
1097
1098		#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1099		// Set variables for UAE memory mapping
#	Line 1078 | Line 1158 | void VideoExit(void)
1158		}
1159		#endif
1160
1081	–	#ifdef HAVE_PTHREADS
1161		// Unlock frame buffer
1162	<	pthread_mutex_unlock(&frame_buffer_lock);
1084	<	#endif
1162	>	UNLOCK_FRAME_BUFFER;
1163
1164		// Close window and server connection
1165		if (x_display != NULL) {
#	Line 1184 | Line 1262 | void VideoInterrupt(void)
1262		if (emerg_quit)
1263		QuitEmulator();
1264
1187	–	#ifdef HAVE_PTHREADS
1265		// Temporarily give up frame buffer lock (this is the point where
1266		// we are suspended when the user presses Ctrl-Tab)
1267	<	pthread_mutex_unlock(&frame_buffer_lock);
1268	<	pthread_mutex_lock(&frame_buffer_lock);
1192	<	#endif
1267	>	UNLOCK_FRAME_BUFFER;
1268	>	LOCK_FRAME_BUFFER;
1269		}
1270
1271
#	Line 1199 | Line 1275 | void VideoInterrupt(void)
1275
1276		void video_set_palette(uint8 *pal)
1277		{
1278	<	#ifdef HAVE_PTHREDS
1203	<	pthread_mutex_lock(&palette_lock);
1204	<	#endif
1278	>	LOCK_PALETTE;
1279
1280		// Convert colors to XColor array
1281		for (int i=0; i<256; i++) {
#	Line 1215 | Line 1289 | void video_set_palette(uint8 *pal)
1289		// Tell redraw thread to change palette
1290		palette_changed = true;
1291
1292	<	#ifdef HAVE_PTHREADS
1219	<	pthread_mutex_unlock(&palette_lock);
1220	<	#endif
1292	>	UNLOCK_PALETTE;
1293		}
1294
1295
#	Line 1233 | Line 1305 | static void suspend_emul(void)
1305		ADBKeyUp(0x36);
1306		ctrl_down = false;
1307
1236	–	#ifdef HAVE_PTHREADS
1308		// Lock frame buffer (this will stop the MacOS thread)
1309	<	pthread_mutex_lock(&frame_buffer_lock);
1239	<	#endif
1309	>	LOCK_FRAME_BUFFER;
1310
1311		// Save frame buffer
1312		fb_save = malloc(VideoMonitor.y * VideoMonitor.bytes_per_row);
#	Line 1250 | Line 1320 | static void suspend_emul(void)
1320		XUngrabPointer(x_display, CurrentTime);
1321		XUngrabKeyboard(x_display, CurrentTime);
1322		XUnmapWindow(x_display, the_win);
1323	<	XSync(x_display, false);
1323	>	wait_unmapped(the_win);
1324
1325		// Open "suspend" window
1326		XSetWindowAttributes wattr;
1327		wattr.event_mask = KeyPressMask;
1328		wattr.background_pixel = black_pixel;
1259	–	wattr.border_pixel = black_pixel;
1260	–	wattr.backing_store = Always;
1261	–	wattr.backing_planes = xdepth;
1262	–	wattr.colormap = DefaultColormap(x_display, screen);
1329
1264	–	XSync(x_display, false);
1330		suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth,
1331	<	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel |
1332	<	CWBackingStore | CWBackingPlanes | (xdepth == 8 ? CWColormap : 0), &wattr);
1333	<	XSync(x_display, false);
1334	<	XStoreName(x_display, suspend_win, GetString(STR_SUSPEND_WINDOW_TITLE));
1270	<	XMapRaised(x_display, suspend_win);
1271	<	XSync(x_display, false);
1331	>	InputOutput, vis, CWEventMask | CWBackPixel, &wattr);
1332	>	set_window_name(suspend_win, STR_SUSPEND_WINDOW_TITLE);
1333	>	set_window_focus(suspend_win);
1334	>	XMapWindow(x_display, suspend_win);
1335		emul_suspended = true;
1336		}
1337		}
#	Line 1281 | Line 1344 | static void resume_emul(void)
1344
1345		// Reopen full screen display
1346		XMapRaised(x_display, the_win);
1347	+	wait_mapped(the_win);
1348		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1285	–	XSync(x_display, false);
1349		XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime);
1350		XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1351		#ifdef ENABLE_XF86_DGA
#	Line 1296 | Line 1359 | static void resume_emul(void)
1359		// not necessary.
1360		#ifdef ENABLE_VOSF
1361		if (use_vosf) {
1362	<	#ifdef HAVE_PTHREADS
1300	<	pthread_mutex_lock(&Screen_draw_lock);
1301	<	#endif
1362	>	LOCK_VOSF;
1363		PFLAG_SET_ALL;
1364	<	#ifdef HAVE_PTHREADS
1304	<	pthread_mutex_unlock(&Screen_draw_lock);
1305	<	#endif
1364	>	UNLOCK_VOSF;
1365		memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1366		}
1367		#endif
#	Line 1323 | Line 1382 | static void resume_emul(void)
1382		XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1383		#endif
1384
1326	–	#ifdef HAVE_PTHREADS
1385		// Unlock frame buffer (and continue MacOS thread)
1386	<	pthread_mutex_unlock(&frame_buffer_lock);
1386	>	UNLOCK_FRAME_BUFFER;
1387		emul_suspended = false;
1330	–	#endif
1388		}
1389		#endif
1390
#	Line 1481 | Line 1538 | static int kc_decode(KeySym ks)
1538		return -1;
1539		}
1540
1541	<	static int event2keycode(XKeyEvent *ev)
1541	>	static int event2keycode(XKeyEvent &ev)
1542		{
1543		KeySym ks;
1544		int as;
1545		int i = 0;
1546
1547		do {
1548	<	ks = XLookupKeysym(ev, i++);
1548	>	ks = XLookupKeysym(&ev, i++);
1549		as = kc_decode(ks);
1550		if (as != -1)
1551		return as;
#	Line 1504 | Line 1561 | static int event2keycode(XKeyEvent *ev)
1561
1562		static void handle_events(void)
1563		{
1564	<	XEvent event;
1565	<	for (;;) {
1566	<	if (!XCheckMaskEvent(x_display, eventmask, &event))
1510	<	break;
1564	>	while (XPending(x_display)) {
1565	>	XEvent event;
1566	>	XNextEvent(x_display, &event);
1567
1568		switch (event.type) {
1569		// Mouse button
1570		case ButtonPress: {
1571	<	unsigned int button = ((XButtonEvent *)&event)->button;
1571	>	unsigned int button = event.xbutton.button;
1572		if (button < 4)
1573		ADBMouseDown(button - 1);
1574		else if (button < 6) {  // Wheel mouse
#	Line 1531 | Line 1587 | static void handle_events(void)
1587		break;
1588		}
1589		case ButtonRelease: {
1590	<	unsigned int button = ((XButtonEvent *)&event)->button;
1590	>	unsigned int button = event.xbutton.button;
1591		if (button < 4)
1592		ADBMouseUp(button - 1);
1593		break;
#	Line 1539 | Line 1595 | static void handle_events(void)
1595
1596		// Mouse moved
1597		case EnterNotify:
1542	–	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1543	–	break;
1598		case MotionNotify:
1599	<	ADBMouseMoved(((XMotionEvent *)&event)->x, ((XMotionEvent *)&event)->y);
1599	>	ADBMouseMoved(event.xmotion.x, event.xmotion.y);
1600		break;
1601
1602		// Keyboard
1603		case KeyPress: {
1604		int code;
1605		if (use_keycodes) {
1606	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
1607	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1606	>	event2keycode(event.xkey);      // This is called to process the hotkeys
1607	>	code = keycode_table[event.xkey.keycode & 0xff];
1608		} else
1609	<	code = event2keycode((XKeyEvent *)&event);
1609	>	code = event2keycode(event.xkey);
1610		if (code != -1) {
1611		if (!emul_suspended) {
1612		if (code == 0x39) {     // Caps Lock pressed
#	Line 1579 | Line 1633 | static void handle_events(void)
1633		case KeyRelease: {
1634		int code;
1635		if (use_keycodes) {
1636	<	event2keycode((XKeyEvent *)&event);     // This is called to process the hotkeys
1637	<	code = keycode_table[((XKeyEvent *)&event)->keycode & 0xff];
1636	>	event2keycode(event.xkey);      // This is called to process the hotkeys
1637	>	code = keycode_table[event.xkey.keycode & 0xff];
1638		} else
1639	<	code = event2keycode((XKeyEvent *)&event);
1639	>	code = event2keycode(event.xkey);
1640		if (code != -1 && code != 0x39) {       // Don't propagate Caps Lock releases
1641		ADBKeyUp(code);
1642		if (code == 0x36)
#	Line 1596 | Line 1650 | static void handle_events(void)
1650		if (display_type == DISPLAY_WINDOW) {
1651		#ifdef ENABLE_VOSF
1652		if (use_vosf) {                 // VOSF refresh
1653	<	#ifdef HAVE_PTHREADS
1600	<	pthread_mutex_lock(&Screen_draw_lock);
1601	<	#endif
1653	>	LOCK_VOSF;
1654		PFLAG_SET_ALL;
1655	<	#ifdef HAVE_PTHREADS
1604	<	pthread_mutex_unlock(&Screen_draw_lock);
1605	<	#endif
1655	>	UNLOCK_VOSF;
1656		memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1657		}
1658		else
#	Line 1617 | Line 1667 | static void handle_events(void)
1667		memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1668		}
1669		break;
1670	+
1671	+	// Window "close" widget clicked
1672	+	case ClientMessage:
1673	+	if (event.xclient.format == 32 && event.xclient.data.l[0] == WM_DELETE_WINDOW) {
1674	+	ADBKeyDown(0x7f);       // Power key
1675	+	ADBKeyUp(0x7f);
1676	+	}
1677	+	break;
1678		}
1679		}
1680		}
#	Line 1766 | Line 1824 | static void update_display_static(void)
1824		for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1825		p--; p2--;
1826		if (*p != *p2) {
1827	<	x2 = i << 3;
1827	>	x2 = (i << 3) + 7;
1828		break;
1829		}
1830		}
1831		}
1832	<	wide = x2 - x1;
1832	>	wide = x2 - x1 + 1;
1833
1834		// Update copy of the_buffer
1835		if (high && wide) {
#	Line 1873 | Line 1931 | static inline void possibly_quit_dga_mod
1931
1932		static inline void handle_palette_changes(int depth, int display_type)
1933		{
1934	<	#ifdef HAVE_PTHREADS
1935	<	pthread_mutex_lock(&palette_lock);
1878	<	#endif
1934	>	LOCK_PALETTE;
1935	>
1936		if (palette_changed) {
1937		palette_changed = false;
1938		if (depth == 8) {
1939		XStoreColors(x_display, cmap[0], palette, 256);
1940		XStoreColors(x_display, cmap[1], palette, 256);
1941	+	XSync(x_display, false);
1942
1943		#ifdef ENABLE_XF86_DGA
1944		if (display_type == DISPLAY_DGA) {
#	Line 1890 | Line 1948 | static inline void handle_palette_change
1948		#endif
1949		}
1950		}
1951	<	#ifdef HAVE_PTHREADS
1952	<	pthread_mutex_unlock(&palette_lock);
1895	<	#endif
1951	>
1952	>	UNLOCK_PALETTE;
1953		}
1954
1955		static void video_refresh_dga(void)
#	Line 1924 | Line 1981 | static void video_refresh_dga_vosf(void)
1981		static int tick_counter = 0;
1982		if (++tick_counter >= frame_skip) {
1983		tick_counter = 0;
1984	<	#ifdef HAVE_PTHREADS
1928	<	pthread_mutex_lock(&Screen_draw_lock);
1929	<	#endif
1984	>	LOCK_VOSF;
1985		update_display_dga_vosf();
1986	<	#ifdef HAVE_PTHREADS
1932	<	pthread_mutex_unlock(&Screen_draw_lock);
1933	<	#endif
1986	>	UNLOCK_VOSF;
1987		}
1988		}
1989		#endif
#	Line 1950 | Line 2003 | static void video_refresh_window_vosf(vo
2003		static int tick_counter = 0;
2004		if (++tick_counter >= frame_skip) {
2005		tick_counter = 0;
2006	<	#ifdef HAVE_PTHREADS
1954	<	pthread_mutex_lock(&Screen_draw_lock);
1955	<	#endif
2006	>	LOCK_VOSF;
2007		update_display_window_vosf();
2008	<	#ifdef HAVE_PTHREADS
1958	<	pthread_mutex_unlock(&Screen_draw_lock);
1959	<	#endif
2008	>	UNLOCK_VOSF;
2009		}
2010		}
2011		#endif // def ENABLE_VOSF
#	Line 2026 | Line 2075 | void VideoRefresh(void)
2075		video_refresh();
2076		}
2077
2029	–	#if 0
2030	–	void VideoRefresh(void)
2031	–	{
2032	–	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
2033	–	// Quit DGA mode if requested
2034	–	if (quit_full_screen) {
2035	–	quit_full_screen = false;
2036	–	if (display_type == DISPLAY_DGA) {
2037	–	#ifdef ENABLE_XF86_DGA
2038	–	XF86DGADirectVideo(x_display, screen, 0);
2039	–	#endif
2040	–	XUngrabPointer(x_display, CurrentTime);
2041	–	XUngrabKeyboard(x_display, CurrentTime);
2042	–	XUnmapWindow(x_display, the_win);
2043	–	XSync(x_display, false);
2044	–	}
2045	–	}
2046	–	#endif
2047	–
2048	–	// Handle X events
2049	–	handle_events();
2050	–
2051	–	// Handle palette changes
2052	–	#ifdef HAVE_PTHREADS
2053	–	pthread_mutex_lock(&palette_lock);
2054	–	#endif
2055	–	if (palette_changed) {
2056	–	palette_changed = false;
2057	–	if (depth == 8) {
2058	–	XStoreColors(x_display, cmap[0], palette, 256);
2059	–	XStoreColors(x_display, cmap[1], palette, 256);
2060	–
2061	–	#ifdef ENABLE_XF86_DGA
2062	–	if (display_type == DISPLAY_DGA) {
2063	–	current_dga_cmap ^= 1;
2064	–	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
2065	–	}
2066	–	#endif
2067	–	}
2068	–	}
2069	–	#ifdef HAVE_PTHREADS
2070	–	pthread_mutex_unlock(&palette_lock);
2071	–	#endif
2072	–
2073	–	// In window mode, update display
2074	–	static int tick_counter = 0;
2075	–	if (display_type == DISPLAY_WINDOW) {
2076	–	tick_counter++;
2077	–	if (frame_skip == 0)
2078	–	update_display_dynamic(tick_counter);
2079	–	else if (tick_counter >= frame_skip) {
2080	–	tick_counter = 0;
2081	–	update_display_static();
2082	–	}
2083	–	}
2084	–	}
2085	–	#endif
2086	–
2078		#ifdef HAVE_PTHREADS
2079		static void *redraw_func(void *arg)
2080		{
#	Line 2091 | Line 2082 | static void *redraw_func(void *arg)
2082		int64 ticks = 0;
2083		uint64 next = GetTicks_usec();
2084		while (!redraw_thread_cancel) {
2094	–	//              VideoRefresh();
2085		video_refresh();
2086		next += 16667;
2087		int64 delay = next - GetTicks_usec();

Diff Legend

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