Skip to content
Permalink
Browse files

[IBus] Only register interest in messages sent to our input context.

  • Loading branch information
baines committed Feb 27, 2015
1 parent 42d9cf6 commit dae40bff0d53464fddb69e73f4a210e50473303c
Showing with 8 additions and 3 deletions.
  1. +1 −0 src/core/linux/SDL_dbus.c
  2. +2 −0 src/core/linux/SDL_dbus.h
  3. +5 −3 src/core/linux/SDL_ibus.c
@@ -45,6 +45,7 @@ load_dbus_syms(void)
SDL_DBUS_SYM(connection_set_exit_on_disconnect);
SDL_DBUS_SYM(connection_get_is_connected);
SDL_DBUS_SYM(connection_add_filter);
SDL_DBUS_SYM(connection_try_register_object_path);
SDL_DBUS_SYM(connection_send);
SDL_DBUS_SYM(connection_send_with_reply_and_block);
SDL_DBUS_SYM(connection_close);
@@ -41,6 +41,8 @@ typedef struct SDL_DBusContext {
dbus_bool_t (*connection_get_is_connected)(DBusConnection *);
dbus_bool_t (*connection_add_filter)(DBusConnection *, DBusHandleMessageFunction,
void *, DBusFreeFunction);
dbus_bool_t (*connection_try_register_object_path)(DBusConnection *, const char *,
const DBusObjectPathVTable *, void *, DBusError *);
dbus_bool_t (*connection_send)(DBusConnection *, DBusMessage *, dbus_uint32_t *);
DBusMessage *(*connection_send_with_reply_and_block)(DBusConnection *, DBusMessage *, int, DBusError *);
void (*connection_close)(DBusConnection *);
@@ -123,7 +123,7 @@ IBus_utf8_strlen(const char *str)
}

static DBusHandlerResult
IBus_MessageFilter(DBusConnection *conn, DBusMessage *msg, void *user_data)
IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data)
{
SDL_DBusContext *dbus = (SDL_DBusContext *)user_data;

@@ -341,6 +341,8 @@ IBus_SetupConnection(SDL_DBusContext *dbus, const char* addr)
const char *path = NULL;
SDL_bool result = SDL_FALSE;
DBusMessage *msg;
DBusObjectPathVTable ibus_vtable = {0};
ibus_vtable.message_function = &IBus_MessageHandler;

ibus_conn = dbus->connection_open_private(addr, NULL);

@@ -388,7 +390,7 @@ IBus_SetupConnection(SDL_DBusContext *dbus, const char* addr)
SDL_AddHintCallback(SDL_HINT_IME_INTERNAL_EDITING, &IBus_SetCapabilities, NULL);

dbus->bus_add_match(ibus_conn, "type='signal',interface='org.freedesktop.IBus.InputContext'", NULL);
dbus->connection_add_filter(ibus_conn, &IBus_MessageFilter, dbus, NULL);
dbus->connection_try_register_object_path(ibus_conn, input_ctx_path, &ibus_vtable, dbus, NULL);
dbus->connection_flush(ibus_conn);
}

@@ -668,7 +670,7 @@ SDL_IBus_PumpEvents(void)
dbus->connection_read_write(ibus_conn, 0);

while (dbus->connection_dispatch(ibus_conn) == DBUS_DISPATCH_DATA_REMAINS) {
/* Do nothing, actual work happens in IBus_MessageFilter */
/* Do nothing, actual work happens in IBus_MessageHandler */
}
}
}

0 comments on commit dae40bf

Please sign in to comment.