From ab6a62f0fd7f2e7e80bb7046020a4de8dbf0bcfc Mon Sep 17 00:00:00 2001 From: vaxerski Date: Mon, 8 Aug 2022 22:49:02 +0200 Subject: [PATCH] Revert "Merge pull request #499 from yavko/fix-active-window-json-bools" This reverts commit 5aed6f1bc7ad15d2f740e490339aaacd5bbe8568, reversing changes made to 6f137938da14a1b5b71cfdad51101d7a6f25320c. --- src/debug/HyprCtl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp index 53e5bc32..c0d0463b 100644 --- a/src/debug/HyprCtl.cpp +++ b/src/debug/HyprCtl.cpp @@ -169,23 +169,23 @@ R"#({ "id": %i, "name": "%s" }, - "floating": %s, + "floating": %i, "monitor": %i, "class": "%s", "title": "%s", "pid": %i, - "xwayland": %s + "xwayland": %i })#", PWINDOW, (int)PWINDOW->m_vRealPosition.vec().x, (int)PWINDOW->m_vRealPosition.vec().y, (int)PWINDOW->m_vRealSize.vec().x, (int)PWINDOW->m_vRealSize.vec().y, PWINDOW->m_iWorkspaceID, escapeJSONStrings(PWINDOW->m_iWorkspaceID == -1 ? "" : g_pCompositor->getWorkspaceByID(PWINDOW->m_iWorkspaceID)->m_szName).c_str(), - ((int)w->m_bIsFloating == 1 ? "true" : "false"), + (int)PWINDOW->m_bIsFloating, PWINDOW->m_iMonitorID, escapeJSONStrings(g_pXWaylandManager->getAppIDClass(PWINDOW)).c_str(), escapeJSONStrings(g_pXWaylandManager->getTitle(PWINDOW)).c_str(), PWINDOW->getPID(), - ((int)w->m_bIsX11 == 1 ? "true" : "false") + (int)PWINDOW->m_bIsX11 ); } else { return getFormat("Window %x -> %s:\n\tat: %i,%i\n\tsize: %i,%i\n\tworkspace: %i (%s)\n\tfloating: %i\n\tmonitor: %i\n\tclass: %s\n\ttitle: %s\n\tpid: %i\n\txwayland: %i\n\n",