overlapping code
This commit is contained in:
		
							
								
								
									
										6
									
								
								dinput.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								dinput.c
									
									
									
									
									
								
							@@ -278,11 +278,6 @@ setup(Bool topbar) {
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
	XFreeModifiermap(modmap);
 | 
						XFreeModifiermap(modmap);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* style */
 | 
					 | 
				
			||||||
	dc.norm[ColBG] = getcolor(normbgcolor);
 | 
					 | 
				
			||||||
	dc.norm[ColFG] = getcolor(normfgcolor);
 | 
					 | 
				
			||||||
	dc.sel[ColBG] = getcolor(selbgcolor);
 | 
					 | 
				
			||||||
	dc.sel[ColFG] = getcolor(selfgcolor);
 | 
					 | 
				
			||||||
	initfont(font);
 | 
						initfont(font);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* menu window */
 | 
						/* menu window */
 | 
				
			||||||
@@ -323,7 +318,6 @@ setup(Bool topbar) {
 | 
				
			|||||||
			DefaultVisual(dpy, screen),
 | 
								DefaultVisual(dpy, screen),
 | 
				
			||||||
			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 | 
								CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* pixmap */
 | 
					 | 
				
			||||||
	dcsetup();
 | 
						dcsetup();
 | 
				
			||||||
	if(prompt)
 | 
						if(prompt)
 | 
				
			||||||
		promptw = MIN(textw(prompt), mw / 5);
 | 
							promptw = MIN(textw(prompt), mw / 5);
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										6
									
								
								dmenu.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								dmenu.c
									
									
									
									
									
								
							@@ -489,11 +489,6 @@ setup(Bool topbar) {
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
	XFreeModifiermap(modmap);
 | 
						XFreeModifiermap(modmap);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* style */
 | 
					 | 
				
			||||||
	dc.norm[ColBG] = getcolor(normbgcolor);
 | 
					 | 
				
			||||||
	dc.norm[ColFG] = getcolor(normfgcolor);
 | 
					 | 
				
			||||||
	dc.sel[ColBG] = getcolor(selbgcolor);
 | 
					 | 
				
			||||||
	dc.sel[ColFG] = getcolor(selfgcolor);
 | 
					 | 
				
			||||||
	initfont(font);
 | 
						initfont(font);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* menu window */
 | 
						/* menu window */
 | 
				
			||||||
@@ -534,7 +529,6 @@ setup(Bool topbar) {
 | 
				
			|||||||
			DefaultVisual(dpy, screen),
 | 
								DefaultVisual(dpy, screen),
 | 
				
			||||||
			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 | 
								CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* pixmap */
 | 
					 | 
				
			||||||
	dcsetup();
 | 
						dcsetup();
 | 
				
			||||||
	if(maxname)
 | 
						if(maxname)
 | 
				
			||||||
		cmdw = MIN(textw(maxname), mw / 3);
 | 
							cmdw = MIN(textw(maxname), mw / 3);
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										1
									
								
								draw.c
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								draw.c
									
									
									
									
									
								
							@@ -47,7 +47,6 @@ dcsetup(void) {
 | 
				
			|||||||
	dc.norm[ColFG] = getcolor(normfgcolor);
 | 
						dc.norm[ColFG] = getcolor(normfgcolor);
 | 
				
			||||||
	dc.sel[ColBG] = getcolor(selbgcolor);
 | 
						dc.sel[ColBG] = getcolor(selbgcolor);
 | 
				
			||||||
	dc.sel[ColFG] = getcolor(selfgcolor);
 | 
						dc.sel[ColFG] = getcolor(selfgcolor);
 | 
				
			||||||
	initfont(font);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* pixmap */
 | 
						/* pixmap */
 | 
				
			||||||
	dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen));
 | 
						dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen));
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user