simon-git: putty (master): Simon Tatham

Sat Aug 8 18:37:43 BST 2015

TL;DR:
  824ad94 Make gtkask.c compile under GTK 1.
  8ee1277 GTK 3 prep: do not include individual GTK/GDK headers.
  0a3e593 GTK 3 prep: use accessor functions for object data fields.
  a6ccb8e GTK 3 prep: use GDK_KEY_<keyname> constants, not GDK_<keyname>.
  2ac190c Allow direct use of X11 to be conditionally compiled out.
  1e4273a GTK 3 prep: use the glib names for base object types.
  961fd07 GTK 3 prep: use gtk_color_selection_get_current_color().
  fbb7c8c GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog.
  5e55b7a Switch to using gtk_window_parse_geometry in GTK 2.
  5fa2249 GTK 3 prep: stop using *nearly* all GTK deprecated functions.

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-08-08 18:37:43

commit 824ad9430c272ff702f584d5d61c1a57abd4ab45
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=824ad9430c272ff702f584d5d61c1a57abd4ab45;hp=0550943b51c538400e31ce18483032e446178120
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 15:04:28 2015 +0100

    Make gtkask.c compile under GTK 1.

    This is less than ideal - passphrase input now happens in ISO 8859-1,
    and the passphrase prompt window is neither centred nor always-on-top.
    But it basically works, and restores bare-minimum GTK 1 support to the
    codebase as a whole.

 unix/gtkask.c    |   68 +++++++++++++++++++++++++++++++++++++++---------------
 unix/gtkcompat.h |   22 ++++++++++++++++++
 2 files changed, 71 insertions(+), 19 deletions(-)

commit 8ee12773d885d906d02340377996895144c14385
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=8ee12773d885d906d02340377996895144c14385;hp=824ad9430c272ff702f584d5d61c1a57abd4ab45
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 15:06:15 2015 +0100

    GTK 3 prep: do not include individual GTK/GDK headers.

    This is the first of several cleanup steps recommended by the GTK 2->3
    migration guide.

    I intend to begin work towards compatibility with GTK 3, but without
    breaking GTK 2 and even GTK 1 compatibility in the process; GTK 2 is
    still useful to _me_ (not least because it permits much easier support
    of old-style server-side X11 fonts), and I recall hearing a rumour
    that at least one kind of strange system can only run GTK 1, so for
    the moment I don't intend to stop supporting either.

    Including gdkkeysyms.h is not optional in GTK 2, because gdk.h does
    not include it. In GTK 3 it does, so we don't explicitly reinclude it
    ourselves.

    We now build cleanly in GTK2 with -DGTK_DISABLE_SINGLE_INCLUDES. (But
    that doesn't say much, because we did already! Apparently gdkkeysyms.h
    was a special case which that #define didn't forbid.)

 unix/gtkask.c  |    3 +++
 unix/gtkdlg.c  |    2 ++
 unix/gtkfont.c |    2 ++
 unix/gtkwin.c  |    2 ++
 4 files changed, 9 insertions(+)

commit 0a3e5939597ada7509445cfe2caa28f16ec2459e
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=0a3e5939597ada7509445cfe2caa28f16ec2459e;hp=8ee12773d885d906d02340377996895144c14385
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 15:53:43 2015 +0100

    GTK 3 prep: use accessor functions for object data fields.

    We now build cleanly in GTK2 with -DGSEAL_ENABLE.

 unix/gtkask.c    |   10 ++--
 unix/gtkcols.c   |   40 ++++++++--------
 unix/gtkcompat.h |   44 ++++++++++++++++-
 unix/gtkdlg.c    |  117 +++++++++++++++++++++++++++------------------
 unix/gtkfont.c   |   16 ++++---
 unix/gtkwin.c    |  140 ++++++++++++++++++++++++++++++------------------------
 6 files changed, 229 insertions(+), 138 deletions(-)

commit a6ccb8e72000c53cca779367136ca5c8a9d03a12
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=a6ccb8e72000c53cca779367136ca5c8a9d03a12;hp=0a3e5939597ada7509445cfe2caa28f16ec2459e
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 16:23:54 2015 +0100

    GTK 3 prep: use GDK_KEY_<keyname> constants, not GDK_<keyname>.

    GTK 2 doesn't _documentedly_ provide a helpful compile option to let
    us check this one in advance of GTK 3, but you can fake one anyway by
    compiling with -D__GDK_KEYSYMS_COMPAT_H__, so that gdkkeysyms-compat.h
    will believe that it's already been included :-) We now build cleanly
    under GTK 2 with that predefine.

 unix/gtkask.c    |    8 +-
 unix/gtkcompat.h |   70 +++++++++++++
 unix/gtkdlg.c    |    4 +-
 unix/gtkwin.c    |  302 +++++++++++++++++++++++++++++-------------------------
 4 files changed, 238 insertions(+), 146 deletions(-)

commit 2ac190c06d516387b4f580c660db9a6808769ce8
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=2ac190c06d516387b4f580c660db9a6808769ce8;hp=a6ccb8e72000c53cca779367136ca5c8a9d03a12
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 16:35:19 2015 +0100

    Allow direct use of X11 to be conditionally compiled out.

    A major aim of introducing GTK 3 support is to permit compiling for
    non-X11 platforms that GTK 3 supports, so I'm going to need to be able
    to build as a pure GTK application with no use of X11 internals.
    Naturally, I don't intend to stop supporting the hybrid GTK+X11 mode
    in which X server-side bitmap fonts are available.

    Use of X11 can be removed by compiling with -DNOT_X_WINDOWS. That's
    the same compatibility flag that was already used by the unfinished OS
    X port to disable the X-specific parts of uxpty.c; now it just applies
    to more source files.

    (There's no 'configure' option to set this flag at present. I haven't
    worked out whether we'll need one yet.)

 unix/gtkdlg.c  |    2 ++
 unix/gtkfont.c |   35 ++++++++++++++++++++++++++--------
 unix/gtkwin.c  |   58 +++++++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 76 insertions(+), 19 deletions(-)

commit 1e4273a9295f0922a84dcea3edffcbd7b5449c11
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=1e4273a9295f0922a84dcea3edffcbd7b5449c11;hp=2ac190c06d516387b4f580c660db9a6808769ce8
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 17:29:02 2015 +0100

    GTK 3 prep: use the glib names for base object types.

    All the things like GtkType, GtkObject, gtk_signal_connect and so on
    should now consistently have the new-style glib names like GType,
    GObject, g_signal_connect, etc.

 unix/gtkask.c    |   24 ++--
 unix/gtkcols.c   |   10 +-
 unix/gtkcols.h   |   12 +-
 unix/gtkcompat.h |   12 ++
 unix/gtkdlg.c    |  384 +++++++++++++++++++++++++++---------------------------
 unix/gtkfont.c   |   50 +++----
 unix/gtkwin.c    |  100 +++++++-------
 7 files changed, 299 insertions(+), 293 deletions(-)

commit 961fd07d08ba8bc381e5142a16e03efd10d9228d
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=961fd07d08ba8bc381e5142a16e03efd10d9228d;hp=1e4273a9295f0922a84dcea3edffcbd7b5449c11
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 17:32:15 2015 +0100

    GTK 3 prep: use gtk_color_selection_get_current_color().

    Replaces the deprecated gtk_color_selection_set_color() which took an
    array of four doubles (RGBA), and instead takes a 'GdkColor' struct
    containing four 16-bit integers.

    For GTK1, we still have to retain the original version.

 unix/gtkdlg.c |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

commit fbb7c8c481364b1081cd40008ed1f6231c41685f
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=fbb7c8c481364b1081cd40008ed1f6231c41685f;hp=961fd07d08ba8bc381e5142a16e03efd10d9228d
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 17:34:25 2015 +0100

    GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog.

    I've put in a special #define to control this selection, in case I
    decide that for reasons of taste I'd prefer to switch back to
    GtkFileSelection in GTK2 which supports both!

 unix/gtkdlg.c |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit 5e55b7a978248a2f740bfb0d6570517e3e5f260a
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5e55b7a978248a2f740bfb0d6570517e3e5f260a;hp=fbb7c8c481364b1081cd40008ed1f6231c41685f
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 18:22:05 2015 +0100

    Switch to using gtk_window_parse_geometry in GTK 2.

    On GTK versions where it's available, this is a much nicer way of
    handling the -geometry command-line option, since not only do we get
    all the faffing about with gravity for free, it also automatically
    sets the user-position WM hints.

 unix/gtkwin.c |   45 ++++++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 15 deletions(-)

commit 5fa22495c70412442b48981d08c53b7895068d13
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5fa22495c70412442b48981d08c53b7895068d13;hp=5e55b7a978248a2f740bfb0d6570517e3e5f260a
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Aug 8 18:02:01 2015 +0100

    GTK 3 prep: stop using *nearly* all GTK deprecated functions.

    Building with -DGTK_DISABLE_DEPRECATED, we now suffer only one compile
    failure, for the use of gtk_quit_add() in idle_toplevel_callback_func.
    That function is apparently removed with no replacement in GTK 3, so
    I'll need to find a completely different approach to getting toplevel
    callbacks to run only in the outermost instance of gtk_main().

    Also, this change doesn't do anything about the use of *GDK*
    deprecated functions, because those include the entire family of
    old-style drawing functions - i.e. the only way to build cleanly with
    -DGDK_DISABLE_DEPRECATED will be to switch to Cairo drawing.

 unix/gtkcompat.h |    2 ++
 unix/gtkdlg.c    |   57 +++++++++++++++++++++++++++++++-----------------------
 unix/gtkfont.c   |    3 ++-
 unix/gtkwin.c    |   28 +++++++++++++++------------
 4 files changed, 53 insertions(+), 37 deletions(-)