portal: send toplevel identifier in jay_toplevel

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! {