enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

remove unused E_Client->input_object 

this is a relic from E18
This commit is contained in:
Mike Blumenkrantz 2015-02-12 16:17:50 -05:00
parent 5846e0febe
commit e34548db01
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_client.c
View 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;

2
src/bin/e_client.h
View 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

2
src/bin/e_comp_x.c
View 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;
}