e_pixmap: remove E_PIXMAP_TYPE_X

It is deprecated.

Change-Id: Ia414b70b0366c6736710366ffb4e74297db09a9d

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 515efee..c0f7d30 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3079,24 +3079,10 @@ _e_client_eval(E_Client *ec)
 #endif
              else if (ec->dialog)
                {
-                  E_Client *trans_ec = NULL;
+                  tx = zx + ((zw - ec->w) / 2);
+                  ty = zy + ((zh - ec->h) / 2);
+                  e_client_pos_set(ec, tx, ty);
 
-                  if (ec->icccm.transient_for)
-                    trans_ec = e_pixmap_find_client(E_PIXMAP_TYPE_X, ec->icccm.transient_for);
-                  if (trans_ec)
-                    {
-                       // if transient for a window and not placed, center on
-                       // transient parent if found
-                       tx = trans_ec->x + ((trans_ec->w - ec->w) / 2);
-                       ty = trans_ec->y + ((trans_ec->h - ec->h) / 2);
-                       e_client_pos_set(ec, tx, ty);
-                    }
-                  else
-                    {
-                       tx = zx + ((zw - ec->w) / 2);
-                       ty = zy + ((zh - ec->h) / 2);
-                       e_client_pos_set(ec, tx, ty);
-                    }
                   ec->changes.pos = 1;
                   ec->placed = 1;
                   ec->pre_cb.x = ec->x; ec->pre_cb.y = ec->y;

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 56d706c..5b4715e 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -908,17 +908,6 @@ e_comp_button_bindings_grab_all(void)
      e_comp->bindings_grab_cb();
 }
 
-EINTERN void
-e_comp_client_redirect_toggle(E_Client *ec)
-{
-   EINA_SAFETY_ON_NULL_RETURN(ec);
-   if (!conf->enable_advanced_features) return;
-   if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_X) return;
-   ec->unredirected_single = !ec->unredirected_single;
-   e_client_redirected_set(ec, !ec->redirected);
-   ec->no_shape_cut = !ec->redirected;
-}
-
 EINTERN Eina_Bool
 e_comp_util_object_is_above_nocomp(Evas_Object *obj)
 {

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 980b346..b423d09 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -232,7 +232,6 @@ EINTERN Eina_Bool     e_comp_gl_get(void);
 
 EINTERN void          e_comp_button_bindings_grab_all(void);
 EINTERN void          e_comp_button_bindings_ungrab_all(void);
-EINTERN void          e_comp_client_redirect_toggle(E_Client *ec);
 EINTERN Eina_Bool     e_comp_util_object_is_above_nocomp(Evas_Object *obj);
 
 EINTERN Eina_Bool     e_comp_util_kbd_grabbed(void);

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 00bda16..9fd3e35 100644 (file)
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -187,7 +187,6 @@ _e_pixmap_find(E_Pixmap_Type type, va_list *l)
    uintptr_t id;
    E_Pixmap *cp;
 
-   if (type == E_PIXMAP_TYPE_X) return NULL;
    if (!pixmaps[type]) return NULL;
 
    id = va_arg(*l, uintptr_t);
@@ -304,7 +303,6 @@ E_API void
 e_pixmap_win_id_del(E_Pixmap *cp)
 {
    if (!cp) return;
-   if (cp->type == E_PIXMAP_TYPE_X) return;
    if (!cp->win) return;
 
    eina_hash_del_by_key(pixmaps[cp->type], &cp->win);
@@ -326,7 +324,7 @@ e_pixmap_new(E_Pixmap_Type type, ...)
    va_list l;
    uintptr_t id;
 
-   EINA_SAFETY_ON_TRUE_RETURN_VAL(type == E_PIXMAP_TYPE_X, NULL);
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(type >= E_PIXMAP_TYPE_MAX, NULL);
 
    va_start(l, type);
 

diff --git a/src/bin/e_pixmap.h b/src/bin/e_pixmap.h
index 5f72bfa..df0d7b7 100644 (file)
--- a/src/bin/e_pixmap.h
+++ b/src/bin/e_pixmap.h
@@ -4,7 +4,6 @@ typedef struct _E_Pixmap E_Pixmap;
 
 typedef enum
 {
-   E_PIXMAP_TYPE_X,
    E_PIXMAP_TYPE_WL,
    E_PIXMAP_TYPE_EXT_OBJECT,
    E_PIXMAP_TYPE_NONE,
@@ -90,7 +89,7 @@ EINTERN void *e_pixmap_ref_resource_get(E_Pixmap *cp);
 static inline Eina_Bool
 e_pixmap_is_x(const E_Pixmap *cp)
 {
-   return cp && e_pixmap_type_get(cp) == E_PIXMAP_TYPE_X;
+   return EINA_FALSE;
 }
 
 # endif