Add namespacing to un-namespaced methods in cspi.

[platform/core/uifw/at-spi2-atk.git] / libspi / value.c

diff --git a/libspi/value.c b/libspi/value.c
index 16e64fb..e576486 100644 (file)
--- a/libspi/value.c
+++ b/libspi/value.c
@@ -29,23 +29,27 @@
 
 /* Static function declarations */
 
+static double
+get_double_from_gvalue (GValue *gvalue);
+static void
+gvalue_set_from_double (GValue *gvalue, double value);
 static void
 spi_value_class_init (SpiValueClass *klass);
 static void
 spi_value_init (SpiValue *value);
-static CORBA_float
+static double
 impl__get_minimumValue (PortableServer_Servant _servant,
-                       CORBA_Environment * ev);
-static        CORBA_float
+                       CORBA_Environment *    ev);
+static double
 impl__get_maximumValue (PortableServer_Servant _servant,
-                       CORBA_Environment * ev);
-static CORBA_float
+                       CORBA_Environment *    ev);
+static double
 impl__get_currentValue (PortableServer_Servant _servant,
-                       CORBA_Environment * ev);
+                       CORBA_Environment *    ev);
 static void 
 impl__set_currentValue (PortableServer_Servant _servant,
-                       const CORBA_float value,
-                       CORBA_Environment * ev);
+                       const CORBA_double     value,
+                       CORBA_Environment *    ev);
 
 
 BONOBO_TYPE_FUNC_FULL (SpiValue,
@@ -98,8 +102,93 @@ get_value_from_servant (PortableServer_Servant servant)
   return ATK_VALUE (object->atko);
 }
 
+static double
+get_double_from_gvalue (GValue *gvalue)
+{
+  double       retval = 0;
+  if (G_TYPE_IS_FUNDAMENTAL (G_VALUE_TYPE (gvalue)))
+    {
+      switch (gvalue->g_type)
+        {
+         case G_TYPE_DOUBLE:
+            retval = g_value_get_double (gvalue);
+           break;
+         case G_TYPE_FLOAT:
+            retval = g_value_get_float (gvalue);
+           break;
+         case G_TYPE_ULONG:
+            retval = g_value_get_ulong (gvalue);
+           break;
+         case G_TYPE_LONG:
+            retval = g_value_get_long (gvalue);
+           break;
+         case G_TYPE_UINT:
+            retval = g_value_get_uint (gvalue);
+           break;
+         case G_TYPE_INT:
+            retval = g_value_get_int (gvalue);
+           break;
+         case G_TYPE_UCHAR:
+            retval = g_value_get_uchar (gvalue);
+           break;
+         case G_TYPE_CHAR:
+            retval = g_value_get_char (gvalue);
+           break;
+         case G_TYPE_BOOLEAN:
+            retval = g_value_get_boolean (gvalue);
+           break;
+        }
+    }
+  else
+    {
+      g_warning ("SpiValue requested from a non-fundamental type\n");      
+    }
+  return retval;
+}  
+
+static void
+gvalue_set_from_double (GValue *gvalue, double value)
+{
+  if (G_TYPE_IS_FUNDAMENTAL (G_VALUE_TYPE (gvalue)))
+    {
+      switch (gvalue->g_type)
+        {
+         case G_TYPE_DOUBLE:
+            g_value_set_double (gvalue, value);
+           break;
+         case G_TYPE_FLOAT:
+            g_value_set_float (gvalue, value);
+           break;
+         case G_TYPE_ULONG:
+            g_value_set_ulong (gvalue, value);
+           break;
+         case G_TYPE_LONG:
+            g_value_set_long (gvalue, value);
+           break;
+         case G_TYPE_UINT:
+            g_value_set_uint (gvalue, value);
+           break;
+         case G_TYPE_INT:
+            g_value_set_int (gvalue, value);
+           break;
+         case G_TYPE_UCHAR:
+            g_value_set_uchar (gvalue, value);
+           break;
+         case G_TYPE_CHAR:
+            g_value_set_char (gvalue, value);
+           break;
+         case G_TYPE_BOOLEAN:
+            g_value_set_boolean (gvalue, ((fabs (value) > 0.5) ? 1 : 0));
+           break;
+        }
+    }
+  else
+    {
+      g_warning ("SpiValue change requested for a non-fundamental type\n");        
+    }
+}
 
-static CORBA_float
+static double
 impl__get_minimumValue (PortableServer_Servant servant,
                        CORBA_Environment     *ev)
 {
@@ -108,20 +197,13 @@ impl__get_minimumValue (PortableServer_Servant servant,
 
   g_return_val_if_fail (value != NULL, 0.0);
 
-  /*
-   * FIXME: ahem, there's no guarantee that
-   * atk_value_get_minimum_value returns a float.
-   * What we really need is a generic value API here
-   */
-
-  g_value_init (&gvalue, G_TYPE_FLOAT);
   atk_value_get_minimum_value (value, &gvalue);
 
-  return (CORBA_float) g_value_get_float (&gvalue);
+  return get_double_from_gvalue (&gvalue);
 }
 
 
-static CORBA_float
+static double
 impl__get_maximumValue (PortableServer_Servant servant,
                        CORBA_Environment     *ev)
 {
@@ -130,14 +212,13 @@ impl__get_maximumValue (PortableServer_Servant servant,
 
   g_return_val_if_fail (value != NULL, 0.0);
 
-  g_value_init (&gvalue, G_TYPE_FLOAT);
   atk_value_get_maximum_value (value, &gvalue);
 
-  return (CORBA_float) g_value_get_float (&gvalue);
+  return get_double_from_gvalue (&gvalue);
 }
 
 
-static CORBA_float
+static double
 impl__get_currentValue (PortableServer_Servant servant,
                        CORBA_Environment     *ev)
 {
@@ -146,25 +227,24 @@ impl__get_currentValue (PortableServer_Servant servant,
 
   g_return_val_if_fail (value != NULL, 0.0);
 
-  g_value_init (&gvalue, G_TYPE_FLOAT);
   atk_value_get_current_value (value, &gvalue);
 
-  return (CORBA_float) g_value_get_float (&gvalue);
+  return get_double_from_gvalue (&gvalue);
 }
 
 
 static void 
 impl__set_currentValue (PortableServer_Servant servant,
-                       const CORBA_float      value,
+                       const CORBA_double     value,
                        CORBA_Environment     *ev)
 {
-  GValue    gvalue = {0, };
+  GValue    gvalue = { 0, };
   AtkValue *avalue = get_value_from_servant (servant);
 
   g_return_if_fail (avalue != NULL);
 
-  g_value_init (&gvalue, G_TYPE_FLOAT);
-  g_value_set_float (&gvalue, (gfloat) value);
+  atk_value_get_current_value (avalue, &gvalue);
+  gvalue_set_from_double (&gvalue, value);
 
   atk_value_set_current_value (avalue, &gvalue);
 }