summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean E. Russell <ser@ser1.net>2021-01-26 13:09:10 -0600
committerSean E. Russell <ser@ser1.net>2021-01-26 13:09:10 -0600
commit273f572a871b0511dd0d0860045b308db6e2161b (patch)
tree96d5e70105d3a96141a28365a098680c056b6135
parentf56cc6486ffc27926c0ce4c96d5577d4895b7a0c (diff)
The statusbar got lost somewhere along the way. A noisy (debug) log message was left in.
-rw-r--r--cmd/gotop/main.go13
-rw-r--r--widgets/proc_linux.go1
2 files changed, 6 insertions, 8 deletions
diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go
index f782191..bcf05f0 100644
--- a/cmd/gotop/main.go
+++ b/cmd/gotop/main.go
@@ -51,7 +51,6 @@ var (
conf gotop.Config
help *w.HelpMenu
bar *w.StatusBar
- statusbar bool
stderrLogger = log.New(os.Stderr, "", 0)
tr lingo.Translations
)
@@ -176,7 +175,7 @@ func eventLoop(c gotop.Config, grid *layout.MyGrid) {
case <-drawTicker:
if !c.HelpVisible {
ui.Render(grid)
- if statusbar {
+ if c.Statusbar {
ui.Render(bar)
}
}
@@ -193,7 +192,7 @@ func eventLoop(c gotop.Config, grid *layout.MyGrid) {
case "<Resize>":
payload := e.Payload.(ui.Resize)
termWidth, termHeight := payload.Width, payload.Height
- if statusbar {
+ if c.Statusbar {
grid.SetRect(0, 0, termWidth, termHeight-1)
bar.SetRect(0, termHeight-1, termWidth, termHeight)
} else {
@@ -238,7 +237,7 @@ func eventLoop(c gotop.Config, grid *layout.MyGrid) {
}
case "<Resize>":
ui.Render(grid)
- if statusbar {
+ if c.Statusbar {
ui.Render(bar)
}
case "<MouseLeft>":
@@ -433,7 +432,7 @@ func run() int {
setDefaultTermuiColors(conf) // done before initializing widgets to allow inheriting colors
help = w.NewHelpMenu(tr)
- if statusbar {
+ if conf.Statusbar {
bar = w.NewStatusBar()
}
@@ -444,7 +443,7 @@ func run() int {
}
termWidth, termHeight := ui.TerminalDimensions()
- if statusbar {
+ if conf.Statusbar {
grid.SetRect(0, 0, termWidth, termHeight-1)
} else {
grid.SetRect(0, 0, termWidth, termHeight)
@@ -452,7 +451,7 @@ func run() int {
help.Resize(termWidth, termHeight)
ui.Render(grid)
- if statusbar {
+ if conf.Statusbar {
bar.SetRect(0, termHeight-1, termWidth, termHeight)
ui.Render(bar)
}
diff --git a/widgets/proc_linux.go b/widgets/proc_linux.go
index b967c7b..938e5c2 100644
--- a/widgets/proc_linux.go
+++ b/widgets/proc_linux.go
@@ -19,7 +19,6 @@ func getProcs() ([]Proc, error) {
procs := []Proc{}
for _, line := range linesOfProcStrings {
- log.Printf("line is '%s', pid is '%s', cpu is '%s', mem is '%s'", line, strings.TrimSpace(line[0:10]), strings.TrimSpace(line[63:68]), strings.TrimSpace(line[69:74]))
pid, err := strconv.Atoi(strings.TrimSpace(line[0:10]))
if err != nil {
log.Println(tr.Value("widget.proc.err.pidconv", err.Error(), line))