From 2f025381f8c11cab2f351a478fba80ce7ae70a67 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Julien=20Rop=C3=A9?= <jrope@redhat.com>

Date: Tue, 25 Feb 2020 12:17:12 +0100

Subject: [PATCH 1/4] Split X11-specific code from the core agent code

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

This commit adds a set of functions (vdagent_display_*) that separates the

agent's code from the underlying backend used for handling monitor

events/settings.

Today, this does not change the behaviour of the agent, as those functions

will just call the existing X11 functions. But we will later add code to

them to support other means of dealing with monitors (i.e: Wayland

support).

Signed-off-by: Julien Ropé <jrope@redhat.com>

Acked-by: Frediano Ziglio <fziglio@redhat.com>

---

 Makefile.am           |   2 +

 src/vdagent/display.c | 129 ++++++++++++++++++++++++++++++++++++++++++

 src/vdagent/display.h |  37 ++++++++++++

 src/vdagent/vdagent.c |  37 ++++--------

 4 files changed, 178 insertions(+), 27 deletions(-)

 create mode 100644 src/vdagent/display.c

 create mode 100644 src/vdagent/display.h

diff --git a/Makefile.am b/Makefile.am

index 2abb5ec..431e414 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -43,6 +43,8 @@ src_spice_vdagent_SOURCES =			\

 	src/vdagent/clipboard.h			\

 	src/vdagent/device-info.c		\

 	src/vdagent/device-info.h		\

+	src/vdagent/display.c			\

+	src/vdagent/display.h			\

 	src/vdagent/file-xfers.c		\

 	src/vdagent/file-xfers.h		\

 	src/vdagent/x11-priv.h			\

diff --git a/src/vdagent/display.c b/src/vdagent/display.c

new file mode 100644

index 0000000..bb83762

--- /dev/null

+++ b/src/vdagent/display.c

@@ -0,0 +1,129 @@

+/*  display.c vdagent display source code

+

+ Copyright 2020 Red Hat, Inc.

+

+ Red Hat Authors:

+ Julien Ropé <jrope@redhat.com>

+

+ This program is free software: you can redistribute it and/or modify

+ it under the terms of the GNU General Public License as published by

+ the Free Software Foundation, either version 3 of the License, or

+ (at your option) any later version.

+

+ This program is distributed in the hope that it will be useful,

+ but WITHOUT ANY WARRANTY; without even the implied warranty of

+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ GNU General Public License for more details.

+

+ You should have received a copy of the GNU General Public License

+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include <config.h>

+

+#include <glib.h>

+#ifdef WITH_GTK

+#include <gdk/gdk.h>

+#ifdef GDK_WINDOWING_X11

+#include <gdk/gdkx.h>

+#endif

+#endif

+#include <syslog.h>

+#include "x11.h"

+#include "x11-priv.h"

+

+#include "display.h"

+

+/**

+ * VDAgentDisplay and the vdagent_display_*() functions are used as wrappers for display-related

+ * operations.

+ * They allow vdagent code to call generic display functions that are independent from the underlying

+ * API (X11/GTK/etc).

+ *

+ * The display.c file contains the actual implementation and chooses what API will be called.

+ * The x11.c and x11-randr.c files contains the x11-specific functions.

+ */

+struct VDAgentDisplay {

+    struct vdagent_x11 *x11;

+    GIOChannel *x11_channel;

+};

+

+struct vdagent_x11* vdagent_display_get_x11(VDAgentDisplay *display)

+{

+    return display->x11;

+}

+

+static gboolean x11_io_channel_cb(GIOChannel *source, GIOCondition condition, gpointer data)

+{

+    VDAgentDisplay *display = data;

+    vdagent_x11_do_read(display->x11);

+

+    return G_SOURCE_CONTINUE;

+}

+

+VDAgentDisplay* vdagent_display_create(UdscsConnection *vdagentd, int debug, int sync)

+{

+    VDAgentDisplay *display;

+

+    display = g_new0(VDAgentDisplay, 1);

+    display->x11 = vdagent_x11_create(vdagentd, debug, sync);

+    if (display->x11 == NULL) {

+        g_free(display);

+        return NULL;

+    }

+

+    display->x11_channel = g_io_channel_unix_new(vdagent_x11_get_fd(display->x11));

+    if (display->x11_channel == NULL) {

+        vdagent_x11_destroy(display->x11, TRUE);

+        g_free(display);

+        return NULL;

+    }

+

+    g_io_add_watch(display->x11_channel, G_IO_IN, x11_io_channel_cb, display);

+

+    return display;

+}

+

+void vdagent_display_destroy(VDAgentDisplay *display, int vdagentd_disconnected)

+{

+    if (!display) {

+        return;

+    }

+

+    g_clear_pointer(&display->x11_channel, g_io_channel_unref);

+    vdagent_x11_destroy(display->x11, vdagentd_disconnected);

+}

+

+/* Function used to determine the default location to save file-xfers,

+ xdg desktop dir or xdg download dir. We err on the safe side and use a

+ whitelist approach, so any unknown desktop will end up with saving

+ file-xfers to the xdg download dir, and opening the xdg download dir with

+ xdg-open when the file-xfer completes. */

+int vdagent_display_has_icons_on_desktop(VDAgentDisplay *display)

+{

+    return vdagent_x11_has_icons_on_desktop(display->x11);

+}

+

+// handle the device info message from the server. This will allow us to

+// maintain a mapping from spice display id to xrandr output

+void vdagent_display_handle_graphics_device_info(VDAgentDisplay *display, uint8_t *data,

+        size_t size)

+{

+    vdagent_x11_handle_graphics_device_info(display->x11, data, size);

+}

+

+/*

+ * Set monitor configuration according to client request.

+ *

+ * On exit send current configuration to client, regardless of error.

+ *

+ * Errors:

+ *  screen size too large for driver to handle. (we set the largest/smallest possible)

+ *  no randr support in X server.

+ *  invalid configuration request from client.

+ */

+void vdagent_display_set_monitor_config(VDAgentDisplay *display, VDAgentMonitorsConfig *mon_config,

+        int fallback)

+{

+    vdagent_x11_set_monitor_config(display->x11, mon_config, fallback);

+}

diff --git a/src/vdagent/display.h b/src/vdagent/display.h

new file mode 100644

index 0000000..1f5365f

--- /dev/null

+++ b/src/vdagent/display.h

@@ -0,0 +1,37 @@

+/*

+ * display.h- vdagent display handling header

+

+    Copyright 2020 Red Hat, Inc.

+

+    This program is free software: you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation, either version 3 of the License, or

+    (at your option) any later version.

+

+    This program is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef SRC_VDAGENT_DISPLAY_H_

+#define SRC_VDAGENT_DISPLAY_H_

+

+typedef struct VDAgentDisplay VDAgentDisplay;

+

+VDAgentDisplay *vdagent_display_create(UdscsConnection *vdagentd, int debug, int sync);

+void vdagent_display_destroy(VDAgentDisplay *display, int vdagentd_disconnected);

+

+int vdagent_display_has_icons_on_desktop(VDAgentDisplay *display);

+void vdagent_display_handle_graphics_device_info(VDAgentDisplay *display, uint8_t *data, size_t size);

+void vdagent_display_set_monitor_config(VDAgentDisplay *display,

+                                        VDAgentMonitorsConfig *mon_config,

+                                        int fallback);

+

+struct vdagent_x11 *vdagent_display_get_x11(VDAgentDisplay *display);

+

+

+#endif /* SRC_VDAGENT_DISPLAY_H_ */

diff --git a/src/vdagent/vdagent.c b/src/vdagent/vdagent.c

index 53b177b..af78328 100644

--- a/src/vdagent/vdagent.c

+++ b/src/vdagent/vdagent.c

@@ -38,16 +38,15 @@

 #include "udscs.h"

 #include "vdagentd-proto.h"

 #include "audio.h"

-#include "x11.h"

 #include "file-xfers.h"

 #include "clipboard.h"

+#include "display.h"

 typedef struct VDAgent {

     VDAgentClipboards *clipboards;

-    struct vdagent_x11 *x11;

+    VDAgentDisplay *display;

     struct vdagent_file_xfers *xfers;

     UdscsConnection *conn;

-    GIOChannel *x11_channel;

     GMainLoop *loop;

 } VDAgent;

@@ -114,7 +113,7 @@ static const gchar *xfer_get_download_directory(VDAgent *agent)

         return fx_dir;

     }

-    return g_get_user_special_dir(vdagent_x11_has_icons_on_desktop(agent->x11) ?

+    return g_get_user_special_dir(vdagent_display_has_icons_on_desktop(agent->display) ?

                                   G_USER_DIRECTORY_DESKTOP :

                                   G_USER_DIRECTORY_DOWNLOAD);

 }

@@ -144,7 +143,7 @@ static gboolean vdagent_init_file_xfer(VDAgent *agent)

     }

     open_dir = fx_open_dir == -1 ?

-               !vdagent_x11_has_icons_on_desktop(agent->x11) :

+               !vdagent_display_has_icons_on_desktop(agent->display) :

                fx_open_dir;

     agent->xfers = vdagent_file_xfers_create(agent->conn, xfer_dir,

@@ -179,7 +178,7 @@ static void daemon_read_complete(UdscsConnection *conn,

     switch (header->type) {

     case VDAGENTD_MONITORS_CONFIG:

-        vdagent_x11_set_monitor_config(agent->x11, (VDAgentMonitorsConfig *)data, 0);

+        vdagent_display_set_monitor_config(agent->display, (VDAgentMonitorsConfig *)data, 0);

         break;

     case VDAGENTD_CLIPBOARD_REQUEST:

         vdagent_clipboard_request(agent->clipboards, header->arg1, header->arg2);

@@ -249,7 +248,7 @@ static void daemon_read_complete(UdscsConnection *conn,

         }

         break;

     case VDAGENTD_GRAPHICS_DEVICE_INFO:

-        vdagent_x11_handle_graphics_device_info(agent->x11, data, header->size);

+        vdagent_display_handle_graphics_device_info(agent->display, data, header->size);

         break;

     case VDAGENTD_CLIENT_DISCONNECTED:

         vdagent_clipboards_release_all(agent->clipboards);

@@ -335,15 +334,7 @@ static int daemonize(void)

     return 0;

 }

-static gboolean x11_io_channel_cb(GIOChannel *source,

-                                  GIOCondition condition,

-                                  gpointer data)

-{

-    VDAgent *agent = data;

-    vdagent_x11_do_read(agent->x11);

-    return G_SOURCE_CONTINUE;

-}

 gboolean vdagent_signal_handler(gpointer user_data)

 {

@@ -369,13 +360,12 @@ static VDAgent *vdagent_new(void)

 static void vdagent_destroy(VDAgent *agent)

 {

     vdagent_finalize_file_xfer(agent);

-    vdagent_x11_destroy(agent->x11, agent->conn == NULL);

+    vdagent_display_destroy(agent->display, agent->conn == NULL);

     g_clear_pointer(&agent->conn, vdagent_connection_destroy);

     while (g_source_remove_by_user_data(agent))

         continue;

-    g_clear_pointer(&agent->x11_channel, g_io_channel_unref);

     g_clear_pointer(&agent->loop, g_main_loop_unref);

     g_free(agent);

 }

@@ -393,22 +383,15 @@ static gboolean vdagent_init_async_cb(gpointer user_data)

     }

     g_object_set_data(G_OBJECT(agent->conn), "agent", agent);

-    agent->x11 = vdagent_x11_create(agent->conn, debug, x11_sync);

-    if (agent->x11 == NULL)

-        goto err_init;

-    agent->x11_channel = g_io_channel_unix_new(vdagent_x11_get_fd(agent->x11));

-    if (agent->x11_channel == NULL)

+    agent->display = vdagent_display_create(agent->conn, debug, x11_sync);

+    if (agent->display == NULL)

         goto err_init;

-    g_io_add_watch(agent->x11_channel,

-                   G_IO_IN,

-                   x11_io_channel_cb,

-                   agent);

     if (!vdagent_init_file_xfer(agent))

         syslog(LOG_WARNING, "File transfer is disabled");

-    agent->clipboards = vdagent_clipboards_new(agent->x11);

+    agent->clipboards = vdagent_clipboards_new(vdagent_display_get_x11(agent->display));

     vdagent_clipboards_set_conn(agent->clipboards, agent->conn);

     if (parent_socket != -1) {

-- 

2.29.2

From aa75e9d7920ffb2290b56fd018789611748f1ea8 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Julien=20Rop=C3=A9?= <jrope@redhat.com>

Date: Tue, 25 Feb 2020 15:18:41 +0100

Subject: [PATCH 2/4] Move handle_graphics_device_info code to generic display

 functions

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Most of the code in vdagent_x11_handle_graphics_device_info() is dealing

with SPICE information, only a few of it is X11-specific.

Move that code away from x11-randr.c so that we can use it with Wayland.

Signed-off-by: Julien Ropé <jrope@redhat.com>

Acked-by: Frediano Ziglio <fziglio@redhat.com>

---

 src/vdagent/display.c   | 33 ++++++++++++++++-

 src/vdagent/x11-randr.c | 82 +++++++++++++----------------------------

 src/vdagent/x11.h       |  3 +-

 3 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/src/vdagent/display.c b/src/vdagent/display.c

index bb83762..51b0a0d 100644

--- a/src/vdagent/display.c

+++ b/src/vdagent/display.c

@@ -109,7 +109,38 @@ int vdagent_display_has_icons_on_desktop(VDAgentDisplay *display)

 void vdagent_display_handle_graphics_device_info(VDAgentDisplay *display, uint8_t *data,

         size_t size)

 {

-    vdagent_x11_handle_graphics_device_info(display->x11, data, size);

+    VDAgentGraphicsDeviceInfo *graphics_device_info = (VDAgentGraphicsDeviceInfo *)data;

+    VDAgentDeviceDisplayInfo *device_display_info = graphics_device_info->display_info;

+

+    void *buffer_end = data + size;

+

+    syslog(LOG_INFO, "Received Graphics Device Info:");

+

+    for (size_t i = 0; i < graphics_device_info->count; ++i) {

+        if ((void*) device_display_info > buffer_end ||

+                (void*) (&device_display_info->device_address +

+                    device_display_info->device_address_len) > buffer_end) {

+            syslog(LOG_ERR, "Malformed graphics_display_info message, "

+                   "extends beyond the end of the buffer");

+            break;

+        }

+

+        // make sure the string is terminated:

+        if (device_display_info->device_address_len > 0) {

+            device_display_info->device_address[device_display_info->device_address_len - 1] = '\0';

+        } else {

+            syslog(LOG_WARNING, "Zero length device_address received for channel_id: %u, monitor_id: %u",

+                   device_display_info->channel_id, device_display_info->monitor_id);

+        }

+

+        vdagent_x11_handle_device_display_info(display->x11, device_display_info);

+

+        device_display_info = (VDAgentDeviceDisplayInfo*) ((char*) device_display_info +

+            sizeof(VDAgentDeviceDisplayInfo) + device_display_info->device_address_len);

+    }

+

+    // make sure daemon is up-to-date with (possibly updated) device IDs

+    vdagent_x11_send_daemon_guest_xorg_res(display->x11, 1);

 }

 /*

diff --git a/src/vdagent/x11-randr.c b/src/vdagent/x11-randr.c

index 3fb7a68..9148563 100644

--- a/src/vdagent/x11-randr.c

+++ b/src/vdagent/x11-randr.c

@@ -778,64 +778,34 @@ static void dump_monitors_config(struct vdagent_x11 *x11,

 // handle the device info message from the server. This will allow us to

 // maintain a mapping from spice display id to xrandr output

-void vdagent_x11_handle_graphics_device_info(struct vdagent_x11 *x11, uint8_t *data, size_t size)

+void vdagent_x11_handle_device_display_info(struct vdagent_x11 *x11,

+                                            VDAgentDeviceDisplayInfo *device_display_info)

 {

-    VDAgentGraphicsDeviceInfo *graphics_device_info = (VDAgentGraphicsDeviceInfo *)data;

-    VDAgentDeviceDisplayInfo *device_display_info = graphics_device_info->display_info;

-

-    void *buffer_end = data + size;

-

-    syslog(LOG_INFO, "Received Graphics Device Info:");

-

-    for (size_t i = 0; i < graphics_device_info->count; ++i) {

-        if ((void*) device_display_info > buffer_end ||

-                (void*) (&device_display_info->device_address +

-                    device_display_info->device_address_len) > buffer_end) {

-            syslog(LOG_ERR, "Malformed graphics_display_info message, "

-                   "extends beyond the end of the buffer");

-            break;

-        }

-

-        // make sure the string is terminated:

-        if (device_display_info->device_address_len > 0) {

-            device_display_info->device_address[device_display_info->device_address_len - 1] = '\0';

-        } else {

-            syslog(LOG_WARNING, "Zero length device_address received for channel_id: %u, monitor_id: %u",

-                   device_display_info->channel_id, device_display_info->monitor_id);

-        }

-

-        RROutput x_output;

-        if (lookup_xrandr_output_for_device_info(device_display_info, x11->display,

-                                                 x11->randr.res, &x_output)) {

-            gint64 *value = g_new(gint64, 1);

-            *value = x_output;

-

-            syslog(LOG_INFO, "Adding graphics device info: channel_id: %u monitor_id: "

-                   "%u device_address: %s, device_display_id: %u xrandr output ID: %lu",

-                   device_display_info->channel_id,

-                   device_display_info->monitor_id,

-                   device_display_info->device_address,

-                   device_display_info->device_display_id,

-                   x_output);

-

-            g_hash_table_insert(x11->guest_output_map,

-                GUINT_TO_POINTER(device_display_info->channel_id + device_display_info->monitor_id),

-                value);

-        } else {

-            syslog(LOG_INFO, "channel_id: %u monitor_id: %u device_address: %s, "

-                   "device_display_id: %u xrandr output ID NOT FOUND",

-                   device_display_info->channel_id,

-                   device_display_info->monitor_id,

-                   device_display_info->device_address,

-                   device_display_info->device_display_id);

-        }

-

-        device_display_info = (VDAgentDeviceDisplayInfo*) ((char*) device_display_info +

-            sizeof(VDAgentDeviceDisplayInfo) + device_display_info->device_address_len);

+    RROutput x_output;

+    if (lookup_xrandr_output_for_device_info(device_display_info, x11->display,

+                                             x11->randr.res, &x_output)) {

+        gint64 *value = g_new(gint64, 1);

+        *value = x_output;

+

+        syslog(LOG_INFO, "Adding graphics device info: channel_id: %u monitor_id: "

+               "%u device_address: %s, device_display_id: %u xrandr output ID: %lu",

+               device_display_info->channel_id,

+               device_display_info->monitor_id,

+               device_display_info->device_address,

+               device_display_info->device_display_id,

+               x_output);

+

+        g_hash_table_insert(x11->guest_output_map,

+            GUINT_TO_POINTER(device_display_info->channel_id + device_display_info->monitor_id),

+            value);

+    } else {

+        syslog(LOG_INFO, "channel_id: %u monitor_id: %u device_address: %s, "

+               "device_display_id: %u xrandr output ID NOT FOUND",

+               device_display_info->channel_id,

+               device_display_info->monitor_id,

+               device_display_info->device_address,

+               device_display_info->device_display_id);

     }

-

-    // make sure daemon is up-to-date with (possibly updated) device IDs

-    vdagent_x11_send_daemon_guest_xorg_res(x11, 1);

 }

 static int get_output_index_for_display_id(struct vdagent_x11 *x11, int display_id)

diff --git a/src/vdagent/x11.h b/src/vdagent/x11.h

index c49a397..6b3bcc1 100644

--- a/src/vdagent/x11.h

+++ b/src/vdagent/x11.h

@@ -51,6 +51,7 @@ void vdagent_x11_client_disconnected(struct vdagent_x11 *x11);

 #endif

 int vdagent_x11_has_icons_on_desktop(struct vdagent_x11 *x11);

-void vdagent_x11_handle_graphics_device_info(struct vdagent_x11 *x11, uint8_t *data, size_t size);

+void vdagent_x11_handle_device_display_info(struct vdagent_x11 *x11,

+                                            VDAgentDeviceDisplayInfo *device_display_info);

 #endif

-- 

2.29.2

From 1601f4de9533dfe35536f68afc9ca899cf578ae3 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Julien=20Rop=C3=A9?= <jrope@redhat.com>

Date: Mon, 6 Jul 2020 09:24:10 +0200

Subject: [PATCH 3/4] Move more code from x11.c to display.c

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Moving the non-X11 part of the code related to

"vdagent_x11_has_icon_on_desktop()".

Turns out most of it is disabled anyway when we build with GTK.

Signed-off-by: Julien Ropé <jrope@redhat.com>

Acked-by: Frediano Ziglio <fziglio@redhat.com>

---

 src/vdagent/display.c | 60 ++++++++++++++++++++++++++++++++++++++-----

 src/vdagent/display.h |  2 +-

 src/vdagent/x11.c     | 53 +++-----------------------------------

 src/vdagent/x11.h     |  5 +++-

 4 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/src/vdagent/display.c b/src/vdagent/display.c

index 51b0a0d..5f2ba2c 100644

--- a/src/vdagent/display.c

+++ b/src/vdagent/display.c

@@ -48,6 +48,21 @@ struct VDAgentDisplay {

     GIOChannel *x11_channel;

 };

+

+static gchar *vdagent_display_get_wm_name(VDAgentDisplay *display)

+{

+#ifdef GDK_WINDOWING_X11

+    GdkDisplay *gdk_display = gdk_display_get_default();

+    if (GDK_IS_X11_DISPLAY(gdk_display))

+        return g_strdup(gdk_x11_screen_get_window_manager_name(

+            gdk_display_get_default_screen(gdk_display)));

+    return g_strdup("unsupported");

+#else

+    return vdagent_x11_get_wm_name(display->x11);

+#endif

+}

+

+

 struct vdagent_x11* vdagent_display_get_x11(VDAgentDisplay *display)

 {

     return display->x11;

@@ -64,6 +79,7 @@ static gboolean x11_io_channel_cb(GIOChannel *source, GIOCondition condition, gp

 VDAgentDisplay* vdagent_display_create(UdscsConnection *vdagentd, int debug, int sync)

 {

     VDAgentDisplay *display;

+    gchar *net_wm_name = NULL;

     display = g_new0(VDAgentDisplay, 1);

     display->x11 = vdagent_x11_create(vdagentd, debug, sync);

@@ -81,6 +97,21 @@ VDAgentDisplay* vdagent_display_create(UdscsConnection *vdagentd, int debug, int

     g_io_add_watch(display->x11_channel, G_IO_IN, x11_io_channel_cb, display);

+

+    /* Since we are started at the same time as the wm,

+       sometimes we need to wait a bit for the _NET_WM_NAME to show up. */

+    for (int i = 0; i < 9; i++) {

+        g_free(net_wm_name);

+        net_wm_name = vdagent_display_get_wm_name(display);

+        if (strcmp(net_wm_name, "unknown"))

+            break;

+        usleep(100000);

+    }

+    if (display->x11->debug)

+        syslog(LOG_DEBUG, "%s: net_wm_name=\"%s\", has icons=%d",

+               __func__, net_wm_name, vdagent_display_has_icons_on_desktop(display));

+    g_free(net_wm_name);

+

     return display;

 }

@@ -95,13 +126,30 @@ void vdagent_display_destroy(VDAgentDisplay *display, int vdagentd_disconnected)

 }

 /* Function used to determine the default location to save file-xfers,

- xdg desktop dir or xdg download dir. We err on the safe side and use a

- whitelist approach, so any unknown desktop will end up with saving

- file-xfers to the xdg download dir, and opening the xdg download dir with

- xdg-open when the file-xfer completes. */

-int vdagent_display_has_icons_on_desktop(VDAgentDisplay *display)

+   xdg desktop dir or xdg download dir. We err on the safe side and use a

+   whitelist approach, so any unknown desktop will end up with saving

+   file-xfers to the xdg download dir, and opening the xdg download dir with

+   xdg-open when the file-xfer completes. */

+gboolean vdagent_display_has_icons_on_desktop(VDAgentDisplay *display)

 {

-    return vdagent_x11_has_icons_on_desktop(display->x11);

+    static const char * const wms_with_icons_on_desktop[] = {

+        "Metacity", /* GNOME-2 or GNOME-3 fallback */

+        "Xfwm4",    /* Xfce */

+        "Marco",    /* Mate */

+        "Metacity (Marco)", /* Mate, newer */

+        NULL

+    };

+    gchar *net_wm_name = vdagent_display_get_wm_name(display);

+    int i;

+

+    for (i = 0; wms_with_icons_on_desktop[i]; i++)

+        if (!strcmp(net_wm_name, wms_with_icons_on_desktop[i])) {

+            g_free(net_wm_name);

+            return TRUE;

+        }

+

+    g_free(net_wm_name);

+    return FALSE;

 }

 // handle the device info message from the server. This will allow us to

diff --git a/src/vdagent/display.h b/src/vdagent/display.h

index 1f5365f..af165ef 100644

--- a/src/vdagent/display.h

+++ b/src/vdagent/display.h

@@ -25,7 +25,7 @@ typedef struct VDAgentDisplay VDAgentDisplay;

 VDAgentDisplay *vdagent_display_create(UdscsConnection *vdagentd, int debug, int sync);

 void vdagent_display_destroy(VDAgentDisplay *display, int vdagentd_disconnected);

-int vdagent_display_has_icons_on_desktop(VDAgentDisplay *display);

+gboolean vdagent_display_has_icons_on_desktop(VDAgentDisplay *display);

 void vdagent_display_handle_graphics_device_info(VDAgentDisplay *display, uint8_t *data, size_t size);

 void vdagent_display_set_monitor_config(VDAgentDisplay *display,

                                         VDAgentMonitorsConfig *mon_config,

diff --git a/src/vdagent/x11.c b/src/vdagent/x11.c

index 550d097..d171ffd 100644

--- a/src/vdagent/x11.c

+++ b/src/vdagent/x11.c

@@ -123,15 +123,8 @@ int vdagent_x11_restore_error_handler(struct vdagent_x11 *x11)

     return error;

 }

-static gchar *vdagent_x11_get_wm_name(struct vdagent_x11 *x11)

+gchar *vdagent_x11_get_wm_name(struct vdagent_x11 *x11)

 {

-#ifdef GDK_WINDOWING_X11

-    GdkDisplay *display = gdk_display_get_default();

-    if (GDK_IS_X11_DISPLAY(display))

-        return g_strdup(gdk_x11_screen_get_window_manager_name(

-            gdk_display_get_default_screen(display)));

-    return g_strdup("unsupported");

-#else

     Atom type_ret;

     int format_ret;

     unsigned long len, remain;

@@ -193,8 +186,7 @@ static gchar *vdagent_x11_get_wm_name(struct vdagent_x11 *x11)

     if (net_wm_name == NULL)

         return g_strdup("unknown");

     return net_wm_name;

-#endif

 }

 struct vdagent_x11 *vdagent_x11_create(UdscsConnection *vdagentd,

     int debug, int sync)

@@ -206,7 +198,6 @@ struct vdagent_x11 *vdagent_x11_create(UdscsConnection *vdagentd,

 #else

     int i, j, major, minor;

 #endif

-    gchar *net_wm_name = NULL;

     x11 = g_new0(struct vdagent_x11, 1);

     x11->vdagentd = vdagentd;

@@ -308,19 +299,6 @@ struct vdagent_x11 *vdagent_x11_create(UdscsConnection *vdagentd,

     }

     vdagent_x11_send_daemon_guest_xorg_res(x11, 1);

-    /* Since we are started at the same time as the wm,

-       sometimes we need to wait a bit for the _NET_WM_NAME to show up. */

-    for (i = 0; i < 9; i++) {

-        g_free(net_wm_name);

-        net_wm_name = vdagent_x11_get_wm_name(x11);

-        if (strcmp(net_wm_name, "unknown"))

-            break;

-        usleep(100000);

-    }

-    if (x11->debug)

-        syslog(LOG_DEBUG, "%s: net_wm_name=\"%s\", has icons=%d",

-               __func__, net_wm_name, vdagent_x11_has_icons_on_desktop(x11));

-    g_free(net_wm_name);

     /* Flush output buffers and consume any pending events */

     vdagent_x11_do_read(x11);

@@ -1407,30 +1365,3 @@ void vdagent_x11_client_disconnected(struct vdagent_x11 *x11)

     }

 }

 #endif

-

-/* Function used to determine the default location to save file-xfers,

-   xdg desktop dir or xdg download dir. We err on the safe side and use a

-   whitelist approach, so any unknown desktop will end up with saving

-   file-xfers to the xdg download dir, and opening the xdg download dir with

-   xdg-open when the file-xfer completes. */

-int vdagent_x11_has_icons_on_desktop(struct vdagent_x11 *x11)

-{

-    const char * const wms_with_icons_on_desktop[] = {

-        "Metacity", /* GNOME-2 or GNOME-3 fallback */

-        "Xfwm4",    /* Xfce */

-        "Marco",    /* Mate */

-        "Metacity (Marco)", /* Mate, newer */

-        NULL

-    };