X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=cmd%2Fmicro%2Fstatusline.go;h=d346a033852e0fd4a370896fa2b6fdf0f61038aa;hb=41a24e61d6b9017dbe010ae36295cb3c1dd701fc;hp=2605ef9b79413d26975ff401f6e2e883d9e657cc;hpb=678819683aba24fc8633e091fc271b5ff379ce0e;p=micro.git diff --git a/cmd/micro/statusline.go b/cmd/micro/statusline.go index 2605ef9b..d346a033 100644 --- a/cmd/micro/statusline.go +++ b/cmd/micro/statusline.go @@ -1,6 +1,7 @@ package main import ( + "path" "strconv" ) @@ -22,6 +23,9 @@ func (sline *Statusline) Display() { y := sline.view.Height + sline.view.y file := sline.view.Buf.GetName() + if sline.view.Buf.Settings["basename"].(bool) { + file = path.Base(file) + } // If the buffer is dirty (has been modified) write a little '+' if sline.view.Buf.Modified() { @@ -43,24 +47,26 @@ func (sline *Statusline) Display() { file += " " + sline.view.Buf.Settings["fileformat"].(string) rightText := "" - if len(kmenuBinding) > 0 { - if globalSettings["keymenu"].(bool) { - rightText += kmenuBinding + ": hide bindings" - } else { - rightText += kmenuBinding + ": show bindings" - } - } - if len(helpBinding) > 0 { + if !sline.view.Buf.Settings["hidehelp"].(bool) { if len(kmenuBinding) > 0 { - rightText += ", " + if globalSettings["keymenu"].(bool) { + rightText += kmenuBinding + ": hide bindings" + } else { + rightText += kmenuBinding + ": show bindings" + } } - if sline.view.Type == vtHelp { - rightText += helpBinding + ": close help" - } else { - rightText += helpBinding + ": open help" + if len(helpBinding) > 0 { + if len(kmenuBinding) > 0 { + rightText += ", " + } + if sline.view.Type == vtHelp { + rightText += helpBinding + ": close help" + } else { + rightText += helpBinding + ": open help" + } } + rightText += " " } - rightText += " " statusLineStyle := defStyle.Reverse(true) if style, ok := colorscheme["statusline"]; ok { @@ -69,6 +75,12 @@ func (sline *Statusline) Display() { // Maybe there is a unicode filename? fileRunes := []rune(file) + + if sline.view.Type == vtTerm { + fileRunes = []rune(sline.view.term.title) + rightText = "" + } + viewX := sline.view.x if viewX != 0 { screen.SetContent(viewX, y, ' ', nil, statusLineStyle)