[Spice-commits] 3 commits - AUTHORS build-aux/gitlog-to-changelog gtk/Makefile.am gtk/spice-widget.c .mailmap Makefile.am NEWS po/POTFILES.in
Marc-André Lureau
elmarco at kemper.freedesktop.org
Sun Jan 15 13:18:46 PST 2012
.mailmap | 2
AUTHORS | 8 +
Makefile.am | 12 ++
NEWS | 14 +++
build-aux/gitlog-to-changelog | 191 ++++++++++++++++++++++++++++++++++++++++++
gtk/Makefile.am | 4
gtk/spice-widget.c | 15 +--
po/POTFILES.in | 11 +-
8 files changed, 241 insertions(+), 16 deletions(-)
New commits:
commit b84535b6db0b7420885d2a2b0e2f0ac3d1a80910
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Sun Jan 15 19:52:51 2012 +0100
Release 0.8
diff --git a/.mailmap b/.mailmap
index f998761..7938323 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,4 +2,6 @@
# <Preferred address in AUTHORS> <other alias used by same author>
<cfergeau at redhat.com> <teuf at gnome.org>
+<cfergeau at redhat.com> <cfergeau at gmail.com>
<marcandre.lureau at redhat.com> <marcandre.lureau at gmail.com>
+<dev-zero at gentoo.org> <tiziano.mueller at stepping-stone.ch>
diff --git a/AUTHORS b/AUTHORS
index 289072b..5c0c4d6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,6 @@
-Gerd Hoffmann <kraxel at redhat.com>
-Marc-André Lureau <marcandre.lureau at redhat.com>
+The following people contributed significantly to spice-gtk:
+
+Gerd Hoffmann <kraxel at redhat.com> - original author
+Marc-André Lureau <marcandre.lureau at redhat.com> - maintainer
+Hans de Goede <hdegoede at redhat.com> - usb redirection
+Christophe Fergeau <cfergeau at redhat.com> - smartcard
diff --git a/NEWS b/NEWS
index 5ce9dd9..18687af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+v0.8
+====
+
+- add USB redirection support, see Hans comments in the log and that
+ post for details: http://hansdegoede.livejournal.com/11084.html
+- introduce SpiceGtkSession to deal with session-wide Gtk events, such
+ as clipboard, instead of doing it per display
+- many cursor and keyboard handling improvements
+- handle the new "semi-seamless" migration
+- support new Spice mini-headers
+- better coroutines: fibers on windows & jmp on linux
+- add Vala vapi bindings generation
+- many bug fixes and code improvements
+
v0.7
====
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8279846..f919aab 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -89,7 +89,7 @@ AM_CPPFLAGS = \
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
SPICE_GTK_LDFLAGS_COMMON = \
- -version-info 1:2:0 \
+ -version-info 2:0:1 \
-no-undefined \
$(VERSION_LDFLAGS) \
$(NULL)
@@ -152,7 +152,7 @@ nodist_libspice_client_gtkinclude_HEADERS = \
$(NULL)
libspice_client_glib_2_0_la_LDFLAGS = \
- -version-info 4:0:3 \
+ -version-info 5:0:4 \
-no-undefined \
$(VERSION_LDFLAGS) \
$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a1875c5..b008d10 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,13 @@
-gtk/spicy.c
-gtk/snappy.c
-gtk/spice-cmdline.c
-data/spicy.desktop.in.in
data/spice-mime.xml.in
+data/spicy.desktop.in.in
gtk/display/display-name.c
gtk/display/gnome-rr-config.c
+gtk/display/gnome-rr-generic.c
gtk/display/gnome-rr-windows.c
gtk/display/gnome-rr-x11.c
-gtk/display/gnome-rr-generic.c
+gtk/snappy.c
+gtk/spice-cmdline.c
gtk/spice-option.c
gtk/spicy-stats.c
+gtk/spicy.c
+gtk/usb-device-manager.c
commit c5093cf7d50abe3759def01073cf6fef6630a4a0
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Sun Jan 15 20:38:22 2012 +0100
Generate ChangeLog and ship it in the tarball
diff --git a/Makefile.am b/Makefile.am
index 48b7b46..8136550 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,8 +55,18 @@ MAINTAINERCLEANFILES = \
po/Makefile.in.in \
$(NULL)
+# Generate the ChangeLog file (with all entries since the switch to git)
+# and insert it into the directory we're about to use to create a tarball.
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+ if test -d .git || test -d ../.git; then \
+ $(top_srcdir)/build-aux/gitlog-to-changelog > $(distdir)/cl-t; \
+ rm -f $(distdir)/ChangeLog; \
+ mv $(distdir)/cl-t $(distdir)/ChangeLog; \
+ fi
+
# see git-version-gen
-dist-hook:
+dist-hook: gen-ChangeLog
echo $(VERSION) > $(distdir)/.tarball-version
BUILT_SOURCES = $(top_srcdir)/.version
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
new file mode 100755
index 0000000..4559704
--- /dev/null
+++ b/build-aux/gitlog-to-changelog
@@ -0,0 +1,191 @@
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+ & eval 'exec perl -wS "$0" $argv:q'
+ if 0;
+# Convert git log output to ChangeLog format.
+
+my $VERSION = '2009-10-30 13:46'; # UTC
+# The definition above must lie within the first 8 lines in order
+# for the Emacs time-stamp write hook (at end) to update it.
+# If you change this file with Emacs, please let the write hook
+# do its job. Otherwise, update this string manually.
+
+# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Written by Jim Meyering
+
+use strict;
+use warnings;
+use Getopt::Long;
+use POSIX qw(strftime);
+
+(my $ME = $0) =~ s|.*/||;
+
+# use File::Coda; # http://meyering.net/code/Coda/
+END {
+ defined fileno STDOUT or return;
+ close STDOUT and return;
+ warn "$ME: failed to close standard output: $!\n";
+ $? ||= 1;
+}
+
+sub usage ($)
+{
+ my ($exit_code) = @_;
+ my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
+ if ($exit_code != 0)
+ {
+ print $STREAM "Try `$ME --help' for more information.\n";
+ }
+ else
+ {
+ print $STREAM <<EOF;
+Usage: $ME [OPTIONS] [ARGS]
+
+Convert git log output to ChangeLog format. If present, any ARGS
+are passed to "git log". To avoid ARGS being parsed as options to
+$ME, they may be preceded by '--'.
+
+OPTIONS:
+
+ --since=DATE convert only the logs since DATE;
+ the default is to convert all log entries.
+ --format=FMT set format string for commit subject and body;
+ see 'man git-log' for the list of format metacharacters;
+ the default is '%s%n%b%n'
+
+ --help display this help and exit
+ --version output version information and exit
+
+EXAMPLE:
+
+ $ME --since=2008-01-01 > ChangeLog
+ $ME -- -n 5 foo > last-5-commits-to-branch-foo
+
+EOF
+ }
+ exit $exit_code;
+}
+
+# If the string $S is a well-behaved file name, simply return it.
+# If it contains white space, quotes, etc., quote it, and return the new string.
+sub shell_quote($)
+{
+ my ($s) = @_;
+ if ($s =~ m![^\w+/.,-]!)
+ {
+ # Convert each single quote to '\''
+ $s =~ s/\'/\'\\\'\'/g;
+ # Then single quote the string.
+ $s = "'$s'";
+ }
+ return $s;
+}
+
+sub quoted_cmd(@)
+{
+ return join (' ', map {shell_quote $_} @_);
+}
+
+{
+ my $since_date = '1970-01-01 UTC';
+ my $format_string = '%s%n%b%n';
+ GetOptions
+ (
+ help => sub { usage 0 },
+ version => sub { print "$ME version $VERSION\n"; exit },
+ 'since=s' => \$since_date,
+ 'format=s' => \$format_string,
+ ) or usage 1;
+
+ my @cmd = (qw (git log --log-size), "--since=$since_date",
+ '--pretty=format:%ct %an <%ae>%n%n'.$format_string, @ARGV);
+ open PIPE, '-|', @cmd
+ or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
+ . "(Is your Git too old? Version 1.5.1 or later is required.)\n");
+
+ my $prev_date_line = '';
+ while (1)
+ {
+ defined (my $in = <PIPE>)
+ or last;
+ $in =~ /^log size (\d+)$/
+ or die "$ME:$.: Invalid line (expected log size):\n$in";
+ my $log_nbytes = $1;
+
+ my $log;
+ my $n_read = read PIPE, $log, $log_nbytes;
+ $n_read == $log_nbytes
+ or die "$ME:$.: unexpected EOF\n";
+
+ my @line = split "\n", $log;
+ my $author_line = shift @line;
+ defined $author_line
+ or die "$ME:$.: unexpected EOF\n";
+ $author_line =~ /^(\d+) (.*>)$/
+ or die "$ME:$.: Invalid line "
+ . "(expected date/author/email):\n$author_line\n";
+
+ my $date_line = sprintf "%s $2\n", strftime ("%F", localtime ($1));
+ # If this line would be the same as the previous date/name/email
+ # line, then arrange not to print it.
+ if ($date_line ne $prev_date_line)
+ {
+ $prev_date_line eq ''
+ or print "\n";
+ print $date_line;
+ }
+ $prev_date_line = $date_line;
+
+ # Omit "Signed-off-by..." lines.
+ @line = grep !/^Signed-off-by: .*>$/, @line;
+
+ # If there were any lines
+ if (@line == 0)
+ {
+ warn "$ME: warning: empty commit message:\n $date_line\n";
+ }
+ else
+ {
+ # Remove leading and trailing blank lines.
+ while ($line[0] =~ /^\s*$/) { shift @line; }
+ while ($line[$#line] =~ /^\s*$/) { pop @line; }
+
+ # Prefix each non-empty line with a TAB.
+ @line = map { length $_ ? "\t$_" : '' } @line;
+
+ print "\n", join ("\n", @line), "\n";
+ }
+
+ defined ($in = <PIPE>)
+ or last;
+ $in ne "\n"
+ and die "$ME:$.: unexpected line:\n$in";
+ }
+
+ close PIPE
+ or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
+ # FIXME-someday: include $PROCESS_STATUS in the diagnostic
+}
+
+# Local Variables:
+# mode: perl
+# indent-tabs-mode: nil
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "my $VERSION = '"
+# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "'; # UTC"
+# End:
commit 8c6e1441795cfcbcd5778cf2006afeac187e3b22
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Sun Jan 15 22:04:17 2012 +0100
Send grab-key signal even in mouse client mode
diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c
index a3ca4fc..86001be 100644
--- a/gtk/spice-widget.c
+++ b/gtk/spice-widget.c
@@ -941,13 +941,16 @@ static gboolean key_event(GtkWidget *widget, GdkEventKey *key)
__FUNCTION__, key->type == GDK_KEY_PRESS ? "press" : "release",
key->hardware_keycode, key->state, key->group);
- if (check_for_grab_key(display, key->type, key->keyval) &&
- d->mouse_mode == SPICE_MOUSE_MODE_SERVER) {
+ if (check_for_grab_key(display, key->type, key->keyval)) {
g_signal_emit(widget, signals[SPICE_DISPLAY_GRAB_KEY_PRESSED], 0);
- if (d->mouse_grab_active)
- try_mouse_ungrab(display);
- else
- try_mouse_grab(display);
+
+ if (d->mouse_mode == SPICE_MOUSE_MODE_SERVER) {
+ if (d->mouse_grab_active)
+ try_mouse_ungrab(display);
+ else
+ try_mouse_grab(display);
+ }
+
return true;
}
More information about the Spice-commits
mailing list