--- previous/src/includes/screen.h 2018/04/24 19:25:10 1.1 +++ previous/src/includes/screen.h 2018/04/24 19:30:31 1.1.1.3 @@ -10,6 +10,10 @@ #include /* for SDL_Surface */ +#if 1 +void SDL_UpdateRect(SDL_Surface *screen, Sint32 x, Sint32 y, Sint32 w, Sint32 h); +void SDL_UpdateRects(SDL_Surface *screen, int numrects, SDL_Rect *rects); +#endif /* The 'screen' is a representation of the ST video memory */ /* taking into account all the border tricks. Data are stored */ @@ -48,13 +52,6 @@ enum #define ST_MEDIUM_RES_BIT 0x1 #define ST_RES_MASK 0x3 -/* Update Palette defines */ -enum -{ - UPDATE_PALETTE_NONE, - UPDATE_PALETTE_UPDATE, - UPDATE_PALETTE_FULLUPDATE -}; /* Palette mask values for 'HBLPaletteMask[]' */ #define PALETTEMASK_RESOLUTION 0x00040000 @@ -72,30 +69,10 @@ enum OVERSCANMODE_BOTTOM /* 0x02 (Top+Bottom) 0x03 */ }; -/* Available fullscreen modes */ -#define NUM_DISPLAYMODEOPTIONS 6 -enum -{ - DISPLAYMODE_LOWCOL_LOWRES, /* low color, low resolution (fastest) */ - DISPLAYMODE_LOWCOL_HIGHRES, /* low color, zoomed resolution */ - DISPLAYMODE_LOWCOL_DUMMY, /* unused */ - DISPLAYMODE_HICOL_LOWRES, /* high color, low resolution */ - DISPLAYMODE_HICOL_HIGHRES, /* high color, zoomed resolution (slowest) */ - DISPLAYMODE_HICOL_DUMMY /* unused */ -}; - - -extern bool bGrabMouse; -extern bool bInFullScreen; -extern int nScreenZoomX, nScreenZoomY; -extern int nBorderPixelsLeft, nBorderPixelsRight; -extern int NEXTScreenStartHorizLine; -extern int NEXTScreenLeftSkipBytes; -extern FRAMEBUFFER *pFrameBuffer; -extern Uint8 pNEXTScreen[(1120*832)*2]; +extern volatile bool bGrabMouse; +extern volatile bool bInFullScreen; +extern struct SDL_Window *sdlWindow; extern SDL_Surface *sdlscrn; -extern Uint32 STRGBPalette[16]; -extern Uint32 ST2RGB[4096]; extern void Screen_Init(void); extern void Screen_UnInit(void);