Merge remote-tracking branch 'upstream/0.7'
This commit is contained in:
		
							
								
								
									
										1
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Makefile
									
									
									
									
									
								
							| @@ -76,6 +76,7 @@ dist: clean | |||||||
|  |  | ||||||
| install: dwl | install: dwl | ||||||
| 	mkdir -p $(DESTDIR)$(PREFIX)/bin | 	mkdir -p $(DESTDIR)$(PREFIX)/bin | ||||||
|  | 	rm -f $(DESTDIR)$(PREFIX)/bin/dwl | ||||||
| 	cp -f dwl $(DESTDIR)$(PREFIX)/bin | 	cp -f dwl $(DESTDIR)$(PREFIX)/bin | ||||||
| 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dwl | 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dwl | ||||||
| 	mkdir -p $(DESTDIR)$(MANDIR)/man1 | 	mkdir -p $(DESTDIR)$(MANDIR)/man1 | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								dwl.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								dwl.c
									
									
									
									
									
								
							| @@ -1506,7 +1506,6 @@ void | |||||||
| destroydecoration(struct wl_listener *listener, void *data) | destroydecoration(struct wl_listener *listener, void *data) | ||||||
| { | { | ||||||
| 	Client *c = wl_container_of(listener, c, destroy_decoration); | 	Client *c = wl_container_of(listener, c, destroy_decoration); | ||||||
| 	c->decoration = NULL; |  | ||||||
|  |  | ||||||
| 	wl_list_remove(&c->destroy_decoration.link); | 	wl_list_remove(&c->destroy_decoration.link); | ||||||
| 	wl_list_remove(&c->set_decoration_mode.link); | 	wl_list_remove(&c->set_decoration_mode.link); | ||||||
| @@ -4476,7 +4475,7 @@ sethints(struct wl_listener *listener, void *data) | |||||||
| { | { | ||||||
| 	Client *c = wl_container_of(listener, c, set_hints); | 	Client *c = wl_container_of(listener, c, set_hints); | ||||||
| 	struct wlr_surface *surface = client_surface(c); | 	struct wlr_surface *surface = client_surface(c); | ||||||
| 	if (c == focustop(selmon)) | 	if (c == focustop(selmon) || !c->surface.xwayland->hints) | ||||||
| 		return; | 		return; | ||||||
|  |  | ||||||
| 	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints); | 	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user