e_desk: remove the flip code

The flipping desk and zone does not used anymore.
Those code are deprecated.

Change-Id: If15c3c593fb1a0f5f6c2350a9f87cb9315e0ba45

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index f75c210e8815203b63d9b8aedb69b8a8393071e6..62bf82ddde889e475438779b826ed15aade7ec9c 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -102,9 +102,6 @@ EVAS_SMART_SUBCLASS_NEW(E_DESK_SMART_OBJ_TYPE, _e_desk,
                         Evas_Smart_Class, Evas_Smart_Class,
                         evas_object_smart_clipped_class_get, NULL)
 
-static E_Desk_Flip_Cb _e_desk_flip_cb = NULL;
-static void *_e_desk_flip_data = NULL;
-
 EINTERN int E_EVENT_DESK_SHOW = 0;
 EINTERN int E_EVENT_DESK_BEFORE_SHOW = 0;
 EINTERN int E_EVENT_DESK_AFTER_SHOW = 0;
@@ -632,19 +629,6 @@ e_desk_prev(E_Zone *zone)
    e_desk_show(e_desk_at_xy_get(zone, x, y));
 }
 
-EINTERN void
-e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data)
-{
-   _e_desk_flip_cb = cb;
-   _e_desk_flip_data = (void*)data;
-}
-
-EINTERN void
-e_desk_flip_end(E_Desk *desk)
-{
-   _e_desk_event_simple_add(desk, E_EVENT_DESK_AFTER_SHOW);
-}
-
 EINTERN unsigned int
 e_desks_count(void)
 {
@@ -1553,7 +1537,6 @@ _e_desk_show_end(void *data, Evas_Object *obj EINA_UNUSED, const char *emission
    if (!ec->visible) evas_object_show(ec->frame);
 
    if (ec_desk != e_desk_current_get(ec_zone)) return;
-   if (ec_desk && !ec_desk->animate_count) e_desk_flip_end(ec_desk);
 }
 
 static void
@@ -1602,7 +1585,6 @@ _e_desk_show_begin(E_Desk *desk, int dx, int dy)
         e_client_comp_hidden_set(ec, ec->hidden || ec->shaded);
         evas_object_show(ec->frame);
      }
-   e_desk_flip_end(desk);
 }
 
 static void

diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 406979e92765ace9aafa359bbdc05bdbcbf5d2ba..edd7ce9b7d56b0efb24eb3476b9f1dd45682871b 100644 (file)
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -12,8 +12,6 @@ typedef struct _E_Event_Desk E_Event_Desk_Zoom_Set;
 typedef struct _E_Event_Desk E_Event_Desk_Zoom_Unset;
 typedef struct _E_Event_Desk_Geometry_Change E_Event_Desk_Geometry_Change;
 
-typedef void (*E_Desk_Flip_Cb)(void *data, E_Desk *desk, int dx, int dy, Eina_Bool show);
-
 typedef enum _E_Desk_Area_Layer
 {
    E_DESK_AREA_LAYER_BACKGROUND          = 0,     //E_LAYER_DESKTOP
@@ -57,13 +55,6 @@ struct _E_Desk_Hook
    unsigned char     delete_me : 1;
 };
 
-typedef enum
-{
-   E_DESKFLIP_ANIMATION_MODE_OFF,
-   E_DESKFLIP_ANIMATION_MODE_PANE,
-   E_DESKFLIP_ANIMATION_MODE_ZOOM
-} E_Deskflip_Animation_Mode;
-
 struct _E_Desk
 {
    E_Object             e_obj_inherit;
@@ -129,9 +120,6 @@ EINTERN void         e_desk_row_remove(E_Zone *zone);
 EINTERN void         e_desk_col_add(E_Zone *zone);
 EINTERN void         e_desk_col_remove(E_Zone *zone);
 
-EINTERN void         e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data);
-EINTERN void         e_desk_flip_end(E_Desk *desk);
-
 EINTERN unsigned int e_desks_count(void);
 
 E_API void         e_desk_geometry_set(E_Desk *desk, int x, int y, int w, int h);

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 9d3f974c4a344f194b6ef6a8f11a354b219a446c..5226f339b8813cae661b3dba76165e603513940f 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -158,12 +158,6 @@ e_zone_shutdown(void)
    return 1;
 }
 
-E_API void
-e_zone_all_edge_flip_eval(void)
-{
-   // TODO: deprecated.
-}
-
 static void
 _e_zone_client_maximize(E_Zone *zone, E_Desk *desk, E_Client *ec, E_Maximize max)
 {
@@ -1224,8 +1218,6 @@ e_zone_new(int num, int id, int x, int y, int w, int h)
 
    e_object_del_attach_func_set(E_OBJECT(zone), _e_zone_object_del_attach);
 
-   e_zone_all_edge_flip_eval();
-
    // CLIENT HOOK Handlers
    E_LIST_HOOK_APPEND(zone->ec_hooks, E_CLIENT_HOOK_NEW_CLIENT_POST, _e_zone_cb_hook_client_new_client_post, zone);
 
@@ -1579,69 +1571,6 @@ e_zone_desk_count_get(E_Zone *zone,
    if (y_count) *y_count = zone->desk_y_count;
 }
 
-EINTERN void
-e_zone_desk_flip_by(E_Zone *zone,
-                    int dx,
-                    int dy)
-{
-   E_OBJECT_CHECK(zone);
-   E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-
-   dx = zone->desk_x_current + dx;
-   dy = zone->desk_y_current + dy;
-   e_zone_desk_flip_to(zone, dx, dy);
-}
-
-EINTERN void
-e_zone_desk_flip_to(E_Zone *zone,
-                    int x,
-                    int y)
-{
-   E_Desk *desk;
-
-   E_OBJECT_CHECK(zone);
-   E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-
-   if (x < 0) x = 0;
-   else if (x >= zone->desk_x_count)
-     x = zone->desk_x_count - 1;
-   if (y < 0) y = 0;
-   else if (y >= zone->desk_y_count)
-     y = zone->desk_y_count - 1;
-
-   desk = e_desk_at_xy_get(zone, x, y);
-   if (!desk) return;
-   e_desk_show(desk);
-}
-
-EINTERN void
-e_zone_desk_linear_flip_by(E_Zone *zone,
-                           int dx)
-{
-   E_OBJECT_CHECK(zone);
-   E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-
-   dx = zone->desk_x_current +
-     (zone->desk_y_current * zone->desk_x_count) + dx;
-   if (((dx < 0) || (dx >= zone->desk_x_count * zone->desk_y_count))) return;
-   dx = dx % (zone->desk_x_count * zone->desk_y_count);
-   e_zone_desk_linear_flip_to(zone, dx);
-}
-
-EINTERN void
-e_zone_desk_linear_flip_to(E_Zone *zone,
-                           int x)
-{
-   int y;
-
-   E_OBJECT_CHECK(zone);
-   E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-
-   y = x / zone->desk_x_count;
-   x = x - (y * zone->desk_x_count);
-   e_zone_desk_flip_to(zone, x, y);
-}
-
 EINTERN Eina_Bool
 e_zone_obstacle_add(E_Zone *zone, E_Client *ec, Eina_Rectangle *geom, Eina_Bool vertical)
 {

diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index dd216920766216f484b867c172e255339d41904a..b5fda7646b66496b19ca9b6dba546212803e204a 100644 (file)
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -193,10 +193,6 @@ EINTERN E_Zone *e_zone_get_by_position(int x, int y);
 EINTERN void      e_zone_bg_reconfigure(E_Zone *zone);
 EINTERN void      e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count);
 EINTERN void      e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count);
-EINTERN void      e_zone_desk_flip_by(E_Zone *zone, int dx, int dy);
-EINTERN void      e_zone_desk_flip_to(E_Zone *zone, int x, int y);
-EINTERN void      e_zone_desk_linear_flip_by(E_Zone *zone, int dx);
-EINTERN void      e_zone_desk_linear_flip_to(E_Zone *zone, int x);
 
 EINTERN Eina_Bool e_zone_obstacle_add(E_Zone *zone, E_Client *ec, Eina_Rectangle *geom, Eina_Bool vertical);
 EINTERN Eina_Bool e_zone_obstacle_update(E_Zone *zone, E_Client *ec, Eina_Rectangle *geom, Eina_Bool vertical);