X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=cspi%2Fspi_action.c;h=7136b45fb7f6f32678aa66adfa151591aaa5b8dc;hb=39ba4c94f2925b59df2931a02f7537a61a6690da;hp=507af16539476d747aa2a484431a40bedd8e1e58;hpb=ef25f6c6de6d39e1b4e4adc4ed9f6d639b04437d;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/cspi/spi_action.c b/cspi/spi_action.c
index 507af16..7136b45 100644
--- a/cspi/spi_action.c
+++ b/cspi/spi_action.c
@@ -1,3 +1,26 @@
+/*
+ * AT-SPI - Assistive Technology Service Provider Interface
+ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
+ *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #include <cspi/spi-private.h>
 
 /**
@@ -5,9 +28,6 @@
  * @obj: a pointer to the #AccessibleAction on which to operate.
  *
  * Increment the reference count for an #AccessibleAction.
- *
- * Returns: 0 (no return code implemented yet).
- *
  **/
 void
 AccessibleAction_ref (AccessibleAction *obj)
@@ -20,9 +40,6 @@ AccessibleAction_ref (AccessibleAction *obj)
  * @obj: a pointer to the #AccessibleAction on which to operate.
  *
  * Decrement the reference count for an #AccessibleAction.
- *
- * Returns: 0 (no return code implemented yet).
- *
  **/
 void
 AccessibleAction_unref (AccessibleAction *obj)
@@ -41,12 +58,11 @@ AccessibleAction_unref (AccessibleAction *obj)
 long
 AccessibleAction_getNActions (AccessibleAction *obj)
 {
-  long retval;
+  dbus_int32_t retval;
 
   cspi_return_val_if_fail (obj != NULL, -1);
 
-  retval =
-    Accessibility_Action__get_nActions (CSPI_OBJREF (obj), cspi_ev ());
+  cspi_dbus_get_property (obj, spi_interface_action, "nActions", NULL, "i", &retval);
 
   cspi_return_val_if_ev ("getNActions", -1);
 
@@ -67,13 +83,11 @@ char *
 AccessibleAction_getDescription (AccessibleAction *obj,
                                  long int          i)
 {
+  dbus_int32_t d_i = i;
   char *retval;
   cspi_return_val_if_fail (obj != NULL, NULL);
 
-  retval =
-    Accessibility_Action_getDescription (CSPI_OBJREF (obj),
-					 (CORBA_long) i,
-					 cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_action, "getDescription", NULL, "i=>s", d_i, &retval);
 
   cspi_return_val_if_ev ("getDescription", NULL);
 
@@ -87,6 +101,25 @@ AccessibleAction_getDescription (AccessibleAction *obj,
  *
  * Get the keybindings for the @i-th action invokable on an
  *      object implementing #AccessibleAction, if any are defined.
+ *      The keybindings string format is as follows:
+ *        there are multiple parts to a keybinding string (typically 3).
+ *        They are delimited with ";".  The first is the action's
+ *        keybinding which is usable if the object implementing the action
+ *        is currently posted to the screen, e.g. if a menu is posted 
+ *        then these keybindings for the corresponding menu-items are
+ *        available.  The second keybinding substring is the full key sequence
+ *        necessary to post the action's widget and activate it, e.g. for
+ *        a menu item such as "File->Open" it would both post the menu and
+ *        activate the item.  Thus the second keybinding string is available
+ *        during the lifetime of the containing toplevel window as a whole,
+ *        whereas the first keybinding string only works while the object
+ *        implementing AtkAction is posted.  The third (and optional)
+ *        keybinding string is the "keyboard shortcut" which invokes the 
+ *        action without posting any menus. 
+ *        Meta-keys are indicated by the conventional strings
+ *        "<Control>", "<Alt>", "<Shift>", "<Mod2>",
+ *        etc. (we use the same string as gtk_accelerator_name() in 
+ *        gtk+-2.X.
  *
  * Returns: a UTF-8 string which can be parsed to determine the @i-th
  *       invokable action's keybindings.
@@ -95,14 +128,11 @@ char *
 AccessibleAction_getKeyBinding (AccessibleAction *obj,
 				long int          i)
 {
+  dbus_int32_t d_i = i;
   char *retval;
-
   cspi_return_val_if_fail (obj != NULL, NULL);
 
-  retval =
-    Accessibility_Action_getKeyBinding (CSPI_OBJREF (obj),
-       (CORBA_long) i,
-       cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_action, "getKeyBinding", NULL, "i=>s", d_i, &retval);
 
   cspi_return_val_if_ev ("getKeyBinding", NULL);
 
@@ -123,14 +153,11 @@ char *
 AccessibleAction_getName (AccessibleAction *obj,
 			  long int          i)
 {
+  dbus_int32_t d_i = i;
   char *retval;
-
   cspi_return_val_if_fail (obj != NULL, NULL);
 
-  retval =
-   Accessibility_Action_getName (CSPI_OBJREF (obj),
-				 (CORBA_long) i,
-				 cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_action, "getName", NULL, "i=>s", d_i, &retval);
 
   cspi_return_val_if_ev ("getName", NULL);
 
@@ -150,14 +177,12 @@ SPIBoolean
 AccessibleAction_doAction (AccessibleAction *obj,
                            long int i)
 {
-  SPIBoolean retval;
+  dbus_int32_t d_i = i;
+  dbus_bool_t retval;
 
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  retval = (SPIBoolean)
-    Accessibility_Action_doAction (CSPI_OBJREF (obj),
-				   (CORBA_long) i,
-				   cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_action, "doAction", NULL, "i=>b", d_i, &retval);
 
   cspi_return_val_if_ev ("doAction", FALSE);