"strings"
"time"
+ "github.com/mattn/go-runewidth"
"github.com/zyedidia/tcell"
)
width int
height int
+ // Where this view is located
+ x, y int
+
// How much to offset because of line numbers
lineNumOffset int
// Is the help text opened in this view
helpOpen bool
+ // This is the index of this view in the views array
+ Num int
+ // What tab is this view stored in
+ TabNum int
+
// Is this view modifiable?
Modifiable bool
func NewViewWidthHeight(buf *Buffer, w, h int) *View {
v := new(View)
+ v.x, v.y = 0, 0
+
v.widthPercent = w
v.heightPercent = h
v.Resize(screen.Size())
func (v *View) Resize(w, h int) {
// Always include 1 line for the command line at the bottom
h--
+ if len(tabs) > 1 {
+ // Include one line for the tab bar at the top
+ h--
+ v.y = 1
+ } else {
+ v.y = 0
+ }
v.width = int(float32(w) * float32(v.widthPercent) / 100)
// We subtract 1 for the statusline
v.height = int(float32(h) * float32(v.heightPercent) / 100)
// The message is what to print after saying "You have unsaved changes. "
func (v *View) CanClose(msg string) bool {
if v.Buf.IsModified {
- quit, canceled := messenger.Prompt("You have unsaved changes. "+msg, "Unsaved")
+ quit, canceled := messenger.Prompt("You have unsaved changes. "+msg, "Unsaved", NoCompletion)
if !canceled {
if strings.ToLower(quit) == "yes" || strings.ToLower(quit) == "y" {
return true
v.Topline = 0
v.leftCol = 0
v.Cursor.ResetSelection()
+ v.Relocate()
v.messages = make(map[string][]GutterMessage)
v.matches = Match(v)
}
}
+func (v *View) VSplit() bool {
+ v.widthPercent /= 2
+ v.Resize(screen.Size())
+
+ newView := NewViewWidthHeight(NewBuffer([]byte{}, ""), v.widthPercent, v.heightPercent)
+ newView.TabNum = v.TabNum
+ newView.x = v.x + v.width
+ tab := tabs[v.TabNum]
+ tab.curView++
+ newView.Num = len(tab.views)
+ tab.views = append(tab.views, newView)
+ return false
+}
+
// Relocate moves the view window so that the cursor is in view
// This is useful if the user has scrolled far away, and then starts typing
func (v *View) Relocate() bool {
}
x = v.Cursor.GetCharPosInLine(y, x)
- if x > Count(v.Buf.Lines[y]) {
- x = Count(v.Buf.Lines[y])
+ if x > Count(v.Buf.Line(y)) {
+ x = Count(v.Buf.Line(y))
}
v.Cursor.X = x
v.Cursor.Y = y
// Window resized
v.Resize(e.Size())
case *tcell.EventKey:
- if e.Key() == tcell.KeyRune && e.Modifiers() == 0 {
+ if e.Key() == tcell.KeyRune && (e.Modifiers() == 0 || e.Modifiers() == tcell.ModShift) {
// Insert a character
if v.Cursor.HasSelection() {
v.Cursor.DeleteSelection()
v.Cursor.ResetSelection()
}
- v.Buf.Insert(v.Cursor.Loc(), string(e.Rune()))
+ v.Buf.Insert(v.Cursor.Loc, string(e.Rune()))
v.Cursor.Right()
+
+ for _, pl := range loadedPlugins {
+ err := Call(pl+".onRune", []string{string(e.Rune())})
+ if err != nil && !strings.HasPrefix(err.Error(), "function does not exist") {
+ TermMessage(err)
+ }
+ }
} else {
- for key, action := range bindings {
+ for key, actions := range bindings {
if e.Key() == key.keyCode {
if e.Key() == tcell.KeyRune {
if e.Rune() != key.r {
}
}
if e.Modifiers() == key.modifiers {
- relocate = action(v)
- for _, pl := range loadedPlugins {
- funcName := strings.Split(runtime.FuncForPC(reflect.ValueOf(action).Pointer()).Name(), ".")
- err := Call(pl+"_on"+funcName[len(funcName)-1], nil)
- if err != nil && !strings.HasPrefix(err.Error(), "function does not exist") {
- TermMessage(err)
+ relocate = false
+ for _, action := range actions {
+ relocate = action(v) || relocate
+ for _, pl := range loadedPlugins {
+ funcName := strings.Split(runtime.FuncForPC(reflect.ValueOf(action).Pointer()).Name(), ".")
+ err := Call(pl+".on"+funcName[len(funcName)-1], nil)
+ if err != nil && !strings.HasPrefix(err.Error(), "function does not exist") {
+ TermMessage(err)
+ }
}
}
}
v.Cursor.ResetSelection()
}
clip := e.Text()
- v.Buf.Insert(v.Cursor.Loc(), clip)
- v.Cursor.SetLoc(v.Cursor.Loc() + Count(clip))
+ v.Buf.Insert(v.Cursor.Loc, clip)
+ v.Cursor.Loc = v.Cursor.Loc.Move(Count(clip), v.Buf)
v.freshClip = false
case *tcell.EventMouse:
x, y := e.Position()
- x -= v.lineNumOffset - v.leftCol
- y += v.Topline
+ x -= v.lineNumOffset - v.leftCol + v.x
+ y += v.Topline - v.y
// Don't relocate for mouse events
relocate = false
v.tripleClick = false
v.lastClickTime = time.Now()
- loc := v.Cursor.Loc()
- v.Cursor.OrigSelection[0] = loc
- v.Cursor.CurSelection[0] = loc
- v.Cursor.CurSelection[1] = loc
+ v.Cursor.OrigSelection[0] = v.Cursor.Loc
+ v.Cursor.CurSelection[0] = v.Cursor.Loc
+ v.Cursor.CurSelection[1] = v.Cursor.Loc
}
v.mouseReleased = false
} else if !v.mouseReleased {
} else if v.doubleClick {
v.Cursor.AddWordToSelection()
} else {
- v.Cursor.CurSelection[1] = v.Cursor.Loc()
+ v.Cursor.CurSelection[1] = v.Cursor.Loc
}
}
case tcell.ButtonNone:
if !v.doubleClick && !v.tripleClick {
v.MoveToMouseClick(x, y)
- v.Cursor.CurSelection[1] = v.Cursor.Loc()
+ v.Cursor.CurSelection[1] = v.Cursor.Loc
}
v.mouseReleased = true
}
// DisplayView renders the view to the screen
func (v *View) DisplayView() {
// The character number of the character in the top left of the screen
- charNum := ToCharPos(0, v.Topline, v.Buf)
+ charNum := Loc{0, v.Topline}
// Convert the length of buffer to a string, and get the length of the string
// We are going to have to offset by that amount
} else {
v.lineNumOffset = 0
}
- var highlightStyle tcell.Style
+ highlightStyle := defStyle
var hasGutterMessages bool
for _, v := range v.messages {
}
for lineN := 0; lineN < v.height; lineN++ {
- var x int
+ x := v.x
// If the buffer is smaller than the view height
if lineN+v.Topline >= v.Buf.NumLines {
// We have to clear all this space
- for i := 0; i < v.width; i++ {
- screen.SetContent(i, lineN, ' ', nil, defStyle)
+ for i := v.x; i < v.width; i++ {
+ screen.SetContent(i, lineN+v.y, ' ', nil, defStyle)
}
continue
}
- line := v.Buf.Lines[lineN+v.Topline]
+ line := v.Buf.Line(lineN + v.Topline)
if hasGutterMessages {
msgOnLine := false
for _, msg := range v.messages[k] {
if msg.lineNum == lineN+v.Topline {
msgOnLine = true
- gutterStyle := tcell.StyleDefault
+ gutterStyle := defStyle
switch msg.kind {
case GutterInfo:
if style, ok := colorscheme["gutter-info"]; ok {
gutterStyle = style
}
}
- screen.SetContent(x, lineN, '>', nil, gutterStyle)
+ screen.SetContent(x, lineN+v.y, '>', nil, gutterStyle)
x++
- screen.SetContent(x, lineN, '>', nil, gutterStyle)
+ screen.SetContent(x, lineN+v.y, '>', nil, gutterStyle)
x++
if v.Cursor.Y == lineN+v.Topline {
messenger.Message(msg.msg)
}
}
if !msgOnLine {
- screen.SetContent(x, lineN, ' ', nil, tcell.StyleDefault)
+ screen.SetContent(x, lineN+v.y, ' ', nil, defStyle)
x++
- screen.SetContent(x, lineN, ' ', nil, tcell.StyleDefault)
+ screen.SetContent(x, lineN+v.y, ' ', nil, defStyle)
x++
if v.Cursor.Y == lineN+v.Topline && messenger.gutterMessage {
messenger.Reset()
if settings["ruler"] == true {
lineNum = strconv.Itoa(lineN + v.Topline + 1)
for i := 0; i < maxLineLength-len(lineNum); i++ {
- screen.SetContent(x, lineN, ' ', nil, lineNumStyle)
+ screen.SetContent(x, lineN+v.y, ' ', nil, lineNumStyle)
x++
}
// Write the actual line number
for _, ch := range lineNum {
- screen.SetContent(x, lineN, ch, nil, lineNumStyle)
+ screen.SetContent(x, lineN+v.y, ch, nil, lineNumStyle)
x++
}
if settings["ruler"] == true {
// Write the extra space
- screen.SetContent(x, lineN, ' ', nil, lineNumStyle)
+ screen.SetContent(x, lineN+v.y, ' ', nil, lineNumStyle)
x++
}
}
// Write the line
for colN, ch := range line {
- var lineStyle tcell.Style
+ lineStyle := defStyle
if settings["syntax"].(bool) {
// Syntax highlighting is enabled
}
if v.Cursor.HasSelection() &&
- (charNum >= v.Cursor.CurSelection[0] && charNum < v.Cursor.CurSelection[1] ||
- charNum < v.Cursor.CurSelection[0] && charNum >= v.Cursor.CurSelection[1]) {
+ (charNum.GreaterEqual(v.Cursor.CurSelection[0]) && charNum.LessThan(v.Cursor.CurSelection[1]) ||
+ charNum.LessThan(v.Cursor.CurSelection[0]) && charNum.GreaterEqual(v.Cursor.CurSelection[1])) {
- lineStyle = tcell.StyleDefault.Reverse(true)
+ lineStyle = defStyle.Reverse(true)
if style, ok := colorscheme["selection"]; ok {
lineStyle = style
lineStyle = highlightStyle
}
- if settings["cursorline"].(bool) && v.Cursor.Y == lineN+v.Topline {
+ if settings["cursorline"].(bool) && !v.Cursor.HasSelection() && v.Cursor.Y == lineN+v.Topline {
if style, ok := colorscheme["cursor-line"]; ok {
fg, _, _ := style.Decompose()
lineStyle = lineStyle.Background(fg)
lineIndentStyle = style
}
if v.Cursor.HasSelection() &&
- (charNum >= v.Cursor.CurSelection[0] && charNum < v.Cursor.CurSelection[1] ||
- charNum < v.Cursor.CurSelection[0] && charNum >= v.Cursor.CurSelection[1]) {
+ (charNum.GreaterEqual(v.Cursor.CurSelection[0]) && charNum.LessThan(v.Cursor.CurSelection[1]) ||
+ charNum.LessThan(v.Cursor.CurSelection[0]) && charNum.GreaterEqual(v.Cursor.CurSelection[1])) {
- lineIndentStyle = tcell.StyleDefault.Reverse(true)
+ lineIndentStyle = defStyle.Reverse(true)
if style, ok := colorscheme["selection"]; ok {
lineIndentStyle = style
}
}
- if settings["cursorline"].(bool) && v.Cursor.Y == lineN+v.Topline {
+ if settings["cursorline"].(bool) && !v.Cursor.HasSelection() && v.Cursor.Y == lineN+v.Topline {
if style, ok := colorscheme["cursor-line"]; ok {
fg, _, _ := style.Decompose()
lineIndentStyle = lineIndentStyle.Background(fg)
}
}
indentChar := []rune(settings["indentchar"].(string))
- screen.SetContent(x-v.leftCol, lineN, indentChar[0], nil, lineIndentStyle)
+ if x-v.leftCol >= v.lineNumOffset {
+ screen.SetContent(x-v.leftCol, lineN+v.y, indentChar[0], nil, lineIndentStyle)
+ }
tabSize := int(settings["tabsize"].(float64))
for i := 0; i < tabSize-1; i++ {
+ x++
+ if x-v.leftCol >= v.lineNumOffset {
+ screen.SetContent(x-v.leftCol, lineN+v.y, ' ', nil, lineStyle)
+ }
+ }
+ } else if runewidth.RuneWidth(ch) > 1 {
+ if x-v.leftCol >= v.lineNumOffset {
+ screen.SetContent(x-v.leftCol, lineN, ch, nil, lineStyle)
+ }
+ for i := 0; i < runewidth.RuneWidth(ch)-1; i++ {
x++
if x-v.leftCol >= v.lineNumOffset {
screen.SetContent(x-v.leftCol, lineN, ' ', nil, lineStyle)
}
} else {
if x-v.leftCol >= v.lineNumOffset {
- screen.SetContent(x-v.leftCol, lineN, ch, nil, lineStyle)
+ screen.SetContent(x-v.leftCol, lineN+v.y, ch, nil, lineStyle)
}
}
- charNum++
+ charNum = charNum.Move(1, v.Buf)
x++
}
// Here we are at a newline
// The newline may be selected, in which case we should draw the selection style
// with a space to represent it
if v.Cursor.HasSelection() &&
- (charNum >= v.Cursor.CurSelection[0] && charNum < v.Cursor.CurSelection[1] ||
- charNum < v.Cursor.CurSelection[0] && charNum >= v.Cursor.CurSelection[1]) {
+ (charNum.GreaterEqual(v.Cursor.CurSelection[0]) && charNum.LessThan(v.Cursor.CurSelection[1]) ||
+ charNum.LessThan(v.Cursor.CurSelection[0]) && charNum.GreaterEqual(v.Cursor.CurSelection[1])) {
selectStyle := defStyle.Reverse(true)
if style, ok := colorscheme["selection"]; ok {
selectStyle = style
}
- screen.SetContent(x-v.leftCol, lineN, ' ', nil, selectStyle)
+ screen.SetContent(x-v.leftCol, lineN+v.y, ' ', nil, selectStyle)
x++
}
- charNum++
+ charNum = charNum.Move(1, v.Buf)
- for i := 0; i < v.width-x; i++ {
- lineStyle := tcell.StyleDefault
- if settings["cursorline"].(bool) && v.Cursor.Y == lineN+v.Topline {
+ for i := 0; i < v.width-((x-v.x)-v.leftCol); i++ {
+ lineStyle := defStyle
+ if settings["cursorline"].(bool) && !v.Cursor.HasSelection() && v.Cursor.Y == lineN+v.Topline {
if style, ok := colorscheme["cursor-line"]; ok {
fg, _, _ := style.Decompose()
lineStyle = lineStyle.Background(fg)
}
}
- screen.SetContent(x+i, lineN, ' ', nil, lineStyle)
+ if !(x-v.leftCol < v.lineNumOffset) {
+ screen.SetContent(x+i, lineN+v.y, ' ', nil, lineStyle)
+ }
}
}
}
if (v.Cursor.Y-v.Topline < 0 || v.Cursor.Y-v.Topline > v.height-1) || v.Cursor.HasSelection() {
screen.HideCursor()
} else {
- screen.ShowCursor(v.Cursor.GetVisualX()+v.lineNumOffset-v.leftCol, v.Cursor.Y-v.Topline)
+ screen.ShowCursor(v.x+v.Cursor.GetVisualX()+v.lineNumOffset-v.leftCol, v.Cursor.Y-v.Topline+v.y)
}
}
projects / micro.git / blobdiff