jesseduffield.lazygit/pkg/gocui
Stefan Haller d3bf88c52c Restore the focused main view by patch identity on escape
Escaping a patch explorer (staging / patch building) back to the focused main
view it was entered from used to replay a numeric scroll position and selection
index captured on the way in. But the reason to escape after staging or dropping
a hunk is that the content changed, so a saved index points at the wrong line —
and the host auto-advances the explorer's selection to a still-valid line anyway,
which is the line the user actually cares about returning to.

Restore by *patch identity* instead. On escape, read the (file, type, source
line) the explorer currently has selected, then have the main view's re-render
land on the row that matches it: scan the incoming content as it loads (the
inverse of the diff-line primitive), and once the matching row plus a screenful
below it have loaded, swap the off-screen render in and scroll to / select that
row in one step. FocusPoint with scrollIntoView centres the row only if it's
off-screen, so the common unchanged-content escape — where the row is already
where it was — doesn't move at all. If the line is gone (the content really
changed), nothing is forced.

This generalizes the scroll restore from a fixed origin to a predicate
(RenderRestore: FirstPaintReady decides when the saved position is reachable,
Apply re-establishes it), folding the separate selection restore into the same
first paint — so it no longer rides a post-load callback that could fire early.

The restore also now survives task replacement, which the numeric version did
not: a periodic refresh can stop the escape's re-render before it first-paints.
The pending restore is held on the buffer manager and is *not* cleared when a
task starts, so the replacement task picks it up. It is not gated on the command
key — staging the last unstaged hunk re-renders `git diff` as `git diff --cached`,
a different command, yet the line to land on is still in the new content — but
validates itself: the scan finds the target line only when the content still
contains it, so applying it to a different item is a harmless no-op. A task
clears it once it has applied it (found or not), so it lives for exactly one
re-render. Because the restore is anchored on content identity and is idempotent,
"survive replacement" and "restore by identity" are one mechanism, not two.

With the identity in hand the snapshot no longer needs the captured scroll/index;
they're derived from the explorer's live selection.
2026-08-08 12:58:59 +02:00
..
attribute.go Bump tcell dependency to v3 2026-04-30 22:14:26 +02:00
AUTHORS Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
block_events_test.go Add gocui primitives to block input during an operation 2026-07-17 12:32:32 +02:00
CHANGES_tcell.md Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
CODE_OF_CONDUCT.md Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
CONTRIBUTING.md Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
doc.go Remove dead Modifier field from keybindings 2026-05-06 09:51:23 +02:00
double_click_test.go Add test for double-click detection 2026-07-31 08:22:35 +02:00
edit.go Convert keybinding fields to Keybinding 2026-05-25 15:32:47 +02:00
escape.go gocui: parse OSC 456 per-line diff metadata and attach it per cell 2026-08-08 12:58:59 +02:00
escape_test.go Materialize cursor-forward escapes as space runs 2026-07-03 18:47:15 +02:00
flush_test.go Make the user-event queue unbounded 2026-07-15 10:14:05 +02:00
gui.go Render async content into an off-screen buffer and swap it in 2026-08-08 12:58:59 +02:00
gui_others.go Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
gui_windows.go Fix linter warnings 2026-04-30 14:29:08 +02:00
key.go Move modifiers into Key 2026-04-30 22:22:53 +02:00
keybinding.go Remove dead Modifier field from keybindings 2026-05-06 09:51:23 +02:00
LICENSE Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
mouse_capture_test.go Route mouse events to their originating view during a drag gesture 2026-07-31 08:22:35 +02:00
README.md Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
scrollbar.go Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
scrollbar_test.go Copy gocui files into lazygit repo under pkg/gocui 2026-04-30 14:29:08 +02:00
suspend_test.go Schedule a redraw when resuming from suspension 2026-07-20 14:23:09 +02:00
task.go Exclude view-buffer render tasks from the busy query 2026-07-07 18:09:33 +02:00
task_manager.go Fix a deadlock between task.Done() and the integration test's idle wait 2026-07-15 15:01:04 +02:00
task_manager_test.go Fix a deadlock between task.Done() and the integration test's idle wait 2026-07-15 15:01:04 +02:00
tcell_driver.go Deliver mouse release after a drag 2026-07-31 08:22:35 +02:00
tcell_driver_test.go Deliver mouse release after a drag 2026-07-31 08:22:35 +02:00
text_area.go Exclude more commit trailers from auto-wrapping 2026-08-02 19:22:34 +02:00
text_area_test.go Exclude more commit trailers from auto-wrapping 2026-08-02 19:22:34 +02:00
user_event_queue_test.go Log the user-event queue's high-water mark 2026-07-15 10:14:05 +02:00
view.go Restore the focused main view by patch identity on escape 2026-08-08 12:58:59 +02:00
view_test.go Add gocui accessors for scanning a loading off-screen render 2026-08-08 12:58:59 +02:00

GOCUI - Go Console User Interface

CircleCI CodeCov Go Report Card GolangCI GoDoc GitHub tag (latest SemVer)

Minimalist Go package aimed at creating Console User Interfaces. A community fork based on the amazing work of jroimartin

Features

  • Minimalist API.
  • Views (the "windows" in the GUI) implement the interface io.ReadWriter.
  • Support for overlapping views.
  • The GUI can be modified at runtime (concurrent-safe).
  • Global and view-level keybindings.
  • Mouse support.
  • Colored text.
  • Customizable editing mode.
  • Easy to build reusable widgets, complex layouts...

About fork

This fork has many improvements over the original work from jroimartin.

  • Written ontop of TCell
  • Better wide character support
  • Support for 1 Line height views
  • Better support for running in docker container
  • Customize frame colors
  • Improved code comments and quality
  • Many small improvements
  • Change Visibility of views

For information about this org see: awesome-gocui/about.

Installation

Execute:

$ go get github.com/awesome-gocui/gocui

Documentation

Execute:

$ go doc github.com/awesome-gocui/gocui

Or visit godoc.org to read it online.

Example

See the _example folder for more examples

package main

import (
	"fmt"
	"log"

	"github.com/awesome-gocui/gocui"
)

func main() {
	g, err := gocui.NewGui(gocui.OutputNormal, true)
	if err != nil {
		log.Panicln(err)
	}
	defer g.Close()

	g.SetManagerFunc(layout)

	if err := g.SetKeybinding("", gocui.KeyCtrlC, gocui.ModNone, quit); err != nil {
		log.Panicln(err)
	}

	if err := g.MainLoop(); err != nil && !gocui.IsQuit(err) {
		log.Panicln(err)
	}
}

func layout(g *gocui.Gui) error {
	maxX, maxY := g.Size()
	if v, err := g.SetView("hello", maxX/2-7, maxY/2, maxX/2+7, maxY/2+2, 0); err != nil {
		if !gocui.IsUnknownView(err) {
			return err
		}

		if _, err := g.SetCurrentView("hello"); err != nil {
			return err
		}

		fmt.Fprintln(v, "Hello world!")
	}

	return nil
}

func quit(g *gocui.Gui, v *gocui.View) error {
	return gocui.ErrQuit
}

Screenshots

r2cui

_examples/demo.go

_examples/dynamic.go

Projects using gocui

  • komanda-cli: IRC Client For Developers.
  • vuls: Agentless vulnerability scanner for Linux/FreeBSD.
  • wuzz: Interactive cli tool for HTTP inspection.
  • httplab: Interactive web server.
  • domainr: Tool that checks the availability of domains based on keywords.
  • gotime: Time tracker for projects and tasks.
  • claws: Interactive command line client for testing websockets.
  • terminews: Terminal based RSS reader.
  • diagram: Tool to convert ascii arts into hand drawn diagrams.
  • pody: CLI app to manage Pods in a Kubernetes cluster.
  • kubexp: Kubernetes client.
  • kcli: Tool for inspecting kafka topics/partitions/messages.
  • fac: git merge conflict resolver
  • jsonui: Interactive JSON explorer for your terminal.
  • cointop: Interactive terminal based UI application for tracking cryptocurrencies.
  • lazygit: simple terminal UI for git commands.
  • lazydocker: The lazier way to manage everything docker.

Note: if your project is not listed here, let us know! :)