Commit Diff

Commit:
43b0d532bd3c1e4fbd4385c6470db12dbf7a5ad8
From:
Russ Cox <rsc@swtch.com>
Date:
Message:
acme: add 32x32 boxcursor The only difference from the upscaled 16x16 is a one-pixel adjustment in the offset position, but this at least exercises setcursor2.
Actions:
Patch | Tree
commit - fe92b4a0b1a8268238bce088cd081da9b802b465
commit + 43b0d532bd3c1e4fbd4385c6470db12dbf7a5ad8
blob - 742aabdf8bd3a43c3f8a2819cf77939aed50b45d
blob + 12701f23fff2da5c66624f847202a647541d042d
--- src/cmd/acme/acme.c
+++ src/cmd/acme/acme.c
@@ -964,6 +964,74 @@ Cursor boxcursor = {
 	 0x70, 0x0E, 0x70, 0x0E, 0x70, 0x0E, 0x70, 0x0E,
 	 0x70, 0x0E, 0x70, 0x0E, 0x70, 0x0E, 0x70, 0x0E,
 	 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x00, 0x00}
+};
+
+Cursor2 boxcursor2 = {
+	{-15, -15},
+	{0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xC0, 0x03, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF, 
+	 0xFF, 0xFF, 0xFF, 0xFF},
+	{0x00, 0x00, 0x00, 0x00, 
+	 0x00, 0x00, 0x00, 0x00, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0x00, 0x00, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x3F, 0xFF, 0xFF, 0xFC, 
+	 0x00, 0x00, 0x00, 0x00, 
+	 0x00, 0x00, 0x00, 0x00}
 };
 
 void
blob - b1fe23babe00d6f34f9b49f6be88b4a5bb28f9f4
blob + 6215e04410fdc958773b9a3549f5fcd7cb1b5274
--- src/cmd/acme/cols.c
+++ src/cmd/acme/cols.c
@@ -477,7 +477,7 @@ coldragwin(Column *c, Window *w, int but)
 	Column *nc;
 
 	clearmouse();
-	setcursor(mousectl, &boxcursor);
+	setcursor2(mousectl, &boxcursor, &boxcursor2);
 	b = mouse->buttons;
 	op = mouse->xy;
 	while(mouse->buttons == b)
blob - 8c4b14ee2388146308abc3732eb178578f78c069
blob + 8a81c97d6a9dd25597456b215ad7dd178db483da
--- src/cmd/acme/dat.h
+++ src/cmd/acme/dat.h
@@ -525,6 +525,7 @@ Image		*button;
 Image		*but2col;
 Image		*but3col;
 Cursor		boxcursor;
+Cursor2		boxcursor2;
 Row			row;
 int			timerpid;
 Disk			*disk;
blob - 8cff0855e2140069a19a50a947753dd852de7f88
blob + 83c64594282d57d41905bddf7614992f44c7484e
--- src/cmd/acme/rows.c
+++ src/cmd/acme/rows.c
@@ -148,7 +148,7 @@ rowdragcol(Row *row, Column *c, int _0)
 	USED(_0);
 
 	clearmouse();
-	setcursor(mousectl, &boxcursor);
+	setcursor2(mousectl, &boxcursor, &boxcursor2);
 	b = mouse->buttons;
 	op = mouse->xy;
 	while(mouse->buttons == b)