Re: [PATCH] gitk: Add workaround for system where Shift-F5 mapped to Shift-XF86_Switch_VT_5

Andrew Wong [off-list ref] writes:

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?

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

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 <redacted>
---
 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

Signed-off-by: Andrew Wong <redacted>
---
 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

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(-)

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

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(-)

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.