e_maximize: remove e_maximize files

e_maximize is deprecated.

Change-Id: Id07deb46191e7cce7cc54f846c50259bf6cab154

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index c3d29d0f1e68c1de612f2a99d02367ca3a8cc41d..8a1ff60e39f1de3bd43b795ad244f89523587117 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -239,7 +239,6 @@ src/bin/windowmgr/e_bindings.c \
 src/bin/windowmgr/e_magnifier.c \
 src/bin/windowmgr/e_layout.c \
 src/bin/windowmgr/e_place.c \
-src/bin/windowmgr/e_maximize.c \
 src/bin/inputmgr/services/e_service_virtual_touch.c \
 src/bin/inputmgr/e_comp_input.c \
 src/bin/inputmgr/e_mouse.c \

diff --git a/src/bin/windowmgr/e_maximize.c b/src/bin/windowmgr/e_maximize.c
deleted file mode 100644 (file)
index 5116612..0000000
--- a/src/bin/windowmgr/e_maximize.c
+++ /dev/null
@@ -1,342 +0,0 @@
-#include "e_maximize_intern.h"
-#include "e_desk_intern.h"
-#include "e_zone_intern.h"
-#include "e_client_intern.h"
-
-typedef struct _E_Maximize_Rect E_Maximize_Rect;
-
-struct _E_Maximize_Rect
-{
-   int x1, yy1, x2, y2;
-};
-
-#define OBSTACLE(_x1, _y1, _x2, _y2)                              \
-  {                                                               \
-     r = E_NEW(E_Maximize_Rect, 1);                               \
-     if (!r) continue;                                            \
-     r->x1 = (_x1); r->yy1 = (_y1); r->x2 = (_x2); r->y2 = (_y2); \
-     rects = eina_list_append(rects, r);                          \
-  }
-
-static void _e_maximize_client_rects_fill(E_Client *ec, Eina_List *list, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir);
-static void _e_maximize_client_rects_fill_both(E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2);
-static void _e_maximize_client_rects_fill_horiz(E_Client *ec, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh);
-static void _e_maximize_client_rects_fill_vert(E_Client *ec, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh);
-
-EINTERN void
-e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir)
-{
-   e_maximize_client_shelf_fill(ec, x1, yy1, x2, y2, dir);
-}
-
-EINTERN void
-e_maximize_client_dock_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2)
-{
-   E_Client *ec2;
-   E_Zone *zone, *ec2_zone;
-   int cx1, cx2, cy1, cy2;
-
-   zone = e_comp_zone_find_by_ec(ec);
-   if (!zone) return;
-
-   cx1 = zone->x;
-   if (x1) cx1 = *x1;
-
-   cy1 = zone->y;
-   if (yy1) cy1 = *yy1;
-
-   cx2 = zone->x + zone->w;
-   if (x2) cx2 = *x2;
-
-   cy2 = zone->y + zone->h;
-   if (y2) cy2 = *y2;
-
-   E_CLIENT_FOREACH(ec2)
-     {
-        enum
-        {
-           NONE,
-           TOP,
-           RIGHT,
-           BOTTOM,
-           LEFT
-        } edge = NONE;
-
-        ec2_zone = e_comp_zone_find_by_ec(ec2);
-        if (ec2_zone == NULL) continue;
-
-        if ((ec2_zone != zone) ||
-            (ec2 == ec) ||
-            (ec2->netwm.type != E_WINDOW_TYPE_DOCK))
-          continue;
-
-        if (((ec2->x == ec2_zone->x) || ((ec2->x + ec2->w) == (ec2_zone->x + ec2_zone->w))) &&
-            ((ec2->y == ec2_zone->y) || ((ec2->x + ec2->h) == (ec2_zone->x + ec2_zone->h))))
-          {
-             /* corner */
-             if (ec2->w > ec2->h)
-               {
-                  if (ec2->y == ec2_zone->y)
-                    edge = TOP;
-                  else if ((ec2->y + ec2->h) == (ec2_zone->y + ec2_zone->h))
-                    edge = BOTTOM;
-               }
-             else
-               {
-                  if ((ec2->x + ec2->w) == (ec2_zone->x + ec2_zone->w))
-                    edge = RIGHT;
-                  else if (ec2->x == ec2_zone->x)
-                    edge = LEFT;
-               }
-          }
-        else
-          {
-             if (ec2->y == ec2_zone->y)
-               edge = TOP;
-             else if ((ec2->y + ec2->h) == (ec2_zone->y + ec2_zone->h))
-               edge = BOTTOM;
-             else if (ec2->x == ec2_zone->x)
-               edge = LEFT;
-             else if ((ec2->x + ec2->w) == (ec2_zone->x + ec2_zone->w))
-               edge = RIGHT;
-          }
-
-        switch (edge)
-          {
-           case TOP:
-             if ((ec2->y + ec2->h) > cy1)
-               cy1 = (ec2->y + ec2->h);
-             break;
-
-           case RIGHT:
-             if (ec2->x < cx2)
-               cx2 = ec2->x;
-             break;
-
-           case BOTTOM:
-             if (ec2->y < cy2)
-               cy2 = ec2->y;
-             break;
-
-           case LEFT:
-             if ((ec2->x + ec2->w) > cx1)
-               cx1 = (ec2->x + ec2->w);
-             break;
-
-           case NONE:
-             printf("Crazy people. Dock isn't at the edge.\n");
-             break;
-          }
-     }
-
-   if (x1) *x1 = cx1;
-   if (yy1) *yy1 = cy1;
-   if (x2) *x2 = cx2;
-   if (y2) *y2 = cy2;
-}
-
-/* TODO: remove this function */
-EINTERN void
-e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir)
-{
-   ;
-}
-
-EINTERN void
-e_maximize_client_client_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir)
-{
-   Eina_List *rects = NULL;
-   E_Maximize_Rect *r;
-   E_Client *ec2;
-   E_Desk *desk;
-
-   desk = e_comp_desk_find_by_ec(ec);
-   if (!desk) return;
-
-   E_CLIENT_FOREACH(ec2)
-     {
-        if (!e_zone_has_ec(desk->zone, ec2)) continue;
-        if ((ec == ec2) || ((!e_desk_has_ec(desk, ec2)) && !ec2->sticky) || (ec2->iconic))
-          continue;
-        OBSTACLE(ec2->x, ec2->y, ec2->x + ec2->w, ec2->y + ec2->h);
-     }
-   if (rects)
-     {
-        _e_maximize_client_rects_fill(ec, rects, x1, yy1, x2, y2, dir);
-        E_FREE_LIST(rects, free);
-     }
-}
-
-static void
-_e_maximize_client_rects_fill(E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir)
-{
-   if ((dir & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
-     {
-        _e_maximize_client_rects_fill_both(ec, rects, x1, yy1, x2, y2);
-     }
-   else
-     {
-        int bx, by, bw, bh;
-        E_Zone *zone;
-
-        zone = e_comp_zone_find_by_ec(ec);
-        if (!zone) return;
-
-        bx = E_CLAMP(ec->x, zone->x, zone->x + zone->w);
-        by = E_CLAMP(ec->y, zone->y, zone->y + zone->h);
-        bw = E_CLAMP(ec->w, 0, zone->w);
-        bh = E_CLAMP(ec->h, 0, zone->h);
-
-        if ((dir & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
-          _e_maximize_client_rects_fill_horiz(ec, rects, x1, x2, &bx, &by, &bw, &bh);
-        else if (((dir & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) ||
-                 ((dir & E_MAXIMIZE_LEFT) == E_MAXIMIZE_LEFT) ||
-                 ((dir & E_MAXIMIZE_RIGHT) == E_MAXIMIZE_RIGHT))
-          _e_maximize_client_rects_fill_vert(ec, rects, yy1, y2, &bx, &by, &bw, &bh);
-     }
-}
-
-static void
-_e_maximize_client_rects_fill_both(E_Client *ec, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2)
-{
-   int hx1, hy1, hx2, hy2;
-   int vx1, vy1, vx2, vy2;
-   int bx, by, bw, bh;
-   E_Zone *zone;
-
-   zone = e_comp_zone_find_by_ec(ec);
-   if (!zone) return;
-
-   hx1 = vx1 = zone->x;
-   if (x1) hx1 = vx1 = *x1;
-
-   hy1 = vy1 = zone->y;
-   if (yy1) hy1 = vy1 = *yy1;
-
-   hx2 = vx2 = zone->x + zone->w;
-   if (x2) hx2 = vx2 = *x2;
-
-   hy2 = vy2 = zone->y + zone->h;
-   if (y2) hy2 = vy2 = *y2;
-
-   /* Init working values, try maximizing horizontally first */
-   bx = ec->saved.x ?: ec->x;
-   by = ec->saved.y ?: ec->y;
-   bw = ec->saved.w ?: ec->w;
-   bh = ec->saved.h ?: ec->h;
-   _e_maximize_client_rects_fill_horiz(ec, rects, &hx1, &hx2, &bx, &by, &bw, &bh);
-   _e_maximize_client_rects_fill_vert(ec, rects, &hy1, &hy2, &bx, &by, &bw, &bh);
-
-   /* Reset working values, try maximizing vertically first */
-   bx = ec->saved.x ?: ec->x;
-   by = ec->saved.y ?: ec->y;
-   bw = ec->saved.w ?: ec->w;
-   bh = ec->saved.h ?: ec->h;
-   _e_maximize_client_rects_fill_vert(ec, rects, &vy1, &vy2, &bx, &by, &bw, &bh);
-   _e_maximize_client_rects_fill_horiz(ec, rects, &vx1, &vx2, &bx, &by, &bw, &bh);
-
-   /* Use the result set that gives the largest volume */
-   if (((hx2 - hx1) * (hy2 - hy1)) > ((vx2 - vx1) * (vy2 - vy1)))
-     {
-        if (x1) *x1 = hx1;
-        if (yy1) *yy1 = hy1;
-        if (x2) *x2 = hx2;
-        if (y2) *y2 = hy2;
-     }
-   else
-     {
-        if (x1) *x1 = vx1;
-        if (yy1) *yy1 = vy1;
-        if (x2) *x2 = vx2;
-        if (y2) *y2 = vy2;
-     }
-}
-
-static void
-_e_maximize_client_rects_fill_horiz(E_Client *ec, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh)
-{
-   Eina_List *l;
-   E_Maximize_Rect *rect;
-   int cx1, cx2;
-   E_Zone *zone;
-
-   zone = e_comp_zone_find_by_ec(ec);
-   if (!zone) return;
-
-   cx1 = zone->x;
-   if (x1) cx1 = *x1;
-
-   cx2 = zone->x + zone->w;
-   if (x2) cx2 = *x2;
-
-   /* Expand left */
-   EINA_LIST_FOREACH(rects, l, rect)
-     {
-        if ((rect->x2 > cx1) && (rect->x2 <= *bx) &&
-            E_INTERSECTS(0, rect->yy1, zone->w, (rect->y2 - rect->yy1), 0, *by, zone->w, *bh))
-          {
-             cx1 = rect->x2;
-          }
-     }
-   *bw += (*bx - cx1);
-   *bx = cx1;
-
-   /* Expand right */
-   EINA_LIST_FOREACH(rects, l, rect)
-     {
-        if ((rect->x1 < cx2) && (rect->x1 >= (*bx + *bw)) &&
-            E_INTERSECTS(0, rect->yy1, zone->w, (rect->y2 - rect->yy1), 0, *by, zone->w, *bh))
-          {
-             cx2 = rect->x1;
-          }
-     }
-   *bw = (cx2 - cx1);
-
-   if (x1) *x1 = cx1;
-   if (x2) *x2 = cx2;
-}
-
-static void
-_e_maximize_client_rects_fill_vert(E_Client *ec, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh)
-{
-   Eina_List *l;
-   E_Maximize_Rect *rect;
-   int cy1, cy2;
-   E_Zone *zone;
-
-   zone = e_comp_zone_find_by_ec(ec);
-   if (!zone) return;
-
-   cy1 = zone->y;
-   if (yy1) cy1 = *yy1;
-
-   cy2 = zone->y + zone->h;
-   if (y2) cy2 = *y2;
-
-   /* Expand up */
-   EINA_LIST_FOREACH(rects, l, rect)
-     {
-        if ((rect->y2 > cy1) && ((rect->yy1 <= *by) || (rect->y2 <= *by)) &&
-            E_INTERSECTS(rect->x1, 0, (rect->x2 - rect->x1), zone->h, *bx, 0, *bw, zone->h))
-          {
-             cy1 = rect->y2;
-          }
-     }
-   *bh += (*by - cy1);
-   *by = cy1;
-
-   /* Expand down */
-   EINA_LIST_FOREACH(rects, l, rect)
-     {
-        if ((rect->yy1 < cy2) && (rect->yy1 >= (*by + *bh)) &&
-            E_INTERSECTS(rect->x1, 0, (rect->x2 - rect->x1), zone->h, *bx, 0, *bw, zone->h))
-          {
-             cy2 = rect->yy1;
-          }
-     }
-   *bh = (cy2 - cy1);
-
-   if (yy1) *yy1 = cy1;
-   if (y2) *y2 = cy2;
-}
-

diff --git a/src/bin/windowmgr/e_maximize_intern.h b/src/bin/windowmgr/e_maximize_intern.h
deleted file mode 100644 (file)
index 3c48ab3..0000000
--- a/src/bin/windowmgr/e_maximize_intern.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef E_MAXIMIZE_INTERN_H
-#define E_MAXIMIZE_INTERN_H
-
-#include "e_intern.h"
-
-EINTERN void e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
-EINTERN void e_maximize_client_dock_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2);
-EINTERN void e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
-EINTERN void e_maximize_client_client_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
-
-#endif

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index 959f0233628d29eb82ce74b0ad8a6623addff7ce..3e85799ec8ab409962db57f7806062f515a88199 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -5,7 +5,6 @@
 #include "e_comp_canvas_intern.h"
 #include "e_comp_wl_rsm_intern.h"
 #include "e_policy_intern.h"
-#include "e_maximize_intern.h"
 #include "e_policy_visibility_intern.h"
 #include "e_input_backend_intern.h"
 #include "e_comp_input_intern.h"
@@ -1339,7 +1338,6 @@ _e_desk_area_ec_maximize(E_Desk_Area *eda, E_Client *ec, E_Maximize max)
                 yy1 = eda->y;
                 x2 = eda->x + eda->w;
                 y2 = eda->y + eda->h;
-                e_maximize_client_shelf_fill(ec, &x1, &yy1, &x2, &y2, max);
                 zx = x1, zy = yy1;
                 zw = x2 - x1;
                 zh = y2 - yy1;