discomfitor pushed a commit to branch enlightenment-0.19.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=eef5efe8c373e52046c09ef2eeaa9061ae0f4a10

commit eef5efe8c373e52046c09ef2eeaa9061ae0f4a10
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Jul 7 13:15:45 2015 -0400

    move E_Client->mouse.in to E_Client->mouse_in to avoid abi breakage
---
 src/bin/e_client.c | 6 +++---
 src/bin/e_client.h | 2 +-
 src/bin/e_comp_x.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 5f849aa..3eb94b8 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)
    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);
diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 5fdeb90..fa4d864 100644
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -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) \
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 06fedc6..07f4ae2 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
         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;
      }

-- 


Reply via email to