portal: send toplevel identifier in jay_toplevel

src/ifs/jay_compositor.rs

@@ -71,7 +71,7 @@ impl Global for JayCompositorGlobal {
     }
 
     fn version(&self) -> u32 {
-        11
+        12
     }
 
     fn required_caps(&self) -> ClientCaps {
@@ -369,6 +369,7 @@ impl JayCompositorRequestHandler for JayCompositor {
             client: self.client.clone(),
             tracker: Default::default(),
             destroyed: Cell::new(false),
+            version: self.version,
         });
         track!(self.client, obj);
         self.client.add_client_obj(&obj)?;

src/ifs/jay_select_toplevel.rs

@@ -1,7 +1,10 @@
 use {
     crate::{
         client::{Client, ClientError},
-        ifs::{jay_toplevel::JayToplevel, wl_seat::ToplevelSelector},
+        ifs::{
+            jay_toplevel::{JayToplevel, ID_SINCE},
+            wl_seat::ToplevelSelector,
+        },
         leaks::Tracker,
         object::{Object, Version},
         tree::ToplevelNode,
@@ -17,6 +20,7 @@ pub struct JaySelectToplevel {
     pub client: Rc<Client>,
     pub tracker: Tracker<Self>,
     pub destroyed: Cell<bool>,
+    pub version: Version,
 }
 
 pub struct JayToplevelSelector {
@@ -35,8 +39,8 @@ impl Drop for JayToplevelSelector {
         if self.jst.destroyed.get() {
             return;
         }
-        let id = match self.tl.take() {
-            None => JayToplevelId::NONE,
+        let jtl = match self.tl.take() {
+            None => None,
             Some(toplevel) => {
                 let id = match self.jst.client.new_id() {
                     Ok(id) => id,
@@ -51,6 +55,7 @@ impl Drop for JayToplevelSelector {
                     tracker: Default::default(),
                     toplevel,
                     destroyed: Cell::new(false),
+                    version: self.jst.version,
                 });
                 track!(self.jst.client, jtl);
                 self.jst.client.add_server_obj(&jtl);
@@ -58,10 +63,19 @@ impl Drop for JayToplevelSelector {
                     .tl_data()
                     .jay_toplevels
                     .set((jtl.client.id, jtl.id), jtl.clone());
-                jtl.id
+                Some(jtl)
             }
         };
-        self.jst.send_done(id);
+        match jtl {
+            None => self.jst.send_done(JayToplevelId::NONE),
+            Some(jtl) => {
+                self.jst.send_done(jtl.id);
+                if jtl.version >= ID_SINCE {
+                    jtl.send_id();
+                    jtl.send_done();
+                }
+            }
+        }
         let _ = self.jst.client.remove_obj(&*self.jst);
     }
 }

src/ifs/jay_toplevel.rs

@@ -10,12 +10,15 @@ use {
     thiserror::Error,
 };
 
+pub const ID_SINCE: Version = Version(12);
+
 pub struct JayToplevel {
     pub id: JayToplevelId,
     pub client: Rc<Client>,
     pub tracker: Tracker<Self>,
     pub toplevel: Rc<dyn ToplevelNode>,
     pub destroyed: Cell<bool>,
+    pub version: Version,
 }
 
 impl JayToplevel {
@@ -35,6 +38,18 @@ impl JayToplevel {
     fn send_destroyed(&self) {
         self.client.event(Destroyed { self_id: self.id });
     }
+
+    pub fn send_id(&self) {
+        let s = self.toplevel.tl_data().identifier.get().to_string();
+        self.client.event(Id {
+            self_id: self.id,
+            id: &s,
+        })
+    }
+
+    pub fn send_done(&self) {
+        self.client.event(Done { self_id: self.id })
+    }
 }
 
 impl JayToplevelRequestHandler for JayToplevel {

src/portal/ptl_display.rs

@@ -323,7 +323,7 @@ fn finish_display_connect(dpy: Rc<PortalDisplayPrelude>) {
                     con: dpy.con.clone(),
                     owner: Default::default(),
                     caps: Default::default(),
-                    version: Version(version.min(9)),
+                    version: Version(version.min(12)),
                 });
                 dpy.con.add_object(jc.clone());
                 dpy.registry.request_bind(name, jc.version.0, jc.deref());

src/wl_usr/usr_ifs/usr_jay_select_toplevel.rs

@@ -1,9 +1,14 @@
 use {
     crate::{
+        ifs::jay_toplevel::ID_SINCE,
         object::Version,
         utils::clonecell::CloneCell,
         wire::{jay_select_toplevel::*, JaySelectToplevelId},
-        wl_usr::{usr_ifs::usr_jay_toplevel::UsrJayToplevel, usr_object::UsrObject, UsrCon},
+        wl_usr::{
+            usr_ifs::usr_jay_toplevel::{UsrJayToplevel, UsrJayToplevelOwner},
+            usr_object::UsrObject,
+            UsrCon,
+        },
     },
     std::{convert::Infallible, rc::Rc},
 };
@@ -15,6 +20,19 @@ pub struct UsrJaySelectToplevel {
     pub version: Version,
 }
 
+impl UsrJaySelectToplevel {
+    fn send(&self, tl: Option<Rc<UsrJayToplevel>>) {
+        if let Some(owner) = self.owner.get() {
+            owner.done(tl);
+        } else {
+            if let Some(tl) = tl {
+                self.con.remove_obj(&*tl);
+            }
+        }
+        self.con.remove_obj(self);
+    }
+}
+
 pub trait UsrJaySelectToplevelOwner {
     fn done(&self, toplevel: Option<Rc<UsrJayToplevel>>);
 }
@@ -22,7 +40,7 @@ pub trait UsrJaySelectToplevelOwner {
 impl JaySelectToplevelEventHandler for UsrJaySelectToplevel {
     type Error = Infallible;
 
-    fn done(&self, ev: Done, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+    fn done(&self, ev: Done, slf: &Rc<Self>) -> Result<(), Self::Error> {
         let tl = if ev.id.is_none() {
             None
         } else {
@@ -31,23 +49,31 @@ impl JaySelectToplevelEventHandler for UsrJaySelectToplevel {
                 con: self.con.clone(),
                 owner: Default::default(),
                 version: self.version,
+                toplevel_id: Default::default(),
             });
             self.con.add_object(tl.clone());
             Some(tl)
         };
-        match self.owner.get() {
-            Some(owner) => owner.done(tl),
-            _ => {
+        'send: {
+            if self.version >= ID_SINCE {
                 if let Some(tl) = tl {
-                    self.con.remove_obj(&*tl);
+                    tl.owner.set(Some(slf.clone()));
+                    break 'send;
                 }
             }
+            self.send(tl);
         }
-        self.con.remove_obj(self);
         Ok(())
     }
 }
 
+impl UsrJayToplevelOwner for UsrJaySelectToplevel {
+    fn done(&self, tl: &Rc<UsrJayToplevel>) {
+        tl.owner.take();
+        self.send(Some(tl.clone()));
+    }
+}
+
 usr_object_base! {
     self = UsrJaySelectToplevel = JaySelectToplevel;
     version = self.version;

src/wl_usr/usr_ifs/usr_jay_toplevel.rs

@@ -5,7 +5,7 @@ use {
         wire::{jay_toplevel::*, JayToplevelId},
         wl_usr::{usr_object::UsrObject, UsrCon},
     },
-    std::{convert::Infallible, rc::Rc},
+    std::{cell::RefCell, convert::Infallible, rc::Rc},
 };
 
 pub struct UsrJayToplevel {
@@ -13,10 +13,12 @@ pub struct UsrJayToplevel {
     pub con: Rc<UsrCon>,
     pub owner: CloneCell<Option<Rc<dyn UsrJayToplevelOwner>>>,
     pub version: Version,
+    pub toplevel_id: RefCell<Option<String>>,
 }
 
 pub trait UsrJayToplevelOwner {
     fn destroyed(&self) {}
+    fn done(&self, tl: &Rc<UsrJayToplevel>);
 }
 
 impl JayToplevelEventHandler for UsrJayToplevel {
@@ -28,6 +30,18 @@ impl JayToplevelEventHandler for UsrJayToplevel {
         }
         Ok(())
     }
+
+    fn id_(&self, ev: Id<'_>, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        *self.toplevel_id.borrow_mut() = Some(ev.id.to_string());
+        Ok(())
+    }
+
+    fn done(&self, _ev: Done, slf: &Rc<Self>) -> Result<(), Self::Error> {
+        if let Some(owner) = self.owner.get() {
+            owner.done(slf);
+        }
+        Ok(())
+    }
 }
 
 usr_object_base! {

wire/jay_toplevel.txt

@@ -3,3 +3,10 @@ request destroy {
 
 event destroyed {
 }
+
+event id (since = 12) {
+    id: str,
+}
+
+event done (since = 12) {
+}