From c743be9596a2d1ce211bd14793200793eb73c059 Mon Sep 17 00:00:00 2001 From: meh Date: Mon, 25 Apr 2016 17:12:39 +0200 Subject: [PATCH] device/builder: remove All events for Absolute and Relative --- src/device/builder.rs | 78 ++++++++----------------------------------- src/event/absolute.rs | 4 --- src/event/relative.rs | 4 --- 3 files changed, 14 insertions(+), 72 deletions(-) diff --git a/src/device/builder.rs b/src/device/builder.rs index 3e3b04e..c83ffa0 100644 --- a/src/device/builder.rs +++ b/src/device/builder.rs @@ -82,10 +82,8 @@ impl Builder { pub fn event>(mut self, value: T) -> Res { match value.into() { Event::All => { - try!(try!(try!(self.event(Event::Keyboard(event::Keyboard::All))) - .event(Event::Controller(event::Controller::All))) - .event(Event::Relative(event::Relative::All))) - .event(Event::Absolute(event::Absolute::All)) + try!(self.event(Event::Keyboard(event::Keyboard::All))) + .event(Event::Controller(event::Controller::All)) } Event::Keyboard(value) => { @@ -199,71 +197,23 @@ impl Builder { } Event::Relative(value) => { - match value { - event::Relative::All => { - let mut builder = self; - - for item in event::relative::Position::iter_variants() { - builder = try!(builder.event(item)); - } - - for item in event::relative::Wheel::iter_variants() { - builder = try!(builder.event(item)); - } - - Ok(builder) - } - - value => { - unsafe { - try!(Errno::result(ui_set_evbit(self.fd, value.kind()))); - try!(Errno::result(ui_set_relbit(self.fd, value.code()))); - } - - Ok(self) - } + unsafe { + try!(Errno::result(ui_set_evbit(self.fd, value.kind()))); + try!(Errno::result(ui_set_relbit(self.fd, value.code()))); } + + Ok(self) } Event::Absolute(value) => { - match value { - event::Absolute::All => { - let mut builder = self; - - for item in event::absolute::Position::iter_variants() { - builder = try!(builder.event(item)); - } - - for item in event::absolute::Wheel::iter_variants() { - builder = try!(builder.event(item)); - } - - for item in event::absolute::Hat::iter_variants() { - builder = try!(builder.event(item)); - } - - for item in event::absolute::Digi::iter_variants() { - builder = try!(builder.event(item)); - } - - for item in event::absolute::Multi::iter_variants() { - builder = try!(builder.event(item)); - } - - Ok(builder) - } - - value => { - unsafe { - try!(Errno::result(ui_set_evbit(self.fd, value.kind()))); - try!(Errno::result(ui_set_absbit(self.fd, value.code()))); - } - - self.code = value.code(); - - Ok(self) - } + unsafe { + try!(Errno::result(ui_set_evbit(self.fd, value.kind()))); + try!(Errno::result(ui_set_absbit(self.fd, value.code()))); } + + self.code = value.code(); + + Ok(self) } } } diff --git a/src/event/absolute.rs b/src/event/absolute.rs index 46b3c23..60695fd 100644 --- a/src/event/absolute.rs +++ b/src/event/absolute.rs @@ -5,8 +5,6 @@ use super::{Kind, Code}; #[derive(Clone, Copy, PartialEq, Eq, Debug)] pub enum Absolute { - All, - Position(Position), Wheel(Wheel), Hat(Hat), @@ -31,8 +29,6 @@ impl Kind for Absolute { impl Code for Absolute { fn code(&self) -> c_int { match self { - &Absolute::All => unreachable!(), - &Absolute::Position(ref v) => v.code(), &Absolute::Wheel(ref v) => v.code(), &Absolute::Hat(ref v) => v.code(), diff --git a/src/event/relative.rs b/src/event/relative.rs index c668eb5..1f3be15 100644 --- a/src/event/relative.rs +++ b/src/event/relative.rs @@ -5,8 +5,6 @@ use super::{Kind, Code}; #[derive(Clone, Copy, PartialEq, Eq, Debug)] pub enum Relative { - All, - Position(Position), Wheel(Wheel), } @@ -28,8 +26,6 @@ impl Kind for Relative { impl Code for Relative { fn code(&self) -> c_int { match self { - &Relative::All => unreachable!(), - &Relative::Position(ref v) => v.code(), &Relative::Wheel(ref v) => v.code(), }