From fdf9da706f1f7fd3df4b66042e207e5208862bdc Mon Sep 17 00:00:00 2001
From: nkorslund <nkorslund@ea6a568a-9f4f-0410-981a-c910a81bb256>
Date: Mon, 2 Feb 2009 13:07:38 +0000
Subject: [PATCH] More work on the GUI. Tried (and failed) to make the fonts
 work.

git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@85 ea6a568a-9f4f-0410-981a-c910a81bb256
---
 core/config.d                                 |   2 +
 fonts/fntfile.d                               | 146 ------------------
 {MyGUI_Media => media_mygui}/Comic.TTF        | Bin
 {MyGUI_Media => media_mygui}/black.png        | Bin
 {MyGUI_Media => media_mygui}/core.font        |   2 +-
 {MyGUI_Media => media_mygui}/core.lang        |   0
 {MyGUI_Media => media_mygui}/core.layer       |   0
 {MyGUI_Media => media_mygui}/core.png         | Bin
 {MyGUI_Media => media_mygui}/core.pointer     |   0
 {MyGUI_Media => media_mygui}/core.skin        |   0
 {MyGUI_Media => media_mygui}/core.xml         |   4 +-
 media_mygui/mwpointer.png                     | Bin 0 -> 4810 bytes
 media_mygui/openmw.font                       |  43 ++++++
 media_mygui/openmw.pointer                    |  13 ++
 media_mygui/openmw_button.skin                |  71 +++++++++
 .../openmw_windows.skin                       | 119 ++++++++++----
 mscripts/gameobjects/inventoryitem.mn         |   3 +
 ogre/bindings.d                               |   5 +
 ogre/cpp_interface.cpp                        |  77 ++++-----
 ogre/cpp_mygui.cpp                            |  29 ++--
 ogre/ogre.d                                   |   3 +
 21 files changed, 280 insertions(+), 237 deletions(-)
 delete mode 100644 fonts/fntfile.d
 rename {MyGUI_Media => media_mygui}/Comic.TTF (100%)
 rename {MyGUI_Media => media_mygui}/black.png (100%)
 rename {MyGUI_Media => media_mygui}/core.font (80%)
 rename {MyGUI_Media => media_mygui}/core.lang (100%)
 rename {MyGUI_Media => media_mygui}/core.layer (100%)
 rename {MyGUI_Media => media_mygui}/core.png (100%)
 rename {MyGUI_Media => media_mygui}/core.pointer (100%)
 rename {MyGUI_Media => media_mygui}/core.skin (100%)
 rename {MyGUI_Media => media_mygui}/core.xml (67%)
 create mode 100644 media_mygui/mwpointer.png
 create mode 100644 media_mygui/openmw.font
 create mode 100644 media_mygui/openmw.pointer
 create mode 100644 media_mygui/openmw_button.skin
 rename {MyGUI_Media => media_mygui}/openmw_windows.skin (68%)

diff --git a/core/config.d b/core/config.d
index 8c0f877e4..ae07e6100 100644
--- a/core/config.d
+++ b/core/config.d
@@ -90,6 +90,7 @@ struct ConfigManager
   char[] esmDir;
   char[] bsaDir;
   char[] sndDir;
+  char[] fontDir;
   char[] musDir; // Explore music
   char[] musDir2; // Battle music
 
@@ -266,6 +267,7 @@ struct ConfigManager
     bsaDir = dataDir;
     esmDir = dataDir;
     sndDir = dataDir ~ "Sound/";
+    fontDir = dataDir ~ "Fonts/";
     musDir = dataDir ~ "Music/Explore/";
     musDir2 = dataDir ~ "Music/Battle/";
 
diff --git a/fonts/fntfile.d b/fonts/fntfile.d
deleted file mode 100644
index 798095374..000000000
--- a/fonts/fntfile.d
+++ /dev/null
@@ -1,146 +0,0 @@
-
-/*
-  Font loader for the Morrowind .FNT/.TEX font file pair. The current
-  code has just been used for testing purposes and to decode the file
-  format. To make it work with MyGUI, we will have to cooperate with a
-  custom sub-class of the MyGUI::Font class in C++.
- */
-module fonts.fntfile;
-
-import std.stream;
-
-import monster.util.string;
-
-align(1)
-struct FntEntry
-{
-  // Positions, as fractions of the entire texture surface. The
-  // xstart2 etc values are just repeated information. The reason for
-  // this is that the characters are stored as four points, with an
-  // (x,y) coordinate each. Since all the rectangles are aligned with
-  // the image however, this is pretty redundant information.
-
-  float xstart, ystart;
-  float xend;
-  float ystart2, xstart2;
-  float yend;
-  float xend2, yend2;
-
-  float width;
-  float height;
-  int zero1;        // Empty heigth? (always zero)
-  float emptyWidth; // Width for empty characters
-  float unk2;       // Vertical displacement?
-  int zero2;        // Horizontal displacement?
-
-  bool isUsed() { return width != 0; }
-}
-static assert(FntEntry.sizeof == 56);
-
-align(1)
-struct FntFile
-{
-  float size;
-  int unk2, unk3;
-  char[128] texname;
-
-  ubyte[160] filler; // Makes the header exactly 300 bytes long
-
-  FntEntry[255] chars;
-}
-
-align(1)
-union Color
-{
-  ubyte[4] rgba;
-  uint val;
-}
-static assert(Color.sizeof == 4);
-
-// One character
-struct Char
-{
-  Color[][] pixels;
-  bool isUsed;
-  int width, height;
-  char chr;
-}
-
-FntFile fnt;
-Char[255] chars;
-
-// Load a fnt-file
-void loadFont(char[] fntFile)
-{
-  assert(iEnds(fntFile, ".fnt"),
-         "loadFont() can only load .fnt files");
-
-  File s = new File(fntFile);
-  s.readExact(&fnt, fnt.sizeof);
-  s.close();
-
-  // Load the .tex file
-  int texWidth, texHeight;
-  char[] tfile = stripz(fnt.texname)~".tex";
-  // DIRTY hack since we can't do case-insensitive file searching yet
-  if(tfile[0] == 'D') tfile[0] = 'd';
-  s.open(tfile);
-  s.read(texWidth);
-  s.read(texHeight);
-  assert(s.size() == 4*(texWidth*texHeight + 2));
-
-  ubyte[] buf;
-  buf.length = s.size - s.position;
-  s.readExact(buf.ptr, buf.length);
-  delete s;
-
-  // Get the pixel buffer as a series of ints
-  uint[] pixelBuf = cast(uint[]) buf;
-
-  foreach(i, ch; fnt.chars)
-    with(chars[i])
-    {
-      // Store the char, if it is printable
-      if(i > 33 && i < 127)
-        chr = i;
-      else chr = ' ';
-
-      // Store the pixel dimensions
-      isUsed = ch.isUsed;
-      height = cast(int)ch.height;
-      if(isUsed)
-        width = cast(int)ch.width;
-      else
-        width = cast(int)ch.emptyWidth;
-
-      assert(ch.emptyWidth == 0 || ch.emptyWidth == -1 || !isUsed);
-      assert(ch.zero1 == 0);
-      assert(ch.zero2 == 0);
-      assert(ch.xstart2 == ch.xstart);
-      assert(ch.ystart2 == ch.ystart);
-      assert(ch.xend2 == ch.xend);
-      assert(ch.yend2 == ch.yend);
-
-      // If the character is not present, skip to the next one now.
-      if(!isUsed) continue;
-
-      // Get the pixel coordinates of this character
-      int startX = cast(int) (ch.xstart * texWidth);
-      int startY = cast(int) (ch.ystart * texHeight);
-      int endX = cast(int) (ch.xend * texWidth);
-      int endY = cast(int) (ch.yend * texHeight);
-
-      assert(endX-startX == width);
-      assert(endY-startY == height);
-
-      // Set up the pixel array
-      pixels.length = height;
-      foreach(line, ref slice; pixels)
-        {
-          // First pixel in the line
-          int strt = texWidth*(startY+line) + startX;
-          // Get a slice of the pixel data
-          slice = cast(Color[])pixelBuf[strt..strt+width];
-        }
-    }
-}
diff --git a/MyGUI_Media/Comic.TTF b/media_mygui/Comic.TTF
similarity index 100%
rename from MyGUI_Media/Comic.TTF
rename to media_mygui/Comic.TTF
diff --git a/MyGUI_Media/black.png b/media_mygui/black.png
similarity index 100%
rename from MyGUI_Media/black.png
rename to media_mygui/black.png
diff --git a/MyGUI_Media/core.font b/media_mygui/core.font
similarity index 80%
rename from MyGUI_Media/core.font
rename to media_mygui/core.font
index 36da17b0a..3ff0c3be6 100644
--- a/MyGUI_Media/core.font
+++ b/media_mygui/core.font
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Font">
-	<Font name="MyGUI_CoreFont.18" source="Comic.TTF" size="18" resolution="72" antialias_colour="false" space_width="a" tab_count="4" spacer="5">
+	<Font name="MyGUI_CoreFont.18" source="Comic.TTF" size="18" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5">
 		<Code range="33 126"/>
 		<Code range="1025 1105"/>
 		<Code range="8470 8470" help="№"/>
diff --git a/MyGUI_Media/core.lang b/media_mygui/core.lang
similarity index 100%
rename from MyGUI_Media/core.lang
rename to media_mygui/core.lang
diff --git a/MyGUI_Media/core.layer b/media_mygui/core.layer
similarity index 100%
rename from MyGUI_Media/core.layer
rename to media_mygui/core.layer
diff --git a/MyGUI_Media/core.png b/media_mygui/core.png
similarity index 100%
rename from MyGUI_Media/core.png
rename to media_mygui/core.png
diff --git a/MyGUI_Media/core.pointer b/media_mygui/core.pointer
similarity index 100%
rename from MyGUI_Media/core.pointer
rename to media_mygui/core.pointer
diff --git a/MyGUI_Media/core.skin b/media_mygui/core.skin
similarity index 100%
rename from MyGUI_Media/core.skin
rename to media_mygui/core.skin
diff --git a/MyGUI_Media/core.xml b/media_mygui/core.xml
similarity index 67%
rename from MyGUI_Media/core.xml
rename to media_mygui/core.xml
index ee4c539f5..f7439be0b 100644
--- a/MyGUI_Media/core.xml
+++ b/media_mygui/core.xml
@@ -7,10 +7,12 @@
 	    <List file="core.layer" group="General"/>
 	    <List file="core.skin" group="General"/>
 	    <List file="core.font" group="General"/>
-	    <List file="core.pointer" group="General"/>
 	    <List file="core.plugin"/>
 
+	    <List file="openmw.pointer" group="General"/>
             <List file="openmw_windows.skin" group="General"/>
+            <List file="openmw_button.skin" group="General"/>
+	    <List file="openmw.font" group="General"/>
     </MyGUI>
 
 </MyGUI>
diff --git a/media_mygui/mwpointer.png b/media_mygui/mwpointer.png
new file mode 100644
index 0000000000000000000000000000000000000000..90bc19b5e2c7ea4f30b895cc5b8cde00ce460e98
GIT binary patch
literal 4810
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

literal 0
HcmV?d00001

diff --git a/media_mygui/openmw.font b/media_mygui/openmw.font
new file mode 100644
index 000000000..9baccc7c5
--- /dev/null
+++ b/media_mygui/openmw.font
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Font">
+<!--
+	<Font name="gothic" source="gothic.ttf" size="18" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5">
+		<Code range="33 126"/>
+		<Code range="1025 1105"/>
+		<Code range="8470 8470" help="№"/>
+		<Code hide="128"/>
+		<Code hide="1026 1039"/>
+		<Code hide="1104"/>
+	</Font>
+
+	<Font name="daedric" source="daedric.ttf" size="18" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5">
+		<Code range="33 98"/>
+		<Code hide="128"/>
+		<Code hide="1026 1039"/>
+		<Code hide="1104"/>
+	</Font>
+
+        <Font name="cards" default_height="17" source="magiccards.ttf" size="18" resolution="50" antialias_colour="false" space_width="4" tab_width="8" cursor_width="2" distance="5" offset_height="0">
+                <Code range="33 98"/>
+        </Font>
+
+	<Font name="dorcla" source="dorcla.ttf" size="20" resolution="72" antialias_colour="false" space_width="5" tab_count="4" spacer="5">
+		<Code range="33 126"/>
+		<Code range="1025 1105"/>
+		<Code range="8470 8470" help="№"/>
+		<Code hide="128"/>
+		<Code hide="1026 1039"/>
+		<Code hide="1104"/>
+	</Font>
+
+	<Font name="perrygot" source="perrygot.ttf" size="16" resolution="72" antialias_colour="false" space_width="4" tab_count="4" spacer="5">
+		<Code range="33 126"/>
+		<Code range="1025 1105"/>
+		<Code range="8470 8470" help="№"/>
+		<Code hide="128"/>
+		<Code hide="1026 1039"/>
+		<Code hide="1104"/>
+	</Font>
+-->
+</MyGUI>
diff --git a/media_mygui/openmw.pointer b/media_mygui/openmw.pointer
new file mode 100644
index 000000000..0d77c878d
--- /dev/null
+++ b/media_mygui/openmw.pointer
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Pointer">
+
+    <Pointer layer="Pointer" texture="mwpointer.png" default="arrow">
+        <Info name="arrow" point="7 0" size="32 32" offset="0 0 32 32"/>
+        <Info name="hresize" point="16 14" size="32 32" offset="32 0 32 32"/>
+        <Info name="vresize" point="17 16" size="32 32" offset="0 32 32 32"/>
+        <Info name="dresize" point="17 15" size="32 32" offset="32 32 32 32"/>
+        <Info name="dresize2" point="15 15" size="32 32" offset="64 32 32 32"/>
+    </Pointer>
+
+</MyGUI>
diff --git a/media_mygui/openmw_button.skin b/media_mygui/openmw_button.skin
new file mode 100644
index 000000000..036202485
--- /dev/null
+++ b/media_mygui/openmw_button.skin
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Skin">
+    <!-- Button graphics -->
+    <Skin name="BTN_Top" size="128 4" texture="menu_button_frame_top.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 128 4">
+            <State name="normal" offset = "0 0 128 4"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="BTN_Bottom" size="128 4" texture="menu_button_frame_bottom.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 128 4">
+            <State name="normal" offset = "0 0 128 4"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="BTN_Left" size="4 16" texture="menu_button_frame_left.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 4 16">
+            <State name="normal" offset = "0 0 4 16"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="BTN_Right" size="4 16" texture="menu_button_frame_right.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 4 16">
+            <State name="normal" offset = "0 0 4 16"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="BTN_TopLeft" size="4 4" texture="menu_button_frame_top_left_corner.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 4 4">
+            <State name="normal" offset = "0 0 4 4"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="BTN_TopRight" size="4 4" texture="menu_button_frame_top_right_corner.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 4 4">
+            <State name="normal" offset = "0 0 4 4"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="BTN_BottomLeft" size="4 4" texture="menu_button_frame_bottom_left_corner.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 4 4">
+            <State name="normal" offset = "0 0 4 4"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="BTN_BottomRight" size="4 4" texture="menu_button_frame_bottom_right_corner.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 4 4">
+            <State name="normal" offset = "0 0 4 4"/>
+        </BasisSkin>
+    </Skin>
+
+    <!-- Button widget -->
+    <Skin name="MW_Button" size="136 24">
+        <Property key="FontName" value = "MyGUI_CoreFont.18" />
+        <!--Property key="FontName" value = "cards" /-->
+        <Property key="FontHeight" value = "18" />
+        <Property key="AlignText" value = "ALIGN_CENTER" />
+        <Property key="Colour" value = "0.6 0.6 0.6" />
+
+        <Child type="Widget" skin="BTN_Left" offset="0 4 4 16" align="ALIGN_VSTRETCH ALIGN_LEFT"/>
+        <Child type="Widget" skin="BTN_Right" offset="132 4 4 16" align="ALIGN_VSTRETCH ALIGN_RIGHT"/>
+        <Child type="Widget" skin="BTN_Top" offset="4 0 128 4" align="ALIGN_HSTRETCH ALIGN_TOP"/>
+        <Child type="Widget" skin="BTN_Bottom" offset="4 20 128 4" align="ALIGN_HSTRETCH ALIGN_BOTTOM"/>
+        <Child type="Widget" skin="BTN_TopLeft" offset="0 0 4 4" align="ALIGN_TOP ALIGN_LEFT"/>
+        <Child type="Widget" skin="BTN_TopRight" offset="132 0 4 4" align="ALIGN_TOP ALIGN_RIGHT"/>
+        <Child type="Widget" skin="BTN_BottomLeft" offset="0 20 4 4" align="ALIGN_BOTTOM ALIGN_LEFT"/>
+        <Child type="Widget" skin="BTN_BottomRight" offset="132 20 4 4" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
+
+        <BasisSkin type="SimpleText" offset = "4 4 128 16" align = "ALIGN_STRETCH">
+            <!--State name="disable" colour="0.87 0.87 0.87"/-->
+            <!--State name="normal" colour="0 0 0"/-->
+            <State name="active" colour="FF0000"/>
+            <State name="pressed" colour="0000FF"/>
+            <State name="select" colour="00FF00"/>
+        </BasisSkin>
+   </Skin>
+</MyGUI>
diff --git a/MyGUI_Media/openmw_windows.skin b/media_mygui/openmw_windows.skin
similarity index 68%
rename from MyGUI_Media/openmw_windows.skin
rename to media_mygui/openmw_windows.skin
index 769f428f1..10ea2bec9 100644
--- a/MyGUI_Media/openmw_windows.skin
+++ b/media_mygui/openmw_windows.skin
@@ -10,28 +10,28 @@
 
     <!-- These define the window borders -->
     <Skin name="TB_B" size="512 4" texture="menu_thick_border_bottom.dds">
-        <Property key="Pointer" value = "size_left" />
+        <Property key="Pointer" value = "vresize" />
         <BasisSkin type="MainSkin" offset = "0 0 512 4">
             <State name="normal" offset = "0 0 512 4"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_R" size="4 512" texture="menu_thick_border_right.dds">
-        <Property key="Pointer" value = "size_left" />
+        <Property key="Pointer" value = "hresize" />
         <BasisSkin type="MainSkin" offset = "0 0 4 512">
             <State name="normal" offset = "0 0 4 512"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_T" size="512 4" texture="menu_thick_border_top.dds">
-        <Property key="Pointer" value = "size_left" />
+        <Property key="Pointer" value = "vresize" />
         <BasisSkin type="MainSkin" offset = "0 0 512 4">
             <State name="normal" offset = "0 0 512 4"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_L" size="4 512" texture="menu_thick_border_left.dds">
-        <Property key="Pointer" value = "size_left" />
+        <Property key="Pointer" value = "hresize" />
         <BasisSkin type="MainSkin" offset = "0 0 4 512">
             <State name="normal" offset = "0 0 4 512"/>
         </BasisSkin>
@@ -39,30 +39,73 @@
 
     <!-- Window border corners -->
     <Skin name="TB_BR" size="4 4" texture="menu_thick_border_bottom_right_corner.dds">
-        <Property key="Pointer" value = "size_left" />
+        <Property key="Pointer" value = "dresize" />
         <BasisSkin type="MainSkin" offset = "0 0 4 4">
             <State name="normal" offset = "0 0 4 4"/>
         </BasisSkin>
     </Skin>
     <Skin name="TB_BL" size="4 4" texture="menu_thick_border_bottom_left_corner.dds">
-        <Property key="Pointer" value = "size_left" />
+        <Property key="Pointer" value = "dresize2" />
         <BasisSkin type="MainSkin" offset = "0 0 4 4">
             <State name="normal" offset = "0 0 4 4"/>
         </BasisSkin>
     </Skin>
     <Skin name="TB_TR" size="4 4" texture="menu_thick_border_top_right_corner.dds">
-        <Property key="Pointer" value = "size_left" />
+        <Property key="Pointer" value = "dresize2" />
         <BasisSkin type="MainSkin" offset = "0 0 4 4">
             <State name="normal" offset = "0 0 4 4"/>
         </BasisSkin>
     </Skin>
     <Skin name="TB_TL" size="4 4" texture="menu_thick_border_top_left_corner.dds">
-        <Property key="Pointer" value = "size_left" />
+        <Property key="Pointer" value = "dresize" />
         <BasisSkin type="MainSkin" offset = "0 0 4 4">
             <State name="normal" offset = "0 0 4 4"/>
         </BasisSkin>
     </Skin>
 
+    <!-- Inner borders -->
+
+    <Skin name="IB_T" size="512 2" texture="menu_thin_border_top.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 512 2">
+            <State name="normal" offset = "0 0 512 2"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="IB_B" size="512 2" texture="menu_thin_border_bottom.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 512 2">
+            <State name="normal" offset = "0 0 512 2"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="IB_L" size="2 512" texture="menu_thin_border_left.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 2 512">
+            <State name="normal" offset = "0 0 2 512"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="IB_R" size="2 512" texture="menu_thin_border_right.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 2 512">
+            <State name="normal" offset = "0 0 2 512"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="IB_TL" size="2 2" texture="menu_thin_border_top_left_corner.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 2 2">
+            <State name="normal" offset = "0 0 2 2"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="IB_TR" size="2 2" texture="menu_thin_border_top_right_corner.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 2 2">
+            <State name="normal" offset = "0 0 2 2"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="IB_BL" size="2 2" texture="menu_thin_border_bottom_left_corner.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 2 2">
+            <State name="normal" offset = "0 0 2 2"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="IB_BR" size="2 2" texture="menu_thin_border_bottom_right_corner.dds">
+        <BasisSkin type="MainSkin" offset = "0 0 2 2">
+            <State name="normal" offset = "0 0 2 2"/>
+        </BasisSkin>
+    </Skin>
+
     <!-- These parts defines the 'blocks' to the left and right of the caption -->
     <Skin name="HB_MID" size="256 16" texture="menu_head_block_middle.dds">
         <BasisSkin type="MainSkin" offset = "0 0 256 16">
@@ -116,20 +159,24 @@
     </Skin>
 
     <Skin name="HB_ALL" size="260 20">
-        <Child type="Widget" skin="HB_MID" offset="2 2 256 16" align="ALIGN_TOP ALIGN_HSTRETCH"></Child>
-        <Child type="Widget" skin="HB_TOP" offset="2 0 256 2" align="ALIGN_TOP ALIGN_HSTRETCH"></Child>
-        <Child type="Widget" skin="HB_BOTTOM" offset="2 18 256 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH"></Child>
-        <Child type="Widget" skin="HB_LEFT" offset="0 2 2 16" align="ALIGN_TOP ALIGN_LEFT"></Child>
-        <Child type="Widget" skin="HB_RIGHT" offset="258 2 2 16" align="ALIGN_TOP ALIGN_RIGHT"></Child>
-        <Child type="Widget" skin="HB_TR" offset="258 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"></Child>
-        <Child type="Widget" skin="HB_TL" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"></Child>
-        <Child type="Widget" skin="HB_BR" offset="258 18 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"></Child>
-        <Child type="Widget" skin="HB_BL" offset="0 18 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"></Child>
+        <Child type="Widget" skin="HB_MID" offset="2 2 256 16" align="ALIGN_TOP ALIGN_HSTRETCH"/>
+        <Child type="Widget" skin="HB_TOP" offset="2 0 256 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
+        <Child type="Widget" skin="HB_BOTTOM" offset="2 18 256 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH"/>
+        <Child type="Widget" skin="HB_LEFT" offset="0 2 2 16" align="ALIGN_TOP ALIGN_LEFT"/>
+        <Child type="Widget" skin="HB_RIGHT" offset="258 2 2 16" align="ALIGN_TOP ALIGN_RIGHT"/>
+        <Child type="Widget" skin="HB_TR" offset="258 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"/>
+        <Child type="Widget" skin="HB_TL" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"/>
+        <Child type="Widget" skin="HB_BR" offset="258 18 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
+        <Child type="Widget" skin="HB_BL" offset="0 18 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"/>
     </Skin>
 
-    <!-- The actual caption. It contains the edges of each of the blocks on
+    <!-- The actual caption. It contains the edges of the blocks on
          its sides as well -->
     <Skin name = "MW_Caption" size = "88 20" texture = "black.png" >
+        <!--
+        <Property key="FontName" value = "dorcla" />
+        <Property key="FontHeight" value = "20" />
+        -->
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_CENTER" />
@@ -141,22 +188,28 @@
         <BasisSkin type="SimpleText" offset = "2 0 84 20" align = "ALIGN_STRETCH"/>
 
         <!-- Add the borders of the surrounding blocks -->
-        <Child type="Widget" skin="HB_LEFT" offset="86 2 2 16" align="ALIGN_TOP ALIGN_RIGHT"></Child>
-        <Child type="Widget" skin="HB_RIGHT" offset="0 2 2 16" align="ALIGN_TOP ALIGN_LEFT"></Child>
-        <Child type="Widget" skin="HB_TR" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"></Child>
-        <Child type="Widget" skin="HB_TL" offset="86 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"></Child>
-        <Child type="Widget" skin="HB_BR" offset="0 18 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"></Child>
-        <Child type="Widget" skin="HB_BL" offset="86 18 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"></Child>
+        <Child type="Widget" skin="HB_LEFT" offset="86 2 2 16" align="ALIGN_TOP ALIGN_RIGHT"/>
+        <Child type="Widget" skin="HB_RIGHT" offset="0 2 2 16" align="ALIGN_TOP ALIGN_LEFT"/>
+        <Child type="Widget" skin="HB_TR" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"/>
+        <Child type="Widget" skin="HB_TL" offset="86 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"/>
+        <Child type="Widget" skin="HB_BR" offset="0 18 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"/>
+        <Child type="Widget" skin="HB_BL" offset="86 18 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
     </Skin>
 
+<!-- ----------------------------------------------------
+
+                 WINDOW DEFINITION
+
+------------------------------------------------------ -->
+
     <Skin name = "MW_Window" size = "256 54">
         <Property key="FontName" value = "MyGUI_CoreFont.18" />
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_CENTER" />
-        <Property key="Colour" value = "0 0 0" />
+        <Property key="Colour" value = "0.8 0.8 0.8" />
         <Property key="ToStick" value = "true" />
 
-        <Child type="Widget" skin="MW_WindowBG" offset = "4 24 248 26" align = "ALIGN_STRETCH" name = "Client">
+        <Child type="Widget" skin="MW_WindowBG" offset = "6 26 244 22" align = "ALIGN_STRETCH" name = "Client">
         </Child>
 
         <!-- Outer orders -->
@@ -187,6 +240,14 @@
         </Child>
 
         <!-- Inner borders -->
+        <Child type="Widget" skin="IB_T" offset="6 24 244 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
+        <Child type="Widget" skin="IB_B" offset="6 48 244 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH"/>
+        <Child type="Widget" skin="IB_L" offset="4 26 2 22" align="ALIGN_LEFT ALIGN_VSTRETCH"/>
+        <Child type="Widget" skin="IB_R" offset="250 26 2 22" align="ALIGN_RIGHT ALIGN_VSTRETCH"/>
+        <Child type="Widget" skin="IB_TL" offset="4 24 2 2" align="ALIGN_TOP ALIGN_LEFT"/>
+        <Child type="Widget" skin="IB_TR" offset="250 24 2 2" align="ALIGN_TOP ALIGN_RIGHT"/>
+        <Child type="Widget" skin="IB_BL" offset="4 48 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"/>
+        <Child type="Widget" skin="IB_BR" offset="250 48 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
 
         <!-- Caption -->
         <Child type="Widget" skin="HB_ALL" offset="4 4 248 20" align = "ALIGN_TOP ALIGN_HSTRETCH">
@@ -202,13 +263,9 @@
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
 
-        
 
 
-        <!--
-        <Child type="Button" skin="WindowCaption" offset = "5 50 10 30" align = "ALIGN_HSTRETCH ALIGN_TOP" name = "Caption">
-            <Property key="Scale" value = "1 1 0 0"/>
-        </Child>
+        <!-- Leftover code - remove later
         <Child type="Button" skin="WindowX" offset = "20 80 24 30" align = "ALIGN_LEFT ALIGN_TOP" name = "Button">
             <Property key="Event" value = "close"/>
         </Child>
diff --git a/mscripts/gameobjects/inventoryitem.mn b/mscripts/gameobjects/inventoryitem.mn
index 728f49c16..045f227f8 100644
--- a/mscripts/gameobjects/inventoryitem.mn
+++ b/mscripts/gameobjects/inventoryitem.mn
@@ -26,3 +26,6 @@ class InventoryItem : GameObject;
 float weight;
 int value;
 
+// Reference to current container. Player / NPC inventories are also
+// containers. Not used yet.
+Container holder;
diff --git a/ogre/bindings.d b/ogre/bindings.d
index bcc711253..64c378af9 100644
--- a/ogre/bindings.d
+++ b/ogre/bindings.d
@@ -160,5 +160,10 @@ void ogre_getCameraPos(float *x, float *y, float *z);
 void ogre_getCameraOrientation(float *fx, float *fy, float *fz, float *ux, float *uy, float *uz);
 void ogre_moveCameraRel(float x, float y, float z);
 
+// Insert a raw RGBA image into the texture system.
+//void ogre_insertTexture(char *name, int width, int height, void *data);
+
+void gui_setupGUI();
+
 // Test
 void gui_setFpsText(char *str);
diff --git a/ogre/cpp_interface.cpp b/ogre/cpp_interface.cpp
index 72a6506b3..1c80810fa 100644
--- a/ogre/cpp_interface.cpp
+++ b/ogre/cpp_interface.cpp
@@ -203,9 +203,6 @@ extern "C" void ogre_makeScene()
   g_light->setDiffuseColour(1,0.7,0.3);
   g_light->setAttenuation(2000, 0, 0.008, 0);
   */
-
-  // Finally, set up the GUI
-  setupGUI();
 }
 
 /*
@@ -694,6 +691,35 @@ extern "C" SceneNode* ogre_createNode(
 
 /* Code currently not in use
 
+// Insert a raw RGBA image into the texture system.
+extern "C" void ogre_insertTexture(char* name, uint32_t width, uint32_t height, void *data)
+{
+  TexturePtr texture = TextureManager::getSingleton().createManual(
+      name, 		// name
+      "General",	// group
+      TEX_TYPE_2D,     	// type
+      width, height,    // width & height
+      0,                // number of mipmaps
+      PF_BYTE_RGBA,     // pixel format
+      TU_DEFAULT);      // usage; should be TU_DYNAMIC_WRITE_ONLY_DISCARDABLE for
+                        // textures updated very often (e.g. each frame)
+
+  // Get the pixel buffer
+  HardwarePixelBufferSharedPtr pixelBuffer = texture->getBuffer();
+
+  // Lock the pixel buffer and get a pixel box
+  pixelBuffer->lock(HardwareBuffer::HBL_NORMAL); // for best performance use HBL_DISCARD!
+  const PixelBox& pixelBox = pixelBuffer->getCurrentLock();
+
+  void *dest = pixelBox.data;
+
+  // Copy the data
+  memcpy(dest, data, width*height*4);
+
+  // Unlock the pixel buffer
+  pixelBuffer->unlock();
+}
+
 // We need this later for animated meshes.
 extern "C" void* ogre_setupSkeleton(char* name)
 {
@@ -708,51 +734,6 @@ extern "C" void* ogre_setupSkeleton(char* name)
   return (void*)skel->createBone();  
 }
 
-// Use this later when loading textures directly from NIF files
-extern "C" void ogre_createTexture(char* name, uint32_t width, uint32_t height)
-{
-  TexturePtr texture = TextureManager::getSingleton().createManual(
-      name, 		// name
-      "ManualTexture",	// group
-      TEX_TYPE_2D,     	// type
-      width, hight,     // width & height
-      0,                // number of mipmaps
-      PF_BYTE_BGRA,     // pixel format
-      TU_DEFAULT);      // usage; should be TU_DYNAMIC_WRITE_ONLY_DISCARDABLE for
-                        // textures updated very often (e.g. each frame)
-
-  // Get the pixel buffer
-  HardwarePixelBufferSharedPtr pixelBuffer = texture->getBuffer();
-
-  // Lock the pixel buffer and get a pixel box
-  pixelBuffer->lock(HardwareBuffer::HBL_NORMAL); // for best performance use HBL_DISCARD!
-  const PixelBox& pixelBox = pixelBuffer->getCurrentLock();
-
-  uint8* pDest = static_cast<uint8*>(pixelBox.data);
-
-  // Fill in some pixel data. This will give a semi-transparent blue,
-  // but this is of course dependent on the chosen pixel format.
-  for (size_t j = 0; j < 256; j++)
-    for(size_t i = 0; i < 256; i++)
-      {
-        *pDest++ = 255; // B
-        *pDest++ =   0; // G
-        *pDest++ =   0; // R
-        *pDest++ = 127; // A
-      }
-
-  // Unlock the pixel buffer
-  pixelBuffer->unlock();
-
-  // Create a material using the texture
-  MaterialPtr material = MaterialManager::getSingleton().create(
-	"DynamicTextureMaterial", // name
-	ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-
-  material->getTechnique(0)->getPass(0)->createTextureUnitState("DynamicTexture");
-  material->getTechnique(0)->getPass(0)->setSceneBlending(SBT_TRANSPARENT_ALPHA);
-}
-
 extern "C" void *ogre_insertBone(char* name, void* rootBone, int32_t index)
 {
   return (void*) ( ((Bone*)rootBone)->createChild(index) );
diff --git a/ogre/cpp_mygui.cpp b/ogre/cpp_mygui.cpp
index 74292cda4..f78a26d6f 100644
--- a/ogre/cpp_mygui.cpp
+++ b/ogre/cpp_mygui.cpp
@@ -19,10 +19,10 @@ void turnGuiOff(MyGUI::WidgetPtr sender)
     }
 }
 
-void setupGUI()
+extern "C" void gui_setupGUI()
 {
   ResourceGroupManager::getSingleton().
-    addResourceLocation("MyGUI_Media", "FileSystem", "General");
+    addResourceLocation("media_mygui", "FileSystem", "General");
 
   mGUI = new MyGUI::Gui();
   mGUI->initialise(mWindow);
@@ -40,11 +40,12 @@ void setupGUI()
      MyGUI::ALIGN_RIGHT | MyGUI::ALIGN_TOP,
      "Statistic");
   FPSText->setTextAlign(MyGUI::ALIGN_RIGHT);
-  FPSText->setColour(Ogre::ColourValue::White);
   FPSText->setNeedMouseFocus(false);
 
-  // TESTING WINDOW WITH BUTTON
   guiMode = 1;
+  MyGUI::WidgetPtr tmp;
+  /*
+  // TESTING WINDOW WITH BUTTON
   width = 300;
   height = 200;
   window = mGUI->createWidget<MyGUI::Window>
@@ -52,36 +53,45 @@ void setupGUI()
      (mWidth-width)/4, (mHeight-height)/4, // Position
      width, height, // Size
      MyGUI::ALIGN_DEFAULT, "Overlapped");
-  //window->setColour(Ogre::ColourValue::White);
   //window->setFontName("ManualFont");
   window->setCaption("GUI Demo");
-  window->setMinMax(180, 160, 1000, 1000);
   window->setAlpha(0.7);
 
   width = 150;
   height = 30;
-  MyGUI::WidgetPtr tmp;
   tmp = window->createWidget<MyGUI::Button>
     ("ButtonSmall",
      40, 100, // Position
      width, height, // Size
      MyGUI::ALIGN_LEFT | MyGUI::ALIGN_TOP,
-     "Main");
+     "QuitButton");
   tmp->setCaption("Press this button");
   tmp->eventMouseButtonClick = MyGUI::newDelegate(&turnGuiOff);
+  */
 
   // TESTING MORROWIND SKIN
   width = 300;
   height = 190;
   mwindow = mGUI->createWidget<MyGUI::Window>
     ("MW_Window",
-     mWidth-width-120, mHeight-height-160, // Position
+     (mWidth-width)/4, (mHeight-height)/4, // Position
      width, height, // Size
      MyGUI::ALIGN_DEFAULT, "Overlapped");
   mwindow->setCaption("Skin test");
   mwindow->setMinMax(100, 140, 1000, 1000);
   mwindow->setAlpha(1);
 
+  width = 45;
+  height = 24;
+  tmp = mwindow->createWidget<MyGUI::Button>
+    ("MW_Button",
+     10, 32, // Position
+     width, height, // Size
+     MyGUI::ALIGN_LEFT | MyGUI::ALIGN_TOP,
+     "MWButton1");
+  tmp->setCaption("Close");
+  tmp->eventMouseButtonClick = MyGUI::newDelegate(&turnGuiOff);
+
   // TESTING BITMAP FONT
   /*
   tmp = mGUI->createWidget<MyGUI::Widget>
@@ -91,7 +101,6 @@ void setupGUI()
      MyGUI::ALIGN_LEFT | MyGUI::ALIGN_BOTTOM,
      "Statistic");
   tmp->setTextAlign(MyGUI::ALIGN_LEFT);
-  tmp->setColour(Ogre::ColourValue::White);
   tmp->setFontName("ManualFont");
   tmp->setCaption("ABC");
   //*/
diff --git a/ogre/ogre.d b/ogre/ogre.d
index 14dcaf411..ce6b3225b 100644
--- a/ogre/ogre.d
+++ b/ogre/ogre.d
@@ -116,6 +116,9 @@ void setupOgre()
   // exterior cells differently, etc.
   ogre_makeScene();
 
+  // Load the GUI elements
+  gui_setupGUI();
+
   ogreSetup = true;
 }