On Fri, Apr 23, 2021 at 12:34 PM Gerd Hoffmann <kra...@redhat.com> wrote:
> Want place gtk clipboard code in a separate C file, which in turn
> requires GtkDisplayState being in a header file. So move it. No
> functional change.
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
> include/ui/gtk.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
> ui/gtk.c | 55 ----------------------------------------------
> 2 files changed, 57 insertions(+), 55 deletions(-)
>
> diff --git a/include/ui/gtk.h b/include/ui/gtk.h
> index 5ae0ad60a600..6e751794043f 100644
> --- a/include/ui/gtk.h
> +++ b/include/ui/gtk.h
> @@ -18,12 +18,15 @@
> #include <gdk/gdkwayland.h>
> #endif
>
> +#include "ui/console.h"
> #include "ui/kbd-state.h"
> #if defined(CONFIG_OPENGL)
> #include "ui/egl-helpers.h"
> #include "ui/egl-context.h"
> #endif
>
> +#define MAX_VCS 10
> +
> typedef struct GtkDisplayState GtkDisplayState;
>
> typedef struct VirtualGfxConsole {
> @@ -83,6 +86,60 @@ typedef struct VirtualConsole {
> };
> } VirtualConsole;
>
> +struct GtkDisplayState {
> + GtkWidget *window;
> +
> + GtkWidget *menu_bar;
> +
> + GtkAccelGroup *accel_group;
> +
> + GtkWidget *machine_menu_item;
> + GtkWidget *machine_menu;
> + GtkWidget *pause_item;
> + GtkWidget *reset_item;
> + GtkWidget *powerdown_item;
> + GtkWidget *quit_item;
> +
> + GtkWidget *view_menu_item;
> + GtkWidget *view_menu;
> + GtkWidget *full_screen_item;
> + GtkWidget *copy_item;
> + GtkWidget *zoom_in_item;
> + GtkWidget *zoom_out_item;
> + GtkWidget *zoom_fixed_item;
> + GtkWidget *zoom_fit_item;
> + GtkWidget *grab_item;
> + GtkWidget *grab_on_hover_item;
> +
> + int nb_vcs;
> + VirtualConsole vc[MAX_VCS];
> +
> + GtkWidget *show_tabs_item;
> + GtkWidget *untabify_item;
> + GtkWidget *show_menubar_item;
> +
> + GtkWidget *vbox;
> + GtkWidget *notebook;
> + int button_mask;
> + gboolean last_set;
> + int last_x;
> + int last_y;
> + int grab_x_root;
> + int grab_y_root;
> + VirtualConsole *kbd_owner;
> + VirtualConsole *ptr_owner;
> +
> + gboolean full_screen;
> +
> + GdkCursor *null_cursor;
> + Notifier mouse_mode_notifier;
> + gboolean free_scale;
> +
> + bool external_pause_update;
> +
> + DisplayOptions *opts;
> +};
> +
> extern bool gtk_use_gl_area;
>
> /* ui/gtk.c */
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 1ea12535284a..7da288a25156 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -60,7 +60,6 @@
> #include "chardev/char.h"
> #include "qom/object.h"
>
> -#define MAX_VCS 10
> #define VC_WINDOW_X_MIN 320
> #define VC_WINDOW_Y_MIN 240
> #define VC_TERM_X_MIN 80
> @@ -119,60 +118,6 @@
> static const guint16 *keycode_map;
> static size_t keycode_maplen;
>
> -struct GtkDisplayState {
> - GtkWidget *window;
> -
> - GtkWidget *menu_bar;
> -
> - GtkAccelGroup *accel_group;
> -
> - GtkWidget *machine_menu_item;
> - GtkWidget *machine_menu;
> - GtkWidget *pause_item;
> - GtkWidget *reset_item;
> - GtkWidget *powerdown_item;
> - GtkWidget *quit_item;
> -
> - GtkWidget *view_menu_item;
> - GtkWidget *view_menu;
> - GtkWidget *full_screen_item;
> - GtkWidget *copy_item;
> - GtkWidget *zoom_in_item;
> - GtkWidget *zoom_out_item;
> - GtkWidget *zoom_fixed_item;
> - GtkWidget *zoom_fit_item;
> - GtkWidget *grab_item;
> - GtkWidget *grab_on_hover_item;
> -
> - int nb_vcs;
> - VirtualConsole vc[MAX_VCS];
> -
> - GtkWidget *show_tabs_item;
> - GtkWidget *untabify_item;
> - GtkWidget *show_menubar_item;
> -
> - GtkWidget *vbox;
> - GtkWidget *notebook;
> - int button_mask;
> - gboolean last_set;
> - int last_x;
> - int last_y;
> - int grab_x_root;
> - int grab_y_root;
> - VirtualConsole *kbd_owner;
> - VirtualConsole *ptr_owner;
> -
> - gboolean full_screen;
> -
> - GdkCursor *null_cursor;
> - Notifier mouse_mode_notifier;
> - gboolean free_scale;
> -
> - bool external_pause_update;
> -
> - DisplayOptions *opts;
> -};
> -
> struct VCChardev {
> Chardev parent;
> VirtualConsole *console;
> --
> 2.30.2
>
>
