From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whe8Y-000619-JW for qemu-devel@nongnu.org; Tue, 06 May 2014 08:06:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Whe8N-0001Xk-V4 for qemu-devel@nongnu.org; Tue, 06 May 2014 08:06:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whe8N-0001XP-Lk for qemu-devel@nongnu.org; Tue, 06 May 2014 08:06:07 -0400 From: Gerd Hoffmann Date: Tue, 6 May 2014 14:05:48 +0200 Message-Id: <1399377958-20076-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1399377958-20076-1-git-send-email-kraxel@redhat.com> References: <1399377958-20076-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 12/22] gtk: add tab to trace events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori Signed-off-by: Gerd Hoffmann --- trace-events | 6 +++--- ui/gtk.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/trace-events b/trace-events index a5218ba..9b9d9d9 100644 --- a/trace-events +++ b/trace-events @@ -1038,9 +1038,9 @@ displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]" ppm_save(const char *filename, void *display_surface) "%s surface=%p" # ui/gtk.c -gd_switch(int width, int height) "width=%d, height=%d" -gd_update(int x, int y, int w, int h) "x=%d, y=%d, w=%d, h=%d" -gd_key_event(int gdk_keycode, int qemu_keycode, const char *action) "translated GDK keycode %d to QEMU keycode %d (%s)" +gd_switch(const char *tab, int width, int height) "tab=%s, width=%d, height=%d" +gd_update(const char *tab, int x, int y, int w, int h) "tab=%s, x=%d, y=%d, w=%d, h=%d" +gd_key_event(const char *tab, int gdk_keycode, int qemu_keycode, const char *action) "tab=%s, translated GDK keycode %d to QEMU keycode %d (%s)" # ui/input.c input_event_key_number(int conidx, int number, bool down) "con %d, key number 0x%x, down %d" diff --git a/ui/gtk.c b/ui/gtk.c index e90d232..c47f4ee 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -355,7 +355,7 @@ static void gd_update(DisplayChangeListener *dcl, int fbw, fbh; int ww, wh; - trace_gd_update(x, y, w, h); + trace_gd_update(vc->label, x, y, w, h); if (vc->gfx.convert) { pixman_image_composite(PIXMAN_OP_SRC, vc->gfx.ds->image, @@ -461,7 +461,7 @@ static void gd_switch(DisplayChangeListener *dcl, VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); bool resized = true; - trace_gd_switch(surface_width(surface), surface_height(surface)); + trace_gd_switch(vc->label, surface_width(surface), surface_height(surface)); if (vc->gfx.surface) { cairo_surface_destroy(vc->gfx.surface); @@ -815,7 +815,7 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) } #endif - trace_gd_key_event(gdk_keycode, qemu_keycode, + trace_gd_key_event(vc->label, gdk_keycode, qemu_keycode, (key->type == GDK_KEY_PRESS) ? "down" : "up"); for (i = 0; i < ARRAY_SIZE(modifier_keycode); i++) { -- 1.8.3.1