typo file name (visivility -> visibility)

Change-Id: Ia57b9754a296def1915e9653c5781a0b355d9069

diff --git a/src/Makefile.am b/src/Makefile.am
index 9968a11fc35ae014a366c1e3ff128dcba12a9c61..3e93a4af21715088d97c3539f8555d3dbc019c15 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ module_la_SOURCES      = e_mod_config.c \
                          e_mod_main.c \
                          e_mod_main.h \
                          e_mod_softkey.c \
-                         e_mod_visivility.c \
+                         e_mod_visibility.c \
                          e_mod_rotation.c \
                          e_mod_rotation.h \
                          e_mod_utils.h \

diff --git a/src/e_mod_visibility.c b/src/e_mod_visibility.c
new file mode 100644 (file)
index 0000000..ecdfe36
--- /dev/null
+++ b/src/e_mod_visibility.c
@@ -0,0 +1,292 @@
+#include "e_mod_main.h"
+#ifdef HAVE_WAYLAND_ONLY
+#define E_COMP_WL
+#include "e_comp_wl.h"
+#include "e_mod_wl.h"
+#endif
+
+typedef struct _Pol_Visibility Pol_Visibility;
+
+struct _Pol_Visibility
+{
+   E_Client *ec;
+   int       visibility;
+};
+
+static Eina_Hash *hash_pol_visibilities = NULL;
+
+static Pol_Visibility *_visibility_add(E_Client *ec, int visibility);
+static Pol_Visibility *_visibility_find(E_Client *ec);
+static void            _visibility_notify_send(E_Client *ec, int visibility);
+static void            _pol_cb_visibility_data_free(void *data);
+
+static Pol_Visibility *
+_visibility_add(E_Client *ec, int visibility)
+{
+   Pol_Visibility *pv;
+
+   if (e_object_is_del(E_OBJECT(ec))) return NULL;
+   
+   pv = eina_hash_find(hash_pol_visibilities, &ec);
+   if (pv) return NULL;
+
+   pv = E_NEW(Pol_Visibility, 1);
+   if (!pv) return NULL;
+
+   pv->ec = ec;
+   pv->visibility = visibility;
+
+   eina_hash_add(hash_pol_visibilities, &ec, pv);
+
+   return pv;
+}
+
+static Pol_Visibility *
+_visibility_find(E_Client *ec)
+{
+   Pol_Visibility *pv;
+
+   pv = eina_hash_find(hash_pol_visibilities, &ec);
+
+   return pv;
+}
+
+static void
+_visibility_notify_send(E_Client *ec, int visibility)
+{
+#ifdef HAVE_WAYLAND_ONLY
+   e_mod_pol_wl_visibility_send(ec, visibility);
+#endif
+}
+
+static void
+_pol_cb_visibility_data_free(void *data)
+{
+   free(data);
+}
+
+void
+e_mod_pol_visibility_init(void)
+{
+   hash_pol_visibilities = eina_hash_pointer_new(_pol_cb_visibility_data_free);
+}
+
+void
+e_mod_pol_visibility_shutdown(void)
+{
+   E_FREE_FUNC(hash_pol_visibilities, eina_hash_free);
+}
+
+static Eina_Bool
+_client_tiler_intersects(E_Client *ec, Eina_Tiler *t)
+{
+   Eina_Rectangle *r;
+   Eina_Iterator *itr;
+   Eina_Bool ret = EINA_FALSE;
+
+   if (!ec) return EINA_FALSE;
+   if (!t) return EINA_FALSE;
+   if (eina_tiler_empty(t)) return EINA_FALSE;
+    
+   itr = eina_tiler_iterator_new(t);
+
+   EINA_ITERATOR_FOREACH(itr, r)
+     {
+        if (E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, r->x, r->y, r->w, r->h))
+          {
+             ret = EINA_TRUE;
+             break;
+          }
+     }
+
+   eina_iterator_free(itr);
+
+   return ret;
+}
+
+static void
+_e_mod_pol_client_iconify_by_visibility(E_Client *ec)
+{
+   if (!ec) return;
+   if (ec->iconic) return;
+   if (ec->exp_iconify.by_client) return;
+   if (ec->exp_iconify.skip_iconify) return;
+
+   e_mod_pol_wl_iconify_state_change_send(ec, 1);
+   e_client_iconify(ec);
+}
+
+static void
+_e_mod_pol_client_uniconify_by_visibility(E_Client *ec)
+{
+   if (!ec) return;
+   if (!ec->iconic) return;
+   if (ec->exp_iconify.by_client) return;
+   if (ec->exp_iconify.skip_iconify) return;
+
+   ec->exp_iconify.not_raise = 1;
+   e_client_uniconify(ec);
+   e_mod_pol_wl_iconify_state_change_send(ec, 0);
+}
+
+void
+e_mod_pol_zone_visibility_calc(E_Zone *zone)
+{
+   E_Client *ec;
+   Eina_Tiler *t;
+   Eina_Rectangle r;
+   const int edge = 1;
+   const int OBSCURED = 2; // 2: Fully Obscured
+   const int UNOBSCURED  = 0;
+   Pol_Visibility *pv;
+
+   if (!zone) return;
+
+   t = eina_tiler_new(zone->w + edge, zone->h + edge);
+   eina_tiler_tile_size_set(t, 1, 1);
+
+   if (zone->display_state != E_ZONE_DISPLAY_STATE_OFF)
+     {
+        EINA_RECTANGLE_SET(&r, zone->x, zone->y, zone->w, zone->h);
+        eina_tiler_rect_add(t, &r);
+     }
+
+   E_CLIENT_REVERSE_FOREACH(zone->comp, ec)
+     {
+        if (e_object_is_del(E_OBJECT(ec))) continue;
+        if (e_client_util_ignored_get(ec)) continue;
+        /* check zone and skip borders not on this zone */
+        if (ec->zone != zone) continue;
+        /* check e_client and skip e_clients not visible */
+        if (!ec->frame) continue;
+        if (!evas_object_visible_get(ec->frame))
+          {
+             if (!ec->iconic) continue;
+             else
+               {
+                  if (ec->exp_iconify.by_client)
+                    continue;
+               }
+          }
+        /* check e_client and skip e_clinets not intersects with zone */
+        if (!E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, zone->x, zone->y, zone->w, zone->h))
+          continue;
+
+        if (_client_tiler_intersects(ec, t))
+          {
+             Eina_Bool opaque = EINA_FALSE;
+             /* unobscured case */
+             pv = _visibility_find(ec);
+             if (pv)
+               {
+                  if (pv->visibility == UNOBSCURED)
+                    {
+                       /* previous state is unobscured */
+                       /* do nothing */
+                    }
+                  else
+                    {
+                       /* previous state is obscured */
+                       _e_mod_pol_client_uniconify_by_visibility(ec);
+                       pv->visibility = UNOBSCURED;
+                       _visibility_notify_send(ec, UNOBSCURED);
+                    }
+               }
+             else
+               {
+                  /* previous state is none */
+                  _e_mod_pol_client_uniconify_by_visibility(ec);
+                  _visibility_add(ec, UNOBSCURED);
+                  _visibility_notify_send(ec, UNOBSCURED);
+               }
+
+             /* check alpha window is opaque or not. */
+             if ((ec->argb) &&
+                 (ec->visibility.opaque == 1))
+               opaque = EINA_TRUE;
+
+             /* if e_client is not alpha or opaque then delete intersect rect */
+             if (!ec->argb || opaque)
+               {
+                  EINA_RECTANGLE_SET(&r, ec->x, ec->y,
+                                         ec->w + edge, ec->h + edge);
+                  eina_tiler_rect_del(t, &r);
+               }
+          }
+        else
+          {
+            /* obscured case */
+             pv = _visibility_find(ec);
+             if (pv)
+               {
+                  if (pv->visibility == UNOBSCURED)
+                    {
+                       /* previous state is unobscured */
+                       pv->visibility = OBSCURED;
+                       _visibility_notify_send(ec, OBSCURED);
+                       if (zone->display_state != E_ZONE_DISPLAY_STATE_OFF)
+                         _e_mod_pol_client_iconify_by_visibility(ec);
+                    }
+                  else
+                    {
+                       /* previous state is obscured */
+                       /* do nothing */
+                    }
+               }
+             else
+               {
+                  /* previous state is none */
+                  _visibility_add(ec, OBSCURED);
+                  _visibility_notify_send(ec, OBSCURED);
+                  if (zone->display_state != E_ZONE_DISPLAY_STATE_OFF)
+                    _e_mod_pol_client_iconify_by_visibility(ec);
+               }
+          }
+     }
+
+   eina_tiler_free(t);
+}
+
+void
+e_mod_pol_visibility_calc(void)
+{
+   E_Zone *zone;
+   Eina_List *zl;
+
+   EINA_LIST_FOREACH(e_comp->zones, zl, zone)
+     {
+        e_mod_pol_zone_visibility_calc(zone);
+     }
+}
+
+void
+e_mod_pol_client_visibility_del(E_Client *ec)
+{
+   Pol_Visibility *pv;
+
+   if (!ec) return;
+
+   pv = eina_hash_find(hash_pol_visibilities, &ec);
+   if (!pv) return;
+
+   eina_hash_del_by_key(hash_pol_visibilities, &ec);
+}
+
+void
+e_mod_pol_client_window_opaque_set(E_Client *ec)
+{
+   int opaque = 0;
+
+   if (!ec) return;
+
+#ifdef HAVE_WAYLAND_ONLY
+   E_Comp_Wl_Client_Data *cdata;
+
+   if (!ec->pixmap) return;
+   if (!(cdata = (E_Comp_Wl_Client_Data *)e_pixmap_cdata_get(ec->pixmap))) return;
+
+   opaque = cdata->opaque_state;
+#endif
+
+   ec->visibility.opaque = opaque;
+}

diff --git a/src/e_mod_visivility.c b/src/e_mod_visivility.c
deleted file mode 100644 (file)
index ecdfe36..0000000
--- a/src/e_mod_visivility.c
+++ /dev/null
@@ -1,292 +0,0 @@
-#include "e_mod_main.h"
-#ifdef HAVE_WAYLAND_ONLY
-#define E_COMP_WL
-#include "e_comp_wl.h"
-#include "e_mod_wl.h"
-#endif
-
-typedef struct _Pol_Visibility Pol_Visibility;
-
-struct _Pol_Visibility
-{
-   E_Client *ec;
-   int       visibility;
-};
-
-static Eina_Hash *hash_pol_visibilities = NULL;
-
-static Pol_Visibility *_visibility_add(E_Client *ec, int visibility);
-static Pol_Visibility *_visibility_find(E_Client *ec);
-static void            _visibility_notify_send(E_Client *ec, int visibility);
-static void            _pol_cb_visibility_data_free(void *data);
-
-static Pol_Visibility *
-_visibility_add(E_Client *ec, int visibility)
-{
-   Pol_Visibility *pv;
-
-   if (e_object_is_del(E_OBJECT(ec))) return NULL;
-   
-   pv = eina_hash_find(hash_pol_visibilities, &ec);
-   if (pv) return NULL;
-
-   pv = E_NEW(Pol_Visibility, 1);
-   if (!pv) return NULL;
-
-   pv->ec = ec;
-   pv->visibility = visibility;
-
-   eina_hash_add(hash_pol_visibilities, &ec, pv);
-
-   return pv;
-}
-
-static Pol_Visibility *
-_visibility_find(E_Client *ec)
-{
-   Pol_Visibility *pv;
-
-   pv = eina_hash_find(hash_pol_visibilities, &ec);
-
-   return pv;
-}
-
-static void
-_visibility_notify_send(E_Client *ec, int visibility)
-{
-#ifdef HAVE_WAYLAND_ONLY
-   e_mod_pol_wl_visibility_send(ec, visibility);
-#endif
-}
-
-static void
-_pol_cb_visibility_data_free(void *data)
-{
-   free(data);
-}
-
-void
-e_mod_pol_visibility_init(void)
-{
-   hash_pol_visibilities = eina_hash_pointer_new(_pol_cb_visibility_data_free);
-}
-
-void
-e_mod_pol_visibility_shutdown(void)
-{
-   E_FREE_FUNC(hash_pol_visibilities, eina_hash_free);
-}
-
-static Eina_Bool
-_client_tiler_intersects(E_Client *ec, Eina_Tiler *t)
-{
-   Eina_Rectangle *r;
-   Eina_Iterator *itr;
-   Eina_Bool ret = EINA_FALSE;
-
-   if (!ec) return EINA_FALSE;
-   if (!t) return EINA_FALSE;
-   if (eina_tiler_empty(t)) return EINA_FALSE;
-    
-   itr = eina_tiler_iterator_new(t);
-
-   EINA_ITERATOR_FOREACH(itr, r)
-     {
-        if (E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, r->x, r->y, r->w, r->h))
-          {
-             ret = EINA_TRUE;
-             break;
-          }
-     }
-
-   eina_iterator_free(itr);
-
-   return ret;
-}
-
-static void
-_e_mod_pol_client_iconify_by_visibility(E_Client *ec)
-{
-   if (!ec) return;
-   if (ec->iconic) return;
-   if (ec->exp_iconify.by_client) return;
-   if (ec->exp_iconify.skip_iconify) return;
-
-   e_mod_pol_wl_iconify_state_change_send(ec, 1);
-   e_client_iconify(ec);
-}
-
-static void
-_e_mod_pol_client_uniconify_by_visibility(E_Client *ec)
-{
-   if (!ec) return;
-   if (!ec->iconic) return;
-   if (ec->exp_iconify.by_client) return;
-   if (ec->exp_iconify.skip_iconify) return;
-
-   ec->exp_iconify.not_raise = 1;
-   e_client_uniconify(ec);
-   e_mod_pol_wl_iconify_state_change_send(ec, 0);
-}
-
-void
-e_mod_pol_zone_visibility_calc(E_Zone *zone)
-{
-   E_Client *ec;
-   Eina_Tiler *t;
-   Eina_Rectangle r;
-   const int edge = 1;
-   const int OBSCURED = 2; // 2: Fully Obscured
-   const int UNOBSCURED  = 0;
-   Pol_Visibility *pv;
-
-   if (!zone) return;
-
-   t = eina_tiler_new(zone->w + edge, zone->h + edge);
-   eina_tiler_tile_size_set(t, 1, 1);
-
-   if (zone->display_state != E_ZONE_DISPLAY_STATE_OFF)
-     {
-        EINA_RECTANGLE_SET(&r, zone->x, zone->y, zone->w, zone->h);
-        eina_tiler_rect_add(t, &r);
-     }
-
-   E_CLIENT_REVERSE_FOREACH(zone->comp, ec)
-     {
-        if (e_object_is_del(E_OBJECT(ec))) continue;
-        if (e_client_util_ignored_get(ec)) continue;
-        /* check zone and skip borders not on this zone */
-        if (ec->zone != zone) continue;
-        /* check e_client and skip e_clients not visible */
-        if (!ec->frame) continue;
-        if (!evas_object_visible_get(ec->frame))
-          {
-             if (!ec->iconic) continue;
-             else
-               {
-                  if (ec->exp_iconify.by_client)
-                    continue;
-               }
-          }
-        /* check e_client and skip e_clinets not intersects with zone */
-        if (!E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, zone->x, zone->y, zone->w, zone->h))
-          continue;
-
-        if (_client_tiler_intersects(ec, t))
-          {
-             Eina_Bool opaque = EINA_FALSE;
-             /* unobscured case */
-             pv = _visibility_find(ec);
-             if (pv)
-               {
-                  if (pv->visibility == UNOBSCURED)
-                    {
-                       /* previous state is unobscured */
-                       /* do nothing */
-                    }
-                  else
-                    {
-                       /* previous state is obscured */
-                       _e_mod_pol_client_uniconify_by_visibility(ec);
-                       pv->visibility = UNOBSCURED;
-                       _visibility_notify_send(ec, UNOBSCURED);
-                    }
-               }
-             else
-               {
-                  /* previous state is none */
-                  _e_mod_pol_client_uniconify_by_visibility(ec);
-                  _visibility_add(ec, UNOBSCURED);
-                  _visibility_notify_send(ec, UNOBSCURED);
-               }
-
-             /* check alpha window is opaque or not. */
-             if ((ec->argb) &&
-                 (ec->visibility.opaque == 1))
-               opaque = EINA_TRUE;
-
-             /* if e_client is not alpha or opaque then delete intersect rect */
-             if (!ec->argb || opaque)
-               {
-                  EINA_RECTANGLE_SET(&r, ec->x, ec->y,
-                                         ec->w + edge, ec->h + edge);
-                  eina_tiler_rect_del(t, &r);
-               }
-          }
-        else
-          {
-            /* obscured case */
-             pv = _visibility_find(ec);
-             if (pv)
-               {
-                  if (pv->visibility == UNOBSCURED)
-                    {
-                       /* previous state is unobscured */
-                       pv->visibility = OBSCURED;
-                       _visibility_notify_send(ec, OBSCURED);
-                       if (zone->display_state != E_ZONE_DISPLAY_STATE_OFF)
-                         _e_mod_pol_client_iconify_by_visibility(ec);
-                    }
-                  else
-                    {
-                       /* previous state is obscured */
-                       /* do nothing */
-                    }
-               }
-             else
-               {
-                  /* previous state is none */
-                  _visibility_add(ec, OBSCURED);
-                  _visibility_notify_send(ec, OBSCURED);
-                  if (zone->display_state != E_ZONE_DISPLAY_STATE_OFF)
-                    _e_mod_pol_client_iconify_by_visibility(ec);
-               }
-          }
-     }
-
-   eina_tiler_free(t);
-}
-
-void
-e_mod_pol_visibility_calc(void)
-{
-   E_Zone *zone;
-   Eina_List *zl;
-
-   EINA_LIST_FOREACH(e_comp->zones, zl, zone)
-     {
-        e_mod_pol_zone_visibility_calc(zone);
-     }
-}
-
-void
-e_mod_pol_client_visibility_del(E_Client *ec)
-{
-   Pol_Visibility *pv;
-
-   if (!ec) return;
-
-   pv = eina_hash_find(hash_pol_visibilities, &ec);
-   if (!pv) return;
-
-   eina_hash_del_by_key(hash_pol_visibilities, &ec);
-}
-
-void
-e_mod_pol_client_window_opaque_set(E_Client *ec)
-{
-   int opaque = 0;
-
-   if (!ec) return;
-
-#ifdef HAVE_WAYLAND_ONLY
-   E_Comp_Wl_Client_Data *cdata;
-
-   if (!ec->pixmap) return;
-   if (!(cdata = (E_Comp_Wl_Client_Data *)e_pixmap_cdata_get(ec->pixmap))) return;
-
-   opaque = cdata->opaque_state;
-#endif
-
-   ec->visibility.opaque = opaque;
-}