simon-git: putty (master): Simon Tatham

Sun Aug 16 13:16:16 BST 2015

TL;DR:
  066bce3 Saw unifontsel_draw_preview_text() in half.
  5319c65 Make the use of server-side backing pixmaps in GTK optional.
  1b3b993 Replace deprecated GDK_DISPLAY() with modern facilities.
  f853b69 Remove an outdated comment.
  0413cc8 Use gtk_window_set_icon() where available.
  b5423b5 Change uxsel_input_add's return type from int to pointer.
  280b14f Reimplement GTK uxsel_input_add using GIOChannel.

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-16 13:16:16

commit 066bce3d1991f67527360b4d051192ec14c316f2
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=066bce3d1991f67527360b4d051192ec14c316f2;hp=828ad5d6d4b4ddcdfdf995b01723f5cfe8bbf371
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 10:32:24 2015 +0100

    Saw unifontsel_draw_preview_text() in half.

    Now it's got an inner half that does actual drawing given a draw
    context, and an outer half that sets up and tears down the draw
    context. Sooner or later the inner half will need calling
    independently of the outer, because GTK3's draw event will provide a
    ready-made cairo_t.

 unix/gtkfont.c |  166 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 92 insertions(+), 74 deletions(-)

commit 5319c659ad23fde34606f49847e70867c5826ea9
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5319c659ad23fde34606f49847e70867c5826ea9;hp=066bce3d1991f67527360b4d051192ec14c316f2
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 09:02:31 2015 +0100

    Make the use of server-side backing pixmaps in GTK optional.

    We won't be able to use them in GTK3, or when compiling with GTK2 and
    -DGDK_DISABLE_DEPRECATED.

    This applies to the one we use for the main terminal window, and also
    the small one we use for the preview pane in the unified font selector.

 unix/gtkfont.c |   27 +++++++++++++++++++++++----
 unix/gtkfont.h |   17 +++++++++++++++++
 unix/gtkwin.c  |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 89 insertions(+), 6 deletions(-)

commit 1b3b99346734ee71263e4107849f5123a480e8e2
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=1b3b99346734ee71263e4107849f5123a480e8e2;hp=5319c659ad23fde34606f49847e70867c5826ea9
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 09:23:32 2015 +0100

    Replace deprecated GDK_DISPLAY() with modern facilities.

    We still don't actually support more than one X display active at
    once, so it's sufficient to replace every call to that macro with
    GDK_DISPLAY_XDISPLAY(gdk_display_get_default()).

 unix/gtkcompat.h |    6 ++++++
 unix/gtkfont.c   |   41 +++++++++++++++++++++++++----------------
 unix/gtkwin.c    |   35 ++++++++++++++++++++---------------
 3 files changed, 51 insertions(+), 31 deletions(-)

commit f853b695de6bad0d59153211cdb63bea6722976e
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=f853b695de6bad0d59153211cdb63bea6722976e;hp=1b3b99346734ee71263e4107849f5123a480e8e2
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 09:29:47 2015 +0100

    Remove an outdated comment.

    I've just noticed the comment in gtkfont.c that said wouldn't it be
    nice to find a way to avoid the GDK pixmap-stretching code when using
    Pango fonts. We now do support this, but we support it in gtkwin.c
    rather than gtkfont.c - because we do it using a Cairo transformation
    matrix, so it still takes place at the level above Pango rather than
    in Pango proper. (I never did find out whether Pango itself included
    facilities to arbitrarily stretch a font.)

    Hence, this comment is useless now. Discard.

 unix/gtkfont.c |   10 ----------
 1 file changed, 10 deletions(-)

commit 0413cc856c8006163bfb4c6d2eeae84f8e475a91
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=0413cc856c8006163bfb4c6d2eeae84f8e475a91;hp=f853b695de6bad0d59153211cdb63bea6722976e
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 09:41:10 2015 +0100

    Use gtk_window_set_icon() where available.

    GTK is deprecating the use of gdk_window_set_icon(), in favour of a
    method that doesn't have to drop down to the GDK level at all (and
    also doesn't use a pixmap). No reason not to use that instead.

 unix/gtkwin.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit b5423b51d468b76eb2b6cd19bb2c900b882e24f3
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=b5423b51d468b76eb2b6cd19bb2c900b882e24f3;hp=0413cc856c8006163bfb4c6d2eeae84f8e475a91
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 12:50:46 2015 +0100

    Change uxsel_input_add's return type from int to pointer.

    In case a front end needs to store more than an integer id to be
    returned to uxsel_input_remove, we now return a pointer to a
    frontend-defined structure.

 unix/gtkwin.c  |   17 +++++++++++++----
 unix/unix.h    |    5 +++--
 unix/uxpgnt.c  |    4 ++--
 unix/uxplink.c |    4 ++--
 unix/uxsel.c   |    5 +++--
 unix/uxsftp.c  |    4 ++--
 6 files changed, 25 insertions(+), 14 deletions(-)

commit 280b14f129850a5dfb393ad0d16ec6da881cd6ee
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=280b14f129850a5dfb393ad0d16ec6da881cd6ee;hp=b5423b51d468b76eb2b6cd19bb2c900b882e24f3
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 13:07:26 2015 +0100

    Reimplement GTK uxsel_input_add using GIOChannel.

    This is the new recommended approach since gdk_input_{add,remove} were
    deprecated (and, honestly, seems a lot more sensible - why on earth
    would those functions have lived in *GDK* of all places?). The old
    implementation is preserved under ifdef for GTK1.

    This was the last of the GDK deprecated functions to go! So GTK PuTTY
    now compiles cleanly with -DGDK_DISABLE_DEPRECATED in addition to all
    the other precautionary flags (though if you do that, you disable GDK
    rendering, which greatly slows down server-side font handling). This
    completes the GTK2-compatible preparation phase of the GTK 3 migration
    guide.

 unix/gtkwin.c |   38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)