5 files changed, 325 insertions(+), 1 deletions(-)

M pc/fns.h
M pc/kbd.c
A pc/psaux.c
A port/devnmouse.c
M port/proc.c

@@ 35,6 35,7 @@ char*	getconf(char*);
 void	guesscpuhz(int);
 void	halt(void);
 int	i8042auxcmd(int);
+int	i8042auxcmds(uchar*, int);
 void	i8042auxenable(void (*)(int, int));
 void	i8042reset(void);
 void	i8250console(void);

@@ 226,6 226,24 @@ i8042auxcmd(int cmd)
 	return 0;
 }
 
+int
+i8042auxcmds(uchar *cmd, int ncmd)
+{
+	int i;
+
+	ilock(&i8042lock);
+	for(i=0; i<ncmd; i++){
+		if(outready() < 0)
+			break;
+		outb(Cmd, 0xD4);
+		if(outready() < 0)
+			break;
+		outb(Data, cmd[i]);
+	}
+	iunlock(&i8042lock);
+	return i;
+}
+
 /*
  *  keyboard interrupt
  */


@@ 451,3 469,4 @@ kbdenable(void)
 
 	intrenable(IrqKBD, i8042intr, 0, BUSUNKNOWN, "kbd");
 }
+

@@ 0,0 1,57 @@
+/*
+ * Interface to raw PS/2 aux port.
+ * Used by user-level mouse daemon.
+ */
+
+#include "u.h"
+#include "../port/lib.h"
+#include "mem.h"
+#include "dat.h"
+#include "fns.h"
+#include "../port/error.h"
+#include "io.h"
+
+#define Image	IMAGE
+#include <draw.h>
+#include <memdraw.h>
+#include <cursor.h>
+#include "screen.h"
+
+/*
+ * BUG: we ignore shift here.
+ * we need a more general solution,
+ * one that will also work for serial mice.
+ */
+Queue *psauxq;
+
+static void
+psauxputc(int c, int)
+{
+	uchar uc;
+
+	uc = c;
+	qproduce(psauxq, &uc, 1);
+}
+
+static long
+psauxread(Chan*, void *a, long n, vlong)
+{
+	return qread(psauxq, a, n);
+}
+
+static long
+psauxwrite(Chan*, void *a, long n, vlong)
+{
+	return i8042auxcmds(a, n);
+}
+
+void
+psauxlink(void)
+{
+	psauxq = qopen(1024, 0, 0, 0);
+	if(psauxq == nil)
+		panic("psauxlink");
+	qnoblock(psauxq, 1);
+	i8042auxenable(psauxputc);
+	addarchfile("psaux", DMEXCL|0660, psauxread, psauxwrite);
+}

@@ 0,0 1,247 @@
+#include	"u.h"
+#include	"../port/lib.h"
+#include	"mem.h"
+#include	"dat.h"
+#include	"fns.h"
+#include	"../port/error.h"
+
+#define	Image	IMAGE
+#include	<draw.h>
+#include	<memdraw.h>
+#include	<cursor.h>
+#include	"screen.h"
+
+typedef struct Mouseinfo Mouseinfo;
+
+struct Mouseinfo
+{
+	Point	xy;
+	int	redraw;		/* update cursor on screen */
+};
+
+Mouseinfo	mouse;
+Cursorinfo	cursor;
+int		mouseshifted;
+Cursor		curs;
+
+void	Cursortocursor(Cursor*);
+int	mousechanged(void*);
+static void mouseclock(void);
+
+enum{
+	Qdir,
+	Qcursor,
+	Qmousepoint,
+	Qmousein,
+	Qmousectl,
+};
+
+static Dirtab mousedir[]={
+	".",	{Qdir, 0, QTDIR},	0,			DMDIR|0555,
+	"cursor",	{Qcursor},	0,			0660,
+	"mousepoint",	{Qmousepoint},	0,			0220,
+};
+
+extern	Memimage*	gscreen;
+
+static void
+mousereset(void)
+{
+	if(!conf.monitor)
+		return;
+
+	curs = arrow;
+	Cursortocursor(&arrow);
+	addclock0link(mouseclock);
+}
+
+static void
+mouseinit(void)
+{
+	if(!conf.monitor)
+		return;
+
+	cursoron(1);
+}
+
+static Chan*
+mouseattach(char *spec)
+{
+	if(!conf.monitor)
+		error(Egreg);
+	return devattach('m', spec);
+}
+
+static Walkqid*
+mousewalk(Chan *c, Chan *nc, char **name, int nname)
+{
+	return devwalk(c, nc, name, nname, mousedir, nelem(mousedir), devgen);
+}
+
+static int
+mousestat(Chan *c, uchar *db, int n)
+{
+	return devstat(c, db, n, mousedir, nelem(mousedir), devgen);
+}
+
+static Chan*
+mouseopen(Chan *c, int omode)
+{
+	switch((ulong)c->qid.path){
+	case Qdir:
+		if(omode != OREAD)
+			error(Eperm);
+		break;
+	case Qmousepoint:
+		if(omode != OWRITE)
+			error(Eperm);
+		break;
+	default:
+		break;
+	}
+	c->mode = openmode(omode);
+	c->flag |= COPEN;
+	c->offset = 0;
+	return c;
+}
+
+static void
+mouseclose(Chan*)
+{
+}
+
+static long
+mouseread(Chan *c, void *va, long n, vlong off)
+{
+	uchar *p;
+
+	p = va;
+	switch((ulong)c->qid.path){
+	case Qdir:
+		return devdirread(c, va, n, mousedir, nelem(mousedir), devgen);
+
+	case Qcursor:
+		if(off != 0)
+			return 0;
+		if(n < 2*4+2*2*16)
+			error(Eshort);
+		n = 2*4+2*2*16;
+		lock(&cursor);
+		BPLONG(p+0, curs.offset.x);
+		BPLONG(p+4, curs.offset.y);
+		memmove(p+8, curs.clr, 2*16);
+		memmove(p+40, curs.set, 2*16);
+		unlock(&cursor);
+		return n;
+
+	default:
+		error(Egreg);
+	}
+	return 0;
+}
+
+static long
+mousewrite(Chan *c, void *va, long n, vlong)
+{
+	char *p;
+	Point pt;
+	char buf[64];
+
+	p = va;
+	switch((ulong)c->qid.path){
+	case Qdir:
+		error(Eisdir);
+
+	case Qcursor:
+		cursoroff(1);
+		if(n < 2*4+2*2*16){
+			curs = arrow;
+			Cursortocursor(&arrow);
+		}else{
+			n = 2*4+2*2*16;
+			curs.offset.x = BGLONG(p+0);
+			curs.offset.y = BGLONG(p+4);
+			memmove(curs.clr, p+8, 2*16);
+			memmove(curs.set, p+40, 2*16);
+			Cursortocursor(&curs);
+		}
+		mouse.redraw = 1;
+		mouseclock();
+		cursoron(1);
+		return n;
+
+	case Qmousepoint:
+		if(n > sizeof buf-1)
+			n = sizeof buf -1;
+		memmove(buf, va, n);
+		buf[n] = 0;
+		p = 0;
+		pt.x = strtoul(buf, &p, 0);
+		if(p == 0)
+			error(Eshort);
+		pt.y = strtoul(p, 0, 0);
+		/*
+		 * this used to be qlocked here but not locked below.
+		 */
+		if(gscreen && ptinrect(pt, gscreen->r)){
+			mouse.xy = pt;
+			mouse.redraw = 1;
+			mouseclock();
+		}
+		return n;
+	}
+
+	error(Egreg);
+	return -1;
+}
+
+Dev nmousedevtab = {
+	'm',
+	"mouse",
+
+	mousereset,
+	mouseinit,
+	devshutdown,
+	mouseattach,
+	mousewalk,
+	mousestat,
+	mouseopen,
+	devcreate,
+	mouseclose,
+	mouseread,
+	devbread,
+	mousewrite,
+	devbwrite,
+	devremove,
+	devwstat,
+};
+
+void
+Cursortocursor(Cursor *c)
+{
+	lock(&cursor);
+	memmove(&cursor.Cursor, c, sizeof(Cursor));
+	setcursor(c);
+	unlock(&cursor);
+}
+
+/*
+ *  called by the clock routine to redraw the cursor
+ */
+static void
+mouseclock(void)
+{
+	if(mouse.redraw && canlock(&cursor)){
+		mouse.redraw = 0;
+		cursoroff(0);
+		mouse.redraw = cursoron(0);
+		unlock(&cursor);
+	}
+	drawactive(0);
+}
+
+Point
+mousexy(void)
+{
+	return mouse.xy;
+}

@@ 1193,7 1193,7 @@ killbig(void)
 			if(s != 0)
 				l += s->top - s->base;
 		}
-		if(l > max) {
+		if(l > max && strcmp(p->text, "kfs") != 0){
 			kp = p;
 			max = l;
 		}