--- np2/x11/scrnmng.h	2003/11/26 14:55:01	1.2
+++ np2/x11/scrnmng.h	2007/01/22 16:37:51	1.6
@@ -2,9 +2,9 @@
 #define	NP2_X11_SCRNMNG_H__
 
 enum {
-	RGB24_B	= 0,
+	RGB24_B	= 2,
 	RGB24_G	= 1,
-	RGB24_R	= 2
+	RGB24_R	= 0
 };
 
 typedef struct {
@@ -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,36 @@ void scrnmng_setextend(int extend);
 void scrnmng_setheight(int posy, int height);
 const SCRNSURF* scrnmng_surflock(void);
 void scrnmng_surfunlock(const SCRNSURF *surf);
-#define	scrnmng_update()
+void scrnmng_update(void);
 #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_isfullscreen()	(scrnmngp->flag & SCRNFLAG_FULLSCREEN)
+#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 X11 */
+
+void scrnmng_setmultiple(int multiple);
+void scrnmng_terminate(void);
+
+/*
+ * 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