Skip to content

Commit 44de37e

Browse files
committed
wip: Remove x11 backend
1 parent 5c6637c commit 44de37e

File tree

5 files changed

+5
-521
lines changed

5 files changed

+5
-521
lines changed

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ features = [
3535
rstest = "0.18.2"
3636

3737
[features]
38-
default = ["egl", "winit", "x11", "udev", "xwayland"]
38+
default = ["egl", "winit", "udev", "xwayland"]
3939
egl = ["smithay/use_system_lib", "smithay/backend_egl"]
4040
udev = [
4141
"smithay-drm-extras",
@@ -52,5 +52,4 @@ udev = [
5252
"xcursor",
5353
]
5454
winit = ["smithay/backend_winit", "smithay/backend_drm"]
55-
x11 = ["smithay/backend_x11", "x11rb", "smithay/renderer_gl", "smithay/backend_vulkan"]
5655
xwayland = ["smithay/xwayland", "x11rb", "smithay/x11rb_event_source", "xcursor"]

src/input_handler.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ use smithay::wayland::shell::wlr_layer::{
3131
};
3232
use smithay::wayland::shell::xdg::XdgToplevelSurfaceData;
3333

34-
#[cfg(any(feature = "winit", feature = "x11", feature = "udev"))]
34+
#[cfg(any(feature = "winit", feature = "udev"))]
3535
use smithay::backend::input::AbsolutePositionEvent;
3636

37-
#[cfg(any(feature = "winit", feature = "x11"))]
37+
#[cfg(feature = "winit")]
3838
use smithay::output::Output;
3939
use tracing::{debug, error, info};
4040

@@ -461,7 +461,7 @@ impl<BackendData: Backend> AnvilState<BackendData> {
461461
}
462462
}
463463

464-
#[cfg(any(feature = "winit", feature = "x11"))]
464+
#[cfg(feature = "winit")]
465465
impl<Backend: crate::state::Backend> AnvilState<Backend> {
466466
pub fn process_input_event_windowed<B: InputBackend>(
467467
&mut self,

src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// If no backend is enabled, a large portion of the codebase is unused.
33
// So silence this useless warning for the CI.
44
#![cfg_attr(
5-
not(any(feature = "winit", feature = "x11", feature = "udev")),
5+
not(any(feature = "winit", feature = "udev")),
66
allow(dead_code, unused_imports)
77
)]
88

@@ -18,7 +18,5 @@ pub mod state;
1818
pub mod udev;
1919
#[cfg(feature = "winit")]
2020
pub mod winit;
21-
#[cfg(feature = "x11")]
22-
pub mod x11;
2321

2422
pub use state::{AnvilState, CalloopData, ClientState};

src/main.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ static POSSIBLE_BACKENDS: &[&str] = &[
33
"--winit : Run anvil as a X11 or Wayland client using winit.",
44
#[cfg(feature = "udev")]
55
"--tty-udev : Run anvil as a tty udev client (requires root if without logind).",
6-
#[cfg(feature = "x11")]
7-
"--x11 : Run anvil as an X11 client.",
86
];
97

108
fn main() {
@@ -29,11 +27,6 @@ fn main() {
2927
tracing::info!("Starting anvil on a tty using udev");
3028
sabiniwm::udev::run_udev();
3129
}
32-
#[cfg(feature = "x11")]
33-
Some("--x11") => {
34-
tracing::info!("Starting anvil with x11 backend");
35-
sabiniwm::x11::run_x11();
36-
}
3730
Some(other) => {
3831
tracing::error!("Unknown backend: {}", other);
3932
}

0 commit comments

Comments
 (0)