* gitk: can't reload commits with new key binding @ 2012-09-30 10:19 SZEDER Gábor 2012-10-01 15:26 ` Andrew Wong 0 siblings, 1 reply; 13+ messages in thread From: SZEDER Gábor @ 2012-09-30 10:19 UTC (permalink / raw) To: git; +Cc: Felipe Contreras, Paul Mackerras Hi, a135f214 (gitk: Avoid Meta1-F5, 2012-04-07) changed the key binding for reloading commits to shift-F5, but this new key binding doesn't seem to be working here, because it doesn't call reloadcommits(). Choosing the reload menu item works. Shift-F5 works properly in other applications. Any ideas? Thanks, Gábor ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: gitk: can't reload commits with new key binding 2012-09-30 10:19 gitk: can't reload commits with new key binding SZEDER Gábor @ 2012-10-01 15:26 ` Andrew Wong 2012-10-01 15:26 ` [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 Andrew Wong 0 siblings, 1 reply; 13+ messages in thread From: Andrew Wong @ 2012-10-01 15:26 UTC (permalink / raw) To: git; +Cc: szeder, paulus, Andrew Wong Sorry, my previous "git send-email" screwed up. Resending the email again. I was running into the same issue too. It turns out that on some machines Shift-F5 is mapped to Shift-XF86_Switch_VT_5. My patch includes a workaround. The same workaround was used for Shift-F4. Andrew Wong (1): gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 gitk-git/gitk | 1 + 1 file changed, 1 insertion(+) -- 1.7.12.1.382.gb0576a6 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 2012-10-01 15:26 ` Andrew Wong @ 2012-10-01 15:26 ` Andrew Wong 2012-10-01 17:27 ` Junio C Hamano 0 siblings, 1 reply; 13+ messages in thread From: Andrew Wong @ 2012-10-01 15:26 UTC (permalink / raw) To: git; +Cc: szeder, paulus, Andrew Wong The same workaround was used for Shift-F4 in: cea07cf8dc9b3677e0c50433c0d72bce83adbdc7 Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> --- gitk-git/gitk | 1 + 1 file changed, 1 insertion(+) diff --git a/gitk-git/gitk b/gitk-git/gitk index d93bd99..698b84a 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -2496,6 +2496,7 @@ proc makewindow {} { bindkey f nextfile bind . <F5> updatecommits bind . <Shift-F5> reloadcommits + catch { bind . <Shift-Key-XF86_Switch_VT_5> reloadcommits } bind . <F2> showrefs bind . <Shift-F4> {newview 0} catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} } -- 1.7.12.1.382.gb0576a6 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 2012-10-01 15:26 ` [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 Andrew Wong @ 2012-10-01 17:27 ` Junio C Hamano 2012-10-02 15:04 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong 0 siblings, 1 reply; 13+ messages in thread From: Junio C Hamano @ 2012-10-01 17:27 UTC (permalink / raw) To: Andrew Wong; +Cc: git, szeder, paulus Andrew Wong <andrew.kw.w@gmail.com> writes: > The same workaround was used for Shift-F4 in: > cea07cf8dc9b3677e0c50433c0d72bce83adbdc7 > > Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> > --- > gitk-git/gitk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/gitk-git/gitk b/gitk-git/gitk > index d93bd99..698b84a 100755 > --- a/gitk-git/gitk > +++ b/gitk-git/gitk > @@ -2496,6 +2496,7 @@ proc makewindow {} { > bindkey f nextfile > bind . <F5> updatecommits > bind . <Shift-F5> reloadcommits > + catch { bind . <Shift-Key-XF86_Switch_VT_5> reloadcommits } > bind . <F2> showrefs > bind . <Shift-F4> {newview 0} > catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} } Wouldn't it make more sense to have a small helper function to wrap binding both <Shift-Fn> and <Shift-Key-XF86_Switch_VT_n> to the same thing and have F4 and F5 binding use that to avoid repetition? ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding 2012-10-01 17:27 ` Junio C Hamano @ 2012-10-02 15:04 ` Andrew Wong 2012-10-02 15:04 ` [PATCH v2 1/2] gitk: Refactor code for binding modified function keys Andrew Wong ` (5 more replies) 0 siblings, 6 replies; 13+ messages in thread From: Andrew Wong @ 2012-10-02 15:04 UTC (permalink / raw) To: git; +Cc: gitster, szeder, paulus, Andrew Wong Refactored the code for binding modified function keys as Junio suggested. Andrew Wong (2): gitk: Refactor code for binding modified function keys gitk: Use bindshiftfunctionkey to bind Shift-F5 gitk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 1.7.12.1.382.gb0576a6 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 1/2] gitk: Refactor code for binding modified function keys 2012-10-02 15:04 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong @ 2012-10-02 15:04 ` Andrew Wong 2012-10-02 15:04 ` [PATCH v2 2/2] gitk: Use bindshiftfunctionkey to bind Shift-F5 Andrew Wong ` (4 subsequent siblings) 5 siblings, 0 replies; 13+ messages in thread From: Andrew Wong @ 2012-10-02 15:04 UTC (permalink / raw) To: git; +Cc: gitster, szeder, paulus, Andrew Wong The function includes a workaround for systems where F* keys are mapped to XF86_Switch_VT_* when modifiers are used. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> --- gitk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index 379582a..f8f89a5 100755 --- a/gitk +++ b/gitk @@ -2503,8 +2503,7 @@ proc makewindow {} { bind . <F5> updatecommits bind . <Shift-F5> reloadcommits bind . <F2> showrefs - bind . <Shift-F4> {newview 0} - catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} } + bindmodfunctionkey Shift 4 {newview 0} bind . <F4> edit_or_newview bind . <$M1B-q> doquit bind . <$M1B-f> {dofind 1 1} @@ -2653,6 +2652,11 @@ proc bindkey {ev script} { } } +proc bindmodfunctionkey {mod n script} { + bind . <$mod-F$n> $script + catch { bind . <$mod-XF86_Switch_VT_$n> $script } +} + # set the focus back to the toplevel for any click outside # the entry widgets proc click {w} { -- 1.7.12.1.382.gb0576a6 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 2/2] gitk: Use bindshiftfunctionkey to bind Shift-F5 2012-10-02 15:04 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong 2012-10-02 15:04 ` [PATCH v2 1/2] gitk: Refactor code for binding modified function keys Andrew Wong @ 2012-10-02 15:04 ` Andrew Wong 2012-10-07 21:18 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong ` (3 subsequent siblings) 5 siblings, 0 replies; 13+ messages in thread From: Andrew Wong @ 2012-10-02 15:04 UTC (permalink / raw) To: git; +Cc: gitster, szeder, paulus, Andrew Wong Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index f8f89a5..d53fdb2 100755 --- a/gitk +++ b/gitk @@ -2501,7 +2501,7 @@ proc makewindow {} { bindkey ? {dofind -1 1} bindkey f nextfile bind . <F5> updatecommits - bind . <Shift-F5> reloadcommits + bindmodfunctionkey Shift 5 reloadcommits bind . <F2> showrefs bindmodfunctionkey Shift 4 {newview 0} bind . <F4> edit_or_newview -- 1.7.12.1.382.gb0576a6 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding 2012-10-02 15:04 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong 2012-10-02 15:04 ` [PATCH v2 1/2] gitk: Refactor code for binding modified function keys Andrew Wong 2012-10-02 15:04 ` [PATCH v2 2/2] gitk: Use bindshiftfunctionkey to bind Shift-F5 Andrew Wong @ 2012-10-07 21:18 ` Andrew Wong 2012-10-08 21:05 ` SZEDER Gábor ` (2 subsequent siblings) 5 siblings, 0 replies; 13+ messages in thread From: Andrew Wong @ 2012-10-07 21:18 UTC (permalink / raw) To: Andrew Wong; +Cc: git, gitster, szeder, paulus Could we look into getting this patch into git/gitk? On 10/02/12 11:04, Andrew Wong wrote: > Refactored the code for binding modified function keys as Junio suggested. > > Andrew Wong (2): > gitk: Refactor code for binding modified function keys > gitk: Use bindshiftfunctionkey to bind Shift-F5 > > gitk | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding 2012-10-02 15:04 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong ` (2 preceding siblings ...) 2012-10-07 21:18 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong @ 2012-10-08 21:05 ` SZEDER Gábor 2012-10-12 14:17 ` Andrew Wong 2012-10-21 22:19 ` Paul Mackerras 5 siblings, 0 replies; 13+ messages in thread From: SZEDER Gábor @ 2012-10-08 21:05 UTC (permalink / raw) To: Andrew Wong; +Cc: git, gitster, paulus Hi, (Sorry for the delayed reply, was out of town.) On Tue, Oct 02, 2012 at 11:04:43AM -0400, Andrew Wong wrote: > Refactored the code for binding modified function keys as Junio suggested. > > Andrew Wong (2): > gitk: Refactor code for binding modified function keys > gitk: Use bindshiftfunctionkey to bind Shift-F5 > Thanks, this series solves the problem for me. Best, Gábor ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding 2012-10-02 15:04 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong ` (3 preceding siblings ...) 2012-10-08 21:05 ` SZEDER Gábor @ 2012-10-12 14:17 ` Andrew Wong 2012-10-21 22:19 ` Paul Mackerras 5 siblings, 0 replies; 13+ messages in thread From: Andrew Wong @ 2012-10-12 14:17 UTC (permalink / raw) To: paulus; +Cc: Andrew Wong, Junio C Hamano, szeder, git list Can I get some feedback on these two patches? It'd be great to have them merged into gitk. Thanks. On 10/02/2012 11:04 AM, Andrew Wong wrote: > Refactored the code for binding modified function keys as Junio suggested. > > Andrew Wong (2): > gitk: Refactor code for binding modified function keys > gitk: Use bindshiftfunctionkey to bind Shift-F5 > > gitk | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding 2012-10-02 15:04 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong ` (4 preceding siblings ...) 2012-10-12 14:17 ` Andrew Wong @ 2012-10-21 22:19 ` Paul Mackerras 5 siblings, 0 replies; 13+ messages in thread From: Paul Mackerras @ 2012-10-21 22:19 UTC (permalink / raw) To: Andrew Wong; +Cc: git, gitster, szeder On Tue, Oct 02, 2012 at 11:04:43AM -0400, Andrew Wong wrote: > Refactored the code for binding modified function keys as Junio suggested. > > Andrew Wong (2): > gitk: Refactor code for binding modified function keys > gitk: Use bindshiftfunctionkey to bind Shift-F5 > > gitk | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) Thanks, applied both patches. Paul. ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 @ 2012-10-01 15:16 Andrew Wong 2012-10-01 15:16 ` Andrew Wong 0 siblings, 1 reply; 13+ messages in thread From: Andrew Wong @ 2012-10-01 15:16 UTC (permalink / raw) To: git; +Cc: szeder, paulus, Andrew Wong I was running into the same issue too. It turns out that on some machines Shift-F5 is mapped to Shift-XF86_Switch_VT_5. My patch includes a workaround. The same workaround was used for Shift-F4. Andrew Wong (1): gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 gitk-git/gitk | 1 + 1 file changed, 1 insertion(+) -- 1.7.12.1.382.gb0576a6 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 2012-10-01 15:16 [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 Andrew Wong @ 2012-10-01 15:16 ` Andrew Wong 0 siblings, 0 replies; 13+ messages in thread From: Andrew Wong @ 2012-10-01 15:16 UTC (permalink / raw) To: git; +Cc: szeder, paulus, Andrew Wong The same workaround was used for Shift-F4 in: cea07cf8dc9b3677e0c50433c0d72bce83adbdc7 Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> --- gitk-git/gitk | 1 + 1 file changed, 1 insertion(+) diff --git a/gitk-git/gitk b/gitk-git/gitk index d93bd99..698b84a 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -2496,6 +2496,7 @@ proc makewindow {} { bindkey f nextfile bind . <F5> updatecommits bind . <Shift-F5> reloadcommits + catch { bind . <Shift-Key-XF86_Switch_VT_5> reloadcommits } bind . <F2> showrefs bind . <Shift-F4> {newview 0} catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} } -- 1.7.12.1.382.gb0576a6 ^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2012-10-21 22:19 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-09-30 10:19 gitk: can't reload commits with new key binding SZEDER Gábor 2012-10-01 15:26 ` Andrew Wong 2012-10-01 15:26 ` [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 Andrew Wong 2012-10-01 17:27 ` Junio C Hamano 2012-10-02 15:04 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong 2012-10-02 15:04 ` [PATCH v2 1/2] gitk: Refactor code for binding modified function keys Andrew Wong 2012-10-02 15:04 ` [PATCH v2 2/2] gitk: Use bindshiftfunctionkey to bind Shift-F5 Andrew Wong 2012-10-07 21:18 ` [PATCH v2 0/2] Re: gitk: can't reload commits with new key binding Andrew Wong 2012-10-08 21:05 ` SZEDER Gábor 2012-10-12 14:17 ` Andrew Wong 2012-10-21 22:19 ` Paul Mackerras -- strict thread matches above, loose matches on Subject: below -- 2012-10-01 15:16 [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5 Andrew Wong 2012-10-01 15:16 ` Andrew Wong
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).