discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e34548db01c40ee55685bfc32e00ff970695e6ff
commit e34548db01c40ee55685bfc32e00ff970695e6ff Author: Mike Blumenkrantz <[email protected]> Date: Thu Feb 12 16:17:50 2015 -0500 remove unused E_Client->input_object this is a relic from E18 --- src/bin/e_client.c | 2 +- src/bin/e_client.h | 2 -- src/bin/e_comp_x.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 1347455..bbc304e 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -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; diff --git a/src/bin/e_client.h b/src/bin/e_client.h index c29bd1e..52eff9d 100644 --- a/src/bin/e_client.h +++ b/src/bin/e_client.h @@ -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 diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 1621942..431e981 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -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; } --
