[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] ui/gtk: Factor out tab window creation into a separate fu
From: |
Vivek Kasireddy |
Subject: |
[PATCH v2 5/6] ui/gtk: Factor out tab window creation into a separate function |
Date: |
Thu, 17 Nov 2022 17:44:25 -0800 |
Pull the code that creates a new window associated with a notebook
tab into a separate function. This new function can be useful not
just when user wants to detach a tab but also in the future when
a new window creation is needed in other scenarios.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Dongwon Kim <dongwon.kim@intel.com>
Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
---
ui/gtk.c | 65 +++++++++++++++++++++++++++++++-------------------------
1 file changed, 36 insertions(+), 29 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 4ac3655694..6b0369e3ed 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1400,6 +1400,41 @@ static gboolean gd_win_grab(void *opaque)
return TRUE;
}
+static void gd_tab_window_create(VirtualConsole *vc)
+{
+ GtkDisplayState *s = vc->s;
+
+ gtk_widget_set_sensitive(vc->menu_item, false);
+ vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+#if defined(CONFIG_OPENGL)
+ if (vc->gfx.esurface) {
+ eglDestroySurface(qemu_egl_display, vc->gfx.esurface);
+ vc->gfx.esurface = NULL;
+ }
+ if (vc->gfx.esurface) {
+ eglDestroyContext(qemu_egl_display, vc->gfx.ectx);
+ vc->gfx.ectx = NULL;
+ }
+#endif
+ gd_widget_reparent(s->notebook, vc->window, vc->tab_item);
+
+ g_signal_connect(vc->window, "delete-event",
+ G_CALLBACK(gd_tab_window_close), vc);
+ gtk_widget_show_all(vc->window);
+
+ if (qemu_console_is_graphic(vc->gfx.dcl.con)) {
+ GtkAccelGroup *ag = gtk_accel_group_new();
+ gtk_window_add_accel_group(GTK_WINDOW(vc->window), ag);
+
+ GClosure *cb = g_cclosure_new_swap(G_CALLBACK(gd_win_grab),
+ vc, NULL);
+ gtk_accel_group_connect(ag, GDK_KEY_g, HOTKEY_MODIFIERS, 0, cb);
+ }
+
+ gd_update_geometry_hints(vc);
+ gd_update_caption(s);
+}
+
static void gd_menu_untabify(GtkMenuItem *item, void *opaque)
{
GtkDisplayState *s = opaque;
@@ -1411,35 +1446,7 @@ static void gd_menu_untabify(GtkMenuItem *item, void
*opaque)
FALSE);
}
if (!vc->window) {
- gtk_widget_set_sensitive(vc->menu_item, false);
- vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-#if defined(CONFIG_OPENGL)
- if (vc->gfx.esurface) {
- eglDestroySurface(qemu_egl_display, vc->gfx.esurface);
- vc->gfx.esurface = NULL;
- }
- if (vc->gfx.esurface) {
- eglDestroyContext(qemu_egl_display, vc->gfx.ectx);
- vc->gfx.ectx = NULL;
- }
-#endif
- gd_widget_reparent(s->notebook, vc->window, vc->tab_item);
-
- g_signal_connect(vc->window, "delete-event",
- G_CALLBACK(gd_tab_window_close), vc);
- gtk_widget_show_all(vc->window);
-
- if (qemu_console_is_graphic(vc->gfx.dcl.con)) {
- GtkAccelGroup *ag = gtk_accel_group_new();
- gtk_window_add_accel_group(GTK_WINDOW(vc->window), ag);
-
- GClosure *cb = g_cclosure_new_swap(G_CALLBACK(gd_win_grab),
- vc, NULL);
- gtk_accel_group_connect(ag, GDK_KEY_g, HOTKEY_MODIFIERS, 0, cb);
- }
-
- gd_update_geometry_hints(vc);
- gd_update_caption(s);
+ gd_tab_window_create(vc);
}
}
--
2.37.2
- [PATCH v2 0/6] ui/gtk: Add a new parameter to assign connectors/monitors (v2), Vivek Kasireddy, 2022/11/17
- [PATCH v2 1/6] ui/gtk: Consider the scaling factor when getting the root coordinates, Vivek Kasireddy, 2022/11/17
- [PATCH v2 2/6] ui/gtk-gl-area: Don't forget to calculate the scaling factors in draw, Vivek Kasireddy, 2022/11/17
- [PATCH v2 4/6] ui/gtk: Disable the scanout when a detached tab is closed, Vivek Kasireddy, 2022/11/17
- [PATCH v2 3/6] ui/gtk: Handle relative mode events correctly with Wayland compositors, Vivek Kasireddy, 2022/11/17
- [PATCH v2 5/6] ui/gtk: Factor out tab window creation into a separate function,
Vivek Kasireddy <=
- [PATCH v2 6/6] ui/gtk: Add a new parameter to assign connectors/monitors to GFX VCs (v2), Vivek Kasireddy, 2022/11/17