renamed drawstatus into drawbar
This commit is contained in:
		
							parent
							
								
									5d831eaa94
								
							
						
					
					
						commit
						9800518ae3
					
				
							
								
								
									
										2
									
								
								client.c
								
								
								
								
							
							
						
						
									
										2
									
								
								client.c
								
								
								
								
							| 
						 | 
					@ -145,7 +145,7 @@ focus(Client *c) {
 | 
				
			||||||
		grabbuttons(c, True);
 | 
							grabbuttons(c, True);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	sel = c;
 | 
						sel = c;
 | 
				
			||||||
	drawstatus();
 | 
						drawbar();
 | 
				
			||||||
	if(!selscreen)
 | 
						if(!selscreen)
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
	if(c) {
 | 
						if(c) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								draw.c
								
								
								
								
							
							
						
						
									
										2
									
								
								draw.c
								
								
								
								
							| 
						 | 
					@ -49,7 +49,7 @@ textnw(const char *text, unsigned int len) {
 | 
				
			||||||
/* extern */
 | 
					/* extern */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
drawstatus(void) {
 | 
					drawbar(void) {
 | 
				
			||||||
	int i, x;
 | 
						int i, x;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	dc.x = dc.y = 0;
 | 
						dc.x = dc.y = 0;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								dwm.h
								
								
								
								
							
							
						
						
									
										2
									
								
								dwm.h
								
								
								
								
							| 
						 | 
					@ -104,7 +104,7 @@ void updatesizehints(Client *c);	/* update the size hint variables of c */
 | 
				
			||||||
void updatetitle(Client *c);		/* update the name of c */
 | 
					void updatetitle(Client *c);		/* update the name of c */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* draw.c */
 | 
					/* draw.c */
 | 
				
			||||||
void drawstatus(void);			/* draw the bar */
 | 
					void drawbar(void);			/* draw the bar */
 | 
				
			||||||
void drawtext(const char *text, unsigned long col[ColLast]);	/* draw text */
 | 
					void drawtext(const char *text, unsigned long col[ColLast]);	/* draw text */
 | 
				
			||||||
unsigned int textw(const char *text);	/* return the width of text in px*/
 | 
					unsigned int textw(const char *text);	/* return the width of text in px*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								event.c
								
								
								
								
							
							
						
						
									
										4
									
								
								event.c
								
								
								
								
							| 
						 | 
					@ -245,7 +245,7 @@ expose(XEvent *e) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if(ev->count == 0) {
 | 
						if(ev->count == 0) {
 | 
				
			||||||
		if(barwin == ev->window)
 | 
							if(barwin == ev->window)
 | 
				
			||||||
			drawstatus();
 | 
								drawbar();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -322,7 +322,7 @@ propertynotify(XEvent *e) {
 | 
				
			||||||
		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 | 
							if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 | 
				
			||||||
			updatetitle(c);
 | 
								updatetitle(c);
 | 
				
			||||||
			if(c == sel)
 | 
								if(c == sel)
 | 
				
			||||||
				drawstatus();
 | 
									drawbar();
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								main.c
								
								
								
								
							
							
						
						
									
										4
									
								
								main.c
								
								
								
								
							| 
						 | 
					@ -326,7 +326,7 @@ main(int argc, char *argv[]) {
 | 
				
			||||||
	xerrorxlib = XSetErrorHandler(xerror);
 | 
						xerrorxlib = XSetErrorHandler(xerror);
 | 
				
			||||||
	XSync(dpy, False);
 | 
						XSync(dpy, False);
 | 
				
			||||||
	setup();
 | 
						setup();
 | 
				
			||||||
	drawstatus();
 | 
						drawbar();
 | 
				
			||||||
	scan();
 | 
						scan();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* main event loop, also reads status text from stdin */
 | 
						/* main event loop, also reads status text from stdin */
 | 
				
			||||||
| 
						 | 
					@ -359,7 +359,7 @@ main(int argc, char *argv[]) {
 | 
				
			||||||
				if(p > stext)
 | 
									if(p > stext)
 | 
				
			||||||
					strncpy(stext, p + 1, sizeof stext);
 | 
										strncpy(stext, p + 1, sizeof stext);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			drawstatus();
 | 
								drawbar();
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		while(XPending(dpy)) {
 | 
							while(XPending(dpy)) {
 | 
				
			||||||
			XNextEvent(dpy, &ev);
 | 
								XNextEvent(dpy, &ev);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										6
									
								
								screen.c
								
								
								
								
							
							
						
						
									
										6
									
								
								screen.c
								
								
								
								
							| 
						 | 
					@ -213,7 +213,7 @@ restack(void) {
 | 
				
			||||||
	XEvent ev;
 | 
						XEvent ev;
 | 
				
			||||||
	XWindowChanges wc;
 | 
						XWindowChanges wc;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	drawstatus();
 | 
						drawbar();
 | 
				
			||||||
	if(!sel)
 | 
						if(!sel)
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
	if(sel->isfloating || isfloating())
 | 
						if(sel->isfloating || isfloating())
 | 
				
			||||||
| 
						 | 
					@ -255,7 +255,7 @@ setlayout(const char *arg) {
 | 
				
			||||||
	if(sel)
 | 
						if(sel)
 | 
				
			||||||
		arrange();
 | 
							arrange();
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		drawstatus();
 | 
							drawbar();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
| 
						 | 
					@ -307,7 +307,7 @@ togglemax(const char *arg) {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
 | 
							resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
 | 
				
			||||||
	drawstatus();
 | 
						drawbar();
 | 
				
			||||||
	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 | 
						while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue