Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix GLUT build for Android

Browse source
This commit is contained in:
Lars Bergstrom 2014-02-11 10:44:37 -06:00
parent 7a86383eef
commit f89eec140b
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/components/main/platform/common/glut_windowing.rs
View file

@ -96,14 +96,16 @@ impl WindowMethods<Application> for Window {
struct ReshapeCallbackState; struct ReshapeCallbackState;
impl glut::ReshapeCallback for ReshapeCallbackState { impl glut::ReshapeCallback for ReshapeCallbackState {
fn call(&self, width: c_int, height: c_int) { fn call(&self, width: c_int, height: c_int) {
local_window().event_queue.with_mut(|queue| queue.push(ResizeWindowEvent(width as uint, height as uint))) let tmp = local_window();
tmp.borrow().event_queue.with_mut(|queue| queue.push(ResizeWindowEvent(width as uint, height as uint)))
} }
} }
glut::reshape_func(glut_window, ~ReshapeCallbackState); glut::reshape_func(glut_window, ~ReshapeCallbackState);
struct KeyboardCallbackState; struct KeyboardCallbackState;
impl glut::KeyboardCallback for KeyboardCallbackState { impl glut::KeyboardCallback for KeyboardCallbackState {
fn call(&self, key: c_uchar, _x: c_int, _y: c_int) { fn call(&self, key: c_uchar, _x: c_int, _y: c_int) {
local_window().handle_key(key) let tmp = local_window();
tmp.borrow().handle_key(key)
} }
} }
glut::keyboard_func(~KeyboardCallbackState); glut::keyboard_func(~KeyboardCallbackState);
@ -111,14 +113,17 @@ impl WindowMethods<Application> for Window {
impl glut::MouseCallback for MouseCallbackState { impl glut::MouseCallback for MouseCallbackState {
fn call(&self, button: c_int, state: c_int, x: c_int, y: c_int) { fn call(&self, button: c_int, state: c_int, x: c_int, y: c_int) {
if button < 3 { if button < 3 {
local_window().handle_mouse(button, state, x, y); let tmp = local_window();
tmp.borrow().handle_mouse(button, state, x, y);
} else { } else {
match button { match button {
3 => { 3 => {
local_window().event_queue.with_mut(|queue| queue.push(ScrollWindowEvent(Point2D(0.0, 5.0 as f32), Point2D(0.0 as i32, 5.0 as i32)))); let tmp = local_window();
tmp.borrow().event_queue.with_mut(|queue| queue.push(ScrollWindowEvent(Point2D(0.0, 5.0 as f32), Point2D(0.0 as i32, 5.0 as i32))));
}, },
4 => { 4 => {
local_window().event_queue.with_mut(|queue| queue.push(ScrollWindowEvent(Point2D(0.0, -5.0 as f32), Point2D(0.0 as i32, -5.0 as i32)))); let tmp = local_window();
tmp.borrow().event_queue.with_mut(|queue| queue.push(ScrollWindowEvent(Point2D(0.0, -5.0 as f32), Point2D(0.0 as i32, -5.0 as i32))));
}, },
_ => {} _ => {}
} }
@ -127,9 +132,9 @@ impl WindowMethods<Application> for Window {
} }
glut::mouse_func(~MouseCallbackState); glut::mouse_func(~MouseCallbackState);
let wrapped_window = Rc::new(window); let wrapped_window = Rc::from_send(window);
install_local_window(wrapped_window); install_local_window(wrapped_window.clone());
wrapped_window wrapped_window
} }
@ -144,7 +149,7 @@ impl WindowMethods<Application> for Window {
glut::swap_buffers(); glut::swap_buffers();
} }
fn recv(@self) -> WindowEvent { fn recv(&self) -> WindowEvent {
if !self.event_queue.with_mut(|queue| queue.is_empty()) { if !self.event_queue.with_mut(|queue| queue.is_empty()) {
return self.event_queue.with_mut(|queue| queue.shift()) return self.event_queue.with_mut(|queue| queue.shift())
} }
@ -157,14 +162,14 @@ impl WindowMethods<Application> for Window {
} }
/// Sets the ready state. /// Sets the ready state.
fn set_ready_state(@self, ready_state: ReadyState) { fn set_ready_state(&self, ready_state: ReadyState) {
self.ready_state.set(ready_state); self.ready_state.set(ready_state);
//FIXME: set_window_title causes crash with Android version of freeGLUT. Temporarily blocked. //FIXME: set_window_title causes crash with Android version of freeGLUT. Temporarily blocked.
//self.update_window_title() //self.update_window_title()
} }
/// Sets the render state. /// Sets the render state.
fn set_render_state(@self, render_state: RenderState) { fn set_render_state(&self, render_state: RenderState) {
if self.ready_state.get() == FinishedLoading && if self.ready_state.get() == FinishedLoading &&
self.render_state.get() == RenderingRenderState && self.render_state.get() == RenderingRenderState &&
render_state == IdleRenderState { render_state == IdleRenderState {
@ -177,7 +182,7 @@ impl WindowMethods<Application> for Window {
//self.update_window_title() //self.update_window_title()
} }
fn hidpi_factor(@self) -> f32 { fn hidpi_factor(&self) -> f32 {
//FIXME: Do nothing in GLUT now. //FIXME: Do nothing in GLUT now.
0f32 0f32
} }