* Boston, MA 02111-1307, USA.
*/
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
+/* value.c : implements the Value interface */
#include <config.h>
-#include <bonobo/Bonobo.h>
-
#include <stdio.h>
+#include <libspi/value.h>
-/*
- * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition of the SpiValue bonobo object
- */
-#include "value.h"
+#define PARENT_TYPE SPI_TYPE_BASE
-/*
- * Static function declarations
- */
+/* Static function declarations */
static void
spi_value_class_init (SpiValueClass *klass);
static void
spi_value_init (SpiValue *value);
-static void
-spi_value_finalize (GObject *obj);
static CORBA_float
-impl__get_minimumSpiValue (PortableServer_Servant _servant,
+impl__get_minimumValue (PortableServer_Servant _servant,
CORBA_Environment * ev);
static CORBA_float
-impl__get_maximumSpiValue (PortableServer_Servant _servant,
+impl__get_maximumValue (PortableServer_Servant _servant,
CORBA_Environment * ev);
static CORBA_float
impl__get_currentValue (PortableServer_Servant _servant,
CORBA_Environment * ev);
+BONOBO_TYPE_FUNC_FULL (SpiValue,
+ Accessibility_Value,
+ PARENT_TYPE,
+ spi_value);
-static GObjectClass *parent_class;
-
-
-GType
-spi_value_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiValueClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_value_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiValue),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_value_init,
- NULL /* value table */
- };
-
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- BONOBO_OBJECT_TYPE,
- POA_Accessibility_SpiValue__init,
- NULL,
- G_STRUCT_OFFSET (SpiValueClass, epv),
- &tinfo,
- "SpiAccessibleValue");
- }
-
- return type;
-}
static void
spi_value_class_init (SpiValueClass *klass)
{
- GObjectClass * object_class = (GObjectClass *) klass;
- POA_Accessibility_SpiValue__epv *epv = &klass->epv;
- parent_class = g_type_class_peek_parent (klass);
-
- object_class->finalize = spi_value_finalize;
-
+ POA_Accessibility_Value__epv *epv = &klass->epv;
/* Initialize epv table */
- epv->_get_minimumSpiValue = impl__get_minimumSpiValue;
- epv->_get_maximumSpiValue = impl__get_maximumSpiValue;
+ epv->_get_minimumValue = impl__get_minimumValue;
+ epv->_get_maximumValue = impl__get_maximumValue;
epv->_get_currentValue = impl__get_currentValue;
epv->_set_currentValue = impl__set_currentValue;
}
+
static void
spi_value_init (SpiValue *value)
{
}
-static void
-spi_value_finalize (GObject *obj)
-{
- SpiValue *value = SPI_VALUE (obj);
- g_object_unref (value->atko);
- value->atko = NULL;
- parent_class->finalize (obj);
-}
SpiValue *
spi_value_interface_new (AtkObject *obj)
{
- SpiValue *new_value =
- SPI_VALUE(g_object_new (SPI_VALUE_TYPE, NULL));
- new_value->atko = obj;
- g_object_ref (obj);
+ SpiValue *new_value = g_object_new (SPI_VALUE_TYPE, NULL);
+
+ spi_base_construct (SPI_BASE (new_value), obj);
+
return new_value;
}
+static AtkValue *
+get_value_from_servant (PortableServer_Servant servant)
+{
+ SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
+
+ if (!object)
+ {
+ return NULL;
+ }
+
+ return ATK_VALUE (object->atko);
+}
+
static CORBA_float
-impl__get_minimumSpiValue (PortableServer_Servant _servant,
- CORBA_Environment * ev)
+impl__get_minimumValue (PortableServer_Servant servant,
+ CORBA_Environment *ev)
{
- SpiValue *value = SPI_VALUE (bonobo_object_from_servant (_servant));
- GValue gvalue = {0, };
+ 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_value_init (&gvalue, G_TYPE_FLOAT);
- atk_value_get_minimum_value (ATK_VALUE(value->atko), &gvalue);
+ atk_value_get_minimum_value (value, &gvalue);
+
return (CORBA_float) g_value_get_float (&gvalue);
}
-
-static CORBA_float
-impl__get_maximumSpiValue (PortableServer_Servant _servant,
- CORBA_Environment * ev)
+static CORBA_float
+impl__get_maximumValue (PortableServer_Servant servant,
+ CORBA_Environment *ev)
{
- SpiValue *value = SPI_VALUE (bonobo_object_from_servant (_servant));
- GValue gvalue = {0, };
+ GValue gvalue = {0, };
+ AtkValue *value = get_value_from_servant (servant);
+
+ g_return_val_if_fail (value != NULL, 0.0);
g_value_init (&gvalue, G_TYPE_FLOAT);
- atk_value_get_maximum_value (ATK_VALUE(value->atko), &gvalue);
+ atk_value_get_maximum_value (value, &gvalue);
+
return (CORBA_float) g_value_get_float (&gvalue);
}
-
static CORBA_float
-impl__get_currentValue (PortableServer_Servant _servant,
- CORBA_Environment * ev)
+impl__get_currentValue (PortableServer_Servant servant,
+ CORBA_Environment *ev)
{
- SpiValue *value = SPI_VALUE (bonobo_object_from_servant (_servant));
- GValue gvalue = {0, };
+ GValue gvalue = {0, };
+ AtkValue *value = get_value_from_servant (servant);
+
+ g_return_val_if_fail (value != NULL, 0.0);
g_value_init (&gvalue, G_TYPE_FLOAT);
- atk_value_get_current_value (ATK_VALUE(value->atko), &gvalue);
+ atk_value_get_current_value (value, &gvalue);
+
return (CORBA_float) g_value_get_float (&gvalue);
}
static void
-impl__set_currentValue (PortableServer_Servant _servant,
- const CORBA_float value,
- CORBA_Environment * ev)
+impl__set_currentValue (PortableServer_Servant servant,
+ const CORBA_float value,
+ CORBA_Environment *ev)
{
- SpiValue *val = SPI_VALUE (bonobo_object_from_servant (_servant));
- 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_set_current_value (ATK_VALUE(val->atko), &gvalue);
+
+ atk_value_set_current_value (avalue, &gvalue);
}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff