old
/
legacy-imlib2
3
0
Fork 4
Code Issues 3 Pull Requests Projects Releases Wiki Activity

x fonts blend again now.... and colro correctly too :) 

SVN revision: 4092
This commit is contained in:
Carsten Haitzler 2001-01-04 21:09:52 +00:00
parent 5c7f536d4a
commit 157dad2d37
2 changed files with 128 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
src/font.c
View File

@ -1140,7 +1140,7 @@ __imlib_xfd_draw_str(Display *display, Drawable drawable, Visual *v, int depth,
im2->data = malloc(im2->w * im2->h * sizeof(DATA32)); im2->data = malloc(im2->w * im2->h * sizeof(DATA32));
#ifdef XMB_FONT_CACHE #ifdef XMB_FONT_CACHE
__imlib_xfd_build_str_image(display, drawable, v, fn, im2, text); __imlib_xfd_build_str_image(display, drawable, v, fn, im2, text, r, g, b, a);
#else #else
m = XCreatePixmap(display, drawable, im2->w, im2->h, 1); m = XCreatePixmap(display, drawable, im2->w, im2->h, 1);
gcv.foreground = 0; gcv.foreground = 0;
@ -1153,8 +1153,8 @@ __imlib_xfd_draw_str(Display *display, Drawable drawable, Visual *v, int depth,
__imlib_GrabDrawableToRGBA(im2->data, 0, 0, im2->w, im2->h, display, m, NULL, __imlib_GrabDrawableToRGBA(im2->data, 0, 0, im2->w, im2->h, display, m, NULL,
v, NULL, 1, 0, 0, im2->w, im2->h, 0, 0); v, NULL, 1, 0, 0, im2->w, im2->h, 0, 0);
SET_FLAG(im2->flags, F_HAS_ALPHA);
#endif #endif
SET_FLAG(im2->flags, F_HAS_ALPHA);
/* /*
printf( "i_ret.x=%d, i_ret.y=%d, i_ret.w=%d, i_ret.h=%d, ascent=%d\n", printf( "i_ret.x=%d, i_ret.y=%d, i_ret.w=%d, i_ret.h=%d, ascent=%d\n",
@ -1183,7 +1183,7 @@ __imlib_xfd_draw_str(Display *display, Drawable drawable, Visual *v, int depth,
break; break;
} }
if (angle == 0.0) { if (angle == 0.0) {
__imlib_BlendImageToImage(im2, im, 0, blend, 0, __imlib_BlendImageToImage(im2, im, 0, 1, 0,
0, 0, im2->w, im2->h, 0, 0, im2->w, im2->h,
x, y, im2->w, im2->h, x, y, im2->w, im2->h,
NULL, OP_COPY, clx, cly, clw, clh); NULL, OP_COPY, clx, cly, clw, clh);
@ -1220,146 +1220,145 @@ __imlib_xfd_draw_str(Display *display, Drawable drawable, Visual *v, int depth,
#ifdef XMB_FONT_CACHE #ifdef XMB_FONT_CACHE
void void
__imlib_xfd_build_str_image(Display *display, Drawable drawable, Visual *v, __imlib_xfd_build_str_image(Display *display, Drawable drawable, Visual *v,
ImlibFont *fn, ImlibImage *im, const char *text) ImlibFont *fn, ImlibImage *im, const char *text,
DATA8 r, DATA8 g, DATA8 b, DATA8 a)
{ {
int i; int i;
int x; int x;
Pixmap pix=(Pixmap)NULL; Pixmap pix=(Pixmap)NULL;
GC gc; GC gc;
int strlen_text;
strlen_text = strlen(text);
x = 0; x = 0;
for (i=0; i<strlen(text); i++ ) for (i=0; i<strlen_text; i++ )
{ {
int len; int len;
int j, k; int j, k;
wchar_t wc; wchar_t wc;
unsigned long hash; unsigned long hash;
ImlibXmbHash *h; ImlibXmbHash *h;
ImlibXmbHashElm *hel, *hel2; ImlibXmbHashElm *hel, *hel2;
ImlibImage *cim; ImlibImage *cim;
len = mblen(text+i, MB_CUR_MAX); len = mblen(text+i, MB_CUR_MAX);
if (len < 0) if (len < 0)
continue; continue;
if (mbtowc(&wc, text+i, len) == -1) if (mbtowc(&wc, text+i, len) == -1)
continue; continue;
/* create hash id */ /* create hash id */
h = fn->xf.hash; h = fn->xf.hash;
if (h->type) if (h->type)
{ {
hash = (wc ^ (wc >> XMB_HASH_VAL1) ^ (wc << XMB_HASH_VAL2)) * hash = (wc ^ (wc >> XMB_HASH_VAL1) ^ (wc << XMB_HASH_VAL2)) *
XMB_HASH_VAL3; XMB_HASH_VAL3;
hash += XMB_HASH_SIZE; hash += XMB_HASH_SIZE;
hash %= XMB_HASH_SIZE; hash %= XMB_HASH_SIZE;
} }
else else
hash = (unsigned char)text[i]; hash = (unsigned char)text[i];
/* /*
printf(" hash=%0x wc=%0x", hash, wc); printf(" hash=%0x wc=%0x", hash, wc);
printf(" c="); printf(" c=");
for (j=0; j<len; j++) printf("%c",text[i+j]); for (j=0; j<len; j++) printf("%c",text[i+j]);
*/ */
/* search hash element */ /* search hash element */
for (hel=h->hash[hash]; hel!=NULL; hel=hel->next) for (hel=h->hash[hash]; hel!=NULL; hel=hel->next)
{ {
if (hel->wc == wc) if (hel->wc == wc)
break; break;
if (hel->next == NULL) if (hel->next == NULL)
break; break;
} }
/* create new hash element */ /* create new hash element */
if (hel==NULL || (hel!=NULL && hel->wc != wc)) if (hel==NULL || (hel!=NULL && hel->wc != wc))
{ {
XRectangle i_ret, l_ret; XRectangle i_ret, l_ret;
hel2 = (ImlibXmbHashElm *)malloc(sizeof(ImlibXmbHashElm)); hel2 = (ImlibXmbHashElm *)malloc(sizeof(ImlibXmbHashElm));
hel2->wc = wc; hel2->wc = wc;
hel2->next = NULL; hel2->next = NULL;
if (pix == (Pixmap)NULL ) if (pix == (Pixmap)NULL )
{ {
XGCValues gcv; XGCValues gcv;
int pw, ph; int pw, ph;
pw = fn->xf.max_width; pw = fn->xf.max_width;
ph = fn->xf.max_ascent + fn->xf.max_descent; ph = fn->xf.max_ascent + fn->xf.max_descent;
pix = XCreatePixmap(display, drawable, pw, ph, 1); pix = XCreatePixmap(display, drawable, pw, ph, 1);
gcv.foreground = 0; gcv.foreground = 0;
gcv.subwindow_mode = IncludeInferiors; gcv.subwindow_mode = IncludeInferiors;
gc = XCreateGC(display, pix, 0, &gcv); gc = XCreateGC(display, pix, 0, &gcv);
} }
XwcTextExtents(fn->xf.xfontset, &wc, 1, &i_ret, &l_ret); XwcTextExtents(fn->xf.xfontset, &wc, 1, &i_ret, &l_ret);
hel2->w = MAX(i_ret.width, l_ret.width); hel2->w = MAX(i_ret.width, l_ret.width);
hel2->h = MAX(i_ret.height, l_ret.height); hel2->h = MAX(i_ret.height, l_ret.height);
hel2->im = (DATA32 *)malloc(hel2->w * hel2->h * sizeof(DATA32)); hel2->im = (DATA32 *)malloc(hel2->w * hel2->h * sizeof(DATA32));
for (j=0; j< hel2->w * hel2->h; j++ ) *(hel2->im + j) = 0; for (j=0; j< hel2->w * hel2->h; j++ ) *(hel2->im + j) = 0;
XSetForeground(display, gc, 0); XSetForeground(display, gc, 0);
XFillRectangle(display, pix, gc, 0, 0, hel2->w, hel2->h); XFillRectangle(display, pix, gc, 0, 0, hel2->w, hel2->h);
XSetForeground(display, gc, 1); XSetForeground(display, gc, 1);
XwcDrawString(display, pix, fn->xf.xfontset, gc, 0, fn->xf.ascent, XwcDrawString(display, pix, fn->xf.xfontset, gc, 0, fn->xf.ascent,
&wc, 1); &wc, 1);
__imlib_GrabDrawableToRGBA(hel2->im, 0, 0, hel2->w, hel2->h, __imlib_GrabDrawableToRGBA(hel2->im, 0, 0, hel2->w, hel2->h,
display, pix, NULL, v, NULL, 1, display, pix, NULL, v, NULL, 1,
0, 0, hel2->w, hel2->h, 0, 0); 0, 0, hel2->w, hel2->h, 0, 0);
{ if (hel==NULL)
DATA32 *p, *p_end; {
h->hash[hash] = hel2;
p_end = hel2->im + (hel2->w * hel2->h);
for (p = hel2->im; p < p_end; p++)
{
if (p[0] & 0xffffff) p[0] = 0xffffffff;
else p[0] = 0x00ffffff;
}
}
if (hel==NULL)
{
h->hash[hash] = hel2;
h->hash_count++; h->hash_count++;
/* printf(" created!"); */ /* printf(" created!"); */
} }
else if (hel->next==NULL) else if (hel->next==NULL)
{ {
hel->next = hel2; hel->next = hel2;
h->collision_count++; h->collision_count++;
/* printf(" Collision!"); */ /* printf(" Collision!"); */
} }
h->mem_use += sizeof(ImlibXmbHashElm); h->mem_use += sizeof(ImlibXmbHashElm);
h->mem_use += hel2->w * hel2->h * sizeof(DATA32); h->mem_use += hel2->w * hel2->h * sizeof(DATA32);
hel = hel2; hel = hel2;
} }
/* /*
else else
printf(" Found!"); printf(" Found!");
printf(" p=%0x\n", hel); printf(" p=%0x\n", hel);
*/ */
/* concatenate string image */ /* concatenate string image */
for (j=0; j<hel->h && j<im->h; j++) for (j=0; j<hel->h && j<im->h; j++)
{ {
int s, d; int s, d;
DATA32 p1, p2;
s = hel->w * j; s = hel->w * j;
d = im->w * j; d = im->w * j;
for (k=0; k<hel->w && (x + k)<im->w; k++) p1 = (a << 24) | (r << 16) | (g << 8) | b;
im->data[d + x + k] = hel->im[s + k]; p2 = (r << 16) | (g << 8) | b;
} for (k=0; k<hel->w && (x + k)<im->w; k++)
x += hel->w; {
if (hel->im[s + k] == 0xffffffff) im->data[d + x + k] = p1;
else im->data[d + x + k] = p2;
}
/* im->data[d + x + k] = hel->im[s + k];*/
}
x += hel->w;
if (len>1) if (len>1)
i += len -1; i += len -1;
} }
if (pix != (Pixmap)NULL ) if (pix != (Pixmap)NULL )
{ {
XFreeGC(display, gc); XFreeGC(display, gc);
XFreePixmap(display, pix); XFreePixmap(display, pix);
} }
} }
#endif #endif

2
src/font.h
View File

@ -148,7 +148,7 @@ void __imlib_xfd_draw_str(Display *display, Drawable drawable,
#ifdef XMB_FONT_CACHE #ifdef XMB_FONT_CACHE
void __imlib_xfd_build_str_image(Display *display, Drawable drawable, void __imlib_xfd_build_str_image(Display *display, Drawable drawable,
Visual *v, ImlibFont *fn, ImlibImage *im, Visual *v, ImlibFont *fn, ImlibImage *im,
const char *text); const char *text, DATA8 r, DATA8 g, DATA8 b, DATA8 a);
#endif #endif
int __imlib_char_pos(ImlibFont *fn, const char *text, int x, int y, int __imlib_char_pos(ImlibFont *fn, const char *text, int x, int y,
int *cx, int *cy, int *cw, int *ch); int *cx, int *cy, int *cw, int *ch);