leyoda/cosmic-workspaces
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix toplevel activation

Browse source 
`new_seat()` is only called when a seat is added after creation of
`SeatState`.
This commit is contained in:
Ian Douglas Scott 2024-05-01 10:12:00 -07:00
parent 249c62ee0a
commit 07f7b8f5bd
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/backend/wayland/mod.rs
View file

@ -55,7 +55,6 @@ pub struct AppData {
shm_state: Shm, shm_state: Shm,
toplevel_manager_state: ToplevelManagerState, toplevel_manager_state: ToplevelManagerState,
sender: mpsc::Sender<Event>, sender: mpsc::Sender<Event>,
seats: Vec<wl_seat::WlSeat>,
capture_filter: CaptureFilter, capture_filter: CaptureFilter,
captures: RefCell<HashMap<CaptureSource, Arc<Capture>>>, captures: RefCell<HashMap<CaptureSource, Arc<Capture>>>,
dmabuf_feedback: Option<DmabufFeedback>, dmabuf_feedback: Option<DmabufFeedback>,
@ -76,12 +75,10 @@ impl AppData {
self.invalidate_capture_filter(); self.invalidate_capture_filter();
} }
Cmd::ActivateToplevel(toplevel_handle) => { Cmd::ActivateToplevel(toplevel_handle) => {
if !self.seats.is_empty() { for seat in self.seat_state.seats() {
for seat in &self.seats { self.toplevel_manager_state
self.toplevel_manager_state .manager
.manager .activate(&toplevel_handle, &seat);
.activate(&toplevel_handle, seat);
}
} }
} }
Cmd::CloseToplevel(toplevel_handle) => { Cmd::CloseToplevel(toplevel_handle) => {
@ -166,15 +163,9 @@ impl SeatHandler for AppData {
&mut self.seat_state &mut self.seat_state
} }
fn new_seat(&mut self, _: &Connection, _: &QueueHandle<Self>, seat: wl_seat::WlSeat) { fn new_seat(&mut self, _: &Connection, _: &QueueHandle<Self>, _seat: wl_seat::WlSeat) {}
self.seats.push(seat);
}
fn remove_seat(&mut self, _: &Connection, _: &QueueHandle<Self>, seat: wl_seat::WlSeat) { fn remove_seat(&mut self, _: &Connection, _: &QueueHandle<Self>, _seat: wl_seat::WlSeat) {}
if let Some(idx) = self.seats.iter().position(|i| i == &seat) {
self.seats.remove(idx);
}
}
fn new_capability( fn new_capability(
&mut self, &mut self,
@ -224,7 +215,6 @@ fn start(conn: Connection) -> mpsc::Receiver<Event> {
seat_state: SeatState::new(&globals, &qh), seat_state: SeatState::new(&globals, &qh),
shm_state: Shm::bind(&globals, &qh).unwrap(), shm_state: Shm::bind(&globals, &qh).unwrap(),
sender, sender,
seats: Vec::new(),
capture_filter: CaptureFilter::default(), capture_filter: CaptureFilter::default(),
captures: RefCell::new(HashMap::new()), captures: RefCell::new(HashMap::new()),
dmabuf_feedback: None, dmabuf_feedback: None,