Skip to content

Commit

Permalink
fix(input): windows: mouse mode flag
Browse files Browse the repository at this point in the history
We need to enable mouse mode on Windows on demand. This is done by
adding a new flag to the input driver and passing it to the cancelreader
to enable mouse mode.

Related: charmbracelet/bubbletea#1313
  • Loading branch information
aymanbagabas committed Feb 24, 2025
1 parent 8377176 commit 3bbc6f7
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion input/cancelreader_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ import (
"github.com/muesli/cancelreader"
)

func newCancelreader(r io.Reader) (cancelreader.CancelReader, error) {
func newCancelreader(r io.Reader, _ int) (cancelreader.CancelReader, error) {
return cancelreader.NewReader(r)
}
13 changes: 9 additions & 4 deletions input/cancelreader_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type conInputReader struct {

var _ cancelreader.CancelReader = &conInputReader{}

func newCancelreader(r io.Reader) (cancelreader.CancelReader, error) {
func newCancelreader(r io.Reader, flags int) (cancelreader.CancelReader, error) {
fallback := func(io.Reader) (cancelreader.CancelReader, error) {
return cancelreader.NewReader(r)
}
Expand All @@ -46,11 +46,16 @@ func newCancelreader(r io.Reader) (cancelreader.CancelReader, error) {
return fallback(r)
}

originalMode, err := prepareConsole(conin,
windows.ENABLE_MOUSE_INPUT,
modes := []uint32{
windows.ENABLE_WINDOW_INPUT,
windows.ENABLE_EXTENDED_FLAGS,
)
}

if flags&FlagMouseMode != 0 {
modes = append(modes, windows.ENABLE_MOUSE_INPUT)
}

originalMode, err := prepareConsole(conin, modes...)
if err != nil {
return nil, fmt.Errorf("failed to prepare console input: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion input/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ type Reader struct {
// }
func NewReader(r io.Reader, termType string, flags int) (*Reader, error) {
d := new(Reader)
cr, err := newCancelreader(r)
cr, err := newCancelreader(r, flags)
if err != nil {
return nil, err
}
Expand Down
4 changes: 4 additions & 0 deletions input/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ const (
// Key definitions come from Terminfo, this flag is only useful when
// FlagTerminfo is not set.
FlagFKeys

// When this flag is set, the driver will enable mouse mode on Windows.
// This is only useful on Windows and has no effect on other platforms.
FlagMouseMode
)

// Parser is a parser for input escape sequences.
Expand Down

0 comments on commit 3bbc6f7

Please sign in to comment.