Merge pull request #6 from idietmoran/dev

multi-threading

Author: Stateford

.gitignore

@@ -3,6 +3,8 @@
 /Release/
 /full release/
 
+/src/fflogs/
+
 
 *.vcxproj
 *.vcxproj.*

main.cpp

@@ -1,10 +1,14 @@
 #include "src/menu.h"
-
+#include <thread>
 
 int main()
 {
+
     Menu menu;
-    menu.start();
+    //menu.start();
+
+    std::thread t1([=, &menu] { menu.start(); });
+    t1.join();
 
     system("pause");
     return 0;

src/menu.cpp

@@ -1,5 +1,7 @@
 #include "menu.h"
 #include <iostream>
+#include <thread>
+
 
 // constructor
 Menu::Menu()
@@ -32,8 +34,23 @@ void Menu::displayAllies()
     std::cout << fflogs_->arch_->getFilteredAllies().size() << "\n";
 
 
-    //for(int i = 0; i < fflogs_->partyMembers_; i++)
-    for (int i = 0; i < fflogs_->arch_->getFilteredAllies().size(); i++)
+    /*
+     * if the size of filteredAllies_ is less than party members,
+     * display number of elements in filteredAllies_ instead of
+     * party members, or cause vector overflow
+     */
+    int numOfPartyMembers;
+
+    if(fflogs_->arch_->getFilteredAllies().size() < fflogs_->partyMembers_)
+    {
+        numOfPartyMembers = fflogs_->arch_->getFilteredAllies().size();
+    }
+    else
+    {
+        numOfPartyMembers = fflogs_->partyMembers_;
+    }
+
+    for (int i = 0; i < numOfPartyMembers; i++)
     {
         SetConsoleTextAttribute(hConsole_, 7);
         if (i == currentMenuSelection_)
@@ -61,21 +78,53 @@ void Menu::alliesMenu(DWORD &mode, INPUT_RECORD &event, HANDLE &hstdin)
     displayAllies();
     prevPartySize_ = fflogs_->partyMembers_;
 
+    
 
     while(true)
     {
         DWORD count;
 
-        fflogs_->arch_->updateNames(fflogs_->ffxiv_, fflogs_->partyMembers_);
+        //fflogs_->arch_->updateNames(fflogs_->ffxiv_, fflogs_->partyMembers_);
 
         if(prevPartySize_ != fflogs_->partyMembers_)
         {
             prevPartySize_ = fflogs_->partyMembers_;
             redraw();
         }
+        bool isConsoleWindowFocussed = (GetConsoleWindow() == GetForegroundWindow());
+        
+        if(GetAsyncKeyState(VK_ESCAPE) & 0x1 && isConsoleWindowFocussed)
+        {
+            exit(0);
+        }
 
+        if(GetAsyncKeyState(VK_UP) & 0x1 && isConsoleWindowFocussed)
+        {
+            if (currentMenuSelection_ > 0)
+            {
+                currentMenuSelection_--;
+                redraw();
+            }
+        }
+
+        if(GetAsyncKeyState(VK_DOWN) & 0x1 && isConsoleWindowFocussed)
+        {
+            if (currentMenuSelection_ < fflogs_->arch_->getFilteredAllies().size() - 1)
+            {
+                currentMenuSelection_++;
+                redraw();
+            }
+        }
 
-        if(WaitForSingleObject(hstdin, 0) == WAIT_OBJECT_0)
+        if(GetAsyncKeyState(VK_RETURN) & 0x1 && isConsoleWindowFocussed)
+        {
+            fflogs_->arch_->getFilteredAllies()[currentMenuSelection_]->openBrowser();
+        }
+        
+        Sleep(1);
+
+        /*
+        else if(WaitForSingleObject(hstdin, 0) == WAIT_OBJECT_0)
         {
             ReadConsoleInput(hstdin, &event, 1, &count);
             // on keydown
@@ -108,6 +157,7 @@ void Menu::alliesMenu(DWORD &mode, INPUT_RECORD &event, HANDLE &hstdin)
                 }
             }
         }
+        */
     }
 }
 
@@ -121,6 +171,18 @@ void Menu::start()
     GetConsoleMode(hstdin, &mode);
     SetConsoleMode(hstdin, 0);
 
-    alliesMenu(mode, event, hstdin);
 
-}
+    std::thread t1([=, &mode, &event, &hstdin] { alliesMenu(mode, event, hstdin); });
+
+    std::thread t2([=] { 
+        while (true)
+        {
+            fflogs_->arch_->updateNames(fflogs_->ffxiv_, fflogs_->partyMembers_);
+            Sleep(2);
+        } 
+    });
+
+    t1.join();
+    t2.join();
+    //alliesMenu(mode, event, hstdin);
+}