Commit 6fc0303b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-4' into staging 



Input handling rewrite.
SDL2 support.

# gpg: Signature made Wed 05 Mar 2014 11:16:08 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-input-4: (38 commits)
  ui/sdl2 : initial port to SDL 2.0 (v2.0)
  console: add QemuUIInfo
  console: add head to index to qemu consoles.
  input: remove index_from_keycode (no users)
  input: move do_mouse_set to new core
  input: move qmp_query_mice to new core
  input: add input_mouse_mode tracepoint
  input: move mouse mode notifier to new core
  input-legacy: remove kbd_mouse_event
  input-legacy: remove kbd_mouse_is_absolute
  input-legacy: remove kbd_mouse_has_absolute
  input-legacy: remove kbd_put_keycode
  input: trace events
  input: mouse: switch cocoa ui to new core
  input: keyboard: switch cocoa ui to new core
  input: mouse: switch monitor to new core
  input: mouse: switch spice ui to new core
  input: mouse: switch vnc ui to new core
  input: mouse: switch sdl ui to new core
  input: mouse: switch gtk ui to new core
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bb2b0450 47c03744

backends/baum.c

+2 −2
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ CharDriverState *chr_baum_init(void) 
    BaumDriverState *baum;

    CharDriverState *chr;

    brlapi_handle_t *handle;

#ifdef CONFIG_SDL

#if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)

    SDL_SysWMinfo info;

#endif

    int tty;
@@ -595,7 +595,7 @@ CharDriverState *chr_baum_init(void) 
        goto fail;

    }



#ifdef CONFIG_SDL

#if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)

    memset(&info, 0, sizeof(info));

    SDL_VERSION(&info.version);

    if (SDL_GetWMInfo(&info))

configure

+19 −4
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ fdt="" 
netmap="no"

pixman=""

sdl=""

sdlabi="1.2"

virtfs=""

vnc="yes"

sparse="no"
@@ -395,6 +396,7 @@ query_pkg_config() { 
}

pkg_config=query_pkg_config

sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"

sdl2_config="${SDL2_CONFIG-${cross_prefix}sdl2-config}"



# If the user hasn't specified ARFLAGS, default to 'rv', just as make does.

ARFLAGS="${ARFLAGS-rv}"
@@ -804,6 +806,8 @@ for opt do 
  ;;

  --enable-sdl) sdl="yes"

  ;;

  --with-sdlabi=*) sdlabi="$optarg"

  ;;

  --disable-qom-cast-debug) qom_cast_debug="no"

  ;;

  --enable-qom-cast-debug) qom_cast_debug="yes"
@@ -1225,6 +1229,7 @@ Advanced options (experts only): 
  --disable-werror         disable compilation abort on warning

  --disable-sdl            disable SDL

  --enable-sdl             enable SDL

  --with-sdlabi            select preferred SDL ABI 1.2 or 2.0

  --disable-gtk            disable gtk UI

  --enable-gtk             enable gtk UI

  --disable-virtfs         disable VirtFS
@@ -1986,12 +1991,22 @@ fi 


# Look for sdl configuration program (pkg-config or sdl-config).  Try

# sdl-config even without cross prefix, and favour pkg-config over sdl-config.

if test "`basename $sdl_config`" != sdl-config && ! has ${sdl_config}; then

  sdl_config=sdl-config



if test $sdlabi = "2.0"; then

    sdl_config=$sdl2_config

    sdlname=sdl2

    sdlconfigname=sdl2_config

else

    sdlname=sdl

    sdlconfigname=sdl_config

fi



if test "`basename $sdl_config`" != $sdlconfigname && ! has ${sdl_config}; then

  sdl_config=$sdlconfigname

fi



if $pkg_config sdl --exists; then

  sdlconfig="$pkg_config sdl"

if $pkg_config $sdlname --exists; then

  sdlconfig="$pkg_config $sdlname"

  _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`

elif has ${sdl_config}; then

  sdlconfig="$sdl_config"

hw/arm/musicpal.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static int musicpal_lcd_init(SysBusDevice *sbd) 
                          "musicpal-lcd", MP_LCD_SIZE);

    sysbus_init_mmio(sbd, &s->iomem);



    s->con = graphic_console_init(dev, &musicpal_gfx_ops, s);

    s->con = graphic_console_init(dev, 0, &musicpal_gfx_ops, s);

    qemu_console_resize(s->con, 128*3, 64*3);



    qdev_init_gpio_in(dev, musicpal_lcd_gpio_brightness_in, 3);

hw/display/blizzard.c

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ void *s1d13745_init(qemu_irq gpio_int) 


    s->fb = g_malloc(0x180000);



    s->con = graphic_console_init(NULL, &blizzard_ops, s);

    s->con = graphic_console_init(NULL, 0, &blizzard_ops, s);

    surface = qemu_console_surface(s->con);



    switch (surface_bits_per_pixel(surface)) {

hw/display/cg3.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static void cg3_realizefn(DeviceState *dev, Error **errp) 


    sysbus_init_irq(sbd, &s->irq);



    s->con = graphic_console_init(DEVICE(dev), &cg3_ops, s);

    s->con = graphic_console_init(DEVICE(dev), 0, &cg3_ops, s);

    qemu_console_resize(s->con, s->width, s->height);

}