mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
the great usize extinction event: remove usize from blitstr
This commit is contained in:
parent
6e6a4f4e20
commit
87501444c5
4 changed files with 6 additions and 6 deletions
|
|
@ -267,9 +267,9 @@ impl<'a> Into<Message> for Opcode<'a> {
|
||||||
}
|
}
|
||||||
Opcode::SetCursor(c) => Message::Scalar(ScalarMessage {
|
Opcode::SetCursor(c) => Message::Scalar(ScalarMessage {
|
||||||
id: 12,
|
id: 12,
|
||||||
arg1: c.pt.x,
|
arg1: c.pt.x as usize,
|
||||||
arg2: c.pt.y,
|
arg2: c.pt.y as usize,
|
||||||
arg3: c.line_height,
|
arg3: c.line_height as usize,
|
||||||
arg4: 0,
|
arg4: 0,
|
||||||
}),
|
}),
|
||||||
Opcode::GetCursor => Message::BlockingScalar(ScalarMessage {
|
Opcode::GetCursor => Message::BlockingScalar(ScalarMessage {
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ impl Rectangle {
|
||||||
|
|
||||||
impl Into<ClipRect> for Rectangle {
|
impl Into<ClipRect> for Rectangle {
|
||||||
fn into(self) -> ClipRect {
|
fn into(self) -> ClipRect {
|
||||||
ClipRect::new(self.x0(), self.y0(), self.x1(), self.y1())
|
ClipRect::new(self.x0() as u32, self.y0() as u32, self.x1() as u32, self.y1() as u32)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ pub fn get_cursor(cid: CID) -> Result<Cursor, xous::Error> {
|
||||||
let response = send_message(cid, api::Opcode::GetCursor.into())?;
|
let response = send_message(cid, api::Opcode::GetCursor.into())?;
|
||||||
if let xous::Result::Scalar2(pt_as_usize, h) = response {
|
if let xous::Result::Scalar2(pt_as_usize, h) = response {
|
||||||
let p: Point = pt_as_usize.into();
|
let p: Point = pt_as_usize.into();
|
||||||
Ok(Cursor::new(p.x as usize, p.y as usize, h as _))
|
Ok(Cursor::new(p.x as u32, p.y as u32, h as _))
|
||||||
} else {
|
} else {
|
||||||
panic!("unexpected return value: {:#?}", response);
|
panic!("unexpected return value: {:#?}", response);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ fn xmain() -> ! {
|
||||||
Opcode::GetCursor => {
|
Opcode::GetCursor => {
|
||||||
let pt: api::Point =
|
let pt: api::Point =
|
||||||
api::Point::new(current_cursor.pt.x as i16, current_cursor.pt.y as i16);
|
api::Point::new(current_cursor.pt.x as i16, current_cursor.pt.y as i16);
|
||||||
xous::return_scalar2(msg.sender, pt.into(), current_cursor.line_height)
|
xous::return_scalar2(msg.sender, pt.into(), current_cursor.line_height as usize)
|
||||||
.expect("GFX: could not return GetCursor request");
|
.expect("GFX: could not return GetCursor request");
|
||||||
}
|
}
|
||||||
Opcode::SetStringClipping(r) => {
|
Opcode::SetStringClipping(r) => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue