Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion m/pager.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ type Pager struct {
// Ref: https://github.com/walles/moar/issues/175
marks map[rune]scrollPosition

ShouldStartWithSearch bool

AfterExit func() error
}

Expand Down Expand Up @@ -321,7 +323,11 @@ func (p *Pager) StartPaging(screen twin.Screen, chromaStyle *chroma.Style, chrom
styleUI(chromaStyle, chromaFormatter, p.StatusBarStyle, p.WithTerminalFg)

p.screen = screen
p.mode = PagerModeViewing{pager: p}
if p.ShouldStartWithSearch {
p.mode = PagerModeSearch{pager: p}
} else {
p.mode = PagerModeViewing{pager: p}
}
p.marks = make(map[rune]scrollPosition)

go func() {
Expand Down
2 changes: 2 additions & 0 deletions m/pagermode-search.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ func removeLastChar(s string) string {

func (m PagerModeSearch) onKey(key twin.KeyCode) {
switch key {
case twin.KeyCtrlD:
m.pager.Quit()
case twin.KeyEnter:
m.pager.mode = PagerModeViewing{pager: m.pager}

Expand Down
2 changes: 2 additions & 0 deletions moar.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ func pagerFromArgs(
"Mouse `mode`: auto, select or scroll: https://github.com/walles/moar/blob/master/MOUSE.md",
parseMouseMode,
)
search := flagSet.Bool("search", false, "Start in search mode")

// Combine flags from environment and from command line
flags := args[1:]
Expand Down Expand Up @@ -574,6 +575,7 @@ func pagerFromArgs(
pager.ScrollLeftHint = *scrollLeftHint
pager.ScrollRightHint = *scrollRightHint
pager.SideScrollAmount = int(*shift)
pager.ShouldStartWithSearch = *search

pager.TargetLine = targetLine
if *follow && pager.TargetLine == nil {
Expand Down
4 changes: 4 additions & 0 deletions twin/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ const (
KeyEnd
KeyPgUp
KeyPgDown

KeyCtrlD
)

// Map incoming escape keystrokes to keycodes, used in consumeEncodedEvent() in
Expand Down Expand Up @@ -68,4 +70,6 @@ var escapeSequenceToKeyCode = map[string]KeyCode{
"\x1b[4~": KeyEnd,
"\x1b[5~": KeyPgUp,
"\x1b[6~": KeyPgDown,

"\x04": KeyCtrlD, // CTRL + D
}