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.27 by gbeauche, 2006-05-14T08:32:05Z vs.
Revision 1.37 by asvitkine, 2008-07-20T07:33:09Z

# 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 1514 | Line 1543 | void SDL_monitor_desc::switch_to_current
1543   #ifdef SHEEPSHAVER
1544   bool video_can_change_cursor(void)
1545   {
1546 <        return (display_type == DISPLAY_WINDOW);
1546 >        static char driver[] = "Quartz?";
1547 >        static int quartzok = -1;
1548 >
1549 >        if (display_type != DISPLAY_WINDOW)
1550 >                return false;
1551 >
1552 >        if (quartzok < 0) {
1553 >                if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver))
1554 >                        quartzok = true;
1555 >                else {
1556 >                        // Quartz driver bug prevents cursor changing in SDL 1.2.11 and later
1557 >                        const SDL_version *vp = SDL_Linked_Version();
1558 >                        quartzok = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch) <= SDL_VERSIONNUM(1, 2, 10);
1559 >                }
1560 >        }
1561 >
1562 >        return quartzok;
1563   }
1564   #endif
1565  
# Line 1725 | Line 1770 | static void handle_events(void)
1770                          // Mouse button
1771                          case SDL_MOUSEBUTTONDOWN: {
1772                                  unsigned int button = event.button.button;
1773 <                                if (button < 4)
1774 <                                        ADBMouseDown(button - 1);
1773 >                                if (button == SDL_BUTTON_LEFT)
1774 >                                        ADBMouseDown(0);
1775 >                                else if (button == SDL_BUTTON_RIGHT)
1776 >                                        ADBMouseDown(1);
1777 >                                else if (button == SDL_BUTTON_MIDDLE)
1778 >                                        ADBMouseDown(2);
1779                                  else if (button < 6) {  // Wheel mouse
1780                                          if (mouse_wheel_mode == 0) {
1781                                                  int key = (button == 5) ? 0x79 : 0x74;  // Page up/down
# Line 1744 | Line 1793 | static void handle_events(void)
1793                          }
1794                          case SDL_MOUSEBUTTONUP: {
1795                                  unsigned int button = event.button.button;
1796 <                                if (button < 4)
1797 <                                        ADBMouseUp(button - 1);
1796 >                                if (button == SDL_BUTTON_LEFT)
1797 >                                        ADBMouseUp(0);
1798 >                                else if (button == SDL_BUTTON_RIGHT)
1799 >                                        ADBMouseUp(1);
1800 >                                else if (button == SDL_BUTTON_MIDDLE)
1801 >                                        ADBMouseUp(2);
1802                                  break;
1803                          }
1804  
# Line 1829 | Line 1882 | static void handle_events(void)
1882                                  ADBKeyDown(0x7f);       // Power key
1883                                  ADBKeyUp(0x7f);
1884                                  break;
1885 +
1886 +                        // Application activate/deactivate; consume the event but otherwise ignore it
1887 +                        case SDL_ACTIVEEVENT:
1888 +                                break;
1889                          }
1890                  }
1891          }
# Line 2186 | Line 2243 | static inline void do_video_refresh(void
2243                  LOCK_EVENTS;
2244                  SDL_FreeCursor(sdl_cursor);
2245                  sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2246 <                if (sdl_cursor)
2246 >                if (sdl_cursor) {
2247 >                        SDL_ShowCursor(private_data == NULL || private_data->cursorVisible);
2248                          SDL_SetCursor(sdl_cursor);
2249 + #ifdef WIN32
2250 +                        // XXX Windows apparently needs an extra mouse event to
2251 +                        // make the new cursor image visible
2252 +                        int visible = SDL_ShowCursor(-1);
2253 +                        if (visible) {
2254 +                                int x, y;
2255 +                                SDL_GetMouseState(&x, &y);
2256 +                                SDL_WarpMouse(x, y);
2257 +                        }
2258 + #endif
2259 +                }
2260                  UNLOCK_EVENTS;
2261          }
2262   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines