From a0cd63eac68adcfedf7e9a1aff14ba4ed91f715c Mon Sep 17 00:00:00 2001
From: skomoroh <skomoroh@efabe8c0-fbe8-4139-b769-b5e6d273206e>
Date: Mon, 31 Mar 2008 15:14:21 +0000
Subject: [PATCH] * fixed bug with accel. keys and NumLock * minore
 improvements

git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@226 efabe8c0-fbe8-4139-b769-b5e6d273206e
---
 pysollib/games/bristol.py       | 16 +++++++++-------
 pysollib/games/katzenschwanz.py |  1 +
 pysollib/tile/menubar.py        |  3 ++-
 pysollib/tk/menubar.py          |  3 ++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py
index 9fc6e4f8..118b44c5 100644
--- a/pysollib/games/bristol.py
+++ b/pysollib/games/bristol.py
@@ -201,38 +201,40 @@ class Dover(Bristol):
 
         # set window
         max_rows = max(rows, self.gameinfo.decks*4)
-        w, h = 2*l.XM+l.XS+max_rows*l.XS, l.YM+l.TEXT_HEIGHT+5*l.YS
+        w, h = 2*l.XM+l.XS+max_rows*l.XS+l.XS/2, l.YM+l.TEXT_HEIGHT+5*l.YS
         self.setSize(w, h)
 
         # create stacks
-        x, y, = 2*l.XM+l.XS+l.XS*(max_rows-self.gameinfo.decks*4), l.YM
+        x, y, = w-l.XS*self.gameinfo.decks*4, l.YM
         for j in range(self.gameinfo.decks):
             for i in range(4):
                 s.foundations.append(self.Foundation_Class(x, y, self, suit=i))
                 x += l.XS
         if text:
-            x, y = l.XM+8*l.XS, l.YM
+            x, y = w-l.XS, l.YM
             tx, ty, ta, tf = l.getTextAttr(None, "ss")
-            tx, ty = x+tx+l.XM, y+ty
+            tx, ty = x+tx, y+ty
             font = self.app.getFont("canvas_default")
             self.texts.info = MfxCanvasText(self.canvas, tx, ty,
                                             anchor=ta, font=font)
 
-        x, y = 2*l.XM+(max_rows-rows)*l.XS, l.YM+l.YS
+        x, y = w-rows*l.XS, l.YM+l.YS
         if text:
             y += l.TEXT_HEIGHT
         for i in range(rows):
-            x += l.XS
             stack = self.RowStack_Class(x, y, self)
             stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET
             s.rows.append(stack)
+            x += l.XS
         x, y, = l.XM, l.YM
         s.talon = self.Talon_Class(x, y, self)
         l.createText(s.talon, "s")
         y += l.TEXT_HEIGHT
         for i in range(3):
             y += l.YS
-            s.reserves.append(self.ReserveStack_Class(x, y, self))
+            stack = self.ReserveStack_Class(x, y, self)
+            s.reserves.append(stack)
+            l.createText(stack, "se")
 
         # define stack-groups
         l.defaultStackGroups()
diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py
index 1a6d5478..e45ba8b3 100644
--- a/pysollib/games/katzenschwanz.py
+++ b/pysollib/games/katzenschwanz.py
@@ -623,6 +623,7 @@ class StepUp(Game):
 # ************************************************************************/
 
 class Kentish(Kings):
+    Solver_Class = FreeCellSolverWrapper(sbb='rank', sm='unlimited')
 
     def createGame(self, rows=8):
         # create layout
diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py
index 6e854588..708e2ac1 100644
--- a/pysollib/tile/menubar.py
+++ b/pysollib/tile/menubar.py
@@ -599,7 +599,8 @@ class PysolMenubarTk:
 ##             return
         if not modifier and len(key) == 1:
             # ignore Ctrl/Shift/Alt
-            func = lambda e, func=func: e.state == 0 and func(e)
+            # but don't ignore NumLock (state == 16)
+            func = lambda e, func=func: e.state in (0, 16) and func(e)
         sequence = "<" + modifier + "KeyPress-" + key + ">"
         bind(self.top, sequence, func)
         if len(key) == 1 and key != key.upper():
diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py
index bdb00604..3746ec4a 100644
--- a/pysollib/tk/menubar.py
+++ b/pysollib/tk/menubar.py
@@ -603,7 +603,8 @@ class PysolMenubarTk:
 ##             return
         if not modifier and len(key) == 1:
             # ignore Ctrl/Shift/Alt
-            func = lambda e, func=func: e.state == 0 and func(e)
+            # but don't ignore NumLock (state == 16)
+            func = lambda e, func=func: e.state in (0, 16) and func(e)
         sequence = "<" + modifier + "KeyPress-" + key + ">"
         bind(self.top, sequence, func)
         if len(key) == 1 and key != key.upper():