qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PATCH 12/22] gtk: add tab to trace events
Date: Tue,  6 May 2014 14:05:48 +0200	[thread overview]
Message-ID: <1399377958-20076-13-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1399377958-20076-1-git-send-email-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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

  parent reply	other threads:[~2014-05-06 12:06 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-06 12:05 [Qemu-devel] [PATCH 00/22] gtk: ui overhaul Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 01/22] gtk: zap scrolled_window Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 02/22] gtk: zap vte size requests Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 03/22] gtk: cleanup CONFIG_VTE ifdef a bit Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 04/22] gtk: Add a scrollbar for text consoles Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 05/22] gtk: remove page numbering assumtions from the code Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 06/22] gtk: VirtualConsole restruction Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 07/22] gtk: move vga state into VirtualGfxConsole Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 08/22] gtk: support multiple gfx displays Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 09/22] gtk: use device type as label Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 10/22] gtk: simplify resize Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 11/22] gtk: allow moving tabs to windows and back Gerd Hoffmann
2014-05-06 12:05 ` Gerd Hoffmann [this message]
2014-05-06 12:05 ` [Qemu-devel] [PATCH 13/22] gtk: add gd_grab trace event Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 14/22] gtk: keep track of grab owner Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 15/22] gtk: skip keyboard grab when hover autograb is active Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 16/22] gtk: update gd_update_caption Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 17/22] gtk: fix grab checks Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 18/22] gtk: update all windows on mouse mode changes Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 19/22] gtk: enable window pointer grabs Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 20/22] gtk: enable untabify for gfx Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 21/22] gtk: Add handling for the xfree86 keycodes Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 22/22] gtk: zap unused global_state Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399377958-20076-13-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).