rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move E_Client->mouse.in to E_Client->mouse_in to avoid abi breakage

This commit is contained in:
Mike Blumenkrantz 2015-07-07 13:15:45 -04:00
parent 303edb544d
commit eef5efe8c3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_client.c
View File

@ -2775,7 +2775,7 @@ e_client_mouse_in(E_Client *ec, int x, int y)
if (ec->desk && ec->desk->animate_count) return;
ec->mouse.current.mx = x;
ec->mouse.current.my = y;
ec->mouse.in = 1;
ec->mouse_in = 1;
if (!ec->iconic)
e_focus_event_mouse_in(ec);
}
@ -2791,7 +2791,7 @@ e_client_mouse_out(E_Client *ec, int x, int y)
ec->mouse.current.mx = x;
ec->mouse.current.my = y;
ec->mouse.in = 0;
ec->mouse_in = 0;
if (!ec->iconic)
e_focus_event_mouse_out(ec);
}
@ -3488,7 +3488,7 @@ e_client_focused_set(E_Client *ec)
ec_unfocus->want_focus = ec_unfocus->focused = 0;
if (!e_object_is_del(E_OBJECT(ec_unfocus)))
e_focus_event_focus_out(ec_unfocus);
if (ec_unfocus->mouse.in)
if (ec_unfocus->mouse_in)
e_client_mouse_out(ec_unfocus, ec_unfocus->x - 1, ec_unfocus->y - 1);
E_FREE_FUNC(ec_unfocus->raise_timer, ecore_timer_del);

2
src/bin/e_client.h
View File

@ -272,7 +272,6 @@ struct E_Client
int x, y, w, h;
int mx, my;
} current, last_down[3], last_up[3];
Eina_Bool in : 1;
} mouse;
struct
@ -699,6 +698,7 @@ struct E_Client
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
uuid_t uuid;
#endif
Eina_Bool mouse_in : 1;
};
#define e_client_focus_policy_click(ec) \

2
src/bin/e_comp_x.c
View File

@ -2139,7 +2139,7 @@ _e_comp_x_mouse_move(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Mouse_M
if ((!ec) && (ev->window != ev->event_window))
ec = _e_comp_x_client_find_by_window(ev->event_window);
if ((!ec) || e_client_util_ignored_get(ec)) return ECORE_CALLBACK_RENEW;
if (!ec->mouse.in)
if (!ec->mouse_in)
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;
}