[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/24] gtk: update gd_update_caption
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 16/24] gtk: update gd_update_caption |
Date: |
Mon, 26 May 2014 10:14:11 +0200 |
Adapt to recent changes, handle multiple windows.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index f804813..7d6a20d 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -271,11 +271,20 @@ static void gd_update_cursor(VirtualConsole *vc)
static void gd_update_caption(GtkDisplayState *s)
{
const char *status = "";
+ gchar *prefix;
gchar *title;
const char *grab = "";
bool is_paused = !runstate_is_running();
+ int i;
- if (gd_is_grab_active(s)) {
+ if (qemu_name) {
+ prefix = g_strdup_printf("QEMU (%s)", qemu_name);
+ } else {
+ prefix = g_strdup_printf("QEMU");
+ }
+
+ if (s->ptr_owner != NULL &&
+ s->ptr_owner->window == NULL) {
grab = _(" - Press Ctrl+Alt+G to release grab");
}
@@ -287,15 +296,24 @@ static void gd_update_caption(GtkDisplayState *s)
is_paused);
s->external_pause_update = false;
- if (qemu_name) {
- title = g_strdup_printf("QEMU (%s)%s%s", qemu_name, status, grab);
- } else {
- title = g_strdup_printf("QEMU%s%s", status, grab);
- }
-
+ title = g_strdup_printf("%s%s%s", prefix, status, grab);
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];
+
+ if (!vc->window) {
+ continue;
+ }
+ title = g_strdup_printf("%s: %s%s%s", prefix, vc->label,
+ vc == s->kbd_owner ? " +kbd" : "",
+ vc == s->ptr_owner ? " +ptr" : "");
+ gtk_window_set_title(GTK_WINDOW(vc->window), title);
+ g_free(title);
+ }
+
+ g_free(prefix);
}
static void gd_update_windowsize(VirtualConsole *vc)
@@ -915,7 +933,6 @@ static void gd_menu_untabify(GtkMenuItem *item, void
*opaque)
{
GtkDisplayState *s = opaque;
VirtualConsole *vc = gd_vc_find_current(s);
- char *title;
if (vc->type == GD_VC_GFX) {
/* temporary: needs more work to get grabs etc correct */
@@ -926,17 +943,11 @@ static void gd_menu_untabify(GtkMenuItem *item, void
*opaque)
vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_reparent(vc->tab_item, vc->window);
- if (qemu_name) {
- title = g_strdup_printf("QEMU (%s): %s", qemu_name, vc->label);
- } else {
- title = g_strdup_printf("QEMU: %s", vc->label);
- }
- gtk_window_set_title(GTK_WINDOW(vc->window), title);
- g_free(title);
-
g_signal_connect(vc->window, "delete-event",
G_CALLBACK(gd_tab_window_close), vc);
gtk_widget_show_all(vc->window);
+
+ gd_update_caption(s);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 08/24] gtk: support multiple gfx displays, (continued)
- [Qemu-devel] [PULL 08/24] gtk: support multiple gfx displays, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 10/24] gtk: simplify resize, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 06/24] gtk: VirtualConsole restruction, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 12/24] gtk: add tab to trace events, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 14/24] gtk: keep track of grab owner, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 11/24] gtk: allow moving tabs to windows and back., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 15/24] gtk: skip keyboard grab when hover autograb is active, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 13/24] gtk: add gd_grab trace event, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 02/24] gtk: zap vte size requests, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 16/24] gtk: update gd_update_caption,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 22/24] gtk: zap unused global_state, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 20/24] gtk: enable untabify for gfx, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 24/24] gtk: workaround gtk2 vte resize issue, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 17/24] gtk: fix grab checks, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 07/24] gtk: move vga state into VirtualGfxConsole, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 18/24] gtk: update all windows on mouse mode changes, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 23/24] gtk: window sizing overhaul, Gerd Hoffmann, 2014/05/26
- Re: [Qemu-devel] [PULL 00/24] gtk: ui overhaul, multiwindow support., Peter Maydell, 2014/05/28