merged my changes
This commit is contained in:
		
						commit
						73ec124ae9
					
				
							
								
								
									
										5
									
								
								dwm.c
								
								
								
								
							
							
						
						
									
										5
									
								
								dwm.c
								
								
								
								
							| 
						 | 
					@ -61,7 +61,7 @@
 | 
				
			||||||
enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 | 
					enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 | 
				
			||||||
enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 | 
					enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 | 
				
			||||||
enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 | 
					enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 | 
				
			||||||
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 | 
					enum { WMProtocols, WMDelete, WMState, WMLast };        /* default atoms */
 | 
				
			||||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
 | 
					enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
 | 
				
			||||||
       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 | 
					       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1326,7 +1326,6 @@ setup(void) {
 | 
				
			||||||
	/* init atoms */
 | 
						/* init atoms */
 | 
				
			||||||
	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
 | 
						wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
 | 
				
			||||||
	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
 | 
						wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
 | 
				
			||||||
	wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
 | 
					 | 
				
			||||||
	wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
 | 
						wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
 | 
				
			||||||
	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
 | 
						netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
 | 
				
			||||||
	netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 | 
						netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 | 
				
			||||||
| 
						 | 
					@ -1634,7 +1633,7 @@ updatesizehints(Client *c) {
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
updatetitle(Client *c) {
 | 
					updatetitle(Client *c) {
 | 
				
			||||||
	if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
 | 
						if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
 | 
				
			||||||
		gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 | 
							gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue