X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-X.c;h=5fdba28a3e780769a4dbfab1388eaaef53cff4dd;hb=5242293f6b459122faec6ec47da391bf1cf89dbd;hp=f1cc4f57a875c84df347344127dbd074fd71162d;hpb=8ccae49d8ac2d5e8034723ad53b56812eb3b32de;p=m17n%2Fm17n-lib.git diff --git a/src/m17n-X.c b/src/m17n-X.c index f1cc4f5..5fdba28 100644 --- a/src/m17n-X.c +++ b/src/m17n-X.c @@ -56,6 +56,24 @@ #include "fontset.h" #include "face.h" +typedef struct { + MFont core; + /* Nth bit tells the existence of a font of size (N+1). + core.property[MFONT_SIZE] holds the smallest size. */ + unsigned int sizes; + /* If sizes is not 0, smallest and largest sizes. */ + unsigned short smallest, largest; +} MXFont; + +/* S must satisfy the condition (S > 0 && S <= 32). */ +#define SET_SIZE(sizes, s) ((sizes) |= (1 << ((s) - 1))) +#define HAVE_SIZE(sizes, s) ((sizes) & (1 << ((s) - 1))) + +typedef struct { + int size, inc, used; + MXFont *fonts; +} MXFontList; + typedef struct { /* Common header for the m17n object. */ @@ -67,18 +85,19 @@ typedef struct be closed on freeing this structure. */ int auto_display; - /** List of available fonts on the display (except for iso8859-1 and - iso10646-1 fonts). Keys are font registries, values are - (MFontList *). */ - MPlist *font_registry_list; - - MPlist *iso8859_1_family_list; + /** List of available X-core fonts on the display. Keys are + registries and values are plists whose keys are families and + values are pointers to MXFontList. */ + MPlist *font_list; - MPlist *iso10646_1_family_list; + /** List of available X-core fonts on the display. Keys are + families and values are pointers to MFont. For each MFont, only + these properties are important; FOUNDRY, FAMILY, REGISTRY. */ + MPlist *base_font_list; - /* List of information about each font. Keys are font registries, - values are (MFontInfo *). */ - MPlist *realized_font_list; + /** Nonzero means that already contains all available + fonts on the display. */ + int all_fonts_scaned; /** Modifier bit masks of the display. */ int meta_mask; @@ -146,6 +165,10 @@ typedef struct /** List of pointers to realized faces on the frame. */ MPlist *realized_face_list; + /* List of information about each font. Keys are font registries, + values are (MFontInfo *). */ + MPlist *realized_font_list; + /** List of pointers to realized fontsets on the frame. */ MPlist *realized_fontset_list; @@ -179,41 +202,18 @@ static void free_display_info (void *object) { MDisplayInfo *disp_info = (MDisplayInfo *) object; - MPlist *plist; - - MPLIST_DO (plist, disp_info->font_registry_list) - { - MFontList *registry_list = MPLIST_VAL (plist); - - if (registry_list->fonts) - free (registry_list->fonts); - free (registry_list); - } - M17N_OBJECT_UNREF (disp_info->font_registry_list); - - MPLIST_DO (plist, disp_info->iso8859_1_family_list) - { - MFontList *family_list = MPLIST_VAL (plist); + MPlist *plist, *p; - if (family_list->fonts) - free (family_list->fonts); - free (family_list); - } - M17N_OBJECT_UNREF (disp_info->iso8859_1_family_list); - - MPLIST_DO (plist, disp_info->iso10646_1_family_list) + MPLIST_DO (plist, disp_info->font_list) { - MFontList *family_list = MPLIST_VAL (plist); - - if (family_list->fonts) - free (family_list->fonts); - free (family_list); + MPLIST_DO (p, MPLIST_VAL (plist)) + free (MPLIST_VAL (p)); + M17N_OBJECT_UNREF (MPLIST_VAL (plist)); } - M17N_OBJECT_UNREF (disp_info->iso10646_1_family_list); - - MPLIST_DO (plist, disp_info->realized_font_list) - mfont__free_realized ((MRealizedFont *) MPLIST_VAL (plist)); - M17N_OBJECT_UNREF (disp_info->realized_font_list); + M17N_OBJECT_UNREF (disp_info->font_list); + MPLIST_DO (plist, disp_info->base_font_list) + free (MPLIST_VAL (plist)); + M17N_OBJECT_UNREF (disp_info->base_font_list); if (disp_info->auto_display) XCloseDisplay (disp_info->display); @@ -232,6 +232,10 @@ free_device (void *object) mfont__free_realized_fontset ((MRealizedFontset *) mplist_value (plist)); M17N_OBJECT_UNREF (device->realized_fontset_list); + MPLIST_DO (plist, device->realized_font_list) + mfont__free_realized ((MRealizedFont *) MPLIST_VAL (plist)); + M17N_OBJECT_UNREF (device->realized_font_list); + MPLIST_DO (plist, device->realized_face_list) { MRealizedFace *rface = MPLIST_VAL (plist); @@ -420,1501 +424,1479 @@ set_region (MFrame *frame, GC gc, MDrawRegion region) } -/* Functions for the device driver. */ +/** X font handler */ -void -mwin__close_device (MFrame *frame) +static MRealizedFont *xfont_select (MFrame *, MFont *, MFont *, int); +static int xfont_open (MRealizedFont *); +static void xfont_find_metric (MRealizedFont *, MGlyphString *, int, int); +static unsigned xfont_encode_char (MRealizedFont *, unsigned); +static void xfont_render (MDrawWindow, int, int, MGlyphString *, + MGlyph *, MGlyph *, int, MDrawRegion); +static int xfont_list (MFrame *frame, MPlist *plist, + MFont *font, MSymbol language, int maxnum); + + +static MFontDriver xfont_driver = + { xfont_select, xfont_open, + xfont_find_metric, xfont_encode_char, xfont_render, xfont_list }; + +static int +font_compare (const void *p1, const void *p2) { - M17N_OBJECT_UNREF (FRAME_DEVICE (frame)); + return strcmp (*(char **) p1, *(char **) p2); } -void * -mwin__device_get_prop (MFrame *frame, MSymbol key) +static MPlist * +xfont_registry_list (MFrame *frame, MSymbol registry) { - MWDevice *device = FRAME_DEVICE (frame); + MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; + MPlist *font_list = disp_info->font_list; + MPlist *base_font_list = disp_info->base_font_list; + MPlist *plist, *p; + char pattern[1024]; + char **font_names, **names; + int nfonts; + int i, j; + MXFont font; + MFont *bfont = NULL; + + plist = mplist_get (font_list, registry); + if (plist) + return plist; + plist = mplist (); + mplist_add (font_list, registry, plist); + sprintf (pattern, "-*-*-*-*-*-*-*-*-*-*-*-*-%s", msymbol_name (registry)); + font_names = XListFonts (disp_info->display, pattern, 0x8000, &nfonts); + if (nfonts == 0) + return plist; + names = alloca (sizeof (char *) * nfonts); + memcpy (names, font_names, sizeof (char *) * nfonts); + qsort (names, nfonts, sizeof (char *), font_compare); + for (i = 0, p = NULL; i < nfonts; i++) + if (mfont__parse_name_into_font (names[i], Mx, (MFont *) &font) == 0 + && (font.core.property[MFONT_SIZE] > 0 + || font.core.property[MFONT_RESY] == 0)) + { + MSymbol family = FONT_PROPERTY ((MFont *) &font, MFONT_FAMILY); + MXFontList *xfont_table; + int sizes[256]; + int sizes_idx = 0; + int size, smallest, largest; + int have_scalable; + unsigned int size_bits = 0; + char *base_end; + int base_len; + int fields; + + if (p && MPLIST_KEY (p) != family) + p = mplist_find_by_key (plist, family); + if (p) + xfont_table = MPLIST_VAL (p); + else + { + p = plist; + MSTRUCT_MALLOC (xfont_table, MERROR_WIN); + MLIST_INIT1 (xfont_table, fonts, 4); + mplist_push (p, family, xfont_table); + } - if (key == Mdisplay) - return (void *) device->display_info->display; - if (key == Mscreen) - return (void *) ScreenOfDisplay(device->display_info->display, - device->screen_num); - if (key == Mcolormap) - return (void *) device->cmap; - if (key == Mdepth) - return (void *) device->depth; - return NULL; + /* Calculate how many bytes to compare to detect fonts of the + same base name. */ + for (base_end = names[i], fields = 0; *base_end; base_end++) + if (*base_end == '-' + && ++fields == 7 /* PIXEL_SIZE */) + break; + base_len = base_end - names[i] + 1; + + size = font.core.property[MFONT_SIZE] / 10; + have_scalable = size == 0; + sizes[sizes_idx++] = size; + for (j = i + 1; j < nfonts && ! strncmp (names[i], names[j], base_len); + i = j++) + if (mfont__parse_name_into_font (names[j], Mx, (MFont *) &font) == 0 + && (font.core.property[MFONT_SIZE] > 0 + || font.core.property[MFONT_RESY] == 0)) + { + int k; + + size = font.core.property[MFONT_SIZE] / 10; + if (! have_scalable) + have_scalable = size == 0; + for (k = 0; k < sizes_idx && sizes[k] != size; k++); + if (k == sizes_idx && sizes_idx < 256) + sizes[sizes_idx++] = size; + } + + for (j = 0, smallest = 0; j < sizes_idx; j++) + { + size = sizes[j]; + if (size <= 32) + { + if (size != 0) + { + if (smallest == 0) + smallest = largest = size; + else if (size < smallest) + smallest = size; + else if (size > largest) + largest = size; + SET_SIZE (size_bits, size); + } + } + else + { + font.core.property[MFONT_SIZE] = size * 10; + font.sizes = 0; + MLIST_APPEND1 (xfont_table, fonts, font, MERROR_WIN); + } + } + + if (size_bits || have_scalable == 1) + { + font.sizes = size_bits; + font.smallest = smallest; + font.largest = largest; + font.core.property[MFONT_SIZE] = have_scalable ? 0 : smallest * 10; + MLIST_APPEND1 (xfont_table, fonts, font, MERROR_WIN); + } + if (! bfont + || (font.core.property[MFONT_FOUNDRY] + != bfont->property[MFONT_FOUNDRY]) + || (font.core.property[MFONT_FAMILY] + != bfont->property[MFONT_FAMILY])) + { + MSTRUCT_MALLOC (bfont, MERROR_WIN); + *bfont = font.core; + for (j = MFONT_WEIGHT; j <= MFONT_ADSTYLE; j++) + bfont->property[j] = 0; + bfont->property[MFONT_SIZE] = bfont->property[MFONT_RESY] = 0; + mplist_push (base_font_list, family, bfont); + } + } + XFreeFontNames (font_names); + return plist; } -void -mwin__realize_face (MRealizedFace *rface) +static void +xfont_list_all (MFrame *frame) { - MFrame *frame; - MSymbol foreground, background, videomode; - MFaceHLineProp *hline; - MFaceBoxProp *box; - GCInfo *info; + MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; + MPlist *font_encoding_list, *p; - if (rface != rface->ascii_rface) - { - rface->info = rface->ascii_rface->info; - return; - } + if (disp_info->all_fonts_scaned) + return; + disp_info->all_fonts_scaned = 1; + font_encoding_list = mfont__encoding_list (); + if (! font_encoding_list) + return; + MPLIST_DO (p, font_encoding_list) + xfont_registry_list (frame, MPLIST_KEY (p)); +} - frame = rface->frame; - MSTRUCT_CALLOC (info, MERROR_WIN); - foreground = rface->face.property[MFACE_FOREGROUND]; - background = rface->face.property[MFACE_BACKGROUND]; - videomode = rface->face.property[MFACE_VIDEOMODE]; - if (! videomode) - videomode = frame->videomode; - if (videomode != Mreverse) - { - info->gc[GC_NORMAL] = get_gc (frame, foreground, 1, &info->rgb_fore); - info->gc[GC_INVERSE] = get_gc (frame, background, 0, &info->rgb_back); - } - else - { - info->gc[GC_NORMAL] = get_gc (frame, background, 0, &info->rgb_fore); - info->gc[GC_INVERSE] = get_gc (frame, foreground, 1, &info->rgb_back); - } -#ifdef HAVE_XFT2 - if (foreground == Mnil) - foreground = frame->foreground; - if (background == Mnil) - background = frame->background; - if (videomode == Mreverse) - { - MSymbol temp = foreground; - foreground = background; - background = temp; - } - if (! XftColorAllocName (FRAME_DISPLAY (frame), - FRAME_VISUAL (frame), - FRAME_CMAP (frame), - MSYMBOL_NAME (foreground), - &info->xft_color_fore)) - mdebug_hook (); - if (! XftColorAllocName (FRAME_DISPLAY (frame), - FRAME_VISUAL (frame), - FRAME_CMAP (frame), - MSYMBOL_NAME (background), - &info->xft_color_back)) - mdebug_hook (); -#endif +typedef struct +{ + M17NObject control; + Display *display; + XFontStruct *xfont; +} MXFontInfo; - hline = rface->hline; - if (hline) - { - if (hline->color) - info->gc[GC_HLINE] = get_gc (frame, hline->color, 1, NULL); - else - info->gc[GC_HLINE] = info->gc[GC_NORMAL]; - } +/* The X font driver function SELECT. */ - box = rface->box; - if (box) - { - if (box->color_top) - info->gc[GC_BOX_TOP] = get_gc (frame, box->color_top, 1, NULL); - else - info->gc[GC_BOX_TOP] = info->gc[GC_NORMAL]; +static MRealizedFont * +xfont_select (MFrame *frame, MFont *spec, MFont *request, int limited_size) +{ + MSymbol family = FONT_PROPERTY (spec, MFONT_FAMILY); + MSymbol registry = FONT_PROPERTY (spec, MFONT_REGISTRY); + int requested_size = request->property[MFONT_SIZE] / 10; + MRealizedFont *rfont; + MPlist *plist; + int i; + MFont *best_font; + int best_size, best_score, score; - if (box->color_left && box->color_left != box->color_top) - info->gc[GC_BOX_LEFT] = get_gc (frame, box->color_left, 1, NULL); - else - info->gc[GC_BOX_LEFT] = info->gc[GC_BOX_TOP]; + if (registry == Mnil + || ! strchr (MSYMBOL_NAME (registry), '-')) + return NULL; - if (box->color_bottom && box->color_bottom != box->color_top) - info->gc[GC_BOX_BOTTOM] = get_gc (frame, box->color_bottom, 1, NULL); - else - info->gc[GC_BOX_BOTTOM] = info->gc[GC_BOX_TOP]; + plist = xfont_registry_list (frame, registry); + if (MPLIST_TAIL_P (plist)) + return NULL; + best_score = -1, best_font = NULL; + MPLIST_DO (plist, plist) + { + if (family == Mnil || family == MPLIST_KEY (plist)) + { + MXFontList *xfont_table = MPLIST_VAL (plist); - if (box->color_right && box->color_right != box->color_bottom) - info->gc[GC_BOX_RIGHT] = get_gc (frame, box->color_right, 1, NULL); - else - info->gc[GC_BOX_RIGHT] = info->gc[GC_BOX_BOTTOM]; + for (i = 0; i < xfont_table->used; i++) + { + MXFont *xfont = xfont_table->fonts + i; + MFont *font = (MFont *) xfont; + unsigned int sizes = xfont->sizes; + int orig_size = font->property[MFONT_SIZE]; + int size; + + if (sizes == 0) + size = orig_size / 10; + else if (requested_size < xfont->smallest) + size = orig_size == 0 ? 0 : xfont->smallest; + else if (requested_size > xfont->largest) + size = orig_size == 0 ? 0 : xfont->largest; + else if (HAVE_SIZE (sizes, requested_size)) + size = requested_size; + else if (orig_size == 0) + size = 0; + else + { + for (size = requested_size - 1; + size > xfont->smallest && ! HAVE_SIZE (sizes, size); + size--); + if (! limited_size) + { + int s; + for (s = requested_size; + s < xfont->largest && ! HAVE_SIZE (sizes, s); + s++); + if (s - requested_size < requested_size - size) + size = s; + } + } + font->property[MFONT_SIZE] = size * 10; + score = mfont__score (font, spec, request, limited_size); + font->property[MFONT_SIZE] = orig_size; + if (score >= 0 && (best_score < 0 || score < best_score)) + { + best_size = size * 10; + best_score = score; + best_font = (MFont *) (xfont_table->fonts + i); + if (best_score == 0) + break; + } + } + if (best_score == 0) + break; + } } + if (! best_font) + return NULL; - rface->info = info; + MSTRUCT_CALLOC (rfont, MERROR_WIN); + rfont->frame = frame; + rfont->spec = *spec; + rfont->request = *request; + rfont->font = *best_font; + if (best_size == 0) + rfont->font.property[MFONT_SIZE] = request->property[MFONT_SIZE]; + else + rfont->font.property[MFONT_SIZE] = best_size; + rfont->score = best_score; + return rfont; } -void -mwin__free_realized_face (MRealizedFace *rface) -{ - if (rface == rface->ascii_rface) - free (rface->info); -} - +/* The X font driver function CLOSE. */ -void -mwin__fill_space (MFrame *frame, MDrawWindow win, MRealizedFace *rface, - int reverse, - int x, int y, int width, int height, MDrawRegion region) +static void +close_xfont (void *object) { - GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_NORMAL : GC_INVERSE]; - - if (region) - gc = set_region (frame, gc, region); + MXFontInfo *xfont_info = object; - XFillRectangle (FRAME_DISPLAY (frame), (Window) win, gc, - x, y, width, height); + XFreeFont (xfont_info->display, xfont_info->xfont); + free (object); } -void mwin__draw_empty_boxes (MDrawWindow win, int x, int y, - MGlyphString *gstring, MGlyph *from, MGlyph *to, - int reverse, MDrawRegion region) -{ - MRealizedFace *rface = from->rface; - Display *display = FRAME_DISPLAY (rface->frame); - GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; +/* The X font driver function OPEN. */ - if (from == to) - return; +static int +xfont_open (MRealizedFont *rfont) +{ + char *name; + MXFontInfo *xfont_info; + MFrame *frame = rfont->frame; + int mdebug_mask = MDEBUG_FONT; - if (region) - gc = set_region (rface->frame, gc, region); - for (; from < to; from++) + /* This never fail to generate a valid fontname because open_spec + should correspond to a font available on the system. */ + name = mfont_unparse_name (&rfont->font, Mx); + M17N_OBJECT (xfont_info, close_xfont, MERROR_WIN); + xfont_info->display = FRAME_DISPLAY (frame); + xfont_info->xfont = XLoadQueryFont (FRAME_DISPLAY (frame), name); + if (! xfont_info->xfont) { - XDrawRectangle (display, (Window) win, gc, - x, y - gstring->ascent + 1, from->width - 1, - gstring->ascent + gstring->descent - 2); - x += from->width; - } -} - - -void -mwin__draw_hline (MFrame *frame, MDrawWindow win, MGlyphString *gstring, - MRealizedFace *rface, int reverse, - int x, int y, int width, MDrawRegion region) -{ - enum MFaceHLineType type = rface->hline->type; - GCInfo *info = rface->info; - GC gc = gc = info->gc[GC_HLINE]; - int i; - - y = (type == MFACE_HLINE_BOTTOM - ? y + gstring->text_descent - rface->hline->width - : type == MFACE_HLINE_UNDER - ? y + 1 - : type == MFACE_HLINE_STRIKE_THROUGH - ? y - ((gstring->ascent + gstring->descent) / 2) - : y - gstring->text_ascent); - if (region) - gc = set_region (frame, gc, region); - - for (i = 0; i < rface->hline->width; i++) - XDrawLine (FRAME_DISPLAY (frame), (Window) win, gc, - x, y + i, x + width - 1, y + i); + rfont->status = -1; + free (xfont_info); + MDEBUG_PRINT1 (" [XFONT] x %s\n", name); + free (name); + return -1; + } + rfont->info = xfont_info; + MDEBUG_PRINT1 (" [XFONT] o %s\n", name); + free (name); + rfont->status = 1; + rfont->ascent = xfont_info->xfont->ascent; + rfont->descent = xfont_info->xfont->descent; + rfont->type = Mx; + rfont->fontp = xfont_info->xfont; + return 0; } -void -mwin__draw_box (MFrame *frame, MDrawWindow win, MGlyphString *gstring, - MGlyph *g, int x, int y, int width, MDrawRegion region) -{ - Display *display = FRAME_DISPLAY (frame); - MRealizedFace *rface = g->rface; - MFaceBoxProp *box = rface->box; - GCInfo *info = rface->info; - GC gc_top, gc_left, gc_right, gc_btm; - int y0, y1; - int i; - - y0 = y - (gstring->text_ascent - + rface->box->inner_vmargin + rface->box->width); - y1 = y + (gstring->text_descent - + rface->box->inner_vmargin + rface->box->width - 1); +/* The X font driver function FIND_METRIC. */ - gc_top = info->gc[GC_BOX_TOP]; - if (region) - gc_top = set_region (frame, gc_top, region); - if (info->gc[GC_BOX_TOP] == info->gc[GC_BOX_BOTTOM]) - gc_btm = gc_top; - else - gc_btm = info->gc[GC_BOX_BOTTOM]; +static void +xfont_find_metric (MRealizedFont *rfont, MGlyphString *gstring, + int from, int to) +{ + MXFontInfo *xfont_info = rfont->info; + XFontStruct *xfont = xfont_info->xfont; + MGlyph *g = MGLYPH (from), *gend = MGLYPH (to); - if (g->type == GLYPH_BOX) + for (; g != gend; g++) { - int x0, x1; - - if (g->left_padding) - x0 = x + box->outer_hmargin, x1 = x + g->width - 1; + if (g->code == MCHAR_INVALID_CODE) + { + g->lbearing = xfont->max_bounds.lbearing; + g->rbearing = xfont->max_bounds.rbearing; + g->width = xfont->max_bounds.width; + g->ascent = xfont->ascent; + g->descent = xfont->descent; + } else - x0 = x, x1 = x + g->width - box->outer_hmargin - 1; - - /* Draw the top side. */ - for (i = 0; i < box->width; i++) - XDrawLine (display, (Window) win, gc_top, x0, y0 + i, x1, y0 + i); + { + int byte1 = g->code >> 8, byte2 = g->code & 0xFF; + XCharStruct *pcm = NULL; - /* Draw the bottom side. */ - if (region && gc_btm != gc_top) - gc_btm = set_region (frame, gc_btm, region); - for (i = 0; i < box->width; i++) - XDrawLine (display, (Window) win, gc_btm, x0, y1 - i, x1, y1 - i); + if (xfont->per_char != NULL) + { + if (xfont->min_byte1 == 0 && xfont->max_byte1 == 0) + { + if (byte1 == 0 + && byte2 >= xfont->min_char_or_byte2 + && byte2 <= xfont->max_char_or_byte2) + pcm = xfont->per_char + byte2 - xfont->min_char_or_byte2; + } + else + { + if (byte1 >= xfont->min_byte1 + && byte1 <= xfont->max_byte1 + && byte2 >= xfont->min_char_or_byte2 + && byte2 <= xfont->max_char_or_byte2) + { + pcm = (xfont->per_char + + ((xfont->max_char_or_byte2 + - xfont->min_char_or_byte2 + 1) + * (byte1 - xfont->min_byte1)) + + (byte2 - xfont->min_char_or_byte2)); + } + } + } - if (g->left_padding > 0) - { - /* Draw the left side. */ - if (info->gc[GC_BOX_LEFT] == info->gc[GC_BOX_TOP]) - gc_left = gc_top; - else + if (pcm) { - gc_left = info->gc[GC_BOX_LEFT]; - if (region) - gc_left = set_region (frame, gc_left, region); + g->lbearing = pcm->lbearing; + g->rbearing = pcm->rbearing; + g->width = pcm->width; + g->ascent = pcm->ascent; + g->descent = pcm->descent; } - for (i = 0; i < rface->box->width; i++) - XDrawLine (display, (Window) win, gc_left, - x0 + i, y0 + i, x0 + i, y1 - i); - } - else - { - /* Draw the right side. */ - if (info->gc[GC_BOX_RIGHT] == info->gc[GC_BOX_TOP]) - gc_right = gc_top; else { - gc_right = info->gc[GC_BOX_RIGHT]; - if (region) - gc_right = set_region (frame, gc_right, region); + /* If the per_char pointer is null, all glyphs between + the first and last character indexes inclusive have + the same information, as given by both min_bounds and + max_bounds. */ + g->lbearing = 0; + g->rbearing = xfont->max_bounds.width; + g->width = xfont->max_bounds.width; + g->ascent = xfont->ascent; + g->descent = xfont->descent; } - for (i = 0; i < rface->box->width; i++) - XDrawLine (display, (Window) win, gc_right, - x1 - i, y0 + i, x1 - i, y1 - i); } } - else - { - /* Draw the top side. */ - for (i = 0; i < box->width; i++) - XDrawLine (display, (Window) win, gc_top, - x, y0 + i, x + width - 1, y0 + i); - - /* Draw the bottom side. */ - if (region && gc_btm != gc_top) - gc_btm = set_region (frame, gc_btm, region); - for (i = 0; i < box->width; i++) - XDrawLine (display, (Window) win, gc_btm, - x, y1 - i, x + width - 1, y1 - i); - } } -#if 0 -void -mwin__draw_bitmap (MFrame *frame, MDrawWindow win, MRealizedFace *rface, - int reverse, int x, int y, - int width, int height, int row_bytes, unsigned char *bmp, - MDrawRegion region) +/* The X font driver function GET_GLYPH_ID. */ + +static unsigned +xfont_encode_char (MRealizedFont *rfont, unsigned code) { - Display *display = FRAME_DISPLAY (frame); - int i, j; - GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; + MXFontInfo *xfont_info; + XFontStruct *xfont; + unsigned min_byte1, max_byte1, min_byte2, max_byte2; + int all_chars_exist; - if (region) - gc = set_region (frame, gc, region); + if (rfont->status < 0 || code >= 0x10000) + return MCHAR_INVALID_CODE; + if (rfont->status == 0) + { + if (xfont_open (rfont) < 0) + return MCHAR_INVALID_CODE; + } + xfont_info = rfont->info; + xfont = xfont_info->xfont; + all_chars_exist = (! xfont->per_char || xfont->all_chars_exist == True); + min_byte1 = xfont->min_byte1; + max_byte1 = xfont->max_byte1; + min_byte2 = xfont->min_char_or_byte2; + max_byte2 = xfont->max_char_or_byte2; - for (i = 0; i < height; i++, bmp += row_bytes) - for (j = 0; j < width; j++) - if (bmp[j / 8] & (1 << (7 - (j % 8)))) - XDrawPoint (display, (Window) win, gc, x + j, y + i); -} -#endif + if (min_byte1 == 0 && max_byte1 == 0) + { + XCharStruct *pcm; -void -mwin__draw_points (MFrame *frame, MDrawWindow win, MRealizedFace *rface, - int intensity, MDrawPoint *points, int num, - MDrawRegion region) -{ - GCInfo *info = rface->info; - GC gc; + if (code < min_byte2 || code > max_byte2) + return MCHAR_INVALID_CODE; + if (all_chars_exist) + return code; + pcm = xfont->per_char + (code - min_byte2); + return ((pcm->width > 0 || pcm->rbearing != pcm->lbearing) + ? code : MCHAR_INVALID_CODE); + } + else + { + unsigned byte1 = code >> 8, byte2 = code & 0xFF; + XCharStruct *pcm; - if (! (gc = info->gc[intensity])) - gc = info->gc[intensity] = get_gc_for_anti_alias (FRAME_DEVICE (frame), - info, intensity); - if (region) - gc = set_region (frame, gc, region); + if (byte1 < min_byte1 || byte1 > max_byte1 + || byte2 < min_byte2 || byte2 > max_byte2) + return MCHAR_INVALID_CODE; - XDrawPoints (FRAME_DISPLAY (frame), (Window) win, gc, - (XPoint *) points, num, CoordModeOrigin); + if (all_chars_exist) + return code; + pcm = xfont->per_char + ((byte1 - min_byte1) * (max_byte2 - min_byte2 + 1) + + (byte2 - min_byte2)); + return ((pcm->width > 0 || pcm->rbearing != pcm->lbearing) + ? code : MCHAR_INVALID_CODE); + } } +/* The X font driver function RENDER. */ -MDrawRegion -mwin__region_from_rect (MDrawMetric *rect) +static void +xfont_render (MDrawWindow win, int x, int y, MGlyphString *gstring, + MGlyph *from, MGlyph *to, int reverse, MDrawRegion region) { - MDrawRegion region1 = XCreateRegion (); - MDrawRegion region2 = XCreateRegion (); - XRectangle xrect; - - xrect.x = rect->x; - xrect.y = rect->y; - xrect.width = rect->width; - xrect.height = rect->height; - XUnionRectWithRegion (&xrect, region1, region2); - XDestroyRegion (region1); - return region2; -} - -void -mwin__union_rect_with_region (MDrawRegion region, MDrawMetric *rect) -{ - MDrawRegion region1 = XCreateRegion (); - XRectangle xrect; - - xrect.x = rect->x; - xrect.y = rect->y; - xrect.width = rect->width; - xrect.height = rect->height; - - XUnionRegion (region, region, region1); - XUnionRectWithRegion (&xrect, region1, region); - XDestroyRegion (region1); -} - -void -mwin__intersect_region (MDrawRegion region1, MDrawRegion region2) -{ - MDrawRegion region = XCreateRegion (); - - XUnionRegion (region1, region1, region); - XIntersectRegion (region, region2, region1); - XDestroyRegion (region); -} - -void -mwin__region_add_rect (MDrawRegion region, MDrawMetric *rect) -{ - MDrawRegion region1 = XCreateRegion (); - XRectangle xrect; - - xrect.x = rect->x; - xrect.y = rect->y; - xrect.width = rect->width; - xrect.height = rect->height; - XUnionRectWithRegion (&xrect, region1, region); - XDestroyRegion (region1); -} - -void -mwin__region_to_rect (MDrawRegion region, MDrawMetric *rect) -{ - XRectangle xrect; - - XClipBox (region, &xrect); - rect->x = xrect.x; - rect->y = xrect.y; - rect->width = xrect.width; - rect->height = xrect.height; -} - -void -mwin__free_region (MDrawRegion region) -{ - XDestroyRegion (region); -} - -void -mwin__dump_region (MDrawRegion region) -{ - XRectangle rect; - XClipBox (region, &rect); - fprintf (stderr, "(%d %d %d %d)\n", rect.x, rect.y, rect.width, rect.height); -} - - -MDrawWindow -mwin__create_window (MFrame *frame, MDrawWindow parent) -{ - Display *display = FRAME_DISPLAY (frame); - Window win; - XWMHints wm_hints = { InputHint, False }; - XClassHint class_hints = { "M17N-IM", "m17n-im" }; - XSetWindowAttributes set_attrs; - unsigned long mask; - XGCValues values; - GCInfo *info = frame->rface->info; - - if (! parent) - parent = (MDrawWindow) RootWindow (display, FRAME_SCREEN (frame)); - mask = GCForeground; - XGetGCValues (display, info->gc[GC_INVERSE], mask, &values); - set_attrs.background_pixel = values.foreground; - set_attrs.backing_store = Always; - set_attrs.override_redirect = True; - set_attrs.save_under = True; - mask = CWBackPixel | CWBackingStore | CWOverrideRedirect | CWSaveUnder; - win = XCreateWindow (display, (Window) parent, 0, 0, 1, 1, 0, - CopyFromParent, InputOutput, CopyFromParent, - mask, &set_attrs); - XSetWMProperties (display, (Window) win, NULL, NULL, NULL, 0, - NULL, &wm_hints, &class_hints); - XSelectInput (display, (Window) win, StructureNotifyMask | ExposureMask); - return (MDrawWindow) win; -} - -void -mwin__destroy_window (MFrame *frame, MDrawWindow win) -{ - XDestroyWindow (FRAME_DISPLAY (frame), (Window) win); -} - -#if 0 -MDrawWindow -mwin__event_window (void *event) -{ - return ((MDrawWindow) ((XEvent *) event)->xany.window); -} - -void -mwin__print_event (void *arg, char *win_name) -{ - char *event_name; - XEvent *event = (XEvent *) arg; - - switch (event->xany.type) - { - case 2: event_name = "KeyPress"; break; - case 3: event_name = "KeyRelease"; break; - case 4: event_name = "ButtonPress"; break; - case 5: event_name = "ButtonRelease"; break; - case 6: event_name = "MotionNotify"; break; - case 7: event_name = "EnterNotify"; break; - case 8: event_name = "LeaveNotify"; break; - case 9: event_name = "FocusIn"; break; - case 10: event_name = "FocusOut"; break; - case 11: event_name = "KeymapNotify"; break; - case 12: event_name = "Expose"; break; - case 13: event_name = "GraphicsExpose"; break; - case 14: event_name = "NoExpose"; break; - case 15: event_name = "VisibilityNotify"; break; - case 16: event_name = "CreateNotify"; break; - case 17: event_name = "DestroyNotify"; break; - case 18: event_name = "UnmapNotify"; break; - case 19: event_name = "MapNotify"; break; - case 20: event_name = "MapRequest"; break; - case 21: event_name = "ReparentNotify"; break; - case 22: event_name = "ConfigureNotify"; break; - case 23: event_name = "ConfigureRequest"; break; - case 24: event_name = "GravityNotify"; break; - case 25: event_name = "ResizeRequest"; break; - case 26: event_name = "CirculateNotify"; break; - case 27: event_name = "CirculateRequest"; break; - case 28: event_name = "PropertyNotify"; break; - case 29: event_name = "SelectionClear"; break; - case 30: event_name = "SelectionRequest"; break; - case 31: event_name = "SelectionNotify"; break; - case 32: event_name = "ColormapNotify"; break; - case 33: event_name = "ClientMessage"; break; - case 34: event_name = "MappingNotify"; break; - default: event_name = "unknown"; - } - - fprintf (stderr, "%s: %s\n", win_name, event_name); -} -#endif - -void -mwin__map_window (MFrame *frame, MDrawWindow win) -{ - XMapRaised (FRAME_DISPLAY (frame), (Window) win); -} - -void -mwin__unmap_window (MFrame *frame, MDrawWindow win) -{ - XUnmapWindow (FRAME_DISPLAY (frame), (Window) win); -} + MRealizedFace *rface = from->rface; + MXFontInfo *xfont_info = rface->rfont->info; + Display *display; + XChar2b *code; + GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; + MGlyph *g; + int i; -void -mwin__window_geometry (MFrame *frame, MDrawWindow win, MDrawWindow parent_win, - MDrawMetric *geometry) -{ - Display *display = FRAME_DISPLAY (frame); - XWindowAttributes attr; - Window parent = (Window) parent_win, root; + if (from == to) + return; - XGetWindowAttributes (display, (Window) win, &attr); - geometry->x = attr.x + attr.border_width; - geometry->y = attr.y + attr.border_width; - geometry->width = attr.width; - geometry->height = attr.height; + /* It is assured that the all glyphs in the current range use the + same realized face. */ + display = FRAME_DISPLAY (rface->frame); - if (! parent) - parent = RootWindow (display, FRAME_SCREEN (frame)); - while (1) + if (region) + gc = set_region (rface->frame, gc, region); + XSetFont (display, gc, xfont_info->xfont->fid); + code = (XChar2b *) alloca (sizeof (XChar2b) * (to - from)); + for (i = 0, g = from; g < to; i++, g++) { - Window this_parent, *children; - unsigned n; - - XQueryTree (display, (Window) win, &root, &this_parent, &children, &n); - if (children) - XFree (children); - if (this_parent == parent || this_parent == root) - break; - win = (MDrawWindow) this_parent; - XGetWindowAttributes (display, (Window) win, &attr); - geometry->x += attr.x + attr.border_width; - geometry->y += attr.y + attr.border_width; + code[i].byte1 = g->code >> 8; + code[i].byte2 = g->code & 0xFF; } -} - -void -mwin__adjust_window (MFrame *frame, MDrawWindow win, - MDrawMetric *current, MDrawMetric *new) -{ - Display *display = FRAME_DISPLAY (frame); - unsigned int mask = 0; - XWindowChanges values; - if (current->width != new->width) - { - mask |= CWWidth; - if (new->width <= 0) - new->width = 1; - values.width = current->width = new->width; - } - if (current->height != new->height) - { - mask |= CWHeight; - if (new->height <= 0) - new->height = 1; - values.height = current->height = new->height; - } - if (current->x != new->x) - { - mask |= CWX; - values.x = current->x = new->x; - } - if (current->y != new->y) - { - mask |= CWY; - current->y = new->y; - values.y = current->y = new->y; - } - if (mask) - XConfigureWindow (display, (Window) win, mask, &values); - XClearWindow (display, (Window) win); -} - -MSymbol -mwin__parse_event (MFrame *frame, void *arg, int *modifiers) -{ - XEvent *event = (XEvent *) arg; - MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; - int len; - char buf[512]; - KeySym keysym; - MSymbol key; - - *modifiers = 0; - if (event->xany.type != KeyPress - /* && event->xany.type != KeyRelease */ - ) - return Mnil; - len = XLookupString ((XKeyEvent *) event, (char *) buf, 512, &keysym, NULL); - if (len > 1) - return Mnil; - if (len == 1) + g = from; + while (g < to) { - int c = keysym; - - if (c < XK_space || c > XK_asciitilde) - c = buf[0]; - if ((c == ' ' || c == 127) && ((XKeyEvent *) event)->state & ShiftMask) - *modifiers |= MINPUT_KEY_SHIFT_MODIFIER; - if (((XKeyEvent *) event)->state & ControlMask) + if (g->type == GLYPH_PAD) + x += g++->width; + else if (g->type == GLYPH_SPACE) + for (; g < to && g->type == GLYPH_SPACE; g++) + x += g->width; + else if (! g->rface->rfont) { - if (c >= 'a' && c <= 'z') - c += 'A' - 'a'; - if (c >= ' ' && c < 127) - *modifiers |= MINPUT_KEY_CONTROL_MODIFIER; - } - key = minput__char_to_key (c); - } - else if (keysym >= XK_Shift_L && keysym <= XK_Hyper_R) - return Mnil; - else - { - char *str = XKeysymToString (keysym); + if ((g->c >= 0x200B && g->c <= 0x200F) + || (g->c >= 0x202A && g->c <= 0x202E)) + x += g++->width; + else + { + /* As a font is not found for this character, draw an + empty box. */ + int box_width = g->width; + int box_height = gstring->ascent + gstring->descent; - if (! str) - return Mnil; - key = msymbol (str); - if (((XKeyEvent *) event)->state & ShiftMask) - *modifiers |= MINPUT_KEY_SHIFT_MODIFIER; - if (((XKeyEvent *) event)->state & ControlMask) - *modifiers |= MINPUT_KEY_CONTROL_MODIFIER; - } - if (((XKeyEvent *) event)->state & disp_info->meta_mask) - *modifiers |= MINPUT_KEY_META_MODIFIER; - if (((XKeyEvent *) event)->state & disp_info->alt_mask) - *modifiers |= MINPUT_KEY_ALT_MODIFIER; - if (((XKeyEvent *) event)->state & disp_info->super_mask) - *modifiers |= MINPUT_KEY_SUPER_MODIFIER; - if (((XKeyEvent *) event)->state & disp_info->hyper_mask) - *modifiers |= MINPUT_KEY_HYPER_MODIFIER; + if (box_width > 4) + box_width -= 2; + if (box_height > 4) + box_height -= 2; + XDrawRectangle (display, (Window) win, gc, + x, y - gstring->ascent, box_width, box_height); + x += g++->width; + } + } + else if (g->xoff != 0 || g->yoff != 0 || g->right_padding) + { + XDrawString16 (display, (Window) win, gc, + x + g->xoff, y + g->yoff, code + (g - from), 1); + x += g->width; + g++; + } + else + { + int orig_x = x; + int code_idx = g - from; - return key; + for (i = 0; + g < to && g->type == GLYPH_CHAR && g->xoff == 0 && g->yoff == 0; + i++, g++) + x += g->width; + XDrawString16 (display, (Window) win, gc, orig_x, y, + code + code_idx, i); + } + } } - -MText * -mwin__get_selection_text (MFrame *frame) +static int +xfont_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language, + int maxnum) { - return NULL; -} - + MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; + MSymbol registry = font ? FONT_PROPERTY (font, MFONT_REGISTRY) : Mnil; + MSymbol family = font ? FONT_PROPERTY (font, MFONT_FAMILY) : Mnil; + MPlist *p, *pl; + int num = 0; -void -mwin__dump_gc (MFrame *frame, MRealizedFace *rface) -{ - unsigned long valuemask = GCForeground | GCBackground | GCClipMask; - XGCValues values; - Display *display = FRAME_DISPLAY (frame); - GCInfo *info = rface->info; - int i; + if (registry != Mnil) + xfont_registry_list (frame, registry); + else + xfont_list_all (frame); - for (i = 0; i <= GC_INVERSE; i++) + /* As we have not yet implemented the language check, return all + base fonts. */ + if (! font) + MPLIST_DO (p, disp_info->base_font_list) + { + mplist_add (plist, MPLIST_KEY (p), MPLIST_VAL (p)); + num++; + if (num == maxnum) + return num; + } + else { - XGetGCValues (display, info->gc[i], valuemask, &values); - fprintf (stderr, "GC%d: fore/#%lX back/#%lX", i, - values.foreground, values.background); - fprintf (stderr, "\n"); + MXFontList *xfontlist; + MXFont *xfont; + int i; + + pl = disp_info->font_list; + if (registry != Mnil) + { + pl = mplist_find_by_key (pl, registry); + if (! pl) + return 0; + } + + MPLIST_DO (pl, pl) + { + p = MPLIST_VAL (pl); + if (family != Mnil) + { + p = mplist_find_by_key (p, family); + if (! p) + return 0; + } + MPLIST_DO (p, p) + { + xfontlist = MPLIST_VAL (p); + for (i = 0; i < xfontlist->used; i++) + { + xfont = xfontlist->fonts + i; + if (mfont__match_p (&xfont->core, font, MFONT_REGISTRY)) + { + mplist_add (plist, MPLIST_KEY (p), &xfont->core); + num++; + if (num == maxnum) + return num; + } + } + if (family != Mnil) + break; + } + if (registry != Mnil) + break; + } } + return num; } -static MDeviceDriver x_driver = - { - mwin__close_device, - mwin__device_get_prop, - mwin__realize_face, - mwin__free_realized_face, - mwin__fill_space, - mwin__draw_empty_boxes, - mwin__draw_hline, - mwin__draw_box, - mwin__draw_points, - mwin__region_from_rect, - mwin__union_rect_with_region, - mwin__intersect_region, - mwin__region_add_rect, - mwin__region_to_rect, - mwin__free_region, - mwin__dump_region, - mwin__create_window, - mwin__destroy_window, - mwin__map_window, - mwin__unmap_window, - mwin__window_geometry, - mwin__adjust_window, - mwin__parse_event - }; - -/** X font handler */ - -static MRealizedFont *xfont_select (MFrame *, MFont *, MFont *, int); -static int xfont_open (MRealizedFont *); -static void xfont_find_metric (MRealizedFont *, MGlyphString *, int, int); -static unsigned xfont_encode_char (MRealizedFont *, int, unsigned); -static void xfont_render (MDrawWindow, int, int, MGlyphString *, - MGlyph *, MGlyph *, int, MDrawRegion); +/* Xft Handler */ -static MFontDriver xfont_driver = - { xfont_select, xfont_open, - xfont_find_metric, xfont_encode_char, xfont_render }; +#ifdef HAVE_XFT2 typedef struct { M17NObject control; Display *display; - XFontStruct *xfont; -} MXFontInfo; + XftFont *font_aa; + XftFont *font_no_aa; +} MXftFontInfo; -static MFontList * -build_font_list (MFrame *frame, MSymbol family, MSymbol registry, - MPlist *plist) -{ - char pattern[1024]; - MFontList *font_list; - char **fontnames; - int nfonts; - int i, j; +static int xft_open (MRealizedFont *); +static void xft_find_metric (MRealizedFont *, MGlyphString *, int, int); +static void xft_render (MDrawWindow, int, int, MGlyphString *, + MGlyph *, MGlyph *, int, MDrawRegion); - MSTRUCT_CALLOC (font_list, MERROR_WIN); +MFontDriver xft_driver = + { NULL, /* Set to ft_select in device_init (). */ + xft_open, xft_find_metric, + NULL, /* Set to ft_encode_char in device_init (). */ + xft_render, + NULL /* Set to ft_list in device_init (). */ + }; - if (family == Mnil) - { - sprintf (pattern, "-*-*-*-*-*-*-*-*-*-*-*-*-%s", - msymbol_name (registry)); - font_list->tag = registry; - } - else - { - sprintf (pattern, "-*-%s-*-*-*-*-*-*-*-*-*-*-%s", - msymbol_name (family), msymbol_name (registry)); - font_list->tag = family; - } - fontnames = XListFonts (FRAME_DISPLAY (frame), pattern, 0x8000, &nfonts); - if (nfonts > 0) - { - MTABLE_MALLOC (font_list->fonts, nfonts, MERROR_WIN); - for (i = j = 0; i < nfonts; i++) - if ((mfont__parse_name_into_font (fontnames[i], Mx, - font_list->fonts + j) - == 0) - && (font_list->fonts[j].property[MFONT_SIZE] != 0 - || font_list->fonts[j].property[MFONT_RESY] == 0)) - j++; - XFreeFontNames (fontnames); - font_list->nfonts = j; - } - mplist_add (plist, font_list->tag, font_list); - return (nfonts > 0 ? font_list : NULL); +static void +close_xft (void *object) +{ + MXftFontInfo *font_info = object; + + XftFontClose (font_info->display, font_info->font_aa); + XftFontClose (font_info->display, font_info->font_no_aa); + free (font_info); } -/* The X font driver function SELECT. */ -static MRealizedFont * -xfont_select (MFrame *frame, MFont *spec, MFont *request, int limited_size) +static XftFont * +xft_open_font (MFrame *frame, MFTInfo *ft_info, int size, int anti_alias) { - MSymbol registry = FONT_PROPERTY (spec, MFONT_REGISTRY); - MRealizedFont *rfont; - MFontList *font_list = NULL; - int i; - MFont *best_font; - int best_score, score; + XftPattern *pattern; + XftFontInfo *xft_font_info; + XftFont *font; - if (registry == Mnil - || ! strchr (MSYMBOL_NAME (registry), '-')) + pattern = XftPatternCreate (); + XftPatternAddString (pattern, XFT_FILE, ft_info->filename); + XftPatternAddDouble (pattern, XFT_PIXEL_SIZE, (double) size); + XftPatternAddBool (pattern, XFT_ANTIALIAS, anti_alias); + xft_font_info = XftFontInfoCreate (FRAME_DISPLAY (frame), pattern); + if (! xft_font_info) return NULL; + font = XftFontOpenInfo (FRAME_DISPLAY (frame), pattern, xft_font_info); + XftFontInfoDestroy (FRAME_DISPLAY (frame), xft_font_info); + return font; +} - /* We handles iso8859-1 and iso10646-1 fonts specially because there - exists so many such fonts. */ - if (registry == M_iso8859_1 || registry == M_iso10646_1) + +static int +xft_open (MRealizedFont *rfont) +{ + MFrame *frame; + MFTInfo *ft_info; + MXftFontInfo *font_info; + int size; + + if ((mfont__ft_driver.open) (rfont) < 0) + return -1; + + size = rfont->font.property[MFONT_SIZE] / 10; + frame = rfont->frame; + + ft_info = rfont->info; + M17N_OBJECT (font_info, close_xft, MERROR_WIN); + ft_info->extra_info = font_info; + font_info->display = FRAME_DISPLAY (frame); + font_info->font_aa = xft_open_font (frame, ft_info, size, 1); + if (font_info->font_aa) { - MPlist *family_list - = (registry == M_iso8859_1 - ? FRAME_DEVICE (frame)->display_info->iso8859_1_family_list - : FRAME_DEVICE (frame)->display_info->iso10646_1_family_list); - MSymbol family = FONT_PROPERTY (spec, MFONT_FAMILY); + font_info->font_no_aa = xft_open_font (frame, ft_info, size, 0); + if (font_info->font_no_aa) + { + rfont->type = Mxft; + rfont->fontp = font_info->font_no_aa; + return 0; + } + XftFontClose (FRAME_DISPLAY (rfont->frame), font_info->font_aa); + } + free (font_info); + ft_info->extra_info = NULL; + rfont->status = -1; + return -1; +} - if (family != Mnil) + +static void +xft_find_metric (MRealizedFont *rfont, MGlyphString *gstring, + int from, int to) +{ + MFTInfo *ft_info = rfont->info; + MXftFontInfo *font_info = ft_info->extra_info; + MGlyph *g = MGLYPH (from), *gend = MGLYPH (to); + + for (; g != gend; g++) + { + if (g->code == MCHAR_INVALID_CODE) { - font_list = (MFontList *) mplist_get (family_list, family); - if (! font_list) - font_list = build_font_list (frame, family, registry, family_list); + MGlyph *start = g++; + + while (g != gend && g->code == MCHAR_INVALID_CODE) g++; + (mfont__ft_driver.find_metric) (rfont, gstring, GLYPH_INDEX (start), + GLYPH_INDEX (g)); + g--; } - if (! font_list) + else { - family = FONT_PROPERTY (request, MFONT_FAMILY); - font_list = (MFontList *) mplist_get (family_list, family); - if (! font_list) - font_list = build_font_list (frame, family, registry, family_list); + XGlyphInfo extents; + + XftGlyphExtents (FRAME_DISPLAY (gstring->frame), + font_info->font_aa, &g->code, 1, &extents); + g->lbearing = - extents.x; + g->rbearing = extents.width - extents.x; + g->width = extents.xOff; + g->ascent = extents.y; + g->descent = extents.height - extents.y; } } - if (! font_list) - { - MPlist *registry_list - = FRAME_DEVICE (frame)->display_info->font_registry_list; +} - font_list = (MFontList *) mplist_get (registry_list, registry); - if (! font_list) - font_list = build_font_list (frame, Mnil, registry, registry_list); - } - if (! font_list) - return NULL; - for (i = 0, best_score = -1, best_font = NULL; i < font_list->nfonts; i++) - if ((best_score = mfont__score (font_list->fonts + i, spec, request, - limited_size)) >= 0) - break; - if (best_score < 0) - return NULL; - best_font = font_list->fonts + i; - for (; best_score > 0 && i < font_list->nfonts ; i++) +static void +xft_render (MDrawWindow win, int x, int y, + MGlyphString *gstring, MGlyph *from, MGlyph *to, + int reverse, MDrawRegion region) +{ + MRealizedFace *rface = from->rface; + MFrame *frame = rface->frame; + MFTInfo *ft_info = rface->rfont->info; + MXftFontInfo *font_info = ft_info->extra_info; + XftDraw *xft_draw = FRAME_DEVICE (frame)->xft_draw; + XftColor *xft_color = (! reverse + ? &((GCInfo *) rface->info)->xft_color_fore + : &((GCInfo *) rface->info)->xft_color_back); + XftFont *xft_font = (gstring->control.anti_alias + && FRAME_DEVICE (frame)->depth > 1 + ? font_info->font_aa : font_info->font_no_aa); + MGlyph *g; + FT_UInt *glyphs; + int last_x; + int nglyphs; + + if (from == to) + return; + + XftDrawChange (xft_draw, (Drawable) win); + XftDrawSetClip (xft_draw, (Region) region); + + glyphs = alloca (sizeof (FT_UInt) * (to - from)); + for (last_x = x, nglyphs = 0, g = from; g < to; x += g++->width) { - score = mfont__score (font_list->fonts + i, spec, request, - limited_size); - if (score >= 0 && score < best_score) + if (g->xoff == 0 && g->yoff == 0 && !g->left_padding && !g->right_padding) + glyphs[nglyphs++] = g->code; + else { - best_font = font_list->fonts + i; - best_score = score; + if (nglyphs > 0) + XftDrawGlyphs (xft_draw, xft_color, xft_font, + last_x, y, glyphs, nglyphs); + nglyphs = 0; + XftDrawGlyphs (xft_draw, xft_color, xft_font, + x + g->xoff, y + g->yoff, (FT_UInt *) &g->code, 1); + last_x = x + g->width; } } - - MSTRUCT_CALLOC (rfont, MERROR_WIN); - rfont->frame = frame; - rfont->spec = *spec; - rfont->request = *request; - rfont->font = *best_font; - if (best_font->property[MFONT_SIZE] == 0) - rfont->font.property[MFONT_SIZE] = request->property[MFONT_SIZE]; - rfont->score = best_score; - return rfont; + if (nglyphs > 0) + XftDrawGlyphs (xft_draw, xft_color, xft_font, last_x, y, glyphs, nglyphs); } +#endif -/* The X font driver function CLOSE. */ + +/* Functions for the device driver. */ static void -close_xfont (void *object) +mwin__close_device (MFrame *frame) { - MXFontInfo *xfont_info = object; + MWDevice *device = FRAME_DEVICE (frame); - XFreeFont (xfont_info->display, xfont_info->xfont); - free (object); + M17N_OBJECT_UNREF (device); } +static void * +mwin__device_get_prop (MFrame *frame, MSymbol key) +{ + MWDevice *device = FRAME_DEVICE (frame); -/* The X font driver function OPEN. */ + if (key == Mdisplay) + return (void *) device->display_info->display; + if (key == Mscreen) + return (void *) ScreenOfDisplay(device->display_info->display, + device->screen_num); + if (key == Mcolormap) + return (void *) device->cmap; + if (key == Mdepth) + return (void *) device->depth; + return NULL; +} -static int -xfont_open (MRealizedFont *rfont) +static void +mwin__realize_face (MRealizedFace *rface) { - char *name; - MXFontInfo *xfont_info; - MFrame *frame = rfont->frame; - int mdebug_mask = MDEBUG_FONT; + MFrame *frame; + MSymbol foreground, background, videomode; + MFaceHLineProp *hline; + MFaceBoxProp *box; + GCInfo *info; - /* This never fail to generate a valid fontname because open_spec - should correspond to a font available on the system. */ - name = mfont_unparse_name (&rfont->font, Mx); - M17N_OBJECT (xfont_info, close_xfont, MERROR_WIN); - xfont_info->display = FRAME_DISPLAY (frame); - xfont_info->xfont = XLoadQueryFont (FRAME_DISPLAY (frame), name); - if (! xfont_info->xfont) + if (rface != rface->ascii_rface) { - rfont->status = -1; - free (xfont_info); - MDEBUG_PRINT1 (" [XFONT] x %s\n", name); - free (name); - return -1; + rface->info = rface->ascii_rface->info; + return; } - rfont->info = xfont_info; - MDEBUG_PRINT1 (" [XFONT] o %s\n", name); - free (name); - rfont->status = 1; - rfont->ascent = xfont_info->xfont->ascent; - rfont->descent = xfont_info->xfont->descent; - return 0; -} + frame = rface->frame; + MSTRUCT_CALLOC (info, MERROR_WIN); -/* The X font driver function FIND_METRIC. */ + foreground = rface->face.property[MFACE_FOREGROUND]; + background = rface->face.property[MFACE_BACKGROUND]; + videomode = rface->face.property[MFACE_VIDEOMODE]; + if (! videomode) + videomode = frame->videomode; + if (videomode != Mreverse) + { + info->gc[GC_NORMAL] = get_gc (frame, foreground, 1, &info->rgb_fore); + info->gc[GC_INVERSE] = get_gc (frame, background, 0, &info->rgb_back); + } + else + { + info->gc[GC_NORMAL] = get_gc (frame, background, 0, &info->rgb_fore); + info->gc[GC_INVERSE] = get_gc (frame, foreground, 1, &info->rgb_back); + } +#ifdef HAVE_XFT2 + if (foreground == Mnil) + foreground = frame->foreground; + if (background == Mnil) + background = frame->background; + if (videomode == Mreverse) + { + MSymbol temp = foreground; + foreground = background; + background = temp; + } + if (! XftColorAllocName (FRAME_DISPLAY (frame), + FRAME_VISUAL (frame), + FRAME_CMAP (frame), + MSYMBOL_NAME (foreground), + &info->xft_color_fore)) + mdebug_hook (); + if (! XftColorAllocName (FRAME_DISPLAY (frame), + FRAME_VISUAL (frame), + FRAME_CMAP (frame), + MSYMBOL_NAME (background), + &info->xft_color_back)) + mdebug_hook (); +#endif -static void -xfont_find_metric (MRealizedFont *rfont, MGlyphString *gstring, - int from, int to) -{ - MXFontInfo *xfont_info = rfont->info; - XFontStruct *xfont = xfont_info->xfont; - MGlyph *g = MGLYPH (from), *gend = MGLYPH (to); + hline = rface->hline; + if (hline) + { + if (hline->color) + info->gc[GC_HLINE] = get_gc (frame, hline->color, 1, NULL); + else + info->gc[GC_HLINE] = info->gc[GC_NORMAL]; + } - for (; g != gend; g++) + box = rface->box; + if (box) { - if (g->code == MCHAR_INVALID_CODE) - { - g->lbearing = xfont->max_bounds.lbearing; - g->rbearing = xfont->max_bounds.rbearing; - g->width = xfont->max_bounds.width; - g->ascent = xfont->ascent; - g->descent = xfont->descent; - } + if (box->color_top) + info->gc[GC_BOX_TOP] = get_gc (frame, box->color_top, 1, NULL); else - { - int byte1 = g->code >> 8, byte2 = g->code & 0xFF; - XCharStruct *pcm = NULL; + info->gc[GC_BOX_TOP] = info->gc[GC_NORMAL]; - if (xfont->per_char != NULL) - { - if (xfont->min_byte1 == 0 && xfont->max_byte1 == 0) - { - if (byte1 == 0 - && byte2 >= xfont->min_char_or_byte2 - && byte2 <= xfont->max_char_or_byte2) - pcm = xfont->per_char + byte2 - xfont->min_char_or_byte2; - } - else - { - if (byte1 >= xfont->min_byte1 - && byte1 <= xfont->max_byte1 - && byte2 >= xfont->min_char_or_byte2 - && byte2 <= xfont->max_char_or_byte2) - { - pcm = (xfont->per_char - + ((xfont->max_char_or_byte2 - - xfont->min_char_or_byte2 + 1) - * (byte1 - xfont->min_byte1)) - + (byte2 - xfont->min_char_or_byte2)); - } - } - } + if (box->color_left && box->color_left != box->color_top) + info->gc[GC_BOX_LEFT] = get_gc (frame, box->color_left, 1, NULL); + else + info->gc[GC_BOX_LEFT] = info->gc[GC_BOX_TOP]; - if (pcm) - { - g->lbearing = pcm->lbearing; - g->rbearing = pcm->rbearing; - g->width = pcm->width; - g->ascent = pcm->ascent; - g->descent = pcm->descent; - } - else - { - /* If the per_char pointer is null, all glyphs between - the first and last character indexes inclusive have - the same information, as given by both min_bounds and - max_bounds. */ - g->lbearing = 0; - g->rbearing = xfont->max_bounds.width; - g->width = xfont->max_bounds.width; - g->ascent = xfont->ascent; - g->descent = xfont->descent; - } - } + if (box->color_bottom && box->color_bottom != box->color_top) + info->gc[GC_BOX_BOTTOM] = get_gc (frame, box->color_bottom, 1, NULL); + else + info->gc[GC_BOX_BOTTOM] = info->gc[GC_BOX_TOP]; + + if (box->color_right && box->color_right != box->color_bottom) + info->gc[GC_BOX_RIGHT] = get_gc (frame, box->color_right, 1, NULL); + else + info->gc[GC_BOX_RIGHT] = info->gc[GC_BOX_BOTTOM]; } -} + rface->info = info; +} -/* The X font driver function ENCODE_CHAR. */ -static unsigned -xfont_encode_char (MRealizedFont *rfont, int c, unsigned code) +static void +mwin__free_realized_face (MRealizedFace *rface) { - MXFontInfo *xfont_info; - XFontStruct *xfont; - unsigned min_byte1, max_byte1, min_byte2, max_byte2; - int all_chars_exist; - - if (rfont->status < 0 || code >= 0x10000) - return MCHAR_INVALID_CODE; - if (rfont->status == 0) - { - if (xfont_open (rfont) < 0) - return MCHAR_INVALID_CODE; - } - xfont_info = rfont->info; - xfont = xfont_info->xfont; - all_chars_exist = (! xfont->per_char || xfont->all_chars_exist == True); - min_byte1 = xfont->min_byte1; - max_byte1 = xfont->max_byte1; - min_byte2 = xfont->min_char_or_byte2; - max_byte2 = xfont->max_char_or_byte2; + if (rface == rface->ascii_rface) + free (rface->info); +} - if (min_byte1 == 0 && max_byte1 == 0) - { - XCharStruct *pcm; - if (code < min_byte2 || code > max_byte2) - return MCHAR_INVALID_CODE; - if (all_chars_exist) - return code; - pcm = xfont->per_char + (code - min_byte2); - return ((pcm->width > 0 || pcm->rbearing != pcm->lbearing) - ? code : MCHAR_INVALID_CODE); - } - else - { - unsigned byte1 = code >> 8, byte2 = code & 0xFF; - XCharStruct *pcm; +static void +mwin__fill_space (MFrame *frame, MDrawWindow win, MRealizedFace *rface, + int reverse, + int x, int y, int width, int height, MDrawRegion region) +{ + GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_NORMAL : GC_INVERSE]; - if (byte1 < min_byte1 || byte1 > max_byte1 - || byte2 < min_byte2 || byte2 > max_byte2) - return MCHAR_INVALID_CODE; + if (region) + gc = set_region (frame, gc, region); - if (all_chars_exist) - return code; - pcm = xfont->per_char + ((byte1 - min_byte1) * (max_byte2 - min_byte2 + 1) - + (byte2 - min_byte2)); - return ((pcm->width > 0 || pcm->rbearing != pcm->lbearing) - ? code : MCHAR_INVALID_CODE); - } + XFillRectangle (FRAME_DISPLAY (frame), (Window) win, gc, + x, y, width, height); } -/* The X font driver function RENDER. */ static void -xfont_render (MDrawWindow win, int x, int y, MGlyphString *gstring, - MGlyph *from, MGlyph *to, int reverse, MDrawRegion region) +mwin__draw_empty_boxes (MDrawWindow win, int x, int y, + MGlyphString *gstring, MGlyph *from, MGlyph *to, + int reverse, MDrawRegion region) { MRealizedFace *rface = from->rface; - MXFontInfo *xfont_info = rface->rfont->info; - Display *display; - XChar2b *code; + Display *display = FRAME_DISPLAY (rface->frame); GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; - MGlyph *g; - int i; if (from == to) return; - /* It is assured that the all glyphs in the current range use the - same realized face. */ - display = FRAME_DISPLAY (rface->frame); - if (region) gc = set_region (rface->frame, gc, region); - XSetFont (display, gc, xfont_info->xfont->fid); - code = (XChar2b *) alloca (sizeof (XChar2b) * (to - from)); - for (i = 0, g = from; g < to; i++, g++) + for (; from < to; from++) { - code[i].byte1 = g->code >> 8; - code[i].byte2 = g->code & 0xFF; + XDrawRectangle (display, (Window) win, gc, + x, y - gstring->ascent + 1, from->width - 1, + gstring->ascent + gstring->descent - 2); + x += from->width; } +} - g = from; - while (g < to) - { - if (g->type == GLYPH_PAD) - x += g++->width; - else if (g->type == GLYPH_SPACE) - for (; g < to && g->type == GLYPH_SPACE; g++) - x += g->width; - else if (! g->rface->rfont) - { - if ((g->c >= 0x200B && g->c <= 0x200F) - || (g->c >= 0x202A && g->c <= 0x202E)) - x += g++->width; - else - { - /* As a font is not found for this character, draw an - empty box. */ - int box_width = g->width; - int box_height = gstring->ascent + gstring->descent; - if (box_width > 4) - box_width -= 2; - if (box_height > 4) - box_height -= 2; - XDrawRectangle (display, (Window) win, gc, - x, y - gstring->ascent, box_width, box_height); - x += g++->width; - } - } - else if (g->xoff != 0 || g->yoff != 0 || g->right_padding) - { - XDrawString16 (display, (Window) win, gc, - x + g->xoff, y + g->yoff, code + (g - from), 1); - x += g->width; - g++; - } - else - { - int orig_x = x; - int code_idx = g - from; +static void +mwin__draw_hline (MFrame *frame, MDrawWindow win, MGlyphString *gstring, + MRealizedFace *rface, int reverse, + int x, int y, int width, MDrawRegion region) +{ + enum MFaceHLineType type = rface->hline->type; + GCInfo *info = rface->info; + GC gc = gc = info->gc[GC_HLINE]; + int i; - for (i = 0; - g < to && g->type == GLYPH_CHAR && g->xoff == 0 && g->yoff == 0; - i++, g++) - x += g->width; - XDrawString16 (display, (Window) win, gc, orig_x, y, - code + code_idx, i); - } - } -} + y = (type == MFACE_HLINE_BOTTOM + ? y + gstring->text_descent - rface->hline->width + : type == MFACE_HLINE_UNDER + ? y + 1 + : type == MFACE_HLINE_STRIKE_THROUGH + ? y - ((gstring->ascent + gstring->descent) / 2) + : y - gstring->text_ascent); + if (region) + gc = set_region (frame, gc, region); - -/* Xft Handler */ + for (i = 0; i < rface->hline->width; i++) + XDrawLine (FRAME_DISPLAY (frame), (Window) win, gc, + x, y + i, x + width - 1, y + i); +} -#ifdef HAVE_XFT2 -typedef struct +static void +mwin__draw_box (MFrame *frame, MDrawWindow win, MGlyphString *gstring, + MGlyph *g, int x, int y, int width, MDrawRegion region) { - M17NObject control; - Display *display; - XftFont *font_aa; - XftFont *font_no_aa; -} MXftFontInfo; + Display *display = FRAME_DISPLAY (frame); + MRealizedFace *rface = g->rface; + MFaceBoxProp *box = rface->box; + GCInfo *info = rface->info; + GC gc_top, gc_left, gc_right, gc_btm; + int y0, y1; + int i; -static int xft_open (MRealizedFont *); -static void xft_find_metric (MRealizedFont *, MGlyphString *, int, int); -static void xft_render (MDrawWindow, int, int, MGlyphString *, - MGlyph *, MGlyph *, int, MDrawRegion); + y0 = y - (gstring->text_ascent + + rface->box->inner_vmargin + rface->box->width); + y1 = y + (gstring->text_descent + + rface->box->inner_vmargin + rface->box->width - 1); -MFontDriver xft_driver = - { NULL, /* Set to ft_select in mwin__init (). */ - xft_open, xft_find_metric, - NULL, /* Set to ft_encode_char in mwin__init (). */ - xft_render }; + gc_top = info->gc[GC_BOX_TOP]; + if (region) + gc_top = set_region (frame, gc_top, region); + if (info->gc[GC_BOX_TOP] == info->gc[GC_BOX_BOTTOM]) + gc_btm = gc_top; + else + gc_btm = info->gc[GC_BOX_BOTTOM]; + if (g->type == GLYPH_BOX) + { + int x0, x1; -static void -close_xft (void *object) -{ - MXftFontInfo *font_info = object; + if (g->left_padding) + x0 = x + box->outer_hmargin, x1 = x + g->width - 1; + else + x0 = x, x1 = x + g->width - box->outer_hmargin - 1; - XftFontClose (font_info->display, font_info->font_aa); - XftFontClose (font_info->display, font_info->font_no_aa); - free (font_info); -} + /* Draw the top side. */ + for (i = 0; i < box->width; i++) + XDrawLine (display, (Window) win, gc_top, x0, y0 + i, x1, y0 + i); + /* Draw the bottom side. */ + if (region && gc_btm != gc_top) + gc_btm = set_region (frame, gc_btm, region); + for (i = 0; i < box->width; i++) + XDrawLine (display, (Window) win, gc_btm, x0, y1 - i, x1, y1 - i); -static XftFont * -xft_open_font (MFrame *frame, MFTInfo *ft_info, int size, int anti_alias) -{ - XftPattern *pattern; - XftFontInfo *xft_font_info; - XftFont *font; + if (g->left_padding > 0) + { + /* Draw the left side. */ + if (info->gc[GC_BOX_LEFT] == info->gc[GC_BOX_TOP]) + gc_left = gc_top; + else + { + gc_left = info->gc[GC_BOX_LEFT]; + if (region) + gc_left = set_region (frame, gc_left, region); + } + for (i = 0; i < rface->box->width; i++) + XDrawLine (display, (Window) win, gc_left, + x0 + i, y0 + i, x0 + i, y1 - i); + } + else + { + /* Draw the right side. */ + if (info->gc[GC_BOX_RIGHT] == info->gc[GC_BOX_TOP]) + gc_right = gc_top; + else + { + gc_right = info->gc[GC_BOX_RIGHT]; + if (region) + gc_right = set_region (frame, gc_right, region); + } + for (i = 0; i < rface->box->width; i++) + XDrawLine (display, (Window) win, gc_right, + x1 - i, y0 + i, x1 - i, y1 - i); + } + } + else + { + /* Draw the top side. */ + for (i = 0; i < box->width; i++) + XDrawLine (display, (Window) win, gc_top, + x, y0 + i, x + width - 1, y0 + i); - pattern = XftPatternCreate (); - XftPatternAddString (pattern, XFT_FILE, ft_info->filename); - XftPatternAddDouble (pattern, XFT_PIXEL_SIZE, (double) size); - XftPatternAddBool (pattern, XFT_ANTIALIAS, anti_alias); - xft_font_info = XftFontInfoCreate (FRAME_DISPLAY (frame), pattern); - if (! xft_font_info) - return NULL; - font = XftFontOpenInfo (FRAME_DISPLAY (frame), pattern, xft_font_info); - XftFontInfoDestroy (FRAME_DISPLAY (frame), xft_font_info); - return font; + /* Draw the bottom side. */ + if (region && gc_btm != gc_top) + gc_btm = set_region (frame, gc_btm, region); + for (i = 0; i < box->width; i++) + XDrawLine (display, (Window) win, gc_btm, + x, y1 - i, x + width - 1, y1 - i); + } } -static int -xft_open (MRealizedFont *rfont) +#if 0 +static void +mwin__draw_bitmap (MFrame *frame, MDrawWindow win, MRealizedFace *rface, + int reverse, int x, int y, + int width, int height, int row_bytes, unsigned char *bmp, + MDrawRegion region) { - MFrame *frame; - MFTInfo *ft_info; - MXftFontInfo *font_info; - int size; + Display *display = FRAME_DISPLAY (frame); + int i, j; + GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; - if ((mfont__ft_driver.open) (rfont) < 0) - return -1; + if (region) + gc = set_region (frame, gc, region); - size = rfont->font.property[MFONT_SIZE] / 10; - frame = rfont->frame; + for (i = 0; i < height; i++, bmp += row_bytes) + for (j = 0; j < width; j++) + if (bmp[j / 8] & (1 << (7 - (j % 8)))) + XDrawPoint (display, (Window) win, gc, x + j, y + i); +} +#endif - ft_info = rfont->info; - M17N_OBJECT (font_info, close_xft, MERROR_WIN); - ft_info->extra_info = font_info; - font_info->display = FRAME_DISPLAY (frame); - font_info->font_aa = xft_open_font (frame, ft_info, size, 1); - if (font_info->font_aa) - { - font_info->font_no_aa = xft_open_font (frame, ft_info, size, 0); - if (font_info->font_no_aa) - return 0; - XftFontClose (FRAME_DISPLAY (rfont->frame), font_info->font_aa); - } - free (font_info); - ft_info->extra_info = NULL; - rfont->status = -1; - return -1; +static void +mwin__draw_points (MFrame *frame, MDrawWindow win, MRealizedFace *rface, + int intensity, MDrawPoint *points, int num, + MDrawRegion region) +{ + GCInfo *info = rface->info; + GC gc; + + if (! (gc = info->gc[intensity])) + gc = info->gc[intensity] = get_gc_for_anti_alias (FRAME_DEVICE (frame), + info, intensity); + if (region) + gc = set_region (frame, gc, region); + + XDrawPoints (FRAME_DISPLAY (frame), (Window) win, gc, + (XPoint *) points, num, CoordModeOrigin); } -static void -xft_find_metric (MRealizedFont *rfont, MGlyphString *gstring, - int from, int to) +static MDrawRegion +mwin__region_from_rect (MDrawMetric *rect) { - MFTInfo *ft_info = rfont->info; - MXftFontInfo *font_info = ft_info->extra_info; - FT_Face ft_face = ft_info->ft_face; - MGlyph *g = MGLYPH (from), *gend = MGLYPH (to); + MDrawRegion region1 = XCreateRegion (); + MDrawRegion region2 = XCreateRegion (); + XRectangle xrect; - for (; g != gend; g++) - { - if (g->code == MCHAR_INVALID_CODE) - { - MGlyph *start = g++; + xrect.x = rect->x; + xrect.y = rect->y; + xrect.width = rect->width; + xrect.height = rect->height; + XUnionRectWithRegion (&xrect, region1, region2); + XDestroyRegion (region1); + return region2; +} - while (g != gend && g->code == MCHAR_INVALID_CODE) g++; - (mfont__ft_driver.find_metric) (rfont, gstring, GLYPH_INDEX (start), - GLYPH_INDEX (g)); - g--; - } - else - { - XGlyphInfo extents; - unsigned code; +static void +mwin__union_rect_with_region (MDrawRegion region, MDrawMetric *rect) +{ + MDrawRegion region1 = XCreateRegion (); + XRectangle xrect; - if (g->otf_encoded) - code = g->code; - else - code = FT_Get_Char_Index (ft_face, (FT_ULong) g->code); + xrect.x = rect->x; + xrect.y = rect->y; + xrect.width = rect->width; + xrect.height = rect->height; - XftGlyphExtents (FRAME_DISPLAY (rfont->frame), - font_info->font_aa, &code, 1, &extents); - g->lbearing = - extents.x; - g->rbearing = extents.width - extents.x; - g->width = extents.xOff; - g->ascent = extents.y; - g->descent = extents.height - extents.y; - } - } + XUnionRegion (region, region, region1); + XUnionRectWithRegion (&xrect, region1, region); + XDestroyRegion (region1); } - -void -xft_render (MDrawWindow win, int x, int y, - MGlyphString *gstring, MGlyph *from, MGlyph *to, - int reverse, MDrawRegion region) +static void +mwin__intersect_region (MDrawRegion region1, MDrawRegion region2) { - MRealizedFace *rface = from->rface; - MFrame *frame = rface->frame; - MFTInfo *ft_info = rface->rfont->info; - MXftFontInfo *font_info = ft_info->extra_info; - FT_Face ft_face = ft_info->ft_face; - XftDraw *xft_draw = FRAME_DEVICE (frame)->xft_draw; - XftColor *xft_color = (! reverse - ? &((GCInfo *) rface->info)->xft_color_fore - : &((GCInfo *) rface->info)->xft_color_back); - XftFont *xft_font = (gstring->control.anti_alias - && FRAME_DEVICE (frame)->depth > 1 - ? font_info->font_aa : font_info->font_no_aa); - MGlyph *g; - FT_UInt *glyphs; - int last_x; - int nglyphs; + MDrawRegion region = XCreateRegion (); - if (from == to) - return; + XUnionRegion (region1, region1, region); + XIntersectRegion (region, region2, region1); + XDestroyRegion (region); +} - XftDrawChange (xft_draw, (Drawable) win); - XftDrawSetClip (xft_draw, (Region) region); - - glyphs = alloca (sizeof (FT_UInt) * (to - from)); - for (last_x = x, nglyphs = 0, g = from; g < to; x += g++->width) - { - unsigned code; +static void +mwin__region_add_rect (MDrawRegion region, MDrawMetric *rect) +{ + MDrawRegion region1 = XCreateRegion (); + XRectangle xrect; - if (g->otf_encoded) - code = g->code; - else - code = FT_Get_Char_Index (ft_face, (FT_ULong) g->code); - if (g->xoff == 0 && g->yoff == 0) - glyphs[nglyphs++] = code; - else - { - if (nglyphs > 0) - XftDrawGlyphs (xft_draw, xft_color, xft_font, - last_x, y, glyphs, nglyphs); - nglyphs = 0; - XftDrawGlyphs (xft_draw, xft_color, xft_font, - x + g->xoff, y + g->yoff, (FT_UInt *) &code, 1); - last_x = x + g->width; - } - } - if (nglyphs > 0) - XftDrawGlyphs (xft_draw, xft_color, xft_font, last_x, y, glyphs, nglyphs); + xrect.x = rect->x; + xrect.y = rect->y; + xrect.width = rect->width; + xrect.height = rect->height; + XUnionRectWithRegion (&xrect, region1, region); + XDestroyRegion (region1); } -#endif +static void +mwin__region_to_rect (MDrawRegion region, MDrawMetric *rect) +{ + XRectangle xrect; - + XClipBox (region, &xrect); + rect->x = xrect.x; + rect->y = xrect.y; + rect->width = xrect.width; + rect->height = xrect.height; +} -/* XIM (X Input Method) handler */ +static void +mwin__free_region (MDrawRegion region) +{ + XDestroyRegion (region); +} -typedef struct MInputXIMMethodInfo +static void +mwin__dump_region (MDrawRegion region) { - Display *display; - XIM xim; - MSymbol language; - MSymbol coding; -} MInputXIMMethodInfo; + XRectangle rect; + XClipBox (region, &rect); + fprintf (stderr, "(%d %d %d %d)\n", rect.x, rect.y, rect.width, rect.height); +} -typedef struct MInputXIMContextInfo + +static MDrawWindow +mwin__create_window (MFrame *frame, MDrawWindow parent) { - XIC xic; + Display *display = FRAME_DISPLAY (frame); Window win; - MConverter *converter; -} MInputXIMContextInfo; + XWMHints wm_hints = { InputHint, False }; + XClassHint class_hints = { "M17N-IM", "m17n-im" }; + XSetWindowAttributes set_attrs; + unsigned long mask; + XGCValues values; + GCInfo *info = frame->rface->info; -static int -xim_open_im (MInputMethod *im) + if (! parent) + parent = (MDrawWindow) RootWindow (display, FRAME_SCREEN (frame)); + mask = GCForeground; + XGetGCValues (display, info->gc[GC_INVERSE], mask, &values); + set_attrs.background_pixel = values.foreground; + set_attrs.backing_store = Always; + set_attrs.override_redirect = True; + set_attrs.save_under = True; + mask = CWBackPixel | CWBackingStore | CWOverrideRedirect | CWSaveUnder; + win = XCreateWindow (display, (Window) parent, 0, 0, 1, 1, 0, + CopyFromParent, InputOutput, CopyFromParent, + mask, &set_attrs); + XSetWMProperties (display, (Window) win, NULL, NULL, NULL, 0, + NULL, &wm_hints, &class_hints); + XSelectInput (display, (Window) win, StructureNotifyMask | ExposureMask); + return (MDrawWindow) win; +} + +static void +mwin__destroy_window (MFrame *frame, MDrawWindow win) { - MInputXIMArgIM *arg = (MInputXIMArgIM *) im->arg; - MLocale *saved, *this; - char *save_modifier_list; - XIM xim; - MInputXIMMethodInfo *im_info; + XDestroyWindow (FRAME_DISPLAY (frame), (Window) win); +} - saved = mlocale_set (LC_CTYPE, NULL); - this = mlocale_set (LC_CTYPE, arg->locale ? arg->locale : ""); - if (! this) - /* The specified locale is not supported. */ - MERROR (MERROR_LOCALE, -1); - if (mlocale_get_prop (this, Mcoding) == Mnil) - { - /* Unable to decode the output of XIM. */ - mlocale_set (LC_CTYPE, msymbol_name (mlocale_get_prop (saved, Mname))); - MERROR (MERROR_LOCALE, -1); - } +#if 0 +static MDrawWindow +mwin__event_window (void *event) +{ + return ((MDrawWindow) ((XEvent *) event)->xany.window); +} - if (arg->modifier_list) - save_modifier_list = XSetLocaleModifiers (arg->modifier_list); - else - save_modifier_list = XSetLocaleModifiers (""); - if (! save_modifier_list) - { - /* The specified locale is not supported by X. */ - mlocale_set (LC_CTYPE, msymbol_name (mlocale_get_prop (saved, Mname))); - MERROR (MERROR_LOCALE, -1); - } +static void +mwin__print_event (void *arg, char *win_name) +{ + char *event_name; + XEvent *event = (XEvent *) arg; - xim = XOpenIM (arg->display, arg->db, arg->res_name, arg->res_class); - if (! xim) + switch (event->xany.type) { - /* No input method is available in the current locale. */ - XSetLocaleModifiers (save_modifier_list); - mlocale_set (LC_CTYPE, msymbol_name (mlocale_get_prop (saved, Mname))); - MERROR (MERROR_WIN, -1); + case 2: event_name = "KeyPress"; break; + case 3: event_name = "KeyRelease"; break; + case 4: event_name = "ButtonPress"; break; + case 5: event_name = "ButtonRelease"; break; + case 6: event_name = "MotionNotify"; break; + case 7: event_name = "EnterNotify"; break; + case 8: event_name = "LeaveNotify"; break; + case 9: event_name = "FocusIn"; break; + case 10: event_name = "FocusOut"; break; + case 11: event_name = "KeymapNotify"; break; + case 12: event_name = "Expose"; break; + case 13: event_name = "GraphicsExpose"; break; + case 14: event_name = "NoExpose"; break; + case 15: event_name = "VisibilityNotify"; break; + case 16: event_name = "CreateNotify"; break; + case 17: event_name = "DestroyNotify"; break; + case 18: event_name = "UnmapNotify"; break; + case 19: event_name = "MapNotify"; break; + case 20: event_name = "MapRequest"; break; + case 21: event_name = "ReparentNotify"; break; + case 22: event_name = "ConfigureNotify"; break; + case 23: event_name = "ConfigureRequest"; break; + case 24: event_name = "GravityNotify"; break; + case 25: event_name = "ResizeRequest"; break; + case 26: event_name = "CirculateNotify"; break; + case 27: event_name = "CirculateRequest"; break; + case 28: event_name = "PropertyNotify"; break; + case 29: event_name = "SelectionClear"; break; + case 30: event_name = "SelectionRequest"; break; + case 31: event_name = "SelectionNotify"; break; + case 32: event_name = "ColormapNotify"; break; + case 33: event_name = "ClientMessage"; break; + case 34: event_name = "MappingNotify"; break; + default: event_name = "unknown"; } - MSTRUCT_MALLOC (im_info, MERROR_WIN); - im_info->display = arg->display; - im_info->xim = xim; - im_info->language = mlocale_get_prop (this, Mlanguage); - im_info->coding = mlocale_get_prop (this, Mcoding); - im->info = im_info; - - XSetLocaleModifiers (save_modifier_list); - mlocale_set (LC_CTYPE, msymbol_name (mlocale_get_prop (saved, Mname))); - - return 0; + fprintf (stderr, "%s: %s\n", win_name, event_name); } +#endif static void -xim_close_im (MInputMethod *im) +mwin__map_window (MFrame *frame, MDrawWindow win) { - MInputXIMMethodInfo *im_info = (MInputXIMMethodInfo *) im->info; - - XCloseIM (im_info->xim); - free (im_info); + XMapRaised (FRAME_DISPLAY (frame), (Window) win); } -static int -xim_create_ic (MInputContext *ic) +static void +mwin__unmap_window (MFrame *frame, MDrawWindow win) { - MInputXIMArgIC *arg = (MInputXIMArgIC *) ic->arg; - MInputXIMMethodInfo *im_info = (MInputXIMMethodInfo *) ic->im->info; - MInputXIMContextInfo *ic_info; - XIC xic; - - if (! arg->input_style) - { - /* By default, use Root style. */ - arg->input_style = XIMPreeditNothing | XIMStatusNothing; - arg->preedit_attrs = NULL; - arg->status_attrs = NULL; - } - - if (! arg->preedit_attrs && ! arg->status_attrs) - xic = XCreateIC (im_info->xim, - XNInputStyle, arg->input_style, - XNClientWindow, arg->client_win, - XNFocusWindow, arg->focus_win, - NULL); - else if (arg->preedit_attrs && ! arg->status_attrs) - xic = XCreateIC (im_info->xim, - XNInputStyle, arg->input_style, - XNClientWindow, arg->client_win, - XNFocusWindow, arg->focus_win, - XNPreeditAttributes, arg->preedit_attrs, - NULL); - else if (! arg->preedit_attrs && arg->status_attrs) - xic = XCreateIC (im_info->xim, - XNInputStyle, arg->input_style, - XNClientWindow, arg->client_win, - XNFocusWindow, arg->focus_win, - XNStatusAttributes, arg->status_attrs, - NULL); - else - xic = XCreateIC (im_info->xim, - XNInputStyle, arg->input_style, - XNClientWindow, arg->client_win, - XNFocusWindow, arg->focus_win, - XNPreeditAttributes, arg->preedit_attrs, - XNStatusAttributes, arg->status_attrs, - NULL); - if (! xic) - MERROR (MERROR_WIN, -1); - - MSTRUCT_MALLOC (ic_info, MERROR_WIN); - ic_info->xic = xic; - ic_info->win = arg->focus_win; - ic_info->converter = mconv_buffer_converter (im_info->coding, NULL, 0); - ic->info = ic_info; - return 0; + XUnmapWindow (FRAME_DISPLAY (frame), (Window) win); } static void -xim_destroy_ic (MInputContext *ic) +mwin__window_geometry (MFrame *frame, MDrawWindow win, MDrawWindow parent_win, + MDrawMetric *geometry) { - MInputXIMContextInfo *ic_info = (MInputXIMContextInfo *) ic->info; + Display *display = FRAME_DISPLAY (frame); + XWindowAttributes attr; + Window parent = (Window) parent_win, root; - XDestroyIC (ic_info->xic); - mconv_free_converter (ic_info->converter); - free (ic_info); - ic->info = NULL; + XGetWindowAttributes (display, (Window) win, &attr); + geometry->x = attr.x + attr.border_width; + geometry->y = attr.y + attr.border_width; + geometry->width = attr.width; + geometry->height = attr.height; + + if (! parent) + parent = RootWindow (display, FRAME_SCREEN (frame)); + while (1) + { + Window this_parent, *children; + unsigned n; + + XQueryTree (display, (Window) win, &root, &this_parent, &children, &n); + if (children) + XFree (children); + if (this_parent == parent || this_parent == root) + break; + win = (MDrawWindow) this_parent; + XGetWindowAttributes (display, (Window) win, &attr); + geometry->x += attr.x + attr.border_width; + geometry->y += attr.y + attr.border_width; + } } -static int -xim_filter (MInputContext *ic, MSymbol key, void *event) +static void +mwin__adjust_window (MFrame *frame, MDrawWindow win, + MDrawMetric *current, MDrawMetric *new) { - MInputXIMContextInfo *ic_info = (MInputXIMContextInfo *) ic->info; + Display *display = FRAME_DISPLAY (frame); + unsigned int mask = 0; + XWindowChanges values; - return (XFilterEvent ((XEvent *) event, ic_info->win) == True); + if (current->width != new->width) + { + mask |= CWWidth; + if (new->width <= 0) + new->width = 1; + values.width = current->width = new->width; + } + if (current->height != new->height) + { + mask |= CWHeight; + if (new->height <= 0) + new->height = 1; + values.height = current->height = new->height; + } + if (current->x != new->x) + { + mask |= CWX; + values.x = current->x = new->x; + } + if (current->y != new->y) + { + mask |= CWY; + current->y = new->y; + values.y = current->y = new->y; + } + if (mask) + XConfigureWindow (display, (Window) win, mask, &values); + XClearWindow (display, (Window) win); } - -static int -xim_lookup (MInputContext *ic, MSymbol key, void *arg, MText *mt) +static MSymbol +mwin__parse_event (MFrame *frame, void *arg, int *modifiers) { - MInputXIMMethodInfo *im_info = (MInputXIMMethodInfo *) ic->im->info; - MInputXIMContextInfo *ic_info = (MInputXIMContextInfo *) ic->info; - XKeyPressedEvent *ev = (XKeyPressedEvent *) arg; - KeySym keysym; - Status status; - char *buf; + XEvent *event = (XEvent *) arg; + MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; int len; + char buf[512]; + KeySym keysym; + MSymbol key = Mnil; - buf = (char *) alloca (512); - len = XmbLookupString (ic_info->xic, ev, buf, 512, &keysym, &status); - if (status == XBufferOverflow) + *modifiers = 0; + if (event->xany.type != KeyPress + /* && event->xany.type != KeyRelease */ + ) + return Mnil; + len = XLookupString ((XKeyEvent *) event, (char *) buf, 512, &keysym, NULL); + if (len > 1) + return Mnil; + if (len == 1) { - buf = (char *) alloca (len); - len = XmbLookupString (ic_info->xic, ev, buf, len, &keysym, &status); + int c = keysym; + + if (c < XK_space || c > XK_asciitilde) + c = buf[0]; + if ((c == ' ' || c == 127) && ((XKeyEvent *) event)->state & ShiftMask) + *modifiers |= MINPUT_KEY_SHIFT_MODIFIER; + if (((XKeyEvent *) event)->state & ControlMask) + { + if (c >= 'a' && c <= 'z') + c += 'A' - 'a'; + if (c >= ' ' && c < 127) + *modifiers |= MINPUT_KEY_CONTROL_MODIFIER; + } + key = minput__char_to_key (c); } + else if (keysym >= XK_Shift_L && keysym <= XK_Hyper_R) + return Mnil; + if (key == Mnil) + { + char *str = XKeysymToString (keysym); - mtext_reset (ic->produced); - if (len == 0) - return 1; + if (! str) + return Mnil; + key = msymbol (str); + if (((XKeyEvent *) event)->state & ShiftMask) + *modifiers |= MINPUT_KEY_SHIFT_MODIFIER; + if (((XKeyEvent *) event)->state & ControlMask) + *modifiers |= MINPUT_KEY_CONTROL_MODIFIER; + } + if (((XKeyEvent *) event)->state & disp_info->meta_mask) + *modifiers |= MINPUT_KEY_META_MODIFIER; + if (((XKeyEvent *) event)->state & disp_info->alt_mask) + *modifiers |= MINPUT_KEY_ALT_MODIFIER; + if (((XKeyEvent *) event)->state & disp_info->super_mask) + *modifiers |= MINPUT_KEY_SUPER_MODIFIER; + if (((XKeyEvent *) event)->state & disp_info->hyper_mask) + *modifiers |= MINPUT_KEY_HYPER_MODIFIER; - mconv_reset_converter (ic_info->converter); - mconv_rebind_buffer (ic_info->converter, (unsigned char *) buf, len); - mconv_decode (ic_info->converter, ic->produced); - mtext_put_prop (ic->produced, 0, mtext_nchars (ic->produced), - Mlanguage, (void *) im_info->language); - mtext_cpy (mt, ic->produced); - mtext_reset (ic->produced); - return 0; + return key; } - -#ifdef X_SET_ERROR_HANDLER -static int -x_error_handler (Display *display, XErrorEvent *error) +void +mwin__dump_gc (MFrame *frame, MRealizedFace *rface) { - mdebug_hook (); - return 0; -} + unsigned long valuemask = GCForeground | GCBackground | GCClipMask; + XGCValues values; + Display *display = FRAME_DISPLAY (frame); + GCInfo *info = rface->info; + int i; -static int -x_io_error_handler (Display *display) -{ - mdebug_hook (); - return 0; + for (i = 0; i <= GC_INVERSE; i++) + { + XGetGCValues (display, info->gc[i], valuemask, &values); + fprintf (stderr, "GC%d: fore/#%lX back/#%lX", i, + values.foreground, values.background); + fprintf (stderr, "\n"); + } } -#endif - +static MDeviceDriver x_driver = + { + mwin__close_device, + mwin__device_get_prop, + mwin__realize_face, + mwin__free_realized_face, + mwin__fill_space, + mwin__draw_empty_boxes, + mwin__draw_hline, + mwin__draw_box, + mwin__draw_points, + mwin__region_from_rect, + mwin__union_rect_with_region, + mwin__intersect_region, + mwin__region_add_rect, + mwin__region_to_rect, + mwin__free_region, + mwin__dump_region, + mwin__create_window, + mwin__destroy_window, + mwin__map_window, + mwin__unmap_window, + mwin__window_geometry, + mwin__adjust_window, + mwin__parse_event + }; /* Functions to be stored in MDeviceLibraryInterface by dlsym (). */ @@ -1930,6 +1912,7 @@ device_init () #ifdef HAVE_XFT2 xft_driver.select = mfont__ft_driver.select; xft_driver.encode_char = mfont__ft_driver.encode_char; + xft_driver.list = mfont__ft_driver.list; #endif Mxim = msymbol ("xim"); @@ -1953,7 +1936,7 @@ device_fini () found, return the found object. Otherwise, return a newly created object. */ -void * +int device_open (MFrame *frame, MPlist *param) { Display *display = NULL; @@ -1971,6 +1954,7 @@ device_open (MFrame *frame, MPlist *param) MPlist *plist; AppData app_data; MFace *face; + int use_xfont = 0, use_freetype = 0, use_xft = 0; for (plist = param; (key = mplist_key (plist)) != Mnil; plist = mplist_next (plist)) @@ -1987,8 +1971,27 @@ device_open (MFrame *frame, MPlist *param) widget = (Widget) mplist_value (plist); else if (key == Mcolormap) cmap = (Colormap) mplist_value (plist); + else if (key == Mfont) + { + MSymbol val = MPLIST_SYMBOL (plist); + + if (val == Mx) + use_xfont = 1; +#ifdef HAVE_FREETYPE + else if (val == Mfreetype) + use_freetype = 1; +#ifdef HAVE_XFT2 + else if (val == Mxft) + use_xft = 1; +#endif +#endif + } } + /* If none of them is specified, use all of them. */ + if (! use_xfont && ! use_freetype && ! use_xft) + use_xfont = use_freetype = use_xft = 1; + if (widget) { display = XtDisplay (widget); @@ -2002,7 +2005,7 @@ device_open (MFrame *frame, MPlist *param) unsigned width, height, border_width; if (! display) - MERROR (MERROR_WIN, NULL); + MERROR (MERROR_WIN, -1); XGetGeometry (display, drawable, &root_window, &x, &y, &width, &height, &border_width, &depth); XGetWindowAttributes (display, root_window, &attr); @@ -2018,7 +2021,7 @@ device_open (MFrame *frame, MPlist *param) { display = XOpenDisplay (NULL); if (! display) - MERROR (MERROR_WIN, NULL); + MERROR (MERROR_WIN, -1); auto_display = 1; } screen = DefaultScreenOfDisplay (display); @@ -2046,10 +2049,8 @@ device_open (MFrame *frame, MPlist *param) M17N_OBJECT (disp_info, free_display_info, MERROR_WIN); disp_info->display = display; disp_info->auto_display = auto_display; - disp_info->font_registry_list = mplist (); - disp_info->iso8859_1_family_list = mplist (); - disp_info->iso10646_1_family_list = mplist (); - disp_info->realized_font_list = mplist (); + disp_info->font_list = mplist (); + disp_info->base_font_list = mplist (); find_modifier_bits (disp_info); mplist_add (display_info_list, Mt, disp_info); } @@ -2081,6 +2082,7 @@ device_open (MFrame *frame, MPlist *param) device->depth = depth; device->cmap = cmap; device->realized_face_list = mplist (); + device->realized_font_list = mplist (); device->realized_fontset_list = mplist (); device->gc_list = mplist (); values.foreground = BlackPixel (display, screen_num); @@ -2093,16 +2095,25 @@ device_open (MFrame *frame, MPlist *param) #endif } + frame->device = device; frame->device_type = MDEVICE_SUPPORT_OUTPUT | MDEVICE_SUPPORT_INPUT; frame->driver = &x_driver; frame->font_driver_list = mplist (); - mplist_add (frame->font_driver_list, Mx, &xfont_driver); #ifdef HAVE_XFT2 - mplist_add (frame->font_driver_list, Mfreetype, &xft_driver); -#elif HAVE_FREETYPE - mplist_add (frame->font_driver_list, Mfreetype, &mfont__ft_driver); -#endif - frame->realized_font_list = disp_info->realized_font_list; + if (use_xft) + { + mplist_add (frame->font_driver_list, Mfreetype, &xft_driver); + use_freetype = 0; + } +#endif /* HAVE_XFT2 */ +#ifdef HAVE_FREETYPE + if (use_freetype) + mplist_add (frame->font_driver_list, Mfreetype, &mfont__ft_driver); +#endif /* HAVE_FREETYPE */ + if (use_xfont || MPLIST_TAIL_P (frame->font_driver_list)) + mplist_push (frame->font_driver_list, Mx, &xfont_driver); + + frame->realized_font_list = device->realized_font_list; frame->realized_face_list = device->realized_face_list; frame->realized_fontset_list = device->realized_fontset_list; @@ -2134,18 +2145,20 @@ device_open (MFrame *frame, MPlist *param) } { - int nfonts; - char **names = XListFonts (display, app_data.font, 1, &nfonts); + int nfonts, i; + /* Try at least 32 fonts to obtain a non-autoscaled font. */ + char **names = XListFonts (display, app_data.font, 32, &nfonts); + MFont *font = NULL; - if (nfonts > 0) + for (i = 0; ! font && i < nfonts; i++) { - if (! (frame->font = mfont_parse_name (names[0], Mx))) + font = mfont_parse_name (names[i], Mx); + if (!font) { /* The font name does not conform to XLFD. Try to open the font and get XA_FONT property. */ - XFontStruct *xfont = XLoadQueryFont (display, names[0]); + XFontStruct *xfont = XLoadQueryFont (display, names[i]); - nfonts = 0; if (xfont) { unsigned long value; @@ -2154,17 +2167,20 @@ device_open (MFrame *frame, MPlist *param) if (XGetFontProperty (xfont, XA_FONT, &value) && (name = ((char *) XGetAtomName (display, (Atom) value)))) - { - if (frame->font = mfont_parse_name (name, Mx)) - nfonts = 1; - } + font = mfont_parse_name (name, Mx); XFreeFont (display, xfont); } } - XFreeFontNames (names); + if (font && + font->property[MFONT_SIZE] == 0 && font->property[MFONT_RESY] > 0) + { + free (font); + font = NULL; + } } - if (! nfonts) - frame->font = mfont_parse_name (FALLBACK_FONT, Mx); + if (nfonts) + XFreeFontNames (names); + frame->font = font ? font : mfont_parse_name (FALLBACK_FONT, Mx); } face = mface_from_font (frame->font); @@ -2185,15 +2201,224 @@ device_open (MFrame *frame, MPlist *param) XSetIOErrorHandler (x_io_error_handler); #endif - return device; + return 0; +} + + + +/* XIM (X Input Method) handler */ + +typedef struct MInputXIMMethodInfo +{ + Display *display; + XIM xim; + MSymbol language; + MSymbol coding; +} MInputXIMMethodInfo; + +typedef struct MInputXIMContextInfo +{ + XIC xic; + Window win; + MConverter *converter; +} MInputXIMContextInfo; + +static int +xim_open_im (MInputMethod *im) +{ + MInputXIMArgIM *arg = (MInputXIMArgIM *) im->arg; + MLocale *saved, *this; + char *save_modifier_list; + XIM xim; + MInputXIMMethodInfo *im_info; + + saved = mlocale_set (LC_CTYPE, NULL); + this = mlocale_set (LC_CTYPE, arg->locale ? arg->locale : ""); + if (! this) + /* The specified locale is not supported. */ + MERROR (MERROR_LOCALE, -1); + if (mlocale_get_prop (this, Mcoding) == Mnil) + { + /* Unable to decode the output of XIM. */ + mlocale_set (LC_CTYPE, msymbol_name (mlocale_get_prop (saved, Mname))); + MERROR (MERROR_LOCALE, -1); + } + + if (arg->modifier_list) + save_modifier_list = XSetLocaleModifiers (arg->modifier_list); + else + save_modifier_list = XSetLocaleModifiers (""); + if (! save_modifier_list) + { + /* The specified locale is not supported by X. */ + mlocale_set (LC_CTYPE, msymbol_name (mlocale_get_prop (saved, Mname))); + MERROR (MERROR_LOCALE, -1); + } + + xim = XOpenIM (arg->display, arg->db, arg->res_name, arg->res_class); + if (! xim) + { + /* No input method is available in the current locale. */ + XSetLocaleModifiers (save_modifier_list); + mlocale_set (LC_CTYPE, msymbol_name (mlocale_get_prop (saved, Mname))); + MERROR (MERROR_WIN, -1); + } + + MSTRUCT_MALLOC (im_info, MERROR_WIN); + im_info->display = arg->display; + im_info->xim = xim; + im_info->language = mlocale_get_prop (this, Mlanguage); + im_info->coding = mlocale_get_prop (this, Mcoding); + im->info = im_info; + + XSetLocaleModifiers (save_modifier_list); + mlocale_set (LC_CTYPE, msymbol_name (mlocale_get_prop (saved, Mname))); + + return 0; +} + +static void +xim_close_im (MInputMethod *im) +{ + MInputXIMMethodInfo *im_info = (MInputXIMMethodInfo *) im->info; + + XCloseIM (im_info->xim); + free (im_info); +} + +static int +xim_create_ic (MInputContext *ic) +{ + MInputXIMArgIC *arg = (MInputXIMArgIC *) ic->arg; + MInputXIMMethodInfo *im_info = (MInputXIMMethodInfo *) ic->im->info; + MInputXIMContextInfo *ic_info; + XIC xic; + + if (! arg->input_style) + { + /* By default, use Root style. */ + arg->input_style = XIMPreeditNothing | XIMStatusNothing; + arg->preedit_attrs = NULL; + arg->status_attrs = NULL; + } + + if (! arg->preedit_attrs && ! arg->status_attrs) + xic = XCreateIC (im_info->xim, + XNInputStyle, arg->input_style, + XNClientWindow, arg->client_win, + XNFocusWindow, arg->focus_win, + NULL); + else if (arg->preedit_attrs && ! arg->status_attrs) + xic = XCreateIC (im_info->xim, + XNInputStyle, arg->input_style, + XNClientWindow, arg->client_win, + XNFocusWindow, arg->focus_win, + XNPreeditAttributes, arg->preedit_attrs, + NULL); + else if (! arg->preedit_attrs && arg->status_attrs) + xic = XCreateIC (im_info->xim, + XNInputStyle, arg->input_style, + XNClientWindow, arg->client_win, + XNFocusWindow, arg->focus_win, + XNStatusAttributes, arg->status_attrs, + NULL); + else + xic = XCreateIC (im_info->xim, + XNInputStyle, arg->input_style, + XNClientWindow, arg->client_win, + XNFocusWindow, arg->focus_win, + XNPreeditAttributes, arg->preedit_attrs, + XNStatusAttributes, arg->status_attrs, + NULL); + if (! xic) + MERROR (MERROR_WIN, -1); + + MSTRUCT_MALLOC (ic_info, MERROR_WIN); + ic_info->xic = xic; + ic_info->win = arg->focus_win; + ic_info->converter = mconv_buffer_converter (im_info->coding, NULL, 0); + ic->info = ic_info; + return 0; +} + +static void +xim_destroy_ic (MInputContext *ic) +{ + MInputXIMContextInfo *ic_info = (MInputXIMContextInfo *) ic->info; + + XDestroyIC (ic_info->xic); + mconv_free_converter (ic_info->converter); + free (ic_info); + ic->info = NULL; +} + +static int +xim_filter (MInputContext *ic, MSymbol key, void *event) +{ + MInputXIMContextInfo *ic_info = (MInputXIMContextInfo *) ic->info; + + return (XFilterEvent ((XEvent *) event, ic_info->win) == True); +} + + +static int +xim_lookup (MInputContext *ic, MSymbol key, void *arg, MText *mt) +{ + MInputXIMMethodInfo *im_info = (MInputXIMMethodInfo *) ic->im->info; + MInputXIMContextInfo *ic_info = (MInputXIMContextInfo *) ic->info; + XKeyPressedEvent *ev = (XKeyPressedEvent *) arg; + KeySym keysym; + Status status; + char *buf; + int len; + + buf = (char *) alloca (512); + len = XmbLookupString (ic_info->xic, ev, buf, 512, &keysym, &status); + if (status == XBufferOverflow) + { + buf = (char *) alloca (len); + len = XmbLookupString (ic_info->xic, ev, buf, len, &keysym, &status); + } + + mtext_reset (ic->produced); + if (len == 0) + return 1; + + mconv_reset_converter (ic_info->converter); + mconv_rebind_buffer (ic_info->converter, (unsigned char *) buf, len); + mconv_decode (ic_info->converter, ic->produced); + mtext_put_prop (ic->produced, 0, mtext_nchars (ic->produced), + Mlanguage, (void *) im_info->language); + mtext_cpy (mt, ic->produced); + mtext_reset (ic->produced); + return 0; +} + + + +#ifdef X_SET_ERROR_HANDLER +static int +x_error_handler (Display *display, XErrorEvent *error) +{ + mdebug_hook (); + return 0; +} + +static int +x_io_error_handler (Display *display) +{ + mdebug_hook (); + return 0; } +#endif + +/*=*/ /*** @} */ #endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */ /* External API */ -/*=*/ /*** @addtogroup m17nInputMethodWin */ /*=*/ /*** @{ */ @@ -2230,31 +2455,27 @@ device_open (MFrame *frame, MPlist *param) /***ja @brief XIMÍÑÆþÎϥɥ饤¥Ð. - ¥É¥é¥¤¥Ð #minput_xim_driver ¤Ï #Mxim ¤ò̾Á°¤È¤·¤Æ»ý¤Ä³°ÉôÆþÎϥ᥽¥Ã - ¥ÉÍѤǤ¢¤ê¡¢ XIM (X Input Methods) ¤ò¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÎÆþÎÏ¥¨¥ó¥¸ - ¥ó¤È¤·¤Æ»ÈÍѤ¹¤ë¡£ + ¥É¥é¥¤¥Ð #minput_xim_driver ¤Ï #Mxim ¤ò̾Á°¤È¤·¤Æ»ý¤Ä³°ÉôÆþÎϥ᥽¥Ã¥ÉÍѤǤ¢¤ê¡¢ + XIM (X Input Methods) ¤ò¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÎÆþÎÏ¥¨¥ó¥¸¥ó¤È¤·¤Æ»ÈÍѤ¹¤ë¡£ ¥·¥ó¥Ü¥ë #Mxim ¤Ï¤³¤Î¥É¥é¥¤¥Ð¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÃͤȤ¹¤ë¥×¥í¥Ñ¥Æ¥£ - #Minput_driver ¤ò»ý¤Á¡¢LANGUAGE ¤¬ #Mnil ¤Ç̾Á°¤¬ #Mxim ¤Ç¤¢¤ëÆþÎÏ - ¥á¥½¥Ã¥É¤Ï¤³¤Î¥É¥é¥¤¥Ð¤òÍøÍѤ¹¤ë¡£ + #Minput_driver ¤ò»ý¤Á¡¢LANGUAGE ¤¬ #Mnil ¤Ç̾Á°¤¬ #Mxim + ¤Ç¤¢¤ëÆþÎϥ᥽¥Ã¥É¤Ï¤³¤Î¥É¥é¥¤¥Ð¤òÍøÍѤ¹¤ë¡£ - ¤·¤¿¤¬¤Ã¤Æ¡¢¤½¤ì¤é¤ÎÆþÎϥ᥽¥Ã¥É¤Ç¤Ï¡¢minput_ ¤Ç»Ï¤Þ¤ë̾Á°¤ò»ý¤Ä´Ø - ¿ô¤Î¥É¥é¥¤¥Ð¤Ë°Í¸¤¹¤ë°ú¿ô¤Ï¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ + ¤·¤¿¤¬¤Ã¤Æ¡¢¤½¤ì¤é¤ÎÆþÎϥ᥽¥Ã¥É¤Ç¤Ï¡¢minput_ + ¤Ç»Ï¤Þ¤ë̾Á°¤ò»ý¤Ä´Ø¿ô¤Î¥É¥é¥¤¥Ð¤Ë°Í¸¤¹¤ë°ú¿ô¤Ï¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ - ´Ø¿ô minput_open_im () ¤Î°ú¿ô $ARG ¤Ï¹½Â¤ÂÎ #MInputXIMArgIM ¤Ø¤Î¥Ý - ¥¤¥ó¥¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï #MInputXIMArgIM ¤ÎÀâÌÀ¤ò - »²¾È¡£ + ´Ø¿ô minput_open_im () ¤Î°ú¿ô $ARG ¤Ï¹½Â¤ÂÎ #MInputXIMArgIM + ¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï #MInputXIMArgIM ¤ÎÀâÌÀ¤ò»²¾È¡£ - ´Ø¿ô minput_create_ic () ¤Î°ú¿ô $ARG ¤Ï¹½Â¤ÂÎ #MInputXIMArgIC ¤Ø¤Î - ¥Ý¥¤¥ó¥¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï #MInputXIMArgIC ¤ÎÀâÌÀ - ¤ò»²¾È¡£ + ´Ø¿ô minput_create_ic () ¤Î°ú¿ô $ARG ¤Ï¹½Â¤ÂÎ #MInputXIMArgIC + ¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï #MInputXIMArgIC ¤ÎÀâÌÀ¤ò»²¾È¡£ - ´Ø¿ô minput_filter () ¤Î°ú¿ô $ARG ¤Ï¹½Â¤ÂÎ @c XEvent ¤Ø¤Î¥Ý¥¤¥ó¥¿ - ¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£°ú¿ô $KEY ¤Ï̵»ë¤µ¤ì¤ë¡£ + ´Ø¿ô minput_filter () ¤Î°ú¿ô $ARG ¤Ï¹½Â¤ÂÎ @c XEvent + ¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£°ú¿ô $KEY ¤Ï̵»ë¤µ¤ì¤ë¡£ ´Ø¿ô minput_lookup () ¤Î°ú¿ô $ARG ¤Ï´Ø¿ô function minput_filter () - ¤Î°ú¿ô $ARG ¤ÈƱ¤¸¤â¤Î¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ °ú¿ô $KEY ¤Ï¡¢Ìµ»ë¤µ¤ì - ¤ë¡£ */ + ¤Î°ú¿ô $ARG ¤ÈƱ¤¸¤â¤Î¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ °ú¿ô $KEY ¤Ï¡¢Ìµ»ë¤µ¤ì¤ë¡£ */ MInputDriver minput_xim_driver = { xim_open_im, xim_close_im, xim_create_ic, xim_destroy_ic,