simon-git: putty (master): Simon Tatham
Commits to Tartarus hosted VCS
tartarus-commits at lists.tartarus.org
Mon Dec 18 14:07:27 GMT 2017
TL;DR:
3faca77 Correct the OS X branch of the clipboards ifdef.
1904c40 OS X: pass Command key back to GTK if it's not being Meta.
31080bf Add keyboard accelerators in the GtkApplication menu.
2065fb6 Minor refactoring of gtkapp.c -> gtkwin.c menu triggers.
04184c8 Fill in some more of the OS X menu bar.
faef0ea Rewrite the OS X TODO a bit.
Repository: https://git.tartarus.org/simon/putty.git
On the web: https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer: Simon Tatham <anakin at pobox.com>
Date: 2017-12-18 14:07:27
commit 3faca7724a833a24dcb7c056017f72a74109ecda
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=3faca7724a833a24dcb7c056017f72a74109ecda;hp=136c119da6388b27ce77966356f3726505b70a5b
Author: Simon Tatham <anakin at pobox.com>
Date: Mon Dec 18 10:31:42 2017 +0000
Correct the OS X branch of the clipboards ifdef.
That's what I get for not testing on all platforms before I push.
Forgot that, since OS X GTK mimics X11 GTK closely enough to still use
the name "CLIPBOARD" for the unique system clipboard, I had left this
code base's internal name for it as CLIP_CLIPBOARD and not the
CLIP_SYSTEM I used on Windows.
unix/unix.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1904c404ed426a3c6b7151e5a21a8d9a1678f611
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=1904c404ed426a3c6b7151e5a21a8d9a1678f611;hp=3faca7724a833a24dcb7c056017f72a74109ecda
Author: Simon Tatham <anakin at pobox.com>
Date: Mon Dec 18 10:43:13 2017 +0000
OS X: pass Command key back to GTK if it's not being Meta.
This fixes the problem I'd previously noticed, that if you don't
configure the "Command key acts as Meta" setting, then keystrokes like
Command-Q which _ought_ to function as accelerators for the
application menu bar don't.
Turns out that this was for the totally obvious reason: the keyboard
event was still being processed by gtkwin.c's key_event() and
translated via the GTK IM into ordinary keyboard input. If instead I
return FALSE from key_event on detecting that a key event has a
non-Meta-configured Command modifier, then it will go to the next-
level key-event handler inside GTK itself which implements the menu
accelerator behaviour. Another problem ticked off the OS X checklist.
unix/gtkapp.c | 9 ---------
unix/gtkwin.c | 9 +++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
commit 31080bf8a7cc0fb7c9b73762fd38244110256ff9
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=31080bf8a7cc0fb7c9b73762fd38244110256ff9;hp=1904c404ed426a3c6b7151e5a21a8d9a1678f611
Author: Simon Tatham <anakin at pobox.com>
Date: Mon Dec 18 11:01:42 2017 +0000
Add keyboard accelerators in the GtkApplication menu.
Now that they actually _work_, it seems more useful to start putting
them in on purpose.
unix/gtkapp.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
commit 2065fb647fb6f6d8c5699eac190ea8d188867454
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=2065fb647fb6f6d8c5699eac190ea8d188867454;hp=31080bf8a7cc0fb7c9b73762fd38244110256ff9
Author: Simon Tatham <anakin at pobox.com>
Date: Mon Dec 18 11:15:44 2017 +0000
Minor refactoring of gtkapp.c -> gtkwin.c menu triggers.
Just to avoid an endless proliferation of functions too small to see,
I've arranged an enumeration of action ids and a single
app_menu_action function on the receiving end, and in gtkapp.c, a list
macro that means I at least don't have to define the tiny callback
functions and the GActionEntry records by hand and keep them in sync.
unix/gtkapp.c | 26 ++++++++++++--------------
unix/gtkwin.c | 21 ++++++++++++---------
unix/unix.h | 8 +++++---
3 files changed, 29 insertions(+), 26 deletions(-)
commit 04184c87ccf9f45e7794219341e7f46435f54883
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=04184c87ccf9f45e7794219341e7f46435f54883;hp=2065fb647fb6f6d8c5699eac190ea8d188867454
Author: Simon Tatham <anakin at pobox.com>
Date: Mon Dec 18 11:46:48 2017 +0000
Fill in some more of the OS X menu bar.
This still isn't complete: I also need to add the variable collections
of things like mid-session special commands and saved session names,
and also I need to try to grey out menu items when they're not
applicable. But it's a start.
unix/gtkapp.c | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
unix/gtkdlg.c | 5 +++--
unix/gtkwin.c | 50 ++++++++++++++++++++++++++++++++++----------------
unix/unix.h | 4 +++-
4 files changed, 85 insertions(+), 24 deletions(-)
commit faef0ea679155e4ae2d921e4af3913f5dbc895a8
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=faef0ea679155e4ae2d921e4af3913f5dbc895a8;hp=04184c87ccf9f45e7794219341e7f46435f54883
Author: Simon Tatham <anakin at pobox.com>
Date: Mon Dec 18 14:04:57 2017 +0000
Rewrite the OS X TODO a bit.
I've filled in the results of some not-entirely-conclusive
investigation into the trackpad scrolling issue, some thoughts on
resizing, and reordered the items into what currently seems the most
sensible order to me.
unix/gtkapp.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
More information about the tartarus-commits
mailing list