hw/xwayland/xwayland-glamor-gbm.c

@@ -278,7 +278,7 @@ xwl_glamor_gbm_create_pixmap(ScreenPtr screen,
 {
     struct xwl_screen *xwl_screen = xwl_screen_get(screen);
     struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
-    struct gbm_bo *bo;
+    struct gbm_bo *bo = NULL;
     PixmapPtr pixmap = NULL;
 
     if (width > 0 && height > 0 && depth >= 15 &&
@@ -297,9 +297,8 @@ xwl_glamor_gbm_create_pixmap(ScreenPtr screen,
                                               format, modifiers, num_modifiers);
             free(modifiers);
         }
-        else
 #endif
-        {
+        if (bo == NULL) {
             bo = gbm_bo_create(xwl_gbm->gbm, width, height, format,
                                GBM_BO_USE_RENDERING);
         }

hw/xwayland/xwayland-glamor.c

@@ -821,12 +821,12 @@ xwl_glamor_init_backends(struct xwl_screen *xwl_screen, Bool use_eglstream)
 #ifdef GLAMOR_HAS_GBM
     xwl_glamor_init_gbm(xwl_screen);
     if (!xwl_screen->gbm_backend.is_available && !use_eglstream)
-        ErrorF("xwayland glamor: GBM backend (default) is not available\n");
+        ErrorF("Xwayland glamor: GBM backend (default) is not available\n");
 #endif
 #ifdef XWL_HAS_EGLSTREAM
     xwl_glamor_init_eglstream(xwl_screen);
     if (!xwl_screen->eglstream_backend.is_available && use_eglstream)
-        ErrorF("xwayland glamor: EGLStream backend requested but not available\n");
+        ErrorF("Xwayland glamor: EGLStream backend requested but not available\n");
 #endif
 }
 

hw/xwayland/xwayland-output.c

@@ -35,6 +35,8 @@
 
 #include "xdg-output-unstable-v1-client-protocol.h"
 
+#define MAX_OUTPUT_NAME 256
+
 static void xwl_output_get_xdg_output(struct xwl_output *xwl_output);
 
 static Rotation
@@ -654,6 +656,23 @@ apply_output_change(struct xwl_output *xwl_output)
 
     if (xwl_screen->fixed_output == NULL)
         update_screen_size(xwl_screen, width, height);
+    else
+        RRTellChanged(xwl_screen->screen);
+}
+
+static void
+xwl_output_set_name(struct xwl_output *xwl_output, const char *name)
+{
+    if (xwl_output->randr_output == NULL)
+        return; /* rootful */
+
+    /* Check whether the compositor is sending us something useful */
+    if (!name || !strlen(name)) {
+        ErrorF("Not using the provided output name, invalid");
+        return;
+    }
+
+    snprintf(xwl_output->randr_output->name, MAX_OUTPUT_NAME, "%s", name);
 }
 
 static void
@@ -675,11 +694,28 @@ output_handle_scale(void *data, struct wl_output *wl_output, int32_t factor)
 {
 }
 
+static void
+output_handle_name(void *data, struct wl_output *wl_output,
+                   const char *name)
+{
+    struct xwl_output *xwl_output = data;
+
+    xwl_output_set_name(xwl_output, name);
+}
+
+static void
+output_handle_description(void *data, struct wl_output *wl_output,
+                          const char *description)
+{
+}
+
 static const struct wl_output_listener output_listener = {
     output_handle_geometry,
     output_handle_mode,
     output_handle_done,
-    output_handle_scale
+    output_handle_scale,
+    output_handle_name,
+    output_handle_description,
 };
 
 static void
@@ -717,6 +753,12 @@ static void
 xdg_output_handle_name(void *data, struct zxdg_output_v1 *xdg_output,
                        const char *name)
 {
+    struct xwl_output *xwl_output = data;
+
+    if (wl_output_get_version(xwl_output->output) >= 4)
+        return; /* wl_output.name is preferred */
+
+    xwl_output_set_name(xwl_output, name);
 }
 
 static void
@@ -769,10 +811,11 @@ xwl_output_from_wl_output(struct xwl_screen *xwl_screen,
 }
 
 struct xwl_output *
-xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id, Bool with_xrandr)
+xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id,
+                  Bool with_xrandr, uint32_t version)
 {
     struct xwl_output *xwl_output;
-    char name[256];
+    char name[MAX_OUTPUT_NAME];
 
     xwl_output = calloc(1, sizeof *xwl_output);
     if (xwl_output == NULL) {
@@ -781,7 +824,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id, Bool with_xrandr)
     }
 
     xwl_output->output = wl_registry_bind(xwl_screen->registry, id,
-                                          &wl_output_interface, 2);
+                                          &wl_output_interface, min(version, 4));
     if (!xwl_output->output) {
         ErrorF("Failed binding wl_output\n");
         goto err;
@@ -793,7 +836,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id, Bool with_xrandr)
     xwl_output->xwl_screen = xwl_screen;
 
     if (with_xrandr) {
-        snprintf(name, sizeof name, "XWAYLAND%d",
+        snprintf(name, MAX_OUTPUT_NAME, "XWAYLAND%d",
                  xwl_screen_get_next_output_serial(xwl_screen));
 
         xwl_output->randr_crtc = RRCrtcCreate(xwl_screen->screen, xwl_output);
@@ -804,7 +847,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id, Bool with_xrandr)
         RRCrtcSetRotations (xwl_output->randr_crtc, ALL_ROTATIONS);
 
         xwl_output->randr_output = RROutputCreate(xwl_screen->screen, name,
-                                                  strlen(name), xwl_output);
+                                                  MAX_OUTPUT_NAME, xwl_output);
         if (!xwl_output->randr_output) {
             ErrorF("Failed creating RandR Output\n");
             goto err;
@@ -814,7 +857,6 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id, Bool with_xrandr)
         RRCrtcGammaSetSize(xwl_output->randr_crtc, 256);
         RROutputSetCrtcs(xwl_output->randr_output, &xwl_output->randr_crtc, 1);
         RROutputSetConnection(xwl_output->randr_output, RR_Connected);
-        RRTellChanged(xwl_screen->screen);
     }
     /* We want the output to be in the list as soon as created so we can
      * use it when binding to the xdg-output protocol...

hw/xwayland/xwayland-output.h

@@ -84,7 +84,8 @@ struct xwl_output *xwl_output_from_wl_output(struct xwl_screen *xwl_screen,
                                              struct wl_output* wl_output);
 
 struct xwl_output *xwl_output_create(struct xwl_screen *xwl_screen,
-                                     uint32_t id, Bool with_xrandr);
+                                     uint32_t id, Bool with_xrandr,
+                                     uint32_t version);
 
 void xwl_output_destroy(struct xwl_output *xwl_output);
 

hw/xwayland/xwayland-screen.c

@@ -432,7 +432,7 @@ registry_global(void *data, struct wl_registry *registry, uint32_t id,
                                  NULL);
     }
     else if (strcmp(interface, "wl_output") == 0 && version >= 2) {
-        if (xwl_output_create(xwl_screen, id, (xwl_screen->fixed_output == NULL)))
+        if (xwl_output_create(xwl_screen, id, (xwl_screen->fixed_output == NULL), version))
             xwl_screen->expecting_event++;
     }
     else if (strcmp(interface, "zxdg_output_manager_v1") == 0) {
@@ -771,7 +771,7 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
 #ifdef XWL_HAS_EGLSTREAM
             use_eglstreams = TRUE;
 #else
-            ErrorF("xwayland glamor: this build does not have EGLStream support\n");
+            ErrorF("Xwayland glamor: this build does not have EGLStream support\n");
 #endif
         }
         else if (strcmp(argv[i], "-force-xrandr-emulation") == 0) {

hw/xwayland/xwayland-window.c

@@ -61,7 +61,7 @@ xwl_window_set_allow_commits(struct xwl_window *xwl_window, Bool allow,
                              const char *debug_msg)
 {
     xwl_window->allow_commits = allow;
-    DebugF("xwayland: win %d allow_commits = %d (%s)\n",
+    DebugF("XWAYLAND: win %d allow_commits = %d (%s)\n",
            xwl_window->window->drawable.id, allow, debug_msg);
 }
 

hw/xwayland/xwayland.c

@@ -302,7 +302,7 @@ xwl_log_handler(const char *format, va_list args)
 #ifdef XWL_HAS_XWAYLAND_EXTENSION
 #include <X11/extensions/xwaylandproto.h>
 
-Bool noXWaylandExtension = FALSE;
+Bool noXwaylandExtension = FALSE;
 
 static int
 ProcXwlQueryVersion(ClientPtr client)
@@ -356,7 +356,7 @@ SProcXwlQueryVersion(ClientPtr client)
 }
 
 static int
-ProcXWaylandDispatch(ClientPtr client)
+ProcXwaylandDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -368,7 +368,7 @@ ProcXWaylandDispatch(ClientPtr client)
 }
 
 static int
-SProcXWaylandDispatch(ClientPtr client)
+SProcXwaylandDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -384,7 +384,7 @@ xwlExtensionInit(void)
 {
     AddExtension(XWAYLAND_EXTENSION_NAME,
                  XwlNumberEvents, XwlNumberErrors,
-                 ProcXWaylandDispatch, SProcXWaylandDispatch,
+                 ProcXwaylandDispatch, SProcXwaylandDispatch,
                  NULL, StandardMinorOpcode);
 }
 
@@ -395,7 +395,7 @@ static const ExtensionModule xwayland_extensions[] = {
     { xwlVidModeExtensionInit, XF86VIDMODENAME, &noXFree86VidModeExtension },
 #endif
 #ifdef XWL_HAS_XWAYLAND_EXTENSION
-    { xwlExtensionInit, XWAYLAND_EXTENSION_NAME, &noXWaylandExtension },
+    { xwlExtensionInit, XWAYLAND_EXTENSION_NAME, &noXwaylandExtension },
 #endif
 };