Comparing 178ac111bc...e7e6d10d0f - qemu

Author	SHA1	Message	Date
Gerd Hoffmann	6fa2769751	gtk: workaround gtk2 vte resize issue Hack isn't pretty, but gets the job done. See source code comment for details. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:04 +02:00
Gerd Hoffmann	82fc18099a	gtk: window sizing overhaul Major overhaul for window size handling. This basically switches qemu over to use geometry hints for the window manager instead of trying to get the job done with widget resize requests. This allows to specify better what we need and also avoids window resizes. FIXME: on gtk2 someone overwrites the geometry hints :( Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:04 +02:00
Gerd Hoffmann	0f61a61df3	gtk: zap unused global_state Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:04 +02:00
Bruce Rogers	3158a3482b	gtk: Add handling for the xfree86 keycodes Currently only evdev keycodes are handled by the gtk-ui. SDL has code to handle both. This patch adds similar processing so that both keycode types will be handled via the gtk-ui. Signed-off-by: Bruce Rogers <brogers@suse.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:04 +02:00
Gerd Hoffmann	aa0a55d42d	gtk: enable untabify for gfx Now we have all grab fixes in place, so we can allow detaching graphic display tabs too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:04 +02:00
Gerd Hoffmann	0c77a37f11	gtk: detached window pointer grabs Make ungrab hotkey work with detached windows. Enable pointer grabs for detached windows. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:04 +02:00
Gerd Hoffmann	99623c90d1	gtk: update all windows on mouse mode changes We might have multiple graphic displays now which all need a cursor update. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	2884cf5b93	gtk: fix grab checks Make it handle multiple windows case correctly. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	4eeaa3a885	gtk: update gd_update_caption Adapt to recent changes, handle multiple windows. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	746b867030	gtk: skip keyboard grab when hover autograb is active It's pointless. With grab on hover enabled the keyboard grab is already active when you press Ctrl-Alt-G ;) Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	4c638e2e4b	gtk: keep track of grab owner Simplifies grab state tracking and makes ungrab more reliable. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	1c856da57b	gtk: add gd_grab trace event Input grab code is tricky, add some debug & trouble shooting aid. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	74444bc198	gtk: add tab to trace events So you can see which of multiple displays (if present) was resized ;) Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	cdeb7090ee	gtk: allow moving tabs to windows and back. "View->Detach tab" will move to tab to a new window. Simply closing the window will move it back into a notebook tab. The label will be permamently stored in VirtualConsole->label, so it can easily be reused to (re-)label tabs and windows. Works for vte tabs only for now. pointer/kbd grab code needs adaptions before we can enable it for gfx tabs too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	d3ef575080	gtk: simplify resize Simply ask for a small window size. When the widgets don't fit in gtk will automatically make the window large enougth to make things fit, no need to try (and fail) duplicate that logic in qemu. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	6a24ced5ca	gtk: use device type as label IMO useful than showing VGA for any graphic device even in case it is something completely different. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	ed1132e41a	gtk: support multiple gfx displays Each display gets its own tab. Tab switching continues to work like it did, just the hotkeys of the vte consoles changes in case a secondary display is present as it will get ctrl-alt-2 assigned and the vtes are shifted by one. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	e3500d1f5f	gtk: move vga state into VirtualGfxConsole Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	271a25c0b6	gtk: VirtualConsole restruction Move all vte-related items into VirtualVteConsole substruct. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	832189c9b1	gtk: remove page numbering assumtions from the code Lookup page numbers using gtk_notebook_page_num() instead. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Cole Robinson	0fb20d1c39	gtk: Add a scrollbar for text consoles Only show the scrollbar if the content doesn't fit on the visible space. [ kraxel: fix box packing ] Signed-off-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	ee5f31e48b	gtk: cleanup CONFIG_VTE ifdef a bit. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	6fe83074d7	gtk: zap vte size requests The vte tabs simply get the size of the vga tab then, with whatever cols and lines are fitting in. I find this bahavior more useful than resizing the qemu window all day long. YMMV. Comments are welcome. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:03 +02:00
Gerd Hoffmann	fd07d07ba9	gtk: zap scrolled_window The vte widget implements the scrollable interface, placing it into a scrolled window is pointless and creates a bunch of strange effects. Zap it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	2014-05-26 08:41:02 +02:00

2 changed files with 739 additions and 378 deletions

7

trace-events

View File

 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_switch(const char *tab, int width, int height) "tab=%s, width=%d, height=%d"
-gd_update(int x, int y, int w, int h) "x=%d, y=%d, w=%d, h=%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(int gdk_keycode, int qemu_keycode, const char *action) "translated GDK keycode %d to QEMU keycode %d (%s)"
+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"

1100

ui/gtk.c

View File

File diff suppressed because it is too large Load Diff

Compare commits

24 Commits

pull-conso ... pull-gtk-7

7

trace-events

View File

1100

ui/gtk.c

View File

Compare commits

24 Commits pull-conso ... pull-gtk-7

7 trace-events Unescape Escape View File

1100 ui/gtk.c View File

24 Commits

pull-conso ... pull-gtk-7

7

trace-events

View File

1100

ui/gtk.c

View File