seat: rename get_output to get_cursor_output
This commit is contained in:
parent
2c03dbbaa4
commit
a975e3b25a
10 changed files with 23 additions and 22 deletions
|
|
@ -457,7 +457,7 @@ impl WlSeatGlobal {
|
|||
self.data_control_devices.remove(&device.id());
|
||||
}
|
||||
|
||||
pub fn get_output(&self) -> Rc<OutputNode> {
|
||||
pub fn get_cursor_output(&self) -> Rc<OutputNode> {
|
||||
self.cursor_user_group.latest_output()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ impl NodeSeatState {
|
|||
.set_kb_node(&seat, seat.state.root.clone(), seat.state.next_serial(None));
|
||||
// log::info!("keyboard_node = root");
|
||||
if focus_last {
|
||||
seat.get_output()
|
||||
seat.get_cursor_output()
|
||||
.node_do_focus(&seat, Direction::Unspecified);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -486,7 +486,7 @@ impl XdgToplevel {
|
|||
if should_be_mapped {
|
||||
if !self.is_mapped.replace(true) {
|
||||
if let Some(seat) = drag.source.data.seat.get() {
|
||||
self.xdg.set_output(&seat.get_output());
|
||||
self.xdg.set_output(&seat.get_cursor_output());
|
||||
}
|
||||
self.toplevel_data.broadcast(self.clone());
|
||||
self.tl_set_visible(self.state.root_visible());
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ impl XdgToplevelDragV1 {
|
|||
if self.source.data.was_used()
|
||||
&& let Some(tl) = self.toplevel.get()
|
||||
{
|
||||
let output = seat.get_output();
|
||||
let output = seat.get_cursor_output();
|
||||
let (x, y) = seat.pointer_cursor().position();
|
||||
tl.drag.take();
|
||||
tl.after_toplevel_drag(
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ impl ZwlrLayerShellV1RequestHandler for ZwlrLayerShellV1 {
|
|||
self.client.lookup(req.output)?.global.clone()
|
||||
} else {
|
||||
for seat in self.client.state.seat_queue.rev_iter() {
|
||||
let output = seat.get_output();
|
||||
let output = seat.get_cursor_output();
|
||||
if !output.is_dummy {
|
||||
break 'get_output output.global.opt.clone();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue