#include "fontset.h"
#include "face.h"
-static int win_initialized;
-
#ifndef DLOPEN_SHLIB_EXT
#define DLOPEN_SHLIB_EXT ".so"
#endif
/** Function to call just after loading the library. */
int (*init) ();
/** Function to call to open a frame on the graphic device. */
- void *(*open) (MFrame *frame, MPlist *param);
+ int (*open) (MFrame *frame, MPlist *param);
/** Function to call just before unloading the library. */
int (*fini) ();
} MDeviceLibraryInterface;
static MPlist *device_library_list;
-
/** Close MFrame and free it. */
static void
{
}
-void *
+static void *
null_device_get_prop (MFrame *frame, MSymbol key)
{
return NULL;
}
-void
+static void
null_device_realize_face (MRealizedFace *rface)
{
rface->info = NULL;
}
-void
+static void
null_device_free_realized_face (MRealizedFace *rface)
{
}
return 0;
}
-static void *
+static int
null_device_open (MFrame *frame, MPlist *param)
{
+ MFace *face;
+
+ frame->device = NULL;
frame->device_type = 0;
frame->driver = &null_driver;
frame->font_driver_list = mplist ();
mplist_add (frame->font_driver_list, Mfreetype, &mfont__ft_driver);
- return &null_device;
+ frame->realized_font_list = null_device.realized_font_list;
+ frame->realized_face_list = null_device.realized_face_list;
+ frame->realized_fontset_list = null_device.realized_fontset_list;
+ face = mface_copy (mface__default);
+ mplist_push (param, Mface, face);
+ M17N_OBJECT_UNREF (face);
+ return 0;
}
static MDeviceLibraryInterface null_interface =
\f
/* Internal API */
-MSymbol Mfreetype;
-
/*** @} */
#endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */
\f
/* External API */
-MSymbol Mdevice;
-
void
m17n_init_win (void)
{
int mdebug_mask = MDEBUG_INIT;
- if (win_initialized++)
+ if (m17n__gui_initialized++)
return;
m17n_init ();
if (merror_code != MERROR_NONE)
- return;
+ {
+ m17n__gui_initialized--;
+ return;
+ }
MDEBUG_PUSH_TIME ();
- Mx = msymbol ("x");
Mgd = msymbol ("gd");
- Mfreetype = msymbol ("freetype");
Mfont = msymbol ("font");
Mfont_width = msymbol ("font-width");
Mfont_ascent = msymbol ("font-ascent");
Mdepth = msymbol ("depth");
Mwidget = msymbol ("widget");
- register_device_library (Mx, "libm17n-X");
- register_device_library (Mgd, "libm17n-gd");
-
MDEBUG_PUSH_TIME ();
if (mfont__init () < 0)
goto err;
MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize font module."));
- MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize win module."));
if (mfont__fontset_init () < 0)
goto err;
MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize fontset module."));
MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize input-win module."));
mframe_default = NULL;
+ register_device_library (Mx, "libm17n-X");
+ register_device_library (Mgd, "libm17n-gd");
+ return;
+
err:
MDEBUG_POP_TIME ();
MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize the m17n GUI module."));
MDEBUG_POP_TIME ();
- return;
}
void
m17n_fini_win (void)
{
int mdebug_mask = MDEBUG_FINI;
+ MPlist *plist;
- if (win_initialized > 1)
- win_initialized--;
- else
+ if (m17n__gui_initialized == 0
+ || --m17n__gui_initialized > 0)
+ return;
+
+ MDEBUG_PUSH_TIME ();
+ MDEBUG_PUSH_TIME ();
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize device modules."));
+ MPLIST_DO (plist, device_library_list)
{
- MPlist *plist;
+ MDeviceLibraryInterface *interface = MPLIST_VAL (plist);
- win_initialized = 0;
- MDEBUG_PUSH_TIME ();
- MDEBUG_PUSH_TIME ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize device modules."));
- MPLIST_DO (plist, device_library_list)
+ if (interface->handle && interface->fini)
{
- MDeviceLibraryInterface *interface = MPLIST_VAL (plist);
-
- if (interface->handle && interface->fini)
- {
- (*interface->fini) ();
- dlclose (interface->handle);
- }
- free (interface->library);
- free (interface);
+ (*interface->fini) ();
+ dlclose (interface->handle);
}
- M17N_OBJECT_UNREF (device_library_list);
+ free (interface->library);
+ }
#ifdef HAVE_FREETYPE
- if (null_interface.handle)
- (*null_interface.fini) ();
+ if (null_interface.handle)
+ (*null_interface.fini) ();
#endif /* not HAVE_FREETYPE */
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize input-gui module."));
- minput__win_fini ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize draw module."));
- mdraw__fini ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize face module."));
- mface__fini ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize fontset module."));
- mfont__fontset_fini ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize font module."));
- mfont__fini ();
- mframe_default = NULL;
- MDEBUG_POP_TIME ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize the gui modules."));
- MDEBUG_POP_TIME ();
- }
+ M17N_OBJECT_UNREF (device_library_list);
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize input-gui module."));
+ minput__win_fini ();
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize draw module."));
+ mdraw__fini ();
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize face module."));
+ mface__fini ();
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize fontset module."));
+ mfont__fontset_fini ();
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize font module."));
+ mfont__fini ();
+ mframe_default = NULL;
+ MDEBUG_POP_TIME ();
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize the gui modules."));
+ MDEBUG_POP_TIME ();
m17n_fini ();
}
/*** @addtogroup m17nFrame */
/***en
- @brief A @e frame is an object corresponding to the physical device.
+ @brief A @e frame is an object corresponding to the graphic device.
A @e frame is an object of the type #MFrame to hold various
- information about each physical display/input device. Almost all
- m17n GUI functions require a pointer to a frame as an
- argument. */
+ information about each display/input device. Almost all m17n GUI
+ functions require a pointer to a frame as an argument. */
/***ja
- @brief @e ¥Õ¥ì¡¼¥à ¤È¤ÏʪÍýŪ¥Ç¥Ð¥¤¥¹¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ë.
+ @brief @e ¥Õ¥ì¡¼¥à ¤È¤Ï¥°¥é¥Õ¥£¥Ã¥¯¥Ç¥Ð¥¤¥¹¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ë.
- @e ¥Õ¥ì¡¼¥à ¤È¤Ï #MFrame ·¿¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ê¡¢¸Ä¡¹¤ÎʪÍýŪ¤Êɽ
- ¼¨¡¿ÆþÎϥǥХ¤¥¹¤Î¾ðÊó¤ò³ÊǼ¤¹¤ë¤¿¤á¤ËÍѤ¤¤é¤ì¤ë¡£¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤Î
- m17n GUI API ¤Ï¡¢°ú¿ô¤È¤·¤Æ¥Õ¥ì¡¼¥à¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÍ׵᤹¤ë¡£ */
+ @e ¥Õ¥ì¡¼¥à ¤È¤Ï #MFrame ·¿¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ê¡¢¸Ä¡¹¤Îɽ¼¨¡¿ÆþÎÏ¥Ç
+ ¥Ð¥¤¥¹¤Î¾ðÊó¤ò³ÊǼ¤¹¤ë¤¿¤á¤ËÍѤ¤¤é¤ì¤ë¡£¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤Î m17n GUI
+ ´Ø¿ô¤Ï¡¢°ú¿ô¤È¤·¤Æ¥Õ¥ì¡¼¥à¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÍ׵᤹¤ë¡£ */
/*** @{ */
/*=*/
/***en
- @name Variables: Keys of frame property (common). */
+ @name Variables: Keys of frame parameter
+
+ These are the symbols to use in a parameter to creat a frame. See
+ the function mframe () for details.
+
+ #Mdevice, #Mdisplay, #Mscreen, #Mdrawable, #Mdepth, and #Mcolormap
+ are also keys of a frame property. */
+
/***ja
- @name ÊÑ¿ô¡§ ¥Õ¥ì¡¼¥à¥×¥í¥Ñ¥Æ¥£¤Î¥¡¼ (¶¦ÄÌ). */
-/*** @{ */
+ @name ÊÑ¿ô¡§ ¥Õ¥ì¡¼¥à¥Ñ¥é¥á¡¼¥¿ÍÑ¥¡¼
+
+ ¥Õ¥ì¡¼¥à¤òÀ¸À®¤¹¤ëºÝ¤Î¥Ñ¥é¥á¡¼¥¿¤ËÍѤ¤¤ë¥·¥ó¥Ü¥ë¡£¾Ü¤·¤¯¤Ï´Ø¿ô
+ mframe () ¤ÎÀâÌÀ»²¾È¡£
+
+ #Mdevice¡¢ #Mdisplay¡¢ #Mscreen¡¢ #Mdrawable¡¢ #Mdepth¡¢#Mcolormap
+ ¤Ï¥Õ¥ì¡¼¥à¥×¥í¥Ñ¥Æ¥£¤Î¥¡¼¤Ç¤â¤¢¤ë¡£ */
+
/*=*/
-MSymbol Mfont;
-MSymbol Mfont_width;
-MSymbol Mfont_ascent;
-MSymbol Mfont_descent;
+
+MSymbol Mdevice, Mdisplay, Mscreen, Mdrawable, Mdepth, Mcolormap, Mwidget;
+
+MSymbol Mgd;
/*=*/
/***en
- @name Variables: Keys of frame parameter (X specific).
+ @name Variables: Keys of frame property
- These are the symbols to use as parameter keys for the function
- mframe () (which see). They are also keys of a frame property
- except for #Mwidget. */
+ These are the symbols to use as an argument to the function
+ mframe_get_prop (). */
/***ja
- @name ÊÑ¿ô¡§ ¥Õ¥ì¡¼¥à¥Ñ¥é¥á¡¼¥¿ÍÑ¥¡¼ (X ¸ÇÍ).
-
- ´Ø¿ô mframe () ¤Î¥Ñ¥é¥á¡¼¥¿¥¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¥·¥ó¥Ü¥ë¡£( mframe
- () ¤ÎÀâÌÀ»²¾È¡£) #Mwidget ¤ò½ü¤¤¤Æ¤Ï¥Õ¥ì¡¼¥à¥×¥í¥Ñ¥Æ¥£¤Î¥¡¼¤Ç¤â¤¢
- ¤ë¡£
- */
+ @name ÊÑ¿ô¡§ ¥Õ¥ì¡¼¥à¥×¥í¥Ñ¥Æ¥£¤Î¥¡¼
+ ´Ø¿ô mframe_get_prop () ¤Î°ú¿ô¤ËÍѤ¤¤é¤ì¤ë¥·¥ó¥Ü¥ë¡£ */
+/*** @{ */
/*=*/
-
-MSymbol Mdisplay, Mscreen, Mdrawable, Mdepth, Mwidget, Mcolormap;
-
-MSymbol Mx, Mgd;
+MSymbol Mfont;
+MSymbol Mfont_width;
+MSymbol Mfont_ascent;
+MSymbol Mfont_descent;
/*=*/
+
/*** @} */
/*=*/
@brief Create a new frame.
The mframe () function creates a new frame with parameters listed
- in $PLIST which may be NULL.
+ in $PLIST which may be @c NULL.
The recognized keys in $PLIST are window system dependent.
<ul>
- <li> #Mface, the value type must be <tt>(MFace *)</tt>.
+ <li> #Mdevice, the value must be one of #Mx, #Mgd, and #Mnil.
+
+ If the value is #Mx, the frame is for X Window System. The
+ argument #MDrawWindow specified together with the frame must be of
+ type @c Window. The frame is both readable and writable, thus all
+ GUI functions can be used.
+
+ If the value is #Mgd, the frame is for an image object of GD
+ library. The argument #MDrawWindow specified together with the
+ frame must be of type @c gdImagePtr. The frame is writable
+ only, thus functions minput_XXX can't be used for the frame.
+
+ If the value is #Mnil, the frame is for a null device. The frame
+ is not writable nor readable, thus functions mdraw_XXX that
+ require the argument #MDrawWindow and functions minput_XXX can't
+ be used for the frame.
+
+ <li> #Mface, the value must be a pointer to #MFace.
The value is used as the default face of the frame.
</ul>
- In addition, in the m17n-X library, the following keys are
- recognized. They are to specify the root window and the depth of
- drawables that can be used with the frame.
+ In addition, if the value of the key #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.
<ul>
- <li> #Mdrawable, the value type must be <tt>Drawable</tt>
+ <li> #Mdrawable, the value type must be <tt>Drawable</tt>.
A parameter of key #Mdisplay must also be specified. The
created frame can be used for drawables whose root window and
The created frame uses the specified colormap.
+ <li> #Mfont, the value must be #Mx, #Mfreetype, or #Mxft.
+
+ The created frame uses the specified font backend. The value #Mx
+ instructs to use X core fonts, #Mfreetype to use local fonts
+ supported by FreeType fonts, and #Mxft to use local fonts via Xft
+ library. You can specify this parameter more than once with
+ different values if you want to use multiple font backends. This
+ is ignored if the specified font backend is not supported on the
+ device.
+
+ When this parameter is not specified, all font backend supported
+ on the device are used.
+
</ul>
@return
@brief ¿·¤·¤¤¥Õ¥ì¡¼¥à¤òºî¤ë.
´Ø¿ô mframe () ¤Ï $PLIST Ãæ¤Î¥Ñ¥é¥á¡¼¥¿¤ò»ý¤Ä¿·¤·¤¤¥Õ¥ì¡¼¥à¤òºî¤ë¡£
- $PLIST ¤ÏNULL ¤Ç¤âÎɤ¤¡£
+ $PLIST ¤Ï @c NULL ¤Ç¤âÎɤ¤¡£
$PLIST ¤Ë¸½¤ï¤ì¤ë¥¡¼¤Î¤¦¤Á¤É¤ì¤¬Ç§¼±¤µ¤ì¤ë¤«¤Ï¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à
- ¤Ë°Í¸¤¹¤ë¡£¤·¤«¤·°Ê²¼¤Î¥¡¼¤Ï¾ï¤Ëǧ¼±¤µ¤ì¤ë¡£
+ ¤Ë°Í¸¤¹¤ë¡£
+
+ °Ê²¼¤Î¥¡¼¤Ï¾ï¤Ëǧ¼±¤µ¤ì¤ë¡£
<ul>
- <li> #Mface. ÃÍ¤Ï <tt>(MFace *)</tt> ·¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
+ <li> #Mdevice. ÃÍ¤Ï #Mx, #Mgd, #Mnil ¤Î¤¤¤º¤ì¤«¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
+
+ Ãͤ¬ #Mx ¤Ê¤é¤Ð¡¢¿·¤·¤¤¥Õ¥ì¡¼¥à¤Ï X ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥àÍѤǤ¢¤ë¡£¤³
+ ¤Î¥Õ¥ì¡¼¥à¤È¶¦¤Ë»ØÄꤵ¤ì¤¿°ú¿ô #MDrawWindow ¤Ï¡¢ @c Window ·¿¤Ç¤Ê
+ ¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¥Õ¥ì¡¼¥à¤ÏÆɤ߽ñ¤¤È¤â¤Ë²Äǽ¤Ç¤¢¤ê¡¢¤¹¤Ù¤Æ¤ÎGUI ´Ø
+ ¿ô¤¬»ÈÍѤǤ¤ë¡£
+
+ Ãͤ¬ #Mgd ¤Ê¤é¤Ð¡¢¿·¤·¤¤¥Õ¥ì¡¼¥à¤Ï GD ¥é¥¤¥Ö¥é¥ê¤Î¥¤¥á¡¼¥¸¥ª¥Ö¥¸¥§
+ ¥¯¥ÈÍѤǤ¢¤ë¡£¤³¤Î¥Õ¥ì¡¼¥à¤È¶¦¤Ë»ØÄꤵ¤ì¤¿°ú¿ô #MDrawWindow ¤Ï¡¢
+ @c gdImagePtr ·¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¥Õ¥ì¡¼¥à¤Ï½ñ¤½Ð¤·ÀìÍѤǤ¢¤ê¡¢
+ minput_ ¤Ç»Ï¤Þ¤ë̾Á°¤Î´Ø¿ô¤Ï»ÈÍѤǤ¤Ê¤¤¡£
+
+ Ãͤ¬ #Mnil ¤Ê¤é¤Ð¡¢¿·¤·¤¤¥Õ¥ì¡¼¥à¤Ï, null ¥Ç¥Ð¥¤¥¹ÍѤǤ¢¤ë¡£¤³¤Î¥Õ
+ ¥ì¡¼¥à¤ÏÆɤ߽ñ¤¤Ç¤¤Ê¤¤¤Î¤Ç¡¢°ú¿ô #MDrawWindow ¤òɬÍפȤ¹¤ëmdraw_
+ ¤Ç»Ï¤Þ¤ë̾Á°¤Î´Ø¿ô¤ä¡¢minput_ ¤Ç»Ï¤Þ¤ë̾Á°¤Î´Ø¿ô¤Ï»ÈÍѤǤ¤Ê¤¤¡£
+
+ <li> #Mface. ÃÍ¤Ï #MFace ¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
¤³¤ÎÃͤϥե졼¥à¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥§¡¼¥¹¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£
</ul>
- ¤³¤ì¤Ë²Ã¤¨¤Æ¡¢m17n-X ¥é¥¤¥Ö¥é¥ê¤Ç¤Ï°Ê²¼¤Î¥¡¼¤âǧ¼±¤¹¤ë¡£¤³¤ì¤é¤Ï
- ¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤È¡¢¥Õ¥ì¡¼¥à¤ÇÍøÍѤǤ¤ë drawable ¤Î¿¼¤µ¤ò»ØÄꤹ¤ë¡£
+ ¤³¤ì¤é¤Î¥¡¼¤Ë²Ã¤¨¡¢#Mdevice ¤Î¥¡¼¤¬ #Mx ¤Ç¤¢¤ë¾ì¹ç¤Ë¸Â¤ê°Ê²¼¤Î¥¡¼
+ ¤âǧ¼±¤µ¤ì¤ë¡£°Ê²¼¤Î¥¡¼¤Ï¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤È¡¢¥Õ¥ì¡¼¥à¤ÇÍøÍѤǤ¤ë
+ drawable ¤Î¿¼¤µ¤ò»ØÄꤹ¤ë¡£
<ul>
À¸À®¤µ¤ì¤¿¥Õ¥ì¡¼¥à¤Ï¡¢»ØÄꤷ¤¿¥«¥é¡¼¥Þ¥Ã¥×¤ò»ÈÍѤ¹¤ë¡£
+ <li> #Mfont. Ãͤϡ¢#Mx, #Mfreetype, #Mxft ¤Î¤¤¤º¤ì¤«¡£
+
+ À¸À®¤µ¤ì¤¿¥Õ¥ì¡¼¥à¤Ï»ØÄꤷ¤¿¥Õ¥©¥ó¥È¥Ð¥Ã¥¯¥¨¥ó¥É¤ò»ÈÍѤ¹¤ë¡£Ãͤ¬
+ #Mx ¤Ç¤¢¤ì¤Ð X ¤Î¥³¥¢¥Õ¥©¥ó¥È¡¢#Mfreetype ¤Ç¤¢¤ì¤Ð FreeType ¤Ç¥µ¥Ý¡¼
+ ¥È¤µ¤ì¤Æ¤¤¤ë¥í¡¼¥«¥ë¥Õ¥©¥ó¥È¡¢#Mxft ¤Ç¤¢¤ì¤Ð Xft ¥é¥¤¥Ö¥é¥ê·Ðͳ¤Ç
+ ÍѤ¤¤ë¥í¡¼¥«¥ë¥Õ¥©¥ó¥È¤ò»ÈÍѤ¹¤ë¡£Ê£¿ô¤Î¥Õ¥©¥ó¥È¥Ð¥Ã¥¯¥¨¥ó¥É¤ò»ÈÍÑ
+ ¤·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥Ñ¥é¥á¡¼¥¿¤òÊ£¿ô²ó¡¢°Û¤Ê¤ëÃͤǻØÄꤹ¤ë¤³¤È¤¬¤Ç
+ ¤¤ë¡£»ØÄꤷ¤¿¥Ð¥Ã¥¯¥¨¥ó¥É¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ç¥Ð¥¤¥¹¤Ç¤Ï¡¢¤³¤Î
+ ¥Ñ¥é¥á¡¼¥¿¤Ï̵»ë¤µ¤ì¤ë¡£
+
+ ¤³¤Î¥Ñ¥é¥á¡¼¥¿¤¬Ìµ¤¤¾ì¹ç¤Ë¤Ï¡¢¥Ç¥Ð¥¤¥¹¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î
+ ¥Õ¥©¥ó¥È¥Ð¥Ã¥¯¥¨¥ó¥É¤òÍøÍѤ¹¤ë¡£
+
</ul>
@return
if (! interface->handle)
{
(*interface->init) ();
- interface->handle = Mt;
+ interface->handle = (void *) 1;
}
#else /* not HAVE_FREETYPE */
MERROR (MERROR_WIN, NULL);
MERROR (MERROR_WIN, NULL);
if (! interface->handle)
{
- interface->handle = dlopen (interface->library, RTLD_NOW);
- if (! interface->handle)
- MERROR (MERROR_WIN, NULL);
- interface->init = dlsym (interface->handle, "device_init");
- interface->open = dlsym (interface->handle, "device_open");
- interface->fini = dlsym (interface->handle, "device_fini");
- if (! interface->init || ! interface->open || ! interface->fini
+ if (! (interface->handle = dlopen (interface->library, RTLD_NOW))
+ || ! (interface->init = dlsym (interface->handle, "device_init"))
+ || ! (interface->open = dlsym (interface->handle, "device_open"))
+ || ! (interface->fini = dlsym (interface->handle, "device_fini"))
|| (*interface->init) () < 0)
{
- dlclose (interface->handle);
+ fprintf (stderr, "%s\n", (char *) dlerror ());
+ if (interface->handle)
+ dlclose (interface->handle);
MERROR (MERROR_WIN, NULL);
}
}
}
M17N_OBJECT (frame, free_frame, MERROR_FRAME);
- if (! (frame->device = (*interface->open) (frame, plist)))
+ if ((*interface->open) (frame, plist) < 0)
{
free (frame);
MERROR (MERROR_WIN, NULL);