Commit fa92b113 authored by Nigel Tao's avatar Nigel Tao

exp/draw: reintroduce the MouseEvent.Nsec timestamp.

R=rsc
CC=golang-dev
https://golang.org/cl/2166042
parent 34c312e1
...@@ -39,6 +39,8 @@ type MouseEvent struct { ...@@ -39,6 +39,8 @@ type MouseEvent struct {
Buttons int Buttons int
// Loc is the location of the cursor. // Loc is the location of the cursor.
Loc image.Point Loc image.Point
// Nsec is the event's timestamp.
Nsec int64
} }
// A ConfigEvent is sent each time the window's color model or size changes. // A ConfigEvent is sent each time the window's color model or size changes.
......
...@@ -19,6 +19,7 @@ import ( ...@@ -19,6 +19,7 @@ import (
"os" "os"
"strconv" "strconv"
"strings" "strings"
"time"
) )
type resID uint32 // X resource IDs. type resID uint32 // X resource IDs.
...@@ -208,12 +209,12 @@ func (c *conn) pumper() { ...@@ -208,12 +209,12 @@ func (c *conn) pumper() {
} else { } else {
c.mouseState.Buttons &^= mask c.mouseState.Buttons &^= mask
} }
// TODO(nigeltao): update mouseState's timestamp. c.mouseState.Nsec = time.Nanoseconds()
c.eventc <- c.mouseState c.eventc <- c.mouseState
case 0x06: // Motion notify. case 0x06: // Motion notify.
c.mouseState.Loc.X = int(c.buf[25])<<8 | int(c.buf[24]) c.mouseState.Loc.X = int(c.buf[25])<<8 | int(c.buf[24])
c.mouseState.Loc.Y = int(c.buf[27])<<8 | int(c.buf[26]) c.mouseState.Loc.Y = int(c.buf[27])<<8 | int(c.buf[26])
// TODO(nigeltao): update mouseState's timestamp. c.mouseState.Nsec = time.Nanoseconds()
c.eventc <- c.mouseState c.eventc <- c.mouseState
case 0x0c: // Expose. case 0x0c: // Expose.
// A single user action could trigger multiple expose events (e.g. if moving another // A single user action could trigger multiple expose events (e.g. if moving another
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment