fix: random crash due to XFree()

Author: SeptemberHX

deb.cmake

@@ -1,6 +1,6 @@
 set(_VERSION_MAJOR 0)
 set(_VERSION_MINOR 6)
-set(_VERSION_PATCH 5)
+set(_VERSION_PATCH 6)
 
 set(CPACK_GENERATOR "DEB")
 

debian/doc/changelog

@@ -1,3 +1,5 @@
+* 0.6.6
+  - fix: random crash due to XFree()
 * 0.6.5
   - add: Allow to drag is now in the preference page
 * 0.6.4

frame/main.cpp

@@ -31,7 +31,7 @@ int main(int argc, char *argv[]) {
     app.setOrganizationName("septemberhx");
     app.setApplicationName("dde-top-panel");
     app.setApplicationDisplayName("DDE Top Panel");
-    app.setApplicationVersion("0.6.5");
+    app.setApplicationVersion("0.6.6");
     app.loadTranslator();
     app.setAttribute(Qt::AA_EnableHighDpiScaling, true);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, false);

frame/util/XUtils.cpp

@@ -223,32 +223,9 @@ QPixmap XUtils::getWindowIconName(int winId) {
 
 
 int XUtils::getWindowScreenNum(int winId) {
-    openXdo();
-
-    QRect r;
-    XWindowAttributes attr;
-    int ret = XGetWindowAttributes(m_xdo->xdpy, winId, &attr);
-    if (ret != 0) {
-        int x, y;
-        Window unused_child, parent, root;
-        Window *children;
-        unsigned int nchildren;
-        XQueryTree(m_xdo->xdpy, winId, &root, &parent, &children, &nchildren);
-        if (children != NULL) {
-            XFree(children);
-        }
-        if (parent == attr.root) {
-            x = attr.x;
-            y = attr.y;
-        } else {
-            XTranslateCoordinates(m_xdo->xdpy, winId, attr.root, attr.x, attr.y, &x, &y, &unused_child);
-        }
-
-        r.setLeft(x);
-        r.setTop(y);
-        r.setWidth(attr.width);
-        r.setHeight(attr.height);
-
+    KWindowInfo info = KWindowSystem::self()->windowInfo(winId, NET::WMGeometry);
+    if (info.valid()) {
+        QRect r = info.geometry();
         int maxPartScreenNum = 0;
         int maxPartArea = 0;
         int i = 0;