2018-10-02 21:37:24 +00:00
|
|
|
use std::{
|
|
|
|
cell::RefCell,
|
|
|
|
rc::Rc,
|
|
|
|
sync::{Arc, Mutex},
|
|
|
|
};
|
2018-05-07 17:56:38 +00:00
|
|
|
|
2018-10-02 21:37:24 +00:00
|
|
|
use smithay::{
|
2021-05-13 17:59:47 +00:00
|
|
|
backend::renderer::buffer_dimensions,
|
2020-02-03 13:31:15 +00:00
|
|
|
reexports::{
|
|
|
|
wayland_protocols::xdg_shell::server::xdg_toplevel,
|
|
|
|
wayland_server::{
|
2021-06-23 07:43:53 +00:00
|
|
|
protocol::{wl_buffer, wl_pointer::ButtonState, wl_shell_surface, wl_surface},
|
2020-02-03 13:31:15 +00:00
|
|
|
Display,
|
|
|
|
},
|
2018-12-15 21:01:24 +00:00
|
|
|
},
|
2020-01-22 04:00:37 +00:00
|
|
|
utils::Rectangle,
|
2018-10-02 21:37:24 +00:00
|
|
|
wayland::{
|
2020-04-21 18:53:55 +00:00
|
|
|
compositor::{
|
2021-06-23 07:43:53 +00:00
|
|
|
compositor_init, is_sync_subsurface, with_states, with_surface_tree_upward, BufferAssignment,
|
|
|
|
SurfaceAttributes, TraversalAction,
|
2020-04-21 18:53:55 +00:00
|
|
|
},
|
2021-06-23 07:43:53 +00:00
|
|
|
seat::{AxisFrame, GrabStartData, PointerGrab, PointerInnerHandle, Seat},
|
2018-10-02 21:37:24 +00:00
|
|
|
shell::{
|
2021-06-23 07:43:53 +00:00
|
|
|
legacy::{wl_shell_init, ShellRequest, ShellState as WlShellState, ShellSurfaceKind},
|
2018-10-02 21:37:24 +00:00
|
|
|
xdg::{
|
2021-06-23 07:43:53 +00:00
|
|
|
xdg_shell_init, Configure, ShellState as XdgShellState, SurfaceCachedState, XdgRequest,
|
|
|
|
XdgToplevelSurfaceRoleAttributes,
|
2018-10-02 21:37:24 +00:00
|
|
|
},
|
|
|
|
},
|
2020-08-08 04:37:35 +00:00
|
|
|
Serial,
|
2018-10-02 21:37:24 +00:00
|
|
|
},
|
2018-09-24 22:32:09 +00:00
|
|
|
};
|
2017-12-10 21:09:17 +00:00
|
|
|
|
2021-05-30 21:31:14 +00:00
|
|
|
use crate::{
|
2021-06-24 16:37:17 +00:00
|
|
|
state::AnvilState,
|
2021-06-15 21:32:02 +00:00
|
|
|
window_map::{Kind as SurfaceKind, PopupKind, WindowMap},
|
2021-05-30 21:31:14 +00:00
|
|
|
};
|
2017-09-22 12:56:59 +00:00
|
|
|
|
2020-02-01 15:42:08 +00:00
|
|
|
struct MoveSurfaceGrab {
|
2020-02-02 15:05:49 +00:00
|
|
|
start_data: GrabStartData,
|
2021-06-23 07:43:53 +00:00
|
|
|
window_map: Rc<RefCell<WindowMap>>,
|
|
|
|
toplevel: SurfaceKind,
|
2020-02-01 15:42:08 +00:00
|
|
|
initial_window_location: (i32, i32),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PointerGrab for MoveSurfaceGrab {
|
|
|
|
fn motion(
|
|
|
|
&mut self,
|
|
|
|
_handle: &mut PointerInnerHandle<'_>,
|
|
|
|
location: (f64, f64),
|
|
|
|
_focus: Option<(wl_surface::WlSurface, (f64, f64))>,
|
2020-08-08 04:37:35 +00:00
|
|
|
_serial: Serial,
|
2020-02-01 15:42:08 +00:00
|
|
|
_time: u32,
|
|
|
|
) {
|
2020-02-02 15:05:49 +00:00
|
|
|
let dx = location.0 - self.start_data.location.0;
|
|
|
|
let dy = location.1 - self.start_data.location.1;
|
2020-02-01 15:42:08 +00:00
|
|
|
let new_window_x = (self.initial_window_location.0 as f64 + dx) as i32;
|
|
|
|
let new_window_y = (self.initial_window_location.1 as f64 + dy) as i32;
|
|
|
|
|
|
|
|
self.window_map
|
|
|
|
.borrow_mut()
|
|
|
|
.set_location(&self.toplevel, (new_window_x, new_window_y));
|
|
|
|
}
|
|
|
|
|
|
|
|
fn button(
|
|
|
|
&mut self,
|
|
|
|
handle: &mut PointerInnerHandle<'_>,
|
|
|
|
button: u32,
|
|
|
|
state: ButtonState,
|
2020-08-08 04:37:35 +00:00
|
|
|
serial: Serial,
|
2020-02-01 15:42:08 +00:00
|
|
|
time: u32,
|
|
|
|
) {
|
|
|
|
handle.button(button, state, serial, time);
|
|
|
|
if handle.current_pressed().is_empty() {
|
|
|
|
// No more buttons are pressed, release the grab.
|
|
|
|
handle.unset_grab(serial, time);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn axis(&mut self, handle: &mut PointerInnerHandle<'_>, details: AxisFrame) {
|
|
|
|
handle.axis(details)
|
|
|
|
}
|
2020-02-02 15:05:49 +00:00
|
|
|
|
|
|
|
fn start_data(&self) -> &GrabStartData {
|
|
|
|
&self.start_data
|
|
|
|
}
|
2020-02-01 15:42:08 +00:00
|
|
|
}
|
|
|
|
|
2020-05-02 10:37:18 +00:00
|
|
|
bitflags::bitflags! {
|
2020-02-11 08:06:36 +00:00
|
|
|
struct ResizeEdge: u32 {
|
|
|
|
const NONE = 0;
|
|
|
|
const TOP = 1;
|
|
|
|
const BOTTOM = 2;
|
|
|
|
const LEFT = 4;
|
|
|
|
const TOP_LEFT = 5;
|
|
|
|
const BOTTOM_LEFT = 6;
|
|
|
|
const RIGHT = 8;
|
|
|
|
const TOP_RIGHT = 9;
|
|
|
|
const BOTTOM_RIGHT = 10;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<wl_shell_surface::Resize> for ResizeEdge {
|
|
|
|
#[inline]
|
|
|
|
fn from(x: wl_shell_surface::Resize) -> Self {
|
|
|
|
Self::from_bits(x.bits()).unwrap()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<ResizeEdge> for wl_shell_surface::Resize {
|
|
|
|
#[inline]
|
|
|
|
fn from(x: ResizeEdge) -> Self {
|
|
|
|
Self::from_bits(x.bits()).unwrap()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<xdg_toplevel::ResizeEdge> for ResizeEdge {
|
|
|
|
#[inline]
|
|
|
|
fn from(x: xdg_toplevel::ResizeEdge) -> Self {
|
|
|
|
Self::from_bits(x.to_raw()).unwrap()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<ResizeEdge> for xdg_toplevel::ResizeEdge {
|
|
|
|
#[inline]
|
|
|
|
fn from(x: ResizeEdge) -> Self {
|
|
|
|
Self::from_raw(x.bits()).unwrap()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-03 13:31:15 +00:00
|
|
|
struct ResizeSurfaceGrab {
|
|
|
|
start_data: GrabStartData,
|
2021-06-23 07:43:53 +00:00
|
|
|
toplevel: SurfaceKind,
|
2020-02-11 08:06:36 +00:00
|
|
|
edges: ResizeEdge,
|
2020-02-03 13:31:15 +00:00
|
|
|
initial_window_size: (i32, i32),
|
|
|
|
last_window_size: (i32, i32),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PointerGrab for ResizeSurfaceGrab {
|
|
|
|
fn motion(
|
|
|
|
&mut self,
|
2021-06-17 20:41:53 +00:00
|
|
|
handle: &mut PointerInnerHandle<'_>,
|
2020-02-03 13:31:15 +00:00
|
|
|
location: (f64, f64),
|
|
|
|
_focus: Option<(wl_surface::WlSurface, (f64, f64))>,
|
2021-06-17 20:41:53 +00:00
|
|
|
serial: Serial,
|
|
|
|
time: u32,
|
2020-02-03 13:31:15 +00:00
|
|
|
) {
|
2021-06-17 20:41:53 +00:00
|
|
|
// It is impossible to get `min_size` and `max_size` of dead toplevel, so we return early.
|
|
|
|
if !self.toplevel.alive() | self.toplevel.get_surface().is_none() {
|
|
|
|
handle.unset_grab(serial, time);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-03 13:31:15 +00:00
|
|
|
let mut dx = location.0 - self.start_data.location.0;
|
|
|
|
let mut dy = location.1 - self.start_data.location.1;
|
|
|
|
|
2020-02-08 06:24:50 +00:00
|
|
|
let mut new_window_width = self.initial_window_size.0;
|
|
|
|
let mut new_window_height = self.initial_window_size.1;
|
|
|
|
|
2020-02-11 08:06:36 +00:00
|
|
|
let left_right = ResizeEdge::LEFT | ResizeEdge::RIGHT;
|
|
|
|
let top_bottom = ResizeEdge::TOP | ResizeEdge::BOTTOM;
|
2020-02-08 06:24:50 +00:00
|
|
|
|
|
|
|
if self.edges.intersects(left_right) {
|
2020-02-11 08:06:36 +00:00
|
|
|
if self.edges.intersects(ResizeEdge::LEFT) {
|
2020-02-03 13:31:15 +00:00
|
|
|
dx = -dx;
|
|
|
|
}
|
|
|
|
|
2020-02-08 06:24:50 +00:00
|
|
|
new_window_width = (self.initial_window_size.0 as f64 + dx) as i32;
|
|
|
|
}
|
|
|
|
|
|
|
|
if self.edges.intersects(top_bottom) {
|
2020-02-11 08:06:36 +00:00
|
|
|
if self.edges.intersects(ResizeEdge::TOP) {
|
2020-02-03 13:31:15 +00:00
|
|
|
dy = -dy;
|
|
|
|
}
|
|
|
|
|
2020-02-08 06:24:50 +00:00
|
|
|
new_window_height = (self.initial_window_size.1 as f64 + dy) as i32;
|
|
|
|
}
|
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
let (min_size, max_size) = with_states(self.toplevel.get_surface().unwrap(), |states| {
|
|
|
|
let data = states.cached_state.current::<SurfaceCachedState>();
|
|
|
|
(data.min_size, data.max_size)
|
|
|
|
})
|
|
|
|
.unwrap();
|
2020-02-08 06:24:50 +00:00
|
|
|
|
|
|
|
let min_width = min_size.0.max(1);
|
|
|
|
let min_height = min_size.1.max(1);
|
|
|
|
let max_width = if max_size.0 == 0 {
|
|
|
|
i32::max_value()
|
2020-02-03 13:31:15 +00:00
|
|
|
} else {
|
2020-02-08 06:24:50 +00:00
|
|
|
max_size.0
|
2020-02-03 13:31:15 +00:00
|
|
|
};
|
2020-02-08 06:24:50 +00:00
|
|
|
let max_height = if max_size.1 == 0 {
|
|
|
|
i32::max_value()
|
|
|
|
} else {
|
|
|
|
max_size.1
|
|
|
|
};
|
|
|
|
|
|
|
|
new_window_width = new_window_width.max(min_width).min(max_width);
|
|
|
|
new_window_height = new_window_height.max(min_height).min(max_height);
|
2020-02-03 13:31:15 +00:00
|
|
|
|
|
|
|
self.last_window_size = (new_window_width, new_window_height);
|
|
|
|
|
|
|
|
match &self.toplevel {
|
2021-06-15 21:32:02 +00:00
|
|
|
SurfaceKind::Xdg(xdg) => {
|
2021-06-23 07:43:53 +00:00
|
|
|
let ret = xdg.with_pending_state(|state| {
|
|
|
|
state.states.set(xdg_toplevel::State::Resizing);
|
|
|
|
state.size = Some(self.last_window_size);
|
|
|
|
});
|
|
|
|
if ret.is_ok() {
|
2021-06-15 21:32:02 +00:00
|
|
|
xdg.send_configure();
|
|
|
|
}
|
|
|
|
}
|
2020-02-03 13:31:15 +00:00
|
|
|
SurfaceKind::Wl(wl) => wl.send_configure(
|
|
|
|
(self.last_window_size.0 as u32, self.last_window_size.1 as u32),
|
2020-02-11 08:06:36 +00:00
|
|
|
self.edges.into(),
|
2020-02-03 13:31:15 +00:00
|
|
|
),
|
2021-01-04 08:46:59 +00:00
|
|
|
#[cfg(feature = "xwayland")]
|
|
|
|
SurfaceKind::X11(_) => {
|
|
|
|
// TODO: What to do here? Send the update via X11?
|
|
|
|
}
|
2020-02-03 13:31:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn button(
|
|
|
|
&mut self,
|
|
|
|
handle: &mut PointerInnerHandle<'_>,
|
|
|
|
button: u32,
|
|
|
|
state: ButtonState,
|
2020-08-08 04:37:35 +00:00
|
|
|
serial: Serial,
|
2020-02-03 13:31:15 +00:00
|
|
|
time: u32,
|
|
|
|
) {
|
|
|
|
handle.button(button, state, serial, time);
|
|
|
|
if handle.current_pressed().is_empty() {
|
|
|
|
// No more buttons are pressed, release the grab.
|
|
|
|
handle.unset_grab(serial, time);
|
|
|
|
|
2021-06-17 20:41:53 +00:00
|
|
|
// If toplevel is dead, we can't resize it, so we return early.
|
|
|
|
if !self.toplevel.alive() | self.toplevel.get_surface().is_none() {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-03 13:31:15 +00:00
|
|
|
if let SurfaceKind::Xdg(xdg) = &self.toplevel {
|
2021-06-23 07:43:53 +00:00
|
|
|
let ret = xdg.with_pending_state(|state| {
|
|
|
|
state.states.unset(xdg_toplevel::State::Resizing);
|
|
|
|
state.size = Some(self.last_window_size);
|
|
|
|
});
|
|
|
|
if ret.is_ok() {
|
2021-06-15 21:32:02 +00:00
|
|
|
xdg.send_configure();
|
|
|
|
}
|
2020-02-08 05:46:15 +00:00
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
with_states(self.toplevel.get_surface().unwrap(), |states| {
|
|
|
|
let mut data = states
|
|
|
|
.data_map
|
|
|
|
.get::<RefCell<SurfaceData>>()
|
|
|
|
.unwrap()
|
|
|
|
.borrow_mut();
|
|
|
|
if let ResizeState::Resizing(resize_data) = data.resize_state {
|
|
|
|
data.resize_state = ResizeState::WaitingForFinalAck(resize_data, serial);
|
|
|
|
} else {
|
|
|
|
panic!("invalid resize state: {:?}", data.resize_state);
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.unwrap();
|
2020-02-08 05:46:15 +00:00
|
|
|
} else {
|
2021-06-23 07:43:53 +00:00
|
|
|
with_states(self.toplevel.get_surface().unwrap(), |states| {
|
|
|
|
let mut data = states
|
|
|
|
.data_map
|
|
|
|
.get::<RefCell<SurfaceData>>()
|
|
|
|
.unwrap()
|
|
|
|
.borrow_mut();
|
|
|
|
if let ResizeState::Resizing(resize_data) = data.resize_state {
|
|
|
|
data.resize_state = ResizeState::WaitingForCommit(resize_data);
|
|
|
|
} else {
|
|
|
|
panic!("invalid resize state: {:?}", data.resize_state);
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.unwrap();
|
2020-02-03 13:31:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn axis(&mut self, handle: &mut PointerInnerHandle<'_>, details: AxisFrame) {
|
|
|
|
handle.axis(details)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn start_data(&self) -> &GrabStartData {
|
|
|
|
&self.start_data
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-02 10:42:02 +00:00
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct ShellHandles {
|
2021-06-23 07:43:53 +00:00
|
|
|
pub xdg_state: Arc<Mutex<XdgShellState>>,
|
|
|
|
pub wl_state: Arc<Mutex<WlShellState>>,
|
|
|
|
pub window_map: Rc<RefCell<WindowMap>>,
|
2020-05-02 10:42:02 +00:00
|
|
|
}
|
|
|
|
|
2021-06-24 16:37:17 +00:00
|
|
|
pub fn init_shell<BackendData: 'static>(display: &mut Display, log: ::slog::Logger) -> ShellHandles {
|
2018-04-22 09:58:39 +00:00
|
|
|
// Create the compositor
|
2021-06-23 07:43:53 +00:00
|
|
|
compositor_init(
|
2018-04-22 09:58:39 +00:00
|
|
|
display,
|
2021-06-23 07:43:53 +00:00
|
|
|
move |surface, mut ddata| {
|
|
|
|
let anvil_state = ddata.get::<AnvilState<BackendData>>().unwrap();
|
|
|
|
let window_map = anvil_state.window_map.as_ref();
|
|
|
|
surface_commit(&surface, &*window_map)
|
2018-04-22 09:58:39 +00:00
|
|
|
},
|
|
|
|
log.clone(),
|
|
|
|
);
|
2017-09-22 12:56:59 +00:00
|
|
|
|
2018-04-22 09:58:39 +00:00
|
|
|
// Init a window map, to track the location of our windows
|
2021-06-23 07:43:53 +00:00
|
|
|
let window_map = Rc::new(RefCell::new(WindowMap::new()));
|
2017-09-22 12:56:59 +00:00
|
|
|
|
2018-04-22 09:58:39 +00:00
|
|
|
// init the xdg_shell
|
2018-04-23 09:40:41 +00:00
|
|
|
let xdg_window_map = window_map.clone();
|
|
|
|
let (xdg_shell_state, _, _) = xdg_shell_init(
|
2018-04-22 09:58:39 +00:00
|
|
|
display,
|
2018-09-24 22:30:39 +00:00
|
|
|
move |shell_event| match shell_event {
|
2018-04-22 17:58:10 +00:00
|
|
|
XdgRequest::NewToplevel { surface } => {
|
2018-11-21 00:46:34 +00:00
|
|
|
// place the window at a random location in the [0;800]x[0;800] square
|
2019-02-24 07:50:21 +00:00
|
|
|
use rand::distributions::{Distribution, Uniform};
|
|
|
|
let range = Uniform::new(0, 800);
|
2018-04-22 09:58:39 +00:00
|
|
|
let mut rng = rand::thread_rng();
|
2019-02-24 07:50:21 +00:00
|
|
|
let x = range.sample(&mut rng);
|
|
|
|
let y = range.sample(&mut rng);
|
2021-06-15 21:32:02 +00:00
|
|
|
// Do not send a configure here, the initial configure
|
|
|
|
// of a xdg_surface has to be sent during the commit if
|
|
|
|
// the surface is not already configured
|
2018-04-23 09:40:41 +00:00
|
|
|
xdg_window_map
|
|
|
|
.borrow_mut()
|
|
|
|
.insert(SurfaceKind::Xdg(surface), (x, y));
|
2018-04-22 09:58:39 +00:00
|
|
|
}
|
2021-06-15 21:32:02 +00:00
|
|
|
XdgRequest::NewPopup { surface } => {
|
|
|
|
// Do not send a configure here, the initial configure
|
|
|
|
// of a xdg_surface has to be sent during the commit if
|
|
|
|
// the surface is not already configured
|
|
|
|
xdg_window_map.borrow_mut().insert_popup(PopupKind::Xdg(surface));
|
|
|
|
}
|
2020-02-01 15:42:08 +00:00
|
|
|
XdgRequest::Move {
|
|
|
|
surface,
|
|
|
|
seat,
|
|
|
|
serial,
|
|
|
|
} => {
|
|
|
|
let seat = Seat::from_resource(&seat).unwrap();
|
|
|
|
// TODO: touch move.
|
|
|
|
let pointer = seat.get_pointer().unwrap();
|
|
|
|
|
2020-02-02 15:07:43 +00:00
|
|
|
// Check that this surface has a click grab.
|
|
|
|
if !pointer.has_grab(serial) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-02 15:05:49 +00:00
|
|
|
let start_data = pointer.grab_start_data().unwrap();
|
|
|
|
|
2020-02-02 15:09:21 +00:00
|
|
|
// If the focus was for a different surface, ignore the request.
|
|
|
|
if start_data.focus.is_none()
|
|
|
|
|| !start_data
|
|
|
|
.focus
|
|
|
|
.as_ref()
|
|
|
|
.unwrap()
|
|
|
|
.0
|
|
|
|
.as_ref()
|
|
|
|
.same_client_as(surface.get_surface().unwrap().as_ref())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-01 15:42:08 +00:00
|
|
|
let toplevel = SurfaceKind::Xdg(surface);
|
|
|
|
let initial_window_location = xdg_window_map.borrow().location(&toplevel).unwrap();
|
|
|
|
|
|
|
|
let grab = MoveSurfaceGrab {
|
2020-02-02 15:05:49 +00:00
|
|
|
start_data,
|
2020-02-01 15:42:08 +00:00
|
|
|
window_map: xdg_window_map.clone(),
|
|
|
|
toplevel,
|
|
|
|
initial_window_location,
|
|
|
|
};
|
|
|
|
|
|
|
|
pointer.set_grab(grab, serial);
|
|
|
|
}
|
2020-02-03 13:31:15 +00:00
|
|
|
XdgRequest::Resize {
|
|
|
|
surface,
|
|
|
|
seat,
|
|
|
|
serial,
|
|
|
|
edges,
|
|
|
|
} => {
|
|
|
|
let seat = Seat::from_resource(&seat).unwrap();
|
|
|
|
// TODO: touch resize.
|
|
|
|
let pointer = seat.get_pointer().unwrap();
|
|
|
|
|
|
|
|
// Check that this surface has a click grab.
|
|
|
|
if !pointer.has_grab(serial) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
let start_data = pointer.grab_start_data().unwrap();
|
|
|
|
|
|
|
|
// If the focus was for a different surface, ignore the request.
|
|
|
|
if start_data.focus.is_none()
|
|
|
|
|| !start_data
|
|
|
|
.focus
|
|
|
|
.as_ref()
|
|
|
|
.unwrap()
|
|
|
|
.0
|
|
|
|
.as_ref()
|
|
|
|
.same_client_as(surface.get_surface().unwrap().as_ref())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-08 05:46:15 +00:00
|
|
|
let toplevel = SurfaceKind::Xdg(surface.clone());
|
2020-02-03 13:31:15 +00:00
|
|
|
let initial_window_location = xdg_window_map.borrow().location(&toplevel).unwrap();
|
|
|
|
let geometry = xdg_window_map.borrow().geometry(&toplevel).unwrap();
|
|
|
|
let initial_window_size = (geometry.width, geometry.height);
|
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
with_states(surface.get_surface().unwrap(), move |states| {
|
|
|
|
states
|
|
|
|
.data_map
|
2020-04-10 15:01:49 +00:00
|
|
|
.get::<RefCell<SurfaceData>>()
|
|
|
|
.unwrap()
|
|
|
|
.borrow_mut()
|
|
|
|
.resize_state = ResizeState::Resizing(ResizeData {
|
|
|
|
edges: edges.into(),
|
|
|
|
initial_window_location,
|
|
|
|
initial_window_size,
|
|
|
|
});
|
2021-06-23 07:43:53 +00:00
|
|
|
})
|
|
|
|
.unwrap();
|
2020-02-08 05:46:15 +00:00
|
|
|
|
2020-02-03 13:31:15 +00:00
|
|
|
let grab = ResizeSurfaceGrab {
|
|
|
|
start_data,
|
|
|
|
toplevel,
|
2020-02-11 08:06:36 +00:00
|
|
|
edges: edges.into(),
|
2020-02-03 13:31:15 +00:00
|
|
|
initial_window_size,
|
|
|
|
last_window_size: initial_window_size,
|
|
|
|
};
|
|
|
|
|
|
|
|
pointer.set_grab(grab, serial);
|
|
|
|
}
|
2021-06-15 21:32:02 +00:00
|
|
|
XdgRequest::AckConfigure {
|
2021-06-23 07:43:53 +00:00
|
|
|
surface,
|
|
|
|
configure: Configure::Toplevel(configure),
|
|
|
|
..
|
2021-06-15 21:32:02 +00:00
|
|
|
} => {
|
2021-06-23 07:43:53 +00:00
|
|
|
let waiting_for_serial = with_states(&surface, |states| {
|
|
|
|
if let Some(data) = states.data_map.get::<RefCell<SurfaceData>>() {
|
|
|
|
if let ResizeState::WaitingForFinalAck(_, serial) = data.borrow().resize_state {
|
|
|
|
return Some(serial);
|
2020-02-08 05:46:15 +00:00
|
|
|
}
|
2021-06-23 07:43:53 +00:00
|
|
|
}
|
2020-02-08 05:46:15 +00:00
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
None
|
|
|
|
})
|
|
|
|
.unwrap();
|
2020-02-08 05:46:15 +00:00
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
if let Some(serial) = waiting_for_serial {
|
|
|
|
if configure.serial > serial {
|
|
|
|
// TODO: huh, we have missed the serial somehow.
|
|
|
|
// this should not happen, but it may be better to handle
|
|
|
|
// this case anyway
|
|
|
|
}
|
2021-06-15 21:32:02 +00:00
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
if serial == configure.serial
|
|
|
|
&& configure.state.states.contains(xdg_toplevel::State::Resizing)
|
|
|
|
{
|
|
|
|
with_states(&surface, |states| {
|
|
|
|
let mut data = states
|
|
|
|
.data_map
|
|
|
|
.get::<RefCell<SurfaceData>>()
|
|
|
|
.unwrap()
|
|
|
|
.borrow_mut();
|
|
|
|
if let ResizeState::WaitingForFinalAck(resize_data, _) = data.resize_state {
|
|
|
|
data.resize_state = ResizeState::WaitingForCommit(resize_data);
|
|
|
|
} else {
|
|
|
|
unreachable!()
|
2020-02-08 05:46:15 +00:00
|
|
|
}
|
2021-06-23 07:43:53 +00:00
|
|
|
})
|
|
|
|
.unwrap();
|
2020-02-08 05:46:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-06-15 21:32:02 +00:00
|
|
|
XdgRequest::Fullscreen { surface, output, .. } => {
|
2021-06-23 07:43:53 +00:00
|
|
|
let ret = surface.with_pending_state(|state| {
|
|
|
|
// TODO: Use size of current output the window is on and set position to (0,0)
|
|
|
|
state.states.set(xdg_toplevel::State::Fullscreen);
|
|
|
|
state.size = Some((800, 600));
|
|
|
|
// TODO: If the provided output is None, use the output where
|
|
|
|
// the toplevel is currently shown
|
|
|
|
state.fullscreen_output = output;
|
|
|
|
});
|
|
|
|
if ret.is_ok() {
|
2021-06-15 21:32:02 +00:00
|
|
|
surface.send_configure();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
XdgRequest::UnFullscreen { surface } => {
|
2021-06-23 07:43:53 +00:00
|
|
|
let ret = surface.with_pending_state(|state| {
|
|
|
|
state.states.unset(xdg_toplevel::State::Fullscreen);
|
|
|
|
state.size = None;
|
|
|
|
state.fullscreen_output = None;
|
|
|
|
});
|
|
|
|
if ret.is_ok() {
|
2021-06-15 21:32:02 +00:00
|
|
|
surface.send_configure();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
XdgRequest::Maximize { surface } => {
|
2021-06-23 07:43:53 +00:00
|
|
|
let ret = surface.with_pending_state(|state| {
|
|
|
|
// TODO: Use size of current output the window is on and set position to (0,0)
|
|
|
|
state.states.set(xdg_toplevel::State::Maximized);
|
|
|
|
state.size = Some((800, 600));
|
|
|
|
});
|
|
|
|
if ret.is_ok() {
|
2021-06-15 21:32:02 +00:00
|
|
|
surface.send_configure();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
XdgRequest::UnMaximize { surface } => {
|
2021-06-23 07:43:53 +00:00
|
|
|
let ret = surface.with_pending_state(|state| {
|
|
|
|
state.states.unset(xdg_toplevel::State::Maximized);
|
|
|
|
state.size = None;
|
|
|
|
});
|
|
|
|
if ret.is_ok() {
|
2021-06-15 21:32:02 +00:00
|
|
|
surface.send_configure();
|
|
|
|
}
|
|
|
|
}
|
2018-04-22 09:58:39 +00:00
|
|
|
_ => (),
|
2017-09-22 12:56:59 +00:00
|
|
|
},
|
|
|
|
log.clone(),
|
|
|
|
);
|
|
|
|
|
2018-04-23 09:40:41 +00:00
|
|
|
// init the wl_shell
|
|
|
|
let shell_window_map = window_map.clone();
|
|
|
|
let (wl_shell_state, _) = wl_shell_init(
|
|
|
|
display,
|
2021-06-23 07:43:53 +00:00
|
|
|
move |req: ShellRequest| {
|
2020-02-01 15:42:08 +00:00
|
|
|
match req {
|
|
|
|
ShellRequest::SetKind {
|
|
|
|
surface,
|
|
|
|
kind: ShellSurfaceKind::Toplevel,
|
|
|
|
} => {
|
|
|
|
// place the window at a random location in the [0;800]x[0;800] square
|
|
|
|
use rand::distributions::{Distribution, Uniform};
|
|
|
|
let range = Uniform::new(0, 800);
|
|
|
|
let mut rng = rand::thread_rng();
|
|
|
|
let x = range.sample(&mut rng);
|
|
|
|
let y = range.sample(&mut rng);
|
|
|
|
shell_window_map
|
|
|
|
.borrow_mut()
|
|
|
|
.insert(SurfaceKind::Wl(surface), (x, y));
|
|
|
|
}
|
|
|
|
ShellRequest::Move {
|
|
|
|
surface,
|
|
|
|
seat,
|
|
|
|
serial,
|
|
|
|
} => {
|
|
|
|
let seat = Seat::from_resource(&seat).unwrap();
|
|
|
|
// TODO: touch move.
|
|
|
|
let pointer = seat.get_pointer().unwrap();
|
|
|
|
|
2020-02-02 15:07:43 +00:00
|
|
|
// Check that this surface has a click grab.
|
|
|
|
if !pointer.has_grab(serial) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-02 15:05:49 +00:00
|
|
|
let start_data = pointer.grab_start_data().unwrap();
|
|
|
|
|
2020-02-02 15:09:21 +00:00
|
|
|
// If the focus was for a different surface, ignore the request.
|
|
|
|
if start_data.focus.is_none()
|
|
|
|
|| !start_data
|
|
|
|
.focus
|
|
|
|
.as_ref()
|
|
|
|
.unwrap()
|
|
|
|
.0
|
|
|
|
.as_ref()
|
|
|
|
.same_client_as(surface.get_surface().unwrap().as_ref())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-01 15:42:08 +00:00
|
|
|
let toplevel = SurfaceKind::Wl(surface);
|
|
|
|
let initial_window_location = shell_window_map.borrow().location(&toplevel).unwrap();
|
|
|
|
|
|
|
|
let grab = MoveSurfaceGrab {
|
2020-02-02 15:05:49 +00:00
|
|
|
start_data,
|
2020-02-01 15:42:08 +00:00
|
|
|
window_map: shell_window_map.clone(),
|
|
|
|
toplevel,
|
|
|
|
initial_window_location,
|
|
|
|
};
|
|
|
|
|
|
|
|
pointer.set_grab(grab, serial);
|
|
|
|
}
|
2020-02-03 13:31:15 +00:00
|
|
|
ShellRequest::Resize {
|
|
|
|
surface,
|
|
|
|
seat,
|
|
|
|
serial,
|
|
|
|
edges,
|
|
|
|
} => {
|
|
|
|
let seat = Seat::from_resource(&seat).unwrap();
|
|
|
|
// TODO: touch resize.
|
|
|
|
let pointer = seat.get_pointer().unwrap();
|
|
|
|
|
|
|
|
// Check that this surface has a click grab.
|
|
|
|
if !pointer.has_grab(serial) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
let start_data = pointer.grab_start_data().unwrap();
|
|
|
|
|
|
|
|
// If the focus was for a different surface, ignore the request.
|
|
|
|
if start_data.focus.is_none()
|
|
|
|
|| !start_data
|
|
|
|
.focus
|
|
|
|
.as_ref()
|
|
|
|
.unwrap()
|
|
|
|
.0
|
|
|
|
.as_ref()
|
|
|
|
.same_client_as(surface.get_surface().unwrap().as_ref())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-08 05:46:15 +00:00
|
|
|
let toplevel = SurfaceKind::Wl(surface.clone());
|
2020-02-03 13:31:15 +00:00
|
|
|
let initial_window_location = shell_window_map.borrow().location(&toplevel).unwrap();
|
|
|
|
let geometry = shell_window_map.borrow().geometry(&toplevel).unwrap();
|
|
|
|
let initial_window_size = (geometry.width, geometry.height);
|
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
with_states(surface.get_surface().unwrap(), move |states| {
|
|
|
|
states
|
|
|
|
.data_map
|
2020-04-10 15:01:49 +00:00
|
|
|
.get::<RefCell<SurfaceData>>()
|
|
|
|
.unwrap()
|
|
|
|
.borrow_mut()
|
|
|
|
.resize_state = ResizeState::Resizing(ResizeData {
|
|
|
|
edges: edges.into(),
|
|
|
|
initial_window_location,
|
|
|
|
initial_window_size,
|
|
|
|
});
|
2021-06-23 07:43:53 +00:00
|
|
|
})
|
|
|
|
.unwrap();
|
2020-02-08 05:46:15 +00:00
|
|
|
|
2020-02-03 13:31:15 +00:00
|
|
|
let grab = ResizeSurfaceGrab {
|
|
|
|
start_data,
|
|
|
|
toplevel,
|
2020-02-11 08:06:36 +00:00
|
|
|
edges: edges.into(),
|
2020-02-03 13:31:15 +00:00
|
|
|
initial_window_size,
|
|
|
|
last_window_size: initial_window_size,
|
|
|
|
};
|
|
|
|
|
|
|
|
pointer.set_grab(grab, serial);
|
|
|
|
}
|
2020-02-01 15:42:08 +00:00
|
|
|
_ => (),
|
2018-09-24 22:32:09 +00:00
|
|
|
}
|
|
|
|
},
|
2018-04-23 09:40:41 +00:00
|
|
|
log.clone(),
|
|
|
|
);
|
|
|
|
|
2020-05-02 10:42:02 +00:00
|
|
|
ShellHandles {
|
|
|
|
xdg_state: xdg_shell_state,
|
|
|
|
wl_state: wl_shell_state,
|
|
|
|
window_map,
|
|
|
|
}
|
2017-09-22 12:56:59 +00:00
|
|
|
}
|
2018-05-07 17:56:38 +00:00
|
|
|
|
2020-02-08 05:46:15 +00:00
|
|
|
/// Information about the resize operation.
|
|
|
|
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
|
|
|
|
pub struct ResizeData {
|
|
|
|
/// The edges the surface is being resized with.
|
2020-02-11 08:06:36 +00:00
|
|
|
edges: ResizeEdge,
|
2020-02-08 05:46:15 +00:00
|
|
|
/// The initial window location.
|
|
|
|
initial_window_location: (i32, i32),
|
|
|
|
/// The initial window size (geometry width and height).
|
|
|
|
initial_window_size: (i32, i32),
|
|
|
|
}
|
|
|
|
|
|
|
|
/// State of the resize operation.
|
|
|
|
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
|
|
|
|
pub enum ResizeState {
|
|
|
|
/// The surface is not being resized.
|
|
|
|
NotResizing,
|
|
|
|
/// The surface is currently being resized.
|
|
|
|
Resizing(ResizeData),
|
|
|
|
/// The resize has finished, and the surface needs to ack the final configure.
|
2020-08-08 04:37:35 +00:00
|
|
|
WaitingForFinalAck(ResizeData, Serial),
|
2020-02-08 05:46:15 +00:00
|
|
|
/// The resize has finished, and the surface needs to commit its final state.
|
|
|
|
WaitingForCommit(ResizeData),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Default for ResizeState {
|
|
|
|
fn default() -> Self {
|
|
|
|
ResizeState::NotResizing
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-07 17:56:38 +00:00
|
|
|
#[derive(Default)]
|
|
|
|
pub struct SurfaceData {
|
2021-06-23 07:43:53 +00:00
|
|
|
pub buffer: Option<wl_buffer::WlBuffer>,
|
2021-04-06 23:15:03 +00:00
|
|
|
pub texture: Option<Box<dyn std::any::Any + 'static>>,
|
2020-02-03 13:22:48 +00:00
|
|
|
pub geometry: Option<Rectangle>,
|
2020-02-08 05:46:15 +00:00
|
|
|
pub resize_state: ResizeState,
|
2021-06-23 07:43:53 +00:00
|
|
|
pub dimensions: Option<(i32, i32)>,
|
2020-04-21 18:53:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl SurfaceData {
|
2021-06-23 07:43:53 +00:00
|
|
|
pub fn update_buffer(&mut self, attrs: &mut SurfaceAttributes) {
|
|
|
|
match attrs.buffer.take() {
|
|
|
|
Some(BufferAssignment::NewBuffer { buffer, .. }) => {
|
|
|
|
// new contents
|
|
|
|
self.dimensions = buffer_dimensions(&buffer);
|
|
|
|
if let Some(old_buffer) = std::mem::replace(&mut self.buffer, Some(buffer)) {
|
|
|
|
old_buffer.release();
|
|
|
|
}
|
|
|
|
self.texture = None;
|
2020-04-21 18:53:55 +00:00
|
|
|
}
|
2021-06-23 07:43:53 +00:00
|
|
|
Some(BufferAssignment::Removed) => {
|
|
|
|
// remove the contents
|
|
|
|
self.buffer = None;
|
|
|
|
self.dimensions = None;
|
|
|
|
self.texture = None;
|
2020-04-21 18:53:55 +00:00
|
|
|
}
|
2021-06-23 07:43:53 +00:00
|
|
|
None => {}
|
2020-04-21 18:53:55 +00:00
|
|
|
}
|
|
|
|
}
|
2018-05-07 17:56:38 +00:00
|
|
|
|
2020-02-03 12:55:48 +00:00
|
|
|
/// Returns the size of the surface.
|
|
|
|
pub fn size(&self) -> Option<(i32, i32)> {
|
2021-06-23 07:43:53 +00:00
|
|
|
self.dimensions
|
2020-02-03 12:55:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks if the surface's input region contains the point.
|
2021-06-23 07:43:53 +00:00
|
|
|
pub fn contains_point(&self, attrs: &SurfaceAttributes, point: (f64, f64)) -> bool {
|
2020-02-03 12:55:48 +00:00
|
|
|
let (w, h) = match self.size() {
|
|
|
|
None => return false, // If the surface has no size, it can't have an input region.
|
|
|
|
Some(wh) => wh,
|
|
|
|
};
|
|
|
|
|
|
|
|
let rect = Rectangle {
|
|
|
|
x: 0,
|
|
|
|
y: 0,
|
|
|
|
width: w,
|
|
|
|
height: h,
|
|
|
|
};
|
|
|
|
|
|
|
|
let point = (point.0 as i32, point.1 as i32);
|
|
|
|
|
|
|
|
// The input region is always within the surface itself, so if the surface itself doesn't contain the
|
|
|
|
// point we can return false.
|
|
|
|
if !rect.contains(point) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If there's no input region, we're done.
|
2021-06-23 07:43:53 +00:00
|
|
|
if attrs.input_region.is_none() {
|
2020-02-03 12:55:48 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
attrs.input_region.as_ref().unwrap().contains(point)
|
2020-02-03 12:55:48 +00:00
|
|
|
}
|
2020-04-21 17:42:03 +00:00
|
|
|
|
|
|
|
/// Send the frame callback if it had been requested
|
2021-06-23 07:43:53 +00:00
|
|
|
pub fn send_frame(attrs: &mut SurfaceAttributes, time: u32) {
|
|
|
|
for callback in attrs.frame_callbacks.drain(..) {
|
2020-10-10 18:01:18 +00:00
|
|
|
callback.done(time);
|
2020-04-21 17:42:03 +00:00
|
|
|
}
|
|
|
|
}
|
2018-05-07 17:56:38 +00:00
|
|
|
}
|
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
fn surface_commit(surface: &wl_surface::WlSurface, window_map: &RefCell<WindowMap>) {
|
2021-01-04 08:18:35 +00:00
|
|
|
#[cfg(feature = "xwayland")]
|
|
|
|
super::xwayland::commit_hook(surface);
|
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
let mut window_map = window_map.borrow_mut();
|
2021-06-15 21:32:02 +00:00
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
if !is_sync_subsurface(surface) {
|
|
|
|
// Update the buffer of all child surfaces
|
|
|
|
with_surface_tree_upward(
|
|
|
|
surface,
|
|
|
|
(),
|
|
|
|
|_, _, _| TraversalAction::DoChildren(()),
|
|
|
|
|_, states, _| {
|
|
|
|
states
|
|
|
|
.data_map
|
|
|
|
.insert_if_missing(|| RefCell::new(SurfaceData::default()));
|
|
|
|
let mut data = states
|
|
|
|
.data_map
|
|
|
|
.get::<RefCell<SurfaceData>>()
|
|
|
|
.unwrap()
|
|
|
|
.borrow_mut();
|
|
|
|
data.update_buffer(&mut *states.cached_state.current::<SurfaceAttributes>());
|
|
|
|
},
|
|
|
|
|_, _, _| true,
|
|
|
|
);
|
2021-06-15 21:32:02 +00:00
|
|
|
}
|
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
if let Some(toplevel) = window_map.find(surface) {
|
|
|
|
// send the initial configure if relevant
|
|
|
|
if let SurfaceKind::Xdg(ref toplevel) = toplevel {
|
|
|
|
let initial_configure_sent = with_states(surface, |states| {
|
|
|
|
states
|
|
|
|
.data_map
|
|
|
|
.get::<Mutex<XdgToplevelSurfaceRoleAttributes>>()
|
|
|
|
.unwrap()
|
|
|
|
.lock()
|
|
|
|
.unwrap()
|
|
|
|
.initial_configure_sent
|
2021-06-15 21:32:02 +00:00
|
|
|
})
|
|
|
|
.unwrap();
|
2021-06-23 07:43:53 +00:00
|
|
|
if !initial_configure_sent {
|
|
|
|
toplevel.send_configure();
|
2018-05-07 17:56:38 +00:00
|
|
|
}
|
|
|
|
}
|
2020-02-08 05:44:39 +00:00
|
|
|
|
|
|
|
window_map.refresh_toplevel(&toplevel);
|
2020-02-08 05:46:15 +00:00
|
|
|
// Get the geometry outside since it uses the token, and so would block inside.
|
|
|
|
let Rectangle { width, height, .. } = window_map.geometry(&toplevel).unwrap();
|
|
|
|
|
2021-06-23 07:43:53 +00:00
|
|
|
let new_location = with_states(surface, |states| {
|
|
|
|
let mut data = states
|
|
|
|
.data_map
|
2020-04-10 15:01:49 +00:00
|
|
|
.get::<RefCell<SurfaceData>>()
|
|
|
|
.unwrap()
|
|
|
|
.borrow_mut();
|
2020-02-08 05:46:15 +00:00
|
|
|
|
|
|
|
let mut new_location = None;
|
|
|
|
|
|
|
|
// If the window is being resized by top or left, its location must be adjusted
|
|
|
|
// accordingly.
|
|
|
|
match data.resize_state {
|
|
|
|
ResizeState::Resizing(resize_data)
|
|
|
|
| ResizeState::WaitingForFinalAck(resize_data, _)
|
|
|
|
| ResizeState::WaitingForCommit(resize_data) => {
|
|
|
|
let ResizeData {
|
|
|
|
edges,
|
|
|
|
initial_window_location,
|
|
|
|
initial_window_size,
|
|
|
|
} = resize_data;
|
2020-01-22 04:00:37 +00:00
|
|
|
|
2020-02-11 08:06:36 +00:00
|
|
|
if edges.intersects(ResizeEdge::TOP_LEFT) {
|
2020-02-08 05:46:15 +00:00
|
|
|
let mut location = window_map.location(&toplevel).unwrap();
|
2020-01-22 04:45:25 +00:00
|
|
|
|
2020-02-11 08:06:36 +00:00
|
|
|
if edges.intersects(ResizeEdge::LEFT) {
|
2020-02-08 05:46:15 +00:00
|
|
|
location.0 = initial_window_location.0 + (initial_window_size.0 - width);
|
|
|
|
}
|
2020-02-11 08:06:36 +00:00
|
|
|
if edges.intersects(ResizeEdge::TOP) {
|
2020-02-08 05:46:15 +00:00
|
|
|
location.1 = initial_window_location.1 + (initial_window_size.1 - height);
|
|
|
|
}
|
2020-02-02 09:42:23 +00:00
|
|
|
|
2020-02-08 05:46:15 +00:00
|
|
|
new_location = Some(location);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ResizeState::NotResizing => (),
|
|
|
|
}
|
2020-01-22 04:45:25 +00:00
|
|
|
|
2020-02-08 05:46:15 +00:00
|
|
|
// Finish resizing.
|
|
|
|
if let ResizeState::WaitingForCommit(_) = data.resize_state {
|
|
|
|
data.resize_state = ResizeState::NotResizing;
|
|
|
|
}
|
|
|
|
|
|
|
|
new_location
|
2021-06-23 07:43:53 +00:00
|
|
|
})
|
|
|
|
.unwrap();
|
2020-02-08 05:46:15 +00:00
|
|
|
|
|
|
|
if let Some(location) = new_location {
|
|
|
|
window_map.set_location(&toplevel, location);
|
|
|
|
}
|
2020-02-08 05:44:39 +00:00
|
|
|
}
|
2020-01-22 04:00:37 +00:00
|
|
|
}
|