Fix: mouse clicking with softwrap

[micro.git] / cmd / micro / messenger.go

diff --git a/cmd/micro/messenger.go b/cmd/micro/messenger.go
index 3a97eb488479b9c42320cf4faef6f4fa5f3e5e68..5cfdf1c2c85e6071f12cd39593a63ea628b9cc72 100644 (file)
--- a/cmd/micro/messenger.go
+++ b/cmd/micro/messenger.go
@@ -6,6 +6,7 @@ import (
        "fmt"
        "os"
        "strconv"
+       "strings"
 
        "github.com/zyedidia/clipboard"
        "github.com/zyedidia/tcell"
@@ -21,10 +22,10 @@ func TermMessage(msg ...interface{}) {
        screenWasNil := screen == nil
        if !screenWasNil {
                screen.Fini()
+               screen = nil
        }
 
        fmt.Println(msg...)
-       messenger.addLog(fmt.Sprint(msg...))
        fmt.Print("\nPress enter to continue")
 
        reader := bufio.NewReader(os.Stdin)
@@ -69,15 +70,17 @@ type Messenger struct {
        gutterMessage bool
 }
 
-func (m *Messenger) addLog(msg string) {
+func (m *Messenger) AddLog(msg string) {
        buffer := m.getBuffer()
-       buffer.Insert(buffer.End(), msg+"\n")
+       buffer.insert(buffer.End(), []byte(msg+"\n"))
+       buffer.Cursor.Loc = buffer.End()
+       buffer.Cursor.Relocate()
 }
 
 func (m *Messenger) getBuffer() *Buffer {
        if m.log == nil {
-               m.log = NewBuffer([]byte{}, "")
-               m.log.Name = "Log"
+               m.log = NewBuffer(strings.NewReader(""), "")
+               m.log.name = "Log"
        }
        return m.log
 }
@@ -90,7 +93,7 @@ func (m *Messenger) Message(msg ...interface{}) {
        if _, ok := colorscheme["message"]; ok {
                m.style = colorscheme["message"]
        }
-       m.addLog(m.message)
+       m.AddLog(m.message)
        m.hasMessage = true
 }
 
@@ -106,7 +109,7 @@ func (m *Messenger) Error(msg ...interface{}) {
        if _, ok := colorscheme["error-message"]; ok {
                m.style = colorscheme["error-message"]
        }
-       m.addLog(m.message)
+       m.AddLog(m.message)
        m.hasMessage = true
 }
 
@@ -128,16 +131,16 @@ func (m *Messenger) YesNoPrompt(prompt string) (bool, bool) {
                        switch e.Key() {
                        case tcell.KeyRune:
                                if e.Rune() == 'y' {
-                                       m.addLog("\t--> y")
+                                       m.AddLog("\t--> y")
                                        m.hasPrompt = false
                                        return true, false
                                } else if e.Rune() == 'n' {
-                                       m.addLog("\t--> n")
+                                       m.AddLog("\t--> n")
                                        m.hasPrompt = false
                                        return false, false
                                }
                        case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape:
-                               m.addLog("\t--> (cancel)")
+                               m.AddLog("\t--> (cancel)")
                                m.hasPrompt = false
                                return false, true
                        }
@@ -164,7 +167,7 @@ func (m *Messenger) LetterPrompt(prompt string, responses ...rune) (rune, bool)
                        case tcell.KeyRune:
                                for _, r := range responses {
                                        if e.Rune() == r {
-                                               m.addLog("\t--> " + string(r))
+                                               m.AddLog("\t--> " + string(r))
                                                m.Clear()
                                                m.Reset()
                                                m.hasPrompt = false
@@ -172,7 +175,7 @@ func (m *Messenger) LetterPrompt(prompt string, responses ...rune) (rune, bool)
                                        }
                                }
                        case tcell.KeyCtrlC, tcell.KeyCtrlQ, tcell.KeyEscape:
-                               m.addLog("\t--> (cancel)")
+                               m.AddLog("\t--> (cancel)")
                                m.Clear()
                                m.Reset()
                                m.hasPrompt = false
@@ -190,11 +193,13 @@ const (
        CommandCompletion
        HelpCompletion
        OptionCompletion
+       PluginCmdCompletion
+       PluginNameCompletion
 )
 
 // Prompt sends the user a message and waits for a response to be typed in
 // This function blocks the main loop while waiting for input
-func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Completion) (string, bool) {
+func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTypes ...Completion) (string, bool) {
        m.hasPrompt = true
        m.Message(prompt)
        if _, ok := m.history[historyType]; !ok {
@@ -204,7 +209,9 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
        }
        m.historyNum = len(m.history[historyType]) - 1
 
-       response, canceled := "", true
+       response, canceled := placeholder, true
+       m.response = response
+       m.cursorx = Count(placeholder)
 
        RedrawAll()
        for m.hasPrompt {
@@ -218,11 +225,11 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
                        switch e.Key() {
                        case tcell.KeyCtrlQ, tcell.KeyCtrlC, tcell.KeyEscape:
                                // Cancel
-                               m.addLog("\t--> (cancel)")
+                               m.AddLog("\t--> (cancel)")
                                m.hasPrompt = false
                        case tcell.KeyEnter:
                                // User is done entering their response
-                               m.addLog("\t--> " + m.response)
+                               m.AddLog("\t--> " + m.response)
                                m.hasPrompt = false
                                response, canceled = m.response, false
                                m.history[historyType][len(m.history[historyType])-1] = response
@@ -253,6 +260,10 @@ func (m *Messenger) Prompt(prompt, historyType string, completionTypes ...Comple
                                        chosen, suggestions = HelpComplete(currentArg)
                                } else if completionType == OptionCompletion {
                                        chosen, suggestions = OptionComplete(currentArg)
+                               } else if completionType == PluginCmdCompletion {
+                                       chosen, suggestions = PluginCmdComplete(currentArg)
+                               } else if completionType == PluginNameCompletion {
+                                       chosen, suggestions = PluginNameComplete(currentArg)
                                } else if completionType < NoCompletion {
                                        chosen, suggestions = PluginComplete(completionType, currentArg)
                                }