Skip to content

mux_plan9.go: get it to build #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rminnich wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mux_plan9.go: get it to build #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 57 additions & 4 deletions draw/drawfcall/mux_plan9.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -151,14 +151,15 @@ 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))
// Replaced Clr with White, Set with Black (?)
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
}
Expand Down Expand Up @@ -262,3 +263,55 @@ Loop:
n, err := c.data.Write(b[i:])
return n + i, err
}

// Cursor2
// copied from ../cursor.go to avoid import cycle

var expand = [16]uint8{
0x00, 0x03, 0x0c, 0x0f,
0x30, 0x33, 0x3c, 0x3f,
0xc0, 0xc3, 0xcc, 0xcf,
0xf0, 0xf3, 0xfc, 0xff,
}

// scaleCursor returns a high-DPI version of c.
func scaleCursor(c Cursor) Cursor2 {
var c2 Cursor2
c2.X = 2 * c.X
c2.Y = 2 * c.Y
for y := 0; y < 16; y++ {
c2.White[8*y+4] = expand[c.White[2*y]>>4]
c2.White[8*y] = c2.White[8*y+4]
c2.Black[8*y+4] = expand[c.Black[2*y]>>4]
c2.Black[8*y] = c2.Black[8*y+4]
c2.White[8*y+5] = expand[c.White[2*y]&15]
c2.White[8*y+1] = c2.White[8*y+5]
c2.Black[8*y+5] = expand[c.Black[2*y]&15]
c2.Black[8*y+1] = c2.Black[8*y+5]
c2.White[8*y+6] = expand[c.White[2*y+1]>>4]
c2.White[8*y+2] = c2.White[8*y+6]
c2.Black[8*y+6] = expand[c.Black[2*y+1]>>4]
c2.Black[8*y+2] = c2.Black[8*y+6]
c2.White[8*y+7] = expand[c.White[2*y+1]&15]
c2.White[8*y+3] = c2.White[8*y+7]
c2.Black[8*y+7] = expand[c.Black[2*y+1]&15]
c2.Black[8*y+3] = c2.Black[8*y+7]
}
return c2
}

func (c *Conn) Cursor2(cursor *Cursor, cursor2 *Cursor2) error {
tx := &Msg{Type: Tcursor2}
if cursor == nil {
tx.Arrow = true
} else {
tx.Cursor = *cursor
if cursor2 == nil {
tx.Cursor2 = scaleCursor(*cursor)
} else {
tx.Cursor2 = *cursor2
}
}
_ = tx
return fmt.Errorf("not yet")
}