#include <stdio.h>
#include <string.h>
-#include "draw.h"
-#include "util.h"
+#include <X11/Xlocale.h>
+
+#include "dwm.h"
static void
-drawborder(Display *dpy, Brush *b)
+drawborder(void)
{
XPoint points[5];
- XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);
- XSetForeground(dpy, b->gc, b->border);
- points[0].x = b->rect.x;
- points[0].y = b->rect.y;
- points[1].x = b->rect.width - 1;
+ XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+ XSetForeground(dpy, dc.gc, dc.border);
+ points[0].x = dc.x;
+ points[0].y = dc.y;
+ points[1].x = dc.w - 1;
points[1].y = 0;
points[2].x = 0;
- points[2].y = b->rect.height - 1;
- points[3].x = -(b->rect.width - 1);
+ points[2].y = dc.h - 1;
+ points[3].x = -(dc.w - 1);
points[3].y = 0;
points[4].x = 0;
- points[4].y = -(b->rect.height - 1);
- XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
+ points[4].y = -(dc.h - 1);
+ XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
}
void
-draw(Display *dpy, Brush *b, Bool border, const char *text)
+draw(Bool border, const char *text)
{
- unsigned int x, y, w, h, len;
+ int x, y, w, h;
+ unsigned int len;
static char buf[256];
XGCValues gcv;
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- XSetForeground(dpy, b->gc, b->bg);
- XFillRectangles(dpy, b->drawable, b->gc, &b->rect, 1);
+ XSetForeground(dpy, dc.gc, dc.bg);
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+ w = 0;
if(border)
- drawborder(dpy, b);
+ drawborder();
if(!text)
return;
memcpy(buf, text, len);
buf[len] = 0;
- h = b->font.ascent + b->font.descent;
- y = b->rect.y + (b->rect.height / 2) - (h / 2) + b->font.ascent;
- x = b->rect.x + (h / 2);
+ h = dc.font.ascent + dc.font.descent;
+ y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+ x = dc.x + (h / 2);
/* shorten text if necessary */
- while(len && (w = textwidth_l(&b->font, buf, len)) > b->rect.width - h)
+ while(len && (w = textnw(buf, len)) > dc.w - h)
buf[--len] = 0;
- if(w > b->rect.width)
+ if(w > dc.w)
return; /* too long */
- gcv.foreground = b->fg;
- gcv.background = b->bg;
- if(b->font.set) {
- XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv);
- XmbDrawImageString(dpy, b->drawable, b->font.set, b->gc,
+ gcv.foreground = dc.fg;
+ gcv.background = dc.bg;
+ if(dc.font.set) {
+ XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
+ XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
x, y, buf, len);
}
else {
- gcv.font = b->font.xfont->fid;
- XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv);
- XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len);
+ gcv.font = dc.font.xfont->fid;
+ XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
+ XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
}
-static unsigned long
-xloadcolors(Display *dpy, Colormap cmap, const char *colstr)
+unsigned long
+initcolor(const char *colstr)
{
XColor color;
+ Colormap cmap = DefaultColormap(dpy, screen);
+
XAllocNamedColor(dpy, cmap, colstr, &color, &color);
return color.pixel;
}
-void
-loadcolors(Display *dpy, int screen, Brush *b,
- const char *bg, const char *fg, const char *border)
-{
- Colormap cmap = DefaultColormap(dpy, screen);
- b->bg = xloadcolors(dpy, cmap, bg);
- b->fg = xloadcolors(dpy, cmap, fg);
- b->border = xloadcolors(dpy, cmap, border);
-}
-
unsigned int
-textwidth_l(Fnt *font, char *text, unsigned int len)
+textnw(char *text, unsigned int len)
{
- if(font->set) {
- XRectangle r;
- XmbTextExtents(font->set, text, len, 0, &r);
+ XRectangle r;
+ if(dc.font.set) {
+ XmbTextExtents(dc.font.set, text, len, NULL, &r);
return r.width;
}
- return XTextWidth(font->xfont, text, len);
+ return XTextWidth(dc.font.xfont, text, len);
}
unsigned int
-textwidth(Fnt *font, char *text)
+textw(char *text)
{
- return textwidth_l(font, text, strlen(text));
+ return textnw(text, strlen(text));
}
void
-loadfont(Display *dpy, Fnt *font, const char *fontstr)
+initfont(const char *fontstr)
{
char **missing, *def;
- int n;
+ int i, n;
- missing = 0;
- def = "?";
+ missing = NULL;
setlocale(LC_ALL, "");
- if(font->set)
- XFreeFontSet(dpy, font->set);
- font->set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing) {
while(n--)
fprintf(stderr, "missing fontset: %s\n", missing[n]);
XFreeStringList(missing);
- if(font->set) {
- XFreeFontSet(dpy, font->set);
- font->set = 0;
+ if(dc.font.set) {
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = NULL;
}
}
- if(font->set) {
+ if(dc.font.set) {
XFontSetExtents *font_extents;
XFontStruct **xfonts;
char **font_names;
- unsigned int i;
-
- font->ascent = font->descent = 0;
- font_extents = XExtentsOfFontSet(font->set);
- n = XFontsOfFontSet(font->set, &xfonts, &font_names);
- for(i = 0, font->ascent = 0, font->descent = 0; i < n; i++) {
- if(font->ascent < (*xfonts)->ascent)
- font->ascent = (*xfonts)->ascent;
- if(font->descent < (*xfonts)->descent)
- font->descent = (*xfonts)->descent;
+
+ dc.font.ascent = dc.font.descent = 0;
+ font_extents = XExtentsOfFontSet(dc.font.set);
+ n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+ for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+ if(dc.font.ascent < (*xfonts)->ascent)
+ dc.font.ascent = (*xfonts)->ascent;
+ if(dc.font.descent < (*xfonts)->descent)
+ dc.font.descent = (*xfonts)->descent;
xfonts++;
}
}
else {
- if(font->xfont)
- XFreeFont(dpy, font->xfont);
- font->xfont = 0;
- font->xfont = XLoadQueryFont(dpy, fontstr);
- if (!font->xfont)
- font->xfont = XLoadQueryFont(dpy, "fixed");
- if (!font->xfont)
- error("error, cannot load 'fixed' font\n");
- font->ascent = font->xfont->ascent;
- font->descent = font->xfont->descent;
+ if(dc.font.xfont)
+ XFreeFont(dpy, dc.font.xfont);
+ dc.font.xfont = NULL;
+ dc.font.xfont = XLoadQueryFont(dpy, fontstr);
+ if (!dc.font.xfont)
+ dc.font.xfont = XLoadQueryFont(dpy, "fixed");
+ if (!dc.font.xfont)
+ error("error, cannot init 'fixed' font\n");
+ dc.font.ascent = dc.font.xfont->ascent;
+ dc.font.descent = dc.font.xfont->descent;
}
- font->height = font->ascent + font->descent;
+ dc.font.height = dc.font.ascent + dc.font.descent;
}
Got questions, comments, patches, etc.? Contact Jason Woofenden