remove unused E_Client->input_object
authorMike Blumenkrantz <zmike@osg.samsung.com>
Thu, 12 Feb 2015 21:17:50 +0000 (16:17 -0500)
committerMike Blumenkrantz <zmike@osg.samsung.com>
Thu, 12 Feb 2015 21:17:50 +0000 (16:17 -0500)
this is a relic from E18

src/bin/e_client.c
src/bin/e_client.h
src/bin/e_comp_x.c

index 13474551a26ba023c4c303b00775065c46c014f3..bbc304eeef670cdec1fae1d59c4bfee3173fe7e6 100644 (file)
@@ -2702,7 +2702,7 @@ 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 ((!ec->input_object) && E_INSIDE(x, y, ec->x, ec->y, ec->w, ec->h)) return;
+   if (E_INSIDE(x, y, ec->x, ec->y, ec->w, ec->h)) return;
 
    ec->mouse.current.mx = x;
    ec->mouse.current.my = y;
index c29bd1ee8d4152e9bb4e548f4ccc2089a817da37..52eff9dd6def67e68f338c330f94b500834a375d 100644 (file)
@@ -259,8 +259,6 @@ struct E_Client
 
    E_Comp_Client_Data       *comp_data;
 
-   Evas_Object *input_object; //for running wayland clients in X
-
    E_Action                  *cur_mouse_action;
 
    int               border_size; //size of client's border
index 1621942d9b7e81d584676e5266636074f3ba7b0a..431e9814531c943b2dc6d8ae35ddc12cf175a44f 100644 (file)
@@ -2035,7 +2035,6 @@ _e_comp_x_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_M
    ec = _e_comp_x_client_find_by_window(ev->win);
    if (!ec) return ECORE_CALLBACK_RENEW;
    if (ec->comp_data->deleted) return ECORE_CALLBACK_RENEW;
-   if (ec->input_object) return ECORE_CALLBACK_RENEW;
    e_client_mouse_in(ec, e_comp_canvas_x_root_adjust(ec->comp, ev->root.x), e_comp_canvas_x_root_adjust(ec->comp, ev->root.y));
    return ECORE_CALLBACK_RENEW;
 }
@@ -2056,7 +2055,6 @@ _e_comp_x_mouse_out(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_
    ec = _e_comp_x_client_find_by_window(ev->win);
    if (!ec) return ECORE_CALLBACK_RENEW;
    if (ec->comp_data->deleted) return ECORE_CALLBACK_RENEW;
-   if (ec->input_object) return ECORE_CALLBACK_RENEW;
    e_client_mouse_out(ec, e_comp_canvas_x_root_adjust(ec->comp, ev->root.x), e_comp_canvas_x_root_adjust(ec->comp, ev->root.y));
    return ECORE_CALLBACK_RENEW;
 }