feat(layershellev): replace use_last_output with output_option in NewInputPanelSettings (#355)

Signed-off-by: fortime <palfortime@gmail.com>

Author: fortime

layershellev/src/events.rs

@@ -120,15 +120,15 @@ pub struct NewXdgWindowSettings {
 }
 
 /// input panel settings to create a new input panel surface
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct NewInputPanelSettings {
     pub size: (u32, u32),
     /// set the surface type as a keyboard
     pub keyboard: bool,
     /// follow the last output of the activated surface, used to create some thing like mako, who
     /// will show on the same window, only when the notifications is cleared, it will change the
     /// wl_output.
-    pub use_last_output: bool,
+    pub output_option: OutputOption,
 }
 
 impl Default for NewLayerShellSettings {

layershellev/src/lib.rs

@@ -3209,31 +3209,45 @@ impl<T: 'static> WindowState<T> {
                             NewInputPanelSettings {
                                 size: (width, height),
                                 keyboard,
-                                use_last_output,
+                                output_option: output_type,
                             },
                             id,
                             info,
                         )) => {
-                            let pos = window_state.surface_pos();
+                            let output = match output_type {
+                                OutputOption::Output(output) => Some(output),
+                                OutputOption::OutputName(name) => window_state
+                                    .xdg_info_cache
+                                    .iter()
+                                    .find(|(_, info)| info.name == *name)
+                                    .map(|(output, _)| output.clone()),
+                                _ => {
+                                    let pos = window_state.surface_pos();
 
-                            let mut output =
-                                pos.and_then(|p| window_state.units[p].wl_output.as_ref());
+                                    let mut output =
+                                        pos.and_then(|p| window_state.units[p].wl_output.as_ref());
 
-                            if window_state.last_wloutput.is_none()
-                                && window_state.outputs.len() > window_state.last_unit_index
-                            {
-                                window_state.last_wloutput = Some(
-                                    window_state.outputs[window_state.last_unit_index].1.clone(),
-                                );
-                            }
+                                    if window_state.last_wloutput.is_none()
+                                        && window_state.outputs.len() > window_state.last_unit_index
+                                    {
+                                        window_state.last_wloutput = Some(
+                                            window_state.outputs[window_state.last_unit_index]
+                                                .1
+                                                .clone(),
+                                        );
+                                    }
 
-                            if use_last_output {
-                                output = window_state.last_wloutput.as_ref();
-                            }
+                                    if matches!(output_type, events::OutputOption::LastOutput) {
+                                        output = window_state.last_wloutput.as_ref();
+                                    }
 
-                            if output.is_none() {
-                                output = window_state.outputs.first().map(|(_, o)| o);
-                            }
+                                    if output.is_none() {
+                                        output = window_state.outputs.first().map(|(_, o)| o);
+                                    }
+
+                                    output.cloned()
+                                }
+                            };
 
                             let Some(output) = output else {
                                 log::warn!("no WlOutput, skip creating input panel");
@@ -3248,7 +3262,7 @@ impl<T: 'static> WindowState<T> {
                                 input_panel.get_input_panel_surface(&wl_surface, &qh, ());
                             if keyboard {
                                 input_panel_surface.set_toplevel(
-                                    output,
+                                    &output,
                                     ZwpInputPanelPosition::CenterBottom as u32,
                                 );
                             } else {