summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-09-30 19:21:31 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-09-30 22:15:01 +0900
commitf0d4a6fe6e98d47a902353a34e0e4f905b0fa51d (patch)
treeb4778d7ea59dba9afd51038663741a13f4154fea /src/lib
parentbf84ffd3bddcff0305fe385dab95efef52346275 (diff)
elm: Longwaited trailing white space removal. Clean elm up!
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elc_multibuttonentry.c10
-rw-r--r--src/lib/elc_naviframe.c2
-rw-r--r--src/lib/elc_player.c18
-rw-r--r--src/lib/elm_calendar.c4
-rw-r--r--src/lib/elm_cnp.c192
-rw-r--r--src/lib/elm_colorselector.c32
-rw-r--r--src/lib/elm_config.c14
-rw-r--r--src/lib/elm_datetime.c10
-rw-r--r--src/lib/elm_entry.c8
-rw-r--r--src/lib/elm_flip.c2
-rw-r--r--src/lib/elm_flipselector.c4
-rw-r--r--src/lib/elm_genlist.c10
-rw-r--r--src/lib/elm_image.c2
-rw-r--r--src/lib/elm_interface_scrollable.c6
-rw-r--r--src/lib/elm_module.c2
-rw-r--r--src/lib/elm_panel.c12
-rw-r--r--src/lib/elm_prefs_data.c6
-rw-r--r--src/lib/elm_slider.c6
-rw-r--r--src/lib/elm_url.c2
-rw-r--r--src/lib/elm_util.c2
-rw-r--r--src/lib/elm_widget.c2
-rw-r--r--src/lib/elm_win.c22
-rw-r--r--src/lib/els_cursor.c2
23 files changed, 185 insertions, 185 deletions
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index b498f2c4b..f800fc61e 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -189,13 +189,13 @@ _shrink_mode_set(Evas_Object *obj,
189 edje_object_size_min_calc(sd->end, &w_label_count, NULL); 189 edje_object_size_min_calc(sd->end, &w_label_count, NULL);
190 elm_coords_finger_size_adjust(1, &w_label_count, 1, NULL); 190 elm_coords_finger_size_adjust(1, &w_label_count, 1, NULL);
191 } 191 }
192 192
193 if ((w < 0) || (w < w_label_count)) 193 if ((w < 0) || (w < w_label_count))
194 { 194 {
195 elm_box_unpack(sd->box, item->button); 195 elm_box_unpack(sd->box, item->button);
196 evas_object_hide(item->button); 196 evas_object_hide(item->button);
197 item->visible = EINA_FALSE; 197 item->visible = EINA_FALSE;
198 198
199 count++; 199 count++;
200 snprintf(buf, sizeof(buf), "... + %d", count); 200 snprintf(buf, sizeof(buf), "... + %d", count);
201 edje_object_part_text_escaped_set(sd->end, "elm.text", buf); 201 edje_object_part_text_escaped_set(sd->end, "elm.text", buf);
@@ -205,7 +205,7 @@ _shrink_mode_set(Evas_Object *obj,
205 (sd->end, w_label_count, h); 205 (sd->end, w_label_count, h);
206 elm_box_pack_end(sd->box, sd->end); 206 elm_box_pack_end(sd->box, sd->end);
207 evas_object_show(sd->end); 207 evas_object_show(sd->end);
208 208
209 sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK; 209 sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
210 evas_object_smart_callback_call 210 evas_object_smart_callback_call
211 (obj, SIG_EXPAND_STATE_CHANGED, (void *)1); 211 (obj, SIG_EXPAND_STATE_CHANGED, (void *)1);
@@ -508,7 +508,7 @@ _button_resize(Evas_Object *obj,
508 508
509 size_str = edje_object_data_get(btn, "button_max_size"); 509 size_str = edje_object_data_get(btn, "button_max_size");
510 if (size_str) button_max_width = atoi(size_str); 510 if (size_str) button_max_width = atoi(size_str);
511 511
512 button_max_width *= elm_widget_scale_get(obj) * elm_config_scale_get(); 512 button_max_width *= elm_widget_scale_get(obj) * elm_config_scale_get();
513 513
514 // decide the size of button 514 // decide the size of button
@@ -567,7 +567,7 @@ _access_multibuttonentry_label_register(Evas_Object *obj, Eina_Bool is_access)
567{ 567{
568 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd); 568 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(obj, sd);
569 Evas_Object *po; 569 Evas_Object *po;
570 570
571 po = (Evas_Object *)edje_object_part_object_get(sd->label, "elm.text"); 571 po = (Evas_Object *)edje_object_part_object_get(sd->label, "elm.text");
572 if (is_access) 572 if (is_access)
573 { 573 {
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index a81e255db..5de3af5bc 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1418,7 +1418,7 @@ _elm_naviframe_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
1418 if (ret) *ret = EINA_TRUE; 1418 if (ret) *ret = EINA_TRUE;
1419 1419
1420 //FIXME: Replace this below code to elm_naviframe_item_pop() at elm 2.0. 1420 //FIXME: Replace this below code to elm_naviframe_item_pop() at elm 2.0.
1421 ///Leave for compatibility. 1421 ///Leave for compatibility.
1422 if (it->title_prev_btn) 1422 if (it->title_prev_btn)
1423 evas_object_smart_callback_call(it->title_prev_btn, SIG_CLICKED, NULL); 1423 evas_object_smart_callback_call(it->title_prev_btn, SIG_CLICKED, NULL);
1424} 1424}
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 142ca1913..9299a976d 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -220,7 +220,7 @@ _update_slider(void *data,
220 length = elm_video_play_length_get(sd->video); 220 length = elm_video_play_length_get(sd->video);
221 pos = elm_video_play_position_get(sd->video); 221 pos = elm_video_play_position_get(sd->video);
222 222
223 elm_object_disabled_set(sd->slider, 223 elm_object_disabled_set(sd->slider,
224 (!seekable) | elm_widget_disabled_get(data)); 224 (!seekable) | elm_widget_disabled_get(data));
225 elm_slider_min_max_set(sd->slider, 0, length); 225 elm_slider_min_max_set(sd->slider, 0, length);
226 if ((elm_slider_value_get(sd->slider) != pos) && 226 if ((elm_slider_value_get(sd->slider) != pos) &&
@@ -383,7 +383,7 @@ _eject(void *data,
383 void *event_info __UNUSED__) 383 void *event_info __UNUSED__)
384{ 384{
385 ELM_PLAYER_DATA_GET(data, sd); 385 ELM_PLAYER_DATA_GET(data, sd);
386 386
387 elm_layout_signal_emit(data, "elm,button,eject", "elm"); 387 elm_layout_signal_emit(data, "elm,button,eject", "elm");
388 emotion_object_eject(elm_video_emotion_get(sd->video)); 388 emotion_object_eject(elm_video_emotion_get(sd->video));
389 evas_object_smart_callback_call(data, SIG_EJECT_CLICKED, NULL); 389 evas_object_smart_callback_call(data, SIG_EJECT_CLICKED, NULL);
@@ -393,7 +393,7 @@ static void
393_mute_toggle(Evas_Object *obj) 393_mute_toggle(Evas_Object *obj)
394{ 394{
395 ELM_PLAYER_DATA_GET(obj, sd); 395 ELM_PLAYER_DATA_GET(obj, sd);
396 396
397 if (!elm_video_audio_mute_get(sd->video)) 397 if (!elm_video_audio_mute_get(sd->video))
398 { 398 {
399 elm_video_audio_mute_set(sd->video, EINA_TRUE); 399 elm_video_audio_mute_set(sd->video, EINA_TRUE);
@@ -480,7 +480,7 @@ _player_button_add(Evas_Object *obj,
480 Evas_Object *ic; 480 Evas_Object *ic;
481 Evas_Object *bt; 481 Evas_Object *bt;
482 char buf[256]; 482 char buf[256];
483 483
484 ic = elm_icon_add(obj); 484 ic = elm_icon_add(obj);
485 snprintf(buf, sizeof(buf), "media_player/%s/%s", name, 485 snprintf(buf, sizeof(buf), "media_player/%s/%s", name,
486 elm_widget_style_get(obj)); 486 elm_widget_style_get(obj));
@@ -491,7 +491,7 @@ _player_button_add(Evas_Object *obj,
491 elm_widget_mirrored_automatic_set(bt, EINA_FALSE); 491 elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
492 elm_object_content_set(bt, ic); 492 elm_object_content_set(bt, ic);
493 evas_object_show(ic); 493 evas_object_show(ic);
494 494
495 snprintf(buf, sizeof(buf), "media_player/%s/%s", name, 495 snprintf(buf, sizeof(buf), "media_player/%s/%s", name,
496 elm_widget_style_get(obj)); 496 elm_widget_style_get(obj));
497 elm_object_style_set(bt, buf); 497 elm_object_style_set(bt, buf);
@@ -554,16 +554,16 @@ _elm_player_smart_content_set(Eo *obj, void *_pd, va_list *list)
554 554
555 if (part && strcmp(part, "video")) 555 if (part && strcmp(part, "video"))
556 { 556 {
557 eo_do_super(obj, MY_CLASS, 557 eo_do_super(obj, MY_CLASS,
558 elm_obj_container_content_set(part, content, &int_ret)); 558 elm_obj_container_content_set(part, content, &int_ret));
559 if (ret) *ret = int_ret; 559 if (ret) *ret = int_ret;
560 return; 560 return;
561 } 561 }
562 if ((!part) || (!strcmp(part, "video"))) part = "elm.swallow.content"; 562 if ((!part) || (!strcmp(part, "video"))) part = "elm.swallow.content";
563 eo_do_super(obj, MY_CLASS, 563 eo_do_super(obj, MY_CLASS,
564 elm_obj_container_content_set(part, content, &int_ret)); 564 elm_obj_container_content_set(part, content, &int_ret));
565 if (ret) *ret = int_ret; 565 if (ret) *ret = int_ret;
566 566
567 if (!_elm_video_check(content)) return; 567 if (!_elm_video_check(content)) return;
568 if (sd->video == content) goto end; 568 if (sd->video == content) goto end;
569 569
@@ -599,7 +599,7 @@ _elm_player_smart_content_set(Eo *obj, void *_pd, va_list *list)
599 elm_object_disabled_set(sd->slider, !seekable); 599 elm_object_disabled_set(sd->slider, !seekable);
600 elm_slider_min_max_set(sd->slider, 0, length); 600 elm_slider_min_max_set(sd->slider, 0, length);
601 elm_slider_value_set(sd->slider, pos); 601 elm_slider_value_set(sd->slider, pos);
602 602
603 elm_slider_value_set(sd->vslider, 603 elm_slider_value_set(sd->vslider,
604 elm_video_audio_level_get(sd->video) * 100.0); 604 elm_video_audio_level_get(sd->video) * 100.0);
605 // XXX: get mute 605 // XXX: get mute
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index bbaf767fc..ab38bcee6 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -69,7 +69,7 @@ _elm_calendar_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list EI
69 Evas_Coord minw = -1, minh = -1; 69 Evas_Coord minw = -1, minh = -1;
70 70
71 Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); 71 Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
72 72
73 // 7x8 (1 month+year, days, 6 dates.) 73 // 7x8 (1 month+year, days, 6 dates.)
74 elm_coords_finger_size_adjust(7, &minw, 8, &minh); 74 elm_coords_finger_size_adjust(7, &minw, 8, &minh);
75 edje_object_size_min_restricted_calc 75 edje_object_size_min_restricted_calc
@@ -919,7 +919,7 @@ _elm_calendar_smart_calculate(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA
919 _set_headers(obj); 919 _set_headers(obj);
920 _populate(obj); 920 _populate(obj);
921 921
922 elm_layout_thaw(obj); 922 elm_layout_thaw(obj);
923} 923}
924 924
925static void 925static void
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 596b81ecf..f6b3599a8 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -276,7 +276,7 @@ static Eina_Bool _x11_elm_cnp_selection_set (Evas_Object *obj, Elm_
276static void _x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data); 276static void _x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data);
277static Eina_Bool _x11_elm_object_cnp_selection_clear (Evas_Object *obj, Elm_Sel_Type selection); 277static Eina_Bool _x11_elm_object_cnp_selection_clear (Evas_Object *obj, Elm_Sel_Type selection);
278static Eina_Bool _x11_elm_cnp_selection_get (Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata); 278static Eina_Bool _x11_elm_cnp_selection_get (Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata);
279static Eina_Bool _x11_elm_drop_target_add (Evas_Object *obj, Elm_Sel_Format format, 279static Eina_Bool _x11_elm_drop_target_add (Evas_Object *obj, Elm_Sel_Format format,
280 Elm_Drag_State entercb, void *enterdata, 280 Elm_Drag_State entercb, void *enterdata,
281 Elm_Drag_State leavecb, void *leavedata, 281 Elm_Drag_State leavecb, void *leavedata,
282 Elm_Drag_Pos poscb, void *posdata, 282 Elm_Drag_Pos poscb, void *posdata,
@@ -403,7 +403,7 @@ static X11_Cnp_Atom _x11_atoms[CNP_N_ATOMS] = {
403 _x11_notify_handler_image,/* Raw image data is the same */ 403 _x11_notify_handler_image,/* Raw image data is the same */
404 0 404 0
405 }, 405 },
406/* 406/*
407 [CNP_ATOM_text_html_utf8] = { 407 [CNP_ATOM_text_html_utf8] = {
408 "text/html;charset=utf-8", 408 "text/html;charset=utf-8",
409 ELM_SEL_FORMAT_HTML, 409 ELM_SEL_FORMAT_HTML,
@@ -541,7 +541,7 @@ _x11_selection_clear(void *udata __UNUSED__, int type __UNUSED__, void *event)
541 _x11_sel_obj_del2, sel); 541 _x11_sel_obj_del2, sel);
542 sel->widget = NULL; 542 sel->widget = NULL;
543 sel->requestwidget = NULL; 543 sel->requestwidget = NULL;
544 544
545 sel->active = EINA_FALSE; 545 sel->active = EINA_FALSE;
546 sel->widget = NULL; 546 sel->widget = NULL;
547 ELM_SAFE_FREE(sel->selbuf, free); 547 ELM_SAFE_FREE(sel->selbuf, free);
@@ -580,7 +580,7 @@ _x11_selection_notify(void *udata __UNUSED__, int type __UNUSED__, void *event)
580 return ECORE_CALLBACK_PASS_ON; 580 return ECORE_CALLBACK_PASS_ON;
581 } 581 }
582 cnp_debug("Target is %s\n", ev->target); 582 cnp_debug("Target is %s\n", ev->target);
583 583
584 for (i = 0; i < CNP_N_ATOMS; i++) 584 for (i = 0; i < CNP_N_ATOMS; i++)
585 { 585 {
586 if (!strcmp(ev->target, _x11_atoms[i].name)) 586 if (!strcmp(ev->target, _x11_atoms[i].name))
@@ -816,7 +816,7 @@ _x11_notify_handler_text(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify
816 free(stripstr); 816 free(stripstr);
817 free(mkupstr); 817 free(mkupstr);
818 } 818 }
819end: 819end:
820 if (sel == (_x11_selections + ELM_SEL_TYPE_XDND)) 820 if (sel == (_x11_selections + ELM_SEL_TYPE_XDND))
821 ecore_x_dnd_send_finished(); 821 ecore_x_dnd_send_finished();
822 return 0; 822 return 0;
@@ -837,7 +837,7 @@ _x11_notify_handler_uri(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *
837 if (data->content == ECORE_X_SELECTION_CONTENT_FILES) 837 if (data->content == ECORE_X_SELECTION_CONTENT_FILES)
838 { 838 {
839 int i, len = 0; 839 int i, len = 0;
840 840
841 cnp_debug("got a files list\n"); 841 cnp_debug("got a files list\n");
842 files = notify->data; 842 files = notify->data;
843 /* 843 /*
@@ -1124,7 +1124,7 @@ _x11_dropable_find(Ecore_X_Window win)
1124{ 1124{
1125 Eina_List *l; 1125 Eina_List *l;
1126 Dropable *dropable; 1126 Dropable *dropable;
1127 1127
1128 if (!drops) return NULL; 1128 if (!drops) return NULL;
1129 EINA_LIST_FOREACH(drops, l, dropable) 1129 EINA_LIST_FOREACH(drops, l, dropable)
1130 { 1130 {
@@ -1139,7 +1139,7 @@ _x11_dropable_geom_find(Ecore_X_Window win, Evas_Coord px, Evas_Coord py)
1139 Eina_List *l; 1139 Eina_List *l;
1140 Dropable *dropable; 1140 Dropable *dropable;
1141 Evas_Coord x, y, w, h; 1141 Evas_Coord x, y, w, h;
1142 1142
1143 if (!drops) return NULL; 1143 if (!drops) return NULL;
1144 EINA_LIST_FOREACH(drops, l, dropable) 1144 EINA_LIST_FOREACH(drops, l, dropable)
1145 { 1145 {
@@ -1229,10 +1229,10 @@ static void
1229_x11_dnd_dropable_handle(Dropable *dropable, Evas_Coord x, Evas_Coord y, Eina_Bool have_obj, Elm_Xdnd_Action action) 1229_x11_dnd_dropable_handle(Dropable *dropable, Evas_Coord x, Evas_Coord y, Eina_Bool have_obj, Elm_Xdnd_Action action)
1230{ 1230{
1231 Dropable *dropable_last = NULL; 1231 Dropable *dropable_last = NULL;
1232 1232
1233 if (dropable->last.in) 1233 if (dropable->last.in)
1234 dropable_last = _x11_dropable_geom_find 1234 dropable_last = _x11_dropable_geom_find
1235 (_x11_elm_widget_xwin_get(dropable->obj), 1235 (_x11_elm_widget_xwin_get(dropable->obj),
1236 dropable->last.x, dropable->last.y); 1236 dropable->last.x, dropable->last.y);
1237 if ((have_obj) && (dropable_last == dropable)) // same 1237 if ((have_obj) && (dropable_last == dropable)) // same
1238 { 1238 {
@@ -1320,7 +1320,7 @@ _x11_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
1320 Ecore_X_Rectangle rect = { 0, 0, 0, 0 }; 1320 Ecore_X_Rectangle rect = { 0, 0, 0, 0 };
1321 Dropable *dropable, *dropable_old; 1321 Dropable *dropable, *dropable_old;
1322 Elm_Xdnd_Action act; 1322 Elm_Xdnd_Action act;
1323 1323
1324 /* Need to send a status back */ 1324 /* Need to send a status back */
1325 /* FIXME: Should check I can drop here */ 1325 /* FIXME: Should check I can drop here */
1326 /* FIXME: Should highlight widget */ 1326 /* FIXME: Should highlight widget */
@@ -1328,7 +1328,7 @@ _x11_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
1328 if (dropable) 1328 if (dropable)
1329 { 1329 {
1330 Evas_Coord x, y, ox = 0, oy = 0, ow = 0, oh = 0; 1330 Evas_Coord x, y, ox = 0, oy = 0, ow = 0, oh = 0;
1331 1331
1332 x = pos->position.x; 1332 x = pos->position.x;
1333 y = pos->position.y; 1333 y = pos->position.y;
1334 _x11_dropable_coords_adjust(dropable, &x, &y); 1334 _x11_dropable_coords_adjust(dropable, &x, &y);
@@ -1343,7 +1343,7 @@ _x11_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
1343 rect.height = oh; 1343 rect.height = oh;
1344 ecore_x_dnd_send_status(EINA_TRUE, EINA_FALSE, rect, pos->action); 1344 ecore_x_dnd_send_status(EINA_TRUE, EINA_FALSE, rect, pos->action);
1345 cnp_debug("dnd position %i %i %p\n", x - ox, y - oy, dropable); 1345 cnp_debug("dnd position %i %i %p\n", x - ox, y - oy, dropable);
1346 _x11_dnd_dropable_handle(dropable, x - ox, y - oy, EINA_TRUE, 1346 _x11_dnd_dropable_handle(dropable, x - ox, y - oy, EINA_TRUE,
1347 act); 1347 act);
1348 // CCCCCCC: call dnd exit on last obj if obj != last 1348 // CCCCCCC: call dnd exit on last obj if obj != last
1349 // CCCCCCC: call drop position on obj 1349 // CCCCCCC: call drop position on obj
@@ -1353,7 +1353,7 @@ _x11_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
1353 { 1353 {
1354 ecore_x_dnd_send_status(EINA_FALSE, EINA_FALSE, rect, pos->action); 1354 ecore_x_dnd_send_status(EINA_FALSE, EINA_FALSE, rect, pos->action);
1355 cnp_debug("dnd position not in obj\n"); 1355 cnp_debug("dnd position not in obj\n");
1356 _x11_dnd_dropable_handle(dropable_old, 0, 0, EINA_FALSE, 1356 _x11_dnd_dropable_handle(dropable_old, 0, 0, EINA_FALSE,
1357 act); 1357 act);
1358 // CCCCCCC: call dnd exit on last obj 1358 // CCCCCCC: call dnd exit on last obj
1359 _x11_dropable_all_set(pos->win, x, y, EINA_TRUE); 1359 _x11_dropable_all_set(pos->win, x, y, EINA_TRUE);
@@ -1432,7 +1432,7 @@ found:
1432 cnp_debug("0x%x\n", drop->win); 1432 cnp_debug("0x%x\n", drop->win);
1433 1433
1434 act = _x11_dnd_action_map(drop->action); 1434 act = _x11_dnd_action_map(drop->action);
1435 1435
1436 if (i == CNP_ATOM_text_urilist) 1436 if (i == CNP_ATOM_text_urilist)
1437 { 1437 {
1438 cnp_debug("We found a URI... (%scached) %s\n", 1438 cnp_debug("We found a URI... (%scached) %s\n",
@@ -1441,7 +1441,7 @@ found:
1441 if (savedtypes.imgfile) 1441 if (savedtypes.imgfile)
1442 { 1442 {
1443 char *entrytag; 1443 char *entrytag;
1444 static const char *tagstring = 1444 static const char *tagstring =
1445 "<item absize=240x180 href=file://%s></item>"; 1445 "<item absize=240x180 href=file://%s></item>";
1446 ddata.x = savedtypes.x; 1446 ddata.x = savedtypes.x;
1447 ddata.y = savedtypes.y; 1447 ddata.y = savedtypes.y;
@@ -1661,7 +1661,7 @@ _x11_elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_For
1661 evas_object_event_callback_del_full(sel->widget, EVAS_CALLBACK_DEL, 1661 evas_object_event_callback_del_full(sel->widget, EVAS_CALLBACK_DEL,
1662 _x11_sel_obj_del, sel); 1662 _x11_sel_obj_del, sel);
1663 sel->widget = NULL; 1663 sel->widget = NULL;
1664 1664
1665 sel->active = EINA_TRUE; 1665 sel->active = EINA_TRUE;
1666 sel->widget = obj; 1666 sel->widget = obj;
1667 sel->xwin = xwin; 1667 sel->xwin = xwin;
@@ -1672,7 +1672,7 @@ _x11_elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_For
1672 1672
1673 evas_object_event_callback_add 1673 evas_object_event_callback_add
1674 (sel->widget, EVAS_CALLBACK_DEL, _x11_sel_obj_del, sel); 1674 (sel->widget, EVAS_CALLBACK_DEL, _x11_sel_obj_del, sel);
1675 1675
1676 if (selbuf) 1676 if (selbuf)
1677 { 1677 {
1678 if (format == ELM_SEL_FORMAT_IMAGE) 1678 if (format == ELM_SEL_FORMAT_IMAGE)
@@ -1700,7 +1700,7 @@ static void
1700_x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data) 1700_x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data)
1701{ 1701{
1702 X11_Cnp_Selection *sel; 1702 X11_Cnp_Selection *sel;
1703 1703
1704 _x11_elm_cnp_init(); 1704 _x11_elm_cnp_init();
1705 sel = _x11_selections + selection; 1705 sel = _x11_selections + selection;
1706 sel->loss_cb = func; 1706 sel->loss_cb = func;
@@ -1713,7 +1713,7 @@ _x11_elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection)
1713 X11_Cnp_Selection *sel; 1713 X11_Cnp_Selection *sel;
1714 1714
1715 _x11_elm_cnp_init(); 1715 _x11_elm_cnp_init();
1716 1716
1717 sel = _x11_selections + selection; 1717 sel = _x11_selections + selection;
1718 1718
1719 /* No longer this selection: Consider it gone! */ 1719 /* No longer this selection: Consider it gone! */
@@ -1729,7 +1729,7 @@ _x11_elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection)
1729 sel->requestwidget = NULL; 1729 sel->requestwidget = NULL;
1730 sel->loss_cb = NULL; 1730 sel->loss_cb = NULL;
1731 sel->loss_data = NULL; 1731 sel->loss_data = NULL;
1732 1732
1733 sel->active = EINA_FALSE; 1733 sel->active = EINA_FALSE;
1734 ELM_SAFE_FREE(sel->selbuf, free); 1734 ELM_SAFE_FREE(sel->selbuf, free);
1735 sel->clear(); 1735 sel->clear();
@@ -1746,14 +1746,14 @@ _x11_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection,
1746 X11_Cnp_Selection *sel; 1746 X11_Cnp_Selection *sel;
1747 1747
1748 _x11_elm_cnp_init(); 1748 _x11_elm_cnp_init();
1749 1749
1750 sel = _x11_selections + selection; 1750 sel = _x11_selections + selection;
1751 1751
1752 if (sel->requestwidget) 1752 if (sel->requestwidget)
1753 evas_object_event_callback_del_full(sel->requestwidget, EVAS_CALLBACK_DEL, 1753 evas_object_event_callback_del_full(sel->requestwidget, EVAS_CALLBACK_DEL,
1754 _x11_sel_obj_del2, sel); 1754 _x11_sel_obj_del2, sel);
1755 sel->requestwidget = NULL; 1755 sel->requestwidget = NULL;
1756 1756
1757 sel->requestformat = format; 1757 sel->requestformat = format;
1758 sel->requestwidget = obj; 1758 sel->requestwidget = obj;
1759 sel->xwin = xwin; 1759 sel->xwin = xwin;
@@ -1763,7 +1763,7 @@ _x11_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection,
1763 1763
1764 evas_object_event_callback_add 1764 evas_object_event_callback_add
1765 (sel->requestwidget, EVAS_CALLBACK_DEL, _x11_sel_obj_del2, sel); 1765 (sel->requestwidget, EVAS_CALLBACK_DEL, _x11_sel_obj_del2, sel);
1766 1766
1767 return EINA_TRUE; 1767 return EINA_TRUE;
1768} 1768}
1769 1769
@@ -1779,7 +1779,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
1779 Eina_List *item, *l; 1779 Eina_List *item, *l;
1780 int first; 1780 int first;
1781 Eina_Bool have_drops = EINA_FALSE; 1781 Eina_Bool have_drops = EINA_FALSE;
1782 1782
1783 _x11_elm_cnp_init(); 1783 _x11_elm_cnp_init();
1784 1784
1785 /* TODO: check if obj is already a drop target. Do not add twice! */ 1785 /* TODO: check if obj is already a drop target. Do not add twice! */
@@ -1834,7 +1834,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
1834 (Evas_Object_Event_Cb)elm_drop_target_del, 1834 (Evas_Object_Event_Cb)elm_drop_target_del,
1835 obj); 1835 obj);
1836 if (!have_drops) ecore_x_dnd_aware_set(xwin, EINA_TRUE); 1836 if (!have_drops) ecore_x_dnd_aware_set(xwin, EINA_TRUE);
1837 1837
1838 /* TODO BUG: should handle dnd-aware per window, not just the first 1838 /* TODO BUG: should handle dnd-aware per window, not just the first
1839 * window that requested it! */ 1839 * window that requested it! */
1840 /* If not the first: We're done */ 1840 /* If not the first: We're done */
@@ -1862,7 +1862,7 @@ _x11_elm_drop_target_del(Evas_Object *obj)
1862 Eina_Bool have_drops = EINA_FALSE; 1862 Eina_Bool have_drops = EINA_FALSE;
1863 1863
1864 _x11_elm_cnp_init(); 1864 _x11_elm_cnp_init();
1865 1865
1866 del = NULL; 1866 del = NULL;
1867 EINA_LIST_FOREACH(drops, item, drop) 1867 EINA_LIST_FOREACH(drops, item, drop)
1868 { 1868 {
@@ -1878,7 +1878,7 @@ _x11_elm_drop_target_del(Evas_Object *obj)
1878 evas_object_event_callback_del(obj, EVAS_CALLBACK_FREE, 1878 evas_object_event_callback_del(obj, EVAS_CALLBACK_FREE,
1879 (Evas_Object_Event_Cb)elm_drop_target_del); 1879 (Evas_Object_Event_Cb)elm_drop_target_del);
1880 if (del) free(del); 1880 if (del) free(del);
1881 1881
1882 /* TODO BUG: we should handle dnd-aware per window, not just the last that reelased it */ 1882 /* TODO BUG: we should handle dnd-aware per window, not just the last that reelased it */
1883 1883
1884 /* If still drops there: All fine.. continue */ 1884 /* If still drops there: All fine.. continue */
@@ -2033,10 +2033,10 @@ static Eina_Bool
2033_x11_elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action) 2033_x11_elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action)
2034{ 2034{
2035 Ecore_X_Atom actx; 2035 Ecore_X_Atom actx;
2036 2036
2037 _x11_elm_cnp_init(); 2037 _x11_elm_cnp_init();
2038 if (!dragwin) return EINA_FALSE; 2038 if (!dragwin) return EINA_FALSE;
2039 2039
2040 if (dragwidget != obj) return EINA_FALSE; 2040 if (dragwidget != obj) return EINA_FALSE;
2041 if (dragaction == action) return EINA_TRUE; 2041 if (dragaction == action) return EINA_TRUE;
2042 dragaction = action; 2042 dragaction = action;
@@ -2111,7 +2111,7 @@ _wl_sel_obj_del2(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_i
2111 if (sel->requestwidget == obj) sel->requestwidget = NULL; 2111 if (sel->requestwidget == obj) sel->requestwidget = NULL;
2112} 2112}
2113 2113
2114static Eina_Bool 2114static Eina_Bool
2115_wl_elm_cnp_selection_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Sel_Format format __UNUSED__, const void *selbuf, size_t buflen) 2115_wl_elm_cnp_selection_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, Elm_Sel_Format format __UNUSED__, const void *selbuf, size_t buflen)
2116{ 2116{
2117 const char *types[10] = {0, }; 2117 const char *types[10] = {0, };
@@ -2119,7 +2119,7 @@ _wl_elm_cnp_selection_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, E
2119 _wl_elm_cnp_init(); 2119 _wl_elm_cnp_init();
2120 2120
2121 /* TODO: other EML_SEL_TYPE and ELM_SEL_FORMAT */ 2121 /* TODO: other EML_SEL_TYPE and ELM_SEL_FORMAT */
2122 if (ELM_SEL_TYPE_CLIPBOARD == selection) 2122 if (ELM_SEL_TYPE_CLIPBOARD == selection)
2123 { 2123 {
2124 types[0] = "text/plain;charset=utf-8"; 2124 types[0] = "text/plain;charset=utf-8";
2125 ecore_wl_dnd_selection_set(ecore_wl_input_get(), types); 2125 ecore_wl_dnd_selection_set(ecore_wl_input_get(), types);
@@ -2133,7 +2133,7 @@ _wl_elm_cnp_selection_set(Evas_Object *obj __UNUSED__, Elm_Sel_Type selection, E
2133 return EINA_FALSE; 2133 return EINA_FALSE;
2134} 2134}
2135 2135
2136static Eina_Bool 2136static Eina_Bool
2137_wl_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format __UNUSED__, Elm_Drop_Cb datacb __UNUSED__, void *udata __UNUSED__) 2137_wl_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format __UNUSED__, Elm_Drop_Cb datacb __UNUSED__, void *udata __UNUSED__)
2138{ 2138{
2139 _wl_elm_cnp_init(); 2139 _wl_elm_cnp_init();
@@ -2147,18 +2147,18 @@ _wl_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Form
2147 wl_cnp_selection.requestwidget = obj; 2147 wl_cnp_selection.requestwidget = obj;
2148 evas_object_event_callback_add(wl_cnp_selection.requestwidget, EVAS_CALLBACK_DEL, 2148 evas_object_event_callback_add(wl_cnp_selection.requestwidget, EVAS_CALLBACK_DEL,
2149 _wl_sel_obj_del2, &wl_cnp_selection); 2149 _wl_sel_obj_del2, &wl_cnp_selection);
2150 ecore_wl_dnd_selection_get(ecore_wl_input_get(), 2150 ecore_wl_dnd_selection_get(ecore_wl_input_get(),
2151 "text/plain;charset=utf-8"); 2151 "text/plain;charset=utf-8");
2152 } 2152 }
2153 return EINA_TRUE; 2153 return EINA_TRUE;
2154} 2154}
2155 2155
2156static Eina_Bool 2156static Eina_Bool
2157_wl_elm_cnp_selection_clear(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection) 2157_wl_elm_cnp_selection_clear(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection)
2158{ 2158{
2159 _wl_elm_cnp_init(); 2159 _wl_elm_cnp_init();
2160 2160
2161 if (ELM_SEL_TYPE_CLIPBOARD == selection) 2161 if (ELM_SEL_TYPE_CLIPBOARD == selection)
2162 { 2162 {
2163 wl_cnp_selection.requestwidget = NULL; 2163 wl_cnp_selection.requestwidget = NULL;
2164 if (wl_cnp_selection.selbuf) free(wl_cnp_selection.selbuf); 2164 if (wl_cnp_selection.selbuf) free(wl_cnp_selection.selbuf);
@@ -2221,7 +2221,7 @@ _wl_selection_receive(void *udata, int type __UNUSED__, void *event)
2221 return ECORE_CALLBACK_PASS_ON; 2221 return ECORE_CALLBACK_PASS_ON;
2222} 2222}
2223 2223
2224static Eina_Bool 2224static Eina_Bool
2225_wl_elm_cnp_init(void) 2225_wl_elm_cnp_init(void)
2226{ 2226{
2227 static int _init_count = 0; 2227 static int _init_count = 0;
@@ -2229,15 +2229,15 @@ _wl_elm_cnp_init(void)
2229 if (_init_count > 0) return EINA_TRUE; 2229 if (_init_count > 0) return EINA_TRUE;
2230 _init_count++; 2230 _init_count++;
2231 2231
2232 ecore_event_handler_add(ECORE_WL_EVENT_DATA_SOURCE_SEND, 2232 ecore_event_handler_add(ECORE_WL_EVENT_DATA_SOURCE_SEND,
2233 _wl_selection_send, &wl_cnp_selection); 2233 _wl_selection_send, &wl_cnp_selection);
2234 ecore_event_handler_add(ECORE_WL_EVENT_SELECTION_DATA_READY, 2234 ecore_event_handler_add(ECORE_WL_EVENT_SELECTION_DATA_READY,
2235 _wl_selection_receive, &wl_cnp_selection); 2235 _wl_selection_receive, &wl_cnp_selection);
2236 2236
2237 return EINA_TRUE; 2237 return EINA_TRUE;
2238} 2238}
2239 2239
2240static Eina_Bool 2240static Eina_Bool
2241_wl_elm_dnd_init(void) 2241_wl_elm_dnd_init(void)
2242{ 2242{
2243 static int _init_count = 0; 2243 static int _init_count = 0;
@@ -2247,18 +2247,18 @@ _wl_elm_dnd_init(void)
2247 2247
2248 text_uri = eina_stringshare_add("text/uri-list"); 2248 text_uri = eina_stringshare_add("text/uri-list");
2249 2249
2250 ecore_event_handler_add(ECORE_WL_EVENT_DATA_SOURCE_SEND, 2250 ecore_event_handler_add(ECORE_WL_EVENT_DATA_SOURCE_SEND,
2251 _wl_dnd_send, &wl_cnp_selection); 2251 _wl_dnd_send, &wl_cnp_selection);
2252 ecore_event_handler_add(ECORE_WL_EVENT_SELECTION_DATA_READY, 2252 ecore_event_handler_add(ECORE_WL_EVENT_SELECTION_DATA_READY,
2253 _wl_dnd_receive, &wl_cnp_selection); 2253 _wl_dnd_receive, &wl_cnp_selection);
2254 2254
2255 ecore_event_handler_add(ECORE_WL_EVENT_DND_END, 2255 ecore_event_handler_add(ECORE_WL_EVENT_DND_END,
2256 _wl_dnd_end, &wl_cnp_selection); 2256 _wl_dnd_end, &wl_cnp_selection);
2257 2257
2258 return EINA_TRUE; 2258 return EINA_TRUE;
2259} 2259}
2260 2260
2261static Eina_Bool 2261static Eina_Bool
2262_wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb dropcb, void *cbdata) 2262_wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb dropcb, void *cbdata)
2263{ 2263{
2264 Dropable *drop; 2264 Dropable *drop;
@@ -2278,7 +2278,7 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
2278 } 2278 }
2279 } 2279 }
2280 2280
2281 if (!(drop = calloc(1, sizeof(Dropable)))) 2281 if (!(drop = calloc(1, sizeof(Dropable))))
2282 return EINA_FALSE; 2282 return EINA_FALSE;
2283 2283
2284 if (!(drops = eina_list_append(drops, drop))) 2284 if (!(drops = eina_list_append(drops, drop)))
@@ -2304,24 +2304,24 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
2304 2304
2305 if (first) 2305 if (first)
2306 { 2306 {
2307 handler_enter = 2307 handler_enter =
2308 ecore_event_handler_add(ECORE_WL_EVENT_DND_ENTER, 2308 ecore_event_handler_add(ECORE_WL_EVENT_DND_ENTER,
2309 _wl_dnd_enter, NULL); 2309 _wl_dnd_enter, NULL);
2310 handler_leave = 2310 handler_leave =
2311 ecore_event_handler_add(ECORE_WL_EVENT_DND_LEAVE, 2311 ecore_event_handler_add(ECORE_WL_EVENT_DND_LEAVE,
2312 _wl_dnd_leave, NULL); 2312 _wl_dnd_leave, NULL);
2313 handler_pos = 2313 handler_pos =
2314 ecore_event_handler_add(ECORE_WL_EVENT_DND_POSITION, 2314 ecore_event_handler_add(ECORE_WL_EVENT_DND_POSITION,
2315 _wl_dnd_position, NULL); 2315 _wl_dnd_position, NULL);
2316 handler_drop = 2316 handler_drop =
2317 ecore_event_handler_add(ECORE_WL_EVENT_DND_DROP, 2317 ecore_event_handler_add(ECORE_WL_EVENT_DND_DROP,
2318 _wl_dnd_drop, NULL); 2318 _wl_dnd_drop, NULL);
2319 } 2319 }
2320 2320
2321 return EINA_TRUE; 2321 return EINA_TRUE;
2322} 2322}
2323 2323
2324static Eina_Bool 2324static Eina_Bool
2325_wl_elm_drop_target_del(Evas_Object *obj) 2325_wl_elm_drop_target_del(Evas_Object *obj)
2326{ 2326{
2327 Dropable *drop; 2327 Dropable *drop;
@@ -2350,7 +2350,7 @@ _wl_elm_drop_target_del(Evas_Object *obj)
2350 return EINA_TRUE; 2350 return EINA_TRUE;
2351} 2351}
2352 2352
2353static Eina_Bool 2353static Eina_Bool
2354_wl_elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action) 2354_wl_elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action)
2355{ 2355{
2356 if (!dragwin) return EINA_FALSE; 2356 if (!dragwin) return EINA_FALSE;
@@ -2387,7 +2387,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format EINA_UNUSED, const ch
2387 wl_cnp_selection.buflen = strlen(wl_cnp_selection.selbuf); 2387 wl_cnp_selection.buflen = strlen(wl_cnp_selection.selbuf);
2388 2388
2389 /* setup callback to notify if this object gets deleted */ 2389 /* setup callback to notify if this object gets deleted */
2390 evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, 2390 evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
2391 _wl_drag_source_del, obj); 2391 _wl_drag_source_del, obj);
2392 2392
2393 dragwidget = obj; 2393 dragwidget = obj;
@@ -2404,7 +2404,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format EINA_UNUSED, const ch
2404 elm_win_borderless_set(dragwin, EINA_TRUE); 2404 elm_win_borderless_set(dragwin, EINA_TRUE);
2405 elm_win_override_set(dragwin, EINA_TRUE); 2405 elm_win_override_set(dragwin, EINA_TRUE);
2406 2406
2407 ecore_wl_window_type_set(elm_win_wl_window_get(dragwin), 2407 ecore_wl_window_type_set(elm_win_wl_window_get(dragwin),
2408 ECORE_WL_WINDOW_TYPE_DND); 2408 ECORE_WL_WINDOW_TYPE_DND);
2409 2409
2410 if (createicon) 2410 if (createicon)
@@ -2422,7 +2422,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format EINA_UNUSED, const ch
2422 else 2422 else
2423 { 2423 {
2424 icon = elm_icon_add(dragwin); 2424 icon = elm_icon_add(dragwin);
2425 evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, 2425 evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND,
2426 EVAS_HINT_EXPAND); 2426 EVAS_HINT_EXPAND);
2427 evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); 2427 evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
2428 } 2428 }
@@ -2448,20 +2448,20 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format EINA_UNUSED, const ch
2448 2448
2449 ecore_wl_dnd_drag_start(ecore_wl_input_get(), 2449 ecore_wl_dnd_drag_start(ecore_wl_input_get(),
2450 elm_win_wl_window_get(obj), 2450 elm_win_wl_window_get(obj),
2451 elm_win_wl_window_get(dragwin), 2451 elm_win_wl_window_get(dragwin),
2452 x3, y3, w, h); 2452 x3, y3, w, h);
2453 2453
2454 return EINA_TRUE; 2454 return EINA_TRUE;
2455} 2455}
2456 2456
2457static void 2457static void
2458_wl_drag_source_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) 2458_wl_drag_source_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED)
2459{ 2459{
2460 if (dragwidget == obj) 2460 if (dragwidget == obj)
2461 dragwidget = NULL; 2461 dragwidget = NULL;
2462} 2462}
2463 2463
2464static Eina_Bool 2464static Eina_Bool
2465_wl_dnd_enter(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) 2465_wl_dnd_enter(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2466{ 2466{
2467 Ecore_Wl_Event_Dnd_Enter *ev; 2467 Ecore_Wl_Event_Dnd_Enter *ev;
@@ -2504,7 +2504,7 @@ _wl_dnd_enter(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2504 return ECORE_CALLBACK_PASS_ON; 2504 return ECORE_CALLBACK_PASS_ON;
2505} 2505}
2506 2506
2507static Eina_Bool 2507static Eina_Bool
2508_wl_dnd_leave(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) 2508_wl_dnd_leave(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2509{ 2509{
2510 Ecore_Wl_Event_Dnd_Leave *ev; 2510 Ecore_Wl_Event_Dnd_Leave *ev;
@@ -2521,7 +2521,7 @@ _wl_dnd_leave(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2521 return ECORE_CALLBACK_PASS_ON; 2521 return ECORE_CALLBACK_PASS_ON;
2522} 2522}
2523 2523
2524static Eina_Bool 2524static Eina_Bool
2525_wl_dnd_position(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) 2525_wl_dnd_position(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2526{ 2526{
2527 Ecore_Wl_Event_Dnd_Position *ev; 2527 Ecore_Wl_Event_Dnd_Position *ev;
@@ -2563,7 +2563,7 @@ _wl_dnd_position(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2563 { 2563 {
2564 case ELM_SEL_FORMAT_TARGETS: 2564 case ELM_SEL_FORMAT_TARGETS:
2565 case ELM_SEL_FORMAT_IMAGE: 2565 case ELM_SEL_FORMAT_IMAGE:
2566 if ((!strncmp(savedtypes.types[i], "text/uri", 8)) || 2566 if ((!strncmp(savedtypes.types[i], "text/uri", 8)) ||
2567 (!strncmp(savedtypes.types[i], "image/", 6))) 2567 (!strncmp(savedtypes.types[i], "image/", 6)))
2568 { 2568 {
2569 wl_cnp_selection.requestwidget = drop->obj; 2569 wl_cnp_selection.requestwidget = drop->obj;
@@ -2591,7 +2591,7 @@ _wl_dnd_position(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2591 return ECORE_CALLBACK_PASS_ON; 2591 return ECORE_CALLBACK_PASS_ON;
2592} 2592}
2593 2593
2594static Eina_Bool 2594static Eina_Bool
2595_wl_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) 2595_wl_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2596{ 2596{
2597 Ecore_Wl_Event_Dnd_Drop *ev; 2597 Ecore_Wl_Event_Dnd_Drop *ev;
@@ -2602,7 +2602,7 @@ _wl_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2602 2602
2603 ev = event; 2603 ev = event;
2604 2604
2605 if (!(drop = _wl_dropable_find(ev->win))) 2605 if (!(drop = _wl_dropable_find(ev->win)))
2606 return ECORE_CALLBACK_PASS_ON; 2606 return ECORE_CALLBACK_PASS_ON;
2607 2607
2608 savedtypes.x = ev->position.x; 2608 savedtypes.x = ev->position.x;
@@ -2617,14 +2617,14 @@ _wl_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2617 2617
2618 for (i = 0; i < savedtypes.ntypes; i++) 2618 for (i = 0; i < savedtypes.ntypes; i++)
2619 { 2619 {
2620 if ((savedtypes.types[i] == text_uri) && 2620 if ((savedtypes.types[i] == text_uri) &&
2621 ((drop->types & ELM_SEL_FORMAT_MARKUP) || 2621 ((drop->types & ELM_SEL_FORMAT_MARKUP) ||
2622 (drop->types & ELM_SEL_FORMAT_IMAGE))) 2622 (drop->types & ELM_SEL_FORMAT_IMAGE)))
2623 { 2623 {
2624 wl_cnp_selection.requestwidget = drop->obj; 2624 wl_cnp_selection.requestwidget = drop->obj;
2625 evas_object_event_callback_add(wl_cnp_selection.requestwidget, 2625 evas_object_event_callback_add(wl_cnp_selection.requestwidget,
2626 EVAS_CALLBACK_DEL, 2626 EVAS_CALLBACK_DEL,
2627 _wl_sel_obj_del2, 2627 _wl_sel_obj_del2,
2628 &wl_cnp_selection); 2628 &wl_cnp_selection);
2629 ecore_wl_dnd_drag_get(ecore_wl_input_get(), text_uri); 2629 ecore_wl_dnd_drag_get(ecore_wl_input_get(), text_uri);
2630 break; 2630 break;
@@ -2634,7 +2634,7 @@ _wl_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
2634 return ECORE_CALLBACK_PASS_ON; 2634 return ECORE_CALLBACK_PASS_ON;
2635} 2635}
2636 2636
2637static Eina_Bool 2637static Eina_Bool
2638_wl_dnd_send(void *data, int type EINA_UNUSED, void *event) 2638_wl_dnd_send(void *data, int type EINA_UNUSED, void *event)
2639{ 2639{
2640 char *buf; 2640 char *buf;
@@ -2662,7 +2662,7 @@ _wl_dnd_send(void *data, int type EINA_UNUSED, void *event)
2662 return ECORE_CALLBACK_PASS_ON; 2662 return ECORE_CALLBACK_PASS_ON;
2663} 2663}
2664 2664
2665static Eina_Bool 2665static Eina_Bool
2666_wl_dnd_receive(void *data, int type EINA_UNUSED, void *event) 2666_wl_dnd_receive(void *data, int type EINA_UNUSED, void *event)
2667{ 2667{
2668 Wl_Cnp_Selection *sel; 2668 Wl_Cnp_Selection *sel;
@@ -2677,7 +2677,7 @@ _wl_dnd_receive(void *data, int type EINA_UNUSED, void *event)
2677 _wl_dropable_data_handle(sel, ev->data); 2677 _wl_dropable_data_handle(sel, ev->data);
2678 else 2678 else
2679 { 2679 {
2680 evas_object_event_callback_del_full(sel->requestwidget, 2680 evas_object_event_callback_del_full(sel->requestwidget,
2681 EVAS_CALLBACK_DEL, 2681 EVAS_CALLBACK_DEL,
2682 _wl_sel_obj_del2, sel); 2682 _wl_sel_obj_del2, sel);
2683 sel->requestwidget = NULL; 2683 sel->requestwidget = NULL;
@@ -2687,7 +2687,7 @@ _wl_dnd_receive(void *data, int type EINA_UNUSED, void *event)
2687 return ECORE_CALLBACK_PASS_ON; 2687 return ECORE_CALLBACK_PASS_ON;
2688} 2688}
2689 2689
2690static Eina_Bool 2690static Eina_Bool
2691_wl_dnd_end(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) 2691_wl_dnd_end(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
2692{ 2692{
2693 /* Ecore_Wl_Event_Dnd_End *ev; */ 2693 /* Ecore_Wl_Event_Dnd_End *ev; */
@@ -2724,14 +2724,14 @@ _wl_dnd_end(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSE
2724 return ECORE_CALLBACK_PASS_ON; 2724 return ECORE_CALLBACK_PASS_ON;
2725} 2725}
2726 2726
2727static void 2727static void
2728_wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data) 2728_wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data)
2729{ 2729{
2730 Dropable *drop; 2730 Dropable *drop;
2731 unsigned int win = 0; 2731 unsigned int win = 0;
2732 char *p, *s = NULL, *entrytag; 2732 char *p, *s = NULL, *entrytag;
2733 Elm_Selection_Data sdata; 2733 Elm_Selection_Data sdata;
2734 static const char *tagstring = 2734 static const char *tagstring =
2735 "<item absize=240x180 href=file://%s></item>"; 2735 "<item absize=240x180 href=file://%s></item>";
2736 2736
2737 win = _wl_elm_widget_window_get(sel->requestwidget); 2737 win = _wl_elm_widget_window_get(sel->requestwidget);
@@ -2764,7 +2764,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data)
2764 2764
2765 if (!savedtypes.imgfile) return; 2765 if (!savedtypes.imgfile) return;
2766 2766
2767 if ((drop->types & ELM_SEL_FORMAT_MARKUP) && 2767 if ((drop->types & ELM_SEL_FORMAT_MARKUP) &&
2768 (drop->types & ELM_SEL_FORMAT_IMAGE)) 2768 (drop->types & ELM_SEL_FORMAT_IMAGE))
2769 { 2769 {
2770 int l = 0; 2770 int l = 0;
@@ -2795,10 +2795,10 @@ _wl_dropable_find(unsigned int win)
2795{ 2795{
2796 Eina_List *l; 2796 Eina_List *l;
2797 Dropable *dropable; 2797 Dropable *dropable;
2798 2798
2799 if (!drops) return NULL; 2799 if (!drops) return NULL;
2800 EINA_LIST_FOREACH(drops, l, dropable) 2800 EINA_LIST_FOREACH(drops, l, dropable)
2801 if (_wl_elm_widget_window_get(dropable->obj) == win) 2801 if (_wl_elm_widget_window_get(dropable->obj) == win)
2802 return dropable; 2802 return dropable;
2803 return NULL; 2803 return NULL;
2804} 2804}
@@ -2824,18 +2824,18 @@ _wl_dropable_find_geom(unsigned int win, Evas_Coord x, Evas_Coord y)
2824 return NULL; 2824 return NULL;
2825} 2825}
2826 2826
2827static void 2827static void
2828_wl_dropable_handle(Dropable *drop, Evas_Coord x, Evas_Coord y, Eina_Bool have_obj) 2828_wl_dropable_handle(Dropable *drop, Evas_Coord x, Evas_Coord y, Eina_Bool have_obj)
2829{ 2829{
2830 Dropable *last = NULL; 2830 Dropable *last = NULL;
2831 2831
2832 if (drop->last.in) 2832 if (drop->last.in)
2833 last = _wl_dropable_find_geom(_wl_elm_widget_window_get(drop->obj), 2833 last = _wl_dropable_find_geom(_wl_elm_widget_window_get(drop->obj),
2834 drop->last.x, drop->last.y); 2834 drop->last.x, drop->last.y);
2835 2835
2836 if ((have_obj) && (last == drop)) 2836 if ((have_obj) && (last == drop))
2837 { 2837 {
2838 if (drop->poscb) 2838 if (drop->poscb)
2839 drop->poscb(drop->posdata, drop->obj, x, y, dragaction); 2839 drop->poscb(drop->posdata, drop->obj, x, y, dragaction);
2840 } 2840 }
2841 else if ((have_obj) && (!last)) 2841 else if ((have_obj) && (!last))
@@ -2863,7 +2863,7 @@ _wl_dropable_handle(Dropable *drop, Evas_Coord x, Evas_Coord y, Eina_Bool have_o
2863 } 2863 }
2864} 2864}
2865 2865
2866static void 2866static void
2867_wl_dropable_all_set(unsigned int win, Evas_Coord x, Evas_Coord y, Eina_Bool set) 2867_wl_dropable_all_set(unsigned int win, Evas_Coord x, Evas_Coord y, Eina_Bool set)
2868{ 2868{
2869 Eina_List *l; 2869 Eina_List *l;
@@ -2880,7 +2880,7 @@ _wl_dropable_all_set(unsigned int win, Evas_Coord x, Evas_Coord y, Eina_Bool set
2880 } 2880 }
2881} 2881}
2882 2882
2883static Eina_Bool 2883static Eina_Bool
2884_wl_drops_accept(const char *type) 2884_wl_drops_accept(const char *type)
2885{ 2885{
2886 Eina_List *l; 2886 Eina_List *l;
@@ -2893,7 +2893,7 @@ _wl_drops_accept(const char *type)
2893 { 2893 {
2894 case ELM_SEL_FORMAT_TARGETS: 2894 case ELM_SEL_FORMAT_TARGETS:
2895 case ELM_SEL_FORMAT_IMAGE: 2895 case ELM_SEL_FORMAT_IMAGE:
2896 if ((!strncmp(type, "text/uri", 8)) || 2896 if ((!strncmp(type, "text/uri", 8)) ||
2897 (!strncmp(type, "image/", 6))) 2897 (!strncmp(type, "image/", 6)))
2898 { 2898 {
2899 wl_cnp_selection.requestwidget = drop->obj; 2899 wl_cnp_selection.requestwidget = drop->obj;
@@ -2916,7 +2916,7 @@ _wl_drops_accept(const char *type)
2916 return will_accept; 2916 return will_accept;
2917} 2917}
2918 2918
2919static unsigned int 2919static unsigned int
2920_wl_elm_widget_window_get(Evas_Object *obj) 2920_wl_elm_widget_window_get(Evas_Object *obj)
2921{ 2921{
2922 Evas_Object *top; 2922 Evas_Object *top;
@@ -3006,7 +3006,7 @@ _local_get_job(void *data)
3006{ 3006{
3007 Local_Selinfo *info = data; 3007 Local_Selinfo *info = data;
3008 Elm_Selection_Data ev; 3008 Elm_Selection_Data ev;
3009 3009
3010 info->get.job = NULL; 3010 info->get.job = NULL;
3011 ev.x = 0; 3011 ev.x = 0;
3012 ev.y = 0; 3012 ev.y = 0;
@@ -3022,7 +3022,7 @@ static Eina_Bool
3022_local_elm_cnp_init(void) 3022_local_elm_cnp_init(void)
3023{ 3023{
3024 static int _init_count = 0; 3024 static int _init_count = 0;
3025 3025
3026 if (_init_count > 0) return EINA_TRUE; 3026 if (_init_count > 0) return EINA_TRUE;
3027 _init_count++; 3027 _init_count++;
3028 memset(&(_local_selinfo), 0, sizeof(_local_selinfo)); 3028 memset(&(_local_selinfo), 0, sizeof(_local_selinfo));
@@ -3085,7 +3085,7 @@ _local_elm_cnp_selection_get(Evas_Object *obj,
3085 _local_selinfo[selection].get.obj = obj; 3085 _local_selinfo[selection].get.obj = obj;
3086 _local_selinfo[selection].get.func = datacb; 3086 _local_selinfo[selection].get.func = datacb;
3087 _local_selinfo[selection].get.data = udata; 3087 _local_selinfo[selection].get.data = udata;
3088 _local_selinfo[selection].get.job = 3088 _local_selinfo[selection].get.job =
3089 ecore_job_add(_local_get_job, &(_local_selinfo[selection])); 3089 ecore_job_add(_local_get_job, &(_local_selinfo[selection]));
3090 return EINA_TRUE; 3090 return EINA_TRUE;
3091} 3091}
@@ -3199,7 +3199,7 @@ _tempfile_new(int size)
3199 char *tmp; 3199 char *tmp;
3200 /* And before someone says anything see POSIX 1003.1-2008 page 400 */ 3200 /* And before someone says anything see POSIX 1003.1-2008 page 400 */
3201 long pid; 3201 long pid;
3202 3202
3203 pid = (long)getpid(); 3203 pid = (long)getpid();
3204 /* Use pid instead of /proc/self: That way if can be passed around */ 3204 /* Use pid instead of /proc/self: That way if can be passed around */
3205 len = snprintf(NULL,0,"/proc/%li/fd/%i", pid, info->fd); 3205 len = snprintf(NULL,0,"/proc/%li/fd/%i", pid, info->fd);
@@ -3306,7 +3306,7 @@ elm_cnp_selection_loss_callback_set(Evas_Object *obj, Elm_Sel_Type selection,
3306#ifdef HAVE_ELEMENTARY_X 3306#ifdef HAVE_ELEMENTARY_X
3307 if (_x11_elm_widget_xwin_get(obj)) 3307 if (_x11_elm_widget_xwin_get(obj))
3308 _x11_elm_cnp_selection_loss_callback_set(obj, selection, func, data); 3308 _x11_elm_cnp_selection_loss_callback_set(obj, selection, func, data);
3309#endif 3309#endif
3310 _local_elm_cnp_selection_loss_callback_set(obj, selection, func, data); 3310 _local_elm_cnp_selection_loss_callback_set(obj, selection, func, data);
3311} 3311}
3312 3312
@@ -3397,15 +3397,15 @@ elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
3397 if (!_elm_cnp_init_count) _elm_cnp_init(); 3397 if (!_elm_cnp_init_count) _elm_cnp_init();
3398#ifdef HAVE_ELEMENTARY_X 3398#ifdef HAVE_ELEMENTARY_X
3399 if (_x11_elm_widget_xwin_get(obj)) 3399 if (_x11_elm_widget_xwin_get(obj))
3400 return _x11_elm_drag_start(obj, format, data, action, 3400 return _x11_elm_drag_start(obj, format, data, action,
3401 createicon, createdata, 3401 createicon, createdata,
3402 dragpos, dragdata, 3402 dragpos, dragdata,
3403 acceptcb, acceptdata, 3403 acceptcb, acceptdata,
3404 dragdone, donecbdata); 3404 dragdone, donecbdata);
3405#endif 3405#endif
3406#ifdef HAVE_ELEMENTARY_WAYLAND 3406#ifdef HAVE_ELEMENTARY_WAYLAND
3407 return _wl_elm_drag_start(obj, format, data, action, 3407 return _wl_elm_drag_start(obj, format, data, action,
3408 createicon, createdata, 3408 createicon, createdata,
3409 dragpos, dragdata, 3409 dragpos, dragdata,
3410 acceptcb, acceptdata, 3410 acceptcb, acceptdata,
3411 dragdone, donecbdata); 3411 dragdone, donecbdata);
@@ -3583,7 +3583,7 @@ _cont_drag_done_cb(void *data, Evas_Object *obj __UNUSED__)
3583{ 3583{
3584 Item_Container_Drag_Info *st = data; 3584 Item_Container_Drag_Info *st = data;
3585 elm_widget_scroll_freeze_pop(st->obj); 3585 elm_widget_scroll_freeze_pop(st->obj);
3586 if (st->user_info.dragdone) 3586 if (st->user_info.dragdone)
3587 st->user_info.dragdone(st->user_info.donecbdata, dragwidget, doaccept); 3587 st->user_info.dragdone(st->user_info.donecbdata, dragwidget, doaccept);
3588} 3588}
3589 3589
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 511a23a20..04190a8dc 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -129,15 +129,15 @@ _color_picker_init(Elm_Colorselector_Smart_Data *sd)
129 } 129 }
130 130
131 color = (sd->a << 24) | 131 color = (sd->a << 24) |
132 (((sd->r * sd->a) / 255) << 16) | 132 (((sd->r * sd->a) / 255) << 16) |
133 (((sd->g * sd->a) / 255) << 8) | 133 (((sd->g * sd->a) / 255) << 8) |
134 (((sd->b * sd->a) / 255)); 134 (((sd->b * sd->a) / 255));
135 135
136 if (sd->a == 255) 136 if (sd->a == 255)
137 evas_object_image_alpha_set(sd->picker_display, EINA_FALSE); 137 evas_object_image_alpha_set(sd->picker_display, EINA_FALSE);
138 else 138 else
139 evas_object_image_alpha_set(sd->picker_display, EINA_TRUE); 139 evas_object_image_alpha_set(sd->picker_display, EINA_TRUE);
140 140
141 pixels = evas_object_image_data_get(sd->picker_display, EINA_TRUE); 141 pixels = evas_object_image_data_get(sd->picker_display, EINA_TRUE);
142 copy = pixels; 142 copy = pixels;
143 for (y = 0; y < 17; y++) 143 for (y = 0; y < 17; y++)
@@ -634,7 +634,7 @@ _mouse_grab_pixels(void *data, int type __UNUSED__, void *event __UNUSED__)
634 634
635 return EINA_TRUE; 635 return EINA_TRUE;
636} 636}
637#endif 637#endif
638 638
639static void 639static void
640_mouse_in_canvas(void *data, Evas *e __UNUSED__, void *event_info __UNUSED__) 640_mouse_in_canvas(void *data, Evas *e __UNUSED__, void *event_info __UNUSED__)
@@ -1449,10 +1449,10 @@ _palette_colors_load(Evas_Object *obj)
1449 item->color->a = color->a; 1449 item->color->a = color->a;
1450 1450
1451 elm_box_pack_end(sd->palette_box, VIEW(item)); 1451 elm_box_pack_end(sd->palette_box, VIEW(item));
1452 evas_object_color_set(item->color_obj, 1452 evas_object_color_set(item->color_obj,
1453 (item->color->r * item->color->a) / 255, 1453 (item->color->r * item->color->a) / 255,
1454 (item->color->g * item->color->a) / 255, 1454 (item->color->g * item->color->a) / 255,
1455 (item->color->b * item->color->a) / 255, 1455 (item->color->b * item->color->a) / 255,
1456 item->color->a); 1456 item->color->a);
1457 1457
1458 sd->items = eina_list_append(sd->items, item); 1458 sd->items = eina_list_append(sd->items, item);
@@ -1513,7 +1513,7 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1513 elm_layout_content_set(obj, "selector", priv->col_bars_area); 1513 elm_layout_content_set(obj, "selector", priv->col_bars_area);
1514 1514
1515 elm_layout_signal_emit(obj, "elm,state,both", "elm"); 1515 elm_layout_signal_emit(obj, "elm,state,both", "elm");
1516 1516
1517 /* setup the color picker */ 1517 /* setup the color picker */
1518 priv->picker = elm_box_add(obj); 1518 priv->picker = elm_box_add(obj);
1519 elm_box_horizontal_set(priv->picker, EINA_TRUE); 1519 elm_box_horizontal_set(priv->picker, EINA_TRUE);
@@ -1964,7 +1964,7 @@ _mode_set(Eo *obj, void *_pd, va_list *list)
1964 elm_layout_signal_emit(obj, "elm,state,picker", "elm"); 1964 elm_layout_signal_emit(obj, "elm,state,picker", "elm");
1965 sd->focused = ELM_COLORSELECTOR_PICKER; 1965 sd->focused = ELM_COLORSELECTOR_PICKER;
1966 break; 1966 break;
1967 1967
1968 case ELM_COLORSELECTOR_ALL: 1968 case ELM_COLORSELECTOR_ALL:
1969 if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box)) 1969 if (!elm_layout_content_set(obj, "elm.palette", sd->palette_box))
1970 elm_layout_content_set(obj, "palette", sd->palette_box); 1970 elm_layout_content_set(obj, "palette", sd->palette_box);
@@ -2041,9 +2041,9 @@ elm_colorselector_palette_item_color_set(Elm_Object_Item *it,
2041 item->color->b = b; 2041 item->color->b = b;
2042 item->color->a = a; 2042 item->color->a = a;
2043 evas_object_color_set(item->color_obj, 2043 evas_object_color_set(item->color_obj,
2044 (item->color->r * item->color->a) / 255, 2044 (item->color->r * item->color->a) / 255,
2045 (item->color->g * item->color->a) / 255, 2045 (item->color->g * item->color->a) / 255,
2046 (item->color->b * item->color->a) / 255, 2046 (item->color->b * item->color->a) / 255,
2047 item->color->a); 2047 item->color->a);
2048 _colors_save(WIDGET(it)); 2048 _colors_save(WIDGET(it));
2049} 2049}
@@ -2096,9 +2096,9 @@ _palette_color_add(Eo *obj, void *_pd, va_list *list)
2096 2096
2097 elm_box_pack_end(sd->palette_box, VIEW(item)); 2097 elm_box_pack_end(sd->palette_box, VIEW(item));
2098 evas_object_color_set(item->color_obj, 2098 evas_object_color_set(item->color_obj,
2099 (item->color->r * item->color->a) / 255, 2099 (item->color->r * item->color->a) / 255,
2100 (item->color->g * item->color->a) / 255, 2100 (item->color->g * item->color->a) / 255,
2101 (item->color->b * item->color->a) / 255, 2101 (item->color->b * item->color->a) / 255,
2102 item->color->a); 2102 item->color->a);
2103 2103
2104 sd->items = eina_list_append(sd->items, item); 2104 sd->items = eina_list_append(sd->items, item);
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index fb231cd04..f04d01c84 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -513,7 +513,7 @@ _elm_config_user_dir_snprintf(char *dst,
513 (dst, size, '/', home, strlen(home), 513 (dst, size, '/', home, strlen(home),
514 ELEMENTARY_BASE_DIR, sizeof(ELEMENTARY_BASE_DIR) - 1); 514 ELEMENTARY_BASE_DIR, sizeof(ELEMENTARY_BASE_DIR) - 1);
515#else 515#else
516#ifdef DOXDG 516#ifdef DOXDG
517 home = getenv("XDG_CONFIG_HOME"); 517 home = getenv("XDG_CONFIG_HOME");
518 if (home) 518 if (home)
519 { 519 {
@@ -522,7 +522,7 @@ _elm_config_user_dir_snprintf(char *dst,
522 "elementary", sizeof("elementary") - 1); 522 "elementary", sizeof("elementary") - 1);
523 } 523 }
524 else 524 else
525#endif 525#endif
526 { 526 {
527 home = getenv("HOME"); 527 home = getenv("HOME");
528 if (!home) home = "/"; 528 if (!home) home = "/";
@@ -535,7 +535,7 @@ _elm_config_user_dir_snprintf(char *dst,
535 user_dir_len = eina_str_join_len 535 user_dir_len = eina_str_join_len
536 (dst, size, '/', home, strlen(home), 536 (dst, size, '/', home, strlen(home),
537 ELEMENTARY_BASE_DIR, sizeof(ELEMENTARY_BASE_DIR) - 1); 537 ELEMENTARY_BASE_DIR, sizeof(ELEMENTARY_BASE_DIR) - 1);
538#endif 538#endif
539 } 539 }
540#endif 540#endif
541 541
@@ -2485,10 +2485,10 @@ _elm_config_sub_init(void)
2485 if (ecore_x_init(NULL)) 2485 if (ecore_x_init(NULL))
2486 { 2486 {
2487 _root_1st = ecore_x_window_root_first_get(); 2487 _root_1st = ecore_x_window_root_first_get();
2488 2488
2489 if (!ecore_x_screen_is_composited(0)) 2489 if (!ecore_x_screen_is_composited(0))
2490 _elm_config->compositing = 0; 2490 _elm_config->compositing = 0;
2491 2491
2492 ecore_x_atoms_get(_atom_names, ATOM_COUNT, _atom); 2492 ecore_x_atoms_get(_atom_names, ATOM_COUNT, _atom);
2493 ecore_x_event_mask_set(_root_1st, 2493 ecore_x_event_mask_set(_root_1st,
2494 ECORE_X_EVENT_MASK_WINDOW_PROPERTY); 2494 ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
@@ -2497,13 +2497,13 @@ _elm_config_sub_init(void)
2497 if (!getenv("ELM_PROFILE")) 2497 if (!getenv("ELM_PROFILE"))
2498 { 2498 {
2499 char *s; 2499 char *s;
2500 2500
2501 s = ecore_x_window_prop_string_get(_root_1st, 2501 s = ecore_x_window_prop_string_get(_root_1st,
2502 _atom[ATOM_E_PROFILE]); 2502 _atom[ATOM_E_PROFILE]);
2503 if (s) 2503 if (s)
2504 { 2504 {
2505 int changed = 0; 2505 int changed = 0;
2506 2506
2507 if (_elm_profile) 2507 if (_elm_profile)
2508 { 2508 {
2509 if (strcmp(_elm_profile, s)) changed = 1; 2509 if (strcmp(_elm_profile, s)) changed = 1;
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 0789f1486..96275b335 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -837,13 +837,13 @@ _elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
837 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) 837 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
838 { 838 {
839 Elm_Access_Info *ai; 839 Elm_Access_Info *ai;
840 840
841 priv->access_obj = _elm_access_edje_object_part_object_register 841 priv->access_obj = _elm_access_edje_object_part_object_register
842 (obj, elm_layout_edje_get(obj), "elm.access"); 842 (obj, elm_layout_edje_get(obj), "elm.access");
843 if (!priv->access_obj) 843 if (!priv->access_obj)
844 priv->access_obj = _elm_access_edje_object_part_object_register 844 priv->access_obj = _elm_access_edje_object_part_object_register
845 (obj, elm_layout_edje_get(obj), "access"); 845 (obj, elm_layout_edje_get(obj), "access");
846 846
847 ai = _elm_access_info_get(priv->access_obj); 847 ai = _elm_access_info_get(priv->access_obj);
848 _elm_access_text_set(ai, ELM_ACCESS_TYPE, "date time"); 848 _elm_access_text_set(ai, ELM_ACCESS_TYPE, "date time");
849 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj); 849 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj);
@@ -1039,11 +1039,11 @@ _elm_datetime_field_limit_set(Eo *obj, void *_pd, va_list *list)
1039 if (min > max) return; 1039 if (min > max) return;
1040 1040
1041 field = sd->field_list + fieldtype; 1041 field = sd->field_list + fieldtype;
1042 if (((min >= mapping[fieldtype].def_min) && 1042 if (((min >= mapping[fieldtype].def_min) &&
1043 (min <= mapping[fieldtype].def_max)) || 1043 (min <= mapping[fieldtype].def_max)) ||
1044 (field->type == ELM_DATETIME_YEAR)) 1044 (field->type == ELM_DATETIME_YEAR))
1045 field->min = min; 1045 field->min = min;
1046 if (((max >= mapping[fieldtype].def_min) && 1046 if (((max >= mapping[fieldtype].def_min) &&
1047 (max <= mapping[fieldtype].def_max)) || 1047 (max <= mapping[fieldtype].def_max)) ||
1048 (field->type == ELM_DATETIME_YEAR)) 1048 (field->type == ELM_DATETIME_YEAR))
1049 field->max = max; 1049 field->max = max;
@@ -1248,7 +1248,7 @@ _class_constructor(Eo_Class *klass)
1248 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_datetime_smart_theme), 1248 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_datetime_smart_theme),
1249 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_datetime_smart_on_focus), 1249 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_datetime_smart_on_focus),
1250 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_datetime_smart_disable), 1250 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DISABLE), _elm_datetime_smart_disable),
1251 1251
1252 EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_datetime_smart_sizing_eval), 1252 EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_datetime_smart_sizing_eval),
1253 1253
1254 EO_OP_FUNC(ELM_OBJ_DATETIME_ID(ELM_OBJ_DATETIME_SUB_ID_FORMAT_GET), _format_get), 1254 EO_OP_FUNC(ELM_OBJ_DATETIME_ID(ELM_OBJ_DATETIME_SUB_ID_FORMAT_GET), _format_get),
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index eaad53fc1..0a94c7590 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -531,7 +531,7 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
531 if (sd->scroll) 531 if (sd->scroll)
532 { 532 {
533 Eina_Bool ok = EINA_FALSE; 533 Eina_Bool ok = EINA_FALSE;
534 534
535 eo_do(obj, elm_scrollable_interface_mirrored_set(elm_widget_mirrored_get(obj))); 535 eo_do(obj, elm_scrollable_interface_mirrored_set(elm_widget_mirrored_get(obj)));
536 536
537 if (sd->single_line) 537 if (sd->single_line)
@@ -1518,7 +1518,7 @@ _mouse_down_cb(void *data,
1518 sd->downx = ev->canvas.x; 1518 sd->downx = ev->canvas.x;
1519 sd->downy = ev->canvas.y; 1519 sd->downy = ev->canvas.y;
1520 sd->long_pressed = EINA_FALSE; 1520 sd->long_pressed = EINA_FALSE;
1521 1521
1522 if (ev->button == 1) 1522 if (ev->button == 1)
1523 { 1523 {
1524 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); 1524 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
@@ -3409,7 +3409,7 @@ _password_set(Eo *obj, void *_pd, va_list *list)
3409 else 3409 else
3410 { 3410 {
3411#ifdef HAVE_ELEMENTARY_X 3411#ifdef HAVE_ELEMENTARY_X
3412 elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP, 3412 elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP,
3413 NULL, NULL, 3413 NULL, NULL,
3414 NULL, NULL, 3414 NULL, NULL,
3415 NULL, NULL, 3415 NULL, NULL,
@@ -3668,7 +3668,7 @@ _editable_set(Eo *obj, void *_pd, va_list *list)
3668 3668
3669#ifdef HAVE_ELEMENTARY_X 3669#ifdef HAVE_ELEMENTARY_X
3670 if (editable) 3670 if (editable)
3671 elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP, 3671 elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP,
3672 NULL, NULL, 3672 NULL, NULL,
3673 NULL, NULL, 3673 NULL, NULL,
3674 NULL, NULL, 3674 NULL, NULL,
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index c63cdd3c9..b433e1b1b 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1334,7 +1334,7 @@ _flip(Evas_Object *obj)
1334 else 1334 else
1335 _flip_do(obj, t, sd->mode, 0, 0); 1335 _flip_do(obj, t, sd->mode, 0, 0);
1336 } 1336 }
1337 1337
1338 if (t >= 1.0) 1338 if (t >= 1.0)
1339 { 1339 {
1340#if 0 // this breaks manual flipping. :/ 1340#if 0 // this breaks manual flipping. :/
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index ce136610c..167eef0be 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -257,7 +257,7 @@ _on_item_changed(Elm_Flipselector_Smart_Data *sd)
257 item = DATA_GET(sd->current); 257 item = DATA_GET(sd->current);
258 if (!item) return; 258 if (!item) return;
259 if (sd->deleting) return; 259 if (sd->deleting) return;
260 260
261 if (item->func) 261 if (item->func)
262 item->func((void *)item->base.data, WIDGET(item), item); 262 item->func((void *)item->base.data, WIDGET(item), item);
263 if (!item->deleted) 263 if (!item->deleted)
@@ -586,7 +586,7 @@ _elm_flipselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
586 Elm_Flipselector_Smart_Data *sd = _pd; 586 Elm_Flipselector_Smart_Data *sd = _pd;
587 587
588 sd->deleting = EINA_TRUE; 588 sd->deleting = EINA_TRUE;
589 589
590 if (sd->walking) ERR("flipselector deleted while walking.\n"); 590 if (sd->walking) ERR("flipselector deleted while walking.\n");
591 591
592 while (sd->items) 592 while (sd->items)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 7b459a4a6..860e86844 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -798,7 +798,7 @@ _elm_genlist_item_position_state_update(Elm_Gen_Item *it)
798 unsigned idx = it->item->order_num_in; 798 unsigned idx = it->item->order_num_in;
799 799
800 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 800 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
801 801
802 if (!it->item->nostacking) 802 if (!it->item->nostacking)
803 { 803 {
804 if ((idx & 0x1) ^ it->item->stacking_even) 804 if ((idx & 0x1) ^ it->item->stacking_even)
@@ -2842,7 +2842,7 @@ static void
2842_item_unhighlight(Elm_Gen_Item *it) 2842_item_unhighlight(Elm_Gen_Item *it)
2843{ 2843{
2844 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 2844 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
2845 2845
2846 if ((it->generation < GL_IT(it)->wsd->generation) || (!it->highlighted)) 2846 if ((it->generation < GL_IT(it)->wsd->generation) || (!it->highlighted))
2847 return; 2847 return;
2848 2848
@@ -3242,7 +3242,7 @@ _item_mouse_move_cb(void *data,
3242 3242
3243 minw /= 2; 3243 minw /= 2;
3244 minh /= 2; 3244 minh /= 2;
3245 3245
3246 // gah! annoying drag detection - leave this alone 3246 // gah! annoying drag detection - leave this alone
3247 if (h < w) 3247 if (h < w)
3248 { 3248 {
@@ -3256,7 +3256,7 @@ _item_mouse_move_cb(void *data,
3256 } 3256 }
3257 if (minw < 5) minw = 5; 3257 if (minw < 5) minw = 5;
3258 if (minh < 5) minh = 5; 3258 if (minh < 5) minh = 5;
3259 3259
3260 if ((adx > minw) || (ady > minh)) 3260 if ((adx > minw) || (ady > minh))
3261 { 3261 {
3262 it->dragging = EINA_TRUE; 3262 it->dragging = EINA_TRUE;
@@ -4883,7 +4883,7 @@ _elm_genlist_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
4883 priv->stack[i] = evas_object_rectangle_add(evas_object_evas_get(obj)); 4883 priv->stack[i] = evas_object_rectangle_add(evas_object_evas_get(obj));
4884 evas_object_smart_member_add(priv->stack[i], priv->pan_obj); 4884 evas_object_smart_member_add(priv->stack[i], priv->pan_obj);
4885 } 4885 }
4886 4886
4887 eo_do(obj, elm_scrollable_interface_extern_pan_set(priv->pan_obj)); 4887 eo_do(obj, elm_scrollable_interface_extern_pan_set(priv->pan_obj));
4888 4888
4889 edje_object_size_min_calc(wd->resize_obj, &minw, &minh); 4889 edje_object_size_min_calc(wd->resize_obj, &minw, &minh);
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 5e1922501..24cb9668c 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -859,7 +859,7 @@ _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Smart_Data *sd,
859 _elm_image_internal_sizing_eval(obj, sd); 859 _elm_image_internal_sizing_eval(obj, sd);
860 860
861 if (ret) *ret = EINA_TRUE; 861 if (ret) *ret = EINA_TRUE;
862} 862}
863 863
864static void 864static void
865_elm_image_smart_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf *download) 865_elm_image_smart_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf *download)
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 7bc0669f6..cfa76e02c 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -538,9 +538,9 @@ _elm_direction_arrows_eval(Elm_Scrollable_Smart_Interface_Data *sid)
538 Eina_Bool go_left = EINA_TRUE, go_right = EINA_TRUE; 538 Eina_Bool go_left = EINA_TRUE, go_right = EINA_TRUE;
539 Eina_Bool go_up = EINA_TRUE, go_down = EINA_TRUE; 539 Eina_Bool go_up = EINA_TRUE, go_down = EINA_TRUE;
540 Evas_Coord x = 0, y = 0, mx = 0, my = 0, minx = 0, miny = 0; 540 Evas_Coord x = 0, y = 0, mx = 0, my = 0, minx = 0, miny = 0;
541 541
542 if (!sid->edje_obj || !sid->pan_obj) return; 542 if (!sid->edje_obj || !sid->pan_obj) return;
543 543
544 eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my)); 544 eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
545 eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny)); 545 eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
546 eo_do(sid->pan_obj, elm_obj_pan_pos_get(&x, &y)); 546 eo_do(sid->pan_obj, elm_obj_pan_pos_get(&x, &y));
@@ -722,7 +722,7 @@ _elm_scroll_scroll_bar_h_visibility_adjust(
722 if (sid->cb_func.content_min_limit) 722 if (sid->cb_func.content_min_limit)
723 sid->cb_func.content_min_limit(sid->obj, sid->min_w, sid->min_h); 723 sid->cb_func.content_min_limit(sid->obj, sid->min_w, sid->min_h);
724 } 724 }
725 725
726 _elm_direction_arrows_eval(sid); 726 _elm_direction_arrows_eval(sid);
727 return scroll_h_vis_change; 727 return scroll_h_vis_change;
728} 728}
diff --git a/src/lib/elm_module.c b/src/lib/elm_module.c
index 72720f487..11dca417b 100644
--- a/src/lib/elm_module.c
+++ b/src/lib/elm_module.c
@@ -48,7 +48,7 @@ _elm_module_shutdown(void)
48 if (modules) 48 if (modules)
49 { 49 {
50 Eina_List *tl = NULL; 50 Eina_List *tl = NULL;
51 51
52 it = eina_hash_iterator_data_new(modules); 52 it = eina_hash_iterator_data_new(modules);
53 53
54 EINA_ITERATOR_FOREACH(it, m) tl = eina_list_append(tl, m); 54 EINA_ITERATOR_FOREACH(it, m) tl = eina_list_append(tl, m);
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 1e8caf238..fea16844a 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -126,7 +126,7 @@ _elm_panel_smart_theme(Eo *obj, void *_pd, va_list *list)
126 const char *str; 126 const char *str;
127 Evas_Coord minw = 0, minh = 0; 127 Evas_Coord minw = 0, minh = 0;
128 Elm_Panel_Smart_Data *sd = _pd; 128 Elm_Panel_Smart_Data *sd = _pd;
129 129
130 Eina_Bool int_ret = EINA_FALSE; 130 Eina_Bool int_ret = EINA_FALSE;
131 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 131 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
132 if (ret) *ret = EINA_FALSE; 132 if (ret) *ret = EINA_FALSE;
@@ -146,15 +146,15 @@ _elm_panel_smart_theme(Eo *obj, void *_pd, va_list *list)
146 elm_widget_highlight_in_theme_set(obj, EINA_FALSE); 146 elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
147 147
148 _orient_set_do(obj); 148 _orient_set_do(obj);
149 149
150 evas_object_hide(sd->event); 150 evas_object_hide(sd->event);
151 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 151 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
152 evas_object_size_hint_min_set(sd->event, minw, minh); 152 evas_object_size_hint_min_set(sd->event, minw, minh);
153 153
154 if (edje_object_part_exists 154 if (edje_object_part_exists
155 (wd->resize_obj, "elm.swallow.event")) 155 (wd->resize_obj, "elm.swallow.event"))
156 elm_layout_content_set(obj, "elm.swallow.event", sd->event); 156 elm_layout_content_set(obj, "elm.swallow.event", sd->event);
157 157
158 elm_layout_sizing_eval(obj); 158 elm_layout_sizing_eval(obj);
159 159
160 if (ret) *ret = EINA_TRUE; 160 if (ret) *ret = EINA_TRUE;
@@ -382,13 +382,13 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
382 (wd->resize_obj, "elm.swallow.event")) 382 (wd->resize_obj, "elm.swallow.event"))
383 { 383 {
384 Evas_Coord minw = 0, minh = 0; 384 Evas_Coord minw = 0, minh = 0;
385 385
386 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 386 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
387 evas_object_size_hint_min_set(priv->event, minw, minh); 387 evas_object_size_hint_min_set(priv->event, minw, minh);
388 elm_layout_content_set(obj, "elm.swallow.event", priv->event); 388 elm_layout_content_set(obj, "elm.swallow.event", priv->event);
389 } 389 }
390 elm_widget_sub_object_add(obj, priv->event); 390 elm_widget_sub_object_add(obj, priv->event);
391 391
392 elm_layout_sizing_eval(obj); 392 elm_layout_sizing_eval(obj);
393} 393}
394 394
diff --git a/src/lib/elm_prefs_data.c b/src/lib/elm_prefs_data.c
index 0a20ee7ad..9a612309c 100644
--- a/src/lib/elm_prefs_data.c
+++ b/src/lib/elm_prefs_data.c
@@ -693,7 +693,7 @@ elm_prefs_data_value_set(Elm_Prefs_Data *prefs_data,
693 } 693 }
694 694
695 name = strrchr(path, ':'); 695 name = strrchr(path, ':');
696 if (!name) 696 if (!name)
697 { 697 {
698 ERR("invalid item path: %s", path); 698 ERR("invalid item path: %s", path);
699 return EINA_FALSE; 699 return EINA_FALSE;
@@ -710,7 +710,7 @@ elm_prefs_data_value_set(Elm_Prefs_Data *prefs_data,
710 if (!values) 710 if (!values)
711 { 711 {
712 /* new key, must add one */ 712 /* new key, must add one */
713 values = eina_hash_string_superfast_new(_data_values_hash_free_cb); 713 values = eina_hash_string_superfast_new(_data_values_hash_free_cb);
714 eina_hash_set(prefs_data->keys, key, values); 714 eina_hash_set(prefs_data->keys, key, values);
715 } 715 }
716 716
@@ -769,7 +769,7 @@ elm_prefs_data_value_get(const Elm_Prefs_Data *prefs_data,
769 EINA_SAFETY_ON_NULL_RETURN_VAL(value, EINA_FALSE); 769 EINA_SAFETY_ON_NULL_RETURN_VAL(value, EINA_FALSE);
770 770
771 name = strrchr(path, ':'); 771 name = strrchr(path, ':');
772 if (!name) 772 if (!name)
773 { 773 {
774 ERR("invalid item path: %s", path); 774 ERR("invalid item path: %s", path);
775 return EINA_FALSE; 775 return EINA_FALSE;
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 24719a412..15660db82 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -497,7 +497,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list)
497 if (sd->popup) 497 if (sd->popup)
498 edje_object_scale_set(sd->popup, elm_widget_scale_get(obj) * 498 edje_object_scale_set(sd->popup, elm_widget_scale_get(obj) *
499 elm_config_scale_get()); 499 elm_config_scale_get());
500 500
501 if (sd->horizontal) 501 if (sd->horizontal)
502 evas_object_size_hint_min_set 502 evas_object_size_hint_min_set
503 (sd->spacer, (double)sd->size * elm_widget_scale_get(obj) * 503 (sd->spacer, (double)sd->size * elm_widget_scale_get(obj) *
@@ -865,7 +865,7 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
865 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 865 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
866 _elm_access_callback_set 866 _elm_access_callback_set
867 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL); 867 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
868 868
869 evas_object_smart_changed(obj); 869 evas_object_smart_changed(obj);
870} 870}
871 871
@@ -978,7 +978,7 @@ _elm_slider_unit_format_set(Eo *obj, void *_pd, va_list *list)
978 const char *units = va_arg(*list, const char *); 978 const char *units = va_arg(*list, const char *);
979 Elm_Slider_Smart_Data *sd = _pd; 979 Elm_Slider_Smart_Data *sd = _pd;
980 Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); 980 Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
981 981
982 eina_stringshare_replace(&sd->units, units); 982 eina_stringshare_replace(&sd->units, units);
983 if (units) 983 if (units)
984 { 984 {
diff --git a/src/lib/elm_url.c b/src/lib/elm_url.c
index 2d745615b..736d1a0fd 100644
--- a/src/lib/elm_url.c
+++ b/src/lib/elm_url.c
@@ -83,7 +83,7 @@ _elm_url_data(void *data, int type EINA_UNUSED, void *event)
83 if (url_data->url_con != r->target) return EINA_TRUE; 83 if (url_data->url_con != r->target) return EINA_TRUE;
84 84
85 eina_binbuf_append_length(r->download, url_data->data, url_data->size); 85 eina_binbuf_append_length(r->download, url_data->data, url_data->size);
86 86
87 return EINA_TRUE; 87 return EINA_TRUE;
88} 88}
89 89
diff --git a/src/lib/elm_util.c b/src/lib/elm_util.c
index 33805a651..476205c93 100644
--- a/src/lib/elm_util.c
+++ b/src/lib/elm_util.c
@@ -51,7 +51,7 @@ double
51_elm_atof(const char *s) 51_elm_atof(const char *s)
52{ 52{
53 char *cradix, *buf, *p; 53 char *cradix, *buf, *p;
54 54
55 if ((!s) || (!s[0])) return 0.0; 55 if ((!s) || (!s[0])) return 0.0;
56 cradix = nl_langinfo(RADIXCHAR); 56 cradix = nl_langinfo(RADIXCHAR);
57 if (!cradix) return atof(s); 57 if (!cradix) return atof(s);
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index f88a70fd7..6c75d71de 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -5986,7 +5986,7 @@ _elm_widget_item_signal_callback_del(Elm_Widget_Item *item,
5986{ 5986{
5987 Elm_Widget_Item_Signal_Data *wisd; 5987 Elm_Widget_Item_Signal_Data *wisd;
5988 Eina_List *l; 5988 Eina_List *l;
5989 5989
5990 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL); 5990 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL);
5991 EINA_SAFETY_ON_NULL_RETURN_VAL(func, NULL); 5991 EINA_SAFETY_ON_NULL_RETURN_VAL(func, NULL);
5992 5992
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 2b6924f41..3fbfd825f 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1010,7 +1010,7 @@ _elm_win_state_change(Ecore_Evas *ee)
1010 ch_maximized = EINA_TRUE; 1010 ch_maximized = EINA_TRUE;
1011 } 1011 }
1012 1012
1013 1013
1014 profile = ecore_evas_window_profile_get(sd->ee); 1014 profile = ecore_evas_window_profile_get(sd->ee);
1015 ch_profile = _elm_win_profile_set(sd, profile); 1015 ch_profile = _elm_win_profile_set(sd, profile);
1016 1016
@@ -2221,10 +2221,10 @@ _elm_win_frame_obj_move(void *data,
2221 evas_object_geometry_get(sd->spacer_obj, &sx, &sy, &sw, &sh); 2221 evas_object_geometry_get(sd->spacer_obj, &sx, &sy, &sw, &sh);
2222 2222
2223 evas_output_framespace_get(sd->evas, &x, &y, &w, &h); 2223 evas_output_framespace_get(sd->evas, &x, &y, &w, &h);
2224 if ((x != (ox - fx)) || (y != (oy - fy)) || 2224 if ((x != (ox - fx)) || (y != (oy - fy)) ||
2225 (w != (fw - ow)) || (h != (fh - oh))) 2225 (w != (fw - ow)) || (h != (fh - oh)))
2226 { 2226 {
2227 evas_output_framespace_set(sd->evas, (ox - fx), (oy - fy), 2227 evas_output_framespace_set(sd->evas, (ox - fx), (oy - fy),
2228 (fw - ow), (fh - oh)); 2228 (fw - ow), (fh - oh));
2229 } 2229 }
2230 2230
@@ -2253,10 +2253,10 @@ _elm_win_frame_obj_resize(void *data,
2253 evas_object_geometry_get(sd->spacer_obj, &sx, &sy, &sw, &sh); 2253 evas_object_geometry_get(sd->spacer_obj, &sx, &sy, &sw, &sh);
2254 2254
2255 evas_output_framespace_get(sd->evas, &x, &y, &w, &h); 2255 evas_output_framespace_get(sd->evas, &x, &y, &w, &h);
2256 if ((x != (ox - fx)) || (y != (oy - fy)) || 2256 if ((x != (ox - fx)) || (y != (oy - fy)) ||
2257 (w != (fw - ow)) || (h != (fh - oh))) 2257 (w != (fw - ow)) || (h != (fh - oh)))
2258 { 2258 {
2259 evas_output_framespace_set(sd->evas, (ox - fx), (oy - fy), 2259 evas_output_framespace_set(sd->evas, (ox - fx), (oy - fy),
2260 (fw - ow), (fh - oh)); 2260 (fw - ow), (fh - oh));
2261 } 2261 }
2262 2262
@@ -2453,14 +2453,14 @@ _elm_win_frame_add(Elm_Win_Smart_Data *sd,
2453 sd->spacer_obj = evas_object_rectangle_add(sd->evas); 2453 sd->spacer_obj = evas_object_rectangle_add(sd->evas);
2454 evas_object_color_set(sd->spacer_obj, 0, 0, 0, 0); 2454 evas_object_color_set(sd->spacer_obj, 0, 0, 0, 0);
2455 evas_object_repeat_events_set(sd->spacer_obj, EINA_TRUE); 2455 evas_object_repeat_events_set(sd->spacer_obj, EINA_TRUE);
2456 edje_object_part_swallow(sd->frame_obj, "elm.swallow.frame_spacer", 2456 edje_object_part_swallow(sd->frame_obj, "elm.swallow.frame_spacer",
2457 sd->spacer_obj); 2457 sd->spacer_obj);
2458 2458
2459 sd->client_obj = evas_object_rectangle_add(sd->evas); 2459 sd->client_obj = evas_object_rectangle_add(sd->evas);
2460 evas_object_color_set(sd->client_obj, 0, 0, 0, 0); 2460 evas_object_color_set(sd->client_obj, 0, 0, 0, 0);
2461 /* NB: Tried pass_events here, but that fails to send events */ 2461 /* NB: Tried pass_events here, but that fails to send events */
2462 evas_object_repeat_events_set(sd->client_obj, EINA_TRUE); 2462 evas_object_repeat_events_set(sd->client_obj, EINA_TRUE);
2463 edje_object_part_swallow(sd->frame_obj, "elm.swallow.client", 2463 edje_object_part_swallow(sd->frame_obj, "elm.swallow.client",
2464 sd->client_obj); 2464 sd->client_obj);
2465 2465
2466 evas_object_is_frame_object_set(sd->frame_obj, EINA_TRUE); 2466 evas_object_is_frame_object_set(sd->frame_obj, EINA_TRUE);
@@ -2470,7 +2470,7 @@ _elm_win_frame_add(Elm_Win_Smart_Data *sd,
2470 evas_object_event_callback_add 2470 evas_object_event_callback_add
2471 (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd); 2471 (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd);
2472 2472
2473 /* NB: Do NOT remove these calls !! Needed to calculate proper 2473 /* NB: Do NOT remove these calls !! Needed to calculate proper
2474 * framespace on inital show of the window */ 2474 * framespace on inital show of the window */
2475 edje_object_size_min_calc(sd->frame_obj, &mw, &mh); 2475 edje_object_size_min_calc(sd->frame_obj, &mw, &mh);
2476 evas_object_move(sd->frame_obj, 0, 0); 2476 evas_object_move(sd->frame_obj, 0, 0);
@@ -2516,7 +2516,7 @@ _elm_win_frame_del(Elm_Win_Smart_Data *sd)
2516{ 2516{
2517 int w, h; 2517 int w, h;
2518 2518
2519 if (sd->client_obj) 2519 if (sd->client_obj)
2520 { 2520 {
2521 evas_object_del(sd->client_obj); 2521 evas_object_del(sd->client_obj);
2522 sd->client_obj = NULL; 2522 sd->client_obj = NULL;
@@ -5433,7 +5433,7 @@ elm_win_floating_mode_get(const Evas_Object *obj)
5433 return sd->floating; 5433 return sd->floating;
5434} 5434}
5435 5435
5436static void 5436static void
5437_window_id_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) 5437_window_id_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
5438{ 5438{
5439 Ecore_Window *ret = va_arg(*list, Ecore_Window *); 5439 Ecore_Window *ret = va_arg(*list, Ecore_Window *);
@@ -5477,7 +5477,7 @@ _window_id_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
5477 *ret = 0; 5477 *ret = 0;
5478} 5478}
5479 5479
5480EAPI Ecore_Window 5480EAPI Ecore_Window
5481elm_win_window_id_get(const Evas_Object *obj) 5481elm_win_window_id_get(const Evas_Object *obj)
5482{ 5482{
5483 if (!obj) return 0; 5483 if (!obj) return 0;
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index 23ef72d0d..85c38398f 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -160,7 +160,7 @@ static void
160_elm_cursor_obj_del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 160_elm_cursor_obj_del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
161{ 161{
162 Elm_Cursor *cur = data; 162 Elm_Cursor *cur = data;
163 163
164 if (cur) 164 if (cur)
165 { 165 {
166 evas_object_event_callback_del_full(cur->obj, EVAS_CALLBACK_DEL, 166 evas_object_event_callback_del_full(cur->obj, EVAS_CALLBACK_DEL,