Replace the fixed-size vc[MAX_VCS] with GPtrArray.
This is a preparatory refactoring for console hotplug support, which
needs to add/remove VCs dynamically.
Signed-off-by: Marc-André Lureau <[email protected]>
---
include/ui/gtk.h | 3 +-
ui/gtk.c | 102 +++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 81 insertions(+), 24 deletions(-)
diff --git a/include/ui/gtk.h b/include/ui/gtk.h
index 5156a049509..4d54de97ea7 100644
--- a/include/ui/gtk.h
+++ b/include/ui/gtk.h
@@ -118,8 +118,7 @@ struct GtkDisplayState {
GtkWidget *grab_item;
GtkWidget *grab_on_hover_item;
- int nb_vcs;
- VirtualConsole vc[MAX_VCS];
+ GPtrArray *vcs;
GtkWidget *show_tabs_item;
GtkWidget *untabify_item;
diff --git a/ui/gtk.c b/ui/gtk.c
index c26dc83ac3e..141cb69d494 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -150,8 +150,8 @@ static VirtualConsole *gd_vc_find_by_menu(GtkDisplayState
*s)
VirtualConsole *vc;
gint i;
- for (i = 0; i < s->nb_vcs; i++) {
- vc = &s->vc[i];
+ for (i = 0; i < s->vcs->len; i++) {
+ vc = g_ptr_array_index(s->vcs, i);
if (gtk_check_menu_item_get_active
(GTK_CHECK_MENU_ITEM(vc->menu_item))) {
return vc;
@@ -165,8 +165,11 @@ static VirtualConsole *gd_vc_find_by_page(GtkDisplayState
*s, gint page)
VirtualConsole *vc;
gint i, p;
- for (i = 0; i < s->nb_vcs; i++) {
- vc = &s->vc[i];
+ if (!s->vcs) {
+ return NULL;
+ }
+ for (i = 0; i < s->vcs->len; i++) {
+ vc = g_ptr_array_index(s->vcs, i);
p = gtk_notebook_page_num(GTK_NOTEBOOK(s->notebook), vc->tab_item);
if (p == page) {
return vc;
@@ -247,8 +250,8 @@ static void gd_update_caption(GtkDisplayState *s)
gtk_window_set_title(GTK_WINDOW(s->window), title);
g_free(title);
- for (i = 0; i < s->nb_vcs; i++) {
- VirtualConsole *vc = &s->vc[i];
+ for (i = 0; i < s->vcs->len; i++) {
+ VirtualConsole *vc = g_ptr_array_index(s->vcs, i);
if (!vc->window) {
continue;
@@ -357,7 +360,7 @@ static void gtk_release_modifiers(GtkDisplayState *s)
{
VirtualConsole *vc = gd_vc_find_current(s);
- if (vc->type != GD_VC_GFX ||
+ if (!vc || vc->type != GD_VC_GFX ||
!qemu_console_is_graphic(vc->gfx.dcl.con)) {
return;
}
@@ -702,8 +705,8 @@ static void gd_mouse_mode_change(Notifier *notify, void
*data)
gd_ungrab_pointer(s);
}
}
- for (i = 0; i < s->nb_vcs; i++) {
- VirtualConsole *vc = &s->vc[i];
+ for (i = 0; i < s->vcs->len; i++) {
+ VirtualConsole *vc = g_ptr_array_index(s->vcs, i);
gd_update_cursor(vc);
}
}
@@ -2114,9 +2117,10 @@ static void gd_vcs_init(GtkDisplayState *s, GSList
*group,
int i;
for (i = 0; i < nb_vcs; i++) {
- VirtualConsole *vc = &s->vc[s->nb_vcs];
- group = gd_vc_vte_init(s, vc, vcs[i], s->nb_vcs, group, view_menu);
- s->nb_vcs++;
+ VirtualConsole *vc = g_new0(VirtualConsole, 1);
+ g_ptr_array_add(s->vcs, vc);
+ group = gd_vc_vte_init(s, vc, vcs[i], s->vcs->len - 1,
+ group, view_menu);
}
}
#endif /* CONFIG_VTE */
@@ -2441,13 +2445,14 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState
*s, DisplayOptions *opts)
/* gfx */
for (vc = 0;; vc++) {
+ VirtualConsole *v;
con = qemu_console_lookup_by_index(vc);
if (!con) {
break;
}
- group = gd_vc_gfx_init(s, &s->vc[vc], con,
- vc, group, view_menu);
- s->nb_vcs++;
+ v = g_new0(VirtualConsole, 1);
+ g_ptr_array_add(s->vcs, v);
+ group = gd_vc_gfx_init(s, v, con, vc, group, view_menu);
}
#if defined(CONFIG_VTE)
@@ -2505,6 +2510,58 @@ static void gd_create_menus(GtkDisplayState *s,
DisplayOptions *opts)
}
+static void gd_vc_free(void *p)
+{
+ VirtualConsole *vc = p;
+
+ switch (vc->type) {
+ case GD_VC_GFX:
+ qemu_console_unregister_listener(&vc->gfx.dcl);
+#if defined(CONFIG_OPENGL)
+ if (display_opengl) {
+ qemu_console_set_display_gl_ctx(vc->gfx.dcl.con, NULL);
+ }
+ if (vc->gfx.esurface) {
+ eglDestroySurface(qemu_egl_display, vc->gfx.esurface);
+ }
+ if (vc->gfx.ectx) {
+ eglDestroyContext(qemu_egl_display, vc->gfx.ectx);
+ }
+ if (vc->gfx.gls) {
+ surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds);
+ qemu_gl_fini_shader(vc->gfx.gls);
+ }
+ egl_fb_destroy(&vc->gfx.guest_fb);
+ egl_fb_destroy(&vc->gfx.win_fb);
+ egl_fb_destroy(&vc->gfx.cursor_fb);
+#endif
+ qkbd_state_free(vc->gfx.kbd);
+ if (vc->gfx.surface) {
+ cairo_surface_destroy(vc->gfx.surface);
+ }
+ if (vc->gfx.convert) {
+ pixman_image_unref(vc->gfx.convert);
+ }
+ break;
+#if defined(CONFIG_VTE)
+ case GD_VC_VTE:
+ fifo8_destroy(&vc->vte.out_fifo);
+ break;
+#endif
+ }
+
+ if (vc->window) {
+ gtk_widget_destroy(vc->window);
+ } else if (vc->tab_item) {
+ gtk_widget_destroy(vc->tab_item);
+ }
+ if (vc->menu_item) {
+ gtk_widget_destroy(vc->menu_item);
+ }
+ g_free(vc->label);
+ g_free(vc);
+}
+
static GtkDisplayState *gtk_display_state;
static gboolean gtkinit;
@@ -2525,6 +2582,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
assert(opts->type == DISPLAY_TYPE_GTK);
s = g_malloc0(sizeof(*s));
gtk_display_state = s;
+ s->vcs = g_ptr_array_new_with_free_func(gd_vc_free);
s->opts = opts;
theme = gtk_icon_theme_get_default();
@@ -2582,13 +2640,10 @@ static void gtk_display_init(DisplayState *ds,
DisplayOptions *opts)
gtk_widget_show_all(s->window);
- for (idx = 0;; idx++) {
- QemuConsole *con = qemu_console_lookup_by_index(idx);
- if (!con) {
- break;
- }
- if (s->vc[idx].type == GD_VC_GFX) {
- gtk_widget_realize(s->vc[idx].gfx.drawing_area);
+ for (idx = 0; idx < s->vcs->len; idx++) {
+ VirtualConsole *v = g_ptr_array_index(s->vcs, idx);
+ if (v->type == GD_VC_GFX) {
+ gtk_widget_realize(v->gfx.drawing_area);
}
}
@@ -2693,6 +2748,9 @@ static void gtk_display_cleanup(void)
qemu_remove_mouse_mode_change_notifier(&s->mouse_mode_notifier);
gd_clipboard_cleanup(s);
+ g_signal_handlers_disconnect_by_func(s->notebook,
+ G_CALLBACK(gd_change_page), s);
+ g_clear_pointer(&s->vcs, g_ptr_array_unref);
g_clear_pointer(&s->window, gtk_widget_destroy);
g_clear_object(&s->null_cursor);
g_clear_pointer(>k_display_state, g_free);
