From b673668d895739fe73006bdc6e8257bb12b7f67f Mon Sep 17 00:00:00 2001 From: Duna Oh Date: Fri, 18 Dec 2015 17:35:55 +0900 Subject: [PATCH] ecore-drm: Don't send mouse_move event too early We cannot be sending an ecore_event for mouse move here as it is too early in the startup process for that too happen. Raising the event here never gets caught because the ecore_evas has not yet registered for ecore_input listening. origin: upstream https://git.enlightenment.org/core/efl.git/commit/?id=0210051a40beb2d53789ced8b6c97671ea99ef2b Signed-off-by: Duna Oh Change-Id: I14f68f75ff1cd49faa420be394798a9597f8e0c7 --- src/lib/ecore_drm/ecore_drm_evdev.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c index 05eeff6..d36035b 100644 --- a/src/lib/ecore_drm/ecore_drm_evdev.c +++ b/src/lib/ecore_drm/ecore_drm_evdev.c @@ -80,43 +80,10 @@ _device_output_set(Ecore_Drm_Evdev *edev) if (libinput_device_has_capability(edev->device, LIBINPUT_DEVICE_CAP_POINTER)) { - Ecore_Drm_Input *pointer_input; - Ecore_Event_Mouse_Move *ev; - edev->seat->ptr.ix = edev->seat->ptr.dx = edev->output->current_mode->width / 2; edev->seat->ptr.iy = edev->seat->ptr.dy = edev->output->current_mode->height / 2; edev->mouse.dx = edev->seat->ptr.dx; edev->mouse.dy = edev->seat->ptr.dy; - - /* send a fake motion event to let other know the initial pos of mouse */ - if (!(pointer_input = edev->seat->input)) return; - if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Move)))) return; - - ev->window = (Ecore_Window)pointer_input->dev->window; - ev->event_window = (Ecore_Window)pointer_input->dev->window; - ev->root_window = (Ecore_Window)pointer_input->dev->window; - - _device_modifiers_update(edev); - ev->modifiers = edev->xkb.modifiers; - ev->same_screen = 1; - - ev->x = edev->seat->ptr.ix; - ev->y = edev->seat->ptr.iy; - ev->root.x = ev->x; - ev->root.y = ev->y; - ev->multi.device = edev->mt_slot; - ev->multi.radius = 1; - ev->multi.radius_x = 1; - ev->multi.radius_y = 1; - ev->multi.pressure = 1.0; - ev->multi.angle = 0.0; - ev->multi.x = ev->x; - ev->multi.y = ev->y; - ev->multi.root.x = ev->x; - ev->multi.root.y = ev->y; - ev->dev_name = eina_stringshare_add(edev->path); - - ecore_event_add(ECORE_EVENT_MOUSE_MOVE, ev, NULL, NULL); } } -- 2.7.4