X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-gui.c;h=5903bf598e16895c9f1242253485ce9efba34a9a;hb=fab40b485745418275aa92252a35144525e3d902;hp=d7cd05d6a312faa2350614d1bd578314fafdd8e5;hpb=73b7b62344a580d336d209a44c9bfe25d7734d31;p=m17n%2Fm17n-lib.git diff --git a/src/m17n-gui.c b/src/m17n-gui.c index d7cd05d..5903bf5 100644 --- a/src/m17n-gui.c +++ b/src/m17n-gui.c @@ -1,5 +1,5 @@ /* m17n-gui.c -- body of the GUI API. - Copyright (C) 2003, 2004 + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H15PRO112 @@ -125,9 +125,11 @@ register_device_library (MSymbol name, char *lib) MDeviceLibraryInterface *interface; MSTRUCT_CALLOC (interface, MERROR_WIN); - interface->library = malloc (strlen (lib) + interface->library = malloc (strlen (M17N_MODULE_DIR) + 1 + + strlen (lib) + strlen (DLOPEN_SHLIB_EXT) + 1); - sprintf (interface->library, "%s%s", lib, DLOPEN_SHLIB_EXT); + sprintf (interface->library, "%s/%s%s", M17N_MODULE_DIR, lib, + DLOPEN_SHLIB_EXT); if (! device_library_list) device_library_list = mplist (); mplist_add (device_library_list, name, interface); @@ -243,7 +245,7 @@ m17n_init_win (void) if (m17n__gui_initialized++) return; m17n_init (); - m17n_init_flt (0); + m17n_init_flt (); if (merror_code != MERROR_NONE) { m17n__gui_initialized--; @@ -342,7 +344,7 @@ m17n_fini_win (void) MDEBUG_POP_TIME (); MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize the gui modules.")); MDEBUG_POP_TIME (); - m17n_fini_flt (0); + m17n_fini_flt (); m17n_fini (); } @@ -372,8 +374,8 @@ m17n_fini_win (void) These are the symbols to use in a parameter to create a frame. See the function mframe () for details. - #Mdevice, #Mdisplay, #Mscreen, #Mdrawable, #Mdepth, and #Mcolormap - are also keys of a frame property. */ + @b Mdevice, @b Mdisplay, @b Mscreen, @b Mdrawable, @b Mdepth, and + @b Mcolormap are also keys of a frame property. */ /***ja @name ÊÑ¿ô¡§ ¥Õ¥ì¡¼¥à¥Ñ¥é¥á¡¼¥¿ÍÑ¥­¡¼ @@ -381,8 +383,8 @@ m17n_fini_win (void) ¥Õ¥ì¡¼¥à¤òÀ¸À®¤¹¤ëºÝ¤Î¥Ñ¥é¥á¡¼¥¿¤ËÍѤ¤¤ë¥·¥ó¥Ü¥ë¡£¾Ü¤·¤¯¤Ï´Ø¿ô mframe () ¤ÎÀâÌÀ»²¾È¡£ - #Mdevice¡¢ #Mdisplay¡¢ #Mscreen¡¢ #Mdrawable¡¢ #Mdepth¡¢#Mcolormap - ¤Ï¥Õ¥ì¡¼¥à¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤Ç¤â¤¢¤ë¡£ */ + @b Mdevice¡¢ @b Mdisplay¡¢ @b Mscreen¡¢ @b Mdrawable¡¢ @b Mdepth¡¢ + @b Mcolormap ¤Ï¥Õ¥ì¡¼¥à¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤Ç¤â¤¢¤ë¡£ */ /*=*/ @@ -425,14 +427,14 @@ MSymbol Mfont_descent; - In addition, if the value of the key #Mdevice is #Mx, the + In addition, if the value of the key @b Mdevice is #Mx, the following keys are recognized. They are to specify the root window and the depth of drawables that can be used with the frame.