simon-git: putty (master): Simon Tatham

Commits to Tartarus CVS repository. tartarus-commits at lists.tartarus.org
Mon Apr 4 11:37:40 BST 2016


TL;DR:
  169a3d2 GTK 3.20 compatibility: switch to gdk_seat_grab.
  a7befbf GTK: split out the computation part from set_geom_hints.
  4ba7ff0 GTK: stop using geometry-based window sizing functions.
  8fd67a9 GTK: stop using gtk_window_parse_geometry.
  4f904fc Account for GtkApplicationWindow menu bar in geometry hints.

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:           2016-04-04 11:37:40

commit 169a3d2457a1a70b0674772a335162b6600f0e94
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=169a3d2457a1a70b0674772a335162b6600f0e94;hp=ab433e80730112b02eea2fd99050cb71b4542070
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 4 11:21:54 2016 +0100

    GTK 3.20 compatibility: switch to gdk_seat_grab.
    
    gdk_device_grab and all its preparatory faff are now deprecated, and
    gdk_seat_grab is the new thing. Introduce yet another branch to all
    the ifdefs for keyboard-grabbing. On the plus side, at least it's
    slightly simpler than the GdkDevice business.

 unix/gtkask.c |   28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

commit a7befbf40eb1aa48e87a79abda3d63841c0d8cde
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=a7befbf40eb1aa48e87a79abda3d63841c0d8cde;hp=169a3d2457a1a70b0674772a335162b6600f0e94
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 4 11:23:25 2016 +0100

    GTK: split out the computation part from set_geom_hints.
    
    This is preparation for dealing with the fact that GTK's geometry-
    based API routines for setting the window size are being deprecated:
    we'll no longer be able to specify a width/height in characters and
    have GTK convert that into a pixel size based on the geometry hints
    we'd already fed it. So we'll need to do that conversion ourselves,
    and the easiest approach is to make it easy to recompute the geometry
    hints on our side whenever we need them.

 unix/gtkwin.c |   54 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

commit 4ba7ff006a5ef48f2961239d9402bddcd37fd648
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=4ba7ff006a5ef48f2961239d9402bddcd37fd648;hp=a7befbf40eb1aa48e87a79abda3d63841c0d8cde
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 4 11:24:24 2016 +0100

    GTK: stop using geometry-based window sizing functions.
    
    gtk_window_resize_to_geometry and gtk_window_set_default_geometry are
    deprecated as of GTK 3.20, so now we do the geometry -> pixel size
    conversion on our side.

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

commit 8fd67a9c46cc175640bf51a0ac7e1e52c8745371
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=8fd67a9c46cc175640bf51a0ac7e1e52c8745371;hp=4ba7ff006a5ef48f2961239d9402bddcd37fd648
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 4 11:27:01 2016 +0100

    GTK: stop using gtk_window_parse_geometry.
    
    This function, which parses the X11-style '-geometry WxH+X+Y' option
    argument and automatically loads the result into the window, is also
    being deprecated.
    
    Fortunately we already had a fallback option for GTK1 (which didn't
    have gtk_window_parse_geometry in the first place), calling the Xlib
    geometry-parsing function and manually loading the results into GTK.
    The method of loading into GTK is not the same between the two
    versions, but the basic strategy is still viable.
    
    For the sake of maintaining and testing fewer ifdef branches, I've
    removed the use of gtk_window_parse_geometry _completely_, even in
    GTK2 which did have it. GTK2 now uses the same strategy that I've
    switched to for GTK3.

 unix/gtkwin.c |   40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

commit 4f904fcd154fccbe99f3e58c4c2c0c3a24976122
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=4f904fcd154fccbe99f3e58c4c2c0c3a24976122;hp=8fd67a9c46cc175640bf51a0ac7e1e52c8745371
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Apr 4 11:28:34 2016 +0100

    Account for GtkApplicationWindow menu bar in geometry hints.
    
    This is another widget that can appear in the top-level window, in
    addition to the drawing area and scrollbar we put there ourselves, and
    hence which needs to be accounted for when figuring out the
    relationship between the drawing area size in character cells and the
    full window size in pixels.
    
    Finding the menu bar widget itself is a bit of a hassle, but having
    found it, dealing with it is basically the same as dealing with the
    scrollbar, only with x and y swapped.

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



More information about the tartarus-commits mailing list