gnome-mag r693 - in trunk: . idl magnifier magnifier/x11

[carlosd svn gnome org]

Author: carlosd
Date: Mon Aug  4 02:21:17 2008
New Revision: 693
URL: http://svn.gnome.org/viewvc/gnome-mag?rev=693&view=rev

Log:
Committed new patch for bug #520796. This one add the showCursor method.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/README
   trunk/idl/GNOME_Magnifier.idl
   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	Mon Aug  4 02:21:17 2008
@@ -1,3 +1,10 @@
+What's new in gnome-mag-0.15.2:
+
+* Committed new patch for bug #520796. This one add the showCursor method.
+
+* Translations:
+	* Djihed Afifi (ar)
+
 What's new in gnome-mag-0.15.1:
 
 * Fix for the following bug:

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Mon Aug  4 02:21:17 2008
@@ -1,4 +1,4 @@
-This is gnome-mag version 0.15.1 (Stable)
+This is gnome-mag version 0.15.2 (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	Mon Aug  4 02:21:17 2008
@@ -233,6 +233,12 @@
     void hideCursor ();
 
     /**
+     * Show the original cursor.
+     **/
+
+    void showCursor ();
+
+    /**
      * Consult if the Magnifier can apply colorblind image filters.
      * @returns TRUE if it can or FALSE otherwise.
      **/

Modified: trunk/magnifier/magnifier.c
==============================================================================
--- trunk/magnifier/magnifier.c	(original)
+++ trunk/magnifier/magnifier.c	Mon Aug  4 02:21:17 2008
@@ -1234,6 +1234,15 @@
 	gmag_gs_hide_cursor (magnifier);
 }
 
+static void
+impl_magnifier_show_cursor (PortableServer_Servant servant,
+                            CORBA_Environment *ev)
+{
+	Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant (servant));
+
+	gmag_gs_show_cursor (magnifier);
+}
+
 static
 CORBA_boolean
 impl_magnifier_full_screen_capable (PortableServer_Servant servant,
@@ -1487,6 +1496,7 @@
 
 	epv->fullScreenCapable = impl_magnifier_full_screen_capable;
 	epv->hideCursor = impl_magnifier_hide_cursor;
+	epv->showCursor = impl_magnifier_show_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	Mon Aug  4 02:21:17 2008
@@ -97,6 +97,15 @@
 	}
 }
 
+void
+gmag_cursor_show (Magnifier *magnifier)
+{
+	int minor, major;
+	XFixesQueryVersion(dpy, &major, &minor);
+	if (major >= 4) {
+		XFixesShowCursor (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	Mon Aug  4 02:21:17 2008
@@ -34,5 +34,6 @@
 GdkPixbuf *gmag_cursor_get_source_pixbuf (Magnifier *magnifier);
 void       gmag_cursor_events_handler (Magnifier *magnifier, XEvent *ev);
 void       gmag_cursor_hide (Magnifier *magnifier);
+void       gmag_cursor_show (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	Mon Aug  4 02:21:17 2008
@@ -489,6 +489,12 @@
 }
 
 void
+gmag_gs_show_cursor (Magnifier *magnifier)
+{
+	gmag_cursor_show (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	Mon Aug  4 02:21:17 2008
@@ -45,5 +45,6 @@
 gboolean   gmag_gs_check_set_struts (Magnifier *magnifier);
 gboolean   gmag_gs_use_compositor (Magnifier *magnifier);
 void       gmag_gs_hide_cursor (Magnifier *magnifier);
+void       gmag_gs_show_cursor (Magnifier *magnifier);
 
 #endif /* GMAG_GRAPHICAL_SERVER_H_ */