mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
Miscellaneous VNC related fixes from Xen forwarded by Matthew Kent.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3489 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
12bc92ab8a
commit
a528b80cb0
5 changed files with 124 additions and 11 deletions
21
console.c
21
console.c
|
@ -509,7 +509,7 @@ static void text_console_resize(TextConsole *s)
|
|||
c++;
|
||||
}
|
||||
}
|
||||
free(s->cells);
|
||||
qemu_free(s->cells);
|
||||
s->cells = cells;
|
||||
}
|
||||
|
||||
|
@ -1167,11 +1167,21 @@ int is_graphic_console(void)
|
|||
return active_console->console_type == GRAPHIC_CONSOLE;
|
||||
}
|
||||
|
||||
void console_color_init(DisplayState *ds)
|
||||
{
|
||||
int i, j;
|
||||
for (j = 0; j < 2; j++) {
|
||||
for (i = 0; i < 8; i++) {
|
||||
color_table[j][i] = col_expand(ds,
|
||||
vga_get_color(ds, color_table_rgb[j][i]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CharDriverState *text_console_init(DisplayState *ds, const char *p)
|
||||
{
|
||||
CharDriverState *chr;
|
||||
TextConsole *s;
|
||||
int i,j;
|
||||
unsigned width;
|
||||
unsigned height;
|
||||
static int color_inited;
|
||||
|
@ -1195,12 +1205,7 @@ CharDriverState *text_console_init(DisplayState *ds, const char *p)
|
|||
|
||||
if (!color_inited) {
|
||||
color_inited = 1;
|
||||
for(j = 0; j < 2; j++) {
|
||||
for(i = 0; i < 8; i++) {
|
||||
color_table[j][i] = col_expand(s->ds,
|
||||
vga_get_color(s->ds, color_table_rgb[j][i]));
|
||||
}
|
||||
}
|
||||
console_color_init(s->ds);
|
||||
}
|
||||
s->y_displayed = 0;
|
||||
s->y_base = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue