From f70ddb601ba15d5006039c163e7e446e404f0a2a Mon Sep 17 00:00:00 2001 From: Dan Mushkevych Date: Sat, 23 Aug 2025 19:48:25 -0700 Subject: [PATCH 1/4] Updating module name to enable local debugging --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 953b092..712803e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module 9fans.net/go +module github.com/mushkevych/9fans-go go 1.23.0 From 6f79a04e54de69781b5736530f299d8b10cfcd82 Mon Sep 17 00:00:00 2001 From: Dan Mushkevych Date: Sat, 23 Aug 2025 20:08:40 -0700 Subject: [PATCH 2/4] First fixes --- draw/drawfcall/mux_plan9.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/draw/drawfcall/mux_plan9.go b/draw/drawfcall/mux_plan9.go index 6849bb8..a117f4c 100644 --- a/draw/drawfcall/mux_plan9.go +++ b/draw/drawfcall/mux_plan9.go @@ -128,7 +128,7 @@ func (c *Conn) ReadMouse() (m Mouse, resized bool, err error) { } m.Point = image.Pt(atoi(f[1]), atoi(f[2])) m.Buttons = atoi(f[3]) - m.Msec = atoi(f[4]) + m.Msec = uint32(atoi(f[4])) if f[0] == "r" { resized = true } @@ -151,14 +151,14 @@ func (c *Conn) Cursor(cursor *Cursor) error { _, err := c.cursor.Write([]byte{0}) return err } - b := make([]byte, 2*4+len(cursor.Clr)+len(cursor.Set)) + b := make([]byte, 2*4+len(cursor.White)+len(cursor.Black)) i := 0 binary.LittleEndian.PutUint32(b[i:], uint32(cursor.Point.X)) i += 4 binary.LittleEndian.PutUint32(b[i:], uint32(cursor.Point.Y)) i += 4 - i += copy(b[i:], cursor.Clr[:]) - i += copy(b[i:], cursor.Set[:]) + i += copy(b[i:], cursor.White[:]) + i += copy(b[i:], cursor.Black[:]) _, err := c.cursor.Write(b) return err } From 90b6e5b036938b8b837229a6da385c5e8967b0b9 Mon Sep 17 00:00:00 2001 From: Dan Mushkevych Date: Sat, 23 Aug 2025 20:15:26 -0700 Subject: [PATCH 3/4] Restoring module name --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 712803e..953b092 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mushkevych/9fans-go +module 9fans.net/go go 1.23.0 From 0f7d5fe5414db9b3fcc1849c60cd0db7b9f90d2e Mon Sep 17 00:00:00 2001 From: Dan Mushkevych Date: Sat, 23 Aug 2025 21:20:50 -0700 Subject: [PATCH 4/4] Adding Cursor2 stub --- draw/drawfcall/mux_plan9.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/draw/drawfcall/mux_plan9.go b/draw/drawfcall/mux_plan9.go index a117f4c..fe9a42a 100644 --- a/draw/drawfcall/mux_plan9.go +++ b/draw/drawfcall/mux_plan9.go @@ -163,6 +163,11 @@ func (c *Conn) Cursor(cursor *Cursor) error { return err } +// Cursor2 on Plan 9: gracefully degrade to legacy Cursor. +func (c *Conn) Cursor2(cur *Cursor, cur2 *Cursor2) error { + return c.Cursor(cur) +} + func (c *Conn) BounceMouse(m *Mouse) error { panic("unimplemented") }