From eb5efc45579c4537017db6bcf698365b3fdba047 Mon Sep 17 00:00:00 2001 From: Charlotte Meyer Date: Tue, 29 Jan 2019 16:05:05 +0100 Subject: [PATCH] Unified interface --- src/input/manager.rs | 2 +- src/main.rs | 4 ++-- src/output/manager.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/input/manager.rs b/src/input/manager.rs index 1b69455..998bc74 100644 --- a/src/input/manager.rs +++ b/src/input/manager.rs @@ -11,7 +11,7 @@ use wlroots::{ with_handles, }; -pub fn manager() -> input::manager::Builder { +pub fn build() -> input::manager::Builder { input::manager::Builder::default() .keyboard_added(keyboard_added) .pointer_added(pointer_added) diff --git a/src/main.rs b/src/main.rs index c22be37..9b61c4c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -60,7 +60,7 @@ fn build_compositor() -> compositor::Compositor { compositor::Builder::new() .gles2(true) .data_device(true) - .input_manager(input::manager()) - .output_manager(output::manager()) + .input_manager(input::build()) + .output_manager(output::build()) .build_auto(CompositorState::new()) } diff --git a/src/output/manager.rs b/src/output/manager.rs index c9cb0e9..b6aecc6 100644 --- a/src/output/manager.rs +++ b/src/output/manager.rs @@ -3,7 +3,7 @@ use crate::CompositorState; use log::debug; use wlroots::{compositor, output, with_handles}; -pub fn manager() -> output::manager::Builder { +pub fn build() -> output::manager::Builder { output::manager::Builder::default().output_added(output_added) }