add wayland support

therefore make libwnck optional (libwnck is x11 only)

see https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/commit/3705931e307e87878f205b905eaa3f5daaffcf09
and https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/commit/8c4d47d625661e848643ce564f63ed3ec1e83293
and https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/commit/1ea64e9965bd6f1026f1167b692e7cc83c269be3

1 files changed, 13 insertions, 5 deletions

diff --git a/src/procman-app.cpp b/src/procman-app.cpp
index 3a0c10a..7724a4c 100644
--- a/src/procman-app.cpp
+++ b/src/procman-app.cpp
@@ -207,7 +207,6 @@ procman_data_new (GSettings *settings)
     ProcData *pd;
     gchar *color;
     gchar **keys;
-    gint swidth, sheight;
     glibtop_cpu cpu;
 
     pd = ProcData::get_instance();
@@ -308,10 +307,19 @@ procman_data_new (GSettings *settings)
     g_free (color);
 
     /* Sanity checks */
-    swidth = WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ()));
-    sheight = HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ()));
-    pd->config.width = CLAMP (pd->config.width, 50, swidth);
-    pd->config.height = CLAMP (pd->config.height, 50, sheight);
+    GdkDisplay *display;
+    GdkMonitor *monitor;
+    GdkRectangle monitor_geometry;
+
+    display = gdk_display_get_default ();
+    monitor = gdk_display_get_monitor_at_point (display, pd->config.xpos, pd->config.ypos);
+    if (monitor == NULL) {
+        monitor = gdk_display_get_monitor (display, 0);
+    }
+    gdk_monitor_get_geometry (monitor, &monitor_geometry);
+
+    pd->config.width = CLAMP (pd->config.width, 50, monitor_geometry.width);
+    pd->config.height = CLAMP (pd->config.height, 50, monitor_geometry.height);
     pd->config.update_interval = MAX (pd->config.update_interval, 1000);
     pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);
     pd->config.disks_update_interval = MAX (pd->config.disks_update_interval, 1000);