apricotbucket28
d8605c8614
This (mostly) allows the CSD added in https://github.com/zed-industries/zed/pull/11525 to work in X11. It's still a bit buggy as it detects a second window drag right after the first one finishes, but it's probably better to change the way window drags are detected in the title bar itself (as that causes other issues). The CSD can be tested by changing the return value of `should_render_window_controls` to true. Also fixes F11 crashing. Release Notes: - N/A
51 lines
1.7 KiB
Rust
51 lines
1.7 KiB
Rust
use x11rb::protocol::{
|
|
xinput,
|
|
xproto::{self, ModMask},
|
|
};
|
|
|
|
use crate::{Modifiers, MouseButton, NavigationDirection};
|
|
|
|
pub(crate) fn button_of_key(detail: xproto::Button) -> Option<MouseButton> {
|
|
Some(match detail {
|
|
1 => MouseButton::Left,
|
|
2 => MouseButton::Middle,
|
|
3 => MouseButton::Right,
|
|
8 => MouseButton::Navigate(NavigationDirection::Back),
|
|
9 => MouseButton::Navigate(NavigationDirection::Forward),
|
|
_ => return None,
|
|
})
|
|
}
|
|
|
|
pub(crate) fn modifiers_from_state(state: xproto::KeyButMask) -> Modifiers {
|
|
Modifiers {
|
|
control: state.contains(xproto::KeyButMask::CONTROL),
|
|
alt: state.contains(xproto::KeyButMask::MOD1),
|
|
shift: state.contains(xproto::KeyButMask::SHIFT),
|
|
platform: state.contains(xproto::KeyButMask::MOD4),
|
|
function: false,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn modifiers_from_xinput_info(modifier_info: xinput::ModifierInfo) -> Modifiers {
|
|
Modifiers {
|
|
control: modifier_info.effective as u16 & ModMask::CONTROL.bits()
|
|
== ModMask::CONTROL.bits(),
|
|
alt: modifier_info.effective as u16 & ModMask::M1.bits() == ModMask::M1.bits(),
|
|
shift: modifier_info.effective as u16 & ModMask::SHIFT.bits() == ModMask::SHIFT.bits(),
|
|
platform: modifier_info.effective as u16 & ModMask::M4.bits() == ModMask::M4.bits(),
|
|
function: false,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn pressed_button_from_mask(button_mask: u32) -> Option<MouseButton> {
|
|
Some(if button_mask & 2 == 2 {
|
|
MouseButton::Left
|
|
} else if button_mask & 4 == 4 {
|
|
MouseButton::Middle
|
|
} else if button_mask & 8 == 8 {
|
|
MouseButton::Right
|
|
} else {
|
|
return None;
|
|
})
|
|
}
|