rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix smart placement! 

SVN revision: 26871
This commit is contained in:
Carsten Haitzler 2006-10-30 13:05:03 +00:00
parent b0c5dca69f
commit 63390c973c
2 changed files with 119 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -8,7 +8,6 @@ Some of the things (in very short form) that need to be done to E17...
BUGS / FIXES BUGS / FIXES
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
* BUG: smart placement seems to screw up if a shelf is at the top of the screen
* BUG: e17 screen res diaolg doesnt work under xephyr - why? * BUG: e17 screen res diaolg doesnt work under xephyr - why?
* BUG: xdaliclock -transparent doesnt use shaped border (not handling shape * BUG: xdaliclock -transparent doesnt use shaped border (not handling shape
change later) change later)

190
src/bin/e_place.c
View File

@ -115,6 +115,7 @@ _e_place_coverage_shelf_add(E_Zone *zone, int ar, int x, int y, int w, int h)
int x2, y2, w2, h2; int x2, y2, w2, h2;
int iw, ih; int iw, ih;
int x0, x00, y0, y00; int x0, x00, y0, y00;
int tmp;
for (l = e_shelf_list(); l; l = l->next) for (l = e_shelf_list(); l; l = l->next)
{ {
@ -134,7 +135,12 @@ _e_place_coverage_shelf_add(E_Zone *zone, int ar, int x, int y, int w, int h)
if ((y2 + h2) < (y + h)) y00 = (y2 + h2); if ((y2 + h2) < (y + h)) y00 = (y2 + h2);
iw = x00 - x0; iw = x00 - x0;
ih = y00 - y0; ih = y00 - y0;
ar += (iw * ih) * 100; /* 100 == 100 times more unlikely for overlap than a normal window */ tmp = (iw * ih);
/* 100 times the weight for avoidance */
if (tmp > (0x7ffffff / 100)) tmp = 0x7fffffff;
else tmp *= 100;
if ((0x7fffffff - ar) <= tmp) ar = 0x7fffffff;
else ar += tmp;
} }
} }
return ar; return ar;
@ -171,6 +177,8 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
a_h = 2; a_h = 2;
a_x = E_NEW(int, 2); a_x = E_NEW(int, 2);
a_y = E_NEW(int, 2); a_y = E_NEW(int, 2);
a_alloc_w = 2;
a_alloc_h = 2;
x -= zone->x; x -= zone->x;
y -= zone->y; y -= zone->y;
@ -179,76 +187,94 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
u_x = calloc(zw + 1, sizeof(char)); u_x = calloc(zw + 1, sizeof(char));
u_y = calloc(zh + 1, sizeof(char)); u_y = calloc(zh + 1, sizeof(char));
a_x[0] = 0; a_x[0] = 0;
a_x[1] = zw; a_x[1] = zw;
a_y[0] = 0; a_y[0] = 0;
a_y[1] = zh; a_y[1] = zh;
if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_ANTIGADGET) u_x[0] = 1;
u_x[zw] = 1;
u_y[0] = 1;
u_y[zh] = 1;
if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)
{ {
Evas_List *l; Evas_List *l;
for (l = e_shelf_list(); l; l = l->next) for (l = e_shelf_list(); l; l = l->next)
{ {
E_Shelf *es; E_Shelf *es;
int bx, by, bw, bh;
es = l->data; es = l->data;
if (es->zone == zone) printf("%p != %p\n", es->zone, zone);
{ if (es->zone != zone) continue;
int bx, by, bw, bh;
bx = es->x; bx = es->x;
by = es->y; by = es->y;
bw = es->w; bw = es->w;
bh = es->h; bh = es->h;
if (E_INTERSECTS(bx, by, bw, bh, 0, 0, zw, zh)) printf("SH: %i %i %ix%i\n", bx, by, bw, bh);
if (!E_INTERSECTS(bx, by, bw, bh, 0, 0, zw, zh)) continue;
if (bx < 0)
{
bw += bx;
bx = 0;
}
if ((bx + bw) > zw) bw = zw - bx;
if (bx >= zw) continue;
if (by < 0)
{
bh += by;
by = 0;
}
if ((by + bh) > zh) bh = zh - by;
if (by >= zh) continue;
if (!u_x[bx])
{
a_w++;
if (a_w > a_alloc_w)
{ {
if ((bx > 0) && (bx <= zw) && (!u_x[bx])) a_alloc_w += 32;
{ E_REALLOC(a_x, int, a_alloc_w);
a_w++;
if (a_w > a_alloc_w)
{
a_alloc_w += 32;
E_REALLOC(a_x, int, a_alloc_w);
}
a_x[a_w - 1] = bx;
u_x[bx] = 1;
}
if (((bx + bw) > 0) && ((bx + bw) <= zw) && (!u_x[bx + bw]))
{
a_w++;
if (a_w > a_alloc_w)
{
a_alloc_w += 32;
E_REALLOC(a_x, int, a_alloc_w);
}
a_x[a_w - 1] = bx + bw;
u_x[bx + bw] = 1;
}
if ((by > 0) && (by <= zh) && (!u_y[by]))
{
a_h++;
if (a_h > a_alloc_h)
{
a_alloc_h += 32;
E_REALLOC(a_y, int, a_alloc_h);
}
a_y[a_h - 1] = by;
u_y[by] = 1;
}
if (((by + bh) > 0) && ((by + bh) <= zh) && (!u_y[by + bh]))
{
a_h++;
if (a_h > a_alloc_h)
{
a_alloc_h += 32;
E_REALLOC(a_y, int, a_alloc_h);
}
a_y[a_h - 1] = by + bh;
u_y[by + bh] = 1;
}
} }
a_x[a_w - 1] = bx;
u_x[bx] = 1;
}
if (!u_x[bx + bw])
{
a_w++;
if (a_w > a_alloc_w)
{
a_alloc_w += 32;
E_REALLOC(a_x, int, a_alloc_w);
}
a_x[a_w - 1] = bx + bw;
u_x[bx + bw] = 1;
}
if (!u_y[by])
{
a_h++;
if (a_h > a_alloc_h)
{
a_alloc_h += 32;
E_REALLOC(a_y, int, a_alloc_h);
}
a_y[a_h - 1] = by;
u_y[by] = 1;
}
if (!u_y[by + bh])
{
a_h++;
if (a_h > a_alloc_h)
{
a_alloc_h += 32;
E_REALLOC(a_y, int, a_alloc_h);
}
a_y[a_h - 1] = by + bh;
u_y[by + bh] = 1;
} }
} }
} }
@ -277,7 +303,21 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
if (E_INTERSECTS(bx, by, bw, bh, 0, 0, zw, zh)) if (E_INTERSECTS(bx, by, bw, bh, 0, 0, zw, zh))
{ {
if ((bx > 0) && (bx <= zw) && (!u_x[bx])) if (bx < 0)
{
bw += bx;
bx = 0;
}
if ((bx + bw) > zw) bw = zw - bx;
if (bx >= zw) continue;
if (by < 0)
{
bh += by;
by = 0;
}
if ((by + bh) > zh) bh = zh - by;
if (by >= zh) continue;
if (!u_x[bx])
{ {
a_w++; a_w++;
if (a_w > a_alloc_w) if (a_w > a_alloc_w)
@ -288,7 +328,7 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
a_x[a_w - 1] = bx; a_x[a_w - 1] = bx;
u_x[bx] = 1; u_x[bx] = 1;
} }
if (((bx + bw) > 0) && ((bx + bw) <= zw) && (!u_x[bx + bw])) if (!u_x[bx + bw])
{ {
a_w++; a_w++;
if (a_w > a_alloc_w) if (a_w > a_alloc_w)
@ -299,7 +339,7 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
a_x[a_w - 1] = bx + bw; a_x[a_w - 1] = bx + bw;
u_x[bx + bw] = 1; u_x[bx + bw] = 1;
} }
if ((by > 0) && (by <= zh) && (!u_y[by])) if (!u_y[by])
{ {
a_h++; a_h++;
if (a_h > a_alloc_h) if (a_h > a_alloc_h)
@ -310,7 +350,7 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
a_y[a_h - 1] = by; a_y[a_h - 1] = by;
u_y[by] = 1; u_y[by] = 1;
} }
if (((by + bh) > 0) && ((by + bh) <= zh) && (!u_y[by + bh])) if (!u_y[by + bh])
{ {
a_h++; a_h++;
if (a_h > a_alloc_h) if (a_h > a_alloc_h)
@ -333,6 +373,10 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
int i, j; int i, j;
int area = 0x7fffffff; int area = 0x7fffffff;
for (i = 0; i < a_w; i++)
printf("X %i\n", a_x[i]);
for (i = 0; i < a_h; i++)
printf("Y %i\n", a_y[i]);
for (j = 0; j < a_h - 1; j++) for (j = 0; j < a_h - 1; j++)
{ {
for (i = 0; i < a_w - 1; i++) for (i = 0; i < a_w - 1; i++)
@ -345,9 +389,10 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
ar = _e_place_coverage_border_add(zone, skiplist, ar, ar = _e_place_coverage_border_add(zone, skiplist, ar,
a_x[i], a_y[j], a_x[i], a_y[j],
w, h); w, h);
ar = _e_place_coverage_shelf_add(zone, ar, if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)
a_x[i], a_y[j], ar = _e_place_coverage_shelf_add(zone, ar,
w, h); a_x[i], a_y[j],
w, h);
if (ar < area) if (ar < area)
{ {
area = ar; area = ar;
@ -363,9 +408,10 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
ar = _e_place_coverage_border_add(zone, skiplist, ar, ar = _e_place_coverage_border_add(zone, skiplist, ar,
a_x[i + 1] - w, a_y[j], a_x[i + 1] - w, a_y[j],
w, h); w, h);
ar = _e_place_coverage_shelf_add(zone, ar, if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)
a_x[i + 1] - w, a_y[j], ar = _e_place_coverage_shelf_add(zone, ar,
w, h); a_x[i + 1] - w, a_y[j],
w, h);
if (ar < area) if (ar < area)
{ {
area = ar; area = ar;
@ -381,9 +427,10 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
ar = _e_place_coverage_border_add(zone, skiplist, ar, ar = _e_place_coverage_border_add(zone, skiplist, ar,
a_x[i + 1] - w, a_y[j + 1] - h, a_x[i + 1] - w, a_y[j + 1] - h,
w, h); w, h);
ar = _e_place_coverage_shelf_add(zone, ar, if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)
a_x[i + 1] - w, a_y[j + 1] - h, ar = _e_place_coverage_shelf_add(zone, ar,
w, h); a_x[i + 1] - w, a_y[j + 1] - h,
w, h);
if (ar < area) if (ar < area)
{ {
area = ar; area = ar;
@ -399,9 +446,10 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
ar = _e_place_coverage_border_add(zone, skiplist, ar, ar = _e_place_coverage_border_add(zone, skiplist, ar,
a_x[i], a_y[j + 1] - h, a_x[i], a_y[j + 1] - h,
w, h); w, h);
ar = _e_place_coverage_shelf_add(zone, ar, if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)
a_x[i], a_y[j + 1] - h, ar = _e_place_coverage_shelf_add(zone, ar,
w, h); a_x[i], a_y[j + 1] - h,
w, h);
if (ar < area) if (ar < area)
{ {
area = ar; area = ar;