mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge.

This commit is contained in:
Kris Maglione 2008-02-08 21:39:25 -05:00
parent 63ed891ed0 b0941bfc9c
commit 5bb7a777a8
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/wmii/client.c
View File

@ -97,7 +97,8 @@ client_create(XWindow w, XWindowAttributes *wa) {
c->border = wa->border_width;
c->r.min = Pt(wa->x, wa->y);
c->r.max = addpt(c->r.min, Pt(wa->width, wa->height));
c->r.max = addpt(c->r.min,
Pt(wa->width, wa->height));
c->w.type = WWindow;
c->w.w = w;
@ -193,7 +194,8 @@ client_manage(Client *c) {
bool newgroup = !c->group
|| c->group->ref == 1
|| selclient() && (selclient()->group == c->group)
|| group_leader(c->group) && !client_viewframe(group_leader(c->group), c->sel->view);
|| group_leader(c->group) && !client_viewframe(group_leader(c->group),
c->sel->view);
f = c->sel;
if(!(c->w.ewmh.type & TypeSplash))

2
cmd/wmii/float.c
View File

@ -88,7 +88,7 @@ float_placeframe(Frame *f) {
return;
*/
if(c->fullscreen || c->w.hints->position || starting) {
f->r = client_grav(c, c->r);
f->r = f->floatr;
return;
}

4
cmd/wmii/frame.c
View File

@ -29,8 +29,8 @@ frame_create(Client *c, View *v) {
if(c->sel) {
f->floatr = c->sel->floatr;
f->r = c->sel->r;
}else{
f->r = client_grav(c, ZR);
}else {
f->r = client_grav(c, c->r);
f->floatr = f->r;
c->sel = f;
}

15
mk/dir.mk
View File

@ -1,23 +1,24 @@
MKSUBDIR = targ=$@; targ=$${targ\#d}; \
for i in $$dirs; do \
export BASE=$(BASE)$$i/; \
if [ ! -d $$i ]; then \
echo Skipping nonexistent directory: $$i 1>&2; \
else \
echo MAKE $$targ $(BASE)$$i/; \
(cd $$i && $(MAKE) BASE="$(BASE)$$i/" $$targ) || exit $?; \
echo MAKE $$targ $$BASE; \
(cd $$i && $(MAKE) $$targ) || exit $?; \
fi; \
done
dall:
dirs="$(DIRS)"; $(MKSUBDIR)
+dirs="$(DIRS)"; $(MKSUBDIR)
dclean:
dirs="$(DIRS)"; $(MKSUBDIR)
+dirs="$(DIRS)"; $(MKSUBDIR)
dinstall:
dirs="$(INSTDIRS)"; $(MKSUBDIR)
+dirs="$(INSTDIRS)"; $(MKSUBDIR)
duninstall:
dirs="$(INSTDIRS)"; $(MKSUBDIR)
+dirs="$(INSTDIRS)"; $(MKSUBDIR)
ddepend:
dirs="$(DIRS)"; $(MKSUBDIR)
+dirs="$(DIRS)"; $(MKSUBDIR)
all: dall
clean: dclean

4
mk/hdr.mk
View File

@ -36,8 +36,8 @@ all:
$(LINK) $@ $<
.c.O:
${COMPILE} ${<:.c=.o} $<
${LINK} $@ ${<:.c=.o}
$(COMPILE) ${<:.c=.o} $<
$(LINK) $@ ${<:.c=.o}
.sh.O:
echo FILTER $(BASE)$<