--- np2/x11/scrnmng.h	2003/11/16 16:43:45	1.1
+++ np2/x11/scrnmng.h	2011/01/15 19:16:58	1.9
@@ -1,10 +1,12 @@
 #ifndef	NP2_X11_SCRNMNG_H__
 #define	NP2_X11_SCRNMNG_H__
 
+G_BEGIN_DECLS
+
 enum {
-	RGB24_B	= 0,
+	RGB24_B	= 2,
 	RGB24_G	= 1,
-	RGB24_R	= 2
+	RGB24_R	= 0
 };
 
 typedef struct {
@@ -40,12 +42,7 @@ typedef struct {
 	BYTE	palchanged;
 } SCRNMNG;
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern SCRNMNG scrnmng;
+extern SCRNMNG *scrnmngp;
 
 void scrnmng_initialize(void);
 BOOL scrnmng_create(BYTE scrnmode);
@@ -59,16 +56,33 @@ void scrnmng_surfunlock(const SCRNSURF *
 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);
 
-#ifdef __cplusplus
-}
-#endif
+/* -- for X11 */
+
+void scrnmng_setmultiple(int multiple);
+void scrnmng_fullscreen(int onoff);
+
+/*
+ * 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);
+
+G_END_DECLS
 
 #endif	/* NP2_X11_SCRNMNG_H__ */