From 4d3c36cce4d70dfd88bd5e782e86141775577d30 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 5 Apr 2019 20:43:21 +0200 Subject: devdraw: respond to windowDidBecomeKey on darwin (#239) Fixes bug where devdraw does not "notice" mouse position after task switch. Fixes https://github.com/9fans/plan9port/issues/232. --- src/cmd/devdraw/cocoa-screen-metal.m | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/cmd/devdraw') diff --git a/src/cmd/devdraw/cocoa-screen-metal.m b/src/cmd/devdraw/cocoa-screen-metal.m index 049d1c5c..21123f16 100644 --- a/src/cmd/devdraw/cocoa-screen-metal.m +++ b/src/cmd/devdraw/cocoa-screen-metal.m @@ -373,6 +373,11 @@ struct Cursors { return YES; } +- (void)windowDidBecomeKey:(id)arg +{ + [myContent sendmouse:0]; +} + @end @implementation DevDrawView -- cgit v1.2.3 From 0308e1f010cd8650840fa0ceee3b342229982420 Mon Sep 17 00:00:00 2001 From: Xiao-Yong Date: Fri, 5 Apr 2019 12:44:47 -0600 Subject: devdraw: fix cocoa metal _flushmemscreen for invalid rectangles (#240) It is possible to receive multiple screen resize events, and resizeimg would be called for different sizes, before _flushmemscreen actually gets called with rectangle sizes different from the most recent resizeimg call. The size mismatch would trigger illegal memory access inside _flushmemscreen. This commit protects _flushmemscreen by returning early if the requested rectangle is outside of the current texture rectangle. --- src/cmd/devdraw/cocoa-screen-metal.m | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/cmd/devdraw') diff --git a/src/cmd/devdraw/cocoa-screen-metal.m b/src/cmd/devdraw/cocoa-screen-metal.m index 21123f16..78110302 100644 --- a/src/cmd/devdraw/cocoa-screen-metal.m +++ b/src/cmd/devdraw/cocoa-screen-metal.m @@ -987,6 +987,10 @@ void _flushmemscreen(Rectangle r) { LOG(@"_flushmemscreen(%d,%d,%d,%d)", r.min.x, r.min.y, Dx(r), Dy(r)); + if(!rectinrect(r, Rect(0, 0, texture.width, texture.height))){ + LOG(@"Rectangle is out of bounds, return."); + return; + } @autoreleasepool{ [texture -- cgit v1.2.3 From 26c6b2579543e928158fa7d3c00d8b0e04ac270c Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 5 Apr 2019 15:04:10 -0400 Subject: devdraw: avoid deadlock on pre-Mojave macOS --- src/cmd/devdraw/cocoa-screen.m | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/cmd/devdraw') diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m index c2489a6c..97128da2 100644 --- a/src/cmd/devdraw/cocoa-screen.m +++ b/src/cmd/devdraw/cocoa-screen.m @@ -541,6 +541,11 @@ _flushmemscreen(Rectangle r) return; rect = NSMakeRect(r.min.x, r.min.y, Dx(r), Dy(r)); + + // This can get blocked behind responding to mouse events, + // which need to acquire the zlock, so let go of it during + // the flush. Perhaps the waitUntilDone:YES is wrong? + zunlock(); [appdelegate performSelectorOnMainThread:@selector(callflushimg:) withObject:[NSValue valueWithRect:rect] @@ -548,6 +553,7 @@ _flushmemscreen(Rectangle r) modes:[NSArray arrayWithObjects: NSRunLoopCommonModes, @"waiting image", nil]]; + zlock(); } static void drawimg(NSRect, uint); -- cgit v1.2.3 From 61601587295f6d0ef1c4084530fe0318e0c72b16 Mon Sep 17 00:00:00 2001 From: Chris Schultz Date: Fri, 5 Apr 2019 14:08:20 -0500 Subject: devdraw: prefer low-power GPU for macOS metal rendering (#231) --- src/cmd/devdraw/cocoa-screen-metal.m | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/cmd/devdraw') diff --git a/src/cmd/devdraw/cocoa-screen-metal.m b/src/cmd/devdraw/cocoa-screen-metal.m index 78110302..21c041a5 100644 --- a/src/cmd/devdraw/cocoa-screen-metal.m +++ b/src/cmd/devdraw/cocoa-screen-metal.m @@ -153,6 +153,7 @@ threadmain(int argc, char **argv) id library; MTLRenderPipelineDescriptor *pipelineDesc; NSError *error; + NSArray *allDevices; const NSWindowStyleMask Winstyle = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable @@ -197,8 +198,18 @@ threadmain(int argc, char **argv) [win setContentView:myContent]; [myContent setWantsLayer:YES]; [myContent setLayerContentsRedrawPolicy:NSViewLayerContentsRedrawOnSetNeedsDisplay]; - - device = MTLCreateSystemDefaultDevice(); + + device = nil; + allDevices = MTLCopyAllDevices(); + for(id mtlDevice in allDevices) { + if ([mtlDevice isLowPower] && ![mtlDevice isRemovable]) { + device = mtlDevice; + break; + } + } + if(!device) + device = MTLCreateSystemDefaultDevice(); + commandQueue = [device newCommandQueue]; layer = (DrawLayer *)[myContent layer]; -- cgit v1.2.3 From 7bb69ba88b8083b3eb9b3afefd8cdeae6aea2149 Mon Sep 17 00:00:00 2001 From: Fazlul Shahriar Date: Fri, 5 Apr 2019 15:09:35 -0400 Subject: libdraw,devdraw: fix compatibility with old 16x16 cursor protocol (#217) Some libraries that depend on devdraw don't know about 32x32 cursor -- mainly 9fans.net/go/draw. --- src/cmd/devdraw/cocoa-srv.c | 8 ++++++++ src/cmd/devdraw/x11-srv.c | 1 + 2 files changed, 9 insertions(+) (limited to 'src/cmd/devdraw') diff --git a/src/cmd/devdraw/cocoa-srv.c b/src/cmd/devdraw/cocoa-srv.c index 329dd71f..c1cf5983 100644 --- a/src/cmd/devdraw/cocoa-srv.c +++ b/src/cmd/devdraw/cocoa-srv.c @@ -162,6 +162,14 @@ runmsg(Wsysmsg *m) break; case Tcursor: + if(m->arrowcursor) + setcursor(nil, nil); + else + setcursor(&m->cursor, nil); + replymsg(m); + break; + + case Tcursor2: if(m->arrowcursor) setcursor(nil, nil); else diff --git a/src/cmd/devdraw/x11-srv.c b/src/cmd/devdraw/x11-srv.c index 17563f41..81416482 100644 --- a/src/cmd/devdraw/x11-srv.c +++ b/src/cmd/devdraw/x11-srv.c @@ -332,6 +332,7 @@ runmsg(Wsysmsg *m) break; case Tcursor: + case Tcursor2: if(m->arrowcursor) _xsetcursor(nil); else -- cgit v1.2.3 From 317c3cdb76806629e8c2710b7fb9a69cc3e46867 Mon Sep 17 00:00:00 2001 From: Xiao-Yong Date: Fri, 5 Apr 2019 13:11:11 -0600 Subject: devdraw: stop redirecting ^H in cocoa-metal (#209) --- src/cmd/devdraw/cocoa-screen-metal.m | 1 - 1 file changed, 1 deletion(-) (limited to 'src/cmd/devdraw') diff --git a/src/cmd/devdraw/cocoa-screen-metal.m b/src/cmd/devdraw/cocoa-screen-metal.m index 21c041a5..5fc03172 100644 --- a/src/cmd/devdraw/cocoa-screen-metal.m +++ b/src/cmd/devdraw/cocoa-screen-metal.m @@ -857,7 +857,6 @@ keycvt(uint code) { switch(code){ case '\r': return '\n'; - case '\b': return 127; case 127: return '\b'; case NSUpArrowFunctionKey: return Kup; case NSDownArrowFunctionKey: return Kdown; -- cgit v1.2.3