andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Implement relative-pointer

Browse Source 
Xwayland actually makes use of it, so I can finally verify that it
works!
This commit is contained in:
Ivan Molodetskikh
2023-12-04 18:12:12 +04:00
parent 0e29e7f6ff
commit 40b633be5c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/mod.rs
+4 -2
View File
@@ -37,8 +37,9 @@ use smithay::wayland::session_lock::{
use smithay::{ use smithay::{
delegate_cursor_shape, delegate_data_control, delegate_data_device, delegate_dmabuf, delegate_cursor_shape, delegate_data_control, delegate_data_device, delegate_dmabuf,
delegate_input_method_manager, delegate_output, delegate_pointer_gestures, delegate_input_method_manager, delegate_output, delegate_pointer_gestures,
delegate_presentation, delegate_primary_selection, delegate_seat, delegate_session_lock, delegate_presentation, delegate_primary_selection, delegate_relative_pointer, delegate_seat,
delegate_tablet_manager, delegate_text_input_manager, delegate_virtual_keyboard_manager, delegate_session_lock, delegate_tablet_manager, delegate_text_input_manager,
delegate_virtual_keyboard_manager,
}; };
use crate::layout::output_size; use crate::layout::output_size;
@@ -74,6 +75,7 @@ delegate_seat!(State);
delegate_cursor_shape!(State); delegate_cursor_shape!(State);
delegate_tablet_manager!(State); delegate_tablet_manager!(State);
delegate_pointer_gestures!(State); delegate_pointer_gestures!(State);
delegate_relative_pointer!(State);
delegate_text_input_manager!(State); delegate_text_input_manager!(State);
impl InputMethodHandler for State { impl InputMethodHandler for State {
src/niri.rs
+4
View File
@@ -63,6 +63,7 @@ use smithay::wayland::input_method::InputMethodManagerState;
use smithay::wayland::output::OutputManagerState; use smithay::wayland::output::OutputManagerState;
use smithay::wayland::pointer_gestures::PointerGesturesState; use smithay::wayland::pointer_gestures::PointerGesturesState;
use smithay::wayland::presentation::PresentationState; use smithay::wayland::presentation::PresentationState;
use smithay::wayland::relative_pointer::RelativePointerManagerState;
use smithay::wayland::selection::data_device::{set_data_device_selection, DataDeviceState}; use smithay::wayland::selection::data_device::{set_data_device_selection, DataDeviceState};
use smithay::wayland::selection::primary_selection::PrimarySelectionState; use smithay::wayland::selection::primary_selection::PrimarySelectionState;
use smithay::wayland::selection::wlr_data_control::DataControlState; use smithay::wayland::selection::wlr_data_control::DataControlState;
@@ -140,6 +141,7 @@ pub struct Niri {
pub input_method_state: InputMethodManagerState, pub input_method_state: InputMethodManagerState,
pub virtual_keyboard_state: VirtualKeyboardManagerState, pub virtual_keyboard_state: VirtualKeyboardManagerState,
pub pointer_gestures_state: PointerGesturesState, pub pointer_gestures_state: PointerGesturesState,
pub relative_pointer_state: RelativePointerManagerState,
pub data_device_state: DataDeviceState, pub data_device_state: DataDeviceState,
pub primary_selection_state: PrimarySelectionState, pub primary_selection_state: PrimarySelectionState,
pub data_control_state: DataControlState, pub data_control_state: DataControlState,
@@ -613,6 +615,7 @@ impl Niri {
let mut seat_state = SeatState::new(); let mut seat_state = SeatState::new();
let tablet_state = TabletManagerState::new::<State>(&display_handle); let tablet_state = TabletManagerState::new::<State>(&display_handle);
let pointer_gestures_state = PointerGesturesState::new::<State>(&display_handle); let pointer_gestures_state = PointerGesturesState::new::<State>(&display_handle);
let relative_pointer_state = RelativePointerManagerState::new::<State>(&display_handle);
let data_device_state = DataDeviceState::new::<State>(&display_handle); let data_device_state = DataDeviceState::new::<State>(&display_handle);
let primary_selection_state = PrimarySelectionState::new::<State>(&display_handle); let primary_selection_state = PrimarySelectionState::new::<State>(&display_handle);
let data_control_state = DataControlState::new::<State, _>( let data_control_state = DataControlState::new::<State, _>(
@@ -714,6 +717,7 @@ impl Niri {
seat_state, seat_state,
tablet_state, tablet_state,
pointer_gestures_state, pointer_gestures_state,
relative_pointer_state,
data_device_state, data_device_state,
primary_selection_state, primary_selection_state,
data_control_state, data_control_state,