--- BasiliskII/src/MacOSX/EmulatorView.h	2002/06/05 10:18:51	1.3
+++ BasiliskII/src/MacOSX/EmulatorView.h	2004/01/12 15:29:24	1.8
@@ -1,9 +1,9 @@
 /*
  *	EmulatorView.h - Custom NSView for Basilisk II window input & output
  *
- *	$Id: EmulatorView.h,v 1.3 2002/06/05 10:18:51 nigel Exp $
+ *	$Id: EmulatorView.h,v 1.8 2004/01/12 15:29:24 cebix Exp $
  *
- *  Basilisk II (C) 1997-2002 Christian Bauer
+ *  Basilisk II (C) 1997-2004 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
@@ -30,18 +30,20 @@
 @interface EmulatorView : NSView
 {
 #ifdef CGIMAGEREF
-	CGImageRef			bitmap;
+	CGImageRef			cgImgRep;
 #endif
 #ifdef NSBITMAP
 	NSBitmapImageRep	*bitmap;
+#else
+	void				*bitmap;
 #endif
-
 #ifdef CGDRAWBITMAP
-	void				*bitmap;
 	short				bps, spp, bpp;
 	int					bytesPerRow;
 	BOOL				isPlanar, hasAlpha;
 #endif
+	float				numBytes;
+
 	short				x, y;
 
 	BOOL				drawView,	// Set when the bitmap is all set up
@@ -49,7 +51,8 @@
 						fullScreen;	// Is this Emulator using the whole screen?
 
 	NSRect				displayBox;	// Cached dimensions of the screen
-	int					screen_height;
+
+	int					screen_height; // Height of the screen with the key window
 }
 
 - (void) benchmark;
@@ -63,6 +66,7 @@
 #endif
 #ifdef CGIMAGEREF
 - (void) readyToDraw: (CGImageRef) image
+			  bitmap: (void *) theBitmap
 		  imageWidth: (short) width
 		 imageHeight: (short) height;
 #endif
@@ -81,12 +85,16 @@
 - (void) disableDrawing;
 - (void) startedFullScreen: (CGDirectDisplayID) theDisplay;
 
+- (void) blacken;
+- (void) clear;
+
 - (short) width;
 - (short) height;
 
 - (BOOL) isFullScreen;
 - (BOOL) mouseInView: (NSEvent *) event;
 - (BOOL) mouseInView;
+- (void) fullscreenMouseMove;
 - (BOOL) processMouseMove: (NSEvent *) event;
 
 #ifdef CGDRAWBITMAP