rename drawstatus to drawstatusbar

This commit is contained in:
Julien Danjou 2007-09-15 13:54:02 +02:00
parent bc3f70e0fa
commit 01b2785587
7 changed files with 12 additions and 12 deletions

View File

@ -307,7 +307,7 @@ main(int argc, char *argv[])
XSync(dpy, False);
parse_config(dpy, DefaultScreen(dpy), &dc, &awesomeconf);
setup(dpy, &dc, &awesomeconf);
drawstatus(dpy, &dc, &awesomeconf);
drawstatusbar(dpy, &dc, &awesomeconf);
void (*handler[LASTEvent]) (XEvent *, awesome_config *) =
{
@ -369,7 +369,7 @@ main(int argc, char *argv[])
if(p > awesomeconf.statustext)
strncpy(awesomeconf.statustext, p + 1, sizeof(awesomeconf.statustext));
}
drawstatus(dpy, &dc, &awesomeconf);
drawstatusbar(dpy, &dc, &awesomeconf);
}
while(XPending(dpy))

View File

@ -277,7 +277,7 @@ focus(Display *disp, DC *drawcontext, Client * c, Bool selscreen, awesome_config
if(!selscreen)
return;
sel = c;
drawstatus(disp, drawcontext, awesomeconf);
drawstatusbar(disp, drawcontext, awesomeconf);
if(sel)
{
XSetWindowBorder(sel->display, sel->win, drawcontext->sel[ColBorder]);

2
draw.c
View File

@ -123,7 +123,7 @@ textnw(XFontSet set, XFontStruct *xfont, const char *text, unsigned int len)
}
void
drawstatus(Display *disp, DC *drawcontext, awesome_config * awesomeconf)
drawstatusbar(Display *disp, DC *drawcontext, awesome_config * awesomeconf)
{
int x, i;
drawcontext->x = drawcontext->y = 0;

2
draw.h
View File

@ -26,7 +26,7 @@
#define textw(set, xfont, text, height) (textnw(set, xfont, text, a_strlen(text)) + height)
void drawstatus(Display *, DC *, awesome_config *); /* draw the bar */
void drawstatusbar(Display *, DC *, awesome_config *); /* draw the bar */
unsigned int textnw(XFontSet, XFontStruct *, const char *, unsigned int);
#endif

View File

@ -301,7 +301,7 @@ handle_event_expose(XEvent * e, awesome_config *awesomeconf)
XExposeEvent *ev = &e->xexpose;
if(!ev->count && awesomeconf->statusbar.window == ev->window)
drawstatus(e->xany.display, &dc, awesomeconf);
drawstatusbar(e->xany.display, &dc, awesomeconf);
}
void
@ -377,7 +377,7 @@ handle_event_propertynotify(XEvent * e, awesome_config *awesomeconf)
{
updatetitle(c);
if(c == sel)
drawstatus(e->xany.display, &dc, awesomeconf);
drawstatusbar(e->xany.display, &dc, awesomeconf);
}
}
}

View File

@ -110,7 +110,7 @@ restack(Display * disp, DC * drawcontext, awesome_config *awesomeconf)
XEvent ev;
XWindowChanges wc;
drawstatus(disp, drawcontext, awesomeconf);
drawstatusbar(disp, drawcontext, awesomeconf);
if(!sel)
return;
if(sel->isfloating || IS_ARRANGE(floating))
@ -180,7 +180,7 @@ uicb_setlayout(Display *disp,
if(sel)
arrange(disp, drawcontext, awesomeconf);
else
drawstatus(disp, drawcontext, awesomeconf);
drawstatusbar(disp, drawcontext, awesomeconf);
saveawesomeprops(disp, awesomeconf);
@ -226,7 +226,7 @@ maximize(int x, int y, int w, int h, DC *drawcontext, awesome_config *awesomecon
else
sel->isfloating = False;
drawstatus(sel->display, drawcontext, awesomeconf);
drawstatusbar(sel->display, drawcontext, awesomeconf);
while(XCheckMaskEvent(sel->display, EnterWindowMask, &ev));
}

View File

@ -64,7 +64,7 @@ uicb_setnmaster(Display *disp,
if(sel)
arrange(disp, drawcontext, awesomeconf);
else
drawstatus(disp, drawcontext, awesomeconf);
drawstatusbar(disp, drawcontext, awesomeconf);
}
void
@ -84,7 +84,7 @@ uicb_setncols(Display *disp,
if(sel)
arrange(disp, drawcontext, awesomeconf);
else
drawstatus(disp, drawcontext, awesomeconf);
drawstatusbar(disp, drawcontext, awesomeconf);
}
void