significant macos progress, now compiles/runs on monetery

include/Mw/LowLevel/Cocoa.h

@@ -11,10 +11,9 @@
 #include <Mw/TypeDefs.h>
 
 #ifdef __OBJC__
-
-#import <Foundation/NSGeometry.h>
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
+#import <Foundation/NSGeometry.h>
 
 #ifdef __APPLE__
 #import <CoreServices/CoreServices.h>
@@ -23,97 +22,104 @@
 #endif
 
 @interface MilskoCocoaPixmap : NSObject {
-	int	 width;
-	int	 height;
-	NSData*	 data;
-	NSImage* image;
+  MwBool valid;
+  int width;
+  int height;
+  NSData *data;
+  NSImage *image;
+  NSBitmapImageRep *rep;
 }
 
-+ (MilskoCocoaPixmap*)newWithWidth:(int)width height:(int)height;
-- (void)updateWithData:(void*)data;
++ (MilskoCocoaPixmap *)newWithWidth:(int)width height:(int)height;
+- (void)updateWithData:(unsigned char *)data;
 - (void)destroy;
 
-/* using @property to create instance variables fucks up 10.4 gcc for some reason? */
-- (NSImage*)image;
+/* using @property to create instance variables fucks up 10.4 gcc for some
+ * reason? */
+- (NSImage *)image;
 
 @end
 
 @interface MilskoCocoaView : NSView {
-	CGContextRef	  cg;
-	CGColorSpaceRef	  space;
-	CGDataProviderRef provider;
-	MwU32*		  buf;
-	float		  width;
-	float		  height;
+  NSBitmapImageRep *rep;
+  NSGraphicsContext *context;
+  MwBool valid;
+  CGColorSpaceRef space;
+  CGDataProviderRef provider;
+  unsigned char *buf;
+  float width;
+  float height;
 }
 
-- (CGContextRef)context;
+- (NSGraphicsContext *)context;
 @end
 
 @interface MilskoCocoa : NSObject {
-	NSApplication*	 application;
-	NSWindow*	 window;
-	NSRect		 rect;
-	MilskoCocoaView* view;
+  NSApplication *application;
+  NSEvent *lastEvent;
+  NSWindow *window;
+  NSRect rect;
+  MilskoCocoaView *view;
+  MwLL parent;
 }
 
-+ (MilskoCocoa*)newWithParent:(MwLL)parent
-			    x:(int)x
-			    y:(int)y
-			width:(int)width
-		       height:(int)height;
-- (void)polygonWithPoints:(MwPoint*)points
-	     points_count:(int)points_count
-		    color:(MwLLColor)color;
-- (void)lineWithPoints:(MwPoint*)points color:(MwLLColor)color;
-- (void)getX:(int*)x Y:(int*)y W:(unsigned int*)w H:(unsigned int*)h;
++ (MilskoCocoa *)newWithParent:(MwLL)parent
+                             x:(int)x
+                             y:(int)y
+                         width:(int)width
+                        height:(int)height;
+- (void)polygonWithPoints:(MwPoint *)points
+             points_count:(int)points_count
+                    color:(MwLLColor)color;
+- (void)lineWithPoints:(MwPoint *)points color:(MwLLColor)color;
+- (void)getX:(int *)x Y:(int *)y W:(unsigned int *)w H:(unsigned int *)h;
 - (void)setX:(int)x Y:(int)y;
 - (void)setW:(int)w H:(int)h;
 - (int)pending;
 - (void)getNextEvent;
-- (void)setTitle:(const char*)title;
-- (void)drawPixmap:(MwLLPixmap)pixmap rect:(MwRect*)rect;
+- (void)setTitle:(const char *)title;
+- (void)drawPixmap:(MwLLPixmap)pixmap rect:(MwRect *)rect;
 - (void)setIcon:(MwLLPixmap)pixmap;
 - (void)forceRender;
-- (void)setCursor:(MwCursor*)image mask:(MwCursor*)mask;
-- (void)detachWithPoint:(MwPoint*)point;
+- (void)setCursor:(MwCursor *)image mask:(MwCursor *)mask;
+- (void)detachWithPoint:(MwPoint *)point;
 - (void)show:(int)show;
 - (void)makePopupWithParent:(MwLL)parent;
 - (void)setSizeHintsWithMinX:(int)minx
-			MinY:(int)miny
-			MaxX:(int)maxx
-			MaxY:(int)maxy;
+                        MinY:(int)miny
+                        MaxX:(int)maxx
+                        MaxY:(int)maxy;
 - (void)makeBorderless:(int)toggle;
 - (void)focus;
 - (void)grabPointer:(int)toggle;
-- (void)setClipboard:(const char*)text;
+- (void)setClipboard:(const char *)text;
 - (void)makeToolWindow;
-- (void)getCursorCoord:(MwPoint*)point;
-- (void)getScreenSize:(MwRect*)rect;
+- (void)getCursorCoord:(MwPoint *)point;
+- (void)getScreenSize:(MwRect *)rect;
 - (void)destroy;
 
 @end
 #define OBJC(x) x
 #else
-#define OBJC(x) void*
+#define OBJC(x) void *
 #endif
 
 MWDECL int MwLLCocoaCallInit(void);
 
 struct _MwLLCocoa {
-	struct _MwLLCommon common;
-	OBJC(MilskoCocoa*)
-	real;
+  struct _MwLLCommon common;
+  OBJC(MilskoCocoa *)
+  real;
 };
 
 struct _MwLLCocoaColor {
-	struct _MwLLCommonColor common;
+  struct _MwLLCommonColor common;
 };
 
 struct _MwLLCocoaPixmap {
-	struct _MwLLCommonPixmap common;
-	OBJC(MilskoCocoaPixmap*)
-	real;
+  struct _MwLLCommonPixmap common;
+  OBJC(MilskoCocoaPixmap *)
+  real;
 };
 
 #endif