Added basic support for input_regions

waycrate · Dec 27, 2024 · e6b01b9 · e6b01b9
1 parent 70bcb15
commit e6b01b9
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 43 deletions.
diff --git a/iced_layershell/src/actions.rs b/iced_layershell/src/actions.rs
@@ -1,4 +1,4 @@
-use crate::reexport::{Anchor, Layer};
+use crate::reexport::{Anchor, Layer, WlRegion};
 use iced::window::Id as IcedId;
 use iced_core::mouse::Interaction;
 use layershellev::id::Id as LayerId;
@@ -69,6 +69,7 @@ pub enum LayershellCustomActions {
         settings: NewLayerShellSettings,
         id: IcedId,
     },
+    SetInputRegion(fn(&WlRegion)),
     NewPopUp {
         settings: IcedNewPopupSettings,
         id: IcedId,

diff --git a/iced_layershell/src/application.rs b/iced_layershell/src/application.rs
@@ -22,6 +22,7 @@ use iced_futures::{Executor, Runtime, Subscription};
 
 use layershellev::{
     calloop::timer::{TimeoutAction, Timer},
+    reexport::wayland_client::{WlCompositor, WlRegion},
     reexport::zwp_virtual_keyboard_v1,
     LayerEvent, ReturnData, StartMode, WindowWrapper,
 };
@@ -196,36 +197,41 @@ where
     ));
 
     let mut context = task::Context::from_waker(task::noop_waker_ref());
-
+    let mut wl_input_region: Option<WlRegion> = None;
     let mut pointer_serial: u32 = 0;
 
     let _ = ev.running_with_proxy(message_receiver, move |event, ev, _| {
         use layershellev::DispatchMessage;
         let mut def_returndata = ReturnData::None;
         match event {
             LayerEvent::InitRequest => {
-                if settings.virtual_keyboard_support.is_some() {
-                    def_returndata = ReturnData::RequestBind;
-                }
+                def_returndata = ReturnData::RequestBind;
             }
             LayerEvent::BindProvide(globals, qh) => {
-                let virtual_keyboard_manager = globals
-                    .bind::<zwp_virtual_keyboard_v1::ZwpVirtualKeyboardManagerV1, _, _>(
-                        qh,
-                        1..=1,
-                        (),
-                    )
-                    .expect("no support virtual_keyboard");
-                let VirtualKeyboardSettings {
-                    file,
-                    keymap_size,
-                    keymap_format,
-                } = settings.virtual_keyboard_support.as_ref().unwrap();
-                let seat = ev.get_seat();
-                let virtual_keyboard_in =
-                    virtual_keyboard_manager.create_virtual_keyboard(seat, qh, ());
-                virtual_keyboard_in.keymap((*keymap_format).into(), file.as_fd(), *keymap_size);
-                ev.set_virtual_keyboard(virtual_keyboard_in);
+                let wl_compositor = globals.bind::<WlCompositor, _, _>(qh, 1..=1, ());
+                if let Ok(wl_compositor) = wl_compositor {
+                    wl_input_region = Some(wl_compositor.create_region(qh, ()));
+                }
+
+                if settings.virtual_keyboard_support.is_some() {
+                    let virtual_keyboard_manager = globals
+                        .bind::<zwp_virtual_keyboard_v1::ZwpVirtualKeyboardManagerV1, _, _>(
+                            qh,
+                            1..=1,
+                            (),
+                        )
+                        .expect("no support virtual_keyboard");
+                    let VirtualKeyboardSettings {
+                        file,
+                        keymap_size,
+                        keymap_format,
+                    } = settings.virtual_keyboard_support.as_ref().unwrap();
+                    let seat = ev.get_seat();
+                    let virtual_keyboard_in =
+                        virtual_keyboard_manager.create_virtual_keyboard(seat, qh, ());
+                    virtual_keyboard_in.keymap((*keymap_format).into(), file.as_fd(), *keymap_size);
+                    ev.set_virtual_keyboard(virtual_keyboard_in);
+                }
             }
             LayerEvent::RequestMessages(message) => {
                 if let DispatchMessage::MouseEnter { serial, .. } = message {
@@ -269,6 +275,22 @@ where
                     LayershellCustomActions::LayerChange(layer) => {
                         ev.main_window().set_layer(layer);
                     }
+                    LayershellCustomActions::SetInputRegion(set_region) => {
+                        let window = ev.main_window();
+
+                        if let Some(region) = &wl_input_region {
+                            let window_size = window.get_size();
+                            let width: i32 = window_size.0.try_into().unwrap_or_default();
+                            let height: i32 = window_size.1.try_into().unwrap_or_default();
+
+                            region.subtract(0, 0, width, height);
+                            set_region(region);
+                        }
+
+                        window
+                            .get_wlsurface()
+                            .set_input_region(wl_input_region.as_ref());
+                    }
                     LayershellCustomActions::MarginChange(margin) => {
                         ev.main_window().set_margin(margin);
                     }

diff --git a/iced_layershell/src/lib.rs b/iced_layershell/src/lib.rs
@@ -13,7 +13,7 @@ mod sandbox;
 pub mod settings;
 
 pub mod reexport {
-    pub use layershellev::reexport::wayland_client::wl_keyboard;
+    pub use layershellev::reexport::wayland_client::{wl_keyboard, WlRegion};
     pub use layershellev::reexport::Anchor;
     pub use layershellev::reexport::KeyboardInteractivity;
     pub use layershellev::reexport::Layer;

diff --git a/iced_layershell/src/multi_window.rs b/iced_layershell/src/multi_window.rs
@@ -32,6 +32,7 @@ use iced_futures::{Executor, Runtime, Subscription};
 
 use layershellev::{
     calloop::timer::{TimeoutAction, Timer},
+    reexport::wayland_client::{WlCompositor, WlRegion},
     reexport::zwp_virtual_keyboard_v1,
     LayerEvent, NewPopUpSettings, ReturnData, WindowState, WindowWrapper,
 };
@@ -210,6 +211,7 @@ where
     let mut context = task::Context::from_waker(task::noop_waker_ref());
 
     let mut pointer_serial: u32 = 0;
+    let mut wl_input_region: Option<WlRegion> = None;
 
     let _ = ev.running_with_proxy(message_receiver, move |event, ev, index| {
         use layershellev::DispatchMessage;
@@ -219,28 +221,33 @@ where
             .map(|unit| unit.id());
         match event {
             LayerEvent::InitRequest => {
-                if settings.virtual_keyboard_support.is_some() {
-                    def_returndata = ReturnData::RequestBind;
-                }
+                def_returndata = ReturnData::RequestBind;
             }
             LayerEvent::BindProvide(globals, qh) => {
-                let virtual_keyboard_manager = globals
-                    .bind::<zwp_virtual_keyboard_v1::ZwpVirtualKeyboardManagerV1, _, _>(
-                        qh,
-                        1..=1,
-                        (),
-                    )
-                    .expect("no support virtual_keyboard");
-                let VirtualKeyboardSettings {
-                    file,
-                    keymap_size,
-                    keymap_format,
-                } = settings.virtual_keyboard_support.as_ref().unwrap();
-                let seat = ev.get_seat();
-                let virtual_keyboard_in =
-                    virtual_keyboard_manager.create_virtual_keyboard(seat, qh, ());
-                virtual_keyboard_in.keymap((*keymap_format).into(), file.as_fd(), *keymap_size);
-                ev.set_virtual_keyboard(virtual_keyboard_in);
+                let wl_compositor = globals.bind::<WlCompositor, _, _>(qh, 1..=1, ());
+                if let Ok(wl_compositor) = wl_compositor {
+                    wl_input_region = Some(wl_compositor.create_region(qh, ()));
+                }
+
+                if settings.virtual_keyboard_support.is_some() {
+                    let virtual_keyboard_manager = globals
+                        .bind::<zwp_virtual_keyboard_v1::ZwpVirtualKeyboardManagerV1, _, _>(
+                            qh,
+                            1..=1,
+                            (),
+                        )
+                        .expect("no support virtual_keyboard");
+                    let VirtualKeyboardSettings {
+                        file,
+                        keymap_size,
+                        keymap_format,
+                    } = settings.virtual_keyboard_support.as_ref().unwrap();
+                    let seat = ev.get_seat();
+                    let virtual_keyboard_in =
+                        virtual_keyboard_manager.create_virtual_keyboard(seat, qh, ());
+                    virtual_keyboard_in.keymap((*keymap_format).into(), file.as_fd(), *keymap_size);
+                    ev.set_virtual_keyboard(virtual_keyboard_in);
+                }
             }
             LayerEvent::RequestMessages(message) => 'outside: {
                 match message {
@@ -355,6 +362,28 @@ where
                             };
                             window.set_size((width, height));
                         }
+                        LayershellCustomActions::SetInputRegion(set_region) => {
+                            let Some(id) = id else {
+                                break 'out;
+                            };
+                            let Some(window) = ev.get_window_with_id(id) else {
+                                break 'out;
+                            };
+                            let Some(region) = &wl_input_region else {
+                                break 'out;
+                            };
+
+                            let window_size = window.get_size();
+                            let width: i32 = window_size.0.try_into().unwrap_or_default();
+                            let height: i32 = window_size.1.try_into().unwrap_or_default();
+
+                            region.subtract(0, 0, width, height);
+                            set_region(region);
+
+                            window
+                                .get_wlsurface()
+                                .set_input_region(wl_input_region.as_ref());
+                        }
                         LayershellCustomActions::VirtualKeyboardPressed { time, key } => {
                             use layershellev::reexport::wayland_client::KeyState;
                             let ky = ev.get_virtual_keyboard().unwrap();

diff --git a/iced_layershell_macros/src/lib.rs b/iced_layershell_macros/src/lib.rs
@@ -38,6 +38,7 @@ pub fn to_layer_message(attr: TokenStream2, input: TokenStream2) -> manyhow::Res
         true => {
             let additional_variants = quote! {
                 AnchorChange{id: iced::window::Id, anchor: iced_layershell::reexport::Anchor},
+                SetInputRegion{ id: iced::window::Id, set_region: fn(&iced_layershell::reexport::WlRegion) },
                 AnchorSizeChange{id: iced::window::Id, anchor:iced_layershell::reexport::Anchor, size: (u32, u32)},
                 LayerChange{id: iced::window::Id, layer:iced_layershell::reexport::Layer},
                 MarginChange{id: iced::window::Id, margin: (i32, i32, i32, i32)},
@@ -61,6 +62,7 @@ pub fn to_layer_message(attr: TokenStream2, input: TokenStream2) -> manyhow::Res
                         use iced_layershell::actions::LayershellCustomActionsWithId;
 
                         match self {
+                            Self::SetInputRegion{ id, set_region } => Ok(LayershellCustomActionsWithId::new(Some(id), LayershellCustomActions::SetInputRegion(set_region))),
                             Self::AnchorChange { id, anchor } => Ok(LayershellCustomActionsWithId::new(Some(id), LayershellCustomActions::AnchorChange(anchor))),
                             Self::AnchorSizeChange { id, anchor, size } => Ok(LayershellCustomActionsWithId::new(Some(id), LayershellCustomActions::AnchorSizeChange(anchor, size))),
                             Self::LayerChange { id, layer } => Ok(LayershellCustomActionsWithId::new(Some(id), LayershellCustomActions::LayerChange(layer))),
@@ -111,6 +113,7 @@ pub fn to_layer_message(attr: TokenStream2, input: TokenStream2) -> manyhow::Res
         false => {
             let additional_variants = quote! {
                 AnchorChange(iced_layershell::reexport::Anchor),
+                SetInputRegion(fn(&iced_layershell::reexport::WlRegion)),
                 AnchorSizeChange(iced_layershell::reexport::Anchor, (u32, u32)),
                 LayerChange(iced_layershell::reexport::Layer),
                 MarginChange((i32, i32, i32, i32)),
@@ -128,6 +131,7 @@ pub fn to_layer_message(attr: TokenStream2, input: TokenStream2) -> manyhow::Res
                         use iced_layershell::actions::LayershellCustomActions;
 
                         match self {
+                            Self::SetInputRegion(region) => Ok(LayershellCustomActions::SetInputRegion(region)),
                             Self::AnchorChange(anchor) => Ok(LayershellCustomActions::AnchorChange(anchor)),
                             Self::AnchorSizeChange(anchor, size) => Ok(LayershellCustomActions::AnchorSizeChange(anchor, size)),
                             Self::LayerChange(layer) => Ok(LayershellCustomActions::LayerChange(layer)),

diff --git a/layershellev/src/lib.rs b/layershellev/src/lib.rs
@@ -241,8 +241,10 @@ pub mod reexport {
         pub use wayland_client::{
             globals::GlobalList,
             protocol::{
+                wl_compositor::WlCompositor,
                 wl_keyboard::{self, KeyState},
                 wl_pointer::{self, ButtonState},
+                wl_region::WlRegion,
                 wl_seat::WlSeat,
             },
             QueueHandle, WEnum,