2008-03-19 Li Yuan <li.yuan@sun.com>

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

diff --git a/libspi/component.c b/libspi/component.c
index 7418c00..9b179a3 100644 (file)
--- a/libspi/component.c
+++ b/libspi/component.c
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -38,7 +39,8 @@ get_component_from_servant (PortableServer_Servant servant)
 {
   SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
   g_return_val_if_fail (object != NULL, NULL);
-  return ATK_COMPONENT (object->atko);
+  g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL);
+  return ATK_COMPONENT (object->gobj);
 }
 
 /*
@@ -56,7 +58,7 @@ impl_accessibility_component_contains (PortableServer_Servant servant,
 
   g_return_val_if_fail (component != NULL, FALSE);
 
-  retval = atk_component_contains (component, (gint) x, (gint) y,
+  retval = atk_component_contains (component, x, y,
                                   (AtkCoordType) coord_type);
   return retval;
 }
@@ -74,10 +76,10 @@ impl_accessibility_component_get_accessible_at_point (PortableServer_Servant ser
   AtkObject    *child;
   AtkComponent *component = get_component_from_servant (servant);
 
-  g_return_val_if_fail (component != NULL, FALSE);
+  g_return_val_if_fail (component != NULL, NULL);
 
   child = atk_component_ref_accessible_at_point (component,
-                                                (gint) x, (gint) y,
+                                                x, y,
                                                 (AtkCoordType) coord_type);
   return spi_accessible_new_return (child, TRUE, ev);
 }
@@ -98,7 +100,7 @@ impl_accessibility_component_get_extents (PortableServer_Servant servant,
                             (AtkCoordType) coord_type);
 
   retval.x = ix;
-  retval.y = ix;
+  retval.y = iy;
   retval.width = iw;
   retval.height = ih;
 
@@ -122,8 +124,8 @@ impl_accessibility_component_get_position (PortableServer_Servant servant,
 
   atk_component_get_position (component, &ix, &iy,
                               (AtkCoordType) coord_type);
-  *x = (CORBA_long) ix;
-  *y = (CORBA_long) iy;
+  *x = ix;
+  *y = iy;
 }
 
 /*
@@ -141,8 +143,8 @@ impl_accessibility_component_get_size (PortableServer_Servant servant,
   g_return_if_fail (component != NULL);
 
   atk_component_get_size (component, &iw, &ih);
-  *width = (CORBA_long) iw;
-  *height = (CORBA_long) ih;
+  *width = iw;
+  *height = ih;
 }
 
 static Accessibility_ComponentLayer
@@ -154,7 +156,7 @@ impl_accessibility_component_get_layer (PortableServer_Servant servant,
 
   g_return_val_if_fail (component != NULL, Accessibility_LAYER_INVALID);
 
-  atklayer = atk_object_get_layer (ATK_OBJECT (component));
+  atklayer = atk_component_get_layer (component);
   switch (atklayer)
     {
       case ATK_LAYER_BACKGROUND:
@@ -169,6 +171,8 @@ impl_accessibility_component_get_layer (PortableServer_Servant servant,
         return Accessibility_LAYER_POPUP;
       case ATK_LAYER_OVERLAY:
         return Accessibility_LAYER_OVERLAY;
+      case ATK_LAYER_WINDOW:
+        return Accessibility_LAYER_WINDOW;
       default:
         break;      
     }
@@ -183,7 +187,29 @@ impl_accessibility_component_get_mdi_z_order (PortableServer_Servant servant,
 
   g_return_val_if_fail (component != NULL, -1);
 
-  return (CORBA_short) atk_object_get_mdi_zorder (ATK_OBJECT (component));
+  return atk_component_get_mdi_zorder (component);
+}
+
+static CORBA_boolean
+impl_accessibility_component_grab_focus (PortableServer_Servant servant,
+                                        CORBA_Environment     *ev)
+{
+  AtkComponent *component = get_component_from_servant (servant);
+
+  g_return_val_if_fail (component != NULL, FALSE);
+
+  return atk_component_grab_focus (component);
+}
+
+static double
+impl_accessibility_component_get_alpha (PortableServer_Servant servant,
+                                       CORBA_Environment     *ev)
+{
+  AtkComponent *component = get_component_from_servant (servant);
+
+  g_return_val_if_fail (component != NULL, FALSE);
+
+  return atk_component_get_alpha (component);
 }
 
 static void
@@ -199,6 +225,8 @@ spi_component_class_init (SpiComponentClass *klass)
         epv->getSize = impl_accessibility_component_get_size;
        epv->getLayer = impl_accessibility_component_get_layer;
        epv->getMDIZOrder = impl_accessibility_component_get_mdi_z_order;
+       epv->grabFocus = impl_accessibility_component_grab_focus;
+       epv->getAlpha = impl_accessibility_component_get_alpha;
 }
 
 static void
@@ -209,14 +237,14 @@ spi_component_init (SpiComponent *component)
 BONOBO_TYPE_FUNC_FULL (SpiComponent,
                       Accessibility_Component,
                       PARENT_TYPE,
-                      spi_component);
+                      spi_component)
 
 SpiComponent *
 spi_component_interface_new (AtkObject *o)
 {
     SpiComponent *retval = g_object_new (SPI_COMPONENT_TYPE, NULL);
 
-    spi_base_construct (SPI_BASE (retval), o);
+    spi_base_construct (SPI_BASE (retval), G_OBJECT(o));
 
     return retval;
 }