/* ftxfont.c -- FreeType font driver on X (without using XFT).
- Copyright (C) 2006-2011 Free Software Foundation, Inc.
+ Copyright (C) 2006-2012 Free Software Foundation, Inc.
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009
static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *,
unsigned, int, int, XPoint *, int, int *,
int);
-static void ftxfont_draw_backgrond (FRAME_PTR, struct font *, GC,
- int, int, int);
+static void ftxfont_draw_background (FRAME_PTR, struct font *, GC,
+ int, int, int);
struct ftxfont_frame_data
{
/* Background and foreground colors. */
XColor colors[2];
- /* GCs interporationg the above colors. gcs[0] is for a color
+ /* GCs interpolating the above colors. gcs[0] is for a color
closest to BACKGROUND, and gcs[5] is for a color closest to
FOREGROUND. */
GC gcs[6];
}
}
- new = malloc (sizeof (struct ftxfont_frame_data));
+ new = malloc (sizeof *new);
if (! new)
return NULL;
new->next = this;
}
static void
-ftxfont_draw_backgrond (FRAME_PTR f, struct font *font, GC gc, int x, int y, int width)
+ftxfont_draw_background (FRAME_PTR f, struct font *font, GC gc, int x, int y,
+ int width)
{
XGCValues xgcv;
BLOCK_INPUT;
if (with_background)
- ftxfont_draw_backgrond (f, font, s->gc, x, y, s->width);
+ ftxfont_draw_background (f, font, s->gc, x, y, s->width);
code = alloca (sizeof (unsigned) * len);
for (i = 0; i < len; i++)
code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8)