X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cspi%2Fspi_registry.c;h=ef3df5fdd05e35bff868e4786d14e825c7b259dc;hb=66c4375c7cd9a0a01e79f562e1bb0326fc4dcd21;hp=6be863a93246141b1a1d5dc465b34e5be7d23124;hpb=336746297d374424847b92b8109cd43d00dde230;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/cspi/spi_registry.c b/cspi/spi_registry.c
index 6be863a..ef3df5f 100644
--- a/cspi/spi_registry.c
+++ b/cspi/spi_registry.c
@@ -25,13 +25,13 @@ static Display *display = NULL;
  *            functions are used internally.  In general, listening to
  *            toolkit-specific events is not recommended.
  *
- * Add an in-process callback function to an existing AccessibleEventListener.
+ * Add an in-process callback function to an existing SpiAccessibleEventListener.
  *
  * Returns: #TRUE if successful, otherwise #FALSE.
  *
  **/
 boolean
-registerGlobalEventListener (AccessibleEventListener *listener,
+registerGlobalEventListener (SpiAccessibleEventListener *listener,
                              char *eventType)
 {
   Accessibility_Registry_registerGlobalEventListener (
@@ -55,13 +55,13 @@ registerGlobalEventListener (AccessibleEventListener *listener,
  * deregisterGlobalEventListener:
  * @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.
+ * deregisters an SpiAccessibleEventListener from the registry, for all event types it may be listening to.
  *
  * Returns: #TRUE if successful, otherwise #FALSE.
  *
  **/
 boolean
-deregisterGlobalEventListenerAll (AccessibleEventListener *listener)
+deregisterGlobalEventListenerAll (SpiAccessibleEventListener *listener)
 {
   Accessibility_Registry_deregisterGlobalEventListenerAll (
                          registry,
@@ -106,7 +106,7 @@ getDesktopCount ()
  * Returns: a pointer to the 'i-th' virtual desktop's #Accessible representation.
  *
  **/
-Accessible*
+SpiAccessible*
 getDesktop (int n)
 {
   return Obj_Add (Accessibility_Registry_getDesktop (registry, (CORBA_short) n, &ev));
@@ -127,7 +127,7 @@ getDesktop (int n)
  *          placed in the list pointed to by parameter @list.
  **/
 int
-getDesktopList (Accessible **list)
+getDesktopList (SpiAccessible **list)
 {
   *list = NULL;
   return 0;
@@ -202,21 +202,21 @@ registerKeystrokeListener (KeystrokeListener *listener,
 	  Accessibility_Registry_getDeviceEventController (registry, &ev);
   Accessibility_KeySet *all_keys = Accessibility_KeySet__alloc();
   Accessibility_KeyEventTypeSeq *key_events = Accessibility_KeyEventTypeSeq__alloc();
-  Accessibility_KeystrokeListener listener_corba_ref;
+  Accessibility_KeystrokeListener spi_listener_corba_ref;
   Accessibility_DeviceEventController_ref (device_event_controller, &ev);
   controller_event_mask->value = (CORBA_unsigned_long) modmask;
   controller_event_mask->refcount = (CORBA_unsigned_short) 1;
 
-  listener_corba_ref = (Accessibility_KeystrokeListener)
+  spi_listener_corba_ref = (Accessibility_KeystrokeListener)
 	  CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), &ev);
   
 	  Accessibility_DeviceEventController_registerKeystrokeListener (
 	  device_event_controller,
-	  listener_corba_ref,
+	  spi_listener_corba_ref,
 	  all_keys,
 	  controller_event_mask,
 	  key_events,
-	  (CORBA_boolean) ((sync_type | KEYLISTENER_CANCONSUME)!=0),
+	  (CORBA_boolean) ((sync_type | KEYSPI_LISTENER_CANCONSUME)!=0),
 	  &ev);
 }
 
@@ -235,17 +235,17 @@ deregisterKeystrokeListener (KeystrokeListener *listener, KeyMaskType keymask)
 	  Accessibility_Registry_getDeviceEventController (registry, &ev);
   Accessibility_KeySet *all_keys = Accessibility_KeySet__alloc();
   Accessibility_KeyEventTypeSeq *key_events = Accessibility_KeyEventTypeSeq__alloc();
-  Accessibility_KeystrokeListener listener_corba_ref;
+  Accessibility_KeystrokeListener spi_listener_corba_ref;
   Accessibility_DeviceEventController_unref (device_event_controller, &ev);
   controller_event_mask->value = (CORBA_unsigned_long) keymask;
   controller_event_mask->refcount = (CORBA_unsigned_short) 1;
 
-  listener_corba_ref = (Accessibility_KeystrokeListener)
+  spi_listener_corba_ref = (Accessibility_KeystrokeListener)
 	  CORBA_Object_duplicate (bonobo_object_corba_objref (bonobo_object (listener)), &ev);
   
   Accessibility_DeviceEventController_deregisterKeystrokeListener (
 	  device_event_controller,
-	  listener_corba_ref,
+	  spi_listener_corba_ref,
 	  all_keys,
 	  controller_event_mask,
 	  key_events,
@@ -266,9 +266,17 @@ deregisterKeystrokeListener (KeystrokeListener *listener, KeyMaskType keymask)
  *
  **/
 void
-generateKeyEvent (long keyCode, long meta)
+generateKeyEvent (long keyval, KeySynthType type)
 {
-  ;
+/* TODO: check current modifier status and
+ *  send keycode to alter, if necessary
+ */
+  Accessibility_DeviceEventController device_event_controller = 
+	  Accessibility_Registry_getDeviceEventController (registry, &ev);
+  Accessibility_DeviceEventController_generateKeyEvent (device_event_controller,
+							keyval,
+							(unsigned long) type,
+							&ev);
 }
 
 /**