typedef struct {
MFont core;
- unsigned int sizes[2];
+ /* Nth bit tells the existence of a font of size (N+1).
+ core.property[MFONT_SIZE] holds the smallest size. */
+ unsigned int sizes;
+ /* If sizes is not 0, smallest and largest sizes. */
+ unsigned short smallest, largest;
} MXFont;
-#define SET_SIZE(xfont, s) ((xfont)->sizes[(s) / 32] |= (1 << ((s) & 0x1F)))
-#define HAVE_SIZE(xfont, s) ((xfont)->sizes[(s) / 32] & (1 << ((s) & 0x1F)))
+/* S must satisfy the condition (S > 0 && S <= 32). */
+#define SET_SIZE(sizes, s) ((sizes) |= (1 << ((s) - 1)))
+#define HAVE_SIZE(sizes, s) ((sizes) & (1 << ((s) - 1)))
typedef struct {
int size, inc, used;
these properties are important; FOUNDRY, FAMILY, REGISTRY. */
MPlist *base_font_list;
+ /** Nonzero means that <font_list> already contains all available
+ fonts on the display. */
+ int all_fonts_scaned;
+
/** Modifier bit masks of the display. */
int meta_mask;
int alt_mask;
static unsigned xfont_encode_char (MRealizedFont *, unsigned);
static void xfont_render (MDrawWindow, int, int, MGlyphString *,
MGlyph *, MGlyph *, int, MDrawRegion);
-static void xfont_list (MFrame *frame, MPlist *plist,
- MFont *font, MSymbol language);
+static int xfont_list (MFrame *frame, MPlist *plist,
+ MFont *font, MSymbol language, int maxnum);
static MFontDriver xfont_driver =
}
static MPlist *
-xfont_registry_list (MDisplayInfo *disp_info, MSymbol registry)
+xfont_registry_list (MFrame *frame, MSymbol registry)
{
+ MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info;
MPlist *font_list = disp_info->font_list;
MPlist *base_font_list = disp_info->base_font_list;
- MPlist *plist = mplist (), *p;
+ MPlist *plist, *p;
char pattern[1024];
char **font_names, **names;
int nfonts;
int i, j;
MXFont font;
- MXFontList *xfont_table;
MFont *bfont = NULL;
+ plist = mplist_get (font_list, registry);
+ if (plist)
+ return plist;
+ plist = mplist ();
mplist_add (font_list, registry, plist);
sprintf (pattern, "-*-*-*-*-*-*-*-*-*-*-*-*-%s", msymbol_name (registry));
font_names = XListFonts (disp_info->display, pattern, 0x8000, &nfonts);
|| font.core.property[MFONT_RESY] == 0))
{
MSymbol family = FONT_PROPERTY ((MFont *) &font, MFONT_FAMILY);
- int size = font.core.property[MFONT_SIZE] / 10;
+ MXFontList *xfont_table;
+ int sizes[256];
+ int sizes_idx = 0;
+ int size, smallest, largest;
+ int have_scalable;
+ unsigned int size_bits = 0;
char *base_end;
int base_len;
int fields;
- font.sizes[0] = font.sizes[1] = 0;
- SET_SIZE (&font, size);
-
- /* Handle fonts of the same base. */
+ if (p && MPLIST_KEY (p) != family)
+ p = mplist_find_by_key (plist, family);
+ if (p)
+ xfont_table = MPLIST_VAL (p);
+ else
+ {
+ p = plist;
+ MSTRUCT_MALLOC (xfont_table, MERROR_WIN);
+ MLIST_INIT1 (xfont_table, fonts, 4);
+ mplist_push (p, family, xfont_table);
+ }
+
+ /* 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];
+ base_len = base_end - names[i] + 1;
+
+ size = font.core.property[MFONT_SIZE] / 10;
+ have_scalable = size == 0;
+ sizes[sizes_idx++] = size;
for (j = i + 1; j < nfonts && ! strncmp (names[i], names[j], base_len);
i = j++)
if (mfont__parse_name_into_font (names[j], Mx, (MFont *) &font) == 0
&& (font.core.property[MFONT_SIZE] > 0
|| font.core.property[MFONT_RESY] == 0))
{
+ int k;
+
size = font.core.property[MFONT_SIZE] / 10;
- SET_SIZE (&font, size);
+ if (! have_scalable)
+ have_scalable = size == 0;
+ for (k = 0; k < sizes_idx && sizes[k] != size; k++);
+ if (k == sizes_idx && sizes_idx < 256)
+ sizes[sizes_idx++] = size;
}
- if (p && MPLIST_KEY (p) != family)
- p = mplist_find_by_key (plist, family);
- if (p)
- xfont_table = MPLIST_VAL (p);
- else
+ for (j = 0, smallest = 0; j < sizes_idx; j++)
{
- p = plist;
- MSTRUCT_MALLOC (xfont_table, MERROR_WIN);
- MLIST_INIT1 (xfont_table, fonts, 4);
- mplist_push (p, family, xfont_table);
+ size = sizes[j];
+ if (size <= 32)
+ {
+ if (size != 0)
+ {
+ if (smallest == 0)
+ smallest = largest = size;
+ else if (size < smallest)
+ smallest = size;
+ else if (size > largest)
+ largest = size;
+ SET_SIZE (size_bits, size);
+ }
+ }
+ else
+ {
+ font.core.property[MFONT_SIZE] = size * 10;
+ font.sizes = 0;
+ MLIST_APPEND1 (xfont_table, fonts, font, MERROR_WIN);
+ }
+ }
+
+ if (size_bits || have_scalable == 1)
+ {
+ font.sizes = size_bits;
+ font.smallest = smallest;
+ font.largest = largest;
+ font.core.property[MFONT_SIZE] = have_scalable ? 0 : smallest * 10;
+ MLIST_APPEND1 (xfont_table, fonts, font, MERROR_WIN);
}
- MLIST_APPEND1 (xfont_table, fonts, font, MERROR_WIN);
if (! bfont
|| (font.core.property[MFONT_FOUNDRY]
!= bfont->property[MFONT_FOUNDRY])
return plist;
}
+static void
+xfont_list_all (MFrame *frame)
+{
+ MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info;
+ MPlist *font_encoding_list, *p;
+
+ 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));
+}
+
+
typedef struct
{
M17NObject control;
/* The X font driver function SELECT. */
static MRealizedFont *
-xfont_select (MFrame *frame, MFont *spec, MFont *request, int limited_size){
-
- MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info;
+xfont_select (MFrame *frame, MFont *spec, MFont *request, int limited_size)
+{
MSymbol family = FONT_PROPERTY (spec, MFONT_FAMILY);
MSymbol registry = FONT_PROPERTY (spec, MFONT_REGISTRY);
- int requested_size = request->property[MFONT_SIZE];
+ int requested_size = request->property[MFONT_SIZE] / 10;
MRealizedFont *rfont;
MPlist *plist;
int i;
MFont *best_font;
- int best_score, score;
+ int best_size, best_score, score;
if (registry == Mnil
|| ! strchr (MSYMBOL_NAME (registry), '-'))
return NULL;
- plist = mplist_get (disp_info->font_list, registry);
- if (! plist
- && ! (plist = xfont_registry_list (disp_info, registry)))
+ plist = xfont_registry_list (frame, registry);
+ if (MPLIST_TAIL_P (plist))
return NULL;
best_score = -1, best_font = NULL;
- if (family == Mnil)
- family = FONT_PROPERTY (request, MFONT_FAMILY);
MPLIST_DO (plist, plist)
{
if (family == Mnil || family == MPLIST_KEY (plist))
{
MXFont *xfont = xfont_table->fonts + i;
MFont *font = (MFont *) xfont;
- int size = requested_size / 10, s0, s1;
-
- for (s0 = size; s0 > 0 && ! HAVE_SIZE (xfont, s0); s0--);
- if (s0 * 10 == requested_size)
- /* Exact size match. */
- ;
- else if (xfont->sizes[0] & 1)
- /* Scalable font. */
+ unsigned int sizes = xfont->sizes;
+ int orig_size = font->property[MFONT_SIZE];
+ int size;
+
+ if (sizes == 0)
+ size = orig_size / 10;
+ else if (requested_size < xfont->smallest)
+ size = orig_size == 0 ? 0 : xfont->smallest;
+ else if (requested_size > xfont->largest)
+ size = orig_size == 0 ? 0 : xfont->largest;
+ else if (HAVE_SIZE (sizes, requested_size))
+ size = requested_size;
+ else if (orig_size == 0)
size = 0;
- else if (limited_size)
- /* We can't use a larger font. */
- continue;
- else if (s0 == 0)
- {
- for (s0 = size + 1; s0 < 64 && ! HAVE_SIZE (xfont, s0); s0++);
- if (s0 == 64)
- continue;
- size = s0;
- }
else
{
- for (s1 = size + (size - s0) - 1;
- s1 > size && HAVE_SIZE (xfont, s1); s1++);
- size = (s1 > size ? s1 : s0);
+ for (size = requested_size - 1;
+ size > xfont->smallest && ! HAVE_SIZE (sizes, size);
+ size--);
+ if (! limited_size)
+ {
+ int s;
+ for (s = requested_size;
+ s < xfont->largest && ! HAVE_SIZE (sizes, s);
+ s++);
+ if (s - requested_size < requested_size - size)
+ size = s;
+ }
}
font->property[MFONT_SIZE] = size * 10;
-
- if ((score = mfont__score (font, spec, request,
- limited_size)) >= 0
- && (best_score < 0 || score < best_score))
- {
- best_score = score;
- best_font = (MFont *) (xfont_table->fonts + i);
- if (best_score == 0)
- break;
- }
+ score = mfont__score (font, spec, request, limited_size);
+ font->property[MFONT_SIZE] = orig_size;
+ if (score >= 0 && (best_score < 0 || score < best_score))
+ {
+ best_size = size * 10;
+ best_score = score;
+ best_font = (MFont *) (xfont_table->fonts + i);
+ if (best_score == 0)
+ break;
+ }
}
if (best_score == 0)
break;
rfont->spec = *spec;
rfont->request = *request;
rfont->font = *best_font;
- if (best_font->property[MFONT_SIZE] == 0)
+ if (best_size == 0)
rfont->font.property[MFONT_SIZE] = request->property[MFONT_SIZE];
+ else
+ rfont->font.property[MFONT_SIZE] = best_size;
rfont->score = best_score;
return rfont;
}
}
}
-static void
-xfont_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language)
+static int
+xfont_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language,
+ int maxnum)
{
MDisplayInfo *disp_info = FRAME_DEVICE (frame)->display_info;
- MPlist *p;
+ MSymbol registry = font ? FONT_PROPERTY (font, MFONT_REGISTRY) : Mnil;
+ MSymbol family = font ? FONT_PROPERTY (font, MFONT_FAMILY) : Mnil;
+ MPlist *p, *pl;
+ int num = 0;
- /* We have not yet implemented the language check. */
- MPLIST_DO (p, disp_info->base_font_list)
- if (! font
- || mfont__match_p ((MFont *) MPLIST_VAL (p), font, MFONT_REGISTRY))
- mplist_push (plist, MPLIST_KEY (p), MPLIST_VAL (p));
+ if (registry != Mnil)
+ xfont_registry_list (frame, registry);
+ else
+ xfont_list_all (frame);
+
+ /* As we have not yet implemented the language check, return all
+ base fonts. */
+ if (! font)
+ MPLIST_DO (p, disp_info->base_font_list)
+ {
+ mplist_add (plist, MPLIST_KEY (p), MPLIST_VAL (p));
+ num++;
+ if (num == maxnum)
+ return num;
+ }
+ else
+ {
+ MXFontList *xfontlist;
+ MXFont *xfont;
+ int i;
+
+ pl = disp_info->font_list;
+ if (registry != Mnil)
+ {
+ pl = mplist_find_by_key (pl, registry);
+ if (! pl)
+ return 0;
+ }
+
+ MPLIST_DO (pl, pl)
+ {
+ p = MPLIST_VAL (pl);
+ if (family != Mnil)
+ {
+ p = mplist_find_by_key (p, family);
+ if (! p)
+ return 0;
+ }
+ MPLIST_DO (p, p)
+ {
+ xfontlist = MPLIST_VAL (p);
+ for (i = 0; i < xfontlist->used; i++)
+ {
+ xfont = xfontlist->fonts + i;
+ if (mfont__match_p (&xfont->core, font, MFONT_REGISTRY))
+ {
+ mplist_add (plist, MPLIST_KEY (p), &xfont->core);
+ num++;
+ if (num == maxnum)
+ return num;
+ }
+ }
+ if (family != Mnil)
+ break;
+ }
+ if (registry != Mnil)
+ break;
+ }
+ }
+ return num;
}
\f
int len;
char buf[512];
KeySym keysym;
- MSymbol key;
+ MSymbol key = Mnil;
*modifiers = 0;
if (event->xany.type != KeyPress
}
else if (keysym >= XK_Shift_L && keysym <= XK_Hyper_R)
return Mnil;
- else
+ if (key == Mnil)
{
char *str = XKeysymToString (keysym);
MPlist *plist;
AppData app_data;
MFace *face;
+ int use_xfont = 0, use_freetype = 0, use_xft = 0;
for (plist = param; (key = mplist_key (plist)) != Mnil;
plist = mplist_next (plist))
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);
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
+ 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;
}
{
- int nfonts;
- char **names = XListFonts (display, app_data.font, 1, &nfonts);
+ int nfonts, i;
+ /* Try at least 32 fonts to obtain a non-autoscaled font. */
+ char **names = XListFonts (display, app_data.font, 32, &nfonts);
+ MFont *font = NULL;
- if (nfonts > 0)
+ for (i = 0; ! font && i < nfonts; i++)
{
- if (! (frame->font = mfont_parse_name (names[0], Mx)))
+ font = mfont_parse_name (names[i], Mx);
+ if (!font)
{
/* The font name does not conform to XLFD. Try to open the
font and get XA_FONT property. */
- XFontStruct *xfont = XLoadQueryFont (display, names[0]);
+ XFontStruct *xfont = XLoadQueryFont (display, names[i]);
- nfonts = 0;
if (xfont)
{
unsigned long value;
if (XGetFontProperty (xfont, XA_FONT, &value)
&& (name = ((char *)
XGetAtomName (display, (Atom) value))))
- {
- if ((frame->font = mfont_parse_name (name, Mx)))
- nfonts = 1;
- }
+ font = mfont_parse_name (name, Mx);
XFreeFont (display, xfont);
}
}
- XFreeFontNames (names);
+ if (font &&
+ font->property[MFONT_SIZE] == 0 && font->property[MFONT_RESY] > 0)
+ {
+ free (font);
+ font = NULL;
+ }
}
- if (! nfonts)
- frame->font = mfont_parse_name (FALLBACK_FONT, Mx);
+ if (nfonts)
+ XFreeFontNames (names);
+ frame->font = font ? font : mfont_parse_name (FALLBACK_FONT, Mx);
}
face = mface_from_font (frame->font);
/***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,
projects / m17n / m17n-lib.git / blobdiff