[Spice-commits] 5 commits - configure.ac gtk/spice-widget.c spice-common

[Marc-André Lureau]

 configure.ac       |   48 +++++++++++++++++++++---------------------------
 gtk/spice-widget.c |    2 +-
 spice-common       |    2 +-
 3 files changed, 23 insertions(+), 29 deletions(-)

New commits:
commit 4c7f3914941eb70a0e6060f40d3749c4f6d1424d
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu Sep 26 20:20:42 2013 +0200

    win32: fix alt-tab grab regression
    
    Since 5f67178c, alt-tab is no longer grabbed by the client. The keyboard
    hook still needs to handle WM_SYSKEY{DOWN,UP} messages.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=873341

diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c
index 4ac1a2f..d39ff59 100644
--- a/gtk/spice-widget.c
+++ b/gtk/spice-widget.c
@@ -659,7 +659,7 @@ void spice_display_set_grab_keys(SpiceDisplay *display, SpiceGrabSequence *seq)
 #ifdef WIN32
 static LRESULT CALLBACK keyboard_hook_cb(int code, WPARAM wparam, LPARAM lparam)
 {
-    if  (win32_window && code == HC_ACTION && wparam == WM_KEYDOWN) {
+    if  (win32_window && code == HC_ACTION && wparam != WM_KEYUP) {
         KBDLLHOOKSTRUCT *hooked = (KBDLLHOOKSTRUCT*)lparam;
         DWORD dwmsg = (hooked->flags << 24) | (hooked->scanCode << 16) | 1;
 
commit daa4ece949d7deb36c3c061b3abda8dc43f46ad6
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu Sep 26 19:35:52 2013 +0200

    build-sys: do not compile python binding with windows by default

diff --git a/configure.ac b/configure.ac
index 7471540..c42066f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -572,22 +572,18 @@ AM_CONDITIONAL(WITH_VALA, [test "x$enable_vala" = "xyes"])
 VAPIDIR="${datadir}/vala/vapi"
 AC_SUBST(VAPIDIR)
 
+
 AC_ARG_WITH([python],
-  AS_HELP_STRING([--with-python], [build python bindings @<:@default=yes@:>@]),
-  [case "${withval}" in
-     yes|no) ;;
-     *) AC_MSG_ERROR([bad value ${withval} for python option]) ;;
+  AS_HELP_STRING([--with-python], [build python bindings @<:@default=auto@:>@]),
+  [case "$withval" in
+   yes|no) with_python="$withval";;
+   *) AC_MSG_ERROR([bad value $withval for python option]) ;;
    esac],
-  [withval=yes])
-
-if test "$with_gtk" = "3.0"
-then
-  WITH_PYTHON=no
-else
-  WITH_PYTHON=$withval
-fi
+  [AS_IF([test "$with_gtk" = "3.0" -o test "x$os_win32=xyes"],
+         [with_python=no])]
+)
 
-if test "$WITH_PYTHON" = "yes"; then
+if test "x$with_python" = "xyes"; then
   PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= 2.0.0)
   AC_SUBST(PYGTK_CFLAGS)
   AC_SUBST(PYGTK_LIBS)
@@ -615,7 +611,7 @@ if test "$WITH_PYTHON" = "yes"; then
   fi
 fi
 
-AM_CONDITIONAL(WITH_PYTHON, [test "$WITH_PYTHON" = "yes"])
+AM_CONDITIONAL(WITH_PYTHON, [test "x$with_python" = "xyes"])
 
 
 AC_ARG_ENABLE([dbus],
commit 56e661ca3a26b2235acb420e59a19034f1fa895d
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu Sep 26 19:05:57 2013 +0200

    Update spice-common

diff --git a/spice-common b/spice-common
index 3363fe7..f88e851 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 3363fe79f9d450774dd018a794c0b4381c1ef0a7
+Subproject commit f88e851ed684f25d325e610b3ac2db2d6bc30848
commit b881d931f741a6b2c87ada184c7569f962c3785e
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu Sep 26 18:34:50 2013 +0200

    build-sys: add --with-audio=auto
    
    Defaults to GStreamer on Windows, and PulseAudio otherwise atm.

diff --git a/configure.ac b/configure.ac
index b63a695..7471540 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,9 +265,13 @@ AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
 AC_ARG_WITH([audio],
-  AS_HELP_STRING([--with-audio=@<:@gstreamer/pulse/no@:>@], [Select audio backend @<:@default=pulse@:>@]),
+  AS_HELP_STRING([--with-audio=@<:@gstreamer/pulse/auto/no@:>@], [Select audio backend @<:@default=auto@:>@]),
   [],
-  [with_audio="pulse"])
+  [with_audio="auto"])
+
+AS_IF([test "x$with_audio" = "xauto"], [
+  AS_IF([test "x$os_win32" = "xyes"], [with_audio=gstreamer], [with_audio=pulse])
+])
 
 case "$with_audio" in
   gstreamer|pulse|no*)
commit 2b47e8c16f78dda81edb11a80be7c481aa457419
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu Sep 26 18:28:28 2013 +0200

    build-sys: fix --with-sasl
    
    The default configure sasl auto setting will error out if SASL is
    missing. Instead, silentely skip sasl configure if detected missing.

diff --git a/configure.ac b/configure.ac
index 74738a3..b63a695 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,30 +122,24 @@ if test "x$with_sasl" != "xno"; then
     SASL_CFLAGS="-I$with_sasl"
     SASL_LIBS="-L$with_sasl"
   fi
-  fail=0
   old_cflags="$CFLAGS"
   old_libs="$LIBS"
   CFLAGS="$CFLAGS $SASL_CFLAGS"
   LIBS="$LIBS $SASL_LIBS"
-  AC_CHECK_HEADER([sasl/sasl.h],[],[
-    if test "x$with_sasl" != "xauto" ; then
-        with_sasl=no
-    else
-        fail=1
-    fi])
-  if test "x$with_sasl" != "xno" ; then
+  AC_CHECK_HEADER([sasl/sasl.h],[with_sasl=yes])
+  if test "x$with_sasl" = "xyes" ; then
     AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl2=yes],[with_sasl2=no])
   fi
-  if test "x$with_sasl2" = "xno" -a "x$with_sasl" != "xno" ; then
+  if test "x$with_sasl2" = "xno" -a "x$with_sasl" = "xyes" ; then
     AC_CHECK_LIB([sasl], [sasl_client_init],[with_sasl=yes],[with_sasl=no])
   fi
   if test "x$with_sasl2" = "xyes"; then
     SASL_LIBS="$SASL_LIBS -lsasl2"
   elif test "x$with_sasl" = "xyes"; then
     SASL_LIBS="$SASL_LIBS -lsasl"
-  else
+  elif test "x$with_sasl" != "xauto"; then
     AC_MSG_ERROR([You must install the Cyrus SASL development package in order to compile spice-gtk])
- fi
+  fi
   CFLAGS="$old_cflags"
   LIBS="$old_libs"
   if test "x$with_sasl2" = "xyes" -o "x$with_sasl" = "xyes" ; then