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

anvil.shell: store input_region in SurfaceData 

This is the most up-to-date committed input region.
This commit is contained in:
Ivan Molodetskikh 2020-02-02 12:41:35 +03:00
parent fd50b45e61
commit fac4ca260e
No known key found for this signature in database
GPG Key ID: 02CE38DA47E9D691
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
anvil/src/shell.rs
View File

@ -13,7 +13,7 @@ use smithay::{
}, },
utils::Rectangle, utils::Rectangle,
wayland::{ wayland::{
compositor::{compositor_init, CompositorToken, SurfaceAttributes, SurfaceEvent}, compositor::{compositor_init, CompositorToken, RegionAttributes, SurfaceAttributes, SurfaceEvent},
data_device::DnDIconRole, data_device::DnDIconRole,
seat::CursorImageRole, seat::CursorImageRole,
shell::{ shell::{
@ -138,17 +138,21 @@ pub fn init_shell(
pub struct SurfaceData { pub struct SurfaceData {
pub buffer: Option<wl_buffer::WlBuffer>, pub buffer: Option<wl_buffer::WlBuffer>,
pub texture: Option<crate::glium_drawer::TextureMetadata>, pub texture: Option<crate::glium_drawer::TextureMetadata>,
pub input_region: Option<RegionAttributes>,
} }
fn surface_commit(surface: &wl_surface::WlSurface, token: CompositorToken<Roles>) { fn surface_commit(surface: &wl_surface::WlSurface, token: CompositorToken<Roles>) {
// we retrieve the contents of the associated buffer and copy it
token.with_surface_data(surface, |attributes| { token.with_surface_data(surface, |attributes| {
attributes.user_data.insert_if_missing(SurfaceData::default); attributes.user_data.insert_if_missing(SurfaceData::default);
let data = attributes.user_data.get_mut::<SurfaceData>().unwrap();
data.input_region = attributes.input_region.clone();
// we retrieve the contents of the associated buffer and copy it
match attributes.buffer.take() { match attributes.buffer.take() {
Some(Some((buffer, (_x, _y)))) => { Some(Some((buffer, (_x, _y)))) => {
// new contents // new contents
// TODO: handle hotspot coordinates // TODO: handle hotspot coordinates
let data = attributes.user_data.get_mut::<SurfaceData>().unwrap();
if let Some(old_buffer) = data.buffer.replace(buffer) { if let Some(old_buffer) = data.buffer.replace(buffer) {
old_buffer.release(); old_buffer.release();
} }
@ -156,7 +160,6 @@ fn surface_commit(surface: &wl_surface::WlSurface, token: CompositorToken<Roles>
} }
Some(None) => { Some(None) => {
// erase the contents // erase the contents
let data = attributes.user_data.get_mut::<SurfaceData>().unwrap();
if let Some(old_buffer) = data.buffer.take() { if let Some(old_buffer) = data.buffer.take() {
old_buffer.release(); old_buffer.release();
} }