2004-07-14 17:28:59 +00:00
|
|
|
/*
|
|
|
|
* QEMU graphical console
|
2007-09-16 21:08:06 +00:00
|
|
|
*
|
2004-07-14 17:28:59 +00:00
|
|
|
* Copyright (c) 2004 Fabrice Bellard
|
2007-09-16 21:08:06 +00:00
|
|
|
*
|
2004-07-14 17:28:59 +00:00
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
2016-01-29 17:49:51 +00:00
|
|
|
#include "qemu/osdep.h"
|
2007-11-17 17:14:51 +00:00
|
|
|
#include "qemu-common.h"
|
2012-11-28 11:06:30 +00:00
|
|
|
#include "ui/console.h"
|
2013-04-17 08:21:27 +00:00
|
|
|
#include "hw/qdev-core.h"
|
2012-12-17 17:20:00 +00:00
|
|
|
#include "qemu/timer.h"
|
2012-05-24 16:48:23 +00:00
|
|
|
#include "qmp-commands.h"
|
2013-04-08 14:55:25 +00:00
|
|
|
#include "sysemu/char.h"
|
2013-11-10 13:20:16 +00:00
|
|
|
#include "trace.h"
|
2014-06-19 06:46:08 +00:00
|
|
|
#include "exec/memory.h"
|
2004-07-14 17:28:59 +00:00
|
|
|
|
|
|
|
#define DEFAULT_BACKSCROLL 512
|
2012-07-10 20:00:55 +00:00
|
|
|
#define CONSOLE_CURSOR_PERIOD 500
|
2004-07-14 17:28:59 +00:00
|
|
|
|
2006-03-11 15:35:30 +00:00
|
|
|
typedef struct TextAttributes {
|
|
|
|
uint8_t fgcol:4;
|
|
|
|
uint8_t bgcol:4;
|
|
|
|
uint8_t bold:1;
|
|
|
|
uint8_t uline:1;
|
|
|
|
uint8_t blink:1;
|
|
|
|
uint8_t invers:1;
|
|
|
|
uint8_t unvisible:1;
|
|
|
|
} TextAttributes;
|
|
|
|
|
2004-07-14 17:28:59 +00:00
|
|
|
typedef struct TextCell {
|
|
|
|
uint8_t ch;
|
2006-03-11 15:35:30 +00:00
|
|
|
TextAttributes t_attrib;
|
2004-07-14 17:28:59 +00:00
|
|
|
} TextCell;
|
|
|
|
|
|
|
|
#define MAX_ESC_PARAMS 3
|
|
|
|
|
|
|
|
enum TTYState {
|
|
|
|
TTY_STATE_NORM,
|
|
|
|
TTY_STATE_ESC,
|
|
|
|
TTY_STATE_CSI,
|
|
|
|
};
|
|
|
|
|
2006-06-25 16:26:29 +00:00
|
|
|
typedef struct QEMUFIFO {
|
|
|
|
uint8_t *buf;
|
|
|
|
int buf_size;
|
|
|
|
int count, wptr, rptr;
|
|
|
|
} QEMUFIFO;
|
|
|
|
|
2007-11-18 01:44:38 +00:00
|
|
|
static int qemu_fifo_write(QEMUFIFO *f, const uint8_t *buf, int len1)
|
2006-06-25 16:26:29 +00:00
|
|
|
{
|
|
|
|
int l, len;
|
|
|
|
|
|
|
|
l = f->buf_size - f->count;
|
|
|
|
if (len1 > l)
|
|
|
|
len1 = l;
|
|
|
|
len = len1;
|
|
|
|
while (len > 0) {
|
|
|
|
l = f->buf_size - f->wptr;
|
|
|
|
if (l > len)
|
|
|
|
l = len;
|
|
|
|
memcpy(f->buf + f->wptr, buf, l);
|
|
|
|
f->wptr += l;
|
|
|
|
if (f->wptr >= f->buf_size)
|
|
|
|
f->wptr = 0;
|
|
|
|
buf += l;
|
|
|
|
len -= l;
|
|
|
|
}
|
|
|
|
f->count += len1;
|
|
|
|
return len1;
|
|
|
|
}
|
|
|
|
|
2007-11-18 01:44:38 +00:00
|
|
|
static int qemu_fifo_read(QEMUFIFO *f, uint8_t *buf, int len1)
|
2006-06-25 16:26:29 +00:00
|
|
|
{
|
|
|
|
int l, len;
|
|
|
|
|
|
|
|
if (len1 > f->count)
|
|
|
|
len1 = f->count;
|
|
|
|
len = len1;
|
|
|
|
while (len > 0) {
|
|
|
|
l = f->buf_size - f->rptr;
|
|
|
|
if (l > len)
|
|
|
|
l = len;
|
|
|
|
memcpy(buf, f->buf + f->rptr, l);
|
|
|
|
f->rptr += l;
|
|
|
|
if (f->rptr >= f->buf_size)
|
|
|
|
f->rptr = 0;
|
|
|
|
buf += l;
|
|
|
|
len -= l;
|
|
|
|
}
|
|
|
|
f->count -= len1;
|
|
|
|
return len1;
|
|
|
|
}
|
|
|
|
|
2007-07-11 23:14:59 +00:00
|
|
|
typedef enum {
|
|
|
|
GRAPHIC_CONSOLE,
|
2008-09-24 03:32:33 +00:00
|
|
|
TEXT_CONSOLE,
|
|
|
|
TEXT_CONSOLE_FIXED_SIZE
|
2009-10-01 21:12:16 +00:00
|
|
|
} console_type_t;
|
2007-07-11 23:14:59 +00:00
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
struct QemuConsole {
|
2013-04-17 07:45:10 +00:00
|
|
|
Object parent;
|
|
|
|
|
2011-09-15 22:48:07 +00:00
|
|
|
int index;
|
2009-10-01 21:12:16 +00:00
|
|
|
console_type_t console_type;
|
2004-07-14 17:28:59 +00:00
|
|
|
DisplayState *ds;
|
2013-03-12 13:39:22 +00:00
|
|
|
DisplaySurface *surface;
|
2013-03-15 14:45:54 +00:00
|
|
|
int dcls;
|
2014-07-11 11:56:51 +00:00
|
|
|
DisplayChangeListener *gl;
|
2016-09-23 07:50:27 +00:00
|
|
|
bool gl_block;
|
2016-12-21 00:38:04 +00:00
|
|
|
int window_id;
|
2012-09-28 11:24:17 +00:00
|
|
|
|
2006-04-09 01:06:34 +00:00
|
|
|
/* Graphic console state. */
|
2013-04-17 08:21:27 +00:00
|
|
|
Object *device;
|
2014-01-24 14:35:21 +00:00
|
|
|
uint32_t head;
|
2014-01-24 16:38:20 +00:00
|
|
|
QemuUIInfo ui_info;
|
2015-03-12 11:51:13 +00:00
|
|
|
QEMUTimer *ui_timer;
|
2013-03-13 13:04:18 +00:00
|
|
|
const GraphicHwOps *hw_ops;
|
2006-04-09 01:06:34 +00:00
|
|
|
void *hw;
|
2012-09-28 11:24:17 +00:00
|
|
|
|
|
|
|
/* Text console state */
|
2004-07-14 17:28:59 +00:00
|
|
|
int width;
|
|
|
|
int height;
|
|
|
|
int total_height;
|
|
|
|
int backscroll_height;
|
|
|
|
int x, y;
|
2007-01-16 23:02:36 +00:00
|
|
|
int x_saved, y_saved;
|
2004-07-14 17:28:59 +00:00
|
|
|
int y_displayed;
|
|
|
|
int y_base;
|
2006-03-11 15:35:30 +00:00
|
|
|
TextAttributes t_attrib_default; /* default text attributes */
|
|
|
|
TextAttributes t_attrib; /* currently active text attributes */
|
2004-07-14 17:28:59 +00:00
|
|
|
TextCell *cells;
|
2008-02-10 16:33:14 +00:00
|
|
|
int text_x[2], text_y[2], cursor_invalidate;
|
2010-12-23 12:42:52 +00:00
|
|
|
int echo;
|
2004-07-14 17:28:59 +00:00
|
|
|
|
2009-01-21 03:02:52 +00:00
|
|
|
int update_x0;
|
|
|
|
int update_y0;
|
|
|
|
int update_x1;
|
|
|
|
int update_y1;
|
|
|
|
|
2004-07-14 17:28:59 +00:00
|
|
|
enum TTYState state;
|
|
|
|
int esc_params[MAX_ESC_PARAMS];
|
|
|
|
int nb_esc_params;
|
|
|
|
|
2007-01-27 23:46:43 +00:00
|
|
|
CharDriverState *chr;
|
2006-06-25 16:26:29 +00:00
|
|
|
/* fifo for key pressed */
|
|
|
|
QEMUFIFO out_fifo;
|
|
|
|
uint8_t out_fifo_buf[16];
|
|
|
|
QEMUTimer *kbd_timer;
|
2004-07-14 17:28:59 +00:00
|
|
|
};
|
|
|
|
|
2013-03-13 11:25:25 +00:00
|
|
|
struct DisplayState {
|
2013-12-01 07:49:47 +00:00
|
|
|
QEMUTimer *gui_timer;
|
2013-03-14 10:56:16 +00:00
|
|
|
uint64_t last_update;
|
|
|
|
uint64_t update_interval;
|
|
|
|
bool refreshing;
|
2013-03-13 11:25:25 +00:00
|
|
|
bool have_gfx;
|
|
|
|
bool have_text;
|
|
|
|
|
|
|
|
QLIST_HEAD(, DisplayChangeListener) listeners;
|
|
|
|
};
|
|
|
|
|
2010-02-10 23:29:57 +00:00
|
|
|
static DisplayState *display_state;
|
2012-09-28 11:24:17 +00:00
|
|
|
static QemuConsole *active_console;
|
2014-05-26 08:36:35 +00:00
|
|
|
static QemuConsole **consoles;
|
2004-07-14 17:28:59 +00:00
|
|
|
static int nb_consoles = 0;
|
2014-05-22 09:27:13 +00:00
|
|
|
static bool cursor_visible_phase;
|
|
|
|
static QEMUTimer *cursor_timer;
|
2004-07-14 17:28:59 +00:00
|
|
|
|
2013-03-07 16:08:29 +00:00
|
|
|
static void text_console_do_init(CharDriverState *chr, DisplayState *ds);
|
2013-03-14 10:56:16 +00:00
|
|
|
static void dpy_refresh(DisplayState *s);
|
2013-04-23 13:44:31 +00:00
|
|
|
static DisplayState *get_alloc_displaystate(void);
|
2014-05-22 09:27:13 +00:00
|
|
|
static void text_console_update_cursor_timer(void);
|
|
|
|
static void text_console_update_cursor(void *opaque);
|
2013-03-07 16:08:29 +00:00
|
|
|
|
2013-03-13 11:17:13 +00:00
|
|
|
static void gui_update(void *opaque)
|
|
|
|
{
|
2013-03-14 10:56:16 +00:00
|
|
|
uint64_t interval = GUI_REFRESH_INTERVAL_IDLE;
|
|
|
|
uint64_t dcl_interval;
|
2013-03-13 11:17:13 +00:00
|
|
|
DisplayState *ds = opaque;
|
|
|
|
DisplayChangeListener *dcl;
|
2013-03-19 14:01:02 +00:00
|
|
|
int i;
|
2013-03-13 11:17:13 +00:00
|
|
|
|
2013-03-14 10:56:16 +00:00
|
|
|
ds->refreshing = true;
|
2013-03-13 11:17:13 +00:00
|
|
|
dpy_refresh(ds);
|
2013-03-14 10:56:16 +00:00
|
|
|
ds->refreshing = false;
|
2013-03-13 11:17:13 +00:00
|
|
|
|
|
|
|
QLIST_FOREACH(dcl, &ds->listeners, next) {
|
2013-03-14 10:56:16 +00:00
|
|
|
dcl_interval = dcl->update_interval ?
|
|
|
|
dcl->update_interval : GUI_REFRESH_INTERVAL_DEFAULT;
|
|
|
|
if (interval > dcl_interval) {
|
|
|
|
interval = dcl_interval;
|
2013-03-13 11:17:13 +00:00
|
|
|
}
|
|
|
|
}
|
2013-03-14 10:56:16 +00:00
|
|
|
if (ds->update_interval != interval) {
|
|
|
|
ds->update_interval = interval;
|
2013-03-19 14:01:02 +00:00
|
|
|
for (i = 0; i < nb_consoles; i++) {
|
|
|
|
if (consoles[i]->hw_ops->update_interval) {
|
|
|
|
consoles[i]->hw_ops->update_interval(consoles[i]->hw, interval);
|
|
|
|
}
|
|
|
|
}
|
2013-03-14 10:56:16 +00:00
|
|
|
trace_console_refresh(interval);
|
|
|
|
}
|
2013-08-21 15:03:08 +00:00
|
|
|
ds->last_update = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
|
|
|
|
timer_mod(ds->gui_timer, ds->last_update + interval);
|
2013-03-13 11:17:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void gui_setup_refresh(DisplayState *ds)
|
|
|
|
{
|
|
|
|
DisplayChangeListener *dcl;
|
|
|
|
bool need_timer = false;
|
|
|
|
bool have_gfx = false;
|
|
|
|
bool have_text = false;
|
|
|
|
|
|
|
|
QLIST_FOREACH(dcl, &ds->listeners, next) {
|
|
|
|
if (dcl->ops->dpy_refresh != NULL) {
|
|
|
|
need_timer = true;
|
|
|
|
}
|
|
|
|
if (dcl->ops->dpy_gfx_update != NULL) {
|
|
|
|
have_gfx = true;
|
|
|
|
}
|
|
|
|
if (dcl->ops->dpy_text_update != NULL) {
|
|
|
|
have_text = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (need_timer && ds->gui_timer == NULL) {
|
2013-08-21 15:03:08 +00:00
|
|
|
ds->gui_timer = timer_new_ms(QEMU_CLOCK_REALTIME, gui_update, ds);
|
|
|
|
timer_mod(ds->gui_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
|
2013-03-13 11:17:13 +00:00
|
|
|
}
|
|
|
|
if (!need_timer && ds->gui_timer != NULL) {
|
2013-08-21 15:03:08 +00:00
|
|
|
timer_del(ds->gui_timer);
|
|
|
|
timer_free(ds->gui_timer);
|
2013-03-13 11:17:13 +00:00
|
|
|
ds->gui_timer = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ds->have_gfx = have_gfx;
|
|
|
|
ds->have_text = have_text;
|
|
|
|
}
|
|
|
|
|
2013-03-12 12:44:38 +00:00
|
|
|
void graphic_hw_update(QemuConsole *con)
|
2006-04-09 01:06:34 +00:00
|
|
|
{
|
2013-03-12 12:44:38 +00:00
|
|
|
if (!con) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
2013-03-13 13:04:18 +00:00
|
|
|
if (con && con->hw_ops->gfx_update) {
|
|
|
|
con->hw_ops->gfx_update(con->hw);
|
2013-03-12 12:44:38 +00:00
|
|
|
}
|
2006-04-09 01:06:34 +00:00
|
|
|
}
|
|
|
|
|
2015-12-03 11:34:25 +00:00
|
|
|
void graphic_hw_gl_block(QemuConsole *con, bool block)
|
|
|
|
{
|
2016-09-23 07:50:27 +00:00
|
|
|
assert(con != NULL);
|
|
|
|
|
|
|
|
con->gl_block = block;
|
|
|
|
if (con->hw_ops->gl_block) {
|
2015-12-03 11:34:25 +00:00
|
|
|
con->hw_ops->gl_block(con->hw, block);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-21 00:38:04 +00:00
|
|
|
int qemu_console_get_window_id(QemuConsole *con)
|
|
|
|
{
|
|
|
|
return con->window_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_console_set_window_id(QemuConsole *con, int window_id)
|
|
|
|
{
|
|
|
|
con->window_id = window_id;
|
|
|
|
}
|
|
|
|
|
2013-03-12 12:44:38 +00:00
|
|
|
void graphic_hw_invalidate(QemuConsole *con)
|
2006-04-09 01:06:34 +00:00
|
|
|
{
|
2013-03-12 12:44:38 +00:00
|
|
|
if (!con) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
2013-03-13 13:04:18 +00:00
|
|
|
if (con && con->hw_ops->invalidate) {
|
|
|
|
con->hw_ops->invalidate(con->hw);
|
2013-03-12 12:44:38 +00:00
|
|
|
}
|
2006-04-09 01:06:34 +00:00
|
|
|
}
|
|
|
|
|
2015-04-08 18:04:13 +00:00
|
|
|
static void ppm_save(const char *filename, DisplaySurface *ds,
|
2013-03-12 13:48:31 +00:00
|
|
|
Error **errp)
|
2006-04-09 01:06:34 +00:00
|
|
|
{
|
2013-03-12 13:48:31 +00:00
|
|
|
int width = pixman_image_get_width(ds->image);
|
|
|
|
int height = pixman_image_get_height(ds->image);
|
2013-04-23 11:26:59 +00:00
|
|
|
int fd;
|
2013-03-12 13:48:31 +00:00
|
|
|
FILE *f;
|
|
|
|
int y;
|
|
|
|
int ret;
|
|
|
|
pixman_image_t *linebuf;
|
|
|
|
|
|
|
|
trace_ppm_save(filename, ds);
|
2013-04-23 11:26:59 +00:00
|
|
|
fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
|
|
|
|
if (fd == -1) {
|
2013-03-12 13:48:31 +00:00
|
|
|
error_setg(errp, "failed to open file '%s': %s", filename,
|
|
|
|
strerror(errno));
|
|
|
|
return;
|
2012-02-24 11:43:45 +00:00
|
|
|
}
|
2013-04-23 11:26:59 +00:00
|
|
|
f = fdopen(fd, "wb");
|
2013-03-12 13:48:31 +00:00
|
|
|
ret = fprintf(f, "P6\n%d %d\n%d\n", width, height, 255);
|
|
|
|
if (ret < 0) {
|
|
|
|
linebuf = NULL;
|
|
|
|
goto write_err;
|
|
|
|
}
|
|
|
|
linebuf = qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, width);
|
|
|
|
for (y = 0; y < height; y++) {
|
|
|
|
qemu_pixman_linebuf_fill(linebuf, ds->image, width, 0, y);
|
|
|
|
clearerr(f);
|
|
|
|
ret = fwrite(pixman_image_get_data(linebuf), 1,
|
|
|
|
pixman_image_get_stride(linebuf), f);
|
|
|
|
(void)ret;
|
|
|
|
if (ferror(f)) {
|
|
|
|
goto write_err;
|
|
|
|
}
|
2011-09-15 22:48:07 +00:00
|
|
|
}
|
|
|
|
|
2013-03-12 13:48:31 +00:00
|
|
|
out:
|
|
|
|
qemu_pixman_image_unref(linebuf);
|
|
|
|
fclose(f);
|
|
|
|
return;
|
|
|
|
|
|
|
|
write_err:
|
|
|
|
error_setg(errp, "failed to write to file '%s': %s", filename,
|
|
|
|
strerror(errno));
|
|
|
|
unlink(filename);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qmp_screendump(const char *filename, Error **errp)
|
|
|
|
{
|
2013-03-15 14:45:54 +00:00
|
|
|
QemuConsole *con = qemu_console_lookup_by_index(0);
|
2013-03-12 13:48:31 +00:00
|
|
|
DisplaySurface *surface;
|
|
|
|
|
|
|
|
if (con == NULL) {
|
|
|
|
error_setg(errp, "There is no QemuConsole I can screendump from.");
|
|
|
|
return;
|
2011-11-18 15:41:59 +00:00
|
|
|
}
|
2013-03-12 13:48:31 +00:00
|
|
|
|
|
|
|
graphic_hw_update(con);
|
|
|
|
surface = qemu_console_surface(con);
|
|
|
|
ppm_save(filename, surface, errp);
|
2006-04-09 01:06:34 +00:00
|
|
|
}
|
|
|
|
|
2013-03-12 12:44:38 +00:00
|
|
|
void graphic_hw_text_update(QemuConsole *con, console_ch_t *chardata)
|
2008-02-10 16:33:14 +00:00
|
|
|
{
|
2013-03-12 12:44:38 +00:00
|
|
|
if (!con) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
2013-03-13 13:04:18 +00:00
|
|
|
if (con && con->hw_ops->text_update) {
|
|
|
|
con->hw_ops->text_update(con->hw, chardata);
|
|
|
|
}
|
2008-02-10 16:33:14 +00:00
|
|
|
}
|
|
|
|
|
2013-03-06 12:40:47 +00:00
|
|
|
static void vga_fill_rect(QemuConsole *con,
|
|
|
|
int posx, int posy, int width, int height,
|
2013-03-08 07:43:24 +00:00
|
|
|
pixman_color_t color)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
2013-03-06 12:40:47 +00:00
|
|
|
DisplaySurface *surface = qemu_console_surface(con);
|
2013-03-06 14:43:23 +00:00
|
|
|
pixman_rectangle16_t rect = {
|
|
|
|
.x = posx, .y = posy, .width = width, .height = height
|
|
|
|
};
|
|
|
|
|
|
|
|
pixman_image_fill_rectangles(PIXMAN_OP_SRC, surface->image,
|
2013-03-08 07:43:24 +00:00
|
|
|
&color, 1, &rect);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* copy from (xs, ys) to (xd, yd) a rectangle of size (w, h) */
|
2013-03-06 12:40:47 +00:00
|
|
|
static void vga_bitblt(QemuConsole *con,
|
|
|
|
int xs, int ys, int xd, int yd, int w, int h)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
2013-03-06 12:40:47 +00:00
|
|
|
DisplaySurface *surface = qemu_console_surface(con);
|
2013-03-06 14:43:23 +00:00
|
|
|
|
|
|
|
pixman_image_composite(PIXMAN_OP_SRC,
|
|
|
|
surface->image, NULL, surface->image,
|
|
|
|
xs, ys, 0, 0, xd, yd, w, h);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************/
|
|
|
|
/* basic char display */
|
|
|
|
|
|
|
|
#define FONT_HEIGHT 16
|
|
|
|
#define FONT_WIDTH 8
|
|
|
|
|
|
|
|
#include "vgafont.h"
|
|
|
|
|
2013-03-08 07:43:24 +00:00
|
|
|
#define QEMU_RGB(r, g, b) \
|
|
|
|
{ .red = r << 8, .green = g << 8, .blue = b << 8, .alpha = 0xffff }
|
|
|
|
|
|
|
|
static const pixman_color_t color_table_rgb[2][8] = {
|
2006-03-11 15:35:30 +00:00
|
|
|
{ /* dark */
|
2015-11-29 13:28:24 +00:00
|
|
|
[QEMU_COLOR_BLACK] = QEMU_RGB(0x00, 0x00, 0x00), /* black */
|
|
|
|
[QEMU_COLOR_BLUE] = QEMU_RGB(0x00, 0x00, 0xaa), /* blue */
|
|
|
|
[QEMU_COLOR_GREEN] = QEMU_RGB(0x00, 0xaa, 0x00), /* green */
|
|
|
|
[QEMU_COLOR_CYAN] = QEMU_RGB(0x00, 0xaa, 0xaa), /* cyan */
|
|
|
|
[QEMU_COLOR_RED] = QEMU_RGB(0xaa, 0x00, 0x00), /* red */
|
|
|
|
[QEMU_COLOR_MAGENTA] = QEMU_RGB(0xaa, 0x00, 0xaa), /* magenta */
|
|
|
|
[QEMU_COLOR_YELLOW] = QEMU_RGB(0xaa, 0xaa, 0x00), /* yellow */
|
|
|
|
[QEMU_COLOR_WHITE] = QEMU_RGB(0xaa, 0xaa, 0xaa), /* white */
|
2006-03-11 15:35:30 +00:00
|
|
|
},
|
|
|
|
{ /* bright */
|
2015-11-29 13:28:24 +00:00
|
|
|
[QEMU_COLOR_BLACK] = QEMU_RGB(0x00, 0x00, 0x00), /* black */
|
|
|
|
[QEMU_COLOR_BLUE] = QEMU_RGB(0x00, 0x00, 0xff), /* blue */
|
|
|
|
[QEMU_COLOR_GREEN] = QEMU_RGB(0x00, 0xff, 0x00), /* green */
|
|
|
|
[QEMU_COLOR_CYAN] = QEMU_RGB(0x00, 0xff, 0xff), /* cyan */
|
|
|
|
[QEMU_COLOR_RED] = QEMU_RGB(0xff, 0x00, 0x00), /* red */
|
|
|
|
[QEMU_COLOR_MAGENTA] = QEMU_RGB(0xff, 0x00, 0xff), /* magenta */
|
|
|
|
[QEMU_COLOR_YELLOW] = QEMU_RGB(0xff, 0xff, 0x00), /* yellow */
|
|
|
|
[QEMU_COLOR_WHITE] = QEMU_RGB(0xff, 0xff, 0xff), /* white */
|
2006-03-11 15:35:30 +00:00
|
|
|
}
|
2004-07-14 17:28:59 +00:00
|
|
|
};
|
|
|
|
|
2013-03-06 12:40:47 +00:00
|
|
|
static void vga_putcharxy(QemuConsole *s, int x, int y, int ch,
|
2006-03-11 15:35:30 +00:00
|
|
|
TextAttributes *t_attrib)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
2013-03-06 14:44:10 +00:00
|
|
|
static pixman_image_t *glyphs[256];
|
2013-03-06 12:40:47 +00:00
|
|
|
DisplaySurface *surface = qemu_console_surface(s);
|
2013-03-08 07:43:24 +00:00
|
|
|
pixman_color_t fgcol, bgcol;
|
2006-03-11 15:35:30 +00:00
|
|
|
|
|
|
|
if (t_attrib->invers) {
|
2013-03-06 08:50:51 +00:00
|
|
|
bgcol = color_table_rgb[t_attrib->bold][t_attrib->fgcol];
|
|
|
|
fgcol = color_table_rgb[t_attrib->bold][t_attrib->bgcol];
|
2006-03-11 15:35:30 +00:00
|
|
|
} else {
|
2013-03-06 08:50:51 +00:00
|
|
|
fgcol = color_table_rgb[t_attrib->bold][t_attrib->fgcol];
|
|
|
|
bgcol = color_table_rgb[t_attrib->bold][t_attrib->bgcol];
|
2006-03-11 15:35:30 +00:00
|
|
|
}
|
2004-07-14 17:28:59 +00:00
|
|
|
|
2013-03-06 14:44:10 +00:00
|
|
|
if (!glyphs[ch]) {
|
|
|
|
glyphs[ch] = qemu_pixman_glyph_from_vgafont(FONT_HEIGHT, vgafont16, ch);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
2013-03-06 14:44:10 +00:00
|
|
|
qemu_pixman_glyph_render(glyphs[ch], surface->image,
|
2013-03-08 07:43:24 +00:00
|
|
|
&fgcol, &bgcol, x, y, FONT_WIDTH, FONT_HEIGHT);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static void text_console_resize(QemuConsole *s)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
|
|
|
TextCell *cells, *c, *c1;
|
|
|
|
int w1, x, y, last_width;
|
|
|
|
|
|
|
|
last_width = s->width;
|
2013-03-13 09:14:52 +00:00
|
|
|
s->width = surface_width(s->surface) / FONT_WIDTH;
|
|
|
|
s->height = surface_height(s->surface) / FONT_HEIGHT;
|
2004-07-14 17:28:59 +00:00
|
|
|
|
|
|
|
w1 = last_width;
|
|
|
|
if (s->width < w1)
|
|
|
|
w1 = s->width;
|
|
|
|
|
2015-11-03 16:12:03 +00:00
|
|
|
cells = g_new(TextCell, s->width * s->total_height);
|
2004-07-14 17:28:59 +00:00
|
|
|
for(y = 0; y < s->total_height; y++) {
|
|
|
|
c = &cells[y * s->width];
|
|
|
|
if (w1 > 0) {
|
|
|
|
c1 = &s->cells[y * last_width];
|
|
|
|
for(x = 0; x < w1; x++) {
|
|
|
|
*c++ = *c1++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for(x = w1; x < s->width; x++) {
|
|
|
|
c->ch = ' ';
|
2006-03-11 15:35:30 +00:00
|
|
|
c->t_attrib = s->t_attrib_default;
|
2004-07-14 17:28:59 +00:00
|
|
|
c++;
|
|
|
|
}
|
|
|
|
}
|
2011-08-21 03:09:37 +00:00
|
|
|
g_free(s->cells);
|
2004-07-14 17:28:59 +00:00
|
|
|
s->cells = cells;
|
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static inline void text_update_xy(QemuConsole *s, int x, int y)
|
2008-02-10 16:33:14 +00:00
|
|
|
{
|
|
|
|
s->text_x[0] = MIN(s->text_x[0], x);
|
|
|
|
s->text_x[1] = MAX(s->text_x[1], x);
|
|
|
|
s->text_y[0] = MIN(s->text_y[0], y);
|
|
|
|
s->text_y[1] = MAX(s->text_y[1], y);
|
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static void invalidate_xy(QemuConsole *s, int x, int y)
|
2009-01-21 03:02:52 +00:00
|
|
|
{
|
2014-05-22 09:01:42 +00:00
|
|
|
if (!qemu_console_is_visible(s)) {
|
|
|
|
return;
|
|
|
|
}
|
2009-01-21 03:02:52 +00:00
|
|
|
if (s->update_x0 > x * FONT_WIDTH)
|
|
|
|
s->update_x0 = x * FONT_WIDTH;
|
|
|
|
if (s->update_y0 > y * FONT_HEIGHT)
|
|
|
|
s->update_y0 = y * FONT_HEIGHT;
|
|
|
|
if (s->update_x1 < (x + 1) * FONT_WIDTH)
|
|
|
|
s->update_x1 = (x + 1) * FONT_WIDTH;
|
|
|
|
if (s->update_y1 < (y + 1) * FONT_HEIGHT)
|
|
|
|
s->update_y1 = (y + 1) * FONT_HEIGHT;
|
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static void update_xy(QemuConsole *s, int x, int y)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
|
|
|
TextCell *c;
|
|
|
|
int y1, y2;
|
|
|
|
|
2013-03-06 12:40:47 +00:00
|
|
|
if (s->ds->have_text) {
|
|
|
|
text_update_xy(s, x, y);
|
|
|
|
}
|
2008-02-10 16:33:14 +00:00
|
|
|
|
2014-05-22 09:01:42 +00:00
|
|
|
y1 = (s->y_base + y) % s->total_height;
|
|
|
|
y2 = y1 - s->y_displayed;
|
|
|
|
if (y2 < 0) {
|
|
|
|
y2 += s->total_height;
|
|
|
|
}
|
|
|
|
if (y2 < s->height) {
|
|
|
|
c = &s->cells[y1 * s->width + x];
|
|
|
|
vga_putcharxy(s, x, y2, c->ch,
|
|
|
|
&(c->t_attrib));
|
|
|
|
invalidate_xy(s, x, y2);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static void console_show_cursor(QemuConsole *s, int show)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
|
|
|
TextCell *c;
|
|
|
|
int y, y1;
|
2013-03-06 12:40:47 +00:00
|
|
|
int x = s->x;
|
2004-07-14 17:28:59 +00:00
|
|
|
|
2013-03-06 12:40:47 +00:00
|
|
|
if (s->ds->have_text) {
|
|
|
|
s->cursor_invalidate = 1;
|
|
|
|
}
|
2008-02-10 16:33:14 +00:00
|
|
|
|
2014-05-22 09:01:42 +00:00
|
|
|
if (x >= s->width) {
|
|
|
|
x = s->width - 1;
|
|
|
|
}
|
|
|
|
y1 = (s->y_base + s->y) % s->total_height;
|
|
|
|
y = y1 - s->y_displayed;
|
|
|
|
if (y < 0) {
|
|
|
|
y += s->total_height;
|
|
|
|
}
|
|
|
|
if (y < s->height) {
|
|
|
|
c = &s->cells[y1 * s->width + x];
|
2014-05-22 09:27:13 +00:00
|
|
|
if (show && cursor_visible_phase) {
|
2014-05-22 09:01:42 +00:00
|
|
|
TextAttributes t_attrib = s->t_attrib_default;
|
|
|
|
t_attrib.invers = !(t_attrib.invers); /* invert fg and bg */
|
|
|
|
vga_putcharxy(s, x, y, c->ch, &t_attrib);
|
|
|
|
} else {
|
|
|
|
vga_putcharxy(s, x, y, c->ch, &(c->t_attrib));
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
2014-05-22 09:01:42 +00:00
|
|
|
invalidate_xy(s, x, y);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static void console_refresh(QemuConsole *s)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
2013-03-06 12:40:47 +00:00
|
|
|
DisplaySurface *surface = qemu_console_surface(s);
|
2004-07-14 17:28:59 +00:00
|
|
|
TextCell *c;
|
|
|
|
int x, y, y1;
|
|
|
|
|
2012-09-28 13:02:08 +00:00
|
|
|
if (s->ds->have_text) {
|
2008-02-10 16:33:14 +00:00
|
|
|
s->text_x[0] = 0;
|
|
|
|
s->text_y[0] = 0;
|
|
|
|
s->text_x[1] = s->width - 1;
|
|
|
|
s->text_y[1] = s->height - 1;
|
|
|
|
s->cursor_invalidate = 1;
|
|
|
|
}
|
2004-07-14 17:28:59 +00:00
|
|
|
|
2014-05-22 09:01:42 +00:00
|
|
|
vga_fill_rect(s, 0, 0, surface_width(surface), surface_height(surface),
|
2015-11-29 13:28:24 +00:00
|
|
|
color_table_rgb[0][QEMU_COLOR_BLACK]);
|
2014-05-22 09:01:42 +00:00
|
|
|
y1 = s->y_displayed;
|
|
|
|
for (y = 0; y < s->height; y++) {
|
|
|
|
c = s->cells + y1 * s->width;
|
|
|
|
for (x = 0; x < s->width; x++) {
|
|
|
|
vga_putcharxy(s, x, y, c->ch,
|
|
|
|
&(c->t_attrib));
|
|
|
|
c++;
|
|
|
|
}
|
|
|
|
if (++y1 == s->total_height) {
|
|
|
|
y1 = 0;
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
}
|
2014-05-22 09:01:42 +00:00
|
|
|
console_show_cursor(s, 1);
|
|
|
|
dpy_gfx_update(s, 0, 0,
|
|
|
|
surface_width(surface), surface_height(surface));
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
static void console_scroll(QemuConsole *s, int ydelta)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
|
|
|
int i, y1;
|
2007-09-17 08:09:54 +00:00
|
|
|
|
2004-07-14 17:28:59 +00:00
|
|
|
if (ydelta > 0) {
|
|
|
|
for(i = 0; i < ydelta; i++) {
|
|
|
|
if (s->y_displayed == s->y_base)
|
|
|
|
break;
|
|
|
|
if (++s->y_displayed == s->total_height)
|
|
|
|
s->y_displayed = 0;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ydelta = -ydelta;
|
|
|
|
i = s->backscroll_height;
|
|
|
|
if (i > s->total_height - s->height)
|
|
|
|
i = s->total_height - s->height;
|
|
|
|
y1 = s->y_base - i;
|
|
|
|
if (y1 < 0)
|
|
|
|
y1 += s->total_height;
|
|
|
|
for(i = 0; i < ydelta; i++) {
|
|
|
|
if (s->y_displayed == y1)
|
|
|
|
break;
|
|
|
|
if (--s->y_displayed < 0)
|
|
|
|
s->y_displayed = s->total_height - 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
console_refresh(s);
|
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static void console_put_lf(QemuConsole *s)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
|
|
|
TextCell *c;
|
|
|
|
int x, y1;
|
|
|
|
|
|
|
|
s->y++;
|
|
|
|
if (s->y >= s->height) {
|
|
|
|
s->y = s->height - 1;
|
2006-03-11 15:35:30 +00:00
|
|
|
|
2004-07-14 17:28:59 +00:00
|
|
|
if (s->y_displayed == s->y_base) {
|
|
|
|
if (++s->y_displayed == s->total_height)
|
|
|
|
s->y_displayed = 0;
|
|
|
|
}
|
|
|
|
if (++s->y_base == s->total_height)
|
|
|
|
s->y_base = 0;
|
|
|
|
if (s->backscroll_height < s->total_height)
|
|
|
|
s->backscroll_height++;
|
|
|
|
y1 = (s->y_base + s->height - 1) % s->total_height;
|
|
|
|
c = &s->cells[y1 * s->width];
|
|
|
|
for(x = 0; x < s->width; x++) {
|
|
|
|
c->ch = ' ';
|
2006-03-11 15:35:30 +00:00
|
|
|
c->t_attrib = s->t_attrib_default;
|
2004-07-14 17:28:59 +00:00
|
|
|
c++;
|
|
|
|
}
|
2014-05-22 09:01:42 +00:00
|
|
|
if (s->y_displayed == s->y_base) {
|
2013-03-06 12:40:47 +00:00
|
|
|
if (s->ds->have_text) {
|
2008-02-10 16:33:14 +00:00
|
|
|
s->text_x[0] = 0;
|
|
|
|
s->text_y[0] = 0;
|
|
|
|
s->text_x[1] = s->width - 1;
|
|
|
|
s->text_y[1] = s->height - 1;
|
|
|
|
}
|
|
|
|
|
2014-05-22 09:01:42 +00:00
|
|
|
vga_bitblt(s, 0, FONT_HEIGHT, 0, 0,
|
|
|
|
s->width * FONT_WIDTH,
|
|
|
|
(s->height - 1) * FONT_HEIGHT);
|
|
|
|
vga_fill_rect(s, 0, (s->height - 1) * FONT_HEIGHT,
|
|
|
|
s->width * FONT_WIDTH, FONT_HEIGHT,
|
|
|
|
color_table_rgb[0][s->t_attrib_default.bgcol]);
|
|
|
|
s->update_x0 = 0;
|
|
|
|
s->update_y0 = 0;
|
|
|
|
s->update_x1 = s->width * FONT_WIDTH;
|
|
|
|
s->update_y1 = s->height * FONT_HEIGHT;
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-11 15:35:30 +00:00
|
|
|
/* Set console attributes depending on the current escape codes.
|
|
|
|
* NOTE: I know this code is not very efficient (checking every color for it
|
|
|
|
* self) but it is more readable and better maintainable.
|
|
|
|
*/
|
2012-09-28 11:24:17 +00:00
|
|
|
static void console_handle_escape(QemuConsole *s)
|
2006-03-11 15:35:30 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i=0; i<s->nb_esc_params; i++) {
|
|
|
|
switch (s->esc_params[i]) {
|
|
|
|
case 0: /* reset all console attributes to default */
|
|
|
|
s->t_attrib = s->t_attrib_default;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
s->t_attrib.bold = 1;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
s->t_attrib.uline = 1;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
s->t_attrib.blink = 1;
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
s->t_attrib.invers = 1;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
s->t_attrib.unvisible = 1;
|
|
|
|
break;
|
|
|
|
case 22:
|
|
|
|
s->t_attrib.bold = 0;
|
|
|
|
break;
|
|
|
|
case 24:
|
|
|
|
s->t_attrib.uline = 0;
|
|
|
|
break;
|
|
|
|
case 25:
|
|
|
|
s->t_attrib.blink = 0;
|
|
|
|
break;
|
|
|
|
case 27:
|
|
|
|
s->t_attrib.invers = 0;
|
|
|
|
break;
|
|
|
|
case 28:
|
|
|
|
s->t_attrib.unvisible = 0;
|
|
|
|
break;
|
|
|
|
/* set foreground color */
|
|
|
|
case 30:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.fgcol = QEMU_COLOR_BLACK;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 31:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.fgcol = QEMU_COLOR_RED;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 32:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.fgcol = QEMU_COLOR_GREEN;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 33:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.fgcol = QEMU_COLOR_YELLOW;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 34:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.fgcol = QEMU_COLOR_BLUE;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 35:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.fgcol = QEMU_COLOR_MAGENTA;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 36:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.fgcol = QEMU_COLOR_CYAN;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 37:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.fgcol = QEMU_COLOR_WHITE;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
/* set background color */
|
|
|
|
case 40:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_BLACK;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 41:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_RED;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 42:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_GREEN;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 43:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_YELLOW;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 44:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_BLUE;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 45:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_MAGENTA;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 46:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_CYAN;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case 47:
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_WHITE;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static void console_clear_xy(QemuConsole *s, int x, int y)
|
2007-01-16 23:02:36 +00:00
|
|
|
{
|
|
|
|
int y1 = (s->y_base + y) % s->total_height;
|
|
|
|
TextCell *c = &s->cells[y1 * s->width + x];
|
|
|
|
c->ch = ' ';
|
|
|
|
c->t_attrib = s->t_attrib_default;
|
|
|
|
update_xy(s, x, y);
|
|
|
|
}
|
|
|
|
|
2016-03-08 19:51:21 +00:00
|
|
|
static void console_put_one(QemuConsole *s, int ch)
|
|
|
|
{
|
|
|
|
TextCell *c;
|
|
|
|
int y1;
|
|
|
|
if (s->x >= s->width) {
|
|
|
|
/* line wrap */
|
|
|
|
s->x = 0;
|
|
|
|
console_put_lf(s);
|
|
|
|
}
|
|
|
|
y1 = (s->y_base + s->y) % s->total_height;
|
|
|
|
c = &s->cells[y1 * s->width + s->x];
|
|
|
|
c->ch = ch;
|
|
|
|
c->t_attrib = s->t_attrib;
|
|
|
|
update_xy(s, s->x, s->y);
|
|
|
|
s->x++;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_respond_str(QemuConsole *s, const char *buf)
|
|
|
|
{
|
|
|
|
while (*buf) {
|
|
|
|
console_put_one(s, *buf);
|
|
|
|
buf++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-04 15:26:09 +00:00
|
|
|
/* set cursor, checking bounds */
|
2012-09-28 11:24:17 +00:00
|
|
|
static void set_cursor(QemuConsole *s, int x, int y)
|
2012-09-04 15:26:09 +00:00
|
|
|
{
|
|
|
|
if (x < 0) {
|
|
|
|
x = 0;
|
|
|
|
}
|
|
|
|
if (y < 0) {
|
|
|
|
y = 0;
|
|
|
|
}
|
|
|
|
if (y >= s->height) {
|
|
|
|
y = s->height - 1;
|
|
|
|
}
|
|
|
|
if (x >= s->width) {
|
|
|
|
x = s->width - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
s->x = x;
|
|
|
|
s->y = y;
|
|
|
|
}
|
|
|
|
|
2012-09-28 11:24:17 +00:00
|
|
|
static void console_putchar(QemuConsole *s, int ch)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
2016-03-08 19:51:21 +00:00
|
|
|
int i;
|
2007-01-16 23:02:36 +00:00
|
|
|
int x, y;
|
2016-03-08 19:51:21 +00:00
|
|
|
char response[40];
|
2004-07-14 17:28:59 +00:00
|
|
|
|
|
|
|
switch(s->state) {
|
|
|
|
case TTY_STATE_NORM:
|
|
|
|
switch(ch) {
|
2006-03-11 15:35:30 +00:00
|
|
|
case '\r': /* carriage return */
|
2004-07-14 17:28:59 +00:00
|
|
|
s->x = 0;
|
|
|
|
break;
|
2006-03-11 15:35:30 +00:00
|
|
|
case '\n': /* newline */
|
2004-07-14 17:28:59 +00:00
|
|
|
console_put_lf(s);
|
|
|
|
break;
|
2006-03-11 15:35:30 +00:00
|
|
|
case '\b': /* backspace */
|
2007-09-16 21:08:06 +00:00
|
|
|
if (s->x > 0)
|
2006-06-25 16:26:29 +00:00
|
|
|
s->x--;
|
2006-03-11 15:35:30 +00:00
|
|
|
break;
|
|
|
|
case '\t': /* tabspace */
|
|
|
|
if (s->x + (8 - (s->x % 8)) > s->width) {
|
2006-07-14 20:24:31 +00:00
|
|
|
s->x = 0;
|
2006-03-11 15:35:30 +00:00
|
|
|
console_put_lf(s);
|
|
|
|
} else {
|
|
|
|
s->x = s->x + (8 - (s->x % 8));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '\a': /* alert aka. bell */
|
|
|
|
/* TODO: has to be implemented */
|
|
|
|
break;
|
2007-01-16 23:02:36 +00:00
|
|
|
case 14:
|
|
|
|
/* SI (shift in), character set 0 (ignored) */
|
|
|
|
break;
|
|
|
|
case 15:
|
|
|
|
/* SO (shift out), character set 1 (ignored) */
|
|
|
|
break;
|
2006-03-11 15:35:30 +00:00
|
|
|
case 27: /* esc (introducing an escape sequence) */
|
2004-07-14 17:28:59 +00:00
|
|
|
s->state = TTY_STATE_ESC;
|
|
|
|
break;
|
|
|
|
default:
|
2016-03-08 19:51:21 +00:00
|
|
|
console_put_one(s, ch);
|
2004-07-14 17:28:59 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2006-03-11 15:35:30 +00:00
|
|
|
case TTY_STATE_ESC: /* check if it is a terminal escape sequence */
|
2004-07-14 17:28:59 +00:00
|
|
|
if (ch == '[') {
|
|
|
|
for(i=0;i<MAX_ESC_PARAMS;i++)
|
|
|
|
s->esc_params[i] = 0;
|
|
|
|
s->nb_esc_params = 0;
|
|
|
|
s->state = TTY_STATE_CSI;
|
|
|
|
} else {
|
|
|
|
s->state = TTY_STATE_NORM;
|
|
|
|
}
|
|
|
|
break;
|
2006-03-11 15:35:30 +00:00
|
|
|
case TTY_STATE_CSI: /* handle escape sequence parameters */
|
2004-07-14 17:28:59 +00:00
|
|
|
if (ch >= '0' && ch <= '9') {
|
|
|
|
if (s->nb_esc_params < MAX_ESC_PARAMS) {
|
2012-09-17 09:10:03 +00:00
|
|
|
int *param = &s->esc_params[s->nb_esc_params];
|
|
|
|
int digit = (ch - '0');
|
|
|
|
|
|
|
|
*param = (*param <= (INT_MAX - digit) / 10) ?
|
|
|
|
*param * 10 + digit : INT_MAX;
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
} else {
|
2012-09-04 15:26:09 +00:00
|
|
|
if (s->nb_esc_params < MAX_ESC_PARAMS)
|
|
|
|
s->nb_esc_params++;
|
2004-07-14 17:28:59 +00:00
|
|
|
if (ch == ';')
|
|
|
|
break;
|
2013-11-10 15:04:16 +00:00
|
|
|
trace_console_putchar_csi(s->esc_params[0], s->esc_params[1],
|
|
|
|
ch, s->nb_esc_params);
|
2004-07-14 17:28:59 +00:00
|
|
|
s->state = TTY_STATE_NORM;
|
|
|
|
switch(ch) {
|
2007-01-16 23:02:36 +00:00
|
|
|
case 'A':
|
|
|
|
/* move cursor up */
|
|
|
|
if (s->esc_params[0] == 0) {
|
|
|
|
s->esc_params[0] = 1;
|
|
|
|
}
|
2012-09-04 15:26:09 +00:00
|
|
|
set_cursor(s, s->x, s->y - s->esc_params[0]);
|
2007-01-16 23:02:36 +00:00
|
|
|
break;
|
|
|
|
case 'B':
|
|
|
|
/* move cursor down */
|
|
|
|
if (s->esc_params[0] == 0) {
|
|
|
|
s->esc_params[0] = 1;
|
|
|
|
}
|
2012-09-04 15:26:09 +00:00
|
|
|
set_cursor(s, s->x, s->y + s->esc_params[0]);
|
2004-07-14 17:28:59 +00:00
|
|
|
break;
|
|
|
|
case 'C':
|
2007-01-16 23:02:36 +00:00
|
|
|
/* move cursor right */
|
|
|
|
if (s->esc_params[0] == 0) {
|
|
|
|
s->esc_params[0] = 1;
|
|
|
|
}
|
2012-09-04 15:26:09 +00:00
|
|
|
set_cursor(s, s->x + s->esc_params[0], s->y);
|
2004-07-14 17:28:59 +00:00
|
|
|
break;
|
2007-01-16 23:02:36 +00:00
|
|
|
case 'D':
|
|
|
|
/* move cursor left */
|
|
|
|
if (s->esc_params[0] == 0) {
|
|
|
|
s->esc_params[0] = 1;
|
|
|
|
}
|
2012-09-04 15:26:09 +00:00
|
|
|
set_cursor(s, s->x - s->esc_params[0], s->y);
|
2007-01-16 23:02:36 +00:00
|
|
|
break;
|
|
|
|
case 'G':
|
|
|
|
/* move cursor to column */
|
2012-09-04 15:26:09 +00:00
|
|
|
set_cursor(s, s->esc_params[0] - 1, s->y);
|
2007-01-16 23:02:36 +00:00
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
case 'H':
|
|
|
|
/* move cursor to row, column */
|
2012-09-04 15:26:09 +00:00
|
|
|
set_cursor(s, s->esc_params[1] - 1, s->esc_params[0] - 1);
|
2007-01-16 23:02:36 +00:00
|
|
|
break;
|
|
|
|
case 'J':
|
|
|
|
switch (s->esc_params[0]) {
|
|
|
|
case 0:
|
|
|
|
/* clear to end of screen */
|
|
|
|
for (y = s->y; y < s->height; y++) {
|
|
|
|
for (x = 0; x < s->width; x++) {
|
|
|
|
if (y == s->y && x < s->x) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
console_clear_xy(s, x, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
/* clear from beginning of screen */
|
|
|
|
for (y = 0; y <= s->y; y++) {
|
|
|
|
for (x = 0; x < s->width; x++) {
|
|
|
|
if (y == s->y && x > s->x) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
console_clear_xy(s, x, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
/* clear entire screen */
|
|
|
|
for (y = 0; y <= s->height; y++) {
|
|
|
|
for (x = 0; x < s->width; x++) {
|
|
|
|
console_clear_xy(s, x, y);
|
|
|
|
}
|
|
|
|
}
|
2011-11-22 10:59:06 +00:00
|
|
|
break;
|
2007-01-16 23:02:36 +00:00
|
|
|
}
|
2011-11-22 10:59:07 +00:00
|
|
|
break;
|
2004-07-14 17:28:59 +00:00
|
|
|
case 'K':
|
2007-01-16 23:02:36 +00:00
|
|
|
switch (s->esc_params[0]) {
|
|
|
|
case 0:
|
2011-11-22 10:59:06 +00:00
|
|
|
/* clear to eol */
|
|
|
|
for(x = s->x; x < s->width; x++) {
|
2007-01-16 23:02:36 +00:00
|
|
|
console_clear_xy(s, x, s->y);
|
2011-11-22 10:59:06 +00:00
|
|
|
}
|
|
|
|
break;
|
2007-01-16 23:02:36 +00:00
|
|
|
case 1:
|
|
|
|
/* clear from beginning of line */
|
|
|
|
for (x = 0; x <= s->x; x++) {
|
|
|
|
console_clear_xy(s, x, s->y);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
/* clear entire line */
|
|
|
|
for(x = 0; x < s->width; x++) {
|
|
|
|
console_clear_xy(s, x, s->y);
|
|
|
|
}
|
2011-11-22 10:59:06 +00:00
|
|
|
break;
|
|
|
|
}
|
2007-01-16 23:02:36 +00:00
|
|
|
break;
|
|
|
|
case 'm':
|
2011-11-22 10:59:06 +00:00
|
|
|
console_handle_escape(s);
|
|
|
|
break;
|
2007-01-16 23:02:36 +00:00
|
|
|
case 'n':
|
2016-03-08 19:51:21 +00:00
|
|
|
switch (s->esc_params[0]) {
|
|
|
|
case 5:
|
|
|
|
/* report console status (always succeed)*/
|
|
|
|
console_respond_str(s, "\033[0n");
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
/* report cursor position */
|
|
|
|
sprintf(response, "\033[%d;%dR",
|
|
|
|
(s->y_base + s->y) % s->total_height + 1,
|
|
|
|
s->x + 1);
|
|
|
|
console_respond_str(s, response);
|
|
|
|
break;
|
|
|
|
}
|
2007-01-16 23:02:36 +00:00
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
/* save cursor position */
|
|
|
|
s->x_saved = s->x;
|
|
|
|
s->y_saved = s->y;
|
|
|
|
break;
|
|
|
|
case 'u':
|
|
|
|
/* restore cursor position */
|
|
|
|
s->x = s->x_saved;
|
|
|
|
s->y = s->y_saved;
|
|
|
|
break;
|
|
|
|
default:
|
2013-11-10 15:04:16 +00:00
|
|
|
trace_console_putchar_unhandled(ch);
|
2007-01-16 23:02:36 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void console_select(unsigned int index)
|
|
|
|
{
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s;
|
2006-03-11 15:35:30 +00:00
|
|
|
|
2013-03-07 15:04:52 +00:00
|
|
|
trace_console_select(index);
|
2013-03-15 14:45:54 +00:00
|
|
|
s = qemu_console_lookup_by_index(index);
|
2004-07-14 17:28:59 +00:00
|
|
|
if (s) {
|
2009-01-15 22:14:11 +00:00
|
|
|
DisplayState *ds = s->ds;
|
2012-07-10 20:00:55 +00:00
|
|
|
|
2004-07-14 17:28:59 +00:00
|
|
|
active_console = s;
|
2012-09-28 13:02:08 +00:00
|
|
|
if (ds->have_gfx) {
|
2013-03-15 14:45:54 +00:00
|
|
|
QLIST_FOREACH(dcl, &ds->listeners, next) {
|
|
|
|
if (dcl->con != NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (dcl->ops->dpy_gfx_switch) {
|
|
|
|
dcl->ops->dpy_gfx_switch(dcl, s->surface);
|
|
|
|
}
|
|
|
|
}
|
2013-03-12 13:39:22 +00:00
|
|
|
dpy_gfx_update(s, 0, 0, surface_width(s->surface),
|
|
|
|
surface_height(s->surface));
|
2012-09-28 13:02:08 +00:00
|
|
|
}
|
|
|
|
if (ds->have_text) {
|
2013-03-05 14:24:14 +00:00
|
|
|
dpy_text_resize(s, s->width, s->height);
|
2009-01-21 18:59:12 +00:00
|
|
|
}
|
2014-05-22 09:27:13 +00:00
|
|
|
text_console_update_cursor(NULL);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int console_puts(CharDriverState *chr, const uint8_t *buf, int len)
|
|
|
|
{
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s = chr->opaque;
|
2004-07-14 17:28:59 +00:00
|
|
|
int i;
|
|
|
|
|
2009-01-21 03:02:52 +00:00
|
|
|
s->update_x0 = s->width * FONT_WIDTH;
|
|
|
|
s->update_y0 = s->height * FONT_HEIGHT;
|
|
|
|
s->update_x1 = 0;
|
|
|
|
s->update_y1 = 0;
|
2004-07-14 17:28:59 +00:00
|
|
|
console_show_cursor(s, 0);
|
|
|
|
for(i = 0; i < len; i++) {
|
|
|
|
console_putchar(s, buf[i]);
|
|
|
|
}
|
|
|
|
console_show_cursor(s, 1);
|
2012-09-28 13:02:08 +00:00
|
|
|
if (s->ds->have_gfx && s->update_x0 < s->update_x1) {
|
2013-03-05 14:24:14 +00:00
|
|
|
dpy_gfx_update(s, s->update_x0, s->update_y0,
|
2012-09-28 13:02:08 +00:00
|
|
|
s->update_x1 - s->update_x0,
|
|
|
|
s->update_y1 - s->update_y0);
|
2009-01-21 03:02:52 +00:00
|
|
|
}
|
2004-07-14 17:28:59 +00:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2006-06-25 16:26:29 +00:00
|
|
|
static void kbd_send_chars(void *opaque)
|
|
|
|
{
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s = opaque;
|
2006-06-25 16:26:29 +00:00
|
|
|
int len;
|
|
|
|
uint8_t buf[16];
|
2007-09-17 08:09:54 +00:00
|
|
|
|
2011-08-15 16:17:31 +00:00
|
|
|
len = qemu_chr_be_can_write(s->chr);
|
2006-06-25 16:26:29 +00:00
|
|
|
if (len > s->out_fifo.count)
|
|
|
|
len = s->out_fifo.count;
|
|
|
|
if (len > 0) {
|
|
|
|
if (len > sizeof(buf))
|
|
|
|
len = sizeof(buf);
|
|
|
|
qemu_fifo_read(&s->out_fifo, buf, len);
|
2011-08-15 16:17:30 +00:00
|
|
|
qemu_chr_be_write(s->chr, buf, len);
|
2006-06-25 16:26:29 +00:00
|
|
|
}
|
|
|
|
/* characters are pending: we send them a bit later (XXX:
|
|
|
|
horrible, should change char device API) */
|
|
|
|
if (s->out_fifo.count > 0) {
|
2013-08-21 15:03:08 +00:00
|
|
|
timer_mod(s->kbd_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1);
|
2006-06-25 16:26:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-07-14 17:28:59 +00:00
|
|
|
/* called when an ascii key is pressed */
|
2014-05-22 10:05:52 +00:00
|
|
|
void kbd_put_keysym_console(QemuConsole *s, int keysym)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
|
|
|
uint8_t buf[16], *q;
|
2016-10-22 09:53:01 +00:00
|
|
|
CharBackend *be;
|
2004-07-14 17:28:59 +00:00
|
|
|
int c;
|
|
|
|
|
2007-07-11 23:14:59 +00:00
|
|
|
if (!s || (s->console_type == GRAPHIC_CONSOLE))
|
2004-07-14 17:28:59 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
switch(keysym) {
|
|
|
|
case QEMU_KEY_CTRL_UP:
|
2013-03-14 13:27:08 +00:00
|
|
|
console_scroll(s, -1);
|
2004-07-14 17:28:59 +00:00
|
|
|
break;
|
|
|
|
case QEMU_KEY_CTRL_DOWN:
|
2013-03-14 13:27:08 +00:00
|
|
|
console_scroll(s, 1);
|
2004-07-14 17:28:59 +00:00
|
|
|
break;
|
|
|
|
case QEMU_KEY_CTRL_PAGEUP:
|
2013-03-14 13:27:08 +00:00
|
|
|
console_scroll(s, -10);
|
2004-07-14 17:28:59 +00:00
|
|
|
break;
|
|
|
|
case QEMU_KEY_CTRL_PAGEDOWN:
|
2013-03-14 13:27:08 +00:00
|
|
|
console_scroll(s, 10);
|
2004-07-14 17:28:59 +00:00
|
|
|
break;
|
|
|
|
default:
|
2006-06-25 16:26:29 +00:00
|
|
|
/* convert the QEMU keysym to VT100 key string */
|
|
|
|
q = buf;
|
|
|
|
if (keysym >= 0xe100 && keysym <= 0xe11f) {
|
|
|
|
*q++ = '\033';
|
|
|
|
*q++ = '[';
|
|
|
|
c = keysym - 0xe100;
|
|
|
|
if (c >= 10)
|
|
|
|
*q++ = '0' + (c / 10);
|
|
|
|
*q++ = '0' + (c % 10);
|
|
|
|
*q++ = '~';
|
|
|
|
} else if (keysym >= 0xe120 && keysym <= 0xe17f) {
|
|
|
|
*q++ = '\033';
|
|
|
|
*q++ = '[';
|
|
|
|
*q++ = keysym & 0xff;
|
2010-12-23 12:42:52 +00:00
|
|
|
} else if (s->echo && (keysym == '\r' || keysym == '\n')) {
|
|
|
|
console_puts(s->chr, (const uint8_t *) "\r", 1);
|
|
|
|
*q++ = '\n';
|
2006-06-25 16:26:29 +00:00
|
|
|
} else {
|
2010-12-23 12:42:52 +00:00
|
|
|
*q++ = keysym;
|
|
|
|
}
|
|
|
|
if (s->echo) {
|
|
|
|
console_puts(s->chr, buf, q - buf);
|
2006-06-25 16:26:29 +00:00
|
|
|
}
|
2016-10-22 09:53:01 +00:00
|
|
|
be = s->chr->be;
|
|
|
|
if (be && be->chr_read) {
|
2006-06-25 16:26:29 +00:00
|
|
|
qemu_fifo_write(&s->out_fifo, buf, q - buf);
|
|
|
|
kbd_send_chars(s);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
qapi: Don't let implicit enum MAX member collide
Now that we guarantee the user doesn't have any enum values
beginning with a single underscore, we can use that for our
own purposes. Renaming ENUM_MAX to ENUM__MAX makes it obvious
that the sentinel is generated.
This patch was mostly generated by applying a temporary patch:
|diff --git a/scripts/qapi.py b/scripts/qapi.py
|index e6d014b..b862ec9 100644
|--- a/scripts/qapi.py
|+++ b/scripts/qapi.py
|@@ -1570,6 +1570,7 @@ const char *const %(c_name)s_lookup[] = {
| max_index = c_enum_const(name, 'MAX', prefix)
| ret += mcgen('''
| [%(max_index)s] = NULL,
|+// %(max_index)s
| };
| ''',
| max_index=max_index)
then running:
$ cat qapi-{types,event}.c tests/test-qapi-types.c |
sed -n 's,^// \(.*\)MAX,s|\1MAX|\1_MAX|g,p' > list
$ git grep -l _MAX | xargs sed -i -f list
The only things not generated are the changes in scripts/qapi.py.
Rejecting enum members named 'MAX' is now useless, and will be dropped
in the next patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-11-18 08:52:57 +00:00
|
|
|
static const int qcode_to_keysym[Q_KEY_CODE__MAX] = {
|
2014-05-27 07:28:38 +00:00
|
|
|
[Q_KEY_CODE_UP] = QEMU_KEY_UP,
|
|
|
|
[Q_KEY_CODE_DOWN] = QEMU_KEY_DOWN,
|
|
|
|
[Q_KEY_CODE_RIGHT] = QEMU_KEY_RIGHT,
|
|
|
|
[Q_KEY_CODE_LEFT] = QEMU_KEY_LEFT,
|
|
|
|
[Q_KEY_CODE_HOME] = QEMU_KEY_HOME,
|
|
|
|
[Q_KEY_CODE_END] = QEMU_KEY_END,
|
|
|
|
[Q_KEY_CODE_PGUP] = QEMU_KEY_PAGEUP,
|
|
|
|
[Q_KEY_CODE_PGDN] = QEMU_KEY_PAGEDOWN,
|
|
|
|
[Q_KEY_CODE_DELETE] = QEMU_KEY_DELETE,
|
2016-08-11 07:21:00 +00:00
|
|
|
[Q_KEY_CODE_BACKSPACE] = QEMU_KEY_BACKSPACE,
|
2014-05-27 07:28:38 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
bool kbd_put_qcode_console(QemuConsole *s, int qcode)
|
|
|
|
{
|
|
|
|
int keysym;
|
|
|
|
|
|
|
|
keysym = qcode_to_keysym[qcode];
|
|
|
|
if (keysym == 0) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
kbd_put_keysym_console(s, keysym);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-05-27 07:32:36 +00:00
|
|
|
void kbd_put_string_console(QemuConsole *s, const char *str, int len)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < len && str[i]; i++) {
|
|
|
|
kbd_put_keysym_console(s, str[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-22 10:05:52 +00:00
|
|
|
void kbd_put_keysym(int keysym)
|
|
|
|
{
|
|
|
|
kbd_put_keysym_console(active_console, keysym);
|
|
|
|
}
|
|
|
|
|
2008-02-10 16:33:14 +00:00
|
|
|
static void text_console_invalidate(void *opaque)
|
|
|
|
{
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s = (QemuConsole *) opaque;
|
2013-03-06 12:40:47 +00:00
|
|
|
|
|
|
|
if (s->ds->have_text && s->console_type == TEXT_CONSOLE) {
|
2009-01-21 18:59:12 +00:00
|
|
|
text_console_resize(s);
|
|
|
|
}
|
2008-02-10 16:33:14 +00:00
|
|
|
console_refresh(s);
|
|
|
|
}
|
|
|
|
|
2009-10-01 21:12:16 +00:00
|
|
|
static void text_console_update(void *opaque, console_ch_t *chardata)
|
2008-02-10 16:33:14 +00:00
|
|
|
{
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s = (QemuConsole *) opaque;
|
2008-02-10 16:33:14 +00:00
|
|
|
int i, j, src;
|
|
|
|
|
|
|
|
if (s->text_x[0] <= s->text_x[1]) {
|
|
|
|
src = (s->y_base + s->text_y[0]) * s->width;
|
|
|
|
chardata += s->text_y[0] * s->width;
|
|
|
|
for (i = s->text_y[0]; i <= s->text_y[1]; i ++)
|
2015-11-29 13:28:24 +00:00
|
|
|
for (j = 0; j < s->width; j++, src++) {
|
|
|
|
console_write_ch(chardata ++,
|
|
|
|
ATTR2CHTYPE(s->cells[src].ch,
|
|
|
|
s->cells[src].t_attrib.fgcol,
|
|
|
|
s->cells[src].t_attrib.bgcol,
|
|
|
|
s->cells[src].t_attrib.bold));
|
|
|
|
}
|
2013-03-05 14:24:14 +00:00
|
|
|
dpy_text_update(s, s->text_x[0], s->text_y[0],
|
2012-09-28 13:02:08 +00:00
|
|
|
s->text_x[1] - s->text_x[0], i - s->text_y[0]);
|
2008-02-10 16:33:14 +00:00
|
|
|
s->text_x[0] = s->width;
|
|
|
|
s->text_y[0] = s->height;
|
|
|
|
s->text_x[1] = 0;
|
|
|
|
s->text_y[1] = 0;
|
|
|
|
}
|
|
|
|
if (s->cursor_invalidate) {
|
2013-03-05 14:24:14 +00:00
|
|
|
dpy_text_cursor(s, s->x, s->y);
|
2008-02-10 16:33:14 +00:00
|
|
|
s->cursor_invalidate = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-24 14:15:58 +00:00
|
|
|
static QemuConsole *new_console(DisplayState *ds, console_type_t console_type,
|
|
|
|
uint32_t head)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
2013-04-17 07:45:10 +00:00
|
|
|
Object *obj;
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s;
|
2006-04-09 01:06:34 +00:00
|
|
|
int i;
|
2004-07-14 17:28:59 +00:00
|
|
|
|
2013-04-17 07:45:10 +00:00
|
|
|
obj = object_new(TYPE_QEMU_CONSOLE);
|
|
|
|
s = QEMU_CONSOLE(obj);
|
2014-04-24 14:15:58 +00:00
|
|
|
s->head = head;
|
2013-04-17 08:21:27 +00:00
|
|
|
object_property_add_link(obj, "device", TYPE_DEVICE,
|
qom: Make QOM link property unref optional
Some object_property_add_link() callers expect property deletion to
unref the link property object. Other callers expect to manage the
refcount themselves. The former are currently broken and therefore leak
the link property object.
This patch adds a flags argument to object_property_add_link() so the
caller can specify which refcount behavior they require. The new
OBJ_PROP_LINK_UNREF_ON_RELEASE flag causes the link pointer to be
unreferenced when the property is deleted.
This fixes refcount leaks in qdev.c, xilinx_axidma.c, xilinx_axienet.c,
s390-virtio-bus.c, virtio-pci.c, virtio-rng.c, and ui/console.c.
Rationale for refcount behavior:
* hw/core/qdev.c
- bus children are explicitly unreferenced, don't interfere
- parent_bus is essentially a read-only property that doesn't hold a
refcount, don't unref
- hotplug_handler is leaked, do unref
* hw/dma/xilinx_axidma.c
- rx stream "dma" links are set using set_link, therefore they
need unref
- tx streams are set using set_link, therefore they need unref
* hw/net/xilinx_axienet.c
- same reasoning as hw/dma/xilinx_axidma.c
* hw/pcmcia/pxa2xx.c
- pxa2xx bypasses set_link and therefore does not use refcounts
* hw/s390x/s390-virtio-bus.c
* hw/virtio/virtio-pci.c
* hw/virtio/virtio-rng.c
* ui/console.c
- set_link is used and there is no explicit unref, do unref
Cc: Peter Crosthwaite <peter.crosthwaite@petalogix.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: Anthony Liguori <aliguori@amazon.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2014-03-19 07:58:55 +00:00
|
|
|
(Object **)&s->device,
|
2014-03-19 07:58:56 +00:00
|
|
|
object_property_allow_set_link,
|
qom: Make QOM link property unref optional
Some object_property_add_link() callers expect property deletion to
unref the link property object. Other callers expect to manage the
refcount themselves. The former are currently broken and therefore leak
the link property object.
This patch adds a flags argument to object_property_add_link() so the
caller can specify which refcount behavior they require. The new
OBJ_PROP_LINK_UNREF_ON_RELEASE flag causes the link pointer to be
unreferenced when the property is deleted.
This fixes refcount leaks in qdev.c, xilinx_axidma.c, xilinx_axienet.c,
s390-virtio-bus.c, virtio-pci.c, virtio-rng.c, and ui/console.c.
Rationale for refcount behavior:
* hw/core/qdev.c
- bus children are explicitly unreferenced, don't interfere
- parent_bus is essentially a read-only property that doesn't hold a
refcount, don't unref
- hotplug_handler is leaked, do unref
* hw/dma/xilinx_axidma.c
- rx stream "dma" links are set using set_link, therefore they
need unref
- tx streams are set using set_link, therefore they need unref
* hw/net/xilinx_axienet.c
- same reasoning as hw/dma/xilinx_axidma.c
* hw/pcmcia/pxa2xx.c
- pxa2xx bypasses set_link and therefore does not use refcounts
* hw/s390x/s390-virtio-bus.c
* hw/virtio/virtio-pci.c
* hw/virtio/virtio-rng.c
* ui/console.c
- set_link is used and there is no explicit unref, do unref
Cc: Peter Crosthwaite <peter.crosthwaite@petalogix.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: Anthony Liguori <aliguori@amazon.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2014-03-19 07:58:55 +00:00
|
|
|
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
2014-04-24 14:15:58 +00:00
|
|
|
&error_abort);
|
2014-01-24 14:35:21 +00:00
|
|
|
object_property_add_uint32_ptr(obj, "head",
|
2014-04-24 14:15:58 +00:00
|
|
|
&s->head, &error_abort);
|
2013-04-17 08:21:27 +00:00
|
|
|
|
2007-07-11 23:14:59 +00:00
|
|
|
if (!active_console || ((active_console->console_type != GRAPHIC_CONSOLE) &&
|
|
|
|
(console_type == GRAPHIC_CONSOLE))) {
|
2004-07-14 17:28:59 +00:00
|
|
|
active_console = s;
|
2007-07-11 23:14:59 +00:00
|
|
|
}
|
2004-07-14 17:28:59 +00:00
|
|
|
s->ds = ds;
|
2007-07-11 23:14:59 +00:00
|
|
|
s->console_type = console_type;
|
2014-05-26 08:36:35 +00:00
|
|
|
|
|
|
|
consoles = g_realloc(consoles, sizeof(*consoles) * (nb_consoles+1));
|
2007-07-11 23:14:59 +00:00
|
|
|
if (console_type != GRAPHIC_CONSOLE) {
|
2011-09-15 22:48:07 +00:00
|
|
|
s->index = nb_consoles;
|
2006-04-09 01:06:34 +00:00
|
|
|
consoles[nb_consoles++] = s;
|
|
|
|
} else {
|
|
|
|
/* HACK: Put graphical consoles before text consoles. */
|
|
|
|
for (i = nb_consoles; i > 0; i--) {
|
2007-07-11 23:14:59 +00:00
|
|
|
if (consoles[i - 1]->console_type == GRAPHIC_CONSOLE)
|
2006-04-09 01:06:34 +00:00
|
|
|
break;
|
|
|
|
consoles[i] = consoles[i - 1];
|
2011-09-15 22:48:07 +00:00
|
|
|
consoles[i]->index = i;
|
2006-04-09 01:06:34 +00:00
|
|
|
}
|
2011-09-15 22:48:07 +00:00
|
|
|
s->index = i;
|
2006-04-09 01:06:34 +00:00
|
|
|
consoles[i] = s;
|
2009-01-16 19:04:14 +00:00
|
|
|
nb_consoles++;
|
2006-04-09 01:06:34 +00:00
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2014-06-18 09:03:15 +00:00
|
|
|
static void qemu_alloc_display(DisplaySurface *surface, int width, int height)
|
2011-03-16 12:33:30 +00:00
|
|
|
{
|
2012-09-26 13:20:05 +00:00
|
|
|
qemu_pixman_image_unref(surface->image);
|
|
|
|
surface->image = NULL;
|
|
|
|
|
2014-06-18 09:03:15 +00:00
|
|
|
surface->format = PIXMAN_x8r8g8b8;
|
2012-09-26 13:20:05 +00:00
|
|
|
surface->image = pixman_image_create_bits(surface->format,
|
|
|
|
width, height,
|
2014-06-18 09:03:15 +00:00
|
|
|
NULL, width * 4);
|
2012-09-26 13:20:05 +00:00
|
|
|
assert(surface->image != NULL);
|
|
|
|
|
2014-06-18 09:03:15 +00:00
|
|
|
surface->flags = QEMU_ALLOCATED_FLAG;
|
2010-02-10 23:29:57 +00:00
|
|
|
}
|
|
|
|
|
2013-02-28 09:48:02 +00:00
|
|
|
DisplaySurface *qemu_create_displaysurface(int width, int height)
|
2012-09-27 09:06:36 +00:00
|
|
|
{
|
|
|
|
DisplaySurface *surface = g_new0(DisplaySurface, 1);
|
2013-02-28 09:48:02 +00:00
|
|
|
|
|
|
|
trace_displaysurface_create(surface, width, height);
|
2014-06-18 09:03:15 +00:00
|
|
|
qemu_alloc_display(surface, width, height);
|
2012-09-27 09:06:36 +00:00
|
|
|
return surface;
|
|
|
|
}
|
|
|
|
|
2014-06-18 09:03:15 +00:00
|
|
|
DisplaySurface *qemu_create_displaysurface_from(int width, int height,
|
|
|
|
pixman_format_code_t format,
|
|
|
|
int linesize, uint8_t *data)
|
2010-02-10 23:29:57 +00:00
|
|
|
{
|
2012-09-26 13:20:05 +00:00
|
|
|
DisplaySurface *surface = g_new0(DisplaySurface, 1);
|
2010-02-10 23:29:57 +00:00
|
|
|
|
2014-06-18 09:03:15 +00:00
|
|
|
trace_displaysurface_create_from(surface, width, height, format);
|
|
|
|
surface->format = format;
|
2012-09-26 13:20:05 +00:00
|
|
|
surface->image = pixman_image_create_bits(surface->format,
|
|
|
|
width, height,
|
|
|
|
(void *)data, linesize);
|
|
|
|
assert(surface->image != NULL);
|
|
|
|
|
2010-02-10 23:29:57 +00:00
|
|
|
return surface;
|
|
|
|
}
|
|
|
|
|
2016-04-01 08:27:20 +00:00
|
|
|
DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image)
|
|
|
|
{
|
|
|
|
DisplaySurface *surface = g_new0(DisplaySurface, 1);
|
|
|
|
|
|
|
|
trace_displaysurface_create_pixman(surface);
|
|
|
|
surface->format = pixman_image_get_format(image);
|
|
|
|
surface->image = pixman_image_ref(image);
|
|
|
|
|
|
|
|
return surface;
|
|
|
|
}
|
|
|
|
|
2014-06-19 06:46:08 +00:00
|
|
|
static void qemu_unmap_displaysurface_guestmem(pixman_image_t *image,
|
|
|
|
void *unused)
|
|
|
|
{
|
|
|
|
void *data = pixman_image_get_data(image);
|
|
|
|
uint32_t size = pixman_image_get_stride(image) *
|
|
|
|
pixman_image_get_height(image);
|
|
|
|
cpu_physical_memory_unmap(data, size, 0, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height,
|
|
|
|
pixman_format_code_t format,
|
|
|
|
int linesize, uint64_t addr)
|
|
|
|
{
|
|
|
|
DisplaySurface *surface;
|
|
|
|
hwaddr size;
|
|
|
|
void *data;
|
|
|
|
|
|
|
|
if (linesize == 0) {
|
|
|
|
linesize = width * PIXMAN_FORMAT_BPP(format) / 8;
|
|
|
|
}
|
|
|
|
|
2015-03-11 08:21:00 +00:00
|
|
|
size = (hwaddr)linesize * height;
|
2014-06-19 06:46:08 +00:00
|
|
|
data = cpu_physical_memory_map(addr, &size, 0);
|
2015-03-11 08:21:00 +00:00
|
|
|
if (size != (hwaddr)linesize * height) {
|
2014-06-19 06:46:08 +00:00
|
|
|
cpu_physical_memory_unmap(data, size, 0, 0);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
surface = qemu_create_displaysurface_from
|
|
|
|
(width, height, format, linesize, data);
|
|
|
|
pixman_image_set_destroy_function
|
|
|
|
(surface->image, qemu_unmap_displaysurface_guestmem, NULL);
|
|
|
|
|
|
|
|
return surface;
|
|
|
|
}
|
|
|
|
|
2013-04-25 10:10:45 +00:00
|
|
|
static DisplaySurface *qemu_create_message_surface(int w, int h,
|
|
|
|
const char *msg)
|
2013-04-25 07:33:19 +00:00
|
|
|
{
|
2013-04-25 10:10:45 +00:00
|
|
|
DisplaySurface *surface = qemu_create_displaysurface(w, h);
|
2015-11-29 13:28:24 +00:00
|
|
|
pixman_color_t bg = color_table_rgb[0][QEMU_COLOR_BLACK];
|
|
|
|
pixman_color_t fg = color_table_rgb[0][QEMU_COLOR_WHITE];
|
2013-04-25 07:33:19 +00:00
|
|
|
pixman_image_t *glyph;
|
|
|
|
int len, x, y, i;
|
|
|
|
|
|
|
|
len = strlen(msg);
|
2013-04-25 10:10:45 +00:00
|
|
|
x = (w / FONT_WIDTH - len) / 2;
|
|
|
|
y = (h / FONT_HEIGHT - 1) / 2;
|
2013-04-25 07:33:19 +00:00
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
glyph = qemu_pixman_glyph_from_vgafont(FONT_HEIGHT, vgafont16, msg[i]);
|
|
|
|
qemu_pixman_glyph_render(glyph, surface->image, &fg, &bg,
|
|
|
|
x+i, y, FONT_WIDTH, FONT_HEIGHT);
|
|
|
|
qemu_pixman_image_unref(glyph);
|
|
|
|
}
|
|
|
|
return surface;
|
|
|
|
}
|
|
|
|
|
2013-02-28 09:48:02 +00:00
|
|
|
void qemu_free_displaysurface(DisplaySurface *surface)
|
2010-02-10 23:29:57 +00:00
|
|
|
{
|
2013-02-28 09:48:02 +00:00
|
|
|
if (surface == NULL) {
|
2010-02-10 23:29:57 +00:00
|
|
|
return;
|
2012-09-26 05:46:20 +00:00
|
|
|
}
|
2013-02-28 09:48:02 +00:00
|
|
|
trace_displaysurface_free(surface);
|
|
|
|
qemu_pixman_image_unref(surface->image);
|
|
|
|
g_free(surface);
|
2010-02-10 23:29:57 +00:00
|
|
|
}
|
|
|
|
|
2014-07-11 11:56:51 +00:00
|
|
|
bool console_has_gl(QemuConsole *con)
|
|
|
|
{
|
|
|
|
return con->gl != NULL;
|
|
|
|
}
|
|
|
|
|
2013-04-23 13:44:31 +00:00
|
|
|
void register_displaychangelistener(DisplayChangeListener *dcl)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-04-25 10:10:45 +00:00
|
|
|
static const char nodev[] =
|
|
|
|
"This VM has no graphic display device.";
|
2013-04-25 07:33:19 +00:00
|
|
|
static DisplaySurface *dummy;
|
2013-03-15 14:45:54 +00:00
|
|
|
QemuConsole *con;
|
|
|
|
|
2014-07-11 11:56:51 +00:00
|
|
|
if (dcl->ops->dpy_gl_ctx_create) {
|
|
|
|
/* display has opengl support */
|
|
|
|
assert(dcl->con);
|
|
|
|
if (dcl->con->gl) {
|
|
|
|
fprintf(stderr, "can't register two opengl displays (%s, %s)\n",
|
|
|
|
dcl->ops->dpy_name, dcl->con->gl->ops->dpy_name);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
dcl->con->gl = dcl;
|
|
|
|
}
|
|
|
|
|
2012-11-13 13:51:41 +00:00
|
|
|
trace_displaychangelistener_register(dcl, dcl->ops->dpy_name);
|
2013-04-23 13:44:31 +00:00
|
|
|
dcl->ds = get_alloc_displaystate();
|
|
|
|
QLIST_INSERT_HEAD(&dcl->ds->listeners, dcl, next);
|
|
|
|
gui_setup_refresh(dcl->ds);
|
2013-03-15 14:45:54 +00:00
|
|
|
if (dcl->con) {
|
|
|
|
dcl->con->dcls++;
|
|
|
|
con = dcl->con;
|
|
|
|
} else {
|
|
|
|
con = active_console;
|
|
|
|
}
|
2013-04-25 07:33:19 +00:00
|
|
|
if (dcl->ops->dpy_gfx_switch) {
|
|
|
|
if (con) {
|
|
|
|
dcl->ops->dpy_gfx_switch(dcl, con->surface);
|
|
|
|
} else {
|
|
|
|
if (!dummy) {
|
2013-04-25 10:10:45 +00:00
|
|
|
dummy = qemu_create_message_surface(640, 480, nodev);
|
2013-04-25 07:33:19 +00:00
|
|
|
}
|
|
|
|
dcl->ops->dpy_gfx_switch(dcl, dummy);
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
2014-05-22 09:27:13 +00:00
|
|
|
text_console_update_cursor(NULL);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
|
2013-03-14 10:56:16 +00:00
|
|
|
void update_displaychangelistener(DisplayChangeListener *dcl,
|
|
|
|
uint64_t interval)
|
|
|
|
{
|
|
|
|
DisplayState *ds = dcl->ds;
|
|
|
|
|
|
|
|
dcl->update_interval = interval;
|
|
|
|
if (!ds->refreshing && ds->update_interval > interval) {
|
2013-08-21 15:03:08 +00:00
|
|
|
timer_mod(ds->gui_timer, ds->last_update + interval);
|
2013-03-14 10:56:16 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-13 13:51:41 +00:00
|
|
|
void unregister_displaychangelistener(DisplayChangeListener *dcl)
|
|
|
|
{
|
|
|
|
DisplayState *ds = dcl->ds;
|
|
|
|
trace_displaychangelistener_unregister(dcl, dcl->ops->dpy_name);
|
2013-03-15 14:45:54 +00:00
|
|
|
if (dcl->con) {
|
|
|
|
dcl->con->dcls--;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_REMOVE(dcl, next);
|
|
|
|
gui_setup_refresh(ds);
|
|
|
|
}
|
|
|
|
|
2015-03-12 11:51:13 +00:00
|
|
|
static void dpy_set_ui_info_timer(void *opaque)
|
|
|
|
{
|
|
|
|
QemuConsole *con = opaque;
|
|
|
|
|
|
|
|
con->hw_ops->ui_info(con->hw, con->head, &con->ui_info);
|
|
|
|
}
|
|
|
|
|
2015-03-13 11:21:14 +00:00
|
|
|
bool dpy_ui_info_supported(QemuConsole *con)
|
|
|
|
{
|
|
|
|
return con->hw_ops->ui_info != NULL;
|
|
|
|
}
|
|
|
|
|
2014-01-24 16:38:20 +00:00
|
|
|
int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info)
|
|
|
|
{
|
|
|
|
assert(con != NULL);
|
2016-05-30 08:41:13 +00:00
|
|
|
|
2015-03-13 11:21:14 +00:00
|
|
|
if (!dpy_ui_info_supported(con)) {
|
2015-03-12 11:51:13 +00:00
|
|
|
return -1;
|
2014-01-24 16:38:20 +00:00
|
|
|
}
|
2016-05-30 08:41:13 +00:00
|
|
|
if (memcmp(&con->ui_info, info, sizeof(con->ui_info)) == 0) {
|
|
|
|
/* nothing changed -- ignore */
|
|
|
|
return 0;
|
|
|
|
}
|
2015-03-12 11:51:13 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Typically we get a flood of these as the user resizes the window.
|
|
|
|
* Wait until the dust has settled (one second without updates), then
|
|
|
|
* go notify the guest.
|
|
|
|
*/
|
2016-05-30 08:41:13 +00:00
|
|
|
con->ui_info = *info;
|
2015-03-12 11:51:13 +00:00
|
|
|
timer_mod(con->ui_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1000);
|
|
|
|
return 0;
|
2014-01-24 16:38:20 +00:00
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void dpy_gfx_update(QemuConsole *con, int x, int y, int w, int h)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplayState *s = con->ds;
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2014-07-11 11:56:51 +00:00
|
|
|
int width = w;
|
|
|
|
int height = h;
|
2012-11-13 13:51:41 +00:00
|
|
|
|
2014-07-11 11:56:51 +00:00
|
|
|
if (con->surface) {
|
|
|
|
width = surface_width(con->surface);
|
|
|
|
height = surface_height(con->surface);
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
x = MAX(x, 0);
|
|
|
|
y = MAX(y, 0);
|
|
|
|
x = MIN(x, width);
|
|
|
|
y = MIN(y, height);
|
|
|
|
w = MIN(w, width - x);
|
|
|
|
h = MIN(h, height - y);
|
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
if (!qemu_console_is_visible(con)) {
|
2013-03-12 13:39:22 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
2013-03-15 14:45:54 +00:00
|
|
|
if (con != (dcl->con ? dcl->con : active_console)) {
|
|
|
|
continue;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
if (dcl->ops->dpy_gfx_update) {
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_gfx_update(dcl, x, y, w, h);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-12 13:39:22 +00:00
|
|
|
void dpy_gfx_replace_surface(QemuConsole *con,
|
|
|
|
DisplaySurface *surface)
|
|
|
|
{
|
|
|
|
DisplayState *s = con->ds;
|
|
|
|
DisplaySurface *old_surface = con->surface;
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2013-03-12 13:39:22 +00:00
|
|
|
|
|
|
|
con->surface = surface;
|
2013-03-15 14:45:54 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
|
|
|
if (con != (dcl->con ? dcl->con : active_console)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (dcl->ops->dpy_gfx_switch) {
|
|
|
|
dcl->ops->dpy_gfx_switch(dcl, surface);
|
|
|
|
}
|
2013-03-12 13:39:22 +00:00
|
|
|
}
|
2013-02-28 09:48:02 +00:00
|
|
|
qemu_free_displaysurface(old_surface);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
|
2014-07-07 06:39:05 +00:00
|
|
|
bool dpy_gfx_check_format(QemuConsole *con,
|
|
|
|
pixman_format_code_t format)
|
|
|
|
{
|
|
|
|
DisplayChangeListener *dcl;
|
|
|
|
DisplayState *s = con->ds;
|
|
|
|
|
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
|
|
|
if (dcl->con && dcl->con != con) {
|
|
|
|
/* dcl bound to another console -> skip */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (dcl->ops->dpy_gfx_check_format) {
|
|
|
|
if (!dcl->ops->dpy_gfx_check_format(dcl, format)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* default is to whitelist native 32 bpp only */
|
|
|
|
if (format != qemu_default_pixman_format(32, true)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-05-02 20:48:30 +00:00
|
|
|
static void dpy_refresh(DisplayState *s)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
|
|
|
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
|
|
|
if (dcl->ops->dpy_refresh) {
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_refresh(dcl);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void dpy_gfx_copy(QemuConsole *con, int src_x, int src_y,
|
|
|
|
int dst_x, int dst_y, int w, int h)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplayState *s = con->ds;
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2013-03-12 13:39:22 +00:00
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
if (!qemu_console_is_visible(con)) {
|
2013-03-12 13:39:22 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
2013-03-15 14:45:54 +00:00
|
|
|
if (con != (dcl->con ? dcl->con : active_console)) {
|
|
|
|
continue;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
if (dcl->ops->dpy_gfx_copy) {
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_gfx_copy(dcl, src_x, src_y, dst_x, dst_y, w, h);
|
2012-11-13 13:51:41 +00:00
|
|
|
} else { /* TODO */
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_gfx_update(dcl, dst_x, dst_y, w, h);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void dpy_text_cursor(QemuConsole *con, int x, int y)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplayState *s = con->ds;
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2013-03-12 13:39:22 +00:00
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
if (!qemu_console_is_visible(con)) {
|
2013-03-12 13:39:22 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
2013-03-15 14:45:54 +00:00
|
|
|
if (con != (dcl->con ? dcl->con : active_console)) {
|
|
|
|
continue;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
if (dcl->ops->dpy_text_cursor) {
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_text_cursor(dcl, x, y);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void dpy_text_update(QemuConsole *con, int x, int y, int w, int h)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplayState *s = con->ds;
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2013-03-12 13:39:22 +00:00
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
if (!qemu_console_is_visible(con)) {
|
2013-03-12 13:39:22 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
2013-03-15 14:45:54 +00:00
|
|
|
if (con != (dcl->con ? dcl->con : active_console)) {
|
|
|
|
continue;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
if (dcl->ops->dpy_text_update) {
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_text_update(dcl, x, y, w, h);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void dpy_text_resize(QemuConsole *con, int w, int h)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplayState *s = con->ds;
|
2015-04-08 18:04:13 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2013-03-12 13:39:22 +00:00
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
if (!qemu_console_is_visible(con)) {
|
2013-03-12 13:39:22 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
2013-03-15 14:45:54 +00:00
|
|
|
if (con != (dcl->con ? dcl->con : active_console)) {
|
|
|
|
continue;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
if (dcl->ops->dpy_text_resize) {
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_text_resize(dcl, w, h);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void dpy_mouse_set(QemuConsole *con, int x, int y, int on)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplayState *s = con->ds;
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2013-03-12 13:39:22 +00:00
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
if (!qemu_console_is_visible(con)) {
|
2013-03-12 13:39:22 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
2013-03-15 14:45:54 +00:00
|
|
|
if (con != (dcl->con ? dcl->con : active_console)) {
|
|
|
|
continue;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
if (dcl->ops->dpy_mouse_set) {
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_mouse_set(dcl, x, y, on);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void dpy_cursor_define(QemuConsole *con, QEMUCursor *cursor)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplayState *s = con->ds;
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
2013-03-12 13:39:22 +00:00
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
if (!qemu_console_is_visible(con)) {
|
2013-03-12 13:39:22 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
2013-03-15 14:45:54 +00:00
|
|
|
if (con != (dcl->con ? dcl->con : active_console)) {
|
|
|
|
continue;
|
|
|
|
}
|
2012-11-13 13:51:41 +00:00
|
|
|
if (dcl->ops->dpy_cursor_define) {
|
2013-03-01 12:03:04 +00:00
|
|
|
dcl->ops->dpy_cursor_define(dcl, cursor);
|
2012-11-13 13:51:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
bool dpy_cursor_define_supported(QemuConsole *con)
|
2012-11-13 13:51:41 +00:00
|
|
|
{
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplayState *s = con->ds;
|
2013-03-15 14:45:54 +00:00
|
|
|
DisplayChangeListener *dcl;
|
|
|
|
|
2012-11-13 13:51:41 +00:00
|
|
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
|
|
|
if (dcl->ops->dpy_cursor_define) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-07-11 11:56:51 +00:00
|
|
|
QEMUGLContext dpy_gl_ctx_create(QemuConsole *con,
|
|
|
|
struct QEMUGLParams *qparams)
|
|
|
|
{
|
|
|
|
assert(con->gl);
|
|
|
|
return con->gl->ops->dpy_gl_ctx_create(con->gl, qparams);
|
|
|
|
}
|
|
|
|
|
|
|
|
void dpy_gl_ctx_destroy(QemuConsole *con, QEMUGLContext ctx)
|
|
|
|
{
|
|
|
|
assert(con->gl);
|
|
|
|
con->gl->ops->dpy_gl_ctx_destroy(con->gl, ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx)
|
|
|
|
{
|
|
|
|
assert(con->gl);
|
|
|
|
return con->gl->ops->dpy_gl_ctx_make_current(con->gl, ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
QEMUGLContext dpy_gl_ctx_get_current(QemuConsole *con)
|
|
|
|
{
|
|
|
|
assert(con->gl);
|
|
|
|
return con->gl->ops->dpy_gl_ctx_get_current(con->gl);
|
|
|
|
}
|
|
|
|
|
|
|
|
void dpy_gl_scanout(QemuConsole *con,
|
|
|
|
uint32_t backing_id, bool backing_y_0_top,
|
2016-06-14 13:44:09 +00:00
|
|
|
uint32_t backing_width, uint32_t backing_height,
|
2014-07-11 11:56:51 +00:00
|
|
|
uint32_t x, uint32_t y, uint32_t width, uint32_t height)
|
|
|
|
{
|
|
|
|
assert(con->gl);
|
|
|
|
con->gl->ops->dpy_gl_scanout(con->gl, backing_id,
|
|
|
|
backing_y_0_top,
|
2016-06-14 13:44:09 +00:00
|
|
|
backing_width, backing_height,
|
2014-07-11 11:56:51 +00:00
|
|
|
x, y, width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
void dpy_gl_update(QemuConsole *con,
|
|
|
|
uint32_t x, uint32_t y, uint32_t w, uint32_t h)
|
|
|
|
{
|
|
|
|
assert(con->gl);
|
|
|
|
con->gl->ops->dpy_gl_update(con->gl, x, y, w, h);
|
|
|
|
}
|
|
|
|
|
2010-02-10 23:29:57 +00:00
|
|
|
/***********************************************************/
|
|
|
|
/* register display */
|
|
|
|
|
2013-03-07 16:08:29 +00:00
|
|
|
/* console.c internal use only */
|
|
|
|
static DisplayState *get_alloc_displaystate(void)
|
2010-02-10 23:29:57 +00:00
|
|
|
{
|
2013-03-07 16:08:29 +00:00
|
|
|
if (!display_state) {
|
|
|
|
display_state = g_new0(DisplayState, 1);
|
2014-05-22 09:27:13 +00:00
|
|
|
cursor_timer = timer_new_ms(QEMU_CLOCK_REALTIME,
|
|
|
|
text_console_update_cursor, NULL);
|
2013-03-07 16:08:29 +00:00
|
|
|
}
|
|
|
|
return display_state;
|
2010-02-10 23:29:57 +00:00
|
|
|
}
|
|
|
|
|
2013-03-07 16:08:29 +00:00
|
|
|
/*
|
|
|
|
* Called by main(), after creating QemuConsoles
|
|
|
|
* and before initializing ui (sdl/vnc/...).
|
|
|
|
*/
|
|
|
|
DisplayState *init_displaystate(void)
|
2010-02-10 23:29:57 +00:00
|
|
|
{
|
2013-06-25 08:49:31 +00:00
|
|
|
gchar *name;
|
2013-03-07 16:08:29 +00:00
|
|
|
int i;
|
|
|
|
|
2014-06-02 12:07:18 +00:00
|
|
|
get_alloc_displaystate();
|
2013-03-07 16:08:29 +00:00
|
|
|
for (i = 0; i < nb_consoles; i++) {
|
|
|
|
if (consoles[i]->console_type != GRAPHIC_CONSOLE &&
|
|
|
|
consoles[i]->ds == NULL) {
|
|
|
|
text_console_do_init(consoles[i]->chr, display_state);
|
|
|
|
}
|
2013-06-25 08:49:31 +00:00
|
|
|
|
|
|
|
/* Hook up into the qom tree here (not in new_console()), once
|
|
|
|
* all QemuConsoles are created and the order / numbering
|
|
|
|
* doesn't change any more */
|
|
|
|
name = g_strdup_printf("console[%d]", i);
|
|
|
|
object_property_add_child(container_get(object_get_root(), "/backend"),
|
2014-04-24 14:15:58 +00:00
|
|
|
name, OBJECT(consoles[i]), &error_abort);
|
2013-06-25 08:49:31 +00:00
|
|
|
g_free(name);
|
2013-03-07 16:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-02-10 23:29:57 +00:00
|
|
|
return display_state;
|
|
|
|
}
|
|
|
|
|
2014-09-24 15:05:27 +00:00
|
|
|
void graphic_console_set_hwops(QemuConsole *con,
|
|
|
|
const GraphicHwOps *hw_ops,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
con->hw_ops = hw_ops;
|
|
|
|
con->hw = opaque;
|
|
|
|
}
|
|
|
|
|
2014-01-24 14:35:21 +00:00
|
|
|
QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head,
|
2013-04-17 08:21:27 +00:00
|
|
|
const GraphicHwOps *hw_ops,
|
2013-03-05 14:24:14 +00:00
|
|
|
void *opaque)
|
2006-04-09 01:06:34 +00:00
|
|
|
{
|
2013-04-25 10:10:45 +00:00
|
|
|
static const char noinit[] =
|
|
|
|
"Guest has not initialized the display (yet).";
|
2013-03-07 16:08:29 +00:00
|
|
|
int width = 640;
|
|
|
|
int height = 480;
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s;
|
2009-01-16 19:04:14 +00:00
|
|
|
DisplayState *ds;
|
2009-01-16 21:13:49 +00:00
|
|
|
|
2013-03-07 16:08:29 +00:00
|
|
|
ds = get_alloc_displaystate();
|
2013-03-07 15:04:52 +00:00
|
|
|
trace_console_gfx_new();
|
2014-04-24 14:15:58 +00:00
|
|
|
s = new_console(ds, GRAPHIC_CONSOLE, head);
|
2015-03-12 11:51:13 +00:00
|
|
|
s->ui_timer = timer_new_ms(QEMU_CLOCK_REALTIME, dpy_set_ui_info_timer, s);
|
2014-09-24 15:05:27 +00:00
|
|
|
graphic_console_set_hwops(s, hw_ops, opaque);
|
2013-04-17 08:21:27 +00:00
|
|
|
if (dev) {
|
2014-04-24 14:15:58 +00:00
|
|
|
object_property_set_link(OBJECT(s), OBJECT(dev), "device",
|
|
|
|
&error_abort);
|
2013-04-17 08:21:27 +00:00
|
|
|
}
|
2009-01-16 19:04:14 +00:00
|
|
|
|
2013-04-25 10:10:45 +00:00
|
|
|
s->surface = qemu_create_message_surface(width, height, noinit);
|
2013-03-05 14:24:14 +00:00
|
|
|
return s;
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
2013-03-15 14:45:54 +00:00
|
|
|
QemuConsole *qemu_console_lookup_by_index(unsigned int index)
|
|
|
|
{
|
2014-05-26 08:36:35 +00:00
|
|
|
if (index >= nb_consoles) {
|
2013-03-15 14:45:54 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return consoles[index];
|
|
|
|
}
|
|
|
|
|
2014-01-24 14:35:21 +00:00
|
|
|
QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head)
|
2013-04-18 05:30:40 +00:00
|
|
|
{
|
|
|
|
Object *obj;
|
2014-01-24 14:35:21 +00:00
|
|
|
uint32_t h;
|
2013-04-18 05:30:40 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < nb_consoles; i++) {
|
|
|
|
if (!consoles[i]) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
obj = object_property_get_link(OBJECT(consoles[i]),
|
2014-04-24 14:15:58 +00:00
|
|
|
"device", &error_abort);
|
2014-01-24 14:35:21 +00:00
|
|
|
if (DEVICE(obj) != dev) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
h = object_property_get_int(OBJECT(consoles[i]),
|
2014-04-24 14:15:58 +00:00
|
|
|
"head", &error_abort);
|
2014-01-24 14:35:21 +00:00
|
|
|
if (h != head) {
|
|
|
|
continue;
|
2013-04-18 05:30:40 +00:00
|
|
|
}
|
2014-01-24 14:35:21 +00:00
|
|
|
return consoles[i];
|
2013-04-18 05:30:40 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-01-12 10:45:43 +00:00
|
|
|
QemuConsole *qemu_console_lookup_by_device_name(const char *device_id,
|
|
|
|
uint32_t head, Error **errp)
|
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
QemuConsole *con;
|
|
|
|
|
|
|
|
dev = qdev_find_recursive(sysbus_get_default(), device_id);
|
|
|
|
if (dev == NULL) {
|
|
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
|
|
"Device '%s' not found", device_id);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
con = qemu_console_lookup_by_device(dev, head);
|
|
|
|
if (con == NULL) {
|
|
|
|
error_setg(errp, "Device %s (head %d) is not bound to a QemuConsole",
|
|
|
|
device_id, head);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return con;
|
|
|
|
}
|
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
bool qemu_console_is_visible(QemuConsole *con)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
2013-03-15 14:45:54 +00:00
|
|
|
return (con == active_console) || (con->dcls > 0);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
2013-03-14 13:27:08 +00:00
|
|
|
bool qemu_console_is_graphic(QemuConsole *con)
|
2008-09-24 03:32:33 +00:00
|
|
|
{
|
2013-03-14 13:27:08 +00:00
|
|
|
if (con == NULL) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
|
|
|
return con && (con->console_type == GRAPHIC_CONSOLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool qemu_console_is_fixedsize(QemuConsole *con)
|
|
|
|
{
|
|
|
|
if (con == NULL) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
|
|
|
return con && (con->console_type != TEXT_CONSOLE);
|
2008-09-24 03:32:33 +00:00
|
|
|
}
|
|
|
|
|
2016-09-23 07:50:27 +00:00
|
|
|
bool qemu_console_is_gl_blocked(QemuConsole *con)
|
|
|
|
{
|
|
|
|
assert(con != NULL);
|
|
|
|
return con->gl_block;
|
|
|
|
}
|
|
|
|
|
2015-02-17 09:41:08 +00:00
|
|
|
char *qemu_console_get_label(QemuConsole *con)
|
|
|
|
{
|
|
|
|
if (con->console_type == GRAPHIC_CONSOLE) {
|
|
|
|
if (con->device) {
|
|
|
|
return g_strdup(object_get_typename(con->device));
|
|
|
|
}
|
|
|
|
return g_strdup("VGA");
|
|
|
|
} else {
|
|
|
|
if (con->chr && con->chr->label) {
|
|
|
|
return g_strdup(con->chr->label);
|
|
|
|
}
|
|
|
|
return g_strdup_printf("vc%d", con->index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-28 08:58:18 +00:00
|
|
|
int qemu_console_get_index(QemuConsole *con)
|
|
|
|
{
|
|
|
|
if (con == NULL) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
|
|
|
return con ? con->index : -1;
|
|
|
|
}
|
|
|
|
|
2014-01-24 14:35:21 +00:00
|
|
|
uint32_t qemu_console_get_head(QemuConsole *con)
|
|
|
|
{
|
|
|
|
if (con == NULL) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
|
|
|
return con ? con->head : -1;
|
|
|
|
}
|
|
|
|
|
2014-01-24 16:38:20 +00:00
|
|
|
QemuUIInfo *qemu_console_get_ui_info(QemuConsole *con)
|
|
|
|
{
|
|
|
|
assert(con != NULL);
|
|
|
|
return &con->ui_info;
|
|
|
|
}
|
|
|
|
|
2013-11-28 08:58:18 +00:00
|
|
|
int qemu_console_get_width(QemuConsole *con, int fallback)
|
|
|
|
{
|
|
|
|
if (con == NULL) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
|
|
|
return con ? surface_width(con->surface) : fallback;
|
|
|
|
}
|
|
|
|
|
|
|
|
int qemu_console_get_height(QemuConsole *con, int fallback)
|
|
|
|
{
|
|
|
|
if (con == NULL) {
|
|
|
|
con = active_console;
|
|
|
|
}
|
|
|
|
return con ? surface_height(con->surface) : fallback;
|
|
|
|
}
|
|
|
|
|
2010-12-23 12:42:52 +00:00
|
|
|
static void text_console_set_echo(CharDriverState *chr, bool echo)
|
|
|
|
{
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s = chr->opaque;
|
2010-12-23 12:42:52 +00:00
|
|
|
|
|
|
|
s->echo = echo;
|
|
|
|
}
|
|
|
|
|
2014-05-22 09:27:13 +00:00
|
|
|
static void text_console_update_cursor_timer(void)
|
|
|
|
{
|
|
|
|
timer_mod(cursor_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME)
|
|
|
|
+ CONSOLE_CURSOR_PERIOD / 2);
|
|
|
|
}
|
|
|
|
|
2012-07-10 20:00:55 +00:00
|
|
|
static void text_console_update_cursor(void *opaque)
|
|
|
|
{
|
2014-05-22 09:27:13 +00:00
|
|
|
QemuConsole *s;
|
|
|
|
int i, count = 0;
|
|
|
|
|
|
|
|
cursor_visible_phase = !cursor_visible_phase;
|
2012-07-10 20:00:55 +00:00
|
|
|
|
2014-05-22 09:27:13 +00:00
|
|
|
for (i = 0; i < nb_consoles; i++) {
|
|
|
|
s = consoles[i];
|
|
|
|
if (qemu_console_is_graphic(s) ||
|
|
|
|
!qemu_console_is_visible(s)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
count++;
|
|
|
|
graphic_hw_invalidate(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (count) {
|
|
|
|
text_console_update_cursor_timer();
|
|
|
|
}
|
2012-07-10 20:00:55 +00:00
|
|
|
}
|
|
|
|
|
2013-03-13 13:04:18 +00:00
|
|
|
static const GraphicHwOps text_console_ops = {
|
|
|
|
.invalidate = text_console_invalidate,
|
|
|
|
.text_update = text_console_update,
|
|
|
|
};
|
|
|
|
|
2010-12-23 12:42:53 +00:00
|
|
|
static void text_console_do_init(CharDriverState *chr, DisplayState *ds)
|
2004-07-14 17:28:59 +00:00
|
|
|
{
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s;
|
2013-03-13 09:14:52 +00:00
|
|
|
int g_width = 80 * FONT_WIDTH;
|
|
|
|
int g_height = 24 * FONT_HEIGHT;
|
2006-03-11 15:35:30 +00:00
|
|
|
|
2010-12-23 12:42:51 +00:00
|
|
|
s = chr->opaque;
|
2009-09-10 08:58:49 +00:00
|
|
|
|
2004-07-14 17:28:59 +00:00
|
|
|
chr->chr_write = console_puts;
|
2004-08-01 21:48:30 +00:00
|
|
|
|
2006-06-25 16:26:29 +00:00
|
|
|
s->out_fifo.buf = s->out_fifo_buf;
|
|
|
|
s->out_fifo.buf_size = sizeof(s->out_fifo_buf);
|
2013-08-21 15:03:08 +00:00
|
|
|
s->kbd_timer = timer_new_ms(QEMU_CLOCK_REALTIME, kbd_send_chars, s);
|
2009-01-16 19:04:14 +00:00
|
|
|
s->ds = ds;
|
2007-09-17 08:09:54 +00:00
|
|
|
|
2004-07-14 17:28:59 +00:00
|
|
|
s->y_displayed = 0;
|
|
|
|
s->y_base = 0;
|
|
|
|
s->total_height = DEFAULT_BACKSCROLL;
|
|
|
|
s->x = 0;
|
|
|
|
s->y = 0;
|
2013-03-13 09:14:52 +00:00
|
|
|
if (!s->surface) {
|
2013-03-12 13:39:22 +00:00
|
|
|
if (active_console && active_console->surface) {
|
2013-03-13 09:14:52 +00:00
|
|
|
g_width = surface_width(active_console->surface);
|
|
|
|
g_height = surface_height(active_console->surface);
|
2013-03-12 13:39:22 +00:00
|
|
|
}
|
2013-03-13 09:14:52 +00:00
|
|
|
s->surface = qemu_create_displaysurface(g_width, g_height);
|
2010-12-23 12:42:51 +00:00
|
|
|
}
|
2006-03-11 15:35:30 +00:00
|
|
|
|
2013-03-13 13:04:18 +00:00
|
|
|
s->hw_ops = &text_console_ops;
|
2008-02-10 16:33:14 +00:00
|
|
|
s->hw = s;
|
|
|
|
|
2006-03-11 15:35:30 +00:00
|
|
|
/* Set text attribute defaults */
|
|
|
|
s->t_attrib_default.bold = 0;
|
|
|
|
s->t_attrib_default.uline = 0;
|
|
|
|
s->t_attrib_default.blink = 0;
|
|
|
|
s->t_attrib_default.invers = 0;
|
|
|
|
s->t_attrib_default.unvisible = 0;
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib_default.fgcol = QEMU_COLOR_WHITE;
|
|
|
|
s->t_attrib_default.bgcol = QEMU_COLOR_BLACK;
|
2006-03-11 15:35:30 +00:00
|
|
|
/* set current text attributes to default */
|
|
|
|
s->t_attrib = s->t_attrib_default;
|
2004-07-14 17:28:59 +00:00
|
|
|
text_console_resize(s);
|
|
|
|
|
2009-12-08 12:11:39 +00:00
|
|
|
if (chr->label) {
|
|
|
|
char msg[128];
|
|
|
|
int len;
|
|
|
|
|
2015-11-29 13:28:24 +00:00
|
|
|
s->t_attrib.bgcol = QEMU_COLOR_BLUE;
|
2009-12-08 12:11:39 +00:00
|
|
|
len = snprintf(msg, sizeof(msg), "%s console\r\n", chr->label);
|
|
|
|
console_puts(chr, (uint8_t*)msg, len);
|
2009-12-08 12:11:40 +00:00
|
|
|
s->t_attrib = s->t_attrib_default;
|
2009-12-08 12:11:39 +00:00
|
|
|
}
|
|
|
|
|
2013-03-26 10:07:54 +00:00
|
|
|
qemu_chr_be_generic_open(chr);
|
2004-07-14 17:28:59 +00:00
|
|
|
}
|
2008-07-01 16:24:38 +00:00
|
|
|
|
2015-09-29 13:49:06 +00:00
|
|
|
static CharDriverState *text_console_init(ChardevVC *vc, Error **errp)
|
2009-01-16 20:23:27 +00:00
|
|
|
{
|
qemu-char: add logfile facility to all chardev backends
Typically a UNIX guest OS will log boot messages to a serial
port in addition to any graphical console. An admin user
may also wish to use the serial port for an interactive
console. A virtualization management system may wish to
collect system boot messages by logging the serial port,
but also wish to allow admins interactive access.
Currently providing such a feature forces the mgmt app
to either provide 2 separate serial ports, one for
logging boot messages and one for interactive console
login, or to proxy all output via a separate service
that can multiplex the two needs onto one serial port.
While both are valid approaches, they each have their
own downsides. The former causes confusion and extra
setup work for VM admins creating disk images. The latter
places an extra burden to re-implement much of the QEMU
chardev backends logic in libvirt or even higher level
mgmt apps and adds extra hops in the data transfer path.
A simpler approach that is satisfactory for many use
cases is to allow the QEMU chardev backends to have a
"logfile" property associated with them.
$QEMU -chardev socket,host=localhost,port=9000,\
server=on,nowait,id-charserial0,\
logfile=/var/log/libvirt/qemu/test-serial0.log
-device isa-serial,chardev=charserial0,id=serial0
This patch introduces a 'ChardevCommon' struct which
is setup as a base for all the ChardevBackend types.
Ideally this would be registered directly as a base
against ChardevBackend, rather than each type, but
the QAPI generator doesn't allow that since the
ChardevBackend is a non-discriminated union. The
ChardevCommon struct provides the optional 'logfile'
parameter, as well as 'logappend' which controls
whether QEMU truncates or appends (default truncate).
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1452516281-27519-1-git-send-email-berrange@redhat.com>
[Call qemu_chr_parse_common if cd->parse is NULL. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-01-11 12:44:41 +00:00
|
|
|
ChardevCommon *common = qapi_ChardevVC_base(vc);
|
2009-01-16 20:23:27 +00:00
|
|
|
CharDriverState *chr;
|
2012-09-28 11:24:17 +00:00
|
|
|
QemuConsole *s;
|
2013-02-25 14:52:32 +00:00
|
|
|
unsigned width = 0;
|
|
|
|
unsigned height = 0;
|
2009-01-16 20:23:27 +00:00
|
|
|
|
qemu-char: add logfile facility to all chardev backends
Typically a UNIX guest OS will log boot messages to a serial
port in addition to any graphical console. An admin user
may also wish to use the serial port for an interactive
console. A virtualization management system may wish to
collect system boot messages by logging the serial port,
but also wish to allow admins interactive access.
Currently providing such a feature forces the mgmt app
to either provide 2 separate serial ports, one for
logging boot messages and one for interactive console
login, or to proxy all output via a separate service
that can multiplex the two needs onto one serial port.
While both are valid approaches, they each have their
own downsides. The former causes confusion and extra
setup work for VM admins creating disk images. The latter
places an extra burden to re-implement much of the QEMU
chardev backends logic in libvirt or even higher level
mgmt apps and adds extra hops in the data transfer path.
A simpler approach that is satisfactory for many use
cases is to allow the QEMU chardev backends to have a
"logfile" property associated with them.
$QEMU -chardev socket,host=localhost,port=9000,\
server=on,nowait,id-charserial0,\
logfile=/var/log/libvirt/qemu/test-serial0.log
-device isa-serial,chardev=charserial0,id=serial0
This patch introduces a 'ChardevCommon' struct which
is setup as a base for all the ChardevBackend types.
Ideally this would be registered directly as a base
against ChardevBackend, rather than each type, but
the QAPI generator doesn't allow that since the
ChardevBackend is a non-discriminated union. The
ChardevCommon struct provides the optional 'logfile'
parameter, as well as 'logappend' which controls
whether QEMU truncates or appends (default truncate).
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1452516281-27519-1-git-send-email-berrange@redhat.com>
[Call qemu_chr_parse_common if cd->parse is NULL. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-01-11 12:44:41 +00:00
|
|
|
chr = qemu_chr_alloc(common, errp);
|
|
|
|
if (!chr) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-01-16 20:23:27 +00:00
|
|
|
|
2013-02-25 14:52:32 +00:00
|
|
|
if (vc->has_width) {
|
|
|
|
width = vc->width;
|
|
|
|
} else if (vc->has_cols) {
|
|
|
|
width = vc->cols * FONT_WIDTH;
|
|
|
|
}
|
2010-12-23 12:42:51 +00:00
|
|
|
|
2013-02-25 14:52:32 +00:00
|
|
|
if (vc->has_height) {
|
|
|
|
height = vc->height;
|
|
|
|
} else if (vc->has_rows) {
|
|
|
|
height = vc->rows * FONT_HEIGHT;
|
|
|
|
}
|
2010-12-23 12:42:51 +00:00
|
|
|
|
2013-03-07 15:04:52 +00:00
|
|
|
trace_console_txt_new(width, height);
|
2010-12-23 12:42:51 +00:00
|
|
|
if (width == 0 || height == 0) {
|
2014-04-24 14:15:58 +00:00
|
|
|
s = new_console(NULL, TEXT_CONSOLE, 0);
|
2010-12-23 12:42:51 +00:00
|
|
|
} else {
|
2014-04-24 14:15:58 +00:00
|
|
|
s = new_console(NULL, TEXT_CONSOLE_FIXED_SIZE, 0);
|
2013-03-13 09:14:52 +00:00
|
|
|
s->surface = qemu_create_displaysurface(width, height);
|
2010-12-23 12:42:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!s) {
|
2011-10-02 16:53:09 +00:00
|
|
|
g_free(chr);
|
2015-09-29 13:49:06 +00:00
|
|
|
error_setg(errp, "cannot create text console");
|
Revert "qemu-char: Print strerror message on failure" and deps
The commit's purpose is laudable:
The only way for chardev drivers to communicate an error was to
return a NULL pointer, which resulted in an error message that
said _that_ something went wrong, but not _why_.
It attempts to achieve it by changing the interface to return 0/-errno
and update qemu_chr_open_opts() to use strerror() to display a more
helpful error message. Unfortunately, it has serious flaws:
1. Backends "socket" and "udp" return bogus error codes, because
qemu_chr_open_socket() and qemu_chr_open_udp() assume that
unix_listen_opts(), unix_connect_opts(), inet_listen_opts(),
inet_connect_opts() and inet_dgram_opts() fail with errno set
appropriately. That assumption is wrong, and the commit turns
unspecific error messages into misleading error messages. For
instance:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: No such file or directory
ENOENT is what happens to be in my errno when the backend returns
-errno. Let's put ERANGE there just for giggles:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx -drive if=none,iops=99999999999999999999
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: Numerical result out of range
Worse: when errno happens to be zero, return -errno erroneously
signals success, and qemu_chr_new_from_opts() dies dereferencing
uninitialized chr. I observe this with "-serial unix:".
2. All qemu_chr_open_opts() knows about the error is an errno error
code. That's simply not enough for a decent message. For instance,
when inet_dgram() can't resolve the parameter host, which errno code
should it use? What if it can't resolve parameter localaddr?
Clue: many backends already report errors in their open methods.
Let's revert the flawed commit along with its dependencies, and fix up
the silent error paths instead.
This reverts commit 6e1db57b2ac9025c2443c665a0d9e78748637b26.
Conflicts:
console.c
hw/baum.c
qemu-char.c
This reverts commit aad04cd024f0c59f0b96f032cde2e24eb3abba6d.
The parts of commit db418a0a "Add stdio char device on windows" that
depend on the reverted change fixed up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-02-07 14:09:08 +00:00
|
|
|
return NULL;
|
2010-12-23 12:42:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
s->chr = chr;
|
|
|
|
chr->opaque = s;
|
2010-12-23 12:42:52 +00:00
|
|
|
chr->chr_set_echo = text_console_set_echo;
|
2013-03-07 16:08:29 +00:00
|
|
|
|
|
|
|
if (display_state) {
|
|
|
|
text_console_do_init(chr, display_state);
|
|
|
|
}
|
Revert "qemu-char: Print strerror message on failure" and deps
The commit's purpose is laudable:
The only way for chardev drivers to communicate an error was to
return a NULL pointer, which resulted in an error message that
said _that_ something went wrong, but not _why_.
It attempts to achieve it by changing the interface to return 0/-errno
and update qemu_chr_open_opts() to use strerror() to display a more
helpful error message. Unfortunately, it has serious flaws:
1. Backends "socket" and "udp" return bogus error codes, because
qemu_chr_open_socket() and qemu_chr_open_udp() assume that
unix_listen_opts(), unix_connect_opts(), inet_listen_opts(),
inet_connect_opts() and inet_dgram_opts() fail with errno set
appropriately. That assumption is wrong, and the commit turns
unspecific error messages into misleading error messages. For
instance:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: No such file or directory
ENOENT is what happens to be in my errno when the backend returns
-errno. Let's put ERANGE there just for giggles:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx -drive if=none,iops=99999999999999999999
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: Numerical result out of range
Worse: when errno happens to be zero, return -errno erroneously
signals success, and qemu_chr_new_from_opts() dies dereferencing
uninitialized chr. I observe this with "-serial unix:".
2. All qemu_chr_open_opts() knows about the error is an errno error
code. That's simply not enough for a decent message. For instance,
when inet_dgram() can't resolve the parameter host, which errno code
should it use? What if it can't resolve parameter localaddr?
Clue: many backends already report errors in their open methods.
Let's revert the flawed commit along with its dependencies, and fix up
the silent error paths instead.
This reverts commit 6e1db57b2ac9025c2443c665a0d9e78748637b26.
Conflicts:
console.c
hw/baum.c
qemu-char.c
This reverts commit aad04cd024f0c59f0b96f032cde2e24eb3abba6d.
The parts of commit db418a0a "Add stdio char device on windows" that
depend on the reverted change fixed up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-02-07 14:09:08 +00:00
|
|
|
return chr;
|
2009-01-16 20:23:27 +00:00
|
|
|
}
|
|
|
|
|
2013-02-20 13:43:19 +00:00
|
|
|
static VcHandler *vc_handler = text_console_init;
|
|
|
|
|
2015-09-29 13:49:06 +00:00
|
|
|
static CharDriverState *vc_init(const char *id, ChardevBackend *backend,
|
2016-10-22 10:09:43 +00:00
|
|
|
ChardevReturn *ret, bool *be_opened,
|
|
|
|
Error **errp)
|
2013-02-20 13:43:19 +00:00
|
|
|
{
|
2016-10-22 10:09:43 +00:00
|
|
|
/* console/chardev init sometimes completes elsewhere in a 2nd
|
|
|
|
* stage, so defer OPENED events until they are fully initialized
|
|
|
|
*/
|
|
|
|
*be_opened = false;
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-17 22:48:37 +00:00
|
|
|
return vc_handler(backend->u.vc.data, errp);
|
2013-02-20 13:43:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void register_vc_handler(VcHandler *handler)
|
|
|
|
{
|
|
|
|
vc_handler = handler;
|
|
|
|
}
|
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void qemu_console_resize(QemuConsole *s, int width, int height)
|
2008-07-01 16:24:38 +00:00
|
|
|
{
|
2013-03-12 13:39:22 +00:00
|
|
|
DisplaySurface *surface;
|
|
|
|
|
|
|
|
assert(s->console_type == GRAPHIC_CONSOLE);
|
2016-08-26 09:47:11 +00:00
|
|
|
|
|
|
|
if (s->surface &&
|
|
|
|
pixman_image_get_width(s->surface->image) == width &&
|
|
|
|
pixman_image_get_height(s->surface->image) == height) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-03-12 13:39:22 +00:00
|
|
|
surface = qemu_create_displaysurface(width, height);
|
|
|
|
dpy_gfx_replace_surface(s, surface);
|
2008-07-01 16:24:38 +00:00
|
|
|
}
|
2008-09-24 02:21:24 +00:00
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
void qemu_console_copy(QemuConsole *con, int src_x, int src_y,
|
2009-01-16 19:04:14 +00:00
|
|
|
int dst_x, int dst_y, int w, int h)
|
2008-09-24 03:32:33 +00:00
|
|
|
{
|
2013-03-12 13:39:22 +00:00
|
|
|
assert(con->console_type == GRAPHIC_CONSOLE);
|
|
|
|
dpy_gfx_copy(con, src_x, src_y, dst_x, dst_y, w, h);
|
2008-09-24 02:21:24 +00:00
|
|
|
}
|
2009-01-15 22:14:11 +00:00
|
|
|
|
2013-03-05 14:24:14 +00:00
|
|
|
DisplaySurface *qemu_console_surface(QemuConsole *console)
|
|
|
|
{
|
2013-03-12 13:39:22 +00:00
|
|
|
return console->surface;
|
2013-03-05 14:24:14 +00:00
|
|
|
}
|
|
|
|
|
2009-01-23 19:56:19 +00:00
|
|
|
PixelFormat qemu_default_pixelformat(int bpp)
|
|
|
|
{
|
2014-06-18 09:07:50 +00:00
|
|
|
pixman_format_code_t fmt = qemu_default_pixman_format(bpp, true);
|
|
|
|
PixelFormat pf = qemu_pixelformat_from_pixman(fmt);
|
2009-01-15 22:14:11 +00:00
|
|
|
return pf;
|
|
|
|
}
|
2013-03-05 17:51:32 +00:00
|
|
|
|
2013-02-25 14:52:32 +00:00
|
|
|
static void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
int val;
|
2016-02-20 00:19:31 +00:00
|
|
|
ChardevVC *vc;
|
2013-02-25 14:52:32 +00:00
|
|
|
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-17 22:48:37 +00:00
|
|
|
vc = backend->u.vc.data = g_new0(ChardevVC, 1);
|
2016-02-20 00:19:31 +00:00
|
|
|
qemu_chr_parse_common(opts, qapi_ChardevVC_base(vc));
|
2013-02-25 14:52:32 +00:00
|
|
|
|
|
|
|
val = qemu_opt_get_number(opts, "width", 0);
|
|
|
|
if (val != 0) {
|
2016-02-20 00:19:31 +00:00
|
|
|
vc->has_width = true;
|
|
|
|
vc->width = val;
|
2013-02-25 14:52:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
val = qemu_opt_get_number(opts, "height", 0);
|
|
|
|
if (val != 0) {
|
2016-02-20 00:19:31 +00:00
|
|
|
vc->has_height = true;
|
|
|
|
vc->height = val;
|
2013-02-25 14:52:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
val = qemu_opt_get_number(opts, "cols", 0);
|
|
|
|
if (val != 0) {
|
2016-02-20 00:19:31 +00:00
|
|
|
vc->has_cols = true;
|
|
|
|
vc->cols = val;
|
2013-02-25 14:52:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
val = qemu_opt_get_number(opts, "rows", 0);
|
|
|
|
if (val != 0) {
|
2016-02-20 00:19:31 +00:00
|
|
|
vc->has_rows = true;
|
|
|
|
vc->rows = val;
|
2013-02-25 14:52:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-17 07:45:10 +00:00
|
|
|
static const TypeInfo qemu_console_info = {
|
|
|
|
.name = TYPE_QEMU_CONSOLE,
|
|
|
|
.parent = TYPE_OBJECT,
|
|
|
|
.instance_size = sizeof(QemuConsole),
|
|
|
|
.class_size = sizeof(QemuConsoleClass),
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2013-03-05 17:51:32 +00:00
|
|
|
static void register_types(void)
|
|
|
|
{
|
2013-04-17 07:45:10 +00:00
|
|
|
type_register_static(&qemu_console_info);
|
2015-09-29 12:55:59 +00:00
|
|
|
register_char_driver("vc", CHARDEV_BACKEND_KIND_VC, qemu_chr_parse_vc,
|
2015-09-29 13:49:06 +00:00
|
|
|
vc_init);
|
2013-03-05 17:51:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type_init(register_types);
|