Browse Source

Plan 9 from Bell Labs 2006-02-26

David du Colombier 18 years ago
parent
commit
bcf4302582
6 changed files with 26 additions and 30 deletions
  1. 3 3
      dist/replica/_plan9.db
  2. 3 3
      dist/replica/plan9.db
  3. 4 0
      dist/replica/plan9.log
  4. 13 21
      sys/man/2/graphics
  5. 1 1
      sys/man/2/mouse
  6. 2 2
      sys/src/cmd/tapefs/tapefs.h

+ 3 - 3
dist/replica/_plan9.db

@@ -7469,7 +7469,7 @@ sys/man/2/getfields - 664 sys sys 1068209043 1605
 sys/man/2/getpid - 664 sys sys 944959694 657
 sys/man/2/getuser - 664 sys sys 1016466457 641
 sys/man/2/getwd - 664 sys sys 971455511 701
-sys/man/2/graphics - 664 sys sys 1121858846 13131
+sys/man/2/graphics - 664 sys sys 1140900146 12765
 sys/man/2/html - 664 sys sys 1019828742 29269
 sys/man/2/httpd - 664 sys sys 1032633536 5941
 sys/man/2/hypot - 664 sys sys 944959693 302
@@ -7487,7 +7487,7 @@ sys/man/2/memdraw - 664 sys sys 1133883757 10112
 sys/man/2/memlayer - 664 sys sys 1040484074 6963
 sys/man/2/memory - 664 sys sys 944959694 2139
 sys/man/2/mktemp - 664 sys sys 950892862 669
-sys/man/2/mouse - 664 sys sys 971455512 4966
+sys/man/2/mouse - 664 sys sys 1140900146 4952
 sys/man/2/mp - 664 sys sys 1140106703 10762
 sys/man/2/muldiv - 664 sys sys 984709633 639
 sys/man/2/nan - 664 sys sys 975084242 937
@@ -13305,7 +13305,7 @@ sys/src/cmd/tapefs/32vfs.c - 664 sys sys 1140814623 3710
 sys/src/cmd/tapefs/cpiofs.c - 664 sys sys 1140814623 2491
 sys/src/cmd/tapefs/fs.c - 664 sys sys 1140814810 9754
 sys/src/cmd/tapefs/mkfile - 664 sys sys 1097914131 254
-sys/src/cmd/tapefs/tapefs.h - 664 sys sys 1140814624 1637
+sys/src/cmd/tapefs/tapefs.h - 664 sys sys 1140875580 1702
 sys/src/cmd/tapefs/tapfs.c - 664 sys sys 1140814624 1924
 sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1140815766 2759
 sys/src/cmd/tapefs/tpfs.c - 664 sys sys 1140814810 1999

+ 3 - 3
dist/replica/plan9.db

@@ -7469,7 +7469,7 @@ sys/man/2/getfields - 664 sys sys 1068209043 1605
 sys/man/2/getpid - 664 sys sys 944959694 657
 sys/man/2/getuser - 664 sys sys 1016466457 641
 sys/man/2/getwd - 664 sys sys 971455511 701
-sys/man/2/graphics - 664 sys sys 1121858846 13131
+sys/man/2/graphics - 664 sys sys 1140900146 12765
 sys/man/2/html - 664 sys sys 1019828742 29269
 sys/man/2/httpd - 664 sys sys 1032633536 5941
 sys/man/2/hypot - 664 sys sys 944959693 302
@@ -7487,7 +7487,7 @@ sys/man/2/memdraw - 664 sys sys 1133883757 10112
 sys/man/2/memlayer - 664 sys sys 1040484074 6963
 sys/man/2/memory - 664 sys sys 944959694 2139
 sys/man/2/mktemp - 664 sys sys 950892862 669
-sys/man/2/mouse - 664 sys sys 971455512 4966
+sys/man/2/mouse - 664 sys sys 1140900146 4952
 sys/man/2/mp - 664 sys sys 1140106703 10762
 sys/man/2/muldiv - 664 sys sys 984709633 639
 sys/man/2/nan - 664 sys sys 975084242 937
@@ -13305,7 +13305,7 @@ sys/src/cmd/tapefs/32vfs.c - 664 sys sys 1140814623 3710
 sys/src/cmd/tapefs/cpiofs.c - 664 sys sys 1140814623 2491
 sys/src/cmd/tapefs/fs.c - 664 sys sys 1140814810 9754
 sys/src/cmd/tapefs/mkfile - 664 sys sys 1097914131 254
-sys/src/cmd/tapefs/tapefs.h - 664 sys sys 1140814624 1637
+sys/src/cmd/tapefs/tapefs.h - 664 sys sys 1140875580 1702
 sys/src/cmd/tapefs/tapfs.c - 664 sys sys 1140814624 1924
 sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1140815766 2759
 sys/src/cmd/tapefs/tpfs.c - 664 sys sys 1140814810 1999

+ 4 - 0
dist/replica/plan9.log

@@ -27869,3 +27869,7 @@
 1140814852 10 c sys/src/cmd/tapefs/zipfs.c - 664 sys sys 1140814625 6588
 1140816653 0 c rc/bin/yesterday - 775 sys sys 1140816178 2439
 1140816653 1 c sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1140815766 2759
+1140874268 0 c sys/src/cmd/tapefs/tapefs.h - 664 sys sys 1140872664 1701
+1140876068 0 c sys/src/cmd/tapefs/tapefs.h - 664 sys sys 1140875580 1702
+1140901275 0 c sys/man/2/graphics - 664 sys sys 1140900146 12765
+1140901275 1 c sys/man/2/mouse - 664 sys sys 1140900146 4952

+ 13 - 21
sys/man/2/graphics

@@ -1,6 +1,6 @@
 .TH GRAPHICS 2
 .SH NAME
-Display, Point, Rectangle, Cursor, initdraw, geninitdraw, drawerror, initdisplay, closedisplay, getdefont, getwindow, gengetwindow, flushimage, bufimage, lockdisplay, unlockdisplay, cursorswitch, cursorset, openfont, buildfont, freefont, Pfmt, Rfmt, strtochan, chantostr, chantodepth \- interactive graphics
+Display, Point, Rectangle, Cursor, initdraw, geninitdraw, drawerror, initdisplay, closedisplay, getdefont, getwindow, gengetwindow, flushimage, bufimage, lockdisplay, unlockdisplay, openfont, buildfont, freefont, Pfmt, Rfmt, strtochan, chantostr, chantodepth \- interactive graphics
 .SH SYNOPSIS
 .nf
 .PP
@@ -62,12 +62,6 @@ int	gengetwindow(Display *d, char *winname,
 	   Image **ip, Screen **sp, int ref)
 .PP
 .B
-void	cursorswitch(Cursor *curs)
-.PP
-.B
-void	cursorset(Point p)
-.PP
-.B
 Font*	openfont(Display *d, char *name)
 .PP
 .B
@@ -276,6 +270,18 @@ as a mask to draw white at the pixels where
 is one, and then drawing black at the pixels where
 .B set
 is one.
+.I Setcursor
+and
+.I moveto
+(see
+.IR mouse (2))
+and
+.I esetcursor
+and
+.I emoveto
+(see
+.IR event (2))
+change the cursor image and its location on the screen.
 .PP
 The routine
 .I initdraw
@@ -502,20 +508,6 @@ and
 .B Screen
 variables for the new window.
 .PP
-The mouse cursor is always displayed.
-The initial cursor is an arrow.
-.I Cursorswitch
-causes the argument cursor to be displayed instead.
-A zero argument causes a switch back to the arrow cursor.
-.I Cursorset
-moves the mouse cursor to position
-.IR p ,
-provided (if in a window) that the requesting program is
-executing in the current window and the mouse is within
-the window boundaries; otherwise
-.I cursorset
-is a no-op.
-.PP
 The graphics functions described in
 .IR draw (2),
 .IR allocimage (2),

+ 1 - 1
sys/man/2/mouse

@@ -1,6 +1,6 @@
 .TH MOUSE 2
 .SH NAME
-initmouse, readmouse, closemouse, moveto, cursorswitch, getrect, drawgetrect, menuhit, setcursor \- mouse control
+initmouse, readmouse, closemouse, moveto, getrect, drawgetrect, menuhit, setcursor \- mouse control
 .SH SYNOPSIS
 .nf
 .B

+ 2 - 2
sys/src/cmd/tapefs/tapefs.h

@@ -1,7 +1,7 @@
 #define	g2byte(x)	(((x)[1]<<8) + (x)[0])		/* little-endian */
 #define	g3byte(x)	(((x)[2]<<16) + ((x)[1]<<8) + (x)[0])
 #define	g4byte(x)	(((x)[3]<<24) + ((x)[2]<<16) + ((x)[1]<<8) + (x)[0])
-
+#define	g8byte(x)	(((vlong)g4byte(x)<<32) | (u32int)g4byte(x+4))
 enum
 {
 	OPERM	= 0x3,		/* mask of all permission types in open mode */
@@ -40,7 +40,7 @@ struct Ram
 	char	*group;
 	vlong addr;
 	void *data;
-	long	ndata;
+	vlong	ndata;
 };
 
 enum