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.56 by gbeauche, 2001-07-07T09:14:47Z vs.
Revision 1.62 by gbeauche, 2001-07-14T18:41:05Z

#	Line 80 | 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 184 | Line 184 | static void (*video_refresh)(void);
184
185		// Prototypes
186		static void *redraw_func(void *arg);
187	–	static int event2keycode(XKeyEvent &ev);
187
188		// From main_unix.cpp
189		extern char *x_display_name;
#	Line 210 | Line 209 | static bool find_visual_for_depth(video_
209		{
210		D(bug("have_visual_for_depth(%d)\n", 1 << depth));
211
212	+	// 1-bit works always and uses default visual
213	+	if (depth == VDEPTH_1BIT) {
214	+	vis = DefaultVisual(x_display, screen);
215	+	visualInfo.visualid = XVisualIDFromVisual(vis);
216	+	int num = 0;
217	+	XVisualInfo *vi = XGetVisualInfo(x_display, VisualIDMask, &visualInfo, &num);
218	+	visualInfo = vi[0];
219	+	XFree(vi);
220	+	xdepth = visualInfo.depth;
221	+	color_class = visualInfo.c_class;
222	+	D(bug(" found visual ID 0x%02x, depth %d\n", visualInfo.visualid, xdepth));
223	+	return true;
224	+	}
225	+
226		// Calculate minimum and maximum supported X depth
227		int min_depth = 1, max_depth = 32;
228		switch (depth) {
216	–	case VDEPTH_1BIT:       // 1-bit works always
217	–	min_depth = 1;
218	–	max_depth = 32;
219	–	break;
229		#ifdef ENABLE_VOSF
230		case VDEPTH_2BIT:
231		case VDEPTH_4BIT:       // VOSF blitters can convert 2/4/8-bit -> 8/16/32-bit
#	Line 294 | Line 303 | static bool find_visual_for_depth(video_
303		case DirectColor: D(bug("DirectColor\n")); break;
304		}
305		#endif
306	+	return true;
307		}
308
309		// Add mode to list of supported modes
#	Line 429 | Line 439 | public:
439		virtual void toggle_mouse_grab(void) {}
440		virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
441
442	+	void disable_mouse_accel(void);
443	+	void restore_mouse_accel(void);
444	+
445		virtual void grab_mouse(void) {}
446		virtual void ungrab_mouse(void) {}
447
448		public:
449		bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
450		Window w;               // The window we draw into
451	+
452	+	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
453		};
454
455		class driver_window;
#	Line 478 | Line 493 | driver_base::driver_base()
493		{
494		the_buffer = NULL;
495		the_buffer_copy = NULL;
496	+	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
497		}
498
499		driver_base::~driver_base()
500		{
501		ungrab_mouse();
502	+	restore_mouse_accel();
503
504		if (w) {
505		XUnmapWindow(x_display, w);
#	Line 506 | Line 523 | driver_base::~driver_base()
523		}
524		#ifdef ENABLE_VOSF
525		else {
526	+	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
527	+	if (the_buffer != VM_MAP_FAILED) {
528	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
529	+	vm_release(the_buffer, the_buffer_size);
530	+	the_buffer = NULL;
531	+	}
532		if (the_host_buffer) {
533	+	D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
534		free(the_host_buffer);
535		the_host_buffer = NULL;
536		}
513	–	if (the_buffer) {
514	–	free(the_buffer);
515	–	the_buffer = NULL;
516	–	}
537		if (the_buffer_copy) {
538	+	D(bug(" freeing the_buffer_copy at %p\n", the_buffer_copy));
539		free(the_buffer_copy);
540		the_buffer_copy = NULL;
541		}
#	Line 525 | Line 546 | driver_base::~driver_base()
546		// Palette has changed
547		void driver_base::update_palette(void)
548		{
549	<	if (cmap[0] && cmap[1]) {
549	>	if (color_class == PseudoColor || color_class == DirectColor) {
550		int num = vis->map_entries;
551		if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor)
552		return; // Indexed mode on true color screen, don't set CLUT
#	Line 535 | Line 556 | void driver_base::update_palette(void)
556		XSync(x_display, false);
557		}
558
559	+	// Disable mouse acceleration
560	+	void driver_base::disable_mouse_accel(void)
561	+	{
562	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
563	+	}
564	+
565	+	// Restore mouse acceleration to original value
566	+	void driver_base::restore_mouse_accel(void)
567	+	{
568	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
569	+	}
570	+
571
572		/*
573		*  Windowed display driver
#	Line 542 | Line 575 | void driver_base::update_palette(void)
575
576		// Open display
577		driver_window::driver_window(const video_mode &mode)
578	<	: gc(0), img(NULL), have_shm(false), mouse_grabbed(false), mac_cursor(0)
578	>	: gc(0), img(NULL), have_shm(false), mac_cursor(0), mouse_grabbed(false)
579		{
580		int width = mode.x, height = mode.y;
581		int aligned_width = (width + 15) & ~15;
#	Line 551 | Line 584 | driver_window::driver_window(const video
584		// Set absolute mouse mode
585		ADBSetRelMouseMode(mouse_grabbed);
586
587	<	// Create window
587	>	// Create window (setting background_pixel, border_pixel and colormap is
588	>	// mandatory when using a non-default visual; in 1-bit mode we use the
589	>	// default visual, so we can also use the default colormap)
590		XSetWindowAttributes wattr;
591		wattr.event_mask = eventmask = win_eventmask;
592	<	wattr.background_pixel = black_pixel;
593	<	wattr.colormap = (mode.depth == VDEPTH_1BIT && color_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
592	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
593	>	wattr.border_pixel = 0;
594	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
595		w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
596	<	InputOutput, vis, CWEventMask | CWBackPixel | (color_class == PseudoColor || color_class == DirectColor ? CWColormap : 0), &wattr);
596	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWColormap, &wattr);
597	>	D(bug(" window created\n"));
598
599		// Set window name/class
600		set_window_name(w, STR_WINDOW_TITLE);
#	Line 581 | Line 618 | driver_window::driver_window(const video
618		XFree(hints);
619		}
620		}
621	+	D(bug(" window attributes set\n"));
622
623		// Show window
624		XMapWindow(x_display, w);
625		wait_mapped(w);
626	+	D(bug(" window mapped\n"));
627
628		// 1-bit mode is big-endian; if the X server is little-endian, we can't
629		// use SHM because that doesn't allow changing the image byte order
#	Line 595 | Line 634 | driver_window::driver_window(const video
634
635		// Create SHM image ("height + 2" for safety)
636		img = XShmCreateImage(x_display, vis, mode.depth == VDEPTH_1BIT ? 1 : xdepth, mode.depth == VDEPTH_1BIT ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
637	+	D(bug(" shm image created\n"));
638		shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777);
639		the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0);
640		shminfo.shmaddr = img->data = (char *)the_buffer_copy;
#	Line 615 | Line 655 | driver_window::driver_window(const video
655		have_shm = true;
656		shmctl(shminfo.shmid, IPC_RMID, 0);
657		}
658	+	D(bug(" shm image attached\n"));
659		}
660
661		// Create normal X image if SHM doesn't work ("height + 2" for safety)
#	Line 622 | Line 663 | driver_window::driver_window(const video
663		int bytes_per_row = (mode.depth == VDEPTH_1BIT ? aligned_width/8 : TrivialBytesPerRow(aligned_width, DepthModeForPixelDepth(xdepth)));
664		the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row);
665		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);
666	+	D(bug(" X image created\n"));
667		}
668
669		if (need_msb_image) {
#	Line 634 | Line 676 | driver_window::driver_window(const video
676		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
677		the_host_buffer = the_buffer_copy;
678		the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
637	–	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
679		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
680	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
681		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
682		#else
683		// Allocate memory for frame buffer
#	Line 684 | Line 726 | driver_window::~driver_window()
726		the_buffer_copy = NULL; // don't free() in driver_base dtor
727		#endif
728		}
729	<	#ifdef ENABLE_VOSF
730	<	if (use_vosf) {
731	<	// don't free() memory mapped buffers in driver_base dtor
690	<	if (the_buffer != VM_MAP_FAILED) {
691	<	vm_release(the_buffer, the_buffer_size);
692	<	the_buffer = NULL;
693	<	}
694	<	if (the_buffer_copy != VM_MAP_FAILED) {
695	<	vm_release(the_buffer_copy, the_buffer_size);
696	<	the_buffer_copy = NULL;
697	<	}
698	<	}
699	<	#endif
700	<	if (img)
729	>	if (img) {
730	>	if (!have_shm)
731	>	img->data = NULL;
732		XDestroyImage(img);
733	+	}
734		if (have_shm) {
735		shmdt(shminfo.shmaddr);
736		shmctl(shminfo.shmid, IPC_RMID, 0);
#	Line 728 | Line 760 | void driver_window::grab_mouse(void)
760		Delay_usec(100000);
761		}
762		if (result == GrabSuccess) {
731	–	ADBSetRelMouseMode(mouse_grabbed = true);
763		XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
764	<	XSync(x_display, false);
764	>	ADBSetRelMouseMode(mouse_grabbed = true);
765	>	disable_mouse_accel();
766		}
767		}
768
#	Line 741 | Line 773 | void driver_window::ungrab_mouse(void)
773		XUngrabPointer(x_display, CurrentTime);
774		XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
775		ADBSetRelMouseMode(mouse_grabbed = false);
776	+	restore_mouse_accel();
777		}
778		}
779
#	Line 836 | Line 869 | void driver_dga::suspend(void)
869		#endif
870		XUngrabPointer(x_display, CurrentTime);
871		XUngrabKeyboard(x_display, CurrentTime);
872	+	restore_mouse_accel();
873		XUnmapWindow(x_display, w);
874		wait_unmapped(w);
875
#	Line 865 | Line 899 | void driver_dga::resume(void)
899		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
900		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
901		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
902	+	disable_mouse_accel();
903		#ifdef ENABLE_XF86_DGA
904		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
905		XF86DGASetViewPort(x_display, screen, 0, 0);
#	Line 1011 | Line 1046 | driver_fbdev::driver_fbdev(const video_m
1046		XGrabPointer(x_display, w, True,
1047		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
1048		GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1049	+	disable_mouse_accel();
1050
1051		// Calculate bytes per row
1052		int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
#	Line 1036 | Line 1072 | driver_fbdev::driver_fbdev(const video_m
1072		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1073		the_host_buffer = the_buffer;
1074		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1075	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1075	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1076		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1077		}
1078		#else
#	Line 1071 | Line 1107 | driver_fbdev::~driver_fbdev()
1107		munmap(the_host_buffer, the_buffer_size);
1108		the_host_buffer = NULL;
1109		}
1074	–	if (the_buffer_copy != VM_MAP_FAILED) {
1075	–	vm_release(the_buffer_copy, the_buffer_size);
1076	–	the_buffer_copy = NULL;
1077	–	}
1078	–	if (the_buffer != VM_MAP_FAILED) {
1079	–	vm_release(the_buffer, the_buffer_size);
1080	–	the_buffer = NULL;
1081	–	}
1110		}
1111		#endif
1112		}
#	Line 1150 | Line 1178 | driver_xf86dga::driver_xf86dga(const vid
1178		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1179		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1180		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1181	+	disable_mouse_accel();
1182
1183		int v_width, v_bank, v_size;
1184		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 1176 | Line 1205 | driver_xf86dga::driver_xf86dga(const vid
1205		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
1206		the_host_buffer = the_buffer;
1207		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1208	<	the_buffer_copy = (uint8 *)vm_acquire(the_buffer_size);
1208	>	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1209		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1210		}
1211		#else
#	Line 1205 | Line 1234 | driver_xf86dga::~driver_xf86dga()
1234		else {
1235		// don't free() the screen buffer in driver_base dtor
1236		the_host_buffer = NULL;
1208	–
1209	–	if (the_buffer_copy != VM_MAP_FAILED) {
1210	–	vm_release(the_buffer_copy, the_buffer_size);
1211	–	the_buffer_copy = NULL;
1212	–	}
1213	–	if (the_buffer != VM_MAP_FAILED) {
1214	–	vm_release(the_buffer, the_buffer_size);
1215	–	the_buffer = NULL;
1216	–	}
1237		}
1238		#endif
1239		#ifdef ENABLE_XF86_VIDMODE
#	Line 1313 | Line 1333 | static void keycode_init(void)
1333		// Open display for specified mode
1334		static bool video_open(const video_mode &mode)
1335		{
1336	+	D(bug("video_open()\n"));
1337	+
1338		// Find best available X visual
1339		if (!find_visual_for_depth(mode.depth)) {
1340		ErrorAlert(STR_NO_XVISUAL_ERR);
#	Line 1323 | Line 1345 | static bool video_open(const video_mode
1345		if (color_class == PseudoColor || color_class == DirectColor) {
1346		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1347		cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1348	+	} else {
1349	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1350	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1351		}
1352
1353		// Find pixel format of direct modes
#	Line 1344 | Line 1369 | static bool video_open(const video_mode
1369		--bloss;
1370		}
1371
1372	<	// Preset palette pixel values for gamma table
1372	>	// Preset palette pixel values for CLUT or gamma table
1373		if (color_class == DirectColor) {
1374		int num = vis->map_entries;
1375		for (int i=0; i<num; i++) {
1376		int c = (i * 256) / num;
1377		palette[i].pixel = map_rgb(c, c, c);
1378	+	palette[i].flags = DoRed | DoGreen | DoBlue;
1379	+	}
1380	+	} else if (color_class == PseudoColor) {
1381	+	for (int i=0; i<256; i++) {
1382	+	palette[i].pixel = i;
1383	+	palette[i].flags = DoRed | DoGreen | DoBlue;
1384		}
1385		}
1386
#	Line 1360 | Line 1391 | static bool video_open(const video_mode
1391		palette[i].red = c * 0x0101;
1392		palette[i].green = c * 0x0101;
1393		palette[i].blue = c * 0x0101;
1363	–	if (color_class == PseudoColor)
1364	–	palette[i].pixel = i;
1365	–	palette[i].flags = DoRed | DoGreen | DoBlue;
1394		}
1395	<	if (cmap[0] && cmap[1]) {
1395	>	if (color_class == PseudoColor || color_class == DirectColor) {
1396		XStoreColors(x_display, cmap[0], palette, num);
1397		XStoreColors(x_display, cmap[1], palette, num);
1398		}
1399
1400		#ifdef ENABLE_VOSF
1401		// Load gray ramp to 8->16/32 expand map
1402	<	if (!IsDirectMode(mode) && (color_class == TrueColor || color_class == DirectColor))
1402	>	if (!IsDirectMode(mode) && xdepth > 8)
1403		for (int i=0; i<256; i++)
1404		ExpandMap[i] = map_rgb(i, i, i);
1405		#endif
#	Line 1605 | Line 1633 | bool VideoInit(bool classic)
1633		// Close display
1634		static void video_close(void)
1635		{
1636	+	D(bug("video_close()\n"));
1637	+
1638		// Stop redraw thread
1639		#ifdef HAVE_PTHREADS
1640		if (redraw_thread_active) {
#	Line 1620 | Line 1650 | static void video_close(void)
1650		// Unlock frame buffer
1651		UNLOCK_FRAME_BUFFER;
1652		XSync(x_display, false);
1653	+	D(bug(" frame buffer unlocked\n"));
1654
1655		#ifdef ENABLE_VOSF
1656		if (use_vosf) {
#	Line 1722 | Line 1753 | void video_set_palette(uint8 *pal, int n
1753		p->red = pal[c*3 + 0] * 0x0101;
1754		p->green = pal[c*3 + 1] * 0x0101;
1755		p->blue = pal[c*3 + 2] * 0x0101;
1725	–	if (color_class == PseudoColor)
1726	–	p->pixel = i;
1727	–	p->flags = DoRed | DoGreen | DoBlue;
1756		p++;
1757		}
1758
1759		#ifdef ENABLE_VOSF
1760		// Recalculate pixel color expansion map
1761	<	if (!IsDirectMode(VideoMonitor.mode) && (color_class == TrueColor || color_class == DirectColor)) {
1761	>	if (!IsDirectMode(VideoMonitor.mode) && xdepth > 8) {
1762		for (int i=0; i<256; i++) {
1763		int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1764		ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]);
#	Line 1943 | Line 1971 | static void handle_events(void)
1971		XNextEvent(x_display, &event);
1972
1973		switch (event.type) {
1974	+
1975		// Mouse button
1976		case ButtonPress: {
1977		unsigned int button = event.xbutton.button;
#	Line 1975 | Line 2004 | static void handle_events(void)
2004		drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2005		break;
2006
2007	+	// Mouse entered window
2008	+	case EnterNotify:
2009	+	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2010	+	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2011	+	break;
2012	+
2013		// Keyboard
2014		case KeyPress: {
2015		int code = -1;
#	Line 2152 | Line 2187 | static void update_display_dynamic(int t
2187		static void update_display_static(driver_window *drv)
2188		{
2189		// Incremental update code
2190	<	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
2190	>	unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
2191		int bytes_per_row = VideoMonitor.mode.bytes_per_row;
2192		int bytes_per_pixel = VideoMonitor.mode.bytes_per_row / VideoMonitor.mode.x;
2193		uint8 *p, *p2;
#	Line 2311 | Line 2346 | static void video_refresh_dga(void)
2346		{
2347		// Quit DGA mode if requested
2348		possibly_quit_dga_mode();
2314	–
2315	–	// Handle X events
2316	–	handle_events();
2317	–
2318	–	// Handle palette changes
2319	–	handle_palette_changes();
2349		}
2350
2351		#ifdef ENABLE_VOSF
#	Line 2326 | Line 2355 | static void video_refresh_dga_vosf(void)
2355		// Quit DGA mode if requested
2356		possibly_quit_dga_mode();
2357
2329	–	// Handle X events
2330	–	handle_events();
2331	–
2332	–	// Handle palette changes
2333	–	handle_palette_changes();
2334	–
2358		// Update display (VOSF variant)
2359		static int tick_counter = 0;
2360		if (++tick_counter >= frame_skip) {
#	Line 2350 | Line 2373 | static void video_refresh_window_vosf(vo
2373		// Ungrab mouse if requested
2374		possibly_ungrab_mouse();
2375
2353	–	// Handle X events
2354	–	handle_events();
2355	–
2356	–	// Handle palette changes
2357	–	handle_palette_changes();
2358	–
2376		// Update display (VOSF variant)
2377		static int tick_counter = 0;
2378		if (++tick_counter >= frame_skip) {
#	Line 2375 | Line 2392 | static void video_refresh_window_static(
2392		// Ungrab mouse if requested
2393		possibly_ungrab_mouse();
2394
2378	–	// Handle X events
2379	–	handle_events();
2380	–
2381	–	// Handle_palette changes
2382	–	handle_palette_changes();
2383	–
2395		// Update display (static variant)
2396		static int tick_counter = 0;
2397		if (++tick_counter >= frame_skip) {
#	Line 2394 | Line 2405 | static void video_refresh_window_dynamic
2405		// Ungrab mouse if requested
2406		possibly_ungrab_mouse();
2407
2397	–	// Handle X events
2398	–	handle_events();
2399	–
2400	–	// Handle_palette changes
2401	–	handle_palette_changes();
2402	–
2408		// Update display (dynamic variant)
2409		static int tick_counter = 0;
2410		tick_counter++;
#	Line 2435 | Line 2440 | static void VideoRefreshInit(void)
2440		}
2441		}
2442
2443	+	// This function is called on non-threaded platforms from a timer interrupt
2444		void VideoRefresh(void)
2445		{
2446		// We need to check redraw_thread_active to inhibit refreshed during
2447		// mode changes on non-threaded platforms
2448	<	if (redraw_thread_active)
2449	<	video_refresh();
2448	>	if (!redraw_thread_active)
2449	>	return;
2450	>
2451	>	// Handle X events
2452	>	handle_events();
2453	>
2454	>	// Handle palette changes
2455	>	handle_palette_changes();
2456	>
2457	>	// Update display
2458	>	video_refresh();
2459		}
2460
2461	+	const int VIDEO_REFRESH_HZ = 60;
2462	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2463	+
2464		#ifdef HAVE_PTHREADS
2465		static void *redraw_func(void *arg)
2466		{
2467	+	int fd = ConnectionNumber(x_display);
2468	+
2469		uint64 start = GetTicks_usec();
2470		int64 ticks = 0;
2471	<	uint64 next = GetTicks_usec();
2471	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2472	>
2473		while (!redraw_thread_cancel) {
2474	<	video_refresh();
2454	<	next += 16667;
2474	>
2475		int64 delay = next - GetTicks_usec();
2476	<	if (delay > 0)
2477	<	Delay_usec(delay);
2478	<	else if (delay < -16667)
2476	>	if (delay < -VIDEO_REFRESH_DELAY) {
2477	>
2478	>	// We are lagging far behind, so we reset the delay mechanism
2479		next = GetTicks_usec();
2480	<	ticks++;
2480	>
2481	>	} else if (delay <= 0) {
2482	>
2483	>	// Delay expired, refresh display
2484	>	handle_events();
2485	>	handle_palette_changes();
2486	>	video_refresh();
2487	>	next += VIDEO_REFRESH_DELAY;
2488	>	ticks++;
2489	>
2490	>	} else {
2491	>
2492	>	// No display refresh pending, check for X events
2493	>	fd_set readfds;
2494	>	FD_ZERO(&readfds);
2495	>	FD_SET(fd, &readfds);
2496	>	struct timeval timeout;
2497	>	timeout.tv_sec = 0;
2498	>	timeout.tv_usec = delay;
2499	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2500	>	handle_events();
2501	>	}
2502		}
2503	+
2504		uint64 end = GetTicks_usec();
2505	<	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2505	>	D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2506		return NULL;
2507		}
2508		#endif

Diff Legend

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