gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 13:28:05 +01:00
Code Issues Projects Releases Wiki Activity

fix a big

Browse Source
This commit is contained in:
id
2000-12-04 07:36:57 +00:00
parent 3fdb6a6f27
commit 3a52326385
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/libwmfun/drawstring.c
View File

@@ -230,12 +230,12 @@ void initDrawFreeTypeString(proplist_t pl, void **init_data) {
/* case 1 -- no no case 2 yet :P */ /* case 1 -- no no case 2 yet :P */
if (!inst_ft_library) { if (!inst_ft_library) {
FT_Init_FreeType(&ft_library); FT_Init_FreeType(&ft_library);
inst_ft_library++;
} }
inst_ft_library++;
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"); _debug("initialize freetype library %d %d %d\n", ft_library, data->face, inst_ft_library);
} }
void void
@@ -258,6 +258,7 @@ destroyDrawFreeTypeString(proplist_t pl, void **func_data) {
} }
free(data->glyphs_array); free(data->glyphs_array);
free(data->glyphs_shadow_array); free(data->glyphs_shadow_array);
_debug("destroy freetype library %d %d %d\n", ft_library, data->face, inst_ft_library);
FT_Done_Face(data->face); FT_Done_Face(data->face);
free(data); free(data);
inst_ft_library--; inst_ft_library--;
@@ -306,7 +307,6 @@ logicalCombineArea(RImage *bg, RImage *image,
_sw, _sh, _dx, _dy); _sw, _sh, _dx, _dy);
} }
} }
} }
void void
@@ -319,19 +319,25 @@ drawFreeTypeString (proplist_t pl, Drawable d,
int length = strlen(text); int length = strlen(text);
Pixmap pixmap; Pixmap pixmap;
GC gc; GC gc;
/*
int xwidth, xheight, dummy; int xwidth, xheight, dummy;
*/
Window wdummy; Window wdummy;
/*pixmap = XCreatePixmap(ds_dpy, d, width, height, DefaultDepth(ds_dpy, DefaultScreen(ds_dpy)));*/ /*pixmap = XCreatePixmap(ds_dpy, d, width, height, DefaultDepth(ds_dpy, DefaultScreen(ds_dpy)));*/
gc = func_data[0]; gc = func_data[0];
data = ((void **)func_data[2])[2]; data = ((void **)func_data[2])[2];
XClearWindow(ds_dpy, d); pixmap = (Pixmap)func_data[3];
/* create temp for drawing */ /* create temp for drawing */
/*
XGetGeometry(ds_dpy, d, &wdummy, &dummy, &dummy, &xwidth, &xheight, &dummy, &dummy); XGetGeometry(ds_dpy, d, &wdummy, &dummy, &dummy, &xwidth, &xheight, &dummy, &dummy);
pixmap = XCreatePixmap(ds_dpy, d, xwidth, xheight, DefaultDepth(ds_dpy, DefaultScreen(ds_dpy))); pixmap = XCreatePixmap(ds_dpy, d, xwidth, xheight, DefaultDepth(ds_dpy, DefaultScreen(ds_dpy)));
XCopyArea(ds_dpy, d, pixmap, gc, 0, 0, xwidth, xheight, 0, 0); XCopyArea(ds_dpy, d, pixmap, gc, 0, 0, xwidth, xheight, 0, 0);
*/
rimg = RCreateImageFromDrawable(rc, pixmap, None); rimg = RCreateImageFromDrawable(rc, pixmap, None);
/*
XFreePixmap(ds_dpy, pixmap); XFreePixmap(ds_dpy, pixmap);
*/
if (rimg) { if (rimg) {
for (i = 0, j = 3; i < strlen(text); i++) { for (i = 0, j = 3; i < strlen(text); i++) {
@@ -349,10 +355,8 @@ 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, logicalCombineArea(rimg, data->glyphs_shadow_array[text[i]]->image,
_sx, _sy, _sw, _sh, _dx-2, _dy-2, 50); _sx, _sy, _sw, _sh, _dx-2, _dy-2, 100);
*/
logicalCombineArea(rimg, data->glyphs_array[text[i]]->image, logicalCombineArea(rimg, data->glyphs_array[text[i]]->image,
_sx, _sy, _sw, _sh, _dx-3, _dy-3, 0); _sx, _sy, _sw, _sh, _dx-3, _dy-3, 0);