hw/xwayland/xwayland-glamor-eglstream.c

@@ -663,7 +663,7 @@ xwl_glamor_eglstream_init_wl_registry(struct xwl_screen *xwl_screen,
     struct xwl_eglstream_private *xwl_eglstream =
         xwl_eglstream_get(xwl_screen);
 
-    if (strcmp(name, "wl_eglstream_display") == 0) {
+    if (strcmp(name, wl_eglstream_display_interface.name) == 0) {
         xwl_eglstream->display = wl_registry_bind(
             wl_registry, id, &wl_eglstream_display_interface, version);
 
@@ -671,11 +671,11 @@ xwl_glamor_eglstream_init_wl_registry(struct xwl_screen *xwl_screen,
                                           &eglstream_display_listener,
                                           xwl_screen);
         return TRUE;
-    } else if (strcmp(name, "wl_eglstream_controller") == 0) {
+    } else if (strcmp(name, wl_eglstream_controller_interface.name) == 0) {
         xwl_eglstream->controller = wl_registry_bind(
             wl_registry, id, &wl_eglstream_controller_interface, version);
         return TRUE;
-    } else if (strcmp(name, "zwp_linux_dmabuf_v1") == 0) {
+    } else if (strcmp(name, zwp_linux_dmabuf_v1_interface.name) == 0) {
         xwl_screen_set_dmabuf_interface(xwl_screen, id, version);
         return TRUE;
     }

hw/xwayland/xwayland-glamor-gbm.c

@@ -1004,10 +1004,10 @@ xwl_glamor_gbm_init_wl_registry(struct xwl_screen *xwl_screen,
                                 uint32_t id, const char *name,
                                 uint32_t version)
 {
-    if (strcmp(name, "wl_drm") == 0) {
+    if (strcmp(name, wl_drm_interface.name) == 0) {
         xwl_screen_set_drm_interface(xwl_screen, id, version);
         return TRUE;
-    } else if (strcmp(name, "zwp_linux_dmabuf_v1") == 0) {
+    } else if (strcmp(name, zwp_linux_dmabuf_v1_interface.name) == 0) {
         xwl_screen_set_dmabuf_interface(xwl_screen, id, version);
         return TRUE;
     }

hw/xwayland/xwayland-input.c

@@ -3025,22 +3025,22 @@ input_handler(void *data, struct wl_registry *registry, uint32_t id,
 {
     struct xwl_screen *xwl_screen = data;
 
-    if (strcmp(interface, "wl_seat") == 0 && version >= 3) {
+    if (strcmp(interface, wl_seat_interface.name) == 0 && version >= 3) {
         create_input_device(xwl_screen, id, version);
         xwl_screen->expecting_event++;
-    } else if (strcmp(interface, "zwp_relative_pointer_manager_v1") == 0) {
+    } else if (strcmp(interface, zwp_relative_pointer_manager_v1_interface.name) == 0) {
         init_relative_pointer_manager(xwl_screen, id, version);
         maybe_init_relative_pointer_listeners_after_capabilities(xwl_screen);
-    } else if (strcmp(interface, "zwp_pointer_constraints_v1") == 0) {
+    } else if (strcmp(interface, zwp_pointer_constraints_v1_interface.name) == 0) {
         init_pointer_constraints(xwl_screen, id, version);
-    } else if (strcmp(interface, "zwp_pointer_gestures_v1") == 0) {
+    } else if (strcmp(interface, zwp_pointer_gestures_v1_interface.name) == 0) {
         init_pointer_gestures(xwl_screen, id, version);
         maybe_init_pointer_gesture_listeners_after_capabilities(xwl_screen);
-    } else if (strcmp(interface, "zwp_tablet_manager_v2") == 0) {
+    } else if (strcmp(interface, zwp_tablet_manager_v2_interface.name) == 0) {
         init_tablet_manager(xwl_screen, id, version);
-    } else if (strcmp(interface, "zwp_xwayland_keyboard_grab_manager_v1") == 0) {
+    } else if (strcmp(interface, zwp_xwayland_keyboard_grab_manager_v1_interface.name) == 0) {
         init_keyboard_grab(xwl_screen, id, version);
-    } else if (strcmp(interface, "zwp_keyboard_shortcuts_inhibit_manager_v1") == 0) {
+    } else if (strcmp(interface, zwp_keyboard_shortcuts_inhibit_manager_v1_interface.name) == 0) {
         init_keyboard_shortcuts_inhibit(xwl_screen, id, version);
     }
 }

hw/xwayland/xwayland-screen.c

@@ -41,6 +41,7 @@
 #include <dixstruct.h>
 #include <propertyst.h>
 #include <inputstr.h>
+#include <xacestr.h>
 #include <xserver_poll.h>
 
 #include "xwayland-cursor.h"
@@ -166,6 +167,33 @@ xwl_property_callback(CallbackListPtr *pcbl, void *closure,
         xwl_window_update_property(xwl_window, rec);
 }
 
+#define readOnlyPropertyAccessMask (DixReadAccess |\
+                                    DixGetAttrAccess |\
+                                    DixListPropAccess |\
+                                    DixGetPropAccess)
+
+static void
+xwl_access_property_callback(CallbackListPtr *pcbl, void *closure,
+                             void *calldata)
+{
+    XacePropertyAccessRec *rec = calldata;
+    PropertyPtr prop = *rec->ppProp;
+    ClientPtr client = rec->client;
+    Mask access_mode = rec->access_mode;
+    ScreenPtr pScreen = closure;
+    struct xwl_screen *xwl_screen = xwl_screen_get(pScreen);
+
+    if (prop->propertyName == xwl_screen->allow_commits_prop) {
+        /* Only the WM and the Xserver itself */
+        if (client != serverClient &&
+            client->index != xwl_screen->wm_client_id &&
+            (access_mode & ~readOnlyPropertyAccessMask) != 0)
+            rec->status = BadAccess;
+    }
+}
+
+#undef readOnlyPropertyAccessMask
+
 static void
 xwl_root_window_finalized_callback(CallbackListPtr *pcbl,
                                    void *closure,
@@ -195,6 +223,7 @@ xwl_close_screen(ScreenPtr screen)
     xwl_dmabuf_feedback_destroy(&xwl_screen->default_feedback);
 
     DeleteCallback(&PropertyStateCallback, xwl_property_callback, screen);
+    XaceDeleteCallback(XACE_PROPERTY_ACCESS, xwl_access_property_callback, screen);
 
     xorg_list_for_each_entry_safe(xwl_output, next_xwl_output,
                                   &xwl_screen->output_list, link)
@@ -419,7 +448,7 @@ registry_global(void *data, struct wl_registry *registry, uint32_t id,
 {
     struct xwl_screen *xwl_screen = data;
 
-    if (strcmp(interface, "wl_compositor") == 0) {
+    if (strcmp(interface, wl_compositor_interface.name) == 0) {
         uint32_t request_version = 1;
 
         if (version >= WL_SURFACE_DAMAGE_BUFFER_SINCE_VERSION)
@@ -428,28 +457,28 @@ registry_global(void *data, struct wl_registry *registry, uint32_t id,
         xwl_screen->compositor =
             wl_registry_bind(registry, id, &wl_compositor_interface, request_version);
     }
-    else if (strcmp(interface, "wl_shm") == 0) {
+    else if (strcmp(interface, wl_shm_interface.name) == 0) {
         xwl_screen->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1);
     }
-    else if (strcmp(interface, "xdg_wm_base") == 0) {
+    else if (strcmp(interface, xdg_wm_base_interface.name) == 0) {
         xwl_screen->xdg_wm_base =
             wl_registry_bind(registry, id, &xdg_wm_base_interface, 1);
         xdg_wm_base_add_listener(xwl_screen->xdg_wm_base,
                                  &xdg_wm_base_listener,
                                  NULL);
     }
-    else if (strcmp(interface, "wl_output") == 0 && version >= 2) {
+    else if (strcmp(interface, wl_output_interface.name) == 0 && version >= 2) {
         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) {
+    else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
         /* We support xdg-output from version 1 to version 3 */
         version = min(version, 3);
         xwl_screen->xdg_output_manager =
             wl_registry_bind(registry, id, &zxdg_output_manager_v1_interface, version);
         xwl_screen_init_xdg_output(xwl_screen);
     }
-    else if (strcmp(interface, "wp_drm_lease_device_v1") == 0) {
+    else if (strcmp(interface, wp_drm_lease_device_v1_interface.name) == 0) {
         if (xwl_screen->screen->root == NULL) {
             struct xwl_queued_drm_lease_device *queued = malloc(sizeof(struct xwl_queued_drm_lease_device));
             queued->id = id;
@@ -458,14 +487,14 @@ registry_global(void *data, struct wl_registry *registry, uint32_t id,
             xwl_screen_add_drm_lease_device(xwl_screen, id);
         }
     }
-    else if (strcmp(interface, "wp_viewporter") == 0) {
+    else if (strcmp(interface, wp_viewporter_interface.name) == 0) {
         xwl_screen->viewporter = wl_registry_bind(registry, id, &wp_viewporter_interface, 1);
     }
-    else if (strcmp(interface, "xwayland_shell_v1") == 0 && xwl_screen->rootless) {
+    else if (strcmp(interface, xwayland_shell_v1_interface.name) == 0 && xwl_screen->rootless) {
         xwl_screen->xwayland_shell =
             wl_registry_bind(registry, id, &xwayland_shell_v1_interface, 1);
     }
-    else if (strcmp(interface, "wp_tearing_control_manager_v1") == 0) {
+    else if (strcmp(interface, wp_tearing_control_manager_v1_interface.name) == 0) {
         xwl_screen->tearing_control_manager =
             wl_registry_bind(registry, id, &wp_tearing_control_manager_v1_interface, 1);
     }
@@ -1027,6 +1056,7 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
 
     AddCallback(&PropertyStateCallback, xwl_property_callback, pScreen);
     AddCallback(&RootWindowFinalizeCallback, xwl_root_window_finalized_callback, pScreen);
+    XaceRegisterCallback(XACE_PROPERTY_ACCESS, xwl_access_property_callback, pScreen);
 
     xwl_screen_setup_custom_vector(xwl_screen);
 

meson.build

@@ -691,7 +691,10 @@ glx_inc = include_directories('glx')
 
 top_dir_inc = include_directories('.')
 
-serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg')
+serverconfigdir = get_option('serverconfigdir')
+if serverconfigdir == ''
+    serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg')
+endif
 
 manpage_config = configuration_data()
 manpage_config.set('vendorversion', '"xorg-server @0@" "X Version 11"'.format(meson.project_version()))

meson_options.txt

@@ -29,6 +29,8 @@ option('module_dir', type: 'string', value: 'xorg/modules',
 option('default_font_path', type: 'string')
 option('fontrootdir', type: 'string',
         description: 'Root directory for legacy fonts. Default: from font-utils.pc or $datadir/fonts/X11')
+option('serverconfigdir', type: 'string',
+        description: 'Miscellaneous server configuration files path. Default: $libdir/xorg')
 
 option('glx', type: 'boolean', value: true)
 option('xdmcp', type: 'boolean', value: true)