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.55 by cebix, 2001-07-06T22:37:23Z vs.
Revision 1.59 by cebix, 2001-07-11T17:04:41Z

#	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 93 | 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
#	Line 212 | Line 213 | static bool find_visual_for_depth(video_
213		// Calculate minimum and maximum supported X depth
214		int min_depth = 1, max_depth = 32;
215		switch (depth) {
216	<	case VDEPTH_1BIT:       // 1-bit works always
217	<	min_depth = 1;
217	<	max_depth = 32;
216	>	case VDEPTH_1BIT:       // 1-bit works always and uses default visual
217	>	min_depth = max_depth = DefaultDepth(x_display, screen);
218		break;
219		#ifdef ENABLE_VOSF
220		case VDEPTH_2BIT:
#	Line 293 | Line 293 | static bool find_visual_for_depth(video_
293		case DirectColor: D(bug("DirectColor\n")); break;
294		}
295		#endif
296	+	return true;
297		}
298
299		// Add mode to list of supported modes
#	Line 428 | Line 429 | public:
429		virtual void toggle_mouse_grab(void) {}
430		virtual void mouse_moved(int x, int y) { ADBMouseMoved(x, y); }
431
432	+	void disable_mouse_accel(void);
433	+	void restore_mouse_accel(void);
434	+
435		virtual void grab_mouse(void) {}
436		virtual void ungrab_mouse(void) {}
437
438		public:
439		bool init_ok;   // Initialization succeeded (we can't use exceptions because of -fomit-frame-pointer)
440		Window w;               // The window we draw into
441	+
442	+	int orig_accel_numer, orig_accel_denom, orig_threshold; // Original mouse acceleration
443		};
444
445		class driver_window;
#	Line 477 | Line 483 | driver_base::driver_base()
483		{
484		the_buffer = NULL;
485		the_buffer_copy = NULL;
486	+	XGetPointerControl(x_display, &orig_accel_numer, &orig_accel_denom, &orig_threshold);
487		}
488
489		driver_base::~driver_base()
490		{
491		ungrab_mouse();
492	+	restore_mouse_accel();
493
494		if (w) {
495		XUnmapWindow(x_display, w);
#	Line 509 | Line 517 | driver_base::~driver_base()
517		free(the_host_buffer);
518		the_host_buffer = NULL;
519		}
520	<	if (the_buffer != (uint8 *)VM_MAP_FAILED) {
521	<	vm_release(the_buffer, the_buffer_size);
520	>	if (the_buffer) {
521	>	free(the_buffer);
522		the_buffer = NULL;
523		}
524	<	if (the_buffer_copy != (uint8 *)VM_MAP_FAILED) {
525	<	vm_release(the_buffer_copy, the_buffer_size);
524	>	if (the_buffer_copy) {
525	>	free(the_buffer_copy);
526		the_buffer_copy = NULL;
527		}
528		}
#	Line 524 | Line 532 | driver_base::~driver_base()
532		// Palette has changed
533		void driver_base::update_palette(void)
534		{
535	<	if (cmap[0] && cmap[1]) {
535	>	if (color_class == PseudoColor || color_class == DirectColor) {
536		int num = vis->map_entries;
537		if (!IsDirectMode(VideoMonitor.mode) && color_class == DirectColor)
538		return; // Indexed mode on true color screen, don't set CLUT
#	Line 534 | Line 542 | void driver_base::update_palette(void)
542		XSync(x_display, false);
543		}
544
545	+	// Disable mouse acceleration
546	+	void driver_base::disable_mouse_accel(void)
547	+	{
548	+	XChangePointerControl(x_display, True, False, 1, 1, 0);
549	+	}
550	+
551	+	// Restore mouse acceleration to original value
552	+	void driver_base::restore_mouse_accel(void)
553	+	{
554	+	XChangePointerControl(x_display, True, True, orig_accel_numer, orig_accel_denom, orig_threshold);
555	+	}
556	+
557
558		/*
559		*  Windowed display driver
#	Line 550 | Line 570 | driver_window::driver_window(const video
570		// Set absolute mouse mode
571		ADBSetRelMouseMode(mouse_grabbed);
572
573	<	// Create window
573	>	// Create window (setting backround_pixel, border_pixel and colormap is
574	>	// mandatory when using a non-default visual; in 1-bit mode we use the
575	>	// default visual, so we can also use the default colormap)
576		XSetWindowAttributes wattr;
577		wattr.event_mask = eventmask = win_eventmask;
578	<	wattr.background_pixel = black_pixel;
579	<	wattr.colormap = (mode.depth == VDEPTH_1BIT && color_class == PseudoColor ? DefaultColormap(x_display, screen) : cmap[0]);
578	>	wattr.background_pixel = (vis == DefaultVisual(x_display, screen) ? black_pixel : 0);
579	>	wattr.border_pixel = 0;
580	>	wattr.colormap = (mode.depth == VDEPTH_1BIT ? DefaultColormap(x_display, screen) : cmap[0]);
581		w = XCreateWindow(x_display, rootwin, 0, 0, width, height, 0, xdepth,
582	<	InputOutput, vis, CWEventMask | CWBackPixel | (color_class == PseudoColor || color_class == DirectColor ? CWColormap : 0), &wattr);
582	>	InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | CWColormap, &wattr);
583
584		// Set window name/class
585		set_window_name(w, STR_WINDOW_TITLE);
#	Line 629 | Line 652 | driver_window::driver_window(const video
652		}
653
654		#ifdef ENABLE_VOSF
655	+	use_vosf = true;
656		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
657		the_host_buffer = the_buffer_copy;
658		the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
#	Line 682 | Line 706 | driver_window::~driver_window()
706		the_buffer_copy = NULL; // don't free() in driver_base dtor
707		#endif
708		}
709	+	#ifdef ENABLE_VOSF
710	+	if (use_vosf) {
711	+	// don't free() memory mapped buffers in driver_base dtor
712	+	if (the_buffer != VM_MAP_FAILED) {
713	+	vm_release(the_buffer, the_buffer_size);
714	+	the_buffer = NULL;
715	+	}
716	+	if (the_buffer_copy != VM_MAP_FAILED) {
717	+	vm_release(the_buffer_copy, the_buffer_size);
718	+	the_buffer_copy = NULL;
719	+	}
720	+	}
721	+	#endif
722		if (img)
723		XDestroyImage(img);
724		if (have_shm) {
#	Line 713 | Line 750 | void driver_window::grab_mouse(void)
750		Delay_usec(100000);
751		}
752		if (result == GrabSuccess) {
716	–	ADBSetRelMouseMode(mouse_grabbed = true);
753		XStoreName(x_display, w, GetString(STR_WINDOW_TITLE_GRABBED));
754	<	XSync(x_display, false);
754	>	ADBSetRelMouseMode(mouse_grabbed = true);
755	>	disable_mouse_accel();
756		}
757		}
758
#	Line 726 | Line 763 | void driver_window::ungrab_mouse(void)
763		XUngrabPointer(x_display, CurrentTime);
764		XStoreName(x_display, w, GetString(STR_WINDOW_TITLE));
765		ADBSetRelMouseMode(mouse_grabbed = false);
766	+	restore_mouse_accel();
767		}
768		}
769
#	Line 821 | Line 859 | void driver_dga::suspend(void)
859		#endif
860		XUngrabPointer(x_display, CurrentTime);
861		XUngrabKeyboard(x_display, CurrentTime);
862	+	restore_mouse_accel();
863		XUnmapWindow(x_display, w);
864		wait_unmapped(w);
865
#	Line 850 | Line 889 | void driver_dga::resume(void)
889		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
890		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
891		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
892	+	disable_mouse_accel();
893		#ifdef ENABLE_XF86_DGA
894		XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse);
895		XF86DGASetViewPort(x_display, screen, 0, 0);
#	Line 996 | Line 1036 | driver_fbdev::driver_fbdev(const video_m
1036		XGrabPointer(x_display, w, True,
1037		PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
1038		GrabModeAsync, GrabModeAsync, w, None, CurrentTime);
1039	+	disable_mouse_accel();
1040
1041		// Calculate bytes per row
1042		int bytes_per_row = TrivialBytesPerRow(mode.x, mode.depth);
1043
1044		// Map frame buffer
1045	<	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1046	<	if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1045	>	the_buffer_size = height * bytes_per_row;
1046	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) {
1047	>	if ((the_buffer = (uint8 *) mmap(NULL, the_buffer_size, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) {
1048		char str[256];
1049		sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno));
1050		ErrorAlert(str);
#	Line 1041 | Line 1083 | driver_fbdev::driver_fbdev(const video_m
1083		// Close display
1084		driver_fbdev::~driver_fbdev()
1085		{
1086	+	if (!use_vosf) {
1087	+	if (the_buffer != MAP_FAILED) {
1088	+	// don't free() the screen buffer in driver_base dtor
1089	+	munmap(the_buffer, the_buffer_size);
1090	+	the_buffer = NULL;
1091	+	}
1092	+	}
1093	+	#ifdef ENABLE_VOSF
1094	+	else {
1095	+	if (the_host_buffer != MAP_FAILED) {
1096	+	// don't free() the screen buffer in driver_base dtor
1097	+	munmap(the_host_buffer, the_buffer_size);
1098	+	the_host_buffer = NULL;
1099	+	}
1100	+	if (the_buffer_copy != VM_MAP_FAILED) {
1101	+	vm_release(the_buffer_copy, the_buffer_size);
1102	+	the_buffer_copy = NULL;
1103	+	}
1104	+	if (the_buffer != VM_MAP_FAILED) {
1105	+	vm_release(the_buffer, the_buffer_size);
1106	+	the_buffer = NULL;
1107	+	}
1108	+	}
1109	+	#endif
1110		}
1111		#endif
1112
#	Line 1110 | Line 1176 | driver_xf86dga::driver_xf86dga(const vid
1176		XWarpPointer(x_display, None, rootwin, 0, 0, 0, 0, 0, 0);
1177		XGrabKeyboard(x_display, rootwin, True, GrabModeAsync, GrabModeAsync, CurrentTime);
1178		XGrabPointer(x_display, rootwin, True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
1179	+	disable_mouse_accel();
1180
1181		int v_width, v_bank, v_size;
1182		XF86DGAGetVideo(x_display, screen, (char **)&the_buffer, &v_width, &v_bank, &v_size);
#	Line 1126 | Line 1193 | driver_xf86dga::driver_xf86dga(const vid
1193
1194		// Init blitting routines
1195		int bytes_per_row = TrivialBytesPerRow((v_width + 7) & ~7, mode.depth);
1196	<	#ifdef VIDEO_VOSF
1196	>	#if VIDEO_VOSF
1197		#if REAL_ADDRESSING || DIRECT_ADDRESSING
1198		// Screen_blitter_init() returns TRUE if VOSF is mandatory
1199		// i.e. the framebuffer update function is not Blit_Copy_Raw
#	Line 1157 | Line 1224 | driver_xf86dga::driver_xf86dga(const vid
1224		driver_xf86dga::~driver_xf86dga()
1225		{
1226		XF86DGADirectVideo(x_display, screen, 0);
1227	+	if (!use_vosf) {
1228	+	// don't free() the screen buffer in driver_base dtor
1229	+	the_buffer = NULL;
1230	+	}
1231	+	#ifdef ENABLE_VOSF
1232	+	else {
1233	+	// don't free() the screen buffer in driver_base dtor
1234	+	the_host_buffer = NULL;
1235	+
1236	+	if (the_buffer_copy != VM_MAP_FAILED) {
1237	+	vm_release(the_buffer_copy, the_buffer_size);
1238	+	the_buffer_copy = NULL;
1239	+	}
1240	+	if (the_buffer != VM_MAP_FAILED) {
1241	+	vm_release(the_buffer, the_buffer_size);
1242	+	the_buffer = NULL;
1243	+	}
1244	+	}
1245	+	#endif
1246		#ifdef ENABLE_XF86_VIDMODE
1247		if (has_vidmode)
1248		XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]);
#	Line 1264 | Line 1350 | static bool video_open(const video_mode
1350		if (color_class == PseudoColor || color_class == DirectColor) {
1351		cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1352		cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocAll);
1353	+	} else {
1354	+	cmap[0] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1355	+	cmap[1] = XCreateColormap(x_display, rootwin, vis, AllocNone);
1356		}
1357
1358		// Find pixel format of direct modes
#	Line 1285 | Line 1374 | static bool video_open(const video_mode
1374		--bloss;
1375		}
1376
1377	<	// Preset palette pixel values for gamma table
1377	>	// Preset palette pixel values for CLUT or gamma table
1378		if (color_class == DirectColor) {
1379		int num = vis->map_entries;
1380		for (int i=0; i<num; i++) {
1381		int c = (i * 256) / num;
1382		palette[i].pixel = map_rgb(c, c, c);
1383	+	palette[i].flags = DoRed | DoGreen | DoBlue;
1384	+	}
1385	+	} else if (color_class == PseudoColor) {
1386	+	for (int i=0; i<256; i++) {
1387	+	palette[i].pixel = i;
1388	+	palette[i].flags = DoRed | DoGreen | DoBlue;
1389		}
1390		}
1391
#	Line 1301 | Line 1396 | static bool video_open(const video_mode
1396		palette[i].red = c * 0x0101;
1397		palette[i].green = c * 0x0101;
1398		palette[i].blue = c * 0x0101;
1304	–	if (color_class == PseudoColor)
1305	–	palette[i].pixel = i;
1306	–	palette[i].flags = DoRed | DoGreen | DoBlue;
1399		}
1400	<	if (cmap[0] && cmap[1]) {
1400	>	if (color_class == PseudoColor || color_class == DirectColor) {
1401		XStoreColors(x_display, cmap[0], palette, num);
1402		XStoreColors(x_display, cmap[1], palette, num);
1403		}
1404
1405		#ifdef ENABLE_VOSF
1406		// Load gray ramp to 8->16/32 expand map
1407	<	if (!IsDirectMode(mode) && (color_class == TrueColor || color_class == DirectColor))
1407	>	if (!IsDirectMode(mode) && xdepth > 8)
1408		for (int i=0; i<256; i++)
1409		ExpandMap[i] = map_rgb(i, i, i);
1410		#endif
#	Line 1343 | Line 1435 | static bool video_open(const video_mode
1435
1436		#ifdef ENABLE_VOSF
1437		if (use_vosf) {
1438	<	// Initialize the mainBuffer structure
1439	<	if (!video_init_buffer()) {
1438	>	// Initialize the VOSF system
1439	>	if (!video_vosf_init()) {
1440		ErrorAlert(STR_VOSF_INIT_ERR);
1441		return false;
1442		}
1351	–
1352	–	// Initialize the handler for SIGSEGV
1353	–	if (!sigsegv_install_handler(screen_fault_handler)) {
1354	–	ErrorAlert("Could not initialize Video on SEGV signals");
1355	–	return false;
1356	–	}
1443		}
1444		#endif
1445
#	Line 1569 | Line 1655 | static void video_close(void)
1655		XSync(x_display, false);
1656
1657		#ifdef ENABLE_VOSF
1572	–	// Deinitialize VOSF
1658		if (use_vosf) {
1659	<	if (mainBuffer.pageInfo) {
1660	<	free(mainBuffer.pageInfo);
1576	<	mainBuffer.pageInfo = NULL;
1577	<	}
1578	<	if (mainBuffer.dirtyPages) {
1579	<	free(mainBuffer.dirtyPages);
1580	<	mainBuffer.dirtyPages = NULL;
1581	<	}
1659	>	// Deinitialize VOSF
1660	>	video_vosf_exit();
1661		}
1662		#endif
1663
#	Line 1676 | Line 1755 | void video_set_palette(uint8 *pal, int n
1755		p->red = pal[c*3 + 0] * 0x0101;
1756		p->green = pal[c*3 + 1] * 0x0101;
1757		p->blue = pal[c*3 + 2] * 0x0101;
1679	–	if (color_class == PseudoColor)
1680	–	p->pixel = i;
1681	–	p->flags = DoRed | DoGreen | DoBlue;
1758		p++;
1759		}
1760
1761		#ifdef ENABLE_VOSF
1762		// Recalculate pixel color expansion map
1763	<	if (!IsDirectMode(VideoMonitor.mode) && (color_class == TrueColor || color_class == DirectColor)) {
1763	>	if (!IsDirectMode(VideoMonitor.mode) && xdepth > 8) {
1764		for (int i=0; i<256; i++) {
1765		int c = i & (num_in-1); // If there are less than 256 colors, we repeat the first entries (this makes color expansion easier)
1766		ExpandMap[i] = map_rgb(pal[c*3+0], pal[c*3+1], pal[c*3+2]);
#	Line 1897 | Line 1973 | static void handle_events(void)
1973		XNextEvent(x_display, &event);
1974
1975		switch (event.type) {
1976	+
1977		// Mouse button
1978		case ButtonPress: {
1979		unsigned int button = event.xbutton.button;
#	Line 1929 | Line 2006 | static void handle_events(void)
2006		drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2007		break;
2008
2009	+	// Mouse entered window
2010	+	case EnterNotify:
2011	+	if (event.xcrossing.mode != NotifyGrab && event.xcrossing.mode != NotifyUngrab)
2012	+	drv->mouse_moved(event.xmotion.x, event.xmotion.y);
2013	+	break;
2014	+
2015		// Keyboard
2016		case KeyPress: {
2017		int code = -1;
#	Line 2265 | Line 2348 | static void video_refresh_dga(void)
2348		{
2349		// Quit DGA mode if requested
2350		possibly_quit_dga_mode();
2268	–
2269	–	// Handle X events
2270	–	handle_events();
2271	–
2272	–	// Handle palette changes
2273	–	handle_palette_changes();
2351		}
2352
2353		#ifdef ENABLE_VOSF
#	Line 2280 | Line 2357 | static void video_refresh_dga_vosf(void)
2357		// Quit DGA mode if requested
2358		possibly_quit_dga_mode();
2359
2283	–	// Handle X events
2284	–	handle_events();
2285	–
2286	–	// Handle palette changes
2287	–	handle_palette_changes();
2288	–
2360		// Update display (VOSF variant)
2361		static int tick_counter = 0;
2362		if (++tick_counter >= frame_skip) {
#	Line 2304 | Line 2375 | static void video_refresh_window_vosf(vo
2375		// Ungrab mouse if requested
2376		possibly_ungrab_mouse();
2377
2307	–	// Handle X events
2308	–	handle_events();
2309	–
2310	–	// Handle palette changes
2311	–	handle_palette_changes();
2312	–
2378		// Update display (VOSF variant)
2379		static int tick_counter = 0;
2380		if (++tick_counter >= frame_skip) {
#	Line 2329 | Line 2394 | static void video_refresh_window_static(
2394		// Ungrab mouse if requested
2395		possibly_ungrab_mouse();
2396
2332	–	// Handle X events
2333	–	handle_events();
2334	–
2335	–	// Handle_palette changes
2336	–	handle_palette_changes();
2337	–
2397		// Update display (static variant)
2398		static int tick_counter = 0;
2399		if (++tick_counter >= frame_skip) {
#	Line 2348 | Line 2407 | static void video_refresh_window_dynamic
2407		// Ungrab mouse if requested
2408		possibly_ungrab_mouse();
2409
2351	–	// Handle X events
2352	–	handle_events();
2353	–
2354	–	// Handle_palette changes
2355	–	handle_palette_changes();
2356	–
2410		// Update display (dynamic variant)
2411		static int tick_counter = 0;
2412		tick_counter++;
#	Line 2389 | Line 2442 | static void VideoRefreshInit(void)
2442		}
2443		}
2444
2445	+	// This function is called on non-threaded platforms from a timer interrupt
2446		void VideoRefresh(void)
2447		{
2448		// We need to check redraw_thread_active to inhibit refreshed during
2449		// mode changes on non-threaded platforms
2450	<	if (redraw_thread_active)
2451	<	video_refresh();
2450	>	if (!redraw_thread_active)
2451	>	return;
2452	>
2453	>	// Handle X events
2454	>	handle_events();
2455	>
2456	>	// Handle palette changes
2457	>	handle_palette_changes();
2458	>
2459	>	// Update display
2460	>	video_refresh();
2461		}
2462
2463	+	const int VIDEO_REFRESH_HZ = 60;
2464	+	const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2465	+
2466		#ifdef HAVE_PTHREADS
2467		static void *redraw_func(void *arg)
2468		{
2469	+	int fd = ConnectionNumber(x_display);
2470	+
2471		uint64 start = GetTicks_usec();
2472		int64 ticks = 0;
2473	<	uint64 next = GetTicks_usec();
2473	>	uint64 next = GetTicks_usec() + VIDEO_REFRESH_DELAY;
2474	>
2475		while (!redraw_thread_cancel) {
2476	<	video_refresh();
2408	<	next += 16667;
2476	>
2477		int64 delay = next - GetTicks_usec();
2478	<	if (delay > 0)
2479	<	Delay_usec(delay);
2480	<	else if (delay < -16667)
2478	>	if (delay < -VIDEO_REFRESH_DELAY) {
2479	>
2480	>	// We are lagging far behind, so we reset the delay mechanism
2481		next = GetTicks_usec();
2482	<	ticks++;
2482	>
2483	>	} else if (delay <= 0) {
2484	>
2485	>	// Delay expired, refresh display
2486	>	handle_events();
2487	>	handle_palette_changes();
2488	>	video_refresh();
2489	>	next += VIDEO_REFRESH_DELAY;
2490	>	ticks++;
2491	>
2492	>	} else {
2493	>
2494	>	// No display refresh pending, check for X events
2495	>	fd_set readfds;
2496	>	FD_ZERO(&readfds);
2497	>	FD_SET(fd, &readfds);
2498	>	struct timeval timeout;
2499	>	timeout.tv_sec = 0;
2500	>	timeout.tv_usec = delay;
2501	>	if (select(fd+1, &readfds, NULL, NULL, &timeout) > 0)
2502	>	handle_events();
2503	>	}
2504		}
2505	+
2506		uint64 end = GetTicks_usec();
2507	<	// printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, ticks * 1000000 / (end - start));
2507	>	D(bug("%Ld refreshes in %Ld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2508		return NULL;
2509		}
2510		#endif

Diff Legend

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