simon-git: putty (master): Simon Tatham

Sun Aug 16 14:54:55 BST 2015

TL;DR:
  afae35e GTK3 port: support the new "draw" signal.
  59a232c GTK3 port: use gdk_device_grab() in gtkask.c.
  aac9d5f GTK3 port: replace size_request in the Columns layout class.
  0ffc564 GTK3 port: respell GDK_WINDOW_XWINDOW / GDK_DRAWABLE_XID.
  ccd7097 GTK3 port: condition out all uses of GdkColormap.
  54a52b5 GTK3 port: add '--with-gtk=3' to the configure script.

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 14:54:55

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

    GTK3 port: support the new "draw" signal.

    This replaces GTK 1/2's "expose_event", and provides a ready-made
    cairo_t to do the drawing with. My previous work has already separated
    all constructions of a cairo_t from the subsequent drawing with it, so
    the new draw event handlers just have to call the latter without the
    former.

 unix/gtkask.c  |   16 ++++++++++
 unix/gtkfont.c |   20 +++++++++++++
 unix/gtkwin.c  |   91 +++++++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 103 insertions(+), 24 deletions(-)

commit 59a232c1613c08a98d4a13238c0189f1b660e3e5
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=59a232c1613c08a98d4a13238c0189f1b660e3e5;hp=afae35eb9085d0f0cdb3a1bd9737b120011ee93a
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 14:36:32 2015 +0100

    GTK3 port: use gdk_device_grab() in gtkask.c.

    This replaces the old gdk_keyboard_grab(), and is what a GTK3 app has
    to use for grabbing the keyboard away from all other X clients.

 unix/gtkask.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

commit aac9d5fcf7b32386a2b37845e5c58e85124d67cb
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=aac9d5fcf7b32386a2b37845e5c58e85124d67cb;hp=59a232c1613c08a98d4a13238c0189f1b660e3e5
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 14:16:08 2015 +0100

    GTK3 port: replace size_request in the Columns layout class.

    It's been replaced by a new pair of methods get_preferred_width and
    get_preferred_height. For the moment, I've followed the porting
    guide's suggestion of keeping the old size_request function as an
    underlying implementation and having each of those methods just return
    one of its outputs. The results are ugly, but it'll compile and run,
    which is a start.

 unix/gtkcols.c |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

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

    GTK3 port: respell GDK_WINDOW_XWINDOW / GDK_DRAWABLE_XID.

    GDK3 now spells both of those as GDK_WINDOW_XID. (Of course 'drawable'
    is no longer a relevant concept in GDK3, since pixmaps are no longer
    supported and so all drawables are just windows.) We keep backwards
    compatibility, of course.

 unix/gtkcompat.h |    2 ++
 unix/gtkfont.c   |    2 ++
 unix/gtkwin.c    |    2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

commit ccd7097330c00dde3d4e08030dd181873f6d25cf
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=ccd7097330c00dde3d4e08030dd181873f6d25cf;hp=0ffc564351d5ca1ea88e545b0c5f4bec85ab00ea
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 14:22:14 2015 +0100

    GTK3 port: condition out all uses of GdkColormap.

    The entire concept has gone away in GTK3, which assumes that everyone
    is now using modern true-colour video modes and so there's no longer
    any reason you shouldn't just casually make up any RGB triple you like
    without bothering to ask the display system's permission.

 unix/gtkfont.c |    2 ++
 unix/gtkwin.c  |   47 +++++++++++++++++++++++++++++------------------
 2 files changed, 31 insertions(+), 18 deletions(-)

commit 54a52b5ebad0eaa04c7b402539cd51d119c84738
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=54a52b5ebad0eaa04c7b402539cd51d119c84738;hp=ccd7097330c00dde3d4e08030dd181873f6d25cf
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Aug 16 14:53:15 2015 +0100

    GTK3 port: add '--with-gtk=3' to the configure script.

    After the last few changes, the whole codebase now compiles and links
    successfully against GTK3, and I can run an experimental pterm. The
    config box and font selector look ugly, but the basics all seem to
    work.

    In order to compile at all, I had to manually bodge in the extra
    compile flag -Wno-deprecated-declarations. My plan is to fix all the
    uses of deprecated things, and then remove that flag.

    I've made GTK3 the second choice, after GTK2 but before GTK1. GTK2 is
    the only GTK version that produces a completely sensible build (partly
    because the GTK3 port is visibly unfinished, and mostly because its
    server-side font handling is just too slow), so it remains the first
    choice.

 configure.ac |   37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)