X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=registryd%2Fdeviceeventcontroller.c;h=9897f38f4881f4b8fbcfefa8b8f8c51140da1a4b;hb=4328426aeae1eeed7c2e696536351b224eeddbce;hp=609839529e9b465b351bde45d0701e90f3038414;hpb=408978dd34f3338e49b6ace5f60b7606579ce7a9;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 6098395..9897f38 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -20,36 +20,25 @@ * Boston, MA 02111-1307, USA. */ -/* - * listener.c: test for accessibility implementation - * - */ +/* deviceeventcontroler.c: implement the DeviceEventController interface */ + +#include #ifdef SPI_DEBUG -#include +# include #endif #include #include -#include #include /* TODO: hide dependency (wrap in single porting file) */ #include -#include -#include -/* - * This pulls the definition for the BonoboObject (GType) - */ -#include "deviceeventcontroller.h" +#include -/* - * Our parent Gtk object type - */ -#define PARENT_TYPE BONOBO_OBJECT_TYPE +/* Our parent Gtk object type */ +#define PARENT_TYPE BONOBO_TYPE_OBJECT -/* - * A pointer to our parent object class - */ +/* A pointer to our parent object class */ static GObjectClass *spi_device_event_controller_parent_class; static gboolean kbd_registered = FALSE; @@ -59,19 +48,34 @@ static Display *display; static Window root_window; typedef enum { - DEVICE_TYPE_KBD, - DEVICE_TYPE_MOUSE, - DEVICE_TYPE_LAST_DEFINED -} DeviceTypeCategory; + SPI_DEVICE_TYPE_KBD, + SPI_DEVICE_TYPE_MOUSE, + SPI_DEVICE_TYPE_LAST_DEFINED +} SpiDeviceTypeCategory; + +struct _DEControllerListener { + CORBA_Object object; + SpiDeviceTypeCategory type; +}; + +typedef struct _DEControllerListener DEControllerListener; + +struct _DEControllerKeyListener { + DEControllerListener listener; + Accessibility_KeySet *keys; + Accessibility_ControllerEventMask *mask; + Accessibility_KeyEventTypeSeq *typeseq; + gboolean is_system_global; +}; + +typedef struct _DEControllerKeyListener DEControllerKeyListener; static gboolean _controller_register_with_devices (SpiDeviceEventController *controller); static gboolean _controller_grab_keyboard (SpiDeviceEventController *controller); -static void _controller_register_device_listener (SpiDeviceEventController *controller, - const CORBA_Object l, - const Accessibility_ControllerEventMask *mask, - DeviceTypeCategory type, - CORBA_Environment *ev); +static void controller_register_device_listener (SpiDeviceEventController *controller, + DEControllerListener *l, + CORBA_Environment *ev); /* * Private methods @@ -93,6 +97,14 @@ _compare_corba_objects (gconstpointer p1, gconstpointer p2) } static gint +_compare_listeners (gconstpointer p1, gconstpointer p2) +{ + DEControllerListener *l1 = (DEControllerListener *) p1; + DEControllerListener *l2 = (DEControllerListener *) p2; + return _compare_corba_objects (l1->object, l2->object); +} + +static gint _eventmask_compare_value (gconstpointer p1, gconstpointer p2) { long d; @@ -104,43 +116,65 @@ _eventmask_compare_value (gconstpointer p1, gconstpointer p2) return (gint) d; } +static DEControllerKeyListener * +dec_key_listener_new (CORBA_Object l, + const Accessibility_KeySet *keys, + const Accessibility_ControllerEventMask *mask, + const Accessibility_KeyEventTypeSeq *typeseq, + const CORBA_boolean is_system_global, + CORBA_Environment *ev) +{ + DEControllerKeyListener *key_listener = g_new0 (DEControllerKeyListener, 1); + key_listener->listener.object = CORBA_Object_duplicate (l, ev); + key_listener->listener.type = SPI_DEVICE_TYPE_KBD; + key_listener->keys = ORBit_copy_value (keys, TC_Accessibility_KeySet); + key_listener->mask = ORBit_copy_value (mask, TC_Accessibility_ControllerEventMask); + key_listener->is_system_global = is_system_global; + + g_print ("new listener, with mask %x, is_global %d, keys %p\n", + (unsigned int) key_listener->mask->value, + (int) key_listener->is_system_global, + (void *) key_listener->keys); + + return key_listener; +} + static void -_controller_register_device_listener (SpiDeviceEventController *controller, - const CORBA_Object l, - const Accessibility_ControllerEventMask *mask, - DeviceTypeCategory type, - CORBA_Environment *ev) +controller_register_device_listener (SpiDeviceEventController *controller, + DEControllerListener *listener, + CORBA_Environment *ev) { Accessibility_ControllerEventMask *mask_ptr = NULL; + DEControllerKeyListener *key_listener; - switch (type) { - case DEVICE_TYPE_KBD: - controller->key_listeners = g_list_append (controller->key_listeners, - CORBA_Object_duplicate (l, ev)); + switch (listener->type) { + case SPI_DEVICE_TYPE_KBD: + key_listener = (DEControllerKeyListener *) listener; + controller->key_listeners = g_list_append (controller->key_listeners, key_listener); mask_ptr = (Accessibility_ControllerEventMask *) - g_list_find_custom (controller->keymask_list, (gpointer) mask, + g_list_find_custom (controller->keymask_list, (gpointer) key_listener->mask, _eventmask_compare_value); if (mask_ptr) ++(mask_ptr->refcount); else { - if (mask->refcount != (CORBA_unsigned_short) 1) + if (key_listener->mask->refcount != (CORBA_unsigned_short) 1) fprintf (stderr, "mask initial refcount is not 1!\n"); - if (mask->value > (CORBA_unsigned_long) 2048) + if (key_listener->mask->value > (CORBA_unsigned_long) 2048) fprintf (stderr, "mask value looks invalid (%lu)\n", - (unsigned long) mask->value); + (unsigned long) key_listener->mask->value); else fprintf (stderr, "appending mask with val=%lu\n", - (unsigned long) mask->value); + (unsigned long) key_listener->mask->value); mask_ptr = Accessibility_ControllerEventMask__alloc(); - mask_ptr->value = mask->value; + mask_ptr->value = key_listener->mask->value; mask_ptr->refcount = (CORBA_unsigned_short) 1; controller->keymask_list = g_list_append (controller->keymask_list, (gpointer) mask_ptr); } break; - case DEVICE_TYPE_MOUSE: + case SPI_DEVICE_TYPE_MOUSE: /* controller->mouse_listeners = g_list_append (controller->mouse_listeners, CORBA_Object_duplicate (l, ev));*/ @@ -150,21 +184,22 @@ _controller_register_device_listener (SpiDeviceEventController *controller, } static void -_controller_deregister_device_listener (SpiDeviceEventController *controller, - const CORBA_Object l, - const Accessibility_ControllerEventMask *mask, - DeviceTypeCategory type, - CORBA_Environment *ev) +controller_deregister_device_listener (SpiDeviceEventController *controller, + DEControllerListener *listener, + CORBA_Environment *ev) { Accessibility_ControllerEventMask *mask_ptr; + DEControllerKeyListener *key_listener; GList *list_ptr; - switch (type) { - case DEVICE_TYPE_KBD: - list_ptr = g_list_find_custom (controller->key_listeners, l, _compare_corba_objects); + switch (listener->type) { + case SPI_DEVICE_TYPE_KBD: + key_listener = (DEControllerKeyListener *) listener; + list_ptr = g_list_find_custom (controller->key_listeners, listener, _compare_listeners); + /* TODO: need a different custom compare func */ if (list_ptr) controller->key_listeners = g_list_remove (controller->key_listeners, list_ptr); list_ptr = (GList *) - g_list_find_custom (controller->keymask_list, (gpointer) mask, + g_list_find_custom (controller->keymask_list, (gpointer) key_listener->mask, _eventmask_compare_value); if (list_ptr) { @@ -179,7 +214,7 @@ _controller_deregister_device_listener (SpiDeviceEventController *controller, } } break; - case DEVICE_TYPE_MOUSE: + case SPI_DEVICE_TYPE_MOUSE: /* controller->mouse_listeners = g_list_append (controller->mouse_listeners, CORBA_Object_duplicate (l, ev));*/ @@ -197,11 +232,11 @@ _controller_register_with_devices (SpiDeviceEventController *controller) /* register with: keyboard hardware code handler */ /* register with: (translated) keystroke handler */ #ifdef SPI_DEBUG - fprintf (stderr, "About to request events on window %ld of display %x\n", + fprintf (stderr, "About to request events on window %ld of display %p\n", (unsigned long) GDK_ROOT_WINDOW(), GDK_DISPLAY()); #endif /* We must open a new connection to the server to avoid clashing with the GDK event loop */ - display = XOpenDisplay (getenv ("DISPLAY")); + display = XOpenDisplay (g_getenv ("DISPLAY")); root_window = DefaultRootWindow (display); XSelectInput (display, root_window, @@ -211,18 +246,60 @@ _controller_register_with_devices (SpiDeviceEventController *controller) return retval; } + +static gboolean +key_event_matches_listener (Accessibility_KeyStroke *key_event, + DEControllerKeyListener *listener, + CORBA_boolean is_system_global) +{ + g_print ("mask=%x, listener mask= %x\n", (unsigned int) key_event->modifiers, + (unsigned int) (listener->mask->value & 0xFFFF)); + if ((key_event->modifiers == (CORBA_unsigned_short) (listener->mask->value && 0xFFFF)) && + ((listener->keys == NULL) || (1)) && /* in keyset seq */ + (1) && /* in event type seq */ + (is_system_global == listener->is_system_global)) + { + return TRUE; + } + else + return FALSE; +} + +static gboolean +notify_keylisteners (GList *key_listeners, + Accessibility_KeyStroke *key_event, + CORBA_boolean is_system_global, + CORBA_Environment *ev) +{ + int i, n_listeners = g_list_length (key_listeners); + gboolean is_consumed = FALSE; + + for (i=0; ilistener.object; + if (key_event_matches_listener (key_event, key_listener, is_system_global)) + { + if (!CORBA_Object_is_nil(ls, ev)) + { + is_consumed = Accessibility_KeystrokeListener_keyEvent (ls, key_event, ev); + } + } + else g_print ("no match for listener %d\n", i); + } + return is_consumed; +} + static gboolean _check_key_event (SpiDeviceEventController *controller) { static gboolean initialized = FALSE; - static gboolean is_active = FALSE; XEvent *x_event = g_new0 (XEvent, 1); XKeyEvent *x_key_event; KeySym keysym; gboolean is_consumed = FALSE; - char key_name[16]; - int i; - int n_listeners = g_list_length (controller->key_listeners); Accessibility_KeyStroke key_event; static CORBA_Environment ev; @@ -252,10 +329,10 @@ _check_key_event (SpiDeviceEventController *controller) (int) x_key_event->state); #endif #ifdef SPI_DEBUG - fprintf(stderr, "%s%c", - (x_key_event->state & Mod1Mask)?"Alt-":"", - ((x_key_event->state & ShiftMask)^(x_key_event->state & LockMask))? - (char) toupper((int) keysym) : (char) tolower((int)keysym)); + fprintf (stderr, "%s%c", + (x_key_event->state & Mod1Mask)?"Alt-":"", + ((x_key_event->state & ShiftMask)^(x_key_event->state & LockMask))? + g_ascii_toupper (keysym) : g_ascii_tolower (keysym)); #endif /* SPI_DEBUG */ } else @@ -265,19 +342,11 @@ _check_key_event (SpiDeviceEventController *controller) #endif } /* relay to listeners, and decide whether to consume it or not */ - for (i=0; ikey_listeners, i); - if (!CORBA_Object_is_nil(ls, &ev)) - { - is_consumed = Accessibility_KeystrokeListener_keyEvent (ls, &key_event, &ev); - } - } + is_consumed = notify_keylisteners (controller->key_listeners, &key_event, CORBA_TRUE, &ev); + if (is_consumed) { - XAllowEvents (display, SyncKeyboard, CurrentTime); + XAllowEvents (display, AsyncKeyboard, CurrentTime); } else { @@ -323,7 +392,7 @@ _controller_grab_keyboard (SpiDeviceEventController *controller) root_window, True, GrabModeAsync, - GrabModeSync); + GrabModeAsync); /* TODO: check call for errors and return FALSE if error occurs */ } else { return FALSE; /* can't do control key yet */ @@ -346,7 +415,7 @@ spi_device_event_controller_object_finalize (GObject *object) } /* - * CORBA Accessibility::SpiDeviceEventController::registerKeystrokeListener + * CORBA Accessibility::DeviceEventController::registerKeystrokeListener * method implementation */ static void @@ -355,23 +424,22 @@ impl_register_keystroke_listener (PortableServer_Servant servant, const Accessibility_KeySet *keys, const Accessibility_ControllerEventMask *mask, const Accessibility_KeyEventTypeSeq *type, - const CORBA_boolean is_synchronous, + const CORBA_boolean is_system_global, CORBA_Environment *ev) { SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER ( bonobo_object_from_servant (servant)); + DEControllerKeyListener *dec_listener; #ifdef SPI_DEBUG fprintf (stderr, "registering keystroke listener %p with maskVal %lu\n", (void *) l, (unsigned long) mask->value); #endif - /* TODO: change this to an enum, indicating if event can be consumed */ - if (is_synchronous) - _controller_register_device_listener(controller, l, mask, DEVICE_TYPE_KBD, ev); - else - ; /* register with toolkit instead */ + dec_listener = dec_key_listener_new (l, keys, mask, type, is_system_global, ev); + controller_register_device_listener (controller, (DEControllerListener *) dec_listener, ev); } + /* - * CORBA Accessibility::SpiDeviceEventController::deregisterKeystrokeListener + * CORBA Accessibility::DeviceEventController::deregisterKeystrokeListener * method implementation */ static void @@ -380,20 +448,28 @@ impl_deregister_keystroke_listener (PortableServer_Servant servant, const Accessibility_KeySet *keys, const Accessibility_ControllerEventMask *mask, const Accessibility_KeyEventTypeSeq *type, - const CORBA_boolean is_synchronous, + const CORBA_boolean is_system_global, CORBA_Environment *ev) { SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER ( bonobo_object_from_servant (servant)); + DEControllerKeyListener *key_listener = dec_key_listener_new (l, + keys, + mask, + type, + is_system_global, + ev); #ifdef SPI_DEBUG fprintf (stderr, "deregistering keystroke listener %p with maskVal %lu\n", (void *) l, (unsigned long) mask->value); #endif - _controller_deregister_device_listener(controller, l, mask, DEVICE_TYPE_KBD, ev); + controller_deregister_device_listener(controller, + (DEControllerListener *) key_listener, + ev); } /* - * CORBA Accessibility::SpiDeviceEventController::registerMouseListener + * CORBA Accessibility::DeviceEventController::registerMouseListener * method implementation */ /* @@ -407,7 +483,7 @@ impl_register_mouse_listener (PortableServer_Servant servant, #ifdef SPI_DEBUG fprintf (stderr, "registering mouse listener %p\n", l); #endif - _controller_register_device_listener(controller, l, mask, DEVICE_TYPE_MOUSE, ev); + controller_register_device_listener(controller, DEVICE_TYPE_MOUSE, l, keys, mask, ev); } */ @@ -418,13 +494,13 @@ keycode_for_keysym (long keysym) } /* - * CORBA Accessibility::SpiDeviceEventController::registerKeystrokeListener + * CORBA Accessibility::DeviceEventController::registerKeystrokeListener * method implementation */ static void impl_generate_key_event (PortableServer_Servant servant, const CORBA_long keycode, - const CORBA_long synth_type, + const Accessibility_KeySynthType synth_type, CORBA_Environment *ev) { long key_synth_code; @@ -458,28 +534,57 @@ impl_generate_key_event (PortableServer_Servant servant, } } -/* - * CORBA Accessibility::SpiDeviceEventController::generateMouseEvent - * method implementation - */ +/* Accessibility::DeviceEventController::generateMouseEvent */ static void -impl_generate_mouse_event (PortableServer_Servant servant, - const CORBA_long x, - const CORBA_long y, - const CORBA_char * eventName, +impl_generate_mouse_event (PortableServer_Servant servant, + const CORBA_long x, + const CORBA_long y, + const CORBA_char *eventName, + CORBA_Environment *ev) +{ +#ifdef SPI_DEBUG + fprintf (stderr, "generating mouse %s event at %ld, %ld\n", eventName, x, y); +#endif +} + +/* Accessibility::DeviceEventController::notifyListenersSync */ +static CORBA_boolean +impl_notify_listeners_sync(PortableServer_Servant servant, + const Accessibility_DeviceEvent *event, CORBA_Environment *ev) { + SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER ( + bonobo_object_from_servant (servant)); + Accessibility_KeyStroke *key_event = (Accessibility_KeyStroke *) event; +#ifdef SPI_DEBUG + g_print ("notifying listeners synchronously: controller %x, event id %d\n", + (void *) controller, (int) event->eventID); +#endif + return (notify_keylisteners (controller->key_listeners, key_event, CORBA_FALSE, ev) ? + CORBA_TRUE : CORBA_FALSE); +} + +/* Accessibility::DeviceEventController::notifyListenersAsync */ +static void +impl_notify_listeners_async (PortableServer_Servant servant, + const Accessibility_DeviceEvent *event, + CORBA_Environment *ev) +{ + SpiDeviceEventController *controller = SPI_DEVICE_EVENT_CONTROLLER( + bonobo_object_from_servant (servant)); + Accessibility_KeyStroke *key_event = (Accessibility_KeyStroke *) event; #ifdef SPI_DEBUG - fprintf (stderr, "generating mouse %s event at %ld, %ld\n", eventName, x, y); + fprintf (stderr, "notifying listeners asynchronously\n"); #endif + notify_keylisteners (controller->key_listeners, key_event, CORBA_FALSE, ev); } static void spi_device_event_controller_class_init (SpiDeviceEventControllerClass *klass) { GObjectClass * object_class = (GObjectClass *) klass; - POA_Accessibility_SpiDeviceEventController__epv *epv = &klass->epv; - spi_device_event_controller_parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE); + POA_Accessibility_DeviceEventController__epv *epv = &klass->epv; + spi_device_event_controller_parent_class = g_type_class_peek_parent (klass); object_class->finalize = spi_device_event_controller_object_finalize; @@ -488,6 +593,8 @@ spi_device_event_controller_class_init (SpiDeviceEventControllerClass *klass) /* epv->registerMouseListener = impl_register_mouse_listener; */ epv->generateKeyEvent = impl_generate_key_event; epv->generateMouseEvent = impl_generate_mouse_event; + epv->notifyListenersSync = impl_notify_listeners_sync; + epv->notifyListenersAsync = impl_notify_listeners_async; klass->check_key_event = _check_key_event; } @@ -500,46 +607,28 @@ spi_device_event_controller_init (SpiDeviceEventController *device_event_control kbd_registered = _controller_register_with_devices (device_event_controller); } -gboolean spi_device_event_controller_check_key_event (SpiDeviceEventController *controller) +gboolean +spi_device_event_controller_check_key_event (SpiDeviceEventController *controller) { SpiDeviceEventControllerClass *klass = SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS (controller); if (klass->check_key_event) return (klass->check_key_event) (controller); + return FALSE; } -GType -spi_device_event_controller_get_type (void) +SpiDeviceEventController * +spi_device_event_controller_new (void *registryp) { - static GType type = 0; - - if (!type) { - static const GTypeInfo tinfo = { - sizeof (SpiDeviceEventControllerClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) spi_device_event_controller_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class data */ - sizeof (SpiDeviceEventController), - 0, /* n preallocs */ - (GInstanceInitFunc) spi_device_event_controller_init, - NULL /* value table */ - }; - /* - * Here we use bonobo_type_unique instead of - * gtk_type_unique, this auto-generates a load of - * CORBA structures for us. All derived types must - * use bonobo_type_unique. - */ - type = bonobo_type_unique ( - PARENT_TYPE, - POA_Accessibility_SpiDeviceEventController__init, - NULL, - G_STRUCT_OFFSET (SpiDeviceEventControllerClass, epv), - &tinfo, - "SpiDeviceEventController"); - } - - return type; + BonoboObject *registry = (BonoboObject *) registryp; + SpiDeviceEventController *retval = g_object_new ( + SPI_DEVICE_EVENT_CONTROLLER_TYPE, NULL); + retval->registry = registry; + bonobo_object_ref (registry); + return retval; } +BONOBO_TYPE_FUNC_FULL (SpiDeviceEventController, + Accessibility_DeviceEventController, + PARENT_TYPE, + spi_device_event_controller); +