libdraw: add Cursor2, a 32x32 high-res cursor

Also add setcursor2, esetcursor2, and draw protocol encoding.
Calls to the old setcursor, esetcursor create a 32x32 by
pixel doubling when needed.

6 files changed, 64 insertions, 6 deletions

diff --git a/src/libdraw/cursor.c b/src/libdraw/cursor.c
new file mode 100644
index 00000000..58f447b1
--- /dev/null
+++ b/src/libdraw/cursor.c
@@ -0,0 +1,32 @@
+#include <u.h>
+#include <libc.h>
+#include <draw.h>
+#include <cursor.h>
+
+static uint8 expand[16] = {
+	0x00, 0x03, 0x0c, 0x0f,
+	0x30, 0x33, 0x3c, 0x3f,
+	0xc0, 0xc3, 0xcc, 0xcf,
+	0xf0, 0xf3, 0xfc, 0xff,
+};
+
+void
+scalecursor(Cursor2 *c2, Cursor *c)
+{
+	int y;
+
+	c2->offset.x = 2*c->offset.x;
+	c2->offset.y = 2*c->offset.y;
+	memset(c2->clr, 0, sizeof c2->clr);
+	memset(c2->set, 0, sizeof c2->set);
+	for(y = 0; y < 16; y++) {
+		c2->clr[8*y] = c2->clr[8*y+4] = expand[c->clr[2*y]>>4];
+		c2->set[8*y] = c2->set[8*y+4] = expand[c->set[2*y]>>4];
+		c2->clr[8*y+1] = c2->clr[8*y+5] = expand[c->clr[2*y]&15];
+		c2->set[8*y+1] = c2->set[8*y+5] = expand[c->set[2*y]&15];
+		c2->clr[8*y+2] = c2->clr[8*y+6] = expand[c->clr[2*y+1]>>4];
+		c2->set[8*y+2] = c2->set[8*y+6] = expand[c->set[2*y+1]>>4];
+		c2->clr[8*y+3] = c2->clr[8*y+7] = expand[c->clr[2*y+1]&15];
+		c2->set[8*y+3] = c2->set[8*y+7] = expand[c->set[2*y+1]&15];
+	}
+}
diff --git a/src/libdraw/drawclient.c b/src/libdraw/drawclient.c
index f0c09430..de20d3a3 100644
--- a/src/libdraw/drawclient.c
+++ b/src/libdraw/drawclient.c
@@ -292,17 +292,22 @@ _displaymoveto(Display *d, Point p)
 }
 
 int
-_displaycursor(Display *d, Cursor *c)
+_displaycursor(Display *d, Cursor *c, Cursor2 *c2)
 {
 	Wsysmsg tx, rx;
 	
 	tx.type = Tcursor;
 	if(c == nil){
 		memset(&tx.cursor, 0, sizeof tx.cursor);
+		memset(&tx.cursor2, 0, sizeof tx.cursor2);
 		tx.arrowcursor = 1;
 	}else{
 		tx.arrowcursor = 0;
 		tx.cursor = *c;
+		if(c2 != nil)
+			tx.cursor2 = *c2;
+		else
+			scalecursor(&tx.cursor2, c);
 	}
 	return displayrpc(d, &tx, &rx, nil);
 }
diff --git a/src/libdraw/drawfcall.c b/src/libdraw/drawfcall.c
index e2d3c642..e36413b6 100644
--- a/src/libdraw/drawfcall.c
+++ b/src/libdraw/drawfcall.c
@@ -64,7 +64,7 @@ sizeW2M(Wsysmsg *m)
 	case Tmoveto:
 		return 4+1+1+4+4;
 	case Tcursor:
-		return 4+1+1+4+4+2*16+2*16+1;
+		return 4+1+1+4+4+2*16+2*16+4+4+4*32+4*32+1;
 	case Rerror:
 		return 4+1+1+_stringsize(m->error);
 	case Rrdkbd:
@@ -141,7 +141,11 @@ convW2M(Wsysmsg *m, uchar *p, uint n)
 		PUT(p+10, m->cursor.offset.y);
 		memmove(p+14, m->cursor.clr, sizeof m->cursor.clr);
 		memmove(p+46, m->cursor.set, sizeof m->cursor.set);
-		p[78] = m->arrowcursor;
+		PUT(p+78, m->cursor2.offset.x);
+		PUT(p+82, m->cursor2.offset.y);
+		memmove(p+86, m->cursor2.clr, sizeof m->cursor2.clr);
+		memmove(p+214, m->cursor2.set, sizeof m->cursor2.set);
+		p[342] = m->arrowcursor;
 		break;
 	case Rrdkbd:
 		PUT2(p+6, m->rune);
@@ -229,7 +233,11 @@ convM2W(uchar *p, uint n, Wsysmsg *m)
 		GET(p+10, m->cursor.offset.y);
 		memmove(m->cursor.clr, p+14, sizeof m->cursor.clr);
 		memmove(m->cursor.set, p+46, sizeof m->cursor.set);
-		m->arrowcursor = p[78];
+		GET(p+78, m->cursor2.offset.x);
+		GET(p+82, m->cursor2.offset.y);
+		memmove(m->cursor2.clr, p+86, sizeof m->cursor2.clr);
+		memmove(m->cursor2.set, p+214, sizeof m->cursor2.set);
+		m->arrowcursor = p[342];
 		break;
 	case Rrdkbd:
 		GET2(p+6, m->rune);
diff --git a/src/libdraw/event.c b/src/libdraw/event.c
index f113d1f0..b369c020 100644
--- a/src/libdraw/event.c
+++ b/src/libdraw/event.c
@@ -416,7 +416,13 @@ emoveto(Point pt)
 void
 esetcursor(Cursor *c)
 {
-	_displaycursor(display, c);
+	_displaycursor(display, c, nil);
+}
+
+void
+esetcursor2(Cursor *c, Cursor2 *c2)
+{
+	_displaycursor(display, c, c2);
 }
 
 int
diff --git a/src/libdraw/mkfile b/src/libdraw/mkfile
index ddb0e833..003bf3ce 100644
--- a/src/libdraw/mkfile
+++ b/src/libdraw/mkfile
@@ -14,6 +14,7 @@ OFILES=\
 	cloadimage.$O\
 	computil.$O\
 	creadimage.$O\
+	cursor.$O\
 	debug.$O\
 	defont.$O\
 	draw.$O\
diff --git a/src/libdraw/mouse.c b/src/libdraw/mouse.c
index ad1a069b..fc486be4 100644
--- a/src/libdraw/mouse.c
+++ b/src/libdraw/mouse.c
@@ -85,6 +85,12 @@ initmouse(char *file, Image *i)
 void
 setcursor(Mousectl *mc, Cursor *c)
 {
-	_displaycursor(mc->display, c);
+	_displaycursor(mc->display, c, nil);
+}
+
+void
+setcursor2(Mousectl *mc, Cursor *c, Cursor2 *c2)
+{
+	_displaycursor(mc->display, c, c2);
 }