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

Update smithay

Browse source 
Updates for changes in https://github.com/Smithay/smithay/pull/1391.
This commit is contained in:
Ian Douglas Scott 2024-04-16 12:05:22 -07:00 • committed by Victoria Brekenfeld
parent 5d5a510691
commit 17ddc7ce24
9 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/shell/grabs/menu/mod.rs
View file

@ -541,7 +541,7 @@ impl PointerGrab<State> for MenuGrab {
.any(|elem| elem.pointer_entered);
if !any_entered {
if event.state == ButtonState::Pressed {
handle.unset_grab(state, event.serial, event.time, true);
handle.unset_grab(self, state, event.serial, event.time, true);
}
} else {
let selected = {
@ -554,7 +554,7 @@ impl PointerGrab<State> for MenuGrab {
selected
};
if selected && event.state == ButtonState::Released {
handle.unset_grab(state, event.serial, event.time, true);
handle.unset_grab(self, state, event.serial, event.time, true);
} else {
handle.button(state, event);
}

10
src/shell/grabs/moving.rs
View file

@ -444,7 +444,7 @@ impl PointerGrab<State> for MoveGrab {
// While the grab is active, no client has pointer focus
handle.motion(state, None, event);
if !self.window.alive() {
handle.unset_grab(state, event.serial, event.time, true);
handle.unset_grab(self, state, event.serial, event.time, true);
}
}
@ -469,12 +469,12 @@ impl PointerGrab<State> for MoveGrab {
match self.release {
ReleaseMode::NoMouseButtons => {
if handle.current_pressed().is_empty() {
handle.unset_grab(state, event.serial, event.time, true);
handle.unset_grab(self, state, event.serial, event.time, true);
}
}
ReleaseMode::Click => {
if event.state == ButtonState::Pressed {
handle.unset_grab(state, event.serial, event.time, true);
handle.unset_grab(self, state, event.serial, event.time, true);
}
}
}
@ -595,7 +595,7 @@ impl TouchGrab<State> for MoveGrab {
seq: Serial,
) {
if event.slot == <Self as TouchGrab<State>>::start_data(self).slot {
handle.unset_grab(data);
handle.unset_grab(self, data);
}
handle.up(data, event, seq);
@ -621,7 +621,7 @@ impl TouchGrab<State> for MoveGrab {
}
fn cancel(&mut self, data: &mut State, handle: &mut TouchInnerHandle<'_, State>, _seq: Serial) {
handle.unset_grab(data);
handle.unset_grab(self, data);
}
fn start_data(&self) -> &TouchGrabStartData<State> {

12
src/shell/layout/floating/grabs/resize.rs
View file

@ -144,7 +144,7 @@ impl PointerGrab<State> for ResizeSurfaceGrab {
handle.motion(data, None, event);
if self.update_location(event.location) {
handle.unset_grab(data, event.serial, event.time, true);
handle.unset_grab(self, data, event.serial, event.time, true);
}
}
@ -169,12 +169,12 @@ impl PointerGrab<State> for ResizeSurfaceGrab {
match self.release {
ReleaseMode::NoMouseButtons => {
if handle.current_pressed().is_empty() {
handle.unset_grab(data, event.serial, event.time, true);
handle.unset_grab(self, data, event.serial, event.time, true);
}
}
ReleaseMode::Click => {
if event.state == ButtonState::Pressed {
handle.unset_grab(data, event.serial, event.time, true);
handle.unset_grab(self, data, event.serial, event.time, true);
}
}
}
@ -297,7 +297,7 @@ impl TouchGrab<State> for ResizeSurfaceGrab {
seq: Serial,
) {
if event.slot == <Self as TouchGrab<State>>::start_data(self).slot {
handle.unset_grab(data);
handle.unset_grab(self, data);
}
handle.up(data, event, seq);
@ -313,7 +313,7 @@ impl TouchGrab<State> for ResizeSurfaceGrab {
) {
if event.slot == <Self as TouchGrab<State>>::start_data(self).slot {
if self.update_location(event.location) {
handle.unset_grab(data);
handle.unset_grab(self, data);
}
}
@ -325,7 +325,7 @@ impl TouchGrab<State> for ResizeSurfaceGrab {
}
fn cancel(&mut self, data: &mut State, handle: &mut TouchInnerHandle<'_, State>, _seq: Serial) {
handle.unset_grab(data);
handle.unset_grab(self, data);
}
fn start_data(&self) -> &TouchGrabStartData<State> {

12
src/shell/layout/tiling/grabs/resize.rs
View file

@ -343,7 +343,7 @@ impl PointerGrab<State> for ResizeForkGrab {
handle.motion(data, None, event);
if self.update_location(data, event.location) {
handle.unset_grab(data, event.serial, event.time, true);
handle.unset_grab(self, data, event.serial, event.time, true);
}
}
@ -368,12 +368,12 @@ impl PointerGrab<State> for ResizeForkGrab {
match self.release {
ReleaseMode::NoMouseButtons => {
if handle.current_pressed().is_empty() {
handle.unset_grab(data, event.serial, event.time, true);
handle.unset_grab(self, data, event.serial, event.time, true);
}
}
ReleaseMode::Click => {
if event.state == ButtonState::Pressed {
handle.unset_grab(data, event.serial, event.time, true);
handle.unset_grab(self, data, event.serial, event.time, true);
}
}
}
@ -494,7 +494,7 @@ impl TouchGrab<State> for ResizeForkGrab {
seq: Serial,
) {
if event.slot == <Self as TouchGrab<State>>::start_data(self).slot {
handle.unset_grab(data);
handle.unset_grab(self, data);
}
handle.up(data, event, seq);
@ -510,7 +510,7 @@ impl TouchGrab<State> for ResizeForkGrab {
) {
if event.slot == <Self as TouchGrab<State>>::start_data(self).slot {
if self.update_location(data, event.location) {
handle.unset_grab(data);
handle.unset_grab(self, data);
}
}
@ -522,7 +522,7 @@ impl TouchGrab<State> for ResizeForkGrab {
}
fn cancel(&mut self, data: &mut State, handle: &mut TouchInnerHandle<'_, State>, _seq: Serial) {
handle.unset_grab(data);
handle.unset_grab(self, data);
}
fn start_data(&self) -> &TouchGrabStartData<State> {

2
src/shell/layout/tiling/grabs/swap.rs
View file

@ -41,7 +41,7 @@ impl KeyboardGrab<State> for SwapWindowGrab {
) {
if !matches!(&data.common.shell.read().unwrap().overview_mode, OverviewMode::Started(Trigger::KeyboardSwap(_, d), _) if d == &self.desc)
{
handle.unset_grab(data, serial, false);
handle.unset_grab(self, data, serial, false);
return;
}