[EGIT] [core/enlightenment] master 01/03: Pass along the evas_event for mouse_in/out on a surface to the smart callback.

[Chris Michael - Enlightenment Git <no-reply@en...>]

devilhorns pushed a commit to branch master.

commit fddd57c7d9b90dfed75093e2bb30ac26b696115b
Author: Chris Michael <cp.michael@...>
Date:   Thu Sep 12 14:57:58 2013 +0100

    Pass along the evas_event for mouse_in/out on a surface to the smart
    callback.
    
    Signed-off-by: Chris Michael <cp.michael@...>
---
 src/bin/e_surface.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_surface.c b/src/bin/e_surface.c
index d2063ca..1e61362 100644
--- a/src/bin/e_surface.c
+++ b/src/bin/e_surface.c
@@ -40,8 +40,8 @@ static void _e_smart_clip_unset(Evas_Object *obj);
 /* local function prototypes */
 static void _e_surface_cb_focus_in(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED);
 static void _e_surface_cb_focus_out(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED);
-static void _e_surface_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED);
-static void _e_surface_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED);
+static void _e_surface_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event);
+static void _e_surface_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_surface_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_surface_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_surface_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event);
@@ -370,15 +370,15 @@ _e_surface_cb_focus_out(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNU
 }
 
 static void 
-_e_surface_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
+_e_surface_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event)
 {
-   evas_object_smart_callback_call(data, "mouse_in", NULL);
+   evas_object_smart_callback_call(data, "mouse_in", event);
 }
 
 static void 
-_e_surface_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
+_e_surface_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event)
 {
-   evas_object_smart_callback_call(data, "mouse_out", NULL);
+   evas_object_smart_callback_call(data, "mouse_out", event);
 }
 
 static void 

-- 

[EGIT] [core/enlightenment] master 02/03: Fix zmike issue w/ surface losing focus when we move/resize.

[Chris Michael - Enlightenment Git <no-reply@en...>]

devilhorns pushed a commit to branch master.

commit 599d98e3f3618c8ef031f7a5b4748c48d9926e6d
Author: Chris Michael <cp.michael@...>
Date:   Thu Sep 12 14:58:44 2013 +0100

    Fix zmike issue w/ surface losing focus when we move/resize.
    
    Signed-off-by: Chris Michael <cp.michael@...>
---
 src/bin/e_comp_wl.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 328b825..719d125 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -592,9 +592,7 @@ wl_pointer_set_focus(struct wl_pointer *pointer, struct wl_resource *surface, wl
      }
 
    resource = _find_resource_for_surface(&pointer->resource_list, surface);
-   if (resource &&
-       (pointer->focus != surface ||
-           pointer->focus_resource != resource)) 
+   if (resource)
      {
         struct wl_display *disp;
 
@@ -2249,7 +2247,6 @@ _e_comp_wl_pointer_configure(E_Wayland_Surface *ews, Evas_Coord x, Evas_Coord y,
    if (!input->wl.seat.pointer->focus) return;
 
    if ((focus = wl_resource_get_user_data(input->wl.seat.pointer->focus)))
-//   if ((focus = (E_Wayland_Surface *)input->wl.seat.pointer->focus))
      {
         /* NB: Ideally, I wanted to use the e_pointer methods here so that 
          * the cursor would match the E theme, however Wayland currently 

-- 

[EGIT] [core/enlightenment] master 01/03: Pass along the evas_event for mouse_in/out on a surface to the smart callback.

[Chris Michael - Enlightenment Git <no-reply@en...>]

devilhorns pushed a commit to branch master.

commit fddd57c7d9b90dfed75093e2bb30ac26b696115b
Author: Chris Michael <cp.michael@...>
Date:   Thu Sep 12 14:57:58 2013 +0100

    Pass along the evas_event for mouse_in/out on a surface to the smart
    callback.
    
    Signed-off-by: Chris Michael <cp.michael@...>
---
 src/bin/e_surface.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_surface.c b/src/bin/e_surface.c
index d2063ca..1e61362 100644
--- a/src/bin/e_surface.c
+++ b/src/bin/e_surface.c
@@ -40,8 +40,8 @@ static void _e_smart_clip_unset(Evas_Object *obj);
 /* local function prototypes */
 static void _e_surface_cb_focus_in(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED);
 static void _e_surface_cb_focus_out(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED);
-static void _e_surface_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED);
-static void _e_surface_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED);
+static void _e_surface_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event);
+static void _e_surface_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_surface_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_surface_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_surface_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event);
@@ -370,15 +370,15 @@ _e_surface_cb_focus_out(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNU
 }
 
 static void 
-_e_surface_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
+_e_surface_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event)
 {
-   evas_object_smart_callback_call(data, "mouse_in", NULL);
+   evas_object_smart_callback_call(data, "mouse_in", event);
 }
 
 static void 
-_e_surface_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
+_e_surface_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event)
 {
-   evas_object_smart_callback_call(data, "mouse_out", NULL);
+   evas_object_smart_callback_call(data, "mouse_out", event);
 }
 
 static void 

-- 

[EGIT] [core/enlightenment] master 03/03: Fix zmike issue w/ surface losing focus when we move/resize. - Check if surface is still focused by the pointer on focus_out events NB: Needed due to spurious focus_out events we receive from evas/edje - On spurious mouse_out event, check if pointer is actually still inside the surface. - Cleanup Move and Resize Grab code (don't need a binding event struct here).

[Chris Michael - Enlightenment Git <no-reply@en...>]

devilhorns pushed a commit to branch master.

commit 09768f143c4c360c36e9e08efa428119ee9ffb11
Author: Chris Michael <cp.michael@...>
Date:   Thu Sep 12 14:59:51 2013 +0100

    Fix zmike issue w/ surface losing focus when we move/resize.
     - Check if surface is still focused by the pointer on focus_out events
       NB: Needed due to spurious focus_out events we receive from evas/edje
     - On spurious mouse_out event, check if pointer is actually still
    inside the surface.
     - Cleanup Move and Resize Grab code (don't need a binding event
    struct here).
    
    Signed-off-by: Chris Michael <cp.michael@...>
---
 src/modules/wl_desktop_shell/e_mod_main.c | 76 +++++++++++++++++--------------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index 9393754..c422dd9 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -46,7 +46,7 @@ static void _e_wl_shell_shell_surface_cb_render_post(void *data, Evas *evas EINA
 static void _e_wl_shell_shell_surface_cb_focus_in(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED);
 static void _e_wl_shell_shell_surface_cb_focus_out(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED);
 static void _e_wl_shell_shell_surface_cb_mouse_in(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED);
-static void _e_wl_shell_shell_surface_cb_mouse_out(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED);
+static void _e_wl_shell_shell_surface_cb_mouse_out(void *data, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_wl_shell_shell_surface_cb_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_wl_shell_shell_surface_cb_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, void *event);
 static void _e_wl_shell_shell_surface_cb_mouse_down(void *data, Evas_Object *obj EINA_UNUSED, void *event);
@@ -58,7 +58,7 @@ static void _e_wl_shell_shell_surface_cb_bd_resize_update(void *data, void *bd);
 static void _e_wl_shell_shell_surface_cb_bd_resize_end(void *data, void *bd);
 
 static void _e_wl_shell_mouse_down_helper(E_Border *bd, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev, Eina_Bool move);
-static void _e_wl_shell_mouse_up_helper(E_Border *bd, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
+static void _e_wl_shell_mouse_up_helper(E_Border *bd, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev);
 
 /* shell surface interface prototypes */
 static void _e_wl_shell_shell_surface_cb_pong(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, unsigned int serial);
@@ -73,7 +73,7 @@ static void _e_wl_shell_shell_surface_cb_title_set(struct wl_client *client EINA
 static void _e_wl_shell_shell_surface_cb_class_set(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, const char *clas);
 
 /* shell move_grab interface prototypes */
-static void _e_wl_shell_move_grab_cb_focus(struct wl_pointer_grab *grab, struct wl_resource *surface EINA_UNUSED, wl_fixed_t x EINA_UNUSED, wl_fixed_t y EINA_UNUSED);
+static void _e_wl_shell_move_grab_cb_focus(struct wl_pointer_grab *grab, struct wl_resource *surface, wl_fixed_t x EINA_UNUSED, wl_fixed_t y EINA_UNUSED);
 static void _e_wl_shell_move_grab_cb_motion(struct wl_pointer_grab *grab, unsigned int timestamp EINA_UNUSED, wl_fixed_t x, wl_fixed_t y);
 static void _e_wl_shell_move_grab_cb_button(struct wl_pointer_grab *grab, unsigned int timestamp EINA_UNUSED, unsigned int button EINA_UNUSED, unsigned int state);
 
@@ -1186,6 +1186,7 @@ _e_wl_shell_shell_surface_cb_focus_out(void *data, Evas_Object *obj EINA_UNUSED,
    E_Wayland_Surface *ews = NULL;
    E_Wayland_Input *input = NULL;
    Eina_List *l = NULL;
+   struct wl_pointer *ptr;
 
    /* try to cast data to our surface structure */
    if (!(ews = data)) return;
@@ -1193,6 +1194,12 @@ _e_wl_shell_shell_surface_cb_focus_out(void *data, Evas_Object *obj EINA_UNUSED,
    /* if this surface is not visible, get out */
    if (!ews->mapped) return;
 
+   if ((ptr = _e_wl_comp->input->wl.seat.pointer))
+     {
+        if (ews->wl.surface == ptr->current)
+          return;
+     }
+
    /* loop the list of inputs */
    EINA_LIST_FOREACH(_e_wl_comp->seats, l, input)
      {
@@ -1236,14 +1243,21 @@ _e_wl_shell_shell_surface_cb_mouse_in(void *data, Evas_Object *obj EINA_UNUSED,
 }
 
 static void 
-_e_wl_shell_shell_surface_cb_mouse_out(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
+_e_wl_shell_shell_surface_cb_mouse_out(void *data, Evas_Object *obj EINA_UNUSED, void *event)
 {
    E_Wayland_Surface *ews = NULL;
    struct wl_pointer *ptr = NULL;
+   Evas_Event_Mouse_Out *ev;
+
+   ev = event;
 
    /* try to cast data to our surface structure */
    if (!(ews = data)) return;
 
+   if (E_INSIDE(ev->canvas.x, ev->canvas.y, ews->geometry.x, ews->geometry.y, 
+                ews->geometry.w, ews->geometry.h))
+     return;
+
    /* if (!ews->input) return; */
 
    /* try to get the pointer from this input */
@@ -2093,13 +2107,15 @@ _e_wl_shell_shell_surface_cb_class_set(struct wl_client *client EINA_UNUSED, str
 
 /* shell move_grab interface functions */
 static void 
-_e_wl_shell_move_grab_cb_focus(struct wl_pointer_grab *grab, struct wl_resource *surface EINA_UNUSED, wl_fixed_t x EINA_UNUSED, wl_fixed_t y EINA_UNUSED)
+_e_wl_shell_move_grab_cb_focus(struct wl_pointer_grab *grab, struct wl_resource *surface, wl_fixed_t x EINA_UNUSED, wl_fixed_t y EINA_UNUSED)
 {
+   struct wl_pointer *ptr;
+
    /* safety */
    if (!grab) return;
 
-   /* remove focus */
-   grab->focus = NULL;
+   ptr = grab->pointer;
+   ptr->current = surface;
 }
 
 static void 
@@ -2140,31 +2156,27 @@ _e_wl_shell_move_grab_cb_button(struct wl_pointer_grab *grab, unsigned int times
        (state == WL_POINTER_BUTTON_STATE_RELEASED))
      {
         E_Wayland_Surface *ews = NULL;
-        E_Binding_Event_Mouse_Button *ev;
+        int btn, x, y;
 
         if (!(ews = ewsg->shell_surface->surface)) return;
 
-        /* create a fake binding event for mouse button */
-        ev = E_NEW(E_Binding_Event_Mouse_Button, 1);
-
         /* set button property of the binding event */
         if (ptr->grab_button == BTN_LEFT)
-          ev->button = 1;
+          btn = 1;
         else if (ptr->grab_button == BTN_MIDDLE)
-          ev->button = 2;
+          btn = 2;
         else if (ptr->grab_button == BTN_RIGHT)
-          ev->button = 3;
+          btn = 3;
 
         /* set the clicked location in the binding event */
-        ev->canvas.x = wl_fixed_to_int(ptr->x) + 
+        x = wl_fixed_to_int(ptr->x) + 
           (ews->bd->x + ews->bd->client_inset.l);
-        ev->canvas.y = wl_fixed_to_int(ptr->y) + 
+        y = wl_fixed_to_int(ptr->y) + 
           (ews->bd->y + ews->bd->client_inset.t);
 
         /* call our helper function to end a move */
-        _e_wl_shell_mouse_up_helper(ews->bd, ev->button, 
-                                    &(Evas_Point){ev->canvas.x, ev->canvas.y}, 
-                                    ev);
+        _e_wl_shell_mouse_up_helper(ews->bd, btn, 
+                                    &(Evas_Point){x, y}, NULL);
 
         /* end the grab */
         _e_wl_shell_grab_end(ewsg);
@@ -2181,11 +2193,13 @@ _e_wl_shell_move_grab_cb_button(struct wl_pointer_grab *grab, unsigned int times
 static void 
 _e_wl_shell_resize_grab_cb_focus(struct wl_pointer_grab *grab, struct wl_resource *surface EINA_UNUSED, wl_fixed_t x EINA_UNUSED, wl_fixed_t y EINA_UNUSED)
 {
+   struct wl_pointer *ptr;
+
    /* safety */
    if (!grab) return;
 
-   /* remove focus */
-   grab->focus = NULL;
+   ptr = grab->pointer;
+   ptr->current = surface;
 }
 
 static void 
@@ -2226,31 +2240,27 @@ _e_wl_shell_resize_grab_cb_button(struct wl_pointer_grab *grab, unsigned int tim
        (state == WL_POINTER_BUTTON_STATE_RELEASED))
      {
         E_Wayland_Surface *ews = NULL;
-        E_Binding_Event_Mouse_Button *ev;
+        int btn, x, y;
 
         if (!(ews = ewsg->shell_surface->surface)) return;
 
-        /* create a fake binding event for mouse button */
-        ev = E_NEW(E_Binding_Event_Mouse_Button, 1);
-
         /* set button property of the binding event */
         if (ptr->grab_button == BTN_LEFT)
-          ev->button = 1;
+          btn = 1;
         else if (ptr->grab_button == BTN_MIDDLE)
-          ev->button = 2;
+          btn = 2;
         else if (ptr->grab_button == BTN_RIGHT)
-          ev->button = 3;
+          btn = 3;
 
         /* set the clicked location in the binding event */
-        ev->canvas.x = wl_fixed_to_int(ptr->x) + 
+        x = wl_fixed_to_int(ptr->x) + 
           (ews->bd->x + ews->bd->client_inset.l);
-        ev->canvas.y = wl_fixed_to_int(ptr->y) + 
+        y = wl_fixed_to_int(ptr->y) + 
           (ews->bd->y + ews->bd->client_inset.t);
 
         /* call our helper function to end a move */
-        _e_wl_shell_mouse_up_helper(ews->bd, ev->button, 
-                                    &(Evas_Point){ev->canvas.x, ev->canvas.y}, 
-                                    ev);
+        _e_wl_shell_mouse_up_helper(ews->bd, btn, 
+                                    &(Evas_Point){x, y}, NULL);
 
         /* end the grab */
         _e_wl_shell_grab_end(ewsg);

--