xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/xwayland/xwayland-glamor.c |    4 ++--
 hw/xwayland/xwayland-screen.c |    2 +-
 hw/xwayland/xwayland-window.c |    2 +-
 hw/xwayland/xwayland.c        |   10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit d01a075d595522aa30043ede5d3a4824b41d24f2
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Jan 27 18:00:16 2023 +0100

    xwayland: Do not use "XWayland" spelling in code identifiers
    
    Let's not give people any excuse for this spelling.

diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 9a1f4a6da..fc2b696d1 100644
--- a/hw/xwayland/xwayland.c
+++ b/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
 };
 
commit b5aa70503aece379446fe136358e52ac1fb30041
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Jan 27 17:56:24 2023 +0100

    xwayland: Spell XWAYLAND consistently in debug messages

diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 4363730fd..eba81b8cb 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/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);
 }
 
commit df75d90a2c6fd73fb1b1e6b71c4299e747acff93
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Jan 27 17:55:33 2023 +0100

    xwayland: Spell Xwayland consistently in error messages

diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 6c7784efb..e7cc7eaf0 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/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
 }
 
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index a880406c9..94085af34 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -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) {