Merge pull request #1 from 321Proteus/development

Feature: Update 1.1 - filenames, Unicode support & more

Author: 321Proteus

README.md

@@ -1,7 +1,7 @@
 # wmw-desktop
 What's My Window (WMW) is a simple C++ utility for detecting active application from the OS, designed to display activity in code editors in the Internet.
 
-WMW uses Windows API to get the foreground window and output its name and elapsed time using the following scheme:
+WMW uses Windows API to get the foreground window and output its name and elapsed time using (by default) the following scheme:
 ```
 MyAppName hh:mm:ss
 ```
@@ -20,18 +20,32 @@ WMW can be widely personalised to the user's needs by changing the values in `se
 
 `unsigned int interval` - the interval between two window requests in miliseconds (default: `1000`)
 
+`string format` - the format of the WMW output. 
+Available placeholders:
+ - `%name` - current application name
+ - `%time` - current application time
+ - `%pname` - current process name
+ - `%pid` - current process ID
+ - `%file` - current file name
+ - `%project` - current project name
+
+Default: `%name %time`
+
 `string windowStartup` - the text to display on application startup (used for future translation purposes)
 
 `codeEditors` - a list of key/value pairs of the applications' process names and the corresponding window titles\
 (Tip: process names can be obtained via the details tab of the Task Manager)
 
+`titleFormats` - a list of key/value pairs of the process names and the corresponding user-defined window title formats, used to detect file and project names.\
+(Tip: as formats may contain Unicode characters, detecting them by hand may be difficult. If you're experiencing problems with the title detection, use the debug funtion at lines 112-114 to read the title as integer values letter by letter)
+
 **Remember**: the settings are stored in the WMW binary and you have to rebuild it to apply the changes!
 
 # To Do
 
- - Add file name/project name detection for the code editors - the window title usually contains them
+ - ~~Add file name/project name detection for the code editors - the window title usually contains them~~
  - Improve the example project by making it refresh automatically every second
- - Add the ability to personalise the output structure in the config, e.g. adding the process name or the PID
+ - ~~Add the ability to personalise the output structure in the config, e.g. adding the process name or the PID~~
 
 Feel free to open a pull request if you develop a solution of one of these (new ideas are also welcome)!
 

example/main.js

@@ -2,7 +2,7 @@ const { spawn } = require("child_process");
 const express = require("express");
 
 const app = express()
-const wmw = spawn("test.exe", { stdio: "pipe" });
+const wmw = spawn("wmw_1.0-release.exe", { stdio: "pipe" });
 
 var text = "";
 

main.cpp

@@ -1,6 +1,10 @@
 #include <iostream>
 #include <string>
+#include <regex>
 #include <windows.h>
+#include <io.h>
+#include <fcntl.h>
+#include <locale>
 
 #include "settings.hpp"
 #include "processInfo.cpp"
@@ -9,26 +13,122 @@ using namespace std;
 
 activeWindowData previousData;
 
+void formatOutput(wstring& text, activeWindowData data) {
+
+    int idx = 0;
+
+    wstring time_w(data.time.begin(), data.time.end());
+    wstring name_w(data.name.begin(), data.name.end());
+    wstring pname_w(data.pname.begin(), data.pname.end());
+    string pidString = to_string(data.pid);
+    wstring pid_w(pidString.begin(), pidString.end());
+
+    while (text.find('%') != string::npos) {
+
+        idx = text.find('%', idx);
+
+        wstring temp = text.substr(idx, 4);
+
+        if      (temp == L"%pid")    text.replace(idx, 4, pid_w);
+        else if (temp == L"%nam")    text.replace(idx, 5, name_w);
+        else if (temp == L"%tim")    text.replace(idx, 5, time_w);
+        else if (temp == L"%pna")    text.replace(idx, 6, pname_w);
+        else if (temp == L"%fil")    text.replace(idx, 5, data.file);
+        else if (temp == L"%pro")    text.replace(idx, 8, data.project);
+        
+        else break;
+        
+    }
+
+
+}
+
+bool getWindowTitleData(wstring& title, wstring format, wstring& file, wstring& project) {
+
+    wstring regexString = format;
+    
+    regexString = regex_replace(regexString, wregex(L"%file"), L"(.*?)");
+    regexString = L"^" + regex_replace(regexString, wregex(L"%project"), L"(.*?)") + L"$"; 
+
+    //swcout << regexString << L" ";
+
+    wsmatch matches;
+
+    if (regex_search(title, matches, wregex(regexString))) {
+        
+        if (matches.size() == 3) {
+
+            if (format.find(L"%file") < format.find(L"%project")) {
+                file = matches[1].str();
+                project = matches[2].str();
+            } else {
+                file = matches[1].str();
+                project = matches[2].str();
+            }
+
+            return true;
+
+        } else if (matches.size() == 2) {
+
+            if (format.find(L"%file") != string::npos) {
+                file = matches[1].str();
+            } else if (format.find(L"%project") != string::npos) {
+                project = matches[1].str();
+            }
+
+            return true;
+        }
+    }
+    return false;
+
+}
+
 int main() {
-    // HWND hwnd = GetConsoleWindow();
-    // ShowWindow(hwnd, SW_HIDE);
 
+    _setmode(_fileno(stdout), 0x40000);
 
-    cout << windowStartup << endl;
+    HWND hwnd = GetConsoleWindow();
+    ShowWindow(hwnd, SW_HIDE);
 
 
+    cout << windowStartup << endl;
+
     while (true) {
 
+        // Open the active window
         HWND target = GetForegroundWindow();
 
         // Acquire the application name, time and PID
         activeWindowData data = fetchWindowInfo(target);
-        string fullData = data.name + " " + data.time;
+
+        // Get the window title
+        wchar_t titleBuffer[256]{};
+        int y = GetWindowTextW(target, titleBuffer, 256);       
+        wstring title(titleBuffer);
+
+
+        /* Debug function to print unicode title letter by letter.
+        Useful for finding title formats */
+        // for (auto el : title) {
+        //     cout << (int)el << ' ';
+        // }
+
+        wstring file, project;
+
+        // Read file and project information from the title using the corresponding format
+        getWindowTitleData(title, titleFormats[data.pname], file, project);
+
+        data.file = file;
+        data.project = project;
+        
+
+        // Print the found values to the template from settings.hpp
+        wstring a(format.begin(), format.end());
+        formatOutput(a, data);
 
         /* Check if the PID is not equal to the previously acquired PID
             so the output is only printed when the window changes */
-
-        if (data.name != "") cout << fullData << endl;
+        if (data.name != "") wcout << a << endl;// << file << " " << project << endl;
         previousData = data;
 
         Sleep(interval);

processInfo.cpp

@@ -74,6 +74,7 @@ activeWindowData fetchWindowInfo(HWND window) {
     info.pid = int(pid);
     info.name = appName;
     info.time = string(formattedTime);
+    info.pname = processName;
 
     return info;
 }

settings.hpp

@@ -13,17 +13,22 @@ namespace {
 
 
     // Translations
-    string windowStartup = "WMW v1.0 Started\n";
+    string windowStartup = "WMW v1.1 Started\n";
 
 
     /* A structure for the fetched windows' data.
-        Consists of the window name, PID and the calculated window time. */
+        Consists of the window name, process name, PID and the calculated window time. */
     struct activeWindowData {
         int pid;
         string name;
         string time;
+        string pname;
+        wstring file;
+        wstring project;
     };
 
+    string format = "%name %time";
+
 
     // A function to format the active window data to an array that could be used by the JS code
     string processInfo(activeWindowData data);
@@ -40,4 +45,13 @@ namespace {
         {"devenv.exe", "Visual Studio 2019"} // This one has a weird name
 
     };
+
+    /* This is the list of applications' window title formats.
+    Regex definitions are allowed. %file and %project are replaced by (.*?) */
+    map <string, wstring> titleFormats = {
+        {"idea64.exe", L"%project \u2013 %file"}, // this one doesn't work for some reason
+        {"Code.exe", L"%file - %project - Visual Studio Code"},
+        {"codeblocks.exe", L"%file \\[%project\\] - Code::Blocks 20.03"},
+        {"devenv.exe", L"%project - Microsoft Visual Studio"}
+    };
 }