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.5 by gbeauche, 2004-06-24T21:46:55Z vs.
Revision 1.8 by gbeauche, 2004-06-26T17:20:35Z

# Line 35 | Line 35
35   *  - Events processing is bound to the general emulation thread as SDL requires
36   *    to PumpEvents() within the same thread as the one that called SetVideoMode().
37   *    Besides, there can't seem to be a way to call SetVideoMode() from a child thread.
38 + *  - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
39 + *  - Backport hw cursor acceleration to Basilisk II?
40 + *  - Move generic Native QuickDraw acceleration routines to gfxaccel.cpp
41   */
42  
43   #include "sysdeps.h"
# Line 96 | Line 99 | static volatile bool redraw_thread_cance
99   static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
100  
101   #ifdef ENABLE_VOSF
102 < static bool use_vosf = true;                                            // Flag: VOSF enabled
102 > static bool use_vosf = false;                                           // Flag: VOSF enabled
103   #else
104   static const bool use_vosf = false;                                     // VOSF not possible
105   #endif
# Line 114 | Line 117 | static int keycode_table[256];                                         // X
117  
118   // SDL variables
119   static int screen_depth;                                                        // Depth of current screen
120 + static SDL_Cursor *sdl_cursor;                                          // Copy of Mac cursor
121 + static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
122   static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
123   static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
124   static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
# Line 255 | Line 260 | static void ErrorAlert(int error)
260   {
261          ErrorAlert(GetString(error));
262   }
263 +
264 + // Display warning alert
265 + static void WarningAlert(int warning)
266 + {
267 +        WarningAlert(GetString(warning));
268 + }
269   #endif
270  
271  
# Line 619 | Line 630 | driver_window::driver_window(SDL_monitor
630          the_buffer = (uint8 *)vm_acquire(the_buffer_size);
631          the_buffer_copy = (uint8 *)malloc(the_buffer_size);
632          D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
633 +
634 +        // Check whether we can initialize the VOSF subsystem and it's profitable
635 +        if (!video_vosf_init(m)) {
636 +                WarningAlert(STR_VOSF_INIT_ERR);
637 +                use_vosf = false;
638 +        }
639 +        else if (!video_vosf_profitable()) {
640 +                video_vosf_exit();
641 +                printf("VOSF acceleration is not profitable on this platform, disabling it\n");
642 +                use_vosf = false;
643 +        }
644 +        if (!use_vosf) {
645 +                free(the_buffer_copy);
646 +                vm_release(the_buffer, the_buffer_size);
647 +                the_host_buffer = NULL;
648 +        }
649 + #endif
650 +        if (!use_vosf) {
651 +                // Allocate memory for frame buffer
652 +                the_buffer_size = (aligned_height + 2) * s->pitch;
653 +                the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
654 +                the_buffer = (uint8 *)calloc(1, the_buffer_size);
655 +                D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
656 +        }
657 +        
658 + #ifdef SHEEPSHAVER
659 +        // Create cursor
660 +        if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
661 +                SDL_SetCursor(sdl_cursor);
662 +                cursor_changed = false;
663 +        }
664   #else
665 <        // Allocate memory for frame buffer
666 <        the_buffer_size = (aligned_height + 2) * s->pitch;
625 <        the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
626 <        the_buffer = (uint8 *)calloc(1, the_buffer_size);
627 <        D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
665 >        // Hide cursor
666 >        SDL_ShowCursor(0);
667   #endif
668  
669          // Set window name/class
670          set_window_name(STR_WINDOW_TITLE);
671  
633 –        // Hide cursor
634 –        SDL_ShowCursor(0);
635 –
672          // Init blitting routines
673          SDL_PixelFormat *f = s->format;
674          VisualFormat visualFormat;
# Line 810 | Line 846 | bool SDL_monitor_desc::video_open(void)
846                  return false;
847          }
848  
813 – #ifdef ENABLE_VOSF
814 –        if (use_vosf) {
815 –                // Initialize the VOSF system
816 –                if (!video_vosf_init(*this)) {
817 –                        ErrorAlert(STR_VOSF_INIT_ERR);
818 –                return false;
819 –                }
820 –        }
821 – #endif
822 –        
849          // Initialize VideoRefresh function
850          VideoRefreshInit();
851  
# Line 1146 | Line 1172 | void SDL_monitor_desc::set_palette(uint8
1172                  }
1173  
1174   #ifdef ENABLE_VOSF
1175 <                // We have to redraw everything because the interpretation of pixel values changed
1176 <                LOCK_VOSF;
1177 <                PFLAG_SET_ALL;
1178 <                UNLOCK_VOSF;
1179 <                memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1175 >                if (use_vosf) {
1176 >                        // We have to redraw everything because the interpretation of pixel values changed
1177 >                        LOCK_VOSF;
1178 >                        PFLAG_SET_ALL;
1179 >                        UNLOCK_VOSF;
1180 >                        memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1181 >                }
1182   #endif
1183          }
1184  
# Line 1221 | Line 1249 | void SDL_monitor_desc::switch_to_current
1249   #ifdef SHEEPSHAVER
1250   bool video_can_change_cursor(void)
1251   {
1252 < //      return hw_mac_cursor_accl && (display_type != DISPLAY_SCREEN);
1225 <        return false;
1252 >        return (display_type == DISPLAY_WINDOW);
1253   }
1254   #endif
1255  
# Line 1234 | Line 1261 | bool video_can_change_cursor(void)
1261   #ifdef SHEEPSHAVER
1262   void video_set_cursor(void)
1263   {
1264 < //      cursor_changed = true;
1264 >        cursor_changed = true;
1265   }
1266   #endif
1267  
# Line 2158 | Line 2185 | static int redraw_func(void *arg)
2185                  // Refresh display
2186                  video_refresh();
2187  
2188 + #ifdef SHEEPSHAVER
2189 +                // Set new cursor image if it was changed
2190 +                if (cursor_changed && sdl_cursor) {
2191 +                        cursor_changed = false;
2192 +                        SDL_FreeCursor(sdl_cursor);
2193 +                        sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2194 +                        if (sdl_cursor)
2195 +                                SDL_SetCursor(sdl_cursor);
2196 +                }
2197 + #endif
2198 +
2199                  // Set new palette if it was changed
2200                  handle_palette_changes();
2201          }

Diff Legend

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