--- BasiliskII/src/MacOSX/EmulatorView.h 2002/03/16 04:00:16 1.1 +++ BasiliskII/src/MacOSX/EmulatorView.h 2002/12/18 11:53:11 1.4 @@ -1,7 +1,7 @@ /* * EmulatorView.h - Custom NSView for Basilisk II window input & output * - * $Id: EmulatorView.h,v 1.1 2002/03/16 04:00:16 nigel Exp $ + * $Id: EmulatorView.h,v 1.4 2002/12/18 11:53:11 nigel Exp $ * * Basilisk II (C) 1997-2002 Christian Bauer * @@ -30,22 +30,27 @@ @interface EmulatorView : NSView { #ifdef CGIMAGEREF - CGImageRef bitmap; + CGImageRef cgImgRep; #endif #ifdef NSBITMAP NSBitmapImageRep *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 + BOOL drawView, // Set when the bitmap is all set up // and ready to display + fullScreen; // Is this Emulator using the whole screen? + + NSRect displayBox; // Cached dimensions of the screen + int screen_height; } - (void) benchmark; @@ -75,10 +80,12 @@ #endif - (void) disableDrawing; +- (void) startedFullScreen: (CGDirectDisplayID) theDisplay; - (short) width; - (short) height; +- (BOOL) isFullScreen; - (BOOL) mouseInView: (NSEvent *) event; - (BOOL) mouseInView; - (BOOL) processMouseMove: (NSEvent *) event;