--- BasiliskII/src/Unix/video_x.cpp 2000/07/13 13:47:12 1.15 +++ BasiliskII/src/Unix/video_x.cpp 2000/10/11 17:55:06 1.24 @@ -52,6 +52,14 @@ # include #endif +#ifdef ENABLE_VOSF +# include // log() +# include +# include +# include +# include +#endif + #include "cpu_emulation.h" #include "main.h" #include "adb.h" @@ -60,7 +68,7 @@ #include "user_strings.h" #include "video.h" -#define DEBUG 1 +#define DEBUG 0 #include "debug.h" @@ -81,6 +89,7 @@ static int16 mouse_wheel_mode = 1; static int16 mouse_wheel_lines = 3; static int display_type = DISPLAY_WINDOW; // See enum above +static bool local_X11; // Flag: X server running on local machine? static uint8 *the_buffer; // Mac frame buffer #ifdef HAVE_PTHREADS @@ -127,12 +136,8 @@ static pthread_mutex_t palette_lock = PT static GC the_gc; static XImage *img = NULL; static XShmSegmentInfo shminfo; -static XImage *cursor_image, *cursor_mask_image; -static Pixmap cursor_map, cursor_mask_map; static Cursor mac_cursor; -static GC cursor_gc, cursor_mask_gc; static uint8 *the_buffer_copy = NULL; // Copy of Mac frame buffer -static uint8 the_cursor[64]; // Cursor image data static bool have_shm = false; // Flag: SHM extensions available static bool updt_box[17][17]; // Flag for Update static int nr_boxes; @@ -157,6 +162,68 @@ static XF86VidModeModeInfo **x_video_mod static int num_x_video_modes; #endif +#ifdef ENABLE_VOSF +static bool use_vosf = true; // Flag: VOSF enabled +#else +static const bool use_vosf = false; // Flag: VOSF enabled +#endif + +#ifdef ENABLE_VOSF +static uint8 * the_host_buffer; // Host frame buffer in VOSF mode +static uint32 the_buffer_size; // Size of allocated the_buffer +#endif + +#ifdef ENABLE_VOSF +// Variables for Video on SEGV support (taken from the Win32 port) +struct ScreenPageInfo { + int top, bottom; // Mapping between this virtual page and Mac scanlines +}; + +struct ScreenInfo { + uint32 memBase; // Real start address + uint32 memStart; // Start address aligned to page boundary + uint32 memEnd; // Address of one-past-the-end of the screen + uint32 memLength; // Length of the memory addressed by the screen pages + + uint32 pageSize; // Size of a page + int pageBits; // Shift count to get the page number + uint32 pageCount; // Number of pages allocated to the screen + + uint8 * dirtyPages; // Table of flags set if page was altered + ScreenPageInfo * pageInfo; // Table of mappings page -> Mac scanlines +}; + +static ScreenInfo mainBuffer; + +#define PFLAG_SET(page) mainBuffer.dirtyPages[page] = 1 +#define PFLAG_CLEAR(page) mainBuffer.dirtyPages[page] = 0 +#define PFLAG_ISSET(page) mainBuffer.dirtyPages[page] +#define PFLAG_ISCLEAR(page) (mainBuffer.dirtyPages[page] == 0) +#ifdef UNALIGNED_PROFITABLE +# define PFLAG_ISCLEAR_4(page) (*((uint32 *)(mainBuffer.dirtyPages + page)) == 0) +#else +# define PFLAG_ISCLEAR_4(page) \ + (mainBuffer.dirtyPages[page ] == 0) \ + && (mainBuffer.dirtyPages[page+1] == 0) \ + && (mainBuffer.dirtyPages[page+2] == 0) \ + && (mainBuffer.dirtyPages[page+3] == 0) +#endif +#define PFLAG_CLEAR_ALL memset(mainBuffer.dirtyPages, 0, mainBuffer.pageCount) +#define PFLAG_SET_ALL memset(mainBuffer.dirtyPages, 1, mainBuffer.pageCount) + +static int zero_fd = -1; +static bool Screen_fault_handler_init(); +static struct sigaction vosf_sa; + +#ifdef HAVE_PTHREADS +static pthread_mutex_t Screen_draw_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer (dirtyPages in fact) +#endif + +#endif + +// VideoRefresh function +void VideoRefreshInit(void); +static void (*video_refresh)(void); // Prototypes static void *redraw_func(void *arg); @@ -164,11 +231,16 @@ static int event2keycode(XKeyEvent *ev); // From main_unix.cpp +extern char *x_display_name; extern Display *x_display; // From sys_unix.cpp extern void SysMountFirstFloppy(void); +#ifdef ENABLE_VOSF +# include "video_vosf.h" +#endif + /* * Initialization @@ -177,7 +249,7 @@ extern void SysMountFirstFloppy(void); // Set VideoMonitor according to video mode void set_video_monitor(int width, int height, int bytes_per_row, bool native_byte_order) { -#if !REAL_ADDRESSING +#if !REAL_ADDRESSING && !DIRECT_ADDRESSING int layout = FLAYOUT_DIRECT; switch (depth) { case 1: @@ -249,8 +321,6 @@ static bool init_window(int width, int h // Read frame skip prefs frame_skip = PrefsFindInt32("frameskip"); - if (frame_skip == 0) - frame_skip = 1; // Create window XSetWindowAttributes wattr; @@ -290,7 +360,7 @@ static bool init_window(int width, int h // Try to create and attach SHM image have_shm = false; - if (depth != 1 && XShmQueryExtension(x_display)) { + if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) { // Create SHM image ("height + 2" for safety) img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height); @@ -341,29 +411,46 @@ static bool init_window(int width, int h img->bitmap_bit_order = MSBFirst; } - // Allocate memory for frame buffer copy +#ifdef ENABLE_VOSF + // Allocate a page-aligned chunk of memory for frame buffer + the_buffer_size = align_on_page_boundary((aligned_height + 2) * img->bytes_per_line); + the_host_buffer = the_buffer_copy; + + the_buffer_copy = (uint8 *)allocate_framebuffer(the_buffer_size); + memset(the_buffer_copy, 0, the_buffer_size); + + the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size); + memset(the_buffer, 0, the_buffer_size); +#else + // Allocate memory for frame buffer the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line); +#endif // Create GC the_gc = XCreateGC(x_display, the_win, 0, 0); XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes); // Create no_cursor - mac_cursor = XCreatePixmapCursor (x_display, - XCreatePixmap (x_display, the_win, 1, 1, 1), - XCreatePixmap (x_display, the_win, 1, 1, 1), - &black, &white, 0, 0); - XDefineCursor (x_display, the_win, mac_cursor); + mac_cursor = XCreatePixmapCursor(x_display, + XCreatePixmap(x_display, the_win, 1, 1, 1), + XCreatePixmap(x_display, the_win, 1, 1, 1), + &black, &white, 0, 0); + XDefineCursor(x_display, the_win, mac_cursor); // Set VideoMonitor + bool native_byte_order; #ifdef WORDS_BIGENDIAN - set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == MSBFirst); + native_byte_order = (img->bitmap_bit_order == MSBFirst); #else - set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst); + native_byte_order = (img->bitmap_bit_order == LSBFirst); #endif +#ifdef ENABLE_VOSF + do_update_framebuffer = GET_FBCOPY_FUNC(depth, native_byte_order, DISPLAY_WINDOW); +#endif + set_video_monitor(width, height, img->bytes_per_line, native_byte_order); -#if REAL_ADDRESSING - VideoMonitor.mac_frame_base = (uint32)the_buffer; +#if REAL_ADDRESSING || DIRECT_ADDRESSING + VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); #else VideoMonitor.mac_frame_base = MacFrameBaseMac; #endif @@ -496,9 +583,31 @@ static bool init_fbdev_dga(char *in_fb_n } } +#if ENABLE_VOSF +#if REAL_ADDRESSING || DIRECT_ADDRESSING + // If the blit function is null, i.e. just a copy of the buffer, + // we first try to avoid the allocation of a temporary frame buffer + use_vosf = true; + do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA); + if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw)) + use_vosf = false; + + if (use_vosf) { + the_host_buffer = the_buffer; + the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row); + the_buffer_copy = (uint8 *)malloc(the_buffer_size); + memset(the_buffer_copy, 0, the_buffer_size); + the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size); + memset(the_buffer, 0, the_buffer_size); + } +#else + use_vosf = false; +#endif +#endif + set_video_monitor(width, height, bytes_per_row, true); -#if REAL_ADDRESSING - VideoMonitor.mac_frame_base = (uint32)the_buffer; +#if REAL_ADDRESSING || DIRECT_ADDRESSING + VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); #else VideoMonitor.mac_frame_base = MacFrameBaseMac; #endif @@ -579,10 +688,32 @@ static bool init_xf86_dga(int width, int bytes_per_row *= 4; break; } + +#if REAL_ADDRESSING || DIRECT_ADDRESSING + // If the blit function is null, i.e. just a copy of the buffer, + // we first try to avoid the allocation of a temporary frame buffer + use_vosf = true; + do_update_framebuffer = GET_FBCOPY_FUNC(depth, true, DISPLAY_DGA); + if (do_update_framebuffer == FBCOPY_FUNC(fbcopy_raw)) + use_vosf = false; + + if (use_vosf) { + the_host_buffer = the_buffer; + the_buffer_size = align_on_page_boundary((height + 2) * bytes_per_row); + the_buffer_copy = (uint8 *)malloc(the_buffer_size); + memset(the_buffer_copy, 0, the_buffer_size); + the_buffer = (uint8 *)allocate_framebuffer(the_buffer_size); + memset(the_buffer, 0, the_buffer_size); + } +#elif defined(ENABLE_VOSF) + // The UAE memory handlers will already handle color conversion, if needed. + use_vosf = false; +#endif + set_video_monitor(width, height, bytes_per_row, true); -#if REAL_ADDRESSING - VideoMonitor.mac_frame_base = (uint32)the_buffer; - MacFrameLayout = FLAYOUT_DIRECT; +#if REAL_ADDRESSING || DIRECT_ADDRESSING + VideoMonitor.mac_frame_base = Host2MacAddr(the_buffer); +// MacFrameLayout = FLAYOUT_DIRECT; #else VideoMonitor.mac_frame_base = MacFrameBaseMac; #endif @@ -658,8 +789,85 @@ static void keycode_init(void) } } +bool VideoInitBuffer() +{ +#ifdef ENABLE_VOSF + if (use_vosf) { + const uint32 page_size = getpagesize(); + const uint32 page_mask = page_size - 1; + + mainBuffer.memBase = (uint32) the_buffer; + // Align the frame buffer on page boundary + mainBuffer.memStart = (uint32)((((unsigned long) the_buffer) + page_mask) & ~page_mask); + mainBuffer.memLength = the_buffer_size; + mainBuffer.memEnd = mainBuffer.memStart + mainBuffer.memLength; + + mainBuffer.pageSize = page_size; + mainBuffer.pageCount = (mainBuffer.memLength + page_mask)/mainBuffer.pageSize; + mainBuffer.pageBits = int( log(mainBuffer.pageSize) / log(2.0) ); + + if (mainBuffer.dirtyPages != 0) + free(mainBuffer.dirtyPages); + + mainBuffer.dirtyPages = (uint8 *) malloc(mainBuffer.pageCount); + + if (mainBuffer.pageInfo != 0) + free(mainBuffer.pageInfo); + + mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo)); + + if ((mainBuffer.dirtyPages == 0) || (mainBuffer.pageInfo == 0)) + return false; + + PFLAG_CLEAR_ALL; + + uint32 a = 0; + for (int i = 0; i < mainBuffer.pageCount; i++) { + int y1 = a / VideoMonitor.bytes_per_row; + if (y1 >= VideoMonitor.y) + y1 = VideoMonitor.y - 1; + + int y2 = (a + mainBuffer.pageSize) / VideoMonitor.bytes_per_row; + if (y2 >= VideoMonitor.y) + y2 = VideoMonitor.y - 1; + + mainBuffer.pageInfo[i].top = y1; + mainBuffer.pageInfo[i].bottom = y2; + + a += mainBuffer.pageSize; + if (a > mainBuffer.memLength) + a = mainBuffer.memLength; + } + + // We can now write-protect the frame buffer + if (mprotect((caddr_t)mainBuffer.memStart, mainBuffer.memLength, PROT_READ) != 0) + return false; + } +#endif + return true; +} + bool VideoInit(bool classic) { +#ifdef ENABLE_VOSF + // Open /dev/zero + zero_fd = open("/dev/zero", O_RDWR); + if (zero_fd < 0) { + char str[256]; + sprintf(str, GetString(STR_NO_DEV_ZERO_ERR), strerror(errno)); + ErrorAlert(str); + return false; + } + + // Zero the mainBuffer structure + mainBuffer.dirtyPages = 0; + mainBuffer.pageInfo = 0; +#endif + + // Check if X server runs on local machine + local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0) + || (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0); + // Init keycode translation keycode_init(); @@ -688,7 +896,7 @@ bool VideoInit(bool classic) #ifdef ENABLE_XF86_DGA // DGA available? int dga_event_base, dga_error_base; - if (XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) { + if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) { int dga_flags = 0; XF86DGAQueryDirectVideo(x_display, screen, &dga_flags); has_dga = dga_flags & XF86DGADirectPresent; @@ -807,7 +1015,7 @@ bool VideoInit(bool classic) pthread_mutex_lock(&frame_buffer_lock); #endif -#if !REAL_ADDRESSING +#if !REAL_ADDRESSING && !DIRECT_ADDRESSING // Set variables for UAE memory mapping MacFrameBaseHost = the_buffer; MacFrameSize = VideoMonitor.bytes_per_row * VideoMonitor.y; @@ -817,6 +1025,27 @@ bool VideoInit(bool classic) MacFrameLayout = FLAYOUT_NONE; #endif +#ifdef ENABLE_VOSF + if (use_vosf) { + // Initialize the mainBuffer structure + if (!VideoInitBuffer()) { + // TODO: STR_VOSF_INIT_ERR ? + ErrorAlert("Could not initialize Video on SEGV signals"); + return false; + } + + // Initialize the handler for SIGSEGV + if (!Screen_fault_handler_init()) { + // TODO: STR_VOSF_INIT_ERR ? + ErrorAlert("Could not initialize Video on SEGV signals"); + return false; + } + } +#endif + + // Initialize VideoRefresh function + VideoRefreshInit(); + XSync(x_display, false); #ifdef HAVE_PTHREADS @@ -885,17 +1114,51 @@ void VideoExit(void) XFreeColormap(x_display, cmap[0]); XFreeColormap(x_display, cmap[1]); } + + if (!use_vosf) { + if (the_buffer) { + free(the_buffer); + the_buffer = NULL; + } - if (the_buffer) { - free(the_buffer); - the_buffer = NULL; + if (!have_shm && the_buffer_copy) { + free(the_buffer_copy); + the_buffer_copy = NULL; + } + } +#ifdef ENABLE_VOSF + else { + if (the_buffer != (uint8 *)MAP_FAILED) { + munmap((caddr_t)the_buffer, the_buffer_size); + the_buffer = 0; + } + + if (the_buffer_copy != (uint8 *)MAP_FAILED) { + munmap((caddr_t)the_buffer_copy, the_buffer_size); + the_buffer_copy = 0; + } + } +#endif + } + +#ifdef ENABLE_VOSF + if (use_vosf) { + // Clear mainBuffer data + if (mainBuffer.pageInfo) { + free(mainBuffer.pageInfo); + mainBuffer.pageInfo = 0; } - if (!have_shm && the_buffer_copy) { - free(the_buffer_copy); - the_buffer_copy = NULL; + if (mainBuffer.dirtyPages) { + free(mainBuffer.dirtyPages); + mainBuffer.dirtyPages = 0; } } + + // Close /dev/zero + if (zero_fd > 0) + close(zero_fd); +#endif } @@ -1027,9 +1290,29 @@ static void resume_emul(void) XF86DGASetViewPort(x_display, screen, 0, 0); #endif XSync(x_display, false); - + + // the_buffer already contains the data to restore. i.e. since a temporary + // frame buffer is used when VOSF is actually used, fb_save is therefore + // not necessary. +#ifdef ENABLE_VOSF + if (use_vosf) { +#ifdef HAVE_PTHREADS + pthread_mutex_lock(&Screen_draw_lock); +#endif + PFLAG_SET_ALL; +#ifdef HAVE_PTHREADS + pthread_mutex_unlock(&Screen_draw_lock); +#endif + memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y); + } +#endif + // Restore frame buffer if (fb_save) { +#ifdef ENABLE_VOSF + // Don't copy fb_save to the temporary frame buffer in VOSF mode + if (!use_vosf) +#endif memcpy(the_buffer, fb_save, VideoMonitor.y * VideoMonitor.bytes_per_row); free(fb_save); fb_save = NULL; @@ -1311,11 +1594,27 @@ static void handle_events(void) // Hidden parts exposed, force complete refresh of window case Expose: if (display_type == DISPLAY_WINDOW) { - int x1, y1; - for (y1=0; y1<16; y1++) - for (x1=0; x1<16; x1++) - updt_box[x1][y1] = true; - nr_boxes = 16 * 16; +#ifdef ENABLE_VOSF + if (use_vosf) { // VOSF refresh +#ifdef HAVE_PTHREADS + pthread_mutex_lock(&Screen_draw_lock); +#endif + PFLAG_SET_ALL; +#ifdef HAVE_PTHREADS + pthread_mutex_unlock(&Screen_draw_lock); +#endif + memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y); + } + else +#endif + if (frame_skip == 0) { // Dynamic refresh + int x1, y1; + for (y1=0; y1<16; y1++) + for (x1=0; x1<16; x1++) + updt_box[x1][y1] = true; + nr_boxes = 16 * 16; + } else // Static refresh + memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y); } break; } @@ -1327,9 +1626,10 @@ static void handle_events(void) * Window display update */ -static void update_display(int ticker) +// Dynamic display update (variable frame rate for each box) +static void update_display_dynamic(int ticker) { - int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xic, xicl, xi; + int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xi; int xil = 0; int rxm = 0, rxmo = 0; int bytes_per_row = VideoMonitor.bytes_per_row; @@ -1416,11 +1716,317 @@ static void update_display(int ticker) } } +// Static display update (fixed frame rate, but incremental) +static void update_display_static(void) +{ + // Incremental update code + int wide = 0, high = 0, x1, x2, y1, y2, i, j; + int bytes_per_row = VideoMonitor.bytes_per_row; + int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x; + uint8 *p, *p2; + + // Check for first line from top and first line from bottom that have changed + y1 = 0; + for (j=0; j=y1; j--) { + if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) { + y2 = j; + break; + } + } + high = y2 - y1 + 1; + + // Check for first column from left and first column from right that have changed + if (high) { + if (depth == 1) { + x1 = VideoMonitor.x - 1; + for (j=y1; j<=y2; j++) { + p = &the_buffer[j * bytes_per_row]; + p2 = &the_buffer_copy[j * bytes_per_row]; + for (i=0; i<(x1>>3); i++) { + if (*p != *p2) { + x1 = i << 3; + break; + } + p++; p2++; + } + } + x2 = x1; + for (j=y1; j<=y2; j++) { + p = &the_buffer[j * bytes_per_row]; + p2 = &the_buffer_copy[j * bytes_per_row]; + p += bytes_per_row; + p2 += bytes_per_row; + for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) { + p--; p2--; + if (*p != *p2) { + x2 = i << 3; + break; + } + } + } + wide = x2 - x1; + + // Update copy of the_buffer + if (high && wide) { + for (j=y1; j<=y2; j++) { + i = j * bytes_per_row + (x1 >> 3); + memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3); + } + } + + } else { + x1 = VideoMonitor.x; + for (j=y1; j<=y2; j++) { + p = &the_buffer[j * bytes_per_row]; + p2 = &the_buffer_copy[j * bytes_per_row]; + for (i=0; ix2*bytes_per_pixel; i--) { + p--; + p2--; + if (*p != *p2) { + x2 = i / bytes_per_pixel; + break; + } + } + } + wide = x2 - x1; + + // Update copy of the_buffer + if (high && wide) { + for (j=y1; j<=y2; j++) { + i = j * bytes_per_row + x1 * bytes_per_pixel; + memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide); + } + } + } + } + + // Refresh display + if (high && wide) { + if (have_shm) + XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0); + else + XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high); + } +} + + +/* + * Screen refresh functions + */ + +// The specialisations hereunder are meant to enable VOSF with DGA in direct +// addressing mode in case the address spaces (RAM, ROM, FrameBuffer) could +// not get mapped correctly with respect to the predetermined host frame +// buffer base address. +// +// Hmm, in other words, when in direct addressing mode and DGA is requested, +// we first try to "triple allocate" the address spaces according to the real +// host frame buffer address. Then, if it fails, we will use a temporary +// frame buffer thus making the real host frame buffer updated when pages +// of the temp frame buffer are altered. +// +// As a side effect, a little speed gain in screen updates could be noticed +// for other modes than DGA. +// +// The following two functions below are inline so that a clever compiler +// could specialise the code according to the current screen depth and +// display type. A more clever compiler would the job by itself though... +// (update_display_vosf is inlined as well) + +static inline void possibly_quit_dga_mode() +{ +#if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) + // Quit DGA mode if requested + if (quit_full_screen) { + quit_full_screen = false; +#ifdef ENABLE_XF86_DGA + XF86DGADirectVideo(x_display, screen, 0); +#endif + XUngrabPointer(x_display, CurrentTime); + XUngrabKeyboard(x_display, CurrentTime); + XUnmapWindow(x_display, the_win); + XSync(x_display, false); + } +#endif +} + +static inline void handle_palette_changes(int depth, int display_type) +{ +#ifdef HAVE_PTHREADS + pthread_mutex_lock(&palette_lock); +#endif + if (palette_changed) { + palette_changed = false; + if (depth == 8) { + XStoreColors(x_display, cmap[0], palette, 256); + XStoreColors(x_display, cmap[1], palette, 256); + +#ifdef ENABLE_XF86_DGA + if (display_type == DISPLAY_DGA) { + current_dga_cmap ^= 1; + XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); + } +#endif + } + } +#ifdef HAVE_PTHREADS + pthread_mutex_unlock(&palette_lock); +#endif +} + +static void video_refresh_dga(void) +{ + // Quit DGA mode if requested + possibly_quit_dga_mode(); + + // Handle X events + handle_events(); + + // Handle palette changes + handle_palette_changes(depth, DISPLAY_DGA); +} + +#ifdef ENABLE_VOSF +#if REAL_ADDRESSING || DIRECT_ADDRESSING +static void video_refresh_dga_vosf(void) +{ + // Quit DGA mode if requested + possibly_quit_dga_mode(); + + // Handle X events + handle_events(); + + // Handle palette changes + handle_palette_changes(depth, DISPLAY_DGA); + + // Update display (VOSF variant) + static int tick_counter = 0; + if (++tick_counter >= frame_skip) { + tick_counter = 0; +#ifdef HAVE_PTHREADS + pthread_mutex_lock(&Screen_draw_lock); +#endif + update_display_dga_vosf(); +#ifdef HAVE_PTHREADS + pthread_mutex_unlock(&Screen_draw_lock); +#endif + } +} +#endif + +static void video_refresh_window_vosf(void) +{ + // Quit DGA mode if requested + possibly_quit_dga_mode(); + + // Handle X events + handle_events(); + + // Handle palette changes + handle_palette_changes(depth, DISPLAY_WINDOW); + + // Update display (VOSF variant) + static int tick_counter = 0; + if (++tick_counter >= frame_skip) { + tick_counter = 0; +#ifdef HAVE_PTHREADS + pthread_mutex_lock(&Screen_draw_lock); +#endif + update_display_window_vosf(); +#ifdef HAVE_PTHREADS + pthread_mutex_unlock(&Screen_draw_lock); +#endif + } +} +#endif // def ENABLE_VOSF + +static void video_refresh_window_static(void) +{ + // Handle X events + handle_events(); + + // Handle_palette changes + handle_palette_changes(depth, DISPLAY_WINDOW); + + // Update display (static variant) + static int tick_counter = 0; + if (++tick_counter >= frame_skip) { + tick_counter = 0; + update_display_static(); + } +} + +static void video_refresh_window_dynamic(void) +{ + // Handle X events + handle_events(); + + // Handle_palette changes + handle_palette_changes(depth, DISPLAY_WINDOW); + + // Update display (dynamic variant) + static int tick_counter = 0; + tick_counter++; + update_display_dynamic(tick_counter); +} + /* * Thread for screen refresh, input handling etc. */ +void VideoRefreshInit(void) +{ + // TODO: set up specialised 8bpp VideoRefresh handlers ? + if (display_type == DISPLAY_DGA) { +#if ENABLE_VOSF && (REAL_ADDRESSING || DIRECT_ADDRESSING) + if (use_vosf) + video_refresh = video_refresh_dga_vosf; + else +#endif + video_refresh = video_refresh_dga; + } + else { +#ifdef ENABLE_VOSF + if (use_vosf) + video_refresh = video_refresh_window_vosf; + else +#endif + if (frame_skip == 0) + video_refresh = video_refresh_window_dynamic; + else + video_refresh = video_refresh_window_static; + } +} + +void VideoRefresh(void) +{ + // TODO: make main_unix/VideoRefresh call directly video_refresh() ? + video_refresh(); +} + +#if 0 void VideoRefresh(void) { #if defined(ENABLE_XF86_DGA) || defined(ENABLE_FBDEV_DGA) @@ -1468,22 +2074,35 @@ void VideoRefresh(void) static int tick_counter = 0; if (display_type == DISPLAY_WINDOW) { tick_counter++; - update_display(tick_counter); + if (frame_skip == 0) + update_display_dynamic(tick_counter); + else if (tick_counter >= frame_skip) { + tick_counter = 0; + update_display_static(); + } } } +#endif #ifdef HAVE_PTHREADS static void *redraw_func(void *arg) { + uint64 start = GetTicks_usec(); + int64 ticks = 0; + uint64 next = GetTicks_usec(); while (!redraw_thread_cancel) { -#ifdef HAVE_NANOSLEEP - struct timespec req = {0, 16666667}; - nanosleep(&req, NULL); -#else - usleep(16667); -#endif - VideoRefresh(); +// VideoRefresh(); + video_refresh(); + next += 16667; + int64 delay = next - GetTicks_usec(); + if (delay > 0) + Delay_usec(delay); + else if (delay < -16667) + next = GetTicks_usec(); + ticks++; } + uint64 end = GetTicks_usec(); + printf("%Ld ticks in %Ld usec = %Ld ticks/sec\n", ticks, end - start, (end - start) / ticks); return NULL; } #endif