mirror of https://github.com/0intro/wmii
Some changes already in snap.
This commit is contained in:
parent
3cb6d8a7d1
commit
86d4f9ebf0
9
Makefile
9
Makefile
|
@ -50,10 +50,11 @@ clean:
|
|||
dist: clean
|
||||
@echo creating dist tarball
|
||||
@mkdir -p wmii-${VERSION}
|
||||
@cp -R LICENSE Makefile README wmii wmiir config.mk rc \
|
||||
wmii.1 wmiir.1 wmiiwm.1 wmii.h ${SRC} 9menu.c wmii-${VERSION}
|
||||
@tar -cf wmii-${VERSION}.tar wmii-${VERSION}
|
||||
@gzip wmii-${VERSION}.tar
|
||||
@ln LICENSE Makefile config.mk README rc/ \
|
||||
wmii.eps wmii.mp \
|
||||
${MAN1:=.1} ${SRC} ${SCRIPTS} wmii.h 9menu.c \
|
||||
wmii-${VERSION}/
|
||||
@tar -zcf wmii-${VERSION}.tgz wmii-${VERSION}
|
||||
@rm -rf wmii-${VERSION}
|
||||
|
||||
install: all
|
||||
|
|
2
column.c
2
column.c
|
@ -305,7 +305,7 @@ AfterHorizontal:
|
|||
resize_frame(south, &south->rect);
|
||||
}
|
||||
AfterVertical:
|
||||
//relax_column(a);
|
||||
arrange_column(a, False);
|
||||
focus_view(screen, v);
|
||||
}
|
||||
|
||||
|
|
11
event.c
11
event.c
|
@ -387,6 +387,16 @@ propertynotify(XEvent *e) {
|
|||
prop_client(c, ev->atom);
|
||||
}
|
||||
|
||||
static void
|
||||
mapnotify(XEvent *e) {
|
||||
Client *c;
|
||||
XMapEvent *ev = &e->xmap;
|
||||
|
||||
if((c = client_of_win(ev->window)))
|
||||
if(c == sel_client())
|
||||
focus_client(c);
|
||||
}
|
||||
|
||||
static void
|
||||
unmapnotify(XEvent *e) {
|
||||
Client *c;
|
||||
|
@ -408,6 +418,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
|
|||
[FocusOut] = focusout,
|
||||
[KeyPress] = keypress,
|
||||
[LeaveNotify] = leavenotify,
|
||||
[MapNotify] = mapnotify,
|
||||
[MapRequest] = maprequest,
|
||||
[MappingNotify] = mappingnotify,
|
||||
[MotionNotify] = motionnotify,
|
||||
|
|
34
mouse.c
34
mouse.c
|
@ -236,15 +236,8 @@ find_droppoint(Frame *frame, int x, int y, XRectangle *rect, Bool do_move) {
|
|||
rect->y = r_south(&f_close->rect);
|
||||
rect->height = f->rect.y - rect->y;
|
||||
}
|
||||
if(do_move) {
|
||||
if(frame == f)
|
||||
return;
|
||||
if(a != frame->area)
|
||||
send_to_area(a, frame);
|
||||
remove_frame(frame);
|
||||
insert_frame(f, frame, True);
|
||||
focus(frame->client, True);
|
||||
}
|
||||
if(do_move)
|
||||
goto do_move;
|
||||
return;
|
||||
}
|
||||
if(y > r_south(&f->rect) - labelh(&def.font)) {
|
||||
|
@ -252,22 +245,27 @@ find_droppoint(Frame *frame, int x, int y, XRectangle *rect, Bool do_move) {
|
|||
rect->height = (screen->rect.height - labelh(&def.font) - rect->y);
|
||||
if(f->anext)
|
||||
rect->height = (f->anext->rect.y - rect->y);
|
||||
if(do_move) {
|
||||
if(frame == f)
|
||||
return;
|
||||
if(a != frame->area)
|
||||
send_to_area(a, frame);
|
||||
remove_frame(frame);
|
||||
insert_frame(f, frame, False);
|
||||
focus(frame->client, True);
|
||||
}
|
||||
if(do_move)
|
||||
goto do_move;
|
||||
return;
|
||||
}
|
||||
|
||||
*rect = f->rect;
|
||||
if(do_move) {
|
||||
swap_frames(frame, f);
|
||||
focus(frame->client, False);
|
||||
}
|
||||
return;
|
||||
|
||||
do_move:
|
||||
if(frame == f)
|
||||
return;
|
||||
if(a != frame->area)
|
||||
send_to_area(a, frame);
|
||||
remove_frame(frame);
|
||||
insert_frame(f, frame, False);
|
||||
arrange_column(f->area, False);
|
||||
focus(frame->client, True);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
7
view.c
7
view.c
|
@ -115,7 +115,6 @@ focus_view(WMScreen *s, View *v) {
|
|||
XGrabServer(blz.dpy);
|
||||
assign_sel_view(v);
|
||||
update_frame_selectors(v);
|
||||
/* gives all(!) clients proper geometry (for use of different tags) */
|
||||
for(c=client; c; c=c->next)
|
||||
if((f = c->sel)) {
|
||||
if(f->view == v) {
|
||||
|
@ -130,8 +129,7 @@ focus_view(WMScreen *s, View *v) {
|
|||
draw_frames();
|
||||
XSync(blz.dpy, False);
|
||||
XUngrabServer(blz.dpy);
|
||||
if(v != old)
|
||||
flush_masked_events(EnterWindowMask);
|
||||
flush_masked_events(EnterWindowMask);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -153,8 +151,7 @@ attach_to_view(View *v, Frame *f) {
|
|||
Client *c = f->client;
|
||||
|
||||
c->revert = nil;
|
||||
if(c->trans || c->floating || c->fixedsize
|
||||
|| (c->rect.width == screen->rect.width && c->rect.height == screen->rect.height))
|
||||
if(c->trans || c->floating || c->fixedsize || c->fullscreen)
|
||||
v->sel = v->area;
|
||||
else if(starting && v->sel->floating)
|
||||
v->sel = v->area->next;
|
||||
|
|
Loading…
Reference in New Issue