migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-29 04:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove x11-dl from winit-common

Browse Source
This commit is contained in:
Mads Marquart
2026-03-26 07:08:54 +01:00
parent d75a0dada0
commit 04e7516cf9
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
winit-common/Cargo.toml
View File

@@ -14,7 +14,7 @@ event-handler = []
# XKB # XKB
wayland = ["dep:memmap2"] wayland = ["dep:memmap2"]
x11 = ["xkbcommon-dl?/x11", "dep:x11-dl"] x11 = ["xkbcommon-dl?/x11"]
xkb = ["dep:xkbcommon-dl", "dep:smol_str"] xkb = ["dep:xkbcommon-dl", "dep:smol_str"]
# CoreFoundation # CoreFoundation
@@ -30,7 +30,6 @@ winit-core.workspace = true
# XKB # XKB
memmap2 = { workspace = true, optional = true } memmap2 = { workspace = true, optional = true }
x11-dl = { workspace = true, optional = true }
xkbcommon-dl = { workspace = true, optional = true } xkbcommon-dl = { workspace = true, optional = true }
# Foundation / CoreFoundation # Foundation / CoreFoundation

4
winit-common/src/xkb/keymap.rs
View File

@@ -7,9 +7,9 @@ use std::ptr::{self, NonNull};
use winit_core::keyboard::{ use winit_core::keyboard::{
Key, KeyCode, KeyLocation, NamedKey, NativeKey, NativeKeyCode, PhysicalKey, Key, KeyCode, KeyLocation, NamedKey, NativeKey, NativeKeyCode, PhysicalKey,
}; };
#[cfg(feature = "x11")]
use x11_dl::xlib_xcb::xcb_connection_t;
use xkb::XKB_MOD_INVALID; use xkb::XKB_MOD_INVALID;
#[cfg(feature = "x11")]
use xkbcommon_dl::x11::xcb_connection_t;
use xkbcommon_dl::{ use xkbcommon_dl::{
self as xkb, xkb_keycode_t, xkb_keymap, xkb_keymap_compile_flags, xkb_keysym_t, self as xkb, xkb_keycode_t, xkb_keymap, xkb_keymap_compile_flags, xkb_keysym_t,
xkb_layout_index_t, xkb_mod_index_t, xkb_layout_index_t, xkb_mod_index_t,

4
winit-common/src/xkb/mod.rs
View File

@@ -9,12 +9,12 @@ use std::sync::atomic::{AtomicBool, Ordering};
use smol_str::SmolStr; use smol_str::SmolStr;
use winit_core::event::{ElementState, KeyEvent}; use winit_core::event::{ElementState, KeyEvent};
use winit_core::keyboard::{Key, KeyLocation}; use winit_core::keyboard::{Key, KeyLocation};
#[cfg(feature = "x11")]
use xkbcommon_dl::x11::{xcb_connection_t, xkbcommon_x11_handle};
use xkbcommon_dl::{ use xkbcommon_dl::{
self as xkb, XkbCommon, XkbCommonCompose, xkb_compose_status, xkb_context, xkb_context_flags, self as xkb, XkbCommon, XkbCommonCompose, xkb_compose_status, xkb_context, xkb_context_flags,
xkbcommon_compose_handle, xkbcommon_handle, xkbcommon_compose_handle, xkbcommon_handle,
}; };
#[cfg(feature = "x11")]
use {x11_dl::xlib_xcb::xcb_connection_t, xkbcommon_dl::x11::xkbcommon_x11_handle};
mod compose; mod compose;
mod keymap; mod keymap;

2
winit-common/src/xkb/state.rs
View File

@@ -5,7 +5,7 @@ use std::ptr::NonNull;
use smol_str::SmolStr; use smol_str::SmolStr;
#[cfg(feature = "x11")] #[cfg(feature = "x11")]
use x11_dl::xlib_xcb::xcb_connection_t; use xkbcommon_dl::x11::xcb_connection_t;
use xkbcommon_dl::{ use xkbcommon_dl::{
self as xkb, xkb_keycode_t, xkb_keysym_t, xkb_layout_index_t, xkb_state, xkb_state_component, self as xkb, xkb_keycode_t, xkb_keysym_t, xkb_layout_index_t, xkb_state, xkb_state_component,
}; };