simon-git: putty (master): Simon Tatham

Commits to Tartarus CVS repository. tartarus-commits at lists.tartarus.org
Tue Sep 1 19:25:36 BST 2015


TL;DR:
  1840103 pterm: set IUTF8 on pty devices depending on charset.
  097d5ff pterm: move termios setup to after the fork.
  dc253b3 On OS X, be able to configure either Option or Command as Meta.
  0afc496 Work around OS X GTK treating Option as an AltGr key.
  1e0e962 OS X: fix handling of Ctrl-Space.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2015-09-01 19:25:36

commit 1840103c05d10ba1c45353282b4ad7f742a75b92
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=1840103c05d10ba1c45353282b4ad7f742a75b92;hp=ad994bab57c06bff0c6d06d0ca8806be0bb2afd2
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Sep 1 18:35:38 2015 +0100

    pterm: set IUTF8 on pty devices depending on charset.
    
    In a UTF-8 pterm, it makes sense to set the IUTF8 flag (on systems
    that have one) on the pty device, so that line editing will take
    account of UTF-8 multibyte characters.

 unix/gtkwin.c |    6 ++++++
 unix/unix.h   |    1 +
 unix/uxpty.c  |   19 +++++++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

commit 097d5ffb37c0280529eb6b172c9ce43f335cf73c
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=097d5ffb37c0280529eb6b172c9ce43f335cf73c;hp=1840103c05d10ba1c45353282b4ad7f742a75b92
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Sep 1 18:45:51 2015 +0100

    pterm: move termios setup to after the fork.
    
    On OS X, apparently, we can't do termios setup on the pty master, so
    instead we have to leave it until we've opened the slave fd in the
    child process. That works on Linux too, so let's leave it here rather
    than having another cumbersome ifdef.

 unix/uxpty.c |   57 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

commit dc253b3c51ac621f894653d0f04aef7d8f9ba8f1
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=dc253b3c51ac621f894653d0f04aef7d8f9ba8f1;hp=097d5ffb37c0280529eb6b172c9ce43f335cf73c
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Sep 1 19:00:25 2015 +0100

    On OS X, be able to configure either Option or Command as Meta.
    
    Personally I like using Command as the Esc-prefixing Meta key in
    terminal sessions, because it occupies the same physical keyboard
    position as the Alt key that I'm used to using on non-Macs. OS X
    Terminal uses Option for that purpose (freeing up Command for the
    conventional Mac keyboard shortcuts, of course), so I anticipate
    differences of opinion.
    
    Hence, here's a pair of OSX-specific config options which permit a
    user to set either, or neither, or both of those modifier keys to
    function as the terminal Meta key.

 putty.h       |    2 ++
 settings.c    |    8 ++++++++
 unix/gtkcfg.c |   16 ++++++++++++++++
 unix/gtkwin.c |   22 ++++++++++++++++------
 unix/unix.h   |    1 +
 5 files changed, 43 insertions(+), 6 deletions(-)

commit 0afc496a5f46c401116b17d10974f2363aab8b86
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=0afc496a5f46c401116b17d10974f2363aab8b86;hp=dc253b3c51ac621f894653d0f04aef7d8f9ba8f1
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Sep 1 19:10:29 2015 +0100

    Work around OS X GTK treating Option as an AltGr key.
    
    If I'm using Option as the Meta key, I want to suppress OS X GTK's
    default behaviour of treating it as an AltGr-oid which changes the
    keyval and Unicode translation of alphabetic keys. So on OS X I enable
    a somewhat bodgy workaround which retranslates from the hardware
    keycode as if the Option modifier had not been active at the time, and
    use that as the character to prefix Esc to.
    
    This is a bit nasty because I have to hardwire group = 0 in the call
    to gdk_keymap_translate_keyboard_state(), whereas in principle what I
    wanted was group = (whatever would have resulted from everything else
    in the key event other than MOD1). However, in practice, they seem to
    be the same, so this will do for the moment.

 unix/gtkwin.c |   42 ++++++++++++++++++++++++++++++++++++++++--
 unix/unix.h   |    2 ++
 2 files changed, 42 insertions(+), 2 deletions(-)

commit 1e0e96204d0a54ebfabe359f716dc21130028ce6
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=1e0e96204d0a54ebfabe359f716dc21130028ce6;hp=0afc496a5f46c401116b17d10974f2363aab8b86
Author: Simon Tatham <anakin at pobox.com>
Date:   Tue Sep 1 19:18:26 2015 +0100

    OS X: fix handling of Ctrl-Space.
    
    I'd left it out of my simulated Ctrl processing. It should have been
    treated as \0, the same as ^2 and ^@.

 unix/gtkwin.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



More information about the tartarus-commits mailing list