#include <org/ibex/plat/Darwin.h>
#include <org/ibex/plat/Darwin$CarbonSurface.h>
+#include <org/ibex/plat/Darwin$GLCarbonSurface$GLCarbonSurfacePixelBuffer.h>
#include <org/ibex/plat/Darwin$GLCarbonSurface.h>
#include <org/ibex/plat/Darwin$GLCarbonPixelBuffer.h>
#include <org/ibex/plat/Darwin$CarbonMessage.h>
};
// CHECKME: Is just making up your own four char codes really correct?
-const static UInt32 kEventClassCarbonMessage = 'ibexa';
-const static UInt32 kEventCarbonMessage = 'ibexb';
-const static UInt32 kEventParamCarbonMessage = 'ibexc';
+const static UInt32 kEventClassCarbonMessage = 'ibxa';
+const static UInt32 kEventCarbonMessage = 'ibxb';
+const static UInt32 kEventParamCarbonMessage = 'ibxc';
static OSStatus carbonMessageEventHandler(EventHandlerCallRef handler, EventRef e, void *userData);
static EventHandlerUPP carbonMessageEventHandlerUPP;
Darwin$CarbonSurface *surface = (Darwin$CarbonSurface*) userData;
Rect rect;
WC(GetRegionBounds)(inClientPaintRgn, &rect);
- surface->Dirty(rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top);
+ surface->dirty(rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top);
return noErr;
}
WindowAttributes attr = kWindowStandardHandlerAttribute|
(framed ? kWindowInWindowMenuAttribute|kWindowStandardDocumentAttributes|kWindowLiveResizeAttribute : 0);
OSStatus r;
- rect.top = rect.left = 0;
- rect.bottom = rect.right = 10;
- winWidth = winHeight = 10;
+ rect.top = rect.left = 100;
+ rect.bottom = rect.right = 200;
+ winWidth = winHeight = 100;
r = WC(CreateNewWindow)(wc, attr, &rect, &window);
checkStatus(r,"CreateNewWindow");
WC(DisposeWindow)(window);
}
-void Darwin$CarbonSurface::natSetIcon(org::ibex::Picture *_p) {
+void Darwin$CarbonSurface::natSetIcon(org::ibex::graphics::Picture *_p) {
}
void Darwin$CarbonSurface::natSetLocation() {
checkStatus(r,"PutScrapFlavor");
}
-HTTP$Proxy *Darwin::natDetectProxy() {
- using org::ibex::HTTP$Proxy;
- HTTP$Proxy *p=0;
+org::ibex::net::HTTP$Proxy *Darwin::natDetectProxy() {
+ org::ibex::net::HTTP$Proxy *p=0;
CFStringRef string;
CFNumberRef number;
SmartCFString smartString;
number = (CFNumberRef) WC(CFDictionaryGetValue)(proxyInfo, kSCPropNetProxies ## proto ## Port); \
if(number != NULL && WC(CFGetTypeID)(number) != WC(CFNumberGetTypeID)()) number = NULL; \
if(string && number && WC(CFNumberGetValue)(number,kCFNumberIntType,&i) && i) { \
- if(!p) p = new HTTP$Proxy(); \
+ if(!p) p = new org::ibex::net::HTTP$Proxy(); \
p->var ## ProxyHost = cfStringToJString(string); \
p->var ## ProxyPort = i; \
} \
WC(aglSetCurrentContext)(ctx);
}
+void Darwin$GLCarbonSurface$GLCarbonSurfacePixelBuffer::activateContext() {
+ // hooray for Brian's forward-thinking design abstractions, because I have no idea what the fuck this does, but it works
+ AGLContext ctx = (AGLContext) rawCTX;
+ WC(aglSetCurrentContext)(ctx);
+}
+
void Darwin$GLCarbonPixelBuffer::natCleanup(RawData* rawWindowRef, RawData* rawCTX) {
WindowRef window = (WindowRef) rawWindowRef;
AGLContext ctx = (AGLContext) rawCTX;