Clean up use of ecore_wl APIs

Change-Id: Id89db9dbea2f4f6b70e345a540f2ab0f43c3e132

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 0a45c4aac6f096055686c34d37b069b76581f9fd..76c5d097c184b95514371ad4bf589336bd8df727 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -4251,9 +4251,6 @@ e_comp_wl_shutdown(void)
    if (e_comp_wl->wl.shm) wl_shm_destroy(e_comp_wl->wl.shm);
    _e_comp_wl_gl_shutdown();
 
-   /* shutdown ecore_wayland */
-   ecore_wl_shutdown();
-
 #ifdef HAVE_WAYLAND_TBM
    e_comp_wl_tbm_shutdown();
 #endif

diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c
index 563a0db1abc64b7d4e5e9eca3d1c9871fc29e75e..ea1e982ce4830b7550576100e35390c493522c83 100644 (file)
--- a/src/bin/e_grabinput.c
+++ b/src/bin/e_grabinput.c
@@ -1,7 +1,6 @@
 #include "e.h"
 
 /* local subsystem functions */
-static void      _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method);
 static void      _e_grabinput_focus(Ecore_Window win, E_Focus_Method method);
 
 /* local subsystem globals */
@@ -12,7 +11,6 @@ static E_Focus_Method focus_method = E_FOCUS_METHOD_NO_INPUT;
 static double last_focus_time = 0.0;
 
 static Ecore_Window focus_fix_win = 0;
-static E_Focus_Method focus_fix_method = E_FOCUS_METHOD_NO_INPUT;
 
 /* externally accessible functions */
 EINTERN int
@@ -33,27 +31,19 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse EINA_UNUSED, Ecore_Win
 {
    if (grab_mouse_win)
      {
-        ecore_wl_input_ungrab(ecore_wl_input_get());
         grab_mouse_win = 0;
      }
    if (grab_key_win)
      {
-        ecore_wl_input_ungrab(ecore_wl_input_get());
         grab_key_win = 0;
         focus_win = 0;
      }
    if (mouse_win)
      {
-        Ecore_Wl_Window *wl_win;
-        if ((wl_win = ecore_wl_window_find(mouse_win)))
-          ecore_wl_input_grab(ecore_wl_input_get(), wl_win, 0);
         grab_mouse_win = mouse_win;
      }
    if (key_win)
      {
-        Ecore_Wl_Window *wl_win;
-        if ((wl_win = ecore_wl_window_find(key_win)))
-          ecore_wl_input_grab(ecore_wl_input_get(), wl_win, 0);
         grab_key_win = key_win;
      }
    return 1;
@@ -64,12 +54,10 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win)
 {
    if (mouse_win == grab_mouse_win)
      {
-        ecore_wl_input_ungrab(ecore_wl_input_get());
         grab_mouse_win = 0;
      }
    if (key_win == grab_key_win)
      {
-        ecore_wl_input_ungrab(ecore_wl_input_get());
         grab_key_win = 0;
         if (focus_win != 0)
           {
@@ -116,47 +104,8 @@ e_grabinput_mouse_win_get(void)
    return grab_mouse_win;
 }
 
-static void
-_e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method)
-{
-   Ecore_Wl_Window *wl_win;
-
-   switch (method)
-     {
-      case E_FOCUS_METHOD_NO_INPUT:
-        break;
-
-      case E_FOCUS_METHOD_LOCALLY_ACTIVE:
-        if ((wl_win = ecore_wl_window_find(win)))
-          {
-             /* FIXME: Need to add an ecore_wl_window_focus function */
-          }
-        break;
-
-      case E_FOCUS_METHOD_GLOBALLY_ACTIVE:
-        if ((wl_win = ecore_wl_window_find(win)))
-          {
-             /* FIXME: Need to add an ecore_wl_window_focus function */
-          }
-        break;
-
-      case E_FOCUS_METHOD_PASSIVE:
-        if ((wl_win = ecore_wl_window_find(win)))
-          {
-             /* FIXME: Need to add an ecore_wl_window_focus function */
-          }
-        break;
-
-      default:
-        break;
-     }
-}
-
 static void
 _e_grabinput_focus(Ecore_Window win, E_Focus_Method method)
 {
-   focus_fix_win = win;
-   focus_fix_method = method;
-   _e_grabinput_focus_do(win, method);
    last_focus_time = ecore_loop_time_get();
 }

diff --git a/src/bin/e_scale.c b/src/bin/e_scale.c
index db8a2a25c35f21fd9a8f349db0e74a98b4b23b90..abee544f4add84c2a205446673d5bf84e44eea68 100644 (file)
--- a/src/bin/e_scale.c
+++ b/src/bin/e_scale.c
@@ -4,6 +4,8 @@ E_API double e_scale = 1.0;
 static Eina_Bool _initted = EINA_FALSE;
 static int _dpi = -1;
 
+#define BASE_DPI 75
+
 EINTERN int
 e_scale_init(void)
 {
@@ -31,7 +33,7 @@ e_scale_update(void)
    if (e_config->scale.use_dpi)
      {
         if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
-          e_scale = (double)ecore_wl_dpi_get() / (double)e_config->scale.base_dpi;
+          e_scale = (double)BASE_DPI / (double)e_config->scale.base_dpi;
 
         if (e_scale > e_config->scale.max) e_scale = e_config->scale.max;
         else if (e_scale < e_config->scale.min)