mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2024-11-25 15:20:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix stupid grow/nudge mistake. (and change an assert to a warning)

Browse Source
This commit is contained in:
Kris Maglione 2008-05-24 21:12:53 -04:00
parent 918fa1cf9d
commit 68f249f726
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/wmii.rc.rc
View File

@ -45,8 +45,8 @@ wmiifocuscol=`{wi_readctl focuscolors}
fn wi_menu { fn wi_menu {
dmenu -b -fn $wmiifont \ dmenu -b -fn $wmiifont \
-nf $wmiinormcol(1) -nb $wmiinormcol(2) \ -nf $wmiinormcol(1) -nb $wmiinormcol(2) \
-sf $wmiifocuscol(1) -sb $wmiifocuscol(2) -sf $wmiifocuscol(1) -sb $wmiifocuscol(2)
} }
fn wi_9menu { fn wi_9menu {
@ -156,7 +156,7 @@ fn wi_eventloop {
wi_arg=`{echo $wi_event | sed 's/^[^ ]+ //'}} wi_arg=`{echo $wi_event | sed 's/^[^ ]+ //'}}
* = `{echo $wi_event} * = `{echo $wi_event}
event = $1; shift event = $1; shift
Event-$event $* Event-$"event $*
} >[2]/dev/null </dev/null } >[2]/dev/null </dev/null
} }

2
cmd/wmii/float.c
View File

@ -30,7 +30,7 @@ float_detach(Frame *f) {
v = f->view; v = f->view;
a = f->area; a = f->area;
sel = view_findarea(v, v->selcol, false); sel = view_findarea(v, v->selcol, false);
assert(sel || !v->area->next); if(!(sel || !v->area->next)) warning("%s:%d: !(sel || !v->area->next)", __FILE__, __LINE__);
pr = f->aprev; pr = f->aprev;
frame_remove(f); frame_remove(f);

10
cmd/wmii/message.c
View File

@ -652,7 +652,10 @@ msg_grow(View *v, IxpMsg *m) {
if(!getamt(m, &amount)) if(!getamt(m, &amount))
return Ebadvalue; return Ebadvalue;
r = f->colr; if(f->area->floating)
r = f->r;
else
r = f->colr;
switch(dir) { switch(dir) {
case LLEFT: r.min.x -= amount.x; break; case LLEFT: r.min.x -= amount.x; break;
case LRIGHT: r.max.x += amount.x; break; case LRIGHT: r.max.x += amount.x; break;
@ -689,7 +692,10 @@ msg_nudge(View *v, IxpMsg *m) {
if(!getamt(m, &amount)) if(!getamt(m, &amount))
return Ebadvalue; return Ebadvalue;
r = f->colr; if(f->area->floating)
r = f->r;
else
r = f->colr;
switch(dir) { switch(dir) {
case LLEFT: r = rectaddpt(r, Pt(-amount.x, 0)); break; case LLEFT: r = rectaddpt(r, Pt(-amount.x, 0)); break;
case LRIGHT: r = rectaddpt(r, Pt( amount.x, 0)); break; case LRIGHT: r = rectaddpt(r, Pt( amount.x, 0)); break;