From 93e16a6582f8e80ac4079ac527637861696ed7b1 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sat, 10 Feb 2024 09:33:32 +0400 Subject: Implement niri msg action --- src/input.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/input.rs') diff --git a/src/input.rs b/src/input.rs index 507e4479..0f586aba 100644 --- a/src/input.rs +++ b/src/input.rs @@ -1,7 +1,8 @@ use std::any::Any; use std::collections::HashSet; -use niri_config::{Action, Binds, LayoutAction, Modifiers}; +use niri_config::{Action, Binds, Modifiers}; +use niri_ipc::LayoutSwitchTarget; use smithay::backend::input::{ AbsolutePositionEvent, Axis, AxisSource, ButtonState, Device, DeviceCapability, Event, GestureBeginEvent, GestureEndEvent, GesturePinchUpdateEvent as _, GestureSwipeUpdateEvent as _, @@ -273,6 +274,10 @@ impl State { return; } + self.do_action(action); + } + + pub fn do_action(&mut self, action: Action) { if self.niri.is_locked() && !allowed_when_locked(&action) { return; } @@ -377,8 +382,8 @@ impl State { self.niri.seat.get_keyboard().unwrap().with_xkb_state( self, |mut state| match action { - LayoutAction::Next => state.cycle_next_layout(), - LayoutAction::Prev => state.cycle_prev_layout(), + LayoutSwitchTarget::Next => state.cycle_next_layout(), + LayoutSwitchTarget::Prev => state.cycle_prev_layout(), }, ); } -- cgit