rename drawstatus to drawstatusbar
This commit is contained in:
parent
bc3f70e0fa
commit
01b2785587
|
@ -307,7 +307,7 @@ main(int argc, char *argv[])
|
||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
parse_config(dpy, DefaultScreen(dpy), &dc, &awesomeconf);
|
parse_config(dpy, DefaultScreen(dpy), &dc, &awesomeconf);
|
||||||
setup(dpy, &dc, &awesomeconf);
|
setup(dpy, &dc, &awesomeconf);
|
||||||
drawstatus(dpy, &dc, &awesomeconf);
|
drawstatusbar(dpy, &dc, &awesomeconf);
|
||||||
|
|
||||||
void (*handler[LASTEvent]) (XEvent *, awesome_config *) =
|
void (*handler[LASTEvent]) (XEvent *, awesome_config *) =
|
||||||
{
|
{
|
||||||
|
@ -369,7 +369,7 @@ main(int argc, char *argv[])
|
||||||
if(p > awesomeconf.statustext)
|
if(p > awesomeconf.statustext)
|
||||||
strncpy(awesomeconf.statustext, p + 1, sizeof(awesomeconf.statustext));
|
strncpy(awesomeconf.statustext, p + 1, sizeof(awesomeconf.statustext));
|
||||||
}
|
}
|
||||||
drawstatus(dpy, &dc, &awesomeconf);
|
drawstatusbar(dpy, &dc, &awesomeconf);
|
||||||
}
|
}
|
||||||
|
|
||||||
while(XPending(dpy))
|
while(XPending(dpy))
|
||||||
|
|
2
client.c
2
client.c
|
@ -277,7 +277,7 @@ focus(Display *disp, DC *drawcontext, Client * c, Bool selscreen, awesome_config
|
||||||
if(!selscreen)
|
if(!selscreen)
|
||||||
return;
|
return;
|
||||||
sel = c;
|
sel = c;
|
||||||
drawstatus(disp, drawcontext, awesomeconf);
|
drawstatusbar(disp, drawcontext, awesomeconf);
|
||||||
if(sel)
|
if(sel)
|
||||||
{
|
{
|
||||||
XSetWindowBorder(sel->display, sel->win, drawcontext->sel[ColBorder]);
|
XSetWindowBorder(sel->display, sel->win, drawcontext->sel[ColBorder]);
|
||||||
|
|
2
draw.c
2
draw.c
|
@ -123,7 +123,7 @@ textnw(XFontSet set, XFontStruct *xfont, const char *text, unsigned int len)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
drawstatus(Display *disp, DC *drawcontext, awesome_config * awesomeconf)
|
drawstatusbar(Display *disp, DC *drawcontext, awesome_config * awesomeconf)
|
||||||
{
|
{
|
||||||
int x, i;
|
int x, i;
|
||||||
drawcontext->x = drawcontext->y = 0;
|
drawcontext->x = drawcontext->y = 0;
|
||||||
|
|
2
draw.h
2
draw.h
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
#define textw(set, xfont, text, height) (textnw(set, xfont, text, a_strlen(text)) + height)
|
#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);
|
unsigned int textnw(XFontSet, XFontStruct *, const char *, unsigned int);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
4
event.c
4
event.c
|
@ -301,7 +301,7 @@ handle_event_expose(XEvent * e, awesome_config *awesomeconf)
|
||||||
XExposeEvent *ev = &e->xexpose;
|
XExposeEvent *ev = &e->xexpose;
|
||||||
|
|
||||||
if(!ev->count && awesomeconf->statusbar.window == ev->window)
|
if(!ev->count && awesomeconf->statusbar.window == ev->window)
|
||||||
drawstatus(e->xany.display, &dc, awesomeconf);
|
drawstatusbar(e->xany.display, &dc, awesomeconf);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -377,7 +377,7 @@ handle_event_propertynotify(XEvent * e, awesome_config *awesomeconf)
|
||||||
{
|
{
|
||||||
updatetitle(c);
|
updatetitle(c);
|
||||||
if(c == sel)
|
if(c == sel)
|
||||||
drawstatus(e->xany.display, &dc, awesomeconf);
|
drawstatusbar(e->xany.display, &dc, awesomeconf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
6
layout.c
6
layout.c
|
@ -110,7 +110,7 @@ restack(Display * disp, DC * drawcontext, awesome_config *awesomeconf)
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
XWindowChanges wc;
|
XWindowChanges wc;
|
||||||
|
|
||||||
drawstatus(disp, drawcontext, awesomeconf);
|
drawstatusbar(disp, drawcontext, awesomeconf);
|
||||||
if(!sel)
|
if(!sel)
|
||||||
return;
|
return;
|
||||||
if(sel->isfloating || IS_ARRANGE(floating))
|
if(sel->isfloating || IS_ARRANGE(floating))
|
||||||
|
@ -180,7 +180,7 @@ uicb_setlayout(Display *disp,
|
||||||
if(sel)
|
if(sel)
|
||||||
arrange(disp, drawcontext, awesomeconf);
|
arrange(disp, drawcontext, awesomeconf);
|
||||||
else
|
else
|
||||||
drawstatus(disp, drawcontext, awesomeconf);
|
drawstatusbar(disp, drawcontext, awesomeconf);
|
||||||
|
|
||||||
saveawesomeprops(disp, awesomeconf);
|
saveawesomeprops(disp, awesomeconf);
|
||||||
|
|
||||||
|
@ -226,7 +226,7 @@ maximize(int x, int y, int w, int h, DC *drawcontext, awesome_config *awesomecon
|
||||||
else
|
else
|
||||||
sel->isfloating = False;
|
sel->isfloating = False;
|
||||||
|
|
||||||
drawstatus(sel->display, drawcontext, awesomeconf);
|
drawstatusbar(sel->display, drawcontext, awesomeconf);
|
||||||
|
|
||||||
while(XCheckMaskEvent(sel->display, EnterWindowMask, &ev));
|
while(XCheckMaskEvent(sel->display, EnterWindowMask, &ev));
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,7 +64,7 @@ uicb_setnmaster(Display *disp,
|
||||||
if(sel)
|
if(sel)
|
||||||
arrange(disp, drawcontext, awesomeconf);
|
arrange(disp, drawcontext, awesomeconf);
|
||||||
else
|
else
|
||||||
drawstatus(disp, drawcontext, awesomeconf);
|
drawstatusbar(disp, drawcontext, awesomeconf);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -84,7 +84,7 @@ uicb_setncols(Display *disp,
|
||||||
if(sel)
|
if(sel)
|
||||||
arrange(disp, drawcontext, awesomeconf);
|
arrange(disp, drawcontext, awesomeconf);
|
||||||
else
|
else
|
||||||
drawstatus(disp, drawcontext, awesomeconf);
|
drawstatusbar(disp, drawcontext, awesomeconf);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue