diff --git a/src/main.cpp b/src/main.cpp index 5afec7e..a9f2a67 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,7 +30,6 @@ int main(int argc, char** argv) { const int BARRET = barMainThread(); Debug::log(BARRET == 0 ? LOG : ERR, "Bar exited with code " + std::to_string(BARRET) + "!"); - g_pWindowManager->DebugOfstream.close(); return 0; } @@ -74,8 +73,6 @@ int main(int argc, char** argv) { xcb_disconnect(g_pWindowManager->DisplayConnection); - g_pWindowManager->DebugOfstream.close(); - if (const auto err = xcb_connection_has_error(g_pWindowManager->DisplayConnection); err != 0) { Debug::log(CRIT, "Exiting because of error " + std::to_string(err)); return err; diff --git a/src/utilities/Debug.cpp b/src/utilities/Debug.cpp index 5635333..6dfd8c5 100644 --- a/src/utilities/Debug.cpp +++ b/src/utilities/Debug.cpp @@ -27,5 +27,9 @@ void Debug::log(LogLevel level, std::string msg) { printf((msg + "\n").c_str()); // also log to a file - g_pWindowManager->DebugOfstream << msg << "\n"; + const std::string DEBUGPATH = ISDEBUG ? "/tmp/hypr/hyprd.log" : "/tmp/hypr/hypr.log"; + std::ofstream ofs; + ofs.open(DEBUGPATH, std::ios::out | std::ios::app); + ofs << msg << "\n"; + ofs.close(); } \ No newline at end of file diff --git a/src/windowManager.cpp b/src/windowManager.cpp index 0b0af2f..417543b 100644 --- a/src/windowManager.cpp +++ b/src/windowManager.cpp @@ -30,10 +30,6 @@ void CWindowManager::createAndOpenAllPipes() { system("cat \" \" > /tmp/hypr/hyprbarout"); system("cat \" \" > /tmp/hypr/hyprbarind"); system("cat \" \" > /tmp/hypr/hyprbaroutd"); - - // open the debug file - const std::string DEBUGPATH = "/tmp/hypr/hypr.log"; - DebugOfstream.open(DEBUGPATH, std::ios::out | std::ios::app); } void CWindowManager::updateRootCursor() { @@ -419,10 +415,10 @@ void CWindowManager::refreshDirtyWindows() { } applyShapeToWindow(&window); - - Debug::log(LOG, "Refreshed dirty window, with an ID of " + std::to_string(window.getDrawable())); } } + + Debug::log(LOG, "Refreshed dirty windows."); } void CWindowManager::setFocusedWindow(xcb_drawable_t window) { diff --git a/src/windowManager.hpp b/src/windowManager.hpp index a955316..159eeb5 100644 --- a/src/windowManager.hpp +++ b/src/windowManager.hpp @@ -22,7 +22,6 @@ class CWindowManager { public: - std::ofstream DebugOfstream; xcb_connection_t* DisplayConnection = nullptr; xcb_ewmh_connection_t* EWMHConnection = nullptr; // Bar uses this xcb_screen_t* Screen = nullptr;