From: handa Date: Tue, 6 Jul 2004 11:37:40 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: REL-1-1-0~123 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=205ae727ce48eca19dc4265e11b55135ae2b88f5;p=m17n%2Fm17n-lib.git *** empty log message *** --- diff --git a/src/ChangeLog b/src/ChangeLog index 446b0f2..7b3b475 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,24 @@ +2004-07-06 Kenichi Handa + + * m17n-gui.c, m17n-gui.h, m17n-gd.c, m17n-X.h, m17n-X.c, + internal-gui.h: Cancel previous changes. + + * m17n-gd.h: Delete it. + + * Makefile.am (libm17n_core_la_LIBADD): New variable. + (libm17n_core_la_LDFLAGS): Add -export-dynamic, move + @XML2_LD_FLAGS@ to above. + (libm17n_la_LIBADD): Add -ldl. + (libm17n_la_LDFLAGS): Add -export-dynamic. + (X_LD_FLAGS): Fix the order of linking. + (libm17n_gui_la_LIBADD): Add ${OPTIONAL_LD_FLAGS}. + (libm17n_gui_la_LDFLAGS): Add -export-dynamic, delete above. + (libm17n_X_la_LDFLAGS): Add -module. + (libm17n_gd_la_SOURCES): Delete m17n-gd.h. + (libm17n_gd_la_LIBADD): Add @GD_LD_FLAGS@. + (libm17n_gd_la_LDFLAGS): Add -module. + (include_HEADERS): Delete m17n-gd.h. + 2004-06-30 Kenichi Handa * m17n-gui.c: Adjusted for the change of struct MDeviceDriver. diff --git a/src/internal-gui.h b/src/internal-gui.h index 8944a9b..dc13947 100644 --- a/src/internal-gui.h +++ b/src/internal-gui.h @@ -227,14 +227,8 @@ typedef struct short x, y; } MDrawPoint; -extern MPlist *m17n__device_library_list; - struct MDeviceDriver { - int initialized; - int (*init) (); - int (*fini) (); - int (*open) (MFrame *frame, MPlist *param); void (*close) (MFrame *frame); void *(*get_prop) (MFrame *frame, MSymbol key); void (*realize_face) (MRealizedFace *rface); diff --git a/src/m17n-core.c b/src/m17n-core.c index ba14e21..efccca6 100644 --- a/src/m17n-core.c +++ b/src/m17n-core.c @@ -48,27 +48,22 @@ It provides GUI modules such as drawing and inputting M-texts on a graphic device. The API itself is independent on a graphic device - but most of functions require an argument MFrame which is created - for a specific type of graphic device. Currently, a null device, - X Window System, and an image date (gdImagePtr) of GD library are + but most functions require an argument MFrame which is created for + a specific type of graphic device. Currently, a null device, X + Window System, and an image date (gdImagePtr) of GD library are supported as a graphic device. - With the null device, you can't draw text nor use an input method - (but, for instance, the funciton mdraw_glyph_list () is - available). To use this device, an application program must - include and be linked by -lm17n-core -lm17n - -lm17n-gui. + On a frame of the null device, you can't draw text nor use an + input method (but, for instance, the funciton mdraw_glyph_list () + is available). - With the X Window System, you can use the whole GUI API. To use - this device, an application program must include and be - linked by -lm17n-core -lm17n -lm17n-gui -lm17n-X. + On a frame of the X Window System, you can use the whole GUI API. - With an image of GD library, you can use all drawing API but can't - use input method. To use this device, an application program must - include , and be linked by -lm17n-core -lm17n - -lm17n-gui -lm17n-gd. + On a frame of GD library, you can use all drawing API but can't + use input method. - It is also possible to use multiple devices. + To use this device, an application program must include + and be linked by -lm17n-core -lm17n -lm17n-gui. When you use this API, CORE and SHELL API are also available. @@ -176,21 +171,16 @@ ¥°¥é¥Õ¥£¥Ã¥¯¥Ç¥Ð¥¤¥¹¤È¤·¤Æ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¡£ ¥Ì¥ë¥Ç¥Ð¥¤¥¹¾å¤Ç¤Ïɽ¼¨¤âÆþÎϤâ¤Ç¤­¤Ê¤¤¡Ê¤¿¤À¤·¤¿¤È¤¨¤Ð - mdraw_glyph_list () ¤Ê¤É¤Î´Ø¿ô¤Ï»ÈÍѲÄǽ¡Ë¡£¤³¤Î¥Ç¥Ð¥¤¥¹¤ò»ÈÍѤ¹¤ë - ¤¿¤á¤Ë¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à¤Ï ¤ò include ¤·¡¢ - -lm17n-core -lm17n -lm17n-gui ¤Ç¥ê¥ó¥¯¤µ¤ì¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ + mdraw_glyph_list () ¤Ê¤É¤Î´Ø¿ô¤Ï»ÈÍѲÄǽ¡Ë¡£ - X ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¾å¤Ç¤Ï¤¹¤Ù¤Æ¤Î GUI API ¤¬»È¤¨¤ë¡£¤³¤Î¥Ç¥Ð¥¤¥¹¤ò - »ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à¤Ï ¤ò - include ¤·¡¢-lm17n-core -lm17n -lm17n-gui -lm17n-X ¤Ç¥ê¥ó¥¯¤µ¤ì¤Ê¤¯ - ¤Æ¤Ï¤Ê¤é¤Ê¤¤ + X ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¾å¤Ç¤Ï¤¹¤Ù¤Æ¤Î GUI API ¤¬»È¤¨¤ë¡£ GD ¥é¥¤¥Ö¥é¥ê¤Î¥¤¥á¡¼¥¸¾å¤Ç¤Ï¡¢ÉÁ²èÍѤΠAPI ¤Ï¤¹¤Ù¤Æ»È¤¨¤ë¤¬ÆþÎÏ¤Ï - ¤Ç¤­¤Ê¤¤¡£¤³¤Î¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à - ¤Ï ¤ò include ¤·¡¢-lm17n-core -lm17n -lm17n-gui - -lm17n-gd ¤Ç¥ê¥ó¥¯¤µ¤ì¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤ + ¤Ç¤­¤Ê¤¤¡£ - Ê£¿ô¤Î¥Ç¥Ð¥¤¥¹¤òƱ»þ¤Ë»ÈÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤ë¡£¤¢ + ¤³¤Î¥Ç¥Ð¥¤¥¹¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à¤Ï + ¤ò include ¤·¡¢-lm17n-core -lm17n -lm17n-gui ¤Ç¥ê¥ó¥¯ + ¤µ¤ì¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ ¤³¤Î API ¤ò»ÈÍѤ¹¤ëºÝ¤Ë¤Ï¡¢¥³¥¢ API ¤È¥·¥§¥ë API ¤â»ÈÍѤǤ­¤ë¡£ diff --git a/src/m17n-gd.h b/src/m17n-gd.h deleted file mode 100644 index 86d4554..0000000 --- a/src/m17n-gd.h +++ /dev/null @@ -1,51 +0,0 @@ -/* m17n-gd.h -- header file for the GUI API for GD Library. - Copyright (C) 2004 - National Institute of Advanced Industrial Science and Technology (AIST) - Registration Number H15PRO112 - - This file is part of the m17n library. - - The m17n library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - as published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - The m17n library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the m17n library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307, USA. */ - -#ifndef _M17N_GD_H_ -#define _M17N_GD_H_ - -#ifndef _M17N_GUI_H_ -#include -#endif - -#ifdef __cplusplus -extern "C" -{ -#endif - -extern int m17n_init_gd (void); -#undef M17N_INIT_GD -#define M17N_INIT_GD() m17n_init_gd () - -#undef M17N_INIT -#define M17N_INIT() \ - do { \ - if (m17n_init_win () < 0) break; \ - if (M17N_INIT_GD () < 0) break; \ - M17N_INIT_X (); \ - } while (0) - -#ifdef __cplusplus -} -#endif - -#endif /* not _M17N_GD_H_ */