From 1aaa6e41e1b81e5c28986a7834751f8530989cca Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Sun, 17 Feb 2013 03:53:02 +0000 Subject: [PATCH] elementary: as previously stated sizeof (long) != sizeof (void*) SVN revision: 84014 --- legacy/elementary/ChangeLog | 4 + legacy/elementary/NEWS | 1 + legacy/elementary/src/bin/test_button.c | 4 +- legacy/elementary/src/bin/test_cursor.c | 10 +- legacy/elementary/src/bin/test_floating.c | 6 +- legacy/elementary/src/bin/test_focus.c | 8 +- legacy/elementary/src/bin/test_genlist.c | 106 +++++++++--------- legacy/elementary/src/bin/test_index.c | 4 +- legacy/elementary/src/bin/test_launcher.c | 52 ++++----- .../src/bin/test_naviframe_complex.c | 2 +- legacy/elementary/src/bin/test_tooltip.c | 14 +-- .../elementary/src/lib/elc_multibuttonentry.c | 2 +- legacy/elementary/src/lib/elm_image.c | 6 +- legacy/elementary/src/lib/elm_widget.c | 2 +- 14 files changed, 111 insertions(+), 110 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index eb577e9b7f..3267a56ada 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -1033,3 +1033,7 @@ 2013-02-16 ChunEon Park (Hermet) * Don't handle the resize objects in widget infrastructure. Actually resize objects are sub objects so we don't need to care them separately. this causes overhead in some cases. + +2013-02-17 Cedric Bail + + * Improve support on some 64bits system. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index b43b40808b..f01f4acc4c 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -71,6 +71,7 @@ Improvements: * Popup is now a focusable object. * Improve naviframe to not apply items' style multiple times when theme/styles are changed. * Don't handle the resize objects in widget infrastructure. Actually resize objects are sub objects so we don't need to care them separately. This causes overhead in some cases(ie, theme change..). + * Improve support on 64bits system. Fixes: diff --git a/legacy/elementary/src/bin/test_button.c b/legacy/elementary/src/bin/test_button.c index 204793c1ab..71b3d033d7 100644 --- a/legacy/elementary/src/bin/test_button.c +++ b/legacy/elementary/src/bin/test_button.c @@ -18,7 +18,7 @@ _bt_repeated(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED_ static void _bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - int param = (int)(long)(data); + int param = (int)(uintptr_t)(data); printf("clicked event on Button:%d\n", param); } @@ -26,7 +26,7 @@ _bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__ static void _bt_unpressed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - int param = (int)(long)(data); + int param = (int)(uintptr_t)(data); printf("unpressed event on Button:%d\n", param); } diff --git a/legacy/elementary/src/bin/test_cursor.c b/legacy/elementary/src/bin/test_cursor.c index 7424eeffc1..99fa6adc17 100644 --- a/legacy/elementary/src/bin/test_cursor.c +++ b/legacy/elementary/src/bin/test_cursor.c @@ -49,15 +49,15 @@ glt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Elm_Object_Item *glit = event_info; Evas_Object *gl = elm_object_item_widget_get(glit); - int val = (int)(long) elm_object_item_data_get(glit); + int val = (int)(uintptr_t) elm_object_item_data_get(glit); Elm_Object_Item *glit1, *glit2, *glit3; val *= 10; - glit1 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 1), glit, + glit1 = elm_genlist_item_append(gl, &itct, (void *)(uintptr_t) (val + 1), glit, ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit2 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 2), glit, + glit2 = elm_genlist_item_append(gl, &itct, (void *)(uintptr_t) (val + 2), glit, ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit, + glit3 = elm_genlist_item_append(gl, &itct, (void *)(uintptr_t) (val + 3), glit, ELM_GENLIST_ITEM_TREE, NULL, NULL); elm_genlist_item_cursor_set(glit1, ELM_CURSOR_HAND2); @@ -91,7 +91,7 @@ char * glt_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; - snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Item mode %i", (int)(uintptr_t)data); return strdup(buf); } diff --git a/legacy/elementary/src/bin/test_floating.c b/legacy/elementary/src/bin/test_floating.c index 4e19dd5450..760192ceef 100644 --- a/legacy/elementary/src/bin/test_floating.c +++ b/legacy/elementary/src/bin/test_floating.c @@ -15,7 +15,7 @@ static Elm_Genlist_Item_Class itc1; static char *glf_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; - snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Item # %i", (int)(uintptr_t)data); return strdup(buf); } @@ -88,11 +88,11 @@ test_floating(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in for (i = 0; i < 20; i++) { elm_genlist_item_append(gl, &itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); } evas_object_resize(win, 480, 800); evas_object_show(win); diff --git a/legacy/elementary/src/bin/test_focus.c b/legacy/elementary/src/bin/test_focus.c index fec2534451..6bb6e8d1a8 100644 --- a/legacy/elementary/src/bin/test_focus.c +++ b/legacy/elementary/src/bin/test_focus.c @@ -30,14 +30,14 @@ _on_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_disable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +my_disable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *bt = data; elm_object_disabled_set(bt, EINA_TRUE); } static void -_enable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +my_enable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *bt = data; elm_object_disabled_set(bt, EINA_FALSE); @@ -281,7 +281,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, 0.0, 0.0); elm_box_pack_end(bx2, bt); - evas_object_smart_callback_add(bt, "clicked", _disable, bt); + evas_object_smart_callback_add(bt, "clicked", my_disable, bt); my_show(bt); elm_object_focus_custom_chain_prepend(bx2, bt, NULL); @@ -292,7 +292,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt2, 0.0, 0.0); elm_box_pack_end(bx2, bt2); - evas_object_smart_callback_add(bt2, "clicked", _enable, bt); + evas_object_smart_callback_add(bt2, "clicked", my_enable, bt); my_show(bt2); elm_object_focus_custom_chain_append(bx2, bt2, NULL); } diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c index 2822802324..d383caa4be 100644 --- a/legacy/elementary/src/bin/test_genlist.c +++ b/legacy/elementary/src/bin/test_genlist.c @@ -125,7 +125,7 @@ static Elm_Genlist_Item_Class *itc1; char *gl_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; - snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Item # %i", (int)(uintptr_t)data); return strdup(buf); } @@ -330,11 +330,11 @@ test_genlist(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf for (i = 0; i < 2000; i++) { gli = elm_genlist_item_append(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); if (i == 50) evas_object_smart_callback_add(bt_50, "clicked", _bt50_cb, gli); else if (i == 1500) @@ -369,11 +369,11 @@ my_gl_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) itc1->func.del = NULL; elm_genlist_item_append(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); i++; } @@ -399,12 +399,12 @@ my_gl_insert_before(void *data, Evas_Object *obj __UNUSED__, void *event_info __ } elm_genlist_item_insert_before(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, NULL/* parent */, gli_selected /* item before */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); i++; } @@ -430,12 +430,12 @@ my_gl_insert_after(void *data, Evas_Object *obj __UNUSED__, void *event_info __U } elm_genlist_item_insert_after(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, NULL/* parent */, gli_selected /* item after */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); i++; } @@ -1232,14 +1232,14 @@ gl4_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Elm_Object_Item *glit = event_info; Evas_Object *gl = elm_object_item_widget_get(glit); - int val = (int)(long) elm_object_item_data_get(glit); + int val = (int)(uintptr_t) elm_object_item_data_get(glit); int i = 0; val *= 10; for (i = 0; i < 10; i++) { elm_genlist_item_append(gl, itc4, - (void *)(long) (val + i)/* item data */, + (void *)(uintptr_t) (val + i)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */, NULL/* func data */); @@ -1270,7 +1270,7 @@ gl4_con_req(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info char *gl4_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; - snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Item mode %i", (int)(uintptr_t)data); return strdup(buf); } @@ -1532,7 +1532,7 @@ static Elm_Genlist_Item_Class *itc_group; char *gl8_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; - snprintf(buf, sizeof(buf), "Group Index # %i (Item # %i)", (int)((long)data / 10), (int)(long)data); + snprintf(buf, sizeof(buf), "Group Index # %i (Item # %i)", (int)((uintptr_t)data / 10), (int)(uintptr_t)data); return strdup(buf); } @@ -1670,21 +1670,21 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in if (!(i % 10)) { gli = git = elm_genlist_item_append(gl, itc_group, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_GROUP, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); } else if (git) { gli = elm_genlist_item_append(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, git/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); } switch (i) { @@ -1726,20 +1726,20 @@ gl9_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Elm_Object_Item *glit = event_info; Evas_Object *gl = elm_object_item_widget_get(glit); - int val = (int)(long) elm_object_item_data_get(glit); + int val = (int)(uintptr_t) elm_object_item_data_get(glit); val *= 10; elm_genlist_item_append(gl, itc1, - (void *)(long) (val + 1)/* item data */, + (void *)(uintptr_t) (val + 1)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, itc1, - (void *)(long) (val + 2)/* item data */, + (void *)(uintptr_t) (val + 2)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, itc1, - (void *)(long) (val + 3)/* item data */, + (void *)(uintptr_t) (val + 3)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */, NULL/* func data */); @@ -1852,9 +1852,9 @@ char *gl10_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part) { char buf[256]; if (!strcmp(part, "elm.text.mode")) - snprintf(buf, sizeof(buf), "Mode # %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Mode # %i", (int)(uintptr_t)data); else - snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Item # %i", (int)(uintptr_t)data); return strdup(buf); } @@ -1966,7 +1966,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (i = 0; i < 50; i++) elm_genlist_item_append(gl, &itc10, - (void *)(long)(1000 + i)/* item data */, + (void *)(uintptr_t)(1000 + i)/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE/* flags */, _gl_sel10/* func */, @@ -2093,7 +2093,7 @@ test_genlist11(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (i = 0; i < 50; i++) elm_genlist_item_append(gl, itc1, - (void *)(long)(1 + i)/* item data */, + (void *)(uintptr_t)(1 + i)/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE/* flags */, NULL/* func */, @@ -2145,11 +2145,11 @@ test_genlist12(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (i = 0; i < 1000; i++) { elm_genlist_item_append(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); } elm_genlist_item_class_free(itc1); @@ -2163,8 +2163,8 @@ static int gl13_cmp(const void *pa, const void *pb) { const Elm_Object_Item *ia = pa, *ib = pb; - int a = (int)(long) elm_object_item_data_get(ia); - int b = (int)(long) elm_object_item_data_get(ib); + int a = (int)(uintptr_t) elm_object_item_data_get(ia); + int b = (int)(uintptr_t) elm_object_item_data_get(ib); return a - b; } @@ -2199,7 +2199,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (i = 0; i < 3; i++) { pi[i] = elm_genlist_item_sorted_insert - (gl, itc4, (void *)(long)idx[i]/* item data */, NULL/* parent */, + (gl, itc4, (void *)(uintptr_t)idx[i]/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl13_cmp/* cmp */, NULL/* func */, NULL/* func data */); } @@ -2210,7 +2210,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (j = 0; j < 3; j++) { elm_genlist_item_sorted_insert - (gl, itc4, (void *)(long)(idx[j] + base)/* item data */, + (gl, itc4, (void *)(uintptr_t)(idx[j] + base)/* item data */, pi[i]/* parent */, ELM_GENLIST_ITEM_NONE, gl13_cmp/* cmp */, NULL/* func */, NULL/* func data */); } @@ -2219,7 +2219,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (i = 0; i < 3; i++) { pi[i + 3] = elm_genlist_item_sorted_insert - (gl, itc4, (void *)(long)(idx[i] * 2)/* item data */, NULL/* parent */, + (gl, itc4, (void *)(uintptr_t)(idx[i] * 2)/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl13_cmp/* cmp */, NULL/* func */, NULL/* func data */); } @@ -2231,7 +2231,7 @@ test_genlist13(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (j = 0; j < 3; j++) { elm_genlist_item_sorted_insert - (gl, itc4, (void *)(long)(idx[j] + base)/* item data */, + (gl, itc4, (void *)(uintptr_t)(idx[j] + base)/* item data */, pi[i + 3]/* parent */, ELM_GENLIST_ITEM_NONE, gl13_cmp/* cmp */, NULL/* func */, NULL/* func data */); } @@ -2268,7 +2268,7 @@ my_gl_insert_before_rel(void *data, Evas_Object *obj __UNUSED__, void *event_inf } elm_genlist_item_insert_before(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, elm_genlist_item_parent_get(gli_selected), gli_selected/* item before */, ELM_GENLIST_ITEM_NONE, @@ -2298,7 +2298,7 @@ my_gl_insert_after_rel(void *data, Evas_Object *obj __UNUSED__, void *event_info } elm_genlist_item_insert_after(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, elm_genlist_item_parent_get(gli_selected), gli_selected/* item after */, ELM_GENLIST_ITEM_NONE, @@ -2352,7 +2352,7 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i // BUG2: should be able to insert after=NULL, append pi[0] = elm_genlist_item_append - (gl, itc4, (void *)(long)idx[0]/* item data */, + (gl, itc4, (void *)(uintptr_t)idx[0]/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); @@ -2360,12 +2360,12 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i { if (relative[i] < 0) pi[i] = elm_genlist_item_insert_before - (gl, itc4, (void *)(long)idx[i]/* item data */, + (gl, itc4, (void *)(uintptr_t)idx[i]/* item data */, NULL/* parent */, pi[-relative[i]], ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); else pi[i] = elm_genlist_item_insert_after - (gl, itc4, (void *)(long)idx[i]/* item data */, + (gl, itc4, (void *)(uintptr_t)idx[i]/* item data */, NULL/* parent */, pi[relative[i]], ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); } @@ -2375,21 +2375,21 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i Elm_Object_Item *sub_glit[6]; int j; - base = 1000 * (int)(long) elm_object_item_data_get(pi[i]); + base = 1000 * (int)(uintptr_t) elm_object_item_data_get(pi[i]); sub_glit[0] = elm_genlist_item_append - (gl, itc4, (void *)(long) (idx[0] + base)/* item data */, pi[i]/* parent */, + (gl, itc4, (void *)(uintptr_t) (idx[0] + base)/* item data */, pi[i]/* parent */, ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); for (j = 1; j < 6; j++) { if (relative[j] < 0) sub_glit[j] = elm_genlist_item_insert_before - (gl, itc4, (void *)(long) (idx[j] + base)/* item data */, + (gl, itc4, (void *)(uintptr_t) (idx[j] + base)/* item data */, pi[i]/* parent */, sub_glit[-relative[j]], ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); else sub_glit[j] = elm_genlist_item_insert_after - (gl, itc4, (void *)(long) (idx[j] + base)/* item data */, + (gl, itc4, (void *)(uintptr_t) (idx[j] + base)/* item data */, pi[i]/* parent */, sub_glit[relative[j]], ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); } @@ -2399,12 +2399,12 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i { if (relative[i] < 0) pi[i] = elm_genlist_item_insert_before - (gl, itc4, (void *)(long) idx[i]/* item data */, + (gl, itc4, (void *)(uintptr_t) idx[i]/* item data */, NULL/* parent */, pi[-relative[i]], ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); else pi[i] = elm_genlist_item_insert_after - (gl, itc4, (void *)(long) idx[i]/* item data */, + (gl, itc4, (void *)(uintptr_t) idx[i]/* item data */, NULL/* parent */, pi[relative[i]], ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); } @@ -2414,21 +2414,21 @@ test_genlist14(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i Elm_Object_Item *sub_glit[6]; int j; - base = 1000 * (int)(long) elm_object_item_data_get(pi[i]); + base = 1000 * (int)(uintptr_t) elm_object_item_data_get(pi[i]); sub_glit[0] = elm_genlist_item_append - (gl, itc4, (void *)(long) (idx[0] + base)/* item data */, pi[i]/* parent */, + (gl, itc4, (void *)(uintptr_t) (idx[0] + base)/* item data */, pi[i]/* parent */, ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); for (j = 1; j < 6; j++) { if (relative[j] < 0) sub_glit[j] = elm_genlist_item_insert_before - (gl, itc4, (void *)(long) (idx[j] + base)/* item data */, + (gl, itc4, (void *)(uintptr_t) (idx[j] + base)/* item data */, pi[i]/* parent */, sub_glit[-relative[j]], ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); else sub_glit[j] = elm_genlist_item_insert_after - (gl, itc4, (void *)(long) (idx[j] + base)/* item data */, + (gl, itc4, (void *)(uintptr_t) (idx[j] + base)/* item data */, pi[i]/* parent */, sub_glit[relative[j]], ELM_GENLIST_ITEM_TREE, NULL/* func */, NULL/* func data */); } @@ -2595,7 +2595,7 @@ test_genlist15(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i NULL/* parent */, ELM_GENLIST_ITEM_NONE/* flags */, gl15_sel/* func */, - (void *)(long)&(tit[i])/* func data */); + (void *)(uintptr_t)&(tit[i])/* func data */); } elm_genlist_item_class_free(itc15); elm_box_pack_end(bx, gl); @@ -2727,7 +2727,7 @@ test_genlist16(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i NULL/* parent */, ELM_GENLIST_ITEM_NONE/* flags */, gl_sel/* func */, - (void *)(long)&(tit[i])/* func data */); + (void *)(uintptr_t)&(tit[i])/* func data */); } elm_genlist_item_class_free(itc15); elm_box_pack_end(bx, gl); @@ -2749,7 +2749,7 @@ gl17_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part) if (!strcmp(part, "elm.text.mode")) snprintf(buf, sizeof(buf), "Mode # %i", tit->mode); else - snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Item # %i", (int)(uintptr_t)data); return strdup(buf); } @@ -3189,11 +3189,11 @@ test_genlist19(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (i = 0; i < 2000; i++) { gli = elm_genlist_item_append(gl, itc1, - (void *)(long)i/* item data */, + (void *)(uintptr_t)i/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + (void *)(uintptr_t)(i * 10)/* func data */); if (i == 50) evas_object_smart_callback_add(bt_50, "clicked", _bt50_cb, gli); else if (i == 1500) diff --git a/legacy/elementary/src/bin/test_index.c b/legacy/elementary/src/bin/test_index.c index 62a27b756e..f0302797dc 100644 --- a/legacy/elementary/src/bin/test_index.c +++ b/legacy/elementary/src/bin/test_index.c @@ -120,7 +120,7 @@ static Elm_Genlist_Item_Class itci; char *gli_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; - int j = (long)data; + int j = (uintptr_t)data; snprintf(buf, sizeof(buf), "%c%c", 'A' + ((j >> 4) & 0xf), 'a' + ((j ) & 0xf) @@ -221,7 +221,7 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info for (i = 0; i < 100; i++) { glit = elm_genlist_item_append(gl, &itci, - (void *)(long)j/* item data */, + (void *)(uintptr_t)j/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, NULL/* func */, NULL/* func data */); diff --git a/legacy/elementary/src/bin/test_launcher.c b/legacy/elementary/src/bin/test_launcher.c index 3ec0aaa5bd..cea39bcbf8 100644 --- a/legacy/elementary/src/bin/test_launcher.c +++ b/legacy/elementary/src/bin/test_launcher.c @@ -110,10 +110,10 @@ ic_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) evas_object_data_set(obj, "timer", tim); evas_object_geometry_get(data, &x, &y, &w, &h); - evas_object_data_set(obj, "x", (void *)(long)(ev->canvas.x)); - evas_object_data_set(obj, "y", (void *)(long)(ev->canvas.y)); - evas_object_data_set(obj, "px", (void *)(long)(x)); - evas_object_data_set(obj, "py", (void *)(long)(y)); + evas_object_data_set(obj, "x", (void *)(uintptr_t)(ev->canvas.x)); + evas_object_data_set(obj, "y", (void *)(uintptr_t)(ev->canvas.y)); + evas_object_data_set(obj, "px", (void *)(uintptr_t)(x)); + evas_object_data_set(obj, "py", (void *)(uintptr_t)(y)); if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) { @@ -145,8 +145,8 @@ ic_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) tb = evas_object_data_get(obj, "tb"); sc = evas_object_data_get(obj, "sc"); elm_object_scroll_freeze_pop(sc); - tbx = (int)(long)evas_object_data_get(obj, "tbx"); - tby = (int)(long)evas_object_data_get(obj, "tby"); + tbx = (int)(uintptr_t)evas_object_data_get(obj, "tbx"); + tby = (int)(uintptr_t)evas_object_data_get(obj, "tby"); elm_table_pack(tb, obj, tbx, tby, 1, 1); list = (Eina_List *)evas_object_data_get (elm_object_top_widget_get(obj), "mbs"); @@ -163,10 +163,10 @@ ic_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) { Evas_Coord x, y, px, py; - x = (Evas_Coord)(long)evas_object_data_get(obj, "x"); - y = (Evas_Coord)(long)evas_object_data_get(obj, "y"); - px = (Evas_Coord)(long)evas_object_data_get(obj, "px"); - py = (Evas_Coord)(long)evas_object_data_get(obj, "py"); + x = (Evas_Coord)(uintptr_t)evas_object_data_get(obj, "x"); + y = (Evas_Coord)(uintptr_t)evas_object_data_get(obj, "y"); + px = (Evas_Coord)(uintptr_t)evas_object_data_get(obj, "px"); + py = (Evas_Coord)(uintptr_t)evas_object_data_get(obj, "py"); evas_object_move(obj, px + ev->cur.canvas.x - x, py + ev->cur.canvas.y - y); @@ -290,8 +290,8 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_data_set(ic, "sc", sc); evas_object_data_set(ic, "bx", bx); evas_object_data_set(ic, "mb", mb); - evas_object_data_set(ic, "tbx", (void *)(long)(1 + i)); - evas_object_data_set(ic, "tby", (void *)(long)(1 + (j * 2))); + evas_object_data_set(ic, "tbx", (void *)(uintptr_t)(1 + i)); + evas_object_data_set(ic, "tby", (void *)(uintptr_t)(1 + (j * 2))); n++; if (n > 23) n = 0; m++; if (m > 15) m = 0; @@ -592,8 +592,8 @@ l3_tim_cb(void *data) (elm_object_top_widget_get(data), "mbs"); EINA_LIST_FOREACH(list, l, mb) evas_object_color_set(mb, 128, 128, 128, 128); - slx = (int)(long)evas_object_data_get(data, "slx"); - sly = (int)(long)evas_object_data_get(data, "sly"); + slx = (int)(uintptr_t)evas_object_data_get(data, "slx"); + sly = (int)(uintptr_t)evas_object_data_get(data, "sly"); snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly); elm_object_part_content_unset(ly, buf); edje_object_signal_emit(elm_layout_edje_get(ly2), "drag", "app"); @@ -628,10 +628,10 @@ l3_ic_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void ly2 = evas_object_data_get(obj, "ly2"); evas_object_geometry_get(ly2, &x, &y, &w, &h); - evas_object_data_set(obj, "x", (void *)(long)(ev->canvas.x)); - evas_object_data_set(obj, "y", (void *)(long)(ev->canvas.y)); - evas_object_data_set(obj, "px", (void *)(long)(x)); - evas_object_data_set(obj, "py", (void *)(long)(y)); + evas_object_data_set(obj, "x", (void *)(uintptr_t)(ev->canvas.x)); + evas_object_data_set(obj, "y", (void *)(uintptr_t)(ev->canvas.y)); + evas_object_data_set(obj, "px", (void *)(uintptr_t)(x)); + evas_object_data_set(obj, "py", (void *)(uintptr_t)(y)); edje_object_signal_emit(elm_layout_edje_get(ly2), "click", "app"); @@ -668,8 +668,8 @@ l3_ic_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *e ly = evas_object_data_get(obj, "ly"); sc = evas_object_data_get(obj, "sc"); elm_object_scroll_freeze_pop(sc); - slx = (int)(long)evas_object_data_get(obj, "slx"); - sly = (int)(long)evas_object_data_get(obj, "sly"); + slx = (int)(uintptr_t)evas_object_data_get(obj, "slx"); + sly = (int)(uintptr_t)evas_object_data_get(obj, "sly"); snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly); elm_object_part_content_set(ly, buf, ly2); list = (Eina_List *)evas_object_data_get @@ -694,10 +694,10 @@ l3_ic_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void { Evas_Coord x, y, px, py; - x = (Evas_Coord)(long)evas_object_data_get(obj, "x"); - y = (Evas_Coord)(long)evas_object_data_get(obj, "y"); - px = (Evas_Coord)(long)evas_object_data_get(obj, "px"); - py = (Evas_Coord)(long)evas_object_data_get(obj, "py"); + x = (Evas_Coord)(uintptr_t)evas_object_data_get(obj, "x"); + y = (Evas_Coord)(uintptr_t)evas_object_data_get(obj, "y"); + px = (Evas_Coord)(uintptr_t)evas_object_data_get(obj, "px"); + py = (Evas_Coord)(uintptr_t)evas_object_data_get(obj, "py"); evas_object_move(ly2, px + ev->cur.canvas.x - x, py + ev->cur.canvas.y - y); @@ -826,8 +826,8 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_data_set(ic, "sc", sc); evas_object_data_set(ic, "bx", bx); evas_object_data_set(ic, "mb", mb); - evas_object_data_set(ic, "slx", (void *)(long)(i)); - evas_object_data_set(ic, "sly", (void *)(long)(j)); + evas_object_data_set(ic, "slx", (void *)(uintptr_t)(i)); + evas_object_data_set(ic, "sly", (void *)(uintptr_t)(j)); snprintf(buf, sizeof(buf), "slot.%i.%i", i, j); elm_object_part_content_set(ly, buf, ly2); diff --git a/legacy/elementary/src/bin/test_naviframe_complex.c b/legacy/elementary/src/bin/test_naviframe_complex.c index 50f97c6aed..63ccc3588a 100644 --- a/legacy/elementary/src/bin/test_naviframe_complex.c +++ b/legacy/elementary/src/bin/test_naviframe_complex.c @@ -26,7 +26,7 @@ static char * gl_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; - snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Item # %i", (int)(uintptr_t)data); return strdup(buf); } diff --git a/legacy/elementary/src/bin/test_tooltip.c b/legacy/elementary/src/bin/test_tooltip.c index 8cc14502a4..68b8748607 100644 --- a/legacy/elementary/src/bin/test_tooltip.c +++ b/legacy/elementary/src/bin/test_tooltip.c @@ -53,15 +53,15 @@ gltt_exp(void *data __UNUSED__, { Elm_Object_Item *glit = event_info; Evas_Object *gl = elm_object_item_widget_get(glit); - int val = (int)(long) elm_object_item_data_get(glit); + int val = (int)(uintptr_t) elm_object_item_data_get(glit); Elm_Object_Item *glit1, *glit2, *glit3; val *= 10; - glit1 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 1), glit, + glit1 = elm_genlist_item_append(gl, &itct, (void *)(uintptr_t) (val + 1), glit, ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit2 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 2), glit, + glit2 = elm_genlist_item_append(gl, &itct, (void *)(uintptr_t) (val + 2), glit, ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit, + glit3 = elm_genlist_item_append(gl, &itct, (void *)(uintptr_t) (val + 3), glit, ELM_GENLIST_ITEM_TREE, NULL, NULL); elm_genlist_item_tooltip_text_set(glit1, "Testing A"); @@ -102,7 +102,7 @@ gltt_text_get(void *data, const char *part __UNUSED__) { char buf[256]; - snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data); + snprintf(buf, sizeof(buf), "Item mode %i", (int)(uintptr_t)data); return strdup(buf); } @@ -185,7 +185,7 @@ _tt_item_icon_del(void *data, { // test to check for del_cb behavior! printf("_tt_icon_del: data=%ld (== 456?), event_info=%p\n", - (long)data, event_info); + (long)(uintptr_t)data, event_info); } static void @@ -275,7 +275,7 @@ _tt_icon_del(void *data, { // test to check for del_cb behavior! printf("_tt_icon_del: data=%ld (== 123?), event_info=%p\n", - (long)data, event_info); + (long)(uintptr_t)data, event_info); } static Eina_Bool diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index 1d30e26d98..2072937276 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -283,7 +283,7 @@ _shrink_mode_set(Evas_Object *obj, sd->view_state = MULTIBUTTONENTRY_VIEW_NONE; evas_object_smart_callback_call - (obj, SIG_EXPAND_STATE_CHANGED, (void *)(long)sd->shrink); + (obj, SIG_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink); } if (sd->view_state != MULTIBUTTONENTRY_VIEW_SHRINK) diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c index 6679b31515..f93014c066 100644 --- a/legacy/elementary/src/lib/elm_image.c +++ b/legacy/elementary/src/lib/elm_image.c @@ -2,11 +2,7 @@ #include "elm_priv.h" #include "elm_widget_image.h" -#ifdef _WIN32 -# define FMT_SIZE_T "%Iu" -#else -# define FMT_SIZE_T "%zu" -#endif +#define FMT_SIZE_T "%zu" EAPI Eo_Op ELM_OBJ_IMAGE_BASE_ID = EO_NOOP; diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index 014d3ee5da..a1d0b8927d 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -575,7 +575,7 @@ _propagate_event(void *data, void *event_info) { INTERNAL_ENTRY; - Evas_Callback_Type type = (Evas_Callback_Type)(long)data; + Evas_Callback_Type type = (Evas_Callback_Type)(uintptr_t)data; Evas_Event_Flags *event_flags = NULL; switch (type)