CORBA_Environment *ev)
{
DEControllerKeyListener *key_listener = g_new0 (DEControllerKeyListener, 1);
- key_listener->listener.object = CORBA_Object_duplicate (l, ev);
+ key_listener->listener.object = bonobo_object_dup_ref (l, ev);
key_listener->listener.type = SPI_DEVICE_TYPE_KBD;
- key_listener->keys = keys;
- key_listener->mask = mask;
+ key_listener->keys = ORBit_copy_value (keys, TC_Accessibility_KeySet);
+ key_listener->mask = ORBit_copy_value (mask, TC_Accessibility_ControllerEventMask);
+ key_listener->typeseq = ORBit_copy_value (typeseq, TC_Accessibility_KeyEventTypeSeq);
key_listener->is_system_global = is_system_global;
+#ifdef SPI_DEBUG
+ 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);
+#endif
return key_listener;
}
static void
+dec_key_listener_free (DEControllerKeyListener *key_listener, CORBA_Environment *ev)
+{
+ bonobo_object_release_unref (key_listener->listener.object, ev);
+ CORBA_free (key_listener->typeseq);
+ CORBA_free (key_listener->mask);
+ CORBA_free (key_listener->keys);
+ g_free (key_listener);
+}
+
+static void
controller_register_device_listener (SpiDeviceEventController *controller,
DEControllerListener *listener,
CORBA_Environment *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 *)
+ controller->key_listeners = g_list_prepend (controller->key_listeners, key_listener);
+ if (key_listener->is_system_global)
+ {
+ mask_ptr = (Accessibility_ControllerEventMask *)
g_list_find_custom (controller->keymask_list, (gpointer) key_listener->mask,
_eventmask_compare_value);
- if (mask_ptr)
+ if (mask_ptr)
++(mask_ptr->refcount);
- else
- {
+ else
+ {
if (key_listener->mask->refcount != (CORBA_unsigned_short) 1)
fprintf (stderr, "mask initial refcount is not 1!\n");
if (key_listener->mask->value > (CORBA_unsigned_long) 2048)
mask_ptr->refcount = (CORBA_unsigned_short) 1;
controller->keymask_list = g_list_append (controller->keymask_list,
(gpointer) mask_ptr);
- }
+ }
+ }
break;
case SPI_DEVICE_TYPE_MOUSE:
/* controller->mouse_listeners = g_list_append (controller->mouse_listeners,
{
Accessibility_ControllerEventMask *mask_ptr;
DEControllerKeyListener *key_listener;
+ DEControllerListener *dec_listener;
GList *list_ptr;
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);
+ /* first, deref matching event mask, if any */
list_ptr = (GList *)
g_list_find_custom (controller->keymask_list, (gpointer) key_listener->mask,
_eventmask_compare_value);
if (!mask_ptr->refcount)
{
controller->keymask_list =
- g_list_remove (controller->keymask_list, mask_ptr);
+ g_list_remove_link (controller->keymask_list, list_ptr);
; /* TODO: release any key grabs that are in place for this key mask */
}
}
+ /* now, remove this listener from the keylistener list */
+ list_ptr = g_list_find_custom (controller->key_listeners, listener, _compare_listeners);
+ if (list_ptr)
+ {
+ dec_listener = (DEControllerListener *) list_ptr->data;
+#ifdef SPI_DEBUG
+ g_print ("removing keylistener %p\n", dec_listener->object);
+#endif
+ controller->key_listeners = g_list_remove_link (controller->key_listeners,
+ list_ptr);
+ dec_key_listener_free ((DEControllerKeyListener *) dec_listener, ev);
+ }
break;
case SPI_DEVICE_TYPE_MOUSE:
/* controller->mouse_listeners = g_list_append (controller->mouse_listeners,
return retval;
}
+static gboolean
+key_set_contains_key (Accessibility_KeySet *key_set, Accessibility_KeyStroke *key_event)
+{
+ gint i;
+ gint len;
+
+ /* g_assert (key_set); */
+ if (!key_set) { g_print ("null key set!"); return TRUE; }
+
+ len = key_set->_length;
+
+ if (len == 0) /* special case, means "all keys/any key" */
+ {
+ return TRUE;
+ }
+
+ for (i=0; i<len; ++i)
+ {
+#ifdef SPI_KEYEVENT_DEBUG
+ g_print ("key_set[%d] = %d; key_event %d, code %d\n",
+ i,
+ (int) key_set->_buffer[i],
+ (int) key_event->keyID,
+ (int) key_event->keycode);
+#endif
+ if (key_set->_buffer[i] == (CORBA_long) key_event->keyID) return TRUE;
+ if (key_set->_buffer[i] == (CORBA_long) -key_event->keycode) return TRUE;
+ }
+
+ return FALSE;
+}
static gboolean
-notify_keylisteners (GList *key_listeners, Accessibility_KeyStroke *key_event, CORBA_Environment *ev)
+key_eventtype_seq_contains_event (Accessibility_KeyEventTypeSeq *type_seq,
+ Accessibility_KeyStroke *key_event)
+{
+ gint i;
+ gint len;
+
+ /* g_assert (type_seq); */
+ if (!type_seq) { g_print ("null type seq!"); return TRUE; }
+
+ len = type_seq->_length;
+
+ if (len == 0) /* special case, means "all events/any event" */
+ {
+ return TRUE;
+ }
+
+ for (i=0; i<len; ++i)
+ {
+/* g_print ("type_seq[%d] = %d\n", i, (int) type_seq->_buffer[i]); */
+ if (type_seq->_buffer[i] == (CORBA_long) key_event->type) return TRUE;
+ }
+
+ return TRUE;
+}
+
+static gboolean
+key_event_matches_listener (Accessibility_KeyStroke *key_event,
+ DEControllerKeyListener *listener,
+ CORBA_boolean is_system_global)
+{
+ if ((key_event->modifiers == (CORBA_unsigned_short) (listener->mask->value & 0xFFFF)) &&
+ key_set_contains_key (listener->keys, key_event) &&
+ key_eventtype_seq_contains_event (listener->typeseq, key_event) &&
+ (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; i<n_listeners && !is_consumed; ++i)
{
Accessibility_KeystrokeListener ls;
- ls = (Accessibility_KeystrokeListener)
+ DEControllerKeyListener *key_listener = (DEControllerKeyListener *)
g_list_nth_data (key_listeners, i);
- if (!CORBA_Object_is_nil(ls, ev))
+ ls = (Accessibility_KeystrokeListener) key_listener->listener.object;
+ if (key_event_matches_listener (key_event, key_listener, is_system_global))
{
- is_consumed = Accessibility_KeystrokeListener_keyEvent (ls, key_event, ev);
- }
+ if (!CORBA_Object_is_nil(ls, ev))
+ {
+ is_consumed = Accessibility_KeystrokeListener_keyEvent (ls, key_event, ev);
+ }
+ }
+ else
+ {
+#ifdef SPI_KEYEVENT_DEBUG
+ g_print ("no match for listener %d\n", i);
+#endif
+ ;
+ }
}
return is_consumed;
}
-
static gboolean
_check_key_event (SpiDeviceEventController *controller)
{
#endif
}
/* relay to listeners, and decide whether to consume it or not */
- is_consumed = notify_keylisteners (controller->key_listeners, &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
{
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 */
#ifdef SPI_DEBUG
fprintf(stderr, "spi_device_event_controller_object_finalize called\n");
#endif
+ /* disconnect any special listeners, get rid of outstanding keygrabs */
+
spi_device_event_controller_parent_class->finalize (object);
}
type,
is_system_global,
ev);
-#ifdef SPI_DEBUG
+#ifdef SPI_DEREGISTER_DEBUG
fprintf (stderr, "deregistering keystroke listener %p with maskVal %lu\n",
(void *) l, (unsigned long) mask->value);
#endif
controller_deregister_device_listener(controller,
(DEControllerListener *) key_listener,
ev);
+ dec_key_listener_free (key_listener, ev);
}
/*
}
}
-/*
- * CORBA Accessibility::DeviceEventController::generateMouseEvent
- * method implementation
- */
+/* Accessibility::DeviceEventController::generateMouseEvent */
static void
impl_generate_mouse_event (PortableServer_Servant servant,
const CORBA_long x,
CORBA_Environment *ev)
{
#ifdef SPI_DEBUG
- fprintf (stderr, "generating mouse %s event at %ld, %ld\n", eventName, x, y);
+ 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, "notifying listeners asynchronously\n");
#endif
+ notify_keylisteners (controller->key_listeners, key_event, CORBA_FALSE, ev);
}
static void
/* 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;
}
SpiDeviceEventController *
spi_device_event_controller_new (void *registryp)
{
- SpiRegistry *registry = SPI_REGISTRY (registryp);
+ BonoboObject *registry = (BonoboObject *) registryp;
SpiDeviceEventController *retval = g_object_new (
SPI_DEVICE_EVENT_CONTROLLER_TYPE, NULL);
retval->registry = registry;
projects / platform / core / uifw / at-spi2-atk.git / blobdiff