From 1b96c5d2668cdde9f3c84caaa61d4b851bfe8960 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 4 Jan 2014 05:13:53 +0100
Subject: [PATCH] Console improvements: Show scrollbar, allow copying text from
 the history

---
 apps/openmw/mwgui/console.cpp           |  2 --
 apps/openmw/mwinput/inputmanagerimp.cpp |  3 +++
 files/mygui/openmw_console.layout       |  5 ++++-
 files/mygui/openmw_console.skin.xml     | 13 -------------
 files/mygui/openmw_font.xml             | 25 +------------------------
 5 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index b8d20709d..c15cc7b1d 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -119,8 +119,6 @@ namespace MWGui
 
         // Set up the log window
         mHistory->setOverflowToTheLeft(true);
-        mHistory->setEditStatic(true);
-        mHistory->setVisibleVScroll(true);
 
         // compiler
         Compiler::registerExtensions (mExtensions, mConsoleOnlyScripts);
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index da0a349d0..8f19fb02e 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -497,6 +497,9 @@ namespace MWInput
                         edit->deleteTextSelection();
                     }
                 }
+            }
+            if (edit && !edit->getEditStatic())
+            {
                 if (arg.keysym.sym == SDLK_c && (arg.keysym.mod & SDL_Keymod(KMOD_CTRL)))
                 {
                     std::string text = edit->getTextSelection();
diff --git a/files/mygui/openmw_console.layout b/files/mygui/openmw_console.layout
index 7d24a283e..0c9a97d04 100644
--- a/files/mygui/openmw_console.layout
+++ b/files/mygui/openmw_console.layout
@@ -7,9 +7,12 @@
     <Property key="Visible" value="false"/>
 
     <!-- Log window -->
-    <Widget type="EditBox" skin="MW_ConsoleLog" position="5 5 380 328" align="Stretch" name="list_History">
+    <Widget type="EditBox" skin="MW_TextBoxEdit" position="5 5 380 328" align="Stretch" name="list_History">
         <Property key="MultiLine" value="1"/>
         <Property key="ReadOnly" value="true"/>
+        <Property key="FontName" value="MonoFont"/>
+        <Property key="TextAlign" value="Left Top"/>
+        <Property key="TextColour" value="1 1 1"/>
     </Widget>
 
     <!-- Command line -->
diff --git a/files/mygui/openmw_console.skin.xml b/files/mygui/openmw_console.skin.xml
index 219cce39a..470451a0e 100644
--- a/files/mygui/openmw_console.skin.xml
+++ b/files/mygui/openmw_console.skin.xml
@@ -2,19 +2,6 @@
 
 <MyGUI type="Skin">
 
-    <!-- Console Output -->
-
-    <Skin name="MW_LogClient" size="10 10">
-        <Property key="FontName" value="MonoFont"/>
-        <Property key="TextAlign" value="Left Top"/>
-        <Property key="TextColour" value="1 1 1"/>
-        <BasisSkin type="EditText" offset="0 0 10 10" align="Stretch"/>
-    </Skin>
-
-    <Skin name="MW_ConsoleLog" size="0 0 50 50">
-        <Property key="WordWrap" value="true"/>
-        <Child type="TextBox" skin="MW_LogClient" offset="0 0 35 10" align="Stretch" name="Client"/>
-    </Skin>
 
     <!-- Console Input -->
 
diff --git a/files/mygui/openmw_font.xml b/files/mygui/openmw_font.xml
index 726bfb281..e4037561d 100644
--- a/files/mygui/openmw_font.xml
+++ b/files/mygui/openmw_font.xml
@@ -1,31 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Resource" version="1.1">
-    <Resource type="ResourceTrueTypeFont" name="EB Garamond">
-        <Property key="Source" value="EBGaramond-Regular.ttf"/>
-        <Property key="Size" value="16"/>
-        <Property key="Resolution" value="72"/>
-        <Property key="Antialias" value="false"/>
-        <Property key="TabWidth" value="8"/>
-        <Property key="OffsetHeight" value="0"/>
-        <Codes>
-            <Code range="33 126"/>
-            <Code range="160"/> <!-- Non-breaking space -->
-            <Code range="192 382"/> <!-- Central and Eastern European languages glyphs -->
-            <Code range="1025 1105"/>
-            <Code range="2026"/> <!-- Ellipsis -->
-            <Code range="8470"/>
-            <Code range="8211"/>   <!-- Minus -->
-            <Code range="8216 8217"/> <!-- Single quotes -->
-            <Code range="8220 8221"/> <!-- Right and Left Double Quotation mark -->
-            <Code hide="128"/>
-            <Code hide="1026 1039"/>
-            <Code hide="1104"/>
-        </Codes>
-    </Resource>
-
     <Resource type="ResourceTrueTypeFont" name="MonoFont">
         <Property key="Source" value="DejaVuLGCSansMono.ttf"/>
-        <Property key="Size" value="18"/>
+        <Property key="Size" value="17"/>
         <Property key="Resolution" value="50"/>
         <Property key="Antialias" value="false"/>
         <Property key="TabWidth" value="8"/>