From: handa Date: Thu, 7 Sep 2006 07:51:04 +0000 (+0000) Subject: (struct _MInputMethodInfo): Delete member im. New X-Git-Tag: REL-1-3-4~82 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=bb539a68c7827315c17accd60275f160ac070ef5;p=m17n%2Fm17n-lib.git (struct _MInputMethodInfo): Delete member im. New members mdb, language, name, extra, cmds, configured_cmds, bc_cmds, vars, configured_vars, bc_vars, description, and tick. (MInputContextInfo): New member tick. --- diff --git a/src/input.h b/src/input.h index 48b0a02..0ba1887 100644 --- a/src/input.h +++ b/src/input.h @@ -23,15 +23,22 @@ #ifndef _M17N_INPUT_H_ #define _M17N_INPUT_H_ -typedef struct +typedef struct _MInputMethodInfo MInputMethodInfo; + +struct _MInputMethodInfo { - MInputMethod *im; + MDatabase *mdb; + MSymbol language, name, extra; + MPlist *cmds, *configured_cmds, *bc_cmds; + MPlist *vars, *configured_vars, *bc_vars; + MText *description; MText *title; MPlist *maps; MPlist *states; MPlist *macros; MPlist *externals; -} MInputMethodInfo; + unsigned long tick; +}; typedef struct MIMState MIMState; @@ -67,7 +74,7 @@ typedef struct /** List of markers. */ MPlist *markers; - /* List of variables. */ + /** List of variables. */ MPlist *vars; MText *preceding_text, *following_text; @@ -76,6 +83,8 @@ typedef struct /** Used by minput_win_driver (input-win.c). */ void *win_info; + + unsigned long tick; } MInputContextInfo; #define MINPUT_KEY_SHIFT_MODIFIER (1 << 0)