Rename WidgetMessage to Message

src/ui/bspwm.rs

@@ -1,7 +1,6 @@
 use std::io::prelude::*;
 use std::io::BufReader;
 use std::process::{Command, Stdio};
-use std::sync::mpsc;
 use std::thread;
 use ui::widget;
 
@@ -15,12 +14,12 @@ struct Desktop {
 
 pub struct Bspwm {
     context: widget::DrawContext,
-    tx: mpsc::Sender<widget::WidgetMessage>,
+    tx: widget::MessageSender,
     desktops: Vec<Desktop>
 }
 
 impl Bspwm {
-    pub fn new(tx: mpsc::Sender<widget::WidgetMessage>, context: widget::DrawContext) -> Bspwm {
+    pub fn new(tx: widget::MessageSender, context: widget::DrawContext) -> Bspwm {
         Bspwm {
             context: context,
             tx: tx,
@@ -64,11 +63,11 @@ impl widget::Widget for Bspwm {
         sum
     }
 
-    fn handle_event(&mut self, event: &widget::WidgetMessage) -> bool {
+    fn handle_event(&mut self, event: &widget::Message) -> bool {
         match event {
-            &widget::WidgetMessage::BspwmEvent(ref line) => {
+            &widget::Message::BspwmEvent(ref line) => {
                 self.desktops = parse_bspwm(line);
-                self.tx.send(widget::WidgetMessage::Relayout).expect("Failed to send relayout");
+                self.tx.send(widget::Message::Relayout).expect("Failed to send relayout");
             },
             _ => {}
         }
@@ -76,7 +75,7 @@ impl widget::Widget for Bspwm {
     }
 }
 
-fn monitor_thread(tx: mpsc::Sender<widget::WidgetMessage>) {
+fn monitor_thread(tx: widget::MessageSender) {
     let bspc = Command::new("bspc")
         .arg("subscribe")
         .arg("report")
@@ -97,7 +96,7 @@ fn monitor_thread(tx: mpsc::Sender<widget::WidgetMessage>) {
 
         match kind {
             'W' => {
-                let event = widget::WidgetMessage::BspwmEvent(line.to_string());
+                let event = widget::Message::BspwmEvent(line.to_string());
                 tx.send(event).expect("Failed to send bswpm event")
             },
             _ => {}

src/ui/mod.rs

@@ -26,7 +26,7 @@ pub fn ui_main(cfg: &Config) -> i32 {
         {
             let tx = tx.clone();
             simple_signal::set_handler(&[Signal::Int, Signal::Term], move |_signals| {
-                tx.send(widget::WidgetMessage::Quit).expect("Failed to send quit");
+                tx.send(widget::Message::Quit).expect("Failed to send quit");
             });
         }
         {
@@ -36,7 +36,7 @@ pub fn ui_main(cfg: &Config) -> i32 {
                 loop {
                     match conn.wait_for_event() {
                         Some(event) => {
-                            let message = widget::WidgetMessage::XcbEvent(event);
+                            let message = widget::Message::XcbEvent(event);
                             tx.send(message).expect("Failed to send xcb event");
                         },
                         None => { break; }
@@ -68,7 +68,7 @@ pub fn ui_main(cfg: &Config) -> i32 {
             let tx = tx.clone();
             thread::spawn(move || {
                 loop {
-                    tx.send(widget::WidgetMessage::Update).expect("Failed to send update");
+                    tx.send(widget::Message::Update).expect("Failed to send update");
                     thread::sleep(time::Duration::from_secs(1));
                 }
             });

src/ui/panel.rs

@@ -103,7 +103,7 @@ impl Panel {
         );
     }
 
-    pub fn handle_event(&mut self, event: widget::WidgetMessage) -> bool {
+    pub fn handle_event(&mut self, event: widget::Message) -> bool {
         let finishing = self.finishing;
         let mut should_exit = false;
         if !finishing {
@@ -112,7 +112,7 @@ impl Panel {
             }
         }
         match event {
-            widget::WidgetMessage::XcbEvent(event) => {
+            widget::Message::XcbEvent(event) => {
                 if event.response_type() == xcb::EXPOSE {
                     self.relayout();
                 };
@@ -123,11 +123,11 @@ impl Panel {
                     }
                 }
             },
-            widget::WidgetMessage::Update =>
+            widget::Message::Update =>
                 self.relayout(),
-            widget::WidgetMessage::Relayout =>
+            widget::Message::Relayout =>
                 self.relayout(),
-            widget::WidgetMessage::Quit =>
+            widget::Message::Quit =>
                 self.finish(),
             _ => {}
         }

src/ui/sensors.rs

@@ -46,9 +46,9 @@ impl widget::Widget for Sensors {
         sum
     }
 
-    fn handle_event(&mut self, event: &widget::WidgetMessage) -> bool {
+    fn handle_event(&mut self, event: &widget::Message) -> bool {
         match event {
-            &widget::WidgetMessage::Update =>
+            &widget::Message::Update =>
                 for ref mut sensor in self.sensors.iter_mut() {
                     sensor.process()
                 },

src/ui/title.rs

@@ -55,9 +55,9 @@ impl Widget for Title {
         0
     }
 
-    fn handle_event(&mut self, event: &widget::WidgetMessage) -> bool {
+    fn handle_event(&mut self, event: &widget::Message) -> bool {
         match event {
-            &widget::WidgetMessage::XcbEvent(ref event) =>
+            &widget::Message::XcbEvent(ref event) =>
                 if event.response_type() == xcb::PROPERTY_NOTIFY {
                     let event: &xcb::PropertyNotifyEvent = unsafe { xcb::cast_event(&event) };
                     if event.atom() == self.conn.atom(x11::_NET_ACTIVE_WINDOW) {

src/ui/tray.rs

@@ -4,12 +4,11 @@ use ui::x11;
 use xcb;
 
 use std::sync::Arc;
-use std::sync::mpsc;
 
 const CLIENT_MESSAGE: u8 = xcb::CLIENT_MESSAGE | 0x80; // 0x80 flag for client messages
 
 pub struct Tray {
-    tx: mpsc::Sender<widget::WidgetMessage>,
+    tx: widget::MessageSender,
     conn: Arc<x11::Connection>,
     window: xcb::Window,
     children: Vec<xcb::Window>,
@@ -17,7 +16,7 @@ pub struct Tray {
 }
 
 impl Tray {
-    pub fn new(tx: mpsc::Sender<widget::WidgetMessage>, conn: Arc<x11::Connection>, window: xcb::Window) -> Tray {
+    pub fn new(tx: widget::MessageSender, conn: Arc<x11::Connection>, window: xcb::Window) -> Tray {
         Tray {
             conn: conn,
             tx: tx,
@@ -67,7 +66,7 @@ impl Tray {
     }
 
     fn relayout(&self) {
-        self.tx.send(widget::WidgetMessage::Relayout).expect("Failed to send relayout");
+        self.tx.send(widget::Message::Relayout).expect("Failed to send relayout");
     }
 
     pub fn force_size(&self, window: xcb::Window, dimensions: Option<(u16, u16)>) {
@@ -101,9 +100,9 @@ impl widget::Widget for Tray {
         }
     }
 
-    fn handle_event(&mut self, event: &widget::WidgetMessage) -> bool {
+    fn handle_event(&mut self, event: &widget::Message) -> bool {
         match event {
-            &widget::WidgetMessage::XcbEvent(ref event) =>
+            &widget::Message::XcbEvent(ref event) =>
                 match event.response_type() {
                     xcb::PROPERTY_NOTIFY if self.timestamp == 0 => {
                         let event: &xcb::PropertyNotifyEvent = unsafe { xcb::cast_event(&event) };

src/ui/widget.rs

@@ -3,8 +3,11 @@ use ui::font;
 
 use std::rc::Rc;
 use std::sync::Arc;
+use std::sync::mpsc;
 
-pub enum WidgetMessage {
+pub type MessageSender = mpsc::Sender<Message>;
+
+pub enum Message {
     Relayout,
     Update,
     Quit,
@@ -16,7 +19,7 @@ pub trait Widget {
     fn init(&mut self) {}
     fn render(&mut self, x: u16);
     fn width(&mut self) -> u16;
-    fn handle_event(&mut self, _event: &WidgetMessage) -> bool {
+    fn handle_event(&mut self, _event: &Message) -> bool {
         false
     }
     fn finish(&mut self) {}