| 63 |
|
#include "video_blit.h" |
| 64 |
|
#include "vm_alloc.h" |
| 65 |
|
|
| 66 |
+ |
#if (defined(__APPLE__) && defined(__MACH__)) |
| 67 |
+ |
#include "utils_macosx.h" |
| 68 |
+ |
#endif |
| 69 |
+ |
|
| 70 |
|
#define DEBUG 0 |
| 71 |
|
#include "debug.h" |
| 72 |
|
|
| 69 |
– |
|
| 73 |
|
// Supported video modes |
| 74 |
|
using std::vector; |
| 75 |
|
static vector<VIDEO_MODE> VideoModes; |
| 628 |
|
class driver_window; |
| 629 |
|
static void update_display_window_vosf(driver_window *drv); |
| 630 |
|
static void update_display_dynamic(int ticker, driver_window *drv); |
| 631 |
< |
static void update_display_static(driver_window *drv); |
| 631 |
> |
static void update_display_static(driver_base *drv); |
| 632 |
|
|
| 633 |
|
class driver_window : public driver_base { |
| 634 |
|
friend void update_display_window_vosf(driver_window *drv); |
| 635 |
|
friend void update_display_dynamic(int ticker, driver_window *drv); |
| 636 |
< |
friend void update_display_static(driver_window *drv); |
| 636 |
> |
friend void update_display_static(driver_base *drv); |
| 637 |
|
|
| 638 |
|
public: |
| 639 |
|
driver_window(SDL_monitor_desc &monitor); |
| 1241 |
|
continue; |
| 1242 |
|
if (w == 512 && h == 384) |
| 1243 |
|
continue; |
| 1241 |
– |
#ifdef ENABLE_VOSF |
| 1244 |
|
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) |
| 1245 |
|
add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d); |
| 1244 |
– |
#else |
| 1245 |
– |
add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth); |
| 1246 |
– |
#endif |
| 1246 |
|
} |
| 1247 |
|
} |
| 1248 |
|
|
| 1896 |
|
*/ |
| 1897 |
|
|
| 1898 |
|
// Static display update (fixed frame rate, but incremental) |
| 1899 |
< |
static void update_display_static(driver_window *drv) |
| 1899 |
> |
static void update_display_static(driver_base *drv) |
| 1900 |
|
{ |
| 1901 |
|
// Incremental update code |
| 1902 |
|
int wide = 0, high = 0, x1, x2, y1, y2, i, j; |
| 1985 |
|
|
| 1986 |
|
} else { |
| 1987 |
|
const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X; |
| 1988 |
+ |
const int dst_bytes_per_row = drv->s->pitch; |
| 1989 |
|
|
| 1990 |
|
x1 = VIDEO_MODE_X; |
| 1991 |
|
for (j=y1; j<=y2; j++) { |
| 2026 |
|
// Blit to screen surface |
| 2027 |
|
for (j=y1; j<=y2; j++) { |
| 2028 |
|
i = j * bytes_per_row + x1 * bytes_per_pixel; |
| 2029 |
+ |
int dst_i = j * dst_bytes_per_row + x1 * bytes_per_pixel; |
| 2030 |
|
memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide); |
| 2031 |
< |
Screen_blit((uint8 *)drv->s->pixels + i, the_buffer + i, bytes_per_pixel * wide); |
| 2031 |
> |
Screen_blit((uint8 *)drv->s->pixels + dst_i, the_buffer + i, bytes_per_pixel * wide); |
| 2032 |
|
} |
| 2033 |
|
|
| 2034 |
|
// Unlock surface, if required |
| 2044 |
|
|
| 2045 |
|
// Static display update (fixed frame rate, bounding boxes based) |
| 2046 |
|
// XXX use NQD bounding boxes to help detect dirty areas? |
| 2047 |
< |
static void update_display_static_bbox(driver_window *drv) |
| 2047 |
> |
static void update_display_static_bbox(driver_base *drv) |
| 2048 |
|
{ |
| 2049 |
|
const VIDEO_MODE &mode = drv->mode; |
| 2050 |
|
|
| 2062 |
|
// Update the surface from Mac screen |
| 2063 |
|
const int bytes_per_row = VIDEO_MODE_ROW_BYTES; |
| 2064 |
|
const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X; |
| 2065 |
+ |
const int dst_bytes_per_row = drv->s->pitch; |
| 2066 |
|
int x, y; |
| 2067 |
|
for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) { |
| 2068 |
|
int h = N_PIXELS; |
| 2077 |
|
bool dirty = false; |
| 2078 |
|
for (int j = y; j < (y + h); j++) { |
| 2079 |
|
const int yb = j * bytes_per_row; |
| 2080 |
+ |
const int dst_yb = j * dst_bytes_per_row; |
| 2081 |
|
if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) { |
| 2082 |
|
memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs); |
| 2083 |
< |
Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs); |
| 2083 |
> |
Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs); |
| 2084 |
|
dirty = true; |
| 2085 |
|
} |
| 2086 |
|
} |
| 2144 |
|
UNLOCK_PALETTE; |
| 2145 |
|
} |
| 2146 |
|
|
| 2147 |
+ |
static void video_refresh_window_static(void); |
| 2148 |
+ |
|
| 2149 |
|
static void video_refresh_dga(void) |
| 2150 |
|
{ |
| 2151 |
|
// Quit DGA mode if requested |
| 2152 |
|
possibly_quit_dga_mode(); |
| 2153 |
+ |
video_refresh_window_static(); |
| 2154 |
|
} |
| 2155 |
|
|
| 2156 |
|
#ifdef ENABLE_VOSF |
| 2202 |
|
tick_counter = 0; |
| 2203 |
|
const VIDEO_MODE &mode = drv->mode; |
| 2204 |
|
if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT) |
| 2205 |
< |
update_display_static_bbox(static_cast<driver_window *>(drv)); |
| 2205 |
> |
update_display_static_bbox(drv); |
| 2206 |
|
else |
| 2207 |
< |
update_display_static(static_cast<driver_window *>(drv)); |
| 2207 |
> |
update_display_static(drv); |
| 2208 |
|
} |
| 2209 |
|
} |
| 2210 |
|
|
| 2240 |
|
handle_events(); |
| 2241 |
|
|
| 2242 |
|
// Update display |
| 2243 |
+ |
#if (defined(__APPLE__) && defined(__MACH__)) |
| 2244 |
+ |
// SDL expects an auto-release pool to be present. |
| 2245 |
+ |
NSAutoReleasePool_wrap(video_refresh); |
| 2246 |
+ |
#else |
| 2247 |
|
video_refresh(); |
| 2248 |
+ |
#endif |
| 2249 |
|
|
| 2250 |
|
#ifdef SHEEPSHAVER |
| 2251 |
|
// Set new cursor image if it was changed |
| 2335 |
|
#ifdef SHEEPSHAVER |
| 2336 |
|
void video_set_dirty_area(int x, int y, int w, int h) |
| 2337 |
|
{ |
| 2338 |
+ |
#ifdef ENABLE_VOSF |
| 2339 |
|
const VIDEO_MODE &mode = drv->mode; |
| 2340 |
|
const int screen_width = VIDEO_MODE_X; |
| 2341 |
|
const int screen_height = VIDEO_MODE_Y; |
| 2342 |
|
const int bytes_per_row = VIDEO_MODE_ROW_BYTES; |
| 2343 |
|
|
| 2332 |
– |
#ifdef ENABLE_VOSF |
| 2344 |
|
if (use_vosf) { |
| 2345 |
|
vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row); |
| 2346 |
|
return; |
