--- SheepShaver/src/include/video.h	2004/04/18 23:03:52	1.5
+++ SheepShaver/src/include/video.h	2005/03/27 13:44:45	1.12
@@ -1,7 +1,7 @@
 /*
  *  video.h - Video/graphics emulation
  *
- *  SheepShaver (C) 1997-2004 Marc Hellwig and Christian Bauer
+ *  SheepShaver (C) 1997-2005 Marc Hellwig and Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 extern bool VideoActivated(void);
 extern bool VideoSnapshot(int xsize, int ysize, uint8 *p);
 
-extern int16 VideoDoDriverIO(void *spaceID, void *commandID, void *commandContents, uint32 commandCode, uint32 commandKind);
+extern int16 VideoDoDriverIO(uint32 spaceID, uint32 commandID, uint32 commandContents, uint32 commandCode, uint32 commandKind);
 
 // System specific and internal functions/data
 struct VideoInfo {
@@ -90,8 +90,9 @@ enum {	// viAppleID
 	APPLE_1152x900,
 	APPLE_1280x1024,
 	APPLE_1600x1200,
+	APPLE_CUSTOM,
 	APPLE_ID_MIN = APPLE_640x480,
-	APPLE_ID_MAX = APPLE_1600x1200
+	APPLE_ID_MAX = APPLE_CUSTOM
 };
 
 enum {	// Display type
@@ -108,14 +109,12 @@ extern rgb_color mac_pal[256];
 extern uint8 remap_mac_be[256];
 extern uint8 MacCursor[68];
 
-struct GammaTbl;
-
 struct VidLocals{
 	uint16	saveMode;
 	uint32	saveData;
 	uint16	savePage;
 	uint32	saveBaseAddr;
-	GammaTbl *gammaTable;		// Current gamma table
+	uint32	gammaTable;			// Mac address of gamma tble
 	uint32	maxGammaTableSize;	// Biggest gamma table allocated
 	uint32	saveVidParms;
 	bool	luminanceMapping;	// Luminance mapping on/off
@@ -125,7 +124,7 @@ struct VidLocals{
 	uint32	cursorSet;
 	uint32	vslServiceID;		// VSL interrupt service ID
 	bool	interruptsEnabled;	// VBL interrupts on/off
-	uint32	regEntryID[4];
+	uint32	regEntryID;			// Mac address of the service owner
 };
 
 extern VidLocals *private_data;	// Pointer to driver local variables (there is only one display, so this is ok)
@@ -138,19 +137,19 @@ extern void VideoQuitFullScreen(void);
 
 extern void video_set_palette(void);
 extern void video_set_cursor(void);
+extern bool video_can_change_cursor(void);
 extern int16 video_mode_change(VidLocals *csSave, uint32 ParamPtr);
 
 extern int16 VSLDoInterruptService(uint32 arg1);
-extern void NQDMisc(uint32 arg1, void *arg2);
+extern void NQDMisc(uint32 arg1, uintptr arg2);
 
 // Native QuickDraw acceleration callbacks
 extern bool NQD_sync_hook(uint32);
 extern bool NQD_bitblt_hook(uint32);
-//extern bool NQD_fillrect_hook(uint32);
+extern bool NQD_fillrect_hook(uint32);
 extern void NQD_bitblt(uint32);
-//extern void NQD_invrect(uint32);
-//extern void NQD_fillrect8(uint32);
-//extern void NQD_fillrect32(uint32);
+extern void NQD_invrect(uint32);
+extern void NQD_fillrect(uint32);
 
 extern bool keyfile_valid;