diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-10 15:47:17 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-10 15:47:17 +0100 |
commit | a93c1bdf0bd4689287094ddb2aae3dc907da3535 (patch) | |
tree | b21d47e8362b3c38f8566f486fad287c6bc4aca5 /ui/vnc.c | |
parent | 0c33682d5f29b0a4ae53bdec4c8e52e4fae37b34 (diff) | |
parent | 1185fde40c3ba02406665b9ee0743270c526be26 (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160610-1' into staging
ui: misc bug fixes.
# gpg: Signature made Fri 10 Jun 2016 10:56:06 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-ui-20160610-1:
console: ignore ui_info updates which don't actually update something
ui/console-gl: Add support for big endian display surfaces
gtk: fix vte version check
ui: fix regression in printing VNC host/port on startup
vnc: drop unused depth arg for set_pixel_format
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc.c')
-rw-r--r-- | ui/vnc.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -2115,8 +2115,7 @@ static void send_color_map(VncState *vs) } } -static void set_pixel_format(VncState *vs, - int bits_per_pixel, int depth, +static void set_pixel_format(VncState *vs, int bits_per_pixel, int big_endian_flag, int true_color_flag, int red_max, int green_max, int blue_max, int red_shift, int green_shift, int blue_shift) @@ -2124,7 +2123,6 @@ static void set_pixel_format(VncState *vs, if (!true_color_flag) { /* Expose a reasonable default 256 color map */ bits_per_pixel = 8; - depth = 8; red_max = 7; green_max = 7; blue_max = 3; @@ -2231,7 +2229,7 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 1) return 20; - set_pixel_format(vs, read_u8(data, 4), read_u8(data, 5), + set_pixel_format(vs, read_u8(data, 4), read_u8(data, 6), read_u8(data, 7), read_u16(data, 8), read_u16(data, 10), read_u16(data, 12), read_u8(data, 14), @@ -3225,7 +3223,7 @@ char *vnc_display_local_addr(const char *id) qapi_free_SocketAddress(addr); return NULL; } - ret = g_strdup_printf("%s;%s", addr->u.inet.data->host, + ret = g_strdup_printf("%s:%s", addr->u.inet.data->host, addr->u.inet.data->port); qapi_free_SocketAddress(addr); |