Auto-start changes:

- Fix: program can't found Spammy.json - Fix: minimized state
FrostAtom · Sep 11, 2022 · 51e74e7 · 51e74e7
1 parent 043b31c
commit 51e74e7
Show file tree

Hide file tree

Showing 34 changed files with 13 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory( Exe )
+add_subdirectory( Spammy )
diff --git a/src/Exe/App.cpp → src/Spammy/App.cpp b/src/Exe/App.cpp → src/Spammy/App.cpp
@@ -2,12 +2,17 @@
 
 App* App::_self = NULL;
 
-App::App(int argc, wchar_t* argv[])
+App::App(int argc, char** argv)
 	: _isRunning(false), _enabled(false), _mainWindow(NULL), _autoStartEnabled(false),
 		_lastUpdate(0), _activeHwnd(NULL), _activeProfile(NULL), _editingProfile(NULL)
 {
 	_self = this;
 
+	wchar_t buf[MAX_PATH];
+	GetCurrentDirectoryW(std::size(buf), buf);
+	GetModuleFileNameW(NULL, buf, std::size(buf));
+	SetCurrentDirectoryW(std::filesystem::path(buf).parent_path().wstring().c_str());
+
 	if (!loadConfig()) {
 		int action = MessageBoxW(NULL, L"Can't load config, reset to defaults?", L"" APP_NAME, MB_ICONQUESTION | MB_OKCANCEL);
 		if (action != IDOK) return;
@@ -17,6 +22,9 @@ App::App(int argc, wchar_t* argv[])
 	_mainWindow = new MainWindow(L"" APP_NAME);
 	if (!_mainWindow->initialize()) return;
 
+	if (argc > 1 && strcmp(argv[1], "autolaunch") == 0)
+		_mainWindow->hide();
+
 	sKeyboard.atttach();
 	sKeyboard.onPress(std::bind_front(&App::onKeyPress, this));
 	sKeyboard.onRelease(std::bind_front(&App::onKeyRelease, this));
@@ -296,7 +304,7 @@ void App::onFocusChanged()
 		_activeProfile = findProfileByApp((const char*)path.filename().u8string().c_str());
 }
 
-auto main(int argc, wchar_t* argv[]) -> int
+int main(int argc, char** argv)
 {
 	std::unique_ptr<App> app(new App(argc, argv));
 	return app->run();

diff --git a/src/Exe/App.h → src/Spammy/App.h b/src/Exe/App.h → src/Spammy/App.h
@@ -25,7 +25,7 @@ class App {
     Profile* _activeProfile, *_editingProfile;
 
 public:
-    App(int argc, wchar_t* argv[]);
+    App(int argc, char** argv);
     ~App();
 
     static App& instance();
@@ -54,7 +54,6 @@ class App {
     void saveConfig();
 
     void onFocusChanged();
-    void onWindowUpdate();
     bool onKeyPress(UINT vkCode, bool repeat);
     bool onKeyRelease(UINT vkCode, bool repeat);
 };
diff --git a/src/Exe/CMakeLists.txt → src/Spammy/CMakeLists.txt b/src/Exe/CMakeLists.txt → src/Spammy/CMakeLists.txt
diff --git a/src/Exe/ImGui.cpp → src/Spammy/ImGui.cpp b/src/Exe/ImGui.cpp → src/Spammy/ImGui.cpp
diff --git a/src/Exe/ImGui.h → src/Spammy/ImGui.h b/src/Exe/ImGui.h → src/Spammy/ImGui.h
diff --git a/src/Exe/KeyboardLayout.h → src/Spammy/KeyboardLayout.h b/src/Exe/KeyboardLayout.h → src/Spammy/KeyboardLayout.h
diff --git a/src/Exe/MainWindow.cpp → src/Spammy/MainWindow.cpp b/src/Exe/MainWindow.cpp → src/Spammy/MainWindow.cpp
diff --git a/src/Exe/MainWindow.h → src/Spammy/MainWindow.h b/src/Exe/MainWindow.h → src/Spammy/MainWindow.h
diff --git a/src/Exe/Profile.h → src/Spammy/Profile.h b/src/Exe/Profile.h → src/Spammy/Profile.h
diff --git a/src/Exe/Utils.cpp → src/Spammy/Utils.cpp b/src/Exe/Utils.cpp → src/Spammy/Utils.cpp
diff --git a/src/Exe/Utils.h → src/Spammy/Utils.h b/src/Exe/Utils.h → src/Spammy/Utils.h
diff --git a/src/Exe/Win32/Keyboard.cpp → src/Spammy/Win32/Keyboard.cpp b/src/Exe/Win32/Keyboard.cpp → src/Spammy/Win32/Keyboard.cpp
diff --git a/src/Exe/Win32/Keyboard.h → src/Spammy/Win32/Keyboard.h b/src/Exe/Win32/Keyboard.h → src/Spammy/Win32/Keyboard.h
diff --git a/src/Exe/Win32/Mouse.cpp → src/Spammy/Win32/Mouse.cpp b/src/Exe/Win32/Mouse.cpp → src/Spammy/Win32/Mouse.cpp
diff --git a/src/Exe/Win32/Mouse.h → src/Spammy/Win32/Mouse.h b/src/Exe/Win32/Mouse.h → src/Spammy/Win32/Mouse.h
diff --git a/src/Exe/Win32/WinEvent.cpp → src/Spammy/Win32/WinEvent.cpp b/src/Exe/Win32/WinEvent.cpp → src/Spammy/Win32/WinEvent.cpp
diff --git a/src/Exe/Win32/WinEvent.h → src/Spammy/Win32/WinEvent.h b/src/Exe/Win32/WinEvent.h → src/Spammy/Win32/WinEvent.h
diff --git a/src/Exe/Window/Detail/ImFont_ComicSans.h → src/Spammy/Window/Detail/ImFont_ComicSans.h b/src/Exe/Window/Detail/ImFont_ComicSans.h → src/Spammy/Window/Detail/ImFont_ComicSans.h
diff --git a/src/Exe/Window/DropManager.cpp → src/Spammy/Window/DropManager.cpp b/src/Exe/Window/DropManager.cpp → src/Spammy/Window/DropManager.cpp
diff --git a/src/Exe/Window/DropManager.h → src/Spammy/Window/DropManager.h b/src/Exe/Window/DropManager.h → src/Spammy/Window/DropManager.h
diff --git a/src/Exe/Window/Renderer/D3d11.cpp → src/Spammy/Window/Renderer/D3d11.cpp b/src/Exe/Window/Renderer/D3d11.cpp → src/Spammy/Window/Renderer/D3d11.cpp
diff --git a/src/Exe/Window/Renderer/D3d11.h → src/Spammy/Window/Renderer/D3d11.h b/src/Exe/Window/Renderer/D3d11.h → src/Spammy/Window/Renderer/D3d11.h
diff --git a/src/Exe/Window/Renderer/D3d9.cpp → src/Spammy/Window/Renderer/D3d9.cpp b/src/Exe/Window/Renderer/D3d9.cpp → src/Spammy/Window/Renderer/D3d9.cpp
diff --git a/src/Exe/Window/Renderer/D3d9.h → src/Spammy/Window/Renderer/D3d9.h b/src/Exe/Window/Renderer/D3d9.h → src/Spammy/Window/Renderer/D3d9.h
diff --git a/src/Exe/Window/Renderer/Renderer.h → src/Spammy/Window/Renderer/Renderer.h b/src/Exe/Window/Renderer/Renderer.h → src/Spammy/Window/Renderer/Renderer.h
diff --git a/src/Exe/Window/TrayIcon.cpp → src/Spammy/Window/TrayIcon.cpp b/src/Exe/Window/TrayIcon.cpp → src/Spammy/Window/TrayIcon.cpp
diff --git a/src/Exe/Window/TrayIcon.h → src/Spammy/Window/TrayIcon.h b/src/Exe/Window/TrayIcon.h → src/Spammy/Window/TrayIcon.h
diff --git a/src/Exe/Window/Window.cpp → src/Spammy/Window/Window.cpp b/src/Exe/Window/Window.cpp → src/Spammy/Window/Window.cpp
@@ -188,7 +188,7 @@ bool Window::isNormalized()
 
 void Window::show()
 {
-	if (_hwnd) ShowWindow(_hwnd, SW_NORMAL);
+	if (_hwnd) ShowWindow(_hwnd, SW_SHOWNORMAL);
 }
 
 void Window::hide()

diff --git a/src/Exe/Window/Window.h → src/Spammy/Window/Window.h b/src/Exe/Window/Window.h → src/Spammy/Window/Window.h
diff --git a/src/Exe/resources/app.ico → src/Spammy/resources/app.ico b/src/Exe/resources/app.ico → src/Spammy/resources/app.ico
diff --git a/src/Exe/resources/resources.aps → src/Spammy/resources/resources.aps b/src/Exe/resources/resources.aps → src/Spammy/resources/resources.aps
diff --git a/src/Exe/resources/resources.h → src/Spammy/resources/resources.h b/src/Exe/resources/resources.h → src/Spammy/resources/resources.h
diff --git a/src/Exe/resources/resources.rc → src/Spammy/resources/resources.rc b/src/Exe/resources/resources.rc → src/Spammy/resources/resources.rc
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		add_subdirectory( Exe )
		add_subdirectory( Spammy )