From bdbaba027b7a45bb83623ada3cb9de5f67eb8797 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 18 Sep 2021 02:21:12 +0800 Subject: [PATCH] improve drawing performance the trailing update after every event seems redundant now that the gam is cleaned up also fix a bug that causes overflow text on tl fitted text to overflow the drawing region --- services/graphics-server/src/backend/betrusted.rs | 2 -- services/graphics-server/src/main.rs | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/graphics-server/src/backend/betrusted.rs b/services/graphics-server/src/backend/betrusted.rs index e0a6b7197..734ee57a5 100644 --- a/services/graphics-server/src/backend/betrusted.rs +++ b/services/graphics-server/src/backend/betrusted.rs @@ -113,8 +113,6 @@ impl XousDisplay { self.srfb.resume(); if drew_note { - let note = crate::sleep_note::LOGO_MAP; - let note_lines = note.len() / FB_WIDTH_WORDS; let hwfb: *mut [u32; FB_SIZE] = self.hwfb.as_mut_ptr() as *mut [u32; FB_SIZE]; for lines in 0..FB_LINES { // set the dirty bits of all lines to force a redraw of the restored data diff --git a/services/graphics-server/src/main.rs b/services/graphics-server/src/main.rs index d75eb1b7f..1ffe8fc41 100644 --- a/services/graphics-server/src/main.rs +++ b/services/graphics-server/src/main.rs @@ -101,7 +101,6 @@ fn xmain() -> ! { let sid = xns .register_name(api::SERVER_NAME_GFX, Some(2)) .expect("can't register server"); - log::trace!("Server listening on address {:?}", sid); // Create a new monochrome simulator display. let mut display = XousDisplay::new(); @@ -336,12 +335,17 @@ fn xmain() -> ! { tv.bounds_computed ); } else { - log::warn!( + log::debug!( "does not intersect, clip_rect: {:?}, br: {:?}", clip_rect, br ); - tv.bounds_computed = Some(Rectangle::new(tl, clip_rect.br())); + tv.bounds_computed = Some(Rectangle::new(tl, + Point::new( + if br.x < clip_rect.br.x { br.x } else { clip_rect.br.x - tv.margin.x }, + if br.y < clip_rect.br.y { br.y } else { clip_rect.br.y - tv.margin.y }, + ) + )); } } TextBounds::GrowableFromBl(bl, width) => { @@ -723,8 +727,6 @@ fn xmain() -> ! { log::error!("received opcode scalar that is not handled"); } } - display.update(); - display.redraw(); } log::trace!("main loop exit, destroying servers"); xns.unregister_server(sid).unwrap();