--- BasiliskII/src/Unix/video_x.cpp 1999/10/03 16:20:08 1.2 +++ BasiliskII/src/Unix/video_x.cpp 2000/04/10 18:53:10 1.14 @@ -1,7 +1,7 @@ /* * video_x.cpp - Video/graphics emulation, X11 specific stuff * - * Basilisk II (C) 1997-1999 Christian Bauer + * Basilisk II (C) 1997-2000 Christian Bauer * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,10 +48,19 @@ #define DEBUG 1 #include "debug.h" -#if ENABLE_DGA +#if ENABLE_XF86_DGA #include #endif +#if ENABLE_XF86_VIDMODE +#include +#endif + +#if ENABLE_FBDEV_DGA +#include +#endif + + // Display types enum { @@ -59,13 +68,16 @@ enum { DISPLAY_DGA // DGA fullscreen display }; - // Constants -const char KEYCODE_FILE_NAME[] = SHAREDIR "keycodes"; +const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes"; +const char FBDEVICES_FILE_NAME[] = DATADIR "/fbdevices"; // Global variables -static int32 frame_skip; +static int32 frame_skip; // Prefs items +static int16 mouse_wheel_mode = 1; +static int16 mouse_wheel_lines = 3; + static int display_type = DISPLAY_WINDOW; // See enum above static uint8 *the_buffer; // Mac frame buffer static bool redraw_thread_active = false; // Flag: Redraw thread installed @@ -73,8 +85,10 @@ static volatile bool redraw_thread_cance static pthread_t redraw_thread; // Redraw thread static bool has_dga = false; // Flag: Video DGA capable +static bool has_vidmode = false; // Flag: VidMode extension available static bool ctrl_down = false; // Flag: Ctrl key pressed +static bool caps_on = false; // Flag: Caps Lock on static bool quit_full_screen = false; // Flag: DGA close requested from redraw thread static bool emerg_quit = false; // Flag: Ctrl-Esc pressed, emergency quit requested from MacOS thread static bool emul_suspended = false; // Flag: Emulator suspended @@ -113,14 +127,27 @@ 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; +static const int sm_uptd[] = {4,1,6,3,0,5,2,7}; +static int sm_no_boxes[] = {1,8,32,64,128,300}; -// Variables for DGA mode +// Variables for XF86 DGA mode static int current_dga_cmap; // Number (0 or 1) of currently installed DGA colormap static Window suspend_win; // "Suspend" window static void *fb_save = NULL; // Saved frame buffer for suspend - static pthread_mutex_t frame_buffer_lock = PTHREAD_MUTEX_INITIALIZER; // Mutex to protect frame buffer +// Variables for fbdev DGA mode +const char FBDEVICE_FILE_NAME[] = "/dev/fb"; +static int fbdev_fd; + +#if ENABLE_XF86_VIDMODE +// Variables for XF86 VidMode support +static XF86VidModeModeInfo **x_video_modes; // Array of all available modes +static int num_x_video_modes; +#endif + // Prototypes static void *redraw_func(void *arg); @@ -141,7 +168,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) { - int layout; + int layout = FLAYOUT_DIRECT; switch (depth) { case 1: layout = FLAYOUT_DIRECT; @@ -190,6 +217,9 @@ static int error_handler(Display *d, XEr // Init window mode static bool init_window(int width, int height) { + int aligned_width = (width + 15) & ~15; + int aligned_height = (height + 15) & ~15; + // Set absolute mouse mode ADBSetRelMouseMode(false); @@ -203,7 +233,8 @@ static bool init_window(int width, int h wattr.event_mask = eventmask = win_eventmask; wattr.background_pixel = black_pixel; wattr.border_pixel = black_pixel; - wattr.backing_store = Always; + wattr.backing_store = NotUseful; + wattr.save_under = false; wattr.backing_planes = xdepth; XSync(x_display, false); @@ -232,16 +263,16 @@ static bool init_window(int width, int h XSetWMNormalHints(x_display, the_win, hints); XFree((char *)hints); } - + // Try to create and attach SHM image have_shm = false; if (depth != 1 && XShmQueryExtension(x_display)) { // Create SHM image ("height + 2" for safety) img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height); - shminfo.shmid = shmget(IPC_PRIVATE, (height + 2) * img->bytes_per_line, IPC_CREAT | 0777); - the_buffer = (uint8 *)shmat(shminfo.shmid, 0, 0); - shminfo.shmaddr = img->data = (char *)the_buffer; + shminfo.shmid = shmget(IPC_PRIVATE, (aligned_height + 2) * img->bytes_per_line, IPC_CREAT | 0777); + the_buffer_copy = (uint8 *)shmat(shminfo.shmid, 0, 0); + shminfo.shmaddr = img->data = (char *)the_buffer_copy; shminfo.readOnly = False; // Try to attach SHM image, catching errors @@ -259,10 +290,10 @@ static bool init_window(int width, int h shmctl(shminfo.shmid, IPC_RMID, 0); } } - + // Create normal X image if SHM doesn't work ("height + 2" for safety) if (!have_shm) { - int bytes_per_row = width; + int bytes_per_row = aligned_width; switch (depth) { case 1: bytes_per_row /= 8; @@ -276,8 +307,8 @@ static bool init_window(int width, int h bytes_per_row *= 4; break; } - the_buffer = (uint8 *)malloc((height + 2) * bytes_per_row); - img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer, width, height, 32, bytes_per_row); + the_buffer_copy = (uint8 *)malloc((aligned_height + 2) * bytes_per_row); + img = XCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, (char *)the_buffer_copy, aligned_width, aligned_height, 32, bytes_per_row); } // 1-Bit mode is big-endian @@ -287,24 +318,18 @@ static bool init_window(int width, int h } // Allocate memory for frame buffer copy - the_buffer_copy = (uint8 *)malloc((height + 2) * img->bytes_per_line); + the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line); // Create GC the_gc = XCreateGC(x_display, the_win, 0, 0); XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes); - // Create cursor - cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor, 16, 16, 16, 2); - cursor_image->byte_order = MSBFirst; - cursor_image->bitmap_bit_order = MSBFirst; - cursor_mask_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)the_cursor+32, 16, 16, 16, 2); - cursor_mask_image->byte_order = MSBFirst; - cursor_mask_image->bitmap_bit_order = MSBFirst; - cursor_map = XCreatePixmap(x_display, the_win, 16, 16, 1); - cursor_mask_map = XCreatePixmap(x_display, the_win, 16, 16, 1); - cursor_gc = XCreateGC(x_display, cursor_map, 0, 0); - cursor_mask_gc = XCreateGC(x_display, cursor_mask_map, 0, 0); - mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, 0, 0); + // 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); // Set VideoMonitor #ifdef WORDS_BIGENDIAN @@ -312,6 +337,7 @@ static bool init_window(int width, int h #else set_video_monitor(width, height, img->bytes_per_line, img->bitmap_bit_order == LSBFirst); #endif + #if REAL_ADDRESSING VideoMonitor.mac_frame_base = (uint32)the_buffer; MacFrameLayout = FLAYOUT_DIRECT; @@ -321,13 +347,168 @@ static bool init_window(int width, int h return true; } -// Init DGA display -static bool init_dga(int width, int height) +// Init fbdev DGA display +static bool init_fbdev_dga(char *in_fb_name) { -#if ENABLE_DGA +#if ENABLE_FBDEV_DGA + // Find the maximum depth available + int ndepths, max_depth(0); + int *depths = XListDepths(x_display, screen, &ndepths); + if (depths == NULL) { + printf("FATAL: Could not determine the maximal depth available\n"); + return false; + } else { + while (ndepths-- > 0) { + if (depths[ndepths] > max_depth) + max_depth = depths[ndepths]; + } + } + + // Get fbdevices file path from preferences + const char *fbd_path = PrefsFindString("fbdevicefile"); + + // Open fbdevices file + FILE *fp = fopen(fbd_path ? fbd_path : FBDEVICES_FILE_NAME, "r"); + if (fp == NULL) { + char str[256]; + sprintf(str, GetString(STR_NO_FBDEVICE_FILE_ERR), fbd_path ? fbd_path : FBDEVICES_FILE_NAME, strerror(errno)); + ErrorAlert(str); + return false; + } + + int fb_depth; // supported depth + uint32 fb_offset; // offset used for mmap(2) + char fb_name[20]; + char line[256]; + bool device_found = false; + while (fgets(line, 255, fp)) { + // Read line + int len = strlen(line); + if (len == 0) + continue; + line[len - 1] = '\0'; + + // Comments begin with "#" or ";" + if ((line[0] == '#') || (line[0] == ';') || (line[0] == '\0')) + continue; + + if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3) + && (strcmp(fb_name, in_fb_name) == 0) && (fb_depth == max_depth)) { + device_found = true; + break; + } + } + + // fbdevices file completely read + fclose(fp); + + // Frame buffer name not found ? Then, display warning + if (!device_found) { + char str[256]; + sprintf(str, GetString(STR_FBDEV_NAME_ERR), in_fb_name, max_depth); + ErrorAlert(str); + return false; + } + + int width = DisplayWidth(x_display, screen); + int height = DisplayHeight(x_display, screen); + depth = fb_depth; // max_depth + + // Set relative mouse mode + ADBSetRelMouseMode(false); + + // Create window + XSetWindowAttributes wattr; + wattr.override_redirect = True; + wattr.backing_store = NotUseful; + wattr.background_pixel = white_pixel; + wattr.border_pixel = black_pixel; + wattr.event_mask = eventmask = dga_eventmask; + + XSync(x_display, false); + the_win = XCreateWindow(x_display, rootwin, + 0, 0, width, height, + 0, xdepth, InputOutput, vis, + CWEventMask|CWBackPixel|CWBorderPixel|CWOverrideRedirect|CWBackingStore, + &wattr); + XSync(x_display, false); + XMapRaised(x_display, the_win); + XSync(x_display, false); + + // Grab mouse and keyboard + XGrabKeyboard(x_display, the_win, True, + GrabModeAsync, GrabModeAsync, CurrentTime); + XGrabPointer(x_display, the_win, True, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, the_win, None, CurrentTime); + + // Set colormap + if (depth == 8) { + XSetWindowColormap(x_display, the_win, cmap[0]); + XSetWMColormapWindows(x_display, the_win, &the_win, 1); + } + + // Set VideoMonitor + int bytes_per_row = width; + switch (depth) { + case 1: + bytes_per_row = ((width | 7) & ~7) >> 3; + break; + case 15: + case 16: + bytes_per_row *= 2; + break; + case 24: + case 32: + bytes_per_row *= 4; + break; + } + + if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_PRIVATE, fbdev_fd, fb_offset)) == MAP_FAILED) { + if ((the_buffer = (uint8 *) mmap(NULL, height * bytes_per_row, PROT_READ | PROT_WRITE, MAP_SHARED, fbdev_fd, fb_offset)) == MAP_FAILED) { + char str[256]; + sprintf(str, GetString(STR_FBDEV_MMAP_ERR), strerror(errno)); + ErrorAlert(str); + return false; + } + } + + set_video_monitor(width, height, bytes_per_row, true); +#if REAL_ADDRESSING + VideoMonitor.mac_frame_base = (uint32)the_buffer; + MacFrameLayout = FLAYOUT_DIRECT; +#else + VideoMonitor.mac_frame_base = MacFrameBaseMac; +#endif + return true; +#else + ErrorAlert("Basilisk II has been compiled with fbdev DGA support disabled."); + return false; +#endif +} + +// Init XF86 DGA display +static bool init_xf86_dga(int width, int height) +{ +#if ENABLE_XF86_DGA // Set relative mouse mode ADBSetRelMouseMode(true); +#if ENABLE_XF86_VIDMODE + // Switch to best mode + if (has_vidmode) { + int best = 0; + for (int i=1; ihdisplay >= width && x_video_modes[i]->vdisplay >= height && + x_video_modes[i]->hdisplay <= x_video_modes[best]->hdisplay && x_video_modes[i]->vdisplay <= x_video_modes[best]->vdisplay) { + best = i; + } + } + XF86VidModeSwitchToMode(x_display, screen, x_video_modes[best]); + XF86VidModeSetViewPort(x_display, screen, 0, 0); + } +#endif + // Create window XSetWindowAttributes wattr; wattr.event_mask = eventmask = dga_eventmask; @@ -385,7 +566,7 @@ static bool init_dga(int width, int heig #endif return true; #else - ErrorAlert("Basilisk II has been compiled with DGA support disabled."); + ErrorAlert("Basilisk II has been compiled with XF86 DGA support disabled."); return false; #endif } @@ -460,20 +641,47 @@ bool VideoInit(bool classic) // Init keycode translation keycode_init(); + // Read prefs + mouse_wheel_mode = PrefsFindInt16("mousewheelmode"); + mouse_wheel_lines = PrefsFindInt16("mousewheellines"); + // Find screen and root window screen = XDefaultScreen(x_display); rootwin = XRootWindow(x_display, screen); - + // Get screen depth xdepth = DefaultDepth(x_display, screen); + +#if ENABLE_FBDEV_DGA + // Frame buffer name + char fb_name[20]; + + // Could do fbdev dga ? + if ((fbdev_fd = open(FBDEVICE_FILE_NAME, O_RDWR)) != -1) + has_dga = true; + else + has_dga = false; +#endif -#if ENABLE_DGA +#if ENABLE_XF86_DGA // DGA available? - int dga_flags = 0; - XF86DGAQueryDirectVideo(x_display, screen, &dga_flags); - has_dga = dga_flags & XF86DGADirectPresent; + int dga_event_base, dga_error_base; + if (XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) { + int dga_flags = 0; + XF86DGAQueryDirectVideo(x_display, screen, &dga_flags); + has_dga = dga_flags & XF86DGADirectPresent; + } else + has_dga = false; #endif +#if ENABLE_XF86_VIDMODE + // VidMode available? + int vm_event_base, vm_error_base; + has_vidmode = XF86VidModeQueryExtension(x_display, &vm_event_base, &vm_error_base); + if (has_vidmode) + XF86VidModeGetAllModeLines(x_display, screen, &num_x_video_modes, &x_video_modes); +#endif + // Find black and white colors XParseColor(x_display, DefaultColormap(x_display, screen), "rgb:00/00/00", &black); XAllocColor(x_display, DefaultColormap(x_display, screen), &black); @@ -539,11 +747,21 @@ bool VideoInit(bool classic) if (mode_str) { if (sscanf(mode_str, "win/%d/%d", &width, &height) == 2) display_type = DISPLAY_WINDOW; - else if (has_dga && strcmp(mode_str, "dga") == 0) { +#if ENABLE_FBDEV_DGA + else if (has_dga && sscanf(mode_str, "dga/%19s", fb_name) == 1) { +#else + else if (has_dga && sscanf(mode_str, "dga/%d/%d", &width, &height) == 2) { +#endif display_type = DISPLAY_DGA; + if (width > DisplayWidth(x_display, screen)) + width = DisplayWidth(x_display, screen); + if (height > DisplayHeight(x_display, screen)) + height = DisplayHeight(x_display, screen); + } + if (width <= 0) width = DisplayWidth(x_display, screen); + if (height <= 0) height = DisplayHeight(x_display, screen); - } } // Initialize according to display type @@ -553,7 +771,11 @@ bool VideoInit(bool classic) return false; break; case DISPLAY_DGA: - if (!init_dga(width, height)) +#if ENABLE_FBDEV_DGA + if (!init_fbdev_dga(fb_name)) +#else + if (!init_xf86_dga(width, height)) +#endif return false; break; } @@ -603,7 +825,7 @@ void VideoExit(void) if (x_display != NULL) { XSync(x_display, false); -#if ENABLE_DGA +#if ENABLE_XF86_DGA if (display_type == DISPLAY_DGA) { XF86DGADirectVideo(x_display, screen, 0); XUngrabPointer(x_display, CurrentTime); @@ -611,10 +833,18 @@ void VideoExit(void) } #endif - if (the_buffer_copy) { - free(the_buffer_copy); - the_buffer_copy = NULL; +#if ENABLE_XF86_VIDMODE + if (has_vidmode && display_type == DISPLAY_DGA) + XF86VidModeSwitchToMode(x_display, screen, x_video_modes[0]); +#endif + +#if ENABLE_FBDEV_DGA + if (display_type == DISPLAY_DGA) { + XUngrabPointer(x_display, CurrentTime); + XUngrabKeyboard(x_display, CurrentTime); + close(fbdev_fd); } +#endif XFlush(x_display); XSync(x_display, false); @@ -622,6 +852,16 @@ void VideoExit(void) XFreeColormap(x_display, cmap[0]); XFreeColormap(x_display, cmap[1]); } + + if (the_buffer) { + free(the_buffer); + the_buffer = NULL; + } + + if (!have_shm && the_buffer_copy) { + free(the_buffer_copy); + the_buffer_copy = NULL; + } } } @@ -683,7 +923,7 @@ void video_set_palette(uint8 *pal) * Suspend/resume emulator */ -#if ENABLE_DGA +#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA static void suspend_emul(void) { if (display_type == DISPLAY_DGA) { @@ -700,7 +940,9 @@ static void suspend_emul(void) memcpy(fb_save, the_buffer, VideoMonitor.y * VideoMonitor.bytes_per_row); // Close full screen display +#if ENABLE_XF86_DGA XF86DGADirectVideo(x_display, screen, 0); +#endif XUngrabPointer(x_display, CurrentTime); XUngrabKeyboard(x_display, CurrentTime); XUnmapWindow(x_display, the_win); @@ -714,6 +956,7 @@ static void suspend_emul(void) wattr.backing_store = Always; wattr.backing_planes = xdepth; wattr.colormap = DefaultColormap(x_display, screen); + XSync(x_display, false); suspend_win = XCreateWindow(x_display, rootwin, 0, 0, 512, 1, 0, xdepth, InputOutput, vis, CWEventMask | CWBackPixel | CWBorderPixel | @@ -738,8 +981,10 @@ static void resume_emul(void) XSync(x_display, false); XGrabKeyboard(x_display, rootwin, 1, GrabModeAsync, GrabModeAsync, CurrentTime); XGrabPointer(x_display, rootwin, 1, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime); +#if ENABLE_XF86_DGA XF86DGADirectVideo(x_display, screen, XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse); XF86DGASetViewPort(x_display, screen, 0, 0); +#endif XSync(x_display, false); // Restore frame buffer @@ -748,8 +993,11 @@ static void resume_emul(void) free(fb_save); fb_save = NULL; } + if (depth == 8) +#if ENABLE_XF86_DGA XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); +#endif // Unlock frame buffer (and continue MacOS thread) pthread_mutex_unlock(&frame_buffer_lock); @@ -815,7 +1063,7 @@ static int kc_decode(KeySym ks) case XK_period: case XK_greater: return 0x2f; case XK_slash: case XK_question: return 0x2c; -#if ENABLE_DGA +#if ENABLE_XF86_DGA || ENABLE_FBDEV_DGA case XK_Tab: if (ctrl_down) {suspend_emul(); return -1;} else return 0x30; #else case XK_Tab: return 0x30; @@ -941,6 +1189,19 @@ static void handle_events(void) unsigned int button = ((XButtonEvent *)&event)->button; if (button < 4) ADBMouseDown(button - 1); + else if (button < 6) { // Wheel mouse + if (mouse_wheel_mode == 0) { + int key = (button == 5) ? 0x79 : 0x74; // Page up/down + ADBKeyDown(key); + ADBKeyUp(key); + } else { + int key = (button == 5) ? 0x3d : 0x3e; // Cursor up/down + for(int i=0; ikeycode & 0xff]; } else code = event2keycode((XKeyEvent *)&event); - if (code != -1) { + if (code != -1 && code != 0x39) { // Don't propagate Caps Lock releases ADBKeyUp(code); if (code == 0x36) ctrl_down = false; @@ -997,8 +1267,13 @@ static void handle_events(void) // Hidden parts exposed, force complete refresh of window case Expose: - if (display_type == DISPLAY_WINDOW) - memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y); + 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; + } break; } } @@ -1009,139 +1284,92 @@ static void handle_events(void) * Window display update */ -static void update_display(void) +static void update_display(int ticker) { - // In classic mode, copy the frame buffer from Mac RAM - if (classic_mode) - memcpy(the_buffer, Mac2HostAddr(0x3fa700), VideoMonitor.bytes_per_row * VideoMonitor.y); - - // Incremental update code - int wide = 0, high = 0, x1, x2, y1, y2, i, j; + int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xic, xicl, xi; + int xil = 0; + int rxm = 0, rxmo = 0; 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; + int rx = VideoMonitor.bytes_per_row / 16; + int ry = VideoMonitor.y / 16; + int max_box; + + y2s = sm_uptd[ticker % 8]; + y2a = 8; + for (i = 0; i < 6; i++) + if (ticker % (2 << i)) break; - } - } - high = y2 - y1 + 1; + max_box = sm_no_boxes[i]; - // Check for first column from left and first column from right that have changed - if (high) { - if (depth == 1) { - 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; 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; + if (y2a) { + for (y1=0; y1<16; y1++) { + for (y2=y2s; y2 < ry; y2 += y2a) { + i = ((y1 * ry) + y2) * bytes_per_row; + for (x1=0; x1<16; x1++, i += rx) { + if (updt_box[x1][y1] == false) { + if (memcmp(&the_buffer_copy[i], &the_buffer[i], rx)) { + updt_box[x1][y1] = true; + nr_boxes++; + } } } } - 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); + if ((nr_boxes <= max_box) && (nr_boxes)) { + for (y1=0; y1<16; y1++) { + for (x1=0; x1<16; x1++) { + if (updt_box[x1][y1] == true) { + if (rxm == 0) + xm = x1; + rxm += rx; + updt_box[x1][y1] = false; } - } - - } 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; i--) { - p -= bytes_per_pixel; - p2 -= bytes_per_pixel; - if (memcmp(p, p2, bytes_per_pixel)) { - x2 = i; - break; + rxm = 0; + yo = y1; + } + if (xil) { + i = (yi * bytes_per_row) + xi; + for (y2=0; y2 < yil; y2++, i += bytes_per_row) + memcpy(&the_buffer_copy[i], &the_buffer[i], xil); + if (depth == 1) { + if (have_shm) + XShmPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil, 0); + else + XPutImage(x_display, the_win, the_gc, img, xi * 8, yi, xi * 8, yi, xil * 8, yil); + } else { + if (have_shm) + XShmPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil, 0); + else + XPutImage(x_display, the_win, the_gc, img, xi / bytes_per_pixel, yi, xi / bytes_per_pixel, yi, xil / bytes_per_pixel, yil); } + xil = 0; } - } - 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); + if ((x1 == 15) && (y1 == 15) && (rxmo)) { + x1--; + xi = xmo * rx; + yi = ymo * ry; + xil = rxmo; + yil = (yo - ymo +1) * ry; + rxmo = 0; } } } - } - - // 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); - } - - // Has the Mac started? (cursor data is not valid otherwise) - if (HasMacStarted()) { - - // Set new cursor image if it was changed - if (memcmp(the_cursor, Mac2HostAddr(0x844), 64)) { - memcpy(the_cursor, Mac2HostAddr(0x844), 64); - memcpy(cursor_image->data, the_cursor, 32); - memcpy(cursor_mask_image->data, the_cursor+32, 32); - XFreeCursor(x_display, mac_cursor); - XPutImage(x_display, cursor_map, cursor_gc, cursor_image, 0, 0, 0, 0, 16, 16); - XPutImage(x_display, cursor_mask_map, cursor_mask_gc, cursor_mask_image, 0, 0, 0, 0, 16, 16); - mac_cursor = XCreatePixmapCursor(x_display, cursor_map, cursor_mask_map, &black, &white, ReadMacInt8(0x885), ReadMacInt8(0x887)); - XDefineCursor(x_display, the_win, mac_cursor); - } + nr_boxes = 0; } } @@ -1164,7 +1392,7 @@ static void *redraw_func(void *arg) usleep(16667); #endif -#if ENABLE_DGA +#if ENABLE_XF86_DGA // Quit DGA mode if requested if (quit_full_screen) { quit_full_screen = false; @@ -1178,6 +1406,18 @@ static void *redraw_func(void *arg) } #endif +#if ENABLE_FBDEV_DGA + // Quit DGA mode if requested + if (quit_full_screen) { + quit_full_screen = false; + if (display_type == DISPLAY_DGA) { + XUngrabPointer(x_display, CurrentTime); + XUngrabKeyboard(x_display, CurrentTime); + XUnmapWindow(x_display, the_win); + XSync(x_display, false); + } + } +#endif // Handle X events handle_events(); @@ -1188,7 +1428,8 @@ static void *redraw_func(void *arg) if (depth == 8) { XStoreColors(x_display, cmap[0], palette, 256); XStoreColors(x_display, cmap[1], palette, 256); -#if ENABLE_DGA + +#if ENABLE_XF86_DGA if (display_type == DISPLAY_DGA) { current_dga_cmap ^= 1; XF86DGAInstallColormap(x_display, screen, cmap[current_dga_cmap]); @@ -1198,13 +1439,10 @@ static void *redraw_func(void *arg) } pthread_mutex_unlock(&palette_lock); - // In window mode, update display and mouse pointer + // In window mode, update display if (display_type == DISPLAY_WINDOW) { tick_counter++; - if (tick_counter >= frame_skip) { - tick_counter = 0; - update_display(); - } + update_display(tick_counter); } } return NULL;