vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

workaround for fullscreen request without client output

This commit is contained in:
Christian Meissl 2021-06-28 12:07:33 +02:00
parent 0d88a392fa
commit d7e10acc78
1 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
anvil/src/shell.rs
View File

@ -513,50 +513,46 @@ pub fn init_shell<BackendData: 'static>(display: Rc<RefCell<Display>>, log: ::sl
// Use the specified preferred output or else the current output the window // Use the specified preferred output or else the current output the window
// is shown or the primary output // is shown or the primary output
let output = output let output = output
.map(|output| {
xdg_output_map
.borrow()
.find(&output, |_, geometry| (Some(output.clone()), geometry))
.ok()
})
.flatten()
.or_else(|| { .or_else(|| {
let xdg_window_map = xdg_window_map.borrow(); let xdg_window_map = xdg_window_map.borrow();
let mut window_output: Option<wl_output::WlOutput> = None;
xdg_window_map xdg_window_map
.find(wl_surface) .find(wl_surface)
.and_then(|kind| xdg_window_map.location(&kind)) .and_then(|kind| xdg_window_map.location(&kind))
.and_then(|position| { .and_then(|position| {
xdg_output_map xdg_output_map
.borrow() .borrow()
.find_by_position(position, |output, _| { .find_by_position(position, |output, geometry| {
let mut window_output: Option<wl_output::WlOutput> = None;
output.with_output(wl_surface, |_, output| { output.with_output(wl_surface, |_, output| {
window_output = Some(output.to_owned()); window_output = Some(output.to_owned());
}) });
(window_output, geometry)
}) })
.ok() .ok()
}); })
window_output
}) })
.or_else(|| { .or_else(|| {
let mut primary_output: Option<wl_output::WlOutput> = None;
xdg_output_map xdg_output_map
.borrow() .borrow()
.with_primary(|output, _| { .with_primary(|output, geometry| {
let mut primary_output: Option<wl_output::WlOutput> = None;
output.with_output(wl_surface, |_, output| { output.with_output(wl_surface, |_, output| {
primary_output = Some(output.to_owned()); primary_output = Some(output.to_owned());
}) });
(primary_output, geometry)
}) })
.ok(); .ok()
primary_output
}); });
let fullscreen_output = if let Some(output) = output { if let Some((output, geometry)) = output {
output
} else {
// If we have no output ignore the request
return;
};
let geometry = xdg_output_map
.borrow()
.find(&fullscreen_output, |_, geometry| geometry)
.ok();
if let Some(geometry) = geometry {
if let Some(surface) = surface.get_surface() { if let Some(surface) = surface.get_surface() {
let mut xdg_window_map = xdg_window_map.borrow_mut(); let mut xdg_window_map = xdg_window_map.borrow_mut();
if let Some(kind) = xdg_window_map.find(surface) { if let Some(kind) = xdg_window_map.find(surface) {
@ -567,7 +563,7 @@ pub fn init_shell<BackendData: 'static>(display: Rc<RefCell<Display>>, log: ::sl
let ret = surface.with_pending_state(|state| { let ret = surface.with_pending_state(|state| {
state.states.set(xdg_toplevel::State::Fullscreen); state.states.set(xdg_toplevel::State::Fullscreen);
state.size = Some((geometry.width, geometry.height)); state.size = Some((geometry.width, geometry.height));
state.fullscreen_output = Some(fullscreen_output); state.fullscreen_output = output;
}); });
if ret.is_ok() { if ret.is_ok() {
surface.send_configure(); surface.send_configure();
@ -683,54 +679,50 @@ pub fn init_shell<BackendData: 'static>(display: Rc<RefCell<Display>>, log: ::sl
// Use the specified preferred output or else the current output the window // Use the specified preferred output or else the current output the window
// is shown or the primary output // is shown or the primary output
let output = output let output = output
.map(|output| {
shell_output_map
.borrow()
.find(&output, |_, geometry| (Some(output.clone()), geometry))
.ok()
})
.flatten()
.or_else(|| { .or_else(|| {
let shell_window_map = shell_window_map.borrow(); let shell_window_map = shell_window_map.borrow();
let mut window_output: Option<wl_output::WlOutput> = None;
shell_window_map shell_window_map
.find(wl_surface) .find(wl_surface)
.and_then(|kind| shell_window_map.location(&kind)) .and_then(|kind| shell_window_map.location(&kind))
.and_then(|position| { .and_then(|position| {
shell_output_map shell_output_map
.borrow() .borrow()
.find_by_position(position, |output, _| { .find_by_position(position, |output, geometry| {
let mut window_output: Option<wl_output::WlOutput> = None;
output.with_output(wl_surface, |_, output| { output.with_output(wl_surface, |_, output| {
window_output = Some(output.to_owned()); window_output = Some(output.to_owned());
}) });
(window_output, geometry)
}) })
.ok() .ok()
}); })
window_output
}) })
.or_else(|| { .or_else(|| {
let mut primary_output: Option<wl_output::WlOutput> = None;
shell_output_map shell_output_map
.borrow() .borrow()
.with_primary(|output, _| { .with_primary(|output, geometry| {
let mut primary_output: Option<wl_output::WlOutput> = None;
output.with_output(wl_surface, |_, output| { output.with_output(wl_surface, |_, output| {
primary_output = Some(output.to_owned()); primary_output = Some(output.to_owned());
}) });
(primary_output, geometry)
}) })
.ok(); .ok()
primary_output
}); });
let fullscreen_output = if let Some(output) = output { if let Some((_, geometry)) = output {
output shell_window_map
} else { .borrow_mut()
// If we have no output ignore the request .insert(SurfaceKind::Wl(surface), (geometry.x, geometry.y));
return; }
};
let geometry = shell_output_map
.borrow()
.find(&fullscreen_output, |_, geometry| geometry)
.ok();
let location = geometry.map(|g| (g.x, g.y)).unwrap_or_default();
shell_window_map
.borrow_mut()
.insert(SurfaceKind::Wl(surface), location);
} }
ShellRequest::Move { ShellRequest::Move {
surface, surface,