commit afea5fc3fd16a2865d0af52563f601a4c03d8256 from: Russ Cox date: Thu Oct 28 01:22:03 2010 UTC mac: add 9term.app, Plumb.app R=rsc http://codereview.appspot.com/2783041 commit - c84e737c3f64030dc9b66ddb931cac757e9ba986 commit + afea5fc3fd16a2865d0af52563f601a4c03d8256 blob - f3fcf7ccb06f5aeff14e695148b6f40653b3e402 blob + c46b9095f52c14e9090509f35ba9695ed4474125 --- lib/moveplan9.files +++ lib/moveplan9.files @@ -23,6 +23,8 @@ bin/unmount bin/vwhois bin/vmount bin/yesterday +mac/9term.app/Contents/MacOS/9term +mac/Plumb.app/Contents/MacOS/plumb mail/lib/qmail mail/lib/remotemail man/mkindex blob - /dev/null blob + b6fbda798b0aec52794ccf9cf67b746c64b6f074 (mode 644) --- /dev/null +++ mac/9term.app/Contents/Info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + 9term + CFBundleGetInfoString + 0.1-1 + CFBundleIconFile + spaceglenda.icns + CFBundleIdentifier + com.swtch.9term + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + 9term + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.1 + CFBundleSignature + 9term1 + CFBundleVersion + 1 + + blob - /dev/null blob + ef6692c3add7e620301db228395a73620080e815 (mode 755) --- /dev/null +++ mac/9term.app/Contents/MacOS/9term @@ -0,0 +1,5 @@ +#!/bin/bash +cd $HOME +. ~/.bashrc +PLAN9=${PLAN9:-/usr/local/plan9} +$PLAN9/bin/9term -W600x800 & blob - /dev/null blob + 494274ced99e2788a6744bf470575d627722fd0f (mode 644) --- /dev/null +++ mac/9term.app/Contents/PkgInfo @@ -0,0 +1,2 @@ +APPL9term + blob - /dev/null blob + 058efbfdc7d9c586f3d713f1d3cf2d9c246f22a2 (mode 644) Binary files /dev/null and mac/9term.app/Contents/Resources/spaceglenda.icns differ blob - /dev/null blob + cff94bb8c078bfc60adabedfd4662c2d8b141d2b (mode 644) --- /dev/null +++ mac/Plumb.app/Contents/Info.plist @@ -0,0 +1,78 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + plumb + CFBundleGetInfoString + 1 + CFBundleIconFile + pjw.icns + CFBundleIdentifier + com.swtch.plan9port.plumb + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Plumb + CFBundlePackageType + APPL + CFBundleShortVersionString + 1 + CFBundleSignature + Plumb1 + CFBundleVersion + 1 + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + C + asm + b + c + cc + cgi + cgo + cpp + cs + go + goc + h + java + l + lx + m + ms + pl + py + s + tex + txt + xy + y + + CFBundleTypeIconFile + spaceglenda.icns + CFBundleTypeMIMETypes + + text/plain + + LSItemContentTypes + + public.plain-text + public.source-code + + CFBundleTypeName + Program Files + CFBundleTypeOSTypes + + + CFBundleTypeRole + Viewer + + + + blob - /dev/null blob + 87e355aa9d187ecf9bf6f695db7f2eb7cd9ed248 (mode 755) --- /dev/null +++ mac/Plumb.app/Contents/MacOS/plumb @@ -0,0 +1,4 @@ +#!/bin/bash +. ~/.bashrc +PLAN9=${PLAN9:-/usr/local/plan9} +$PLAN9/bin/plumb $($PLAN9/bin/macargv) blob - /dev/null blob + 05192d3003309d38f0f04f3ac0724bd54a1d5792 (mode 644) --- /dev/null +++ mac/Plumb.app/Contents/PkgInfo @@ -0,0 +1,2 @@ +APPLPlumb + blob - /dev/null blob + 1f49f2cb65ac1a6c5cb311d77bdc5d6702a04f81 (mode 644) Binary files /dev/null and mac/Plumb.app/Contents/Resources/pjw.icns differ blob - /dev/null blob + 058efbfdc7d9c586f3d713f1d3cf2d9c246f22a2 (mode 644) Binary files /dev/null and mac/spaceglenda.icns differ blob - /dev/null blob + 40d6ef03690385d937a583fedef8365921ab48d3 (mode 644) Binary files /dev/null and mac/spaceglenda.png differ blob - eda896d9a1a296e9316a265578948a034f09a59c blob + 67a865c0e680f8f162a14d7a9cf1eec80047c36d --- src/cmd/devdraw/mkfile +++ src/cmd/devdraw/mkfile @@ -41,3 +41,8 @@ CLEANFILES=latin1.h $O.mklatinkbd devdraw-cocoa: devdraw.o latin1.o mouseswap.o winsize.o osx-screen-objc.o osx-draw.o osx-srv-objc.o osx-delegate-objc.o $LD -o $target $prereq +install-macargv: $O.macargv + install $O.macargv $PLAN9/bin/macargv + +$O.macargv: macargv.$O + $LD -o $target $prereq blob - /dev/null blob + a5ea1ade7725b8d6230984c7b9c5f5a5dac78de5 (mode 644) --- /dev/null +++ src/cmd/devdraw/macargv.c @@ -0,0 +1,90 @@ +#include +#include +#include + +AUTOFRAMEWORK(Carbon) + +static OSErr Handler(const AppleEvent *event, AppleEvent *reply, long handlerRefcon); + +int +main(void) +{ + AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, Handler, 0, false); + RunApplicationEventLoop(); + return 0; +} + +static OSErr +GetFullPathname(FSSpec *fss, char *path, int len) +{ + FSRef fsr; + OSErr err; + + *path = '\0'; + err = FSpMakeFSRef(fss, &fsr); + if (err == fnfErr) { + /* FSSpecs can point to non-existing files, fsrefs can't. */ + FSSpec fss2; + int tocopy; + + err = FSMakeFSSpec(fss->vRefNum, fss->parID, + (unsigned char*)"", &fss2); + if (err) + return err; + err = FSpMakeFSRef(&fss2, &fsr); + if (err) + return err; + err = (OSErr)FSRefMakePath(&fsr, (unsigned char*)path, len-1); + if (err) + return err; + /* This part is not 100% safe: we append the filename part, but + ** I'm not sure that we don't run afoul of the various 8bit + ** encodings here. Will have to look this up at some point... + */ + strcat(path, "/"); + tocopy = fss->name[0]; + if ((strlen(path) + tocopy) >= len) + tocopy = len - strlen(path) - 1; + if (tocopy > 0) + strncat(path, (char*)fss->name+1, tocopy); + } + else { + if (err) + return err; + err = (OSErr)FSRefMakePath(&fsr, (unsigned char*)path, len); + if (err) + return err; + } + return 0; +} + +static void +chk(int err) +{ + if(err != 0) { + printf("err %d\n", err); + exit(1); + } +} + +static OSErr +Handler(const AppleEvent *event, AppleEvent *reply, long handlerRefcon) +{ + AEDesc list; + DescType type; + FSSpec f; + AEKeyword keyword; + Size actual; + long len; + char s[1000]; + + chk(AEGetParamDesc(event, keyDirectObject, typeAEList, &list)); + chk(AECountItems(&list, &len)); + chk(AEGetNthPtr(&list, 1, typeFSS, &keyword, &type, (Ptr*)&f, sizeof(FSSpec), &actual)); + chk(GetFullPathname(&f, s, sizeof s)); + printf("%s\n", s); + fflush(stdout); + + // uncomment to keep handling more open events + exit(0); +} blob - 5e65a29c84eea39e826ea6c33ae084da2ef746bb blob + 788a0e61e688e861e017e1f615177dec50208663 --- src/cmd/devdraw/mkwsysrules.sh +++ src/cmd/devdraw/mkwsysrules.sh @@ -52,6 +52,7 @@ elif [ $WSYSTYPE = osx ]; then echo 'LDFLAGS=$LDFLAGS -F/System/Library/PrivateFrameworks' fi echo 'WSYSOFILES=$WSYSOFILES osx-screen-carbon-objc.o osx-draw.o osx-srv.o' + echo 'install: install-macargv' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' fi blob - e542686540a72abe019973fa5ee08b7cf5a58785 blob + ec8710ebb417396dc5837776ab122cd86fb3d3ed --- src/cmd/rio/mkfile +++ src/cmd/rio/mkfile @@ -41,3 +41,6 @@ error.$O: showevent/ShowEvent.c $O.xshove: xshove.$O $LD -o $O.xshove xshove.$O -lX11 +# bug in reusing mksysrules.sh +install-macargv: + true