--- np2/x11/scrnmng.h 2003/11/16 16:43:45 1.1 +++ np2/x11/scrnmng.h 2004/07/05 14:36:58 1.4 @@ -45,7 +45,7 @@ typedef struct { extern "C" { #endif -extern SCRNMNG scrnmng; +extern SCRNMNG *scrnmngp; void scrnmng_initialize(void); BOOL scrnmng_create(BYTE scrnmode); @@ -56,17 +56,33 @@ void scrnmng_setextend(int extend); void scrnmng_setheight(int posy, int height); const SCRNSURF* scrnmng_surflock(void); void scrnmng_surfunlock(const SCRNSURF *surf); -void scrnmng_update(void); +#define scrnmng_update() #define scrnmng_dispclock() #define scrnmng_isfullscreen() (0) -#define scrnmng_haveextend() (scrnmng.flag & SCRNFLAG_HAVEEXTEND) -#define scrnmng_getbpp() (scrnmng.bpp) -#define scrnmng_allflash() do { scrnmng.allflash = TRUE; } while (0) -#define scrnmng_palchanged() do { scrnmng.palchanged = TRUE; } while (0) +#define scrnmng_haveextend() (scrnmngp->flag & SCRNFLAG_HAVEEXTEND) +#define scrnmng_getbpp() (scrnmngp->bpp) +#define scrnmng_allflash() do { scrnmngp->allflash = TRUE; } while (0) +#define scrnmng_palchanged() do { scrnmngp->palchanged = TRUE; } while (0) RGB16 scrnmng_makepal16(RGB32 pal32); +void scrnmng_draw(RECT_T *r); + +/* + * for menubase + */ + +typedef struct { + int width; + int height; + int bpp; +} SCRNMENU; + +BOOL scrnmng_entermenu(SCRNMENU *smenu); +void scrnmng_leavemenu(void); +void scrnmng_menudraw(const RECT_T *rct); + #ifdef __cplusplus } #endif