Fix ungrab when in absolute pointer mode

This commit is contained in:
Daniel P. Berrange 2008-09-25 12:14:27 +00:00
parent 29aaa2069f
commit da2138ecbb
3 changed files with 29 additions and 3 deletions

View File

@ -1 +1,3 @@
gtk-vnc-0.3.7.tar.gz
.build*.log
*.rpm

View File

@ -0,0 +1,19 @@
diff -r cf0e849385e0 src/vncdisplay.c
--- a/src/vncdisplay.c Thu Sep 11 17:07:42 2008 +0100
+++ b/src/vncdisplay.c Thu Sep 25 12:57:31 2008 +0100
@@ -703,13 +703,12 @@
}
}
- if ((!priv->grab_keyboard || !priv->absolute) &&
- key->type == GDK_KEY_PRESS &&
+ if (key->type == GDK_KEY_PRESS &&
((keyval == GDK_Control_L && (key->state & GDK_MOD1_MASK)) ||
(keyval == GDK_Alt_L && (key->state & GDK_CONTROL_MASK)))) {
if (priv->in_pointer_grab)
do_pointer_ungrab(VNC_DISPLAY(widget), FALSE);
- else
+ else if (!priv->grab_keyboard || !priv->absolute)
do_pointer_grab(VNC_DISPLAY(widget), FALSE);
}

View File

@ -7,10 +7,11 @@
Summary: A GTK widget for VNC clients
Name: gtk-vnc
Version: 0.3.7
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: Development/Libraries
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch1: %{name}-%{version}-abs-ungrab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://gtk-vnc.sf.net/
BuildRequires: gtk2-devel pygtk2-devel python-devel zlib-devel
@ -32,7 +33,7 @@ Summary: Libraries, includes, etc. to compile with the gtk-vnc library
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: pkgconfig
Requires: pygtk2-devel gtk2-devel gnutls-devel
Requires: gtk2-devel gnutls-devel
%description devel
gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
@ -67,6 +68,7 @@ browsers.
%prep
%setup -q
%patch1 -p1
%build
%if %{with_plugin}
@ -120,10 +122,13 @@ rm -fr %{buildroot}
%endif
%changelog
* Thu Sep 25 2008 Daniel P. Berrange <berrange@redhat.com> - 0.3.7-2.fc10
- Allow pointer ungrab keysequence if already grabbed (rhbz #463729)
* Fri Sep 5 2008 Matthias Clasen <mclasen@redhat.com> - 0.3.7-1
- Update to 0.3.7
* Thu Aug 28 2008 Daniel P. Berrange <berrange@redhat.com> - 0.3.6-4.fc9
* Thu Aug 28 2008 Daniel P. Berrange <berrange@redhat.com> - 0.3.6-4.fc10
- Fix key/mouse event propagation (rhbz #454627)
* Mon Jul 7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.3.6-3