diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-06-16 15:03:09 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-06-16 12:23:07 -0400 |
commit | 43b6c2eeb1fcdb9817c99e97f235976cfdf56f29 (patch) | |
tree | a4fac723eee9fce777d1ef94afd52a274613adea /src/lib/ecore_evas/ecore_evas.c | |
parent | 4921d26fc8efa2acdf424ce47075ecb4ccacaaa4 (diff) |
ecore-evas: use pointer device with mouse move events instead of seat
Diffstat (limited to '')
-rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 07ee8e8dce..b6d82c55f9 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c | |||
@@ -3399,6 +3399,7 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee, | |||
3399 | Efl_Input_Pointer *evt; | 3399 | Efl_Input_Pointer *evt; |
3400 | Eina_Bool send_event = EINA_TRUE; | 3400 | Eina_Bool send_event = EINA_TRUE; |
3401 | Ecore_Evas_Cursor *cursor; | 3401 | Ecore_Evas_Cursor *cursor; |
3402 | Eo *seat; | ||
3402 | int fx, fy, fw, fh, evt_x, evt_y; | 3403 | int fx, fy, fw, fh, evt_x, evt_y; |
3403 | 3404 | ||
3404 | evas_output_framespace_get(ee->evas, &fx, &fy, &fw, &fh); | 3405 | evas_output_framespace_get(ee->evas, &fx, &fy, &fw, &fh); |
@@ -3406,16 +3407,20 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee, | |||
3406 | if (pointer) | 3407 | if (pointer) |
3407 | { | 3408 | { |
3408 | if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT) | 3409 | if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT) |
3409 | pointer = efl_input_device_seat_get(pointer); | 3410 | seat = efl_input_device_seat_get(pointer); |
3410 | if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT) | 3411 | else seat = pointer; |
3411 | { | ||
3412 | ERR("Could not find seat"); | ||
3413 | return; | ||
3414 | } | ||
3415 | } | 3412 | } |
3416 | else | 3413 | else |
3417 | pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT); | 3414 | { |
3418 | cursor = eina_hash_find(ee->prop.cursors, &pointer); | 3415 | pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE); |
3416 | seat = efl_input_device_seat_get(pointer); | ||
3417 | } | ||
3418 | if (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) | ||
3419 | { | ||
3420 | ERR("Could not find seat"); | ||
3421 | return; | ||
3422 | } | ||
3423 | cursor = eina_hash_find(ee->prop.cursors, &seat); | ||
3419 | if (cursor) | 3424 | if (cursor) |
3420 | { | 3425 | { |
3421 | cursor->pos_x = x; | 3426 | cursor->pos_x = x; |