summaryrefslogtreecommitdiffstats
path: root/draw
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--draw.c12
-rw-r--r--draw.h2
2 files changed, 9 insertions, 5 deletions
diff --git a/draw.c b/draw.c
index 688bd69..6791b97 100644
--- a/draw.c
+++ b/draw.c
@@ -13,6 +13,9 @@
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MAX(a, b) ((a) > (b) ? (a) : (b))
+/* variables */
+char *progname;
+
void
drawcleanup(void) {
if(dc.font.set)
@@ -71,6 +74,7 @@ void
eprint(const char *errstr, ...) {
va_list ap;
+ fprintf(stderr, "%s: ", progname);
va_start(ap, errstr);
vfprintf(stderr, errstr, ap);
va_end(ap);
@@ -83,7 +87,7 @@ getcolor(const char *colstr) {
XColor color;
if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
- eprint("drawtext: cannot allocate color '%s'\n", colstr);
+ eprint("cannot allocate color '%s'\n", colstr);
return color.pixel;
}
@@ -92,8 +96,8 @@ initfont(const char *fontstr) {
char *def, **missing = NULL;
int i, n;
- if(!fontstr || fontstr[0] == '\0')
- eprint("drawtext: cannot load font: '%s'\n", fontstr);
+ if(!fontstr || !*fontstr)
+ eprint("cannot load null font\n");
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing)
XFreeStringList(missing);
@@ -111,7 +115,7 @@ initfont(const char *fontstr) {
else {
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
- eprint("drawtext: cannot load font: '%s'\n", fontstr);
+ eprint("cannot load font '%s'\n", fontstr);
dc.font.ascent = dc.font.xfont->ascent;
dc.font.descent = dc.font.xfont->descent;
}
diff --git a/draw.h b/draw.h
index b6615ab..d1f1a7c 100644
--- a/draw.h
+++ b/draw.h
@@ -30,13 +30,13 @@ int textnw(const char *text, unsigned int len);
int textw(const char *text);
/* variables */
+extern char *progname;
extern Display *dpy;
extern DC dc;
extern int screen;
extern unsigned int mw, mh;
extern Window parent;
-/* style */
extern const char *font;
extern const char *normbgcolor;
extern const char *normfgcolor;
702d92bc97645ccbb0be6&follow=1'>applied patch from pancakeGravatar Enno Boland (tox) 1-2/+0 2009-09-09small fix to work more proberly with tabbed.Gravatar Enno Boland (tox) 1-0/+1 2009-09-08adding fflush()Gravatar Enno Boland (tox) 1-1/+3 2009-09-08rearranging config.def.hGravatar Enno Boland (tox) 1-22/+22 2009-09-07fixing numlock bug.Gravatar Enno Boland (tox) 1-1/+3 2009-09-07using gint instead of int (insane API, but ok.)Gravatar Enno Boland (tox) 1-19/+12 2009-09-07using simple strings for colors in config.hGravatar Enno Boland (tox) 2-6/+6 2009-09-07changing keybindingsGravatar Enno Boland (tox) 1-16/+15 2009-09-07changing minimal size.Gravatar Enno Boland (tox) 1-1/+1 2009-09-07next version is 0.1Gravatar Enno Boland (tox) 1-1/+1 2009-09-07moving config.h to config.def.h.Gravatar Enno Boland (tox) 2-11/+15 2009-09-07moving color definitions to config.hGravatar Enno Boland (tox) 2-4/+5 2009-09-07indicator is red when http and green when httpsGravatar Enno Boland (tox) 1-1/+15 2009-09-07making indicator smaller.Gravatar Enno Boland (tox) 1-1/+1 2009-09-07typoGravatar Enno Boland (tox) 1-2/+2 2009-09-07adding indicator bar.Gravatar Enno Boland (tox) 1-11/+46 2009-09-07s/zoompage/zoom/Gravatar Enno Boland (tox) 2-5/+6 2009-09-07typo fixGravatar Enno Boland (tox) 1-1/+1 2009-09-07changes to the event system, make config.h saner, working on cookiesGravatar Enno Boland (tox) 2-96/+63 2009-09-06typofixGravatar Enno Boland (tox) 1-1/+1 2009-09-06reworked navigate.Gravatar Enno Boland (tox) 2-7/+4 2009-09-06reworked navigate.Gravatar Enno Boland (tox) 2-7/+4 2009-09-06reappling printing; changing some keys.Gravatar Enno Boland (tox) 2-3/+10