Skip to content

draw: reopen ctl file when reattaching #1

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

Merged
merged 1 commit into from
Dec 14, 2020
Merged

draw: reopen ctl file when reattaching #1

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
12 changes: 10 additions & 2 deletions draw/init_plan9.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ type Display struct {
DefaultFont *Font
DefaultSubfont *Subfont

dir string
conn *drawFile
ctl *os.File
mousectl *Mousectl
Expand Down Expand Up @@ -159,8 +160,8 @@ func Init(errch chan<- error, fontname, label, winsize string) (*Display, error)
}

id := atoi(info[:1*12])
drawDir := fmt.Sprintf("/dev/draw/%d", id)
fd, err := os.OpenFile(drawDir+"/data", os.O_RDWR|syscall.O_CLOEXEC, 0666)
d.dir = fmt.Sprintf("/dev/draw/%d", id)
fd, err := os.OpenFile(d.dir+"/data", os.O_RDWR|syscall.O_CLOEXEC, 0666)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -263,6 +264,13 @@ func (d *Display) getwindow(ref int) error {
// If reattaching, maintain value of screen pointer.
func gengetwindow(d *Display, winname string, ref int) error {
var i *Image
var err error

d.ctl.Close()
d.ctl, err = os.OpenFile(d.dir + "/ctl", os.O_RDWR|syscall.O_CLOEXEC, 0666)
if err != nil {
return err
}

buf, err := ioutil.ReadFile(winname)
if err != nil {
Expand Down