git-gui: Support keyboard traversal in browser.
Users want to navigate the file list shown in our branch browser windows using the keyboard. So we now support basic traversal with the arrow keys: Up/Down: Move the "selection bar" to focus on a different name. Return: Move into the subtree, or open the annotated file. M1-Right: Ditto. M1-Up: Move to the parent tree. M1-Left: Ditto. Probably the only feature missing from this is to key a leading part of the file name and jump directly to that file (or subtree). This change did require a bit of refactoring, to pull the navigation logic out of the mouse click procedure and into more generic routines which can also be used in bindings. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Feb 8, 2007 at 17:07 UTC
9bccb782c35b864988e51d433271faba2ac3e96f
1 file changed
+99
-38
git-gui.sh
+99
-38
@@ -2957,7 +2957,7 @@ proc reset_hard_wait {fd} {
2957
set next_browser_id 0
2958
2959
proc new_browser {commit} {
2960
- global next_browser_id cursor_ptr
2960
+ global next_browser_id cursor_ptr M1B
2961
global browser_commit browser_status browser_stack browser_path browser_busy
2962
2963
set w .browser[incr next_browser_id]
@@ -3007,6 +3007,16 @@ proc new_browser {commit} {
3007
3008
bind $w_list <Button-1> "browser_click 0 $w_list @%x,%y;break"
3009
bind $w_list <Double-Button-1> "browser_click 1 $w_list @%x,%y;break"
3010
+ bind $w_list <$M1B-Up> "browser_parent $w_list;break"
3011
+ bind $w_list <$M1B-Left> "browser_parent $w_list;break"
3012
+ bind $w_list <Up> "browser_move -1 $w_list;break"
3013
+ bind $w_list <Down> "browser_move 1 $w_list;break"
3014
+ bind $w_list <$M1B-Right> "browser_enter $w_list;break"
3015
+ bind $w_list <Return> "browser_enter $w_list;break"
3016
+ bind $w_list <Prior> "browser_page -1 $w_list;break"
3017
+ bind $w_list <Next> "browser_page 1 $w_list;break"
3018
+ bind $w_list <Left> break
3019
+ bind $w_list <Right> break
3020
3021
bind $w <Visibility> "focus $w"
3022
bind $w <Destroy> "
@@ -3022,52 +3032,100 @@ proc new_browser {commit} {
3032
ls_tree $w_list $browser_commit($w_list) {}
3033
}
3034
3025
-proc browser_click {was_double_click w pos} {
3035
+proc browser_move {dir w} {
3036
+ global browser_files browser_busy
3037
+
3038
+ if {$browser_busy($w)} return
3039
+ set lno [lindex [split [$w index in_sel.first] .] 0]
3040
+ incr lno $dir
3041
+ if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
3042
+ $w tag remove in_sel 0.0 end
3043
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3044
+ $w see $lno.0
3045
+ }
3046
+}
3047
+
3048
+proc browser_page {dir w} {
3049
+ global browser_files browser_busy
3050
+
3051
+ if {$browser_busy($w)} return
3052
+ $w yview scroll $dir pages
3053
+ set lno [expr {int(
3054
+ [lindex [$w yview] 0]
3055
+ * [llength $browser_files($w)]
3056
+ + 1)}]
3057
+ if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
3058
+ $w tag remove in_sel 0.0 end
3059
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3060
+ $w see $lno.0
3061
+ }
3062
+}
3063
+
3064
+proc browser_parent {w} {
3065
+ global browser_files browser_status browser_path
3066
+ global browser_stack browser_busy
3067
+
3068
+ if {$browser_busy($w)} return
3069
+ set info [lindex $browser_files($w) 0]
3070
+ if {[lindex $info 0] eq {parent}} {
3071
+ set parent [lindex $browser_stack($w) end-1]
3072
+ set browser_stack($w) [lrange $browser_stack($w) 0 end-2]
3073
+ if {$browser_stack($w) eq {}} {
3074
+ regsub {:.*$} $browser_path($w) {:} browser_path($w)
3075
+ } else {
3076
+ regsub {/[^/]+$} $browser_path($w) {} browser_path($w)
3077
+ }
3078
+ set browser_status($w) "Loading $browser_path($w)..."
3079
+ ls_tree $w [lindex $parent 0] [lindex $parent 1]
3080
+ }
3081
+}
3082
+
3083
+proc browser_enter {w} {
3084
global browser_files browser_status browser_path
3085
global browser_commit browser_stack browser_busy
3086
3087
if {$browser_busy($w)} return
3030
- set lno [lindex [split [$w index $pos] .] 0]
3088
+ set lno [lindex [split [$w index in_sel.first] .] 0]
3089
set info [lindex $browser_files($w) [expr {$lno - 1}]]
3032
-
3033
- $w conf -state normal
3034
- $w tag remove sel 0.0 end
3035
- $w tag remove in_sel 0.0 end
3090
if {$info ne {}} {
3091
+ switch -- [lindex $info 0] {
3092
+ parent {
3093
+ browser_parent $w
3094
+ }
3095
+ tree {
3096
+ set name [lindex $info 2]
3097
+ set escn [escape_path $name]
3098
+ set browser_status($w) "Loading $escn..."
3099
+ append browser_path($w) $escn
3100
+ ls_tree $w [lindex $info 1] $name
3101
+ }
3102
+ blob {
3103
+ set name [lindex $info 2]
3104
+ set p {}
3105
+ foreach n $browser_stack($w) {
3106
+ append p [lindex $n 1]
3107
+ }
3108
+ append p $name
3109
+ show_blame $browser_commit($w) $p
3110
+ }
3111
+ }
3112
+ }
3113
+}
3114
+
3115
+proc browser_click {was_double_click w pos} {
3116
+ global browser_files browser_busy
3117
+
3118
+ if {$browser_busy($w)} return
3119
+ set lno [lindex [split [$w index $pos] .] 0]
3120
+ focus $w
3121
+
3122
+ if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
3123
+ $w tag remove in_sel 0.0 end
3124
$w tag add in_sel $lno.0 [expr {$lno + 1}].0
3125
if {$was_double_click} {
3039
- switch -- [lindex $info 0] {
3040
- parent {
3041
- set parent [lindex $browser_stack($w) end-1]
3042
- set browser_stack($w) [lrange $browser_stack($w) 0 end-2]
3043
- if {$browser_stack($w) eq {}} {
3044
- regsub {:.*$} $browser_path($w) {:} browser_path($w)
3045
- } else {
3046
- regsub {/[^/]+$} $browser_path($w) {} browser_path($w)
3047
- }
3048
- set browser_status($w) "Loading $browser_path($w)..."
3049
- ls_tree $w [lindex $parent 0] [lindex $parent 1]
3050
- }
3051
- tree {
3052
- set name [lindex $info 2]
3053
- set escn [escape_path $name]
3054
- set browser_status($w) "Loading $escn..."
3055
- append browser_path($w) $escn
3056
- ls_tree $w [lindex $info 1] $name
3057
- }
3058
- blob {
3059
- set name [lindex $info 2]
3060
- set p {}
3061
- foreach n $browser_stack($w) {
3062
- append p [lindex $n 1]
3063
- }
3064
- append p $name
3065
- show_blame $browser_commit($w) $p
3066
- }
3067
- }
3126
+ browser_enter $w
3127
}
3128
}
3070
- $w conf -state disabled
3129
}
3130
3131
proc ls_tree {w tree_id name} {
@@ -3079,7 +3137,6 @@ proc ls_tree {w tree_id name} {
3137
3138
$w conf -state normal
3139
$w tag remove in_sel 0.0 end
3082
- $w tag remove sel 0.0 end
3140
$w delete 0.0 end
3141
if {$browser_stack($w) ne {}} {
3142
$w image create end \
@@ -3147,6 +3204,10 @@ proc read_ls_tree {fd w} {
3204
set browser_status($w) Ready.
3205
set browser_busy($w) 0
3206
array unset browser_buffer $w
3207
+ if {$n > 0} {
3208
+ $w tag add in_sel 1.0 2.0
3209
+ focus -force $w
3210
+ }
3211
}
3212
}
3213