alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 22:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #626 from tomaka/rm-window-feature

Browse source 
Remove the window feature entirely
This commit is contained in:
tomaka 2015-10-03 16:22:39 +02:00
parent c8fd077e17 7a625ef3d8
commit 819c5f679b
8 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -10,10 +10,6 @@ repository = "https://github.com/tomaka/glutin"
documentation = "https://tomaka.github.io/glutin/" documentation = "https://tomaka.github.io/glutin/"
build = "build.rs" build = "build.rs"
[features]
default = ["window"]
window = []
[dependencies] [dependencies]
gl_common = "0.1.0" gl_common = "0.1.0"
lazy_static = "0.1.10" lazy_static = "0.1.10"

1
src/api/android/mod.rs
View file

@ -283,7 +283,6 @@ impl GlContext for Window {
} }
} }
#[cfg(feature = "window")]
#[derive(Clone)] #[derive(Clone)]
pub struct WindowProxy; pub struct WindowProxy;

4
src/api/cocoa/mod.rs
View file

@ -185,12 +185,9 @@ pub struct Window {
delegate: WindowDelegate, delegate: WindowDelegate,
} }
#[cfg(feature = "window")]
unsafe impl Send for Window {} unsafe impl Send for Window {}
#[cfg(feature = "window")]
unsafe impl Sync for Window {} unsafe impl Sync for Window {}
#[cfg(feature = "window")]
#[derive(Clone)] #[derive(Clone)]
pub struct WindowProxy; pub struct WindowProxy;
@ -264,7 +261,6 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
} }
impl Window { impl Window {
#[cfg(feature = "window")]
pub fn new(win_attribs: &WindowAttributes, pf_reqs: &PixelFormatRequirements, pub fn new(win_attribs: &WindowAttributes, pf_reqs: &PixelFormatRequirements,
opengl: &GlAttributes<&Window>) -> Result<Window, CreationError> opengl: &GlAttributes<&Window>) -> Result<Window, CreationError>
{ {

2
src/api/glx/mod.rs
View file

@ -1,4 +1,4 @@
#![cfg(all(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), feature = "window"))] #![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
use ContextError; use ContextError;
use CreationError; use CreationError;

2
src/api/x11/mod.rs
View file

@ -1,4 +1,4 @@
#![cfg(all(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), feature = "window"))] #![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
pub use self::monitor::{MonitorId, get_available_monitors, get_primary_monitor}; pub use self::monitor::{MonitorId, get_available_monitors, get_primary_monitor};
pub use self::window::{Window, XWindow, PollEventsIterator, WaitEventsIterator, Context, WindowProxy}; pub use self::window::{Window, XWindow, PollEventsIterator, WaitEventsIterator, Context, WindowProxy};

4
src/lib.rs
View file

@ -60,11 +60,8 @@ extern crate x11_dl;
pub use events::*; pub use events::*;
pub use headless::{HeadlessRendererBuilder, HeadlessContext}; pub use headless::{HeadlessRendererBuilder, HeadlessContext};
#[cfg(feature = "window")]
pub use window::{WindowBuilder, WindowProxy, PollEventsIterator, WaitEventsIterator}; pub use window::{WindowBuilder, WindowProxy, PollEventsIterator, WaitEventsIterator};
#[cfg(feature = "window")]
pub use window::{AvailableMonitorsIter, MonitorId, get_available_monitors, get_primary_monitor}; pub use window::{AvailableMonitorsIter, MonitorId, get_available_monitors, get_primary_monitor};
#[cfg(feature = "window")]
pub use native_monitor::NativeMonitorId; pub use native_monitor::NativeMonitorId;
use std::io; use std::io;
@ -75,7 +72,6 @@ mod api;
mod platform; mod platform;
mod events; mod events;
mod headless; mod headless;
#[cfg(feature = "window")]
mod window; mod window;
pub mod os; pub mod os;

4
src/platform/linux/api_dispatch.rs
View file

@ -1,6 +1,4 @@
/*#[cfg(feature = "window")] /*pub use api::x11::{Window, WindowProxy, MonitorId, get_available_monitors, get_primary_monitor};
pub use api::x11::{Window, WindowProxy, MonitorId, get_available_monitors, get_primary_monitor};
#[cfg(feature = "window")]
pub use api::x11::{WaitEventsIterator, PollEventsIterator};*/ pub use api::x11::{WaitEventsIterator, PollEventsIterator};*/
use std::collections::VecDeque; use std::collections::VecDeque;

8
src/platform/linux/mod.rs
View file

@ -11,18 +11,10 @@ use libc;
use api::osmesa::{self, OsMesaContext}; use api::osmesa::{self, OsMesaContext};
#[cfg(feature = "window")]
pub use self::api_dispatch::{Window, WindowProxy, MonitorId, get_available_monitors, get_primary_monitor}; pub use self::api_dispatch::{Window, WindowProxy, MonitorId, get_available_monitors, get_primary_monitor};
#[cfg(feature = "window")]
pub use self::api_dispatch::{WaitEventsIterator, PollEventsIterator}; pub use self::api_dispatch::{WaitEventsIterator, PollEventsIterator};
#[cfg(feature = "window")]
mod api_dispatch; mod api_dispatch;
#[cfg(not(feature = "window"))]
pub type Window = (); // TODO: hack to make things work
#[cfg(not(feature = "window"))]
pub type MonitorId = (); // TODO: hack to make things work
pub struct HeadlessContext(OsMesaContext); pub struct HeadlessContext(OsMesaContext);
impl HeadlessContext { impl HeadlessContext {