2009-02-19 Mike Gorse <mgorse@novell.com>

	* atk-adaptor/event.c, registryd/deviceeventcontroller.c,
	  spi-common/spi-dbus.c, spi-common/dbus.h: Extract function to
	  emit signals, move to spi-common, and use for device events.

	* deviceeventcontroller.c: Accept type as an array in
	  registerKeystrokeListener.

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index 80fb7b8..7f9a253 100644 (file)
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -149,28 +149,6 @@ spi_atk_bridge_key_listener (AtkKeyEventStruct *event, gpointer data)
  * the AT-SPI event.
  */
 
-/*
- * This is a rather annoying function needed to replace
- * NULL values of strings with the empty string. Null string
- * values can be created by the atk_object_get_name or text selection
- */
-static const void *
-provide_defaults(const gint type,
-                const void *val)
-{
-  switch (type)
-    {
-      case DBUS_TYPE_STRING:
-      case DBUS_TYPE_OBJECT_PATH:
-          if (!val)
-             return "";
-          else
-             return val;
-      default:
-          return val;
-    }
-}
-
 static void 
 emit(AtkObject  *accessible,
      const char *klass,
@@ -181,9 +159,7 @@ emit(AtkObject  *accessible,
      const char *type,
      const void *val)
 {
-  DBusMessage *sig;
-  DBusMessageIter iter, sub;
-  gchar *path, *cname, *t;
+  gchar *path;
 
   path = atk_dbus_object_to_path (accessible);
 
@@ -194,41 +170,8 @@ emit(AtkObject  *accessible,
   if (path == NULL)
       return;
 
-  if (!klass) klass = "";
-  if (!major) major = "";
-  if (!minor) minor = "";
-
-  /*
-   * This is very annoying, but as '-' isn't a legal signal
-   * name in D-Bus (Why not??!?) The names need converting
-   * on this side, and again on the client side.
-   */
-  cname = g_strdup(major);
-  while ((t = strchr(cname, '-')) != NULL) *t = '_';
-
-  sig = dbus_message_new_signal(path, klass, cname);
-  g_free(cname);
+  spi_dbus_emit_signal (atk_adaptor_app_data->bus, path, klass, major, minor, detail1, detail2, type, val);
   g_free(path);
-
-  dbus_message_iter_init_append(sig, &iter);
-
-  dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor);
-  dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1);
-  dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2);
-
-  dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, type, &sub);
-  /*
-   * I need to convert the string signature to an integer type signature.
-   * DBUS_TYPE_INT32 is defined as 'i' whereas the string is "i".
-   * I should just be able to cast the first character of the string to an
-   * integer.
-   */
-  val = provide_defaults((int) *type, val);
-  dbus_message_iter_append_basic(&sub, (int) *type, &val);
-  dbus_message_iter_close_container(&iter, &sub);
-
-  dbus_connection_send(atk_adaptor_app_data->bus, sig, NULL);
-  dbus_message_unref(sig);
 }
 
 /*---------------------------------------------------------------------------*/

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 2d41ef4..7d1545e 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -371,13 +371,9 @@ spi_dec_clear_unlatch_pending (SpiDEController *controller)
   priv->xkb_latch_mask = 0;
 }
 
-static void emit(SpiDEController *controller, const char *name, int first_type, ...)
+static void emit(SpiDEController *controller, const char *interface, const char *name, const char *detail, dbus_uint32_t d1, dbus_uint32_t d2)
 {
-  va_list arg;
-
-  va_start(arg, first_type);
-  spi_dbus_emit_valist(controller->bus, SPI_DBUS_PATH_DEC, SPI_DBUS_INTERFACE_DEC, name, first_type, arg);
-  va_end(arg);
+  spi_dbus_emit_signal(controller->bus, SPI_DBUS_PATH_DEC, interface, name, detail, d1, d2, NULL, NULL);
 }
 
 static gboolean
@@ -1839,7 +1835,20 @@ impl_register_keystroke_listener (DBusConnection *bus,
   dbus_message_iter_next(&iter);
   dbus_message_iter_get_basic(&iter, &mask);
   dbus_message_iter_next(&iter);
-  dbus_message_iter_get_basic(&iter, &type);
+  if (!strcmp (dbus_message_iter_get_signature (&iter), "u"))
+    dbus_message_iter_get_basic(&iter, &type);
+  else
+  {
+    dbus_message_iter_recurse(&iter, &iter_array);
+    while (dbus_message_iter_get_arg_type(&iter_array) != DBUS_TYPE_INVALID)
+    {
+      dbus_uint32_t t;
+      dbus_message_iter_get_basic (&iter_array, &t);
+      type |= (1 << t);
+      dbus_message_iter_next (&iter_array);
+    }
+    dbus_message_iter_next (&iter_array);
+  }
   dbus_message_iter_next(&iter);
   mode = (Accessibility_EventListenerMode *)g_malloc(sizeof(Accessibility_EventListenerMode));
   if (mode)

diff --git a/spi-common/spi-dbus.c b/spi-common/spi-dbus.c
index 75c5d4c..f859156 100644 (file)
--- a/spi-common/spi-dbus.c
+++ b/spi-common/spi-dbus.c
@@ -151,6 +151,78 @@ dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_D
 }
 
 /*
+ * This is a rather annoying function needed to replace
+ * NULL values of strings with the empty string. Null string
+ * values can be created by the atk_object_get_name or text selection
+ */
+static const void *
+provide_defaults(const gint type,
+                const void *val)
+{
+  switch (type)
+    {
+      case DBUS_TYPE_STRING:
+      case DBUS_TYPE_OBJECT_PATH:
+          if (!val)
+             return "";
+          else
+             return val;
+      default:
+          return val;
+    }
+}
+
+void 
+spi_dbus_emit_signal(DBusConnection *bus, const char *path,
+     const char *klass,
+     const char *major,
+     const char *minor,
+     dbus_int32_t detail1,
+     dbus_int32_t detail2,
+     const char *type,
+     const void *val)
+{
+  gchar *cname, *t;
+  DBusMessage *sig;
+  DBusMessageIter iter, sub;
+  if (!klass) klass = "";
+  if (!major) major = "";
+  if (!minor) minor = "";
+  if (!type) type = "u";
+
+  /*
+   * This is very annoying, but as '-' isn't a legal signal
+   * name in D-Bus (Why not??!?) The names need converting
+   * on this side, and again on the client side.
+   */
+  cname = g_strdup(major);
+  while ((t = strchr(cname, '-')) != NULL) *t = '_';
+
+  sig = dbus_message_new_signal(path, klass, cname);
+  g_free(cname);
+
+  dbus_message_iter_init_append(sig, &iter);
+
+  dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor);
+  dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1);
+  dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2);
+
+  dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, type, &sub);
+  /*
+   * I need to convert the string signature to an integer type signature.
+   * DBUS_TYPE_INT32 is defined as 'i' whereas the string is "i".
+   * I should just be able to cast the first character of the string to an
+   * integer.
+   */
+  val = provide_defaults((int) *type, val);
+  dbus_message_iter_append_basic(&sub, (int) *type, &val);
+  dbus_message_iter_close_container(&iter, &sub);
+
+  dbus_connection_send(bus, sig, NULL);
+  dbus_message_unref(sig);
+}
+
+/*
 dbus_bool_t spi_dbus_get_simple_property (DBusConnection *bus, const char *dest, const char *path, const char *interface, const char *prop, int *type, void *ptr, DBusError *error)
 {
   DBusMessage *message, *reply;

diff --git a/spi-common/spi-dbus.h b/spi-common/spi-dbus.h
index 15eb177..ae4696e 100644 (file)
--- a/spi-common/spi-dbus.h
+++ b/spi-common/spi-dbus.h
@@ -67,6 +67,7 @@ dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...);
 dbus_bool_t spi_dbus_marshall_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e);
 dbus_bool_t spi_dbus_demarshall_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e);
 dbus_bool_t spi_dbus_get_simple_property (DBusConnection *bus, const char *dest, const char *path, const char *interface, const char *prop, int *type, void *ptr, DBusError *error);
+void spi_dbus_emit_signal(DBusConnection *bus, const char *path, const char *klass, const char *major, const char *minor, dbus_int32_t detail1, dbus_int32_t detail2, const char *type, const void *val);
 /*
 void spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name);
 void spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name);