From 838ffbd98cd6acfaad67fd6b3a08ac69b9f68f9d Mon Sep 17 00:00:00 2001 From: billh Date: Sat, 18 Aug 2001 22:20:42 +0000 Subject: [PATCH] Renamed "target" member of Event to "source". Improved simple-at test and accessibleeventlistener.c to send actual event structs. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@39 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 8 ++++++++ at-bridge/bridge.c | 2 +- atk-bridge/bridge.c | 2 +- cspi/spi-listener.h | 7 +------ idl/Accessibility_Event.idl | 2 +- idl/Event.idl | 2 +- libspi/accessibleeventlistener.c | 7 +++---- libspi/application.c | 2 +- libspi/eventlistener.c | 7 +++---- libspi/listener.c | 6 +++--- libspi/registry.c | 6 +++--- registryd/registry.c | 6 +++--- test/app.c | 2 +- test/simple-at.c | 12 ++++++++---- 14 files changed, 38 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0d5258..92c73fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,14 @@ * test/Makefile.am : * test/simple-at.c : Added new test that uses the C bindings API. + * idl/Event.idl : + * libspi/listener.c : + * libspi/registry.c : + * libspi/accessibleeventlistener.c : + * at-bridge/bridge.c : + Renamed member "target" of Accessibility_Event to "source", + which is more descriptive. + 2001-08-18 Bill Haneman diff --git a/at-bridge/bridge.c b/at-bridge/bridge.c index 9da60d4..7b3c876 100644 --- a/at-bridge/bridge.c +++ b/at-bridge/bridge.c @@ -107,7 +107,7 @@ static void bridge_focus_tracker (AtkObject *object) { Accessibility_Event *e = g_new0(Accessibility_Event, 1); e->type = CORBA_string_dup ("focus:"); - e->target = bonobo_object_corba_objref (bonobo_object (accessible_new (object))); + e->source = bonobo_object_corba_objref (bonobo_object (accessible_new (object))); e->detail1 = 0; e->detail2 = 0; Accessibility_Registry_notifyEvent (registry, e, &ev); diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index 9da60d4..7b3c876 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -107,7 +107,7 @@ static void bridge_focus_tracker (AtkObject *object) { Accessibility_Event *e = g_new0(Accessibility_Event, 1); e->type = CORBA_string_dup ("focus:"); - e->target = bonobo_object_corba_objref (bonobo_object (accessible_new (object))); + e->source = bonobo_object_corba_objref (bonobo_object (accessible_new (object))); e->detail1 = 0; e->detail2 = 0; Accessibility_Registry_notifyEvent (registry, e, &ev); diff --git a/cspi/spi-listener.h b/cspi/spi-listener.h index ac6c4b8..c03851f 100644 --- a/cspi/spi-listener.h +++ b/cspi/spi-listener.h @@ -14,12 +14,7 @@ extern "C" { * */ -typedef struct _AccessibleEvent { - Accessible *source; - char *type; - char *detail1; - char *detail2; -} AccessibleEvent; +typedef Accessibility_Event AccessibleEvent; /* * diff --git a/idl/Accessibility_Event.idl b/idl/Accessibility_Event.idl index 92b6250..3e9d01a 100644 --- a/idl/Accessibility_Event.idl +++ b/idl/Accessibility_Event.idl @@ -31,7 +31,7 @@ module Accessibility struct Event { string type; - Accessible target; + Accessible source; long detail1; long detail2; }; diff --git a/idl/Event.idl b/idl/Event.idl index 92b6250..3e9d01a 100644 --- a/idl/Event.idl +++ b/idl/Event.idl @@ -31,7 +31,7 @@ module Accessibility struct Event { string type; - Accessible target; + Accessible source; long detail1; long detail2; }; diff --git a/libspi/accessibleeventlistener.c b/libspi/accessibleeventlistener.c index 41a4050..c724614 100644 --- a/libspi/accessibleeventlistener.c +++ b/libspi/accessibleeventlistener.c @@ -70,7 +70,6 @@ impl_accessible_event_notify_event (PortableServer_Servant servant, const Accessibility_Event *e, CORBA_Environment *ev) { - int n; int len; VoidEventListenerCB cb; @@ -83,10 +82,10 @@ impl_accessible_event_notify_event (PortableServer_Servant servant, cb = (VoidEventListenerCB) g_list_nth_data (listener->callbacks, n); if (cb) { - (*cb) (NULL); + (*cb) (e); } } - bonobo_object_release_unref (e->target, ev); + bonobo_object_release_unref (e->source, ev); } static void @@ -147,7 +146,7 @@ AccessibleEventListener * accessible_event_listener_new () { AccessibleEventListener *retval = - LISTENER (g_object_new (accessible_event_listener_get_type (), NULL)); + ACCESSIBLE_EVENT_LISTENER (g_object_new (accessible_event_listener_get_type (), NULL)); return retval; } diff --git a/libspi/application.c b/libspi/application.c index c305ae4..6bba3a4 100644 --- a/libspi/application.c +++ b/libspi/application.c @@ -134,7 +134,7 @@ application_toolkit_listener (GSignalInvocationHint *signal_hint, { aobject = atk_implementor_ref_accessible (ATK_IMPLEMENTOR (gobject)); e->type = CORBA_string_dup (sbuf); - e->target = bonobo_object_corba_objref (bonobo_object (accessible_new (aobject))); + e->source = bonobo_object_corba_objref (bonobo_object (accessible_new (aobject))); e->detail1 = 0; e->detail2 = 0; Accessibility_EventListener_notifyEvent (the_toolkit_listener, e, &ev); diff --git a/libspi/eventlistener.c b/libspi/eventlistener.c index 41a4050..c724614 100644 --- a/libspi/eventlistener.c +++ b/libspi/eventlistener.c @@ -70,7 +70,6 @@ impl_accessible_event_notify_event (PortableServer_Servant servant, const Accessibility_Event *e, CORBA_Environment *ev) { - int n; int len; VoidEventListenerCB cb; @@ -83,10 +82,10 @@ impl_accessible_event_notify_event (PortableServer_Servant servant, cb = (VoidEventListenerCB) g_list_nth_data (listener->callbacks, n); if (cb) { - (*cb) (NULL); + (*cb) (e); } } - bonobo_object_release_unref (e->target, ev); + bonobo_object_release_unref (e->source, ev); } static void @@ -147,7 +146,7 @@ AccessibleEventListener * accessible_event_listener_new () { AccessibleEventListener *retval = - LISTENER (g_object_new (accessible_event_listener_get_type (), NULL)); + ACCESSIBLE_EVENT_LISTENER (g_object_new (accessible_event_listener_get_type (), NULL)); return retval; } diff --git a/libspi/listener.c b/libspi/listener.c index d6d6efc..fb0778a 100644 --- a/libspi/listener.c +++ b/libspi/listener.c @@ -74,7 +74,7 @@ impl_notify_event (PortableServer_Servant servant, #ifdef SPI_DEBUG fprintf (stderr, "notify %s...\n", e->type); fprintf (stderr, "source name: '%s'\n", - Accessibility_Accessible__get_name(e->target, ev)); + Accessibility_Accessible__get_name(e->source, ev)); if (ev->_major != CORBA_NO_EXCEPTION) { fprintf(stderr, ("Accessibility app error: exception during event notification: %s\n"), @@ -82,13 +82,13 @@ impl_notify_event (PortableServer_Servant servant, exit(-1); } fprintf (stderr, "source is component ? : %s\n", - Accessibility_Accessible_queryInterface (e->target, + Accessibility_Accessible_queryInterface (e->source, "IDL:Accessibility/Component:1.0", ev) ? "yes" : "no"); #endif - bonobo_object_release_unref (e->target, ev); + bonobo_object_release_unref (e->source, ev); } diff --git a/libspi/registry.c b/libspi/registry.c index a257a39..269365a 100644 --- a/libspi/registry.c +++ b/libspi/registry.c @@ -461,7 +461,7 @@ impl_registry_notify_event (PortableServer_Servant servant, default: break; } - bonobo_object_release_unref (e->target, ev); + bonobo_object_release_unref (e->source, ev); } static void @@ -489,9 +489,9 @@ registry_notify_listeners ( GList *listeners, { #ifdef SPI_DEBUG fprintf(stderr, "notifying listener #%d\n", n); - fprintf(stderr, "event name %s\n", Accessibility_Accessible__get_name(e->target, ev)); + fprintf(stderr, "event name %s\n", Accessibility_Accessible__get_name(e->source, ev)); #endif - bonobo_object_dup_ref ( e->target, ev); + bonobo_object_dup_ref ( e->source, ev); Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener, e, ev); diff --git a/registryd/registry.c b/registryd/registry.c index a257a39..269365a 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -461,7 +461,7 @@ impl_registry_notify_event (PortableServer_Servant servant, default: break; } - bonobo_object_release_unref (e->target, ev); + bonobo_object_release_unref (e->source, ev); } static void @@ -489,9 +489,9 @@ registry_notify_listeners ( GList *listeners, { #ifdef SPI_DEBUG fprintf(stderr, "notifying listener #%d\n", n); - fprintf(stderr, "event name %s\n", Accessibility_Accessible__get_name(e->target, ev)); + fprintf(stderr, "event name %s\n", Accessibility_Accessible__get_name(e->source, ev)); #endif - bonobo_object_dup_ref ( e->target, ev); + bonobo_object_dup_ref ( e->source, ev); Accessibility_EventListener_notifyEvent ((Accessibility_EventListener) ls->listener, e, ev); diff --git a/test/app.c b/test/app.c index e79f5b9..c4d29f4 100644 --- a/test/app.c +++ b/test/app.c @@ -64,7 +64,7 @@ main(int argc, char **argv) accessible = accessible_new (atko); fprintf(stderr, "accessible created.\n"); - e.target = bonobo_object_corba_objref ( bonobo_object (accessible)); + e.source = bonobo_object_corba_objref ( bonobo_object (accessible)); e.type = CORBA_string_dup ("focus:"); obj_id = "OAFIID:Accessibility_Registry:proto0.1"; diff --git a/test/simple-at.c b/test/simple-at.c index a0438f2..d1c6df0 100644 --- a/test/simple-at.c +++ b/test/simple-at.c @@ -63,13 +63,17 @@ main(int argc, char **argv) } void -report_focus_event (void *fp) +report_focus_event (void *p) { - fprintf (stderr, "focus\n"); + AccessibleEvent *ev = (AccessibleEvent *) p; + fprintf (stderr, "%s event from %s\n", ev->type, + Accessible_getName (&ev->source)); } void -report_button_press (void *fp) +report_button_press (void *p) { - fprintf (stderr, "button press\n"); + AccessibleEvent *ev = (AccessibleEvent *) p; + fprintf (stderr, "%s event from %s\n", ev->type, + Accessible_getName (&ev->source)); } -- 2.7.4