bindings/Makefile.am bindings/python/Makefile.am bindings/python/common.h bindings/python/gendefs.sh bindings/python/ibus-types.defs bindings/python/ibus-virtual-methods.defs bindings/python/ibus.defs bindings/python/ibus.override bindings/python/ibusmodule.c bus/.gitignore bus/Makefile.am bus/connection.c bus/connection.h bus/dbusimpl.c bus/dbusimpl.h bus/engineproxy.c bus/engineproxy.h bus/factoryproxy.c bus/factoryproxy.h bus/ibusimpl.c bus/ibusimpl.h bus/inputcontext.c bus/inputcontext.h bus/main.c bus/matchrule.c bus/matchrule.h bus/panelproxy.c bus/panelproxy.h bus/registry.c bus/registry.h bus/server.c bus/server.h bus/test-matchrule.c bus/test-registry.c client/x11/.gitignore docs/Makefile.am docs/reference/Makefile.am docs/reference/ibus/.gitignore docs/reference/ibus/Makefile.am docs/reference/ibus/ibus.types gconf/.gitignore gconf/config.c gconf/gconf.xml.in gconf/main.c ibus-1.0.pc.in ibus/.gitignore ibus/_gtk.py ibus/component.py ibus/enginedesc.py ibus/inputcontext.py ibus/interface/iinputcontext.py ibus/observedpath.py ibus/serializable.py ibus/text.py setup/enginecombobox.py setup/enginetreeview.py setup/icon.py src/.gitignore src/Makefile.am src/ibus.h src/ibusattribute.c src/ibusattribute.h src/ibusbus.c src/ibusbus.h src/ibuscomponent.c src/ibuscomponent.h src/ibusconfig.c src/ibusconfig.h src/ibusconfigprivate.h src/ibusconfigservice.c src/ibusconfigservice.h src/ibusconnection.c src/ibusconnection.h src/ibusdebug.h src/ibusengine.c src/ibusengine.h src/ibusenginedesc.c src/ibusenginedesc.h src/ibusenumtypes.c src/ibusenumtypes.c.template src/ibusenumtypes.h src/ibusenumtypes.h.template src/ibuserror.c src/ibuserror.h src/ibusfactory.c src/ibusfactory.h src/ibushotkey.c src/ibushotkey.h src/ibusinputcontext.c src/ibusinputcontext.h src/ibusinternal.c src/ibusinternal.h src/ibuskeynames.c src/ibuskeysyms-update.pl src/ibuskeysyms.h src/ibuslookuptable.c src/ibuslookuptable.h src/ibusmarshalers.list src/ibusmessage.c src/ibusmessage.h src/ibusobject.c src/ibusobject.h src/ibusobservedpath.c src/ibusobservedpath.h src/ibuspendingcall.c src/ibuspendingcall.h src/ibusproperty.c src/ibusproperty.h src/ibusproxy.c src/ibusproxy.h src/ibusserializable.c src/ibusserializable.h src/ibusserver.c src/ibusserver.h src/ibusservice.c src/ibusservice.h src/ibusshare.c src/ibusshare.h src/ibustext.c src/ibustext.h src/ibustypes.h src/ibusxml.c src/ibusxml.h src/keyname-table.h src/test-attribute.c src/test-bus.c src/test-engine.c src/test-keynames.c src/test-lookuptable.c src/test-proxy.c src/test-server.c src/test-text.c ui/gtk/gtkpanel.xml.in @@ -6,6 +6,7 @@ *.so *~ tags +TAGS Makefile.qmake Makefile Makefile.in @@ -34,3 +35,4 @@ stamp-h1 py-compile ibus-*.tar.* ibus.spec +ibus-1.0.pc .gitignore @@ -19,25 +19,30 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -SUBDIRS = \ - daemon \ - gconf \ - ibus \ - launcher \ - ui \ - lib \ - util \ - client \ - setup \ - icons \ - m4 \ - po \ +SUBDIRS = \ + src \ + bindings \ + gconf \ + ibus \ + ui \ + util \ + client \ + setup \ + bus \ + icons \ + m4 \ + po \ + docs \ $(NULL) ACLOCAL_AMFLAGS = -I m4 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = ibus-1.0.pc + EXTRA_DIST = \ autogen.sh \ + ibus-1.0.pc.in \ ibus.spec.in \ python-config.py \ $(NULL) @@ -55,6 +60,7 @@ install-data-hook: DISTCHECK_CONFIGURE_FLAGS = \ --enable-pygconf \ + --enable-gtk-doc \ $(NULL) rpm: dist @PACKAGE_NAME@.spec Makefile.am @@ -4,6 +4,7 @@ set -x autopoint --force libtoolize --automake --copy --force +gtkdocize #--flavour=no-tmpl aclocal -I m4 --force autoheader --force automake --add-missing --copy --force autogen.sh @@ -21,6 +21,6 @@ SUBDIRS = \ gtk2 \ - qt4 \ x11 \ + qt4 \ $(NULL) client/Makefile.am @@ -19,10 +19,10 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -libibus_gtk = $(top_builddir)/lib/gtk2/libibus-gtk.la +libibus = $(top_builddir)/src/libibus.la INCLUDES = \ - -I$(top_srcdir)/lib/gtk2 \ + -I$(top_srcdir)/src \ $(NULL) immoduledir = @GTK_IM_MODULEDIR@ @@ -34,8 +34,8 @@ im_ibus_la_SOURCES = \ ibusimcontext.h \ $(NULL) -im_ibus_la_DEPENDENCIES = $(libibus_gtk) -im_ibus_la_LIBADD = $(libibus_gtk) +im_ibus_la_DEPENDENCIES = $(libibus) +im_ibus_la_LIBADD = $(libibus) im_ibus_la_CFLAGS = \ @GTK2_CFLAGS@ \ @@ -50,8 +50,8 @@ im_ibus_la_LDFLAGS = \ -module \ $(NULL) -$(libibus_gtk): - (cd $(top_builddir)/lib/gtk2; make ) +$(libibus): + (cd $(top_builddir)/src; make ) EXTRA_DIST = \ $(NULL) client/gtk2/Makefile.am @@ -21,7 +21,7 @@ #include <glib/gprintf.h> #include <gtk/gtk.h> #include <gtk/gtkimmodule.h> -#include "ibusimclient.h" +#include <ibus.h> #include "ibusimcontext.h" #define IBUS_LOCALDIR "" @@ -38,19 +38,22 @@ static const GtkIMContextInfo * info_list[] = { }; +G_MODULE_EXPORT const gchar* g_module_check_init (GModule *module); +const gchar* +g_module_check_init (GModule *module) +{ + return glib_check_version (GLIB_MAJOR_VERSION, + GLIB_MINOR_VERSION, + GLIB_MICRO_VERSION); +} + void im_module_init (GTypeModule *type_module) { - ibus_im_client_register_type(type_module); - ibus_im_context_register_type(type_module); -#if 0 - gchar **p = environ; - extern gchar **environ; - while (*p != NULL) { - g_fprintf (stderr, "%s\n", *p); - p ++; - } -#endif + /* make module resident */ + g_type_module_use (type_module); + + ibus_im_context_register_type (type_module); } void client/gtk2/ibusim.c @@ -23,9 +23,8 @@ #include <sys/socket.h> #include <sys/time.h> #include <sys/un.h> +#include <ibus.h> #include "ibusimcontext.h" -#include "ibusattribute.h" -#include "ibusimclient.h" /* IBusIMContextPriv */ struct _IBusIMContextPrivate { @@ -34,7 +33,7 @@ struct _IBusIMContextPrivate { /* enabled */ gboolean enable; - gchar *ic; + IBusInputContext *ibus_context; /* preedit status */ gchar *preedit_string; @@ -56,35 +55,37 @@ static guint _signal_delete_surrounding_id = 0; static guint _signal_retrieve_surrounding_id = 0; /* functions prototype */ -static void ibus_im_context_class_init (IBusIMContextClass *klass); -static void ibus_im_context_init (IBusIMContext *obj); -static void ibus_im_context_finalize (GObject *obj); -static void ibus_im_context_reset (GtkIMContext *context); +static void ibus_im_context_class_init (IBusIMContextClass *klass); +static void ibus_im_context_init (GObject *obj); +static void ibus_im_context_finalize (GObject *obj); +static void ibus_im_context_reset (GtkIMContext *context); static gboolean ibus_im_context_filter_keypress - (GtkIMContext *context, - GdkEventKey *key); -static void ibus_im_context_focus_in (GtkIMContext *context); -static void ibus_im_context_focus_out (GtkIMContext *context); + (GtkIMContext *context, + GdkEventKey *key); +static void ibus_im_context_focus_in (GtkIMContext *context); +static void ibus_im_context_focus_out (GtkIMContext *context); static void ibus_im_context_get_preedit_string - (GtkIMContext *context, - gchar **str, - PangoAttrList **attrs, - gint *cursor_pos); + (GtkIMContext *context, + gchar **str, + PangoAttrList **attrs, + gint *cursor_pos); static void ibus_im_context_set_client_window - (GtkIMContext *context, - GdkWindow *client); + (GtkIMContext *context, + GdkWindow *client); static void ibus_im_context_set_cursor_location - (GtkIMContext *context, - GdkRectangle *area); + (GtkIMContext *context, + GdkRectangle *area); static void ibus_im_context_set_use_preedit - (GtkIMContext *context, - gboolean use_preedit); + (GtkIMContext *context, + gboolean use_preedit); /* static methods*/ -static void _init_ibus_client (void); -static void _set_cursor_location_internal +static void _create_input_context (IBusIMContext *context); +static void _set_cursor_location_internal (GtkIMContext *context); +static void _bus_connected_cb (IBusBus *bus, + IBusIMContext *context); /* callback functions for slave context */ static void _slave_commit_cb (GtkIMContext *slave, gchar *string, @@ -109,9 +110,7 @@ static void _slave_delete_surrounding_cb static GType _ibus_type_im_context = 0; static GtkIMContextClass *parent_class = NULL; -static IBusIMClient *_client = NULL; -static GHashTable *_ic_table = NULL; -static GArray *_im_context_array = NULL; +static IBusBus *_bus = NULL; void ibus_im_context_register_type (GTypeModule *type_module) @@ -210,16 +209,16 @@ ibus_im_context_class_init (IBusIMContextClass *klass) _signal_retrieve_surrounding_id = g_signal_lookup ("retrieve-surrounding", G_TYPE_FROM_CLASS (klass)); g_assert (_signal_retrieve_surrounding_id != 0); + } static void -ibus_im_context_init (IBusIMContext *obj) +ibus_im_context_init (GObject *obj) { - _init_ibus_client (); - IBusIMContext *ibus = IBUS_IM_CONTEXT (obj); - IBusIMContextPrivate *priv = ibus->priv = - G_TYPE_INSTANCE_GET_PRIVATE (ibus, IBUS_TYPE_IM_CONTEXT, IBusIMContextPrivate); + IBusIMContext *ibuscontext = IBUS_IM_CONTEXT (obj); + IBusIMContextPrivate *priv = ibuscontext->priv = + G_TYPE_INSTANCE_GET_PRIVATE (ibuscontext, IBUS_TYPE_IM_CONTEXT, IBusIMContextPrivate); priv->client_window = NULL; @@ -238,34 +237,47 @@ ibus_im_context_init (IBusIMContext *obj) priv->cursor_area.width = 0; priv->cursor_area.height = 0; - priv->ic = NULL; + priv->ibus_context = NULL; priv->has_focus = FALSE; - priv->caps = IBUS_CAP_PREEDIT | IBUS_CAP_FOCUS; + priv->caps = IBUS_CAP_PREEDIT_TEXT | IBUS_CAP_FOCUS; // Create slave im context - ibus->priv->slave = gtk_im_context_simple_new (); - g_signal_connect (ibus->priv->slave, - "commit", G_CALLBACK (_slave_commit_cb), obj); - g_signal_connect (ibus->priv->slave, - "preedit-start", G_CALLBACK (_slave_preedit_start_cb), obj); - g_signal_connect (ibus->priv->slave, - "preedit-end", G_CALLBACK (_slave_preedit_end_cb), obj); - g_signal_connect (ibus->priv->slave, - "preedit-changed", G_CALLBACK (_slave_preedit_changed_cb), obj); - g_signal_connect (ibus->priv->slave, - "retrieve-surrounding", G_CALLBACK (_slave_retrieve_surrounding_cb), obj); - g_signal_connect (ibus->priv->slave, - "delete-surrounding", G_CALLBACK (_slave_delete_surrounding_cb), obj); - - g_array_append_val (_im_context_array, obj); - - if (ibus_im_client_get_connected (_client)) { - const gchar *ic = ibus_im_client_create_input_context (_client); - ibus_im_context_set_ic (ibus, ic); - g_hash_table_insert (_ic_table, - (gpointer) ibus_im_context_get_ic (ibus), (gpointer) ibus); - } + priv->slave = gtk_im_context_simple_new (); + g_signal_connect (priv->slave, + "commit", + G_CALLBACK (_slave_commit_cb), + ibuscontext); + g_signal_connect (priv->slave, + "preedit-start", + G_CALLBACK (_slave_preedit_start_cb), + ibuscontext); + g_signal_connect (priv->slave, + "preedit-end", + G_CALLBACK (_slave_preedit_end_cb), + ibuscontext); + g_signal_connect (priv->slave, + "preedit-changed", + G_CALLBACK (_slave_preedit_changed_cb), + ibuscontext); + g_signal_connect (priv->slave, + "retrieve-surrounding", + G_CALLBACK (_slave_retrieve_surrounding_cb), + ibuscontext); + g_signal_connect (priv->slave, + "delete-surrounding", + G_CALLBACK (_slave_delete_surrounding_cb), + ibuscontext); + + /* init bus object */ + if (_bus == NULL) + _bus = ibus_bus_new(); + + if (ibus_bus_is_connected (_bus)) { + _create_input_context (ibuscontext); + } + + g_signal_connect (_bus, "connected", G_CALLBACK (_bus_connected_cb), obj); } static void @@ -277,18 +289,10 @@ ibus_im_context_finalize (GObject *obj) IBusIMContext *ibus = IBUS_IM_CONTEXT (obj); IBusIMContextPrivate *priv = ibus->priv; - gint i; - for (i = 0; i < _im_context_array->len; i++) { - if (obj == g_array_index (_im_context_array, GObject *, i)) { - g_array_remove_index_fast (_im_context_array, i); - break; - } - } + g_signal_handlers_disconnect_by_func (_bus, G_CALLBACK (_bus_connected_cb), obj); - if (priv->ic) { - ibus_im_client_release_input_context (_client, priv->ic); - g_hash_table_remove (_ic_table, priv->ic); - g_free (priv->ic); + if (priv->ibus_context) { + ibus_object_destroy (priv->ibus_context); } g_object_unref (priv->slave); @@ -318,12 +322,26 @@ ibus_im_context_filter_keypress (GtkIMContext *context, IBusIMContext *ibus = IBUS_IM_CONTEXT (context); IBusIMContextPrivate *priv = ibus->priv; - if (priv->ic && priv->has_focus) { + if (priv->ibus_context && priv->has_focus) { /* If context does not have focus, ibus will process key event in sync mode. * It is a workaround for increase search in treeview. */ - gboolean retval = ibus_im_client_filter_keypress (_client, - priv->ic, event, FALSE); + gboolean retval; + switch (event->type) { + case GDK_KEY_RELEASE: + retval = ibus_input_context_process_key_event (priv->ibus_context, + event->keyval, + event->state | IBUS_RELEASE_MASK); + break; + case GDK_KEY_PRESS: + retval = ibus_input_context_process_key_event (priv->ibus_context, + event->keyval, + event->state); + break; + default: + retval = FALSE; + } + if (retval) { return TRUE; } @@ -337,15 +355,17 @@ ibus_im_context_filter_keypress (GtkIMContext *context, static void ibus_im_context_focus_in (GtkIMContext *context) { - g_return_if_fail (context != NULL); - g_return_if_fail (IBUS_IS_IM_CONTEXT (context)); + g_assert (IBUS_IS_IM_CONTEXT (context)); - IBusIMContext *ibus = IBUS_IM_CONTEXT (context); - IBusIMContextPrivate *priv = ibus->priv; + IBusIMContext *ibuscontext; + IBusIMContextPrivate *priv; + + ibuscontext = IBUS_IM_CONTEXT (context); + priv = ibuscontext->priv; priv->has_focus = TRUE; - if (priv->ic) { - ibus_im_client_focus_in (_client, priv->ic); + if (priv->ibus_context) { + ibus_input_context_focus_in (priv->ibus_context); } gtk_im_context_focus_in (priv->slave); @@ -356,15 +376,18 @@ ibus_im_context_focus_in (GtkIMContext *context) static void ibus_im_context_focus_out (GtkIMContext *context) { - g_return_if_fail (context != NULL); - g_return_if_fail (IBUS_IS_IM_CONTEXT (context)); - IBusIMContext *ibus = IBUS_IM_CONTEXT (context); - IBusIMContextPrivate *priv = ibus->priv; + g_assert (IBUS_IS_IM_CONTEXT (context)); + + IBusIMContext *ibuscontext; + IBusIMContextPrivate *priv; + + ibuscontext = IBUS_IM_CONTEXT (context); + priv = ibuscontext->priv; priv->has_focus = FALSE; - if (priv->ic) { - ibus_im_client_focus_out (_client, priv->ic); + if (priv->ibus_context) { + ibus_input_context_focus_out (priv->ibus_context); } gtk_im_context_focus_out (priv->slave); } @@ -372,14 +395,16 @@ ibus_im_context_focus_out (GtkIMContext *context) static void ibus_im_context_reset (GtkIMContext *context) { - g_return_if_fail (context != NULL); - g_return_if_fail (IBUS_IS_IM_CONTEXT (context)); + g_assert (IBUS_IS_IM_CONTEXT (context)); - IBusIMContext *ibus = IBUS_IM_CONTEXT (context); - IBusIMContextPrivate *priv = ibus->priv; + IBusIMContext *ibuscontext; + IBusIMContextPrivate *priv; - if (priv->ic) { - ibus_im_client_reset (_client, priv->ic); + ibuscontext = IBUS_IM_CONTEXT (context); + priv = ibuscontext->priv; + + if (priv->ibus_context) { + ibus_input_context_reset (priv->ibus_context); } gtk_im_context_reset (priv->slave); } @@ -387,15 +412,17 @@ ibus_im_context_reset (GtkIMContext *context) static void ibus_im_context_get_preedit_string (GtkIMContext *context, - gchar **str, - PangoAttrList **attrs, - gint *cursor_pos) + gchar **str, + PangoAttrList **attrs, + gint *cursor_pos) { - g_return_if_fail (context != NULL); - g_return_if_fail (IBUS_IS_IM_CONTEXT (context)); + g_assert (IBUS_IS_IM_CONTEXT (context)); - IBusIMContext *ibus = IBUS_IM_CONTEXT (context); - IBusIMContextPrivate *priv = ibus->priv; + IBusIMContext *ibuscontext; + IBusIMContextPrivate *priv; + + ibuscontext = IBUS_IM_CONTEXT (context); + priv = ibuscontext->priv; if (priv->enable) { if (priv->preedit_visible) { @@ -460,7 +487,7 @@ _set_cursor_location_internal (GtkIMContext *context) GdkRectangle area; gint x, y; - if(priv->client_window == NULL || priv->ic == NULL) { + if(priv->client_window == NULL || priv->ibus_context == NULL) { return; } @@ -475,7 +502,11 @@ _set_cursor_location_internal (GtkIMContext *context) gdk_window_get_origin (priv->client_window, &x, &y); area.x += x; area.y += y; - ibus_im_client_set_cursor_location (_client, priv->ic, &area); + ibus_input_context_set_cursor_location (priv->ibus_context, + area.x, + area.y, + area.width, + area.height); } static void @@ -501,96 +532,84 @@ ibus_im_context_set_use_preedit (GtkIMContext *context, gboolean use_preedit) IBusIMContext *ibus = IBUS_IM_CONTEXT (context); IBusIMContextPrivate *priv = ibus->priv; - if(priv->ic) { + if(priv->ibus_context) { if (use_preedit) { - priv->caps |= IBUS_CAP_PREEDIT; + priv->caps |= IBUS_CAP_PREEDIT_TEXT; } else { - priv->caps &= ~IBUS_CAP_PREEDIT; + priv->caps &= ~IBUS_CAP_PREEDIT_TEXT; } - ibus_im_client_set_capabilities (_client, priv->ic, priv->caps); + ibus_input_context_set_capabilities (priv->ibus_context, priv->caps); } gtk_im_context_set_use_preedit (priv->slave, use_preedit); } static void -_client_connected_cb (IBusIMClient *client, gpointer user_data) -{ - gint i; - const gchar *ic; - IBusIMContext *context; - - for (i = 0; i < _im_context_array->len; i++) { - context = g_array_index (_im_context_array, IBusIMContext *, i); - ic = ibus_im_client_create_input_context (client); - ibus_im_context_set_ic (context, ic); - if (ic == NULL) { - continue; - } - g_hash_table_insert (_ic_table, - (gpointer) ibus_im_context_get_ic (context), (gpointer) context); - } -} - -static void -_client_disconnected_cb (IBusIMClient *client, gpointer user_data) +_bus_connected_cb (IBusBus *bus, + IBusIMContext *context) { - gint i; - IBusIMContext *context; - - g_hash_table_remove_all (_ic_table); - for (i = 0; i < _im_context_array->len; i++) { - context = g_array_index (_im_context_array, IBusIMContext *, i); - ibus_im_context_set_ic (context, NULL); - } + g_assert (IBUS_IS_IM_CONTEXT (context)); + g_assert (context->priv->ibus_context == NULL); + _create_input_context (context); } static void -_client_commit_string_cb (IBusIMClient *client, const gchar *ic, const gchar *string, gpointer user_data) +_ibus_context_commit_text_cb (IBusInputContext *ibus_context, + IBusText *text, + IBusIMContext *context) { - IBusIMContext *context = g_hash_table_lookup (_ic_table, ic); - g_return_if_fail (context != NULL); - - g_signal_emit (context, _signal_commit_id, 0, string); + g_assert (IBUS_IS_INPUT_CONTEXT (ibus_context)); + g_assert (IBUS_IS_TEXT (text)); + g_assert (IBUS_IS_IM_CONTEXT (context)); + g_signal_emit (context, _signal_commit_id, 0, text->text); } static void -_client_forward_event_cb (IBusIMClient *client, const gchar *ic, GdkEvent *event, gpointer user_data) +_ibus_context_forward_key_event_cb (IBusInputContext *ibus_context, + guint keyval, + gboolean is_press, + guint state, + IBusIMContext *context) { - IBusIMContext *context = g_hash_table_lookup (_ic_table, ic); - g_return_if_fail (context != NULL); + g_assert (IBUS_IS_IM_CONTEXT (context)); - if (event->type == GDK_KEY_PRESS || - event->type == GDK_KEY_RELEASE) { - /* - GTimeVal time; - event->key.time = time.tv_sec * 1000 + time.tv_usec / 1000; - */ - event->key.time = GDK_CURRENT_TIME; - } + GdkEventKey *event; + IBusIMContextPrivate *priv; -#if 0 - if (event->any.window != context->priv->client_window) { - GdkWindow *old_window = event->any.window; - event->any.window = context->priv->client_window; - gdk_event_put (event); - event->any.window = old_window; - } - else -#endif - gdk_event_put (event); + priv = context->priv; + event = (GdkEventKey *)gdk_event_new (is_press ? GDK_KEY_PRESS : GDK_KEY_RELEASE); + + event->time = GDK_CURRENT_TIME; + event->window = g_object_ref (priv->client_window); + event->send_event = FALSE; + event->state = state; + event->keyval = keyval; + event->string = gdk_keyval_name (keyval); + event->length = strlen (event->string); + event->hardware_keycode = 0; + event->group = 0; + event->is_modifier = 0; + + gdk_event_put ((GdkEvent *)event); + gdk_event_free ((GdkEvent *)event); } static void -_client_update_preedit_cb (IBusIMClient *client, const gchar *ic, const gchar *string, - IBusAttrList *attr_list, gint cursor_pos, gboolean visible, gpointer user_data) +_ibus_context_update_preedit_text_cb (IBusInputContext *ibus_context, + IBusText *text, + gint cursor_pos, + gboolean visible, + IBusIMContext *context) { - IBusIMContext *context = g_hash_table_lookup (_ic_table, ic); - g_return_if_fail (context != NULL); + g_assert (IBUS_IS_INPUT_CONTEXT (ibus_context)); + g_assert (IBUS_IS_TEXT (text)); + g_assert (IBUS_IS_IM_CONTEXT (context)); - IBusIMContextPrivate *priv = context->priv; + IBusIMContextPrivate *priv; + priv = context->priv; + const gchar *str; if (priv->preedit_string) { g_free (priv->preedit_string); @@ -600,12 +619,13 @@ _client_update_preedit_cb (IBusIMClient *client, const gchar *ic, const gchar *s priv->preedit_attrs = NULL; } - priv->preedit_string = g_strdup (string); - if (attr_list) { + str = text->text; + priv->preedit_string = g_strdup (str); + if (text->attrs) { guint i; priv->preedit_attrs = pango_attr_list_new (); for (i = 0; ; i++) { - IBusAttribute *attr = ibus_attr_list_get (attr_list, i); + IBusAttribute *attr = ibus_attr_list_get (text->attrs, i); if (attr == NULL) { break; } @@ -630,8 +650,8 @@ _client_update_preedit_cb (IBusIMClient *client, const gchar *ic, const gchar *s default: continue; } - pango_attr->start_index = g_utf8_offset_to_pointer (string, attr->start_index) - string; - pango_attr->end_index = g_utf8_offset_to_pointer (string, attr->end_index) - string; + pango_attr->start_index = g_utf8_offset_to_pointer (str, attr->start_index) - str; + pango_attr->end_index = g_utf8_offset_to_pointer (str, attr->end_index) - str; pango_attr_list_insert (priv->preedit_attrs, pango_attr); } } @@ -641,11 +661,10 @@ _client_update_preedit_cb (IBusIMClient *client, const gchar *ic, const gchar *s } static void -_client_show_preedit_cb (IBusIMClient *client, const gchar *ic, gpointer user_data) +_ibus_context_show_preedit_text_cb (IBusInputContext *ibus_context, + IBusIMContext *context) { - IBusIMContext *context = g_hash_table_lookup (_ic_table, ic); - g_return_if_fail (context != NULL); - + g_assert (IBUS_IS_IM_CONTEXT (context)); IBusIMContextPrivate *priv = context->priv; if (priv->preedit_visible == FALSE) { @@ -655,11 +674,10 @@ _client_show_preedit_cb (IBusIMClient *client, const gchar *ic, gpointer user_da } static void -_client_hide_preedit_cb (IBusIMClient *client, const gchar *ic, gpointer user_data) +_ibus_context_hide_preedit_text_cb (IBusInputContext *ibus_context, + IBusIMContext *context) { - IBusIMContext *context = g_hash_table_lookup (_ic_table, ic); - g_return_if_fail (context != NULL); - + g_assert (IBUS_IS_IM_CONTEXT (context)); IBusIMContextPrivate *priv = context->priv; if (priv->preedit_visible == TRUE) { @@ -669,62 +687,88 @@ _client_hide_preedit_cb (IBusIMClient *client, const gchar *ic, gpointer user_da } static void -_client_enabled_cb (IBusIMClient *client, const gchar *ic, gpointer user_data) +_ibus_context_enabled_cb (IBusInputContext *ibus_context, + IBusIMContext *context) { - IBusIMContext *context = g_hash_table_lookup (_ic_table, ic); - g_return_if_fail (context != NULL); - + g_assert (IBUS_IS_IM_CONTEXT (context)); IBusIMContextPrivate *priv = context->priv; - if (priv->enable == FALSE) { - priv->enable = TRUE; - } + priv->enable = TRUE; } static void -_client_disabled_cb (IBusIMClient *client, const gchar *ic, gpointer user_data) +_ibus_context_disabled_cb (IBusInputContext *ibus_context, + IBusIMContext *context) { - IBusIMContext *context = g_hash_table_lookup (_ic_table, ic); - g_return_if_fail (context != NULL); - + g_assert (IBUS_IS_IM_CONTEXT (context)); IBusIMContextPrivate *priv = context->priv; - if (priv->enable == TRUE) { - priv->enable = FALSE; - } + priv->enable = FALSE; } static void -_init_ibus_client (void) +_ibus_context_destroy_cb (IBusInputContext *ibus_context, + IBusIMContext *context) { - if (_client != NULL) { - return; - } + g_assert (IBUS_IS_IM_CONTEXT (context)); - _im_context_array = g_array_new (TRUE, TRUE, sizeof (IBusIMContext *)); - _ic_table = g_hash_table_new (g_str_hash, g_str_equal); + IBusIMContextPrivate *priv = context->priv; - _client = ibus_im_client_new (); + g_assert (priv->ibus_context == ibus_context); - g_signal_connect (_client, "connected", - G_CALLBACK (_client_connected_cb), NULL); - g_signal_connect (_client, "disconnected", - G_CALLBACK (_client_disconnected_cb), NULL); - g_signal_connect (_client, "commit-string", - G_CALLBACK (_client_commit_string_cb), NULL); - g_signal_connect (_client, "forward-event", - G_CALLBACK (_client_forward_event_cb), NULL); - g_signal_connect (_client, "update-preedit", - G_CALLBACK (_client_update_preedit_cb), NULL); - g_signal_connect (_client, "show-preedit", - G_CALLBACK (_client_show_preedit_cb), NULL); - g_signal_connect (_client, "hide-preedit", - G_CALLBACK (_client_hide_preedit_cb), NULL); - g_signal_connect (_client, "enabled", - G_CALLBACK (_client_enabled_cb), NULL); - g_signal_connect (_client, "disabled", - G_CALLBACK (_client_disabled_cb), NULL); + g_object_unref (priv->ibus_context); + priv->ibus_context = NULL; + priv->enable = FALSE; +} +static void +_create_input_context (IBusIMContext *context) +{ + g_assert (IBUS_IS_IM_CONTEXT (context)); + g_assert (context->priv->ibus_context == NULL); + + IBusIMContextPrivate *priv; + priv = context->priv; + + priv->ibus_context = ibus_bus_create_input_context (_bus, "test"); + + g_signal_connect (priv->ibus_context, + "commit-text", + G_CALLBACK (_ibus_context_commit_text_cb), + context); + g_signal_connect (priv->ibus_context, + "forward-key-event", + G_CALLBACK (_ibus_context_forward_key_event_cb), + context); + g_signal_connect (priv->ibus_context, + "update-preedit-text", + G_CALLBACK (_ibus_context_update_preedit_text_cb), + context); + g_signal_connect (priv->ibus_context, + "show-preedit-text", + G_CALLBACK (_ibus_context_show_preedit_text_cb), + context); + g_signal_connect (priv->ibus_context, + "hide-preedit-text", + G_CALLBACK (_ibus_context_hide_preedit_text_cb), + context); + g_signal_connect (priv->ibus_context, + "enabled", + G_CALLBACK (_ibus_context_enabled_cb), + context); + g_signal_connect (priv->ibus_context, + "disabled", + G_CALLBACK (_ibus_context_disabled_cb), + context); + g_signal_connect (priv->ibus_context, "destroy", + G_CALLBACK (_ibus_context_destroy_cb), + context); + + ibus_input_context_set_capabilities (priv->ibus_context, priv->caps); + + if (priv->has_focus) { + ibus_input_context_focus_in (priv->ibus_context); + } } /* Callback functions for slave context */ @@ -750,7 +794,7 @@ _slave_preedit_changed_cb (GtkIMContext *slave, IBusIMContext *context) IBusIMContextPrivate *priv = context->priv; - if (priv->enable && priv->ic) { + if (priv->enable && priv->ibus_context) { return; } @@ -765,7 +809,7 @@ _slave_preedit_start_cb (GtkIMContext *slave, IBusIMContext *context) IBusIMContextPrivate *priv = context->priv; - if (priv->enable && priv->ic) { + if (priv->enable && priv->ibus_context) { return; } g_signal_emit (context, _signal_preedit_start_id, 0); @@ -779,7 +823,7 @@ _slave_preedit_end_cb (GtkIMContext *slave, IBusIMContext *context) IBusIMContextPrivate *priv = context->priv; - if (priv->enable && priv->ic) { + if (priv->enable && priv->ibus_context) { return; } g_signal_emit (context, _signal_preedit_end_id, 0); @@ -793,7 +837,7 @@ _slave_retrieve_surrounding_cb (GtkIMContext *slave, IBusIMContext *context) IBusIMContextPrivate *priv = context->priv; - if (priv->enable && priv->ic) { + if (priv->enable && priv->ibus_context) { return; } g_signal_emit (context, _signal_retrieve_surrounding_id, 0); @@ -807,44 +851,12 @@ _slave_delete_surrounding_cb (GtkIMContext *slave, gint a1, gint a2, IBusIMConte IBusIMContextPrivate *priv = context->priv; - if (priv->enable && priv->ic) { + if (priv->enable && priv->ibus_context) { return; } g_signal_emit (context, _signal_delete_surrounding_id, 0, a1, a2); } -const gchar * -ibus_im_context_get_ic (IBusIMContext *context) -{ - g_return_val_if_fail (context != NULL, NULL); - g_return_val_if_fail (IBUS_IS_IM_CONTEXT (context), NULL); - - IBusIMContextPrivate *priv = context->priv; - return priv->ic; -} - -void -ibus_im_context_set_ic (IBusIMContext *context, const gchar *ic) -{ - g_return_if_fail (context != NULL); - g_return_if_fail (IBUS_IS_IM_CONTEXT (context)); - - IBusIMContextPrivate *priv = context->priv; - - g_free (priv->ic); - priv->ic = g_strdup (ic); - - if (priv->ic == NULL) { - priv->enable = FALSE; - } - else { - ibus_im_client_set_capabilities (_client, priv->ic, priv->caps); - if (priv->has_focus) { - ibus_im_context_focus_in (GTK_IM_CONTEXT (context)); - } - } -} - void ibus_im_context_show_preedit (IBusIMContext *context) { client/gtk2/ibusimcontext.c @@ -21,9 +21,9 @@ libIMdkit = $(top_builddir)/util/IMdkit/libIMdkit.la -libibus_gtk = $(top_builddir)/lib/gtk2/libibus-gtk.la +libibus = $(top_builddir)/src/libibus.la -bin_PROGRAMS = ibus-x11 +libexec_PROGRAMS = ibus-x11 ibus_x11_SOURCES = \ main.c \ @@ -32,12 +32,12 @@ ibus_x11_SOURCES = \ ibus_x11_DEPENDENCIES = \ $(libIMdkit) \ - $(libibus_gtk) \ + $(libibus) \ $(NULL) ibus_x11_LDADD = \ $(libIMdkit) \ - $(libibus_gtk) \ + $(libibus) \ $(NULL) ibus_x11_LDFLAGS = \ @@ -48,7 +48,7 @@ ibus_x11_CFLAGS = \ @GTK2_CFLAGS@ \ @DBUS_CFLAGS@ \ -I$(top_srcdir)/util/IMdkit \ - -I$(top_srcdir)/lib/gtk2 \ + -I$(top_srcdir)/src \ $(NULL) noinst_HEADERS = \ @@ -58,6 +58,6 @@ noinst_HEADERS = \ $(IMdkit): (cd $(top_builddir)/util/IMdkit; make) -$(libibus_gtk): - (cd $(top_builddir)/lib/gtk2; make) +$(libibus): + (cd $(top_builddir)/src; make) client/x11/Makefile.am @@ -44,8 +44,7 @@ g_debug (fmt_args); \ } -#include <ibusattribute.h> -#include <ibusimclient.h> +#include <ibus.h> #include "gdk-private.h" struct _X11ICONN { @@ -53,32 +52,53 @@ struct _X11ICONN { }; typedef struct _X11ICONN X11ICONN; +typedef struct _X11IC X11IC; struct _X11IC { - gchar *ibus_ic; - Window client_window; - Window focus_window; - gint32 input_style; - X11ICONN *conn; - gint icid; - gint connect_id; - gchar *lang; - gboolean has_preedit_area; - GdkRectangle preedit_area; + IBusInputContext *context; + Window client_window; + Window focus_window; + gint32 input_style; + X11ICONN *conn; + gint icid; + gint connect_id; + gchar *lang; + gboolean has_preedit_area; + GdkRectangle preedit_area; gchar *preedit_string; IBusAttrList *preedit_attrs; - gint preedit_cursor; - gboolean preedit_visible; - gboolean preedit_started; - gint onspot_preedit_length; + gint preedit_cursor; + gboolean preedit_visible; + gboolean preedit_started; + gint onspot_preedit_length; }; -typedef struct _X11IC X11IC; - -static void _xim_set_cursor_location (X11IC *x11ic); +static void _xim_set_cursor_location (X11IC *x11ic); +static void _context_commit_text_cb (IBusInputContext *context, + IBusText *text, + X11IC *x11ic); +static void _context_forward_key_event_cb + (IBusInputContext *context, + X11IC *x11ic); + +static void _context_update_preedit_text_cb + (IBusInputContext *context, + IBusText *text, + gint cursor_pos, + gboolean visible, + X11IC *x11ic); +static void _context_show_preedit_text_cb + (IBusInputContext *context, + X11IC *x11ic); +static void _context_hide_preedit_text_cb + (IBusInputContext *context, + X11IC *x11ic); +static void _context_enabled_cb (IBusInputContext *context, + X11IC *x11ic); +static void _context_disabled_cb (IBusInputContext *context, + X11IC *x11ic); static GHashTable *_x11_ic_table = NULL; -static GHashTable *_ibus_ic_table = NULL; static GHashTable *_connections = NULL; static XIMS _xims = NULL; static gchar _server_name[128] = "ibus"; @@ -95,9 +115,9 @@ static gchar _locale[1024] = "uk,ur,uz,ve,vi,wa,xh,yi,zh,zu"; static gboolean _kill_daemon = FALSE; -static gint g_debug_level = 0; +static gint g_debug_level = 0; -static IBusIMClient *_client = NULL; +static IBusBus *_bus = NULL; static void _xim_preedit_start (XIMS xims, const X11IC *x11ic) @@ -315,21 +335,35 @@ xim_create_ic (XIMS xims, IMChangeICStruct *call_data) i = _xim_store_ic_values (x11ic, call_data); - x11ic->ibus_ic = g_strdup (ibus_im_client_create_input_context (_client)); - if (x11ic->ibus_ic == NULL) { + x11ic->context = ibus_bus_create_input_context (_bus, "xim"); + + if (x11ic->context == NULL) { g_slice_free (X11IC, x11ic); g_return_val_if_reached (0); } - g_hash_table_insert (_ibus_ic_table, x11ic->ibus_ic, (gpointer)x11ic); + g_signal_connect (x11ic->context, "commit-text", + G_CALLBACK (_context_commit_text_cb), x11ic); + g_signal_connect (x11ic->context, "forward-key-event", + G_CALLBACK (_context_forward_key_event_cb), x11ic); + + g_signal_connect (x11ic->context, "update-preedit-text", + G_CALLBACK (_context_update_preedit_text_cb), x11ic); + g_signal_connect (x11ic->context, "show-preedit-text", + G_CALLBACK (_context_show_preedit_text_cb), x11ic); + g_signal_connect (x11ic->context, "hide-preedit-text", + G_CALLBACK (_context_hide_preedit_text_cb), x11ic); + g_signal_connect (x11ic->context, "enabled", + G_CALLBACK (_context_enabled_cb), x11ic); + g_signal_connect (x11ic->context, "disabled", + G_CALLBACK (_context_disabled_cb), x11ic); + if (x11ic->input_style & XIMPreeditCallbacks) { - ibus_im_client_set_capabilities (_client, x11ic->ibus_ic, - IBUS_CAP_FOCUS | IBUS_CAP_PREEDIT); + ibus_input_context_set_capabilities (x11ic->context, IBUS_CAP_FOCUS | IBUS_CAP_PREEDIT_TEXT); } else { - ibus_im_client_set_capabilities (_client, x11ic->ibus_ic, - IBUS_CAP_FOCUS); + ibus_input_context_set_capabilities (x11ic->context, IBUS_CAP_FOCUS); } g_hash_table_insert (_x11_ic_table, @@ -352,16 +386,23 @@ xim_destroy_ic (XIMS xims, IMChangeICStruct *call_data) (gconstpointer)(unsigned long)call_data->icid); g_return_val_if_fail (x11ic != NULL, 0); - ibus_im_client_release_input_context (_client, x11ic->ibus_ic); + if (x11ic->context) { + ibus_object_destroy ((IBusObject *)x11ic->context); + g_object_unref (x11ic->context); + x11ic->context = NULL; + } - g_hash_table_remove (_ibus_ic_table, x11ic->ibus_ic); g_hash_table_remove (_x11_ic_table, (gconstpointer)(unsigned long)call_data->icid); x11ic->conn->clients = g_list_remove (x11ic->conn->clients, (gconstpointer)x11ic); g_free (x11ic->preedit_string); - ibus_attr_list_unref (x11ic->preedit_attrs); - g_free (x11ic->ibus_ic); + x11ic->preedit_string = NULL; + + if (x11ic->preedit_attrs) { + g_object_unref (x11ic->preedit_attrs); + x11ic->preedit_attrs = NULL; + } g_slice_free (X11IC, x11ic); @@ -380,7 +421,7 @@ xim_set_ic_focus (XIMS xims, IMChangeFocusStruct *call_data) (gconstpointer)(unsigned long)call_data->icid); g_return_val_if_fail (x11ic != NULL, 0); - ibus_im_client_focus_in (_client, x11ic->ibus_ic); + ibus_input_context_focus_in (x11ic->context); _xim_set_cursor_location (x11ic); return 1; @@ -398,7 +439,7 @@ xim_unset_ic_focus (XIMS xims, IMChangeFocusStruct *call_data) (gconstpointer)(unsigned long)call_data->icid); g_return_val_if_fail (x11ic != NULL, 0); - ibus_im_client_focus_out (_client, x11ic->ibus_ic); + ibus_input_context_focus_out (x11ic->context); return 1; @@ -426,8 +467,12 @@ xim_forward_event (XIMS xims, IMForwardEventStruct *call_data) event.send_event = xevent->send_event; event.window = NULL; - if (ibus_im_client_filter_keypress (_client, - x11ic->ibus_ic, &event, False)) { + if (event.type == GDK_KEY_RELEASE) { + event.state |= IBUS_RELEASE_MASK; + } + + if (ibus_input_context_process_key_event (x11ic->context, + event.keyval, event.state)) { if (! x11ic->has_preedit_area) { _xim_set_cursor_location (x11ic); } @@ -479,12 +524,19 @@ _free_ic (gpointer data, gpointer user_data) g_return_if_fail (x11ic != NULL); g_free (x11ic->preedit_string); - ibus_attr_list_unref (x11ic->preedit_attrs); - g_free (x11ic->ibus_ic); + + if (x11ic->preedit_attrs) { + g_object_unref (x11ic->preedit_attrs); + x11ic->preedit_attrs = NULL; + } + + if (x11ic->context) { + ibus_object_destroy ((IBusObject *)x11ic->context); + g_object_unref (x11ic->context); + x11ic->context = NULL; + } /* Remove the IC from g_client dictionary */ - g_hash_table_remove (_ibus_ic_table, - (gconstpointer)(unsigned long)x11ic->ibus_ic); g_hash_table_remove (_x11_ic_table, (gconstpointer)(unsigned long)x11ic->icid); @@ -551,8 +603,11 @@ _xim_set_cursor_location (X11IC *x11ic) } } - ibus_im_client_set_cursor_location (_client, - x11ic->ibus_ic, &preedit_area); + ibus_input_context_set_cursor_location (x11ic->context, + preedit_area.x, + preedit_area.y, + preedit_area.width, + preedit_area.height); } @@ -618,7 +673,7 @@ xim_reset_ic (XIMS xims, IMResetICStruct *call_data) (gconstpointer)(unsigned long)call_data->icid); g_return_val_if_fail (x11ic != NULL, 0); - ibus_im_client_reset (_client, x11ic->ibus_ic); + ibus_input_context_reset (x11ic->context); return 1; } @@ -702,23 +757,29 @@ _xim_forward_gdk_event (GdkEventKey *event, X11IC *x11ic) } static void -_client_disconnected_cb (IBusIMClient *client, gpointer user_data) +_bus_disconnected_cb (IBusBus *bus, + gpointer user_data) { g_warning ("Connection closed by ibus-daemon"); + g_object_unref (_bus); + _bus = NULL; exit(EXIT_SUCCESS); } static void -_client_commit_string_cb (IBusIMClient *client, const gchar *ic, const gchar *string, gpointer user_data) +_context_commit_text_cb (IBusInputContext *context, + IBusText *text, + X11IC *x11ic) { - X11IC *x11ic = g_hash_table_lookup (_ibus_ic_table, ic); - g_return_if_fail (x11ic != NULL); + g_assert (IBUS_IS_INPUT_CONTEXT (context)); + g_assert (IBUS_IS_TEXT (text)); + g_assert (x11ic != NULL); XTextProperty tp; IMCommitStruct cms = {0}; Xutf8TextListToTextProperty (GDK_DISPLAY (), - (gchar **)&string, 1, XCompoundTextStyle, &tp); + (gchar **)&(text->text), 1, XCompoundTextStyle, &tp); cms.major_code = XIM_COMMIT; cms.icid = x11ic->icid; @@ -731,12 +792,12 @@ _client_commit_string_cb (IBusIMClient *client, const gchar *ic, const gchar *st } static void -_client_forward_event_cb (IBusIMClient *client, const gchar *ic, GdkEvent *event, gpointer user_data) +_context_forward_key_event_cb (IBusInputContext *context, + X11IC *x11ic) { - X11IC *x11ic = g_hash_table_lookup (_ibus_ic_table, ic); - g_return_if_fail (x11ic != NULL); + g_assert (x11ic); - _xim_forward_gdk_event (&(event->key), x11ic); + // _xim_forward_gdk_event (&(event->key), x11ic); } static void @@ -759,21 +820,27 @@ _update_preedit (X11IC *x11ic) } static void -_client_update_preedit_cb (IBusIMClient *client, const gchar *ic, const gchar *string, - IBusAttrList *attrs, gint cursor_pos, gboolean visible, gpointer user_data) +_context_update_preedit_text_cb (IBusInputContext *context, + IBusText *text, + gint cursor_pos, + gboolean visible, + X11IC *x11ic) { - X11IC *x11ic = g_hash_table_lookup (_ibus_ic_table, ic); - g_return_if_fail (x11ic != NULL); + g_assert (IBUS_IS_INPUT_CONTEXT (context)); + g_assert (IBUS_IS_TEXT (text)); + g_assert (x11ic); if (x11ic->preedit_string) { g_free(x11ic->preedit_string); } - x11ic->preedit_string = g_strdup(string); + x11ic->preedit_string = g_strdup(text->text); if (x11ic->preedit_attrs) { - ibus_attr_list_unref (x11ic->preedit_attrs); + g_object_unref (x11ic->preedit_attrs); } - x11ic->preedit_attrs = ibus_attr_list_ref(attrs); + + g_object_ref(text->attrs); + x11ic->preedit_attrs = text->attrs; x11ic->preedit_cursor = cursor_pos; x11ic->preedit_visible = visible; @@ -782,74 +849,62 @@ _client_update_preedit_cb (IBusIMClient *client, const gchar *ic, const gchar *s } static void -_client_show_preedit_cb (IBusIMClient *client, const gchar *ic, gpointer user_data) +_context_show_preedit_text_cb (IBusInputContext *context, + X11IC *x11ic) { - X11IC *x11ic = g_hash_table_lookup (_ibus_ic_table, ic); - g_return_if_fail (x11ic != NULL); + g_assert (IBUS_IS_INPUT_CONTEXT (context)); + g_assert (x11ic); x11ic->preedit_visible = TRUE; _update_preedit (x11ic); } static void -_client_hide_preedit_cb (IBusIMClient *client, const gchar *ic, gpointer user_data) +_context_hide_preedit_text_cb (IBusInputContext *context, + X11IC *x11ic) { - X11IC *x11ic = g_hash_table_lookup (_ibus_ic_table, ic); - g_return_if_fail (x11ic != NULL); + g_assert (IBUS_IS_INPUT_CONTEXT (context)); + g_assert (x11ic); x11ic->preedit_visible = FALSE; _update_preedit (x11ic); } static void -_client_enabled_cb (IBusIMClient *client, const gchar *ic, gpointer user_data) +_context_enabled_cb (IBusInputContext *context, + X11IC *x11ic) { - X11IC *x11ic = g_hash_table_lookup (_ibus_ic_table, ic); - g_return_if_fail (x11ic != NULL); + g_assert (IBUS_IS_INPUT_CONTEXT (context)); + g_assert (x11ic); _xim_preedit_start (_xims, x11ic); } static void -_client_disabled_cb (IBusIMClient *client, const gchar *ic, gpointer user_data) +_context_disabled_cb (IBusInputContext *context, + X11IC *x11ic) { - X11IC *x11ic = g_hash_table_lookup (_ibus_ic_table, ic); - g_return_if_fail (x11ic != NULL); + g_assert (IBUS_IS_INPUT_CONTEXT (context)); + g_assert (x11ic); _xim_preedit_end (_xims, x11ic); } static void -_init_ibus_client (void) +_init_ibus (void) { - if (_client != NULL) + if (_bus != NULL) return; + ibus_init (); - ibus_im_client_register_type (NULL); - - _client = ibus_im_client_new (); + _bus = ibus_bus_new (); - if (!ibus_im_client_get_connected (_client)) { + if (!ibus_bus_is_connected (_bus)) { g_error ("Can not connect to ibus-daemon!"); } - g_signal_connect (_client, "disconnected", - G_CALLBACK (_client_disconnected_cb), NULL); - g_signal_connect (_client, "commit-string", - G_CALLBACK (_client_commit_string_cb), NULL); - g_signal_connect (_client, "forward-event", - G_CALLBACK (_client_forward_event_cb), NULL); - - g_signal_connect (_client, "update-preedit", - G_CALLBACK (_client_update_preedit_cb), NULL); - g_signal_connect (_client, "show-preedit", - G_CALLBACK (_client_show_preedit_cb), NULL); - g_signal_connect (_client, "hide-preedit", - G_CALLBACK (_client_hide_preedit_cb), NULL); - g_signal_connect (_client, "enabled", - G_CALLBACK (_client_enabled_cb), NULL); - g_signal_connect (_client, "disabled", - G_CALLBACK (_client_disabled_cb), NULL); + g_signal_connect (_bus, "disconnected", + G_CALLBACK (_bus_disconnected_cb), NULL); } static void @@ -915,9 +970,9 @@ _xim_init_IMdkit () IMFilterEventMask, KeyPressMask | KeyReleaseMask, NULL); - _init_ibus_client (); + _init_ibus (); - if (!ibus_im_client_get_connected (_client)) { + if (!ibus_bus_is_connected (_bus)) { g_warning ("Can not connect to ibus daemon"); exit (1); } @@ -926,7 +981,9 @@ _xim_init_IMdkit () static void _atexit_cb () { - ibus_im_client_kill_daemon(_client); + if (_bus) { + ibus_bus_kill(_bus); + } } static void @@ -1021,7 +1078,6 @@ main (int argc, char **argv) } _x11_ic_table = g_hash_table_new (g_direct_hash, g_direct_equal); - _ibus_ic_table = g_hash_table_new (g_str_hash, g_str_equal); _connections = g_hash_table_new (g_direct_hash, g_direct_equal); signal (SIGINT, _sighandler); client/x11/main.c @@ -21,9 +21,9 @@ # if not 1, append datestamp to the version number. m4_define([ibus_released], [0]) -m4_define([ibus_major_version], [0]) +m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [1]) -m4_define([ibus_micro_version], [1]) +m4_define([ibus_micro_version], [0]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -49,20 +49,34 @@ AC_ISC_POSIX AC_HEADER_STDC AM_PROG_LIBTOOL +# If only source code changed, lt_revision + 1 +# If any interface added, lt_age + 1 +# If any interfaces changed or removed, lt_current + 1 +m4_define([lt_current], [0]) +m4_define([lt_revision], [0]) +m4_define([lt_age], [0]) +LT_VERSION_INFO="lt_current:lt_revision:lt_age" +AC_SUBST(LT_VERSION_INFO) + # check inotify AC_CHECK_HEADERS([sys/inotify.h]) # check glib2 AM_PATH_GLIB_2_0 PKG_CHECK_MODULES(GLIB2, [ - glib-2.0 >= 2.16 + glib-2.0 >= 2.18 ]) PKG_CHECK_MODULES(GOBJECT2, [ - gobject-2.0 + gobject-2.0 >= 2.18 +]) +PKG_CHECK_MODULES(GIO2, [ + gio-2.0 >= 2.18 +]) +PKG_CHECK_MODULES(PYGOBJECT2, [ + pygobject-2.0 >= 2.15 ]) - -# check gtk, gdk & pygtk +# check for gtk, gdk & pygtk PKG_CHECK_MODULES(GTK2, [ gtk+-2.0 ]) @@ -74,9 +88,11 @@ PKG_CHECK_MODULES(GDK2, [ gdk-2.0 ]) -# check dbus-glib +# check for gtk-doc +GTK_DOC_CHECK(1.9) +# check for dbus-glib PKG_CHECK_MODULES(DBUS, [ - dbus-glib-1 + dbus-1 ]) # Check for Qt4 @@ -131,6 +147,9 @@ AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_INCLUDES) AC_SUBST(PYTHON_LIBS) +# +REBUILD = # +AC_SUBST(REBUILD) # define GETTEXT_* variables GETTEXT_PACKAGE=ibus @@ -158,32 +177,9 @@ AC_ARG_ENABLE(qt4-immodule, if test x"$IBUS_HAS_QT4" != x"yes"; then enable_qt4=no fi +enable_qt=no AM_CONDITIONAL(IBUS_BUILD_QT4, [test x"$enable_qt4" = x"yes" ]) -# check pygtk gconf for pygconf -AC_ARG_ENABLE(pygconf, - AS_HELP_STRING([--enable-pygconf], - [Build python gconf binding, with it ibus will not depend on gnome-python]), - [enable_pygconf=$enableval], - [enable_pygconf=no], -) - -PKG_CHECK_MODULES(PYGTK, - pygtk-2.0 >= 2.10.3, - [IBUS_HAS_PYGTK=yes], - [IBUS_HAS_PYGTK=no] -) -AC_SUBST(PYGTK_CFLAGS) -AC_SUBST(PYGTK_LIBS) -if test x"$IBUS_HAS_PYGTK" != x"yes" -a x"$enable_pygconf" = x"yes"; then - AC_MSG_ERROR(can not build python gconf binding without pygtk-2.0) -fi - -AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) -if test x"$PYGTK_CODEGEN" = x"no" -a x"$enable_pygconf" = x"yes"; then - AC_MSG_ERROR(can not build python gconf binding without pygtk-codegen-2.0) -fi - PKG_CHECK_MODULES(GCONF, [gconf-2.0 >= 2.11.1], [IBUS_HAS_GCONF=yes], @@ -191,11 +187,6 @@ PKG_CHECK_MODULES(GCONF, ) AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) -if test x"$IBUS_HAS_GCONF" != x"yes" -a x"$enable_pygconf" = x"yes"; then - AC_MSG_ERROR(can not build python gconf binding without gconf-2.0) -fi - -AM_CONDITIONAL(IBUS_BUILD_PYGCONF, [test x"$enable_pygconf" = x"yes" ]) # check iso-codes AC_ARG_ENABLE(iso-codes-check, @@ -220,22 +211,17 @@ fi # OUTPUT files AC_CONFIG_FILES([ po/Makefile.in Makefile +ibus-1.0.pc ibus.spec ibus/_config.py ibus/Makefile ibus/interface/Makefile -daemon/Makefile -daemon/ibus-daemon -launcher/ibus -launcher/ibus.desktop -launcher/Makefile ui/Makefile ui/gtk/Makefile ui/gtk/ibus-ui-gtk +ui/gtk/gtkpanel.xml gconf/Makefile -gconf/ibus-gconf -lib/Makefile -lib/gtk2/Makefile +gconf/gconf.xml client/Makefile client/gtk2/Makefile client/qt4/Makefile @@ -243,10 +229,16 @@ client/x11/Makefile setup/Makefile setup/ibus-setup setup/ibus-setup.desktop +src/Makefile +bus/Makefile +bindings/Makefile +bindings/python/Makefile util/Makefile util/IMdkit/Makefile -util/gconf/Makefile icons/Makefile +docs/Makefile +docs/reference/Makefile +docs/reference/ibus/Makefile m4/Makefile ]) @@ -259,6 +251,6 @@ Build options: Build static libs $enable_static Gtk immodule dir $GTK_IM_MODULEDIR Enable Qt4 IM module $enable_qt4 - Build pygconf $enable_pygconf + Build document $enable_gtk_doc ]) configure.ac @@ -19,22 +19,54 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -gconf_PYTHON = \ - config.py \ - main.py \ +libibus = $(top_builddir)/src/libibus.la + +INCLUDES = \ + -I$(top_srcdir)/src \ + $(NULL) + +AM_CFLAGS = \ + @GLIB2_CFLAGS@ \ + @GCONF_CFLAGS@ \ + @DBUS_CFLAGS@ \ + -DG_LOG_DOMAIN=\"IBUS\" \ + $(INCLUDES) \ + $(NULL) +AM_LDFLAGS = \ + @GLIB2_LIBS@ \ + @GCONF_LIBS@ \ + @DBUS_LIBS@ \ + $(libibus) \ + $(NULL) + +libexec_PROGRAMS = \ + ibus-gconf \ $(NULL) -gconfdir = $(pkgdatadir)/gconf +ibus_gconf_SOURCES = \ + main.c \ + config.c \ + config.h \ + $(NULL) +ibus_gconf_CFLAGS = \ + $(AM_CFLAGS) \ + $(NULL) +ibus_gconf_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(NULL) -bin_SCRIPTS = ibus-gconf +component_DATA = \ + gconf.xml \ + $(NULL) +componentdir = $(pkgdatadir)/component CLEANFILES = \ *.pyc \ $(NULL) EXTRA_DIST = \ - ibus-gconf.in \ + gconf.xml.in \ $(NULL) -test: - $(ENV) PYTHONPATH=$(top_srcdir) $(PYTHON) $(srcdir)/main.py +$(libibus): + $(MAKE) -C $(top_builddir)/src gconf/Makefile.am @@ -13,10 +13,13 @@ Source1: xinput-ibus BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999") + BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: python BuildRequires: gtk2-devel +BuildRequires: dbus-devel BuildRequires: qt-devel BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils @@ -26,6 +29,7 @@ Requires(post): %{_sbindir}/alternatives Requires(postun): desktop-file-utils Requires(postun): %{_sbindir}/alternatives +Requires: glib2 >= %{glib_ver} Requires: pygtk2 Requires: dbus-python >= 0.83.0 Requires: gnome-python2-gconf @@ -33,6 +37,8 @@ Requires: notification-daemon Requires: pyxdg Requires: iso-codes +%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf + %description IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides full featured and user friendly input method user interface. It also may help @@ -55,7 +61,16 @@ Requires: qt >= 4.4.2 %description qt This package contains ibus im module for qt4 -%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf +%package devel +Summary: Development tools for ibus +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: glib2-devel +Requires: dbus-devel + +%description devel +The ibus-devel package contains the header files and developer +docs for ibus. %prep %setup -q @@ -68,8 +83,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-gtk.la -rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-gtk.so +rm -f $RPM_BUILD_ROOT%{_libdir}/libibus.la rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.la # install xinput config file @@ -112,26 +126,15 @@ fi %dir %{python_sitelib}/ibus %{python_sitelib}/ibus/* %dir %{_datadir}/ibus/ -%dir %{_datadir}/ibus/daemon/ -%dir %{_datadir}/ibus/gconf/ -%dir %{_datadir}/ibus/ui -%dir %{_datadir}/ibus/setup/ -%dir %{_datadir}/ibus/engine/ -%dir %{_datadir}/ibus/icons/ -%{_bindir}/ibus +%{_bindir}/ibus-daemon %{_bindir}/ibus-setup -%{_libdir}/libibus-gtk.so* -%{_datadir}/ibus/daemon/* -%{_datadir}/ibus/gconf/* -%{_datadir}/ibus/ui/* -%{_datadir}/ibus/setup/* -%{_datadir}/ibus/icons/* +%{_libdir}/libibus.so* +%{_datadir}/ibus/* %{_datadir}/applications/* %{_datadir}/pixmaps/* -%{_bindir}/ibus-daemon -%{_bindir}/ibus-gconf -%{_bindir}/ibus-ui-gtk -%{_bindir}/ibus-x11 +%{_libexecdir}/ibus-gconf +%{_libexecdir}/ibus-ui-gtk +%{_libexecdir}/ibus-x11 %config %{_xinputconf} %files gtk @@ -142,6 +145,13 @@ fi %defattr(-,root,root,-) %{_libdir}/qt4/plugins/inputmethods/libibus.so +%files devel +%defattr(-,root,root,-) +%{_libdir}/lib*.so +%{_includedir}/* +%{_datadir}/gtk-doc/html/* +%{_libdir}/pkgconfig/* + %changelog * Thu Aug 07 2008 Huang Peng <shawn.p.huang@gmail.com> - @VERSION@-1 - The first version. ibus.spec.in @@ -28,10 +28,11 @@ ibus_PYTHON = \ attribute.py \ common.py \ bus.py \ + inputcontext.py \ engine.py \ exception.py \ factory.py \ - gtk.py \ + _gtk.py \ __init__.py \ keysyms.py \ lang.py \ @@ -41,6 +42,11 @@ ibus_PYTHON = \ panel.py \ notifications.py \ property.py \ + serializable.py \ + text.py \ + component.py \ + enginedesc.py \ + observedpath.py \ utility.py \ config.py \ _config.py \ ibus/Makefile.am @@ -27,6 +27,7 @@ from interface import * from exception import * from lookuptable import * from bus import * +from inputcontext import * from lang import * from utility import * from engine import * @@ -34,4 +35,9 @@ from factory import * from panel import * from notifications import * from config import * +from serializable import * +from text import * +from observedpath import * +from enginedesc import * +from component import * from _config import * ibus/__init__.py @@ -32,12 +32,12 @@ __all__ = ( "AttributeForeground", "AttributeBackground", "AttrList", - "attribute_from_dbus_value", - "attr_list_from_dbus_value", "ARGB", "RGB" ) import dbus +from exception import IBusException +from serializable import * ATTR_TYPE_UNDERLINE = 1 ATTR_TYPE_FOREGROUND = 2 @@ -48,8 +48,10 @@ ATTR_UNDERLINE_SINGLE = 1 ATTR_UNDERLINE_DOUBLE = 2 ATTR_UNDERLINE_LOW = 3 -class Attribute: - def __init__ (self, type, value, start_index, end_index): +class Attribute(Serializable): + __NAME__ = "IBusAttribute" + def __init__ (self, type=0, value=0, start_index=0, end_index=0): + super(Attribute, self).__init__() self.__type = type self.__value = value self.__start_index = start_index @@ -72,30 +74,25 @@ class Attribute: start_index = property(get_start_index) end_index = property(get_end_index) - def to_dbus_value (self): - values = [dbus.UInt32 (self.__type), - dbus.UInt32 (self.__value), - dbus.UInt32 (self.__start_index), - dbus.UInt32 (self.__end_index)] - return dbus.Struct (values, signature="uuuu") - - def from_dbus_value (self, value): - if not isinstance (value, dbus.Struct): - raise dbus.Exception ("Attribute must be dbus.Struct uuuu") - - if len (value) != 4 or not all (map (lambda x: isinstance (x, dbus.UInt32), value)): - raise dbus.Exception ("Attribute must be dbus.Struct uuuu") - - self.__type = value[0] - self.__value = value[1] - self.__start_index = value[2] - self.__end_index = value[3] - -def attribute_from_dbus_value (value): - attribute = Attribute (0, 0, 0, 0) - attribute.from_dbus_value (value) - return attribute - + def serialize(self, struct): + super(Attribute, self).serialize(struct) + struct.append (dbus.UInt32(self.__type)) + struct.append (dbus.UInt32(self.__value)) + struct.append (dbus.UInt32(self.__start_index)) + struct.append (dbus.UInt32(self.__end_index)) + + def deserialize(self, struct): + super(Attribute, self).deserialize(struct) + if len(struct) < 4: + raise IBusException ("Can not deserialize IBusAttribute") + + self.__type = struct.pop(0) + self.__value = struct.pop(0) + self.__start_index = struct.pop(0) + self.__end_index = struct.pop(0) + +serializable_register(Attribute) + class AttributeUnderline (Attribute): def __init__(self, value, start_index, end_index): Attribute.__init__ (self, ATTR_TYPE_UNDERLINE, value, start_index, end_index) @@ -114,8 +111,10 @@ def ARGB (a, r, g, b): def RGB (r, g, b): return ARGB (255, r, g, b) -class AttrList: +class AttrList(Serializable): + __NAME__ = "IBusAttrList" def __init__ (self, attrs = []): + super(AttrList, self).__init__() self._attrs = [] for attr in attrs: self.append (attr) @@ -124,29 +123,31 @@ class AttrList: assert isinstance (attr, Attribute) self._attrs.append (attr) - def to_dbus_value (self): - array = dbus.Array (signature = "v") - for attr in self._attrs: - array.append (attr.to_dbus_value ()) - return array - - def from_dbus_value (self, value): - attrs = [] - if not isinstance (value, dbus.Array): - raise IBusException ("AttrList must from dbus.Array (uuuu)") - - for v in value: - attr = attribute_from_dbus_value (v) - attrs.append (attr) + def serialize (self, struct): + super(AttrList, self).serialize (struct) + array = map (lambda a: serialize_object(a), self._attrs) + array = dbus.Array (array, signature = "v") + struct.append(array) + def deserialize (self, struct): + super(AttrList, self).deserialize(struct) + attrs = map(lambda v: deserialize_object(v), struct.pop(0)) self._attrs = attrs def __iter__ (self): return self._attrs.__iter__ () -def attr_list_from_dbus_value (value): - if len(value) == 0: - return None - attrs = AttrList () - attrs.from_dbus_value (value) - return attrs +serializable_register(AttrList) + +def test(): + attr_list = AttrList() + attr_list.append (Attribute()) + attr_list.append (Attribute()) + attr_list.append (Attribute()) + attr_list.append (Attribute()) + attr_list.append (Attribute()) + value = serialize_object(attr_list) + attr_list = deserialize_object(value) + +if __name__ == "__main__": + test() ibus/attribute.py @@ -23,95 +23,27 @@ __all__ = ( "Bus", ) -import sys -import gobject import dbus import dbus.lowlevel import dbus.connection import dbus.mainloop.glib -import ibus +import gobject +import common +import object +import serializable +import config dbus.mainloop.glib.DBusGMainLoop(set_as_default = True) -class Bus(ibus.Object): +class Bus(object.Object): __gsignals__ = { - "commit-string" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, gobject.TYPE_STRING) - ), - "update-preedit" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, gobject.TYPE_INT, gobject.TYPE_BOOLEAN) - ), - "show-preedit" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "hide-preedit" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "update-aux-string" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, gobject.TYPE_BOOLEAN) - ), - "show-aux-string" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "hide-aux-string" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "update-lookup-table" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, gobject.TYPE_BOOLEAN) - ), - "show-lookup-table" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "hide-lookup-table" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "page-up-lookup-table" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "page-down-lookup-table" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "cursor-up-lookup-table" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "cursor-down-lookup-table" : ( - gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_STRING, ) - ), - "config-value-changed" : ( - gobject.SIGNAL_RUN_FIRST, + "disconnected" : ( + gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, - (gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) + () ), "config-reloaded" : ( - gobject.SIGNAL_RUN_FIRST, + gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, () ), @@ -119,29 +51,36 @@ class Bus(ibus.Object): def __init__(self): super(Bus, self).__init__() - self.__dbusconn = dbus.connection.Connection(ibus.IBUS_ADDR) - self.__ibus = self.__dbusconn.get_object(ibus.IBUS_NAME, - ibus.IBUS_PATH) + self.__dbusconn = dbus.connection.Connection(common.IBUS_ADDR) self.__dbus = self.__dbusconn.get_object(dbus.BUS_DAEMON_NAME, - dbus.BUS_DAEMON_PATH) - self.__dbusconn.add_message_filter(self.__dbus_message_cb) + dbus.BUS_DAEMON_PATH) self.__unique_name = self.hello() + self.__ibus = self.__dbusconn.get_object(common.IBUS_SERVICE_IBUS, + common.IBUS_PATH_IBUS) - try: - unique_name = self.get_name_owner(ibus.IBUS_CONFIG_NAME) - self.__config = self.__dbusconn.get_object(unique_name, - ibus.IBUS_CONFIG_PATH) - except: - self.__config = None - self.add_match( - "type='signal'," - "interface='" + dbus.BUS_DAEMON_IFACE + "'," - "member='NameOwnerChanged'," - "arg0='" + ibus.IBUS_CONFIG_NAME + "'") + self.__dbusconn.call_on_disconnection(self.__dbusconn_disconnected_cb) + # self.__dbusconn.add_message_filter(self.__filter_cb) + + def __filter_cb(self, conn, message): + if message.get_type() == 4: + print "Signal %s" % message.get_member() + print " sender = %s" % message.get_sender() + print " path = %s" % message.get_path() + return dbus.lowlevel.HANDLER_RESULT_NOT_YET_HANDLED + + def __dbusconn_disconnected_cb(self, dbusconn): + assert self.__dbusconn == dbusconn + self.__dbusconn = None + self.emit("disconnected") def get_name(self): return self.__unique_name + def get_is_connected(self): + if self.__dbusconn == None: + return False + return self.__dbusconn.get_is_connected() + # define dbus methods def get_dbus(self): return self.__dbus @@ -150,7 +89,7 @@ class Bus(ibus.Object): return self.__dbus.Hello() def request_name(self, name, flags): - return self.__dbus.RequestName(name, flags) + return self.__dbus.RequestName(name, dbus.UInt32 (flags)) def release_name(self, name): return self.__dbus.ReleaseName(name) @@ -168,209 +107,56 @@ class Bus(ibus.Object): return self.__dbusconn def get_address(self): - return ibus.IBUS_ADDR - - def create_input_context(self, client_name): - return self.__ibus.CreateInputContext(client_name) - - def release_input_context(self, ic): - return self.__ibus.ReleaseInputContext(ic) - - def process_key_event(self, ic, keyval, is_press, state): - return self.__ibus.ProcessKeyEvent(ic, keyval, is_press, state) - - def set_cursor_location(self, ic, x, y, w, h): - return self.__ibus.SetCursorLocation(ic, x, y, w, h) - - def foucs_in(self, ic): - return self.__ibus.FocusIn(ic) - - def foucs_out(self, ic): - return self.__ibus.FocusOut(ic) - - def reset(self, ic): - return self.__ibus.Reset(ic) + return common.IBUS_ADDR - def is_enabled(self, ic): - return self.__ibus.IsEnabled(ic) + # define ibus methods + def register_component(self, component): + component = serializable.serialize_object(component) + return self.__ibus.RegisterComponent(component) - def set_capabilities(self, ic, caps): - return self.__ibus.SetCapabilities(ic, caps) + def list_engines(self): + engines = self.__ibus.ListEngines() + return map(serializable.deserialize_object, engines) - def register_factories(self, object_paths): - object_paths = dbus.Array(object_paths, signature="o") - return self.__ibus.RegisterFactories(object_paths, **ibus.DEFAULT_ASYNC_HANDLERS) + def list_active_engines(self): + engines = self.__ibus.ListActiveEngines() + return map(serializable.deserialize_object, engines) - def unregister_factories(self, object_paths): - return self.__ibus.UnregisterFactories(object_paths) - - def register_config(self, object_path, replace = False): - return self.__ibus.RegisterConfig(object_path, replace) - - def get_factories(self): - return self.__ibus.GetFactories() - - def get_factory_info(self, factory_path): - return self.__ibus.GetFactoryInfo(factory_path) - - def set_factory(self, factory_path): - return self.__ibus.SetFactory(factory_path) - - def get_input_context_states(self, ic): - return self.__ibus.GetInputContextStates(ic) - - def config_add_watch(self, section): - return self.add_match( - "type='signal'," - "interface='" + ibus.IBUS_CONFIG_NAME + "'," - "member='ValueChanged'," - "arg0='" + section + "'" - ) + def create_input_context(self, client_name): + return self.__ibus.CreateInputContext(client_name) - def config_remove_watch(self, section): - return self.remove_match( - "type='signal'," - "interface='" + ibus.IBUS_CONFIG_NAME + "'," - "member='ValueChanged'," - "arg0='" + section + "'" - ) + def kill(self): + return self.__ibus.Kill() - def config_set_value(self, section, name, value): - return self.__config.SetValue(section, name, value) + def get_config(self): + try: + return self.__config + except: + self.__config = config.Config(self) + return self.__config - def config_set_list(self, section, name, value, list_type): - value = dbus.Array(value, signature = list_type) - return self.__config.SetValue(section, name, value) +def test(): + import glib + import factory + import text - def config_get_value(self, section, name, default_value = None): - try: - return self.__config.GetValue(section, name) - except Exception, e: - return default_value + mainloop = glib.MainLoop() - def register_list_engines(self): - return self.__ibus.RegisterListEngines() + def __disconnected_cb(*args): + print "Disconnected", args + mainloop.quit() - def register_reload_engines(self): - return self.__ibus.RegisterReloadEngines() + b = Bus() + b.connect("disconnected", __disconnected_cb) - def register_start_engine(self, lang, name): - return self.__ibus.RegisterStartEngine(lang, name) + print "unique_name =", b.get_name() - def register_restart_engine(self, lang, name): - return self.__ibus.RegisterRestartEngine(lang, name) + for i in b.list_factories(): + print i.name - def register_stop_engine(self, lang, name): - return self.__ibus.RegisterStopEngine(lang, name) + mainloop.run() + print "Exit" - def kill(self): - return self.__ibus.Kill() - def __dbus_message_cb(self, conn, message): - # name owner changed signal - if message.is_signal(dbus.BUS_DAEMON_IFACE, "NameOwnerChanged"): - args = message.get_args_list() - if args[0] == ibus.IBUS_CONFIG_NAME: - if args[2] != "": - self.__config = self.__dbusconn.get_object(args[2], ibus.IBUS_CONFIG_PATH) - else: - self.__config = None - self.emit("config-reloaded") - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - # commit string signal - elif message.is_signal(ibus.IBUS_IFACE, "CommitString"): - args = message.get_args_list() - ic, string = args[0:2] - self.emit("commit-string", ic, string.encode("utf-8")) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - - # preedit signals - elif message.is_signal(ibus.IBUS_IFACE, "UpdatePreedit"): - args = message.get_args_list() - ic, preedit, attrs, cursor_pos, visible = args[0:5] - attrs = ibus.attr_list_from_dbus_value(attrs) - self.emit("update-preedit", ic, preedit.encode("utf-8"), - attrs, cursor_pos, visible) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "ShowPreedit"): - args = message.get_args_list() - ic = args[0] - self.emit("show-preedit", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "HidePreedit"): - args = message.get_args_list() - ic = args[0] - self.emit("hide-preedit", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - - # aux string signals - elif message.is_signal(ibus.IBUS_IFACE, "UpdateAuxString"): - args = message.get_args_list() - ic, aux_string, attrs, visible = args[0:4] - attrs = ibus.attr_list_from_dbus_value(attrs) - self.emit("update-aux-string", ic, aux_string.encode("utf-8"), - attrs, visible) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "ShowAuxString"): - args = message.get_args_list() - ic = args[0] - self.emit("show-aux-string", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "HideAuxString"): - args = message.get_args_list() - ic = args[0] - self.emit("hide-aux-string", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - - # lookup table signals - elif message.is_signal(ibus.IBUS_IFACE, "UpdateLookupTable"): - args = message.get_args_list() - ic, lookup_table, visible = args[0:3] - lookup_table = ibus.lookup_table_from_dbus_value(lookup_table) - self.emit("update-lookup-table", ic, lookup_table, visible) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "ShowLookupTable"): - args = message.get_args_list() - ic = args[0] - self.emit("show-lookup-table", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "HideLookupTable"): - args = message.get_args_list() - ic = args[0] - self.emit("hide-lookup-table", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "PageUpLookupTable"): - args = message.get_args_list() - ic = args[0] - self.emit("page-up-lookup-table", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "PageDownLookupTable"): - args = message.get_args_list() - ic = args[0] - self.emit("page-down-lookup-table", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "CursorUpLookupTable"): - args = message.get_args_list() - ic = args[0] - self.emit("cursor-up-lookup-table", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - elif message.is_signal(ibus.IBUS_IFACE, "CursorDownLookupTable"): - args = message.get_args_list() - ic = args[0] - self.emit("cursor-down-lookup-table", ic) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - - # Config signals - elif message.is_signal(ibus.IBUS_CONFIG_IFACE, "ValueChanged"): - args = message.get_args_list() - section, name, value = args[0:3] - self.emit("config-value-changed", section, name, value) - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - - # DBUS Disconnected signal - elif message.is_signal(dbus.LOCAL_IFACE, "Disconnected"): - self.destroy() - retval = dbus.lowlevel.HANDLER_RESULT_HANDLED - else: - retval = dbus.lowlevel.HANDLER_RESULT_NOT_YET_HANDLED - return retval +if __name__ == "__main__": + test() ibus/bus.py @@ -21,14 +21,15 @@ __all__ = ( "IBUS_ADDR", - "IBUS_IFACE", - "IBUS_NAME", - "IBUS_PATH", - "IBUS_CONFIG_IFACE", - "IBUS_ENGINE_FACTORY_IFACE", - "IBUS_ENGINE_IFACE", - "IBUS_PANEL_IFACE", - "IBUS_NOTIFICATIONS_IFACE", + "IBUS_IFACE_IBUS", + "IBUS_SERVICE_IBUS", + "IBUS_PATH_IBUS", + "IBUS_IFACE_CONFIG", + "IBUS_IFACE_PANEL", + "IBUS_IFACE_ENGINE", + "IBUS_IFACE_ENGINE_FACTORY", + "IBUS_IFACE_INPUT_CONTEXT", + "IBUS_IFACE_NOTIFICATIONS", "default_reply_handler", "default_error_handler", "DEFAULT_ASYNC_HANDLERS", @@ -67,15 +68,16 @@ if not __username: IBUS_ADDR = "unix:path=/tmp/ibus-%s/ibus-%s" % (__username, display.replace(":", "-")) # IBUS_ADDR = "tcp:host=localhost,port=7799" -IBUS_IFACE = "org.freedesktop.IBus" -IBUS_PATH = "/org/freedesktop/IBus" -IBUS_NAME = "org.freedesktop.IBus" +IBUS_IFACE_IBUS = "org.freedesktop.IBus" +IBUS_PATH_IBUS = "/org/freedesktop/IBus" +IBUS_SERVICE_IBUS = "org.freedesktop.IBus" -IBUS_CONFIG_IFACE = "org.freedesktop.ibus.Config" -IBUS_ENGINE_FACTORY_IFACE = "org.freedesktop.ibus.EngineFactory" -IBUS_ENGINE_IFACE = "org.freedesktop.ibus.Engine" -IBUS_PANEL_IFACE = "org.freedesktop.ibus.Panel" -IBUS_NOTIFICATIONS_IFACE = "org.freedesktop.ibus.Notifications" +IBUS_IFACE_PANEL = "org.freedesktop.IBus.Panel" +IBUS_IFACE_CONFIG = "org.freedesktop.IBus.Config" +IBUS_IFACE_ENGINE = "org.freedesktop.IBus.Engine" +IBUS_IFACE_ENGINE_FACTORY = "org.freedesktop.IBus.EngineFactory" +IBUS_IFACE_INPUT_CONTEXT = "org.freedesktop.IBus.InputContext" +IBUS_IFACE_NOTIFICATIONS = "org.freedesktop.IBus.Notifications" def default_reply_handler( *args): pass ibus/common.py @@ -21,17 +21,20 @@ __all__ = ( "ConfigBase", - "IBUS_CONFIG_NAME", - "IBUS_CONFIG_PATH" + "IBUS_SERVICE_CONFIG", + "IBUS_PATH_CONFIG" ) -IBUS_CONFIG_NAME = "org.freedesktop.ibus.Config" -IBUS_CONFIG_PATH = "/org/freedesktop/ibus/Config" +IBUS_SERVICE_CONFIG = "org.freedesktop.IBus.Config" +IBUS_PATH_CONFIG = "/org/freedesktop/IBus/Config" -import ibus -from ibus import interface +import gobject +import object +import interface +import dbus +from dbus.proxies import ProxyObject -class ConfigBase(ibus.Object): +class ConfigBase(object.Object): def __init__(self, bus): super(ConfigBase, self).__init__() self.__proxy = ConfigProxy(self, bus.get_dbusconn()) @@ -48,7 +51,7 @@ class ConfigBase(ibus.Object): class ConfigProxy(interface.IConfig): def __init__ (self, config, dbusconn): - super(ConfigProxy, self).__init__(dbusconn, IBUS_CONFIG_PATH) + super(ConfigProxy, self).__init__(dbusconn, IBUS_PATH_CONFIG) self.__dbusconn = dbusconn self.__config = config @@ -60,3 +63,80 @@ class ConfigProxy(interface.IConfig): def Destroy(self): self.__config.destroy() + +class Config(object.Object): + __gsignals__ = { + "reloaded" : ( + gobject.SIGNAL_RUN_LAST, + gobject.TYPE_NONE, + () + ), + "value-changed" : ( + gobject.SIGNAL_RUN_LAST, + gobject.TYPE_NONE, + (gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) + ), + } + + def __init__(self, bus): + super(Config, self).__init__() + self.__bus = bus + self.__bus_name = None + + self.__bus.add_match("type='signal',\ + sender='org.freedesktop.DBus',\ + member='NameOwnerChanged',\ + arg0='org.freedesktop.IBus.Config'") + self.__bus.get_dbusconn().add_signal_receiver(self.__name_owner_changed_cb, signal_name="NameOwnerChanged") + + try: + self.__init_config() + except: + self.__config = None + + def __name_owner_changed_cb(self, name, old_name, new_name): + if name == "org.freedesktop.IBus.Config": + if new_name == "": + self.__config = None + else: + self.__init_config(new_name) + + def __init_config(self, bus_name=None): + if bus_name == None: + bus_name = self.__bus.get_name_owner(IBUS_SERVICE_CONFIG) + + match_rule = "type='signal',\ + sender='%s',\ + member='ValueChanged',\ + path='/org/freedesktop/IBus/Config'" + + if self.__bus_name: + self.__bus.remove_match(match_rule % self.__bus_name) + self.__bus_name = None + + self.__config = self.__bus.get_dbusconn().get_object(bus_name, IBUS_PATH_CONFIG) + self.__config.connect_to_signal("ValueChanged", self.__value_changed_cb) + + self.__bus_name = bus_name + self.__bus.add_match(match_rule % self.__bus_name) + self.emit("reloaded") + + def __value_changed_cb(self, section, name, value): + self.emit("value-changed", section, name, value) + + def get_value(self, section, name, default_value): + try: + return self.__config.GetValue(section, name) + except: + return default_value + + def set_value(self, section, name, value): + try: + return self.__config.SetValue(section, name, value) + except: + return + + def set_list(self, section, name, value, signature): + return self.set_value(section, name, dbus.Array(value, signature=signature)) + +gobject.type_register(Config) ibus/config.py @@ -23,15 +23,16 @@ __all__ = ( "EngineBase", ) -import ibus -from ibus import interface +import object +import serializable +import interface -class EngineBase(ibus.Object): +class EngineBase(object.Object): def __init__(self, bus, object_path): super(EngineBase, self).__init__() self.__proxy = EngineProxy (self, bus.get_dbusconn(), object_path) - def process_key_event(self, keyval, is_press, state): + def process_key_event(self, keyval, state): return False def focus_in(self): @@ -73,39 +74,37 @@ class EngineBase(ibus.Object): def property_hide(self, prop_name): pass - def commit_string(self, text): - return self.__proxy.CommitString(text) + def commit_text(self, text): + text = serializable.serialize_object(text) + return self.__proxy.CommitText(text) - def forward_key_event(self, keyval, is_press, state): - return self.__proxy.ForwardKeyEvent(keyval, is_press, state) + def forward_key_event(self, keyval, state): + return self.__proxy.ForwardKeyEvent(keyval, state) - def update_preedit(self, text, attrs, cursor_pos, visible): - if attrs == None: - attrs = ibus.AttrList() - return self.__proxy.UpdatePreedit(text, attrs.to_dbus_value(), cursor_pos, visible) + def update_preedit_text(self, text, cursor_pos, visible): + text = serializable.serialize_object(text) + return self.__proxy.UpdatePreeditText(text, cursor_pos, visible) - def show_preedit(self): - return self.__proxy.ShowPreedit() + def show_preedit_text(self): + return self.__proxy.ShowPreeditText() - def hide_preedit(self): - return self.__proxy.HidePreedit() + def hide_preedit_text(self): + return self.__proxy.HidePreeditText() - def update_aux_string(self, text, attrs, visible): - if attrs == None: - attrs = ibus.AttrList() - return self.__proxy.UpdateAuxString(text, attrs.to_dbus_value(), visible) + def update_auxiliary_text(self, text, visible): + text = serializable.serialize_object(text) + return self.__proxy.UpdateAuxiliaryText(text, visible) - def show_aux_string(self): - return self.__proxy.ShowAuxString() + def show_auxiliary_text(self): + return self.__proxy.ShowAuxiliaryText() - def hide_aux_string(self): - return self.__proxy.HideAuxString() + def hide_auxiliary_text(self): + return self.__proxy.HideAuxiliaryText() def update_lookup_table(self, lookup_table, visible, just_current_page = False): if just_current_page: - dbus_values = lookup_table.current_page_to_dbus_value() - else: - dbus_values = lookup_table.to_dbus_value() + lookup_table = lookup_table.get_current_page_as_lookup_table() + dbus_values = serializable.serialize_object(lookup_table) return self.__proxy.UpdateLookupTable(dbus_values, visible) def show_lookup_table(self): @@ -127,10 +126,12 @@ class EngineBase(ibus.Object): return self.__proxy.CursorDownLookupTable() def register_properties(self, props): - return self.__proxy.RegisterProperties(props.to_dbus_value()) + dbus_values = serializable.serialize_object(props) + return self.__proxy.RegisterProperties(dbus_values) def update_property(self, prop): - return self.__proxy.UpdateProperty(prop.to_dbus_value()) + dbus_values = serializable.serialize_object(prop) + return self.__proxy.UpdateProperty(dbus_values) def get_dbus_object(self): return self.__proxy @@ -145,8 +146,8 @@ class EngineProxy(interface.IEngine): super(EngineProxy, self).__init__(conn, object_path) self.__engine = engine - def ProcessKeyEvent(self, keyval, is_press, state): - return self.__engine.process_key_event(keyval, is_press, state) + def ProcessKeyEvent(self, keyval, state): + return self.__engine.process_key_event(keyval, state) def FocusIn(self): return self.__engine.focus_in() ibus/engine.py @@ -21,24 +21,19 @@ __all__ = ( "EngineFactoryBase", + "FactoryInfo" ) - -import ibus -from ibus import interface - -class EngineFactoryBase(ibus.Object): - def __init__(self, info, engine_class, engine_path, bus, object_path): +import dbus +import object +import interface +from serializable import * +from exception import * + +class EngineFactoryBase(object.Object): + def __init__(self, bus): super(EngineFactoryBase, self).__init__() - self.__proxy = EngineFactoryProxy (self, bus.get_dbusconn(), object_path) - self.__info = info + self.__proxy = EngineFactoryProxy (self, bus.get_dbusconn(), "/org/freedesktop/IBus/Factory") self.__bus = bus - self.__engine_class = engine_class - self.__engine_path = engine_path - self.__engine_id = 1 - self.__object_path = object_path - - def get_info(self): - return self.__info def initialize(self): pass @@ -46,21 +41,13 @@ class EngineFactoryBase(ibus.Object): def uninitialize(self): pass - def register(self): - self.__bus.register_factories([self.__object_path]) - - def create_engine(self): - engine = self.__engine_class(self.__bus, self.__engine_path + str(self.__engine_id)) - self.__engine_id += 1 - return engine.get_dbus_object() + def create_engine(self, engine_name): + raise IBusException("Can not create engine %s" % engine_name) def do_destroy(self): self.__proxy = None self.__bus = None - self.__info = None - self.__engine_class = None - self.__engine_path = None - super(EngineFactoryBase,self).do_destroy() + super(EngineFactoryBase, self).do_destroy() class EngineFactoryProxy(interface.IEngineFactory): @@ -77,11 +64,70 @@ class EngineFactoryProxy(interface.IEngineFactory): def Uninitialize(self): return self.__factory.uninitialize() - def CreateEngine(self): - return self.__factory.create_engine() + def CreateEngine(self, engine_name): + engine = self.__factory.create_engine(engine_name) + return engine.get_dbus_object() def Destroy(self): self.__factory.destroy() self.__factory = None self.remove_from_connection () +class FactoryInfo(Serializable): + __NAME__ = "IBusFactoryInfo" + def __init__ (self, path=None, name=None, lang=None, icon=None, authors=None, credits=None): + super(FactoryInfo, self).__init__() + self.__path = path + self.__name = name + self.__lang = lang + self.__icon = icon + self.__authors = authors + self.__credits = credits + + def get_path(self): + return self.__path + + def get_name(self): + return self.__name + + def get_lang(self): + return self.__lang + + def get_icon(self): + return self.__icon + def get_authors(self): + return self.__authors + + def get_credits(self): + return self.__credits + + path = property(get_path) + name = property(get_name) + lang = property(get_lang) + icon = property(get_icon) + authors = property(get_authors) + credits = property(get_credits) + + def serialize(self, struct): + super(FactoryInfo, self).serialize(struct) + struct.append (dbus.ObjectPath(self.__path)) + struct.append (dbus.String(self.__name)) + struct.append (dbus.String(self.__lang)) + struct.append (dbus.String(self.__icon)) + struct.append (dbus.String(self.__authors)) + struct.append (dbus.String(self.__credits)) + + def deserialize(self, struct): + super(FactoryInfo, self).deserialize(struct) + if len(struct) < 5: + raise IBusException ("Can not deserialize IBusFactoryInfo") + + self.__path = struct.pop(0) + self.__name = struct.pop(0) + self.__lang = struct.pop(0) + self.__icon = struct.pop(0) + self.__authors = struct.pop(0) + self.__credits = struct.pop(0) + +serializable_register(FactoryInfo) + ibus/factory.py @@ -24,6 +24,7 @@ ibus_interface_PYTHON = \ ienginefactory.py \ iengine.py \ iibus.py \ + iinputcontext.py \ ipanel.py \ inotifications.py \ __init__.py \ ibus/interface/Makefile.am @@ -20,6 +20,7 @@ # Boston, MA 02111-1307 USA from iibus import * +from iinputcontext import * from iengine import * from ienginefactory import * from ipanel import * ibus/interface/__init__.py @@ -23,22 +23,22 @@ __all__ = ("IConfig", ) import dbus.service from ibus.common import \ - IBUS_CONFIG_IFACE + IBUS_IFACE_CONFIG class IConfig(dbus.service.Object): # define method decorator. method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_CONFIG_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_CONFIG, \ **args) # define signal decorator. signal = lambda **args: \ - dbus.service.signal(dbus_interface=IBUS_CONFIG_IFACE, \ + dbus.service.signal(dbus_interface=IBUS_IFACE_CONFIG, \ **args) # define async method decorator. async_method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_CONFIG_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_CONFIG, \ async_callbacks=("reply_cb", "error_cb"), \ **args) ibus/interface/iconfig.py @@ -23,27 +23,27 @@ __all__ = ("IEngine", ) import dbus.service from ibus.common import \ - IBUS_ENGINE_IFACE + IBUS_IFACE_ENGINE class IEngine(dbus.service.Object): # define method decorator. method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_ENGINE_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_ENGINE, \ **args) # define signal decorator. signal = lambda **args: \ - dbus.service.signal(dbus_interface=IBUS_ENGINE_IFACE, \ + dbus.service.signal(dbus_interface=IBUS_IFACE_ENGINE, \ **args) # define async method decorator. async_method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_ENGINE_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_ENGINE, \ async_callbacks=("reply_cb", "error_cb"), \ **args) - @method(in_signature="ubu", out_signature="b") - def ProcessKeyEvent(self, keyval, is_press, state): + @method(in_signature="uu", out_signature="b") + def ProcessKeyEvent(self, keyval, state): pass @method(in_signature="iiii") @@ -89,29 +89,30 @@ class IEngine(dbus.service.Object): @method() def Destroy(self): pass - @signal(signature="s") - def CommitString(self, text): pass + + @signal(signature="v") + def CommitText(self, text): pass @signal(signature="ubu") def ForwardKeyEvent(self, keyval, is_press, state): pass - @signal(signature="sa(uuuu)ib") - def UpdatePreedit(self, text, attrs, cursor_pos, visible): pass + @signal(signature="vub") + def UpdatePreeditText(self, text, cursor_pos, visible): pass @signal() - def ShowPreedit(self): pass + def ShowPreeditText(self): pass @signal() - def HidePreedit(self): pass + def HidePreeditText(self): pass - @signal(signature="sa(uuuu)b") - def UpdateAuxString(self, text, attrs, visible): pass + @signal(signature="vb") + def UpdateAuxiliaryText(self, text, visible): pass @signal() - def ShowAuxString(self): pass + def ShowAuxiliaryText(self): pass @signal() - def HideAuxString(self): pass + def HideAuxiliaryText(self): pass @signal(signature="vb") def UpdateLookupTable(self, lookup_table, visible): pass ibus/interface/iengine.py @@ -23,17 +23,17 @@ __all__ = ("IEngineFactory", ) import dbus.service from ibus.common import \ - IBUS_ENGINE_FACTORY_IFACE + IBUS_IFACE_ENGINE_FACTORY class IEngineFactory(dbus.service.Object): # define method decorator. method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_ENGINE_FACTORY_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_ENGINE_FACTORY, \ **args) # define async method decorator. async_method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_ENGINE_FACTORY_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_ENGINE_FACTORY, \ async_callbacks=("reply_cb", "error_cb"), \ **args) @@ -51,8 +51,8 @@ class IEngineFactory(dbus.service.Object): # Create an input context and return the id of the context. # If failed, it will return "" or None. - @method(out_signature="o") - def CreateEngine(self): pass + @method(in_signature="s", out_signature="o") + def CreateEngine(self, engine_name): pass # Destroy the engine @method() ibus/interface/ienginefactory.py @@ -23,100 +23,49 @@ __all__ = ("IIBus", ) import dbus.service from ibus.common import \ - IBUS_IFACE + IBUS_IFACE_IBUS class IIBus(dbus.service.Object): # define method decorator. method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_IBUS, \ connection_keyword="dbusconn", \ **args) # define async method decorator. async_method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_IBUS, \ connection_keyword="dbusconn", \ async_callbacks=("reply_cb", "error_cb"), \ **args) @method(out_signature="s") - def GetIBusAddress(self, dbusconn): pass + def GetAddress(self, dbusconn): pass # methods for ibus clients - @method(in_signature="s", out_signature="s") + @method(in_signature="s", out_signature="o") def CreateInputContext(self, client_name, dbusconn): pass - @method(in_signature="s") - def ReleaseInputContext(self, ic, dbusconn): pass - - @async_method(in_signature="subu", out_signature="b") - def ProcessKeyEvent(self, ic, keyval, is_press, state, dbusconn, reply_cb, error_cb): pass - - @method(in_signature="siiii") - def SetCursorLocation(self, ic, x, y, w, h, dbusconn): pass - - @method(in_signature="s") - def FocusIn(self, ic, dbusconn): pass - - @method(in_signature="s") - def FocusOut(self, ic, dbusconn): pass - - @method(in_signature="s") - def Reset(self, ic, dbusconn): pass - - @method(in_signature="s", out_signature="b") - def IsEnabled(self, ic, dbusconn): pass - - @method(in_signature="si") - def SetCapabilities(self, ic, caps, dbusconn): pass + @method(in_signature="s", out_signature="sb") + def GetInputContextStates(self, ic, dbusconn): pass # methods for ibus engine provide - @method(in_signature="ao") + @method(in_signature="av") def RegisterFactories(self, object_paths, dbusconn): pass - @method(in_signature="ao") + @method(in_signature="av") def UnregisterFactories(self, object_paths, dbusconn): pass # general methods - @method(out_signature="av") - def GetFactories(self, dbusconn): pass + @method(in_signature="av") + def RegisterComponent(self, components, dbusconn): pass - @method(in_signature="o", out_signature="av") - def GetFactoryInfo(self, factory_path, dbusconn): pass - - @method(in_signature="o") - def SetFactory(self, factory_path, dbusconn): pass - - @method(in_signature="s", out_signature="sb") - def GetInputContextStates(self, ic, dbusconn): pass - - @method(out_signature="a(sssssssb)") - def RegisterListEngines(self, dbusconn): pass - - @method() - def RegisterReloadEngines(self, dbusconn): pass - - @method(in_signature="ss") - def RegisterStartEngine(self, lang, name, dbusconn): pass - - @method(in_signature="ss") - def RegisterRestartEngine(self, lang, name, dbusconn): pass + @method(out_signature="av") + def ListEngines(self, dbusconn): pass - @method(in_signature="ss") - def RegisterStopEngine(self, lang, name, dbusconn): pass + @method(out_signature="av") + def ListActiveEngines(self, dbusconn): pass @async_method() def Kill(self, dbusconn, reply_cb, error_cb): pass - #sigals - def CommitString(self, ic, text): pass - - def UpdatePreedit(self, ic, text, attrs, cursor_pos, show): pass - - def Enabled(self, ic): pass - - def Disabled(self, ic): pass - - def ConfigValueChanged(self, key, value): pass - - def ConfigReload(self): pass ibus/interface/iibus.py @@ -23,22 +23,22 @@ __all__ = ("INotifications", ) import dbus.service from ibus.common import \ - IBUS_NOTIFICATIONS_IFACE + IBUS_IFACE_NOTIFICATIONS class INotifications(dbus.service.Object): # define method decorator. method = lambda **args: \ - dbus.service.method(dbus_interface = IBUS_NOTIFICATIONS_IFACE, \ + dbus.service.method(dbus_interface = IBUS_IFACE_NOTIFICATIONS, \ **args) # define signal decorator. signal = lambda **args: \ - dbus.service.signal(dbus_interface = IBUS_NOTIFICATIONS_IFACE, \ + dbus.service.signal(dbus_interface = IBUS_IFACE_NOTIFICATIONS, \ **args) # define async method decorator. async_method = lambda **args: \ - dbus.service.method(dbus_interface = IBUS_NOTIFICATIONS_IFACE, \ + dbus.service.method(dbus_interface = IBUS_IFACE_NOTIFICATIONS, \ async_callbacks = ("reply_cb", "error_cb"), \ **args) ibus/interface/inotifications.py @@ -23,44 +23,44 @@ __all__ = ("IPanel", ) import dbus.service from ibus.common import \ - IBUS_PANEL_IFACE + IBUS_IFACE_PANEL class IPanel(dbus.service.Object): # define method decorator. method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_PANEL_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_PANEL, \ **args) # define signal decorator. signal = lambda **args: \ - dbus.service.signal(dbus_interface=IBUS_PANEL_IFACE, \ + dbus.service.signal(dbus_interface=IBUS_IFACE_PANEL, \ **args) # define async method decorator. async_method = lambda **args: \ - dbus.service.method(dbus_interface=IBUS_PANE_IFACE, \ + dbus.service.method(dbus_interface=IBUS_IFACE_PANEL, \ async_callbacks=("reply_cb", "error_cb"), \ **args) @method(in_signature="iiii") def SetCursorLocation(self, x, y, w, h): pass - @method(in_signature="svub") - def UpdatePreedit(self, text, attrs, cursor_pos, visible): pass + @method(in_signature="vub") + def UpdatePreeditText(self, text, cursor_pos, visible): pass @method() - def ShowPreedit(self): pass + def ShowPreeditText(self): pass @method() - def HidePreedit(self): pass + def HidePreeditText(self): pass - @method(in_signature="svb") - def UpdateAuxString(self, text, attrs, visible): pass + @method(in_signature="vb") + def UpdateAuxiliaryText(self, text, visible): pass @method() - def ShowAuxString(self): pass + def ShowAuxiliaryText(self): pass @method() - def HideAuxString(self): pass + def HideAuxiliaryText(self): pass @method(in_signature="vb") def UpdateLookupTable(self, lookup_table, visible): pass @@ -95,14 +95,14 @@ class IPanel(dbus.service.Object): @method() def HideLanguageBar(self): pass - @method(in_signature="s") + @method(in_signature="o") def FocusIn(self, ic): pass - @method(in_signature="s") + @method(in_signature="o") def FocusOut(self, ic): pass @method() - def StatesChanged(self): pass + def StateChanged(self): pass @method() def Reset(self): pass @@ -126,12 +126,12 @@ class IPanel(dbus.service.Object): @signal() def CursorDown(self): pass - @signal() + @signal(signature="si") def PropertyActivate(self, prop_name, prop_state): pass - @signal() + @signal(signature="s") def PropertyShow(self, prop_name): pass - @signal() + @signal(signature="s") def PropertyHide(self, prop_name): pass ibus/interface/ipanel.py @@ -21,54 +21,24 @@ __all__ = ( "LookupTable", - "lookup_table_from_dbus_value" ) import dbus -from attribute import * +from serializable import * from exception import * -class CandidateList(list): - def __init__(self, items = []): - super(CandidateList, self).__init__(items) - - def clean(self): - del self[:] - def __getslice__(self, i, j): - items = super(CandidateList, self).__getslice__(i, j) - return CandidateList(items) - - def to_dbus_value(self): - value = dbus.Array([], signature="v") - for text, attrs in self: - value.append(dbus.Struct((dbus.String(text), attrs.to_dbus_value()))) - return value - - def from_dbus_value(self, value): - candidates = [] - if not isinstance(value, dbus.Array): - raise dbus.Exception("Candidates must from dbus.Array(a(sa(...))") - for candidate in value: - if not isinstance(candidate, dbus.Struct): - raise IBusException("Candidates must from dbus.Array(a(sa(...)))") - if len(candidate) != 2 or \ - not isinstance(candidate[0], dbus.String): - raise IBusException("Candidates must from dbus.Array(a(sa(...)))") - text = candidate[0] - attrs = attr_list_from_dbus_value(candidate[1]) - candidates.append((text, attrs)) - - self.clean() - self[:] = candidates - -class LookupTable(object): - def __init__(self, page_size=5, labels=None): +class LookupTable(Serializable): + __NAME__ = "IBusLookupTable" + def __init__(self, page_size=5, cursor_pos=0, coursor_visible=True, candidates=None): super(LookupTable, self).__init__() self.__cursor_visible = True - self.__cursor_pos = 0 - self.__candidates = CandidateList() + self.__cursor_pos = cursor_pos + if candidates == None: + self.__candidates = list() + else: + self.__candidates = candidates self.set_page_size(page_size) - self.set_labels(labels) + self.set_labels(None) def set_page_size(self, page_size): self.__page_size = page_size @@ -159,18 +129,16 @@ class LookupTable(object): return True def clean(self): - self.__candidates.clean() + self.__candidates = list() self.__cursor_pos = 0 - def append_candidate(self, candidate, attrs = None): - if attrs == None: - attrs = AttrList() - self.__candidates.append((candidate, attrs)) + def append_candidate(self, text): + self.__candidates.append(text) def get_candidate(self, index): return self.__candidates[index] - def get_canidates_in_current_page(self): + def get_candidates_in_current_page(self): page = self.__cursor_pos / self.__page_size start_index = page * self.__page_size end_index = min((page + 1) * self.__page_size, len(self.__candidates)) @@ -185,50 +153,43 @@ class LookupTable(object): def __len__(self): return self.get_number_of_candidates() - def to_dbus_value(self): - value = (dbus.Int32(self.__page_size), - dbus.Int32(self.__cursor_pos), - dbus.Boolean(self.__cursor_visible), - self.__candidates.to_dbus_value()) - return dbus.Struct(value) - - def current_page_to_dbus_value(self): - candidates = self.get_canidates_in_current_page() - value = (dbus.Int32(self.__page_size), - dbus.Int32(self.__cursor_pos % self.__page_size), - dbus.Boolean(self.__cursor_visible), - candidates.to_dbus_value()) - return dbus.Struct(value) - - def from_dbus_value(self, value): - if not isinstance(value, dbus.Struct): - raise dbus.Exception("LookupTable must from dbus.Struct(uuba(...))") - - if len(value) != 4 or \ - not isinstance(value[0], dbus.Int32) or \ - not isinstance(value[1], dbus.Int32) or \ - not isinstance(value[2], dbus.Boolean): - raise dbus.Exception("LookupTable must from dbus.Struct(uuba(...))") - - self.__candidates.from_dbus_value(value[3]) - self.__page_size = value[0] - self.__cursor_pos = value[1] - self.__cursor_visible = value[2] - -def lookup_table_from_dbus_value(value): - lookup_table = LookupTable() - lookup_table.from_dbus_value(value) - return lookup_table - -def unit_test(): + def serialize(self, struct): + super(LookupTable, self).serialize(struct) + struct.append(dbus.UInt32(self.__page_size)) + struct.append(dbus.UInt32(self.__cursor_pos)) + struct.append(dbus.Boolean(self.__cursor_visible)) + candidates = map(lambda c: serialize_object(c), self.__candidates) + struct.append(dbus.Array(candidates, signature="v")) + + def get_current_page_as_lookup_table(self): + candidates = self.get_candidates_in_current_page() + return LookupTable(self.__page_size, + self.__cursor_pos % self.__page_size, + self.__cursor_visible, + candidates) + + def deserialize(self, struct): + super(LookupTable, self).deserialize(struct) + + self.__page_size = struct.pop(0) + self.__cursor_pos = struct.pop(0) + self.__cursor_visible = struct.pop(0) + self.__candidates = map(deserialize_object, struct.pop(0)) + + +serializable_register(LookupTable) + +def test(): t = LookupTable() # attrs = AttrList() # attrs.append(AttributeBackground(RGB(233, 0,1), 0, 3)) # attrs.append(AttributeUnderline(1, 3, 5)) t.append_candidate("Hello") - value = t.to_dbus_value() - print value - t = lookup_table_from_dbus_value(value) + value = serialize_object(t) + t = deserialize_object(value) + t = t.get_current_page_as_lookup_table() + value = serialize_object(t) + t = deserialize_object(value) if __name__ == "__main__": - unit_test() + test() ibus/lookuptable.py @@ -21,12 +21,12 @@ __all__ = ( "NotificationsBase", - "IBUS_NOTIFICATIONS_NAME", - "IBUS_NOTIFICATIONS_PATH" + "IBUS_SERVICE_NOTIFICATIONS", + "IBUS_PATH_NOTIFICATIONS" ) -IBUS_NOTIFICATIONS_NAME = "org.freedesktop.ibus.Notifications" -IBUS_NOTIFICATIONS_PATH = "/org/freedesktop/ibus/Notifications" +IBUS_SERVICE_NOTIFICATIONS = "org.freedesktop.IBus.Notifications" +IBUS_PATH_NOTIFICATIONS = "/org/freedesktop/IBus/Notifications" import ibus from ibus import interface @@ -50,7 +50,7 @@ class NotificationsBase(ibus.Object): class NotificationsProxy(interface.INotifications): def __init__ (self, notify, dbusconn): - super(NotificationsProxy, self).__init__(dbusconn, IBUS_NOTIFICATIONS_PATH) + super(NotificationsProxy, self).__init__(dbusconn, IBUS_PATH_NOTIFICATIONS) self.__dbusconn = dbusconn self.__notify = notify ibus/notifications.py @@ -28,21 +28,30 @@ import gobject class Object(gobject.GObject): __gsignals__ = { 'destroy' : ( - gobject.SIGNAL_RUN_FIRST, + gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()) } def __init__(self): super(Object, self).__init__() - self._destroyed = False + self.__destroyed = False + self.__handlers = [] def destroy(self): - if not self._destroyed: + if not self.__destroyed: self.emit("destroy") - self._destroyed = True + self.__destroyed = True def do_destroy(self): - pass + self.__disconnect_all() + + def connect(self, signal_name, handler, *args): + id = super(Object, self).connect(signal_name, handler, *args) + self.__handlers.append(id) + + def __disconnect_all(self): + map(self.disconnect, self.__handlers) + self.__handlers = [] gobject.type_register(Object) ibus/object.py @@ -25,15 +25,17 @@ __all__ = ( "PanelButton", "PanelToggleButton", "PanelMenu", - "IBUS_PANEL_NAME", - "IBUS_PANEL_PATH" + "IBUS_SERVICE_PANEL", + "IBUS_PATH_PANEL" ) -IBUS_PANEL_NAME = "org.freedesktop.ibus.Panel" -IBUS_PANEL_PATH = "/org/freedesktop/ibus/Panel" +IBUS_SERVICE_PANEL = "org.freedesktop.IBus.Panel" +IBUS_PATH_PANEL = "/org/freedesktop/IBus/Panel" -import ibus -from ibus import interface +from serializable import * +from object import Object +import interface +import dbus class PanelItem: pass @@ -47,30 +49,31 @@ class PanelToggleButton(PanelButton): class PanelMenu(PanelItem): pass -class PanelBase(ibus.Object): +class PanelBase(Object): def __init__(self, bus): super(PanelBase, self).__init__() - self.__proxy = PanelProxy(self, bus.get_dbusconn()) + self.__bus = bus + self.__proxy = PanelProxy(self, bus) def set_cursor_location(self, x, y, w, h): pass - def update_preedit(self, text, attrs, cursor_pos, visible): + def update_preedit_text(self, text, cursor_pos, visible): pass - def show_preedit(self): + def show_preedit_text(self): pass - def hide_preedit(self): + def hide_preedit_text(self): pass - def update_aux_string(self, text, attrs, visible): + def update_auxiliary_text(self, text, visible): pass - def show_aux_string(self): + def show_auxiliary_text(self): pass - def hide_aux_string(self): + def hide_auxiliary_text(self): pass def update_lookup_table(self, lookup_table, visible): @@ -118,7 +121,7 @@ class PanelBase(ibus.Object): def focus_out(self, ic): pass - def states_changed(self): + def state_changed(self): pass def reset(self): @@ -140,47 +143,52 @@ class PanelBase(ibus.Object): self.__proxy.CursorDown() def property_activate(self, prop_name, prop_state): + prop_name = dbus.String(prop_name) + prop_state = dbus.Int32(prop_state) self.__proxy.PropertyActivate(prop_name, prop_state) def property_show(self, prop_name): + prop_name = dbus.String(prop_name) self.__proxy.PropertyShow(prop_name) def property_hide(self, prop_name): + prop_name = dbus.String(prop_name) self.__proxy.PropertyHide(prop_name) class PanelProxy(interface.IPanel): - def __init__ (self, panel, dbusconn): - super(PanelProxy, self).__init__(dbusconn, IBUS_PANEL_PATH) - self.__dbusconn = dbusconn + def __init__ (self, panel, bus): + super(PanelProxy, self).__init__(bus.get_dbusconn(), IBUS_PATH_PANEL) + self.__bus = bus self.__panel = panel + self.__focus_ic = None def SetCursorLocation(self, x, y, w, h): self.__panel.set_cursor_location(x, y, w, h) - def UpdatePreedit(self, text, attrs, cursor_pos, show): - attrs = ibus.attr_list_from_dbus_value(attrs) - self.__panel.update_preedit(text, attrs, cursor_pos, show) + def UpdatePreeditText(self, text, cursor_pos, visible): + text = deserialize_object(text) + self.__panel.update_preedit_text(text, cursor_pos, visible) - def ShowPreedit(self): - self.__panel.show_preedit() + def ShowPreeditText(self): + self.__panel.show_preedit_text() - def HidePreedit(self): - self.__panel.hide_preedit() + def HidePreeditText(self): + self.__panel.hide_preedit_text() - def UpdateAuxString(self, text, attrs, show): - attrs = ibus.attr_list_from_dbus_value(attrs) - self.__panel.update_aux_string(text, attrs, show) + def UpdateAuxiliaryText(self, text, visible): + text = deserialize_object(text) + self.__panel.update_auxiliary_text(text, visible) - def ShowAuxString(self): - self.__panel.show_aux_string() + def ShowAuxiliaryText(self): + self.__panel.show_auxiliary_text() - def HideAuxString(self): - self.__panel.hide_aux_string() + def HideAuxiliaryText(self): + self.__panel.hide_auxiliary_text() - def UpdateLookupTable(self, lookup_table, show): - lookup_table = ibus.lookup_table_from_dbus_value(lookup_table) - self.__panel.update_lookup_table(lookup_table, show) + def UpdateLookupTable(self, lookup_table, visible): + lookup_table = deserialize_object(lookup_table) + self.__panel.update_lookup_table(lookup_table, visible) def ShowLookupTable(self): self.__panel.show_lookup_table() @@ -213,11 +221,11 @@ class PanelProxy(interface.IPanel): self.__panel.hide_language_bar() def RegisterProperties(self, props): - props = ibus.prop_list_from_dbus_value(props) + props = deserialize_object(props) self.__panel.register_properties(props) def UpdateProperty(self, prop): - prop = ibus.property_from_dbus_value(prop) + prop = deserialize_object(prop) self.__panel.update_property(prop) def FocusIn(self, ic): @@ -226,8 +234,8 @@ class PanelProxy(interface.IPanel): def FocusOut(self, ic): self.__panel.focus_out(ic) - def StatesChanged(self): - self.__panel.states_changed() + def StateChanged(self): + self.__panel.state_changed() def Reset(self): self.__panel.reset() @@ -238,3 +246,41 @@ class PanelProxy(interface.IPanel): def Destroy(self): self.__panel.destroy() +def test(): + import gtk + from bus import Bus + from inputcontext import InputContext + import factory + import attribute + import property + import text + import lookuptable + + class TestPanel(PanelBase): + def __init__(self): + self.__bus = Bus() + self.__bus.connect("disconnected", gtk.main_quit) + super(TestPanel, self).__init__(self.__bus) + self.__bus.request_name(IBUS_SERVICE_PANEL, 0) + + def focus_in(self, ic): + print "focus-in:", ic + context = InputContext(self.__bus, ic) + info = context.get_factory_info() + print "factory:", info.name + + def focus_out(self, ic): + print "focus-out:", ic + + def update_auxiliary_text(self, text, visible): + print "update-auxiliary-text:", text.text + + def update_lookup_table(self, table, visible): + print "update-lookup-table", table + + panel = TestPanel() + gtk.main() + + +if __name__ == "__main__": + test() ibus/panel.py @@ -30,11 +30,11 @@ __all__ = ( "PROP_STATE_INCONSISTENT", "Property", "PropList", - "property_from_dbus_value", - "prop_list_from_dbus_value", ) import dbus +from text import Text +from serializable import * PROP_TYPE_NORMAL = 0 PROP_TYPE_TOGGLE = 1 @@ -52,18 +52,18 @@ def _to_unicode(text): if isinstance(text, str): return unicode(text, "utf8") raise TypeError("text must be instance of unicode or str") +def _to_text(text): + if isinstance(text, Text): + return text + text = _to_unicode(text) + return Text(text) -class Property(object): - def __init__(self, name, - type = PROP_TYPE_NORMAL, - label = u"", - icon = u"", - tooltip = u"", - sensitive = True, - visible = True, - state = PROP_STATE_UNCHECKED): +class Property(Serializable): + __NAME__ = "IBusProperty" + def __init__(self, key="", type=PROP_TYPE_NORMAL, label=u"", icon=u"", tooltip=u"", + sensitive=True, visible=True, state=PROP_STATE_UNCHECKED): super(Property, self).__init__() - self.__name = _to_unicode(name) + self.__key = _to_unicode(key) self.__type = type self.label = label self.icon = icon @@ -79,14 +79,14 @@ class Property(object): def get_sub_props(self): return self.__sub_props - def get_name(self): - return self.__name + def get_key(self): + return self.__key def get_type(self): return self.__type def set_label(self, label): - self.__label = _to_unicode(label) + self.__label = _to_text(label) def get_label(self): return self.__label @@ -98,7 +98,7 @@ class Property(object): return self.__icon def set_tooltip(self, tooltip): - self.__tooltip = _to_unicode(tooltip) + self.__tooltip = _to_text(tooltip) def get_tooltip(self): return self.__tooltip @@ -121,7 +121,7 @@ class Property(object): def get_visible(self): return self.__visible - name = property(get_name) + key = property(get_key) type = property(get_type) label = property(get_label, set_label) icon = property(get_icon, set_icon) @@ -146,38 +146,37 @@ class Property(object): return self.__sub_props.is_same(prop.__sub_props, test_all) - def to_dbus_value(self): - sub_props = self.__sub_props.to_dbus_value() - values = (dbus.String(self.__name), - dbus.UInt32(self.__type), - dbus.String(self.__label), - dbus.String(self.__icon), - dbus.String(self.__tooltip), - dbus.Boolean(self.__sensitive), - dbus.Boolean(self.__visible), - dbus.UInt32(self.__state), - sub_props) - return dbus.Struct(values) - - def from_dbus_value(self, value): - self.__name, \ - self.__type, \ - self.__label, \ - self.__icon, \ - self.__tooltip, \ - self.__sensitive, \ - self.__visible, \ - self.__state, \ - props = value - - self.__sub_props = prop_list_from_dbus_value(props) - -def property_from_dbus_value(value): - p = Property("") - p.from_dbus_value(value) - return p - -class PropList(object): + def serialize(self, struct): + super(Property, self).serialize(struct) + struct.append(dbus.String(self.__key)) + struct.append(dbus.UInt32(self.__type)) + struct.append(serialize_object(self.__label)) + struct.append(dbus.String(self.__icon)) + struct.append(serialize_object(self.__tooltip)) + struct.append(dbus.Boolean(self.__sensitive)) + struct.append(dbus.Boolean(self.__visible)) + struct.append(dbus.UInt32(self.__state)) + sub_props = serialize_object(self.__sub_props) + struct.append(sub_props) + + def deserialize(self, struct): + super(Property, self).deserialize(struct) + self.__key = struct.pop(0) + self.__type = struct.pop(0) + self.__label = deserialize_object(struct.pop(0)) + self.__icon = struct.pop(0) + self.__tooltip = deserialize_object(struct.pop(0)) + self.__sensitive = deserialize_object(struct.pop(0)) + self.__visible = struct.pop(0) + self.__state = struct.pop(0) + props = struct.pop(0) + + self.__sub_props = deserialize_object(props) + +serializable_register(Property) + +class PropList(Serializable): + __NAME__ = "IBusPropList" def __init__(self): super(PropList, self).__init__() self.__props = [] @@ -203,14 +202,14 @@ class PropList(object): return False return False - def to_dbus_value(self): - props = map(lambda p: p.to_dbus_value(), self.__props) - return dbus.Array(props, signature = "v") + def serialize(self, struct): + super(PropList, self).serialize(struct) + props = map(lambda p: serialize_object(p), self.__props) + struct.append (dbus.Array(props, signature = "v")) - def from_dbus_value(self, value): - props = [] - for p in value: - props.append(property_from_dbus_value(p)) + def deserialize(self, struct): + super(PropList, self).deserialize(struct) + props = map(lambda v: deserialize_object(v), struct.pop(0)) self.__props = props def __iter__(self): @@ -219,10 +218,7 @@ class PropList(object): def __getitem__(self, i): return self.__props.__getitem__(i) -def prop_list_from_dbus_value(value): - props = PropList() - props.from_dbus_value(value) - return props +serializable_register(PropList) def test(): props = PropList() @@ -230,18 +226,9 @@ def test(): props.append(Property(u"b")) props.append(Property(u"c")) props.append(Property(u"d")) - value = props.to_dbus_value() - print prop_list_from_dbus_value(value) - - p = Property(u"z") - p.set_sub_props(props) - props = PropList() - props.append(p) - value = props.to_dbus_value() - print prop_list_from_dbus_value(value) - p.label = u"a" - p.label = "a" - p.label = 1 + value = serialize_object(props) + props = deserialize_object(value) + print props if __name__ == "__main__": test() ibus/property.py @@ -11,3 +11,8 @@ insert-header.sin quot.sed remove-potcdate.sed remove-potcdate.sin +ja.gmo +pa.gmo +zh_CN.gmo +ibus.pot +stamp-po po/.gitignore @@ -19,7 +19,7 @@ ./ibus/lang.py ./ibus/lookuptable.py ./ibus/property.py -./ibus/gtk.py +./ibus/_gtk.py ./ibus/ascii.py ./ibus/factory.py ./ui/gtk/menu.py @@ -31,20 +31,6 @@ ./ui/gtk/panel.py ./ui/gtk/propitem.py ./ui/gtk/languagebar.py -./gconf/main.py -./gconf/config.py ./setup/main.py ./setup/keyboardshortcut.py -./daemon/bus.py -./daemon/register.py -./daemon/contextmanager.py -./daemon/ibusdaemon.py -./daemon/factorymanager.py -./daemon/engine.py -./daemon/panel.py -./daemon/config.py -./daemon/inputcontext.py -./daemon/lookuptable.py -./daemon/enginefactory.py -./daemon/connection.py ./setup/setup.glade po/POTFILES.in @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ibus VERSION\n" "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n" -"POT-Creation-Date: 2008-10-19 09:45+0800\n" +"POT-Creation-Date: 2009-02-05 10:29+0800\n" "PO-Revision-Date: 2008-08-28 17:31+0900\n" "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n" "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n" @@ -16,20 +16,20 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ibus/lang.py:40 ui/gtk/panel.py:294 ui/gtk/panel.py:295 ui/gtk/panel.py:296 -#: ui/gtk/panel.py:297 setup/main.py:361 setup/main.py:362 setup/main.py:363 +#: ibus/lang.py:40 ui/gtk/panel.py:307 ui/gtk/panel.py:308 ui/gtk/panel.py:309 +#: ui/gtk/panel.py:310 msgid "Other" msgstr "" -#: ui/gtk/panel.py:94 +#: ui/gtk/panel.py:99 msgid "iBus - Running" msgstr "iBus - 実行中" -#: ui/gtk/panel.py:356 +#: ui/gtk/panel.py:370 msgid "IBus is an intelligent input bus for Linux/Unix." msgstr "" -#: ui/gtk/panel.py:360 +#: ui/gtk/panel.py:374 msgid "translator-credits" msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>" @@ -37,23 +37,23 @@ msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>" msgid "Switch engine" msgstr "" -#: setup/main.py:100 +#: setup/main.py:99 msgid "trigger" msgstr "トリガー" -#: setup/main.py:110 +#: setup/main.py:109 msgid "next engine" msgstr "次のエンジン" -#: setup/main.py:120 +#: setup/main.py:119 msgid "prev engine" msgstr "前のエンジン" -#: setup/main.py:165 +#: setup/main.py:197 msgid "IBus daemon is not started. Do you want to start it now?" msgstr "IBus デーモンが動いていません。起動しますか？" -#: setup/main.py:180 +#: setup/main.py:212 msgid "" "IBus has been started! If you can not use IBus, please add below lines in " "$HOME/.bashrc, and relogin your desktop.\n" @@ -67,19 +67,7 @@ msgstr "" " export XMODIFIERS=@im=ibus\n" " export QT_IM_MODULE=ibus" -#: setup/main.py:202 setup/setup.glade:368 -msgid "Engine" -msgstr "エンジン" - -#: setup/main.py:229 -msgid "Started" -msgstr "開始" - -#: setup/main.py:239 -msgid "Preload" -msgstr "プリロード" - -#: setup/main.py:249 +#: setup/main.py:227 #, python-format msgid "Select keyboard shortcut for %s" msgstr "%s のキーボードショートカットを選択" @@ -108,25 +96,6 @@ msgstr "" msgid "Please press a key (or a key combination)" msgstr "キーもしくはキーの組み合わせを入力してください" -#: daemon/bus.py:221 -msgid "Cannot enable input engine" -msgstr "" - -#: daemon/bus.py:222 -msgid "" -"IBus can not enable input engine, because IBus does not load any input " -"engines!\n" -"Please use ibus-setup program to load some input engines." -msgstr "" - -#: daemon/bus.py:224 -msgid "Setup" -msgstr "" - -#: daemon/bus.py:224 -msgid "Don't show this again" -msgstr "" - #: setup/setup.glade:7 msgid "IBus - Setup" msgstr "IBus - セットアップ" @@ -183,7 +152,28 @@ msgstr "" msgid "General" msgstr "一般" -#: setup/setup.glade:385 +#: setup/setup.glade:399 +msgid "gtk-add" +msgstr "" + +#: setup/setup.glade:409 +#, fuzzy +msgid "gtk-remove" +msgstr "gtk-close" + +#: setup/setup.glade:422 +msgid "gtk-go-up" +msgstr "" + +#: setup/setup.glade:435 +msgid "gtk-go-down" +msgstr "" + +#: setup/setup.glade:460 +msgid "Engine" +msgstr "エンジン" + +#: setup/setup.glade:477 msgid "" "<big><b>iBus</b></big>\n" "<small>The intelligent input bus</small>\n" @@ -193,10 +183,16 @@ msgid "" "\n" msgstr "" -#: setup/setup.glade:410 +#: setup/setup.glade:502 msgid "About" msgstr "About" -#: setup/setup.glade:432 +#: setup/setup.glade:524 msgid "gtk-close" msgstr "gtk-close" + +#~ msgid "Started" +#~ msgstr "開始" + +#~ msgid "Preload" +#~ msgstr "プリロード" po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ibus\n" "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n" -"POT-Creation-Date: 2008-10-19 09:45+0800\n" +"POT-Creation-Date: 2009-02-05 10:29+0800\n" "PO-Revision-Date: 2008-10-17 14:15+0530\n" "Last-Translator: Amanpreet Singh <aalam@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-l10n@lists.sf.net>\n" @@ -16,20 +16,20 @@ msgstr "" "X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ibus/lang.py:40 ui/gtk/panel.py:294 ui/gtk/panel.py:295 ui/gtk/panel.py:296 -#: ui/gtk/panel.py:297 setup/main.py:361 setup/main.py:362 setup/main.py:363 +#: ibus/lang.py:40 ui/gtk/panel.py:307 ui/gtk/panel.py:308 ui/gtk/panel.py:309 +#: ui/gtk/panel.py:310 msgid "Other" msgstr "ਹੋਰ" -#: ui/gtk/panel.py:94 +#: ui/gtk/panel.py:99 msgid "iBus - Running" msgstr "iBus -  ਚੱਲ ਰਿਹਾ ਹੈ" -#: ui/gtk/panel.py:356 +#: ui/gtk/panel.py:370 msgid "IBus is an intelligent input bus for Linux/Unix." msgstr "iBus ਲੀਨਕਸ/ਯੂਨੈਕਸ ਲਈ ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ ਹੈ।" -#: ui/gtk/panel.py:360 +#: ui/gtk/panel.py:374 msgid "translator-credits" msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ" @@ -37,23 +37,23 @@ msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ" msgid "Switch engine" msgstr "ਇੰਜਣ ਬਦਲੋ" -#: setup/main.py:100 +#: setup/main.py:99 msgid "trigger" msgstr "ਟਰਿੱਗਰ" -#: setup/main.py:110 +#: setup/main.py:109 msgid "next engine" msgstr "ਅਗਲਾ ਇੰਜਣ" -#: setup/main.py:120 +#: setup/main.py:119 msgid "prev engine" msgstr "ਪਿਛਲਾ ਇੰਜਣ" -#: setup/main.py:165 +#: setup/main.py:197 msgid "IBus daemon is not started. Do you want to start it now?" msgstr "iBus ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: setup/main.py:180 +#: setup/main.py:212 msgid "" "IBus has been started! If you can not use IBus, please add below lines in " "$HOME/.bashrc, and relogin your desktop.\n" @@ -66,19 +66,7 @@ msgstr "" "
 export XMODIFIERS=@im=ibus\n" "
 export QT_IM_MODULE=ibus" -#: setup/main.py:202 setup/setup.glade:368 -msgid "Engine" -msgstr "ਇੰਜਣ" - -#: setup/main.py:229 -msgid "Started" -msgstr "ਚਾਲੂ ਹੈ" - -#: setup/main.py:239 -msgid "Preload" -msgstr "ਪ੍ਰੀ-ਲੋਡ" - -#: setup/main.py:249 +#: setup/main.py:227 #, python-format msgid "Select keyboard shortcut for %s" msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ" @@ -107,28 +95,6 @@ msgstr "" msgid "Please press a key (or a key combination)" msgstr "ਕੋਈ ਵੀ ਸਵਿੱਚ ਦੱਬੋ (ਜਾਂ ਸਵਿੱਚ ਜੋੜ)" -#: daemon/bus.py:221 -msgid "Cannot enable input engine" -msgstr "ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ" - -#: daemon/bus.py:222 -msgid "" -"IBus can not enable input engine, because IBus does not load any input " -"engines!\n" -"Please use ibus-setup program to load some input engines." -msgstr "" -"iBus ਕੋਈ ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਹੈ, ਕਿਉਂਕਿ ਆਈ-ਬੱਸ ਕਿਸੇ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦੀ " -"ਹੈ!\n" -"
ਕੁਝ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਕਰਨ ਵਾਸਤੇ ibus-setup ਪਰੋਗਰਾਮ ਵਰਤੋਂ।" - -#: daemon/bus.py:224 -msgid "Setup" -msgstr "ਸੈੱਟਅੱਪ" - -#: daemon/bus.py:224 -msgid "Don't show this again" -msgstr "ਇਹ ਮੁੜ ਨਾ ਵੇਖਾਓ" - #: setup/setup.glade:7 msgid "IBus - Setup" msgstr "IBus - ਸੈੱਟਅੱਪ" @@ -185,7 +151,28 @@ msgstr "<b>UI</b>" msgid "General" msgstr "ਆਮ" -#: setup/setup.glade:385 +#: setup/setup.glade:399 +msgid "gtk-add" +msgstr "" + +#: setup/setup.glade:409 +#, fuzzy +msgid "gtk-remove" +msgstr "gtk-close" + +#: setup/setup.glade:422 +msgid "gtk-go-up" +msgstr "" + +#: setup/setup.glade:435 +msgid "gtk-go-down" +msgstr "" + +#: setup/setup.glade:460 +msgid "Engine" +msgstr "ਇੰਜਣ" + +#: setup/setup.glade:477 msgid "" "<big><b>iBus</b></big>\n" "<small>The intelligent input bus</small>\n" @@ -201,10 +188,34 @@ msgstr "" "
\n" "
\n" -#: setup/setup.glade:410 +#: setup/setup.glade:502 msgid "About" msgstr "ਇਸ ਬਾਰੇ" -#: setup/setup.glade:432 +#: setup/setup.glade:524 msgid "gtk-close" msgstr "gtk-close" + +#~ msgid "Started" +#~ msgstr "ਚਾਲੂ ਹੈ" + +#~ msgid "Preload" +#~ msgstr "ਪ੍ਰੀ-ਲੋਡ" + +#~ msgid "Cannot enable input engine" +#~ msgstr "ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ" + +#~ msgid "" +#~ "IBus can not enable input engine, because IBus does not load any input " +#~ "engines!\n" +#~ "Please use ibus-setup program to load some input engines." +#~ msgstr "" +#~ "iBus ਕੋਈ ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਹੈ, ਕਿਉਂਕਿ ਆਈ-ਬੱਸ ਕਿਸੇ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕਰ " +#~ "ਸਕਦੀ ਹੈ!\n" +#~ "
ਕੁਝ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਕਰਨ ਵਾਸਤੇ ibus-setup ਪਰੋਗਰਾਮ ਵਰਤੋਂ।" + +#~ msgid "Setup" +#~ msgstr "ਸੈੱਟਅੱਪ" + +#~ msgid "Don't show this again" +#~ msgstr "ਇਹ ਮੁੜ ਨਾ ਵੇਖਾਓ" po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1.20080813\n" "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n" -"POT-Creation-Date: 2008-10-19 09:45+0800\n" +"POT-Creation-Date: 2009-02-05 10:29+0800\n" "PO-Revision-Date: 2008-08-13 21:59+0800\n" "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n" "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n" @@ -16,20 +16,20 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ibus/lang.py:40 ui/gtk/panel.py:294 ui/gtk/panel.py:295 ui/gtk/panel.py:296 -#: ui/gtk/panel.py:297 setup/main.py:361 setup/main.py:362 setup/main.py:363 +#: ibus/lang.py:40 ui/gtk/panel.py:307 ui/gtk/panel.py:308 ui/gtk/panel.py:309 +#: ui/gtk/panel.py:310 msgid "Other" msgstr "其他" -#: ui/gtk/panel.py:94 +#: ui/gtk/panel.py:99 msgid "iBus - Running" msgstr "iBus - 运行" -#: ui/gtk/panel.py:356 +#: ui/gtk/panel.py:370 msgid "IBus is an intelligent input bus for Linux/Unix." msgstr "" -#: ui/gtk/panel.py:360 +#: ui/gtk/panel.py:374 msgid "translator-credits" msgstr "Huang Peng <shawn.p.huang@gmail.com>" @@ -37,23 +37,23 @@ msgstr "Huang Peng <shawn.p.huang@gmail.com>" msgid "Switch engine" msgstr "切换引擎" -#: setup/main.py:100 +#: setup/main.py:99 msgid "trigger" msgstr "开关" -#: setup/main.py:110 +#: setup/main.py:109 msgid "next engine" msgstr "下一个引擎" -#: setup/main.py:120 +#: setup/main.py:119 msgid "prev engine" msgstr "上一个引擎" -#: setup/main.py:165 +#: setup/main.py:197 msgid "IBus daemon is not started. Do you want to start it now?" msgstr "IBus守护进程没有启动，您是否想现在启动它？" -#: setup/main.py:180 +#: setup/main.py:212 msgid "" "IBus has been started! If you can not use IBus, please add below lines in " "$HOME/.bashrc, and relogin your desktop.\n" @@ -66,19 +66,7 @@ msgstr "" " export XMODIFIERS=@im=ibus\n" " export QT_IM_MODULE=ibus" -#: setup/main.py:202 setup/setup.glade:368 -msgid "Engine" -msgstr "输入法引擎" - -#: setup/main.py:229 -msgid "Started" -msgstr "启动" - -#: setup/main.py:239 -msgid "Preload" -msgstr "预加载" - -#: setup/main.py:249 +#: setup/main.py:227 #, python-format msgid "Select keyboard shortcut for %s" msgstr "选择%s的快捷键" @@ -107,27 +95,6 @@ msgstr "" msgid "Please press a key (or a key combination)" msgstr "请按一个键盘按键（或者一个组合按键）" -#: daemon/bus.py:221 -msgid "Cannot enable input engine" -msgstr "不能启动输入引擎" - -#: daemon/bus.py:222 -msgid "" -"IBus can not enable input engine, because IBus does not load any input " -"engines!\n" -"Please use ibus-setup program to load some input engines." -msgstr "" -"IBus不能启动输入引擎，因为IBus没有加载任何输入引擎！\n" -"请运行ibus-setup程序，启动需要的输入法引擎。" - -#: daemon/bus.py:224 -msgid "Setup" -msgstr "设置" - -#: daemon/bus.py:224 -msgid "Don't show this again" -msgstr "不再显示该信息" - #: setup/setup.glade:7 msgid "IBus - Setup" msgstr "IBus - 设置" @@ -184,7 +151,27 @@ msgstr "<b>用户界面</b>" msgid "General" msgstr "通用" -#: setup/setup.glade:385 +#: setup/setup.glade:399 +msgid "gtk-add" +msgstr "" + +#: setup/setup.glade:409 +msgid "gtk-remove" +msgstr "" + +#: setup/setup.glade:422 +msgid "gtk-go-up" +msgstr "" + +#: setup/setup.glade:435 +msgid "gtk-go-down" +msgstr "" + +#: setup/setup.glade:460 +msgid "Engine" +msgstr "输入法引擎" + +#: setup/setup.glade:477 msgid "" "<big><b>iBus</b></big>\n" "<small>The intelligent input bus</small>\n" @@ -194,10 +181,33 @@ msgid "" "\n" msgstr "" -#: setup/setup.glade:410 +#: setup/setup.glade:502 msgid "About" msgstr "关于" -#: setup/setup.glade:432 +#: setup/setup.glade:524 msgid "gtk-close" msgstr "" + +#~ msgid "Started" +#~ msgstr "启动" + +#~ msgid "Preload" +#~ msgstr "预加载" + +#~ msgid "Cannot enable input engine" +#~ msgstr "不能启动输入引擎" + +#~ msgid "" +#~ "IBus can not enable input engine, because IBus does not load any input " +#~ "engines!\n" +#~ "Please use ibus-setup program to load some input engines." +#~ msgstr "" +#~ "IBus不能启动输入引擎，因为IBus没有加载任何输入引擎！\n" +#~ "请运行ibus-setup程序，启动需要的输入法引擎。" + +#~ msgid "Setup" +#~ msgstr "设置" + +#~ msgid "Don't show this again" +#~ msgstr "不再显示该信息" po/zh_CN.po @@ -1 +1,2 @@ ibus-setup +ibus-setup.desktop setup/.gitignore @@ -21,6 +21,9 @@ ibussetup_PYTHON = \ main.py \ + icon.py \ + enginecombobox.py \ + enginetreeview.py \ keyboardshortcut.py \ $(NULL) setup/Makefile.am @@ -80,7 +80,7 @@ class KeyboardShortcutSelection(gtk.VBox): table = gtk.Table(4, 2) self.__modifier_buttons = [] - self.__modifier_buttons.append(("Ctrl", gtk.CheckButton("_Ctrl"), gdk.CONTROL_MASK)) + self.__modifier_buttons.append(("Control", gtk.CheckButton("_Control"), gdk.CONTROL_MASK)) self.__modifier_buttons.append(("Alt", gtk.CheckButton("A_lt"), gdk.MOD1_MASK)) self.__modifier_buttons.append(("Shift", gtk.CheckButton("_Shift"), gdk.SHIFT_MASK)) self.__modifier_buttons.append(("Meta", gtk.CheckButton("_Meta"), gdk.META_MASK)) @@ -258,7 +258,7 @@ if __name__ == "__main__": dlg = KeyboardShortcutSelectionDialog( title = "Select test", buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK)) - dlg.add_shortcut("Ctrl+Shift+space") + dlg.add_shortcut("Control+Shift+space") dlg.set_shortcuts(None) print dlg.run() print dlg.get_shortcuts() setup/keyboardshortcut.py @@ -33,6 +33,9 @@ from os import path from xdg import BaseDirectory from gtk import gdk from gtk import glade +from enginecombobox import EngineComboBox +from enginetreeview import EngineTreeView +from icon import load_icon _ = lambda a : gettext.dgettext("ibus", a) N_ = lambda a : a @@ -75,12 +78,6 @@ class Setup(object): def __init_ui(self): # add icon search path - icon_theme = gtk.icon_theme_get_default() - dir = path.dirname(__file__) - icondir = path.join(dir, "..", "icons") - icon_theme.prepend_search_path(icondir) - - self.__dialog = self.__xml.get_widget("dialog_setup") # auto start ibus @@ -90,76 +87,111 @@ class Setup(object): # keyboard shortcut # trigger - shortcuts = self.__bus.config_get_value( - "general", "keyboard_shortcut_trigger", + self.__config = self.__bus.get_config() + shortcuts = self.__config.get_value( + "general/hotkey", "trigger", ibus.CONFIG_GENERAL_SHORTCUT_TRIGGER_DEFAULT) + button = self.__xml.get_widget("button_trigger") entry = self.__xml.get_widget("entry_trigger") entry.set_text("; ".join(shortcuts)) button.connect("clicked", self.__shortcut_button_clicked_cb, - N_("trigger"), "general", "keyboard_shortcut_trigger", entry) + N_("trigger"), "general/hotkey", "trigger", entry) # next engine - shortcuts = self.__bus.config_get_value( - "general", "keyboard_shortcut_next_engine", + shortcuts = self.__config.get_value( + "general/hotkey", "next_engine", ibus.CONFIG_GENERAL_SHORTCUT_NEXT_ENGINE_DEFAULT) button = self.__xml.get_widget("button_next_engine") entry = self.__xml.get_widget("entry_next_engine") entry.set_text("; ".join(shortcuts)) button.connect("clicked", self.__shortcut_button_clicked_cb, - N_("next engine"), "general", "keyboard_shortcut_next_engine", entry) + N_("next engine"), "general/hotkey", "next_engine", entry) # prev engine - shortcuts = self.__bus.config_get_value( - "general", "keyboard_shortcut_prev_engine", + shortcuts = self.__config.get_value( + "general/hotkey", "prev_engine", ibus.CONFIG_GENERAL_SHORTCUT_PREV_ENGINE_DEFAULT) button = self.__xml.get_widget("button_prev_engine") entry = self.__xml.get_widget("entry_prev_engine") entry.set_text("; ".join(shortcuts)) button.connect("clicked", self.__shortcut_button_clicked_cb, - N_("prev engine"), "general", "keyboard_shortcut_prev_engine", entry) - - + N_("prev engine"), "general/hotkey", "prev_engine", entry) # lookup table orientation self.__combobox_lookup_table_orientation = self.__xml.get_widget("combobox_lookup_table_orientation") self.__combobox_lookup_table_orientation.set_active( - self.__bus.config_get_value("panel", "lookup_table_orientation", 0)) + self.__config.get_value("panel", "lookup_table_orientation", 0)) self.__combobox_lookup_table_orientation.connect("changed", self.__combobox_lookup_table_orientation_changed_cb) # auto hide self.__checkbutton_auto_hide = self.__xml.get_widget("checkbutton_auto_hide") self.__checkbutton_auto_hide.set_active( - self.__bus.config_get_value("panel", "auto_hide", False)) + self.__config.get_value("panel", "auto_hide", False)) self.__checkbutton_auto_hide.connect("toggled", self.__checkbutton_auto_hide_toggled_cb) # custom font self.__checkbutton_custom_font = self.__xml.get_widget("checkbutton_custom_font") self.__checkbutton_custom_font.set_active( - self.__bus.config_get_value("panel", "use_custom_font", False)) + self.__config.get_value("panel", "use_custom_font", False)) self.__checkbutton_custom_font.connect("toggled", self.__checkbutton_custom_font_toggled_cb) self.__fontbutton_custom_font = self.__xml.get_widget("fontbutton_custom_font") - if self.__bus.config_get_value("panel", "use_custom_font", False): + if self.__config.get_value("panel", "use_custom_font", False): self.__fontbutton_custom_font.set_sensitive(True) else: self.__fontbutton_custom_font.set_sensitive(False) font_name = gtk.settings_get_default().get_property("gtk-font-name") font_name = unicode(font_name, "utf-8") - font_name = self.__bus.config_get_value("panel", "custom_font", font_name) + font_name = self.__config.get_value("panel", "custom_font", font_name) self.__fontbutton_custom_font.connect("notify::font-name", self.__fontbutton_custom_font_notify_cb) self.__fontbutton_custom_font.set_font_name(font_name) - self.__init_engine_view() + # init engine page + self.__engines = self.__bus.list_engines() + self.__combobox = EngineComboBox(self.__engines) + self.__combobox.show() + self.__xml.get_widget("alignment_engine_combobox").add(self.__combobox) + + tmp_dict = {} + for e in self.__engines: + tmp_dict[e.name] = e + engine_names = self.__config.get_value("general", "preload_engines", []) + engines = [] + for n in engine_names: + if n in tmp_dict: + engines.append(tmp_dict[n]) + self.__treeview = EngineTreeView(engines) + self.__treeview.show() + self.__xml.get_widget("scrolledwindow_engine_treeview").add(self.__treeview) + + self.__treeview.connect("changed", self.__treeview_changed_cb) + + button = self.__xml.get_widget("button_engine_add") + button.connect("clicked", + lambda *args:self.__treeview.prepend_engine(self.__combobox.get_active_engine())) + button = self.__xml.get_widget("button_engine_remove") + button.connect("clicked", lambda *args:self.__treeview.remove_engine()) + button = self.__xml.get_widget("button_engine_up") + button.connect("clicked", lambda *args:self.__treeview.move_up_engine()) + + button = self.__xml.get_widget("button_engine_down") + button.connect("clicked", lambda *args:self.__treeview.move_down_engine()) + + def __treeview_changed_cb(self, treeview): + engines = self.__treeview.get_engines() + engine_names = map(lambda e: e.name, engines) + self.__config.set_list("general", "preload_engines", engine_names, "s") def __init_bus(self): try: self.__bus = ibus.Bus() # self.__bus.connect("config-value-changed", self.__config_value_changed_cb) - self.__bus.connect("config-reloaded", self.__config_reloaded_cb) - self.__bus.config_add_watch("/general") - self.__bus.config_add_watch("/panel") + # self.__bus.connect("config-reloaded", self.__config_reloaded_cb) + # self.__bus.config_add_watch("/general") + # self.__bus.config_add_watch("/general/hotkey") + # self.__bus.config_add_watch("/panel") except: while self.__bus == None: message = _("IBus daemon is not started. Do you want to start it now?") @@ -190,60 +222,6 @@ class Setup(object): dlg.destroy() self.__flush_gtk_events() - def __init_engine_view(self): - # engines tree - self.__tree = self.__xml.get_widget("treeview_engines") - self.__preload_engines = set(self.__bus.config_get_value("general", "preload_engines", [])) - model = self.__create_model() - self.__tree.set_model(model) - - # column for engine - column = gtk.TreeViewColumn() - column.set_title(_("Engine")) - column.set_resizable(True) - column.set_min_width(120) - - renderer = gtk.CellRendererPixbuf() - renderer.set_property("xalign", 0.5) - - column.pack_start(renderer, False) - column.set_attributes(renderer, pixbuf = COLUMN_ICON, visible = COLUMN_VISIBLE) - - renderer = gtk.CellRendererText() - renderer.set_property("xalign", 0.0) - renderer.set_property("ellipsize", pango.ELLIPSIZE_END) - - # column.set_clickable(True) - column.pack_start(renderer) - column.set_attributes(renderer, text = COLUMN_NAME) - - self.__tree.append_column(column) - - # column for started - renderer = gtk.CellRendererToggle() - renderer.set_data('column', COLUMN_ENABLE) - renderer.set_property("xalign", 0.5) - renderer.connect("toggled", self.__item_started_column_toggled_cb, model) - - #col_offset = gtk.TreeViewColumn("Holiday", renderer, text=HOLIDAY_NAME) - column = gtk.TreeViewColumn(_("Started"), renderer, active = COLUMN_ENABLE, visible = COLUMN_VISIBLE) - column.set_resizable(True) - self.__tree.append_column(column) - - # column for preload - renderer = gtk.CellRendererToggle() - renderer.set_data('column', COLUMN_PRELOAD) - renderer.set_property("xalign", 0.5) - renderer.connect("toggled", self.__item_preload_column_toggled_cb, model) - - column = gtk.TreeViewColumn(_("Preload"), renderer, active = COLUMN_PRELOAD, visible = COLUMN_VISIBLE) - column.set_resizable(True) - self.__tree.append_column(column) - - renderer = gtk.CellRendererText() - column = gtk.TreeViewColumn("", renderer) - self.__tree.append_column(column) - def __shortcut_button_clicked_cb(self, button, name, section, _name, entry): buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK) title = _("Select keyboard shortcut for %s") % _(name) @@ -259,7 +237,7 @@ class Setup(object): dialog.destroy() if id != gtk.RESPONSE_OK: return - self.__bus.config_set_value(section, _name, shortcuts) + self.__config.set_value(section, _name, shortcuts) entry.set_text("; ".join(shortcuts)) @@ -309,94 +287,15 @@ class Setup(object): if data[DATA_PRELOAD]: if engine not in self.__preload_engines: self.__preload_engines.add(engine) - self.__bus.config_set_list("general", "preload_engines", list(self.__preload_engines), "s") + self.__config.set_list("general", "preload_engines", list(self.__preload_engines), "s") else: if engine in self.__preload_engines: self.__preload_engines.remove(engine) - self.__bus.config_set_list("general", "preload_engines", list(self.__preload_engines), "s") + self.__config.set_list("general", "preload_engines", list(self.__preload_engines), "s") # set new value model.set(iter, COLUMN_PRELOAD, data[DATA_PRELOAD]) - def __load_icon(self, icon, icon_size): - pixbuf = None - try: - pixbuf = gdk.pixbuf_new_from_file(icon) - w, h = pixbuf.get_width(), pixbuf.get_height() - rate = max(w, h) / float(icon_size) - w = int(w / rate) - h = int(h / rate) - pixbuf = pixbuf.scale_simple(w, h, gdk.INTERP_BILINEAR) - except: - pass - if pixbuf == None: - try: - theme = gtk.icon_theme_get_default() - pixbuf = theme.load_icon(icon, icon_size, 0) - except: - pass - return pixbuf - - def __create_model(self): - # create tree store - model = gtk.TreeStore( - gobject.TYPE_STRING, - gobject.TYPE_BOOLEAN, - gobject.TYPE_BOOLEAN, - gobject.TYPE_BOOLEAN, - gdk.Pixbuf, - gobject.TYPE_PYOBJECT) - - langs = dict() - - self.__bus.register_reload_engines() - for name, local_name, lang, icon, author, credits, _exec, started in self.__bus.register_list_engines(): - _lang = ibus.get_language_name(lang) - if _lang not in langs: - langs[_lang] = list() - langs[_lang].append([name, local_name, lang, icon, author, credits, _exec, started]) - - keys = langs.keys() - keys.sort() - if _("Other") in keys: - keys.remove(_("Other")) - keys.append(_("Other")) - - icon_size = gtk.icon_size_lookup(gtk.ICON_SIZE_LARGE_TOOLBAR)[0] - pixbuf_missing = self.__load_icon("engine-default", icon_size) - if pixbuf_missing == None: - pixbuf_missing = self.__load_icon("gtk-missing-image", icon_size) - - for key in keys: - iter = model.append(None) - model.set(iter, - COLUMN_NAME, key, - COLUMN_ENABLE, False, - COLUMN_PRELOAD, False, - COLUMN_VISIBLE, False, - COLUMN_ICON, None, - COLUMN_DATA, None) - langs[key].sort() - - for name, local_name, lang, icon, author, credits, _exec, started in langs[key]: - child_iter = model.append(iter) - is_preload = "%s:%s" % (lang, name) in self.__preload_engines - - pixbuf = self.__load_icon(icon, icon_size) - if pixbuf == None: - pixbuf = pixbuf_missing - - model.set(child_iter, - COLUMN_NAME, local_name, - COLUMN_ENABLE, started, - COLUMN_PRELOAD, is_preload, - COLUMN_VISIBLE, True, - COLUMN_ICON, pixbuf, - COLUMN_DATA, - [name, local_name, lang, icon, author, credits, _exec, started, is_preload]) - - return model - def __is_auto_start(self): link_file = path.join(BaseDirectory.xdg_config_home, "autostart/ibus.desktop") ibus_desktop = path.join(os.getenv("IBUS_PREFIX"), "share/applications/ibus.desktop") @@ -425,27 +324,27 @@ class Setup(object): os.symlink(ibus_desktop, link_file) def __combobox_lookup_table_orientation_changed_cb(self, combobox): - self.__bus.config_set_value( + self.__config.set_value( "panel", "lookup_table_orientation", self.__combobox_lookup_table_orientation.get_active()) def __checkbutton_auto_hide_toggled_cb(self, button): - self.__bus.config_set_value( + self.__config.set_value( "panel", "auto_hide", self.__checkbutton_auto_hide.get_active()) def __checkbutton_custom_font_toggled_cb(self, button): if self.__checkbutton_custom_font.get_active(): self.__fontbutton_custom_font.set_sensitive(True) - self.__bus.config_set_value("panel", "use_custom_font", True) + self.__config.set_value("panel", "use_custom_font", True) else: self.__fontbutton_custom_font.set_sensitive(False) - self.__bus.config_set_value("panel", "use_custom_font", False) + self.__config.set_value("panel", "use_custom_font", False) def __fontbutton_custom_font_notify_cb(self, button, arg): font_name = self.__fontbutton_custom_font.get_font_name() font_name = unicode(font_name, "utf-8") - self.__bus.config_set_value("panel", "custom_font", font_name) + self.__config.set_value("panel", "custom_font", font_name) def __config_value_changed_cb(self, bus, section, name, value): pass setup/main.py @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Thu Oct 9 11:25:43 2008 --> +<!--Generated with glade3 3.4.5 on Wed Feb 4 15:58:20 2009 --> <glade-interface> <widget class="GtkDialog" id="dialog_setup"> <property name="border_width">5</property> @@ -340,20 +340,112 @@ Vertical</property> <property name="left_padding">2</property> <property name="right_padding">2</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="width_request">300</property> - <property name="height_request">350</property> + <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTreeView" id="treeview_engines"> + <widget class="GtkAlignment" id="alignment6"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="reorderable">True</property> + <property name="top_padding">4</property> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkAlignment" id="alignment_engine_combobox"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </widget> + </child> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow_engine_treeview"> + <property name="width_request">240</property> + <property name="height_request">350</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="top_padding">8</property> + <property name="bottom_padding">8</property> + <property name="left_padding">8</property> + <property name="right_padding">8</property> + <child> + <widget class="GtkVButtonBox" id="vbuttonbox1"> + <property name="visible">True</property> + <property name="spacing">5</property> + <property name="layout_style">GTK_BUTTONBOX_START</property> + <child> + <widget class="GtkButton" id="button_engine_add"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">gtk-add</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + </widget> + </child> + <child> + <widget class="GtkButton" id="button_engine_remove"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">gtk-remove</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="button_engine_up"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">gtk-go-up</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="button_engine_down"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">gtk-go-down</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> </widget> + <packing> + <property name="position">1</property> + </packing> </child> </widget> </child> setup/setup.glade @@ -1 +1,2 @@ ibus-ui-gtk +gtkpanel.xml ui/gtk/.gitignore @@ -31,10 +31,16 @@ ui_gtk_PYTHON = \ propitem.py \ toolitem.py \ $(NULL) - ui_gtkdir = $(pkgdatadir)/ui/gtk -bin_SCRIPTS = ibus-ui-gtk +libexec_SCRIPTS = \ + ibus-ui-gtk \ + $(NULL) + +component_DATA = \ + gtkpanel.xml \ + $(NULL) +componentdir = $(pkgdatadir)/component CLEANFILES = \ *.pyc \ @@ -42,9 +48,11 @@ CLEANFILES = \ EXTRA_DIST = \ ibus-ui-gtk.in \ + gtkpanel.xml.in \ $(NULL) test: $(ENV) DBUS_DEBUG=true \ + IBUS_PREFIX=@prefix@ \ PYTHONPATH=$(top_srcdir) \ $(PYTHON) $(srcdir)/main.py ui/gtk/Makefile.am @@ -24,7 +24,7 @@ import gtk.gdk as gdk import gobject import pango import ibus -from ibus.gtk import PangoAttrList +from ibus._gtk import PangoAttrList class Label(gtk.Label): pass gobject.type_register(Label, "IBusPanelLabel") @@ -260,58 +260,53 @@ class CandidatePanel(gtk.VBox): # self.hide_all() # self.show_all() - def show_preedit(self): + def show_preedit_text(self): self.__preedit_visible = True self.__preedit_label.show() self.__check_show_states() - def hide_preedit(self): + def hide_preedit_text(self): self.__preedit_visible = False self.__preedit_label.hide() self.__check_show_states() - def update_preedit(self, text, attrs, cursor_pos, visible): - if attrs: - attrs = PangoAttrList(attrs, text) + def update_preedit_text(self, text, cursor_pos, visible): + attrs = PangoAttrList(text.attributes, text.text) if visible: - self.show_preedit() + self.show_preedit_text() else: - self.hide_preedit() - self.__preedit_string = text - self.__preedit_label.set_text(text) - if attrs == None: - attrs = pango.AttrList() + self.hide_preedit_text() + self.__preedit_stribg = text.text + self.__preedit_label.set_text(text.text) self.__preedit_attrs = attrs self.__preedit_label.set_attributes(attrs) - def show_aux_string(self): + def show_auxiliary_text(self): self.__aux_string_visible = True self.__aux_label.show() self.__check_show_states() - def hide_aux_string(self): + def hide_auxiliary_text(self): self.__aux_string_visible = False self.__aux_label.hide() self.__check_show_states() - def update_aux_string(self, text, attrs, show): - attrs = PangoAttrList(attrs, text) + def update_auxiliary_text(self, text, show): + attrs = PangoAttrList(text.attributes, text.text) if show: - self.show_aux_string() + self.show_auxiliary_text() else: - self.hide_aux_string() + self.hide_auxiliary_text() - self.__aux_string = text - self.__aux_label.set_text(text) - if attrs == None: - attrs = pango.AttrList() + self.__aux_string = text.text + self.__aux_label.set_text(text.text) self.__aux_attrs = attrs self.__aux_label.set_attributes(attrs) def __refresh_candidates(self): - candidates = self.__lookup_table.get_canidates_in_current_page() - candidates = map(lambda x: (x[0], PangoAttrList(x[1], x[0]) if x[1] else None), candidates) + candidates = self.__lookup_table.get_candidates_in_current_page() + candidates = map(lambda x: (x.text, PangoAttrList(x.attributes, x.text)), candidates) self.__candidate_area.set_candidates(candidates, self.__lookup_table.get_cursor_pos_in_current_page(), self.__lookup_table.is_cursor_visible() @@ -372,8 +367,8 @@ class CandidatePanel(gtk.VBox): self.emit("hide") def reset(self): - self.update_preedit("", None, 0, False) - self.update_aux_string("", None, False) + self.update_preedit_text(ibus.Text(""), 0, False) + self.update_auxiliary_text(ibus.Text(""), False) self.update_lookup_table(None, False) self.hide() ui/gtk/candidatepanel.py @@ -33,9 +33,6 @@ class IconWidget(gtk.Image): theme = gtk.icon_theme_get_default() pixbuf = theme.load_icon(icon, size, 0) except: - pass - - if pixbuf == None: theme = gtk.icon_theme_get_default() pixbuf = theme.load_icon(gtk.STOCK_MISSING_IMAGE, size, 0) ui/gtk/icon.py @@ -78,7 +78,7 @@ class LanguageBar(gtk.Toolbar): self.insert(self.__handle, -1) # create input methods menu - prop = ibus.Property(name = "", type = ibus.PROP_TYPE_TOGGLE, icon = "ibus", tooltip = _("Switch engine")) + prop = ibus.Property(key = "", type = ibus.PROP_TYPE_TOGGLE, icon = "ibus", tooltip = _("Switch engine")) self.__im_menu = ToggleToolButton(prop) self.__im_menu.set_homogeneous(False) self.__im_menu.connect("toggled", self.__im_menu_toggled_cb) @@ -192,6 +192,8 @@ class LanguageBar(gtk.Toolbar): self.__im_menu.set_sensitive(False) if self.__auto_hide: self.hide_all() + else: + self.show_all() gobject.type_register(LanguageBar, "IBusLanguageBar") ui/gtk/languagebar.py @@ -31,19 +31,16 @@ import notifications class UIApplication: def __init__ (self): self.__bus = ibus.Bus() - self.__bus.connect("destroy", self.__bus_destroy_cb) + self.__bus.connect("disconnected", gtk.main_quit) self.__panel = panel.Panel(self.__bus) - self.__notify = notifications.Notifications(self.__bus) - self.__notify.set_status_icon(self.__panel.get_status_icon()) + self.__bus.request_name(ibus.IBUS_SERVICE_PANEL, 0) + # self.__notify = notifications.Notifications(self.__bus) + # self.__notify.set_status_icon(self.__panel.get_status_icon()) def run(self): gtk.main() - def __bus_destroy_cb(self, _ibus): - gtk.main_quit() - - def launch_panel(): # gtk.settings_get_default().props.gtk_theme_name = "/home/phuang/.themes/aud-Default/gtk-2.0/gtkrc" # gtk.rc_parse("./themes/default/gtkrc") ui/gtk/main.py @@ -107,7 +107,7 @@ class ImageMenuItem (gtk.ImageMenuItem, PropItem): self.hide_all () def do_activate (self): - self.emit ("property-activate", self._prop.name, self._prop.state) + self.emit ("property-activate", self._prop.key, self._prop.state) def property_changed (self): self.set_sensitive (self._prop.sensitive) @@ -145,7 +145,7 @@ class CheckMenuItem (gtk.CheckMenuItem, PropItem): self._prop.state = ibus.PROP_STATE_CHECKED else: self._prop.state = ibus.PROP_STATE_UNCHECKED - self.emit ("property-activate", self._prop.name, self._prop.state) + self.emit ("property-activate", self._prop.key, self._prop.state) def property_changed (self): self.set_active (self._prop.state == ibus.PROP_STATE_CHECKED) @@ -167,7 +167,7 @@ class RadioMenuItem (gtk.RadioMenuItem, PropItem): } def __init__ (self, group, prop): - gtk.RadioMenuItem.__init__ (self, group, label = prop.label) + gtk.RadioMenuItem.__init__ (self, group, label = prop.label.text) PropItem.__init__ (self, prop) self.set_active (self._prop.state == ibus.PROP_STATE_CHECKED) @@ -194,7 +194,7 @@ class RadioMenuItem (gtk.RadioMenuItem, PropItem): self._prop.state = ibus.PROP_STATE_CHECKED else: self._prop.state = ibus.PROP_STATE_UNCHECKED - self.emit ("property-activate", self._prop.name, self._prop.state) + self.emit ("property-activate", self._prop.key, self._prop.state) class SeparatorMenuItem (gtk.SeparatorMenuItem, PropItem): __gsignals__ = { ui/gtk/menu.py @@ -34,17 +34,13 @@ from gettext import dgettext _ = lambda a : dgettext("ibus", a) N_ = lambda a : a -BUS_NOTIFICATIONS_NAME = "org.freedesktop.Notifications" -BUS_NOTIFICATIONS_PATH = "/org/freedesktop/Notifications" -BUS_NOTIFICATIONS_IFACE = "org.freedesktop.Notifications" - class Notifications(ibus.NotificationsBase): def __init__ (self, bus): super(Notifications, self).__init__(bus) self.__bus = bus try: self.__dbus = dbus.SessionBus() - self.__dbus.watch_name_owner(BUS_NOTIFICATIONS_NAME, + self.__dbus.watch_name_owner(ibus.IBUS_SERVICE_NOTIFICATIONS, self.__notifications_name_owner_changed_cb) except: self.__dbus = None @@ -52,7 +48,7 @@ class Notifications(ibus.NotificationsBase): self.__ids = set([]) self.__init_notifications() self.__status_icons = None - self.__bus.request_name(ibus.IBUS_NOTIFICATIONS_NAME, 0) + self.__bus.request_name(ibus.IBUS_SERVICE_NOTIFICATIONS, 0) def __notifications_name_owner_changed_cb(self, unique_name): if unique_name: @@ -66,13 +62,13 @@ class Notifications(ibus.NotificationsBase): try: self.__notifications = self.__dbus.get_object( - BUS_NOTIFICATIONS_NAME, BUS_NOTIFICATIONS_PATH) + ibus.IBUS_SERVICE_NOTIFICATIONS, ibus.IBUS_PATH_NOTIFICATIONS) self.__notifications.connect_to_signal("NotificationClosed", self.__notification_closed_cb, - dbus_interface=BUS_NOTIFICATIONS_IFACE) + dbus_interface=ibus.IBUS_IFACE_NOTIFICATIONS) self.__notifications.connect_to_signal("ActionInvoked", self.__action_invoked_cb, - dbus_interface=BUS_NOTIFICATIONS_IFACE) + dbus_interface=ibus.IBUS_IFACE_NOTIFICATIONS) self.__ids = set([]) except: self.__notifications = None ui/gtk/notifications.py @@ -55,6 +55,7 @@ class Panel(ibus.PanelBase): def __init__ (self, bus): super(Panel, self).__init__(bus) self.__bus = bus + self.__config = self.__bus.get_config() self.__focus_ic = None self.__setup_pid = 0 self.__prefix = os.getenv("IBUS_PREFIX") @@ -67,9 +68,9 @@ class Panel(ibus.PanelBase): signal.signal(signal.SIGCHLD, self.__sigchld_cb) # connect bus signal - self.__bus.connect("config-value-changed", self.__config_value_changed_cb) - self.__bus.connect("config-reloaded", self.__config_reloaded_cb) - self.__bus.config_add_watch("panel") + self.__config.connect("value-changed", self.__config_value_changed_cb) + self.__config.connect("reloaded", self.__config_reloaded_cb) + # self.__bus.config_add_watch("panel") # add icon search path icon_theme = gtk.icon_theme_get_default() @@ -101,28 +102,28 @@ class Panel(ibus.PanelBase): self.__config_load_lookup_table_orientation() self.__config_load_auto_hide() self.__config_load_custom_font() - self.__bus.request_name(ibus.panel.IBUS_PANEL_NAME, 0) + # self.__bus.request_name(ibus.panel.IBUS_SERVICE_PANEL, 0) def set_cursor_location(self, x, y, w, h): self.__candidate_panel.set_cursor_location(x + w, y + h) - def update_preedit(self, text, attrs, cursor_pos, visible): - self.__candidate_panel.update_preedit(text, attrs, cursor_pos, visible) + def update_preedit_text(self, text, cursor_pos, visible): + self.__candidate_panel.update_preedit_text(text, cursor_pos, visible) - def show_preedit(self): - self.__candidate_panel.show_preedit() + def show_preedit_text(self): + self.__candidate_panel.show_preedit_text() - def hide_preedit(self): - self.__candidate_panel.hide_preedit() + def hide_preedit_text(self): + self.__candidate_panel.hide_preedit_text() - def update_aux_string(self, text, attrs, visible): - self.__candidate_panel.update_aux_string(text, attrs, visible) + def update_auxiliary_text(self, text, visible): + self.__candidate_panel.update_auxiliary_text(text, visible) - def show_aux_string(self): - self.__candidate_panel.show_aux_string() + def show_auxiliary_text(self): + self.__candidate_panel.show_auxiliary_text() - def hide_aux_string(self): - self.__candidate_panel.hide_aux_string() + def hide_auxiliary_text(self): + self.__candidate_panel.hide_auxiliary_text() def update_lookup_table(self, lookup_table, visible): self.__candidate_panel.update_lookup_table(lookup_table, visible) @@ -175,35 +176,43 @@ class Panel(ibus.PanelBase): def focus_in(self, ic): self.reset() - self.__focus_ic = ic - - factory, enabled = self.__bus.get_input_context_states(ic) + self.__focus_ic = ibus.InputContext(self.__bus, ic) + enabled = self.__focus_ic.is_enabled() self.__language_bar.set_enabled(enabled) - if factory == "" or not enabled: + if not enabled: self.__set_im_icon(self.__ibus_icon) else: - name, lang, icon, authors, credits = self.__bus.get_factory_info(factory) - self.__set_im_icon(icon) + engine = self.__focus_ic.get_engine() + if engine: + self.__set_im_icon(engine.icon) + else: + self.__set_im_icon(self.__ibus_icon) self.__language_bar.focus_in() def focus_out(self, ic): self.reset() - if self.__focus_ic == ic: - self.__focus_ic = None - self.__language_bar.focus_out() - self.__set_im_icon(self.__ibus_icon) + self.__focus_ic = None + self.__language_bar.focus_out() + self.__set_im_icon(self.__ibus_icon) - def states_changed(self): + def state_changed(self): if not self.__focus_ic: return - factory, enabled = self.__bus.get_input_context_states(self.__focus_ic) + + enabled = self.__focus_ic.is_enabled() self.__language_bar.set_enabled(enabled) - if enabled == False or not factory: + + if enabled == False: + self.reset() self.__set_im_icon(self.__ibus_icon) else: - name, lang, icon, authors, credits = self.__bus.get_factory_info(factory) - self.__set_im_icon(icon) + engine = self.__focus_ic.get_engine() + if engine: + self.__set_im_icon(engine.icon) + else: + self.__set_im_icon(self.__ibus_icon) + def reset(self): self.__candidate_panel.reset() @@ -216,7 +225,7 @@ class Panel(ibus.PanelBase): gtk.main_quit() def __config_load_lookup_table_orientation(self): - value = self.__bus.config_get_value("panel", "lookup_table_orientation", 0) + value = self.__config.get_value("panel", "lookup_table_orientation", 0) if value != 0 and value != 1: value = 0 if value == 0: @@ -225,14 +234,14 @@ class Panel(ibus.PanelBase): self.__candidate_panel.set_orientation(gtk.ORIENTATION_VERTICAL) def __config_load_auto_hide(self): - auto_hide = self.__bus.config_get_value("panel", "auto_hide", False) + auto_hide = self.__config.get_value("panel", "auto_hide", False) self.__language_bar.set_auto_hide(auto_hide) def __config_load_custom_font(self): - use_custom_font = self.__bus.config_get_value("panel", "use_custom_font", False) + use_custom_font = self.__config.get_value("panel", "use_custom_font", False) font_name = gtk.settings_get_default().get_property("gtk-font-name") font_name = unicode(font_name, "utf-8") - custom_font = self.__bus.config_get_value("panel", "custom_font", font_name) + custom_font = self.__config.get_value("panel", "custom_font", font_name) style_string = 'style "custom-font" { font_name="%s" }\n' \ 'class "IBusPanelLabel" style "custom-font"\n' if use_custom_font: @@ -246,6 +255,8 @@ class Panel(ibus.PanelBase): gtk.rc_reset_styles(settings) def __config_value_changed_cb(self, bus, section, name, value): + if section != "panel": + return if name == "lookup_table_orientation": self.__config_load_lookup_table_orientation() elif name == "auto_hide": @@ -278,45 +289,44 @@ class Panel(ibus.PanelBase): def __create_im_menu(self): menu = gtk.Menu() - factories = self.__bus.get_factories() + engines = self.__bus.list_active_engines() - if not factories: + if not engines: item = gtk.MenuItem(label = "no engine") item.set_sensitive(False) menu.add(item) else: tmp = {} - for factory in factories: - name, lang, icon, authors, credits = self.__bus.get_factory_info(factory) - lang = ibus.get_language_name(lang) - if not icon: - icon = "engine-default" + for engine in engines: + lang = ibus.get_language_name(engine.language) if lang not in tmp: tmp[lang] = [] - tmp[lang].append((name, lang, icon, authors, credits, factory)) + tmp[lang].append(engine) + langs = tmp.keys() other = tmp.get(_("Other"), []) if _("Other") in tmp: langs.remove(_("Other")) langs.append(_("Other")) + for lang in langs: if len(tmp[lang]) == 1: - name, lang, icon, authors, credits, factory = tmp[lang][0] - item = gtk.ImageMenuItem("%s - %s" % (lang, name)) + engine = tmp[lang][0] + item = gtk.ImageMenuItem("%s - %s" % (lang, engine.longname)) size = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU) - item.set_image (_icon.IconWidget(icon, size[0])) - item.connect("activate", self.__im_menu_item_activate_cb, factory) + item.set_image (_icon.IconWidget(engine.icon, size[0])) + item.connect("activate", self.__im_menu_item_activate_cb, engine) menu.add(item) else: item = gtk.MenuItem(lang) menu.add(item) submenu = gtk.Menu() item.set_submenu(submenu) - for name, __lang, icon, authors, credits, factory in tmp[lang]: - item = gtk.ImageMenuItem(name) + for engine in tmp[lang]: + item = gtk.ImageMenuItem(engine.longname) size = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU) - item.set_image (_icon.IconWidget(icon, size[0])) - item.connect("activate", self.__im_menu_item_activate_cb, factory) + item.set_image (_icon.IconWidget(engine.icon, size[0])) + item.connect("activate", self.__im_menu_item_activate_cb, engine) submenu.add(item) menu.show_all() @@ -345,8 +355,8 @@ class Panel(ibus.PanelBase): gtk.get_current_event_time(), self.__status_icon) - def __im_menu_item_activate_cb(self, item, factory): - self.__bus.set_factory(factory) + def __im_menu_item_activate_cb(self, item, engine): + self.__focus_ic.set_engine(engine) def __sys_menu_item_activate_cb(self, item, command): if command == gtk.STOCK_PREFERENCES: ui/gtk/panel.py @@ -30,7 +30,7 @@ class PropItem: retval = False - if self._prop.name == prop.name and self._prop.type == prop.type: + if self._prop.key == prop.key and self._prop.type == prop.type: self._prop = prop self.property_changed () retval = True ui/gtk/propitem.py @@ -36,7 +36,7 @@ class ToolButton(gtk.ToolButton, PropItem): } def __init__(self, prop): - gtk.ToolButton.__init__ (self, label = prop.label) + gtk.ToolButton.__init__ (self, label = prop.label.text) self.set_homogeneous(False) PropItem.__init__ (self, prop) self.property_changed() @@ -58,14 +58,14 @@ class ToolButton(gtk.ToolButton, PropItem): def set_tooltip_text(self, text): if text: - gtk.ToolButton.set_tooltip_text(self, text) + gtk.ToolButton.set_tooltip_text(self, text.text) else: gtk.ToolButton.set_tooltip_text(self, None) self._prop.tooltip = text def property_changed(self): - self.set_label(self._prop.label) + self.set_label(self._prop.label.text) self.set_tooltip_text(self._prop.tooltip) self.set_sensitive(self._prop.sensitive) self.set_icon_name(self._prop.icon) @@ -78,7 +78,7 @@ class ToolButton(gtk.ToolButton, PropItem): self.hide_all() def do_clicked(self): - self.emit("property-activate", self._prop.name, self._prop.state) + self.emit("property-activate", self._prop.key, self._prop.state) class ToggleToolButton(gtk.ToggleToolButton, PropItem): @@ -112,7 +112,7 @@ class ToggleToolButton(gtk.ToggleToolButton, PropItem): def set_tooltip_text(self, text): if text: - gtk.ToggleToolButton.set_tooltip_text(self, text) + gtk.ToggleToolButton.set_tooltip_text(self, text.text) else: gtk.ToggleToolButton.set_tooltip_text(self, None) @@ -120,7 +120,7 @@ class ToggleToolButton(gtk.ToggleToolButton, PropItem): def property_changed(self): self.set_tooltip_text(self._prop.tooltip) - self.set_label(self._prop.label) + self.set_label(self._prop.label.text) self.set_icon_name(self._prop.icon) self.set_active(self._prop.state == ibus.PROP_STATE_CHECKED) self.set_sensitive(self._prop.sensitive) @@ -136,7 +136,7 @@ class ToggleToolButton(gtk.ToggleToolButton, PropItem): self._prop.state = ibus.PROP_STATE_CHECKED else: self._prop.state = ibus.PROP_STATE_UNCHECKED - self.emit("property-activate", self._prop.name, self._prop.state) + self.emit("property-activate", self._prop.key, self._prop.state) class SeparatorToolItem(gtk.SeparatorToolItem, PropItem): def __init__ (self, prop): ui/gtk/toolitem.py @@ -21,5 +21,4 @@ SUBDIRS = \ IMdkit \ - gconf \ $(NULL) util/Makefile.am @@ -1,8 +1,8 @@ XIM=ibus -XIM_PROGRAM="/usr/bin/ibus" +XIM_PROGRAM="/usr/bin/ibus-daemon" ICON="/usr/share/ibus/icons/ibus.svg" # XIM_ARGS="0xffffffff" PREFERENCE_PROGRAM=/usr/bin/ibus-setup -SHORT_DESC="iBus" +SHORT_DESC="IBus" GTK_IM_MODULE=ibus -QT_IM_MODULE=ibus +# QT_IM_MODULE=ibus xinput-ibus daemon/.gitignore daemon/Makefile.am daemon/_dbus.py daemon/bus.py daemon/config.py daemon/connection.py daemon/contextmanager.py daemon/engine.py daemon/enginefactory.py daemon/factorymanager.py daemon/ibus-daemon.in daemon/ibusdaemon.py daemon/inputcontext.py daemon/lookuptable.py daemon/notifications.py daemon/panel.py daemon/register.py gconf/config.py gconf/ibus-gconf.in gconf/main.py ibus/gtk.py launcher/Makefile.am launcher/ibus.desktop.in launcher/ibus.in lib/Makefile.am lib/gtk2/Makefile.am lib/gtk2/ibusattribute.c lib/gtk2/ibusattribute.h lib/gtk2/ibusimclient.c lib/gtk2/ibusimclient.h lib/gtk2/ibusmarshalers.list util/gconf/Makefile.am util/gconf/gconf-arg-types.py util/gconf/gconf-fixes.c util/gconf/gconf-fixes.h util/gconf/gconf-types.c util/gconf/gconf-types.h util/gconf/gconf.defs util/gconf/gconf.override util/gconf/gconfmodule.c util/gconf/wscript 41ad46305a88637dd99f00a2d2a3f455505d357b Huang Peng shawn.p.huang@gmail.com http://github.com/phuang/ibus/commit/aedad1ea0a7fef604aa27f4b58433fd8f2ece29e aedad1ea0a7fef604aa27f4b58433fd8f2ece29e 2009-02-04T18:39:56-08:00 2009-02-04T18:39:56-08:00 re-implement ibus in c language. ffcb531d8474bde18b90341bcd4eb639edd74525 Huang Peng shawn.p.huang@gmail.com