e_service_taskbar: support auto_placement request

[platform/upstream/enlightenment.git] / src / bin / services / e_service_taskbar.c

diff --git a/src/bin/services/e_service_taskbar.c b/src/bin/services/e_service_taskbar.c
index bfa4516..a42dd48 100644 (file)
--- a/src/bin/services/e_service_taskbar.c
+++ b/src/bin/services/e_service_taskbar.c
@@ -4,6 +4,8 @@
 #include <wayland-server.h>
 #include <tzsh_server.h>
 
+static void _e_service_taskbar_update(E_Service_Taskbar *taskbar_service);
+
 /* private data for taskbar */
 static E_Service_Taskbar   *_taskbar_service = NULL;
 
@@ -57,6 +59,7 @@ _taskbar_cb_client_zone_set(void *data, int type EINA_UNUSED, void *event)
          taskbar_service->ec, taskbar_service, taskbar_service->zone, ev->zone);
 
    taskbar_service->zone = ev->zone;
+   _e_service_taskbar_update(taskbar_service);
 
 end:
    return ECORE_CALLBACK_PASS_ON;
@@ -125,7 +128,8 @@ _e_service_taskbar_update(E_Service_Taskbar *taskbar_service)
    Eina_Bool vertical;
    E_Client *ec;
 
-   if (!taskbar_service) return;
+   if (!taskbar_service->ec) return;
+   if (!taskbar_service->zone) return;
 
    ec = taskbar_service->ec;
 
@@ -154,7 +158,9 @@ _e_service_taskbar_update(E_Service_Taskbar *taskbar_service)
         vertical = EINA_TRUE;
      }
 
-   e_client_util_move_without_frame(ec, taskbar_service->x, taskbar_service->y);
+   if (taskbar_service->auto_placement == EINA_TRUE)
+     e_client_util_move_without_frame(ec, taskbar_service->x, taskbar_service->y);
+
    e_zone_obstacle_update(taskbar_service->zone, ec,
                           &(Eina_Rectangle){taskbar_service->x, taskbar_service->y, taskbar_service->w, taskbar_service->h},
                           vertical);
@@ -210,3 +216,26 @@ e_service_taskbar_size_set(E_Client *ec, unsigned int w, unsigned int h)
    _e_service_taskbar_update(_taskbar_service);
    return EINA_TRUE;
 }
+
+EINTERN Eina_Bool
+e_service_taskbar_auto_placement_set(E_Client *ec, Eina_Bool set)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(_taskbar_service, EINA_FALSE);
+
+   ELOGF("TASKBAR", "Set Auto Placement to %d", ec, set);
+
+   if (ec != _taskbar_service->ec)
+     {
+        ELOGF("TASKBAR", "ERROR... Taskbar ec is not matched...regisered(%p)..", ec, _taskbar_service->ec);
+        return EINA_FALSE;
+     }
+
+   if (set == _taskbar_service->auto_placement)
+     return EINA_TRUE;
+
+   _taskbar_service->auto_placement = set;
+   _e_service_taskbar_update(_taskbar_service);
+
+   return EINA_TRUE;
+}