e_plane: added getters/setters regarding hw layer

Change-Id: If4754098b0fa96d89850acf263cf32a747eb8cda

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 09a6b72..0f2f5e1 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -328,7 +328,9 @@ e_comp_screen_init_outputs(void)
              for (j = 0; j < eout->plane_count; j++)
                {
                   printf("COMP TDM: added plane %i\n", j);
-                  e_plane_new(eout);
+                  Eina_Bool pri = EINA_FALSE;
+                  if (j == 0) pri = EINA_TRUE;
+                  e_plane_new(eout, j, pri);
                }
 
              r->outputs = eina_list_append(r->outputs, eout);

diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index d0ad81b..1526a8b 100644 (file)
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -4,15 +4,16 @@
  * E_plane represents hw overlay and a surface is assigned to disable composition
  * Each Output always has dedicated canvas and a zone
  */
-
-E_API int E_EVENT_PLANE_ADD = 0;
-E_API int E_EVENT_PLANE_DEL = 0;
-
 ///////////////////////////////////////////
+static const char *_e_plane_ec_last_err = NULL;
 
 /* local subsystem functions */
 static void
-_e_plane_reconfigure_clients(E_Plane *plane, int dx, int dy, int dw, int dh)
+_e_plane_reconfigure_clients(E_Plane *plane,
+                             int dx,
+                             int dy,
+                             int dw,
+                             int dh)
 {
    EINA_SAFETY_ON_NULL_RETURN(plane->ec);
 
@@ -20,23 +21,21 @@ _e_plane_reconfigure_clients(E_Plane *plane, int dx, int dy, int dw, int dh)
 }
 
 ///////////////////////////////////////////
-/*
 EINTERN int
 e_plane_init(void)
 {
-   E_EVENT_PLANE_ADD = ecore_event_type_new();
-   E_EVENT_PLANE_DEL = ecore_event_type_new();
-
+   _e_plane_ec_last_err = eina_stringshare_add("UNKNOWN");
    return 1;
 }
 
 EINTERN int
 e_plane_shutdown(void)
 {
+   eina_stringshare_del(_e_plane_ec_last_err);
    return 1;
 }
-*/
-E_API void
+
+EINTERN void
 e_plane_free(E_Plane *plane)
 {
    //printf("@@@@@@@@@@ e_plane_free: %i %i | %i %i %ix%i = %p\n", zone->num, zone->id, zone->x, zone->y, zone->w, zone->h, zone);
@@ -47,8 +46,10 @@ e_plane_free(E_Plane *plane)
    free(plane);
 }
 
-E_API E_Plane *
-e_plane_new(E_Output *eout)
+EINTERN E_Plane *
+e_plane_new(E_Output *eout,
+            int zpos,
+            Eina_Bool is_pri)
 {
    E_Plane *plane;
 
@@ -56,10 +57,8 @@ e_plane_new(E_Output *eout)
 
    if (!eout) return NULL;
 
-   //plane = E_OBJECT_ALLOC(E_Plane, E_PLANE_TYPE, _e_plane_free);
    plane = E_NEW(E_Plane, 1);
-   if (!plane) return NULL;
-   printf("%s 2", __FUNCTION__);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, NULL);
 
    snprintf(name, sizeof(name), "Plane %s", eout->id);
    plane->name = eina_stringshare_add(name);
@@ -67,58 +66,142 @@ e_plane_new(E_Output *eout)
    plane->type = E_PLANE_TYPE_INVALID;
    plane->eout = eout;
 
+   plane->zpos = zpos;
+   plane->is_primary = is_pri;
+
    /* config default resolution with output size*/
-   plane->resolution.x = eout->config.geom.x;
-   plane->resolution.y = eout->config.geom.y;
-   plane->resolution.w = eout->config.geom.w;
-   plane->resolution.h = eout->config.geom.h;
+   plane->geometry.x = eout->config.geom.x;
+   plane->geometry.y = eout->config.geom.y;
+   plane->geometry.w = eout->config.geom.w;
+   plane->geometry.h = eout->config.geom.h;
 
    eout->planes = eina_list_append(eout->planes, plane);
 
-   printf("@@@@@@@@@@ e_plane_new:| %i %i %ix%i\n", plane->resolution.x , plane->resolution.y, plane->resolution.w, plane->resolution.h);
+   printf("@@@@@@@@@@ e_plane_new:| %i %i %ix%i\n", plane->geometry.x , plane->geometry.y, plane->geometry.w, plane->geometry.h);
 
    return plane;
 }
 
 E_API Eina_Bool
 e_plane_resolution_set(E_Plane *plane,
-                       int x,
-                       int y,
                        int w,
                        int h)
 {
    int dx = 0, dy = 0, dw = 0, dh = 0;
 
-   E_OBJECT_CHECK_RETURN(plane, EINA_FALSE);
-   E_OBJECT_TYPE_CHECK_RETURN(plane, E_PLANE_TYPE, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, EINA_FALSE);
 
-   if ((x == plane->resolution.x) && (plane->resolution.y) && (w == plane->resolution.w) && (h == plane->resolution.h))
+   if (plane->is_primary) return EINA_FALSE;
+
+   if ((w == plane->geometry.w) && (h == plane->geometry.h))
      return EINA_FALSE;
 
-   plane->resolution.x = x;
-   plane->resolution.y = y;
-   plane->resolution.w = w;
-   plane->resolution.h = h;
+   plane->geometry.w = w;
+   plane->geometry.h = h;
 
    /* TODO: config clist refer to resolution */
    _e_plane_reconfigure_clients(plane, dx, dy, dw, dh);
    return EINA_TRUE;
 }
 
-E_API void
-e_plane_type_set(E_Plane *plane, E_Plane_Type_State type)
+E_API Eina_Bool
+e_plane_type_set(E_Plane *plane,
+                 E_Plane_Type_State type)
 {
-   E_OBJECT_CHECK(plane);
-   E_OBJECT_TYPE_CHECK(plane, E_PLANE_TYPE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, EINA_FALSE);
 
+   if ((type == E_PLANE_TYPE_VIDEO) ||
+       (type == E_PLANE_TYPE_CURSOR))
+     {
+        if (plane->ec || plane->prepare_ec) return EINA_FALSE;
+     }
    plane->type = type;
+   return EINA_TRUE;
 }
 
 E_API E_Plane_Type_State
 e_plane_type_get(E_Plane *plane)
 {
-   E_OBJECT_CHECK_RETURN(plane, E_ZONE_DISPLAY_STATE_OFF);
-   E_OBJECT_TYPE_CHECK_RETURN(plane, E_PLANE_TYPE, E_ZONE_DISPLAY_STATE_OFF);
-
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, E_PLANE_TYPE_INVALID);
    return plane->type;
 }
+
+E_API E_Client *
+e_plane_ec_get(E_Plane *plane)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, NULL);
+   return plane->ec;
+}
+
+E_API E_Client *
+e_plane_ec_prepare_get(E_Plane *plane)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, NULL);
+   return plane->prepare_ec;
+}
+
+E_API Eina_Bool
+e_plane_ec_prepare_set(E_Plane *plane,
+                       E_Client *ec)
+{
+   if(!plane)
+     {
+        eina_stringshare_replace(&_e_plane_ec_last_err, "Invalid e_plane were passed");
+        goto err;
+     }
+
+   if (plane->type == E_PLANE_TYPE_OVERLAY)
+     {
+        eina_stringshare_replace(&_e_plane_ec_last_err, NULL);
+        plane->prepare_ec = ec;
+        return EINA_TRUE;
+     }
+   eina_stringshare_replace(&_e_plane_ec_last_err, "Type dismatch : ec not availabe on e_plane");
+err:
+
+   return EINA_FALSE;
+}
+
+E_API const char *
+e_plane_ec_prepare_set_last_error_get(E_Plane *plane)
+{
+   return _e_plane_ec_last_err;
+}
+
+E_API Eina_Bool
+e_plane_is_primary(E_Plane *plane)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, EINA_FALSE);
+   if (plane->is_primary) return EINA_TRUE;
+   return EINA_FALSE;
+}
+
+E_API Eina_Bool
+e_plane_is_cursor(E_Plane *plane)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, EINA_FALSE);
+   if (plane->type == E_PLANE_TYPE_CURSOR) return EINA_TRUE;
+   return EINA_FALSE;
+}
+
+E_API E_Plane_Color
+e_plane_color_val_get(E_Plane *plane)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(plane, E_PLANE_COLOR_INVALID);
+   return plane->color;
+}
+
+E_API void
+e_plane_geom_get(E_Plane *plane,
+                 int *x,
+                 int *y,
+                 int *w,
+                 int *h)
+{
+   if (!plane) return;
+   if (x) *x = plane->geometry.x;
+   if (y) *y = plane->geometry.y;
+   if (w) *w = plane->geometry.w;
+   if (h) *h = plane->geometry.h;
+}
+

diff --git a/src/bin/e_plane.h b/src/bin/e_plane.h
index d33b6c7..79865ae 100644 (file)
--- a/src/bin/e_plane.h
+++ b/src/bin/e_plane.h
@@ -1,5 +1,20 @@
 #ifdef E_TYPEDEFS
 
+typedef enum _E_Plane_Type_State
+{
+   E_PLANE_TYPE_INVALID,
+   E_PLANE_TYPE_VIDEO,
+   E_PLANE_TYPE_OVERLAY,
+   E_PLANE_TYPE_CURSOR
+} E_Plane_Type_State;
+
+typedef enum _E_Plane_Color
+{
+   E_PLANE_COLOR_INVALID,
+   E_PLANE_COLOR_YUV,
+   E_PLANE_COLOR_RGB
+} E_Plane_Color;
+
 typedef struct _E_Plane                      E_Plane;
 
 #else
@@ -8,38 +23,40 @@ typedef struct _E_Plane                      E_Plane;
 
 #define E_PLANE_TYPE (int)0xE0b11001
 
-typedef enum _E_Plane_Type_State
-{
-   E_PLANE_TYPE_INVALID,
-   E_PLANE_TYPE_PRIMARY,
-   E_PLANE_TYPE_SELECTIVE,
-   E_PLANE_TYPE_CURSOR
-} E_Plane_Type_State;
-
 struct _E_Plane
 {
+   int                 zpos;
    struct
      {
         int          x, y, w, h; // FIXME
-     } resolution;
+     } geometry;
 
    const char         *name;
    E_Plane_Type_State  type;
+   E_Plane_Color       color;
+
    E_Client           *ec;
+   E_Client           *prepare_ec;
    E_Output           *eout;
-};
 
-extern E_API int E_EVENT_PLANE_ADD;
-extern E_API int E_EVENT_PLANE_DEL;
+   Eina_Bool           is_primary;
+};
 
-EINTERN int    e_plane_init(void);
-EINTERN int    e_plane_shutdown(void);
-E_API E_Plane  * e_plane_new(E_Output *eout);
-E_API void       e_plane_free(E_Plane *plane);
-E_API Eina_Bool  e_plane_resolution_set(E_Plane *plane, int x, int y, int w, int h);
-E_API void       e_plane_type_set(E_Plane *plane, E_Plane_Type_State type);
+EINTERN int              e_plane_init(void);
+EINTERN int              e_plane_shutdown(void);
+EINTERN E_Plane         *e_plane_new(E_Output *eout, int zpos, Eina_Bool is_pri);
+EINTERN void             e_plane_free(E_Plane *plane);
+E_API Eina_Bool          e_plane_resolution_set(E_Plane *plane, int w, int h);
+E_API Eina_Bool          e_plane_type_set(E_Plane *plane, E_Plane_Type_State type);
 E_API E_Plane_Type_State e_plane_type_get(E_Plane *plane);
-
+E_API E_Client          *e_plane_ec_get(E_Plane *plane);
+E_API E_Client          *e_plane_ec_prepare_get(E_Plane *plane);
+E_API Eina_Bool          e_plane_ec_prepare_set(E_Plane *plane, E_Client *ec);
+E_API const char        *e_plane_ec_prepare_set_last_error_get(E_Plane *plane);
+E_API Eina_Bool          e_plane_is_primary(E_Plane *plane);
+E_API Eina_Bool          e_plane_is_cursor(E_Plane *plane);
+E_API E_Plane_Color      e_plane_color_val_get(E_Plane *plane);
+E_API void               e_plane_geom_get(E_Plane *plane, int *x, int *y, int *w, int *h);
 
 #endif
 #endif