evas: change _evas_pointer_data_add() to return created pointer data
authorMike Blumenkrantz <zmike@osg.samsung.com>
Fri, 16 Jun 2017 19:03:09 +0000 (15:03 -0400)
committerMike Blumenkrantz <zmike@osg.samsung.com>
Fri, 16 Jun 2017 16:23:08 +0000 (12:23 -0400)
src/lib/evas/canvas/evas_main.c
src/lib/evas/include/evas_private.h

index 2d8f2e5..e7c3786 100644 (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
index a755468..59f9f19 100644 (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,