Merge pull request #333 from mahkoh/jorth/set-keymap-no-seal

mmap: use MAP_PRIVATE for all keymaps

src/cli/input.rs

@@ -354,7 +354,7 @@ impl Input {
         let data = Rc::new(RefCell::new(Vec::new()));
         jay_input::Keymap::handle(&self.tc, input, data.clone(), |d, map| {
             let mem = Rc::new(
-                ClientMem::new(&map.keymap, map.keymap_len as _, true, None, None).unwrap(),
+                ClientMem::new_private(&map.keymap, map.keymap_len as _, true, None, None).unwrap(),
             )
             .offset(0);
             mem.read(d.borrow_mut().deref_mut()).unwrap();

src/clientmem.rs

@@ -57,7 +57,6 @@ impl ClientMem {
         Self::new2(fd, len, read_only, client, cpu, c::MAP_SHARED)
     }
 
-    #[cfg_attr(not(feature = "it"), expect(dead_code))]
     pub fn new_private(
         fd: &Rc<OwnedFd>,
         len: usize,

src/ifs/jay_input.rs

@@ -169,7 +169,7 @@ impl JayInput {
     where
         F: FnOnce(&Rc<XkbKeymap>) -> Result<(), JayInputError>,
     {
-        let cm = Rc::new(ClientMem::new(
+        let cm = Rc::new(ClientMem::new_private(
             keymap,
             len as _,
             true,

src/ifs/wl_seat/zwp_virtual_keyboard_v1.rs

@@ -56,7 +56,7 @@ impl ZwpVirtualKeyboardV1RequestHandler for ZwpVirtualKeyboardV1 {
         if req.size > MAX_SIZE {
             return Err(ZwpVirtualKeyboardV1Error::OversizedKeymap);
         }
-        let client_mem = ClientMem::new(
+        let client_mem = ClientMem::new_private(
             &req.fd,
             req.size as usize - 1,
             true,