mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-23 19:49:43 +00:00
vnc dynamic resolution (Stefano Stabellini)
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5229 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori
parent
82b36dc398
commit
7eac3a87f1
216
vnc.c
216
vnc.c
@ -71,8 +71,8 @@ typedef void VncWritePixels(VncState *vs, void *data, int size);
|
||||
|
||||
typedef void VncSendHextileTile(VncState *vs,
|
||||
int x, int y, int w, int h,
|
||||
uint32_t *last_bg,
|
||||
uint32_t *last_fg,
|
||||
void *last_bg,
|
||||
void *last_fg,
|
||||
int *has_bg, int *has_fg);
|
||||
|
||||
#define VNC_MAX_WIDTH 2048
|
||||
@ -164,9 +164,9 @@ struct VncState
|
||||
VncWritePixels *write_pixels;
|
||||
VncSendHextileTile *send_hextile_tile;
|
||||
int pix_bpp, pix_big_endian;
|
||||
int red_shift, red_max, red_shift1;
|
||||
int green_shift, green_max, green_shift1;
|
||||
int blue_shift, blue_max, blue_shift1;
|
||||
int client_red_shift, client_red_max, server_red_shift, server_red_max;
|
||||
int client_green_shift, client_green_max, server_green_shift, server_green_max;
|
||||
int client_blue_shift, client_blue_max, server_blue_shift, server_blue_max;
|
||||
|
||||
VncReadEvent *read_handler;
|
||||
size_t read_handler_expect;
|
||||
@ -208,6 +208,8 @@ static void vnc_flush(VncState *vs);
|
||||
static void vnc_update_client(void *opaque);
|
||||
static void vnc_client_read(void *opaque);
|
||||
|
||||
static void vnc_colordepth(DisplayState *ds, int depth);
|
||||
|
||||
static inline void vnc_set_bit(uint32_t *d, int k)
|
||||
{
|
||||
d[k >> 5] |= 1 << (k & 0x1f);
|
||||
@ -330,14 +332,17 @@ static void vnc_write_pixels_copy(VncState *vs, void *pixels, int size)
|
||||
/* slowest but generic code. */
|
||||
static void vnc_convert_pixel(VncState *vs, uint8_t *buf, uint32_t v)
|
||||
{
|
||||
unsigned int r, g, b;
|
||||
uint8_t r, g, b;
|
||||
|
||||
r = (v >> vs->red_shift1) & vs->red_max;
|
||||
g = (v >> vs->green_shift1) & vs->green_max;
|
||||
b = (v >> vs->blue_shift1) & vs->blue_max;
|
||||
v = (r << vs->red_shift) |
|
||||
(g << vs->green_shift) |
|
||||
(b << vs->blue_shift);
|
||||
r = ((v >> vs->server_red_shift) & vs->server_red_max) * (vs->client_red_max + 1) /
|
||||
(vs->server_red_max + 1);
|
||||
g = ((v >> vs->server_green_shift) & vs->server_green_max) * (vs->client_green_max + 1) /
|
||||
(vs->server_green_max + 1);
|
||||
b = ((v >> vs->server_blue_shift) & vs->server_blue_max) * (vs->client_blue_max + 1) /
|
||||
(vs->server_blue_max + 1);
|
||||
v = (r << vs->client_red_shift) |
|
||||
(g << vs->client_green_shift) |
|
||||
(b << vs->client_blue_shift);
|
||||
switch(vs->pix_bpp) {
|
||||
case 1:
|
||||
buf[0] = v;
|
||||
@ -370,14 +375,34 @@ static void vnc_convert_pixel(VncState *vs, uint8_t *buf, uint32_t v)
|
||||
|
||||
static void vnc_write_pixels_generic(VncState *vs, void *pixels1, int size)
|
||||
{
|
||||
uint32_t *pixels = pixels1;
|
||||
uint8_t buf[4];
|
||||
int n, i;
|
||||
|
||||
n = size >> 2;
|
||||
for(i = 0; i < n; i++) {
|
||||
vnc_convert_pixel(vs, buf, pixels[i]);
|
||||
vnc_write(vs, buf, vs->pix_bpp);
|
||||
if (vs->depth == 4) {
|
||||
uint32_t *pixels = pixels1;
|
||||
int n, i;
|
||||
n = size >> 2;
|
||||
for(i = 0; i < n; i++) {
|
||||
vnc_convert_pixel(vs, buf, pixels[i]);
|
||||
vnc_write(vs, buf, vs->pix_bpp);
|
||||
}
|
||||
} else if (vs->depth == 2) {
|
||||
uint16_t *pixels = pixels1;
|
||||
int n, i;
|
||||
n = size >> 1;
|
||||
for(i = 0; i < n; i++) {
|
||||
vnc_convert_pixel(vs, buf, pixels[i]);
|
||||
vnc_write(vs, buf, vs->pix_bpp);
|
||||
}
|
||||
} else if (vs->depth == 1) {
|
||||
uint8_t *pixels = pixels1;
|
||||
int n, i;
|
||||
n = size;
|
||||
for(i = 0; i < n; i++) {
|
||||
vnc_convert_pixel(vs, buf, pixels[i]);
|
||||
vnc_write(vs, buf, vs->pix_bpp);
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "vnc_write_pixels_generic: VncState color depth not supported\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -413,6 +438,18 @@ static void hextile_enc_cord(uint8_t *ptr, int x, int y, int w, int h)
|
||||
#include "vnchextile.h"
|
||||
#undef BPP
|
||||
|
||||
#define GENERIC
|
||||
#define BPP 8
|
||||
#include "vnchextile.h"
|
||||
#undef BPP
|
||||
#undef GENERIC
|
||||
|
||||
#define GENERIC
|
||||
#define BPP 16
|
||||
#include "vnchextile.h"
|
||||
#undef BPP
|
||||
#undef GENERIC
|
||||
|
||||
#define GENERIC
|
||||
#define BPP 32
|
||||
#include "vnchextile.h"
|
||||
@ -423,18 +460,23 @@ static void send_framebuffer_update_hextile(VncState *vs, int x, int y, int w, i
|
||||
{
|
||||
int i, j;
|
||||
int has_fg, has_bg;
|
||||
uint32_t last_fg32, last_bg32;
|
||||
uint8_t *last_fg, *last_bg;
|
||||
|
||||
vnc_framebuffer_update(vs, x, y, w, h, 5);
|
||||
|
||||
last_fg = (uint8_t *) malloc(vs->depth);
|
||||
last_bg = (uint8_t *) malloc(vs->depth);
|
||||
has_fg = has_bg = 0;
|
||||
for (j = y; j < (y + h); j += 16) {
|
||||
for (i = x; i < (x + w); i += 16) {
|
||||
vs->send_hextile_tile(vs, i, j,
|
||||
MIN(16, x + w - i), MIN(16, y + h - j),
|
||||
&last_bg32, &last_fg32, &has_bg, &has_fg);
|
||||
last_bg, last_fg, &has_bg, &has_fg);
|
||||
}
|
||||
}
|
||||
free(last_fg);
|
||||
free(last_bg);
|
||||
|
||||
}
|
||||
|
||||
static void send_framebuffer_update(VncState *vs, int x, int y, int w, int h)
|
||||
@ -1133,17 +1175,6 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
|
||||
check_pointer_type_change(vs, kbd_mouse_is_absolute());
|
||||
}
|
||||
|
||||
static int compute_nbits(unsigned int val)
|
||||
{
|
||||
int n;
|
||||
n = 0;
|
||||
while (val != 0) {
|
||||
n++;
|
||||
val >>= 1;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
static void set_pixel_format(VncState *vs,
|
||||
int bits_per_pixel, int depth,
|
||||
int big_endian_flag, int true_color_flag,
|
||||
@ -1163,6 +1194,7 @@ static void set_pixel_format(VncState *vs,
|
||||
return;
|
||||
}
|
||||
if (bits_per_pixel == 32 &&
|
||||
bits_per_pixel == vs->depth * 8 &&
|
||||
host_big_endian_flag == big_endian_flag &&
|
||||
red_max == 0xff && green_max == 0xff && blue_max == 0xff &&
|
||||
red_shift == 16 && green_shift == 8 && blue_shift == 0) {
|
||||
@ -1171,6 +1203,7 @@ static void set_pixel_format(VncState *vs,
|
||||
vs->send_hextile_tile = send_hextile_tile_32;
|
||||
} else
|
||||
if (bits_per_pixel == 16 &&
|
||||
bits_per_pixel == vs->depth * 8 &&
|
||||
host_big_endian_flag == big_endian_flag &&
|
||||
red_max == 31 && green_max == 63 && blue_max == 31 &&
|
||||
red_shift == 11 && green_shift == 5 && blue_shift == 0) {
|
||||
@ -1179,6 +1212,7 @@ static void set_pixel_format(VncState *vs,
|
||||
vs->send_hextile_tile = send_hextile_tile_16;
|
||||
} else
|
||||
if (bits_per_pixel == 8 &&
|
||||
bits_per_pixel == vs->depth * 8 &&
|
||||
red_max == 7 && green_max == 7 && blue_max == 3 &&
|
||||
red_shift == 5 && green_shift == 2 && blue_shift == 0) {
|
||||
vs->depth = 1;
|
||||
@ -1191,28 +1225,116 @@ static void set_pixel_format(VncState *vs,
|
||||
bits_per_pixel != 16 &&
|
||||
bits_per_pixel != 32)
|
||||
goto fail;
|
||||
vs->depth = 4;
|
||||
vs->red_shift = red_shift;
|
||||
vs->red_max = red_max;
|
||||
vs->red_shift1 = 24 - compute_nbits(red_max);
|
||||
vs->green_shift = green_shift;
|
||||
vs->green_max = green_max;
|
||||
vs->green_shift1 = 16 - compute_nbits(green_max);
|
||||
vs->blue_shift = blue_shift;
|
||||
vs->blue_max = blue_max;
|
||||
vs->blue_shift1 = 8 - compute_nbits(blue_max);
|
||||
vs->pix_bpp = bits_per_pixel / 8;
|
||||
if (vs->depth == 4) {
|
||||
vs->send_hextile_tile = send_hextile_tile_generic_32;
|
||||
} else if (vs->depth == 2) {
|
||||
vs->send_hextile_tile = send_hextile_tile_generic_16;
|
||||
} else {
|
||||
vs->send_hextile_tile = send_hextile_tile_generic_8;
|
||||
}
|
||||
|
||||
vs->pix_big_endian = big_endian_flag;
|
||||
vs->write_pixels = vnc_write_pixels_generic;
|
||||
vs->send_hextile_tile = send_hextile_tile_generic;
|
||||
}
|
||||
|
||||
vnc_dpy_resize(vs->ds, vs->ds->width, vs->ds->height);
|
||||
vs->client_red_shift = red_shift;
|
||||
vs->client_red_max = red_max;
|
||||
vs->client_green_shift = green_shift;
|
||||
vs->client_green_max = green_max;
|
||||
vs->client_blue_shift = blue_shift;
|
||||
vs->client_blue_max = blue_max;
|
||||
vs->pix_bpp = bits_per_pixel / 8;
|
||||
|
||||
vga_hw_invalidate();
|
||||
vga_hw_update();
|
||||
}
|
||||
|
||||
static void vnc_colordepth(DisplayState *ds, int depth)
|
||||
{
|
||||
int host_big_endian_flag;
|
||||
struct VncState *vs = ds->opaque;
|
||||
|
||||
switch (depth) {
|
||||
case 24:
|
||||
if (ds->depth == 32) return;
|
||||
depth = 32;
|
||||
break;
|
||||
case 15:
|
||||
case 8:
|
||||
case 0:
|
||||
return;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
host_big_endian_flag = 1;
|
||||
#else
|
||||
host_big_endian_flag = 0;
|
||||
#endif
|
||||
|
||||
switch (depth) {
|
||||
case 8:
|
||||
vs->depth = depth / 8;
|
||||
vs->server_red_max = 7;
|
||||
vs->server_green_max = 7;
|
||||
vs->server_blue_max = 3;
|
||||
vs->server_red_shift = 5;
|
||||
vs->server_green_shift = 2;
|
||||
vs->server_blue_shift = 0;
|
||||
break;
|
||||
case 16:
|
||||
vs->depth = depth / 8;
|
||||
vs->server_red_max = 31;
|
||||
vs->server_green_max = 63;
|
||||
vs->server_blue_max = 31;
|
||||
vs->server_red_shift = 11;
|
||||
vs->server_green_shift = 5;
|
||||
vs->server_blue_shift = 0;
|
||||
break;
|
||||
case 32:
|
||||
vs->depth = 4;
|
||||
vs->server_red_max = 255;
|
||||
vs->server_green_max = 255;
|
||||
vs->server_blue_max = 255;
|
||||
vs->server_red_shift = 16;
|
||||
vs->server_green_shift = 8;
|
||||
vs->server_blue_shift = 0;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
if (vs->pix_bpp == 4 && vs->depth == 4 &&
|
||||
host_big_endian_flag == vs->pix_big_endian &&
|
||||
vs->client_red_max == 0xff && vs->client_green_max == 0xff && vs->client_blue_max == 0xff &&
|
||||
vs->client_red_shift == 16 && vs->client_green_shift == 8 && vs->client_blue_shift == 0) {
|
||||
vs->write_pixels = vnc_write_pixels_copy;
|
||||
vs->send_hextile_tile = send_hextile_tile_32;
|
||||
} else if (vs->pix_bpp == 2 && vs->depth == 2 &&
|
||||
host_big_endian_flag == vs->pix_big_endian &&
|
||||
vs->client_red_max == 31 && vs->client_green_max == 63 && vs->client_blue_max == 31 &&
|
||||
vs->client_red_shift == 11 && vs->client_green_shift == 5 && vs->client_blue_shift == 0) {
|
||||
vs->write_pixels = vnc_write_pixels_copy;
|
||||
vs->send_hextile_tile = send_hextile_tile_16;
|
||||
} else if (vs->pix_bpp == 1 && vs->depth == 1 &&
|
||||
host_big_endian_flag == vs->pix_big_endian &&
|
||||
vs->client_red_max == 7 && vs->client_green_max == 7 && vs->client_blue_max == 3 &&
|
||||
vs->client_red_shift == 5 && vs->client_green_shift == 2 && vs->client_blue_shift == 0) {
|
||||
vs->write_pixels = vnc_write_pixels_copy;
|
||||
vs->send_hextile_tile = send_hextile_tile_8;
|
||||
} else {
|
||||
if (vs->depth == 4) {
|
||||
vs->send_hextile_tile = send_hextile_tile_generic_32;
|
||||
} else if (vs->depth == 2) {
|
||||
vs->send_hextile_tile = send_hextile_tile_generic_16;
|
||||
} else {
|
||||
vs->send_hextile_tile = send_hextile_tile_generic_8;
|
||||
}
|
||||
vs->write_pixels = vnc_write_pixels_generic;
|
||||
}
|
||||
}
|
||||
|
||||
static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len)
|
||||
{
|
||||
int i;
|
||||
@ -1316,7 +1438,9 @@ static int protocol_client_init(VncState *vs, uint8_t *data, size_t len)
|
||||
vnc_write_u16(vs, vs->ds->height);
|
||||
|
||||
vnc_write_u8(vs, vs->depth * 8); /* bits-per-pixel */
|
||||
vnc_write_u8(vs, vs->depth * 8); /* depth */
|
||||
if (vs->depth == 4) vnc_write_u8(vs, 24); /* depth */
|
||||
else vnc_write_u8(vs, vs->depth * 8); /* depth */
|
||||
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
vnc_write_u8(vs, 1); /* big-endian-flag */
|
||||
#else
|
||||
@ -2006,7 +2130,6 @@ void vnc_display_init(DisplayState *ds)
|
||||
|
||||
vs->lsock = -1;
|
||||
vs->csock = -1;
|
||||
vs->depth = 4;
|
||||
vs->last_x = -1;
|
||||
vs->last_y = -1;
|
||||
|
||||
@ -2027,6 +2150,7 @@ void vnc_display_init(DisplayState *ds)
|
||||
vs->ds->dpy_resize = vnc_dpy_resize;
|
||||
vs->ds->dpy_refresh = NULL;
|
||||
|
||||
vnc_colordepth(vs->ds, 32);
|
||||
vnc_dpy_resize(vs->ds, 640, 400);
|
||||
}
|
||||
|
||||
|
||||
12
vnchextile.h
12
vnchextile.h
@ -2,29 +2,29 @@
|
||||
#define CONCAT(a, b) CONCAT_I(a, b)
|
||||
#define pixel_t CONCAT(uint, CONCAT(BPP, _t))
|
||||
#ifdef GENERIC
|
||||
#define NAME generic
|
||||
#define NAME CONCAT(generic_, BPP)
|
||||
#else
|
||||
#define NAME BPP
|
||||
#endif
|
||||
|
||||
static void CONCAT(send_hextile_tile_, NAME)(VncState *vs,
|
||||
int x, int y, int w, int h,
|
||||
uint32_t *last_bg32,
|
||||
uint32_t *last_fg32,
|
||||
void *last_bg_,
|
||||
void *last_fg_,
|
||||
int *has_bg, int *has_fg)
|
||||
{
|
||||
uint8_t *row = (vs->ds->data + y * vs->ds->linesize + x * vs->depth);
|
||||
pixel_t *irow = (pixel_t *)row;
|
||||
int j, i;
|
||||
pixel_t *last_bg = (pixel_t *)last_bg32;
|
||||
pixel_t *last_fg = (pixel_t *)last_fg32;
|
||||
pixel_t *last_bg = (pixel_t *)last_bg_;
|
||||
pixel_t *last_fg = (pixel_t *)last_fg_;
|
||||
pixel_t bg = 0;
|
||||
pixel_t fg = 0;
|
||||
int n_colors = 0;
|
||||
int bg_count = 0;
|
||||
int fg_count = 0;
|
||||
int flags = 0;
|
||||
uint8_t data[(sizeof(pixel_t) + 2) * 16 * 16];
|
||||
uint8_t data[(vs->pix_bpp + 2) * 16 * 16];
|
||||
int n_data = 0;
|
||||
int n_subtiles = 0;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user