From 86fa1b58e5a44a1711e812ed1e56c0e2c6946eed Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 24 Sep 2015 09:11:59 +0200 Subject: Rename MonitorID -> MonitorId --- src/api/x11/monitor.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/api/x11/monitor.rs') diff --git a/src/api/x11/monitor.rs b/src/api/x11/monitor.rs index 0a20b63..30bd522 100644 --- a/src/api/x11/monitor.rs +++ b/src/api/x11/monitor.rs @@ -5,25 +5,25 @@ use super::XConnection; use native_monitor::NativeMonitorId; #[derive(Clone)] -pub struct MonitorID(pub Arc, pub u32); +pub struct MonitorId(pub Arc, pub u32); -pub fn get_available_monitors(x: &Arc) -> VecDeque { +pub fn get_available_monitors(x: &Arc) -> VecDeque { let nb_monitors = unsafe { (x.xlib.XScreenCount)(x.display) }; let mut monitors = VecDeque::new(); - monitors.extend((0 .. nb_monitors).map(|i| MonitorID(x.clone(), i as u32))); + monitors.extend((0 .. nb_monitors).map(|i| MonitorId(x.clone(), i as u32))); monitors } #[inline] -pub fn get_primary_monitor(x: &Arc) -> MonitorID { +pub fn get_primary_monitor(x: &Arc) -> MonitorId { let primary_monitor = unsafe { (x.xlib.XDefaultScreen)(x.display) }; - MonitorID(x.clone(), primary_monitor as u32) + MonitorId(x.clone(), primary_monitor as u32) } -impl MonitorID { +impl MonitorId { pub fn get_name(&self) -> Option { - let MonitorID(_, screen_num) = *self; + let MonitorId(_, screen_num) = *self; Some(format!("Monitor #{}", screen_num)) } -- cgit v1.2.3