2009-06-11 Mark Doffman <mark.doffman@codethink.co.uk>

[platform/core/uifw/at-spi2-atk.git] / registryd / deviceeventcontroller.c

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 7d1545e..8049ab0 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -371,9 +371,26 @@ spi_dec_clear_unlatch_pending (SpiDEController *controller)
   priv->xkb_latch_mask = 0;
 }
 
-static void emit(SpiDEController *controller, const char *interface, const char *name, const char *detail, dbus_uint32_t d1, dbus_uint32_t d2)
+static void emit(SpiDEController *controller, const char *interface, const char *name, int a1, int a2)
 {
-  spi_dbus_emit_signal(controller->bus, SPI_DBUS_PATH_DEC, interface, name, detail, d1, d2, NULL, NULL);
+  DBusMessage *signal = NULL;
+  DBusMessageIter iter, iter_variant;
+  int nil = 0;
+  const char *minor = "";
+  const char *path = SPI_DBUS_PATH_DESKTOP;
+
+  signal = dbus_message_new_signal (path, interface, name);
+
+  dbus_message_iter_init_append (signal, &iter);
+
+  dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &minor);
+  dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &a1);
+  dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &a2);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "i", &iter_variant);
+      dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &nil);
+  dbus_message_iter_close_container (&iter, &iter_variant);
+
+  dbus_connection_send (controller->bus, signal, NULL);
 }
 
 static gboolean
@@ -480,7 +497,7 @@ spi_dec_button_update_and_emit (SpiDEController *controller,
        if (!is_consumed)
          {
            dbus_uint32_t x = last_mouse_pos->x, y = last_mouse_pos->y;
-           emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "button", event_detail, x, y);
+           emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "button", x, y);
          }
        else
          spi_dec_set_unlatch_pending (controller, mask_return);
@@ -524,10 +541,10 @@ spi_dec_mouse_check (SpiDEController *controller,
     {
       // TODO: combine these two signals?
       dbus_uint32_t ix = *x, iy = *y;
-      emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "abs", NULL, ix, iy);
+      emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "abs", ix, iy);
       ix -= last_mouse_pos->x;
       iy -= last_mouse_pos->y;
-      emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "rel", NULL, ix, iy);
+      emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "rel", ix, iy);
       last_mouse_pos->x = *x;
       last_mouse_pos->y = *y;
       *moved = True;
@@ -559,7 +576,7 @@ spi_dec_emit_modifier_event (SpiDEController *controller, guint prev_mask,
 
   d1 = prev_mask & key_modifier_mask;
   d2 = current_mask & key_modifier_mask;
-      emit(controller, SPI_DBUS_INTERFACE_EVENT_KEYBOARD, "modifiers", NULL, d1, d2);
+      emit(controller, SPI_DBUS_INTERFACE_EVENT_KEYBOARD, "modifiers", d1, d2);
 }
 
 static gboolean
@@ -961,7 +978,10 @@ Accessibility_DeviceEventListener_notifyEvent(SpiDEController *controller,
                                               DEControllerListener *listener,
                                               const Accessibility_DeviceEvent *key_event)
 {
-  DBusMessage *message = dbus_message_new_method_call(listener->bus_name, listener->path, "org.freedesktop.atspi.Registry", "notifyEvent");
+  DBusMessage *message = dbus_message_new_method_call(listener->bus_name,
+                                                      listener->path,
+                                                      SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER,
+                                                      "notifyEvent");
   DBusError error;
   dbus_bool_t consumed = FALSE;
 
@@ -1368,7 +1388,7 @@ spi_key_set_contains_key (GSList                          *key_set,
 
   if (!key_set)
     {
-      g_print ("null key set!");
+      g_print ("null key set!\n");
       return TRUE;
     }
 
@@ -1814,7 +1834,7 @@ impl_register_keystroke_listener (DBusConnection *bus,
   dbus_int32_t mask, type;
   Accessibility_EventListenerMode *mode;
   dbus_bool_t ret;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
   char *keystring;
 
   dbus_message_iter_init(message, &iter);
@@ -1875,7 +1895,7 @@ impl_register_keystroke_listener (DBusConnection *bus,
  *     method implementation
  */
 static DBusMessage *
-impl_register_device_listener (DBusConnection *bus,
+impl_register_device_event_listener (DBusConnection *bus,
                                  DBusMessage *message,
                                  void *user_data)
 {
@@ -1885,7 +1905,7 @@ impl_register_device_listener (DBusConnection *bus,
   const char *path;
   dbus_int32_t event_types;
   dbus_bool_t ret;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
 
   dbus_error_init(&error);
   if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID))
@@ -2022,7 +2042,7 @@ impl_deregister_keystroke_listener (DBusConnection *bus,
   const char *path;
   GSList *keys = NULL;
   dbus_int32_t mask, type;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
 
   dbus_message_iter_init(message, &iter);
   // TODO: verify type signature
@@ -2064,7 +2084,7 @@ impl_deregister_keystroke_listener (DBusConnection *bus,
  *     method implementation
  */
 static DBusMessage *
-impl_deregister_device_listener (DBusConnection *bus,
+impl_deregister_device_event_listener (DBusConnection *bus,
                                  DBusMessage *message,
                                  void *user_data)
 {
@@ -2073,7 +2093,7 @@ impl_deregister_device_listener (DBusConnection *bus,
   DBusError error;
   const char *path;
   dbus_int32_t event_types;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
 
   dbus_error_init(&error);
   if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_UINT32, &event_types, DBUS_TYPE_INVALID))
@@ -2384,7 +2404,7 @@ static DBusMessage * impl_generate_keyboard_event (DBusConnection *bus, DBusMess
   gint err;
   KeySym keysym;
   DEControllerPrivateData *priv;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
 
   dbus_error_init(&error);
   if (!dbus_message_get_args(message, &error, DBUS_TYPE_INT32, &keycode, DBUS_TYPE_STRING, &keystring, DBUS_TYPE_UINT32, &synth_type, DBUS_TYPE_INVALID))
@@ -2460,11 +2480,12 @@ static DBusMessage * impl_generate_mouse_event (DBusConnection *bus, DBusMessage
   dbus_int32_t       x;
   dbus_int32_t       y;
   char *eventName;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
   int button = 0;
   gboolean err = FALSE;
   Display *display = spi_get_display ();
 
+  dbus_error_init (&error);
   if (!dbus_message_get_args(message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_STRING, &eventName, DBUS_TYPE_INVALID))
   {
     return droute_invalid_arguments_error (message);
@@ -2535,7 +2556,7 @@ impl_notify_listeners_sync (DBusConnection *bus, DBusMessage *message, void *use
   SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
   Accessibility_DeviceEvent event;
   dbus_bool_t ret;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
 
   if (!spi_dbus_demarshal_deviceEvent(message, &event))
   {
@@ -2562,7 +2583,7 @@ impl_notify_listeners_async (DBusConnection *bus, DBusMessage *message, void *us
 {
   SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
   Accessibility_DeviceEvent event;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
 
   if (!spi_dbus_demarshal_deviceEvent(message, &event))
   {
@@ -2727,9 +2748,9 @@ static void wait_for_release_event (XEvent          *event,
 static DRouteMethod dev_methods[] =
 {
   { impl_register_keystroke_listener, "registerKeystrokeListener" },
-  { impl_register_device_listener, "registerDeviceListener" },
+  { impl_register_device_event_listener, "registerDeviceEventListener" },
   { impl_deregister_keystroke_listener, "deregisterKeystrokeListener" },
-  { impl_deregister_device_listener, "deregisterDeviceListener" },
+  { impl_deregister_device_event_listener, "deregisterDeviceEventListener" },
   { impl_generate_keyboard_event, "generateKeyboardEvent" },
   { impl_generate_mouse_event, "generateMouseEvent" },
   { impl_notify_listeners_sync, "notifyListenersSync" },
@@ -2747,7 +2768,7 @@ spi_registry_dec_new (SpiRegistry *reg, DBusConnection *bus, DRouteContext *drou
   dec->bus = bus;
 
   path = droute_add_one (droute,
-                         "/org/freedesktop/atspi/registry/deviceeventcontroller",
+                         SPI_DBUS_PATH_DEC,
                          dec);
 
   droute_path_add_interface (path,