Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4398 : glennw/servo/glutin-clear, r=pcwalton

Browse source
This commit is contained in:
bors-servo 2014-12-16 20:18:44 -07:00
commit b8900782b0
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/servo/Cargo.lock generated
View file

@ -263,7 +263,7 @@ dependencies = [
[[package]] [[package]]
name = "gleam" name = "gleam"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c" source = "git+https://github.com/servo/gleam#c54eb9ad6d4b62b7effbe9c79a1b3720845b45b4"
dependencies = [ dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)", "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
] ]

2
ports/cef/Cargo.lock generated
View file

@ -260,7 +260,7 @@ dependencies = [
[[package]] [[package]]
name = "gleam" name = "gleam"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c" source = "git+https://github.com/servo/gleam#c54eb9ad6d4b62b7effbe9c79a1b3720845b45b4"
dependencies = [ dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)", "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
] ]

14
ports/glutin/window.rs
View file

@ -27,12 +27,10 @@ use std::rc::Rc;
use time::{mod, Timespec}; use time::{mod, Timespec};
use util::geometry::ScreenPx; use util::geometry::ScreenPx;
use util::opts::{RenderApi, Mesa, OpenGL}; use util::opts::{RenderApi, Mesa, OpenGL};
use gleam::gl;
use glutin; use glutin;
use NestedEventLoopListener; use NestedEventLoopListener;
#[cfg(not(target_os="android"))]
use gleam::gl;
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
use std::ptr; use std::ptr;
@ -146,6 +144,11 @@ impl Window {
last_title_set_time: Cell::new(Timespec::new(0, 0)), last_title_set_time: Cell::new(Timespec::new(0, 0)),
}; };
gl::clear_color(0.6, 0.6, 0.6, 1.0);
gl::clear(gl::COLOR_BUFFER_BIT);
gl::finish();
window.present();
Rc::new(window) Rc::new(window)
} }
} }
@ -417,11 +420,6 @@ impl Window {
self.key_modifiers.get().intersects(LEFT_CONTROL | RIGHT_CONTROL) self.key_modifiers.get().intersects(LEFT_CONTROL | RIGHT_CONTROL)
} }
#[inline]
fn shift_pressed(&self) -> bool {
self.key_modifiers.get().intersects(LEFT_SHIFT | RIGHT_SHIFT)
}
fn toggle_modifier(&self, modifier: KeyModifiers) { fn toggle_modifier(&self, modifier: KeyModifiers) {
let mut modifiers = self.key_modifiers.get(); let mut modifiers = self.key_modifiers.get();
modifiers.toggle(modifier); modifiers.toggle(modifier);

2
ports/gonk/Cargo.lock generated
View file

@ -243,7 +243,7 @@ dependencies = [
[[package]] [[package]]
name = "gleam" name = "gleam"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c" source = "git+https://github.com/servo/gleam#c54eb9ad6d4b62b7effbe9c79a1b3720845b45b4"
dependencies = [ dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)", "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
] ]