aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/devdraw
diff options
context:
space:
mode:
authorPetter Rodhelind <petter.rodhelind@gmail.com>2021-02-18 20:21:24 +0100
committerPetter Rodhelind <petter.rodhelind@gmail.com>2021-02-18 20:21:24 +0100
commit181d56ee64da53279bb6ecf49c24ab54cfb7193f (patch)
treefc6c8736bb97790a257c5514998c583ffce7c41c /src/cmd/devdraw
parent94c521bf102a74aec7e1a5c3a9ef5eaa968d4e14 (diff)
parent90971376a5e8620fc62579aa1b3be26245ec8c06 (diff)
downloadplan9port-181d56ee64da53279bb6ecf49c24ab54cfb7193f.tar.gz
plan9port-181d56ee64da53279bb6ecf49c24ab54cfb7193f.tar.bz2
plan9port-181d56ee64da53279bb6ecf49c24ab54cfb7193f.zip
Merge remote-tracking branch 'upstream/master'HEADmaster
Diffstat (limited to 'src/cmd/devdraw')
-rw-r--r--src/cmd/devdraw/mac-screen.m5
-rw-r--r--src/cmd/devdraw/mkwsysrules.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/cmd/devdraw/mac-screen.m b/src/cmd/devdraw/mac-screen.m
index ad9c029e..9e51eec6 100644
--- a/src/cmd/devdraw/mac-screen.m
+++ b/src/cmd/devdraw/mac-screen.m
@@ -238,11 +238,14 @@ rpc_attach(Client *c, char *label, char *winsize)
char *s;
NSArray *allDevices;
- const NSWindowStyleMask Winstyle = NSWindowStyleMaskTitled
+ NSWindowStyleMask Winstyle = NSWindowStyleMaskTitled
| NSWindowStyleMaskClosable
| NSWindowStyleMaskMiniaturizable
| NSWindowStyleMaskResizable;
+ if(label == nil || *label == '\0')
+ Winstyle &= ~NSWindowStyleMaskTitled;
+
s = winsize;
sr = [[NSScreen mainScreen] frame];
r = [[NSScreen mainScreen] visibleFrame];
diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh
index 122e9123..56dff55a 100644
--- a/src/cmd/devdraw/mkwsysrules.sh
+++ b/src/cmd/devdraw/mkwsysrules.sh
@@ -7,6 +7,8 @@ if [ "x$X11" = "x" ]; then
X11=/usr/X11R6
elif [ -d /usr/local/X11R6 ]; then
X11=/usr/local/X11R6
+ elif [ -d /usr/X11R7 ]; then
+ X11=/usr/X11R7
elif [ -d /usr/X ]; then
X11=/usr/X
elif [ -d /usr/openwin ]; then # for Sun