From be399a85b237c906f111c6503d6bea14dc5464c7 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Sun, 19 Dec 2021 00:47:58 +0100
Subject: [PATCH] minor patches

---
 src/bar/Bar.cpp        |  2 +-
 src/events/events.cpp  | 23 -----------------------
 src/events/events.hpp  |  1 -
 src/utilities/Util.cpp |  9 ++++-----
 src/windowManager.cpp  | 11 +++++++----
 5 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/bar/Bar.cpp b/src/bar/Bar.cpp
index f5ac9a5..af4e0ca 100644
--- a/src/bar/Bar.cpp
+++ b/src/bar/Bar.cpp
@@ -164,7 +164,7 @@ void CStatusBar::setupTray() {
                       XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | XCB_CW_OVERRIDE_REDIRECT | XCB_CW_COLORMAP, 
                       values);
 
-    xcb_atom_t dockAtom[] = {HYPRATOMS["_NET_WM_WINDOW_TYPE_UTILITY"]};
+    xcb_atom_t dockAtom[] = {HYPRATOMS["_NET_WM_WINDOW_TYPE_DOCK"]};
     xcb_ewmh_set_wm_window_type(g_pWindowManager->EWMHConnection, m_iWindowID, 1, dockAtom);
 
     const uint32_t ORIENTATION = 0; // Horizontal
diff --git a/src/events/events.cpp b/src/events/events.cpp
index 384eb35..fd86d6d 100644
--- a/src/events/events.cpp
+++ b/src/events/events.cpp
@@ -620,27 +620,4 @@ void Events::eventClientMessage(xcb_generic_event_t* event) {
             xcb_map_window(g_pWindowManager->DisplayConnection, CLIENT);
         }
     }
-}
-
-void Events::eventConfigureRequest(xcb_generic_event_t* event) {
-    const auto E = reinterpret_cast<xcb_configure_request_event_t*>(event);
-
-    RETURNIFBAR;
-
-    const auto PWINDOW = g_pWindowManager->getWindowFromDrawable(E->window);
-
-    if (!PWINDOW || !PWINDOW->getIsFloating())
-        return;
-
-    // correct delta
-    auto DELTA = PWINDOW->getDefaultSize() - Vector2D(E->width, E->height);
-
-    PWINDOW->setDefaultSize(Vector2D(E->width, E->height));
-    PWINDOW->setDefaultPosition(PWINDOW->getDefaultPosition() - (DELTA / 2.f)); // Center
-
-    PWINDOW->setPosition(PWINDOW->getDefaultPosition());
-    PWINDOW->setSize(PWINDOW->getDefaultSize());
-
-    PWINDOW->setRealPosition(PWINDOW->getDefaultPosition());
-    PWINDOW->setRealSize(PWINDOW->getDefaultSize());
 }
\ No newline at end of file
diff --git a/src/events/events.hpp b/src/events/events.hpp
index 41ba220..3bec0ce 100644
--- a/src/events/events.hpp
+++ b/src/events/events.hpp
@@ -16,7 +16,6 @@ namespace Events {
     EVENT(KeyPress);
     EVENT(MotionNotify);
     EVENT(ClientMessage);
-    EVENT(ConfigureRequest);
 
     // Bypass some events for floating windows
     CWindow*        remapWindow(int, bool floating = false, int forcemonitor = -1);
diff --git a/src/utilities/Util.cpp b/src/utilities/Util.cpp
index 522cbb7..1758935 100644
--- a/src/utilities/Util.cpp
+++ b/src/utilities/Util.cpp
@@ -18,11 +18,10 @@ std::string exec(const char* cmd) {
 
 void clearLogs() {
     std::ofstream logs;
-    const char* const ENVHOME = getenv("HOME");
-    const std::string DEBUGPATH = ENVHOME + (std::string) "/.hypr.log";
-    logs.open(DEBUGPATH, std::ios::out | std::ios::trunc);
-    logs << " ";
-    logs.close();
+    const std::string DEBUGPATH = "/tmp/hypr/hypr.log";
+    const std::string DEBUGPATH2 = "/tmp/hypr/hyprd.log";
+    unlink(DEBUGPATH2.c_str());
+    unlink(DEBUGPATH.c_str());
 }
 
 double parabolic(double from, double to, double incline) {
diff --git a/src/windowManager.cpp b/src/windowManager.cpp
index ac16bd5..a8c95cd 100644
--- a/src/windowManager.cpp
+++ b/src/windowManager.cpp
@@ -264,10 +264,6 @@ void CWindowManager::recieveEvent() {
                 Events::eventMapWindow(ev);
                 Debug::log(LOG, "Event dispatched MAP");
                 break;
-            case XCB_CONFIGURE_REQUEST:
-                Events::eventConfigureRequest(ev);
-                Debug::log(LOG, "Event dispatched CONFIGURE_REQUEST");
-                break;
             case XCB_BUTTON_PRESS:
                 Events::eventButtonPress(ev);
                 Debug::log(LOG, "Event dispatched BUTTON_PRESS");
@@ -1684,6 +1680,13 @@ void CWindowManager::doPostCreationChecks(CWindow* pWindow) {
     }
     free(wm_type_cookiereply);
 
+    // Check if it has a name
+    const auto NAME = getClassName(window);
+    if (NAME.first == "Error" && NAME.second == "Error") {
+        closeWindowAllChecks(window);
+        Debug::log(WARN, "Window created but has a class of NULL. Removing.");
+    }
+
     Debug::log(LOG, "Post creation checks ended");
     //
 }