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.18 by cebix, 2000-07-22T18:12:35Z vs.
Revision 1.20 by gbeauche, 2000-09-25T21:49:19Z

#	Line 52 | Line 52
52		# include <sys/mman.h>
53		#endif
54
55	+	#ifdef ENABLE_VOSF
56	+	# include <math.h> // log()
57	+	# include <unistd.h>
58	+	# include <signal.h>
59	+	# include <fcntl.h>
60	+	# include <sys/mman.h>
61	+	#endif
62	+
63		#include "cpu_emulation.h"
64		#include "main.h"
65		#include "adb.h"
#	Line 154 | Line 162 | static XF86VidModeModeInfo **x_video_mod
162		static int num_x_video_modes;
163		#endif
164
165	+	#ifdef ENABLE_VOSF
166	+	static bool use_vosf = true;                                            // Flag: VOSF enabled
167	+	#else
168	+	static const bool use_vosf = false;                                     // Flag: VOSF enabled
169	+	#endif
170	+
171	+	#ifdef ENABLE_VOSF
172	+	static uint8 * the_host_buffer;                                         // Host frame buffer in VOSF mode
173	+	static uint32 the_buffer_size;                                          // Size of allocated the_buffer
174	+	#endif
175	+
176	+	#ifdef ENABLE_VOSF
177	+	// Variables for Video on SEGV support (taken from the Win32 port)
178	+	struct ScreenPageInfo {
179	+	int top, bottom;                    // Mapping between this virtual page and Mac scanlines
180	+	};
181	+
182	+	struct ScreenInfo {
183	+	uint32 memBase;                             // Real start address
184	+	uint32 memStart;                    // Start address aligned to page boundary
185	+	uint32 memEnd;                              // Address of one-past-the-end of the screen
186	+	uint32 memLength;                   // Length of the memory addressed by the screen pages
187	+
188	+	uint32 pageSize;                    // Size of a page
189	+	int pageBits;                               // Shift count to get the page number
190	+	uint32 pageCount;                   // Number of pages allocated to the screen
191	+
192	+	uint8 * dirtyPages;                 // Table of flags set if page was altered
193	+	ScreenPageInfo * pageInfo;  // Table of mappings page -> Mac scanlines
194	+	};
195	+
196	+	static ScreenInfo mainBuffer;
197	+
198	+	#define PFLAG_SET(page)                 mainBuffer.dirtyPages[page] = 1
199	+	#define PFLAG_CLEAR(page)               mainBuffer.dirtyPages[page] = 0
200	+	#define PFLAG_ISSET(page)               mainBuffer.dirtyPages[page]
201	+	#define PFLAG_ISCLEAR(page)             (mainBuffer.dirtyPages[page] == 0)
202	+	#ifdef UNALIGNED_PROFITABLE
203	+	# define PFLAG_ISCLEAR_4(page)  (*((uint32 *)(mainBuffer.dirtyPages + page)) == 0)
204	+	#else
205	+	# define PFLAG_ISCLEAR_4(page)  \
206	+	(mainBuffer.dirtyPages[page  ] == 0) \
207	+	&&      (mainBuffer.dirtyPages[page+1] == 0) \
208	+	&&      (mainBuffer.dirtyPages[page+2] == 0) \
209	+	&&      (mainBuffer.dirtyPages[page+3] == 0)
210	+	#endif
211	+	#define PFLAG_CLEAR_ALL                 memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount)
212	+	#define PFLAG_SET_ALL                   memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount)
213	+
214	+	static int zero_fd = -1;
215	+	static bool Screen_fault_handler_init();
216	+	static struct sigaction vosf_sa;
217	+
218	+	#ifdef HAVE_PTHREADS
219	+	static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER;    // Mutex to protect frame buffer (dirtyPages in fact)
220	+	#endif
221	+
222	+	#endif
223	+
224	+	// VideoRefresh function
225	+	void VideoRefreshInit(void);
226	+	static void (*video_refresh)(void);
227
228		// Prototypes
229		static void *redraw_func(void *arg);
#	Line 167 | Line 237 | extern Display *x_display;
237		// From sys_unix.cpp
238		extern void SysMountFirstFloppy(void);
239
240	+	#ifdef ENABLE_VOSF
241	+	# include "video_vosf.h"
242	+	#endif
243	+
244
245		/*
246		*  Initialization
#	Line 175 | Line 249 | extern void SysMountFirstFloppy(void);
249		// Set VideoMonitor according to video mode
250		void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order)
251		{
252	<	#if !REAL_ADDRESSING
252	>	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
253		int layout = FLAYOUT_DIRECT;
254		switch (depth) {
255		case 1:
#	Line 337 | Line 411 | static bool init_window(int width, int h
411		img->bitmap_bit_order = MSBFirst;
412		}
413
414	+	#ifdef ENABLE_VOSF
415	+	// Allocate a page-aligned chunk of memory for frame buffer
416	+	the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line);
417	+	the_host_buffer = the_buffer_copy;
418	+
419	+	the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size);
420	+	memset(the_buffer_copy, 0, the_buffer_size);
421	+
422	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
423	+	memset(the_buffer, 0, the_buffer_size);
424	+	#else
425		// Allocate memory for frame buffer
426		the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
427	+	#endif
428
429		// Create GC
430		the_gc = XCreateGC(x_display, the_win, 0, 0);
#	Line 352 | Line 438 | static bool init_window(int width, int h
438		XDefineCursor(x_display, the_win, mac_cursor);
439
440		// Set VideoMonitor
441	+	bool native_byte_order;
442		#ifdef WORDS_BIGENDIAN
443	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst);
443	>	native_byte_order = (img->bitmap_bit_order == MSBFirst);
444		#else
445	<	set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst);
445	>	native_byte_order = (img->bitmap_bit_order == LSBFirst);
446	>	#endif
447	>	#ifdef ENABLE_VOSF
448	>	do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW);
449		#endif
450	+	set_video_monitor(width, height, img->bytes_per_line, native_byte_order);
451
452	<	#if REAL_ADDRESSING
453	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
452	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
453	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
454		#else
455		VideoMonitor.mac_frame_base = MacFrameBaseMac;
456		#endif
#	Line 492 | Line 583 | static bool init_fbdev_dga(char *in_fb_n
583		}
584		}
585
586	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
587	+	// If the blit function is null, i.e. just a copy of the buffer,
588	+	// we first try to avoid the allocation of a temporary frame buffer
589	+	use_vosf = true;
590	+	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
591	+	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
592	+	use_vosf = false;
593	+
594	+	if (use_vosf) {
595	+	the_host_buffer = the_buffer;
596	+	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
597	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
598	+	memset(the_buffer_copy, 0, the_buffer_size);
599	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
600	+	memset(the_buffer, 0, the_buffer_size);
601	+	}
602	+	#elif ENABLE_VOSF
603	+	use_vosf = false;
604	+	#endif
605	+
606		set_video_monitor(width, height, bytes_per_row, true);
607	<	#if REAL_ADDRESSING
608	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
607	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
608	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
609		#else
610		VideoMonitor.mac_frame_base = MacFrameBaseMac;
611		#endif
#	Line 575 | Line 686 | static bool init_xf86_dga(int width, int
686		bytes_per_row *= 4;
687		break;
688		}
689	+
690	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
691	+	// If the blit function is null, i.e. just a copy of the buffer,
692	+	// we first try to avoid the allocation of a temporary frame buffer
693	+	use_vosf = true;
694	+	do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA);
695	+	if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw))
696	+	use_vosf = false;
697	+
698	+	if (use_vosf) {
699	+	the_host_buffer = the_buffer;
700	+	the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row);
701	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
702	+	memset(the_buffer_copy, 0, the_buffer_size);
703	+	the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size);
704	+	memset(the_buffer, 0, the_buffer_size);
705	+	}
706	+	#elif ENABLE_VOSF
707	+	// The UAE memory handlers will already handle color conversion, if needed.
708	+	use_vosf = false;
709	+	#endif
710	+
711		set_video_monitor(width, height, bytes_per_row, true);
712	<	#if REAL_ADDRESSING
713	<	VideoMonitor.mac_frame_base = (uint32)the_buffer;
714	<	MacFrameLayout = FLAYOUT_DIRECT;
712	>	#if REAL_ADDRESSING || DIRECT_ADDRESSING
713	>	VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer);
714	>	//      MacFrameLayout = FLAYOUT_DIRECT;
715		#else
716		VideoMonitor.mac_frame_base = MacFrameBaseMac;
717		#endif
#	Line 654 | Line 787 | static void keycode_init(void)
787		}
788		}
789
790	+	bool VideoInitBuffer()
791	+	{
792	+	#ifdef ENABLE_VOSF
793	+	if (use_vosf) {
794	+	const uint32 page_size  = getpagesize();
795	+	const uint32 page_mask  = page_size - 1;
796	+
797	+	mainBuffer.memBase      = (uint32) the_buffer;
798	+	// Align the frame buffer on page boundary
799	+	mainBuffer.memStart             = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask);
800	+	mainBuffer.memLength    = the_buffer_size;
801	+	mainBuffer.memEnd       = mainBuffer.memStart + mainBuffer.memLength;
802	+
803	+	mainBuffer.pageSize     = page_size;
804	+	mainBuffer.pageCount    = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
805	+	mainBuffer.pageBits     = int( log(mainBuffer.pageSize) / log(2.0) );
806	+
807	+	if (mainBuffer.dirtyPages != 0)
808	+	free(mainBuffer.dirtyPages);
809	+
810	+	mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount);
811	+
812	+	if (mainBuffer.pageInfo != 0)
813	+	free(mainBuffer.pageInfo);
814	+
815	+	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
816	+
817	+	if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0))
818	+	return false;
819	+
820	+	PFLAG_CLEAR_ALL;
821	+
822	+	uint32 a = 0;
823	+	for (int i = 0; i < mainBuffer.pageCount; i++) {
824	+	int y1 = a / VideoMonitor.bytes_per_row;
825	+	if (y1 >= VideoMonitor.y)
826	+	y1 = VideoMonitor.y - 1;
827	+
828	+	int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row;
829	+	if (y2 >= VideoMonitor.y)
830	+	y2 = VideoMonitor.y - 1;
831	+
832	+	mainBuffer.pageInfo[i].top = y1;
833	+	mainBuffer.pageInfo[i].bottom = y2;
834	+
835	+	a += mainBuffer.pageSize;
836	+	if (a > mainBuffer.memLength)
837	+	a = mainBuffer.memLength;
838	+	}
839	+
840	+	// We can now write-protect the frame buffer
841	+	if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0)
842	+	return false;
843	+	}
844	+	#endif
845	+	return true;
846	+	}
847	+
848		bool VideoInit(bool classic)
849		{
850	+	#ifdef ENABLE_VOSF
851	+	// Open /dev/zero
852	+	zero_fd = open("/dev/zero", O_RDWR);
853	+	if (zero_fd < 0) {
854	+	char str[256];
855	+	sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno));
856	+	ErrorAlert(str);
857	+	return false;
858	+	}
859	+
860	+	// Zero the mainBuffer structure
861	+	mainBuffer.dirtyPages = 0;
862	+	mainBuffer.pageInfo = 0;
863	+	#endif
864	+
865		// Check if X server runs on local machine
866		local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
867		|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
#	Line 807 | Line 1013 | bool VideoInit(bool classic)
1013		pthread_mutex_lock(&frame_buffer_lock);
1014		#endif
1015
1016	<	#if !REAL_ADDRESSING
1016	>	#if !REAL_ADDRESSING && !DIRECT_ADDRESSING
1017		// Set variables for UAE memory mapping
1018		MacFrameBaseHost = the_buffer;
1019		MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y;
#	Line 817 | Line 1023 | bool VideoInit(bool classic)
1023		MacFrameLayout = FLAYOUT_NONE;
1024		#endif
1025
1026	+	#ifdef ENABLE_VOSF
1027	+	if (use_vosf) {
1028	+	// Initialize the mainBuffer structure
1029	+	if (!VideoInitBuffer()) {
1030	+	// TODO: STR_VOSF_INIT_ERR ?
1031	+	ErrorAlert("Could not initialize Video on SEGV signals");
1032	+	return false;
1033	+	}
1034	+
1035	+	// Initialize the handler for SIGSEGV
1036	+	if (!Screen_fault_handler_init()) {
1037	+	// TODO: STR_VOSF_INIT_ERR ?
1038	+	ErrorAlert("Could not initialize Video on SEGV signals");
1039	+	return false;
1040	+	}
1041	+	}
1042	+	#endif
1043	+
1044	+	// Initialize VideoRefresh function
1045	+	VideoRefreshInit();
1046	+
1047		XSync(x_display, false);
1048
1049		#ifdef HAVE_PTHREADS
#	Line 885 | Line 1112 | void VideoExit(void)
1112		XFreeColormap(x_display, cmap[0]);
1113		XFreeColormap(x_display, cmap[1]);
1114		}
1115	+
1116	+	if (!use_vosf) {
1117	+	if (the_buffer) {
1118	+	free(the_buffer);
1119	+	the_buffer = NULL;
1120	+	}
1121
1122	<	if (the_buffer) {
1123	<	free(the_buffer);
1124	<	the_buffer = NULL;
1122	>	if (!have_shm && the_buffer_copy) {
1123	>	free(the_buffer_copy);
1124	>	the_buffer_copy = NULL;
1125	>	}
1126	>	}
1127	>	#ifdef ENABLE_VOSF
1128	>	else {
1129	>	if (the_buffer != (uint8 *)MAP_FAILED) {
1130	>	munmap((caddr_t)the_buffer, the_buffer_size);
1131	>	the_buffer = 0;
1132	>	}
1133	>
1134	>	if (the_buffer_copy != (uint8 *)MAP_FAILED) {
1135	>	munmap((caddr_t)the_buffer_copy, the_buffer_size);
1136	>	the_buffer_copy = 0;
1137	>	}
1138	>	}
1139	>	#endif
1140	>	}
1141	>
1142	>	#ifdef ENABLE_VOSF
1143	>	if (use_vosf) {
1144	>	// Clear mainBuffer data
1145	>	if (mainBuffer.pageInfo) {
1146	>	free(mainBuffer.pageInfo);
1147	>	mainBuffer.pageInfo = 0;
1148		}
1149
1150	<	if (!have_shm && the_buffer_copy) {
1151	<	free(the_buffer_copy);
1152	<	the_buffer_copy = NULL;
1150	>	if (mainBuffer.dirtyPages) {
1151	>	free(mainBuffer.dirtyPages);
1152	>	mainBuffer.dirtyPages = 0;
1153		}
1154		}
1155	+
1156	+	// Close /dev/zero
1157	+	if (zero_fd > 0)
1158	+	close(zero_fd);
1159	+	#endif
1160		}
1161
1162
#	Line 1030 | Line 1291 | static void resume_emul(void)
1291
1292		// Restore frame buffer
1293		if (fb_save) {
1294	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1295	+	if (use_vosf)
1296	+	mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ|PROT_WRITE);
1297	+	#endif
1298		memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1299	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1300	+	if (use_vosf) {
1301	+	mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ);
1302	+	do_update_framebuffer(the_host_buffer, the_buffer, VideoMonitor.x * VideoMonitor.bytes_per_row);
1303	+	#ifdef HAVE_PTHREADS
1304	+	pthread_mutex_lock(&Screen_draw_lock);
1305	+	#endif
1306	+	PFLAG_CLEAR_ALL;
1307	+	#ifdef HAVE_PTHREADS
1308	+	pthread_mutex_unlock(&Screen_draw_lock);
1309	+	#endif
1310	+	}
1311	+	#endif
1312		free(fb_save);
1313		fb_save = NULL;
1314		}
#	Line 1317 | Line 1595 | static void handle_events(void)
1595		for (x1=0; x1<16; x1++)
1596		updt_box[x1][y1] = true;
1597		nr_boxes = 16 * 16;
1598	<	} else
1598	>	} else {
1599	>	#ifdef ENABLE_VOSF
1600	>	#ifdef HAVE_PTHREADS
1601	>	pthread_mutex_lock(&Screen_draw_lock);
1602	>	#endif
1603	>	PFLAG_SET_ALL;
1604	>	#ifdef HAVE_PTHREADS
1605	>	pthread_mutex_unlock(&Screen_draw_lock);
1606	>	#endif
1607	>	#endif
1608		memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1609	+	}
1610		}
1611		break;
1612		}
#	Line 1536 | Line 1824 | static void update_display_static(void)
1824
1825
1826		/*
1827	+	*      Screen refresh functions
1828	+	*/
1829	+
1830	+	// The specialisations hereunder are meant to enable VOSF with DGA in direct
1831	+	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
1832	+	// not get mapped correctly with respect to the predetermined host frame
1833	+	// buffer base address.
1834	+	//
1835	+	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1836	+	// we first try to "triple allocate" the address spaces according to the real
1837	+	// host frame buffer address. Then, if it fails, we will use a temporary
1838	+	// frame buffer thus making the real host frame buffer updated when pages
1839	+	// of the temp frame buffer are altered.
1840	+	//
1841	+	// As a side effect, a little speed gain in screen updates could be noticed
1842	+	// for other modes than DGA.
1843	+	//
1844	+	// The following two functions below are inline so that a clever compiler
1845	+	// could specialise the code according to the current screen depth and
1846	+	// display type. A more clever compiler would the job by itself though...
1847	+	// (update_display_vosf is inlined as well)
1848	+
1849	+	static inline void possibly_quit_dga_mode()
1850	+	{
1851	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1852	+	// Quit DGA mode if requested
1853	+	if (quit_full_screen) {
1854	+	quit_full_screen = false;
1855	+	#ifdef ENABLE_XF86_DGA
1856	+	XF86DGADirectVideo(x_display, screen, 0);
1857	+	#endif
1858	+	XUngrabPointer(x_display, CurrentTime);
1859	+	XUngrabKeyboard(x_display, CurrentTime);
1860	+	XUnmapWindow(x_display, the_win);
1861	+	XSync(x_display, false);
1862	+	}
1863	+	#endif
1864	+	}
1865	+
1866	+	static inline void handle_palette_changes(int depth, int display_type)
1867	+	{
1868	+	#ifdef HAVE_PTHREADS
1869	+	pthread_mutex_lock(&palette_lock);
1870	+	#endif
1871	+	if (palette_changed) {
1872	+	palette_changed = false;
1873	+	if (depth == 8) {
1874	+	XStoreColors(x_display, cmap[0], palette, 256);
1875	+	XStoreColors(x_display, cmap[1], palette, 256);
1876	+
1877	+	#ifdef ENABLE_XF86_DGA
1878	+	if (display_type == DISPLAY_DGA) {
1879	+	current_dga_cmap ^= 1;
1880	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1881	+	}
1882	+	#endif
1883	+	}
1884	+	}
1885	+	#ifdef HAVE_PTHREADS
1886	+	pthread_mutex_unlock(&palette_lock);
1887	+	#endif
1888	+	}
1889	+
1890	+	static void video_refresh_dga(void)
1891	+	{
1892	+	// Quit DGA mode if requested
1893	+	possibly_quit_dga_mode();
1894	+
1895	+	// Handle X events
1896	+	handle_events();
1897	+
1898	+	// Handle palette changes
1899	+	handle_palette_changes(depth, DISPLAY_DGA);
1900	+	}
1901	+
1902	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1903	+	static void video_refresh_dga_vosf(void)
1904	+	{
1905	+	// Quit DGA mode if requested
1906	+	possibly_quit_dga_mode();
1907	+
1908	+	// Handle X events
1909	+	handle_events();
1910	+
1911	+	// Handle palette changes
1912	+	handle_palette_changes(depth, DISPLAY_DGA);
1913	+
1914	+	// Update display (VOSF variant)
1915	+	static int tick_counter = 0;
1916	+	if (++tick_counter >= frame_skip) {
1917	+	tick_counter = 0;
1918	+	#ifdef HAVE_PTHREADS
1919	+	pthread_mutex_lock(&Screen_draw_lock);
1920	+	#endif
1921	+	update_display_dga_vosf();
1922	+	#ifdef HAVE_PTHREADS
1923	+	pthread_mutex_unlock(&Screen_draw_lock);
1924	+	#endif
1925	+	}
1926	+	}
1927	+	#endif
1928	+
1929	+	#ifdef ENABLE_VOSF
1930	+	static void video_refresh_window_vosf(void)
1931	+	{
1932	+	// Quit DGA mode if requested
1933	+	possibly_quit_dga_mode();
1934	+
1935	+	// Handle X events
1936	+	handle_events();
1937	+
1938	+	// Handle palette changes
1939	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1940	+
1941	+	// Update display (VOSF variant)
1942	+	static int tick_counter = 0;
1943	+	if (++tick_counter >= frame_skip) {
1944	+	tick_counter = 0;
1945	+	#ifdef HAVE_PTHREADS
1946	+	pthread_mutex_lock(&Screen_draw_lock);
1947	+	#endif
1948	+	update_display_window_vosf();
1949	+	#ifdef HAVE_PTHREADS
1950	+	pthread_mutex_unlock(&Screen_draw_lock);
1951	+	#endif
1952	+	}
1953	+	}
1954	+	#endif
1955	+
1956	+	static void video_refresh_window_static(void)
1957	+	{
1958	+	// Handle X events
1959	+	handle_events();
1960	+
1961	+	// Handle_palette changes
1962	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1963	+
1964	+	// Update display (static variant)
1965	+	static int tick_counter = 0;
1966	+	if (++tick_counter >= frame_skip) {
1967	+	tick_counter = 0;
1968	+	update_display_static();
1969	+	}
1970	+	}
1971	+
1972	+	static void video_refresh_window_dynamic(void)
1973	+	{
1974	+	// Handle X events
1975	+	handle_events();
1976	+
1977	+	// Handle_palette changes
1978	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1979	+
1980	+	// Update display (dynamic variant)
1981	+	static int tick_counter = 0;
1982	+	tick_counter++;
1983	+	update_display_dynamic(tick_counter);
1984	+	}
1985	+
1986	+
1987	+	/*
1988		*  Thread for screen refresh, input handling etc.
1989		*/
1990
1991	+	void VideoRefreshInit(void)
1992	+	{
1993	+	// TODO: set up specialised 8bpp VideoRefresh handlers ?
1994	+	if (display_type == DISPLAY_DGA) {
1995	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1996	+	if (use_vosf)
1997	+	video_refresh = video_refresh_dga_vosf;
1998	+	else
1999	+	#endif
2000	+	video_refresh = video_refresh_dga;
2001	+	}
2002	+	else {
2003	+	#ifdef ENABLE_VOSF
2004	+	if (use_vosf)
2005	+	video_refresh = video_refresh_window_vosf;
2006	+	else
2007	+	#endif
2008	+	if (frame_skip == 0)
2009	+	video_refresh = video_refresh_window_dynamic;
2010	+	else
2011	+	video_refresh = video_refresh_window_static;
2012	+	}
2013	+	}
2014	+
2015	+	void VideoRefresh(void)
2016	+	{
2017	+	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2018	+	video_refresh();
2019	+	}
2020	+
2021	+	#if 0
2022		void VideoRefresh(void)
2023		{
2024		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
#	Line 1594 | Line 2074 | void VideoRefresh(void)
2074		}
2075		}
2076		}
2077	+	#endif
2078
2079		#ifdef HAVE_PTHREADS
2080		static void *redraw_func(void *arg)
2081		{
2082	<	uint64 start = GetTicks_usec();
2083	<	int64 ticks = 0;
2082	>	uint64 start = GetTicks_usec();
2083	>	int64 ticks = 0;
2084		uint64 next = GetTicks_usec();
2085		while (!redraw_thread_cancel) {
2086	<	VideoRefresh();
2086	>	//              VideoRefresh();
2087	>	video_refresh();
2088		next += 16667;
2089		int64 delay = next - GetTicks_usec();
2090		if (delay > 0)
2091		Delay_usec(delay);
2092		else if (delay < -16667)
2093		next = GetTicks_usec();
2094	<	ticks++;
2094	>	ticks++;
2095		}
2096	<	uint64 end = GetTicks_usec();
2097	<	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2096	>	uint64 end = GetTicks_usec();
2097	>	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2098		return NULL;
2099		}
2100		#endif

Diff Legend

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