ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 05:37:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

terminal: consider border in size calculation

Browse Source
This commit is contained in:
Norman Feske 2020-08-19 12:08:59 +02:00
parent f2d7f7aa6e
commit 969e59c599
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
repos/gems/src/server/terminal/text_screen_surface.h
View File

@ -50,6 +50,16 @@ class Terminal::Text_screen_surface
unsigned columns;
unsigned lines;
enum { BORDER = 1U };
/**
* Return number of visible pixels considering the border
*/
static unsigned _visible(unsigned value)
{
return max(value, 2U*BORDER) - 2U*BORDER;
}
class Invalid : Genode::Exception { };
Geometry(Font const &font, Framebuffer const &framebuffer)
@ -57,8 +67,8 @@ class Terminal::Text_screen_surface
fb_size(framebuffer.w(), framebuffer.h()),
char_width(font.string_width(Utf8_ptr("M"))),
char_height(font.height()),
columns((framebuffer.w() << 8)/char_width.value),
lines(framebuffer.h()/char_height)
columns((_visible(framebuffer.w()) << 8)/char_width.value),
lines(_visible(framebuffer.h())/char_height)
{
if (columns*lines == 0)
throw Invalid();