#include <gdk/gdkkeysyms.h>
#include <gdk/gdkwindow.h>
-#include <atk-adaptor/spi-private.h>
#include <spi-common/keymasks.h>
-#include <droute/droute.h>
-#include <droute/introspect-loader.h>
#include <spi-common/spi-dbus.h>
#include <spi-common/spi-types.h>
+#include <droute/droute.h>
+
#include "deviceeventcontroller.h"
#include "reentrant-list.h"
G_DEFINE_TYPE(SpiDEController, spi_device_event_controller, G_TYPE_OBJECT)
/* Private methods */
+static dbus_bool_t
+spi_dbus_add_disconnect_match (DBusConnection *bus, const char *name)
+{
+ char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name);
+ if (match)
+ {
+ DBusError error;
+ dbus_error_init (&error);
+ dbus_bus_add_match (bus, match, &error);
+ g_free (match);
+ return !dbus_error_is_set (&error);
+ }
+ else return FALSE;
+}
+
+static dbus_bool_t
+spi_dbus_remove_disconnect_match (DBusConnection *bus, const char *name)
+{
+ char *match = g_strdup_printf ("interface=%s,member=NameOwnerChanged,arg0=%s", DBUS_INTERFACE_DBUS, name);
+ if (match)
+ {
+ DBusError error;
+ dbus_error_init (&error);
+ dbus_bus_remove_match (bus, match, &error);
+ g_free (match);
+ return !dbus_error_is_set (&error);
+ }
+ else return FALSE;
+}
static unsigned int
keysym_mod_mask (KeySym keysym, KeyCode keycode)
g_object_get_qdata (G_OBJECT (controller), spi_dec_private_quark);
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, int a1, int a2)
{
- va_list arg;
+ 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);
- va_start(arg, first_type);
- spi_dbus_emit_valist(controller->droute->bus, SPI_DBUS_PATH_DEC, SPI_DBUS_INTERFACE_DEC, name, first_type, arg);
- va_end(arg);
+ 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
guint mask_return)
{
Accessibility_DeviceEvent mouse_e;
- gchar event_name[24];
+ gchar event_detail[24];
gboolean is_consumed = FALSE;
if ((mask_return & mouse_button_mask) !=
fprintf (stderr, "Button %d %s\n",
button_number, (is_down) ? "Pressed" : "Released");
#endif
- snprintf (event_name, 22, "mouse:button:%d%c", button_number,
+ snprintf (event_detail, 22, "%d%c", button_number,
(is_down) ? 'p' : 'r');
/* TODO: FIXME distinguish between physical and
* logical buttons
if (!is_consumed)
{
dbus_uint32_t x = last_mouse_pos->x, y = last_mouse_pos->y;
- emit(controller, event_name, DBUS_TYPE_UINT32, &x, DBUS_TYPE_UINT32, &y, DBUS_TYPE_INVALID);
+ emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "button", x, y);
}
else
spi_dec_set_unlatch_pending (controller, mask_return);
{
// TODO: combine these two signals?
dbus_uint32_t ix = *x, iy = *y;
- emit(controller, "mouse_abs", DBUS_TYPE_UINT32, &ix, DBUS_TYPE_UINT32, &iy, DBUS_TYPE_INVALID);
+ emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "abs", ix, iy);
ix -= last_mouse_pos->x;
iy -= last_mouse_pos->y;
- emit(controller, "mouse_rel", DBUS_TYPE_UINT32, &ix, DBUS_TYPE_UINT32, &iy, DBUS_TYPE_INVALID);
+ emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "rel", ix, iy);
last_mouse_pos->x = *x;
last_mouse_pos->y = *y;
*moved = True;
d1 = prev_mask & key_modifier_mask;
d2 = current_mask & key_modifier_mask;
- emit(controller, "keyboard_modifiers", DBUS_TYPE_UINT32, &d1, DBUS_TYPE_UINT32, &d2, DBUS_TYPE_INVALID);
+ emit(controller, SPI_DBUS_INTERFACE_EVENT_KEYBOARD, "modifiers", d1, d2);
}
static gboolean
controller->key_listeners = g_list_prepend (controller->key_listeners,
key_listener);
- spi_dbus_add_disconnect_match (controller->droute->bus, key_listener->listener.bus_name);
+ spi_dbus_add_disconnect_match (controller->bus, key_listener->listener.bus_name);
if (key_listener->mode->global)
{
return spi_controller_register_global_keygrabs (controller, key_listener);
break;
case SPI_DEVICE_TYPE_MOUSE:
controller->mouse_listeners = g_list_prepend (controller->mouse_listeners, listener);
- spi_dbus_add_disconnect_match (controller->droute->bus, listener->bus_name);
+ spi_dbus_add_disconnect_match (controller->bus, listener->bus_name);
break;
default:
break;
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;
{
// TODO: Evaluate performance: perhaps rework this whole architecture
// to avoid blocking calls
- DBusMessage *reply = dbus_connection_send_with_reply_and_block(controller->droute->bus, message, 1000, &error);
+ DBusMessage *reply = dbus_connection_send_with_reply_and_block(controller->bus, message, 1000, &error);
if (reply)
{
DBusError error;
XEvent *xevent)
{
Accessibility_DeviceEvent mouse_e;
- gchar event_name[24];
+ gchar event_detail[24];
gboolean is_consumed = FALSE;
gboolean xkb_mod_unlatch_occurred;
XButtonEvent *xbutton_event = (XButtonEvent *) xevent;
(xevent->type == ButtonPress) ? "Press" : "Release",
mouse_button_state);
#endif
- snprintf (event_name, 22, "mouse:button_%d%c", button,
+ snprintf (event_detail, 22, "%d%c", button,
(xevent->type == ButtonPress) ? 'p' : 'r');
/* TODO: FIXME distinguish between physical and logical buttons */
ix = last_mouse_pos->x;
iy = last_mouse_pos->y;
/* TODO - Work out which part of the spec this emit is fulfilling */
- //emit(controller, event_name, DBUS_TYPE_UINT32, &ix, DBUS_TYPE_UINT32, &iy, DBUS_TYPE_INVALID);
+ //emit(controller, SPI_DBUS_INTERFACE_EVENT_MOUSE, "button", event_detail, ix, iy);
}
xkb_mod_unlatch_occurred = (xevent->type == ButtonPress ||
if (!key_set)
{
- g_print ("null key set!");
+ g_print ("null key set!\n");
return TRUE;
}
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);
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)
* method implementation
*/
static DBusMessage *
-impl_register_device_listener (DBusConnection *bus,
+impl_register_device_event_listener (DBusConnection *bus,
DBusMessage *message,
void *user_data)
{
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))
{
- return spi_dbus_general_error (message);
+ return droute_invalid_arguments_error (message);
}
dec_listener = spi_dec_listener_new (dbus_message_get_sender(message), path, event_types);
ret = spi_controller_register_device_listener (
{
RemoveListenerClosure ctx;
- ctx.bus = controller->droute->bus;
+ ctx.bus = controller->bus;
ctx.listener = listener;
spi_re_entrant_list_foreach (&controller->mouse_listeners,
{
RemoveListenerClosure ctx;
- ctx.bus = controller->droute->bus;
+ ctx.bus = controller->bus;
ctx.listener = (DEControllerListener *) key_listener;
/* special case, copy keyset from existing controller list entry */
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
* method implementation
*/
static DBusMessage *
-impl_deregister_device_listener (DBusConnection *bus,
+impl_deregister_device_event_listener (DBusConnection *bus,
DBusMessage *message,
void *user_data)
{
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))
{
- return spi_dbus_general_error (message);
+ return droute_invalid_arguments_error (message);
}
listener = spi_dec_listener_new (dbus_message_get_sender(message), path, event_types);
spi_controller_deregister_device_listener (
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))
{
- return spi_dbus_general_error (message);
+ return droute_invalid_arguments_error (message);
}
#ifdef SPI_DEBUG
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 ();
if (!dbus_message_get_args(message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_STRING, &eventName, DBUS_TYPE_INVALID))
{
- return spi_dbus_general_error (message);
+ return droute_invalid_arguments_error (message);
}
#ifdef SPI_DEBUG
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))
{
- return spi_dbus_general_error (message);
+ return droute_invalid_arguments_error (message);
}
#ifdef SPI_DEBUG
g_print ("notifylistening listeners synchronously: controller %p, event id %d\n",
{
SpiDEController *controller = SPI_DEVICE_EVENT_CONTROLLER(user_data);
Accessibility_DeviceEvent event;
- DBusMessage *reply;
+ DBusMessage *reply = NULL;
if (!spi_dbus_demarshal_deviceEvent(message, &event))
{
- return spi_dbus_general_error (message);
+ return droute_invalid_arguments_error (message);
}
#ifdef SPI_DEBUG
g_print ("notifylistening listeners asynchronously: controller %p, event id %d\n",
check_release_handler = g_timeout_add (CHECK_RELEASE_DELAY, check_release, &pressed_event);
}
-static DBusMessage *
-impl_introspect (DBusConnection *bus, DBusMessage *message,
- void *user_data)
-{
- const char *path;
- GString *output;
- char *final;
-
- DBusMessage *reply;
-
- path = dbus_message_get_path(message);
-
- output = g_string_new(spi_introspection_header);
-
- g_string_append_printf(output, spi_introspection_node_element, path);
-
- spi_append_interface(output, SPI_DBUS_INTERFACE_DEC);
-
- g_string_append(output, spi_introspection_footer);
- final = g_string_free(output, FALSE);
-
- reply = dbus_message_new_method_return (message);
- g_assert(reply != NULL);
- dbus_message_append_args(reply, DBUS_TYPE_STRING, &final,
- DBUS_TYPE_INVALID);
-
- g_free(final);
- return reply;
-}
-
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" },
{ NULL, NULL }
};
-static DRouteMethod intro_methods[] = {
- {impl_introspect, "Introspect"},
- {NULL, NULL}
-};
-
SpiDEController *
-spi_registry_dec_new (SpiRegistry *reg, DRouteData *droute)
+spi_registry_dec_new (SpiRegistry *reg, DBusConnection *bus, DRouteContext *droute)
{
SpiDEController *dec = g_object_new (SPI_DEVICE_EVENT_CONTROLLER_TYPE, NULL);
+ DRoutePath *path;
dec->registry = g_object_ref (reg);
- dec->droute = droute;
-
- droute_add_interface (droute,
- SPI_DBUS_INTERFACE_DEC,
- dev_methods,
- NULL, NULL, NULL);
- droute_add_interface (droute,
- "org.freedesktop.DBus.Introspectable",
- intro_methods,
- NULL, NULL, NULL);
+ dec->bus = bus;
+
+ path = droute_add_one (droute,
+ SPI_DBUS_PATH_DEC,
+ dec);
+
+ droute_path_add_interface (path,
+ SPI_DBUS_INTERFACE_DEC,
+ dev_methods,
+ NULL);
spi_dec_init_mouse_listener (dec);
/* TODO: kill mouse listener on finalize */
projects / platform / core / uifw / at-spi2-atk.git / blobdiff