[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] gtk: move gd_update_caption calls to gd_{grab, u
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/6] gtk: move gd_update_caption calls to gd_{grab, ungrab}_{pointer, keyboard} |
Date: |
Tue, 15 Sep 2015 12:38:51 +0200 |
Then we don't have to pair the grab/ungrab calls with update_caption
calls any more because things happen automatically ;)
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
ui/gtk.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 24a1edb..5f87475 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -856,7 +856,6 @@ static gboolean gd_button_event(GtkWidget *widget,
GdkEventButton *button,
TRUE);
} else {
gd_grab_pointer(vc);
- gd_update_caption(s);
}
return TRUE;
}
@@ -1095,7 +1094,6 @@ static gboolean gd_win_grab(void *opaque)
} else {
gd_grab_pointer(vc);
}
- gd_update_caption(vc->s);
return TRUE;
}
@@ -1278,6 +1276,7 @@ static void gd_grab_keyboard(VirtualConsole *vc)
GDK_CURRENT_TIME);
#endif
vc->s->kbd_owner = vc;
+ gd_update_caption(vc->s);
trace_gd_grab(vc->label, "kbd", true);
}
@@ -1295,6 +1294,7 @@ static void gd_ungrab_keyboard(GtkDisplayState *s)
#else
gdk_keyboard_ungrab(GDK_CURRENT_TIME);
#endif
+ gd_update_caption(s);
trace_gd_grab(vc->label, "kbd", false);
}
@@ -1336,6 +1336,7 @@ static void gd_grab_pointer(VirtualConsole *vc)
&vc->s->grab_x_root, &vc->s->grab_y_root, NULL);
#endif
vc->s->ptr_owner = vc;
+ gd_update_caption(vc->s);
trace_gd_grab(vc->label, "ptr", true);
}
@@ -1361,6 +1362,7 @@ static void gd_ungrab_pointer(GtkDisplayState *s)
gtk_widget_get_screen(vc->gfx.drawing_area),
vc->s->grab_x_root, vc->s->grab_y_root);
#endif
+ gd_update_caption(s);
trace_gd_grab(vc->label, "ptr", false);
}
@@ -1377,7 +1379,6 @@ static void gd_menu_grab_input(GtkMenuItem *item, void
*opaque)
gd_ungrab_pointer(s);
}
- gd_update_caption(s);
gd_update_cursor(vc);
}
@@ -1432,7 +1433,6 @@ static gboolean gd_enter_event(GtkWidget *widget,
GdkEventCrossing *crossing,
if (gd_grab_on_hover(s)) {
gd_grab_keyboard(vc);
- gd_update_caption(s);
}
return TRUE;
}
@@ -1445,7 +1445,6 @@ static gboolean gd_leave_event(GtkWidget *widget,
GdkEventCrossing *crossing,
if (gd_grab_on_hover(s)) {
gd_ungrab_keyboard(s);
- gd_update_caption(s);
}
return TRUE;
}
--
1.8.3.1
- [Qemu-devel] [PULL 0/6] gtk: misc grab tweaks, locale fix., Gerd Hoffmann, 2015/09/15
- [Qemu-devel] [PULL 6/6] gtk: use setlocale() for LC_MESSAGES only, Gerd Hoffmann, 2015/09/15
- [Qemu-devel] [PULL 4/6] gtk: set free_scale when setting zoom_fit, Gerd Hoffmann, 2015/09/15
- [Qemu-devel] [PULL 2/6] gtk: move gd_update_caption calls to gd_{grab, ungrab}_{pointer, keyboard},
Gerd Hoffmann <=
- [Qemu-devel] [PULL 1/6] gtk: check for existing grabs in gd_grab_{pointer, keyboard}, Gerd Hoffmann, 2015/09/15
- [Qemu-devel] [PULL 3/6] gtk: trace input grab reason, Gerd Hoffmann, 2015/09/15
- [Qemu-devel] [PULL 5/6] gtk: don't grab input when entering fullscreen., Gerd Hoffmann, 2015/09/15
- Re: [Qemu-devel] [PULL 0/6] gtk: misc grab tweaks, locale fix., Peter Maydell, 2015/09/15