Apply capsulation of e_comp

Change-Id: I8a2c8919ec5dc7dfa62260e315721c3230707648

diff --git a/src/e_mod_gesture_events.c b/src/e_mod_gesture_events.c
index 75391f71297e272e7dc3d2ed672f11d892ba397f..651d9ab5d9b7ad0cb9f58fb18d29fdae78b82b44 100644 (file)
--- a/src/e_mod_gesture_events.c
+++ b/src/e_mod_gesture_events.c
@@ -323,8 +323,8 @@ _e_gesture_send_back_key(Eina_Bool pressed)
    ev->same_screen = 1;
    ev->keycode = conf->edge_swipe.back_key;
    ev->dev = ecore_device_ref(gesture->device.kbd_device);
-   ev->window = e_comp->ee_win;
-   ev->event_window = e_comp->ee_win;
+   ev->window = e_comp_ee_win_get();
+   ev->event_window = ev->window;
    ev->data = key_data;
 
    if (!e_input_thread_mode_get())
@@ -356,8 +356,8 @@ _e_gesture_send_touch_cancel(void)
 
    ev_cancel->timestamp = e_util_timestamp_get();
    ev_cancel->same_screen = 1;
-   ev_cancel->window = e_comp->ee_win;
-   ev_cancel->event_window = e_comp->ee_win;
+   ev_cancel->window = e_comp_ee_win_get();
+   ev_cancel->event_window = ev_cancel->window;
 
    GTINF("Add Cancel event. time: %d", ev_cancel->timestamp);
 
@@ -547,6 +547,7 @@ _e_gesture_process_edge_swipe_down(Ecore_Event_Mouse_Button *ev)
 
    if (gesture->gesture_events.num_pressed == 1)
      {
+        int comp_w = 0, comp_h = 0;
         for (i = 1; i < E_GESTURE_FINGER_MAX+1; i++)
           {
              if (edge_swipes->base.fingers[i].enabled)
@@ -555,13 +556,14 @@ _e_gesture_process_edge_swipe_down(Ecore_Event_Mouse_Button *ev)
                }
           }
 
+        e_comp_size_get(&comp_w, comp_h);
         if (ev->y < conf->edge_swipe.area_offset)
           edge_swipes->base.edge = E_GESTURE_EDGE_TOP;
-        else if (ev->y > e_comp->h - conf->edge_swipe.area_offset)
+        else if (ev->y > comp_h - conf->edge_swipe.area_offset)
           edge_swipes->base.edge = E_GESTURE_EDGE_BOTTOM;
         else if (ev->x < conf->edge_swipe.area_offset)
           edge_swipes->base.edge = E_GESTURE_EDGE_LEFT;
-        else if (ev->x > e_comp->w - conf->edge_swipe.area_offset)
+        else if (ev->x > comp_w - conf->edge_swipe.area_offset)
           edge_swipes->base.edge = E_GESTURE_EDGE_RIGHT;
 
         if (!((1 << (edge_swipes->base.edge)) & edge_swipes->base.enabled_edge))
@@ -800,6 +802,8 @@ _e_gesture_process_edge_drag_down(Ecore_Event_Mouse_Button *ev)
 
    if (gesture->gesture_events.num_pressed == 1)
      {
+        int comp_w = 0, comp_h = 0;
+
         for (i = 1; i < E_GESTURE_FINGER_MAX+1; i++)
           {
              if (edge_drags->base.fingers[i].enabled)
@@ -808,13 +812,14 @@ _e_gesture_process_edge_drag_down(Ecore_Event_Mouse_Button *ev)
                }
           }
 
+        e_comp_size_get(&comp_w, comp_h);
         if (ev->y < conf->edge_drag.area_offset)
           edge_drags->base.edge = E_GESTURE_EDGE_TOP;
-        else if (ev->y > e_comp->h - conf->edge_drag.area_offset)
+        else if (ev->y > comp_h - conf->edge_drag.area_offset)
           edge_drags->base.edge = E_GESTURE_EDGE_BOTTOM;
         else if (ev->x < conf->edge_drag.area_offset)
           edge_drags->base.edge = E_GESTURE_EDGE_LEFT;
-        else if (ev->x > e_comp->w - conf->edge_drag.area_offset)
+        else if (ev->x > comp_w - conf->edge_drag.area_offset)
           edge_drags->base.edge = E_GESTURE_EDGE_RIGHT;
 
         if (!((1 << (edge_drags->base.edge)) & edge_drags->base.enabled_edge))

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 28897d521ea27a0147781bf7d62967ecde2232bb..78b94ac0b456eff5907b32eaafb4bc47bd1af663 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -449,25 +449,28 @@ _e_gesture_edge_grabbed_client_check(struct wl_client *client)
 static int
 _e_gesture_set_edge_point(int edge_size, int edge, int start_point, int end_point, int *sp, int *ep)
 {
+   int comp_w = 0, comp_h = 0;
+
        *sp = *ep = 0;
+   e_comp_size_get(&comp_w, &comp_h);
        if (edge_size == E_GESTURE_EDGE_SIZE_PARTIAL)
      {
         *sp = start_point;
         *ep = end_point;
         if (((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) &&
-            (*ep > e_comp->w))
-          *ep = e_comp->w;
+            (*ep > comp_w))
+          *ep = comp_w;
         else if (((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) &&
-                 (*ep > e_comp->h))
-          *ep = e_comp->h;
+                 (*ep > comp_h))
+          *ep = comp_h;
      }
    else if (edge_size == E_GESTURE_EDGE_SIZE_FULL)
      {
         *sp = 0;
         if ((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM))
-          *ep = e_comp->w;
+          *ep = comp_w;
         else if ((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT))
-          *ep = e_comp->h;
+          *ep = comp_h;
      }
    else
      {
@@ -551,7 +554,7 @@ _e_gesture_ungrab_edge_swipe(struct wl_client *client,
    Eina_List *l, *l_next;
    E_Gesture_Event_Edge_Finger_Edge *edata;
    Eina_Bool flag_removed = EINA_FALSE;
-   int sp = 0, ep = 0;
+   int sp = 0, ep = 0, comp_w = 0, comp_h = 0;
 
    GTINF("client %p is request ungrab edge swipe gesture, fingers: %d, edge: 0x%x, edge_size: %d, (%d ~ %d)\n", client, fingers, edge, edge_size, start_point, end_point);
 
@@ -564,24 +567,25 @@ _e_gesture_ungrab_edge_swipe(struct wl_client *client,
 
    gev = &gesture->gesture_events;
 
+   e_comp_size_get(&comp_w, &comp_h);
    if (edge_size == E_GESTURE_EDGE_SIZE_PARTIAL)
      {
         sp = start_point;
         ep = end_point;
         if (((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) &&
-            (ep > e_comp->w))
-          ep = e_comp->w;
+            (ep > comp_w))
+          ep = comp_w;
         else if (((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) &&
-                 (ep > e_comp->h))
-          ep = e_comp->h;
+                 (ep > comp_h))
+          ep = comp_h;
      }
    else if (edge_size == E_GESTURE_EDGE_SIZE_FULL)
      {
         sp = 0;
         if ((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM))
-          ep = e_comp->w;
+          ep = comp_w;
         else if ((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT))
-          ep = e_comp->h;
+          ep = comp_h;
      }
    else
      {
@@ -693,7 +697,7 @@ _e_gesture_ungrab_edge_drag(struct wl_client *client,
    Eina_List *l, *l_next;
    E_Gesture_Event_Edge_Finger_Edge *edata;
    Eina_Bool flag_removed = EINA_FALSE;
-   int sp = 0, ep = 0;
+   int sp = 0, ep = 0, comp_w = 0, comp_h = 0;
 
    GTINF("client %p is request ungrab edge drag gesture, fingers: %d, edge: 0x%x, edge_size: %d, (%d ~ %d)\n", client, fingers, edge, edge_size, start_point, end_point);
 
@@ -704,24 +708,25 @@ _e_gesture_ungrab_edge_drag(struct wl_client *client,
         goto out;
      }
 
+   e_comp_size_get(&comp_w, &comp_h);
    if (edge_size == E_GESTURE_EDGE_SIZE_PARTIAL)
      {
         sp = start_point;
         ep = end_point;
         if (((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM)) &&
-            (ep > e_comp->w))
-          ep = e_comp->w;
+            (ep > comp_w))
+          ep = comp_w;
         else if (((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT)) &&
-                 (ep > e_comp->h))
-          ep = e_comp->h;
+                 (ep > comp_h))
+          ep = comp_h;
      }
    else if (edge_size == E_GESTURE_EDGE_SIZE_FULL)
      {
         sp = 0;
         if ((edge == E_GESTURE_EDGE_TOP) || (edge == E_GESTURE_EDGE_BOTTOM))
-          ep = e_comp->w;
+          ep = comp_w;
         else if ((edge == E_GESTURE_EDGE_RIGHT) || (edge == E_GESTURE_EDGE_LEFT))
-          ep = e_comp->h;
+          ep = comp_h;
      }
    else
      {
@@ -1935,9 +1940,9 @@ _e_gesture_init(E_Module *m)
         return NULL;
      }
 
-   if (!e_comp)
+   if (!e_comp_get())
      {
-        GTERR("Failed to initialize gesture module ! (e_comp == NULL)\n");
+        GTERR("Failed to initialize gesture module ! (e_comp_get() == NULL)\n");
         goto err;
      }