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

Fix mutabiliy of x_info

Browse source
This commit is contained in:
Manish Goregaokar 2015-02-23 21:35:28 +05:30
parent d715241085
commit 488b0e4b26
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ports/gonk/src/input.rs
View file

@ -97,16 +97,16 @@ fn read_input_device(device_path: &Path,
}; };
let fd = device.as_raw_fd(); let fd = device.as_raw_fd();
let x_info: linux_input_absinfo = unsafe { zeroed() }; let mut x_info: linux_input_absinfo = unsafe { zeroed() };
let y_info: linux_input_absinfo = unsafe { zeroed() }; let mut y_info: linux_input_absinfo = unsafe { zeroed() };
unsafe { unsafe {
let ret = ioctl(fd, ev_ioc_g_abs(ABS_MT_POSITION_X), &x_info); let ret = ioctl(fd, ev_ioc_g_abs(ABS_MT_POSITION_X), &mut x_info);
if ret < 0 { if ret < 0 {
println!("Couldn't get ABS_MT_POSITION_X info {} {}", ret, errno()); println!("Couldn't get ABS_MT_POSITION_X info {} {}", ret, errno());
} }
} }
unsafe { unsafe {
let ret = ioctl(fd, ev_ioc_g_abs(ABS_MT_POSITION_Y), &y_info); let ret = ioctl(fd, ev_ioc_g_abs(ABS_MT_POSITION_Y), &mut y_info);
if ret < 0 { if ret < 0 {
println!("Couldn't get ABS_MT_POSITION_Y info {} {}", ret, errno()); println!("Couldn't get ABS_MT_POSITION_Y info {} {}", ret, errno());
} }
@ -166,9 +166,9 @@ fn read_input_device(device_path: &Path,
if dist < 16 { if dist < 16 {
let click_pt = TypedPoint2D(slotA.x as f32, slotA.y as f32); let click_pt = TypedPoint2D(slotA.x as f32, slotA.y as f32);
println!("Dispatching click!"); println!("Dispatching click!");
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::MouseDown(0, click_pt))).ok(); sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::MouseDown(0, click_pt))).ok().unwrap();
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::MouseUp(0, click_pt))).ok(); sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::MouseUp(0, click_pt))).ok().unwrap();
sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::Click(0, click_pt))).ok(); sender.send(WindowEvent::MouseWindowEventClass(MouseWindowEvent::Click(0, click_pt))).ok().unwrap();
} }
} else { } else {
println!("Touch down"); println!("Touch down");
@ -184,14 +184,14 @@ fn read_input_device(device_path: &Path,
} else { } else {
println!("Touch move x: {}, y: {}", slotA.x, slotA.y); println!("Touch move x: {}, y: {}", slotA.x, slotA.y);
sender.send(WindowEvent::Scroll(TypedPoint2D((slotA.x - last_x) as f32, (slotA.y - last_y) as f32), sender.send(WindowEvent::Scroll(TypedPoint2D((slotA.x - last_x) as f32, (slotA.y - last_y) as f32),
TypedPoint2D(slotA.x, slotA.y))).ok(); TypedPoint2D(slotA.x, slotA.y))).ok().unwrap();
last_x = slotA.x; last_x = slotA.x;
last_y = slotA.y; last_y = slotA.y;
if touch_count >= 2 { if touch_count >= 2 {
let slotB = &slots[1]; let slotB = &slots[1];
let cur_dist = dist(slotA.x, slotB.x, slotA.y, slotB.y); let cur_dist = dist(slotA.x, slotB.x, slotA.y, slotB.y);
println!("Zooming {} {} {} {}", cur_dist, last_dist, screen_dist, ((screen_dist + (cur_dist - last_dist))/screen_dist)); println!("Zooming {} {} {} {}", cur_dist, last_dist, screen_dist, ((screen_dist + (cur_dist - last_dist))/screen_dist));
sender.send(WindowEvent::Zoom((screen_dist + (cur_dist - last_dist))/screen_dist)).ok(); sender.send(WindowEvent::Zoom((screen_dist + (cur_dist - last_dist))/screen_dist)).ok().unwrap();
last_dist = cur_dist; last_dist = cur_dist;
} }
} }

4
ports/gonk/src/lib.rs
View file

@ -125,11 +125,11 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
}; };
let ConstellationChan(ref chan) = constellation_chan; let ConstellationChan(ref chan) = constellation_chan;
chan.send(ConstellationMsg::InitLoadUrl(url)).ok(); chan.send(ConstellationMsg::InitLoadUrl(url)).ok().unwrap();
} }
// Send the constallation Chan as the result // Send the constallation Chan as the result
result_chan.send(constellation_chan).ok(); result_chan.send(constellation_chan).ok().unwrap();
}); });
let constellation_chan = result_port.recv().unwrap(); let constellation_chan = result_port.recv().unwrap();

4
ports/gonk/src/window.rs
View file

@ -849,8 +849,8 @@ struct GonkCompositorProxy {
impl CompositorProxy for GonkCompositorProxy { impl CompositorProxy for GonkCompositorProxy {
fn send(&mut self, msg: compositor_task::Msg) { fn send(&mut self, msg: compositor_task::Msg) {
// Send a message and kick the OS event loop awake. // Send a message and kick the OS event loop awake.
self.sender.send(msg).ok(); self.sender.send(msg).ok().unwrap();
self.event_sender.send(WindowEvent::Idle).ok(); self.event_sender.send(WindowEvent::Idle).ok().unwrap();
} }
fn clone_compositor_proxy(&self) -> Box<CompositorProxy+Send> { fn clone_compositor_proxy(&self) -> Box<CompositorProxy+Send> {
Box::new(GonkCompositorProxy { Box::new(GonkCompositorProxy {