X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-X.c;h=9ddca5ad18542ac7d865c3035a5ee16647139588;hb=7ebe3307e5ffe8fa4f5a3151a861ba5ad9625dc7;hp=24b5c4bd10c82fb07adf1bde3f02de7bf816e972;hpb=e53f5ca0a8c39c8a7ec17b9a847948aeb96e51e6;p=m17n%2Fm17n-lib.git diff --git a/src/m17n-X.c b/src/m17n-X.c index 24b5c4b..9ddca5a 100644 --- a/src/m17n-X.c +++ b/src/m17n-X.c @@ -43,6 +43,7 @@ #ifdef HAVE_XFT2 #include +#include #endif /* HAVE_XFT2 */ #include "m17n-gui.h" @@ -56,6 +57,26 @@ #include "fontset.h" #include "face.h" +typedef struct _MFontX MFontX; + +struct _MFontX +{ + /* Record a font of the smallest pixel size. */ + MFont core; + /* Nth bit tells the existence of a font of size N + 5. So this is + for 5..36 pixel size fonts. Usually this covers all sizes. */ + unsigned int size5_36; + /* Fonts of (size < 5 || size > 36) are listed here (except for a + scalable whose size is 0). */ + MFontX *next; +}; + +/* S must satisfy the condition (S >= 5 && S < 36). */ + +#define SET_SIZE(FONTX, S) ((FONTX)->size5_36 |= (1 << ((S) - 5))) + +#define HAVE_SIZE(FONTX, S) ((FONTX)->size5_36 & (1 << ((S) - 5))) + typedef struct { /* Common header for the m17n object. */ @@ -67,18 +88,14 @@ 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; - - MPlist *iso10646_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 MFontX. */ + MPlist *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 +163,10 @@ typedef struct /** List of pointers to realized faces on the frame. */ MPlist *realized_face_list; + /* List of single element whose value is a root of chain of realized + fonts. */ + MPlist *realized_font_list; + /** List of pointers to realized fontsets on the frame. */ MPlist *realized_fontset_list; @@ -164,8 +185,7 @@ static MSymbol M_iso8859_1, M_iso10646_1; #define FRAME_VISUAL(frame) DefaultVisual (FRAME_DISPLAY (frame), \ FRAME_SCREEN (frame)) -#define DEFAULT_FONT "-misc-fixed-medium-r-normal--*-120-*-*-*-*-iso8859-1" -#define FALLBACK_FONT "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1" +#define DEFAULT_FONT "-*-*-medium-r-normal--13-*-*-*-c-*-iso8859-1" typedef struct { @@ -179,41 +199,23 @@ 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 *plist, *pl; - MPLIST_DO (plist, disp_info->iso8859_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); - } - M17N_OBJECT_UNREF (disp_info->iso8859_1_family_list); - - MPLIST_DO (plist, disp_info->iso10646_1_family_list) - { - MFontList *family_list = MPLIST_VAL (plist); + MPLIST_DO (pl, MPLIST_VAL (plist)) + { + MFontX *fontx, *next; - if (family_list->fonts) - free (family_list->fonts); - free (family_list); + for (fontx = MPLIST_VAL (pl); fontx; fontx = next) + { + next = fontx->next; + free (fontx); + } + } + 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); if (disp_info->auto_display) XCloseDisplay (disp_info->display); @@ -232,6 +234,10 @@ free_device (void *object) mfont__free_realized_fontset ((MRealizedFontset *) mplist_value (plist)); M17N_OBJECT_UNREF (device->realized_fontset_list); + if (MPLIST_VAL (device->realized_font_list)) + mfont__free_realized (MPLIST_VAL (device->realized_font_list)); + M17N_OBJECT_UNREF (device->realized_font_list); + MPLIST_DO (plist, device->realized_face_list) { MRealizedFace *rface = MPLIST_VAL (plist); @@ -420,1501 +426,1501 @@ set_region (MFrame *frame, GC gc, MDrawRegion region) } -/* Functions for the device driver. */ +/** X font handler */ -void -mwin__close_device (MFrame *frame) +static MFont *xfont_select (MFrame *, MFont *, int); +static MRealizedFont *xfont_open (MFrame *, MFont *, MFont *, MRealizedFont *); +static void xfont_find_metric (MRealizedFont *, MGlyphString *, int, int); +static int xfont_has_char (MFrame *, MFont *, MFont *, int, unsigned); +static unsigned xfont_encode_char (MFrame *, MFont *, MFont *, unsigned); +static void xfont_render (MDrawWindow, int, int, MGlyphString *, + MGlyph *, MGlyph *, int, MDrawRegion); +static int xfont_list (MFrame *, MPlist *, MFont *, int); + + +static MFontDriver xfont_driver = + { xfont_select, xfont_open, + xfont_find_metric, xfont_has_char, 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 *plist, *p; + char pattern[1024]; + char **font_names, **names; + int nfonts; + int i, j; + MFont font; + + 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); + MFONT_INIT (&font); + for (i = 0, p = NULL; i < nfonts; i++) + if (mfont__parse_name_into_font (names[i], Mx, &font) == 0 + && (font.size >= 50 || font.property[MFONT_RESY] == 0)) + { + MSymbol family = FONT_PROPERTY (&font, MFONT_FAMILY); + MFontX *fontx, *fontx2; + unsigned sizes[256]; + int nsizes = 0; + int size, smallest; + char *base_end; + int base_len; + int fields; + + if (p && MPLIST_KEY (p) != family) + p = mplist_find_by_key (plist, family); + if (! p) + p = mplist_push (plist, family, 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 = smallest = font.size / 10; + sizes[nsizes++] = 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, &font) == 0 + && (font.size >= 50 || font.property[MFONT_RESY] == 0)) + { + size = font.size / 10; + if (size < smallest) + smallest = size; + if (nsizes < 256) + sizes[nsizes++] = size; + } - 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; + font.type = MFONT_TYPE_OBJECT; + font.source = MFONT_SOURCE_X; + MSTRUCT_CALLOC (fontx, MERROR_WIN); + fontx->core = font; + fontx->core.size = smallest * 10; + fontx->next = MPLIST_VAL (p); + MPLIST_VAL (p) = fontx; + if (smallest > 0) + for (j = 0; j < nsizes; j++) + { + if (sizes[j] <= 36) + { + if (sizes[j] != smallest) + SET_SIZE (fontx, sizes[j]); + } + else + { + MSTRUCT_CALLOC (fontx2, MERROR_WIN); + fontx2->core = font; + fontx2->core.size = sizes[j] * 10; + fontx2->next = MPLIST_VAL (p); + MPLIST_VAL (p) = fontx2; + } + } + } + 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; - - if (rface != rface->ascii_rface) - { - rface->info = rface->ascii_rface->info; - return; - } - - 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 - - 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]; - } - - 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]; - - 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 (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]; - } + MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; + MPlist *font_encoding_list, *p; - rface->info = info; + 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)); } - -void -mwin__free_realized_face (MRealizedFace *rface) +typedef struct { - if (rface == rface->ascii_rface) - free (rface->info); -} + M17NObject control; + Display *display; + XFontStruct *xfont; +} MRealizedFontX; +/* The X font driver function SELECT. */ -void -mwin__fill_space (MFrame *frame, MDrawWindow win, MRealizedFace *rface, - int reverse, - int x, int y, int width, int height, MDrawRegion region) +static MFont * +xfont_select (MFrame *frame, MFont *font, int limited_size) { - GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_NORMAL : GC_INVERSE]; + MPlist *plist = mplist (), *pl; + int num = xfont_list (frame, plist, font, 0); + MFont *found = NULL; - if (region) - gc = set_region (frame, gc, region); - - XFillRectangle (FRAME_DISPLAY (frame), (Window) win, gc, - x, y, width, height); + if (num > 0) + MPLIST_DO (pl, plist) + { + font = MPLIST_VAL (pl); + if (limited_size == 0 + || font->size == 0 + || font->size <= limited_size) + { + found = font; + break; + } + } + M17N_OBJECT_UNREF (plist); + return found; } +/* The X font driver function CLOSE. */ -void mwin__draw_empty_boxes (MDrawWindow win, int x, int y, - MGlyphString *gstring, MGlyph *from, MGlyph *to, - int reverse, MDrawRegion region) +static void +close_xfont (void *object) { - MRealizedFace *rface = from->rface; - Display *display = FRAME_DISPLAY (rface->frame); - GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; - - if (from == to) - return; + MRealizedFontX *x_rfont = object; - if (region) - gc = set_region (rface->frame, gc, region); - for (; from < to; from++) - { - XDrawRectangle (display, (Window) win, gc, - x, y - gstring->ascent + 1, from->width - 1, - gstring->ascent + gstring->descent - 2); - x += from->width; - } + XFreeFont (x_rfont->display, x_rfont->xfont); + free (x_rfont); } +/* The X font driver function OPEN. */ -void -mwin__draw_hline (MFrame *frame, MDrawWindow win, MGlyphString *gstring, - MRealizedFace *rface, int reverse, - int x, int y, int width, MDrawRegion region) +static MRealizedFont * +xfont_open (MFrame *frame, MFont *font, MFont *spec, MRealizedFont *rfont) { - enum MFaceHLineType type = rface->hline->type; - GCInfo *info = rface->info; - GC gc = gc = info->gc[GC_HLINE]; - int i; + int size = spec->size; + MRealizedFontX *x_rfont; + char *name; + Display *display = FRAME_DISPLAY (frame); + XFontStruct *xfont; + int mdebug_mask = MDEBUG_FONT; + MFont this; - 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); + if (rfont) + { + for (; rfont; rfont = rfont->next) + if (rfont->font == font && rfont->spec.size == size) + return rfont; + } - for (i = 0; i < rface->hline->width; i++) - XDrawLine (FRAME_DISPLAY (frame), (Window) win, gc, - x, y + i, x + width - 1, y + i); + this = *font; + this.size = size; + /* This never fail to generate a valid fontname. */ + name = mfont_unparse_name (&this, Mx); + xfont = XLoadQueryFont (FRAME_DISPLAY (frame), name); + if (! xfont) + { + MDEBUG_PRINT1 (" [XFONT] x %s\n", name); + free (name); + font->type = MFONT_TYPE_FAILURE; + return NULL; + } + MDEBUG_PRINT1 (" [XFONT] o %s\n", name); + free (name); + M17N_OBJECT (x_rfont, close_xfont, MERROR_FONT_X); + x_rfont->display = display; + x_rfont->xfont = xfont; + MSTRUCT_CALLOC (rfont, MERROR_FONT_X); + rfont->spec = this; + rfont->spec.type = MFONT_TYPE_REALIZED; + rfont->spec.source = MFONT_SOURCE_X; + rfont->frame = frame; + rfont->font = font; + rfont->driver = &xfont_driver; + rfont->info = x_rfont; + rfont->ascent = xfont->ascent; + rfont->descent = xfont->descent; + rfont->max_advance = xfont->max_bounds.width; + rfont->fontp = xfont; + rfont->next = MPLIST_VAL (frame->realized_font_list); + MPLIST_VAL (frame->realized_font_list) = rfont; + return rfont; } -void -mwin__draw_box (MFrame *frame, MDrawWindow win, MGlyphString *gstring, - MGlyph *g, int x, int y, int width, MDrawRegion region) +/* The X font driver function FIND_METRIC. */ + +static void +xfont_find_metric (MRealizedFont *rfont, MGlyphString *gstring, + int from, int to) { - 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; + XFontStruct *xfont = rfont->fontp; + MGlyph *g = MGLYPH (from), *gend = MGLYPH (to); - 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); - - 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) + 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) -{ - Display *display = FRAME_DISPLAY (frame); - int i, j; - GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; - - if (region) - gc = set_region (frame, gc, region); - - 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 - -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); } -MDrawRegion -mwin__region_from_rect (MDrawMetric *rect) +static int +xfont_has_char (MFrame *frame, MFont *font, MFont *spec, int c, unsigned code) { - 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; + return (xfont_encode_char (frame, font, spec, code) != MCHAR_INVALID_CODE); } -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; +/* The X font driver function GET_GLYPH_ID. */ - XUnionRegion (region, region, region1); - XUnionRectWithRegion (&xrect, region1, region); - XDestroyRegion (region1); -} - -void -mwin__intersect_region (MDrawRegion region1, MDrawRegion region2) +static unsigned +xfont_encode_char (MFrame *frame, MFont *font, MFont *spec, unsigned code) { - MDrawRegion region = XCreateRegion (); - - XUnionRegion (region1, region1, region); - XIntersectRegion (region, region2, region1); - XDestroyRegion (region); -} + MRealizedFont *rfont; + XFontStruct *xfont; + unsigned min_byte1, max_byte1, min_byte2, max_byte2; + int all_chars_exist; -void -mwin__region_add_rect (MDrawRegion region, MDrawMetric *rect) -{ - MDrawRegion region1 = XCreateRegion (); - XRectangle xrect; + if (font->type == MFONT_TYPE_REALIZED) + rfont = (MRealizedFont *) font; + else if (font->type == MFONT_TYPE_OBJECT) + { + int size = spec->size; - xrect.x = rect->x; - xrect.y = rect->y; - xrect.width = rect->width; - xrect.height = rect->height; - XUnionRectWithRegion (&xrect, region1, region); - XDestroyRegion (region1); -} + for (rfont = MPLIST_VAL (frame->realized_font_list); rfont; + rfont = rfont->next) + if (rfont->font == font && rfont->spec.size == size) + break; + if (! rfont) + { + rfont = xfont_open (frame, font, spec, NULL); + if (! rfont) + return MCHAR_INVALID_CODE; + } + } + else + MFATAL (MERROR_FONT_X); + xfont = rfont->fontp; + 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; -void -mwin__region_to_rect (MDrawRegion region, MDrawMetric *rect) -{ - XRectangle xrect; + if (min_byte1 == 0 && max_byte1 == 0) + { + XCharStruct *pcm; - XClipBox (region, &xrect); - rect->x = xrect.x; - rect->y = xrect.y; - rect->width = xrect.width; - rect->height = xrect.height; -} + 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; -void -mwin__free_region (MDrawRegion region) -{ - XDestroyRegion (region); -} + if (byte1 < min_byte1 || byte1 > max_byte1 + || byte2 < min_byte2 || byte2 > max_byte2) + return MCHAR_INVALID_CODE; -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); + 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. */ -MDrawWindow -mwin__create_window (MFrame *frame, MDrawWindow parent) +static void +xfont_render (MDrawWindow win, int x, int y, MGlyphString *gstring, + MGlyph *from, MGlyph *to, int reverse, MDrawRegion region) { - 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; + MRealizedFace *rface = from->rface; + Display *display = FRAME_DISPLAY (rface->frame); + XChar2b *code; + GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; + MGlyph *g; + int i; - 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; -} + if (from == to) + return; -void -mwin__destroy_window (MFrame *frame, MDrawWindow win) -{ - XDestroyWindow (FRAME_DISPLAY (frame), (Window) win); -} + if (region) + gc = set_region (rface->frame, gc, region); + XSetFont (display, gc, ((XFontStruct *) rface->rfont->fontp)->fid); + code = (XChar2b *) alloca (sizeof (XChar2b) * (to - from)); + for (i = 0, g = from; g < to; i++, g++) + { + code[i].byte1 = g->code >> 8; + code[i].byte2 = g->code & 0xFF; + } -#if 0 -MDrawWindow -mwin__event_window (void *event) -{ - return ((MDrawWindow) ((XEvent *) event)->xany.window); -} + 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; -void -mwin__print_event (void *arg, char *win_name) -{ - char *event_name; - XEvent *event = (XEvent *) arg; + 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; - 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"; + 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); + } } - - fprintf (stderr, "%s: %s\n", win_name, event_name); } -#endif -void -mwin__map_window (MFrame *frame, MDrawWindow win) +static int +xfont_list (MFrame *frame, MPlist *plist, MFont *font, int maxnum) { - XMapRaised (FRAME_DISPLAY (frame), (Window) win); + 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; + int size = font ? font->size : 0; + MPlist *pl, *p; + int num = 0; + int mdebug_mask = MDEBUG_FONT; + + MDEBUG_PRINT2 (" [X-FONT] listing %s-%s...", + family ? msymbol_name (family) : "*", + registry ? msymbol_name (registry) : "*"); + + if (registry == Mnil) + xfont_list_all (frame); + else + xfont_registry_list (frame, registry); + + MPLIST_DO (pl, disp_info->font_list) + { + if (registry != Mnil && registry != MPLIST_KEY (pl)) + continue; + MPLIST_DO (p, MPLIST_VAL (pl)) + { + MFontX *fontx; + + if (family != Mnil && family != MPLIST_KEY (p)) + continue; + for (fontx = MPLIST_VAL (p); fontx; fontx = fontx->next) + if (! font + || (mfont__match_p (&fontx->core, font, MFONT_REGISTRY))) + { + if (fontx->core.size == size + || fontx->core.size == 0) + { + mplist_push (plist, MPLIST_KEY (p), fontx); + num++; + } + else if (size == 0 + || (size <= 360 && HAVE_SIZE (fontx, (size / 10)))) + { + unsigned size5_36 = fontx->size5_36; + MFontX *fontx2; + int i; + + fontx->size5_36 = 0; + for (i = fontx->core.size / 10; i <= 36; i++) + if (size5_36 & (1 << (i - 5))) + { + MSTRUCT_CALLOC (fontx2, MERROR_WIN); + fontx2->core = fontx->core; + fontx2->core.size = i * 10; + fontx2->next = fontx->next; + fontx->next = fontx2; + fontx = fontx2; + if ((size == 0 || size == fontx->core.size) + && (maxnum == 0 || num < maxnum)) + { + mplist_push (plist, MPLIST_KEY (p), fontx); + num++; + } + } + } + if (maxnum > 0 && maxnum == num) + break; + } + if (maxnum > 0 && maxnum == num) + break; + } + if (maxnum > 0 && maxnum == num) + break; + } + + MDEBUG_PRINT1 (" %d found\n", num); + return num; } -void -mwin__unmap_window (MFrame *frame, MDrawWindow win) + +/* Xft Handler */ + +#ifdef HAVE_XFT2 + +typedef struct { - XUnmapWindow (FRAME_DISPLAY (frame), (Window) win); + M17NObject control; + Display *display; + XftFont *font_aa; + XftFont *font_no_aa; + FT_Face ft_face; + /* Pointer to MRealizedFontFT */ + void *info; +} MRealizedFontXft; + +static MRealizedFont *xft_open (MFrame *frame, MFont *font, MFont *spec, + MRealizedFont *); +static int xft_has_char (MFrame *frame, MFont *font, MFont *spec, + int c, unsigned code); +static unsigned xft_encode_char (MFrame *frame, MFont *font, MFont *spec, + unsigned code); +static void xft_find_metric (MRealizedFont *, MGlyphString *, int, int); +static void xft_render (MDrawWindow, int, int, MGlyphString *, + MGlyph *, MGlyph *, int, MDrawRegion); + +MFontDriver xft_driver = + { NULL, xft_open, + xft_find_metric, xft_has_char, xft_encode_char, xft_render, NULL }; + +static void +close_xft (void *object) +{ + MRealizedFontXft *rfont_xft = object; + + if (rfont_xft->font_aa) + XftFontClose (rfont_xft->display, rfont_xft->font_aa); + if (rfont_xft->font_no_aa) + XftFontClose (rfont_xft->display, rfont_xft->font_no_aa); + M17N_OBJECT_UNREF (rfont_xft->info); + free (rfont_xft); } -void -mwin__window_geometry (MFrame *frame, MDrawWindow win, MDrawWindow parent_win, - MDrawMetric *geometry) + +static XftFont * +xft_open_font (Display *display, MSymbol file, double size, + FcBool anti_alias) { - Display *display = FRAME_DISPLAY (frame); - XWindowAttributes attr; - Window parent = (Window) parent_win, root; + FcPattern *pattern; + XftFont *font; - 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; + pattern = FcPatternCreate (); + FcPatternAddString (pattern, FC_FILE, (FcChar8 *) msymbol_name (file)); + FcPatternAddDouble (pattern, FC_PIXEL_SIZE, size); + FcPatternAddBool (pattern, FC_ANTIALIAS, anti_alias); + font = XftFontOpenPattern (display, pattern); + return font; +} - if (! parent) - parent = RootWindow (display, FRAME_SCREEN (frame)); - while (1) + +static MRealizedFont * +xft_open (MFrame *frame, MFont *font, MFont *spec, MRealizedFont *rfont) +{ + Display *display = FRAME_DISPLAY (frame); + int reg = spec->property[MFONT_REGISTRY]; + FT_Face ft_face; + MRealizedFontXft *rfont_xft; + FcBool anti_alias = FRAME_DEVICE (frame)->depth > 1 ? FcTrue : FcFalse; + double size = font->size ? font->size : spec->size; + XftFont *xft_font; + + if (rfont) { - Window this_parent, *children; - unsigned n; + MRealizedFont *save = NULL; - 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; + for (; rfont; rfont = rfont->next) + if (rfont->font == font + && (rfont->font->size ? rfont->font->size == size + : rfont->spec.size == size) + && rfont->spec.property[MFONT_REGISTRY] == reg) + { + if (! save) + save = rfont; + if (rfont->driver == &xft_driver) + return rfont; + } + rfont = save; } + rfont = (mfont__ft_driver.open) (frame, font, spec, rfont); + if (! rfont) + return NULL; + spec = &rfont->spec; + ft_face = rfont->fontp; + xft_font = xft_open_font (display, font->file, size / 10, anti_alias); + if (! xft_font) + return NULL; + M17N_OBJECT (rfont_xft, close_xft, MERROR_WIN); + rfont_xft->display = display; + if (anti_alias == FcTrue) + rfont_xft->font_aa = xft_font; + else + rfont_xft->font_no_aa = xft_font; + rfont_xft->ft_face = ft_face; + rfont_xft->info = rfont->info; + M17N_OBJECT_REF (rfont->info); + MSTRUCT_CALLOC (rfont, MERROR_FONT_X); + rfont->spec = *spec; + rfont->frame = frame; + rfont->font = font; + rfont->driver = &xft_driver; + rfont->info = rfont_xft; + rfont->ascent = ft_face->size->metrics.ascender >> 6; + rfont->descent = - ft_face->size->metrics.descender >> 6; + rfont->max_advance = ft_face->size->metrics.max_advance >> 6; + rfont->fontp = xft_font; + rfont->next = MPLIST_VAL (frame->realized_font_list); + MPLIST_VAL (frame->realized_font_list) = rfont; + return rfont; } -void -mwin__adjust_window (MFrame *frame, MDrawWindow win, - MDrawMetric *current, MDrawMetric *new) +static void +xft_find_metric (MRealizedFont *rfont, MGlyphString *gstring, + int from, int to) { - Display *display = FRAME_DISPLAY (frame); - unsigned int mask = 0; - XWindowChanges values; + Display *display = FRAME_DISPLAY (rfont->frame); + XftFont *xft_font = rfont->fontp; + MGlyph *g = MGLYPH (from), *gend = MGLYPH (to); - 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) + for (; g != gend; g++) { - mask |= CWHeight; - if (new->height <= 0) - new->height = 1; - values.height = current->height = new->height; + if (g->code == MCHAR_INVALID_CODE) + { + g->lbearing = 0; + g->rbearing = xft_font->max_advance_width; + g->width = g->rbearing; + g->ascent = xft_font->ascent; + g->descent = xft_font->descent; + } + else + { + XGlyphInfo extents; + + XftGlyphExtents (display, xft_font, &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 (current->x != new->x) +} + +static int +xft_has_char (MFrame *frame, MFont *font, MFont *spec, int c, unsigned code) +{ + int result; + + if (font->type == MFONT_TYPE_REALIZED) { - mask |= CWX; - values.x = current->x = new->x; + MRealizedFont *rfont = (MRealizedFont *) font; + MRealizedFontXft *rfont_xft = rfont->info; + + rfont->info = rfont_xft->info; + result = mfont__ft_driver.has_char (frame, font, spec, c, code); + rfont->info = rfont_xft; } - if (current->y != new->y) + else + result = mfont__ft_driver.has_char (frame, font, spec, c, code); + return result; +} + +static unsigned +xft_encode_char (MFrame *frame, MFont *font, MFont *spec, unsigned code) +{ + if (font->type == MFONT_TYPE_REALIZED) { - mask |= CWY; - current->y = new->y; - values.y = current->y = new->y; + MRealizedFont *rfont = (MRealizedFont *) font; + MRealizedFontXft *rfont_xft = rfont->info; + + rfont->info = rfont_xft->info; + code = mfont__ft_driver.encode_char (frame, font, spec, code); + rfont->info = rfont_xft; } - if (mask) - XConfigureWindow (display, (Window) win, mask, &values); - XClearWindow (display, (Window) win); + else + code = mfont__ft_driver.encode_char (frame, font, spec, code); + return code; } -MSymbol -mwin__parse_event (MFrame *frame, void *arg, int *modifiers) +static void +xft_render (MDrawWindow win, int x, int y, + MGlyphString *gstring, MGlyph *from, MGlyph *to, + int reverse, MDrawRegion region) { - XEvent *event = (XEvent *) arg; - MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info; - int len; - char buf[512]; - KeySym keysym; - MSymbol key; + MRealizedFace *rface = from->rface; + MFrame *frame = rface->frame; + Display *display = FRAME_DISPLAY (frame); + MRealizedFont *rfont = rface->rfont; + MRealizedFontXft *rfont_xft = rfont->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); + int anti_alias = (gstring->control.anti_alias + && FRAME_DEVICE (frame)->depth > 1); + XftFont *xft_font; + MGlyph *g; + FT_UInt *glyphs; + int last_x; + int nglyphs; - *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) - { - int c = keysym; + if (from == to) + return; - 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 (anti_alias) + { + if (rfont_xft->font_aa) + xft_font = rfont_xft->font_aa; + else { - if (c >= 'a' && c <= 'z') - c += 'A' - 'a'; - if (c >= ' ' && c < 127) - *modifiers |= MINPUT_KEY_CONTROL_MODIFIER; + double size = rfont->spec.size; + + xft_font = xft_open_font (display, rfont->spec.file, size / 10, + FcTrue); + if (xft_font) + rfont_xft->font_aa = xft_font; + else + xft_font = rfont->fontp; } - key = minput__char_to_key (c); } - else if (keysym >= XK_Shift_L && keysym <= XK_Hyper_R) - return Mnil; else { - char *str = XKeysymToString (keysym); + if (rfont_xft->font_no_aa) + xft_font = rfont_xft->font_no_aa; + else + { + double size = rfont->spec.size; - 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; + xft_font = xft_open_font (display, rfont->spec.file, size / 10, + FcTrue); + if (xft_font) + rfont_xft->font_no_aa = xft_font; + else + xft_font = rfont->fontp; + } } - 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; - - return key; -} - -MText * -mwin__get_selection_text (MFrame *frame) -{ - return NULL; -} - - -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; - - for (i = 0; i <= GC_INVERSE; i++) + 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) { - XGetGCValues (display, info->gc[i], valuemask, &values); - fprintf (stderr, "GC%d: fore/#%lX back/#%lX", i, - values.foreground, values.background); - fprintf (stderr, "\n"); + if (g->xoff == 0 && g->yoff == 0 && !g->left_padding && !g->right_padding) + glyphs[nglyphs++] = g->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 *) &g->code, 1); + last_x = x + g->width; + } } + if (nglyphs > 0) + XftDrawGlyphs (xft_draw, xft_color, xft_font, last_x, y, glyphs, nglyphs); } -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 - }; +#endif /* HAVE_XFT2 */ -/** X font handler */ +/* Functions for the device driver. */ -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); +static void +mwin__close_device (MFrame *frame) +{ + MWDevice *device = FRAME_DEVICE (frame); -static MFontDriver xfont_driver = - { xfont_select, xfont_open, - xfont_find_metric, xfont_encode_char, xfont_render }; + M17N_OBJECT_UNREF (device); +} -typedef struct +static void * +mwin__device_get_prop (MFrame *frame, MSymbol key) { - M17NObject control; - Display *display; - XFontStruct *xfont; -} MXFontInfo; + MWDevice *device = FRAME_DEVICE (frame); -static MFontList * -build_font_list (MFrame *frame, MSymbol family, MSymbol registry, - MPlist *plist) + 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 void +mwin__realize_face (MRealizedFace *rface) { - char pattern[1024]; - MFontList *font_list; - char **fontnames; - int nfonts; - int i, j; + MFrame *frame; + MSymbol foreground, background, videomode; + MFaceHLineProp *hline; + MFaceBoxProp *box; + GCInfo *info; + + if (rface != rface->ascii_rface) + { + rface->info = rface->ascii_rface->info; + return; + } - MSTRUCT_CALLOC (font_list, MERROR_WIN); + frame = rface->frame; + MSTRUCT_CALLOC (info, MERROR_WIN); - if (family == Mnil) + 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) { - sprintf (pattern, "-*-*-*-*-*-*-*-*-*-*-*-*-%s", - msymbol_name (registry)); - font_list->tag = registry; + 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 { - sprintf (pattern, "-*-%s-*-*-*-*-*-*-*-*-*-*-%s", - msymbol_name (family), msymbol_name (registry)); - font_list->tag = family; + info->gc[GC_NORMAL] = get_gc (frame, background, 0, &info->rgb_fore); + info->gc[GC_INVERSE] = get_gc (frame, foreground, 1, &info->rgb_back); } - - fontnames = XListFonts (FRAME_DISPLAY (frame), pattern, 0x8000, &nfonts); - if (nfonts > 0) +#ifdef HAVE_XFT2 + if (foreground == Mnil) + foreground = frame->foreground; + if (background == Mnil) + background = frame->background; + if (videomode == Mreverse) { - 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; + MSymbol temp = foreground; + foreground = background; + background = temp; } - mplist_add (plist, font_list->tag, font_list); - return (nfonts > 0 ? font_list : NULL); -} - -/* The X font driver function SELECT. */ - -static MRealizedFont * -xfont_select (MFrame *frame, MFont *spec, MFont *request, int limited_size) -{ - MSymbol registry = FONT_PROPERTY (spec, MFONT_REGISTRY); - MRealizedFont *rfont; - MFontList *font_list = NULL; - int i; - MFont *best_font; - int best_score, score; - - if (registry == Mnil - || ! strchr (MSYMBOL_NAME (registry), '-')) - return NULL; + 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 /* HAVE_XFT2 */ - /* 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) + hline = rface->hline; + if (hline) { - 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); - - if (family != Mnil) - { - font_list = (MFontList *) mplist_get (family_list, family); - if (! font_list) - font_list = build_font_list (frame, family, registry, family_list); - } - if (! font_list) - { - 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); - } + if (hline->color) + info->gc[GC_HLINE] = get_gc (frame, hline->color, 1, NULL); + else + info->gc[GC_HLINE] = info->gc[GC_NORMAL]; } - if (! font_list) + + box = rface->box; + if (box) { - MPlist *registry_list - = FRAME_DEVICE (frame)->display_info->font_registry_list; + 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]; - 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; + 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]; - 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++) - { - score = mfont__score (font_list->fonts + i, spec, request, - limited_size); - if (score >= 0 && score < best_score) - { - best_font = font_list->fonts + i; - best_score = score; - } + 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]; } - 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; + rface->info = info; } -/* The X font driver function CLOSE. */ +static void +mwin__free_realized_face (MRealizedFace *rface) +{ + if (rface == rface->ascii_rface) + free (rface->info); +} + static void -close_xfont (void *object) +mwin__fill_space (MFrame *frame, MDrawWindow win, MRealizedFace *rface, + int reverse, + int x, int y, int width, int height, MDrawRegion region) { - MXFontInfo *xfont_info = object; + GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_NORMAL : GC_INVERSE]; - XFreeFont (xfont_info->display, xfont_info->xfont); - free (object); -} + if (region) + gc = set_region (frame, gc, region); + XFillRectangle (FRAME_DISPLAY (frame), (Window) win, gc, + x, y, width, height); +} -/* The X font driver function OPEN. */ -static int -xfont_open (MRealizedFont *rfont) +static void +mwin__draw_empty_boxes (MDrawWindow win, int x, int y, + MGlyphString *gstring, MGlyph *from, MGlyph *to, + int reverse, MDrawRegion region) { - char *name; - MXFontInfo *xfont_info; - MFrame *frame = rfont->frame; - int mdebug_mask = MDEBUG_FONT; + MRealizedFace *rface = from->rface; + Display *display = FRAME_DISPLAY (rface->frame); + GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; + + if (from == to) + return; - /* 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 (region) + gc = set_region (rface->frame, gc, region); + for (; from < to; from++) { - rfont->status = -1; - free (xfont_info); - MDEBUG_PRINT1 (" [XFONT] x %s\n", name); - free (name); - return -1; + XDrawRectangle (display, (Window) win, gc, + x, y - gstring->ascent + 1, from->width - 1, + gstring->ascent + gstring->descent - 2); + x += from->width; } - 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; } -/* The X font driver function FIND_METRIC. */ +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; + + 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); +} + static void -xfont_find_metric (MRealizedFont *rfont, MGlyphString *gstring, - int from, int to) +mwin__draw_box (MFrame *frame, MDrawWindow win, MGlyphString *gstring, + MGlyph *g, int x, int y, int width, MDrawRegion region) { - MXFontInfo *xfont_info = rfont->info; - XFontStruct *xfont = xfont_info->xfont; - MGlyph *g = MGLYPH (from), *gend = MGLYPH (to); + 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); + + 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]; - for (; g != gend; g++) + if (g->type == GLYPH_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; - } + int x0, x1; + + if (g->left_padding) + x0 = x + box->outer_hmargin, x1 = x + g->width - 1; else - { - int byte1 = g->code >> 8, byte2 = g->code & 0xFF; - XCharStruct *pcm = NULL; + x0 = x, x1 = x + g->width - box->outer_hmargin - 1; - 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)); - } - } - } + /* Draw the top side. */ + for (i = 0; i < box->width; i++) + XDrawLine (display, (Window) win, gc_top, x0, y0 + i, x1, y0 + i); - if (pcm) + /* 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 (g->left_padding > 0) + { + /* Draw the left side. */ + if (info->gc[GC_BOX_LEFT] == info->gc[GC_BOX_TOP]) + gc_left = gc_top; + else { - g->lbearing = pcm->lbearing; - g->rbearing = pcm->rbearing; - g->width = pcm->width; - g->ascent = pcm->ascent; - g->descent = pcm->descent; + 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 { - /* 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; + 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); } } -} - - -/* The X font driver function ENCODE_CHAR. */ - -static unsigned -xfont_encode_char (MRealizedFont *rfont, int c, unsigned code) -{ - 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 (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; - - if (byte1 < min_byte1 || byte1 > max_byte1 - || byte2 < min_byte2 || byte2 > max_byte2) - return MCHAR_INVALID_CODE; + /* 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); - 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); + /* 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); } } -/* The X font driver function RENDER. */ +#if 0 static void -xfont_render (MDrawWindow win, int x, int y, MGlyphString *gstring, - MGlyph *from, MGlyph *to, int reverse, MDrawRegion region) +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) { - MRealizedFace *rface = from->rface; - MXFontInfo *xfont_info = rface->rfont->info; - Display *display; - XChar2b *code; + Display *display = FRAME_DISPLAY (frame); + int i, j; GC gc = ((GCInfo *) rface->info)->gc[reverse ? GC_INVERSE : GC_NORMAL]; - MGlyph *g; - int i; - if (from == to) - return; + if (region) + gc = set_region (frame, gc, region); + + 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 - /* It is assured that the all glyphs in the current range use the - same realized face. */ - display = FRAME_DISPLAY (rface->frame); +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 (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++) - { - code[i].byte1 = g->code >> 8; - code[i].byte2 = g->code & 0xFF; - } + gc = set_region (frame, gc, region); - 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; + XDrawPoints (FRAME_DISPLAY (frame), (Window) win, gc, + (XPoint *) points, num, CoordModeOrigin); +} - 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; - 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); - } - } +static MDrawRegion +mwin__region_from_rect (MDrawMetric *rect) +{ + 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; } - -/* Xft Handler */ +static 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; -#ifdef HAVE_XFT2 + XUnionRegion (region, region, region1); + XUnionRectWithRegion (&xrect, region1, region); + XDestroyRegion (region1); +} -typedef struct +static void +mwin__intersect_region (MDrawRegion region1, MDrawRegion region2) { - M17NObject control; - Display *display; - XftFont *font_aa; - XftFont *font_no_aa; -} MXftFontInfo; - -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); - -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 }; + MDrawRegion region = XCreateRegion (); + XUnionRegion (region1, region1, region); + XIntersectRegion (region, region2, region1); + XDestroyRegion (region); +} static void -close_xft (void *object) +mwin__region_add_rect (MDrawRegion region, MDrawMetric *rect) { - MXftFontInfo *font_info = object; + MDrawRegion region1 = XCreateRegion (); + XRectangle xrect; - XftFontClose (font_info->display, font_info->font_aa); - XftFontClose (font_info->display, font_info->font_no_aa); - free (font_info); + xrect.x = rect->x; + xrect.y = rect->y; + xrect.width = rect->width; + xrect.height = rect->height; + XUnionRectWithRegion (&xrect, region1, region); + XDestroyRegion (region1); } - -static XftFont * -xft_open_font (MFrame *frame, MFTInfo *ft_info, int size, int anti_alias) +static void +mwin__region_to_rect (MDrawRegion region, MDrawMetric *rect) { - XftPattern *pattern; - XftFontInfo *xft_font_info; - XftFont *font; + XRectangle xrect; - 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; + XClipBox (region, &xrect); + rect->x = xrect.x; + rect->y = xrect.y; + rect->width = xrect.width; + rect->height = xrect.height; } - -static int -xft_open (MRealizedFont *rfont) +static void +mwin__free_region (MDrawRegion region) { - 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) - { - 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; + XDestroyRegion (region); } - static void -xft_find_metric (MRealizedFont *rfont, MGlyphString *gstring, - int from, int to) +mwin__dump_region (MDrawRegion region) { - 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); - - for (; g != gend; g++) - { - if (g->code == MCHAR_INVALID_CODE) - { - 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--; - } - else - { - XGlyphInfo extents; - unsigned code; - - if (g->otf_encoded) - code = g->code; - else - code = FT_Get_Char_Index (ft_face, (FT_ULong) g->code); - - 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; - } - } + XRectangle rect; + XClipBox (region, &rect); + fprintf (stderr, "(%d %d %d %d)\n", rect.x, rect.y, rect.width, rect.height); } -void -xft_render (MDrawWindow win, int x, int y, - MGlyphString *gstring, MGlyph *from, MGlyph *to, - int reverse, MDrawRegion region) +static MDrawWindow +mwin__create_window (MFrame *frame, MDrawWindow parent) { - 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; - - 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) - { - unsigned code; + 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 (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); + 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; } -#endif - - - -/* XIM (X Input Method) handler */ - -typedef struct MInputXIMMethodInfo +static void +mwin__destroy_window (MFrame *frame, MDrawWindow win) { - Display *display; - XIM xim; - MSymbol language; - MSymbol coding; -} MInputXIMMethodInfo; + XDestroyWindow (FRAME_DISPLAY (frame), (Window) win); +} -typedef struct MInputXIMContextInfo +#if 0 +static MDrawWindow +mwin__event_window (void *event) { - XIC xic; - Window win; - MConverter *converter; -} MInputXIMContextInfo; + return ((MDrawWindow) ((XEvent *) event)->xany.window); +} -static int -xim_open_im (MInputMethod *im) +static void +mwin__print_event (void *arg, char *win_name) { - 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); - } + 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); - } - - 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))); + 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"; + } - 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 (). */ @@ -1929,7 +1935,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"); @@ -1946,6 +1952,23 @@ device_fini () 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 + /** Return an MWDevice object corresponding to a display specified in PLIST. @@ -1953,7 +1976,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; @@ -1970,7 +1993,9 @@ device_open (MFrame *frame, MPlist *param) unsigned depth = 0; MPlist *plist; AppData app_data; + MFont *font = NULL; 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 +2012,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 +2046,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 +2062,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 +2090,7 @@ 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 (); find_modifier_bits (disp_info); mplist_add (display_info_list, Mt, disp_info); } @@ -2081,6 +2122,8 @@ device_open (MFrame *frame, MPlist *param) device->depth = depth; device->cmap = cmap; device->realized_face_list = mplist (); + device->realized_font_list = mplist (); + mplist_add (device->realized_font_list, Mt, NULL); device->realized_fontset_list = mplist (); device->gc_list = mplist (); values.foreground = BlackPixel (display, screen_num); @@ -2093,16 +2136,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; @@ -2133,41 +2185,28 @@ device_open (MFrame *frame, MPlist *param) frame->videomode = Mnormal; } - { - int nfonts; - char **names = XListFonts (display, app_data.font, 1, &nfonts); - - if (nfonts > 0) - { - if (! (frame->font = mfont_parse_name (names[0], Mx))) - { - /* The font name does not conform to XLFD. Try to open the - font and get XA_FONT property. */ - XFontStruct *xfont = XLoadQueryFont (display, names[0]); - - nfonts = 0; - if (xfont) - { - unsigned long value; - char *name; - - if (XGetFontProperty (xfont, XA_FONT, &value) - && (name = ((char *) - XGetAtomName (display, (Atom) value)))) - { - if ((frame->font = mfont_parse_name (name, Mx))) - nfonts = 1; - } - XFreeFont (display, xfont); - } - } - XFreeFontNames (names); - } - if (! nfonts) - frame->font = mfont_parse_name (FALLBACK_FONT, Mx); - } + if (strcmp (app_data.font, DEFAULT_FONT) != 0) + { + XFontStruct *xfont = XLoadQueryFont (display, app_data.font); + unsigned long value; + char *name; - face = mface_from_font (frame->font); + if (xfont) + { + font = mfont_parse_name (app_data.font, Mx); + if (! font + && XGetFontProperty (xfont, XA_FONT, &value) + && (name = ((char *) XGetAtomName (display, (Atom) value)))) + font = mfont_parse_name (name, Mx); + XFreeFont (display, xfont); + } + } + if (! font) + font = mfont_parse_name (DEFAULT_FONT, Mx); + else if (! font->size) + font->size = 130; + face = mface_from_font (font); + free (font); face->property[MFACE_FONTSET] = mfontset (NULL); face->property[MFACE_FOREGROUND] = frame->foreground; face->property[MFACE_BACKGROUND] = frame->background; @@ -2184,18 +2223,209 @@ device_open (MFrame *frame, MPlist *param) XSetErrorHandler (x_error_handler); XSetIOErrorHandler (x_io_error_handler); #endif + 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; - return device; + 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; } + +/*=*/ + /*** @} */ #endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */ /* External API */ -/*=*/ /*** @addtogroup m17nInputMethodWin */ -/*=*/ + /*** @{ */ /***en @@ -2230,31 +2460,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,