From d07fb3261f596766b47f868fc6c088ec8f286cd5 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 23 Jul 2018 19:29:15 +0200 Subject: devmouse: produce signed msec timestamp in /dev/mouse, accept unsigned on write --- sys/src/9/port/devmouse.c | 4 ++-- sys/src/cmd/vnc/devmouse.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/src/9/port/devmouse.c b/sys/src/9/port/devmouse.c index a0d004c66..e8433ef5f 100644 --- a/sys/src/9/port/devmouse.c +++ b/sys/src/9/port/devmouse.c @@ -291,7 +291,7 @@ mouseread(Chan *c, void *va, long n, vlong off) b = 16; else if (b == 16) b = 8; - sprint(buf, "m%11d %11d %11d %11lud ", + sprint(buf, "m%11d %11d %11d %11ld ", m.xy.x, m.xy.y, b, m.msec); mouse.lastcounter = m.counter; @@ -448,7 +448,7 @@ mousewrite(Chan *c, void *va, long n, vlong) if(*p == 0) error(Eshort); b = strtol(p, &p, 0); - msec = strtol(p, 0, 0); + msec = (ulong)strtoll(p, 0, 0); if(msec == 0) msec = TK2MS(MACHP(0)->ticks); diff --git a/sys/src/cmd/vnc/devmouse.c b/sys/src/cmd/vnc/devmouse.c index 64f29bae0..4c860162f 100644 --- a/sys/src/cmd/vnc/devmouse.c +++ b/sys/src/cmd/vnc/devmouse.c @@ -191,7 +191,7 @@ mouseread(Chan *c, void *va, long n, vlong off) m = mouse.Mousestate; unlock(&mouse); - sprint(buf, "m%11d %11d %11d %11lud ", + sprint(buf, "m%11d %11d %11d %11ld ", m.xy.x, m.xy.y, m.buttons, m.msec); mouse.lastcounter = m.counter; -- cgit v1.2.3