devdraw: update Lion cocoa

R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5015042

src/cmd/9pfuse/mkfile

@@ -1,5 +1,5 @@
 <$PLAN9/src/mkhdr
-<|./osxvers
+<|osxvers
 
 TARG=9pfuse
 

src/cmd/devdraw/cocoa-screen.h

@@ -7,7 +7,7 @@ void	setlabel(char*);
 char*	getsnarf(void);
 void	putsnarf(char*);
 
-void	mousetrack(int, int, int, int);
+void	mousetrack(int, int, int, uint);
 void	keystroke(int);
 void	kicklabel(char*);
 

src/cmd/devdraw/cocoa-srv.c

@@ -308,7 +308,7 @@ matchmouse(void)
 }
 
 void
-mousetrack(int x, int y, int b, int ms)
+mousetrack(int x, int y, int b, uint ms)
 {
 	Mouse *m;
 	

src/cmd/devdraw/cocoa-thread.c

@@ -23,32 +23,3 @@ qunlock(QLock *q)
 {
 	pthread_mutex_unlock(&q->m);
 }
-
-static void
-rinit(Rendez *r)
-{
-	pthread_mutex_lock(&initlock);
-	if(r->init == 0){
-		pthread_cond_init(&r->c, nil);
-		r->init = 1;
-	}
-	pthread_mutex_unlock(&initlock);
-}
-
-void
-rsleep(Rendez *r)
-{
-	if(r->init == 0)
-		rinit(r);
-	pthread_cond_wait(&r->c, &r->l->m);
-}
-
-int
-rwakeup(Rendez *r)
-{
-	if(r->init == 0)
-		rinit(r);
-	pthread_cond_signal(&r->c);
-
-	return 0;
-}

src/cmd/devdraw/cocoa-thread.h

@@ -1,12 +1,8 @@
 #define QLock DQLock
 #define qlock dqlock
 #define qunlock dqunlock
-#define Rendez DRendez
-#define rsleep drsleep
-#define rwakeup drwakeup
 
 typedef struct QLock QLock;
-typedef struct Rendez Rendez;
 
 struct QLock
 {
@@ -14,14 +10,5 @@ struct QLock
 	int init;
 };
 
-struct Rendez
-{
-	QLock *l;
-	pthread_cond_t c;
-	int init;
-};
-
 void	qlock(QLock*);
 void	qunlock(QLock*);
-void rsleep(Rendez*);
-int rwakeup(Rendez*);	/* BUG: always returns 0 */

src/cmd/devdraw/mkfile

@@ -1,4 +1,5 @@
 <$PLAN9/src/mkhdr
+<|osxvers
 
 TARG=devdraw