mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed icon stuff after tagging

This commit is contained in:
Anselm R. Garbe 2006-03-10 18:27:34 +01:00
parent 2f10738da4
commit a01daeff2d
2 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liblitz/blitz.h
View File

@ -4,7 +4,6 @@
*/
#include <X11/Xlib.h>
#include <X11/xpm.h>
#include <cext.h>
#define BLITZ_FONT "fixed"
@ -43,9 +42,6 @@ XFontStruct *blitz_getfont(Display *dpy, char *fontstr);
int blitz_loadcolor(Display *dpy, int mon, char *colstr, Color *c);
void blitz_drawlabel(Display *dpy, Draw *r);
void blitz_drawmeter(Display *dpy, Draw *r);
int blitz_createicon(Display *dpy, Icon *ico, char *data[]);
void blitz_freeicon(Display *dpy, Icon *ico);
void blitz_drawicon(Display *dpy, Draw *d, Icon *ico);
void blitz_drawborder(Display *dpy, Draw *r);
/* geometry.c */

60
liblitz/draw.c
View File

@ -175,63 +175,3 @@ blitz_drawlabel(Display *dpy, Draw * d)
if (d->data)
xdrawtext(dpy, d);
}
int
blitz_createicon(Display *dpy, Icon *ico, char *data[])
{
printf("Entering blitz_createicon\n");
fflush(NULL);
XpmAttributes attr;
XImage* mask;
GC gc;
printf("%s …\n", data[0] );
attr.valuemask = XpmSize;
int retval;
retval = XpmCreateImageFromData(dpy, data, &ico->image, &mask, &attr);
if(retval)
return retval;
printf(" %dx%d\n", ico->image->width, ico->image->height);
ico->mask = XCreatePixmap(dpy, XDefaultRootWindow(dpy), mask->width, mask->height, mask->depth);
gc = XCreateGC (dpy, ico->mask, 0, NULL);
XPutImage(dpy, ico->mask, gc, mask, 0, 0, 0, 0, mask->width, mask->height);
printf("mask: %dx%d (%d)\n", mask->width, mask->height, sizeof(Pixmap));
XpmFreeAttributes(&attr);
return 0;
}
void
blitz_freeicon(Display *dpy, Icon *ico)
{
if(ico->image) {
XDestroyImage(ico->image);
ico->image = nil;
XFreePixmap(dpy, ico->mask);
}
}
void
blitz_drawicon(Display *dpy, Draw *d, Icon *ico)
{
int y, w, h;
xdrawbg(dpy, d);
if (d->rect.width - 4 < ico->image->width)
w = d->rect.width - 4;
else
w = ico->image->width;
if (d->rect.height - 4 < ico->image->height)
h = d->rect.height - 4;
else
h = ico->image->height;
y = (h - ico->image->height) / 2;
XSetClipMask(dpy, d->gc, ico->mask);
XSetClipOrigin(dpy, d->gc, d->rect.x + 2, d->rect.y + 2 + y);
/* vertically centered */
if (y < 0)
XPutImage(dpy, d->drawable, d->gc, ico->image, 0, -y, d->rect.x + 2, d->rect.y + 2, w, h);
else
XPutImage(dpy, d->drawable, d->gc, ico->image, 0, y, d->rect.x + 2, d->rect.y + 2 + y, w, h);
XSetClipMask(dpy, d->gc, None);
}