X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2Fregistry.c;h=6119cdf77fafdaae7570c2153db046b5dbe8bbe7;hb=d8761880c8bd6c1c2b48749f57bab780900c274b;hp=0c8218f089a2550604bf67a37b02ff41d8bebe2e;hpb=9f2631625c43bf3dffa4352dc69c89a9751f286b;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/registryd/registry.c b/registryd/registry.c
index 0c8218f..6119cdf 100644
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -81,7 +81,7 @@ spi_registry_set_debug (const char *debug_flag_string)
     _dbg = (int) g_ascii_strtod (debug_flag_string, NULL);
 }
 
-SpiListenerStruct *
+static SpiListenerStruct *
 spi_listener_struct_new (Accessibility_EventListener listener, CORBA_Environment *ev)
 {
   SpiListenerStruct *retval = g_malloc (sizeof (SpiListenerStruct));
@@ -90,7 +90,7 @@ spi_listener_struct_new (Accessibility_EventListener listener, CORBA_Environment
 }
 
 
-void
+static void
 spi_listener_struct_free (SpiListenerStruct *ls, CORBA_Environment *ev)
 {
   bonobo_object_release_unref (ls->listener, ev);
@@ -116,7 +116,11 @@ desktop_add_application (SpiDesktop *desktop,
   /* FIXME
   spi_init_any_object (&e.any_data, a);
   */
-  spi_init_any_nil (&e.any_data);
+  spi_init_any_nil (&e.any_data,
+		    e.source,
+		    Accessibility_ROLE_DESKTOP_FRAME,
+		    "");
+
   Accessibility_Registry_notifyEvent (BONOBO_OBJREF (registry),
 				      &e, &ev);
   bonobo_object_release_unref (a, &ev);
@@ -131,7 +135,7 @@ desktop_remove_application (SpiDesktop *desktop,
 {
   BonoboObject *registry = BONOBO_OBJECT (data);
   Accessibility_Event e;
-  Accessibility_Accessible a;
+  /* Accessibility_Accessible a; FIXME */
   CORBA_Environment ev;
   
   CORBA_exception_init (&ev);
@@ -140,13 +144,16 @@ desktop_remove_application (SpiDesktop *desktop,
   e.source = BONOBO_OBJREF (desktop);
   e.detail1 = index;
   e.detail2 = 0;
+  /* FIXME
   a = Accessibility_Accessible_getChildAtIndex (BONOBO_OBJREF (desktop), 
 						index, &ev);
-  /* FIXME
   spi_init_any_object (&e.any_data, a);
   */
-  spi_init_any_nil (&e.any_data);
-  Accessibility_Accessible_unref (a, &ev);
+  spi_init_any_nil (&e.any_data,
+		    e.source,
+		    Accessibility_ROLE_DESKTOP_FRAME,
+		    "");
+  /* Accessibility_Accessible_unref (a, &ev); */
   Accessibility_Registry_notifyEvent (BONOBO_OBJREF (registry),
 				      &e, &ev);
   Accessibility_Desktop_unref (e.source, &ev);
@@ -286,6 +293,10 @@ parse_event_type (EventTypeStruct *etype, const char *event_name)
     {
       etype->type_cat = ETYPE_OBJECT;
     }
+  else if (!g_ascii_strncasecmp (event_name, "document:", 9))
+    {
+      etype->type_cat = ETYPE_OBJECT;
+    }
   else if (!g_ascii_strncasecmp (event_name, "window:", 7))
     {
       etype->type_cat = ETYPE_WINDOW;
@@ -595,7 +606,7 @@ typedef struct {
   CORBA_Environment  *ev;
   Bonobo_Unknown      source;
   EventTypeStruct     etype;
-  Accessibility_Event e_out;
+  Accessibility_Event *e_out;
 } NotifyContext;
 
 static SpiReEntrantContinue
@@ -627,12 +638,12 @@ notify_listeners_cb (GList * const *list, gpointer user_data)
 	}
 #endif
       
-      ctx->e_out.source = ctx->source;
+      ctx->e_out->source = ctx->source;
       
       if ((*list) && (*list)->data == ls)
         {
           Accessibility_EventListener_notifyEvent (
-            (Accessibility_EventListener) ls->listener, &ctx->e_out, ctx->ev);
+            (Accessibility_EventListener) ls->listener, ctx->e_out, ctx->ev);
           if (ctx->ev->_major != CORBA_NO_EXCEPTION)
             {
               DBG (1, g_warning ("Accessibility app error: exception during "
@@ -672,11 +683,7 @@ registry_clone_notify_context (NotifyContext *ctx)
   new_ctx->etype.major = ctx->etype.major;
   new_ctx->etype.minor = ctx->etype.minor;
   new_ctx->etype.detail = ctx->etype.detail;
-  new_ctx->e_out.type = CORBA_string_dup (ctx->e_out.type);
-  new_ctx->e_out.source = ctx->e_out.source;
-  new_ctx->e_out.detail1 = ctx->e_out.detail1;
-  new_ctx->e_out.detail2 = ctx->e_out.detail2;
-  CORBA_any__copy (&(new_ctx->e_out.any_data), &(ctx->e_out.any_data));
+  new_ctx->e_out = ORBit_copy_value (ctx->e_out, TC_Accessibility_Event);
   return new_ctx;
 }
 
@@ -710,7 +717,7 @@ registry_flush_event_queue (SpiRegistry       *registry,
       bonobo_object_release_unref (q_ctx->source, NULL);
     }
     CORBA_free ((void *)q_ctx->etype.event_name);
-    CORBA_free ((void *)q_ctx->e_out.type);
+    CORBA_free (q_ctx->e_out);
     g_free (q_ctx);
   }
   registry->is_queueing = FALSE;
@@ -825,23 +832,20 @@ registry_defer_on_event (SpiRegistry *registry, NotifyContext *ctx)
 static gboolean
 registry_queue_event (SpiRegistry *registry, NotifyContext *ctx)
 {
-  NotifyContext *q_ctx = registry_clone_notify_context (ctx);
 #ifdef SPI_QUEUE_DEBUG
-    if (q_ctx->etype.type_cat != ETYPE_MOUSE)
-      fprintf (stderr, "push! %s %p\n", q_ctx->etype.event_name, q_ctx);
+    if (ctx->etype.type_cat != ETYPE_MOUSE)
+      fprintf (stderr, "push! %s %p\n", ctx->etype.event_name, ctx);
 #endif    
   if (registry->is_queueing)
     {
+      NotifyContext *q_ctx = registry_clone_notify_context (ctx);
+
       g_queue_push_head (registry->deferred_event_queue, q_ctx);
 
       return FALSE;
     }
   else
     {
-      bonobo_object_release_unref (q_ctx->source, NULL);
-      CORBA_free ((void *)q_ctx->etype.event_name);
-      CORBA_free ((void *)q_ctx->e_out.type);
-      g_free (q_ctx);
       return TRUE; 
     }
 }
@@ -906,7 +910,7 @@ impl_registry_notify_event (PortableServer_Servant     servant,
   parse_event_type (&ctx.etype, e->type);
 
   ctx.ev = ev;
-  ctx.e_out = *e;
+  ctx.e_out = (Accessibility_Event *)e;
   ctx.source = e->source;
 
 #ifdef SPI_QUEUE_DEBUG