all: split reusable components into workspace crates

src/client.rs

@@ -25,7 +25,6 @@ use {
             pending_serial::PendingSerial,
             pid_info::{PidInfo, get_pid_info, get_socket_creds},
             pidfd_send_signal::pidfd_send_signal,
-            static_text::StaticText,
         },
         wire::WlRegistryId,
     },
@@ -71,35 +70,6 @@ bitflags! {
         CAP_FOREIGN_TOPLEVEL_GEOMETRY_TRACKING = 1 << 16,
 }
 
-impl StaticText for ClientCapsEnum {
-    fn text(&self) -> &'static str {
-        match self {
-            ClientCapsEnum::CAP_DATA_CONTROL_MANAGER => "data-control",
-            ClientCapsEnum::CAP_VIRTUAL_KEYBOARD_MANAGER => "virtual-keyboard",
-            ClientCapsEnum::CAP_FOREIGN_TOPLEVEL_LIST => "foreign-toplevel-list",
-            ClientCapsEnum::CAP_IDLE_NOTIFIER => "idle-notifier",
-            ClientCapsEnum::CAP_SESSION_LOCK_MANAGER => "session-lock",
-            ClientCapsEnum::CAP_JAY_COMPOSITOR => "jay-compositor",
-            ClientCapsEnum::CAP_LAYER_SHELL => "layer-shell",
-            ClientCapsEnum::CAP_SCREENCOPY_MANAGER => "screencopy",
-            ClientCapsEnum::CAP_SEAT_MANAGER => "seat-manager",
-            ClientCapsEnum::CAP_DRM_LEASE => "drm-lease",
-            ClientCapsEnum::CAP_INPUT_METHOD => "input-method",
-            ClientCapsEnum::CAP_WORKSPACE => "workspace-manager",
-            ClientCapsEnum::CAP_FOREIGN_TOPLEVEL_MANAGER => "foreign-toplevel-manager",
-            ClientCapsEnum::CAP_HEAD_MANAGER => "head-manager",
-            ClientCapsEnum::CAP_GAMMA_CONTROL_MANAGER => "gamma-control-manager",
-            ClientCapsEnum::CAP_VIRTUAL_POINTER_MANAGER => "virtual-pointer",
-            ClientCapsEnum::CAP_FOREIGN_TOPLEVEL_GEOMETRY_TRACKING => {
-                "foreign-toplevel-geometry-tracking"
-            }
-        }
-    }
-}
-
-pub const CAPS_DEFAULT: ClientCaps = ClientCaps(CAP_LAYER_SHELL.0 | CAP_DRM_LEASE.0);
-pub const CAPS_DEFAULT_SANDBOXED: ClientCaps = ClientCaps(CAP_DRM_LEASE.0);
-
 #[derive(Debug, Copy, Clone, Hash, Ord, PartialOrd, Eq, PartialEq)]
 pub struct ClientId(u64);
 
@@ -156,24 +126,12 @@ impl Clients {
         id: ClientId,
         global: &Rc<State>,
         socket: Rc<OwnedFd>,
-        bounding_caps: ClientCaps,
-        set_bounding_caps_for_children: bool,
         acceptor: &Rc<AcceptorMetadata>,
     ) -> Result<(), ClientError> {
         let Some((uid, pid)) = get_socket_creds(&socket) else {
             return Ok(());
         };
-        self.spawn2(
-            id,
-            global,
-            socket,
-            uid,
-            pid,
-            bounding_caps,
-            set_bounding_caps_for_children,
-            false,
-            acceptor,
-        )?;
+        self.spawn2(id, global, socket, uid, pid, false, acceptor)?;
         Ok(())
     }
 
@@ -184,15 +142,9 @@ impl Clients {
         socket: Rc<OwnedFd>,
         uid: c::uid_t,
         pid: c::pid_t,
-        bounding_caps: ClientCaps,
-        set_bounding_caps_for_children: bool,
         is_xwayland: bool,
         acceptor: &Rc<AcceptorMetadata>,
     ) -> Result<Rc<Client>, ClientError> {
-        let effective_caps = match acceptor.sandboxed {
-            true => CAPS_DEFAULT_SANDBOXED,
-            false => CAPS_DEFAULT,
-        };
         let data = Rc::new_cyclic(|slf| Client {
             id,
             state: global.clone(),
@@ -204,8 +156,6 @@ impl Clients {
             shutdown: Default::default(),
             tracker: Default::default(),
             is_xwayland,
-            effective_caps: Cell::new(effective_caps & bounding_caps),
-            bounding_caps_for_children: Cell::new(bounding_caps),
             last_enter_serial: Default::default(),
             pid_info: get_pid_info(uid, pid),
             serials: Default::default(),
@@ -226,10 +176,6 @@ impl Clients {
             acceptor: acceptor.clone(),
         });
         track!(data, data);
-        global.update_capabilities(&data, bounding_caps, set_bounding_caps_for_children);
-        if acceptor.secure || is_xwayland {
-            data.effective_caps.set(ClientCaps::all());
-        }
         let display = Rc::new(WlDisplay::new(&data));
         track!(data, display);
         data.objects.display.set(Some(display.clone()));
@@ -239,13 +185,12 @@ impl Clients {
             data: data.clone(),
         };
         log::info!(
-            "Client {} connected, pid: {}, uid: {}, fd: {}, comm: {:?}, caps: {:?}",
+            "Client {} connected, pid: {}, uid: {}, fd: {}, comm: {:?}",
             id,
             pid,
             uid,
             client.data.socket.raw(),
             data.pid_info.comm,
-            data.effective_caps.get(),
         );
         client.data.property_changed(CL_CHANGED_NEW);
         self.clients.borrow_mut().insert(client.data.id, client);
@@ -274,9 +219,8 @@ impl Clients {
     {
         let clients = self.clients.borrow();
         for client in clients.values() {
-            if client.data.effective_caps.get().contains(required_caps)
-                && (!xwayland_only || client.data.is_xwayland)
-            {
+            let _ = required_caps;
+            if !xwayland_only || client.data.is_xwayland {
                 f(&client.data);
             }
         }
@@ -336,8 +280,6 @@ pub struct Client {
     shutdown: AsyncEvent,
     pub tracker: Tracker<Client>,
     pub is_xwayland: bool,
-    pub effective_caps: Cell<ClientCaps>,
-    pub bounding_caps_for_children: Cell<ClientCaps>,
     pub last_enter_serial: Cell<Option<u64>>,
     pub pid_info: PidInfo,
     pub serials: RefCell<VecDeque<SerialRange>>,
@@ -349,7 +291,7 @@ pub struct Client {
     pub wire_scale: Cell<Option<i32>>,
     pub focus_stealing_serial: Cell<Option<u64>>,
     pub changed_properties: Cell<ClMatcherChange>,
-    pub destroyed: CopyHashMap<CritMatcherId, Weak<dyn CritDestroyListener<Rc<Self>>>>,
+    pub destroyed: CopyHashMap<CritMatcherId, Weak<dyn CritDestroyListener<Self>>>,
     pub acceptor: Rc<AcceptorMetadata>,
 }