Changes to introspection generation to remove DOCTYPE and XML
[platform/core/uifw/at-spi2-atk.git] / cspi / spi_registry.c
index 91cd90e..77341a9 100644 (file)
@@ -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
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- *
- * Global functions serviced by the registry
- *
- */
+/* spi_registry.c: Global functions wrapping the registry */
 
-/* static stuff used only by registry C bindings */
-static GList *key_listeners = NULL;
-static Display *display = NULL;
+#include <cspi/spi-private.h>
 
 /**
- * registerGlobalEventListener:
+ * SPI_registerGlobalEventListener:
  * @listener: the #AccessibleEventListener to be registered against an
  *            event type.
  * @eventType: a character string indicating the type of events for which
@@ -48,7 +43,6 @@ static Display *display = NULL;
  *
  *            object:property-change
  *            object:property-change:accessible-name
- *            object:property-change:accessible-state
  *            object:property-change:accessible-description
  *            object:property-change:accessible-parent
  *            object:property-change:accessible-value
@@ -62,6 +56,7 @@ static Display *display = NULL;
  *
  *    (other object events)
  *
+ *            object:state-changed 
  *            object:children-changed
  *            object:visible-data-changed
  *            object:selection-changed
@@ -75,6 +70,39 @@ static Display *display = NULL;
  *            object:column-reordered
  *            object:column-deleted
  *            object:model-changed
+ *            object:active-descendant-changed
+ *
+ *  (window events)
+ *
+ *            window:minimize
+ *            window:maximize
+ *            window:restore
+ *            window:close
+ *            window:create
+ *            window:reparent
+ *            window:desktop-create
+ *            window:desktop-destroy
+ *            window:activate
+ *            window:deactivate
+ *            window:raise
+ *            window:lower
+ *            window:move
+ *            window:resize
+ *            window:shade
+ *            window:unshade
+ *            window:restyle
+ *
+ *  (other events)
+ *
+ *            focus:
+ *            mouse:abs
+ *            mouse:rel
+ *            mouse:b1p
+ *            mouse:b1r
+ *            mouse:b2p
+ *            mouse:b2r
+ *            mouse:b3p
+ *            mouse:b3r
  *
  * NOTE: this string may be UTF-8, but should not contain byte value 56
  *            (ascii ':'), except as a delimiter, since non-UTF-8 string
@@ -85,62 +113,54 @@ static Display *display = NULL;
  * Add an in-process callback function to an existing AccessibleEventListener.
  *
  * Returns: #TRUE if successful, otherwise #FALSE.
- *
  **/
-boolean
-registerGlobalEventListener (AccessibleEventListener *listener,
-                             char *eventType)
+SPIBoolean
+SPI_registerGlobalEventListener (AccessibleEventListener *listener,
+                                const char              *eventType)
 {
-  Accessibility_Registry_registerGlobalEventListener (
-                         registry,
-                         (Accessibility_EventListener)
-                            bonobo_object_corba_objref (bonobo_object (listener)),
-                         eventType,
-                         &ev);
-
-  if (ev._major != CORBA_NO_EXCEPTION)
-    {
-    return FALSE;
-    }
-  else
+  if (!listener)
     {
-      return TRUE;
+      return FALSE;
     }
+
+  Accessibility_Registry_registerGlobalEventListener (
+    cspi_registry (),
+    cspi_event_listener_get_corba (listener),
+    eventType, cspi_ev ());
+
+  return  !cspi_exception ();
 }
 
 /**
- * deregisterGlobalEventListenerAll:
+ * SPI_deregisterGlobalEventListenerAll:
  * @listener: the #AccessibleEventListener to be registered against
  *            an event type.
  *
  * deregisters an AccessibleEventListener from the registry, for all
- *            event types it may be listening to.
+ *            event types it may be listening to. Use
+ *            AccessibleEventListener_unref to release the
+ *            listener reference.
  *
  * Returns: #TRUE if successful, otherwise #FALSE.
- *
  **/
-boolean
-deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
+SPIBoolean
+SPI_deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
 {
-  Accessibility_Registry_deregisterGlobalEventListenerAll (
-                         registry,
-                         (Accessibility_EventListener)
-                            CORBA_Object_duplicate (
-                                   bonobo_object_corba_objref (
-                                           bonobo_object (listener)), &ev),
-                         &ev);
-
-  if (ev._major != CORBA_NO_EXCEPTION)
+  if (!listener)
     {
-    return FALSE;
-    }
-  else
-    {
-      return TRUE;
+      return FALSE;
     }
+
+  Accessibility_Registry_deregisterGlobalEventListenerAll (
+    cspi_registry (),
+    cspi_event_listener_get_corba (listener),
+    cspi_ev ());
+
+  return !cspi_exception ();
 }
+
 /**
- * deregisterGlobalEventListener:
+ * SPI_deregisterGlobalEventListener:
  * @listener: the #AccessibleEventListener registered against an event type.
  * @eventType: a string specifying the event type for which this
  *             listener is to be deregistered.
@@ -149,48 +169,48 @@ deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
  *             event type.
  *
  * Returns: #TRUE if successful, otherwise #FALSE.
- *
  **/
-boolean
-deregisterGlobalEventListener (AccessibleEventListener *listener,
-                              char *eventType)
+SPIBoolean
+SPI_deregisterGlobalEventListener (AccessibleEventListener *listener,
+                                  const char              *eventType)
 {
-  Accessibility_Registry_deregisterGlobalEventListener (
-         registry,
-         (Accessibility_EventListener)
-         CORBA_Object_duplicate (
-                 bonobo_object_corba_objref (bonobo_object (listener)), &ev),
-         (CORBA_char *) eventType,
-         &ev);
-
-  if (ev._major != CORBA_NO_EXCEPTION)
-    {
-    return FALSE;
-    }
-  else
+  if (!listener)
     {
-      return TRUE;
+      return FALSE;
     }
+
+  Accessibility_Registry_deregisterGlobalEventListener (
+    cspi_registry (), 
+    cspi_event_listener_get_corba (listener),
+    eventType, cspi_ev ());
+
+  return !cspi_exception ();
 }
 
 /**
- * getDesktopCount:
+ * SPI_getDesktopCount:
  *
  * Get the number of virtual desktops.
  * NOTE: currently multiple virtual desktops are not implemented, this
  *       function always returns '1'.
  *
  * Returns: an integer indicating the number of active virtual desktops.
- *
  **/
 int
-getDesktopCount ()
+SPI_getDesktopCount ()
 {
-  return Accessibility_Registry_getDesktopCount (registry, &ev);
+  int retval;
+
+  retval = Accessibility_Registry_getDesktopCount (
+    cspi_registry (), cspi_ev ());
+
+  cspi_return_val_if_ev ("getDesktopCount", -1);
+
+  return retval;
 }
 
 /**
- * getDesktop:
+ * SPI_getDesktop:
  * @i: an integer indicating which of the accessible desktops is to be returned.
  *
  * Get the virtual desktop indicated by index @i.
@@ -198,20 +218,22 @@ getDesktopCount ()
  *       function always returns '1'.
  *
  * Returns: a pointer to the 'i-th' virtual desktop's #Accessible representation.
- *
  **/
 Accessible*
-getDesktop (int i)
+SPI_getDesktop (int i)
 {
-  return Obj_Add (Accessibility_Registry_getDesktop (registry, (CORBA_short) i, &ev));
+  return cspi_object_add (
+    Accessibility_Registry_getDesktop (
+      cspi_registry (), i, cspi_ev ()));
 }
 
 /**
- * getDesktopList:
- * @list: a pointer to an array of #Accessible objects.
+ * SPI_getDesktopList:
+ * @desktop_list: a pointer to an array of #Accessible references.
  *
  * Get the list of virtual desktops.  On return, @list will point
- *     to a newly-created array of virtual desktop pointers.
+ *     to a newly-created, NULL terminated array of virtual desktop
+ *     pointers.
  *     It is the responsibility of the caller to free this array when
  *     it is no longer needed.
  *
@@ -222,38 +244,71 @@ getDesktop (int i)
  *          placed in the list pointed to by parameter @list.
  **/
 int
-getDesktopList (Accessible **list)
+SPI_getDesktopList (Accessible ***desktop_list)
 {
-  *list = NULL;
-  return 0;
+  int i;
+  Accessible **list;
+  Accessibility_DesktopSeq *desktops;
+
+  if (!desktop_list)
+         return 0;
+
+  *desktop_list = NULL;
+
+  desktops = Accessibility_Registry_getDesktopList (cspi_registry (),
+                                                   cspi_ev ());
+
+  cspi_return_val_if_ev ("getDesktopList", 0);
+
+  list = g_new0 (Accessible *, desktops->_length + 1);
+
+  for (i = 0; i < desktops->_length; i++)
+    {
+      list [i] = cspi_object_add (
+             CORBA_Object_duplicate (desktops->_buffer [i], cspi_ev ()));
+    }
+  list [i] = NULL;
+
+  CORBA_free (desktops);
+
+  *desktop_list = list;
+
+  return i;
 }
 
-static gboolean
-key_event_source_func (void *p)
+/**
+ * SPI_freeDesktopList:
+ * @desktop_list: a pointer to an array of #Accessible objects
+ * as returned from @SPI_getDesktopList
+ * 
+ * This routine frees the memory associated with the list.
+ **/
+void
+SPI_freeDesktopList (Accessible **desktop_list)
 {
-  GList *listeners = (GList *)p;
-  XEvent *x_event = g_new0 (XEvent, 1);
-  while (XPending (display))
+  Accessible **p;
+  
+  for (p = desktop_list; p && *p; p++)
     {
-      XNextEvent (display, x_event);
-      while (listeners)
-        {
-        /* if the listener mask matches, notify it*/
-          if (1)
-           {
-             ;   
-           }
-       }
+      cspi_object_unref (*p);
     }
-  return TRUE;
+  g_free (desktop_list);
 }
 
 /**
- * registerAccessibleKeystrokeListener:
+ * SPI_KEYSET_ALL_KEYS:
+ * @SPI_KEYSET_ALL_KEYS: A special value for an AccessibleKeySet type, which tacitly
+ *                       includes all keycodes and keyvals for the specified modifier set.
+ **/
+
+/**
+ * SPI_registerAccessibleKeystrokeListener:
  * @listener:  a pointer to the #AccessibleKeystrokeListener for which
  *             keystroke events are requested.
  * @keys:      a pointer to the #AccessibleKeySet indicating which
- *             keystroke events are requested, or #SPI_KEYSET_ALL_KEYS.
+ *             keystroke events are requested, or #SPI_KEYSET_ALL_KEYS
+ *             to indicate that all keycodes and keyvals for the specified
+ *             modifier set are to be included.
  * @modmask:   an #AccessibleKeyMaskType mask indicating which
  *             key event modifiers must be set in combination with @keys,
  *             events will only be reported for key events for which all
@@ -266,79 +321,108 @@ key_event_source_func (void *p)
  *             the behavior of the notification/listener transaction.
  *             
  * Register a listener for keystroke events, either pre-emptively for
- *             all windows (SPI_KEYLISTENER_ALL_WINDOWS), or
- *             non-preemptively (SPI_KEYLISTENER_NOSYNC).
- *             ( Other sync_type values may be available in the future.)
+ *             all windows (SPI_KEYLISTENER_ALL_WINDOWS),
+ *             non-preemptively (SPI_KEYLISTENER_NOSYNC), or
+ *             pre-emptively at the toolkit level (SPI_KEYLISTENER_CANCONSUME).
+ *             If ALL_WINDOWS or CANCONSUME are used, the event is consumed
+ *             upon receipt if one of @listener's callbacks returns #TRUE.
+ *             ( Other sync_type values may be available in the future )
+ *
+ * Returns: #TRUE if successful, otherwise #FALSE.
  **/
-void
-registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
-                                    AccessibleKeySet *keys,
-                                    AccessibleKeyMaskType modmask,
-                                    AccessibleKeyEventMask eventmask,
-                                    AccessibleKeyListenerSyncType sync_type)
+SPIBoolean
+SPI_registerAccessibleKeystrokeListener (AccessibleKeystrokeListener  *listener,
+                                        AccessibleKeySet             *keys,
+                                        AccessibleKeyMaskType         modmask,
+                                        AccessibleKeyEventMask        eventmask,
+                                        AccessibleKeyListenerSyncType sync_type)
 {
-  Accessibility_ControllerEventMask *controller_event_mask =
-         Accessibility_ControllerEventMask__alloc();
-  Accessibility_DeviceEventController device_event_controller = 
-         Accessibility_Registry_getDeviceEventController (registry, &ev);
-  Accessibility_KeySet *key_set = Accessibility_KeySet__alloc();
-  Accessibility_KeyEventTypeSeq *key_events = Accessibility_KeyEventTypeSeq__alloc();
-  Accessibility_KeystrokeListener spi_listener_corba_ref;
-  gint i, mask;
-  Accessibility_DeviceEventController_ref (device_event_controller, &ev);
+  gint                                i;
+  Accessibility_KeySet                key_set;
+  Accessibility_KeyEventTypeSeq       key_events;
+  Accessibility_ControllerEventMask   controller_event_mask;
+  Accessibility_DeviceEventController device_event_controller;
+  Accessibility_EventListenerMode     listener_mode;
+  Accessibility_EventType             key_event_types [2];
+  SPIBoolean                          retval = FALSE;
+
+  if (!listener)
+    {
+      return retval;
+    }
+
+  device_event_controller = 
+    Accessibility_Registry_getDeviceEventController (cspi_registry (), cspi_ev ());
+
+  cspi_return_val_if_ev ("getting event controller", FALSE);
 
   /* copy the keyval filter values from the C api into the CORBA KeySet */
   if (keys)
     {
-      key_set->_buffer = Accessibility_KeySet_allocbuf (
-                                                   (unsigned long) keys->len);
-      key_set->_length = (unsigned long) keys->len;
-      for (i=0; i < key_set->_length; ++i)
+      key_set._length = keys->len;
+      key_set._buffer = Accessibility_KeySet_allocbuf (keys->len);
+      for (i = 0; i < key_set._length; ++i)
         {
-          /* we overload the keyset long w/keycodes, the - bit acts as a flag */
-          key_set->_buffer[i] = (keys->keysyms[i]) ? keys->keysyms[i] :
-                                                -keys->keycodes[i];
+          key_set._buffer[i].keycode = keys->keycodes[i];
+         key_set._buffer[i].keysym = keys->keysyms[i];
+         if (keys->keystrings && keys->keystrings[i]) 
+           {
+             key_set._buffer[i].keystring = CORBA_string_dup(keys->keystrings[i]);
+           } 
+          else 
+            {
+             key_set._buffer[i].keystring = CORBA_string_dup("");
+           }
         }
     }
-  /* copy the event filter values from the C api into the CORBA KeyEventTypeSeq */
-  mask=1;
-  i=0;
-  do
+  else
     {
-      if (mask & eventmask) ++i; 
-      mask <<= 1;
-    } while (mask & 0xFFFF);
-  
-  key_events->_buffer = Accessibility_KeyEventTypeSeq_allocbuf (i);
-  i=0;
+      key_set._length = 0;
+      key_set._buffer = NULL;
+    }
+       
+  /* copy the event filter values from the C api into the CORBA KeyEventTypeSeq */
+  i = 0;
+  key_events._buffer = key_event_types;
   if (eventmask & SPI_KEY_PRESSED)
     {
-      key_events->_buffer[i++] = Accessibility_KEY_PRESSED;
+      key_events._buffer[i++] = Accessibility_KEY_PRESSED_EVENT;
     }
   if (eventmask & SPI_KEY_RELEASED)
     {
-      key_events->_buffer[i++] = Accessibility_KEY_RELEASED;
+      key_events._buffer[i++] = Accessibility_KEY_RELEASED_EVENT;
     }
-  key_events->_length = i;
+  key_events._length = i;
   
-  controller_event_mask->value = (CORBA_unsigned_long) modmask;
-  controller_event_mask->refcount = (CORBA_unsigned_short) 1;
+  controller_event_mask = (CORBA_unsigned_long) modmask;
 
-  spi_listener_corba_ref = (Accessibility_KeystrokeListener)
-         CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), &ev);
-  
-         Accessibility_DeviceEventController_registerKeystrokeListener (
-         device_event_controller,
-         spi_listener_corba_ref,
-         key_set,
-         controller_event_mask,
-         key_events,
-         (CORBA_boolean) ((sync_type & SPI_KEYLISTENER_ALL_WINDOWS)!=0),
-         &ev);
+  listener_mode.synchronous =
+         (CORBA_boolean) ((sync_type & SPI_KEYLISTENER_SYNCHRONOUS)!=0);
+  listener_mode.preemptive =
+         (CORBA_boolean) ((sync_type & SPI_KEYLISTENER_CANCONSUME)!=0);
+  listener_mode.global =
+         (CORBA_boolean) ((sync_type & SPI_KEYLISTENER_ALL_WINDOWS)!=0);
+
+  retval = Accessibility_DeviceEventController_registerKeystrokeListener (
+    device_event_controller,
+    cspi_event_listener_get_corba (listener),
+    &key_set,
+    controller_event_mask,
+    &key_events,
+    &listener_mode,
+    cspi_ev ());
+
+  CORBA_free (key_set._buffer);
+
+  cspi_return_val_if_ev ("registering keystroke listener", FALSE);
+
+  cspi_release_unref (device_event_controller);
+
+  return retval;
 }
 
 /**
- * deregisterAccessibleKeystrokeListener:
+ * SPI_deregisterAccessibleKeystrokeListener:
  * @listener: a pointer to the #AccessibleKeystrokeListener for which
  *            keystroke events are requested.
  * @modmask:  the key modifier mask for which this listener is to be
@@ -346,78 +430,250 @@ registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
  *
  * Removes a keystroke event listener from the registry's listener queue,
  *            ceasing notification of events with modifiers matching @modmask.
+ *
+ * Returns: #TRUE if successful, otherwise #FALSE.
  **/
-void
-deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
-                                      AccessibleKeyMaskType modmask)
+SPIBoolean
+SPI_deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
+                                          AccessibleKeyMaskType        modmask)
 {
-  Accessibility_ControllerEventMask *controller_event_mask =
-         Accessibility_ControllerEventMask__alloc();
-  Accessibility_DeviceEventController device_event_controller = 
-         Accessibility_Registry_getDeviceEventController (registry, &ev);
-  Accessibility_KeySet *all_keys = Accessibility_KeySet__alloc();
-  Accessibility_KeyEventTypeSeq *key_events = Accessibility_KeyEventTypeSeq__alloc();
-  Accessibility_KeystrokeListener spi_listener_corba_ref;
-  Accessibility_DeviceEventController_unref (device_event_controller, &ev);
-  controller_event_mask->value = (CORBA_unsigned_long) modmask;
-  controller_event_mask->refcount = (CORBA_unsigned_short) 1;
-
-  spi_listener_corba_ref = (Accessibility_KeystrokeListener)
-         CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), &ev);
-  
+  Accessibility_ControllerEventMask   controller_event_mask;
+  Accessibility_KeySet                key_set;
+  Accessibility_KeyEventTypeSeq       key_events;
+  Accessibility_DeviceEventController device_event_controller;
+
+  if (!listener)
+    {
+      return FALSE;
+    }
+
+  device_event_controller = 
+    Accessibility_Registry_getDeviceEventController (cspi_registry (), cspi_ev ());
+
+  cspi_return_val_if_ev ("getting keystroke listener", FALSE);
+
+  controller_event_mask = (CORBA_unsigned_long) modmask;
+
+  key_events._buffer = NULL;
+  key_events._length = 0;
+
+  key_set._buffer = NULL;
+  key_set._length = 0;
+
   Accessibility_DeviceEventController_deregisterKeystrokeListener (
-         device_event_controller,
-         spi_listener_corba_ref,
-         all_keys,
-         controller_event_mask,
-         key_events,
-         (CORBA_boolean) TRUE,
-         &ev);
+    device_event_controller,
+    cspi_event_listener_get_corba (listener),
+    &key_set,
+    controller_event_mask,
+    &key_events,
+    cspi_ev ());
+
+  cspi_release_unref (device_event_controller);
+
+  return TRUE;
 }
 
 /**
- * generateKeyEvent:
+ * SPI_registerDeviceEventListener:
+ * @listener:  a pointer to the #AccessibleDeviceListener which requests
+ *             the events.
+ * @eventmask: an #AccessibleDeviceEventMask mask indicating which
+ *             types of key events are requested (#SPI_KEY_PRESSED, etc.).
+ * @filter: Unused parameter.
+ *             
+ * Register a listener for device events, for instance button events.
+ *
+ * Returns: #TRUE if successful, otherwise #FALSE.
+ **/
+SPIBoolean
+SPI_registerDeviceEventListener (AccessibleDeviceListener  *listener,
+                                AccessibleDeviceEventMask  eventmask,
+                                void                      *filter)
+{
+  Accessibility_DeviceEventController device_event_controller;
+  SPIBoolean                          retval = FALSE;
+  Accessibility_EventTypeSeq          event_types;
+  Accessibility_EventType             event_type_buffer[2];
+  gint                                i;
+
+  if (!listener)
+    {
+      return retval;
+    }
+
+  device_event_controller = 
+    Accessibility_Registry_getDeviceEventController (cspi_registry (), cspi_ev ());
+
+  cspi_return_val_if_ev ("getting event controller", FALSE);
+
+  /* copy the event filter values from the C api into the CORBA KeyEventTypeSeq */
+  
+  event_types._buffer = event_type_buffer;
+  i = 0;
+
+  if (eventmask & SPI_BUTTON_PRESSED)
+    {
+      event_types._buffer[i++] = Accessibility_BUTTON_PRESSED_EVENT;
+    }
+  if (eventmask & SPI_BUTTON_RELEASED)
+    {
+      event_types._buffer[i++] = Accessibility_BUTTON_RELEASED_EVENT;
+    }
+
+  event_types._length = i;
+  
+  retval = Accessibility_DeviceEventController_registerDeviceEventListener (
+    device_event_controller,
+    cspi_event_listener_get_corba (listener),
+    &event_types,
+    cspi_ev ());
+
+  cspi_return_val_if_ev ("registering keystroke listener", FALSE);
+
+  cspi_release_unref (device_event_controller);
+
+  return retval;
+}
+
+/**
+ * SPI_deregisterDeviceEventListener:
+ * @listener: a pointer to the #AccessibleDeviceListener for which
+ *            device events are requested.
+ * @filter: Unused parameter.
+ *
+ * Removes a device event listener from the registry's listener queue,
+ *            ceasing notification of events of the specified type.
+ *
+ * Returns: #TRUE if successful, otherwise #FALSE.
+ **/
+SPIBoolean
+SPI_deregisterDeviceEventListener (AccessibleDeviceListener *listener,
+                                  void                     *filter)
+{
+  Accessibility_DeviceEventController device_event_controller;
+  Accessibility_EventTypeSeq       event_types;
+  Accessibility_EventType          event_type_buff[2];
+
+  if (!listener)
+    {
+      return FALSE;
+    }
+
+  device_event_controller = 
+    Accessibility_Registry_getDeviceEventController (cspi_registry (), cspi_ev ());
+
+  cspi_return_val_if_ev ("getting keystroke listener", FALSE);
+
+  event_types._buffer = event_type_buff;
+  event_types._length = 2;
+  event_types._buffer[0] = Accessibility_BUTTON_PRESSED_EVENT;
+  event_types._buffer[1] = Accessibility_BUTTON_RELEASED_EVENT;
+
+  Accessibility_DeviceEventController_deregisterDeviceEventListener (
+    device_event_controller,
+    cspi_event_listener_get_corba (listener),
+    &event_types,    
+    cspi_ev ());
+
+  cspi_release_unref (device_event_controller);
+
+  return TRUE;
+}
+
+/**
+ * SPI_generateKeyboardEvent:
  * @keyval: a long integer indicating the keycode or keysym of the key event
  *           being synthesized.
+ * @keystring: an (optional) UTF-8 string which, if @keyval is NULL,
+ *           indicates a 'composed' keyboard input string which is 
+ *           being synthesized; this type of keyboard event synthesis does
+ *           not emulate hardware keypresses but injects the string 
+ *           as though a composing input method (such as XIM) were used.
  * @synth_type: a #AccessibleKeySynthType flag indicating whether @keyval
  *           is to be interpreted as a keysym rather than a keycode
- *           (SPI_KEYSYM), or whether to synthesize
+ *           (CSPI_KEYSYM), or whether to synthesize
  *           SPI_KEY_PRESS, SPI_KEY_RELEASE, or both (SPI_KEY_PRESSRELEASE).
  *
  * Synthesize a keyboard event (as if a hardware keyboard event occurred in the
  * current UI context).
  *
+ * Returns: #TRUE if successful, otherwise #FALSE.
  **/
-void
-generateKeyEvent (long int keyval, AccessibleKeySynthType synth_type)
+SPIBoolean
+SPI_generateKeyboardEvent (long int keyval,
+                          char *keystring,
+                          AccessibleKeySynthType synth_type)
 {
-/* TODO: check current modifier status and
- *  send keycode to alter, if necessary
- */
+  Accessibility_KeySynthType keysynth_type;
   Accessibility_DeviceEventController device_event_controller = 
-         Accessibility_Registry_getDeviceEventController (registry, &ev);
-  Accessibility_DeviceEventController_generateKeyEvent (device_event_controller,
-                                                       keyval,
-                                                       (unsigned long) synth_type,
-                                                       &ev);
+         Accessibility_Registry_getDeviceEventController (cspi_registry (), cspi_ev ());
+
+  cspi_return_val_if_ev ("getting event controller for key event gen", FALSE);
+
+  switch (synth_type)
+    {
+      case SPI_KEY_PRESS:
+         keysynth_type = Accessibility_KEY_PRESS;
+         break;
+      case SPI_KEY_RELEASE:
+         keysynth_type = Accessibility_KEY_RELEASE;
+         break;
+      case SPI_KEY_PRESSRELEASE:
+         keysynth_type = Accessibility_KEY_PRESSRELEASE;
+         break;
+      case SPI_KEY_SYM:
+         keysynth_type = Accessibility_KEY_SYM;
+         break;
+      case SPI_KEY_STRING:
+         keysynth_type = Accessibility_KEY_STRING;
+         break;
+      default:
+          return FALSE;
+    }
+
+  Accessibility_DeviceEventController_generateKeyboardEvent (device_event_controller,
+                                                            keyval,
+                                                            keystring ? keystring : "",
+                                                            keysynth_type,
+                                                            cspi_ev ());
+
+  cspi_return_val_if_ev ("generating keyboard event", FALSE);
+
+  cspi_release_unref (device_event_controller);
+
+  return TRUE;
 }
 
 /**
- * generateMouseEvent:
+ * SPI_generateMouseEvent:
  * @x: a #long indicating the screen x coordinate of the mouse event.
  * @y: a #long indicating the screen y coordinate of the mouse event.
  * @name: a string indicating which mouse event to be synthesized
- *        (e.g. "button1", "button2", "mousemove").
+ *        (e.g. "b1p", "b1c", "b2r", "rel", "abs").
  *
  * Synthesize a mouse event at a specific screen coordinate.
  * Most AT clients should use the #AccessibleAction interface when
  * tempted to generate mouse events, rather than this method.
- * Not Yet Implemented.
+ * Event names: b1p = button 1 press; b2r = button 2 release;
+ *              b3c = button 3 click; b2d = button 2 double-click;
+ *              abs = absolute motion; rel = relative motion.
  *
+ * Returns: #TRUE if successful, otherwise #FALSE.
  **/
-void
-generateMouseEvent (long x, long y, char *name)
+SPIBoolean
+SPI_generateMouseEvent (long x, long y, char *name)
 {
-  ;
+  Accessibility_DeviceEventController device_event_controller = 
+         Accessibility_Registry_getDeviceEventController (cspi_registry (), cspi_ev ());
+
+  cspi_return_val_if_ev ("getting event controller for mouse event gen", FALSE);
+
+  Accessibility_DeviceEventController_generateMouseEvent (device_event_controller,
+                                                         x, y, name, cspi_ev ());
+  cspi_return_val_if_ev ("generating mouse event", FALSE);
+
+  cspi_release_unref (device_event_controller);
+
+  return TRUE;
 }