Skip to content
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.

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

Support hyperlinks #60

Merged
merged 6 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
77 changes: 53 additions & 24 deletions escape.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type escapeInterpreter struct {
curFgColor, curBgColor Attribute
mode OutputMode
instruction instruction
hyperlink string
}

type (
Expand All @@ -40,7 +41,11 @@ const (
stateCSI
stateParams
stateOSC
stateOSCEscape
stateOSCWaitForParams
stateOSCParams
stateOSCHyperlink
stateOSCEndEscape
stateOSCSkipUnknown

bold fontEffect = 1
faint fontEffect = 2
Expand All @@ -60,6 +65,7 @@ var (
errNotCSI = errors.New("Not a CSI escape sequence")
errCSIParseError = errors.New("CSI escape sequence parsing error")
errCSITooLong = errors.New("CSI escape sequence is too long")
errOSCParseError = errors.New("OSC escape sequence parsing error")
)

// runes in case of error will output the non-parsed runes as a string.
Expand All @@ -78,6 +84,7 @@ func (ei *escapeInterpreter) runes() []rune {
ret = append(ret, ';')
}
return append(ret, ei.curch)
default:
}
return nil
}
Expand Down Expand Up @@ -191,15 +198,47 @@ func (ei *escapeInterpreter) parseOne(ch rune) (isEscape bool, err error) {
return false, errCSIParseError
}
case stateOSC:
if ch == '8' {
ei.state = stateOSCWaitForParams
ei.hyperlink = ""
return true, nil
}

ei.state = stateOSCSkipUnknown
return true, nil
case stateOSCWaitForParams:
if ch != ';' {
return true, errOSCParseError
}

ei.state = stateOSCParams
return true, nil
case stateOSCParams:
if ch == ';' {
ei.state = stateOSCHyperlink
}
return true, nil
case stateOSCHyperlink:
switch ch {
case 0x07:
ei.state = stateNone
case 0x1b:
ei.state = stateOSCEscape
return true, nil
ei.state = stateOSCEndEscape
default:
ei.hyperlink += string(ch)
}
return true, nil
case stateOSCEscape:
case stateOSCEndEscape:
ei.state = stateNone
return true, nil
case stateOSCSkipUnknown:
switch ch {
case 0x07:
ei.state = stateNone
case 0x1b:
ei.state = stateOSCEndEscape
}
return true, nil
}
return false, nil
}
Expand Down Expand Up @@ -267,58 +306,48 @@ func (ei *escapeInterpreter) outputCSI() error {

func (ei *escapeInterpreter) csiColor(param []string) (color Attribute, skip int, err error) {
if len(param) < 2 {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}

switch param[1] {
case "2":
// 24-bit color
if ei.mode < OutputTrue {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
if len(param) < 5 {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
var red, green, blue int
red, err = strconv.Atoi(param[2])
if err != nil {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
green, err = strconv.Atoi(param[3])
if err != nil {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
blue, err = strconv.Atoi(param[4])
if err != nil {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
return NewRGBColor(int32(red), int32(green), int32(blue)), 5, nil
case "5":
// 8-bit color
if ei.mode < Output256 {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
if len(param) < 3 {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
var hex int
hex, err = strconv.Atoi(param[2])
if err != nil {
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
return Get256Color(int32(hex)), 3, nil
default:
err = errCSIParseError
return
return 0, 0, errCSIParseError
}
}

Expand Down
43 changes: 29 additions & 14 deletions gui.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ type Gui struct {
managers []Manager
keybindings []*keybinding
focusHandler func(bool) error
openHyperlink func(string) error
maxX, maxY int
outputMode OutputMode
stop chan struct{}
Expand Down Expand Up @@ -624,6 +625,10 @@ func (g *Gui) SetFocusHandler(handler func(bool) error) {
g.focusHandler = handler
}

func (g *Gui) SetOpenHyperlinkFunc(openHyperlinkFunc func(string) error) {
g.openHyperlink = openHyperlinkFunc
}

// getKey takes an empty interface with a key and returns the corresponding
// typed Key or rune.
func getKey(key interface{}) (Key, rune, error) {
Expand Down Expand Up @@ -1302,7 +1307,7 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
switch ev.Type {
case eventKey:

_, err := g.execKeybindings(g.currentView, ev)
err := g.execKeybindings(g.currentView, ev)
if err != nil {
return err
}
Expand Down Expand Up @@ -1367,6 +1372,14 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
}
}

if ev.Key == MouseLeft && !v.Editable && g.openHyperlink != nil {
if newY >= 0 && newY <= len(v.viewLines)-1 && newX >= 0 && newX <= len(v.viewLines[newY].line)-1 {
if link := v.viewLines[newY].line[newX].hyperlink; link != "" {
return g.openHyperlink(link)
}
}
}

if IsMouseKey(ev.Key) {
opts := ViewMouseBindingOpts{X: newX, Y: newY}
matched, err := g.execMouseKeybindings(v, ev, opts)
Expand All @@ -1378,9 +1391,11 @@ func (g *Gui) onKey(ev *GocuiEvent) error {
}
}

if _, err := g.execKeybindings(v, ev); err != nil {
if err := g.execKeybindings(v, ev); err != nil {
return err
}

default:
}

return nil
Expand Down Expand Up @@ -1440,25 +1455,25 @@ func IsMouseScrollKey(key interface{}) bool {
}

// execKeybindings executes the keybinding handlers that match the passed view
// and event. The value of matched is true if there is a match and no errors.
func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) (matched bool, err error) {
// and event.
func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) error {
var globalKb *keybinding
var matchingParentViewKb *keybinding

// if we're searching, and we've hit n/N/Esc, we ignore the default keybinding
if v != nil && v.IsSearching() && ev.Mod == ModNone {
if eventMatchesKey(ev, g.NextSearchMatchKey) {
return true, v.gotoNextMatch()
return v.gotoNextMatch()
} else if eventMatchesKey(ev, g.PrevSearchMatchKey) {
return true, v.gotoPreviousMatch()
return v.gotoPreviousMatch()
} else if eventMatchesKey(ev, g.SearchEscapeKey) {
v.searcher.clearSearch()
if g.OnSearchEscape != nil {
if err := g.OnSearchEscape(); err != nil {
return true, err
return err
}
}
return true, nil
return nil
}
}

Expand Down Expand Up @@ -1486,26 +1501,26 @@ func (g *Gui) execKeybindings(v *View, ev *GocuiEvent) (matched bool, err error)
if g.currentView != nil && g.currentView.Editable && g.currentView.Editor != nil {
matched := g.currentView.Editor.Edit(g.currentView, ev.Key, ev.Ch, ev.Mod)
if matched {
return true, nil
return nil
}
}

if globalKb != nil {
return g.execKeybinding(v, globalKb)
}
return false, nil
return nil
}

// execKeybinding executes a given keybinding
func (g *Gui) execKeybinding(v *View, kb *keybinding) (bool, error) {
func (g *Gui) execKeybinding(v *View, kb *keybinding) error {
if g.isBlacklisted(kb.key) {
return true, nil
return nil
}

if err := kb.handler(g, v); err != nil {
return false, err
return err
}
return true, nil
return nil
}

func (g *Gui) onFocus(ev *GocuiEvent) error {
Expand Down
3 changes: 3 additions & 0 deletions tcell_driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ func (g *Gui) pollEvent() GocuiEvent {
mouseKey = MouseRight
case tcell.ButtonMiddle:
mouseKey = MouseMiddle
default:
}
}

Expand All @@ -374,11 +375,13 @@ func (g *Gui) pollEvent() GocuiEvent {
dragState = NOT_DRAGGING
case tcell.ButtonSecondary:
case tcell.ButtonMiddle:
default:
}
mouseMod = Modifier(lastMouseMod)
lastMouseMod = tcell.ModNone
lastMouseKey = tcell.ButtonNone
}
default:
}

if !wheeling {
Expand Down
11 changes: 8 additions & 3 deletions view.go
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ type viewLine struct {
type cell struct {
chr rune
bgColor, fgColor Attribute
hyperlink string
}

type lineType []cell
Expand Down Expand Up @@ -851,9 +852,10 @@ func (v *View) parseInput(ch rune, x int, _ int) (bool, []cell) {
repeatCount = tabStop - (x % tabStop)
}
c := cell{
fgColor: v.ei.curFgColor,
bgColor: v.ei.curBgColor,
chr: ch,
fgColor: v.ei.curFgColor,
bgColor: v.ei.curBgColor,
hyperlink: v.ei.hyperlink,
chr: ch,
}
for i := 0; i < repeatCount; i++ {
cells = append(cells, c)
Expand Down Expand Up @@ -1188,6 +1190,9 @@ func (v *View) draw() error {
if bgColor == ColorDefault {
bgColor = v.BgColor
}
if c.hyperlink != "" {
fgColor |= AttrUnderline
}

if err := v.setRune(x, y, c.chr, fgColor, bgColor); err != nil {
return err
Expand Down
Loading