macos: Map our user generated event to Event::Awakened

.travis.yml

@@ -4,6 +4,8 @@ rust:
   - nightly
   - stable
 
+cache: cargo
+
 addons:
   apt:
     packages:
@@ -12,7 +14,6 @@ addons:
 
 env:
   global:
-    - secure: "FfubMXYXu2e7chvdfKBkc+aKPkvoBOb5Idg0KCYuD++qPFIBYg6pUE8H8WvU+V7RsEBu5vshhn3dzjkKs+LXIdo5PQUMZutAgy83g5SGxRn8Ra79GjBVBs6+XOEhFun/+7fGj2Ly/AK6BTDpqyYAhAUS7jIaF6/+JWNwPwEYfdQ="
     - secure: "kVjHgK+6ivT5tUleNH/m6+69tPf8gkPNSPLsnXrkMJaIeXSnnKKQegP1O0UCThYAUbbwrUGlrKJUngDxkD8jSANhzAULX9t1iXho41InzYBEErTanXBYF8WO1rK1keKjLwiYw4KuvbiBoSeKabzQRwv0kMttxY57+hKVROr5dSg="
 
 script:
@@ -24,15 +25,10 @@ os:
   - osx
 
 after_success: 
-  - |
-      [ $TRAVIS_BRANCH = master ] &&
-      [ $TRAVIS_PULL_REQUEST = false ] &&
-      cargo doc &&
-      echo '<meta http-equiv=refresh content=0;url=glutin/index.html>' > target/doc/index.html &&
-      sudo pip install ghp-import &&
-      ghp-import -n target/doc &&
-      git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
   - |
       [ $TRAVIS_BRANCH = master ] &&
       [ $TRAVIS_PULL_REQUEST = false ] &&
       cargo publish --token ${CRATESIO_TOKEN}
+
+notifications:
+  webhooks: http://build.servo.org:54856/travis

Cargo.toml

@@ -1,123 +1,52 @@
 [package]
-name = "glutin"
-version = "0.4.0"
-authors = ["tomaka <pierre.krieger1708@gmail.com>"]
-description = "Cross-plaform OpenGL context provider."
+name = "servo-glutin"
+version = "0.10.0"
+authors = ["The glutin contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
+description = "Cross-platform OpenGL context provider."
 keywords = ["windowing", "opengl"]
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/tomaka/glutin"
-documentation = "https://tomaka.github.io/glutin/"
+documentation = "https://docs.rs/glutin"
 build = "build.rs"
 
+[lib]
+name = "glutin"
+
+[features]
+default = ["image"]
+headless = []
+
 [dependencies]
-gl_common = "0.1.0"
-lazy_static = "0.1.10"
-libc = "0.1"
+lazy_static = "0.2.0"
+libc = "0.2"
 shared_library = "0.1.0"
 
 [build-dependencies]
-gl_generator = "0.1.0"
-khronos_api = "0.0.8"
-
-[dev-dependencies]
-clock_ticks = "0.0.5"
-
-[target.arm-linux-androideabi.dependencies.android_glue]
-version = "0.1"
-
-[target.i386-apple-ios.dependencies]
-objc = "0.1"
+gl_generator = "0.5"
 
-[target.x86_64-apple-ios.dependencies]
-objc = "0.1"
-
-[target.aarch64-apple-ios.dependencies]
-objc = "0.1"
-
-[target.armv7s-apple-ios.dependencies]
-objc = "0.1"
-
-[target.armv7-apple-ios.dependencies]
-objc = "0.1"
-
-[target.x86_64-apple-darwin.dependencies]
-objc = "0.1"
-cgl = "0"
-cocoa = "0.1.4"
-core-foundation = "0"
-core-graphics = "0"
-
-[target.i686-pc-windows-gnu.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-gdi32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.1"
-dwmapi-sys = "0.1"
+[target.'cfg(target_os = "android")'.dependencies.android_glue]
+version = "0.2"
 
-[target.i686-pc-windows-msvc.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-gdi32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.1"
-dwmapi-sys = "0.1"
+[target.'cfg(target_os = "ios")'.dependencies]
+objc = "0.2"
 
-[target.x86_64-pc-windows-gnu.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-gdi32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.1"
-dwmapi-sys = "0.1"
+[target.'cfg(target_os = "macos")'.dependencies]
+objc = "0.2"
+cgl = "0.2"
+cocoa = "0.8"
+core-foundation = "0.3"
+core-graphics = "0.7"
 
-[target.x86_64-pc-windows-msvc.dependencies]
+[target.'cfg(target_os = "windows")'.dependencies]
 winapi = "0.2"
 shell32-sys = "0.1"
-gdi32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.1"
+gdi32-sys = "0.2"
+user32-sys = "0.2"
+kernel32-sys = "0.2"
 dwmapi-sys = "0.1"
 
-[target.i686-unknown-linux-gnu.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
-wayland-kbd = "0.2.0"
-wayland-window = "0.1.0"
-x11-dl = "~2.0"
-
-[target.x86_64-unknown-linux-gnu.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
-wayland-kbd = "0.2.0"
-wayland-window = "0.1.0"
-x11-dl = "~2.0"
-
-[target.arm-unknown-linux-gnueabihf.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
-wayland-kbd = "0.2.0"
-wayland-window = "0.1.0"
-x11-dl = "~2.0"
-
-[target.aarch64-unknown-linux-gnu.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
-wayland-kbd = "0.2.0"
-wayland-window = "0.1.0"
-x11-dl = "~2.0"
-
-[target.x86_64-unknown-dragonfly.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
-wayland-kbd = "0.2.0"
-wayland-window = "0.1.0"
-x11-dl = "~2.0"
-
-[target.x86_64-unknown-freebsd.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.2.1", features = ["egl", "dlopen"] }
-wayland-kbd = "0.2.0"
-wayland-window = "0.1.0"
-x11-dl = "~2.0"
+[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies]
+osmesa-sys = "0.1.0"
+x11-dl = "2.4"
+image = { version = "0.12", optional = true }

README.md

@@ -3,6 +3,8 @@
 
 [![](http://meritbadge.herokuapp.com/glutin)](https://crates.io/crates/glutin)
 
+[![Docs.rs](https://docs.rs/glutin/badge.svg)](https://docs.rs/glutin)
+
 Alternative to GLFW in pure Rust.
 
 [![Build Status](https://travis-ci.org/tomaka/glutin.png?branch=master)](https://travis-ci.org/tomaka/glutin)
@@ -13,7 +15,7 @@ Alternative to GLFW in pure Rust.
 glutin = "*"
 ```
 
-## [Documentation](http://tomaka.github.io/glutin/)
+## [Documentation](https://docs.rs/glutin)
 
 ## Try it!
 
@@ -43,14 +45,15 @@ fn main() {
 
     unsafe { window.make_current() };
 
-    unsafe {
-        gl::load_with(|symbol| window.get_proc_address(symbol));
+    let gl_ = match api_type {
+        gl::GlType::Gl => unsafe { gl::GlFns::load_with(|s| Self::get_proc_address(s) as *const _) },
+        gl::GlType::Gles => unsafe { gl::GlesFns::load_with(|s| Self::get_proc_address(s) as *const _) },
+    };
 
-        gl::ClearColor(0.0, 1.0, 0.0, 1.0);
-    }
+    gl_.clear_color(0.0, 1.0, 0.0, 1.0);
 
     for event in window.wait_events() {
-        unsafe { gl::Clear(gl::COLOR_BUFFER_BIT) };
+        gl_.clear(gl::COLOR_BUFFER_BIT);
         window.swap_buffers();
 
         match event {
@@ -68,7 +71,3 @@ Note that glutin aims at being a low-level brick in your rendering infrastructur
 ### Android
 
  - To compile the examples for android, initialize the submodules, go to `deps/apk-builder/apk-builder` and run `cargo build`, then go back to `glutin` and call `ANDROID_HOME=/path/to/sdk NDK_HOME=/path/to/ndk NDK_STANDALONE=/path/to/standalone cargo test --no-run --target=arm-linux-androideabi`
-
-### X11
-
- - The plan is that glutin tries to dynamically link-to and use wayland if possible. If it doesn't work, it will try xlib instead. If it doesn't work, it will try libcaca. This is work-in-progress.