discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5bebba3036212b7b0fe56a7bb314ef4357c28ede
commit 5bebba3036212b7b0fe56a7bb314ef4357c28ede
Author: Bryce Harrington <br...@osg.samsung.com>
Date: Wed Feb 25 22:00:11 2015 -0500
wayland: Refactor out common mouse handling code
Summary:
These two functions are nearly identical so move much of the common code
into a helper function.
Reviewers: cedric, devilhorns, zmike
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2053
---
src/bin/e_comp_wl.c | 78 +++++++++++++++++++----------------------------------
1 file changed, 28 insertions(+), 50 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index c0605d8..1ce576b 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -257,23 +257,15 @@ _e_comp_wl_evas_cb_mouse_move(void *data, Evas *evas
EINA_UNUSED, Evas_Object *o
}
}
-static void
-_e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *event)
+static Eina_Bool
+_e_comp_wl_evas_handle_mouse_button(E_Client *ec, uint32_t timestamp, uint32_t
button_id, uint32_t state)
{
- E_Client *ec;
- Evas_Event_Mouse_Down *ev;
- struct wl_resource *res;
- struct wl_client *wc;
Eina_List *l;
+ struct wl_client *wc;
uint32_t serial, btn;
+ struct wl_resource *res;
- ev = event;
- if (!(ec = data)) return;
- if (ec->cur_mouse_action) return;
- if (e_object_is_del(E_OBJECT(ec))) return;
- if (e_client_util_ignored_get(ec)) return;
-
- switch (ev->button)
+ switch (button_id)
{
case 1:
btn = BTN_LEFT;
@@ -285,34 +277,31 @@ _e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas
EINA_UNUSED, Evas_Object *o
btn = BTN_RIGHT;
break;
default:
- btn = ev->button;
+ btn = button_id;
break;
}
ec->comp->wl_comp_data->ptr.button = btn;
- if (!ec->comp_data->surface) return;
+ if (!ec->comp_data->surface) return EINA_FALSE;
wc = wl_resource_get_client(ec->comp_data->surface);
serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
+
EINA_LIST_FOREACH(ec->comp->wl_comp_data->ptr.resources, l, res)
{
- if (!e_comp_wl_input_pointer_check(res)) continue;
if (wl_resource_get_client(res) != wc) continue;
- wl_pointer_send_button(res, serial, ev->timestamp, btn,
- WL_POINTER_BUTTON_STATE_PRESSED);
+ if (!e_comp_wl_input_pointer_check(res)) continue;
+ wl_pointer_send_button(res, serial, timestamp, btn, state);
}
+ return EINA_TRUE;
}
static void
-_e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *event)
+_e_comp_wl_evas_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *event)
{
E_Client *ec;
- Evas_Event_Mouse_Up *ev;
- struct wl_resource *res;
- struct wl_client *wc;
- Eina_List *l;
- uint32_t serial, btn;
+ Evas_Event_Mouse_Down *ev;
ev = event;
if (!(ec = data)) return;
@@ -320,35 +309,24 @@ _e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas
EINA_UNUSED, Evas_Object *obj
if (e_object_is_del(E_OBJECT(ec))) return;
if (e_client_util_ignored_get(ec)) return;
- switch (ev->button)
- {
- case 1:
- btn = BTN_LEFT;
- break;
- case 2:
- btn = BTN_MIDDLE;
- break;
- case 3:
- btn = BTN_RIGHT;
- break;
- default:
- btn = ev->button;
- break;
- }
+ _e_comp_wl_evas_handle_mouse_button(ec, ev->timestamp, ev->button,
+ WL_POINTER_BUTTON_STATE_PRESSED);
+}
- ec->comp->wl_comp_data->ptr.button = btn;
+static void
+_e_comp_wl_evas_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *event)
+{
+ E_Client *ec;
+ Evas_Event_Mouse_Up *ev;
- if (!ec->comp_data->surface) return;
+ ev = event;
+ if (!(ec = data)) return;
+ if (ec->cur_mouse_action) return;
+ if (e_object_is_del(E_OBJECT(ec))) return;
+ if (e_client_util_ignored_get(ec)) return;
- wc = wl_resource_get_client(ec->comp_data->surface);
- serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
- EINA_LIST_FOREACH(ec->comp->wl_comp_data->ptr.resources, l, res)
- {
- if (!e_comp_wl_input_pointer_check(res)) continue;
- if (wl_resource_get_client(res) != wc) continue;
- wl_pointer_send_button(res, serial, ev->timestamp, btn,
- WL_POINTER_BUTTON_STATE_RELEASED);
- }
+ _e_comp_wl_evas_handle_mouse_button(ec, ev->timestamp, ev->button,
+ WL_POINTER_BUTTON_STATE_RELEASED);
}
static void
--
