enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Fix pointer grab fields. 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2013-06-14 10:02:18 +01:00
parent 2093443237
commit 29b736fe37
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/modules/wl_x11/e_mod_main.c
View File

@ -525,8 +525,6 @@ _input_mouse_down_send(E_Input *input, Ecore_Event_Mouse_Button *ev)
if (!(ptr = input->pointer)) return; if (!(ptr = input->pointer)) return;
/* TODO: ping handler */
if ((ptr->seat) && (ptr->seat->compositor)) if ((ptr->seat) && (ptr->seat->compositor))
{ {
if ((ptr->seat->compositor->cb_ping) && (ptr->focus)) if ((ptr->seat->compositor->cb_ping) && (ptr->focus))
@ -541,15 +539,15 @@ _input_mouse_down_send(E_Input *input, Ecore_Event_Mouse_Button *ev)
} }
if (ptr->button_count == 0) if (ptr->grab->button_count == 0)
{ {
ptr->grab_button = ev->buttons; ptr->grab->button = ev->buttons;
ptr->grab_time = ev->timestamp; ptr->grab->timestamp = ev->timestamp;
ptr->grab_x = ptr->x; ptr->grab->x = ptr->x;
ptr->grab_y = ptr->y; ptr->grab->y = ptr->y;
} }
ptr->button_count++; ptr->grab->button_count++;
if ((ptr->grab) && (ptr->grab->interface)) if ((ptr->grab) && (ptr->grab->interface))
{ {
@ -558,9 +556,9 @@ _input_mouse_down_send(E_Input *input, Ecore_Event_Mouse_Button *ev)
WL_POINTER_BUTTON_STATE_PRESSED); WL_POINTER_BUTTON_STATE_PRESSED);
} }
if (ptr->button_count == 1) if (ptr->grab->button_count == 1)
{ {
ptr->grab_serial = ptr->grab->serial =
wl_display_get_serial(ptr->seat->compositor->wl.display); wl_display_get_serial(ptr->seat->compositor->wl.display);
} }
} }
@ -569,22 +567,21 @@ static void
_input_mouse_up_send(E_Input *input, Ecore_Event_Mouse_Button *ev) _input_mouse_up_send(E_Input *input, Ecore_Event_Mouse_Button *ev)
{ {
E_Input_Pointer *ptr; E_Input_Pointer *ptr;
unsigned int serial = 0;
if (!(ptr = input->pointer)) return; if (!(ptr = input->pointer)) return;
ptr->button_count--;
if ((ptr->grab) && (ptr->grab->interface)) if ((ptr->grab) && (ptr->grab->interface))
{ {
ptr->grab->button_count--;
if (ptr->grab->interface->button) if (ptr->grab->interface->button)
ptr->grab->interface->button(ptr->grab, ev->timestamp, ev->buttons, ptr->grab->interface->button(ptr->grab, ev->timestamp, ev->buttons,
WL_POINTER_BUTTON_STATE_RELEASED); WL_POINTER_BUTTON_STATE_RELEASED);
}
if (ptr->button_count == 1) if (ptr->grab->button_count == 1)
{ {
ptr->grab_serial = ptr->grab->serial =
wl_display_get_serial(ptr->seat->compositor->wl.display); wl_display_get_serial(ptr->seat->compositor->wl.display);
} }
}
} }