projects
/
m17n
/
m17n-lib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[m17n/m17n-lib.git]
/
src
/
m17n-gui.c
diff --git
a/src/m17n-gui.c
b/src/m17n-gui.c
index
22816ed
..
44c204c
100644
(file)
--- a/
src/m17n-gui.c
+++ b/
src/m17n-gui.c
@@
-88,7
+88,7
@@
typedef struct
{
/** Name of the dynamic library (e.g. "libm17n-X.so"). */
char *library;
{
/** Name of the dynamic library (e.g. "libm17n-X.so"). */
char *library;
- /** Handle fo the dynamic library. */
+ /** Handle of the dynamic library. */
void *handle;
/** Function to call just after loading the library. */
int (*init) ();
void *handle;
/** Function to call just after loading the library. */
int (*init) ();
@@
-264,6
+264,7
@@
m17n_init_win (void)
Mdrawable = msymbol ("drawable");
Mdepth = msymbol ("depth");
Mwidget = msymbol ("widget");
Mdrawable = msymbol ("drawable");
Mdepth = msymbol ("depth");
Mwidget = msymbol ("widget");
+ Mcolormap = msymbol ("colormap");
MDEBUG_PUSH_TIME ();
if (mfont__init () < 0)
MDEBUG_PUSH_TIME ();
if (mfont__init () < 0)
@@
-320,19
+321,22
@@
m17n_fini_win (void)
}
#ifdef HAVE_FREETYPE
if (null_interface.handle)
}
#ifdef HAVE_FREETYPE
if (null_interface.handle)
- (*null_interface.fini) ();
+ {
+ (*null_interface.fini) ();
+ null_interface.handle = NULL;
+ }
#endif /* not HAVE_FREETYPE */
M17N_OBJECT_UNREF (device_library_list);
#endif /* not HAVE_FREETYPE */
M17N_OBJECT_UNREF (device_library_list);
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize input-gui module."));
minput__win_fini ();
minput__win_fini ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize draw module."));
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize input-gui module."));
mdraw__fini ();
mdraw__fini ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize face module."));
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize draw module."));
mface__fini ();
mface__fini ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize fontset module."));
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize face module."));
mfont__fontset_fini ();
mfont__fontset_fini ();
- MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize font module."));
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize fontset module."));
mfont__fini ();
mfont__fini ();
+ MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize font module."));
mframe_default = NULL;
MDEBUG_POP_TIME ();
MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize the gui modules."));
mframe_default = NULL;
MDEBUG_POP_TIME ();
MDEBUG_PRINT_TIME ("FINI", (stderr, " to finalize the gui modules."));
@@
-683,8
+687,8
@@
mframe (MPlist *plist)
if (MPLIST_KEY (pl) == Mface)
mface_merge (frame->face, (MFace *) MPLIST_VAL (pl));
mface__update_frame_face (frame);
if (MPLIST_KEY (pl) == Mface)
mface_merge (frame->face, (MFace *) MPLIST_VAL (pl));
mface__update_frame_face (frame);
- frame->font = frame->rface->rfont ? frame->rface->rfont->font : NULL;
-
+ frame->font
+ = frame->rface->rfont ? (MFont *) frame->rface->rfont : NULL;
if (plist_created)
M17N_OBJECT_UNREF (plist);
return frame;
if (plist_created)
M17N_OBJECT_UNREF (plist);
return frame;
@@
-778,9
+782,9
@@
mframe_get_prop (MFrame *frame, MSymbol key)
if (key == Mface)
return frame->face;
if (key == Mfont)
if (key == Mface)
return frame->face;
if (key == Mfont)
- return (frame->rface->rfont ? frame->rface->rfont->font : NULL);
+ return frame->font;
if (key == Mfont_width)
if (key == Mfont_width)
- return (void *) (frame->space_width);
+ return (void *) (frame->average_width);
if (key == Mfont_ascent)
return (void *) (frame->ascent);
if (key == Mfont_descent)
if (key == Mfont_ascent)
return (void *) (frame->ascent);
if (key == Mfont_descent)