simon-git: puzzles (main): Simon Tatham

Sun Jul 31 09:07:33 BST 2022

TL;DR:
  49dbf1f Pearl: Require width or height to be at least 6 for Tricky
  0dc4650 Towers: Fix indentation of some solver code
  cd338a1 Unruly: Fix memory leak in dup_game()
  4c1e47b Bridges: Fix off-by-one in WITHIN()
  3d0c734 gtk: Do not override window background colour when using a dark theme
  e13ad1a gtk: Adjust to reordering of XPM icons
  f0f9740 Makefile.doc: Update file list in the clean rule
  b34f8b1 Style cleanups from the previous fixes.

Repository:     https://git.tartarus.org/simon/puzzles.git
On the web:     https://git.tartarus.org/?p=simon/puzzles.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2022-07-31 09:07:33

commit 49dbf1f60dc5c6bcb6b3ffadf89e7e0c14106638
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=49dbf1f60dc5c6bcb6b3ffadf89e7e0c14106638;hp=387d323dd8d579db2c90b499b3b19f746cbdbce5
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Aug 10 07:00:06 2018 +0100

    Pearl: Require width or height to be at least 6 for Tricky

    Josh Triplett reported:
    > If I ask pearl to generate a 5x5 tricky puzzle, it runs forever.

    I find that 5x6 or 6x5 works, so set the minimum accordingly.

    References: https://bugs.debian.org/667963

 pearl.c | 2 ++
 1 file changed, 2 insertions(+)

commit 0dc46506ca85eb49299fc62a4362c8a4a655e320
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=0dc46506ca85eb49299fc62a4362c8a4a655e320;hp=49dbf1f60dc5c6bcb6b3ffadf89e7e0c14106638
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Jun 30 14:43:16 2016 +0200

    Towers: Fix indentation of some solver code

    gcc 6 warns about statements that are indented as if they were meant
    to be part of a preceding conditional block.  In this case I don't
    think that was intended, so shift it left.

    References: https://bugs.debian.org/811577

 towers.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit cd338a1a35394a7abfd517569e908b54bf657aaa
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=cd338a1a35394a7abfd517569e908b54bf657aaa;hp=0dc46506ca85eb49299fc62a4362c8a4a655e320
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Aug 17 17:33:54 2019 +0100

    Unruly: Fix memory leak in dup_game()

    The common structure is ref-counted and dup_game() bumps the reference
    count rather than copying it.  However, blank_state() always allocates
    a new instance.  Add a parameter to control whether blank_state()
    allocates it.

    Fixes: 47cec547e59a ("Unruly, Group: reference-count the 'immutable' array.")

 unruly.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit 4c1e47b272274972556d7790384998e593d0ae57
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=4c1e47b272274972556d7790384998e593d0ae57;hp=cd338a1a35394a7abfd517569e908b54bf657aaa
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Aug 17 17:36:51 2019 +0100

    Bridges: Fix off-by-one in WITHIN()

    WITHIN() used to treat the min and max as inclusive bounds but was
    changed to treat the max as exclusive, apparently accidentally.

    Fixed: 5f5b284c0bdd ("Use C99 bool within source modules.")

 bridges.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3d0c734e433972d6a9421ebd58763ca5bf1f1355
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=3d0c734e433972d6a9421ebd58763ca5bf1f1355;hp=4c1e47b272274972556d7790384998e593d0ae57
Author: Ben Hutchings <benh at debian.org>
Date:   Sun Feb 13 22:23:31 2022 +0100

    gtk: Do not override window background colour when using a dark theme

    When the user chooses a global dark theme, the window background will
    be dark and the default text colour light.  Overriding the window
    background to be light grey can make the menu and status bars
    unreadable.  In case a dark theme is used, only set the background
    colour for the content area.

    References: https://bugs.debian.org/944237

 gtk.c | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

commit e13ad1a18069f792dcebc2a3de38b9c476fd0233
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=e13ad1a18069f792dcebc2a3de38b9c476fd0233;hp=3d0c734e433972d6a9421ebd58763ca5bf1f1355
Author: Ben Hutchings <benh at debian.org>
Date:   Sun Jul 31 01:42:37 2022 +0200

    gtk: Adjust to reordering of XPM icons

    Commit cc7f550 "Migrate to a CMake-based build system." reversed the
    order of xpm_icons, so the largest icon (96x96) is now first and
    the smallest (16x16) is now last.

    The About dialog now shows the smallest icon, and the window icon is
    now the largest icon.

    Change the array indexing so that the same size icons are used as
    before.

    Fixes: cc7f5503dc8f ("Migrate to a CMake-based build system.")

 gtk.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f0f974055b7f8ee91bae6505aad166923ec7117f
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=f0f974055b7f8ee91bae6505aad166923ec7117f;hp=e13ad1a18069f792dcebc2a3de38b9c476fd0233
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jul 31 03:42:50 2022 +0200

    Makefile.doc: Update file list in the clean rule

    - puzzles.chm and puzzles.cnt need to be removed as well
    - HTML Help Workshop is no longer used, so drop the patterns for its
      intermediate output

 Makefile.doc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b34f8b1ee33163af988c75587e6ac99739b7684f
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=b34f8b1ee33163af988c75587e6ac99739b7684f;hp=f0f974055b7f8ee91bae6505aad166923ec7117f
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Jul 31 09:00:21 2022 +0100

    Style cleanups from the previous fixes.

    Reordered the statements in the fixed Unruly blank_state so that there
    doesn't need to be a double if statement (and I think it's more
    sensible in any case to put each memset of a freshly allocated array
    immediately after the alloc).

    In GTK set_window_background, the nest of #ifdefs is now complicated
    enough to deserve a few comments on the #else and #endif lines. And
    while I was there I switched the gboolean to a bool, on my general
    principle that platform-specific boolean types are only worth using
    when you're passing them to a platform API function (and perhaps not
    even then, if it's not passed by reference).

 gtk.c    | 10 +++++-----
 unruly.c |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)