o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devdraw: minor OS X leak fixes and attempted speedups

Browse source
This commit is contained in:
Russ Cox 2008-07-09 23:49:55 -04:00
parent 7733377c43
commit c752966bcb
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/cmd/devdraw/osx-screen.c
View file

@ -48,6 +48,7 @@ struct {
MenuRef vmenu; MenuRef vmenu;
WindowRef window; WindowRef window;
CGImageRef image; CGImageRef image;
CGContextRef windowctx;
PasteboardRef snarf; PasteboardRef snarf;
} osx; } osx;
@ -466,6 +467,7 @@ eresized(int new)
int bpl; int bpl;
CGDataProviderRef provider; CGDataProviderRef provider;
CGImageRef image; CGImageRef image;
CGColorSpaceRef cspace;
GetWindowBounds(osx.window, kWindowContentRgn, &or); GetWindowBounds(osx.window, kWindowContentRgn, &or);
r = Rect(or.left, or.top, or.right, or.bottom); r = Rect(or.left, or.top, or.right, or.bottom);
@ -484,10 +486,13 @@ eresized(int new)
bpl = bytesperline(r, 32); bpl = bytesperline(r, 32);
provider = CGDataProviderCreateWithData(0, provider = CGDataProviderCreateWithData(0,
m->data->bdata, Dy(r)*bpl, 0); m->data->bdata, Dy(r)*bpl, 0);
//cspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
cspace = CGColorSpaceCreateDeviceRGB();
image = CGImageCreate(Dx(r), Dy(r), 8, 32, bpl, image = CGImageCreate(Dx(r), Dy(r), 8, 32, bpl,
CGColorSpaceCreateDeviceRGB(), cspace,
kCGImageAlphaNoneSkipLast, kCGImageAlphaNoneSkipLast,
provider, 0, 0, kCGRenderingIntentDefault); provider, 0, 0, kCGRenderingIntentDefault);
CGColorSpaceRelease(cspace);
CGDataProviderRelease(provider); // CGImageCreate did incref CGDataProviderRelease(provider); // CGImageCreate did incref
mouserect = m->r; mouserect = m->r;
@ -508,10 +513,10 @@ void
_flushmemscreen(Rectangle r) _flushmemscreen(Rectangle r)
{ {
CGRect cgr; CGRect cgr;
CGContextRef context;
CGImageRef subimg; CGImageRef subimg;
QDBeginCGContext(GetWindowPort(osx.window), &context); if(osx.windowctx == nil)
QDBeginCGContext(GetWindowPort(osx.window), &osx.windowctx);
cgr.origin.x = r.min.x; cgr.origin.x = r.min.x;
cgr.origin.y = r.min.y; cgr.origin.y = r.min.y;
@ -519,11 +524,9 @@ _flushmemscreen(Rectangle r)
cgr.size.height = Dy(r); cgr.size.height = Dy(r);
subimg = CGImageCreateWithImageInRect(osx.image, cgr); subimg = CGImageCreateWithImageInRect(osx.image, cgr);
cgr.origin.y = Dy(osx.screenr) - r.max.y; // XXX how does this make any sense? cgr.origin.y = Dy(osx.screenr) - r.max.y; // XXX how does this make any sense?
CGContextDrawImage(context, cgr, subimg); CGContextDrawImage(osx.windowctx, cgr, subimg);
CGContextFlush(context); CGContextFlush(osx.windowctx);
CGImageRelease(subimg); CGImageRelease(subimg);
QDEndCGContext(GetWindowPort(osx.window), &context);
} }
void void
@ -534,11 +537,19 @@ fullscreen(void)
GDHandle device; GDHandle device;
if(osx.isfullscreen){ if(osx.isfullscreen){
if(osx.windowctx){
QDEndCGContext(GetWindowPort(osx.window), &osx.windowctx);
osx.windowctx = nil;
}
EndFullScreen(restore, 0); EndFullScreen(restore, 0);
osx.window = oldwindow; osx.window = oldwindow;
ShowWindow(osx.window); ShowWindow(osx.window);
osx.isfullscreen = 0; osx.isfullscreen = 0;
}else{ }else{
if(osx.windowctx){
QDEndCGContext(GetWindowPort(osx.window), &osx.windowctx);
osx.windowctx = nil;
}
HideWindow(osx.window); HideWindow(osx.window);
oldwindow = osx.window; oldwindow = osx.window;
GetWindowGreatestAreaDevice(osx.window, kWindowTitleBarRgn, &device, nil); GetWindowGreatestAreaDevice(osx.window, kWindowTitleBarRgn, &device, nil);
@ -699,6 +710,7 @@ putsnarf(char *s)
qunlock(&clip.lk); qunlock(&clip.lk);
return; return;
} }
assert(sizeof(clip.rbuf[0]) == 2);
cfdata = CFDataCreate(kCFAllocatorDefault, cfdata = CFDataCreate(kCFAllocatorDefault,
(uchar*)clip.rbuf, runestrlen(clip.rbuf)*2); (uchar*)clip.rbuf, runestrlen(clip.rbuf)*2);
if(cfdata == nil){ if(cfdata == nil){
@ -713,7 +725,7 @@ putsnarf(char *s)
qunlock(&clip.lk); qunlock(&clip.lk);
return; return;
} }
/* CFRelease(cfdata); ??? */ CFRelease(cfdata);
qunlock(&clip.lk); qunlock(&clip.lk);
} }
@ -724,6 +736,7 @@ setlabel(char *label)
cs = CFStringCreateWithBytes(nil, (uchar*)osx.label, strlen(osx.label), kCFStringEncodingUTF8, false); cs = CFStringCreateWithBytes(nil, (uchar*)osx.label, strlen(osx.label), kCFStringEncodingUTF8, false);
SetWindowTitleWithCFString(osx.window, cs); SetWindowTitleWithCFString(osx.window, cs);
CFRelease(cs);
} }
static void static void