Commit 19a2c626 authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

gtk: Initialization stubs 



This reduces the number of CONFIG_GTK #ifdefs in vl.c.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent e35ee7c1

include/ui/console.h

+17 −0
Original line number Diff line number Diff line
@@ -506,7 +506,24 @@ static inline void curses_display_init(DisplayState *ds, int full_screen) 
int index_from_key(const char *key, size_t key_length);



/* gtk.c */

#ifdef CONFIG_GTK

void early_gtk_display_init(int opengl);

void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover);

#else

static inline void gtk_display_init(DisplayState *ds, bool full_screen,

                                    bool grab_on_hover)

{

    /* This must never be called if CONFIG_GTK is disabled */

    error_report("GTK support is disabled");

    abort();

}



static inline void early_gtk_display_init(int opengl)

{

    /* This must never be called if CONFIG_GTK is disabled */

    error_report("GTK support is disabled");

    abort();

}

#endif



#endif

vl.c

+1 −6
Original line number Diff line number Diff line
@@ -148,9 +148,7 @@ int vga_interface_type = VGA_NONE; 
static int full_screen = 0;

static int no_frame = 0;

int no_quit = 0;

#ifdef CONFIG_GTK

static bool grab_on_hover;

#endif

CharDriverState *serial_hds[MAX_SERIAL_PORTS];

CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];

CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
@@ -4246,11 +4244,10 @@ int main(int argc, char **argv, char **envp) 
                     "ignoring option");

    }



#if defined(CONFIG_GTK)

    if (display_type == DT_GTK) {

        early_gtk_display_init(request_opengl);

    }

#endif



    if (display_type == DT_SDL) {

        sdl_display_early_init(request_opengl);

    }
@@ -4548,11 +4545,9 @@ int main(int argc, char **argv, char **envp) 
    case DT_COCOA:

        cocoa_display_init(ds, full_screen);

        break;

#if defined(CONFIG_GTK)

    case DT_GTK:

        gtk_display_init(ds, full_screen, grab_on_hover);

        break;

#endif

    default:

        break;

    }