Remaining fixes from the PR 15 review discussion

CREDITS

@@ -95,8 +95,6 @@ template.level                         OD Team                 GPLv3+
 
 Name                                   Author                  License                 Source URL
 ------------------------------------------------------------------------------------------------------------------------
-RTShaderLib/*                          The Ogre 3D Team        MIT                     http://www.ogre3d.org/licensing
-
 scripts/
 -> *.material                          OD Team                 GPLv3+
 
@@ -185,6 +183,8 @@ textures/
 -> MysteryBox*.png                     Nobiax, Danimal         CC-BY-SA 3.0            http://opengameart.org/users/danimal
 -> OrcBed*.png                         Bart, p0ss              CC-BY-SA 3.0            http://forum.freegamedev.net/viewtopic.php?p=60191#p60191
 -> Orc{,Normal}.png
+-> Panels_Diffuse.png                  The Ogre 3D Team        MIT                     https://github.com/OGRECave/ogre - Samples/Media/materials/textures
+-> Panels_Normal_Tangent.png           The Ogre 3D Team        MIT                     https://github.com/OGRECave/ogre - Samples/Media/materials/textures
 -> PitDemon*.png
 -> Podium*.png
 -> Portal{,Normal}.png                 Yughues                 CC0                     http://opengameart.org/users/yughues

gui/LoadConfirm.layout

@@ -7,20 +7,25 @@
         <Property name="AlwaysOnTop" value="True" />
         <Property name="Text" value="Are you sure ?" /> 
         <Property name="AlwaysOnTop" value="True" />
+        <!-- The text fills the client area above the buttons and the buttons
+             are anchored to the client area's bottom edge, so the dialog lays
+             out correctly whatever room the titlebar and frame take. -->
         <Window type="OD/StaticText" name="Message" >
        	    <Property name="Text" value="  You have an unsaved changes, your work will be lost, &#0010;
       Do you really want to load a new level?" />
             <Property name="InheritsAlpha" value="False" />
-	    <Property name="Area" value="{{0.5,-220},{0.5,-100},{0.5,220},{0.5,0}}" />
+            <Property name="VertFormatting" value="CentreAligned" />
+            <Property name="HorzFormatting" value="WordWrapCentered" />
+            <Property name="Area" value="{{0,25},{0,5},{1,-25},{1,-50}}" />
         </Window>
         <Window type="OD/Button" name="YesOption" >
-            <Property name="Area" value="{{0.3,-48},{0.8,-39},{0.3,44},{0.8,-1}}" />
+            <Property name="Area" value="{{0.3,-48},{1,-44},{0.3,44},{1,-6}}" />
             <Property name="Text" value="Yes" />
             <Property name="TooltipText" value="Confirm exit" />
             <Property name="InheritsAlpha" value="False" />
         </Window>
         <Window type="OD/Button" name="NoOption" >
-            <Property name="Area" value="{{0.7,-47},{0.8,-39},{0.7,45},{0.8,-1}}" />
+            <Property name="Area" value="{{0.7,-47},{1,-44},{0.7,45},{1,-6}}" />
             <Property name="Text" value="No" />
             <Property name="TooltipText" value="Cancel exit" />
             <Property name="InheritsAlpha" value="False" />

gui/OD.looknfeel

@@ -973,6 +973,10 @@
             </Area>
             <Property name="AlwaysOnTop" value="False" />
             <Property name="WantsMultiClickEvents" value="False" />
+            <!-- Position against the window's outer rect, not the client area:
+                 the client area starts below the titlebar, so a client-relative
+                 titlebar would sit its own height too low. -->
+            <Property name="NonClient" value="True" />
         </Child>
         <Child nameSuffix="__auto_closebutton__" type="OD/SystemButton">
             <Area>
@@ -1000,6 +1004,7 @@
             <Property name="NormalImage" value="OpenDungeonsSkin/CloseButtonNormal" />
             <Property name="HoverImage" value="OpenDungeonsSkin/CloseButtonHover" />
             <Property name="PushedImage" value="OpenDungeonsSkin/CloseButtonPressed" />
+                    <Property name="NonClient" value="True" />
         </Child>
         <ImagerySection name="withtitle_frame">
             <FrameComponent>

gui/WindowApplyChanges.layout

@@ -2,27 +2,30 @@
 
 <GUILayout version="4" >
     <Window type="OD/FrameWindow" name="ConfirmRestart" >
-        <Property name="Area" value="{{0.5,-200},{0.5,-100},{0.5,200},{0.5,60}}" />
+        <Property name="Area" value="{{0.5,-200},{0.5,-95},{0.5,200},{0.5,95}}" />
         <Property name="Text" value="Warning" />
         <Property name="Alpha" value="0.8" />
         <Property name="AlwaysOnTop" value="True" />
         <Property name="SizingEnabled" value="False" />
+        <!-- The text fills the client area above the buttons and the buttons
+             are anchored to the client area's bottom edge, so the dialog lays
+             out correctly whatever room the titlebar and frame take. -->
         <Window type="OD/StaticText" name="ApplyText" >
             <Property name="FrameEnabled" value="False" />
             <Property name="BackgroundEnabled" value="False" />
             <Property name="InheritsAlpha" value="False" />
-            <Property Name="VertFormatting" Value="TopAligned" />
+            <Property name="VertFormatting" value="CentreAligned" />
             <Property name="HorzFormatting" value="WordWrapCentered" />
-            <Property name="Area" value="{{0,25},{0,30},{1,-25},{0.7,0}}" />
+            <Property name="Area" value="{{0,25},{0,5},{1,-25},{1,-45}}" />
             <Property name="Text" value="To actually apply this setting,&#0010;Open Dungeons needs to be stopped now.&#0010;Do you want to apply this change now?" />
         </Window>
         <Window type="OD/Button" name="CancelButton" >
-            <Property name="Area" value="{{0.3,-48},{0.9,-39},{0.3,44},{0.9,-5}}" />
+            <Property name="Area" value="{{0.3,-48},{1,-42},{0.3,44},{1,-8}}" />
             <Property name="Text" value="Cancel" />
             <Property name="InheritsAlpha" value="False" />
         </Window>
         <Window type="OD/Button" name="ApplyButton" >
-            <Property name="Area" value="{{0.7,-47},{0.9,-39},{0.7,45},{0.9,-5}}" />
+            <Property name="Area" value="{{0.7,-47},{1,-42},{0.7,45},{1,-8}}" />
             <Property name="Text" value="Apply" />
             <Property name="InheritsAlpha" value="False" />
         </Window>

gui/WindowQuit.layout

@@ -2,24 +2,27 @@
 
 <GUILayout version="4" >
     <Window type="OD/FrameWindow" name="ConfirmExit" >
-        <Property name="Area" value="{{0.5,-200},{0.5,-100},{0.5,200},{0.5,39}}" />
+        <Property name="Area" value="{{0.5,-200},{0.5,-95},{0.5,200},{0.5,95}}" />
         <Property name="Text" value="Do you really want to leave the underworld?" />
         <Property name="Alpha" value="0.8" />
         <Property name="AlwaysOnTop" value="True" />
+        <!-- Anchored to the client area's bottom edge so the dialog lays out
+             correctly whatever room the titlebar and frame take: buttons row,
+             then the replay checkbox underneath. -->
         <Window type="OD/Button" name="YesOption" >
-            <Property name="Area" value="{{0.3,-48},{0.6,-39},{0.3,44},{0.6,-1}}" />
+            <Property name="Area" value="{{0.3,-48},{1,-72},{0.3,44},{1,-34}}" />
             <Property name="Text" value="Yes" />
             <Property name="TooltipText" value="Confirm exit" />
             <Property name="InheritsAlpha" value="False" />
         </Window>
         <Window type="OD/Button" name="NoOption" >
-            <Property name="Area" value="{{0.7,-47},{0.6,-39},{0.7,45},{0.6,-1}}" />
+            <Property name="Area" value="{{0.7,-47},{1,-72},{0.7,45},{1,-34}}" />
             <Property name="Text" value="No" />
             <Property name="TooltipText" value="Cancel exit" />
             <Property name="InheritsAlpha" value="False" />
         </Window>
         <Window type="OD/Checkbox" name="SaveReplayCheckbox" >
-            <Property name="Area" value="{{0.5,-91},{0,96},{0.5,91},{0,123}}" />
+            <Property name="Area" value="{{0.5,-91},{1,-30},{0.5,91},{1,-3}}" />
             <Property name="Text" value="Save the game replay?" />
         </Window>
     </Window>

source/entities/Creature.cpp

@@ -1962,13 +1962,17 @@ void Creature::createStatsWindow()
 
     mStatsWindow = wmgr->createWindow("OD/FrameWindow", std::string("CreatureStatsWindows_") + getName());
     mStatsWindow->setPosition(CEGUI::UVector2(CEGUI::UDim(0.3, 0), CEGUI::UDim(0.3, 0)));
-    mStatsWindow->setSize(CEGUI::USize(CEGUI::UDim(0, 380), CEGUI::UDim(0, 400)));
+    mStatsWindow->setSize(CEGUI::USize(CEGUI::UDim(0, 380), CEGUI::UDim(0, 460)));
 
+    // The frame's client area already excludes the titlebar, so the text pane
+    // can use almost all of it; the scrollbar keeps the tail of the stats
+    // reachable when the text is still taller than the window.
     CEGUI::Window* textWindow = wmgr->createWindow("OD/StaticText", "TextDisplay");
-    textWindow->setPosition(CEGUI::UVector2(CEGUI::UDim(0.05, 0), CEGUI::UDim(0.1, 0)));
-    textWindow->setSize(CEGUI::USize(CEGUI::UDim(0.9, 0), CEGUI::UDim(0.85, 0)));
+    textWindow->setPosition(CEGUI::UVector2(CEGUI::UDim(0.05, 0), CEGUI::UDim(0.02, 0)));
+    textWindow->setSize(CEGUI::USize(CEGUI::UDim(0.9, 0), CEGUI::UDim(0.96, 0)));
     textWindow->setProperty("FrameEnabled", "False");
     textWindow->setProperty("BackgroundEnabled", "False");
+    textWindow->setProperty("VertScrollbar", "True");
 
     // We want to close the window when the cross is clicked
     mStatsWindow->subscribeEvent(CEGUI::FrameWindow::EventCloseClicked,

source/entities/Tile.cpp

@@ -2323,11 +2323,15 @@ void Tile::createStatsWindow()
     mStatsWindow->setPosition(CEGUI::UVector2(CEGUI::UDim(0.3, 0), CEGUI::UDim(0.3, 0)));
     mStatsWindow->setSize(CEGUI::USize(CEGUI::UDim(0, 380), CEGUI::UDim(0, 400)));
 
+    // The frame's client area already excludes the titlebar, so the text pane
+    // can use almost all of it; the scrollbar keeps the tail of the stats
+    // reachable when the text is still taller than the window.
     CEGUI::Window* textWindow = wmgr->createWindow("OD/StaticText", "TextDisplay");
-    textWindow->setPosition(CEGUI::UVector2(CEGUI::UDim(0.05, 0), CEGUI::UDim(0.1, 0)));
-    textWindow->setSize(CEGUI::USize(CEGUI::UDim(0.9, 0), CEGUI::UDim(0.85, 0)));
+    textWindow->setPosition(CEGUI::UVector2(CEGUI::UDim(0.05, 0), CEGUI::UDim(0.02, 0)));
+    textWindow->setSize(CEGUI::USize(CEGUI::UDim(0.9, 0), CEGUI::UDim(0.96, 0)));
     textWindow->setProperty("FrameEnabled", "False");
     textWindow->setProperty("BackgroundEnabled", "False");
+    textWindow->setProperty("VertScrollbar", "True");
 
     // We want to close the window when the cross is clicked
     mStatsWindow->subscribeEvent(CEGUI::FrameWindow::EventCloseClicked,

source/modes/InputManager.cpp

@@ -91,14 +91,13 @@ InputManager::InputManager(Ogre::RenderWindow* renderWindow):
     paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string(keyboardGrab ? "DISCL_EXCLUSIVE" : "DISCL_NONEXCLUSIVE")));
 #elif defined OIS_LINUX_PLATFORM
     paramList.insert(std::make_pair(std::string("x11_mouse_grab"), std::string(mouseGrab ? "true" : "false")));
-    // When grabbing, OIS tracks the pointer by accumulating relative motion and warps
-    // the real pointer back to the window centre near the edges. Leaving the system
-    // cursor visible then shows it drifting away from the one CEGUI draws, so hide it.
-    /* paramList.insert(std::make_pair(std::string("x11_mouse_hide"), std::string(mouseGrab ? "true" : "false")));
-     * FIXME: While I was debugging cursor issues I found that hiding actually hides the cursor,
-     * not showing the system one. It works somehow. Did not have much time to think about
-     * this yet. Need to return to it later.
-     */
+    // Always hide the X11 cursor over the window: CEGUI draws its own cursor,
+    // so a visible system cursor would show as a second pointer — and when
+    // grabbing, OIS additionally warps the real pointer back to the window
+    // centre, which makes the system cursor visibly drift away from CEGUI's.
+    // (OIS implements this by setting a blank cursor on the window, so if the
+    // CEGUI cursor ever fails to render there is no pointer at all — that is
+    // the trade-off being made here.)
     paramList.insert(std::make_pair(std::string("x11_mouse_hide"), std::string("true")));
     paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string(keyboardGrab ? "true" : "false")));
     paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));