norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set console resolution to 800x600 by default

Browse Source 
This sets the console resolution to 800x600 on startup. We no longer have a
console with an invalid resolution after startup so we now can start calculating
font sizes properly.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2011-11-26 17:04:52 +01:00
parent e5de20a22a
commit 607a5eed54
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/console.c
View File

@ -48,6 +48,18 @@ struct kmscon_console {
struct kmscon_font *font; struct kmscon_font *font;
}; };
static void kmscon_console_free_res(struct kmscon_console *con)
{
if (con && con->cr) {
cairo_destroy(con->cr);
cairo_surface_destroy(con->surf);
free(con->surf_buf);
con->cr = NULL;
con->surf = NULL;
con->surf_buf = NULL;
}
}
int kmscon_console_new(struct kmscon_console **out) int kmscon_console_new(struct kmscon_console **out)
{ {
struct kmscon_console *con; struct kmscon_console *con;
@ -63,15 +75,21 @@ int kmscon_console_new(struct kmscon_console **out)
memset(con, 0, sizeof(*con)); memset(con, 0, sizeof(*con));
con->ref = 1; con->ref = 1;
ret = kmscon_console_resize(con, 80, 24); ret = kmscon_console_set_res(con, 800, 600);
if (ret) if (ret)
goto err_free; goto err_free;
ret = kmscon_console_resize(con, 80, 24);
if (ret)
goto err_res;
glGenTextures(1, &con->tex); glGenTextures(1, &con->tex);
*out = con; *out = con;
return 0; return 0;
err_res:
kmscon_console_free_res(con);
err_free: err_free:
free(con); free(con);
return ret; return ret;
@ -111,12 +129,7 @@ void kmscon_console_unref(struct kmscon_console *con)
if (--con->ref) if (--con->ref)
return; return;
if (con->cr) { kmscon_console_free_res(con);
cairo_destroy(con->cr);
cairo_surface_destroy(con->surf);
free(con->surf_buf);
}
kmscon_font_unref(con->font); kmscon_font_unref(con->font);
console_free_cells(con); console_free_cells(con);
glDeleteTextures(1, &con->tex); glDeleteTextures(1, &con->tex);
@ -125,14 +138,15 @@ void kmscon_console_unref(struct kmscon_console *con)
/* /*
* This resets the resolution used for drawing operations. It is recommended to * This resets the resolution used for drawing operations. It is recommended to
* set this to the size of your framebuffer, howevr, you can set this to * set this to the size of your framebuffer, however, you can set this to
* anything except 0. * anything except 0.
* This image-resolution is used internally to render the console fonts. The * This image-resolution is used internally to render the console fonts. The
* kmscon_console_map() function can map this image to any framebuffer size you * kmscon_console_map() function can map this image to any framebuffer size you
* want. Therefore, this screen resolution is just a performance and quality * want. Therefore, this screen resolution is just a performance and quality
* hint. * hint.
* This function must be called before drawing the console, though. Returns 0 on * By default this is set to 800x600.
* success, -EINVAL if con, x or y is 0/NULL and -ENOMEM on out-of-mem errors. * Returns 0 on success -EINVAL if con, x or y is 0/NULL and -ENOMEM on
* out-of-mem errors.
*/ */
int kmscon_console_set_res(struct kmscon_console *con, uint32_t x, uint32_t y) int kmscon_console_set_res(struct kmscon_console *con, uint32_t x, uint32_t y)
{ {