gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
id
2000-12-04 03:14:52 +00:00
parent edcfd4a321
commit 3fdb6a6f27
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/libwmfun/drawstring.c
View File

@@ -160,7 +160,11 @@ WMFreeTypeRImage *renderChar(FT_Face face, FT_ULong char_index, RColor *color) {
index = FT_Get_Char_Index(face, char_index); index = FT_Get_Char_Index(face, char_index);
FT_Load_Glyph(face, index, FT_LOAD_DEFAULT); error = FT_Load_Glyph(face, index, FT_LOAD_DEFAULT);
if (error) {
_debug("error loading glyph\n");
return NULL;
}
FT_Render_Glyph(face->glyph, ft_render_mode_normal); FT_Render_Glyph(face->glyph, ft_render_mode_normal);
slot = face->glyph; slot = face->glyph;
@@ -228,10 +232,10 @@ void initDrawFreeTypeString(proplist_t pl, void **init_data) {
FT_Init_FreeType(&ft_library); FT_Init_FreeType(&ft_library);
inst_ft_library++; inst_ft_library++;
} }
_debug("initialize freetype library\n");
FT_New_Face(ft_library, PLGetString(PLGetArrayElement(pl, 4)), 0, &data->face); FT_New_Face(ft_library, PLGetString(PLGetArrayElement(pl, 4)), 0, &data->face);
FT_Set_Pixel_Sizes(data->face, 0, atoi(PLGetString(PLGetArrayElement(pl, 5)))); FT_Set_Pixel_Sizes(data->face, 0, atoi(PLGetString(PLGetArrayElement(pl, 5))));
_debug("initialize freetype library\n");
} }
void void
@@ -264,7 +268,8 @@ void
logicalCombineArea(RImage *bg, RImage *image, logicalCombineArea(RImage *bg, RImage *image,
int _sx, int _sy, int _sx, int _sy,
int _sw, int _sh, int _sw, int _sh,
int _dx, int _dy) { int _dx, int _dy,
int opaquueness) {
if (_dx >= bg->width) { if (_dx >= bg->width) {
return; return;
@@ -292,9 +297,15 @@ logicalCombineArea(RImage *bg, RImage *image,
_dy = 0; _dy = 0;
} }
if (_sh > 0 && _sw > 0) if (_sh > 0 && _sw > 0) {
if (opaquueness) {
RCombineAreaWithOpaqueness(bg, image, _sx, _sy,
_sw, _sh, _dx, _dy, opaquueness);
} else {
RCombineArea(bg, image, _sx, _sy, RCombineArea(bg, image, _sx, _sy,
_sw, _sh, _dx, _dy); _sw, _sh, _dx, _dy);
}
}
} }
@@ -327,8 +338,8 @@ drawFreeTypeString (proplist_t pl, Drawable d,
if (!data->glyphs_array[text[i]]) { if (!data->glyphs_array[text[i]]) {
data->glyphs_array[text[i]] = renderChar(data->face, (FT_ULong)text[i], &data->color); data->glyphs_array[text[i]] = renderChar(data->face, (FT_ULong)text[i], &data->color);
data->glyphs_shadow_array[text[i]] = renderChar(data->face, (FT_ULong)text[i], &black_color); data->glyphs_shadow_array[text[i]] = renderChar(data->face, (FT_ULong)text[i], &black_color);
_debug("alloc %c\n", text[i]);
} }
if (data->glyphs_array[text[i]])
if (data->glyphs_array[text[i]]->image) { if (data->glyphs_array[text[i]]->image) {
int _sx, _dx, _sy, _dy, _sw, _sh; int _sx, _dx, _sy, _dy, _sw, _sh;
@@ -338,10 +349,12 @@ drawFreeTypeString (proplist_t pl, Drawable d,
_sw = data->glyphs_array[text[i]]->image->width; _sw = data->glyphs_array[text[i]]->image->width;
_sh = data->glyphs_array[text[i]]->image->height; _sh = data->glyphs_array[text[i]]->image->height;
logicalCombineArea(rimg, data->glyphs_shadow_array[text[i]]->image, _sx, _sy, /*
_sw, _sh, _dx-2, _dy-2); logicalCombineArea(rimg, data->glyphs_shadow_array[text[i]]->image,
logicalCombineArea(rimg, data->glyphs_array[text[i]]->image, _sx, _sy, _sx, _sy, _sw, _sh, _dx-2, _dy-2, 50);
_sw, _sh, _dx-3, _dy-3); */
logicalCombineArea(rimg, data->glyphs_array[text[i]]->image,
_sx, _sy, _sw, _sh, _dx-3, _dy-3, 0);
j += data->glyphs_array[text[i]]->advance_x >> 6; j += data->glyphs_array[text[i]]->advance_x >> 6;
} }
@@ -362,7 +375,7 @@ drawFreeTypeString (proplist_t pl, Drawable d,
void void
destroyDrawString (proplist_t pl, void **init_data) { destroyDrawString (proplist_t pl, void **init_data) {
if (strcmp(PLGetString(PLGetArrayElement(pl, 2)), "drawPlainString") == 0) if (strcmp(PLGetString(PLGetArrayElement(pl, 2)), "drawPlainString") == 0)
destroyDrawPlainString((Display *)init_data[0], (Colormap)init_data[1]); destroyDrawPlainString((Display *)init_data[0], NULL);
else if (strcmp(PLGetString(PLGetArrayElement(pl, 2)), "drawFreeTypeString") == 0) else if (strcmp(PLGetString(PLGetArrayElement(pl, 2)), "drawFreeTypeString") == 0)
destroyDrawFreeTypeString(pl, init_data); destroyDrawFreeTypeString(pl, init_data);
} }