e_pixmap: remove e_pixmap_is_x

It is deprecated.

Change-Id: I4758ba93d6ed1f03868d968cf0df64175f7d6677

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index c0f7d30..4a01dac 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3422,15 +3422,8 @@ _e_client_frame_update(E_Client *ec)
      bordername = "noresize";
    else if (ec->shaped)
      bordername = "shaped";
-   else if (e_pixmap_is_x(ec->pixmap) &&
-            ((!ec->icccm.accepts_focus) &&
-            (!ec->icccm.take_focus)))
-     bordername = "nofocus";
    else if (ec->urgent)
      bordername = "urgent";
-   else if (((ec->icccm.transient_for != 0) || (ec->dialog)) && 
-            (e_pixmap_is_x(ec->pixmap)))
-     bordername = "dialog";
    else if (ec->netwm.state.modal)
      bordername = "modal";
    else if ((ec->netwm.state.skip_taskbar) ||
@@ -5062,7 +5055,6 @@ e_client_mouse_out(E_Client *ec, int x, int y)
    if (ec->fullscreen) return;
    if (e_object_is_del(E_OBJECT(ec))) return;
    if (ec->desk && ec->desk->animate_count) return;
-   if (e_pixmap_is_x(ec->pixmap) && E_INSIDE(x, y, ec->x, ec->y, ec->w, ec->h)) return;
 
    ec->mouse.current.mx = x;
    ec->mouse.current.my = y;

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 59b9ae5..d3828e2 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1039,7 +1039,7 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
                  ((name) && (m->name) && (!e_util_glob_match(name, m->name))))
                continue;
              if (!_e_comp_object_shadow_client_match(cw->ec, m)) continue;
-             
+
              focus = m->focus;
              urgent = m->urgent;
              no_shadow = m->no_shadow;
@@ -2117,7 +2117,7 @@ _e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack, E_Comp_Obj
           }
         if (!o)
           /* top client layer window hasn't been stacked yet. this probably shouldn't happen?
-           * return here since the top client layer window 
+           * return here since the top client layer window
            */
           {
              E_Client *ec;
@@ -2524,10 +2524,6 @@ _e_comp_intercept_show_helper(E_Comp_Object *cw)
      }
    /* re-set geometry */
    evas_object_move(cw->smart_obj, ec->x, ec->y);
-   /* ensure that some kind of frame calc has occurred if there's a frame */
-   if (e_pixmap_is_x(ec->pixmap) && cw->frame_object &&
-       (ec->h == ec->client.h) && (ec->w == ec->client.w))
-     CRI("ACK! ec:%p", ec);
    /* force resize in case it hasn't happened yet, or just to update size */
    evas_object_resize(cw->smart_obj, ec->w, ec->h);
    if ((cw->w < 1) || (cw->h < 1))
@@ -3645,7 +3641,7 @@ _e_comp_object_util_show(void *data EINA_UNUSED, Evas_Object *obj)
           /* already visible */
           return;
      }
-   
+
    evas_object_show(obj);
    if (ref)
      {

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 65c4359..c94f851 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -246,7 +246,7 @@ _e_comp_wl_focus_check(void)
 
    if (stopping) return;
    ec = e_client_focused_get();
-   if ((!ec) || e_pixmap_is_x(ec->pixmap))
+   if (!ec)
      e_grabinput_focus(e_comp->ee_win, E_FOCUS_METHOD_PASSIVE);
 }
 

diff --git a/src/bin/e_pixmap.h b/src/bin/e_pixmap.h
index df0d7b7..801f50e 100644 (file)
--- a/src/bin/e_pixmap.h
+++ b/src/bin/e_pixmap.h
@@ -86,12 +86,6 @@ E_API void e_pixmap_buffer_clear(E_Pixmap *cp, Eina_Bool only_free);
 EINTERN void e_pixmap_buffer_clear_cancel(E_Pixmap *cp);
 EINTERN void *e_pixmap_ref_resource_get(E_Pixmap *cp);
 
-static inline Eina_Bool
-e_pixmap_is_x(const E_Pixmap *cp)
-{
-   return EINA_FALSE;
-}
-
 # endif
 
 #endif