Merge pull request #478 from yavko/change-to-json-bools

Change more to json bools
This commit is contained in:
Vaxry 2022-08-06 00:33:33 +02:00 committed by GitHub
commit aa7177a9e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -80,23 +80,23 @@ R"#({
"id": %i, "id": %i,
"name": "%s" "name": "%s"
}, },
"floating": %i, "floating": %s,
"monitor": %i, "monitor": %i,
"class": "%s", "class": "%s",
"title": "%s", "title": "%s",
"pid": %i, "pid": %i,
"xwayland": %i "xwayland": %s
},)#", },)#",
w.get(), w.get(),
(int)w->m_vRealPosition.vec().x, (int)w->m_vRealPosition.vec().y, (int)w->m_vRealPosition.vec().x, (int)w->m_vRealPosition.vec().y,
(int)w->m_vRealSize.vec().x, (int)w->m_vRealSize.vec().y, (int)w->m_vRealSize.vec().x, (int)w->m_vRealSize.vec().y,
w->m_iWorkspaceID, escapeJSONStrings(w->m_iWorkspaceID == -1 ? "" : g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID) ? g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID)->m_szName : std::string("Invalid workspace " + std::to_string(w->m_iWorkspaceID))).c_str(), w->m_iWorkspaceID, escapeJSONStrings(w->m_iWorkspaceID == -1 ? "" : g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID) ? g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID)->m_szName : std::string("Invalid workspace " + std::to_string(w->m_iWorkspaceID))).c_str(),
(int)w->m_bIsFloating, ((int)w->m_bIsFloating == 1 ? "true" : "false"),
w->m_iMonitorID, w->m_iMonitorID,
escapeJSONStrings(g_pXWaylandManager->getAppIDClass(w.get())).c_str(), escapeJSONStrings(g_pXWaylandManager->getAppIDClass(w.get())).c_str(),
escapeJSONStrings(g_pXWaylandManager->getTitle(w.get())).c_str(), escapeJSONStrings(g_pXWaylandManager->getTitle(w.get())).c_str(),
w->getPID(), w->getPID(),
(int)w->m_bIsX11 ((int)w->m_bIsX11 == 1 ? "true" : "false")
); );
} }
} }
@ -129,13 +129,13 @@ R"#({
"name": "%s", "name": "%s",
"monitor": "%s", "monitor": "%s",
"windows": %i, "windows": %i,
"hasfullscreen": %i "hasfullscreen": %s
},)#", },)#",
w->m_iID, w->m_iID,
escapeJSONStrings(w->m_szName).c_str(), escapeJSONStrings(w->m_szName).c_str(),
escapeJSONStrings(g_pCompositor->getMonitorFromID(w->m_iMonitorID)->szName).c_str(), escapeJSONStrings(g_pCompositor->getMonitorFromID(w->m_iMonitorID)->szName).c_str(),
g_pCompositor->getWindowsOnWorkspace(w->m_iID), g_pCompositor->getWindowsOnWorkspace(w->m_iID),
(int)w->m_bHasFullscreenWindow ((int)w->m_bHasFullscreenWindow == 1 ? "true" : "false")
); );
} }