ref: 3cd7cb78349a24bb04dcfea9a2566cfdea0518ab
parent: 37e3db239a67cf01fb3c7b351121bceafc961c24
author: cinap_lenrek <cinap_lenrek@gmx.de>
date: Thu Aug 16 02:32:34 EDT 2012
rio: add some tolerance when declaring windows covered
--- a/sys/src/cmd/rio/rio.c
+++ b/sys/src/cmd/rio/rio.c
@@ -656,12 +656,13 @@
}
static int
-wcovered(Window *w, Rectangle r)
+wcovered(Window *w, Rectangle r, int i)
{Window *t;
- int i;
- for(i=0; i<nwindow; i++){+ if(Dx(r) < font->height || Dy(r) < font->height)
+ return 1;
+ for(; i<nwindow; i++){t = window[i];
if(t == w || t->topped <= w->topped || t->deleted)
continue;
@@ -668,16 +669,16 @@
if(Dx(t->screenr) == 0 || Dy(t->screenr) == 0 || rectXrect(r, t->screenr) == 0)
continue;
if(r.min.y < t->screenr.min.y)
- if(!wcovered(w, Rect(r.min.x, r.min.y, r.max.x, t->screenr.min.y)))
+ if(!wcovered(w, Rect(r.min.x, r.min.y, r.max.x, t->screenr.min.y), i))
return 0;
if(r.min.x < t->screenr.min.x)
- if(!wcovered(w, Rect(r.min.x, r.min.y, t->screenr.min.x, r.max.y)))
+ if(!wcovered(w, Rect(r.min.x, r.min.y, t->screenr.min.x, r.max.y), i))
return 0;
if(r.max.y > t->screenr.max.y)
- if(!wcovered(w, Rect(r.min.x, t->screenr.max.y, r.max.x, r.max.y)))
+ if(!wcovered(w, Rect(r.min.x, t->screenr.max.y, r.max.x, r.max.y), i))
return 0;
if(r.max.x > t->screenr.max.x)
- if(!wcovered(w, Rect(t->screenr.max.x, r.min.y, r.max.x, r.max.y)))
+ if(!wcovered(w, Rect(t->screenr.max.x, r.min.y, r.max.x, r.max.y), i))
return 0;
return 1;
}
@@ -696,7 +697,7 @@
break;
if(i < n || window[i]->deleted)
continue;
- if(wcovered(window[i], window[i]->screenr)){+ if(wcovered(window[i], window[i]->screenr, 0)){hidden[n++] = window[i];
if(n >= nelem(hidden))
break;
--
⑨