From: Dongwon Kim <[email protected]> Currently, the fullscreen toggle hotkey (Ctrl+Alt+f by default) and zoom hotkeys (Ctrl+Alt++, Ctrl+Alt+-, Ctrl+Alt+0) only function for the main QEMU window. When a VC is detached (untabified), it loses these capabilities.
Implement toggle helpers, gd_win_full_screen and zoom helpers (gd_win_zoom_in, gd_win_zoom_out, gd_win_zoom_fixed) and connect them to the detached window's accelerator group in gd_menu_untabify. Also remove a leftover debug fprintf in gd_win_grab. v2: - Reuse gd_win_zoom_* in gd_menu_zoom_* to avoid duplicated scaling logic - Guard zoom helpers against NULL or non-GFX consoles (!vc || vc->type != GD_VC_GFX) - Keep both GDK_KEY_plus and GDK_KEY_equal accelerators Cc: Marc-André Lureau <[email protected]> Signed-off-by: Dongwon Kim <[email protected]> --- ui/gtk.c | 148 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 111 insertions(+), 37 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index ed7ffc06b1..5427c2f174 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1562,7 +1562,6 @@ static gboolean gd_win_grab(void *opaque) { VirtualConsole *vc = opaque; - fprintf(stderr, "%s: %s\n", __func__, vc->label); if (vc->s->ptr_owner) { gd_ungrab_pointer(vc->s); } else { @@ -1571,6 +1570,96 @@ static gboolean gd_win_grab(void *opaque) return TRUE; } +static gboolean gd_win_full_screen(void *opaque) +{ + VirtualConsole *vc = opaque; + GdkWindow *window; + GdkWindowState state; + + if (!vc || !vc->window || !gtk_widget_get_realized(vc->window)) { + return TRUE; + } + + window = gtk_widget_get_window(vc->window); + if (!window) { + return TRUE; + } + + state = gdk_window_get_state(window); + + if (state & GDK_WINDOW_STATE_FULLSCREEN) { + gtk_window_unfullscreen(GTK_WINDOW(vc->window)); + + if (vc->type == GD_VC_GFX) { + vc->gfx.scale_x = vc->gfx.preferred_scale; + vc->gfx.scale_y = vc->gfx.preferred_scale; + gd_update_windowsize(vc); + } + } else { + if (vc->type == GD_VC_GFX) { + gtk_widget_set_size_request(vc->gfx.drawing_area, -1, -1); + } + gtk_window_fullscreen(GTK_WINDOW(vc->window)); + } + + gd_update_cursor(vc); + return TRUE; +} + +static gboolean gd_win_zoom_in(void *opaque) +{ + VirtualConsole *vc = opaque; + + if (!vc || vc->type != GD_VC_GFX) { + return TRUE; + } + + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(vc->s->zoom_fit_item), + FALSE); + + vc->gfx.scale_x += VC_SCALE_STEP; + vc->gfx.scale_y += VC_SCALE_STEP; + + gd_update_windowsize(vc); + return TRUE; +} + +static gboolean gd_win_zoom_out(void *opaque) +{ + VirtualConsole *vc = opaque; + + if (!vc || vc->type != GD_VC_GFX) { + return TRUE; + } + + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(vc->s->zoom_fit_item), + FALSE); + + vc->gfx.scale_x -= VC_SCALE_STEP; + vc->gfx.scale_y -= VC_SCALE_STEP; + + vc->gfx.scale_x = MAX(vc->gfx.scale_x, VC_SCALE_MIN); + vc->gfx.scale_y = MAX(vc->gfx.scale_y, VC_SCALE_MIN); + + gd_update_windowsize(vc); + return TRUE; +} + +static gboolean gd_win_zoom_fixed(void *opaque) +{ + VirtualConsole *vc = opaque; + + if (!vc || vc->type != GD_VC_GFX) { + return TRUE; + } + + vc->gfx.scale_x = vc->gfx.preferred_scale; + vc->gfx.scale_y = vc->gfx.preferred_scale; + + gd_update_windowsize(vc); + return TRUE; +} + static void gd_menu_untabify(GtkMenuItem *item, void *opaque) { GtkDisplayState *s = opaque; @@ -1609,9 +1698,24 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque) 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); + gtk_accel_group_connect(ag, GDK_KEY_g, HOTKEY_MODIFIERS, 0, + g_cclosure_new_swap(G_CALLBACK(gd_win_grab), + vc, NULL)); + gtk_accel_group_connect(ag, GDK_KEY_f, HOTKEY_MODIFIERS, 0, + g_cclosure_new_swap(G_CALLBACK(gd_win_full_screen), + vc, NULL)); + gtk_accel_group_connect(ag, GDK_KEY_plus, HOTKEY_MODIFIERS, 0, + g_cclosure_new_swap(G_CALLBACK(gd_win_zoom_in), + vc, NULL)); + gtk_accel_group_connect(ag, GDK_KEY_equal, HOTKEY_MODIFIERS, 0, + g_cclosure_new_swap(G_CALLBACK(gd_win_zoom_in), + vc, NULL)); + gtk_accel_group_connect(ag, GDK_KEY_minus, HOTKEY_MODIFIERS, 0, + g_cclosure_new_swap(G_CALLBACK(gd_win_zoom_out), + vc, NULL)); + gtk_accel_group_connect(ag, GDK_KEY_0, HOTKEY_MODIFIERS, 0, + g_cclosure_new_swap(G_CALLBACK(gd_win_zoom_fixed), + vc, NULL)); } gd_rebuild_vc_menu(s); @@ -1691,17 +1795,7 @@ static void gd_menu_zoom_in(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); - if (!vc) { - return; - } - - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->zoom_fit_item), - FALSE); - - vc->gfx.scale_x += VC_SCALE_STEP; - vc->gfx.scale_y += VC_SCALE_STEP; - - gd_update_windowsize(vc); + gd_win_zoom_in(vc); } static void gd_accel_zoom_in(void *opaque) @@ -1715,20 +1809,7 @@ static void gd_menu_zoom_out(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); - if (!vc) { - return; - } - - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->zoom_fit_item), - FALSE); - - vc->gfx.scale_x -= VC_SCALE_STEP; - vc->gfx.scale_y -= VC_SCALE_STEP; - - vc->gfx.scale_x = MAX(vc->gfx.scale_x, VC_SCALE_MIN); - vc->gfx.scale_y = MAX(vc->gfx.scale_y, VC_SCALE_MIN); - - gd_update_windowsize(vc); + gd_win_zoom_out(vc); } static void gd_menu_zoom_fixed(GtkMenuItem *item, void *opaque) @@ -1736,14 +1817,7 @@ static void gd_menu_zoom_fixed(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); - if (!vc) { - return; - } - - vc->gfx.scale_x = vc->gfx.preferred_scale; - vc->gfx.scale_y = vc->gfx.preferred_scale; - - gd_update_windowsize(vc); + gd_win_zoom_fixed(vc); } static void gd_menu_zoom_fit(GtkMenuItem *item, void *opaque) -- 2.43.0
