From 4dcaf040e670809af60a8c915b0ff113e8dd4641 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 4 Aug 2017 20:21:13 +0400
Subject: [PATCH] A Russian journal index

---
 apps/openmw/mwgui/journalbooks.cpp     | 14 ++++++++------
 apps/openmw/mwgui/journalviewmodel.cpp | 24 +++++++++++++++++++++---
 apps/openmw/mwgui/journalviewmodel.hpp |  4 ++--
 apps/openmw/mwgui/journalwindow.cpp    |  4 ++--
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwgui/journalbooks.cpp b/apps/openmw/mwgui/journalbooks.cpp
index 5634eb080..19a2a9afe 100644
--- a/apps/openmw/mwgui/journalbooks.cpp
+++ b/apps/openmw/mwgui/journalbooks.cpp
@@ -224,20 +224,22 @@ book JournalBooks::createTopicIndexBook ()
 
     BookTypesetter::Style* body   = typesetter->createStyle ("", MyGUI::Colour::Black);
 
-    for (int i = 0; i < 26; ++i)
+    for (int i = 0; i < 32; ++i)
     {
-        char ch = 'A' + i;
-
         char buffer [32];
 
-        sprintf (buffer, "( %c )", ch);
+        sprintf(buffer, "( %c%c )", 0xd0, 0x90 + i); // CYRILLIC CAPITAL A is a 0xd090 in UTF-8
 
         const MWGui::TextColours& textColours = MWBase::Environment::get().getWindowManager()->getTextColours();
         BookTypesetter::Style* style = typesetter->createHotStyle (body, textColours.journalTopic,
                                                                    textColours.journalTopicOver,
-                                                                   textColours.journalTopicPressed, ch);
+                                                                   textColours.journalTopicPressed, i+1);
+
+        // Words can not be started with these characters
+        if (i == 26 || i == 28)
+            continue;
 
-        if (i == 13)
+        if (i == 15)
             typesetter->sectionBreak ();
 
         typesetter->write (style, to_utf8_span (buffer));
diff --git a/apps/openmw/mwgui/journalviewmodel.cpp b/apps/openmw/mwgui/journalviewmodel.cpp
index b5d08eec6..02103280b 100644
--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@@ -305,18 +305,36 @@ struct JournalViewModelImpl : JournalViewModel
         visitor (toUtf8Span (topic.getName()));
     }
 
-    void visitTopicNamesStartingWith (char character, std::function < void (const std::string&) > visitor) const
+    void visitTopicNamesStartingWith (int index, std::function < void (const std::string&) > visitor) const
     {
         MWBase::Journal * journal = MWBase::Environment::get().getJournal();
 
         for (MWBase::Journal::TTopicIter i = journal->topicBegin (); i != journal->topicEnd (); ++i)
         {
-            if (i->first [0] != Misc::StringUtils::toLower(character))
+            if (i->first.length() < 2)
+                continue;
+
+            unsigned char byte1 = i->first[0];
+            unsigned char byte2 = i->first[1];
+
+            // Upper case
+            if (byte1 == 0xd0 && byte2 >= 0xb0 && byte2 < 0xc0)
+                byte2 -= 32;
+
+            if (byte1 == 0xd1 && byte2 >= 0x80 && byte2 < 0x90)
+            {
+                byte1 -= 1;
+                byte2 += 32;
+            }
+
+            // CYRILLIC CAPITAL A is a 0xd090 in UTF-8
+            // so we can use 0xd08f + index
+            // (index is a position of letter in alphabet, begins from 1)
+            if (byte1 != 0xd0 || byte2 != 0x8f + index)
                 continue;
 
             visitor (i->second.getName());
         }
-
     }
 
     struct TopicEntryImpl : BaseEntry <MWDialogue::Topic::TEntryIter, TopicEntry>
diff --git a/apps/openmw/mwgui/journalviewmodel.hpp b/apps/openmw/mwgui/journalviewmodel.hpp
index 3edde3d31..88f8acd55 100644
--- a/apps/openmw/mwgui/journalviewmodel.hpp
+++ b/apps/openmw/mwgui/journalviewmodel.hpp
@@ -75,8 +75,8 @@ namespace MWGui
         /// provides the name of the topic specified by its id
         virtual void visitTopicName (TopicId topicId, std::function <void (Utf8Span)> visitor) const = 0;
 
-        /// walks over the topics whose names start with the specified character providing the topics name
-        virtual void visitTopicNamesStartingWith (char character, std::function < void (const std::string&) > visitor) const = 0;
+        /// walks over the topics whose names start with the character, specified by its index in the alphabet, providing the topics name
+        virtual void visitTopicNamesStartingWith (int index, std::function < void (const std::string&) > visitor) const = 0;
 
         /// walks over the topic entries for the topic specified by its identifier
         virtual void visitTopicEntries (TopicId topicId, std::function <void (TopicEntry const &)> visitor) const = 0;
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 105f95085..b4279e03d 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -431,7 +431,7 @@ namespace
             MWBase::Environment::get().getWindowManager()->playSound("book page");
         }
 
-        void notifyIndexLinkClicked (MWGui::TypesetBook::InteractiveId character)
+        void notifyIndexLinkClicked (MWGui::TypesetBook::InteractiveId index)
         {
             setVisible (LeftTopicIndex, false);
             setVisible (RightTopicIndex, false);
@@ -444,7 +444,7 @@ namespace
 
             AddNamesToList add(list);
 
-            mModel->visitTopicNamesStartingWith((char) character, add);
+            mModel->visitTopicNamesStartingWith(index, add);
 
             list->adjustSize();