#include <stdlib.h>
#include <locale.h>
-#define OB_SHADOW "shadow"
-#define OB_SHADOW_OFFSET "shadowoffset"
-#define OB_SHADOW_ALPHA "shadowtint"
-
-FcObjectType objs[] = {
- { OB_SHADOW, FcTypeBool },
- { OB_SHADOW_OFFSET, FcTypeInteger },
- { OB_SHADOW_ALPHA, FcTypeInteger }
-};
-
-static gboolean started = FALSE;
-
-static void font_startup(void)
-{
- if (!XftInit(0)) {
- g_warning(_("Couldn't initialize Xft."));
- exit(EXIT_FAILURE);
- }
-
- /* Here we are teaching xft about the shadow, shadowoffset & shadowtint */
- FcNameRegisterObjectTypes(objs, (sizeof(objs) / sizeof(objs[0])));
-}
-
static void measure_font(const RrInstance *inst, RrFont *f)
{
PangoFontMetrics *metrics;
g_free(locale);
}
-static RrFont *openfontstring(const RrInstance *inst, gchar *fontstring)
-{
- RrFont *out;
- FcPattern *pat;
- gint tint;
- gchar *sval;
- gint ival;
-
- if (!(pat = XftNameParse(fontstring)))
- return NULL;
-
- out = g_new(RrFont, 1);
- out->inst = inst;
- out->ref = 1;
- out->font_desc = pango_font_description_new();
- out->layout = pango_layout_new(inst->pango);
-
- /* get the data from the parsed xft string */
-
- /* get the family */
- if (FcPatternGetString(pat, "family", 0,
- (FcChar8**)&sval) == FcResultMatch)
- pango_font_description_set_family(out->font_desc, sval);
-
- /* get the weight */
- if (FcPatternGetInteger(pat, "weight", 0, &ival) == FcResultMatch) {
- if (ival == FC_WEIGHT_LIGHT)
- pango_font_description_set_weight(out->font_desc,
- PANGO_WEIGHT_LIGHT);
- else if (ival == FC_WEIGHT_DEMIBOLD)
- pango_font_description_set_weight(out->font_desc,
- PANGO_WEIGHT_SEMIBOLD);
- else if (ival == FC_WEIGHT_BOLD)
- pango_font_description_set_weight(out->font_desc,
- PANGO_WEIGHT_BOLD);
- else if (ival == FC_WEIGHT_BLACK)
- pango_font_description_set_weight(out->font_desc,
- PANGO_WEIGHT_ULTRABOLD);
- }
-
- /* get the style/slant */
- if (FcPatternGetInteger(pat, "slant", 0, &ival) == FcResultMatch) {
- if (ival == FC_SLANT_ITALIC)
- pango_font_description_set_style(out->font_desc,
- PANGO_STYLE_ITALIC);
- else if (ival == FC_SLANT_OBLIQUE)
- pango_font_description_set_style(out->font_desc,
- PANGO_STYLE_OBLIQUE);
- }
-
- /* get the size */
- if (FcPatternGetInteger(pat, "size", 0, &ival) == FcResultMatch)
- pango_font_description_set_size(out->font_desc, ival * PANGO_SCALE);
- else if (FcPatternGetInteger(pat, "pixelsize", 0, &ival) == FcResultMatch)
- pango_font_description_set_absolute_size(out->font_desc,
- ival * PANGO_SCALE);
- else
- pango_font_description_set_size(out->font_desc, 8 * PANGO_SCALE);
-
- if (FcPatternGetBool(pat, OB_SHADOW, 0, &out->shadow) != FcResultMatch)
- out->shadow = FALSE;
-
- if (FcPatternGetInteger(pat, OB_SHADOW_OFFSET, 0, &out->offset) !=
- FcResultMatch)
- out->offset = 1;
-
- if (FcPatternGetInteger(pat, OB_SHADOW_ALPHA, 0, &tint) != FcResultMatch)
- tint = 25;
- if (tint > 100) tint = 100;
- else if (tint < -100) tint = -100;
- out->tint = tint;
-
- /* setup the layout */
- pango_layout_set_font_description(out->layout, out->font_desc);
- pango_layout_set_single_paragraph_mode(out->layout, TRUE);
- pango_layout_set_ellipsize(out->layout, PANGO_ELLIPSIZE_MIDDLE);
-
- /* get the ascent and descent */
- measure_font(inst, out);
-
- FcPatternDestroy(pat);
-
- return out;
-}
-
-RrFont *RrFontOpenByString(const RrInstance *inst, gchar *fontstring)
-{
- RrFont *out;
-
- if (!started) {
- font_startup();
- started = TRUE;
- }
-
- if ((out = openfontstring(inst, fontstring)))
- return out;
- g_warning(_("Unable to load font: %s\n"), fontstring);
- g_warning(_("Trying fallback font: %s\n"), "sans");
-
- if ((out = openfontstring(inst, "sans")))
- return out;
- g_warning(_("Unable to load font: %s\n"), "sans");
-
- return NULL;
-}
-
RrFont *RrFontOpen(const RrInstance *inst, gchar *name, gint size,
- RrFontWeight weight, RrFontSlant slant, gboolean shadow,
- gint shadowoffset, gchar shadowtint)
+ RrFontWeight weight, RrFontSlant slant)
{
RrFont *out;
PangoWeight pweight;
PangoStyle pstyle;
- if (!started) {
- font_startup();
- started = TRUE;
- }
-
- g_assert(shadowtint <= 100 && shadowtint >= -100);
-
out = g_new(RrFont, 1);
out->inst = inst;
out->ref = 1;
pango_font_description_set_style(out->font_desc, pstyle);
pango_font_description_set_size(out->font_desc, size * PANGO_SCALE);
- /* setup the shadow */
- out->shadow = shadow;
- out->offset = shadowoffset;
- out->tint = shadowtint;
-
/* setup the layout */
pango_layout_set_font_description(out->layout, out->font_desc);
pango_layout_set_single_paragraph_mode(out->layout, TRUE);
RrFont *RrFontOpenDefault(const RrInstance *inst)
{
return RrFontOpen(inst, RrDefaultFontFamily, RrDefaultFontSize,
- RrDefaultFontWeight, RrDefaultFontSlant,
- RrDefaultFontShadow, RrDefaultFontShadowOffset,
- RrDefaultFontShadowTint);
+ RrDefaultFontWeight, RrDefaultFontSlant);
}
void RrFontRef(RrFont *f)
}
static void font_measure_full(const RrFont *f, const gchar *str,
- gint *x, gint *y)
+ gint *x, gint *y, gint shadow_x, gint shadow_y)
{
PangoRectangle rect;
pango_layout_set_text(f->layout, str, -1);
pango_layout_set_width(f->layout, -1);
pango_layout_get_pixel_extents(f->layout, NULL, &rect);
- *x = rect.width + (f->shadow ? ABS(f->offset) : 0);
- *y = rect.height + (f->shadow ? ABS(f->offset) : 0);
+ *x = rect.width + ABS(shadow_x);
+ *y = rect.height + ABS(shadow_y);
}
-RrSize *RrFontMeasureString(const RrFont *f, const gchar *str)
+RrSize *RrFontMeasureString(const RrFont *f, const gchar *str,
+ gint shadow_x, gint shadow_y)
{
RrSize *size;
size = g_new(RrSize, 1);
- font_measure_full(f, str, &size->width, &size->height);
+ font_measure_full(f, str, &size->width, &size->height, shadow_x, shadow_y);
return size;
}
-gint RrFontHeight(const RrFont *f)
+gint RrFontHeight(const RrFont *f, gint shadow_y)
{
- return (f->ascent + f->descent) / PANGO_SCALE +
- (f->shadow ? f->offset : 0);
+ return (f->ascent + f->descent) / PANGO_SCALE + ABS(shadow_y);
}
static inline int font_calculate_baseline(RrFont *f, gint height)
break;
}
- if (t->font->shadow) {
- if (t->font->tint >= 0) {
- c.color.red = 0;
- c.color.green = 0;
- c.color.blue = 0;
- c.color.alpha = 0xffff * t->font->tint / 100;
- c.pixel = BlackPixel(RrDisplay(t->font->inst),
- RrScreen(t->font->inst));
- } else {
- c.color.red = 0xffff;
- c.color.green = 0xffff;
- c.color.blue = 0xffff;
- c.color.alpha = 0xffff * -t->font->tint / 100;
- c.pixel = WhitePixel(RrDisplay(t->font->inst),
- RrScreen(t->font->inst));
- }
+ if (t->shadow_offset_x || t->shadow_offset_y) {
+ c.color.red = t->shadow_color->r | t->shadow_color->r << 8;
+ c.color.green = t->shadow_color->g | t->shadow_color->g << 8;
+ c.color.blue = t->shadow_color->b | t->shadow_color->b << 8;
+ c.color.alpha = 0xffff * t->shadow_alpha / 255;
+ c.pixel = t->shadow_color->pixel;
/* see below... */
pango_xft_render_layout_line
(d, &c, pango_layout_get_line(t->font->layout, 0),
- (x + t->font->offset) * PANGO_SCALE,
- (y + t->font->offset) * PANGO_SCALE);
+ (x + t->shadow_offset_x) * PANGO_SCALE,
+ (y + t->shadow_offset_y) * PANGO_SCALE);
}
c.color.red = t->color->r | t->color->r << 8;