Retrieve the monitors and their info for osx

This commit is contained in:
David Partouche 2014-11-04 18:03:38 +01:00
parent 605bf39b78
commit 9dd592600a
4 changed files with 57 additions and 20 deletions

View file

@ -29,3 +29,9 @@ git = "https://github.com/servo/rust-core-foundation"
[target.x86_64-apple-darwin.dependencies.core_foundation] [target.x86_64-apple-darwin.dependencies.core_foundation]
git = "https://github.com/servo/rust-core-foundation" git = "https://github.com/servo/rust-core-foundation"
[target.i686-apple-darwin.dependencies.core_graphics]
git = "https://github.com/servo/rust-core-graphics"
[target.x86_64-apple-darwin.dependencies.core_graphics]
git = "https://github.com/servo/rust-core-graphics"

View file

@ -37,6 +37,8 @@ extern crate libc;
extern crate cocoa; extern crate cocoa;
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
extern crate core_foundation; extern crate core_foundation;
#[cfg(target_os = "macos")]
extern crate core_graphics;
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
extern crate sync; extern crate sync;

View file

@ -22,6 +22,9 @@ use {MouseInput, Pressed, Released, LeftMouseButton, RightMouseButton, MouseMove
use events; use events;
pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
mod monitor;
mod event; mod event;
static mut shift_pressed: bool = false; static mut shift_pressed: bool = false;
@ -43,26 +46,6 @@ impl Deref<Window> for HeadlessContext {
} }
} }
pub struct MonitorID;
pub fn get_available_monitors() -> Vec<MonitorID> {
unimplemented!()
}
pub fn get_primary_monitor() -> MonitorID {
unimplemented!()
}
impl MonitorID {
pub fn get_name(&self) -> Option<String> {
unimplemented!()
}
pub fn get_dimensions(&self) -> (uint, uint) {
unimplemented!()
}
}
#[cfg(feature = "window")] #[cfg(feature = "window")]
impl Window { impl Window {
pub fn new(builder: WindowBuilder) -> Result<Window, String> { pub fn new(builder: WindowBuilder) -> Result<Window, String> {

46
src/osx/monitor.rs Normal file
View file

@ -0,0 +1,46 @@
use core_graphics::display;
pub struct MonitorID(u32);
pub fn get_available_monitors() -> Vec<MonitorID> {
let mut monitors = Vec::new();
unsafe {
let max_displays = 10u32;
let mut active_displays = [0u32, ..10];
let mut display_count = 0;
display::CGGetActiveDisplayList(max_displays,
&mut active_displays[0],
&mut display_count);
for i in range(0u, display_count as uint) {
monitors.push(MonitorID(active_displays[i]));
}
}
monitors
}
pub fn get_primary_monitor() -> MonitorID {
let id = unsafe {
MonitorID(display::CGMainDisplayID())
};
id
}
impl MonitorID {
pub fn get_name(&self) -> Option<String> {
let MonitorID(display_id) = *self;
let screen_num = unsafe {
display::CGDisplayModelNumber(display_id)
};
Some(format!("Monitor #{}", screen_num))
}
pub fn get_dimensions(&self) -> (uint, uint) {
let MonitorID(display_id) = *self;
let dimension = unsafe {
let height = display::CGDisplayPixelsHigh(display_id);
let width = display::CGDisplayPixelsWide(display_id);
(width as uint, height as uint)
};
dimension
}
}