Remove ecore-wayland dependency

It is improper that the Enlightenment (Window Manager) module uses ecore_wayland API (client side API).
This is recommendation of window manager team.

Change-Id: Id8bb0e6989aab489192077634e2821ae3c4804db

diff --git a/configure.ac b/configure.ac
index 053e1cb..3f91ec6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,32 +62,11 @@ dnl ========================================================================
 # checks for pkg-config
 dnl ========================================================================
 
-have_wayland_only=no
-AC_ARG_ENABLE([wayland-only],
-  AS_HELP_STRING([--enable-wayland-only],[enable wayland-only version of screen-reader @<:@default=disabled@:>@]),
-  [have_wayland_only=$enableval],
-  [have_wayland_only=no])
-AC_MSG_CHECKING([whether wayland-only version is enabled])
-if test "x${have_wayland_only}" = "xyes"; then
-  AC_DEFINE_UNQUOTED([HAVE_WAYLAND_ONLY],[1],[enable wayland-only version of screen-reader])
-fi
-AM_CONDITIONAL(HAVE_WAYLAND_ONLY, [test "x${have_wayland_only}" = xyes])
-
-if test "x${have_wayland_only}" = "xyes"; then
-       PKG_CHECK_MODULES(ENLIGHTENMENT, [enlightenment, dlog])
-else
-       PKG_CHECK_MODULES(ENLIGHTENMENT, [enlightenment, dlog, x11, utilX])
-       ENLIGHTENMENT_CFLAGS="${ENLIGHTENMENT_CFLAGS} -DNEED_X=1"
-fi
+PKG_CHECK_MODULES(ENLIGHTENMENT, [enlightenment, dlog])
 
 AC_SUBST(ENLIGHTENMENT_CFLAGS)
 AC_SUBST(ENLIGHTENMENT_LIBS)
 
-# to include e_comp_wl.h
-if test "${have_wayland_only}" != "xno"; then
-        AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
-fi
-
 dnl =======================================================================
 
 release=$(pkg-config --variable=release enlightenment)

diff --git a/packaging/e-mod-tizen-screen-reader.spec b/packaging/e-mod-tizen-screen-reader.spec
index b4a7910..cb007e0 100644 (file)
--- a/packaging/e-mod-tizen-screen-reader.spec
+++ b/packaging/e-mod-tizen-screen-reader.spec
@@ -1,5 +1,3 @@
-%bcond_with wayland
-
 Name: e-mod-tizen-screen-reader
 Version: 0.0.2
 Release: 1
@@ -11,8 +9,6 @@ License: BSD-2-Clause
 BuildRequires: pkgconfig(enlightenment)
 BuildRequires: pkgconfig(dlog)
 
-%global TZ_SYS_RO_SHARE  %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share}
-
 %description
 This package is a screen-reader module for Tizen enlightenment.
 
@@ -20,14 +16,14 @@ This package is a screen-reader module for Tizen enlightenment.
 %setup -q
 
 %build
+%define DataDir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share}
 
 export GC_SECTIONS_FLAGS="-fdata-sections -ffunction-sections -Wl,--gc-sections"
 export CFLAGS+=" -Wall -g -fPIC -rdynamic ${GC_SECTIONS_FLAGS} -DE_LOGGING=1"
 export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
 
-%if %{with wayland}
-%reconfigure --enable-wayland-only
-%endif
+%autogen
+%configure
 
 make
 
@@ -35,8 +31,8 @@ make
 rm -rf %{buildroot}
 
 # for license notification
-mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license
-cp -a %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name}
+mkdir -p %{buildroot}/%{DataDir}/license
+cp -a %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/%{DataDir}/license/%{name}
 
 # install
 make install DESTDIR=%{buildroot}
@@ -47,4 +43,4 @@ find  %{buildroot}%{_libdir}/enlightenment/modules/%{name} -name *.la | xargs rm
 %files
 %defattr(-,root,root,-)
 %{_libdir}/enlightenment/modules/e-mod-tizen-screen-reader
-%{TZ_SYS_RO_SHARE}/license/%{name}
+%{DataDir}/license/%{name}

diff --git a/src/Makefile.am b/src/Makefile.am
index 9d879e8..4d05810 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,10 +10,6 @@ module_la_SOURCES      = \
        e_screen_reader_config.c \
        e_screen_reader_gestures.c
 
-#if HAVE_WAYLAND_ONLY
-#module_la_SOURCES      += e_screen_reader_*.c \
-#endif
-
 module_la_LIBADD       =
 module_la_CFLAGS       = @ENLIGHTENMENT_CFLAGS@
 module_la_LDFLAGS      = -module -avoid-version @ENLIGHTENMENT_LIBS@ -lecore_wayland

diff --git a/src/e_screen_reader_gestures.c b/src/e_screen_reader_gestures.c
index 3a10796..0284806 100644 (file)
--- a/src/e_screen_reader_gestures.c
+++ b/src/e_screen_reader_gestures.c
@@ -181,64 +181,34 @@ static void _emit_mouse_move_event ( Ecore_Event_Mouse_Button *ev_btn)
 
 int __get_window_angle(void)
 {
-   E_Client *ec;
    E_Zone *zone;
-   int x = 0, y = 0, w = 0, h = 0;
-   E_Comp_Wl_Client_Data *cdata;
 
    zone = e_zone_current_get();
    if(!zone)
      {
-        DEBUG("Fail to found zone");
+        ERROR("Fail to find zone");
         return cover->angle;
      }
 
-   E_CLIENT_REVERSE_FOREACH(ec)
-     {
-        if (e_object_is_del(E_OBJECT(ec))) continue;
-        if (e_client_util_ignored_get(ec)) continue;
-        if (ec->zone != zone) continue;
-        if (!ec->frame) continue;
-        cdata = (E_Comp_Wl_Client_Data *)ec->comp_data;
-        if (cdata && cdata->sub.data) continue;
-
-        e_client_geometry_get(ec, &x, &y, &w, &h);
-        Eina_Bool vis = evas_object_visible_get(ec->frame);
-        if (!vis) continue;
-
-        if (E_INTERSECTS(x, y, w, h,
-                         zone->x, zone->y, zone->w, zone->h))
-             break;
-     }
-
-   if (ec)
-     {
-        cover->angle = ec->e.state.rot.ang.curr;
-        DEBUG("Window angle: %d", cover->angle);
-     }
-   else
-        ERROR("Cannot find window");
-
+   cover->angle = zone->rot.act;
    return cover->angle;
 }
 
 void __transform_coordinates(int *ax, int *ay)
 {
-    int win_angle, w, h, tmp;
+    int win_angle, tmp;
 
     win_angle = __get_window_angle();
-    ecore_wl_screen_size_get(&w, &h);
-
     switch (win_angle) {
        case 90:
           tmp = *ax;
-          *ax = h - *ay;
+          *ax = cover->zone.h - *ay;
           *ay = tmp;
           break;
        case 270:
           tmp = *ax;
           *ax = *ay;
-          *ay = w - tmp;
+          *ay = cover->zone.w - tmp;
           break;
     }
 }
@@ -882,20 +852,18 @@ _hover_gesture_mouse_up(Ecore_Event_Mouse_Button *ev, Cover *cov)
 
 void __inverse_transform_coordinates(int *ax, int *ay)
 {
-   int win_angle, w, h, tmp;
+   int win_angle, tmp;
 
    win_angle = __get_window_angle();
-   ecore_wl_screen_size_get(&w, &h);
-
    switch (win_angle) {
       case 90:
          tmp = *ax;
          *ax = *ay;
-         *ay = h - tmp;
+         *ay = cover->zone.h - tmp;
          break;
       case 270:
          tmp = *ax;
-         *ax = w - *ay;
+         *ax = cover->zone.w - *ay;
          *ay = tmp;
          break;
    }
@@ -1442,8 +1410,7 @@ _events_shutdown(void)
 static void
 _gesture_init()
 {
-   E_Zone *ez;
-   E_Client *ec;
+   E_Zone *zone;
    cover = E_NEW(Cover, 1);
    if (!cover)
      {
@@ -1456,22 +1423,21 @@ _gesture_init()
    highlighted_object_y = -1;
    scrolling = EINA_FALSE;
 
-   /* Initialize angle value */
-   ec = e_client_top_get();
-   if (ec)
+   zone = e_zone_current_get();
+   if (zone)
      {
-        cover->angle = ec->e.state.rot.ang.curr;
-        DEBUG("Default angle: %d", cover->angle);
+        /* Initialize angle value */
+        cover->angle = zone->rot.act;
+
+        /* Keep device geometry information */
+        cover->zone.x = zone->x;
+        cover->zone.y = zone->y;
+        cover->zone.w = zone->w;
+        cover->zone.h = zone->h;
      }
-
-   /* Keep device geometry information */
-   ez = e_zone_current_get();
-   if (ez)
+   else
      {
-        cover->zone.x = ez->x;
-        cover->zone.y = ez->y;
-        cover->zone.w = ez->w;
-        cover->zone.h = ez->h;
+        ERROR("Fail to find zone");
      }
 }
 
@@ -1490,7 +1456,6 @@ int _e_mod_atspi_gestures_init(void)
    DEBUG("gesture init");
    _gesture_init();
    _events_init();
-   ecore_wl_init(NULL);
 
    return 0;
 }
@@ -1501,7 +1466,6 @@ int _e_mod_atspi_gestures_shutdown(void)
 
    _events_shutdown();
    _gesture_shutdown();
-   ecore_wl_shutdown();
 
    return 0;
 }

diff --git a/src/e_screen_reader_private.h b/src/e_screen_reader_private.h
index e2d3b08..98de33d 100644 (file)
--- a/src/e_screen_reader_private.h
+++ b/src/e_screen_reader_private.h
@@ -4,7 +4,6 @@
 #include "e.h"
 #include "e_screen_reader_config.h"
 #include "e_comp.h"
-#include <Ecore_Wayland.h>
 
 extern int _eina_log_dom;