From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Birger Skogeng Pedersen <birger.sp@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] git-gui: Add hotkeys to set widget focus
Date: Sun, 1 Sep 2019 20:58:15 +0200 [thread overview]
Message-ID: <CAKPyHN0+KQTNe=Wc_6KEpbtd-KS1Y6a9ad=dpq9QFR-F5tvpEA@mail.gmail.com> (raw)
In-Reply-To: <20190831122326.9071-1-birger.sp@gmail.com>
Hi Birger,
On Sat, Aug 31, 2019 at 2:23 PM Birger Skogeng Pedersen
<birger.sp@gmail.com> wrote:
>
> The user cannot change focus between the list of files, the diff view and
> the commit message widgets without using the mouse (clicking either of
> the four widgets ).
that bugged me two, but never come up with a good idea.
>
> Hotkeys CTRL/CMD+number (1-4) now focuses a previously selected path from
> either the "Unstaged Changes" or "Staged Changes", the diff view or the
> commit message dialog widgets, respectively. This enables the user to
> select/unselect files, view the diff and create a commit in git-gui
> using keyboard-only.
But I don't understand this in full. Does this mean pressing CTRL+1 or
+2 does also changes the file selection? Why isn't it sufficient to
just focus the respective file list widget? And than have bindings to
change the selection?
Bert
>
> Signed-off-by: Birger Skogeng Pedersen <birger.sp@gmail.com>
> ---
> git-gui/git-gui.sh | 57 +++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 56 insertions(+), 1 deletion(-)
>
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index 6de74ce639..cbd0b69804 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -2494,7 +2494,7 @@ proc force_first_diff {after} {
>
> proc toggle_or_diff {mode w args} {
> global file_states file_lists current_diff_path ui_index ui_workdir
> - global last_clicked selected_paths
> + global last_clicked selected_paths file_lists_last_clicked
>
> if {$mode eq "click"} {
> foreach {x y} $args break
> @@ -2551,6 +2551,8 @@ proc toggle_or_diff {mode w args} {
> $ui_index tag remove in_sel 0.0 end
> $ui_workdir tag remove in_sel 0.0 end
>
> + set file_lists_last_clicked($w) $lno
> +
> # Determine the state of the file
> if {[info exists file_states($path)]} {
> set state [lindex $file_states($path) 0]
> @@ -2664,6 +2666,51 @@ proc show_less_context {} {
> }
> }
>
> +proc select_first_path {w} {
> + global file_lists last_clicked selected_paths ui_workdir
> + global file_lists_last_clicked
> +
> + set _list_length [llength $file_lists($w)]
> +
> + if {$_list_length > 0} {
> +
> + set _index $file_lists_last_clicked($w)
> +
> + if {$_index eq {}} {
> + set _index 1
> + } elseif {$_index > $_list_length} {
> + set _index $_list_length
> + }
> +
> + focus $w
> + set last_clicked [list $w $_index]
> + set path [lindex $file_lists($w) [expr $_index - 1]]
> + array unset selected_paths
> + set selected_paths($path) 1
> + show_diff $path $w
> + }
> +}
> +
> +proc select_first_unstaged_changes_path {} {
> + global ui_workdir
> + select_first_path $ui_workdir
> +}
> +
> +proc select_first_staged_changes_path {} {
> + global ui_index
> + select_first_path $ui_index
> +}
> +
> +proc focus_diff {} {
> + global ui_diff
> + focus $ui_diff
> +}
> +
> +proc focus_commit_message {} {
> + global ui_comm
> + focus $ui_comm
> +}
> +
> ######################################################################
> ##
> ## ui construction
> @@ -3877,6 +3924,14 @@ foreach i [list $ui_index $ui_workdir] {
> }
> unset i
>
> +bind . <$M1B-Key-1> {select_first_unstaged_changes_path}
> +bind . <$M1B-Key-2> {select_first_staged_changes_path}
> +bind . <$M1B-Key-3> {focus_diff}
> +bind . <$M1B-Key-4> {focus_commit_message}
> +
> +set file_lists_last_clicked($ui_index) {}
> +set file_lists_last_clicked($ui_workdir) {}
> +
> set file_lists($ui_index) [list]
> set file_lists($ui_workdir) [list]
>
> --
> 2.23.0.37.g745f681289
>
next prev parent reply other threads:[~2019-09-01 18:58 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-20 13:32 git-gui, feature request: add hotkeys to focus different widgets Birger Skogeng Pedersen
2018-02-23 10:22 ` [PATCH] git-gui: Add hotkeys to change focus between ui widgets Birger Skogeng Pedersen
2018-02-23 16:42 ` Birger Skogeng Pedersen
2018-02-28 12:10 ` Birger Skogeng Pedersen
2018-03-05 16:55 ` Johannes Schindelin
2018-03-06 14:35 ` Birger Skogeng Pedersen
2018-03-06 19:28 ` Junio C Hamano
2019-08-31 12:23 ` [PATCH] git-gui: Add hotkeys to set widget focus Birger Skogeng Pedersen
2019-08-31 12:27 ` Birger Skogeng Pedersen
2019-09-01 11:32 ` Pratyush Yadav
2019-09-01 16:21 ` Junio C Hamano
2019-09-01 18:24 ` Birger Skogeng Pedersen
2019-09-01 19:01 ` Bert Wesarg
2019-09-01 19:36 ` [PATCH] " Birger Skogeng Pedersen
2019-09-02 18:19 ` Pratyush Yadav
2019-09-02 18:35 ` Birger Skogeng Pedersen
2019-09-02 18:53 ` Pratyush Yadav
2019-09-02 19:05 ` Birger Skogeng Pedersen
2019-09-02 19:42 ` Bert Wesarg
2019-09-03 14:21 ` Birger Skogeng Pedersen
2019-09-03 14:22 ` Pratyush Yadav
2019-09-03 14:45 ` [PATCH] git-gui: use path name instead of list index to track last clicked file Pratyush Yadav
2019-09-03 18:07 ` [PATCH v4] git-gui: Add hotkeys to set widget focus Birger Skogeng Pedersen
2019-09-03 18:13 ` Birger Skogeng Pedersen
2019-09-03 19:30 ` Birger Skogeng Pedersen
2019-09-03 21:49 ` Pratyush Yadav
2019-09-04 14:30 ` [PATCH v5] " Birger Skogeng Pedersen
2019-09-04 18:59 ` Johannes Sixt
2019-09-04 19:20 ` Birger Skogeng Pedersen
2019-09-04 21:39 ` Johannes Sixt
2019-09-04 22:31 ` Pratyush Yadav
2019-09-04 23:38 ` Junio C Hamano
2019-09-05 12:33 ` Pratyush Yadav
2019-09-04 19:55 ` Bert Wesarg
2019-09-04 21:45 ` Johannes Sixt
2019-09-10 19:12 ` Pratyush Yadav
2019-09-11 6:49 ` Birger Skogeng Pedersen
2019-09-11 17:48 ` Pratyush Yadav
2019-09-11 18:11 ` Johannes Sixt
2019-09-03 16:06 ` [PATCH] [PATCH] " Bert Wesarg
2019-09-01 22:27 ` Philip Oakley
2019-09-02 12:25 ` Pratyush Yadav
2019-09-02 17:23 ` Philip Oakley
2019-09-03 22:18 ` Pratyush Yadav
2019-09-01 18:58 ` Bert Wesarg [this message]
2019-09-01 19:25 ` Birger Skogeng Pedersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKPyHN0+KQTNe=Wc_6KEpbtd-KS1Y6a9ad=dpq9QFR-F5tvpEA@mail.gmail.com' \
--to=bert.wesarg@googlemail.com \
--cc=birger.sp@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).