diff options
| -rw-r--r-- | ui/console-gl.c | 5 | ||||
| -rw-r--r-- | ui/console.c | 7 | ||||
| -rw-r--r-- | ui/gtk.c | 2 | ||||
| -rw-r--r-- | ui/vnc.c | 8 |
4 files changed, 15 insertions, 7 deletions
diff --git a/ui/console-gl.c b/ui/console-gl.c index 74b1bed6ee..5165e21646 100644 --- a/ui/console-gl.c +++ b/ui/console-gl.c @@ -88,6 +88,11 @@ void surface_gl_create_texture(ConsoleGLState *gls, surface->glformat = GL_BGRA_EXT; surface->gltype = GL_UNSIGNED_BYTE; break; + case PIXMAN_BE_x8r8g8b8: + case PIXMAN_BE_a8r8g8b8: + surface->glformat = GL_RGBA; + surface->gltype = GL_UNSIGNED_BYTE; + break; case PIXMAN_r5g6b5: surface->glformat = GL_RGB; surface->gltype = GL_UNSIGNED_SHORT_5_6_5; diff --git a/ui/console.c b/ui/console.c index bf385790b5..ce1e10570f 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1453,16 +1453,21 @@ bool dpy_ui_info_supported(QemuConsole *con) int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info) { assert(con != NULL); - con->ui_info = *info; + if (!dpy_ui_info_supported(con)) { return -1; } + if (memcmp(&con->ui_info, info, sizeof(con->ui_info)) == 0) { + /* nothing changed -- ignore */ + return 0; + } /* * 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. */ + con->ui_info = *info; timer_mod(con->ui_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1000); return 0; } @@ -1748,7 +1748,7 @@ static GSList *gd_vc_vte_init(GtkDisplayState *s, VirtualConsole *vc, /* The documentation says that the default is UTF-8, but actually it is * 7-bit ASCII at least in VTE 0.38. */ -#if VTE_CHECK_VERSION(0, 40, 0) +#if VTE_CHECK_VERSION(0, 38, 0) vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8", NULL); #else vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8"); @@ -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); |