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.15 by cebix, 2000-07-13T13:47:12Z vs.
Revision 1.22 by cebix, 2000-10-08T18:41:35Z

#	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 60 | Line 68
68		#include "user_strings.h"
69		#include "video.h"
70
71	<	#define DEBUG 1
71	>	#define DEBUG 0
72		#include "debug.h"
73
74
#	Line 81 | Line 89 | static int16 mouse_wheel_mode = 1;
89		static int16 mouse_wheel_lines = 3;
90
91		static int display_type = DISPLAY_WINDOW;                       // See enum above
92	+	static bool local_X11;                                                          // Flag: X server running on local machine?
93		static uint8 *the_buffer;                                                       // Mac frame buffer
94
95		#ifdef HAVE_PTHREADS
#	Line 127 | Line 136 | static pthread_mutex_t palette_lock = PT
136		static GC the_gc;
137		static XImage *img = NULL;
138		static XShmSegmentInfo shminfo;
130	–	static XImage *cursor_image, *cursor_mask_image;
131	–	static Pixmap cursor_map, cursor_mask_map;
139		static Cursor mac_cursor;
133	–	static GC cursor_gc, cursor_mask_gc;
140		static uint8 *the_buffer_copy = NULL;                           // Copy of Mac frame buffer
135	–	static uint8 the_cursor[64];                                            // Cursor image data
141		static bool have_shm = false;                                           // Flag: SHM extensions available
142		static bool updt_box[17][17];                                           // Flag for Update
143		static int nr_boxes;
#	Line 157 | 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 164 | Line 231 | static int event2keycode(XKeyEvent *ev);
231
232
233		// From main_unix.cpp
234	+	extern char *x_display_name;
235		extern Display *x_display;
236
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 177 | 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 249 | Line 321 | static bool init_window(int width, int h
321
322		// Read frame skip prefs
323		frame_skip = PrefsFindInt32("frameskip");
252	–	if (frame_skip == 0)
253	–	frame_skip = 1;
324
325		// Create window
326		XSetWindowAttributes wattr;
#	Line 290 | Line 360 | static bool init_window(int width, int h
360
361		// Try to create and attach SHM image
362		have_shm = false;
363	<	if (depth != 1 && XShmQueryExtension(x_display)) {
363	>	if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
364
365		// Create SHM image ("height + 2" for safety)
366		img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
#	Line 341 | Line 411 | static bool init_window(int width, int h
411		img->bitmap_bit_order = MSBFirst;
412		}
413
414	<	// Allocate memory for frame buffer copy
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);
431		XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
432
433		// Create no_cursor
434	<	mac_cursor = XCreatePixmapCursor (x_display,
435	<	XCreatePixmap (x_display, the_win, 1, 1, 1),
436	<	XCreatePixmap (x_display, the_win, 1, 1, 1),
437	<	&black, &white, 0, 0);
438	<	XDefineCursor (x_display, the_win, mac_cursor);
434	>	mac_cursor = XCreatePixmapCursor(x_display,
435	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
436	>	XCreatePixmap(x_display, the_win, 1, 1, 1),
437	>	&black, &white, 0, 0);
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 496 | 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 579 | 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 defined(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 658 | 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);
868	+
869		// Init keycode translation
870		keycode_init();
871
#	Line 688 | Line 894 | bool VideoInit(bool classic)
894		#ifdef ENABLE_XF86_DGA
895		// DGA available?
896		int dga_event_base, dga_error_base;
897	<	if (XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
897	>	if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
898		int dga_flags = 0;
899		XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
900		has_dga = dga_flags & XF86DGADirectPresent;
#	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 1027 | Line 1288 | static void resume_emul(void)
1288		XF86DGASetViewPort(x_display, screen, 0, 0);
1289		#endif
1290		XSync(x_display, false);
1291	<
1291	>
1292	>	// the_buffer already contains the data to restore. i.e. since a temporary
1293	>	// frame buffer is used when VOSF is actually used, fb_save is therefore
1294	>	// not necessary.
1295	>	#ifdef ENABLE_VOSF
1296	>	if (use_vosf) {
1297	>	#ifdef HAVE_PTHREADS
1298	>	pthread_mutex_lock(&Screen_draw_lock);
1299	>	#endif
1300	>	PFLAG_SET_ALL;
1301	>	#ifdef HAVE_PTHREADS
1302	>	pthread_mutex_unlock(&Screen_draw_lock);
1303	>	#endif
1304	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1305	>	}
1306	>	#endif
1307	>
1308		// Restore frame buffer
1309		if (fb_save) {
1310	+	#ifdef ENABLE_VOSF
1311	+	// Don't copy fb_save to the temporary frame buffer in VOSF mode
1312	+	if (!use_vosf)
1313	+	#endif
1314		memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row);
1315		free(fb_save);
1316		fb_save = NULL;
#	Line 1311 | Line 1592 | static void handle_events(void)
1592		// Hidden parts exposed, force complete refresh of window
1593		case Expose:
1594		if (display_type == DISPLAY_WINDOW) {
1595	<	int x1, y1;
1596	<	for (y1=0; y1<16; y1++)
1597	<	for (x1=0; x1<16; x1++)
1598	<	updt_box[x1][y1] = true;
1599	<	nr_boxes = 16 * 16;
1595	>	#ifdef ENABLE_VOSF
1596	>	if (use_vosf) {                 // VOSF refresh
1597	>	#ifdef HAVE_PTHREADS
1598	>	pthread_mutex_lock(&Screen_draw_lock);
1599	>	#endif
1600	>	PFLAG_SET_ALL;
1601	>	#ifdef HAVE_PTHREADS
1602	>	pthread_mutex_unlock(&Screen_draw_lock);
1603	>	#endif
1604	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1605	>	}
1606	>	else
1607	>	#endif
1608	>	if (frame_skip == 0) {  // Dynamic refresh
1609	>	int x1, y1;
1610	>	for (y1=0; y1<16; y1++)
1611	>	for (x1=0; x1<16; x1++)
1612	>	updt_box[x1][y1] = true;
1613	>	nr_boxes = 16 * 16;
1614	>	} else                                  // Static refresh
1615	>	memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
1616		}
1617		break;
1618		}
#	Line 1327 | Line 1624 | static void handle_events(void)
1624		*  Window display update
1625		*/
1626
1627	<	static void update_display(int ticker)
1627	>	// Dynamic display update (variable frame rate for each box)
1628	>	static void update_display_dynamic(int ticker)
1629		{
1630	<	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xic, xicl, xi;
1630	>	int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi;
1631		int xil = 0;
1632		int rxm = 0, rxmo = 0;
1633		int bytes_per_row = VideoMonitor.bytes_per_row;
#	Line 1416 | Line 1714 | static void update_display(int ticker)
1714		}
1715		}
1716
1717	+	// Static display update (fixed frame rate, but incremental)
1718	+	static void update_display_static(void)
1719	+	{
1720	+	// Incremental update code
1721	+	int wide = 0, high = 0, x1, x2, y1, y2, i, j;
1722	+	int bytes_per_row = VideoMonitor.bytes_per_row;
1723	+	int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
1724	+	uint8 *p, *p2;
1725	+
1726	+	// Check for first line from top and first line from bottom that have changed
1727	+	y1 = 0;
1728	+	for (j=0; j<VideoMonitor.y; j++) {
1729	+	if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1730	+	y1 = j;
1731	+	break;
1732	+	}
1733	+	}
1734	+	y2 = y1 - 1;
1735	+	for (j=VideoMonitor.y-1; j>=y1; j--) {
1736	+	if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
1737	+	y2 = j;
1738	+	break;
1739	+	}
1740	+	}
1741	+	high = y2 - y1 + 1;
1742	+
1743	+	// Check for first column from left and first column from right that have changed
1744	+	if (high) {
1745	+	if (depth == 1) {
1746	+	x1 = VideoMonitor.x;
1747	+	for (j=y1; j<=y2; j++) {
1748	+	p = &the_buffer[j * bytes_per_row];
1749	+	p2 = &the_buffer_copy[j * bytes_per_row];
1750	+	for (i=0; i<(x1>>3); i++) {
1751	+	if (*p != *p2) {
1752	+	x1 = i << 3;
1753	+	break;
1754	+	}
1755	+	p++; p2++;
1756	+	}
1757	+	}
1758	+	x2 = x1;
1759	+	for (j=y1; j<=y2; j++) {
1760	+	p = &the_buffer[j * bytes_per_row];
1761	+	p2 = &the_buffer_copy[j * bytes_per_row];
1762	+	p += bytes_per_row;
1763	+	p2 += bytes_per_row;
1764	+	for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
1765	+	p--; p2--;
1766	+	if (*p != *p2) {
1767	+	x2 = i << 3;
1768	+	break;
1769	+	}
1770	+	}
1771	+	}
1772	+	wide = x2 - x1;
1773	+
1774	+	// Update copy of the_buffer
1775	+	if (high && wide) {
1776	+	for (j=y1; j<=y2; j++) {
1777	+	i = j * bytes_per_row + (x1 >> 3);
1778	+	memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3);
1779	+	}
1780	+	}
1781	+
1782	+	} else {
1783	+	x1 = VideoMonitor.x;
1784	+	for (j=y1; j<=y2; j++) {
1785	+	p = &the_buffer[j * bytes_per_row];
1786	+	p2 = &the_buffer_copy[j * bytes_per_row];
1787	+	for (i=0; i<x1*bytes_per_pixel; i++) {
1788	+	if (*p != *p2) {
1789	+	x1 = i / bytes_per_pixel;
1790	+	break;
1791	+	}
1792	+	p++; p2++;
1793	+	}
1794	+	}
1795	+	x2 = x1;
1796	+	for (j=y1; j<=y2; j++) {
1797	+	p = &the_buffer[j * bytes_per_row];
1798	+	p2 = &the_buffer_copy[j * bytes_per_row];
1799	+	p += bytes_per_row;
1800	+	p2 += bytes_per_row;
1801	+	for (i=VideoMonitor.x*bytes_per_pixel; i>x2*bytes_per_pixel; i--) {
1802	+	p--;
1803	+	p2--;
1804	+	if (*p != *p2) {
1805	+	x2 = i / bytes_per_pixel;
1806	+	break;
1807	+	}
1808	+	}
1809	+	}
1810	+	wide = x2 - x1;
1811	+
1812	+	// Update copy of the_buffer
1813	+	if (high && wide) {
1814	+	for (j=y1; j<=y2; j++) {
1815	+	i = j * bytes_per_row + x1 * bytes_per_pixel;
1816	+	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
1817	+	}
1818	+	}
1819	+	}
1820	+	}
1821	+
1822	+	// Refresh display
1823	+	if (high && wide) {
1824	+	if (have_shm)
1825	+	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
1826	+	else
1827	+	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
1828	+	}
1829	+	}
1830	+
1831	+
1832	+	/*
1833	+	*      Screen refresh functions
1834	+	*/
1835	+
1836	+	// The specialisations hereunder are meant to enable VOSF with DGA in direct
1837	+	// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could
1838	+	// not get mapped correctly with respect to the predetermined host frame
1839	+	// buffer base address.
1840	+	//
1841	+	// Hmm, in other words, when in direct addressing mode and DGA is requested,
1842	+	// we first try to "triple allocate" the address spaces according to the real
1843	+	// host frame buffer address. Then, if it fails, we will use a temporary
1844	+	// frame buffer thus making the real host frame buffer updated when pages
1845	+	// of the temp frame buffer are altered.
1846	+	//
1847	+	// As a side effect, a little speed gain in screen updates could be noticed
1848	+	// for other modes than DGA.
1849	+	//
1850	+	// The following two functions below are inline so that a clever compiler
1851	+	// could specialise the code according to the current screen depth and
1852	+	// display type. A more clever compiler would the job by itself though...
1853	+	// (update_display_vosf is inlined as well)
1854	+
1855	+	static inline void possibly_quit_dga_mode()
1856	+	{
1857	+	#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
1858	+	// Quit DGA mode if requested
1859	+	if (quit_full_screen) {
1860	+	quit_full_screen = false;
1861	+	#ifdef ENABLE_XF86_DGA
1862	+	XF86DGADirectVideo(x_display, screen, 0);
1863	+	#endif
1864	+	XUngrabPointer(x_display, CurrentTime);
1865	+	XUngrabKeyboard(x_display, CurrentTime);
1866	+	XUnmapWindow(x_display, the_win);
1867	+	XSync(x_display, false);
1868	+	}
1869	+	#endif
1870	+	}
1871	+
1872	+	static inline void handle_palette_changes(int depth, int display_type)
1873	+	{
1874	+	#ifdef HAVE_PTHREADS
1875	+	pthread_mutex_lock(&palette_lock);
1876	+	#endif
1877	+	if (palette_changed) {
1878	+	palette_changed = false;
1879	+	if (depth == 8) {
1880	+	XStoreColors(x_display, cmap[0], palette, 256);
1881	+	XStoreColors(x_display, cmap[1], palette, 256);
1882	+
1883	+	#ifdef ENABLE_XF86_DGA
1884	+	if (display_type == DISPLAY_DGA) {
1885	+	current_dga_cmap ^= 1;
1886	+	XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]);
1887	+	}
1888	+	#endif
1889	+	}
1890	+	}
1891	+	#ifdef HAVE_PTHREADS
1892	+	pthread_mutex_unlock(&palette_lock);
1893	+	#endif
1894	+	}
1895	+
1896	+	static void video_refresh_dga(void)
1897	+	{
1898	+	// Quit DGA mode if requested
1899	+	possibly_quit_dga_mode();
1900	+
1901	+	// Handle X events
1902	+	handle_events();
1903	+
1904	+	// Handle palette changes
1905	+	handle_palette_changes(depth, DISPLAY_DGA);
1906	+	}
1907	+
1908	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
1909	+	static void video_refresh_dga_vosf(void)
1910	+	{
1911	+	// Quit DGA mode if requested
1912	+	possibly_quit_dga_mode();
1913	+
1914	+	// Handle X events
1915	+	handle_events();
1916	+
1917	+	// Handle palette changes
1918	+	handle_palette_changes(depth, DISPLAY_DGA);
1919	+
1920	+	// Update display (VOSF variant)
1921	+	static int tick_counter = 0;
1922	+	if (++tick_counter >= frame_skip) {
1923	+	tick_counter = 0;
1924	+	#ifdef HAVE_PTHREADS
1925	+	pthread_mutex_lock(&Screen_draw_lock);
1926	+	#endif
1927	+	update_display_dga_vosf();
1928	+	#ifdef HAVE_PTHREADS
1929	+	pthread_mutex_unlock(&Screen_draw_lock);
1930	+	#endif
1931	+	}
1932	+	}
1933	+	#endif
1934	+
1935	+	#ifdef ENABLE_VOSF
1936	+	static void video_refresh_window_vosf(void)
1937	+	{
1938	+	// Quit DGA mode if requested
1939	+	possibly_quit_dga_mode();
1940	+
1941	+	// Handle X events
1942	+	handle_events();
1943	+
1944	+	// Handle palette changes
1945	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1946	+
1947	+	// Update display (VOSF variant)
1948	+	static int tick_counter = 0;
1949	+	if (++tick_counter >= frame_skip) {
1950	+	tick_counter = 0;
1951	+	#ifdef HAVE_PTHREADS
1952	+	pthread_mutex_lock(&Screen_draw_lock);
1953	+	#endif
1954	+	update_display_window_vosf();
1955	+	#ifdef HAVE_PTHREADS
1956	+	pthread_mutex_unlock(&Screen_draw_lock);
1957	+	#endif
1958	+	}
1959	+	}
1960	+	#endif
1961	+
1962	+	static void video_refresh_window_static(void)
1963	+	{
1964	+	// Handle X events
1965	+	handle_events();
1966	+
1967	+	// Handle_palette changes
1968	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1969	+
1970	+	// Update display (static variant)
1971	+	static int tick_counter = 0;
1972	+	if (++tick_counter >= frame_skip) {
1973	+	tick_counter = 0;
1974	+	update_display_static();
1975	+	}
1976	+	}
1977	+
1978	+	static void video_refresh_window_dynamic(void)
1979	+	{
1980	+	// Handle X events
1981	+	handle_events();
1982	+
1983	+	// Handle_palette changes
1984	+	handle_palette_changes(depth, DISPLAY_WINDOW);
1985	+
1986	+	// Update display (dynamic variant)
1987	+	static int tick_counter = 0;
1988	+	tick_counter++;
1989	+	update_display_dynamic(tick_counter);
1990	+	}
1991	+
1992
1993		/*
1994		*  Thread for screen refresh, input handling etc.
1995		*/
1996
1997	+	void VideoRefreshInit(void)
1998	+	{
1999	+	// TODO: set up specialised 8bpp VideoRefresh handlers ?
2000	+	if (display_type == DISPLAY_DGA) {
2001	+	#if REAL_ADDRESSING || DIRECT_ADDRESSING
2002	+	if (use_vosf)
2003	+	video_refresh = video_refresh_dga_vosf;
2004	+	else
2005	+	#endif
2006	+	video_refresh = video_refresh_dga;
2007	+	}
2008	+	else {
2009	+	#ifdef ENABLE_VOSF
2010	+	if (use_vosf)
2011	+	video_refresh = video_refresh_window_vosf;
2012	+	else
2013	+	#endif
2014	+	if (frame_skip == 0)
2015	+	video_refresh = video_refresh_window_dynamic;
2016	+	else
2017	+	video_refresh = video_refresh_window_static;
2018	+	}
2019	+	}
2020	+
2021	+	void VideoRefresh(void)
2022	+	{
2023	+	// TODO: make main_unix/VideoRefresh call directly video_refresh() ?
2024	+	video_refresh();
2025	+	}
2026	+
2027	+	#if 0
2028		void VideoRefresh(void)
2029		{
2030		#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA)
#	Line 1468 | Line 2072 | void VideoRefresh(void)
2072		static int tick_counter = 0;
2073		if (display_type == DISPLAY_WINDOW) {
2074		tick_counter++;
2075	<	update_display(tick_counter);
2075	>	if (frame_skip == 0)
2076	>	update_display_dynamic(tick_counter);
2077	>	else if (tick_counter >= frame_skip) {
2078	>	tick_counter = 0;
2079	>	update_display_static();
2080	>	}
2081		}
2082		}
2083	+	#endif
2084
2085		#ifdef HAVE_PTHREADS
2086		static void *redraw_func(void *arg)
2087		{
2088	+	uint64 start = GetTicks_usec();
2089	+	int64 ticks = 0;
2090	+	uint64 next = GetTicks_usec();
2091		while (!redraw_thread_cancel) {
2092	<	#ifdef HAVE_NANOSLEEP
2093	<	struct timespec req = {0, 16666667};
2094	<	nanosleep(&req, NULL);
2095	<	#else
2096	<	usleep(16667);
2097	<	#endif
2098	<	VideoRefresh();
2092	>	//              VideoRefresh();
2093	>	video_refresh();
2094	>	next += 16667;
2095	>	int64 delay = next - GetTicks_usec();
2096	>	if (delay > 0)
2097	>	Delay_usec(delay);
2098	>	else if (delay < -16667)
2099	>	next = GetTicks_usec();
2100	>	ticks++;
2101		}
2102	+	uint64 end = GetTicks_usec();
2103	+	printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks);
2104		return NULL;
2105		}
2106		#endif

Diff Legend

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