Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-7' into staging

gtk: ui overhaul, multiwindow support.

# gpg: Signature made Mon 26 May 2014 08:54:55 BST using RSA key ID D3E87138
# gpg: Can't check signature: public key not found

* remotes/kraxel/tags/pull-gtk-7: (24 commits)
  gtk: workaround gtk2 vte resize issue
  gtk: window sizing overhaul
  gtk: zap unused global_state
  gtk: Add handling for the xfree86 keycodes
  gtk: enable untabify for gfx
  gtk: detached window pointer grabs
  gtk: update all windows on mouse mode changes
  gtk: fix grab checks
  gtk: update gd_update_caption
  gtk: skip keyboard grab when hover autograb is active
  gtk: keep track of grab owner
  gtk: add gd_grab trace event
  gtk: add tab to trace events
  gtk: allow moving tabs to windows and back.
  gtk: simplify resize
  gtk: use device type as label
  gtk: support multiple gfx displays
  gtk: move vga state into VirtualGfxConsole
  gtk: VirtualConsole restruction
  gtk: remove page numbering assumtions from the code
  ...

Signed-off-by: Peter Maydell <[email protected]>

diff --cc trace-events
index ea56d5281e93d8a7343d9f4f7d76d43fecc806ee,aaaae42e697c4d9c981a4c6c8e3e1b8905ed8fec..f256ca51b0d8cb88cabc2b32111813917f7bc315
--- 1/trace-events
--- 2/trace-events
+++ b/trace-events
@@@ -1042,12 -1045,13 +1042,13 @@@ displaychangelistener_unregister(void *
  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)"
+ gd_grab(const char *tab, const char *device, bool on) "tab=%s, %s %d"
  
  # ui/input.c
 -input_event_key_number(int conidx, int number, bool down) "con %d, key number 0x%x, down %d"
 +input_event_key_number(int conidx, int number, const char *qcode, bool down) "con %d, key number 0x%x [%s], down %d"
  input_event_key_qcode(int conidx, const char *qcode, bool down) "con %d, key qcode %s, down %d"
  input_event_btn(int conidx, const char *btn, bool down) "con %d, button %s, down %d"
  input_event_rel(int conidx, const char *axis, int value) "con %d, axis %s, value %d"