leyoda/smithay-clipboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only update serial on PtrEvent::Enter/Button when seat is already presented (#8)

Browse source 
Fixes primary selection storing, when mouse button was pressed inside surface
and then released outside.
This commit is contained in:
Kirill Chibisov 2019-09-03 16:38:28 +03:00 • committed by trimental
parent b2b0e4099d
commit 705939b3bf
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -2,6 +2,8 @@
## Unreleased
- Fix primary selection storing, when releasing button outside of the surface
## 0.3.4 -- 2019-08-14
- Add fallback to gtk primary selection, when zwp primary selection is not available

24
src/threaded.rs
View file

@ -665,6 +665,16 @@ fn implement_seat(
// Get serials from recieved events from the seat pointer
match evt {
PtrEvent::Enter { serial, .. } => {
if let Some(seat) = seat_map
.lock()
.unwrap()
.get_mut(&seat_name.lock().unwrap().clone())
{
// Update serial if "seat" is already presented
seat.1 = serial;
return;
}
seat_map.lock().unwrap().insert(
seat_name.lock().unwrap().clone(),
(
@ -678,6 +688,17 @@ fn implement_seat(
);
}
PtrEvent::Button { serial, .. } => {
if let Some(seat) = seat_map
.lock()
.unwrap()
.get_mut(&seat_name.lock().unwrap().clone())
{
// Update serial if seat is already presented
seat.1 = serial;
return;
}
// This is for consistency with `PtrEvent::Enter`
seat_map.lock().unwrap().insert(
seat_name.lock().unwrap().clone(),
(
@ -690,9 +711,6 @@ fn implement_seat(
),
);
}
PtrEvent::Leave { .. } => {
seat_map.lock().unwrap().remove(&*seat_name.lock().unwrap());
}
_ => {}
}
},