motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 09:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui/vc: move text fields to QemuTextConsole

Browse source 
Now we can instantiate the specific console with its own fields. Pass
the most appropriate type to the various functions, and cast up to
QEMU_CONSOLE as necessary.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230830093843.3531473-29-marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2023-08-30 13:38:02 +04:00
parent 463c6b19c7
commit b2bb9cc43d
1 changed files with 91 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

175
ui/console.c
View file

@ -94,26 +94,6 @@ struct QemuConsole {
const GraphicHwOps *hw_ops; const GraphicHwOps *hw_ops;
void *hw; void *hw;
/* Text console state */
int width;
int height;
int total_height;
int backscroll_height;
int x, y;
int y_displayed;
int y_base;
TextCell *cells;
int text_x[2], text_y[2], cursor_invalidate;
int echo;
int update_x0;
int update_y0;
int update_x1;
int update_y1;
Chardev *chr;
/* fifo for key pressed */
Fifo8 out_fifo;
CoQueue dump_queue; CoQueue dump_queue;
QTAILQ_ENTRY(QemuConsole) next; QTAILQ_ENTRY(QemuConsole) next;
@ -136,6 +116,26 @@ OBJECT_DEFINE_TYPE(QemuGraphicConsole, qemu_graphic_console, QEMU_GRAPHIC_CONSOL
typedef struct QemuTextConsole { typedef struct QemuTextConsole {
QemuConsole parent; QemuConsole parent;
int width;
int height;
int total_height;
int backscroll_height;
int x, y;
int y_displayed;
int y_base;
TextCell *cells;
int text_x[2], text_y[2], cursor_invalidate;
int echo;
int update_x0;
int update_y0;
int update_x1;
int update_y1;
Chardev *chr;
/* fifo for key pressed */
Fifo8 out_fifo;
} QemuTextConsole; } QemuTextConsole;
typedef QemuConsoleClass QemuTextConsoleClass; typedef QemuConsoleClass QemuTextConsoleClass;
@ -162,7 +162,7 @@ OBJECT_DEFINE_TYPE(QemuFixedTextConsole, qemu_fixed_text_console, QEMU_FIXED_TEX
struct VCChardev { struct VCChardev {
Chardev parent; Chardev parent;
QemuConsole *console; QemuTextConsole *console;
enum TTYState state; enum TTYState state;
int esc_params[MAX_ESC_PARAMS]; int esc_params[MAX_ESC_PARAMS];
@ -428,43 +428,44 @@ static void vga_putcharxy(QemuConsole *s, int x, int y, int ch,
&fgcol, &bgcol, x, y, FONT_WIDTH, FONT_HEIGHT); &fgcol, &bgcol, x, y, FONT_WIDTH, FONT_HEIGHT);
} }
static void text_console_resize(QemuConsole *s) static void text_console_resize(QemuTextConsole *t)
{ {
QemuConsole *s = QEMU_CONSOLE(t);
TextCell *cells, *c, *c1; TextCell *cells, *c, *c1;
int w1, x, y, last_width; int w1, x, y, last_width;
assert(s->scanout.kind == SCANOUT_SURFACE); assert(s->scanout.kind == SCANOUT_SURFACE);
last_width = s->width; last_width = t->width;
s->width = surface_width(s->surface) / FONT_WIDTH; t->width = surface_width(s->surface) / FONT_WIDTH;
s->height = surface_height(s->surface) / FONT_HEIGHT; t->height = surface_height(s->surface) / FONT_HEIGHT;
w1 = last_width; w1 = last_width;
if (s->width < w1) if (t->width < w1)
w1 = s->width; w1 = t->width;
cells = g_new(TextCell, s->width * s->total_height + 1); cells = g_new(TextCell, t->width * t->total_height + 1);
for(y = 0; y < s->total_height; y++) { for(y = 0; y < t->total_height; y++) {
c = &cells[y * s->width]; c = &cells[y * t->width];
if (w1 > 0) { if (w1 > 0) {
c1 = &s->cells[y * last_width]; c1 = &t->cells[y * last_width];
for(x = 0; x < w1; x++) { for(x = 0; x < w1; x++) {
*c++ = *c1++; *c++ = *c1++;
} }
} }
for(x = w1; x < s->width; x++) { for(x = w1; x < t->width; x++) {
c->ch = ' '; c->ch = ' ';
c->t_attrib = TEXT_ATTRIBUTES_DEFAULT; c->t_attrib = TEXT_ATTRIBUTES_DEFAULT;
c++; c++;
} }
} }
g_free(s->cells); g_free(t->cells);
s->cells = cells; t->cells = cells;
} }
static void invalidate_xy(QemuConsole *s, int x, int y) static void invalidate_xy(QemuTextConsole *s, int x, int y)
{ {
if (!qemu_console_is_visible(s)) { if (!qemu_console_is_visible(QEMU_CONSOLE(s))) {
return; return;
} }
if (s->update_x0 > x * FONT_WIDTH) if (s->update_x0 > x * FONT_WIDTH)
@ -479,7 +480,7 @@ static void invalidate_xy(QemuConsole *s, int x, int y)
static void vc_update_xy(VCChardev *vc, int x, int y) static void vc_update_xy(VCChardev *vc, int x, int y)
{ {
QemuConsole *s = vc->console; QemuTextConsole *s = vc->console;
TextCell *c; TextCell *c;
int y1, y2; int y1, y2;
@ -498,13 +499,13 @@ static void vc_update_xy(VCChardev *vc, int x, int y)
x = s->width - 1; x = s->width - 1;
} }
c = &s->cells[y1 * s->width + x]; c = &s->cells[y1 * s->width + x];
vga_putcharxy(s, x, y2, c->ch, vga_putcharxy(QEMU_CONSOLE(s), x, y2, c->ch,
&(c->t_attrib)); &(c->t_attrib));
invalidate_xy(s, x, y2); invalidate_xy(s, x, y2);
} }
} }
static void console_show_cursor(QemuConsole *s, int show) static void console_show_cursor(QemuTextConsole *s, int show)
{ {
TextCell *c; TextCell *c;
int y, y1; int y, y1;
@ -525,17 +526,17 @@ static void console_show_cursor(QemuConsole *s, int show)
if (show && cursor_visible_phase) { if (show && cursor_visible_phase) {
TextAttributes t_attrib = TEXT_ATTRIBUTES_DEFAULT; TextAttributes t_attrib = TEXT_ATTRIBUTES_DEFAULT;
t_attrib.invers = !(t_attrib.invers); /* invert fg and bg */ t_attrib.invers = !(t_attrib.invers); /* invert fg and bg */
vga_putcharxy(s, x, y, c->ch, &t_attrib); vga_putcharxy(QEMU_CONSOLE(s), x, y, c->ch, &t_attrib);
} else { } else {
vga_putcharxy(s, x, y, c->ch, &(c->t_attrib)); vga_putcharxy(QEMU_CONSOLE(s), x, y, c->ch, &(c->t_attrib));
} }
invalidate_xy(s, x, y); invalidate_xy(s, x, y);
} }
} }
static void console_refresh(QemuConsole *s) static void console_refresh(QemuTextConsole *s)
{ {
DisplaySurface *surface = qemu_console_surface(s); DisplaySurface *surface = qemu_console_surface(QEMU_CONSOLE(s));
TextCell *c; TextCell *c;
int x, y, y1; int x, y, y1;
@ -545,13 +546,13 @@ static void console_refresh(QemuConsole *s)
s->text_y[1] = s->height - 1; s->text_y[1] = s->height - 1;
s->cursor_invalidate = 1; s->cursor_invalidate = 1;
vga_fill_rect(s, 0, 0, surface_width(surface), surface_height(surface), vga_fill_rect(QEMU_CONSOLE(s), 0, 0, surface_width(surface), surface_height(surface),
color_table_rgb[0][QEMU_COLOR_BLACK]); color_table_rgb[0][QEMU_COLOR_BLACK]);
y1 = s->y_displayed; y1 = s->y_displayed;
for (y = 0; y < s->height; y++) { for (y = 0; y < s->height; y++) {
c = s->cells + y1 * s->width; c = s->cells + y1 * s->width;
for (x = 0; x < s->width; x++) { for (x = 0; x < s->width; x++) {
vga_putcharxy(s, x, y, c->ch, vga_putcharxy(QEMU_CONSOLE(s), x, y, c->ch,
&(c->t_attrib)); &(c->t_attrib));
c++; c++;
} }
@ -560,11 +561,11 @@ static void console_refresh(QemuConsole *s)
} }
} }
console_show_cursor(s, 1); console_show_cursor(s, 1);
dpy_gfx_update(s, 0, 0, dpy_gfx_update(QEMU_CONSOLE(s), 0, 0,
surface_width(surface), surface_height(surface)); surface_width(surface), surface_height(surface));
} }
static void console_scroll(QemuConsole *s, int ydelta) static void console_scroll(QemuTextConsole *s, int ydelta)
{ {
int i, y1; int i, y1;
@ -595,7 +596,7 @@ static void console_scroll(QemuConsole *s, int ydelta)
static void vc_put_lf(VCChardev *vc) static void vc_put_lf(VCChardev *vc)
{ {
QemuConsole *s = vc->console; QemuTextConsole *s = vc->console;
TextCell *c; TextCell *c;
int x, y1; int x, y1;
@ -624,10 +625,10 @@ static void vc_put_lf(VCChardev *vc)
s->text_x[1] = s->width - 1; s->text_x[1] = s->width - 1;
s->text_y[1] = s->height - 1; s->text_y[1] = s->height - 1;
vga_bitblt(s, 0, FONT_HEIGHT, 0, 0, vga_bitblt(QEMU_CONSOLE(s), 0, FONT_HEIGHT, 0, 0,
s->width * FONT_WIDTH, s->width * FONT_WIDTH,
(s->height - 1) * FONT_HEIGHT); (s->height - 1) * FONT_HEIGHT);
vga_fill_rect(s, 0, (s->height - 1) * FONT_HEIGHT, vga_fill_rect(QEMU_CONSOLE(s), 0, (s->height - 1) * FONT_HEIGHT,
s->width * FONT_WIDTH, FONT_HEIGHT, s->width * FONT_WIDTH, FONT_HEIGHT,
color_table_rgb[0][TEXT_ATTRIBUTES_DEFAULT.bgcol]); color_table_rgb[0][TEXT_ATTRIBUTES_DEFAULT.bgcol]);
s->update_x0 = 0; s->update_x0 = 0;
@ -737,7 +738,7 @@ static void vc_handle_escape(VCChardev *vc)
static void vc_clear_xy(VCChardev *vc, int x, int y) static void vc_clear_xy(VCChardev *vc, int x, int y)
{ {
QemuConsole *s = vc->console; QemuTextConsole *s = vc->console;
int y1 = (s->y_base + y) % s->total_height; int y1 = (s->y_base + y) % s->total_height;
if (x >= s->width) { if (x >= s->width) {
x = s->width - 1; x = s->width - 1;
@ -750,7 +751,7 @@ static void vc_clear_xy(VCChardev *vc, int x, int y)
static void vc_put_one(VCChardev *vc, int ch) static void vc_put_one(VCChardev *vc, int ch)
{ {
QemuConsole *s = vc->console; QemuTextConsole *s = vc->console;
TextCell *c; TextCell *c;
int y1; int y1;
if (s->x >= s->width) { if (s->x >= s->width) {
@ -777,7 +778,7 @@ static void vc_respond_str(VCChardev *vc, const char *buf)
/* set cursor, checking bounds */ /* set cursor, checking bounds */
static void vc_set_cursor(VCChardev *vc, int x, int y) static void vc_set_cursor(VCChardev *vc, int x, int y)
{ {
QemuConsole *s = vc->console; QemuTextConsole *s = vc->console;
if (x < 0) { if (x < 0) {
x = 0; x = 0;
@ -798,7 +799,7 @@ static void vc_set_cursor(VCChardev *vc, int x, int y)
static void vc_putchar(VCChardev *vc, int ch) static void vc_putchar(VCChardev *vc, int ch)
{ {
QemuConsole *s = vc->console; QemuTextConsole *s = vc->console;
int i; int i;
int x, y; int x, y;
char response[40]; char response[40];
@ -1095,9 +1096,12 @@ void console_select(unsigned int index)
} }
displaychangelistener_display_console(dcl, s, NULL); displaychangelistener_display_console(dcl, s, NULL);
} }
dpy_text_resize(s, s->width, s->height);
if (QEMU_IS_TEXT_CONSOLE(s)) {
dpy_text_resize(s, QEMU_TEXT_CONSOLE(s)->width, QEMU_TEXT_CONSOLE(s)->height);
text_console_update_cursor(NULL); text_console_update_cursor(NULL);
} }
}
} }
#define TYPE_CHARDEV_VC "chardev-vc" #define TYPE_CHARDEV_VC "chardev-vc"
@ -1107,7 +1111,7 @@ DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV,
static int vc_chr_write(Chardev *chr, const uint8_t *buf, int len) static int vc_chr_write(Chardev *chr, const uint8_t *buf, int len)
{ {
VCChardev *drv = VC_CHARDEV(chr); VCChardev *drv = VC_CHARDEV(chr);
QemuConsole *s = drv->console; QemuTextConsole *s = drv->console;
int i; int i;
s->update_x0 = s->width * FONT_WIDTH; s->update_x0 = s->width * FONT_WIDTH;
@ -1120,14 +1124,14 @@ static int vc_chr_write(Chardev *chr, const uint8_t *buf, int len)
} }
console_show_cursor(s, 1); console_show_cursor(s, 1);
if (s->update_x0 < s->update_x1) { if (s->update_x0 < s->update_x1) {
dpy_gfx_update(s, s->update_x0, s->update_y0, dpy_gfx_update(QEMU_CONSOLE(s), s->update_x0, s->update_y0,
s->update_x1 - s->update_x0, s->update_x1 - s->update_x0,
s->update_y1 - s->update_y0); s->update_y1 - s->update_y0);
} }
return len; return len;
} }
static void kbd_send_chars(QemuConsole *s) static void kbd_send_chars(QemuTextConsole *s)
{ {
uint32_t len, avail; uint32_t len, avail;
@ -1145,13 +1149,14 @@ static void kbd_send_chars(QemuConsole *s)
} }
/* called when an ascii key is pressed */ /* called when an ascii key is pressed */
void kbd_put_keysym_console(QemuConsole *s, int keysym) void kbd_put_keysym_console(QemuConsole *con, int keysym)
{ {
QemuTextConsole *s = (QemuTextConsole *)object_dynamic_cast(OBJECT(con), TYPE_QEMU_TEXT_CONSOLE);
uint8_t buf[16], *q; uint8_t buf[16], *q;
int c; int c;
uint32_t num_free; uint32_t num_free;
if (!s || QEMU_IS_GRAPHIC_CONSOLE(s)) if (!s)
return; return;
switch(keysym) { switch(keysym) {
@ -1251,17 +1256,17 @@ void kbd_put_keysym(int keysym)
static void text_console_invalidate(void *opaque) static void text_console_invalidate(void *opaque)
{ {
QemuConsole *s = (QemuConsole *) opaque; QemuTextConsole *s = QEMU_TEXT_CONSOLE(opaque);
if (QEMU_IS_TEXT_CONSOLE(s) && !QEMU_IS_FIXED_TEXT_CONSOLE(s)) { if (!QEMU_IS_FIXED_TEXT_CONSOLE(s)) {
text_console_resize(s); text_console_resize(QEMU_TEXT_CONSOLE(s));
} }
console_refresh(s); console_refresh(s);
} }
static void text_console_update(void *opaque, console_ch_t *chardata) static void text_console_update(void *opaque, console_ch_t *chardata)
{ {
QemuConsole *s = (QemuConsole *) opaque; QemuTextConsole *s = QEMU_TEXT_CONSOLE(opaque);
int i, j, src; int i, j, src;
if (s->text_x[0] <= s->text_x[1]) { if (s->text_x[0] <= s->text_x[1]) {
@ -1275,7 +1280,7 @@ static void text_console_update(void *opaque, console_ch_t *chardata)
s->cells[src].t_attrib.bgcol, s->cells[src].t_attrib.bgcol,
s->cells[src].t_attrib.bold)); s->cells[src].t_attrib.bold));
} }
dpy_text_update(s, s->text_x[0], s->text_y[0], dpy_text_update(QEMU_CONSOLE(s), s->text_x[0], s->text_y[0],
s->text_x[1] - s->text_x[0], i - s->text_y[0]); s->text_x[1] - s->text_x[0], i - s->text_y[0]);
s->text_x[0] = s->width; s->text_x[0] = s->width;
s->text_y[0] = s->height; s->text_y[0] = s->height;
@ -1283,7 +1288,7 @@ static void text_console_update(void *opaque, console_ch_t *chardata)
s->text_y[1] = 0; s->text_y[1] = 0;
} }
if (s->cursor_invalidate) { if (s->cursor_invalidate) {
dpy_text_cursor(s, s->x, s->y); dpy_text_cursor(QEMU_CONSOLE(s), s->x, s->y);
s->cursor_invalidate = 0; s->cursor_invalidate = 0;
} }
} }
@ -2399,12 +2404,14 @@ char *qemu_console_get_label(QemuConsole *con)
} }
} }
return g_strdup("VGA"); return g_strdup("VGA");
} else { } else if (QEMU_IS_TEXT_CONSOLE(con)) {
if (con->chr && con->chr->label) { QemuTextConsole *c = QEMU_TEXT_CONSOLE(con);
return g_strdup(con->chr->label); if (c->chr && c->chr->label) {
return g_strdup(c->chr->label);
} }
}
return g_strdup_printf("vc%d", con->index); return g_strdup_printf("vc%d", con->index);
}
} }
int qemu_console_get_index(QemuConsole *con) int qemu_console_get_index(QemuConsole *con)
@ -2466,17 +2473,15 @@ int qemu_console_get_height(QemuConsole *con, int fallback)
static void vc_chr_accept_input(Chardev *chr) static void vc_chr_accept_input(Chardev *chr)
{ {
VCChardev *drv = VC_CHARDEV(chr); VCChardev *drv = VC_CHARDEV(chr);
QemuConsole *s = drv->console;
kbd_send_chars(s); kbd_send_chars(drv->console);
} }
static void vc_chr_set_echo(Chardev *chr, bool echo) static void vc_chr_set_echo(Chardev *chr, bool echo)
{ {
VCChardev *drv = VC_CHARDEV(chr); VCChardev *drv = VC_CHARDEV(chr);
QemuConsole *s = drv->console;
s->echo = echo; drv->console->echo = echo;
} }
static void text_console_update_cursor_timer(void) static void text_console_update_cursor_timer(void)
@ -2514,7 +2519,7 @@ static const GraphicHwOps text_console_ops = {
static void text_console_do_init(Chardev *chr) static void text_console_do_init(Chardev *chr)
{ {
VCChardev *drv = VC_CHARDEV(chr); VCChardev *drv = VC_CHARDEV(chr);
QemuConsole *s = drv->console; QemuTextConsole *s = drv->console;
int g_width = 80 * FONT_WIDTH; int g_width = 80 * FONT_WIDTH;
int g_height = 24 * FONT_HEIGHT; int g_height = 24 * FONT_HEIGHT;
@ -2525,17 +2530,17 @@ static void text_console_do_init(Chardev *chr)
s->total_height = DEFAULT_BACKSCROLL; s->total_height = DEFAULT_BACKSCROLL;
s->x = 0; s->x = 0;
s->y = 0; s->y = 0;
if (s->scanout.kind != SCANOUT_SURFACE) { if (QEMU_CONSOLE(s)->scanout.kind != SCANOUT_SURFACE) {
if (active_console && active_console->scanout.kind == SCANOUT_SURFACE) { if (active_console && active_console->scanout.kind == SCANOUT_SURFACE) {
g_width = qemu_console_get_width(active_console, g_width); g_width = qemu_console_get_width(active_console, g_width);
g_height = qemu_console_get_height(active_console, g_height); g_height = qemu_console_get_height(active_console, g_height);
} }
s->surface = qemu_create_displaysurface(g_width, g_height); QEMU_CONSOLE(s)->surface = qemu_create_displaysurface(g_width, g_height);
s->scanout.kind = SCANOUT_SURFACE; QEMU_CONSOLE(s)->scanout.kind = SCANOUT_SURFACE;
} }
s->hw_ops = &text_console_ops; QEMU_CONSOLE(s)->hw_ops = &text_console_ops;
s->hw = s; QEMU_CONSOLE(s)->hw = s;
/* set current text attributes to default */ /* set current text attributes to default */
drv->t_attrib = TEXT_ATTRIBUTES_DEFAULT; drv->t_attrib = TEXT_ATTRIBUTES_DEFAULT;
@ -2561,7 +2566,7 @@ static void vc_chr_open(Chardev *chr,
{ {
ChardevVC *vc = backend->u.vc.data; ChardevVC *vc = backend->u.vc.data;
VCChardev *drv = VC_CHARDEV(chr); VCChardev *drv = VC_CHARDEV(chr);
QemuConsole *s; QemuTextConsole *s;
unsigned width = 0; unsigned width = 0;
unsigned height = 0; unsigned height = 0;
@ -2579,11 +2584,11 @@ static void vc_chr_open(Chardev *chr,
trace_console_txt_new(width, height); trace_console_txt_new(width, height);
if (width == 0 || height == 0) { if (width == 0 || height == 0) {
s = (QemuConsole *)object_new(TYPE_QEMU_TEXT_CONSOLE); s = QEMU_TEXT_CONSOLE(object_new(TYPE_QEMU_TEXT_CONSOLE));
} else { } else {
s = (QemuConsole *)object_new(TYPE_QEMU_FIXED_TEXT_CONSOLE); s = QEMU_TEXT_CONSOLE(object_new(TYPE_QEMU_FIXED_TEXT_CONSOLE));
s->scanout.kind = SCANOUT_SURFACE; QEMU_CONSOLE(s)->scanout.kind = SCANOUT_SURFACE;
s->surface = qemu_create_displaysurface(width, height); QEMU_CONSOLE(s)->surface = qemu_create_displaysurface(width, height);
} }
s->chr = chr; s->chr = chr;