Browse Source

Plan 9 from Bell Labs 2005-06-14

David du Colombier 16 years ago
parent
commit
66be1ed790

+ 10 - 4
dist/replica/_plan9.db

@@ -281,7 +281,7 @@
 386/bin/ip/ftpd - 775 sys sys 1116903734 169211
 386/bin/ip/gizzard - 775 sys sys 1081480408 101521
 386/bin/ip/gping - 775 sys sys 1116126318 182819
-386/bin/ip/hogports - 775 sys sys 1115950083 42883
+386/bin/ip/hogports - 775 sys sys 1118632064 42883
 386/bin/ip/httpd - 20000000775 sys sys 1016920846 0
 386/bin/ip/httpd/httpd - 775 sys sys 1115950083 290319
 386/bin/ip/httpd/imagemap - 775 sys sys 1115950084 114785
@@ -347,7 +347,7 @@
 386/bin/nntpfs - 775 sys sys 1115950100 160898
 386/bin/ns - 775 sys sys 1115950100 65260
 386/bin/p - 775 sys sys 1115950100 64990
-386/bin/page - 775 sys sys 1115950101 232679
+386/bin/page - 775 sys sys 1118671839 232775
 386/bin/paqfs - 775 sys sys 1115950101 107558
 386/bin/passwd - 775 sys sys 1115950101 83747
 386/bin/pbd - 775 sys sys 1085077087 4661
@@ -5761,6 +5761,8 @@ sys/doc/venti/venti.pdf - 755 sys sys 1020384352 139090
 sys/doc/venti/venti.ps - 664 sys sys 1019852320 2012620
 sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
+sys/games/lib/4scores - 664 sys sys 1118680448 0
+sys/games/lib/5scores - 664 sys sys 1118680453 0
 sys/games/lib/fortunes - 664 sys sys 1117193231 253904
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
@@ -13861,6 +13863,8 @@ sys/src/fs/sony/mem.h - 664 sys sys 1015110103 2865
 sys/src/fs/sony/mkfile - 664 sys sys 1091803623 1594
 sys/src/fs/worms - 664 sys sys 1015110031 2806
 sys/src/games - 20000000775 sys sys 1095792091 0
+sys/src/games/4s.c - 664 sys sys 1118672529 1466
+sys/src/games/5s.c - 664 sys sys 1118672529 3802
 sys/src/games/catback.p - 664 sys sys 1108184106 35763
 sys/src/games/catclock.c - 664 sys sys 1108184106 10354
 sys/src/games/eyes.p - 664 sys sys 1108184106 1128
@@ -13872,7 +13876,7 @@ sys/src/games/mahjongg/mahjongg.c - 644 sys sys 1095792293 3452
 sys/src/games/mahjongg/mahjongg.h - 644 sys sys 1095792293 1606
 sys/src/games/mahjongg/mkfile - 644 sys sys 1095792293 230
 sys/src/games/memo.c - 644 sys sys 1110436470 6837
-sys/src/games/mkfile - 664 sys sys 1110435498 533
+sys/src/games/mkfile - 664 sys sys 1118672535 567
 sys/src/games/music - 20000000775 sys sys 1103793915 0
 sys/src/games/music/Readme - 664 sys sys 1103793914 488
 sys/src/games/music/debug.h - 664 sys sys 1103793914 201
@@ -13940,6 +13944,7 @@ sys/src/games/sudoku/levels.c - 664 sys sys 1117226433 3186
 sys/src/games/sudoku/mkfile - 664 sys sys 1117226432 218
 sys/src/games/sudoku/sudoku.c - 664 sys sys 1117636441 7809
 sys/src/games/sudoku/sudoku.h - 664 sys sys 1117226432 1159
+sys/src/games/xs.h - 664 sys sys 1118672529 14310
 sys/src/lib9p - 20000000775 sys sys 1015023311 0
 sys/src/lib9p/_post.c - 664 sys sys 1103565871 1642
 sys/src/lib9p/dirread.c - 664 sys sys 1015023310 641
@@ -15044,4 +15049,5 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/ip/hogports - 775 sys sys 1118632064 42883
+386/bin/games/4s - 775 sys sys 1118718525 175529
+386/bin/games/5s - 775 sys sys 1118718525 178065

+ 9 - 2
dist/replica/plan9.db

@@ -245,6 +245,8 @@
 386/bin/fs/zipfs - 775 sys sys 1115950074 109088
 386/bin/ftpfs - 775 sys sys 1116903732 271518
 386/bin/games - 20000000775 sys sys 1096298711 0
+386/bin/games/4s - 775 sys sys 1118718525 175529
+386/bin/games/5s - 775 sys sys 1118718525 178065
 386/bin/games/catclock - 775 sys sys 1115950075 140798
 386/bin/games/juggle - 775 sys sys 1118202754 125319
 386/bin/games/jukebox - 775 sys sys 1105589128 264821
@@ -347,7 +349,7 @@
 386/bin/nntpfs - 775 sys sys 1115950100 160898
 386/bin/ns - 775 sys sys 1115950100 65260
 386/bin/p - 775 sys sys 1115950100 64990
-386/bin/page - 775 sys sys 1115950101 232679
+386/bin/page - 775 sys sys 1118671839 232775
 386/bin/paqfs - 775 sys sys 1115950101 107558
 386/bin/passwd - 775 sys sys 1115950101 83747
 386/bin/pbd - 775 sys sys 1085077087 4661
@@ -5761,6 +5763,8 @@ sys/doc/venti/venti.pdf - 755 sys sys 1020384352 139090
 sys/doc/venti/venti.ps - 664 sys sys 1019852320 2012620
 sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
+sys/games/lib/4scores - 664 sys sys 1118680448 0
+sys/games/lib/5scores - 664 sys sys 1118680453 0
 sys/games/lib/fortunes - 664 sys sys 1117193231 253904
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
@@ -13861,6 +13865,8 @@ sys/src/fs/sony/mem.h - 664 sys sys 1015110103 2865
 sys/src/fs/sony/mkfile - 664 sys sys 1091803623 1594
 sys/src/fs/worms - 664 sys sys 1015110031 2806
 sys/src/games - 20000000775 sys sys 1095792091 0
+sys/src/games/4s.c - 664 sys sys 1118672529 1466
+sys/src/games/5s.c - 664 sys sys 1118672529 3802
 sys/src/games/catback.p - 664 sys sys 1108184106 35763
 sys/src/games/catclock.c - 664 sys sys 1108184106 10354
 sys/src/games/eyes.p - 664 sys sys 1108184106 1128
@@ -13872,7 +13878,7 @@ sys/src/games/mahjongg/mahjongg.c - 644 sys sys 1095792293 3452
 sys/src/games/mahjongg/mahjongg.h - 644 sys sys 1095792293 1606
 sys/src/games/mahjongg/mkfile - 644 sys sys 1095792293 230
 sys/src/games/memo.c - 644 sys sys 1110436470 6837
-sys/src/games/mkfile - 664 sys sys 1110435498 533
+sys/src/games/mkfile - 664 sys sys 1118672535 567
 sys/src/games/music - 20000000775 sys sys 1103793915 0
 sys/src/games/music/Readme - 664 sys sys 1103793914 488
 sys/src/games/music/debug.h - 664 sys sys 1103793914 201
@@ -13940,6 +13946,7 @@ sys/src/games/sudoku/levels.c - 664 sys sys 1117226433 3186
 sys/src/games/sudoku/mkfile - 664 sys sys 1117226432 218
 sys/src/games/sudoku/sudoku.c - 664 sys sys 1117636441 7809
 sys/src/games/sudoku/sudoku.h - 664 sys sys 1117226432 1159
+sys/src/games/xs.h - 664 sys sys 1118672529 14310
 sys/src/lib9p - 20000000775 sys sys 1015023311 0
 sys/src/lib9p/_post.c - 664 sys sys 1103565871 1642
 sys/src/lib9p/dirread.c - 664 sys sys 1015023310 641

+ 9 - 0
dist/replica/plan9.log

@@ -19481,3 +19481,12 @@
 1118287877 0 c 386/bin/tar - 775 sys sys 1118286689 96201
 1118624431 0 c sys/src/cmd/ip/hogports.c - 664 sys sys 1118623129 989
 1118633434 0 c 386/bin/ip/hogports - 775 sys sys 1118632064 42883
+1118673043 0 c 386/bin/page - 775 sys sys 1118671839 232775
+1118673043 1 a sys/src/games/4s.c - 664 sys sys 1118672529 1466
+1118673043 2 a sys/src/games/5s.c - 664 sys sys 1118672529 3802
+1118673043 3 c sys/src/games/mkfile - 664 sys sys 1118672535 567
+1118673043 4 a sys/src/games/xs.h - 664 sys sys 1118672529 14310
+1118682045 0 a sys/games/lib/4scores - 664 sys sys 1118680448 0
+1118682045 1 a sys/games/lib/5scores - 664 sys sys 1118680453 0
+1118719854 0 a 386/bin/games/4s - 775 sys sys 1118718525 175529
+1118719854 1 a 386/bin/games/5s - 775 sys sys 1118718525 178065

+ 0 - 0
sys/games/lib/4scores


+ 0 - 0
sys/games/lib/5scores


+ 55 - 0
sys/src/games/4s.c

@@ -0,0 +1,55 @@
+#include <u.h>
+#include <libc.h>
+#include <draw.h>
+#include <thread.h>
+#include <mouse.h>
+#include <keyboard.h>
+
+#define	N	4
+
+typedef struct Piece Piece;
+struct Piece{
+	short	rot;
+	short	tx;
+	Point	sz;
+	Point	d[N];
+};
+
+Piece pieces[]={
+	{ 0, 0, 4,1,  { 0,0,  1,0,  1,0,  1,0 }},
+	{ 1, 0, 2,4,  { 1,0,  0,1,  0,1,  0,1 }},
+	{ 2, 0, 4,1,  { 0,0,  1,0,  1,0,  1,0 }},
+	{ 3, 0, 2,4,  { 1,0,  0,1,  0,1,  0,1 }},
+
+	{ 0, 1, 3,2,  { 0,0,  1,0,  1,0,  0,1 }},
+	{ 1, 1, 2,3,  { 1,0,  0,1,  0,1, -1,0 }},
+	{ 2, 1, 3,2,  { 0,0,  0,1,  1,0,  1,0 }},
+	{ 3, 1, 2,3,  { 0,0,  1,0, -1,1,  0,1 }},
+
+	{ 0, 2, 3,2,  { 0,1,  1,0,  1,0,  0,-1}},
+	{ 1, 2, 2,3,  { 0,0,  0,1,  0,1,  1,0 }},
+	{ 2, 2, 3,2,  { 0,0,  1,0,  1,0, -2,1 }},
+	{ 3, 2, 2,3,  { 0,0,  1,0,  0,1,  0,1 }},
+
+	{ 0, 3, 2,2,  { 0,1,  1,0,  0,-1, -1,0}},
+	{ 1, 3, 2,2,  { 0,1,  1,0,  0,-1, -1,0}},
+	{ 2, 3, 2,2,  { 0,1,  1,0,  0,-1, -1,0}},
+	{ 3, 3, 2,2,  { 0,1,  1,0,  0,-1, -1,0}},
+
+	{ 0, 4, 3,2,  { 0,0,  1,0,  1,0, -1,1 }},
+	{ 1, 4, 2,3,  { 1,0, -1,1,  1,0,  0,1 }},
+	{ 2, 4, 3,2,  { 1,0, -1,1,  1,0,  1,0 }},
+	{ 3, 4, 2,3,  { 0,0,  0,1,  0,1,  1,-1}},
+
+	{ 0, 5, 3,2,  { 0,0,  1,0,  0,1,  1,0 }},
+	{ 1, 5, 2,3,  { 1,0,  0,1,  -1,0, 0,1 }},
+	{ 2, 5, 3,2,  { 0,0,  1,0,  0,1,  1,0 }},
+	{ 3, 5, 2,3,  { 1,0,  0,1,  -1,0, 0,1 }},
+
+	{ 0, 6, 3,2,  { 0,1,  1,0,  0,-1, 1,0 }},
+	{ 1, 6, 2,3,  { 0,0,  0,1,  1,0,  0,1 }},
+	{ 2, 6, 3,2,  { 0,1,  1,0,  0,-1, 1,0 }},
+	{ 3, 6, 2,3,  { 0,0,  0,1,  1,0,  0,1 }},
+};
+
+#include "xs.h"

+ 111 - 0
sys/src/games/5s.c

@@ -0,0 +1,111 @@
+#include <u.h>
+#include <libc.h>
+#include <draw.h>
+#include <thread.h>
+#include <mouse.h>
+#include <keyboard.h>
+
+#define	N	5
+
+typedef struct Piece Piece;
+struct Piece{
+	short	rot;
+	short	tx;
+	Point	sz;
+	Point	d[N];
+};
+
+Piece pieces[]={
+	{ 0, 1, 5,1,  { 0,0,  1,0,  1,0,  1,0,  1,0 }},
+	{ 1, 1, 1,5,  { 0,0,  0,1,  0,1,  0,1,  0,1 }},
+	{ 2, 1, 5,1,  { 0,0,  1,0,  1,0,  1,0,  1,0 }},
+	{ 3, 1, 1,5,  { 0,0,  0,1,  0,1,  0,1,  0,1 }},
+
+	{ 0, 0, 4,2,  { 0,0,  1,0,  1,0,  1,0,  0,1 }},
+	{ 1, 0, 2,4,  { 1,0,  0,1,  0,1,  0,1, -1,0 }},
+	{ 2, 0, 4,2,  { 0,0,  0,1,  1,0,  1,0,  1,0 }},
+	{ 3, 0, 2,4,  { 0,0,  1,0, -1,1,  0,1,  0,1 }},
+
+	{ 0, 2, 4,2,  { 0,0,  0,1,  1,-1, 1,0,  1,0 }},
+	{ 1, 2, 2,4,  { 0,0,  1,0,  0,1,  0,1,  0,1 }},
+	{ 2, 2, 4,2,  { 0,1,  1,0,  1,0,  1,0,  0,-1}},
+	{ 3, 2, 2,4,  { 0,0,  0,1,  0,1,  0,1,  1,0 }},
+
+	{ 0, 7, 3,3,  { 0,0,  1,0,  1,0,  0,1,  0,1 }},
+	{ 1, 7, 3,3,  { 0,2,  1,0,  1,0,  0,-1, 0,-1}},
+	{ 2, 7, 3,3,  { 0,0,  0,1,  0,1,  1,0,  1,0 }},
+	{ 3, 7, 3,3,  { 0,2,  0,-1, 0,-1, 1,0,  1,0 }},
+
+	{ 0, 3, 3,2,  { 0,0,  1,0,  1,0, -2,1,  1,0 }},
+	{ 1, 3, 2,3,  { 0,0,  1,0, -1,1,  1,0,  0,1 }},
+	{ 2, 3, 3,2,  { 1,0,  1,0, -2,1,  1,0,  1,0 }},
+	{ 3, 3, 2,3,  { 0,0,  0,1,  1,0, -1,1,  1,0 }},
+
+	{ 0, 4, 3,2,  { 0,0,  1,0,  1,0, -1,1,  1,0 }},
+	{ 1, 4, 2,3,  { 1,0, -1,1,  1,0, -1,1,  1,0 }},
+	{ 2, 4, 3,2,  { 0,0,  1,0, -1,1,  1,0,  1,0 }},
+	{ 3, 4, 2,3,  { 0,0,  1,0, -1,1,  1,0, -1,1 }},
+
+	{ 0, 7, 3,2,  { 0,0,  2,0, -2,1,  1,0,  1,0 }},
+	{ 1, 7, 2,3,  { 0,0,  1,0, -1,1,  0,1,  1,0 }},
+	{ 2, 7, 3,2,  { 0,0,  1,0,  1,0, -2,1,  2,0 }},
+	{ 3, 7, 2,3,  { 0,0,  1,0,  0,1, -1,1,  1,0 }},
+
+	{ 0, 5, 3,3,  { 0,0,  1,0,  0,1,  1,0, -1,1 }},
+	{ 1, 5, 3,3,  { 2,0, -2,1,  1,0,  1,0, -1,1 }},
+	{ 2, 5, 3,3,  { 1,0, -1,1,  1,0,  0,1,  1,0 }},
+	{ 3, 5, 3,3,  { 1,0, -1,1,  1,0,  1,0, -2,1 }},
+
+	{ 0, 6, 3,3,  { 1,0,  1,0, -2,1,  1,0,  0,1 }},
+	{ 1, 6, 3,3,  { 1,0, -1,1,  1,0,  1,0,  0,1 }},
+	{ 2, 6, 3,3,  { 1,0,  0,1,  1,0, -2,1,  1,0 }},
+	{ 3, 6, 3,3,  { 0,0,  0,1,  1,0,  1,0, -1,1 }},
+
+	{ 0, 0, 4,2,  { 0,0,  1,0,  1,0,  1,0, -2,1 }},
+	{ 1, 0, 2,4,  { 1,0, -1,1,  1,0,  0,1,  0,1 }},
+	{ 2, 0, 4,2,  { 2,0, -2,1,  1,0,  1,0,  1,0 }},
+	{ 3, 0, 2,4,  { 0,0,  0,1,  0,1,  1,0, -1,1 }},
+
+	{ 0, 2, 4,2,  { 0,0,  1,0,  1,0,  1,0, -1,1 }},
+	{ 1, 2, 2,4,  { 1,0,  0,1, -1,1,  1,0,  0,1 }},
+	{ 2, 2, 4,2,  { 1,0, -1,1,  1,0,  1,0,  1,0 }},
+	{ 3, 2, 2,4,  { 0,0,  0,1,  1,0, -1,1,  0,1 }},
+
+	{ 0, 1, 3,3,  { 0,0,  1,0,  0,1,  1,0,  0,1 }},
+	{ 1, 1, 3,3,  { 2,0, -1,1,  1,0, -2,1,  1,0 }},
+	{ 2, 1, 3,3,  { 0,0,  0,1,  1,0,  0,1,  1,0 }},
+	{ 3, 1, 3,3,  { 1,0,  1,0, -2,1,  1,0, -1,1 }},
+
+	{ 0, 3, 3,3,  { 0,0,  1,0,  1,0, -1,1,  0,1 }},
+	{ 1, 3, 3,3,  { 2,0, -2,1,  1,0,  1,0,  0,1 }},
+	{ 2, 3, 3,3,  { 1,0,  0,1, -1,1,  1,0,  1,0 }},
+	{ 3, 3, 3,3,  { 0,0,  0,1,  1,0,  1,0, -2,1 }},
+
+	{ 0, 4, 3,3,  { 1,0, -1,1,  1,0,  1,0, -1,1 }},
+	{ 1, 4, 3,3,  { 1,0, -1,1,  1,0,  1,0, -1,1 }},
+	{ 2, 4, 3,3,  { 1,0, -1,1,  1,0,  1,0, -1,1 }},
+	{ 3, 4, 3,3,  { 1,0, -1,1,  1,0,  1,0, -1,1 }},
+
+	{ 0, 8, 4,2,  { 0,0,  1,0,  0,1,  1,0,  1,0 }},
+	{ 1, 8, 2,4,  { 1,0, -1,1,  1,0, -1,1,  0,1 }},
+	{ 2, 8, 4,2,  { 0,0,  1,0,  1,0,  0,1,  1,0 }},
+	{ 3, 8, 2,4,  { 1,0,  0,1, -1,1,  1,0, -1,1 }},
+
+	{ 0, 9, 4,2,  { 2,0,  1,0, -3,1,  1,0,  1,0 }},
+	{ 1, 9, 2,4,  { 0,0,  0,1,  0,1,  1,0,  0,1 }},
+	{ 2, 9, 4,2,  { 1,0,  1,0,  1,0, -3,1,  1,0 }},
+	{ 3, 9, 2,4,  { 0,0,  0,1,  1,0,  0,1,  0,1 }},
+
+	{ 0, 5, 3,3,  { 0,0,  0,1,  1,0,  1,0,  0,1 }},
+	{ 1, 5, 3,3,  { 1,0,  1,0, -1,1, -1,1,  1,0 }},
+	{ 2, 5, 3,3,  { 0,0,  0,1,  1,0,  1,0,  0,1 }},
+	{ 3, 5, 3,3,  { 1,0,  1,0, -1,1, -1,1,  1,0 }},
+
+	{ 0, 6, 3,3,  { 2,0, -2,1,  1,0,  1,0, -2,1 }},
+	{ 1, 6, 3,3,  { 0,0,  1,0,  0,1,  0,1,  1,0 }},
+	{ 2, 6, 3,3,  { 2,0, -2,1,  1,0,  1,0, -2,1 }},
+	{ 3, 6, 3,3,  { 0,0,  1,0,  0,1,  0,1,  1,0 }},
+
+};
+
+#include "xs.h"

+ 5 - 1
sys/src/games/mkfile

@@ -1,6 +1,8 @@
 </$objtype/mkfile
 
-TARG=catclock\
+TARG=4s\
+	5s\
+	catclock\
 	juggle\
 	memo\
 
@@ -14,6 +16,8 @@ DIRS=\
 	mahjongg\
 	sokoban\
 
+4s.$O:	xs.h
+5s.$O:	xs.h
 catclock.$O:	catback.p eyes.p
 
 all:V:	dirall

+ 750 - 0
sys/src/games/xs.h

@@ -0,0 +1,750 @@
+/*
+ * engine for 4s, 5s, etc
+ * need to define N and pieces table before including this
+ */
+
+enum
+{
+	CNone	= 0,
+	CBounds	= 1,
+	CPiece	= 2,
+	NX	= 10,
+	NY	= 20,
+};
+
+enum{
+	TIMER,
+	MOUSE,
+	RESHAPE,
+	KBD,
+	NONBLOCK,
+	NALT
+};
+
+#define	NP	(sizeof pieces/sizeof(Piece))
+
+char		board[NY][NX];
+Rectangle	rboard;
+Point		pscore;
+Point		scoresz;
+int		pcsz = 32;
+Point		pos;
+Image	*bb, *bbmask, *bb2, *bb2mask;
+Rectangle	br, br2;
+long		points;
+int		dt;
+int		DY;
+int		DMOUSE;
+int		lastmx;
+int		newscreen;
+Channel	*timerc;
+Mousectl	*mousectl;
+Keyboardctl	*keyboardctl;
+
+void		redraw(int);
+
+int	tsleep;
+
+Piece *piece;
+
+#define	NCOL	10
+
+uchar txbits[NCOL][32]={
+	{0xDD,0xDD,0xFF,0xFF,0x77,0x77,0xFF,0xFF,
+	 0xDD,0xDD,0xFF,0xFF,0x77,0x77,0xFF,0xFF,
+	 0xDD,0xDD,0xFF,0xFF,0x77,0x77,0xFF,0xFF,
+	 0xDD,0xDD,0xFF,0xFF,0x77,0x77,0xFF,0xFF},
+	{0xDD,0xDD,0x77,0x77,0xDD,0xDD,0x77,0x77,
+	 0xDD,0xDD,0x77,0x77,0xDD,0xDD,0x77,0x77,
+	 0xDD,0xDD,0x77,0x77,0xDD,0xDD,0x77,0x77,
+	 0xDD,0xDD,0x77,0x77,0xDD,0xDD,0x77,0x77},
+	{0xAA,0xAA,0x55,0x55,0xAA,0xAA,0x55,0x55,
+	 0xAA,0xAA,0x55,0x55,0xAA,0xAA,0x55,0x55,
+	 0xAA,0xAA,0x55,0x55,0xAA,0xAA,0x55,0x55,
+	 0xAA,0xAA,0x55,0x55,0xAA,0xAA,0x55,0x55},
+	{0xAA,0xAA,0x55,0x55,0xAA,0xAA,0x55,0x55,
+	 0xAA,0xAA,0x55,0x55,0xAA,0xAA,0x55,0x55,
+	 0xAA,0xAA,0x55,0x55,0xAA,0xAA,0x55,0x55,
+	 0xAA,0xAA,0x55,0x55,0xAA,0xAA,0x55,0x55},
+	{0x22,0x22,0x88,0x88,0x22,0x22,0x88,0x88,
+	 0x22,0x22,0x88,0x88,0x22,0x22,0x88,0x88,
+	 0x22,0x22,0x88,0x88,0x22,0x22,0x88,0x88,
+	 0x22,0x22,0x88,0x88,0x22,0x22,0x88,0x88},
+	{0x22,0x22,0x00,0x00,0x88,0x88,0x00,0x00,
+	 0x22,0x22,0x00,0x00,0x88,0x88,0x00,0x00,
+	 0x22,0x22,0x00,0x00,0x88,0x88,0x00,0x00,
+	 0x22,0x22,0x00,0x00,0x88,0x88,0x00,0x00},
+	{0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+	 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+	 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+	 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00},
+	{0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+	 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+	 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,
+	 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00},
+	{0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,
+	 0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,
+	 0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,
+	 0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xCC},
+	{0xCC,0xCC,0xCC,0xCC,0x33,0x33,0x33,0x33,
+	 0xCC,0xCC,0xCC,0xCC,0x33,0x33,0x33,0x33,
+	 0xCC,0xCC,0xCC,0xCC,0x33,0x33,0x33,0x33,
+	 0xCC,0xCC,0xCC,0xCC,0x33,0x33,0x33,0x33},
+};
+
+int txpix[NCOL] = {
+	DYellow,	/* yellow */
+	DCyan,	/* cyan */
+	DGreen,	/* lime green */
+	DGreyblue,	/* slate */
+	DRed,	/* red */
+	DGreygreen,	/* olive green */
+	DBlue,	/* blue */
+	0xFF55AAFF,	/* pink */
+	0xFFAAFFFF,	/* lavender */
+	0xBB005DFF,	/* maroon */
+};
+
+Image *tx[NCOL];
+
+Piece *
+rotr(Piece *p)
+{
+	if(p->rot == 3)
+		return p-3;
+	return p+1;
+}
+
+Piece *
+rotl(Piece *p)
+{
+	if(p->rot == 0)
+		return p+3;
+	return p-1;
+}
+
+int
+collide(Point pt, Piece *p)
+{
+	int i;
+	int c = CNone;
+
+	pt.x = (pt.x - rboard.min.x) / pcsz;
+	pt.y = (pt.y - rboard.min.y) / pcsz;
+	for(i=0; i<N; i++){
+		pt.x += p->d[i].x;
+		pt.y += p->d[i].y;
+		if(pt.x<0 || pt.x>=NX || pt.y<0 || pt.y>=NY)
+			c |= CBounds;
+		if(board[pt.y][pt.x])
+			c |= CPiece;
+	}
+	return c;
+}
+
+int
+collider(Point pt, Point pmax)
+{
+	int i, j, pi, pj, n, m;
+
+	pi = (pt.x - rboard.min.x) / pcsz;
+	pj = (pt.y - rboard.min.y) / pcsz;
+	n = pmax.x / pcsz;
+	m = pmax.y / pcsz + 1;
+	for(i = pi; i < pi+n && i < NX; i++)
+		for(j = pj; j < pj+m && j < NY; j++)
+			if(board[j][i])
+				return 1;
+	return 0;
+}
+
+void
+setpiece(Piece *p){
+	int i;
+	Rectangle r, r2;
+	Point op, delta;
+
+	draw(bb, bb->r, display->white, nil, ZP);
+	draw(bbmask, bbmask->r, display->transparent, nil, ZP);
+	br = Rect(0, 0, 0, 0);
+	br2 = br;
+	piece = p;
+	if(p == 0)
+		return;
+	r.min = bb->r.min;
+	for(i=0; i<N; i++){
+		r.min.x += p->d[i].x*pcsz;
+		r.min.y += p->d[i].y*pcsz;
+		r.max.x = r.min.x + pcsz;
+		r.max.y = r.min.y + pcsz;
+		if(i == 0){
+			draw(bb, r, display->black, nil, ZP);
+			draw(bb, insetrect(r, 1), tx[piece->tx], nil, ZP);
+			draw(bbmask, r, display->opaque, nil, ZP);
+			op = r.min;
+		}else{
+			draw(bb, r, bb, nil, op);
+			draw(bbmask, r, bbmask, nil, op);
+		}
+		if(br.max.x < r.max.x)
+			br.max.x = r.max.x;
+		if(br.max.y < r.max.y)
+			br.max.y = r.max.y;
+	}
+	br.max = subpt(br.max, bb->r.min);
+	delta = Pt(0,DY);
+	br2.max = addpt(br.max, delta);
+	r = rectaddpt(br, bb2->r.min);
+	r2 = rectaddpt(br2, bb2->r.min);
+	draw(bb2, r2, display->white, nil, ZP);
+	draw(bb2, rectaddpt(r,delta), bb, nil, bb->r.min);
+	draw(bb2mask, r2, display->transparent, nil, ZP);
+	draw(bb2mask, r, display->opaque, bbmask, bb->r.min);
+	draw(bb2mask, rectaddpt(r,delta), display->opaque, bbmask, bb->r.min);
+}
+
+void
+drawpiece(void){
+	draw(screen, rectaddpt(br, pos), bb, bbmask, bb->r.min);
+}
+
+void
+undrawpiece(void)
+{
+	Image *mask = nil;
+	if(collider(pos, br.max))
+		mask = bbmask;
+	draw(screen, rectaddpt(br, pos), display->white, mask, bb->r.min);
+}
+
+void
+rest(void)
+{
+	int i;
+	Point pt;
+
+	pt = divpt(subpt(pos, rboard.min), pcsz);
+	for(i=0; i<N; i++){
+		pt.x += piece->d[i].x;
+		pt.y += piece->d[i].y;
+		board[pt.y][pt.x] = piece->tx+16;
+	}
+}
+
+int
+canfit(Piece *p)
+{
+	static int dx[]={0, -1, 1, -2, 2, -3, 3, 4, -4};
+	int i, j;
+	Point z;
+
+	j = N + 1;
+	if(N > 4){
+		j = p->sz.x;
+		if(j<p->sz.y)
+			j = p->sz.y;
+		j = 2*j-1;
+	}
+	for(i=0; i<j; i++){
+		z.x = pos.x + dx[i]*pcsz;
+		z.y = pos.y;
+		if(!collide(z, p)){
+			z.y = pos.y + pcsz-1;
+			if(!collide(z, p)){
+				undrawpiece();
+				pos.x = z.x;
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+void
+score(int p)
+{
+	char buf[128];
+
+	points += p;
+	snprint(buf, sizeof(buf), "%.6ld", points);
+	draw(screen, Rpt(pscore, addpt(pscore, scoresz)), display->white, nil, ZP);
+	string(screen, pscore, display->black, ZP, font, buf);
+}
+
+void
+drawsq(Image *b, Point p, int ptx){
+	Rectangle r;
+
+	r.min = p;
+	r.max.x = r.min.x+pcsz;
+	r.max.y = r.min.y+pcsz;
+	draw(b, r, display->black, nil, ZP);
+	draw(b, insetrect(r, 1), tx[ptx], nil, ZP);
+}
+
+void
+drawboard(void)
+{
+	int i, j;
+
+	border(screen, insetrect(rboard, -2), 2, display->black, ZP);
+	draw(screen, Rect(rboard.min.x, rboard.min.y-2, rboard.max.x, rboard.min.y),
+		display->white, nil, ZP);
+	for(i=0; i<NY; i++)
+		for(j=0; j<NX; j++)
+			if(board[i][j])
+				drawsq(screen, Pt(rboard.min.x+j*pcsz, rboard.min.y+i*pcsz), board[i][j]-16);
+	score(0);
+}
+
+void
+choosepiece(void)
+{
+	int i;
+
+	do{
+		i = nrand(NP);
+		setpiece(&pieces[i]);
+		pos = rboard.min;
+		pos.x += nrand(NX)*pcsz;
+	}while(collide(Pt(pos.x, pos.y+pcsz-DY), piece));
+	drawpiece();
+	flushimage(display, 1);
+}
+
+int
+movepiece(void)
+{
+	Image *mask = nil;
+
+	if(collide(Pt(pos.x, pos.y+pcsz), piece))
+		return 0;
+	if(collider(pos, br2.max))
+		mask = bb2mask;
+	draw(screen, rectaddpt(br2, pos), bb2, mask, bb2->r.min);
+	pos.y += DY;
+	flushimage(display, 1);
+	return 1;
+}
+
+void
+pause(int t)
+{
+	flushimage(display, 1);
+	while(nbrecv(timerc, nil) == 1)
+		;
+	while(recv(timerc, nil) == 1)
+		if((t -= tsleep) < 0)
+			break;
+}
+
+int
+horiz(void)
+{
+	int lev[N];
+	int i, j, h;
+	Rectangle r;
+	Image *col;
+
+	h = 0;
+	for(i=0; i<NY; i++){
+		for(j=0; board[i][j]; j++)
+			if(j == NX-1){
+				lev[h++] = i;
+				break;
+			}
+	}
+	if(h == 0)
+		return 0;
+	r = rboard;
+	newscreen = 0;
+	for(j=0; j<h; j++){
+		r.min.y = rboard.min.y + lev[j]*pcsz;
+		r.max.y = r.min.y + pcsz;
+		draw(screen, r, display->white, nil, ZP);
+		flushimage(display, 1);
+	}
+	for(i=0; i<6; i++){
+		pause(500);
+		if(newscreen){
+			drawboard();
+			break;
+		}
+		col = (i&1)? display->white : display->black;
+		for(j=0; j<h; j++){
+			r.min.y = rboard.min.y + lev[j]*pcsz;
+			r.max.y = r.min.y + pcsz;
+			draw(screen, r, col, nil, ZP);
+		}
+		flushimage(display, 1);
+	}
+	r = rboard;
+	for(j=0; j<h; j++){
+		i = NY - lev[j] - 1;
+		score(250+10*i*i);
+		r.min.y = rboard.min.y;
+		r.max.y = rboard.min.y+lev[j]*pcsz;
+		draw(screen, rectaddpt(r, Pt(0,pcsz)), screen, nil, r.min);
+		r.max.y = rboard.min.y+pcsz;
+		draw(screen, r, display->white, nil, ZP);
+		memcpy(&board[1][0], &board[0][0], NX*lev[j]);
+		memset(&board[0][0], 0, NX);
+	}
+	flushimage(display, 1);
+	return 1;
+}
+
+void
+mright(void)
+{
+	if(!collide(Pt(pos.x+pcsz, pos.y), piece))
+	if(!collide(Pt(pos.x+pcsz, pos.y+pcsz-DY), piece)){
+		undrawpiece();
+		pos.x += pcsz;
+		drawpiece();
+		flushimage(display, 1);
+	}
+}
+
+void
+mleft(void)
+{
+	if(!collide(Pt(pos.x-pcsz, pos.y), piece))
+	if(!collide(Pt(pos.x-pcsz, pos.y+pcsz-DY), piece)){
+		undrawpiece();
+		pos.x -= pcsz;
+		drawpiece();
+		flushimage(display, 1);
+	}
+}
+
+void
+rright(void)
+{
+	if(canfit(rotr(piece))){
+		setpiece(rotr(piece));
+		drawpiece();
+		flushimage(display, 1);
+	}
+}
+
+void
+rleft(void)
+{
+	if(canfit(rotl(piece))){
+		setpiece(rotl(piece));
+		drawpiece();
+		flushimage(display, 1);
+	}
+}
+
+int fusst = 0;
+int
+drop(int f)
+{
+	Mouse mouse;
+
+	if(f){
+		score(5L*(rboard.max.y-pos.y)/pcsz);
+		do; while(movepiece());
+	}
+	fusst = 0;
+	rest();
+	if(pos.y==rboard.min.y && !horiz())
+		return 1;
+	horiz();
+	setpiece(0);
+	pause(1500);
+	choosepiece();
+	while(nbrecv(mousectl->c, &mouse) == 1)
+		lastmx = mouse.xy.x;
+	while(nbrecv(keyboardctl->c, nil) == 1)
+		;
+	return 0;
+}
+
+int
+play(void)
+{
+	int i;
+	int suspended;
+	Mouse om;
+	Mouse mouse;
+	Rune r;
+	Alt alts[NALT+1];
+
+	alts[TIMER].c = timerc;
+	alts[TIMER].v = nil;
+	alts[TIMER].op = CHANRCV;
+	alts[MOUSE].c = mousectl->c;
+	alts[MOUSE].v = &mouse;
+	alts[MOUSE].op = CHANRCV;
+	alts[RESHAPE].c = mousectl->resizec;
+	alts[RESHAPE].v = nil;
+	alts[RESHAPE].op = CHANRCV;
+	alts[KBD].c = keyboardctl->c;
+	alts[KBD].v = &r;
+	alts[KBD].op = CHANRCV;
+	alts[NONBLOCK].c = nil;
+	alts[NONBLOCK].v = nil;
+	alts[NONBLOCK].op = CHANNOBLK;
+	alts[NALT].op = CHANEND;
+
+	/* flush the pipe */
+	while(alt(alts) != NONBLOCK)
+		;
+	alts[NONBLOCK].op = CHANEND;
+
+	dt = 64;
+	suspended = 0;
+	choosepiece();
+	for(;;)
+	switch(alt(alts)){
+	case MOUSE:
+		if(suspended)
+			break;
+		if(lastmx < 0)
+			lastmx = mouse.xy.x;
+		if(mouse.xy.x > lastmx+DMOUSE){
+			mright();
+			lastmx = mouse.xy.x;
+		}
+		if(mouse.xy.x < lastmx-DMOUSE){
+			mleft();
+			lastmx = mouse.xy.x;
+		}
+		if(mouse.buttons&1 && !(om.buttons&1))
+			rleft();
+		if(mouse.buttons&2 && !(om.buttons&2))
+			if(drop(1))
+				return 1;
+		if(mouse.buttons&4 && !(om.buttons&4))
+			rright();
+		om = mouse;
+		break;
+	case RESHAPE:
+		redraw(1);
+		break;		
+	case KBD:
+		if(suspended) {
+			suspended = 0;
+			break;
+		}
+		switch(r){
+		case 'q':
+		case 'Q':
+		case 0x04:
+			return 0;
+		case 'f':
+		case ';':
+			mright();
+			break;
+		case 'a':
+		case 'j':
+			mleft();
+			break;
+		case 'd':
+		case 'l':
+			rright();
+			break;
+		case 's':
+		case 'k':
+			rleft();
+			break;
+		case ' ':
+			if(drop(1))
+				return 1;
+			break;
+		case 'z':
+			suspended = 1;
+			break;
+		}
+		break;
+	case TIMER:
+		if(suspended)
+			break;
+		dt -= tsleep;
+		if(dt < 0){
+			i = 1;
+			dt = 16 * (points+nrand(10000)-5000) / 10000;
+			if(dt >= 32){
+				i += (dt-32)/16;
+				dt = 32;
+			}
+			dt = 52-dt;
+			while(i-- > 0)
+				if(movepiece()==0 && ++fusst==40){
+					if(drop(0))
+						return 1;
+					break;
+				}
+		}
+		break;
+	}
+	return 0;		/* not reached */
+}
+
+void
+setparms(void)
+{
+	char buf[32];
+	int fd, n;
+
+	tsleep = 50;
+	fd = open("/dev/hz", OREAD);
+	if(fd < 0)
+		return;
+	n = read(fd, buf, sizeof buf - 1);
+	close(fd);
+	if(n < 0)
+		return;
+	buf[n] = '\0';
+	tsleep = strtoul(buf, 0, 10);
+	tsleep = (1000 + tsleep - 1) / tsleep;
+}
+
+void
+timerproc(void *v)
+{
+	Channel *c;
+	void **arg;
+
+	arg = v;
+	c = (Channel*)arg;
+
+	for(;;){
+		sleep(tsleep);
+		send(c, nil);
+	}
+}
+
+void
+redraw(int new)
+{
+	Rectangle r;
+	long dx, dy;
+
+	if(new && getwindow(display, Refmesg) < 0){
+		fprint(2, "can't reattach to window");
+		exits("redraw");
+	}
+	r = screen->r;
+	pos.x = (pos.x - rboard.min.x) / pcsz;
+	pos.y = (pos.y - rboard.min.y) / pcsz;
+	dx = r.max.x - r.min.x;
+	dy = r.max.y - r.min.y - 2*32;
+	DY = dx / NX;
+	if(DY > dy / NY)
+		DY = dy / NY;
+	DY /= 8;
+	if(DY > 4)
+		DY = 4;
+	pcsz = DY*8;
+	DMOUSE = pcsz/3;
+	if(pcsz < 8){
+		fprint(2, "screen too small: %d\n", pcsz);
+		threadexitsall(nil);
+		exits("too small");
+	}
+	rboard = screen->r;
+	rboard.min.x += (dx-pcsz*NX)/2;
+	rboard.min.y += (dy-pcsz*NY)/2+32;
+	rboard.max.x = rboard.min.x+NX*pcsz;
+	rboard.max.y = rboard.min.y+NY*pcsz;
+	pscore.x = rboard.min.x+8;
+	pscore.y = rboard.min.y-32;
+	scoresz = stringsize(font, "000000");
+	pos.x = pos.x*pcsz + rboard.min.x;
+	pos.y = pos.y*pcsz + rboard.min.y;
+	if(bb){
+		freeimage(bb);
+		freeimage(bbmask);
+		freeimage(bb2);
+		freeimage(bb2mask);
+	}
+	bb = allocimage(display, Rect(0,0,N*pcsz,N*pcsz), screen->chan, 0, 0);
+	bbmask = allocimage(display, Rect(0,0,N*pcsz,N*pcsz), GREY1, 0, 0);
+	bb2 = allocimage(display, Rect(0,0,N*pcsz,N*pcsz+DY), screen->chan, 0, 0);
+	bb2mask = allocimage(display, bb2->r, GREY1, 0, 0);
+	if(bb==0 || bbmask==0 || bb2==0 || bb2mask==0){
+		fprint(2, "allocimage fail (bb)\n");
+		exits("allocimage");
+	}
+	draw(screen, screen->r, display->white, nil, ZP);
+	drawboard();
+	setpiece(piece);
+	if(piece)
+		drawpiece();
+	lastmx = -1;
+	newscreen = 1;
+	flushimage(display, 1);
+}
+
+void
+threadmain(int argc, char *argv[])
+{
+	Image *tb;
+	char buf[200];
+	int i, scores;
+	long starttime, endtime;
+
+	ARGBEGIN{
+	}ARGEND
+
+	setparms();
+	snprint(buf, sizeof(buf), "%ds", N);
+	initdraw(0, 0, buf);
+	mousectl = initmouse(nil, display->image);	/* BUG? */
+	if(mousectl == nil){
+		fprint(2, "[45]s: mouse init failed: %r\n");
+		exits("mouse");
+	}
+	keyboardctl = initkeyboard(nil);	/* BUG? */
+	if(keyboardctl == nil){
+		fprint(2, "[45]s: keyboard init failed: %r\n");
+		exits("kbd");
+	}
+	starttime = time(0);
+	srand(starttime);
+	snprint(buf, sizeof(buf), "/sys/games/lib/%dscores", N);
+	scores = open(buf, OWRITE);
+	if(scores < 0){
+		fprint(2, "can't open %s\n", buf);
+		exits("scores file");
+	}
+	tb = 0;
+	if(screen->depth < 3){
+		tb = allocimage(display, Rect(0,0,16,16), 0, 1, -1);
+		if(tb == 0){
+			fprint(2, "allocimage fail (tb)\n");
+			exits("allocimage");
+		}
+	}
+	for(i = 0; i<NCOL; i++){
+		tx[i] = allocimage(display, Rect(0, 0, 16, 16), screen->chan, 1, txpix[i]);
+		if(tx[i] == 0){
+			fprint(2, "allocimage fail (tx)\n");
+			exits("allocimage");
+		}
+		if(screen->depth < 3){
+			loadimage(tb, tb->r, txbits[i], 32);
+			draw(tx[i], tx[i]->r, tb, nil, ZP);
+		}
+	}
+	if(tb != 0)
+		freeimage(tb);
+
+	threadsetname("4s-5s");
+	timerc= chancreate(sizeof(int), 0);
+	proccreate(timerproc, timerc, 1024);
+	points = 0;
+	memset(board, 0, sizeof(board));
+	redraw(0);
+	if(play()){
+		endtime = time(0);
+		fprint(scores, "%ld\t%s\t%lud\t%ld\n",
+			points, getuser(), starttime, endtime-starttime);
+	}
+	threadexitsall(nil);
+	exits(0);
+}