mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2025-02-08 10:25:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some changes already in snap.

Browse Source
This commit is contained in:
Kris Maglione 2007-03-05 01:11:12 -05:00
parent 3cb6d8a7d1
commit 86d4f9ebf0
5 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -50,10 +50,11 @@ clean:
dist: clean dist: clean
@echo creating dist tarball @echo creating dist tarball
@mkdir -p wmii-${VERSION} @mkdir -p wmii-${VERSION}
@cp -R LICENSE Makefile README wmii wmiir config.mk rc \ @ln LICENSE Makefile config.mk README rc/ \
wmii.1 wmiir.1 wmiiwm.1 wmii.h ${SRC} 9menu.c wmii-${VERSION} wmii.eps wmii.mp \
@tar -cf wmii-${VERSION}.tar wmii-${VERSION} ${MAN1:=.1} ${SRC} ${SCRIPTS} wmii.h 9menu.c \
@gzip wmii-${VERSION}.tar wmii-${VERSION}/
@tar -zcf wmii-${VERSION}.tgz wmii-${VERSION}
@rm -rf wmii-${VERSION} @rm -rf wmii-${VERSION}
install: all install: all

2
column.c
View File

@ -305,7 +305,7 @@ AfterHorizontal:
resize_frame(south, &south->rect); resize_frame(south, &south->rect);
} }
AfterVertical: AfterVertical:
//relax_column(a); arrange_column(a, False);
focus_view(screen, v); focus_view(screen, v);
} }

11
event.c
View File

@ -387,6 +387,16 @@ propertynotify(XEvent *e) {
prop_client(c, ev->atom); 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 static void
unmapnotify(XEvent *e) { unmapnotify(XEvent *e) {
Client *c; Client *c;
@ -408,6 +418,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
[FocusOut] = focusout, [FocusOut] = focusout,
[KeyPress] = keypress, [KeyPress] = keypress,
[LeaveNotify] = leavenotify, [LeaveNotify] = leavenotify,
[MapNotify] = mapnotify,
[MapRequest] = maprequest, [MapRequest] = maprequest,
[MappingNotify] = mappingnotify, [MappingNotify] = mappingnotify,
[MotionNotify] = motionnotify, [MotionNotify] = motionnotify,

34
mouse.c
View File

@ -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->y = r_south(&f_close->rect);
rect->height = f->rect.y - rect->y; rect->height = f->rect.y - rect->y;
} }
if(do_move) { if(do_move)
if(frame == f) goto do_move;
return;
if(a != frame->area)
send_to_area(a, frame);
remove_frame(frame);
insert_frame(f, frame, True);
focus(frame->client, True);
}
return; return;
} }
if(y > r_south(&f->rect) - labelh(&def.font)) { 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); rect->height = (screen->rect.height - labelh(&def.font) - rect->y);
if(f->anext) if(f->anext)
rect->height = (f->anext->rect.y - rect->y); rect->height = (f->anext->rect.y - rect->y);
if(do_move) { if(do_move)
if(frame == f) goto do_move;
return;
if(a != frame->area)
send_to_area(a, frame);
remove_frame(frame);
insert_frame(f, frame, False);
focus(frame->client, True);
}
return; return;
} }
*rect = f->rect; *rect = f->rect;
if(do_move) { if(do_move) {
swap_frames(frame, f); swap_frames(frame, f);
focus(frame->client, False); 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 static void

7
view.c
View File

@ -115,7 +115,6 @@ focus_view(WMScreen *s, View *v) {
XGrabServer(blz.dpy); XGrabServer(blz.dpy);
assign_sel_view(v); assign_sel_view(v);
update_frame_selectors(v); update_frame_selectors(v);
/* gives all(!) clients proper geometry (for use of different tags) */
for(c=client; c; c=c->next) for(c=client; c; c=c->next)
if((f = c->sel)) { if((f = c->sel)) {
if(f->view == v) { if(f->view == v) {
@ -130,8 +129,7 @@ focus_view(WMScreen *s, View *v) {
draw_frames(); draw_frames();
XSync(blz.dpy, False); XSync(blz.dpy, False);
XUngrabServer(blz.dpy); XUngrabServer(blz.dpy);
if(v != old) flush_masked_events(EnterWindowMask);
flush_masked_events(EnterWindowMask);
} }
void void
@ -153,8 +151,7 @@ attach_to_view(View *v, Frame *f) {
Client *c = f->client; Client *c = f->client;
c->revert = nil; c->revert = nil;
if(c->trans || c->floating || c->fixedsize if(c->trans || c->floating || c->fixedsize || c->fullscreen)
|| (c->rect.width == screen->rect.width && c->rect.height == screen->rect.height))
v->sel = v->area; v->sel = v->area;
else if(starting && v->sel->floating) else if(starting && v->sel->floating)
v->sel = v->area->next; v->sel = v->area->next;