it: test window gains kb focus when mapped

src/it/test_ifs/test_keyboard.rs

@@ -0,0 +1,89 @@
+use {
+    crate::{
+        ifs::wl_seat::wl_keyboard::WlKeyboard,
+        it::{
+            test_error::TestResult, test_object::TestObject, test_transport::TestTransport,
+            test_utils::test_expected_event::TEEH, testrun::ParseFull,
+        },
+        utils::{buffd::MsgParser, clonecell::CloneCell, once::Once},
+        wire::{wl_keyboard::*, WlKeyboardId, WlSurfaceId},
+    },
+    std::rc::Rc,
+};
+
+pub struct TestEnterEvent {
+    pub serial: u32,
+    pub surface: WlSurfaceId,
+    pub keys: Vec<u32>,
+}
+
+pub struct TestKeyboard {
+    pub id: WlKeyboardId,
+    pub tran: Rc<TestTransport>,
+    pub server: CloneCell<Option<Rc<WlKeyboard>>>,
+    pub destroyed: Once,
+    pub enter: TEEH<TestEnterEvent>,
+}
+
+impl TestKeyboard {
+    pub fn destroy(&self) -> TestResult {
+        if self.destroyed.set() {
+            self.tran.send(Release { self_id: self.id })?;
+        }
+        Ok(())
+    }
+
+    fn handle_keymap(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Keymap::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_enter(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let ev = Enter::parse_full(parser)?;
+        self.enter.push(TestEnterEvent {
+            serial: ev.serial,
+            surface: ev.surface,
+            keys: ev.keys.to_vec(),
+        });
+        Ok(())
+    }
+
+    fn handle_leave(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Leave::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_key(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Key::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_modifiers(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Modifiers::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_repeat_info(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = RepeatInfo::parse_full(parser)?;
+        Ok(())
+    }
+}
+
+impl Drop for TestKeyboard {
+    fn drop(&mut self) {
+        let _ = self.destroy();
+    }
+}
+
+test_object! {
+    TestKeyboard, WlKeyboard;
+
+    KEYMAP => handle_keymap,
+    ENTER => handle_enter,
+    LEAVE => handle_leave,
+    KEY => handle_key,
+    MODIFIERS => handle_modifiers,
+    REPEAT_INFO => handle_repeat_info,
+}
+
+impl TestObject for TestKeyboard {}

src/it/test_ifs/test_pointer.rs

@@ -0,0 +1,95 @@
+use {
+    crate::{
+        ifs::wl_seat::wl_pointer::WlPointer,
+        it::{
+            test_error::TestResult, test_object::TestObject, test_transport::TestTransport,
+            testrun::ParseFull,
+        },
+        utils::{buffd::MsgParser, clonecell::CloneCell},
+        wire::{wl_pointer::*, WlPointerId},
+    },
+    std::{cell::Cell, rc::Rc},
+};
+
+pub struct TestPointer {
+    pub id: WlPointerId,
+    pub tran: Rc<TestTransport>,
+    pub server: CloneCell<Option<Rc<WlPointer>>>,
+    pub destroyed: Cell<bool>,
+}
+
+impl TestPointer {
+    pub fn destroy(&self) -> TestResult {
+        if !self.destroyed.replace(true) {
+            self.tran.send(Release { self_id: self.id })?;
+        }
+        Ok(())
+    }
+
+    fn handle_enter(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Enter::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_leave(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Leave::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_motion(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Motion::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_button(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Button::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_axis(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Axis::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_frame(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = Frame::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_axis_source(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = AxisSource::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_axis_stop(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = AxisStop::parse_full(parser)?;
+        Ok(())
+    }
+
+    fn handle_axis_discrete(&self, parser: MsgParser<'_, '_>) -> TestResult {
+        let _ev = AxisDiscrete::parse_full(parser)?;
+        Ok(())
+    }
+}
+
+impl Drop for TestPointer {
+    fn drop(&mut self) {
+        let _ = self.destroy();
+    }
+}
+
+test_object! {
+    TestPointer, WlPointer;
+
+    ENTER => handle_enter,
+    LEAVE => handle_leave,
+    MOTION => handle_motion,
+    BUTTON => handle_button,
+    AXIS => handle_axis,
+    FRAME => handle_frame,
+    AXIS_SOURCE => handle_axis_source,
+    AXIS_STOP => handle_axis_stop,
+    AXIS_DISCRETE => handle_axis_discrete,
+}
+
+impl TestObject for TestPointer {}

src/it/test_ifs/test_seat.rs

@@ -0,0 +1,99 @@
+use {
+    crate::{
+        ifs::wl_seat::WlSeat,
+        it::{
+            test_error::{TestError, TestResult},
+            test_ifs::{test_keyboard::TestKeyboard, test_pointer::TestPointer},
+            test_object::TestObject,
+            test_transport::TestTransport,
+            testrun::ParseFull,
+        },
+        utils::{buffd::MsgParser, clonecell::CloneCell, once::Once},
+        wire::{wl_seat::*, WlSeatId},
+    },
+    std::{cell::Cell, rc::Rc},
+};
+
+pub struct TestSeat {
+    pub id: WlSeatId,
+    pub tran: Rc<TestTransport>,
+    pub server: CloneCell<Option<Rc<WlSeat>>>,
+    pub destroyed: Once,
+    pub caps: Cell<u32>,
+    pub name: CloneCell<Option<Rc<String>>>,
+}
+
+impl TestSeat {
+    pub fn destroy(&self) -> Result<(), TestError> {
+        if self.destroyed.set() {
+            self.tran.send(Release { self_id: self.id })?;
+        }
+        Ok(())
+    }
+
+    pub async fn get_keyboard(&self) -> TestResult<Rc<TestKeyboard>> {
+        let id = self.tran.id();
+        self.tran.send(GetKeyboard {
+            self_id: self.id,
+            id,
+        })?;
+        let kb = Rc::new(TestKeyboard {
+            id,
+            tran: self.tran.clone(),
+            server: Default::default(),
+            destroyed: Default::default(),
+            enter: Default::default(),
+        });
+        self.tran.add_obj(kb.clone())?;
+        self.tran.sync().await;
+        let server = self.tran.get_server_obj(id)?;
+        kb.server.set(Some(server));
+        Ok(kb)
+    }
+
+    pub async fn get_pointer(&self) -> TestResult<Rc<TestPointer>> {
+        let id = self.tran.id();
+        self.tran.send(GetPointer {
+            self_id: self.id,
+            id,
+        })?;
+        let pointer = Rc::new(TestPointer {
+            id,
+            tran: self.tran.clone(),
+            server: Default::default(),
+            destroyed: Default::default(),
+        });
+        self.tran.add_obj(pointer.clone())?;
+        self.tran.sync().await;
+        let server = self.tran.get_server_obj(id)?;
+        pointer.server.set(Some(server));
+        Ok(pointer)
+    }
+
+    fn handle_capabilities(&self, parser: MsgParser<'_, '_>) -> Result<(), TestError> {
+        let ev = Capabilities::parse_full(parser)?;
+        self.caps.set(ev.capabilities);
+        Ok(())
+    }
+
+    fn handle_name(&self, parser: MsgParser<'_, '_>) -> Result<(), TestError> {
+        let ev = Name::parse_full(parser)?;
+        self.name.set(Some(Rc::new(ev.name.to_string())));
+        Ok(())
+    }
+}
+
+impl Drop for TestSeat {
+    fn drop(&mut self) {
+        let _ = self.destroy();
+    }
+}
+
+test_object! {
+    TestSeat, WlSeat;
+
+    CAPABILITIES => handle_capabilities,
+    NAME => handle_name,
+}
+
+impl TestObject for TestSeat {}

src/it/test_ifs/test_subcompositor.rs

@@ -40,7 +40,7 @@ impl TestSubcompositor {
             id,
             tran: self.tran.clone(),
             destroyed: Cell::new(false),
-            server: self.tran.get_object(id)?,
+            server: self.tran.get_server_obj(id)?,
         });
         self.tran.add_obj(ss.clone())?;
         Ok(ss)