* Boston, MA 02111-1307, USA.
*/
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* component.c : implements the Component interface */
+#include <config.h>
#include <stdio.h>
+#include <libspi/accessible.h>
+#include <libspi/component.h>
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition for the BonoboObject (Gtk Type)
- */
-#include "component.h"
-#include "accessible.h"
-
-/*
- * Our parent Gtk object type
- */
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
+/* Our parent Gtk object type */
+#define PARENT_TYPE SPI_TYPE_BASE
-/*
- * A pointer to our parent object class
- */
-static GObjectClass *component_parent_class;
+/* A pointer to our parent object class */
+static GObjectClass *spi_component_parent_class;
-/*
- * Implemented GObject::finalize
- */
-static void
-accessibility_component_object_finalize (GObject *object)
+static AtkComponent *
+get_component_from_servant (PortableServer_Servant servant)
{
- Component *component = COMPONENT (object);
-
- printf("accessible_component_object_finalize called\n");
- g_object_unref (component->atko);
- component->atko = NULL;
-
- printf("atko freed, calling parent finalize\n");
- component_parent_class->finalize (object);
+ SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
+ g_return_val_if_fail (object != NULL, NULL);
+ return ATK_COMPONENT (object->atko);
}
/*
CORBA_Environment *ev)
{
CORBA_boolean retval;
- Component *component = COMPONENT (bonobo_object_from_servant (servant));
- retval = atk_component_contains (ATK_COMPONENT (component->atko), (gint) x, (gint) y,
+ AtkComponent *component = get_component_from_servant (servant);
+
+ g_return_val_if_fail (component != NULL, FALSE);
+
+ retval = atk_component_contains (component, (gint) x, (gint) y,
(AtkCoordType) coord_type);
- fprintf (stderr, "Component contains() called: %s\n", retval ? "true" : "false" );
return retval;
}
CORBA_short coord_type,
CORBA_Environment *ev)
{
- Accessibility_Accessible retval;
- Component *component = COMPONENT (bonobo_object_from_servant (servant));
- AtkObject *child;
- child = atk_component_ref_accessible_at_point (ATK_COMPONENT (component->atko),
- (gint) x, (gint) y,
- (AtkCoordType) coord_type);
- retval = bonobo_object_corba_objref (bonobo_object (accessible_new (child)));
- return retval;
+ AtkObject *child;
+ AtkComponent *component = get_component_from_servant (servant);
+
+ g_return_val_if_fail (component != NULL, FALSE);
+
+ child = atk_component_ref_accessible_at_point (component,
+ (gint) x, (gint) y,
+ (AtkCoordType) coord_type);
+ return spi_accessible_new_return (child, TRUE, ev);
}
/*
* CORBA Accessibility::Component::getExtents method implementation
*/
-static void
+static Accessibility_BoundingBox
impl_accessibility_component_get_extents (PortableServer_Servant servant,
- CORBA_long * x,
- CORBA_long * y,
- CORBA_long * width,
- CORBA_long * height,
- const CORBA_short coord_type,
+ const CORBA_short coord_type,
CORBA_Environment *ev)
{
- Component *component = COMPONENT (bonobo_object_from_servant (servant));
gint ix, iy, iw, ih;
- atk_component_get_extents (ATK_COMPONENT (component->atko), &ix, &iy, &iw, &ih,
- (AtkCoordType) coord_type);
- *x = (CORBA_long) ix;
- *y = (CORBA_long) iy;
- *width = (CORBA_long) iw;
- *height = (CORBA_long) ih;
+ Accessibility_BoundingBox retval;
+ AtkComponent *component = get_component_from_servant (servant);
+
+ atk_component_get_extents (component, &ix, &iy, &iw, &ih,
+ (AtkCoordType) coord_type);
+
+ retval.x = ix;
+ retval.y = ix;
+ retval.width = iw;
+ retval.height = ih;
+
+ return retval;
}
/*
const CORBA_short coord_type,
CORBA_Environment *ev)
{
- Component *component = COMPONENT (bonobo_object_from_servant (servant));
gint ix, iy;
- atk_component_get_position (ATK_COMPONENT (component->atko), &ix, &iy,
+ AtkComponent *component = get_component_from_servant (servant);
+
+ g_return_if_fail (component != NULL);
+
+ atk_component_get_position (component, &ix, &iy,
(AtkCoordType) coord_type);
*x = (CORBA_long) ix;
*y = (CORBA_long) iy;
CORBA_long * height,
CORBA_Environment *ev)
{
- Component *component = COMPONENT (bonobo_object_from_servant (servant));
gint iw, ih;
- atk_component_get_size (ATK_COMPONENT (component->atko), &iw, &ih);
+ AtkComponent *component = get_component_from_servant (servant);
+
+ g_return_if_fail (component != NULL);
+
+ atk_component_get_size (component, &iw, &ih);
*width = (CORBA_long) iw;
*height = (CORBA_long) ih;
}
+static Accessibility_ComponentLayer
+impl_accessibility_component_get_layer (PortableServer_Servant servant,
+ CORBA_Environment *ev)
+{
+ AtkLayer atklayer;
+ AtkComponent *component = get_component_from_servant (servant);
+
+ g_return_val_if_fail (component != NULL, Accessibility_LAYER_INVALID);
+
+ atklayer = atk_object_get_layer (ATK_OBJECT (component));
+ switch (atklayer)
+ {
+ case ATK_LAYER_BACKGROUND:
+ return Accessibility_LAYER_BACKGROUND;
+ case ATK_LAYER_CANVAS:
+ return Accessibility_LAYER_CANVAS;
+ case ATK_LAYER_WIDGET:
+ return Accessibility_LAYER_WIDGET;
+ case ATK_LAYER_MDI:
+ return Accessibility_LAYER_MDI;
+ case ATK_LAYER_POPUP:
+ return Accessibility_LAYER_POPUP;
+ case ATK_LAYER_OVERLAY:
+ return Accessibility_LAYER_OVERLAY;
+ default:
+ break;
+ }
+ return Accessibility_LAYER_INVALID;
+}
+
+static CORBA_short
+impl_accessibility_component_get_mdi_z_order (PortableServer_Servant servant,
+ CORBA_Environment *ev)
+{
+ AtkComponent *component = get_component_from_servant (servant);
+
+ g_return_val_if_fail (component != NULL, -1);
+
+ return (CORBA_short) atk_object_get_mdi_zorder (ATK_OBJECT (component));
+}
+
static void
-accessibility_component_class_init (ComponentClass *klass)
+spi_component_class_init (SpiComponentClass *klass)
{
- GObjectClass * object_class = (GObjectClass *) klass;
POA_Accessibility_Component__epv *epv = &klass->epv;
- component_parent_class = g_type_class_peek_parent (klass);
-
- object_class->finalize = accessibility_component_object_finalize;
+ spi_component_parent_class = g_type_class_peek_parent (klass);
epv->contains = impl_accessibility_component_contains;
epv->getAccessibleAtPoint = impl_accessibility_component_get_accessible_at_point;
epv->getExtents = impl_accessibility_component_get_extents;
epv->getPosition = impl_accessibility_component_get_position;
epv->getSize = impl_accessibility_component_get_size;
+ epv->getLayer = impl_accessibility_component_get_layer;
+ epv->getMDIZOrder = impl_accessibility_component_get_mdi_z_order;
}
static void
-accessibility_component_init (Component *component)
+spi_component_init (SpiComponent *component)
{
}
-GType
-accessibility_component_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (ComponentClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) accessibility_component_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (Component),
- 0, /* n preallocs */
- (GInstanceInitFunc) accessibility_component_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 (
- PARENT_TYPE,
- POA_Accessibility_Component__init,
- NULL,
- G_STRUCT_OFFSET (ComponentClass, epv),
- &tinfo,
- "AccessibleComponent");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiComponent,
+ Accessibility_Component,
+ PARENT_TYPE,
+ spi_component);
-Component *
-component_interface_new (AtkObject *o)
+SpiComponent *
+spi_component_interface_new (AtkObject *o)
{
- Component *retval =
- COMPONENT (g_object_new (accessibility_component_get_type (), NULL));
- retval->atko = o;
- g_object_ref (o);
-return retval;
+ SpiComponent *retval = g_object_new (SPI_COMPONENT_TYPE, NULL);
+
+ spi_base_construct (SPI_BASE (retval), o);
+
+ return retval;
}
projects / platform / core / uifw / at-spi2-atk.git / blobdiff