From patchwork Tue May 5 11:27:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 468087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 499FB140789 for ; Tue, 5 May 2015 22:06:55 +1000 (AEST) Received: from localhost ([::1]:38481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ypb1r-0005fd-BT for incoming@patchwork.ozlabs.org; Tue, 05 May 2015 07:28:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ypb1C-0004ji-GO for qemu-devel@nongnu.org; Tue, 05 May 2015 07:28:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ypb14-00054V-0D for qemu-devel@nongnu.org; Tue, 05 May 2015 07:28:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ypb13-00053b-Op for qemu-devel@nongnu.org; Tue, 05 May 2015 07:27:57 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t45BRuIr025204 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 5 May 2015 07:27:57 -0400 Received: from nilsson.home.kraxel.org (ovpn-116-78.ams2.redhat.com [10.36.116.78]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t45BRsNE027728; Tue, 5 May 2015 07:27:55 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 09F44832C8; Tue, 5 May 2015 13:27:54 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 5 May 2015 13:27:45 +0200 Message-Id: <1430825266-30300-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1430825266-30300-1-git-send-email-kraxel@redhat.com> References: <1430825266-30300-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 4/5] gtk: create gtk.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move various gtk bits (includes, data structures) to a header file. Signed-off-by: Gerd Hoffmann --- include/ui/gtk.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ui/gtk.c | 73 ++--------------------------------------------------- 2 files changed, 78 insertions(+), 71 deletions(-) create mode 100644 include/ui/gtk.h diff --git a/include/ui/gtk.h b/include/ui/gtk.h new file mode 100644 index 0000000..b750845 --- /dev/null +++ b/include/ui/gtk.h @@ -0,0 +1,76 @@ +#ifndef UI_GTK_H +#define UI_GTK_H + +#ifdef _WIN32 +# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */ +#endif + +#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE +/* Work around an -Wstrict-prototypes warning in GTK headers */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstrict-prototypes" +#endif +#include +#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE +#pragma GCC diagnostic pop +#endif + +#include + +#ifdef GDK_WINDOWING_X11 +#include +#include +#endif + +/* Compatibility define to let us build on both Gtk2 and Gtk3 */ +#if GTK_CHECK_VERSION(3, 0, 0) +static inline void gdk_drawable_get_size(GdkWindow *w, gint *ww, gint *wh) +{ + *ww = gdk_window_get_width(w); + *wh = gdk_window_get_height(w); +} +#endif + +typedef struct GtkDisplayState GtkDisplayState; + +typedef struct VirtualGfxConsole { + GtkWidget *drawing_area; + DisplayChangeListener dcl; + DisplaySurface *ds; + pixman_image_t *convert; + cairo_surface_t *surface; + double scale_x; + double scale_y; +} VirtualGfxConsole; + +#if defined(CONFIG_VTE) +typedef struct VirtualVteConsole { + GtkWidget *box; + GtkWidget *scrollbar; + GtkWidget *terminal; + CharDriverState *chr; +} VirtualVteConsole; +#endif + +typedef enum VirtualConsoleType { + GD_VC_GFX, + GD_VC_VTE, +} VirtualConsoleType; + +typedef struct VirtualConsole { + GtkDisplayState *s; + char *label; + GtkWidget *window; + GtkWidget *menu_item; + GtkWidget *tab_item; + GtkWidget *focus; + VirtualConsoleType type; + union { + VirtualGfxConsole gfx; +#if defined(CONFIG_VTE) + VirtualVteConsole vte; +#endif + }; +} VirtualConsole; + +#endif /* UI_GTK_H */ diff --git a/ui/gtk.c b/ui/gtk.c index 9163b43..8b1458f 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -34,24 +34,11 @@ #define GETTEXT_PACKAGE "qemu" #define LOCALEDIR "po" -#ifdef _WIN32 -# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */ -#endif - #include "qemu-common.h" -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE -/* Work around an -Wstrict-prototypes warning in GTK headers */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wstrict-prototypes" -#endif -#include -#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE -#pragma GCC diagnostic pop -#endif - +#include "ui/console.h" +#include "ui/gtk.h" -#include #include #include #if defined(CONFIG_VTE) @@ -60,7 +47,6 @@ #include #include "trace.h" -#include "ui/console.h" #include "ui/input.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" @@ -68,10 +54,6 @@ #include "keymaps.h" #include "sysemu/char.h" #include "qom/object.h" -#ifdef GDK_WINDOWING_X11 -#include -#include -#endif #define MAX_VCS 10 #define VC_WINDOW_X_MIN 320 @@ -99,15 +81,6 @@ # define VTE_RESIZE_HACK 1 #endif -/* Compatibility define to let us build on both Gtk2 and Gtk3 */ -#if GTK_CHECK_VERSION(3, 0, 0) -static inline void gdk_drawable_get_size(GdkWindow *w, gint *ww, gint *wh) -{ - *ww = gdk_window_get_width(w); - *wh = gdk_window_get_height(w); -} -#endif - #if !GTK_CHECK_VERSION(2, 20, 0) #define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED(widget) #endif @@ -138,48 +111,6 @@ static const int modifier_keycode[] = { 0x2a, 0x36, 0x1d, 0x9d, 0x38, 0xb8, 0xdb, 0xdd, }; -typedef struct GtkDisplayState GtkDisplayState; - -typedef struct VirtualGfxConsole { - GtkWidget *drawing_area; - DisplayChangeListener dcl; - DisplaySurface *ds; - pixman_image_t *convert; - cairo_surface_t *surface; - double scale_x; - double scale_y; -} VirtualGfxConsole; - -#if defined(CONFIG_VTE) -typedef struct VirtualVteConsole { - GtkWidget *box; - GtkWidget *scrollbar; - GtkWidget *terminal; - CharDriverState *chr; -} VirtualVteConsole; -#endif - -typedef enum VirtualConsoleType { - GD_VC_GFX, - GD_VC_VTE, -} VirtualConsoleType; - -typedef struct VirtualConsole { - GtkDisplayState *s; - char *label; - GtkWidget *window; - GtkWidget *menu_item; - GtkWidget *tab_item; - GtkWidget *focus; - VirtualConsoleType type; - union { - VirtualGfxConsole gfx; -#if defined(CONFIG_VTE) - VirtualVteConsole vte; -#endif - }; -} VirtualConsole; - struct GtkDisplayState { GtkWidget *window;