diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index fde35423a83..af2145637f7 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -36,7 +36,7 @@ dependencies = [ [[package]] name = "azure" version = "0.1.0" -source = "git+https://github.com/servo/rust-azure#08d2513e8ebbfe9ce6620aa514c2f2b91059b304" +source = "git+https://github.com/servo/rust-azure#ec5fddfe96f889e35cc83abd2255f8325f2ec147" dependencies = [ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", @@ -44,6 +44,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)", ] @@ -314,12 +315,15 @@ dependencies = [ [[package]] name = "gl_common" -version = "0.0.3" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "gl_generator" -version = "0.0.16" +version = "0.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -330,27 +334,29 @@ dependencies = [ [[package]] name = "gleam" version = "0.0.1" -source = "git+https://github.com/servo/gleam#7e063390e52df54e6f90884535c072b99b69de1b" +source = "git+https://github.com/servo/gleam#1a85194298997cf602270d4c1aeb0a043ce339e7" dependencies = [ - "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glutin" -version = "0.0.4-pre" -source = "git+https://github.com/servo/glutin?branch=servo#7d602af694bdb400944990846f91d1043e2a2bc8" +version = "0.0.4" +source = "git+https://github.com/servo/glutin?branch=servo#40591806dc7382ddb75d90f2289127f5f28f9825" dependencies = [ "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)", "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", "gdi32-sys 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -365,8 +371,9 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gleam 0.0.1 (git+https://github.com/servo/gleam)", - "glutin 0.0.4-pre (git+https://github.com/servo/glutin?branch=servo)", + "glutin 0.0.4 (git+https://github.com/servo/glutin?branch=servo)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -377,8 +384,8 @@ name = "glx" version = "0.0.1" source = "git+https://github.com/servo/rust-glx#d8a3329d1f68dc4cf72509daca7ef837b8ce94d6" dependencies = [ - "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -458,7 +465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#7f0ab52e147b778c79b9378fe3ddd4d13055df84" +source = "git+https://github.com/servo/rust-layers#62870a30b06fb8776e01140167e55d1f2370b503" dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", @@ -468,6 +475,7 @@ dependencies = [ "gleam 0.0.1 (git+https://github.com/servo/gleam)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)", ] @@ -847,9 +855,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xlib" version = "0.1.0" -source = "git+https://github.com/servo/rust-xlib#7558b1b41304292955b3c081dba23d291458fde9" +source = "git+https://github.com/servo/rust-xlib#4f1bfc476256c37a152980d42213116a62629599" dependencies = [ "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b16590eac5e..7718986eef7 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -38,7 +38,7 @@ dependencies = [ [[package]] name = "azure" version = "0.1.0" -source = "git+https://github.com/servo/rust-azure#08d2513e8ebbfe9ce6620aa514c2f2b91059b304" +source = "git+https://github.com/servo/rust-azure#ec5fddfe96f889e35cc83abd2255f8325f2ec147" dependencies = [ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", @@ -46,6 +46,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)", ] @@ -316,15 +317,18 @@ dependencies = [ [[package]] name = "gl_common" -version = "0.0.3" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "gl_generator" -version = "0.0.16" +version = "0.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "khronos_api 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -332,27 +336,29 @@ dependencies = [ [[package]] name = "gleam" version = "0.0.1" -source = "git+https://github.com/servo/gleam#7e063390e52df54e6f90884535c072b99b69de1b" +source = "git+https://github.com/servo/gleam#1a85194298997cf602270d4c1aeb0a043ce339e7" dependencies = [ - "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glutin" -version = "0.0.4-pre" -source = "git+https://github.com/servo/glutin?branch=servo#7d602af694bdb400944990846f91d1043e2a2bc8" +version = "0.0.4" +source = "git+https://github.com/servo/glutin?branch=servo#40591806dc7382ddb75d90f2289127f5f28f9825" dependencies = [ "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)", "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", "gdi32-sys 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -367,8 +373,9 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gleam 0.0.1 (git+https://github.com/servo/gleam)", - "glutin 0.0.4-pre (git+https://github.com/servo/glutin?branch=servo)", + "glutin 0.0.4 (git+https://github.com/servo/glutin?branch=servo)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "time 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -379,8 +386,8 @@ name = "glx" version = "0.0.1" source = "git+https://github.com/servo/rust-glx#d8a3329d1f68dc4cf72509daca7ef837b8ce94d6" dependencies = [ - "gl_common 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -452,6 +459,11 @@ dependencies = [ "winapi 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "khronos_api" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "khronos_api" version = "0.0.5" @@ -460,7 +472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#7f0ab52e147b778c79b9378fe3ddd4d13055df84" +source = "git+https://github.com/servo/rust-layers#62870a30b06fb8776e01140167e55d1f2370b503" dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", @@ -470,6 +482,7 @@ dependencies = [ "gleam 0.0.1 (git+https://github.com/servo/gleam)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)", ] @@ -868,9 +881,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xlib" version = "0.1.0" -source = "git+https://github.com/servo/rust-xlib#7558b1b41304292955b3c081dba23d291458fde9" +source = "git+https://github.com/servo/rust-xlib#4f1bfc476256c37a152980d42213116a62629599" dependencies = [ "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 87c092e86e5..d58ed4a32bd 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -42,3 +42,4 @@ git = "https://github.com/servo/rust-egl" [dependencies] time = "0.1.12" bitflags = "*" +libc = "*" diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs index cb30d1c4fa5..b644483adb2 100644 --- a/ports/glutin/lib.rs +++ b/ports/glutin/lib.rs @@ -8,7 +8,6 @@ #![feature(core)] #![cfg_attr(feature = "window", feature(hash))] #![feature(box_syntax)] -#![feature(libc)] #[macro_use] extern crate bitflags; #[cfg(target_os="macos")] diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 01800adb6df..a4ebf05492c 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -175,8 +175,8 @@ impl Window { self.event_queue.borrow_mut().push(WindowEvent::Resize(TypedSize2D(width, height))); } Event::MouseInput(element_state, mouse_button) => { - if mouse_button == MouseButton::LeftMouseButton || - mouse_button == MouseButton::RightMouseButton { + if mouse_button == MouseButton::Left || + mouse_button == MouseButton::Right { let mouse_pos = self.mouse_pos.get(); self.handle_mouse(mouse_button, element_state, mouse_pos.x, mouse_pos.y); } diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index ada1b63f89f..2359111138c 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -17,7 +17,7 @@ dependencies = [ [[package]] name = "azure" version = "0.1.0" -source = "git+https://github.com/servo/rust-azure#08d2513e8ebbfe9ce6620aa514c2f2b91059b304" +source = "git+https://github.com/servo/rust-azure#ec5fddfe96f889e35cc83abd2255f8325f2ec147" dependencies = [ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", @@ -25,6 +25,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)", ] @@ -282,7 +283,7 @@ dependencies = [ [[package]] name = "gl_generator" -version = "0.0.16" +version = "0.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -293,11 +294,12 @@ dependencies = [ [[package]] name = "gleam" version = "0.0.1" -source = "git+https://github.com/servo/gleam#7e063390e52df54e6f90884535c072b99b69de1b" +source = "git+https://github.com/servo/gleam#1a85194298997cf602270d4c1aeb0a043ce339e7" dependencies = [ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -306,7 +308,7 @@ version = "0.0.1" source = "git+https://github.com/servo/rust-glx#d8a3329d1f68dc4cf72509daca7ef837b8ce94d6" dependencies = [ "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -378,7 +380,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#7f0ab52e147b778c79b9378fe3ddd4d13055df84" +source = "git+https://github.com/servo/rust-layers#62870a30b06fb8776e01140167e55d1f2370b503" dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", @@ -388,6 +390,7 @@ dependencies = [ "gleam 0.0.1 (git+https://github.com/servo/gleam)", "glx 0.0.1 (git+https://github.com/servo/rust-glx)", "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia?branch=upstream-2014-06-16)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)", ] @@ -772,9 +775,10 @@ dependencies = [ [[package]] name = "xlib" version = "0.1.0" -source = "git+https://github.com/servo/rust-xlib#7558b1b41304292955b3c081dba23d291458fde9" +source = "git+https://github.com/servo/rust-xlib#4f1bfc476256c37a152980d42213116a62629599" dependencies = [ "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]]