[imbus commit] r56 - in trunk/imbus: . daemon src

[codesite...@google.com]

Author: james.su
Date: Tue Jan 6 07:10:06 2009
New Revision: 56

Removed:
trunk/imbus/daemon/
trunk/imbus/src/im_debug.h
Modified:
trunk/imbus/Makefile.am
trunk/imbus/TODO
trunk/imbus/configure.ac
trunk/imbus/src/Makefile.am
trunk/imbus/src/im_event_roles.h
trunk/imbus/src/im_event_types.h

Log:
- Remove inappropriate files.

Modified: trunk/imbus/Makefile.am
==============================================================================
--- trunk/imbus/Makefile.am (original)
+++ trunk/imbus/Makefile.am Tue Jan 6 07:10:06 2009
@@ -36,7 +36,7 @@
endif

AUTOMAKE_OPTIONS = gnu
-SUBDIRS = $(LIBLTDL_DIR) src tests utils daemon $(UNIT_TESTS_DIR)
+SUBDIRS = $(LIBLTDL_DIR) src tests utils $(UNIT_TESTS_DIR)

MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 \

Modified: trunk/imbus/TODO
==============================================================================
--- trunk/imbus/TODO (original)
+++ trunk/imbus/TODO Tue Jan 6 07:10:06 2009
@@ -46,3 +46,11 @@

Think about the event of switching active component.
Think about how to register the languages supported by IMEngine component.
+
+======== IMBusServer =========
+
+1. relationship among various objects and data.
+
+1 IOChannel <-> N Components
+1 Component <-> M Event Roles
+1 Event

Modified: trunk/imbus/configure.ac
==============================================================================
--- trunk/imbus/configure.ac (original)
+++ trunk/imbus/configure.ac Tue Jan 6 07:10:06 2009
@@ -255,7 +255,6 @@
tests/Makefile
utils/Makefile
unittests/Makefile
- daemon/Makefile
imbus-1.0.pc])
AC_OUTPUT

Modified: trunk/imbus/src/Makefile.am
==============================================================================
--- trunk/imbus/src/Makefile.am (original)
+++ trunk/imbus/src/Makefile.am Tue Jan 6 07:10:06 2009
@@ -76,8 +76,7 @@
im_unicode.h \
im_utilities.h \
im_value.h \
- im_value_array.h \
- im_debug.h
+ im_value_array.h

configexecincludedir = $(libdir)/imbus-1.0/include

Modified: trunk/imbus/src/im_event_roles.h
==============================================================================
--- trunk/imbus/src/im_event_roles.h (original)
+++ trunk/imbus/src/im_event_roles.h Tue Jan 6 07:10:06 2009
@@ -72,6 +72,7 @@

typedef struct _IMEventRoles IMEventRoles;
typedef struct _IMEventRolesClass IMEventRolesClass;
+typedef struct _IMEventRolesIterator IMEventRolesIterator;

enum
{
@@ -191,6 +192,10 @@
IMBool im_event_roles_check (const IMEventRoles
*event_roles,
IMUInt32
event_type,
IMUInt
role);
+
+
+IMEventRolesIterator* im_event_roles_get_iterator (const IMEventRoles
*event_roles);
+

IM_END_DECLS

Modified: trunk/imbus/src/im_event_types.h
==============================================================================
--- trunk/imbus/src/im_event_types.h (original)
+++ trunk/imbus/src/im_event_types.h Tue Jan 6 07:10:06 2009
@@ -11,11 +11,80 @@

IM_BEGIN_DECLS

+/**
+ * Description of the comment format:
+ *
+ * - Can broadcast
+ * Indicates if the event can be broadcasted or not. If the event can be
+ * broadcasted, then Dest ID of the event can be set to
+ * IM_EVENT_DEST_BROADCAST.
+ */
enum
{
/** Indicates invalid event. */
IM_EVENT_INVALID = 0,

+ /**
+ * Asks IMBUS to load a component module.
+ *
+ * An IMBUS component shall send this event to IMBUS if it wants to
load an
+ * external component module.
+ * Upon receiving this event, IMBUS will load the specified module and
run
+ * it in a separated process.
+ * IMBUS won't send reply to indicate if the module is loaded
successfully.
+ * The component shall check if the module has been loaded by itself,
by
+ * using IM_EVENT_QUERY_COMPONENTS event or sending private event to
the
+ * components provided by the module.
+ *
+ * This event might be handled by an external module manager instead of
+ * IMBUS itself.
+ *
+ * Possible producer: any components
+ * Possible consumer: IMBUS
+ * Possible observer: any components
+ *
+ * Can broadcast: No
+ *
+ * Source ID: ID of the component, which sends this event
+ * Dest ID: shall be IM_EVENT_DEST_IMBUS
+ * ICID: shall be IM_EVENT_INPUT_CONTEXT_NONE
+ *
+ * Data:
+ * - IMString
+ * Name or file URI of the module to be loaded.
+ *
+ * Has reply event: No
+ */
+ IM_EVENT_LOAD_MODULE,
+
+ /**
+ * Asks IMBUS to unload a component module.
+ *
+ * An IMBUS component shall send this event to IMBUS if it wants to
unload an
+ * external component module previously loaded by itself.
+ * Upon receiving this event, IMBUS will unload the specified module.
+ * A component can only unload modules loaded by itself.
+ *
+ * This event might be handled by an external module manager instead of
+ * IMBUS itself.
+ *
+ * Possible producer: any components
+ * Possible consumer: IMBUS
+ * Possible observer: any components
+ *
+ * Can broadcast: No
+ *
+ * Source ID: ID of the component, which sends this event
+ * Dest ID: shall be IM_EVENT_DEST_IMBUS
+ * ICID: shall be IM_EVENT_INPUT_CONTEXT_NONE
+ *
+ * Data:
+ * - IMString
+ * Name or file URI of the module to be unloaded.
+ *
+ * Has reply event: No
+ */
+ IM_EVENT_UNLOAD_MODULE,

/**
* Registers a component into IMBUS
@@ -385,6 +454,7 @@
*/
IM_EVENT_DEACTIVATE_HOTKEY_PROFILES,

+ IM_EVENT_QUERY_HOTKEY_PROFILES,

/**
* Sets active component for specified event roles