gnome-mag r688 - in trunk: . idl m4 magnifier magnifier/x11

[carlosd svn gnome org]

Author: carlosd
Date: Sun Jul  6 01:14:32 2008
New Revision: 688
URL: http://svn.gnome.org/viewvc/gnome-mag?rev=688&view=rev

Log:
commiting changes for 0.15.1 release

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/README
   trunk/idl/GNOME_Magnifier.idl
   trunk/m4/intltool.m4
   trunk/magnifier/magnifier.c
   trunk/magnifier/x11/gmag-cursor.c
   trunk/magnifier/x11/gmag-cursor.h
   trunk/magnifier/x11/gmag-graphical-server.c
   trunk/magnifier/x11/gmag-graphical-server.h

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Jul  6 01:14:32 2008
@@ -1,3 +1,18 @@
+What's new in gnome-mag-0.15.1:
+
+* Fix for the following bug:
+	#520796: Magnifier should turn off the system sprite/cursor/mouse when
+		 using full screen magnification.
+
+* Translations:
+	* Djihed Afifi (ar), Petr Kovar (cs), Giannis Katsampiris (el)
+	  David Lodge (en_GB), Jorge Gonzáz (es),
+	  Iñ Larrañ Murgoitio (eu), Ignacio Casal Quinteiro (gl),
+	  Yair Hershkovitz (he), Rajesh Ranjan (hi), Gabor Kelemen (hu),
+	  Luca Ferretti (it), Ani Peter (ml), sandeep shedmake (mr),
+	  Nabin Gautam (ne), Yannig Marchegay (Kokoyaya) (oc),
+	  Baris Cicek (tr), Woodman Tuen (zh_HK), Woodman Tuen (zh_TW)
+
 What's new in gnome-mag-0.15.0:
 
 * Fix for the following bugs:

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Sun Jul  6 01:14:32 2008
@@ -1,4 +1,4 @@
-This is gnome-mag version 0.14.11 (Stable)
+This is gnome-mag version 0.15.1 (Stable)
 
 This directory contains the gnome-mag magnification
 service definition and sample implementation.

Modified: trunk/idl/GNOME_Magnifier.idl
==============================================================================
--- trunk/idl/GNOME_Magnifier.idl	(original)
+++ trunk/idl/GNOME_Magnifier.idl	Sun Jul  6 01:14:32 2008
@@ -227,6 +227,12 @@
     boolean fullScreenCapable ();
 
     /**
+     * Hide the original cursor.
+     **/
+
+    void hideCursor ();
+
+    /**
      * Consult if the Magnifier can apply colorblind image filters.
      * @returns TRUE if it can or FALSE otherwise.
      **/

Modified: trunk/m4/intltool.m4
==============================================================================
--- trunk/m4/intltool.m4	(original)
+++ trunk/m4/intltool.m4	Sun Jul  6 01:14:32 2008
@@ -87,6 +87,20 @@
 AC_SUBST(INTLTOOL_SERVICE_RULE)
 AC_SUBST(INTLTOOL_POLICY_RULE)
 
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
 # Use the tools built into the package, not the ones that are installed.
 AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
 AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')

Modified: trunk/magnifier/magnifier.c
==============================================================================
--- trunk/magnifier/magnifier.c	(original)
+++ trunk/magnifier/magnifier.c	Sun Jul  6 01:14:32 2008
@@ -1225,6 +1225,15 @@
 #endif
 }
 
+static void
+impl_magnifier_hide_cursor (PortableServer_Servant servant,
+                        CORBA_Environment *ev)
+{
+        Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
+
+	gmag_gs_hide_cursor (magnifier);
+}
+
 static
 CORBA_boolean
 impl_magnifier_full_screen_capable (PortableServer_Servant servant,
@@ -1477,6 +1486,7 @@
 	object_class->dispose = magnifier_gobject_dispose;
 
 	epv->fullScreenCapable = impl_magnifier_full_screen_capable;
+	epv->hideCursor = impl_magnifier_hide_cursor;
 	epv->supportColorblindFilters =
 		impl_magnifier_support_colorblind_filters;
         epv->_set_SourceDisplay = impl_magnifier_set_source_display;

Modified: trunk/magnifier/x11/gmag-cursor.c
==============================================================================
--- trunk/magnifier/x11/gmag-cursor.c	(original)
+++ trunk/magnifier/x11/gmag-cursor.c	Sun Jul  6 01:14:32 2008
@@ -87,6 +87,17 @@
 	return cursor_pixbuf;
 }
 
+void
+gmag_cursor_hide (Magnifier *magnifier)
+{
+	int minor, major;
+	XFixesQueryVersion(dpy, &major, &minor);
+	if (major >= 4) {
+		XFixesHideCursor (dpy, root_window);
+	}
+}
+
+
 gint
 gmag_cursor_init (Magnifier *magnifier, Display *dpy_conn)
 {

Modified: trunk/magnifier/x11/gmag-cursor.h
==============================================================================
--- trunk/magnifier/x11/gmag-cursor.h	(original)
+++ trunk/magnifier/x11/gmag-cursor.h	Sun Jul  6 01:14:32 2008
@@ -33,5 +33,6 @@
 gint       gmag_cursor_init (Magnifier *magnifier, Display *dpy_conn);
 GdkPixbuf *gmag_cursor_get_source_pixbuf (Magnifier *magnifier);
 void       gmag_cursor_events_handler (Magnifier *magnifier, XEvent *ev);
+void       gmag_cursor_hide (Magnifier *magnifier);
 
 #endif /* GMAG_CURSOR_H_ */

Modified: trunk/magnifier/x11/gmag-graphical-server.c
==============================================================================
--- trunk/magnifier/x11/gmag-graphical-server.c	(original)
+++ trunk/magnifier/x11/gmag-graphical-server.c	Sun Jul  6 01:14:32 2008
@@ -483,6 +483,12 @@
 }
 
 void
+gmag_gs_hide_cursor (Magnifier *magnifier)
+{
+	gmag_cursor_hide (magnifier);
+}
+
+void
 gmag_gs_client_init (Magnifier *magnifier)
 {
 	GIOChannel               *ioc;

Modified: trunk/magnifier/x11/gmag-graphical-server.h
==============================================================================
--- trunk/magnifier/x11/gmag-graphical-server.h	(original)
+++ trunk/magnifier/x11/gmag-graphical-server.h	Sun Jul  6 01:14:32 2008
@@ -44,5 +44,6 @@
 gboolean   gmag_gs_reset_overlay_at_idle (gpointer data);
 gboolean   gmag_gs_check_set_struts (Magnifier *magnifier);
 gboolean   gmag_gs_use_compositor (Magnifier *magnifier);
+void       gmag_gs_hide_cursor (Magnifier *magnifier);
 
 #endif /* GMAG_GRAPHICAL_SERVER_H_ */