borisfaure
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: change _evas_pointer_data_add() to return created pointer data

This commit is contained in:
Mike Blumenkrantz 2017-06-16 15:03:09 -04:00
parent 8dd12d2cfa
commit 7ca2da0f5d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/evas/canvas/evas_main.c
View File

@ -1160,7 +1160,7 @@ _evas_pointer_data_by_device_get(Evas_Public_Data *edata, Efl_Input_Device *poin
return NULL;
}
Eina_Bool
Evas_Pointer_Data *
_evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer)
{
Evas_Pointer_Data *pdata;
@ -1168,13 +1168,13 @@ _evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer)
Eo *seat;
seat = efl_input_device_seat_get(pointer);
EINA_SAFETY_ON_NULL_RETURN_VAL(seat, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(seat, NULL);
EINA_INLIST_FOREACH(edata->seats, pseat)
if (pseat->seat == seat) break;
if (!pseat)
{
pseat = calloc(1, sizeof(Evas_Pointer_Seat));
EINA_SAFETY_ON_NULL_RETURN_VAL(pseat, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(pseat, NULL);
pseat->seat = seat;
edata->seats = eina_inlist_append(edata->seats, EINA_INLIST_GET(pseat));
}
@ -1187,13 +1187,13 @@ _evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer)
free(pseat);
}
ERR("alloc fail");
return EINA_FALSE;
return NULL;
}
pdata->pointer = pointer;
pdata->seat = pseat;
pseat->pointers = eina_inlist_append(pseat->pointers, EINA_INLIST_GET(pdata));
return EINA_TRUE;
return pdata;
}
void

2
src/lib/evas/include/evas_private.h
View File

@ -2071,7 +2071,7 @@ Eina_Bool _evas_image_proxy_source_clip_get(const Eo *eo_obj);
void _evas_focus_dispatch_event(Evas_Object_Protected_Data *obj,
Efl_Input_Device *seat, Eina_Bool in);
Evas_Pointer_Data *_evas_pointer_data_by_device_get(Evas_Public_Data *edata, Efl_Input_Device *pointer);
Eina_Bool _evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer);
Evas_Pointer_Data *_evas_pointer_data_add(Evas_Public_Data *edata, Efl_Input_Device *pointer);
void _evas_pointer_data_remove(Evas_Public_Data *edata, Efl_Input_Device *pointer);
Eina_List *_evas_pointer_list_in_rect_get(Evas_Public_Data *edata,
Evas_Object *obj,