michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-18 07:17:49 +00:00
Code Issues Projects Releases Wiki Activity

Simplify framebuffer code

Browse Source
This commit is contained in:
Philipp Oppermann
2023-12-29 20:20:42 +01:00
parent 79f47fda12
commit 563c19731f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/src/framebuffer.rs
View File

@@ -8,22 +8,23 @@ use embedded_graphics::{
pub struct Display { pub struct Display {
framebuffer: &'static mut FrameBuffer, framebuffer: &'static mut FrameBuffer,
width: usize,
height: usize,
} }
impl Display { impl Display {
pub fn new(framebuffer: &'static mut FrameBuffer) -> Display { pub fn new(framebuffer: &'static mut FrameBuffer) -> Display {
Self { framebuffer } Self {
width: framebuffer.info().width,
height: framebuffer.info().height,
framebuffer,
}
} }
fn draw_pixel(&mut self, coordinates: Point, color: Rgb888) { fn draw_pixel(&mut self, coordinates: Point, color: Rgb888) {
// ignore any pixels that are out of bounds. // ignore any pixels that are out of bounds.
let (width, height) = {
let info = self.framebuffer.info();
(info.width, info.height)
};
let position = match (coordinates.x.try_into(), coordinates.y.try_into()) { let position = match (coordinates.x.try_into(), coordinates.y.try_into()) {
(Ok(x), Ok(y)) if x < width && y < height => Position { x, y }, (Ok(x), Ok(y)) if x < self.width && y < self.height => Position { x, y },
_ => return, // ignore out-of-bounds pixel _ => return, // ignore out-of-bounds pixel
}; };
let color = Color { let color = Color {
@@ -54,10 +55,9 @@ impl DrawTarget for Display {
impl geometry::OriginDimensions for Display { impl geometry::OriginDimensions for Display {
fn size(&self) -> geometry::Size { fn size(&self) -> geometry::Size {
let info = self.framebuffer.info();
geometry::Size::new( geometry::Size::new(
info.width.try_into().unwrap(), self.width.try_into().unwrap(),
info.height.try_into().unwrap(), self.height.try_into().unwrap(),
) )
} }
} }