Let scrollbars tab away focus

japhb · japhb · commit 108c25b44b95 · 2025-11-22T15:10:36.000-08:00
diff --git a/lib/Terminal/Widgets/ScrollBar.rakumod b/lib/Terminal/Widgets/ScrollBar.rakumod
@@ -145,6 +145,8 @@ class Terminal::Widgets::HScrollBar
             Ctrl-CursorRight => 'bar-right-scroll',
             Home             => 'home-scroll',
             End              => 'end-scroll',
+            Ctrl-I           => 'focus-next',    # Tab
+            ShiftTab         => 'focus-prev',    # Shift-Tab is weird and special
             ;
 
         my $keyname = $event.keyname;
@@ -155,6 +157,8 @@ class Terminal::Widgets::HScrollBar
             when 'bar-right-scroll'   { self.bar-right-scroll   }
             when 'home-scroll'        { self.home-scroll        }
             when 'end-scroll'         { self.end-scroll         }
+            when 'focus-next'         { self.focus-next }
+            when 'focus-prev'         { self.focus-prev }
         }
     }
 
@@ -288,6 +292,8 @@ class Terminal::Widgets::VScrollBar
             Ctrl-CursorDown => 'bar-down-scroll',
             Home            => 'home-scroll',
             End             => 'end-scroll',
+            Ctrl-I          => 'focus-next',    # Tab
+            ShiftTab        => 'focus-prev',    # Shift-Tab is weird and special
             ;
 
         my $keyname = $event.keyname;
@@ -298,6 +304,8 @@ class Terminal::Widgets::VScrollBar
             when 'bar-down-scroll'   { self.bar-down-scroll   }
             when 'home-scroll'       { self.home-scroll       }
             when 'end-scroll'        { self.end-scroll        }
+            when 'focus-next'        { self.focus-next }
+            when 'focus-prev'        { self.focus-prev }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ class Terminal::Widgets::HScrollBar`
`145`	`145`	`Ctrl-CursorRight => 'bar-right-scroll',`
`146`	`146`	`Home => 'home-scroll',`
`147`	`147`	`End => 'end-scroll',`
	`148`	`+ Ctrl-I => 'focus-next', # Tab`
	`149`	`+ ShiftTab => 'focus-prev', # Shift-Tab is weird and special`
`148`	`150`	`;`
`149`	`151`
`150`	`152`	`my $keyname = $event.keyname;`
`@@ -155,6 +157,8 @@ class Terminal::Widgets::HScrollBar`
`155`	`157`	`when 'bar-right-scroll' { self.bar-right-scroll }`
`156`	`158`	`when 'home-scroll' { self.home-scroll }`
`157`	`159`	`when 'end-scroll' { self.end-scroll }`
	`160`	`+ when 'focus-next' { self.focus-next }`
	`161`	`+ when 'focus-prev' { self.focus-prev }`
`158`	`162`	`}`
`159`	`163`	`}`
`160`	`164`
`@@ -288,6 +292,8 @@ class Terminal::Widgets::VScrollBar`
`288`	`292`	`Ctrl-CursorDown => 'bar-down-scroll',`
`289`	`293`	`Home => 'home-scroll',`
`290`	`294`	`End => 'end-scroll',`
	`295`	`+ Ctrl-I => 'focus-next', # Tab`
	`296`	`+ ShiftTab => 'focus-prev', # Shift-Tab is weird and special`
`291`	`297`	`;`
`292`	`298`
`293`	`299`	`my $keyname = $event.keyname;`
`@@ -298,6 +304,8 @@ class Terminal::Widgets::VScrollBar`
`298`	`304`	`when 'bar-down-scroll' { self.bar-down-scroll }`
`299`	`305`	`when 'home-scroll' { self.home-scroll }`
`300`	`306`	`when 'end-scroll' { self.end-scroll }`
	`307`	`+ when 'focus-next' { self.focus-next }`
	`308`	`+ when 'focus-prev' { self.focus-prev }`
`301`	`309`	`}`
`302`	`310`	`}`
`303`	`311`