2004-07-14 21:28:59 +04:00
|
|
|
/*
|
|
|
|
* QEMU graphical console
|
2007-09-17 01:08:06 +04:00
|
|
|
*
|
2004-07-14 21:28:59 +04:00
|
|
|
* Copyright (c) 2004 Fabrice Bellard
|
2007-09-17 01:08:06 +04:00
|
|
|
*
|
2004-07-14 21:28:59 +04: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.
|
|
|
|
*/
|
2007-11-17 20:14:51 +03:00
|
|
|
#include "qemu-common.h"
|
2012-11-28 15:06:30 +04:00
|
|
|
#include "ui/console.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/timer.h"
|
2012-05-24 20:48:23 +04:00
|
|
|
#include "qmp-commands.h"
|
2012-12-17 21:20:05 +04:00
|
|
|
#include "char/char.h"
|
2004-07-14 21:28:59 +04:00
|
|
|
|
2006-03-11 18:35:30 +03:00
|
|
|
//#define DEBUG_CONSOLE
|
2004-07-14 21:28:59 +04:00
|
|
|
#define DEFAULT_BACKSCROLL 512
|
|
|
|
#define MAX_CONSOLES 12
|
2012-07-11 00:00:55 +04:00
|
|
|
#define CONSOLE_CURSOR_PERIOD 500
|
2004-07-14 21:28:59 +04:00
|
|
|
|
2006-06-25 21:37:36 +04:00
|
|
|
#define QEMU_RGBA(r, g, b, a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
|
|
|
|
#define QEMU_RGB(r, g, b) QEMU_RGBA(r, g, b, 0xff)
|
2004-07-14 21:28:59 +04:00
|
|
|
|
2006-03-11 18:35:30 +03: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 21:28:59 +04:00
|
|
|
typedef struct TextCell {
|
|
|
|
uint8_t ch;
|
2006-03-11 18:35:30 +03:00
|
|
|
TextAttributes t_attrib;
|
2004-07-14 21:28:59 +04:00
|
|
|
} TextCell;
|
|
|
|
|
|
|
|
#define MAX_ESC_PARAMS 3
|
|
|
|
|
|
|
|
enum TTYState {
|
|
|
|
TTY_STATE_NORM,
|
|
|
|
TTY_STATE_ESC,
|
|
|
|
TTY_STATE_CSI,
|
|
|
|
};
|
|
|
|
|
2006-06-25 20:26:29 +04:00
|
|
|
typedef struct QEMUFIFO {
|
|
|
|
uint8_t *buf;
|
|
|
|
int buf_size;
|
|
|
|
int count, wptr, rptr;
|
|
|
|
} QEMUFIFO;
|
|
|
|
|
2007-11-18 04:44:38 +03:00
|
|
|
static int qemu_fifo_write(QEMUFIFO *f, const uint8_t *buf, int len1)
|
2006-06-25 20:26:29 +04: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 04:44:38 +03:00
|
|
|
static int qemu_fifo_read(QEMUFIFO *f, uint8_t *buf, int len1)
|
2006-06-25 20:26:29 +04: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-12 03:14:59 +04:00
|
|
|
typedef enum {
|
|
|
|
GRAPHIC_CONSOLE,
|
2008-09-24 07:32:33 +04:00
|
|
|
TEXT_CONSOLE,
|
|
|
|
TEXT_CONSOLE_FIXED_SIZE
|
2009-10-02 01:12:16 +04:00
|
|
|
} console_type_t;
|
2007-07-12 03:14:59 +04:00
|
|
|
|
2012-09-28 15:24:17 +04:00
|
|
|
struct QemuConsole {
|
2011-09-16 02:48:07 +04:00
|
|
|
int index;
|
2009-10-02 01:12:16 +04:00
|
|
|
console_type_t console_type;
|
2004-07-14 21:28:59 +04:00
|
|
|
DisplayState *ds;
|
2012-09-28 15:24:17 +04:00
|
|
|
|
2006-04-09 05:06:34 +04:00
|
|
|
/* Graphic console state. */
|
|
|
|
vga_hw_update_ptr hw_update;
|
|
|
|
vga_hw_invalidate_ptr hw_invalidate;
|
|
|
|
vga_hw_screen_dump_ptr hw_screen_dump;
|
2008-02-10 19:33:14 +03:00
|
|
|
vga_hw_text_update_ptr hw_text_update;
|
2006-04-09 05:06:34 +04:00
|
|
|
void *hw;
|
2004-07-14 21:28:59 +04:00
|
|
|
int g_width, g_height;
|
2012-09-28 15:24:17 +04:00
|
|
|
|
|
|
|
/* Text console state */
|
2004-07-14 21:28:59 +04:00
|
|
|
int width;
|
|
|
|
int height;
|
|
|
|
int total_height;
|
|
|
|
int backscroll_height;
|
|
|
|
int x, y;
|
2007-01-17 02:02:36 +03:00
|
|
|
int x_saved, y_saved;
|
2004-07-14 21:28:59 +04:00
|
|
|
int y_displayed;
|
|
|
|
int y_base;
|
2006-03-11 18:35:30 +03:00
|
|
|
TextAttributes t_attrib_default; /* default text attributes */
|
|
|
|
TextAttributes t_attrib; /* currently active text attributes */
|
2004-07-14 21:28:59 +04:00
|
|
|
TextCell *cells;
|
2008-02-10 19:33:14 +03:00
|
|
|
int text_x[2], text_y[2], cursor_invalidate;
|
2010-12-23 15:42:52 +03:00
|
|
|
int echo;
|
2012-07-11 00:00:55 +04:00
|
|
|
bool cursor_visible_phase;
|
|
|
|
QEMUTimer *cursor_timer;
|
2004-07-14 21:28:59 +04:00
|
|
|
|
2009-01-21 06:02:52 +03:00
|
|
|
int update_x0;
|
|
|
|
int update_y0;
|
|
|
|
int update_x1;
|
|
|
|
int update_y1;
|
|
|
|
|
2004-07-14 21:28:59 +04:00
|
|
|
enum TTYState state;
|
|
|
|
int esc_params[MAX_ESC_PARAMS];
|
|
|
|
int nb_esc_params;
|
|
|
|
|
2007-01-28 02:46:43 +03:00
|
|
|
CharDriverState *chr;
|
2006-06-25 20:26:29 +04:00
|
|
|
/* fifo for key pressed */
|
|
|
|
QEMUFIFO out_fifo;
|
|
|
|
uint8_t out_fifo_buf[16];
|
|
|
|
QEMUTimer *kbd_timer;
|
2004-07-14 21:28:59 +04:00
|
|
|
};
|
|
|
|
|
2010-02-11 02:29:57 +03:00
|
|
|
static DisplayState *display_state;
|
2012-09-28 15:24:17 +04:00
|
|
|
static QemuConsole *active_console;
|
|
|
|
static QemuConsole *consoles[MAX_CONSOLES];
|
2004-07-14 21:28:59 +04:00
|
|
|
static int nb_consoles = 0;
|
|
|
|
|
2006-04-09 05:06:34 +04:00
|
|
|
void vga_hw_update(void)
|
|
|
|
{
|
2007-01-17 02:02:36 +03:00
|
|
|
if (active_console && active_console->hw_update)
|
2006-04-09 05:06:34 +04:00
|
|
|
active_console->hw_update(active_console->hw);
|
|
|
|
}
|
|
|
|
|
|
|
|
void vga_hw_invalidate(void)
|
|
|
|
{
|
2010-05-20 17:23:06 +04:00
|
|
|
if (active_console && active_console->hw_invalidate)
|
2006-04-09 05:06:34 +04:00
|
|
|
active_console->hw_invalidate(active_console->hw);
|
|
|
|
}
|
|
|
|
|
2012-05-24 20:48:23 +04:00
|
|
|
void qmp_screendump(const char *filename, Error **errp)
|
2006-04-09 05:06:34 +04:00
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *previous_active_console;
|
2012-02-24 15:43:45 +04:00
|
|
|
bool cswitch;
|
2008-07-19 17:04:26 +04:00
|
|
|
|
|
|
|
previous_active_console = active_console;
|
2012-02-24 15:43:45 +04:00
|
|
|
cswitch = previous_active_console && previous_active_console->index != 0;
|
2011-09-16 02:48:07 +04:00
|
|
|
|
2008-07-19 17:04:26 +04:00
|
|
|
/* There is currently no way of specifying which screen we want to dump,
|
2008-09-02 04:09:16 +04:00
|
|
|
so always dump the first one. */
|
2012-02-24 15:43:45 +04:00
|
|
|
if (cswitch) {
|
|
|
|
console_select(0);
|
|
|
|
}
|
2011-09-16 02:48:07 +04:00
|
|
|
if (consoles[0] && consoles[0]->hw_screen_dump) {
|
2012-05-24 20:48:23 +04:00
|
|
|
consoles[0]->hw_screen_dump(consoles[0]->hw, filename, cswitch, errp);
|
2012-02-24 15:43:44 +04:00
|
|
|
} else {
|
2012-05-24 20:48:23 +04:00
|
|
|
error_setg(errp, "device doesn't support screendump\n");
|
2011-09-16 02:48:07 +04:00
|
|
|
}
|
|
|
|
|
2012-02-24 15:43:45 +04:00
|
|
|
if (cswitch) {
|
2011-11-18 19:41:59 +04:00
|
|
|
console_select(previous_active_console->index);
|
|
|
|
}
|
2006-04-09 05:06:34 +04:00
|
|
|
}
|
|
|
|
|
2009-10-02 01:12:16 +04:00
|
|
|
void vga_hw_text_update(console_ch_t *chardata)
|
2008-02-10 19:33:14 +03:00
|
|
|
{
|
|
|
|
if (active_console && active_console->hw_text_update)
|
|
|
|
active_console->hw_text_update(active_console->hw, chardata);
|
|
|
|
}
|
|
|
|
|
2004-07-14 21:28:59 +04:00
|
|
|
/* convert a RGBA color to a color index usable in graphic primitives */
|
|
|
|
static unsigned int vga_get_color(DisplayState *ds, unsigned int rgba)
|
|
|
|
{
|
|
|
|
unsigned int r, g, b, color;
|
|
|
|
|
2008-11-24 22:29:13 +03:00
|
|
|
switch(ds_get_bits_per_pixel(ds)) {
|
2004-07-14 21:28:59 +04:00
|
|
|
#if 0
|
|
|
|
case 8:
|
|
|
|
r = (rgba >> 16) & 0xff;
|
|
|
|
g = (rgba >> 8) & 0xff;
|
|
|
|
b = (rgba) & 0xff;
|
2007-09-17 01:08:06 +04:00
|
|
|
color = (rgb_to_index[r] * 6 * 6) +
|
|
|
|
(rgb_to_index[g] * 6) +
|
2004-07-14 21:28:59 +04:00
|
|
|
(rgb_to_index[b]);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
case 15:
|
|
|
|
r = (rgba >> 16) & 0xff;
|
|
|
|
g = (rgba >> 8) & 0xff;
|
|
|
|
b = (rgba) & 0xff;
|
|
|
|
color = ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3);
|
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
r = (rgba >> 16) & 0xff;
|
|
|
|
g = (rgba >> 8) & 0xff;
|
|
|
|
b = (rgba) & 0xff;
|
|
|
|
color = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
|
|
|
|
break;
|
|
|
|
case 32:
|
|
|
|
default:
|
|
|
|
color = rgba;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return color;
|
|
|
|
}
|
|
|
|
|
2007-09-17 01:08:06 +04:00
|
|
|
static void vga_fill_rect (DisplayState *ds,
|
2004-07-14 21:28:59 +04:00
|
|
|
int posx, int posy, int width, int height, uint32_t color)
|
|
|
|
{
|
|
|
|
uint8_t *d, *d1;
|
|
|
|
int x, y, bpp;
|
2007-09-17 12:09:54 +04:00
|
|
|
|
2008-11-24 22:29:13 +03:00
|
|
|
bpp = (ds_get_bits_per_pixel(ds) + 7) >> 3;
|
|
|
|
d1 = ds_get_data(ds) +
|
|
|
|
ds_get_linesize(ds) * posy + bpp * posx;
|
2004-07-14 21:28:59 +04:00
|
|
|
for (y = 0; y < height; y++) {
|
|
|
|
d = d1;
|
|
|
|
switch(bpp) {
|
|
|
|
case 1:
|
|
|
|
for (x = 0; x < width; x++) {
|
|
|
|
*((uint8_t *)d) = color;
|
|
|
|
d++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
for (x = 0; x < width; x++) {
|
|
|
|
*((uint16_t *)d) = color;
|
|
|
|
d += 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
for (x = 0; x < width; x++) {
|
|
|
|
*((uint32_t *)d) = color;
|
|
|
|
d += 4;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2008-11-24 22:29:13 +03:00
|
|
|
d1 += ds_get_linesize(ds);
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* copy from (xs, ys) to (xd, yd) a rectangle of size (w, h) */
|
|
|
|
static void vga_bitblt(DisplayState *ds, int xs, int ys, int xd, int yd, int w, int h)
|
|
|
|
{
|
|
|
|
const uint8_t *s;
|
|
|
|
uint8_t *d;
|
|
|
|
int wb, y, bpp;
|
|
|
|
|
2008-11-24 22:29:13 +03:00
|
|
|
bpp = (ds_get_bits_per_pixel(ds) + 7) >> 3;
|
2004-07-14 21:28:59 +04:00
|
|
|
wb = w * bpp;
|
|
|
|
if (yd <= ys) {
|
2008-11-24 22:29:13 +03:00
|
|
|
s = ds_get_data(ds) +
|
|
|
|
ds_get_linesize(ds) * ys + bpp * xs;
|
|
|
|
d = ds_get_data(ds) +
|
|
|
|
ds_get_linesize(ds) * yd + bpp * xd;
|
2004-07-14 21:28:59 +04:00
|
|
|
for (y = 0; y < h; y++) {
|
|
|
|
memmove(d, s, wb);
|
2008-11-24 22:29:13 +03:00
|
|
|
d += ds_get_linesize(ds);
|
|
|
|
s += ds_get_linesize(ds);
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
} else {
|
2008-11-24 22:29:13 +03:00
|
|
|
s = ds_get_data(ds) +
|
|
|
|
ds_get_linesize(ds) * (ys + h - 1) + bpp * xs;
|
|
|
|
d = ds_get_data(ds) +
|
|
|
|
ds_get_linesize(ds) * (yd + h - 1) + bpp * xd;
|
2004-07-14 21:28:59 +04:00
|
|
|
for (y = 0; y < h; y++) {
|
|
|
|
memmove(d, s, wb);
|
2008-11-24 22:29:13 +03:00
|
|
|
d -= ds_get_linesize(ds);
|
|
|
|
s -= ds_get_linesize(ds);
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************/
|
|
|
|
/* basic char display */
|
|
|
|
|
|
|
|
#define FONT_HEIGHT 16
|
|
|
|
#define FONT_WIDTH 8
|
|
|
|
|
|
|
|
#include "vgafont.h"
|
|
|
|
|
|
|
|
#define cbswap_32(__x) \
|
|
|
|
((uint32_t)( \
|
|
|
|
(((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
|
|
|
|
(((uint32_t)(__x) & (uint32_t)0x0000ff00UL) << 8) | \
|
|
|
|
(((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \
|
|
|
|
(((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) ))
|
|
|
|
|
2009-07-27 18:13:06 +04:00
|
|
|
#ifdef HOST_WORDS_BIGENDIAN
|
2004-07-14 21:28:59 +04:00
|
|
|
#define PAT(x) x
|
|
|
|
#else
|
|
|
|
#define PAT(x) cbswap_32(x)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static const uint32_t dmask16[16] = {
|
|
|
|
PAT(0x00000000),
|
|
|
|
PAT(0x000000ff),
|
|
|
|
PAT(0x0000ff00),
|
|
|
|
PAT(0x0000ffff),
|
|
|
|
PAT(0x00ff0000),
|
|
|
|
PAT(0x00ff00ff),
|
|
|
|
PAT(0x00ffff00),
|
|
|
|
PAT(0x00ffffff),
|
|
|
|
PAT(0xff000000),
|
|
|
|
PAT(0xff0000ff),
|
|
|
|
PAT(0xff00ff00),
|
|
|
|
PAT(0xff00ffff),
|
|
|
|
PAT(0xffff0000),
|
|
|
|
PAT(0xffff00ff),
|
|
|
|
PAT(0xffffff00),
|
|
|
|
PAT(0xffffffff),
|
|
|
|
};
|
|
|
|
|
|
|
|
static const uint32_t dmask4[4] = {
|
|
|
|
PAT(0x00000000),
|
|
|
|
PAT(0x0000ffff),
|
|
|
|
PAT(0xffff0000),
|
|
|
|
PAT(0xffffffff),
|
|
|
|
};
|
|
|
|
|
2006-03-11 18:35:30 +03:00
|
|
|
static uint32_t color_table[2][8];
|
|
|
|
|
2011-09-07 23:44:36 +04:00
|
|
|
#ifndef CONFIG_CURSES
|
2006-03-11 18:35:30 +03:00
|
|
|
enum color_names {
|
|
|
|
COLOR_BLACK = 0,
|
|
|
|
COLOR_RED = 1,
|
|
|
|
COLOR_GREEN = 2,
|
|
|
|
COLOR_YELLOW = 3,
|
|
|
|
COLOR_BLUE = 4,
|
|
|
|
COLOR_MAGENTA = 5,
|
|
|
|
COLOR_CYAN = 6,
|
|
|
|
COLOR_WHITE = 7
|
|
|
|
};
|
2011-09-07 23:44:36 +04:00
|
|
|
#endif
|
2006-03-11 18:35:30 +03:00
|
|
|
|
|
|
|
static const uint32_t color_table_rgb[2][8] = {
|
|
|
|
{ /* dark */
|
2006-06-25 21:37:36 +04:00
|
|
|
QEMU_RGB(0x00, 0x00, 0x00), /* black */
|
|
|
|
QEMU_RGB(0xaa, 0x00, 0x00), /* red */
|
|
|
|
QEMU_RGB(0x00, 0xaa, 0x00), /* green */
|
|
|
|
QEMU_RGB(0xaa, 0xaa, 0x00), /* yellow */
|
|
|
|
QEMU_RGB(0x00, 0x00, 0xaa), /* blue */
|
|
|
|
QEMU_RGB(0xaa, 0x00, 0xaa), /* magenta */
|
|
|
|
QEMU_RGB(0x00, 0xaa, 0xaa), /* cyan */
|
|
|
|
QEMU_RGB(0xaa, 0xaa, 0xaa), /* white */
|
2006-03-11 18:35:30 +03:00
|
|
|
},
|
|
|
|
{ /* bright */
|
2006-06-25 21:37:36 +04:00
|
|
|
QEMU_RGB(0x00, 0x00, 0x00), /* black */
|
|
|
|
QEMU_RGB(0xff, 0x00, 0x00), /* red */
|
|
|
|
QEMU_RGB(0x00, 0xff, 0x00), /* green */
|
|
|
|
QEMU_RGB(0xff, 0xff, 0x00), /* yellow */
|
|
|
|
QEMU_RGB(0x00, 0x00, 0xff), /* blue */
|
|
|
|
QEMU_RGB(0xff, 0x00, 0xff), /* magenta */
|
|
|
|
QEMU_RGB(0x00, 0xff, 0xff), /* cyan */
|
|
|
|
QEMU_RGB(0xff, 0xff, 0xff), /* white */
|
2006-03-11 18:35:30 +03:00
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static inline unsigned int col_expand(DisplayState *ds, unsigned int col)
|
|
|
|
{
|
2008-11-24 22:29:13 +03:00
|
|
|
switch(ds_get_bits_per_pixel(ds)) {
|
2004-07-14 21:28:59 +04:00
|
|
|
case 8:
|
|
|
|
col |= col << 8;
|
|
|
|
col |= col << 16;
|
|
|
|
break;
|
|
|
|
case 15:
|
|
|
|
case 16:
|
|
|
|
col |= col << 16;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return col;
|
|
|
|
}
|
2006-03-11 18:35:30 +03:00
|
|
|
#ifdef DEBUG_CONSOLE
|
|
|
|
static void console_print_text_attributes(TextAttributes *t_attrib, char ch)
|
|
|
|
{
|
|
|
|
if (t_attrib->bold) {
|
|
|
|
printf("b");
|
|
|
|
} else {
|
|
|
|
printf(" ");
|
|
|
|
}
|
|
|
|
if (t_attrib->uline) {
|
|
|
|
printf("u");
|
|
|
|
} else {
|
|
|
|
printf(" ");
|
|
|
|
}
|
|
|
|
if (t_attrib->blink) {
|
|
|
|
printf("l");
|
|
|
|
} else {
|
|
|
|
printf(" ");
|
|
|
|
}
|
|
|
|
if (t_attrib->invers) {
|
|
|
|
printf("i");
|
|
|
|
} else {
|
|
|
|
printf(" ");
|
|
|
|
}
|
|
|
|
if (t_attrib->unvisible) {
|
|
|
|
printf("n");
|
|
|
|
} else {
|
|
|
|
printf(" ");
|
|
|
|
}
|
|
|
|
|
|
|
|
printf(" fg: %d bg: %d ch:'%2X' '%c'\n", t_attrib->fgcol, t_attrib->bgcol, ch, ch);
|
|
|
|
}
|
|
|
|
#endif
|
2004-07-14 21:28:59 +04:00
|
|
|
|
2007-09-17 01:08:06 +04:00
|
|
|
static void vga_putcharxy(DisplayState *ds, int x, int y, int ch,
|
2006-03-11 18:35:30 +03:00
|
|
|
TextAttributes *t_attrib)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
|
|
|
uint8_t *d;
|
|
|
|
const uint8_t *font_ptr;
|
|
|
|
unsigned int font_data, linesize, xorcol, bpp;
|
|
|
|
int i;
|
2006-03-11 18:35:30 +03:00
|
|
|
unsigned int fgcol, bgcol;
|
|
|
|
|
|
|
|
#ifdef DEBUG_CONSOLE
|
|
|
|
printf("x: %2i y: %2i", x, y);
|
|
|
|
console_print_text_attributes(t_attrib, ch);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (t_attrib->invers) {
|
|
|
|
bgcol = color_table[t_attrib->bold][t_attrib->fgcol];
|
|
|
|
fgcol = color_table[t_attrib->bold][t_attrib->bgcol];
|
|
|
|
} else {
|
|
|
|
fgcol = color_table[t_attrib->bold][t_attrib->fgcol];
|
|
|
|
bgcol = color_table[t_attrib->bold][t_attrib->bgcol];
|
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
|
2008-11-24 22:29:13 +03:00
|
|
|
bpp = (ds_get_bits_per_pixel(ds) + 7) >> 3;
|
|
|
|
d = ds_get_data(ds) +
|
|
|
|
ds_get_linesize(ds) * y * FONT_HEIGHT + bpp * x * FONT_WIDTH;
|
|
|
|
linesize = ds_get_linesize(ds);
|
2004-07-14 21:28:59 +04:00
|
|
|
font_ptr = vgafont16 + FONT_HEIGHT * ch;
|
|
|
|
xorcol = bgcol ^ fgcol;
|
2008-11-24 22:29:13 +03:00
|
|
|
switch(ds_get_bits_per_pixel(ds)) {
|
2004-07-14 21:28:59 +04:00
|
|
|
case 8:
|
|
|
|
for(i = 0; i < FONT_HEIGHT; i++) {
|
|
|
|
font_data = *font_ptr++;
|
2006-03-11 18:35:30 +03:00
|
|
|
if (t_attrib->uline
|
|
|
|
&& ((i == FONT_HEIGHT - 2) || (i == FONT_HEIGHT - 3))) {
|
2011-11-04 13:38:29 +04:00
|
|
|
font_data = 0xFF;
|
2006-03-11 18:35:30 +03:00
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
((uint32_t *)d)[0] = (dmask16[(font_data >> 4)] & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[1] = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol;
|
|
|
|
d += linesize;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
case 15:
|
|
|
|
for(i = 0; i < FONT_HEIGHT; i++) {
|
|
|
|
font_data = *font_ptr++;
|
2006-03-11 18:35:30 +03:00
|
|
|
if (t_attrib->uline
|
|
|
|
&& ((i == FONT_HEIGHT - 2) || (i == FONT_HEIGHT - 3))) {
|
2011-11-04 13:38:29 +04:00
|
|
|
font_data = 0xFF;
|
2006-03-11 18:35:30 +03:00
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
((uint32_t *)d)[0] = (dmask4[(font_data >> 6)] & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[1] = (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[2] = (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[3] = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol;
|
|
|
|
d += linesize;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 32:
|
|
|
|
for(i = 0; i < FONT_HEIGHT; i++) {
|
|
|
|
font_data = *font_ptr++;
|
2006-03-11 18:35:30 +03:00
|
|
|
if (t_attrib->uline && ((i == FONT_HEIGHT - 2) || (i == FONT_HEIGHT - 3))) {
|
2011-11-04 13:38:29 +04:00
|
|
|
font_data = 0xFF;
|
2006-03-11 18:35:30 +03:00
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
((uint32_t *)d)[0] = (-((font_data >> 7)) & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[1] = (-((font_data >> 6) & 1) & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[2] = (-((font_data >> 5) & 1) & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[3] = (-((font_data >> 4) & 1) & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[4] = (-((font_data >> 3) & 1) & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[5] = (-((font_data >> 2) & 1) & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[6] = (-((font_data >> 1) & 1) & xorcol) ^ bgcol;
|
|
|
|
((uint32_t *)d)[7] = (-((font_data >> 0) & 1) & xorcol) ^ bgcol;
|
|
|
|
d += linesize;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-28 15:24:17 +04:00
|
|
|
static void text_console_resize(QemuConsole *s)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
|
|
|
TextCell *cells, *c, *c1;
|
|
|
|
int w1, x, y, last_width;
|
|
|
|
|
|
|
|
last_width = s->width;
|
|
|
|
s->width = s->g_width / FONT_WIDTH;
|
|
|
|
s->height = s->g_height / FONT_HEIGHT;
|
|
|
|
|
|
|
|
w1 = last_width;
|
|
|
|
if (s->width < w1)
|
|
|
|
w1 = s->width;
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
cells = g_malloc(s->width * s->total_height * sizeof(TextCell));
|
2004-07-14 21:28:59 +04: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 18:35:30 +03:00
|
|
|
c->t_attrib = s->t_attrib_default;
|
2004-07-14 21:28:59 +04:00
|
|
|
c++;
|
|
|
|
}
|
|
|
|
}
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(s->cells);
|
2004-07-14 21:28:59 +04:00
|
|
|
s->cells = cells;
|
|
|
|
}
|
|
|
|
|
2012-09-28 15:24:17 +04:00
|
|
|
static inline void text_update_xy(QemuConsole *s, int x, int y)
|
2008-02-10 19:33:14 +03: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 15:24:17 +04:00
|
|
|
static void invalidate_xy(QemuConsole *s, int x, int y)
|
2009-01-21 06:02:52 +03: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 15:24:17 +04:00
|
|
|
static void update_xy(QemuConsole *s, int x, int y)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
|
|
|
TextCell *c;
|
|
|
|
int y1, y2;
|
|
|
|
|
|
|
|
if (s == active_console) {
|
2008-11-24 22:29:13 +03:00
|
|
|
if (!ds_get_bits_per_pixel(s->ds)) {
|
2008-02-10 19:33:14 +03:00
|
|
|
text_update_xy(s, x, y);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-07-14 21:28:59 +04: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];
|
2007-09-17 01:08:06 +04:00
|
|
|
vga_putcharxy(s->ds, x, y2, c->ch,
|
2006-03-11 18:35:30 +03:00
|
|
|
&(c->t_attrib));
|
2009-01-21 06:02:52 +03:00
|
|
|
invalidate_xy(s, x, y2);
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-28 15:24:17 +04:00
|
|
|
static void console_show_cursor(QemuConsole *s, int show)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
|
|
|
TextCell *c;
|
|
|
|
int y, y1;
|
|
|
|
|
|
|
|
if (s == active_console) {
|
2007-02-11 01:37:56 +03:00
|
|
|
int x = s->x;
|
2008-02-10 19:33:14 +03:00
|
|
|
|
2008-11-24 22:29:13 +03:00
|
|
|
if (!ds_get_bits_per_pixel(s->ds)) {
|
2008-02-10 19:33:14 +03:00
|
|
|
s->cursor_invalidate = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-02-11 01:37:56 +03:00
|
|
|
if (x >= s->width) {
|
|
|
|
x = s->width - 1;
|
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
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) {
|
2007-02-11 01:37:56 +03:00
|
|
|
c = &s->cells[y1 * s->width + x];
|
2012-07-11 00:00:55 +04:00
|
|
|
if (show && s->cursor_visible_phase) {
|
2006-03-11 18:35:30 +03:00
|
|
|
TextAttributes t_attrib = s->t_attrib_default;
|
|
|
|
t_attrib.invers = !(t_attrib.invers); /* invert fg and bg */
|
2007-02-11 01:37:56 +03:00
|
|
|
vga_putcharxy(s->ds, x, y, c->ch, &t_attrib);
|
2004-07-14 21:28:59 +04:00
|
|
|
} else {
|
2007-02-11 01:37:56 +03:00
|
|
|
vga_putcharxy(s->ds, x, y, c->ch, &(c->t_attrib));
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
2009-01-21 06:02:52 +03:00
|
|
|
invalidate_xy(s, x, y);
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-28 15:24:17 +04:00
|
|
|
static void console_refresh(QemuConsole *s)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
|
|
|
TextCell *c;
|
|
|
|
int x, y, y1;
|
|
|
|
|
2007-09-17 01:08:06 +04:00
|
|
|
if (s != active_console)
|
2004-07-14 21:28:59 +04:00
|
|
|
return;
|
2012-09-28 17:02:08 +04:00
|
|
|
|
|
|
|
if (s->ds->have_text) {
|
2008-02-10 19:33:14 +03: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 21:28:59 +04:00
|
|
|
|
2012-09-28 17:02:08 +04:00
|
|
|
if (s->ds->have_gfx) {
|
|
|
|
vga_fill_rect(s->ds, 0, 0, ds_get_width(s->ds), ds_get_height(s->ds),
|
|
|
|
color_table[0][COLOR_BLACK]);
|
|
|
|
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->ds, x, y, c->ch,
|
|
|
|
&(c->t_attrib));
|
|
|
|
c++;
|
|
|
|
}
|
|
|
|
if (++y1 == s->total_height) {
|
|
|
|
y1 = 0;
|
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
2012-09-28 17:02:08 +04:00
|
|
|
console_show_cursor(s, 1);
|
|
|
|
dpy_gfx_update(s->ds, 0, 0, ds_get_width(s->ds), ds_get_height(s->ds));
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void console_scroll(int ydelta)
|
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s;
|
2004-07-14 21:28:59 +04:00
|
|
|
int i, y1;
|
2007-09-17 12:09:54 +04:00
|
|
|
|
2004-07-14 21:28:59 +04:00
|
|
|
s = active_console;
|
2007-07-12 03:14:59 +04:00
|
|
|
if (!s || (s->console_type == GRAPHIC_CONSOLE))
|
2004-07-14 21:28:59 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
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 15:24:17 +04:00
|
|
|
static void console_put_lf(QemuConsole *s)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
|
|
|
TextCell *c;
|
|
|
|
int x, y1;
|
|
|
|
|
|
|
|
s->y++;
|
|
|
|
if (s->y >= s->height) {
|
|
|
|
s->y = s->height - 1;
|
2006-03-11 18:35:30 +03:00
|
|
|
|
2004-07-14 21:28:59 +04: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 18:35:30 +03:00
|
|
|
c->t_attrib = s->t_attrib_default;
|
2004-07-14 21:28:59 +04:00
|
|
|
c++;
|
|
|
|
}
|
|
|
|
if (s == active_console && s->y_displayed == s->y_base) {
|
2008-11-24 22:29:13 +03:00
|
|
|
if (!ds_get_bits_per_pixel(s->ds)) {
|
2008-02-10 19:33:14 +03: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;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-09-17 01:08:06 +04:00
|
|
|
vga_bitblt(s->ds, 0, FONT_HEIGHT, 0, 0,
|
|
|
|
s->width * FONT_WIDTH,
|
2004-07-14 21:28:59 +04:00
|
|
|
(s->height - 1) * FONT_HEIGHT);
|
|
|
|
vga_fill_rect(s->ds, 0, (s->height - 1) * FONT_HEIGHT,
|
2007-09-17 01:08:06 +04:00
|
|
|
s->width * FONT_WIDTH, FONT_HEIGHT,
|
2006-03-11 18:35:30 +03:00
|
|
|
color_table[0][s->t_attrib_default.bgcol]);
|
2009-01-21 06:02:52 +03:00
|
|
|
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 21:28:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-11 18:35:30 +03: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 15:24:17 +04:00
|
|
|
static void console_handle_escape(QemuConsole *s)
|
2006-03-11 18:35:30 +03: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:
|
|
|
|
s->t_attrib.fgcol=COLOR_BLACK;
|
|
|
|
break;
|
|
|
|
case 31:
|
|
|
|
s->t_attrib.fgcol=COLOR_RED;
|
|
|
|
break;
|
|
|
|
case 32:
|
|
|
|
s->t_attrib.fgcol=COLOR_GREEN;
|
|
|
|
break;
|
|
|
|
case 33:
|
|
|
|
s->t_attrib.fgcol=COLOR_YELLOW;
|
|
|
|
break;
|
|
|
|
case 34:
|
|
|
|
s->t_attrib.fgcol=COLOR_BLUE;
|
|
|
|
break;
|
|
|
|
case 35:
|
|
|
|
s->t_attrib.fgcol=COLOR_MAGENTA;
|
|
|
|
break;
|
|
|
|
case 36:
|
|
|
|
s->t_attrib.fgcol=COLOR_CYAN;
|
|
|
|
break;
|
|
|
|
case 37:
|
|
|
|
s->t_attrib.fgcol=COLOR_WHITE;
|
|
|
|
break;
|
|
|
|
/* set background color */
|
|
|
|
case 40:
|
|
|
|
s->t_attrib.bgcol=COLOR_BLACK;
|
|
|
|
break;
|
|
|
|
case 41:
|
|
|
|
s->t_attrib.bgcol=COLOR_RED;
|
|
|
|
break;
|
|
|
|
case 42:
|
|
|
|
s->t_attrib.bgcol=COLOR_GREEN;
|
|
|
|
break;
|
|
|
|
case 43:
|
|
|
|
s->t_attrib.bgcol=COLOR_YELLOW;
|
|
|
|
break;
|
|
|
|
case 44:
|
|
|
|
s->t_attrib.bgcol=COLOR_BLUE;
|
|
|
|
break;
|
|
|
|
case 45:
|
|
|
|
s->t_attrib.bgcol=COLOR_MAGENTA;
|
|
|
|
break;
|
|
|
|
case 46:
|
|
|
|
s->t_attrib.bgcol=COLOR_CYAN;
|
|
|
|
break;
|
|
|
|
case 47:
|
|
|
|
s->t_attrib.bgcol=COLOR_WHITE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-28 15:24:17 +04:00
|
|
|
static void console_clear_xy(QemuConsole *s, int x, int y)
|
2007-01-17 02:02:36 +03: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);
|
|
|
|
}
|
|
|
|
|
2012-09-04 19:26:09 +04:00
|
|
|
/* set cursor, checking bounds */
|
2012-09-28 15:24:17 +04:00
|
|
|
static void set_cursor(QemuConsole *s, int x, int y)
|
2012-09-04 19:26:09 +04: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 15:24:17 +04:00
|
|
|
static void console_putchar(QemuConsole *s, int ch)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
|
|
|
TextCell *c;
|
2007-01-17 02:02:36 +03:00
|
|
|
int y1, i;
|
|
|
|
int x, y;
|
2004-07-14 21:28:59 +04:00
|
|
|
|
|
|
|
switch(s->state) {
|
|
|
|
case TTY_STATE_NORM:
|
|
|
|
switch(ch) {
|
2006-03-11 18:35:30 +03:00
|
|
|
case '\r': /* carriage return */
|
2004-07-14 21:28:59 +04:00
|
|
|
s->x = 0;
|
|
|
|
break;
|
2006-03-11 18:35:30 +03:00
|
|
|
case '\n': /* newline */
|
2004-07-14 21:28:59 +04:00
|
|
|
console_put_lf(s);
|
|
|
|
break;
|
2006-03-11 18:35:30 +03:00
|
|
|
case '\b': /* backspace */
|
2007-09-17 01:08:06 +04:00
|
|
|
if (s->x > 0)
|
2006-06-25 20:26:29 +04:00
|
|
|
s->x--;
|
2006-03-11 18:35:30 +03:00
|
|
|
break;
|
|
|
|
case '\t': /* tabspace */
|
|
|
|
if (s->x + (8 - (s->x % 8)) > s->width) {
|
2006-07-15 00:24:31 +04:00
|
|
|
s->x = 0;
|
2006-03-11 18:35:30 +03: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-17 02:02:36 +03:00
|
|
|
case 14:
|
|
|
|
/* SI (shift in), character set 0 (ignored) */
|
|
|
|
break;
|
|
|
|
case 15:
|
|
|
|
/* SO (shift out), character set 1 (ignored) */
|
|
|
|
break;
|
2006-03-11 18:35:30 +03:00
|
|
|
case 27: /* esc (introducing an escape sequence) */
|
2004-07-14 21:28:59 +04:00
|
|
|
s->state = TTY_STATE_ESC;
|
|
|
|
break;
|
|
|
|
default:
|
2007-02-11 01:37:56 +03:00
|
|
|
if (s->x >= s->width) {
|
|
|
|
/* line wrap */
|
|
|
|
s->x = 0;
|
|
|
|
console_put_lf(s);
|
2007-01-17 02:02:36 +03:00
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
y1 = (s->y_base + s->y) % s->total_height;
|
|
|
|
c = &s->cells[y1 * s->width + s->x];
|
|
|
|
c->ch = ch;
|
2006-03-11 18:35:30 +03:00
|
|
|
c->t_attrib = s->t_attrib;
|
2004-07-14 21:28:59 +04:00
|
|
|
update_xy(s, s->x, s->y);
|
|
|
|
s->x++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2006-03-11 18:35:30 +03:00
|
|
|
case TTY_STATE_ESC: /* check if it is a terminal escape sequence */
|
2004-07-14 21:28:59 +04: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 18:35:30 +03:00
|
|
|
case TTY_STATE_CSI: /* handle escape sequence parameters */
|
2004-07-14 21:28:59 +04:00
|
|
|
if (ch >= '0' && ch <= '9') {
|
|
|
|
if (s->nb_esc_params < MAX_ESC_PARAMS) {
|
2012-09-17 13:10:03 +04: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 21:28:59 +04:00
|
|
|
}
|
|
|
|
} else {
|
2012-09-04 19:26:09 +04:00
|
|
|
if (s->nb_esc_params < MAX_ESC_PARAMS)
|
|
|
|
s->nb_esc_params++;
|
2004-07-14 21:28:59 +04:00
|
|
|
if (ch == ';')
|
|
|
|
break;
|
2007-01-17 02:02:36 +03:00
|
|
|
#ifdef DEBUG_CONSOLE
|
|
|
|
fprintf(stderr, "escape sequence CSI%d;%d%c, %d parameters\n",
|
|
|
|
s->esc_params[0], s->esc_params[1], ch, s->nb_esc_params);
|
|
|
|
#endif
|
2004-07-14 21:28:59 +04:00
|
|
|
s->state = TTY_STATE_NORM;
|
|
|
|
switch(ch) {
|
2007-01-17 02:02:36 +03:00
|
|
|
case 'A':
|
|
|
|
/* move cursor up */
|
|
|
|
if (s->esc_params[0] == 0) {
|
|
|
|
s->esc_params[0] = 1;
|
|
|
|
}
|
2012-09-04 19:26:09 +04:00
|
|
|
set_cursor(s, s->x, s->y - s->esc_params[0]);
|
2007-01-17 02:02:36 +03:00
|
|
|
break;
|
|
|
|
case 'B':
|
|
|
|
/* move cursor down */
|
|
|
|
if (s->esc_params[0] == 0) {
|
|
|
|
s->esc_params[0] = 1;
|
|
|
|
}
|
2012-09-04 19:26:09 +04:00
|
|
|
set_cursor(s, s->x, s->y + s->esc_params[0]);
|
2004-07-14 21:28:59 +04:00
|
|
|
break;
|
|
|
|
case 'C':
|
2007-01-17 02:02:36 +03:00
|
|
|
/* move cursor right */
|
|
|
|
if (s->esc_params[0] == 0) {
|
|
|
|
s->esc_params[0] = 1;
|
|
|
|
}
|
2012-09-04 19:26:09 +04:00
|
|
|
set_cursor(s, s->x + s->esc_params[0], s->y);
|
2004-07-14 21:28:59 +04:00
|
|
|
break;
|
2007-01-17 02:02:36 +03:00
|
|
|
case 'D':
|
|
|
|
/* move cursor left */
|
|
|
|
if (s->esc_params[0] == 0) {
|
|
|
|
s->esc_params[0] = 1;
|
|
|
|
}
|
2012-09-04 19:26:09 +04:00
|
|
|
set_cursor(s, s->x - s->esc_params[0], s->y);
|
2007-01-17 02:02:36 +03:00
|
|
|
break;
|
|
|
|
case 'G':
|
|
|
|
/* move cursor to column */
|
2012-09-04 19:26:09 +04:00
|
|
|
set_cursor(s, s->esc_params[0] - 1, s->y);
|
2007-01-17 02:02:36 +03:00
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
case 'H':
|
|
|
|
/* move cursor to row, column */
|
2012-09-04 19:26:09 +04:00
|
|
|
set_cursor(s, s->esc_params[1] - 1, s->esc_params[0] - 1);
|
2007-01-17 02:02:36 +03: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 14:59:06 +04:00
|
|
|
break;
|
2007-01-17 02:02:36 +03:00
|
|
|
}
|
2011-11-22 14:59:07 +04:00
|
|
|
break;
|
2004-07-14 21:28:59 +04:00
|
|
|
case 'K':
|
2007-01-17 02:02:36 +03:00
|
|
|
switch (s->esc_params[0]) {
|
|
|
|
case 0:
|
2011-11-22 14:59:06 +04:00
|
|
|
/* clear to eol */
|
|
|
|
for(x = s->x; x < s->width; x++) {
|
2007-01-17 02:02:36 +03:00
|
|
|
console_clear_xy(s, x, s->y);
|
2011-11-22 14:59:06 +04:00
|
|
|
}
|
|
|
|
break;
|
2007-01-17 02:02:36 +03: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 14:59:06 +04:00
|
|
|
break;
|
|
|
|
}
|
2007-01-17 02:02:36 +03:00
|
|
|
break;
|
|
|
|
case 'm':
|
2011-11-22 14:59:06 +04:00
|
|
|
console_handle_escape(s);
|
|
|
|
break;
|
2007-01-17 02:02:36 +03:00
|
|
|
case 'n':
|
|
|
|
/* report cursor position */
|
|
|
|
/* TODO: send ESC[row;colR */
|
|
|
|
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:
|
|
|
|
#ifdef DEBUG_CONSOLE
|
|
|
|
fprintf(stderr, "unhandled escape character '%c'\n", ch);
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void console_select(unsigned int index)
|
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s;
|
2006-03-11 18:35:30 +03:00
|
|
|
|
2004-07-14 21:28:59 +04:00
|
|
|
if (index >= MAX_CONSOLES)
|
|
|
|
return;
|
2010-09-20 17:11:19 +04:00
|
|
|
if (active_console) {
|
|
|
|
active_console->g_width = ds_get_width(active_console->ds);
|
|
|
|
active_console->g_height = ds_get_height(active_console->ds);
|
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
s = consoles[index];
|
|
|
|
if (s) {
|
2009-01-16 01:14:11 +03:00
|
|
|
DisplayState *ds = s->ds;
|
2012-07-11 00:00:55 +04:00
|
|
|
|
2012-08-17 17:50:44 +04:00
|
|
|
if (active_console && active_console->cursor_timer) {
|
2012-07-11 00:00:55 +04:00
|
|
|
qemu_del_timer(active_console->cursor_timer);
|
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
active_console = s;
|
2012-09-28 17:02:08 +04:00
|
|
|
if (ds->have_gfx) {
|
2009-03-13 18:02:13 +03:00
|
|
|
ds->surface = qemu_resize_displaysurface(ds, s->g_width, s->g_height);
|
2012-09-28 17:02:08 +04:00
|
|
|
dpy_gfx_resize(ds);
|
|
|
|
}
|
|
|
|
if (ds->have_text) {
|
|
|
|
dpy_text_resize(ds, s->width, s->height);
|
2009-01-21 21:59:12 +03:00
|
|
|
}
|
2012-07-11 00:00:55 +04:00
|
|
|
if (s->cursor_timer) {
|
|
|
|
qemu_mod_timer(s->cursor_timer,
|
|
|
|
qemu_get_clock_ms(rt_clock) + CONSOLE_CURSOR_PERIOD / 2);
|
|
|
|
}
|
2008-02-10 19:33:14 +03:00
|
|
|
vga_hw_invalidate();
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int console_puts(CharDriverState *chr, const uint8_t *buf, int len)
|
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s = chr->opaque;
|
2004-07-14 21:28:59 +04:00
|
|
|
int i;
|
|
|
|
|
2009-01-21 06:02:52 +03: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 21:28:59 +04: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 17:02:08 +04:00
|
|
|
if (s->ds->have_gfx && s->update_x0 < s->update_x1) {
|
|
|
|
dpy_gfx_update(s->ds, s->update_x0, s->update_y0,
|
|
|
|
s->update_x1 - s->update_x0,
|
|
|
|
s->update_y1 - s->update_y0);
|
2009-01-21 06:02:52 +03:00
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2006-06-25 20:26:29 +04:00
|
|
|
static void kbd_send_chars(void *opaque)
|
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s = opaque;
|
2006-06-25 20:26:29 +04:00
|
|
|
int len;
|
|
|
|
uint8_t buf[16];
|
2007-09-17 12:09:54 +04:00
|
|
|
|
2011-08-15 20:17:31 +04:00
|
|
|
len = qemu_chr_be_can_write(s->chr);
|
2006-06-25 20:26:29 +04: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 20:17:30 +04:00
|
|
|
qemu_chr_be_write(s->chr, buf, len);
|
2006-06-25 20:26:29 +04:00
|
|
|
}
|
|
|
|
/* characters are pending: we send them a bit later (XXX:
|
|
|
|
horrible, should change char device API) */
|
|
|
|
if (s->out_fifo.count > 0) {
|
2011-03-11 18:47:48 +03:00
|
|
|
qemu_mod_timer(s->kbd_timer, qemu_get_clock_ms(rt_clock) + 1);
|
2006-06-25 20:26:29 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-07-14 21:28:59 +04:00
|
|
|
/* called when an ascii key is pressed */
|
|
|
|
void kbd_put_keysym(int keysym)
|
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s;
|
2004-07-14 21:28:59 +04:00
|
|
|
uint8_t buf[16], *q;
|
|
|
|
int c;
|
|
|
|
|
|
|
|
s = active_console;
|
2007-07-12 03:14:59 +04:00
|
|
|
if (!s || (s->console_type == GRAPHIC_CONSOLE))
|
2004-07-14 21:28:59 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
switch(keysym) {
|
|
|
|
case QEMU_KEY_CTRL_UP:
|
|
|
|
console_scroll(-1);
|
|
|
|
break;
|
|
|
|
case QEMU_KEY_CTRL_DOWN:
|
|
|
|
console_scroll(1);
|
|
|
|
break;
|
|
|
|
case QEMU_KEY_CTRL_PAGEUP:
|
|
|
|
console_scroll(-10);
|
|
|
|
break;
|
|
|
|
case QEMU_KEY_CTRL_PAGEDOWN:
|
|
|
|
console_scroll(10);
|
|
|
|
break;
|
|
|
|
default:
|
2006-06-25 20:26:29 +04: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 15:42:52 +03:00
|
|
|
} else if (s->echo && (keysym == '\r' || keysym == '\n')) {
|
|
|
|
console_puts(s->chr, (const uint8_t *) "\r", 1);
|
|
|
|
*q++ = '\n';
|
2006-06-25 20:26:29 +04:00
|
|
|
} else {
|
2010-12-23 15:42:52 +03:00
|
|
|
*q++ = keysym;
|
|
|
|
}
|
|
|
|
if (s->echo) {
|
|
|
|
console_puts(s->chr, buf, q - buf);
|
2006-06-25 20:26:29 +04:00
|
|
|
}
|
2007-01-28 02:46:43 +03:00
|
|
|
if (s->chr->chr_read) {
|
2006-06-25 20:26:29 +04:00
|
|
|
qemu_fifo_write(&s->out_fifo, buf, q - buf);
|
|
|
|
kbd_send_chars(s);
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-10 19:33:14 +03:00
|
|
|
static void text_console_invalidate(void *opaque)
|
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s = (QemuConsole *) opaque;
|
2009-01-21 21:59:12 +03:00
|
|
|
if (!ds_get_bits_per_pixel(s->ds) && s->console_type == TEXT_CONSOLE) {
|
|
|
|
s->g_width = ds_get_width(s->ds);
|
|
|
|
s->g_height = ds_get_height(s->ds);
|
|
|
|
text_console_resize(s);
|
|
|
|
}
|
2008-02-10 19:33:14 +03:00
|
|
|
console_refresh(s);
|
|
|
|
}
|
|
|
|
|
2009-10-02 01:12:16 +04:00
|
|
|
static void text_console_update(void *opaque, console_ch_t *chardata)
|
2008-02-10 19:33:14 +03:00
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s = (QemuConsole *) opaque;
|
2008-02-10 19:33:14 +03: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 ++)
|
|
|
|
for (j = 0; j < s->width; j ++, src ++)
|
|
|
|
console_write_ch(chardata ++, s->cells[src].ch |
|
|
|
|
(s->cells[src].t_attrib.fgcol << 12) |
|
|
|
|
(s->cells[src].t_attrib.bgcol << 8) |
|
|
|
|
(s->cells[src].t_attrib.bold << 21));
|
2012-09-28 17:02:08 +04:00
|
|
|
dpy_text_update(s->ds, s->text_x[0], s->text_y[0],
|
|
|
|
s->text_x[1] - s->text_x[0], i - s->text_y[0]);
|
2008-02-10 19:33:14 +03: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) {
|
2012-09-12 09:56:45 +04:00
|
|
|
dpy_text_cursor(s->ds, s->x, s->y);
|
2008-02-10 19:33:14 +03:00
|
|
|
s->cursor_invalidate = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-28 15:24:17 +04:00
|
|
|
static QemuConsole *get_graphic_console(DisplayState *ds)
|
2009-01-16 22:41:04 +03:00
|
|
|
{
|
2009-01-16 22:04:14 +03:00
|
|
|
int i;
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s;
|
2009-01-16 22:04:14 +03:00
|
|
|
for (i = 0; i < nb_consoles; i++) {
|
|
|
|
s = consoles[i];
|
2009-01-17 00:01:48 +03:00
|
|
|
if (s->console_type == GRAPHIC_CONSOLE && s->ds == ds)
|
2009-01-16 22:04:14 +03:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-09-28 15:24:17 +04:00
|
|
|
static QemuConsole *new_console(DisplayState *ds, console_type_t console_type)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s;
|
2006-04-09 05:06:34 +04:00
|
|
|
int i;
|
2004-07-14 21:28:59 +04:00
|
|
|
|
|
|
|
if (nb_consoles >= MAX_CONSOLES)
|
|
|
|
return NULL;
|
2012-09-28 15:24:17 +04:00
|
|
|
s = g_malloc0(sizeof(QemuConsole));
|
2007-07-12 03:14:59 +04:00
|
|
|
if (!active_console || ((active_console->console_type != GRAPHIC_CONSOLE) &&
|
|
|
|
(console_type == GRAPHIC_CONSOLE))) {
|
2004-07-14 21:28:59 +04:00
|
|
|
active_console = s;
|
2007-07-12 03:14:59 +04:00
|
|
|
}
|
2004-07-14 21:28:59 +04:00
|
|
|
s->ds = ds;
|
2007-07-12 03:14:59 +04:00
|
|
|
s->console_type = console_type;
|
|
|
|
if (console_type != GRAPHIC_CONSOLE) {
|
2011-09-16 02:48:07 +04:00
|
|
|
s->index = nb_consoles;
|
2006-04-09 05:06:34 +04:00
|
|
|
consoles[nb_consoles++] = s;
|
|
|
|
} else {
|
|
|
|
/* HACK: Put graphical consoles before text consoles. */
|
|
|
|
for (i = nb_consoles; i > 0; i--) {
|
2007-07-12 03:14:59 +04:00
|
|
|
if (consoles[i - 1]->console_type == GRAPHIC_CONSOLE)
|
2006-04-09 05:06:34 +04:00
|
|
|
break;
|
|
|
|
consoles[i] = consoles[i - 1];
|
2011-09-16 02:48:07 +04:00
|
|
|
consoles[i]->index = i;
|
2006-04-09 05:06:34 +04:00
|
|
|
}
|
2011-09-16 02:48:07 +04:00
|
|
|
s->index = i;
|
2006-04-09 05:06:34 +04:00
|
|
|
consoles[i] = s;
|
2009-01-16 22:04:14 +03:00
|
|
|
nb_consoles++;
|
2006-04-09 05:06:34 +04:00
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2012-09-27 13:06:36 +04:00
|
|
|
static void qemu_alloc_display(DisplaySurface *surface, int width, int height,
|
|
|
|
int linesize, PixelFormat pf, int newflags)
|
2011-03-16 15:33:30 +03:00
|
|
|
{
|
|
|
|
surface->pf = pf;
|
2012-09-26 17:20:05 +04:00
|
|
|
|
|
|
|
qemu_pixman_image_unref(surface->image);
|
|
|
|
surface->image = NULL;
|
|
|
|
|
|
|
|
surface->format = qemu_pixman_get_format(&pf);
|
|
|
|
assert(surface->format != 0);
|
|
|
|
surface->image = pixman_image_create_bits(surface->format,
|
|
|
|
width, height,
|
|
|
|
NULL, linesize);
|
|
|
|
assert(surface->image != NULL);
|
|
|
|
|
2011-03-16 15:33:30 +03:00
|
|
|
surface->flags = newflags | QEMU_ALLOCATED_FLAG;
|
2010-02-11 02:29:57 +03:00
|
|
|
#ifdef HOST_WORDS_BIGENDIAN
|
2011-03-16 15:33:30 +03:00
|
|
|
surface->flags |= QEMU_BIG_ENDIAN_FLAG;
|
2010-02-11 02:29:57 +03:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2012-09-27 13:06:36 +04:00
|
|
|
DisplaySurface *qemu_create_displaysurface(DisplayState *ds,
|
|
|
|
int width, int height)
|
|
|
|
{
|
|
|
|
DisplaySurface *surface = g_new0(DisplaySurface, 1);
|
|
|
|
|
|
|
|
int linesize = width * 4;
|
|
|
|
qemu_alloc_display(surface, width, height, linesize,
|
|
|
|
qemu_default_pixelformat(32), 0);
|
|
|
|
return surface;
|
|
|
|
}
|
|
|
|
|
|
|
|
DisplaySurface *qemu_resize_displaysurface(DisplayState *ds,
|
|
|
|
int width, int height)
|
|
|
|
{
|
|
|
|
int linesize = width * 4;
|
|
|
|
|
|
|
|
trace_displaysurface_resize(ds, ds->surface, width, height);
|
|
|
|
qemu_alloc_display(ds->surface, width, height, linesize,
|
|
|
|
qemu_default_pixelformat(32), 0);
|
|
|
|
return ds->surface;
|
|
|
|
}
|
|
|
|
|
2012-09-26 09:46:20 +04:00
|
|
|
DisplaySurface *qemu_create_displaysurface_from(int width, int height, int bpp,
|
2012-09-26 17:20:05 +04:00
|
|
|
int linesize, uint8_t *data)
|
2010-02-11 02:29:57 +03:00
|
|
|
{
|
2012-09-26 17:20:05 +04:00
|
|
|
DisplaySurface *surface = g_new0(DisplaySurface, 1);
|
2010-02-11 02:29:57 +03:00
|
|
|
|
|
|
|
surface->pf = qemu_default_pixelformat(bpp);
|
2012-09-26 17:20:05 +04:00
|
|
|
|
|
|
|
surface->format = qemu_pixman_get_format(&surface->pf);
|
|
|
|
assert(surface->format != 0);
|
|
|
|
surface->image = pixman_image_create_bits(surface->format,
|
|
|
|
width, height,
|
|
|
|
(void *)data, linesize);
|
|
|
|
assert(surface->image != NULL);
|
|
|
|
|
2010-02-11 02:29:57 +03:00
|
|
|
#ifdef HOST_WORDS_BIGENDIAN
|
|
|
|
surface->flags = QEMU_BIG_ENDIAN_FLAG;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return surface;
|
|
|
|
}
|
|
|
|
|
2012-09-26 09:46:20 +04:00
|
|
|
void qemu_free_displaysurface(DisplayState *ds)
|
2010-02-11 02:29:57 +03:00
|
|
|
{
|
2012-09-26 09:46:20 +04:00
|
|
|
trace_displaysurface_free(ds, ds->surface);
|
|
|
|
if (ds->surface == NULL) {
|
2010-02-11 02:29:57 +03:00
|
|
|
return;
|
2012-09-26 09:46:20 +04:00
|
|
|
}
|
2012-09-26 17:20:05 +04:00
|
|
|
qemu_pixman_image_unref(ds->surface->image);
|
2012-09-26 09:46:20 +04:00
|
|
|
g_free(ds->surface);
|
2010-02-11 02:29:57 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dumb_display_init(void)
|
|
|
|
{
|
2011-08-21 07:09:37 +04:00
|
|
|
DisplayState *ds = g_malloc0(sizeof(DisplayState));
|
2011-06-19 13:53:02 +04:00
|
|
|
int width = 640;
|
|
|
|
int height = 480;
|
|
|
|
|
|
|
|
if (is_fixedsize_console()) {
|
|
|
|
width = active_console->g_width;
|
|
|
|
height = active_console->g_height;
|
|
|
|
}
|
|
|
|
ds->surface = qemu_create_displaysurface(ds, width, height);
|
2010-02-11 02:29:57 +03:00
|
|
|
register_displaystate(ds);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************/
|
|
|
|
/* register display */
|
|
|
|
|
|
|
|
void register_displaystate(DisplayState *ds)
|
|
|
|
{
|
|
|
|
DisplayState **s;
|
|
|
|
s = &display_state;
|
|
|
|
while (*s != NULL)
|
|
|
|
s = &(*s)->next;
|
|
|
|
ds->next = NULL;
|
|
|
|
*s = ds;
|
|
|
|
}
|
|
|
|
|
|
|
|
DisplayState *get_displaystate(void)
|
|
|
|
{
|
|
|
|
if (!display_state) {
|
|
|
|
dumb_display_init ();
|
|
|
|
}
|
|
|
|
return display_state;
|
|
|
|
}
|
|
|
|
|
2009-01-16 22:04:14 +03:00
|
|
|
DisplayState *graphic_console_init(vga_hw_update_ptr update,
|
|
|
|
vga_hw_invalidate_ptr invalidate,
|
|
|
|
vga_hw_screen_dump_ptr screen_dump,
|
|
|
|
vga_hw_text_update_ptr text_update,
|
|
|
|
void *opaque)
|
2006-04-09 05:06:34 +04:00
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s;
|
2009-01-16 22:04:14 +03:00
|
|
|
DisplayState *ds;
|
2009-01-17 00:13:49 +03:00
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
ds = (DisplayState *) g_malloc0(sizeof(DisplayState));
|
2009-03-13 18:02:13 +03:00
|
|
|
ds->surface = qemu_create_displaysurface(ds, 640, 480);
|
2006-04-09 05:06:34 +04:00
|
|
|
|
2007-07-12 03:14:59 +04:00
|
|
|
s = new_console(ds, GRAPHIC_CONSOLE);
|
2009-01-16 22:04:14 +03:00
|
|
|
if (s == NULL) {
|
2009-03-13 18:02:13 +03:00
|
|
|
qemu_free_displaysurface(ds);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(ds);
|
2009-01-16 22:04:14 +03:00
|
|
|
return NULL;
|
|
|
|
}
|
2006-04-09 05:06:34 +04:00
|
|
|
s->hw_update = update;
|
|
|
|
s->hw_invalidate = invalidate;
|
|
|
|
s->hw_screen_dump = screen_dump;
|
2008-02-10 19:33:14 +03:00
|
|
|
s->hw_text_update = text_update;
|
2006-04-09 05:06:34 +04:00
|
|
|
s->hw = opaque;
|
2009-01-16 22:04:14 +03:00
|
|
|
|
2009-01-17 00:13:49 +03:00
|
|
|
register_displaystate(ds);
|
2009-01-16 22:04:14 +03:00
|
|
|
return ds;
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
|
2006-04-09 05:06:34 +04:00
|
|
|
int is_graphic_console(void)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
2008-02-10 19:33:14 +03:00
|
|
|
return active_console && active_console->console_type == GRAPHIC_CONSOLE;
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
|
2008-09-24 07:32:33 +04:00
|
|
|
int is_fixedsize_console(void)
|
|
|
|
{
|
|
|
|
return active_console && active_console->console_type != TEXT_CONSOLE;
|
|
|
|
}
|
|
|
|
|
2007-10-31 01:38:53 +03:00
|
|
|
void console_color_init(DisplayState *ds)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
for (j = 0; j < 2; j++) {
|
|
|
|
for (i = 0; i < 8; i++) {
|
2009-01-17 00:13:49 +03:00
|
|
|
color_table[j][i] = col_expand(ds,
|
2007-10-31 01:38:53 +03:00
|
|
|
vga_get_color(ds, color_table_rgb[j][i]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-23 15:42:52 +03:00
|
|
|
static void text_console_set_echo(CharDriverState *chr, bool echo)
|
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s = chr->opaque;
|
2010-12-23 15:42:52 +03:00
|
|
|
|
|
|
|
s->echo = echo;
|
|
|
|
}
|
|
|
|
|
2012-07-11 00:00:55 +04:00
|
|
|
static void text_console_update_cursor(void *opaque)
|
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s = opaque;
|
2012-07-11 00:00:55 +04:00
|
|
|
|
|
|
|
s->cursor_visible_phase = !s->cursor_visible_phase;
|
|
|
|
vga_hw_invalidate();
|
|
|
|
qemu_mod_timer(s->cursor_timer,
|
|
|
|
qemu_get_clock_ms(rt_clock) + CONSOLE_CURSOR_PERIOD / 2);
|
|
|
|
}
|
|
|
|
|
2010-12-23 15:42:53 +03:00
|
|
|
static void text_console_do_init(CharDriverState *chr, DisplayState *ds)
|
2004-07-14 21:28:59 +04:00
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s;
|
2004-07-14 21:28:59 +04:00
|
|
|
static int color_inited;
|
2006-03-11 18:35:30 +03:00
|
|
|
|
2010-12-23 15:42:51 +03:00
|
|
|
s = chr->opaque;
|
2009-09-10 12:58:49 +04:00
|
|
|
|
2004-07-14 21:28:59 +04:00
|
|
|
chr->chr_write = console_puts;
|
2004-08-02 01:48:30 +04:00
|
|
|
|
2006-06-25 20:26:29 +04:00
|
|
|
s->out_fifo.buf = s->out_fifo_buf;
|
|
|
|
s->out_fifo.buf_size = sizeof(s->out_fifo_buf);
|
2011-03-11 18:47:48 +03:00
|
|
|
s->kbd_timer = qemu_new_timer_ms(rt_clock, kbd_send_chars, s);
|
2009-01-16 22:04:14 +03:00
|
|
|
s->ds = ds;
|
2007-09-17 12:09:54 +04:00
|
|
|
|
2004-07-14 21:28:59 +04:00
|
|
|
if (!color_inited) {
|
|
|
|
color_inited = 1;
|
2007-10-31 01:38:53 +03:00
|
|
|
console_color_init(s->ds);
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
|
|
|
s->y_displayed = 0;
|
|
|
|
s->y_base = 0;
|
|
|
|
s->total_height = DEFAULT_BACKSCROLL;
|
|
|
|
s->x = 0;
|
|
|
|
s->y = 0;
|
2010-12-23 15:42:51 +03:00
|
|
|
if (s->console_type == TEXT_CONSOLE) {
|
|
|
|
s->g_width = ds_get_width(s->ds);
|
|
|
|
s->g_height = ds_get_height(s->ds);
|
|
|
|
}
|
2006-03-11 18:35:30 +03:00
|
|
|
|
2012-07-11 00:00:55 +04:00
|
|
|
s->cursor_timer =
|
|
|
|
qemu_new_timer_ms(rt_clock, text_console_update_cursor, s);
|
|
|
|
|
2008-02-10 19:33:14 +03:00
|
|
|
s->hw_invalidate = text_console_invalidate;
|
|
|
|
s->hw_text_update = text_console_update;
|
|
|
|
s->hw = s;
|
|
|
|
|
2006-03-11 18:35:30 +03: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;
|
|
|
|
s->t_attrib_default.fgcol = COLOR_WHITE;
|
|
|
|
s->t_attrib_default.bgcol = COLOR_BLACK;
|
|
|
|
/* set current text attributes to default */
|
|
|
|
s->t_attrib = s->t_attrib_default;
|
2004-07-14 21:28:59 +04:00
|
|
|
text_console_resize(s);
|
|
|
|
|
2009-12-08 15:11:39 +03:00
|
|
|
if (chr->label) {
|
|
|
|
char msg[128];
|
|
|
|
int len;
|
|
|
|
|
2009-12-08 15:11:40 +03:00
|
|
|
s->t_attrib.bgcol = COLOR_BLUE;
|
2009-12-08 15:11:39 +03:00
|
|
|
len = snprintf(msg, sizeof(msg), "%s console\r\n", chr->label);
|
|
|
|
console_puts(chr, (uint8_t*)msg, len);
|
2009-12-08 15:11:40 +03:00
|
|
|
s->t_attrib = s->t_attrib_default;
|
2009-12-08 15:11:39 +03:00
|
|
|
}
|
|
|
|
|
2009-11-03 17:29:56 +03:00
|
|
|
qemu_chr_generic_open(chr);
|
2009-01-18 17:08:04 +03:00
|
|
|
if (chr->init)
|
|
|
|
chr->init(chr);
|
2004-07-14 21:28:59 +04:00
|
|
|
}
|
2008-07-01 20:24:38 +04:00
|
|
|
|
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 18:09:08 +04:00
|
|
|
CharDriverState *text_console_init(QemuOpts *opts)
|
2009-01-16 23:23:27 +03:00
|
|
|
{
|
|
|
|
CharDriverState *chr;
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s;
|
2010-12-23 15:42:51 +03:00
|
|
|
unsigned width;
|
|
|
|
unsigned height;
|
2009-01-16 23:23:27 +03:00
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
chr = g_malloc0(sizeof(CharDriverState));
|
2009-01-16 23:23:27 +03:00
|
|
|
|
2010-12-23 15:42:51 +03:00
|
|
|
width = qemu_opt_get_number(opts, "width", 0);
|
|
|
|
if (width == 0)
|
|
|
|
width = qemu_opt_get_number(opts, "cols", 0) * FONT_WIDTH;
|
|
|
|
|
|
|
|
height = qemu_opt_get_number(opts, "height", 0);
|
|
|
|
if (height == 0)
|
|
|
|
height = qemu_opt_get_number(opts, "rows", 0) * FONT_HEIGHT;
|
|
|
|
|
|
|
|
if (width == 0 || height == 0) {
|
|
|
|
s = new_console(NULL, TEXT_CONSOLE);
|
|
|
|
} else {
|
|
|
|
s = new_console(NULL, TEXT_CONSOLE_FIXED_SIZE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!s) {
|
2011-10-02 20:53:09 +04:00
|
|
|
g_free(chr);
|
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 18:09:08 +04:00
|
|
|
return NULL;
|
2010-12-23 15:42:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
s->chr = chr;
|
|
|
|
s->g_width = width;
|
|
|
|
s->g_height = height;
|
|
|
|
chr->opaque = s;
|
2010-12-23 15:42:52 +03:00
|
|
|
chr->chr_set_echo = text_console_set_echo;
|
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 18:09:08 +04:00
|
|
|
return chr;
|
2009-01-16 23:23:27 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void text_consoles_set_display(DisplayState *ds)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2012-02-07 18:09:21 +04:00
|
|
|
for (i = 0; i < nb_consoles; i++) {
|
|
|
|
if (consoles[i]->console_type != GRAPHIC_CONSOLE) {
|
|
|
|
text_console_do_init(consoles[i]->chr, ds);
|
|
|
|
}
|
2009-01-16 23:23:27 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-16 22:04:14 +03:00
|
|
|
void qemu_console_resize(DisplayState *ds, int width, int height)
|
2008-07-01 20:24:38 +04:00
|
|
|
{
|
2012-09-28 15:24:17 +04:00
|
|
|
QemuConsole *s = get_graphic_console(ds);
|
2009-01-21 22:18:00 +03:00
|
|
|
if (!s) return;
|
|
|
|
|
2009-01-16 22:04:14 +03:00
|
|
|
s->g_width = width;
|
|
|
|
s->g_height = height;
|
|
|
|
if (is_graphic_console()) {
|
2009-03-13 18:02:13 +03:00
|
|
|
ds->surface = qemu_resize_displaysurface(ds, width, height);
|
2012-09-28 17:02:08 +04:00
|
|
|
dpy_gfx_resize(ds);
|
2008-07-01 20:24:38 +04:00
|
|
|
}
|
|
|
|
}
|
2008-09-24 06:21:24 +04:00
|
|
|
|
2009-01-16 22:04:14 +03:00
|
|
|
void qemu_console_copy(DisplayState *ds, int src_x, int src_y,
|
|
|
|
int dst_x, int dst_y, int w, int h)
|
2008-09-24 07:32:33 +04:00
|
|
|
{
|
2009-01-16 22:04:14 +03:00
|
|
|
if (is_graphic_console()) {
|
2012-09-28 17:02:08 +04:00
|
|
|
dpy_gfx_copy(ds, src_x, src_y, dst_x, dst_y, w, h);
|
2008-09-24 06:21:24 +04:00
|
|
|
}
|
|
|
|
}
|
2009-01-16 01:14:11 +03:00
|
|
|
|
2009-01-23 22:56:19 +03:00
|
|
|
PixelFormat qemu_different_endianness_pixelformat(int bpp)
|
2009-01-16 01:14:11 +03:00
|
|
|
{
|
|
|
|
PixelFormat pf;
|
|
|
|
|
|
|
|
memset(&pf, 0x00, sizeof(PixelFormat));
|
|
|
|
|
|
|
|
pf.bits_per_pixel = bpp;
|
2012-08-22 19:19:42 +04:00
|
|
|
pf.bytes_per_pixel = DIV_ROUND_UP(bpp, 8);
|
2009-01-16 01:14:11 +03:00
|
|
|
pf.depth = bpp == 32 ? 24 : bpp;
|
|
|
|
|
|
|
|
switch (bpp) {
|
2009-01-23 22:56:19 +03:00
|
|
|
case 24:
|
|
|
|
pf.rmask = 0x000000FF;
|
|
|
|
pf.gmask = 0x0000FF00;
|
|
|
|
pf.bmask = 0x00FF0000;
|
|
|
|
pf.rmax = 255;
|
|
|
|
pf.gmax = 255;
|
|
|
|
pf.bmax = 255;
|
|
|
|
pf.rshift = 0;
|
|
|
|
pf.gshift = 8;
|
|
|
|
pf.bshift = 16;
|
2009-01-26 18:37:30 +03:00
|
|
|
pf.rbits = 8;
|
|
|
|
pf.gbits = 8;
|
|
|
|
pf.bbits = 8;
|
2009-01-16 01:14:11 +03:00
|
|
|
break;
|
2009-01-23 22:56:19 +03:00
|
|
|
case 32:
|
|
|
|
pf.rmask = 0x0000FF00;
|
|
|
|
pf.gmask = 0x00FF0000;
|
|
|
|
pf.bmask = 0xFF000000;
|
|
|
|
pf.amask = 0x00000000;
|
|
|
|
pf.amax = 255;
|
|
|
|
pf.rmax = 255;
|
|
|
|
pf.gmax = 255;
|
|
|
|
pf.bmax = 255;
|
|
|
|
pf.ashift = 0;
|
|
|
|
pf.rshift = 8;
|
|
|
|
pf.gshift = 16;
|
|
|
|
pf.bshift = 24;
|
2009-01-26 18:37:30 +03:00
|
|
|
pf.rbits = 8;
|
|
|
|
pf.gbits = 8;
|
|
|
|
pf.bbits = 8;
|
|
|
|
pf.abits = 8;
|
2009-01-23 22:56:19 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return pf;
|
|
|
|
}
|
|
|
|
|
|
|
|
PixelFormat qemu_default_pixelformat(int bpp)
|
|
|
|
{
|
|
|
|
PixelFormat pf;
|
|
|
|
|
|
|
|
memset(&pf, 0x00, sizeof(PixelFormat));
|
|
|
|
|
|
|
|
pf.bits_per_pixel = bpp;
|
2012-08-22 19:19:42 +04:00
|
|
|
pf.bytes_per_pixel = DIV_ROUND_UP(bpp, 8);
|
2009-01-23 22:56:19 +03:00
|
|
|
pf.depth = bpp == 32 ? 24 : bpp;
|
|
|
|
|
|
|
|
switch (bpp) {
|
2010-05-21 13:59:14 +04:00
|
|
|
case 15:
|
|
|
|
pf.bits_per_pixel = 16;
|
|
|
|
pf.rmask = 0x00007c00;
|
|
|
|
pf.gmask = 0x000003E0;
|
|
|
|
pf.bmask = 0x0000001F;
|
|
|
|
pf.rmax = 31;
|
|
|
|
pf.gmax = 31;
|
|
|
|
pf.bmax = 31;
|
|
|
|
pf.rshift = 10;
|
|
|
|
pf.gshift = 5;
|
|
|
|
pf.bshift = 0;
|
|
|
|
pf.rbits = 5;
|
|
|
|
pf.gbits = 5;
|
|
|
|
pf.bbits = 5;
|
|
|
|
break;
|
2009-01-16 01:14:11 +03:00
|
|
|
case 16:
|
|
|
|
pf.rmask = 0x0000F800;
|
|
|
|
pf.gmask = 0x000007E0;
|
|
|
|
pf.bmask = 0x0000001F;
|
|
|
|
pf.rmax = 31;
|
|
|
|
pf.gmax = 63;
|
|
|
|
pf.bmax = 31;
|
|
|
|
pf.rshift = 11;
|
|
|
|
pf.gshift = 5;
|
|
|
|
pf.bshift = 0;
|
2009-01-26 18:37:30 +03:00
|
|
|
pf.rbits = 5;
|
|
|
|
pf.gbits = 6;
|
|
|
|
pf.bbits = 5;
|
2009-01-16 01:14:11 +03:00
|
|
|
break;
|
|
|
|
case 24:
|
2009-01-23 22:56:19 +03:00
|
|
|
pf.rmask = 0x00FF0000;
|
|
|
|
pf.gmask = 0x0000FF00;
|
|
|
|
pf.bmask = 0x000000FF;
|
|
|
|
pf.rmax = 255;
|
|
|
|
pf.gmax = 255;
|
|
|
|
pf.bmax = 255;
|
|
|
|
pf.rshift = 16;
|
|
|
|
pf.gshift = 8;
|
|
|
|
pf.bshift = 0;
|
2009-01-26 18:37:30 +03:00
|
|
|
pf.rbits = 8;
|
|
|
|
pf.gbits = 8;
|
|
|
|
pf.bbits = 8;
|
2011-11-22 15:56:10 +04:00
|
|
|
break;
|
2009-01-16 01:14:11 +03:00
|
|
|
case 32:
|
|
|
|
pf.rmask = 0x00FF0000;
|
|
|
|
pf.gmask = 0x0000FF00;
|
|
|
|
pf.bmask = 0x000000FF;
|
|
|
|
pf.rmax = 255;
|
|
|
|
pf.gmax = 255;
|
|
|
|
pf.bmax = 255;
|
|
|
|
pf.rshift = 16;
|
|
|
|
pf.gshift = 8;
|
|
|
|
pf.bshift = 0;
|
2009-01-26 18:37:30 +03:00
|
|
|
pf.rbits = 8;
|
|
|
|
pf.gbits = 8;
|
|
|
|
pf.bbits = 8;
|
2009-01-16 01:14:11 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return pf;
|
|
|
|
}
|