--- np2/x11/scrnmng.h 2003/11/26 14:55:01 1.2 +++ np2/x11/scrnmng.h 2003/12/19 16:08:01 1.3 @@ -45,7 +45,7 @@ typedef struct { extern "C" { #endif -extern SCRNMNG scrnmng; +extern SCRNMNG *scrnmngp; void scrnmng_initialize(void); BOOL scrnmng_create(BYTE scrnmode); @@ -60,13 +60,27 @@ void scrnmng_surfunlock(const SCRNSURF * #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); +/* + * 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