Fixed use of setenv () which broke Solaris build.

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

diff --git a/libspi/value.c b/libspi/value.c
index 372bb0d..fcd0a20 100644 (file)
--- a/libspi/value.c
+++ b/libspi/value.c
@@ -29,23 +29,25 @@
 
 /* Static function declarations */
 
+static Accessibility_SValue
+gvalue_to_svalue (GValue *gvalue);
 static void
 spi_value_class_init (SpiValueClass *klass);
 static void
 spi_value_init (SpiValue *value);
-static CORBA_float
+static Accessibility_SValue
 impl__get_minimumValue (PortableServer_Servant _servant,
-                       CORBA_Environment * ev);
-static        CORBA_float
+                       CORBA_Environment *    ev);
+static Accessibility_SValue
 impl__get_maximumValue (PortableServer_Servant _servant,
-                       CORBA_Environment * ev);
-static CORBA_float
+                       CORBA_Environment *    ev);
+static Accessibility_SValue
 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);
+impl__set_currentValue (PortableServer_Servant       _servant,
+                       const Accessibility_SValue * value,
+                       CORBA_Environment *          ev);
 
 
 BONOBO_TYPE_FUNC_FULL (SpiValue,
@@ -98,64 +100,134 @@ get_value_from_servant (PortableServer_Servant servant)
   return ATK_VALUE (object->atko);
 }
 
+static Accessibility_SValue
+gvalue_to_svalue (GValue *gvalue)
+{
+  Accessibility_SValue sval;
+  if (G_VALUE_HOLDS_DOUBLE (gvalue))
+  {
+      sval._d = Accessibility_DOUBLEVAL;
+      sval._u.val_double = g_value_get_double (gvalue);
+  }
+  else if (G_VALUE_HOLDS_FLOAT (gvalue))
+  {
+      sval._d = Accessibility_FLOATVAL;
+      sval._u.val_float = g_value_get_float (gvalue);
+  }
+  else if (G_VALUE_HOLDS_ULONG (gvalue))
+  {
+      sval._d = Accessibility_ULONGVAL;
+      sval._u.val_ulong = g_value_get_ulong (gvalue); 
+  }
+  else if (G_VALUE_HOLDS_LONG (gvalue))
+  {
+      sval._d = Accessibility_LONGVAL;
+      sval._u.val_long = g_value_get_long (gvalue);
+  }
+  else if (G_VALUE_HOLDS_UINT (gvalue))
+  {
+      sval._d = Accessibility_USHORTVAL;
+      sval._u.val_ushort = CLAMP (g_value_get_uint (gvalue), 0, G_MAXUSHORT);
+  }
+  else if (G_VALUE_HOLDS_INT (gvalue))
+  {
+      sval._d = Accessibility_SHORTVAL;
+      sval._u.val_short = CLAMP (g_value_get_int (gvalue), G_MINSHORT, G_MAXSHORT);
+  }
+  else
+  {
+      sval._d = Accessibility_SHORTVAL;
+      sval._u.val_short = 0;
+  }
+  return sval;
+}
+
+static void
+gvalue_set_from_svalue (GValue *gvalue, Accessibility_SValue *sval)
+{
+  switch (sval->_d)
+    {
+      case Accessibility_DOUBLEVAL:
+        g_value_init (gvalue, G_TYPE_DOUBLE);
+        g_value_set_double (gvalue, sval->_u.val_double);
+        break;
+      case Accessibility_FLOATVAL:
+        g_value_init (gvalue, G_TYPE_FLOAT);
+        g_value_set_float (gvalue, sval->_u.val_float);
+        break;
+      case Accessibility_ULONGVAL:
+        g_value_init (gvalue, G_TYPE_ULONG);
+        g_value_set_ulong (gvalue, sval->_u.val_ulong);
+        break;
+      case Accessibility_LONGVAL:
+        g_value_init (gvalue, G_TYPE_LONG);
+        g_value_set_long (gvalue, sval->_u.val_long);
+        break;
+      case Accessibility_USHORTVAL:
+        g_value_init (gvalue, G_TYPE_UINT);
+        g_value_set_uint (gvalue, sval->_u.val_ushort);
+        break;
+      case Accessibility_SHORTVAL:
+        g_value_init (gvalue, G_TYPE_INT);
+        g_value_set_int (gvalue, sval->_u.val_short);
+        break;
+      default:
+        g_value_init (gvalue, G_TYPE_INT);
+       g_value_set_int (gvalue, 0);
+    }
+}
 
-static CORBA_float
+static Accessibility_SValue
 impl__get_minimumValue (PortableServer_Servant servant,
                        CORBA_Environment     *ev)
 {
   GValue    gvalue = {0, };
   AtkValue *value = get_value_from_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_return_val_if_fail (value != NULL, gvalue_to_svalue (&gvalue));
 
   g_value_init (&gvalue, G_TYPE_DOUBLE);
   atk_value_get_minimum_value (value, &gvalue);
 
-  return (CORBA_float) g_value_get_double (&gvalue);
+  return gvalue_to_svalue (&gvalue);
 }
 
 
-static CORBA_float
+static Accessibility_SValue
 impl__get_maximumValue (PortableServer_Servant servant,
                        CORBA_Environment     *ev)
 {
   GValue   gvalue = {0, };
   AtkValue *value = get_value_from_servant (servant);
 
-  g_return_val_if_fail (value != NULL, 0.0);
+  g_return_val_if_fail (value != NULL, gvalue_to_svalue (&gvalue));
 
   g_value_init (&gvalue, G_TYPE_DOUBLE);
   atk_value_get_maximum_value (value, &gvalue);
 
-  return (CORBA_float) g_value_get_double (&gvalue);
+  return gvalue_to_svalue (&gvalue);
 }
 
 
-static CORBA_float
+static Accessibility_SValue
 impl__get_currentValue (PortableServer_Servant servant,
                        CORBA_Environment     *ev)
 {
   GValue   gvalue = {0, };
   AtkValue *value = get_value_from_servant (servant);
 
-  g_return_val_if_fail (value != NULL, 0.0);
+  g_return_val_if_fail (value != NULL, gvalue_to_svalue (&gvalue));
 
   g_value_init (&gvalue, G_TYPE_DOUBLE);
   atk_value_get_current_value (value, &gvalue);
 
-  return (CORBA_float) g_value_get_double (&gvalue);
+  return gvalue_to_svalue (&gvalue);
 }
 
 
 static void 
 impl__set_currentValue (PortableServer_Servant servant,
-                       const CORBA_float      value,
+                       const Accessibility_SValue *value,
                        CORBA_Environment     *ev)
 {
   GValue    gvalue = {0, };
@@ -163,8 +235,7 @@ impl__set_currentValue (PortableServer_Servant servant,
 
   g_return_if_fail (avalue != NULL);
 
-  g_value_init (&gvalue, G_TYPE_DOUBLE);
-  g_value_set_double (&gvalue, (gdouble) value);
+  gvalue_set_from_svalue (&gvalue, value);
 
   atk_value_set_current_value (avalue, &gvalue);
 }