kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

seat: rename get_output to get_cursor_output

Browse source
This commit is contained in:
khyperia 2025-12-23 14:57:02 +01:00 • committed by Julian Orth
parent 2c03dbbaa4
commit a975e3b25a
10 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/config/handler.rs
View file

@ -1012,16 +1012,16 @@ impl ConfigProxyHandler {
self.state.double_click_distance.set(dist);
}
fn handle_get_seat_workspace(&self, seat: Seat) -> Result<(), CphError> {
fn handle_get_seat_cursor_workspace(&self, seat: Seat) -> Result<(), CphError> {
let seat = self.get_seat(seat)?;
let output = seat.get_output();
let output = seat.get_cursor_output();
let mut workspace = Workspace(0);
if !output.is_dummy
&& let Some(ws) = output.workspace.get()
{
workspace = self.get_workspace_by_name(&ws.name);
}
self.respond(Response::GetSeatWorkspace { workspace });
self.respond(Response::GetSeatCursorWorkspace { workspace });
Ok(())
}
@ -1056,7 +1056,7 @@ impl ConfigProxyHandler {
let name = self.get_workspace(ws)?;
let workspace = match self.state.workspaces.get(name.deref()) {
Some(ws) => ws,
_ => seat.get_output().create_workspace(name.deref()),
_ => seat.get_cursor_output().create_workspace(name.deref()),
};
seat.set_workspace(&workspace);
Ok(())
@ -1112,7 +1112,8 @@ impl ConfigProxyHandler {
Some(ws) => ws,
_ => return Ok(()),
},
WorkspaceSource::Seat(s) => match self.get_seat(s)?.get_output().workspace.get() {
WorkspaceSource::Seat(s) => match self.get_seat(s)?.get_cursor_output().workspace.get()
{
Some(ws) => ws,
_ => return Ok(()),
},
@ -2935,9 +2936,9 @@ impl ConfigProxyHandler {
ClientMessage::MakeRenderDevice { device } => self
.handle_make_render_device(device)
.wrn("make_render_device")?,
ClientMessage::GetSeatWorkspace { seat } => self
.handle_get_seat_workspace(seat)
.wrn("get_seat_workspace")?,
ClientMessage::GetSeatCursorWorkspace { seat } => self
.handle_get_seat_cursor_workspace(seat)
.wrn("get_seat_cursor_workspace")?,
ClientMessage::GetSeatKeyboardWorkspace { seat } => self
.handle_get_seat_keyboard_workspace(seat)
.wrn("get_seat_keyboard_workspace")?,