ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/SDL/video_sdl.cpp
(Generate patch)

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.24 by gbeauche, 2006-05-09T21:41:02Z vs.
Revision 1.35 by asvitkine, 2008-06-20T00:45:27Z

# Line 1 | Line 1
1   /*
2   *  video_sdl.cpp - Video/graphics emulation, SDL specific stuff
3   *
4 < *  Basilisk II (C) 1997-2005 Christian Bauer
4 > *  Basilisk II (C) 1997-2008 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 27 | Line 27
27   *      Ctrl-F5 = grab mouse (in windowed mode)
28   *
29   *  FIXMEs and TODOs:
30 + *  - Windows requires an extra mouse event to update the actual cursor image?
31   *  - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux
32   *  - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?)
33   *  - Mouse acceleration, there is no API in SDL yet for that
34   *  - Force relative mode in Grab mode even if SDL provides absolute coordinates?
34 *  - Fullscreen mode
35   *  - Gamma tables support is likely to be broken here
36   *  - Events processing is bound to the general emulation thread as SDL requires
37   *    to PumpEvents() within the same thread as the one that called SetVideoMode().
38   *    Besides, there can't seem to be a way to call SetVideoMode() from a child thread.
39 *  - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
39   *  - Backport hw cursor acceleration to Basilisk II?
40   *  - Factor out code
41   */
# Line 49 | Line 48
48   #include <errno.h>
49   #include <vector>
50  
51 + #ifdef WIN32
52 + #include <malloc.h> /* alloca() */
53 + #endif
54 +
55   #include "cpu_emulation.h"
56   #include "main.h"
57   #include "adb.h"
# Line 133 | Line 136 | static SDL_Cursor *sdl_cursor;                                         // C
136   static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
137   static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
138   static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
139 < static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
139 > static const int sdl_eventmask = SDL_MOUSEEVENTMASK | SDL_KEYEVENTMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK | SDL_ACTIVEEVENTMASK;
140  
141   // Mutex to protect SDL events
142   static SDL_mutex *sdl_events_lock = NULL;
# Line 194 | Line 197 | extern void SysMountFirstFloppy(void);
197  
198   static void *vm_acquire_framebuffer(uint32 size)
199   {
200 <        return vm_acquire(size);
200 >        // always try to reallocate framebuffer at the same address
201 >        static void *fb = VM_MAP_FAILED;
202 >        if (fb != VM_MAP_FAILED) {
203 >                if (vm_acquire_fixed(fb, size) < 0) {
204 > #ifndef SHEEPSHAVER
205 >                        printf("FATAL: Could not reallocate framebuffer at previous address\n");
206 > #endif
207 >                        fb = VM_MAP_FAILED;
208 >                }
209 >        }
210 >        if (fb == VM_MAP_FAILED)
211 >                fb = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT);
212 >        return fb;
213   }
214  
215   static inline void vm_release_framebuffer(void *fb, uint32 size)
# Line 716 | Line 731 | void driver_base::restore_mouse_accel(vo
731   *  Windowed display driver
732   */
733  
734 + static bool SDL_display_opened = false;
735 +
736   // Open display
737   driver_window::driver_window(SDL_monitor_desc &m)
738          : driver_base(m), mouse_grabbed(false)
# Line 727 | Line 744 | driver_window::driver_window(SDL_monitor
744          // Set absolute mouse mode
745          ADBSetRelMouseMode(mouse_grabbed);
746  
747 +        // This is ugly:
748 +        // If we're switching resolutions (ie, not setting it for the first time),
749 +        // there's a bug in SDL where the SDL_Surface created will not be properly
750 +        // setup. The solution is to SDL_QuitSubSystem(SDL_INIT_VIDEO) before calling
751 +        // SDL_SetVideoMode for the second time (SDL_SetVideoMode will call SDL_Init()
752 +        // and all will be well). Without this, the video becomes corrupted (at least
753 +        // on Mac OS X), after the resolution switch.
754 +        if (SDL_display_opened)
755 +                SDL_QuitSubSystem(SDL_INIT_VIDEO);
756 +
757          // Create surface
758          int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
759          if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
760                  return;
761  
762 +        SDL_display_opened = true;
763 +
764   #ifdef ENABLE_VOSF
765          use_vosf = true;
766          // Allocate memory for frame buffer (SIZE is extended to page-boundary)
# Line 1829 | Line 1858 | static void handle_events(void)
1858                                  ADBKeyDown(0x7f);       // Power key
1859                                  ADBKeyUp(0x7f);
1860                                  break;
1861 +
1862 +                        // Application activate/deactivate; consume the event but otherwise ignore it
1863 +                        case SDL_ACTIVEEVENT:
1864 +                                break;
1865                          }
1866                  }
1867          }
# Line 1984 | Line 2017 | static void update_display_static(driver
2017          }
2018   }
2019  
2020 + // Static display update (fixed frame rate, bounding boxes based)
2021 + // XXX use NQD bounding boxes to help detect dirty areas?
2022 + static void update_display_static_bbox(driver_window *drv)
2023 + {
2024 +        const VIDEO_MODE &mode = drv->mode;
2025 +
2026 +        // Allocate bounding boxes for SDL_UpdateRects()
2027 +        const int N_PIXELS = 64;
2028 +        const int n_x_boxes = (VIDEO_MODE_X + N_PIXELS - 1) / N_PIXELS;
2029 +        const int n_y_boxes = (VIDEO_MODE_Y + N_PIXELS - 1) / N_PIXELS;
2030 +        SDL_Rect *boxes = (SDL_Rect *)alloca(sizeof(SDL_Rect) * n_x_boxes * n_y_boxes);
2031 +        int nr_boxes = 0;
2032 +
2033 +        // Lock surface, if required
2034 +        if (SDL_MUSTLOCK(drv->s))
2035 +                SDL_LockSurface(drv->s);
2036 +
2037 +        // Update the surface from Mac screen
2038 +        const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2039 +        const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2040 +        int x, y;
2041 +        for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2042 +                int h = N_PIXELS;
2043 +                if (h > VIDEO_MODE_Y - y)
2044 +                        h = VIDEO_MODE_Y - y;
2045 +                for (x = 0; x < VIDEO_MODE_X; x += N_PIXELS) {
2046 +                        int w = N_PIXELS;
2047 +                        if (w > VIDEO_MODE_X - x)
2048 +                                w = VIDEO_MODE_X - x;
2049 +                        const int xs = w * bytes_per_pixel;
2050 +                        const int xb = x * bytes_per_pixel;
2051 +                        bool dirty = false;
2052 +                        for (int j = y; j < (y + h); j++) {
2053 +                                const int yb = j * bytes_per_row;
2054 +                                if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2055 +                                        memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2056 +                                        Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2057 +                                        dirty = true;
2058 +                                }
2059 +                        }
2060 +                        if (dirty) {
2061 +                                boxes[nr_boxes].x = x;
2062 +                                boxes[nr_boxes].y = y;
2063 +                                boxes[nr_boxes].w = w;
2064 +                                boxes[nr_boxes].h = h;
2065 +                                nr_boxes++;
2066 +                        }
2067 +                }
2068 +        }
2069 +
2070 +        // Unlock surface, if required
2071 +        if (SDL_MUSTLOCK(drv->s))
2072 +                SDL_UnlockSurface(drv->s);
2073 +
2074 +        // Refresh display
2075 +        if (nr_boxes)
2076 +                SDL_UpdateRects(drv->s, nr_boxes, boxes);
2077 + }
2078 +
2079  
2080   // We suggest the compiler to inline the next two functions so that it
2081   // may specialise the code according to the current screen depth and
# Line 2078 | Line 2170 | static void video_refresh_window_static(
2170          static int tick_counter = 0;
2171          if (++tick_counter >= frame_skip) {
2172                  tick_counter = 0;
2173 <                update_display_static(static_cast<driver_window *>(drv));
2173 >                const VIDEO_MODE &mode = drv->mode;
2174 >                if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2175 >                        update_display_static_bbox(static_cast<driver_window *>(drv));
2176 >                else
2177 >                        update_display_static(static_cast<driver_window *>(drv));
2178          }
2179   }
2180  
# Line 2123 | Line 2219 | static inline void do_video_refresh(void
2219                  LOCK_EVENTS;
2220                  SDL_FreeCursor(sdl_cursor);
2221                  sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2222 <                if (sdl_cursor)
2222 >                if (sdl_cursor) {
2223                          SDL_SetCursor(sdl_cursor);
2224 + #ifdef WIN32
2225 +                        // XXX Windows apparently needs an extra mouse event to
2226 +                        // make the new cursor image visible
2227 +                        int visible = SDL_ShowCursor(-1);
2228 +                        if (visible) {
2229 +                                int x, y;
2230 +                                SDL_GetMouseState(&x, &y);
2231 +                                SDL_WarpMouse(x, y);
2232 +                        }
2233 + #endif
2234 +                }
2235                  UNLOCK_EVENTS;
2236          }
2237   #endif
# Line 2183 | Line 2290 | static int redraw_func(void *arg)
2290          return 0;
2291   }
2292   #endif
2293 +
2294 +
2295 + /*
2296 + *  Record dirty area from NQD
2297 + */
2298 +
2299 + #ifdef SHEEPSHAVER
2300 + void video_set_dirty_area(int x, int y, int w, int h)
2301 + {
2302 +        const VIDEO_MODE &mode = drv->mode;
2303 +        const int screen_width = VIDEO_MODE_X;
2304 +        const int screen_height = VIDEO_MODE_Y;
2305 +        const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2306 +
2307 + #ifdef ENABLE_VOSF
2308 +        if (use_vosf) {
2309 +                vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2310 +                return;
2311 +        }
2312 + #endif
2313 +
2314 +        // XXX handle dirty bounding boxes for non-VOSF modes
2315 + }
2316 + #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines