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

Merge pull request #154 from YaLTeR/input-region 

Store and use the committed input_region
This commit is contained in:
Victor Berger 2020-02-02 11:27:34 +01:00 committed by GitHub
parent fd50b45e61 13cac4f693
commit e07a57885b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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();
} }
@ -197,10 +200,12 @@ fn contains_point(attrs: &SurfaceAttributes, point: (f64, f64)) -> bool {
return false; return false;
} }
let input_region = &attrs.user_data.get::<SurfaceData>().unwrap().input_region;
// If there's no input region, we're done. // If there's no input region, we're done.
if attrs.input_region.is_none() { if input_region.is_none() {
return true; return true;
} }
attrs.input_region.as_ref().unwrap().contains(point) input_region.as_ref().unwrap().contains(point)
} }