aboutsummaryrefslogtreecommitdiff
path: root/src/niri.rs
diff options
context:
space:
mode:
authorIvan Molodetskikh <yalterz@gmail.com>2023-10-24 15:05:14 +0400
committerIvan Molodetskikh <yalterz@gmail.com>2023-10-24 15:05:14 +0400
commit3fd421f13fb823a5dd2b75d0d8649d190f932b2d (patch)
tree3ebf940c92c11153f1f28e3c313d972c7aa1e3f1 /src/niri.rs
parentd25473188528b9e9b69e2fb70dccaf8c3605128d (diff)
downloadniri-3fd421f13fb823a5dd2b75d0d8649d190f932b2d.tar.gz
niri-3fd421f13fb823a5dd2b75d0d8649d190f932b2d.tar.bz2
niri-3fd421f13fb823a5dd2b75d0d8649d190f932b2d.zip
Update Smithay
Diffstat (limited to 'src/niri.rs')
-rw-r--r--src/niri.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/niri.rs b/src/niri.rs
index 1917ee97..90ac94f3 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -37,7 +37,6 @@ use smithay::reexports::calloop::timer::{TimeoutAction, Timer};
use smithay::reexports::calloop::{
self, Idle, Interest, LoopHandle, LoopSignal, Mode, PostAction, RegistrationToken,
};
-use smithay::reexports::nix::libc::CLOCK_MONOTONIC;
use smithay::reexports::wayland_protocols::xdg::shell::server::xdg_toplevel::WmCapabilities;
use smithay::reexports::wayland_protocols_misc::server_decoration as _server_decoration;
use smithay::reexports::wayland_server::backend::{
@@ -46,7 +45,8 @@ use smithay::reexports::wayland_server::backend::{
use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
use smithay::reexports::wayland_server::{Display, DisplayHandle};
use smithay::utils::{
- IsAlive, Logical, Physical, Point, Rectangle, Scale, Size, Transform, SERIAL_COUNTER,
+ ClockSource, IsAlive, Logical, Monotonic, Physical, Point, Rectangle, Scale, Size, Transform,
+ SERIAL_COUNTER,
};
use smithay::wayland::compositor::{
with_states, with_surface_tree_downward, CompositorClientState, CompositorState, SurfaceData,
@@ -506,10 +506,11 @@ impl Niri {
|_| true,
);
let presentation_state =
- PresentationState::new::<State>(&display_handle, CLOCK_MONOTONIC as u32);
+ PresentationState::new::<State>(&display_handle, Monotonic::id() as u32);
let text_input_state = TextInputManagerState::new::<State>(&display_handle);
- let input_method_state = InputMethodManagerState::new::<State>(&display_handle);
+ let input_method_state =
+ InputMethodManagerState::new::<State, _>(&display_handle, |_| true);
let virtual_keyboard_state =
VirtualKeyboardManagerState::new::<State, _>(&display_handle, |_| true);