follow the changed protocol

This is the implementation for the changed wtz_screen interface.

Change-Id: Ifa4c356dbf7ad1c9e16fb299c2d3e9256da544b5

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 3860ab0a9cef605d8c60101ad679fb7e341bdfc9..b881329e370e90a733ea976a5543cfb16f1f9c63 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -2345,10 +2345,14 @@ e_desk_splitscreen_regions_all_generate(E_Desk *desk, struct wl_client *client,
                desk->ss_region_resources = eina_list_append(
                         desk->ss_region_resources, ss_region_res);
 
-              // send the splitscreen_region sresources
-              wtz_splitscreen_send_region(ss_res,
-                        ss_region_res, edg->name,
-                        edg->x, edg->y, edg->w, edg->h);
+              // send the splitscreen_region resources
+              wtz_splitscreen_send_region(ss_res, ss_region_res);
+
+              // send the name of the split_screen_region
+              wtz_splitscreen_region_send_name(ss_region_res, edg->name);
+
+              // send the geometry of the split_screen_region
+              wtz_splitscreen_region_send_geometry(ss_region_res, edg->x, edg->y, edg->w, edg->h);
           }
      }
 

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 51851ef8f44db02f7530d2225dae746474c4e6af..2db315feb3b2c51f9927a890af4c4aa05dbcbd25 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -1857,27 +1857,10 @@ _e_zone_screen_cb_get_splitscreen(struct wl_client *client,
    ELOGF("E_Zone", "Create a splitscreen resource. zone_id:%d", NULL, zone->id);
 }
 
-static void
-_e_zone_screen_cb_set_client_side_decoration(struct wl_client *client,
-    struct wl_resource *resource, uint32_t enable)
-{
-   E_Zone *zone;
-
-   if (!(zone = wl_resource_get_user_data(resource))) return;
-
-   if (zone->csd_enabled != enable) zone->csd_enabled = enable;
-
-   // TODO: The currunt ecs(wtz_surface) in this zone(wtz_screen) can support
-   //       client-side decoration. Therefore, do something(?) for them to get
-   //       the client-side decoration. - [soolim]
-
-}
-
 static const struct wtz_screen_interface _e_zone_screen_interface =
 {
    _e_zone_screen_cb_destroy,
    _e_zone_screen_cb_get_splitscreen,
-   _e_zone_screen_cb_set_client_side_decoration,
 };
 
 static void
@@ -1926,9 +1909,6 @@ _e_zone_screen_cb_bind(struct wl_client *client, void *data,
    if (zone->splitscreen_enabled)
      _e_zone_screen_capability_add(resource, &capabilities,
             WTZ_SCREEN_CAPABILITY_SPLITSCREEN);
-   if (zone->csd_enabled)
-     _e_zone_screen_capability_add(resource, &capabilities,
-            WTZ_SCREEN_CAPABILITY_CLIENT_SIDE_DECORATION);
    wtz_screen_send_capabilities(resource, &capabilities);
 
    ELOGF("E_Zone", "Bound wtz_screen zone->id: %d Size: %dx%d", NULL,

diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 3fe1a903bd75c6cc3ca7c9a17c23d103a0cfdabb..7dfe7a49bbd278416fea4fcc981ee5f742c84808 100644 (file)
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -159,7 +159,6 @@ struct _E_Zone
    struct wl_global *global;                 // wtz_screen global resource
    Eina_List *resources;                     // binding resources of wtz_screen global resource
    Eina_Bool splitscreen_enabled;            // splitscreen capability
-   Eina_Bool csd_enabled;                    // client side decoration capablitiy
 
    Eina_List *obstacles;
 };