github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-30 06:37:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add infobar

Browse Source
This commit is contained in:
Zachary Yedidia
2018-12-31 22:07:01 -05:00
parent e9a4238a3f
commit c50e0cb932
11 changed files with 309 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/micro/micro.go
View File

@@ -12,6 +12,8 @@ import (
"github.com/zyedidia/micro/cmd/micro/action"
"github.com/zyedidia/micro/cmd/micro/buffer"
"github.com/zyedidia/micro/cmd/micro/config"
"github.com/zyedidia/micro/cmd/micro/display"
"github.com/zyedidia/micro/cmd/micro/info"
"github.com/zyedidia/micro/cmd/micro/screen"
"github.com/zyedidia/micro/cmd/micro/util"
"github.com/zyedidia/tcell"
@@ -126,7 +128,7 @@ func LoadInput() []*buffer.Buffer {
continue
}
buf, err := buffer.NewBufferFromFile(args[i])
buf, err := buffer.NewBufferFromFile(args[i], buffer.BTDefault)
if err != nil {
util.TermMessage(err)
continue
@@ -143,10 +145,10 @@ func LoadInput() []*buffer.Buffer {
util.TermMessage("Error reading from stdin: ", err)
input = []byte{}
}
buffers = append(buffers, buffer.NewBufferFromString(string(input), filename))
buffers = append(buffers, buffer.NewBufferFromString(string(input), filename, buffer.BTDefault))
} else {
// Option 3, just open an empty buffer
buffers = append(buffers, buffer.NewBufferFromString(string(input), filename))
buffers = append(buffers, buffer.NewBufferFromString(string(input), filename, buffer.BTDefault))
}
return buffers
@@ -168,6 +170,7 @@ func main() {
}
config.InitGlobalSettings()
action.InitBindings()
err = config.InitColorscheme()
if err != nil {
util.TermMessage(err)
@@ -192,6 +195,10 @@ func main() {
width, height := screen.Screen.Size()
ep := NewBufEditPane(0, 0, width, height-1, b)
info.InitInfoBar()
infowindow := display.NewInfoWindow(info.MainBar)
infobar := action.NewBufHandler(info.MainBar.Buffer, infowindow)
// Here is the event loop which runs in a separate thread
go func() {
events = make(chan tcell.Event)
@@ -206,6 +213,7 @@ func main() {
// Display everything
screen.Screen.Fill(' ', config.DefStyle)
ep.Display()
infowindow.Display()
screen.Screen.Show()
var event tcell.Event
@@ -216,7 +224,11 @@ func main() {
}
if event != nil {
ep.HandleEvent(event)
if info.MainBar.HasPrompt {
infobar.HandleEvent(event)
} else {
ep.HandleEvent(event)
}
}
}