summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-07-07 13:15:45 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-07-07 13:15:45 -0400
commiteef5efe8c373e52046c09ef2eeaa9061ae0f4a10 (patch)
tree416973e8976c9c1d31645fc1f480a657a6d59fcd
parent303edb544def2495bf62e2f55b1dc1433bd0a77e (diff)
move E_Client->mouse.in to E_Client->mouse_in to avoid abi breakage
-rw-r--r--src/bin/e_client.c6
-rw-r--r--src/bin/e_client.h2
-rw-r--r--src/bin/e_comp_x.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 5f849aa20..3eb94b890 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -2775,7 +2775,7 @@ e_client_mouse_in(E_Client *ec, int x, int y)
2775 if (ec->desk && ec->desk->animate_count) return; 2775 if (ec->desk && ec->desk->animate_count) return;
2776 ec->mouse.current.mx = x; 2776 ec->mouse.current.mx = x;
2777 ec->mouse.current.my = y; 2777 ec->mouse.current.my = y;
2778 ec->mouse.in = 1; 2778 ec->mouse_in = 1;
2779 if (!ec->iconic) 2779 if (!ec->iconic)
2780 e_focus_event_mouse_in(ec); 2780 e_focus_event_mouse_in(ec);
2781} 2781}
@@ -2791,7 +2791,7 @@ e_client_mouse_out(E_Client *ec, int x, int y)
2791 2791
2792 ec->mouse.current.mx = x; 2792 ec->mouse.current.mx = x;
2793 ec->mouse.current.my = y; 2793 ec->mouse.current.my = y;
2794 ec->mouse.in = 0; 2794 ec->mouse_in = 0;
2795 if (!ec->iconic) 2795 if (!ec->iconic)
2796 e_focus_event_mouse_out(ec); 2796 e_focus_event_mouse_out(ec);
2797} 2797}
@@ -3488,7 +3488,7 @@ e_client_focused_set(E_Client *ec)
3488 ec_unfocus->want_focus = ec_unfocus->focused = 0; 3488 ec_unfocus->want_focus = ec_unfocus->focused = 0;
3489 if (!e_object_is_del(E_OBJECT(ec_unfocus))) 3489 if (!e_object_is_del(E_OBJECT(ec_unfocus)))
3490 e_focus_event_focus_out(ec_unfocus); 3490 e_focus_event_focus_out(ec_unfocus);
3491 if (ec_unfocus->mouse.in) 3491 if (ec_unfocus->mouse_in)
3492 e_client_mouse_out(ec_unfocus, ec_unfocus->x - 1, ec_unfocus->y - 1); 3492 e_client_mouse_out(ec_unfocus, ec_unfocus->x - 1, ec_unfocus->y - 1);
3493 3493
3494 E_FREE_FUNC(ec_unfocus->raise_timer, ecore_timer_del); 3494 E_FREE_FUNC(ec_unfocus->raise_timer, ecore_timer_del);
diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 5fdeb9034..fa4d86417 100644
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -272,7 +272,6 @@ struct E_Client
272 int x, y, w, h; 272 int x, y, w, h;
273 int mx, my; 273 int mx, my;
274 } current, last_down[3], last_up[3]; 274 } current, last_down[3], last_up[3];
275 Eina_Bool in : 1;
276 } mouse; 275 } mouse;
277 276
278 struct 277 struct
@@ -699,6 +698,7 @@ struct E_Client
699#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) 698#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
700 uuid_t uuid; 699 uuid_t uuid;
701#endif 700#endif
701 Eina_Bool mouse_in : 1;
702}; 702};
703 703
704#define e_client_focus_policy_click(ec) \ 704#define e_client_focus_policy_click(ec) \
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 06fedc624..07f4ae268 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -2139,7 +2139,7 @@ _e_comp_x_mouse_move(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Mouse_M
2139 if ((!ec) && (ev->window != ev->event_window)) 2139 if ((!ec) && (ev->window != ev->event_window))
2140 ec = _e_comp_x_client_find_by_window(ev->event_window); 2140 ec = _e_comp_x_client_find_by_window(ev->event_window);
2141 if ((!ec) || e_client_util_ignored_get(ec)) return ECORE_CALLBACK_RENEW; 2141 if ((!ec) || e_client_util_ignored_get(ec)) return ECORE_CALLBACK_RENEW;
2142 if (!ec->mouse.in) 2142 if (!ec->mouse_in)
2143 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)); 2143 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));
2144 return ECORE_CALLBACK_RENEW; 2144 return ECORE_CALLBACK_RENEW;
2145 } 2145 }