summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2020-05-04 14:21:03 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-05-04 15:15:07 +0100
commit3c619b96fc8b9e68c0ba4c7f191465ea7f1a428e (patch)
tree30cf96d89c5f64482d6553b9cce87a63774c85eb
parent016953644494de3b42d9d7538c457fe44f5ca5e1 (diff)
remove arguments of LOGFN in ecre_x and ecore_wayland as the are always the same
Reviewers: raster Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11769
-rw-r--r--src/lib/ecore_wayland/ecore_wl.c24
-rw-r--r--src/lib/ecore_wayland/ecore_wl_dnd.c56
-rw-r--r--src/lib/ecore_wayland/ecore_wl_input.c88
-rw-r--r--src/lib/ecore_wayland/ecore_wl_output.c6
-rw-r--r--src/lib/ecore_wayland/ecore_wl_private.h4
-rw-r--r--src/lib/ecore_wayland/ecore_wl_subsurf.c18
-rw-r--r--src/lib/ecore_wayland/ecore_wl_window.c94
-rw-r--r--src/lib/ecore_x/ecore_x.c102
-rw-r--r--src/lib/ecore_x/ecore_x_atoms.c6
-rw-r--r--src/lib/ecore_x/ecore_x_composite.c14
-rw-r--r--src/lib/ecore_x/ecore_x_cursor.c10
-rw-r--r--src/lib/ecore_x/ecore_x_damage.c8
-rw-r--r--src/lib/ecore_x/ecore_x_dnd.c22
-rw-r--r--src/lib/ecore_x/ecore_x_dpms.c26
-rw-r--r--src/lib/ecore_x/ecore_x_drawable.c8
-rw-r--r--src/lib/ecore_x/ecore_x_e.c232
-rw-r--r--src/lib/ecore_x/ecore_x_events.c42
-rw-r--r--src/lib/ecore_x/ecore_x_fixes.c40
-rw-r--r--src/lib/ecore_x/ecore_x_gc.c4
-rw-r--r--src/lib/ecore_x/ecore_x_icccm.c66
-rw-r--r--src/lib/ecore_x/ecore_x_image.c10
-rw-r--r--src/lib/ecore_x/ecore_x_mwm.c4
-rw-r--r--src/lib/ecore_x/ecore_x_netwm.c128
-rw-r--r--src/lib/ecore_x/ecore_x_pixmap.c10
-rw-r--r--src/lib/ecore_x/ecore_x_present.c2
-rw-r--r--src/lib/ecore_x/ecore_x_private.h4
-rw-r--r--src/lib/ecore_x/ecore_x_region.c24
-rw-r--r--src/lib/ecore_x/ecore_x_screensaver.c24
-rw-r--r--src/lib/ecore_x/ecore_x_selection.c42
-rw-r--r--src/lib/ecore_x/ecore_x_sync.c20
-rw-r--r--src/lib/ecore_x/ecore_x_test.c6
-rw-r--r--src/lib/ecore_x/ecore_x_window.c100
-rw-r--r--src/lib/ecore_x/ecore_x_window_prop.c44
-rw-r--r--src/lib/ecore_x/ecore_x_window_shape.c48
-rw-r--r--src/lib/ecore_x/ecore_x_xi2.c6
-rw-r--r--src/lib/ecore_x/ecore_x_xinerama.c4
36 files changed, 673 insertions, 673 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index 3bc3125122..6905ff9dde 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -128,7 +128,7 @@ EAPI int
128ecore_wl_init(const char *name) 128ecore_wl_init(const char *name)
129{ 129{
130 struct wl_callback *callback; 130 struct wl_callback *callback;
131 LOGFN(__FILE__, __LINE__, __FUNCTION__); 131 LOGFN;
132 132
133 if (++_ecore_wl_init_count != 1) return _ecore_wl_init_count; 133 if (++_ecore_wl_init_count != 1) return _ecore_wl_init_count;
134 134
@@ -240,7 +240,7 @@ exit_eina:
240EAPI int 240EAPI int
241ecore_wl_shutdown(void) 241ecore_wl_shutdown(void)
242{ 242{
243 LOGFN(__FILE__, __LINE__, __FUNCTION__); 243 LOGFN;
244 244
245 return _ecore_wl_shutdown(EINA_TRUE); 245 return _ecore_wl_shutdown(EINA_TRUE);
246} 246}
@@ -337,7 +337,7 @@ ecore_wl_screen_size_get(int *w, int *h)
337 Eina_Inlist *tmp; 337 Eina_Inlist *tmp;
338 int ow = 0, oh = 0; 338 int ow = 0, oh = 0;
339 339
340 LOGFN(__FILE__, __LINE__, __FUNCTION__); 340 LOGFN;
341 341
342 if (w) *w = 0; 342 if (w) *w = 0;
343 if (h) *h = 0; 343 if (h) *h = 0;
@@ -380,7 +380,7 @@ ecore_wl_screen_size_get(int *w, int *h)
380EAPI void 380EAPI void
381ecore_wl_pointer_xy_get(int *x, int *y) 381ecore_wl_pointer_xy_get(int *x, int *y)
382{ 382{
383 LOGFN(__FILE__, __LINE__, __FUNCTION__); 383 LOGFN;
384 384
385 _ecore_wl_input_pointer_xy_get(x, y); 385 _ecore_wl_input_pointer_xy_get(x, y);
386} 386}
@@ -390,7 +390,7 @@ ecore_wl_dpi_get(void)
390{ 390{
391 int w, mw; 391 int w, mw;
392 392
393 LOGFN(__FILE__, __LINE__, __FUNCTION__); 393 LOGFN;
394 394
395 if (!_ecore_wl_disp) return 0; 395 if (!_ecore_wl_disp) return 0;
396 396
@@ -428,7 +428,7 @@ ecore_wl_display_iterate(void)
428EAPI Eina_Bool 428EAPI Eina_Bool
429ecore_wl_animator_source_set(Ecore_Animator_Source source) 429ecore_wl_animator_source_set(Ecore_Animator_Source source)
430{ 430{
431 LOGFN(__FILE__, __LINE__, __FUNCTION__); 431 LOGFN;
432 432
433 if (_ecore_wl_server_mode) return EINA_FALSE; 433 if (_ecore_wl_server_mode) return EINA_FALSE;
434 434
@@ -477,7 +477,7 @@ ecore_wl_server_mode_set(Eina_Bool on)
477static int 477static int
478_ecore_wl_shutdown(Eina_Bool close) 478_ecore_wl_shutdown(Eina_Bool close)
479{ 479{
480 LOGFN(__FILE__, __LINE__, __FUNCTION__); 480 LOGFN;
481 481
482 if (_ecore_wl_init_count < 1) 482 if (_ecore_wl_init_count < 1)
483 { 483 {
@@ -619,7 +619,7 @@ _ecore_wl_cb_handle_data(void *data, Ecore_Fd_Handler *hdl)
619 Ecore_Wl_Display *ewd; 619 Ecore_Wl_Display *ewd;
620 int ret = 0; 620 int ret = 0;
621 621
622 /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */ 622 /* LOGFN; */
623 623
624 if (_ecore_wl_fatal_error) return ECORE_CALLBACK_CANCEL; 624 if (_ecore_wl_fatal_error) return ECORE_CALLBACK_CANCEL;
625 625
@@ -664,7 +664,7 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
664 Ecore_Wl_Display *ewd; 664 Ecore_Wl_Display *ewd;
665 Ecore_Wl_Global *global; 665 Ecore_Wl_Global *global;
666 666
667 LOGFN(__FILE__, __LINE__, __FUNCTION__); 667 LOGFN;
668 668
669 ewd = data; 669 ewd = data;
670 670
@@ -769,7 +769,7 @@ _ecore_wl_cb_handle_global_remove(void *data, struct wl_registry *registry EINA_
769 Ecore_Wl_Global *global; 769 Ecore_Wl_Global *global;
770 Eina_Inlist *tmp; 770 Eina_Inlist *tmp;
771 771
772 LOGFN(__FILE__, __LINE__, __FUNCTION__); 772 LOGFN;
773 773
774 ewd = data; 774 ewd = data;
775 775
@@ -786,7 +786,7 @@ _ecore_wl_cb_handle_global_remove(void *data, struct wl_registry *registry EINA_
786static Eina_Bool 786static Eina_Bool
787_ecore_wl_xkb_init(Ecore_Wl_Display *ewd) 787_ecore_wl_xkb_init(Ecore_Wl_Display *ewd)
788{ 788{
789 LOGFN(__FILE__, __LINE__, __FUNCTION__); 789 LOGFN;
790 790
791 if (!(ewd->xkb.context = xkb_context_new(0))) 791 if (!(ewd->xkb.context = xkb_context_new(0)))
792 return EINA_FALSE; 792 return EINA_FALSE;
@@ -797,7 +797,7 @@ _ecore_wl_xkb_init(Ecore_Wl_Display *ewd)
797static Eina_Bool 797static Eina_Bool
798_ecore_wl_xkb_shutdown(Ecore_Wl_Display *ewd) 798_ecore_wl_xkb_shutdown(Ecore_Wl_Display *ewd)
799{ 799{
800 LOGFN(__FILE__, __LINE__, __FUNCTION__); 800 LOGFN;
801 801
802 xkb_context_unref(ewd->xkb.context); 802 xkb_context_unref(ewd->xkb.context);
803 803
diff --git a/src/lib/ecore_wayland/ecore_wl_dnd.c b/src/lib/ecore_wayland/ecore_wl_dnd.c
index 09f6c9c9a9..d4bf3e193f 100644
--- a/src/lib/ecore_wayland/ecore_wl_dnd.c
+++ b/src/lib/ecore_wayland/ecore_wl_dnd.c
@@ -85,7 +85,7 @@ _ecore_wl_dnd_offer_listener =
85EINA_DEPRECATED EAPI Eina_Bool 85EINA_DEPRECATED EAPI Eina_Bool
86ecore_wl_dnd_set_selection(Ecore_Wl_Dnd *dnd, const char **types_offered) 86ecore_wl_dnd_set_selection(Ecore_Wl_Dnd *dnd, const char **types_offered)
87{ 87{
88 LOGFN(__FILE__, __LINE__, __FUNCTION__); 88 LOGFN;
89 89
90 return ecore_wl_dnd_selection_set(dnd->input, types_offered); 90 return ecore_wl_dnd_selection_set(dnd->input, types_offered);
91} 91}
@@ -97,7 +97,7 @@ ecore_wl_dnd_set_selection(Ecore_Wl_Dnd *dnd, const char **types_offered)
97EINA_DEPRECATED EAPI Eina_Bool 97EINA_DEPRECATED EAPI Eina_Bool
98ecore_wl_dnd_get_selection(Ecore_Wl_Dnd *dnd, const char *type) 98ecore_wl_dnd_get_selection(Ecore_Wl_Dnd *dnd, const char *type)
99{ 99{
100 LOGFN(__FILE__, __LINE__, __FUNCTION__); 100 LOGFN;
101 101
102 return ecore_wl_dnd_selection_get(dnd->input, type); 102 return ecore_wl_dnd_selection_get(dnd->input, type);
103} 103}
@@ -143,7 +143,7 @@ ecore_wl_dnd_selection_set(Ecore_Wl_Input *input, const char **types_offered)
143 const char **type; 143 const char **type;
144 char **t; 144 char **t;
145 145
146 LOGFN(__FILE__, __LINE__, __FUNCTION__); 146 LOGFN;
147 147
148 if (!input) return EINA_FALSE; 148 if (!input) return EINA_FALSE;
149 149
@@ -197,7 +197,7 @@ ecore_wl_dnd_selection_get(Ecore_Wl_Input *input, const char *type)
197{ 197{
198 char **t; 198 char **t;
199 199
200 LOGFN(__FILE__, __LINE__, __FUNCTION__); 200 LOGFN;
201 201
202 /* check for valid input and selection source */ 202 /* check for valid input and selection source */
203 if ((!input) || (!input->selection_source)) return EINA_FALSE; 203 if ((!input) || (!input->selection_source)) return EINA_FALSE;
@@ -221,7 +221,7 @@ ecore_wl_dnd_selection_get(Ecore_Wl_Input *input, const char *type)
221EAPI Eina_Bool 221EAPI Eina_Bool
222ecore_wl_dnd_selection_owner_has(Ecore_Wl_Input *input) 222ecore_wl_dnd_selection_owner_has(Ecore_Wl_Input *input)
223{ 223{
224 LOGFN(__FILE__, __LINE__, __FUNCTION__); 224 LOGFN;
225 225
226 if (!input) return EINA_FALSE; 226 if (!input) return EINA_FALSE;
227 return (input->selection_source != NULL); 227 return (input->selection_source != NULL);
@@ -234,7 +234,7 @@ ecore_wl_dnd_selection_owner_has(Ecore_Wl_Input *input)
234EAPI Eina_Bool 234EAPI Eina_Bool
235ecore_wl_dnd_selection_clear(Ecore_Wl_Input *input) 235ecore_wl_dnd_selection_clear(Ecore_Wl_Input *input)
236{ 236{
237 LOGFN(__FILE__, __LINE__, __FUNCTION__); 237 LOGFN;
238 238
239 /* check for valid input */ 239 /* check for valid input */
240 if (!input) return EINA_FALSE; 240 if (!input) return EINA_FALSE;
@@ -256,7 +256,7 @@ ecore_wl_dnd_drag_start(Ecore_Wl_Input *input, Ecore_Wl_Window *win, Ecore_Wl_Wi
256 struct wl_surface *drag_surface; 256 struct wl_surface *drag_surface;
257 struct wl_surface *origin_surface; 257 struct wl_surface *origin_surface;
258 258
259 LOGFN(__FILE__, __LINE__, __FUNCTION__); 259 LOGFN;
260 260
261 /* check for valid input. if not, get the default one */ 261 /* check for valid input. if not, get the default one */
262 if (!input) input = _ecore_wl_disp->input; 262 if (!input) input = _ecore_wl_disp->input;
@@ -312,7 +312,7 @@ ecore_wl_dnd_drag_end(Ecore_Wl_Input *input)
312{ 312{
313 Ecore_Wl_Event_Dnd_End *ev; 313 Ecore_Wl_Event_Dnd_End *ev;
314 314
315 LOGFN(__FILE__, __LINE__, __FUNCTION__); 315 LOGFN;
316 316
317 /* check for valid input. if not, get the default one */ 317 /* check for valid input. if not, get the default one */
318 if (!input) input = _ecore_wl_disp->input; 318 if (!input) input = _ecore_wl_disp->input;
@@ -354,7 +354,7 @@ ecore_wl_dnd_drag_get(Ecore_Wl_Input *input, const char *type)
354{ 354{
355 char **t; 355 char **t;
356 356
357 LOGFN(__FILE__, __LINE__, __FUNCTION__); 357 LOGFN;
358 358
359 /* check for valid input and drag source */ 359 /* check for valid input and drag source */
360 if ((!input) || (!input->drag_source)) return EINA_FALSE; 360 if ((!input) || (!input->drag_source)) return EINA_FALSE;
@@ -380,7 +380,7 @@ ecore_wl_dnd_drag_types_set(Ecore_Wl_Input *input, const char **types_offered)
380 const char **type; 380 const char **type;
381 char **t; 381 char **t;
382 382
383 LOGFN(__FILE__, __LINE__, __FUNCTION__); 383 LOGFN;
384 384
385 /* check for valid input. if not, get the default one */ 385 /* check for valid input. if not, get the default one */
386 if (!input) input = _ecore_wl_disp->input; 386 if (!input) input = _ecore_wl_disp->input;
@@ -426,7 +426,7 @@ ecore_wl_dnd_drag_types_set(Ecore_Wl_Input *input, const char **types_offered)
426EAPI struct wl_array * 426EAPI struct wl_array *
427ecore_wl_dnd_drag_types_get(Ecore_Wl_Input *input) 427ecore_wl_dnd_drag_types_get(Ecore_Wl_Input *input)
428{ 428{
429 LOGFN(__FILE__, __LINE__, __FUNCTION__); 429 LOGFN;
430 430
431 /* check for valid input. if not, get the default one */ 431 /* check for valid input. if not, get the default one */
432 if (!input) input = _ecore_wl_disp->input; 432 if (!input) input = _ecore_wl_disp->input;
@@ -441,7 +441,7 @@ _ecore_wl_dnd_add(Ecore_Wl_Input *input, struct wl_data_device *data_device EINA
441{ 441{
442 Ecore_Wl_Dnd_Source *source; 442 Ecore_Wl_Dnd_Source *source;
443 443
444 LOGFN(__FILE__, __LINE__, __FUNCTION__); 444 LOGFN;
445 445
446 if (!(source = malloc(sizeof(Ecore_Wl_Dnd_Source)))) 446 if (!(source = malloc(sizeof(Ecore_Wl_Dnd_Source))))
447 return; 447 return;
@@ -464,7 +464,7 @@ _ecore_wl_dnd_enter(void *data, struct wl_data_device *data_device EINA_UNUSED,
464 char **types; 464 char **types;
465 int num = 0; 465 int num = 0;
466 466
467 LOGFN(__FILE__, __LINE__, __FUNCTION__); 467 LOGFN;
468 468
469 if (!(input = data)) return; 469 if (!(input = data)) return;
470 470
@@ -510,7 +510,7 @@ _ecore_wl_dnd_leave(void *data, struct wl_data_device *data_device EINA_UNUSED)
510 Ecore_Wl_Event_Dnd_Leave *ev; 510 Ecore_Wl_Event_Dnd_Leave *ev;
511 Ecore_Wl_Input *input; 511 Ecore_Wl_Input *input;
512 512
513 LOGFN(__FILE__, __LINE__, __FUNCTION__); 513 LOGFN;
514 514
515 if (!(input = data)) return; 515 if (!(input = data)) return;
516 516
@@ -531,7 +531,7 @@ _ecore_wl_dnd_motion(void *data, struct wl_data_device *data_device EINA_UNUSED,
531 Ecore_Wl_Event_Dnd_Position *ev; 531 Ecore_Wl_Event_Dnd_Position *ev;
532 Ecore_Wl_Input *input; 532 Ecore_Wl_Input *input;
533 533
534 LOGFN(__FILE__, __LINE__, __FUNCTION__); 534 LOGFN;
535 535
536 if (!(input = data)) return; 536 if (!(input = data)) return;
537 537
@@ -558,7 +558,7 @@ _ecore_wl_dnd_drop(void *data, struct wl_data_device *data_device EINA_UNUSED)
558 Ecore_Wl_Event_Dnd_Drop *ev; 558 Ecore_Wl_Event_Dnd_Drop *ev;
559 Ecore_Wl_Input *input; 559 Ecore_Wl_Input *input;
560 560
561 LOGFN(__FILE__, __LINE__, __FUNCTION__); 561 LOGFN;
562 562
563 if (!(input = data)) return; 563 if (!(input = data)) return;
564 564
@@ -583,7 +583,7 @@ _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device EINA_UNUS
583{ 583{
584 Ecore_Wl_Input *input; 584 Ecore_Wl_Input *input;
585 585
586 LOGFN(__FILE__, __LINE__, __FUNCTION__); 586 LOGFN;
587 587
588 if (!(input = data)) return; 588 if (!(input = data)) return;
589 589
@@ -603,7 +603,7 @@ _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device EINA_UNUS
603void 603void
604_ecore_wl_dnd_del(Ecore_Wl_Dnd_Source *source) 604_ecore_wl_dnd_del(Ecore_Wl_Dnd_Source *source)
605{ 605{
606 LOGFN(__FILE__, __LINE__, __FUNCTION__); 606 LOGFN;
607 607
608 if (!source) return; 608 if (!source) return;
609 source->refcount--; 609 source->refcount--;
@@ -626,7 +626,7 @@ _ecore_wl_dnd_selection_data_receive(Ecore_Wl_Dnd_Source *source, const char *ty
626 struct _dnd_source *read_source = NULL; 626 struct _dnd_source *read_source = NULL;
627 int p[2]; 627 int p[2];
628 628
629 LOGFN(__FILE__, __LINE__, __FUNCTION__); 629 LOGFN;
630 630
631 if (pipe2(p, O_CLOEXEC) == -1) 631 if (pipe2(p, O_CLOEXEC) == -1)
632 return; 632 return;
@@ -689,7 +689,7 @@ _ecore_wl_dnd_selection_data_read(void *data, Ecore_Fd_Handler *fd_handler EINA_
689 Ecore_Wl_Event_Selection_Data_Ready *event; 689 Ecore_Wl_Event_Selection_Data_Ready *event;
690 Eina_Bool ret; 690 Eina_Bool ret;
691 691
692 LOGFN(__FILE__, __LINE__, __FUNCTION__); 692 LOGFN;
693 693
694 read_source = data; 694 read_source = data;
695 source = read_source->source; 695 source = read_source->source;
@@ -733,7 +733,7 @@ _ecore_wl_dnd_selection_data_ready_cb_free(void *data EINA_UNUSED, void *event)
733{ 733{
734 Ecore_Wl_Event_Selection_Data_Ready *ev; 734 Ecore_Wl_Event_Selection_Data_Ready *ev;
735 735
736 LOGFN(__FILE__, __LINE__, __FUNCTION__); 736 LOGFN;
737 737
738 if (!(ev = event)) return; 738 if (!(ev = event)) return;
739 739
@@ -748,7 +748,7 @@ _ecore_wl_dnd_selection_cb_idle(void *data)
748 struct _dnd_task *task; 748 struct _dnd_task *task;
749 int count, i; 749 int count, i;
750 750
751 LOGFN(__FILE__, __LINE__, __FUNCTION__); 751 LOGFN;
752 752
753 ctx = data; 753 ctx = data;
754 count = epoll_wait(ctx->epoll_fd, ctx->ep, 1, 0); 754 count = epoll_wait(ctx->epoll_fd, ctx->ep, 1, 0);
@@ -772,7 +772,7 @@ _ecore_wl_dnd_source_cb_target(void *data, struct wl_data_source *source EINA_UN
772{ 772{
773 Ecore_Wl_Event_Data_Source_Target *event; 773 Ecore_Wl_Event_Data_Source_Target *event;
774 774
775 LOGFN(__FILE__, __LINE__, __FUNCTION__); 775 LOGFN;
776 if (!data) return; 776 if (!data) return;
777 777
778 if (!(event = calloc(1, sizeof(Ecore_Wl_Event_Data_Source_Target)))) return; 778 if (!(event = calloc(1, sizeof(Ecore_Wl_Event_Data_Source_Target)))) return;
@@ -789,7 +789,7 @@ _ecore_wl_dnd_source_cb_target_free(void *data EINA_UNUSED, void *event)
789{ 789{
790 Ecore_Wl_Event_Data_Source_Target *ev; 790 Ecore_Wl_Event_Data_Source_Target *ev;
791 791
792 LOGFN(__FILE__, __LINE__, __FUNCTION__); 792 LOGFN;
793 793
794 if (!(ev = event)) return; 794 if (!(ev = event)) return;
795 795
@@ -802,7 +802,7 @@ _ecore_wl_dnd_source_cb_send(void *data, struct wl_data_source *source EINA_UNUS
802{ 802{
803 Ecore_Wl_Event_Data_Source_Send *event; 803 Ecore_Wl_Event_Data_Source_Send *event;
804 804
805 LOGFN(__FILE__, __LINE__, __FUNCTION__); 805 LOGFN;
806 806
807 if (!data) return; 807 if (!data) return;
808 808
@@ -820,7 +820,7 @@ _ecore_wl_dnd_source_cb_send_free(void *data EINA_UNUSED, void *event)
820{ 820{
821 Ecore_Wl_Event_Data_Source_Send *ev; 821 Ecore_Wl_Event_Data_Source_Send *ev;
822 822
823 LOGFN(__FILE__, __LINE__, __FUNCTION__); 823 LOGFN;
824 824
825 if (!(ev = event)) return; 825 if (!(ev = event)) return;
826 826
@@ -834,7 +834,7 @@ _ecore_wl_dnd_source_cb_cancelled(void *data, struct wl_data_source *source)
834 Ecore_Wl_Input *input; 834 Ecore_Wl_Input *input;
835 Ecore_Wl_Event_Data_Source_Cancelled *ev; 835 Ecore_Wl_Event_Data_Source_Cancelled *ev;
836 836
837 LOGFN(__FILE__, __LINE__, __FUNCTION__); 837 LOGFN;
838 838
839 if (!(input = data)) return; 839 if (!(input = data)) return;
840 840
@@ -858,7 +858,7 @@ _ecore_wl_dnd_offer_cb_offer(void *data, struct wl_data_offer *data_offer EINA_U
858 Ecore_Wl_Dnd_Source *source; 858 Ecore_Wl_Dnd_Source *source;
859 char **t; 859 char **t;
860 860
861 LOGFN(__FILE__, __LINE__, __FUNCTION__); 861 LOGFN;
862 862
863 if (!(source = data)) return; 863 if (!(source = data)) return;
864 if (!type) return; 864 if (!type) return;
diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c
index e3fb6f487d..12220d78c5 100644
--- a/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/src/lib/ecore_wayland/ecore_wl_input.c
@@ -150,7 +150,7 @@ static int _pointer_x, _pointer_y;
150EAPI void 150EAPI void
151ecore_wl_input_grab(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsigned int button) 151ecore_wl_input_grab(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsigned int button)
152{ 152{
153 LOGFN(__FILE__, __LINE__, __FUNCTION__); 153 LOGFN;
154 154
155 if (!input) return; 155 if (!input) return;
156 input->grab = win; 156 input->grab = win;
@@ -160,7 +160,7 @@ ecore_wl_input_grab(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsigned int bu
160EAPI void 160EAPI void
161ecore_wl_input_ungrab(Ecore_Wl_Input *input) 161ecore_wl_input_ungrab(Ecore_Wl_Input *input)
162{ 162{
163 LOGFN(__FILE__, __LINE__, __FUNCTION__); 163 LOGFN;
164 164
165 if (!input) return; 165 if (!input) return;
166 166
@@ -184,7 +184,7 @@ ecore_wl_input_ungrab(Ecore_Wl_Input *input)
184void 184void
185_ecore_wl_input_grab_release(Ecore_Wl_Input *input, Ecore_Wl_Window *win) 185_ecore_wl_input_grab_release(Ecore_Wl_Input *input, Ecore_Wl_Window *win)
186{ 186{
187 LOGFN(__FILE__, __LINE__, __FUNCTION__); 187 LOGFN;
188 188
189 if (!input) return; 189 if (!input) return;
190 if (input->grab != win) return; 190 if (input->grab != win) return;
@@ -204,7 +204,7 @@ _pointer_update_stop(Ecore_Wl_Input *input)
204EAPI void 204EAPI void
205ecore_wl_input_pointer_set(Ecore_Wl_Input *input, struct wl_surface *surface, int hot_x, int hot_y) 205ecore_wl_input_pointer_set(Ecore_Wl_Input *input, struct wl_surface *surface, int hot_x, int hot_y)
206{ 206{
207 LOGFN(__FILE__, __LINE__, __FUNCTION__); 207 LOGFN;
208 208
209 if (!input) return; 209 if (!input) return;
210 210
@@ -217,7 +217,7 @@ ecore_wl_input_pointer_set(Ecore_Wl_Input *input, struct wl_surface *surface, in
217EAPI void 217EAPI void
218ecore_wl_input_cursor_size_set(Ecore_Wl_Input *input, const int size) 218ecore_wl_input_cursor_size_set(Ecore_Wl_Input *input, const int size)
219{ 219{
220 LOGFN(__FILE__, __LINE__, __FUNCTION__); 220 LOGFN;
221 221
222 if (!input) return; 222 if (!input) return;
223 223
@@ -234,7 +234,7 @@ ecore_wl_input_cursor_size_set(Ecore_Wl_Input *input, const int size)
234EAPI void 234EAPI void
235ecore_wl_input_cursor_theme_name_set(Ecore_Wl_Input *input, const char *cursor_theme_name) 235ecore_wl_input_cursor_theme_name_set(Ecore_Wl_Input *input, const char *cursor_theme_name)
236{ 236{
237 LOGFN(__FILE__, __LINE__, __FUNCTION__); 237 LOGFN;
238 238
239 if (!input) return; 239 if (!input) return;
240 240
@@ -252,7 +252,7 @@ ecore_wl_input_cursor_theme_name_set(Ecore_Wl_Input *input, const char *cursor_t
252EAPI struct xkb_keymap * 252EAPI struct xkb_keymap *
253ecore_wl_input_keymap_get(Ecore_Wl_Input *input) 253ecore_wl_input_keymap_get(Ecore_Wl_Input *input)
254{ 254{
255 LOGFN(__FILE__, __LINE__, __FUNCTION__); 255 LOGFN;
256 256
257 EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL); 257 EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL);
258 258
@@ -308,7 +308,7 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
308{ 308{
309 struct wl_cursor *cursor; 309 struct wl_cursor *cursor;
310 310
311 LOGFN(__FILE__, __LINE__, __FUNCTION__); 311 LOGFN;
312 312
313 if (!input) return; 313 if (!input) return;
314 /* No pointer device. Don't need to set cursor and update it */ 314 /* No pointer device. Don't need to set cursor and update it */
@@ -346,7 +346,7 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
346EAPI void 346EAPI void
347ecore_wl_input_cursor_default_restore(Ecore_Wl_Input *input) 347ecore_wl_input_cursor_default_restore(Ecore_Wl_Input *input)
348{ 348{
349 LOGFN(__FILE__, __LINE__, __FUNCTION__); 349 LOGFN;
350 350
351 if (!input) return; 351 if (!input) return;
352 352
@@ -369,7 +369,7 @@ ecore_wl_input_get(void)
369EAPI struct wl_seat * 369EAPI struct wl_seat *
370ecore_wl_input_seat_get(Ecore_Wl_Input *input) 370ecore_wl_input_seat_get(Ecore_Wl_Input *input)
371{ 371{
372 LOGFN(__FILE__, __LINE__, __FUNCTION__); 372 LOGFN;
373 373
374 if (!input) return NULL; 374 if (!input) return NULL;
375 375
@@ -400,7 +400,7 @@ _ecore_wl_input_add(Ecore_Wl_Display *ewd, unsigned int id)
400{ 400{
401 Ecore_Wl_Input *input; 401 Ecore_Wl_Input *input;
402 402
403 LOGFN(__FILE__, __LINE__, __FUNCTION__); 403 LOGFN;
404 404
405 if (!(input = calloc(1, sizeof(Ecore_Wl_Input)))) return; 405 if (!(input = calloc(1, sizeof(Ecore_Wl_Input)))) return;
406 406
@@ -525,7 +525,7 @@ _ecore_wl_input_seat_handle_capabilities(void *data, struct wl_seat *seat, enum
525 525
526 if (!(input = data)) return; 526 if (!(input = data)) return;
527 527
528 LOGFN(__FILE__, __LINE__, __FUNCTION__); 528 LOGFN;
529 529
530 if ((caps & WL_SEAT_CAPABILITY_POINTER) && (!input->pointer)) 530 if ((caps & WL_SEAT_CAPABILITY_POINTER) && (!input->pointer))
531 { 531 {
@@ -577,7 +577,7 @@ _ecore_wl_input_cb_pointer_motion(void *data, struct wl_pointer *pointer EINA_UN
577{ 577{
578 Ecore_Wl_Input *input; 578 Ecore_Wl_Input *input;
579 579
580 /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */ 580 /* LOGFN; */
581 581
582 if (!(input = data)) return; 582 if (!(input = data)) return;
583 583
@@ -595,7 +595,7 @@ _ecore_wl_input_cb_pointer_button(void *data, struct wl_pointer *pointer EINA_UN
595{ 595{
596 Ecore_Wl_Input *input; 596 Ecore_Wl_Input *input;
597 597
598 LOGFN(__FILE__, __LINE__, __FUNCTION__); 598 LOGFN;
599 599
600 if (!(input = data)) return; 600 if (!(input = data)) return;
601 601
@@ -637,7 +637,7 @@ _ecore_wl_input_cb_pointer_axis(void *data, struct wl_pointer *pointer EINA_UNUS
637{ 637{
638 Ecore_Wl_Input *input; 638 Ecore_Wl_Input *input;
639 639
640 LOGFN(__FILE__, __LINE__, __FUNCTION__); 640 LOGFN;
641 641
642 if (!(input = data)) return; 642 if (!(input = data)) return;
643 _ecore_wl_input_mouse_wheel_send(input, axis, wl_fixed_to_int(value), 643 _ecore_wl_input_mouse_wheel_send(input, axis, wl_fixed_to_int(value),
@@ -649,7 +649,7 @@ _ecore_wl_input_cb_pointer_frame(void *data, struct wl_callback *callback, unsig
649{ 649{
650 Ecore_Wl_Input *input; 650 Ecore_Wl_Input *input;
651 651
652 LOGFN(__FILE__, __LINE__, __FUNCTION__); 652 LOGFN;
653 653
654 if (!(input = data)) return; 654 if (!(input = data)) return;
655 655
@@ -680,7 +680,7 @@ _ecore_wl_input_cb_keyboard_keymap(void *data, struct wl_keyboard *keyboard EINA
680 Ecore_Wl_Input *input; 680 Ecore_Wl_Input *input;
681 char *map = NULL; 681 char *map = NULL;
682 682
683 LOGFN(__FILE__, __LINE__, __FUNCTION__); 683 LOGFN;
684 684
685 if (!(input = data)) 685 if (!(input = data))
686 { 686 {
@@ -789,7 +789,7 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard EINA_UN
789 char key[256], keyname[256], compose[256]; 789 char key[256], keyname[256], compose[256];
790 Ecore_Event_Key *e; 790 Ecore_Event_Key *e;
791 791
792 LOGFN(__FILE__, __LINE__, __FUNCTION__); 792 LOGFN;
793 793
794 if (!(input = data)) return; 794 if (!(input = data)) return;
795 795
@@ -891,7 +891,7 @@ _ecore_wl_input_cb_keyboard_modifiers(void *data, struct wl_keyboard *keyboard E
891 Ecore_Wl_Input *input; 891 Ecore_Wl_Input *input;
892 xkb_mod_mask_t mask; 892 xkb_mod_mask_t mask;
893 893
894 LOGFN(__FILE__, __LINE__, __FUNCTION__); 894 LOGFN;
895 895
896 if (!(input = data)) return; 896 if (!(input = data)) return;
897 897
@@ -927,7 +927,7 @@ _ecore_wl_input_cb_keyboard_repeat_setup(void *data, struct wl_keyboard *keyboar
927{ 927{
928 Ecore_Wl_Input *input; 928 Ecore_Wl_Input *input;
929 929
930 LOGFN(__FILE__, __LINE__, __FUNCTION__); 930 LOGFN;
931 931
932 if (!(input = data)) return; 932 if (!(input = data)) return;
933 933
@@ -949,7 +949,7 @@ _ecore_wl_input_cb_keyboard_repeat(void *data)
949 Ecore_Wl_Input *input; 949 Ecore_Wl_Input *input;
950 Ecore_Wl_Window *win = NULL; 950 Ecore_Wl_Window *win = NULL;
951 951
952 LOGFN(__FILE__, __LINE__, __FUNCTION__); 952 LOGFN;
953 953
954 if (!(input = data)) return ECORE_CALLBACK_RENEW; 954 if (!(input = data)) return ECORE_CALLBACK_RENEW;
955 955
@@ -974,7 +974,7 @@ _ecore_wl_input_cb_pointer_enter(void *data, struct wl_pointer *pointer EINA_UNU
974 Ecore_Wl_Input *input; 974 Ecore_Wl_Input *input;
975 Ecore_Wl_Window *win = NULL; 975 Ecore_Wl_Window *win = NULL;
976 976
977 LOGFN(__FILE__, __LINE__, __FUNCTION__); 977 LOGFN;
978 978
979 if (!surface) return; 979 if (!surface) return;
980 if (!(input = data)) return; 980 if (!(input = data)) return;
@@ -1022,7 +1022,7 @@ _ecore_wl_input_cb_pointer_leave(void *data, struct wl_pointer *pointer EINA_UNU
1022 Ecore_Wl_Input *input; 1022 Ecore_Wl_Input *input;
1023 Ecore_Wl_Window *win; 1023 Ecore_Wl_Window *win;
1024 1024
1025 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1025 LOGFN;
1026 1026
1027 if (!surface) return; 1027 if (!surface) return;
1028 if (!(input = data)) return; 1028 if (!(input = data)) return;
@@ -1055,7 +1055,7 @@ _ecore_wl_input_cb_keyboard_enter(void *data, struct wl_keyboard *keyboard EINA_
1055 Ecore_Wl_Input *input; 1055 Ecore_Wl_Input *input;
1056 Ecore_Wl_Window *win = NULL; 1056 Ecore_Wl_Window *win = NULL;
1057 1057
1058 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1058 LOGFN;
1059 1059
1060 if (!surface) return; 1060 if (!surface) return;
1061 if (!(input = data)) return; 1061 if (!(input = data)) return;
@@ -1084,7 +1084,7 @@ _ecore_wl_input_cb_keyboard_leave(void *data, struct wl_keyboard *keyboard EINA_
1084 Ecore_Wl_Input *input; 1084 Ecore_Wl_Input *input;
1085 Ecore_Wl_Window *win; 1085 Ecore_Wl_Window *win;
1086 1086
1087 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1087 LOGFN;
1088 1088
1089 if (!surface) return; 1089 if (!surface) return;
1090 if (!(input = data)) return; 1090 if (!(input = data)) return;
@@ -1119,7 +1119,7 @@ _ecore_wl_input_cb_touch_down(void *data, struct wl_touch *touch EINA_UNUSED, un
1119 Ecore_Wl_Input *input; 1119 Ecore_Wl_Input *input;
1120 Ecore_Wl_Window *win; 1120 Ecore_Wl_Window *win;
1121 1121
1122 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1122 LOGFN;
1123 1123
1124 if (!surface) return; 1124 if (!surface) return;
1125 if (!(input = data)) return; 1125 if (!(input = data)) return;
@@ -1158,7 +1158,7 @@ _ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch EINA_UNUSED, unsi
1158{ 1158{
1159 Ecore_Wl_Input *input; 1159 Ecore_Wl_Input *input;
1160 1160
1161 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1161 LOGFN;
1162 1162
1163 if (!(input = data)) return; 1163 if (!(input = data)) return;
1164 if (!input->touch_focus) return; 1164 if (!input->touch_focus) return;
@@ -1178,7 +1178,7 @@ _ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch EINA_UNUSED,
1178{ 1178{
1179 Ecore_Wl_Input *input; 1179 Ecore_Wl_Input *input;
1180 1180
1181 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1181 LOGFN;
1182 1182
1183 if (!(input = data)) return; 1183 if (!(input = data)) return;
1184 if (!input->touch_focus) return; 1184 if (!input->touch_focus) return;
@@ -1193,19 +1193,19 @@ _ecore_wl_input_cb_touch_motion(void *data, struct wl_touch *touch EINA_UNUSED,
1193static void 1193static void
1194_ecore_wl_input_cb_touch_frame(void *data EINA_UNUSED, struct wl_touch *touch EINA_UNUSED) 1194_ecore_wl_input_cb_touch_frame(void *data EINA_UNUSED, struct wl_touch *touch EINA_UNUSED)
1195{ 1195{
1196 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1196 LOGFN;
1197} 1197}
1198 1198
1199static void 1199static void
1200_ecore_wl_input_cb_touch_cancel(void *data EINA_UNUSED, struct wl_touch *touch EINA_UNUSED) 1200_ecore_wl_input_cb_touch_cancel(void *data EINA_UNUSED, struct wl_touch *touch EINA_UNUSED)
1201{ 1201{
1202 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1202 LOGFN;
1203} 1203}
1204 1204
1205static void 1205static void
1206_ecore_wl_input_cb_data_offer(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer) 1206_ecore_wl_input_cb_data_offer(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer)
1207{ 1207{
1208 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1208 LOGFN;
1209 1209
1210 _ecore_wl_dnd_add(data, data_device, offer); 1210 _ecore_wl_dnd_add(data, data_device, offer);
1211} 1211}
@@ -1213,7 +1213,7 @@ _ecore_wl_input_cb_data_offer(void *data, struct wl_data_device *data_device, st
1213static void 1213static void
1214_ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct wl_data_offer *offer) 1214_ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct wl_data_offer *offer)
1215{ 1215{
1216 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1216 LOGFN;
1217 1217
1218 if (!surface) return; 1218 if (!surface) return;
1219 1219
@@ -1223,7 +1223,7 @@ _ecore_wl_input_cb_data_enter(void *data, struct wl_data_device *data_device, un
1223static void 1223static void
1224_ecore_wl_input_cb_data_leave(void *data, struct wl_data_device *data_device) 1224_ecore_wl_input_cb_data_leave(void *data, struct wl_data_device *data_device)
1225{ 1225{
1226 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1226 LOGFN;
1227 1227
1228 _ecore_wl_dnd_leave(data, data_device); 1228 _ecore_wl_dnd_leave(data, data_device);
1229} 1229}
@@ -1231,7 +1231,7 @@ _ecore_wl_input_cb_data_leave(void *data, struct wl_data_device *data_device)
1231static void 1231static void
1232_ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, wl_fixed_t x, wl_fixed_t y) 1232_ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, wl_fixed_t x, wl_fixed_t y)
1233{ 1233{
1234 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1234 LOGFN;
1235 1235
1236 _ecore_wl_dnd_motion(data, data_device, timestamp, x, y); 1236 _ecore_wl_dnd_motion(data, data_device, timestamp, x, y);
1237} 1237}
@@ -1239,7 +1239,7 @@ _ecore_wl_input_cb_data_motion(void *data, struct wl_data_device *data_device, u
1239static void 1239static void
1240_ecore_wl_input_cb_data_drop(void *data, struct wl_data_device *data_device) 1240_ecore_wl_input_cb_data_drop(void *data, struct wl_data_device *data_device)
1241{ 1241{
1242 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1242 LOGFN;
1243 1243
1244 _ecore_wl_dnd_drop(data, data_device); 1244 _ecore_wl_dnd_drop(data, data_device);
1245} 1245}
@@ -1247,7 +1247,7 @@ _ecore_wl_input_cb_data_drop(void *data, struct wl_data_device *data_device)
1247static void 1247static void
1248_ecore_wl_input_cb_data_selection(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer) 1248_ecore_wl_input_cb_data_selection(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer)
1249{ 1249{
1250 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1250 LOGFN;
1251 1251
1252 _ecore_wl_dnd_selection(data, data_device, offer); 1252 _ecore_wl_dnd_selection(data, data_device, offer);
1253} 1253}
@@ -1258,7 +1258,7 @@ _ecore_wl_input_mouse_move_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, uns
1258 Ecore_Event_Mouse_Move *ev; 1258 Ecore_Event_Mouse_Move *ev;
1259 Ecore_Wl_Mouse_Down_Info *down_info; 1259 Ecore_Wl_Mouse_Down_Info *down_info;
1260 1260
1261 /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */ 1261 /* LOGFN; */
1262 1262
1263 if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Move)))) return; 1263 if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Move)))) return;
1264 1264
@@ -1299,7 +1299,7 @@ _ecore_wl_input_mouse_in_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsig
1299{ 1299{
1300 Ecore_Wl_Event_Mouse_In *ev; 1300 Ecore_Wl_Event_Mouse_In *ev;
1301 1301
1302 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1302 LOGFN;
1303 1303
1304 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Mouse_In)))) return; 1304 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Mouse_In)))) return;
1305 1305
@@ -1324,7 +1324,7 @@ _ecore_wl_input_mouse_out_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, unsi
1324{ 1324{
1325 Ecore_Wl_Event_Mouse_Out *ev; 1325 Ecore_Wl_Event_Mouse_Out *ev;
1326 1326
1327 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1327 LOGFN;
1328 1328
1329 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Mouse_Out)))) return; 1329 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Mouse_Out)))) return;
1330 1330
@@ -1349,7 +1349,7 @@ _ecore_wl_input_focus_in_send(Ecore_Wl_Input *input EINA_UNUSED, Ecore_Wl_Window
1349{ 1349{
1350 Ecore_Wl_Event_Focus_In *ev; 1350 Ecore_Wl_Event_Focus_In *ev;
1351 1351
1352 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1352 LOGFN;
1353 1353
1354 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Focus_In)))) return; 1354 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Focus_In)))) return;
1355 ev->timestamp = timestamp; 1355 ev->timestamp = timestamp;
@@ -1362,7 +1362,7 @@ _ecore_wl_input_focus_out_send(Ecore_Wl_Input *input EINA_UNUSED, Ecore_Wl_Windo
1362{ 1362{
1363 Ecore_Wl_Event_Focus_Out *ev; 1363 Ecore_Wl_Event_Focus_Out *ev;
1364 1364
1365 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1365 LOGFN;
1366 1366
1367 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Focus_Out)))) return; 1367 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Focus_Out)))) return;
1368 ev->timestamp = timestamp; 1368 ev->timestamp = timestamp;
@@ -1376,7 +1376,7 @@ _ecore_wl_input_mouse_down_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, int
1376 Ecore_Event_Mouse_Button *ev; 1376 Ecore_Event_Mouse_Button *ev;
1377 Ecore_Wl_Mouse_Down_Info *down_info; 1377 Ecore_Wl_Mouse_Down_Info *down_info;
1378 1378
1379 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1379 LOGFN;
1380 1380
1381 if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)))) return; 1381 if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)))) return;
1382 1382
@@ -1485,7 +1485,7 @@ _ecore_wl_input_mouse_up_send(Ecore_Wl_Input *input, Ecore_Wl_Window *win, int d
1485 Ecore_Event_Mouse_Button *ev; 1485 Ecore_Event_Mouse_Button *ev;
1486 Ecore_Wl_Mouse_Down_Info *down_info; 1486 Ecore_Wl_Mouse_Down_Info *down_info;
1487 1487
1488 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1488 LOGFN;
1489 1489
1490 if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)))) return; 1490 if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)))) return;
1491 1491
@@ -1548,7 +1548,7 @@ _ecore_wl_input_mouse_wheel_send(Ecore_Wl_Input *input, unsigned int axis, int v
1548{ 1548{
1549 Ecore_Event_Mouse_Wheel *ev; 1549 Ecore_Event_Mouse_Wheel *ev;
1550 1550
1551 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1551 LOGFN;
1552 1552
1553 if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Wheel)))) return; 1553 if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Wheel)))) return;
1554 1554
diff --git a/src/lib/ecore_wayland/ecore_wl_output.c b/src/lib/ecore_wayland/ecore_wl_output.c
index 596a0f80a9..cb61c077ad 100644
--- a/src/lib/ecore_wayland/ecore_wl_output.c
+++ b/src/lib/ecore_wayland/ecore_wl_output.c
@@ -10,7 +10,7 @@ _ecore_wl_output_cb_geometry(void *data, struct wl_output *wl_output EINA_UNUSED
10{ 10{
11 Ecore_Wl_Output *output; 11 Ecore_Wl_Output *output;
12 12
13 LOGFN(__FILE__, __LINE__, __FUNCTION__); 13 LOGFN;
14 14
15 output = data; 15 output = data;
16 output->allocation.x = x; 16 output->allocation.x = x;
@@ -27,7 +27,7 @@ _ecore_wl_output_cb_mode(void *data, struct wl_output *wl_output EINA_UNUSED, un
27 Ecore_Wl_Output *output; 27 Ecore_Wl_Output *output;
28 Ecore_Wl_Display *ewd; 28 Ecore_Wl_Display *ewd;
29 29
30 LOGFN(__FILE__, __LINE__, __FUNCTION__); 30 LOGFN;
31 31
32 output = data; 32 output = data;
33 ewd = output->display; 33 ewd = output->display;
@@ -77,7 +77,7 @@ _ecore_wl_output_add(Ecore_Wl_Display *ewd, unsigned int id)
77{ 77{
78 Ecore_Wl_Output *output; 78 Ecore_Wl_Output *output;
79 79
80 LOGFN(__FILE__, __LINE__, __FUNCTION__); 80 LOGFN;
81 81
82 if (!(output = calloc(1, sizeof(Ecore_Wl_Output)))) return; 82 if (!(output = calloc(1, sizeof(Ecore_Wl_Output)))) return;
83 83
diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index a100b440e5..c2e0825785 100644
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -17,9 +17,9 @@
17 17
18# ifdef LOGFNS 18# ifdef LOGFNS
19# include <stdio.h> 19# include <stdio.h>
20# define LOGFN(fl, ln, fn) printf("-ECORE-WL: %25s: %5i - %s\n", fl, ln, fn); 20# define LOGFN printf("-ECORE-WL: %25s: %5i - %s\n", __FILE__, __LINE__, __func__)
21# else 21# else
22# define LOGFN(fl, ln, fn) 22# define LOGFN
23# endif 23# endif
24 24
25extern int _ecore_wl_log_dom; 25extern int _ecore_wl_log_dom;
diff --git a/src/lib/ecore_wayland/ecore_wl_subsurf.c b/src/lib/ecore_wayland/ecore_wl_subsurf.c
index 3c92ce8c4e..96e35877a5 100644
--- a/src/lib/ecore_wayland/ecore_wl_subsurf.c
+++ b/src/lib/ecore_wayland/ecore_wl_subsurf.c
@@ -35,7 +35,7 @@ ecore_wl_subsurf_create(Ecore_Wl_Window *win)
35 Ecore_Wl_Subsurf *ess; 35 Ecore_Wl_Subsurf *ess;
36 struct wl_subcompositor *subcomp; 36 struct wl_subcompositor *subcomp;
37 37
38 LOGFN(__FILE__, __LINE__, __FUNCTION__); 38 LOGFN;
39 39
40 if (!win) return NULL; 40 if (!win) return NULL;
41 if (!win->surface) return NULL; 41 if (!win->surface) return NULL;
@@ -89,7 +89,7 @@ _ecore_wl_subsurf_destroy(Ecore_Wl_Subsurf *ess)
89EAPI void 89EAPI void
90ecore_wl_subsurf_del(Ecore_Wl_Subsurf *ess) 90ecore_wl_subsurf_del(Ecore_Wl_Subsurf *ess)
91{ 91{
92 LOGFN(__FILE__, __LINE__, __FUNCTION__); 92 LOGFN;
93 93
94 if (!ess) return; 94 if (!ess) return;
95 95
@@ -112,7 +112,7 @@ _ecore_wl_subsurfs_del_all(Ecore_Wl_Window *win)
112EAPI struct wl_surface * 112EAPI struct wl_surface *
113ecore_wl_subsurf_surface_get(Ecore_Wl_Subsurf *ess) 113ecore_wl_subsurf_surface_get(Ecore_Wl_Subsurf *ess)
114{ 114{
115 LOGFN(__FILE__, __LINE__, __FUNCTION__); 115 LOGFN;
116 116
117 if (!ess) return NULL; 117 if (!ess) return NULL;
118 118
@@ -122,7 +122,7 @@ ecore_wl_subsurf_surface_get(Ecore_Wl_Subsurf *ess)
122EAPI void 122EAPI void
123ecore_wl_subsurf_position_set(Ecore_Wl_Subsurf *ess, int x, int y) 123ecore_wl_subsurf_position_set(Ecore_Wl_Subsurf *ess, int x, int y)
124{ 124{
125 LOGFN(__FILE__, __LINE__, __FUNCTION__); 125 LOGFN;
126 126
127 if (!ess) return; 127 if (!ess) return;
128 if (!ess->subsurface) return; 128 if (!ess->subsurface) return;
@@ -139,7 +139,7 @@ ecore_wl_subsurf_position_set(Ecore_Wl_Subsurf *ess, int x, int y)
139EAPI void 139EAPI void
140ecore_wl_subsurf_position_get(Ecore_Wl_Subsurf *ess, int *x, int *y) 140ecore_wl_subsurf_position_get(Ecore_Wl_Subsurf *ess, int *x, int *y)
141{ 141{
142 LOGFN(__FILE__, __LINE__, __FUNCTION__); 142 LOGFN;
143 143
144 if (!ess) return; 144 if (!ess) return;
145 145
@@ -150,7 +150,7 @@ ecore_wl_subsurf_position_get(Ecore_Wl_Subsurf *ess, int *x, int *y)
150EAPI void 150EAPI void
151ecore_wl_subsurf_place_above(Ecore_Wl_Subsurf *ess, struct wl_surface *surface) 151ecore_wl_subsurf_place_above(Ecore_Wl_Subsurf *ess, struct wl_surface *surface)
152{ 152{
153 LOGFN(__FILE__, __LINE__, __FUNCTION__); 153 LOGFN;
154 154
155 if (!ess) return; 155 if (!ess) return;
156 if (!surface) return; 156 if (!surface) return;
@@ -162,7 +162,7 @@ ecore_wl_subsurf_place_above(Ecore_Wl_Subsurf *ess, struct wl_surface *surface)
162EAPI void 162EAPI void
163ecore_wl_subsurf_place_below(Ecore_Wl_Subsurf *ess, struct wl_surface *surface) 163ecore_wl_subsurf_place_below(Ecore_Wl_Subsurf *ess, struct wl_surface *surface)
164{ 164{
165 LOGFN(__FILE__, __LINE__, __FUNCTION__); 165 LOGFN;
166 166
167 if (!ess) return; 167 if (!ess) return;
168 if (!surface) return; 168 if (!surface) return;
@@ -174,7 +174,7 @@ ecore_wl_subsurf_place_below(Ecore_Wl_Subsurf *ess, struct wl_surface *surface)
174EAPI void 174EAPI void
175ecore_wl_subsurf_sync_set(Ecore_Wl_Subsurf *ess, Eina_Bool val) 175ecore_wl_subsurf_sync_set(Ecore_Wl_Subsurf *ess, Eina_Bool val)
176{ 176{
177 LOGFN(__FILE__, __LINE__, __FUNCTION__); 177 LOGFN;
178 178
179 if (!ess) return; 179 if (!ess) return;
180 if (!ess->subsurface) return; 180 if (!ess->subsurface) return;
@@ -195,7 +195,7 @@ ecore_wl_subsurf_opaque_region_set(Ecore_Wl_Subsurf *ess, int x, int y, int w, i
195{ 195{
196 struct wl_region *region = NULL; 196 struct wl_region *region = NULL;
197 197
198 LOGFN(__FILE__, __LINE__, __FUNCTION__); 198 LOGFN;
199 199
200 if (!ess) return; 200 if (!ess) return;
201 if (!ess->surface) return; 201 if (!ess->surface) return;
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 39764d42e7..9504128e51 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -196,7 +196,7 @@ ecore_wl_window_new(Ecore_Wl_Window *parent, int x, int y, int w, int h, int buf
196 Ecore_Wl_Window *win; 196 Ecore_Wl_Window *win;
197 static int _win_id = 1; 197 static int _win_id = 1;
198 198
199 LOGFN(__FILE__, __LINE__, __FUNCTION__); 199 LOGFN;
200 200
201 if (!(win = calloc(1, sizeof(Ecore_Wl_Window)))) 201 if (!(win = calloc(1, sizeof(Ecore_Wl_Window))))
202 { 202 {
@@ -236,7 +236,7 @@ ecore_wl_window_free(Ecore_Wl_Window *win)
236{ 236{
237 Ecore_Wl_Input *input; 237 Ecore_Wl_Input *input;
238 238
239 LOGFN(__FILE__, __LINE__, __FUNCTION__); 239 LOGFN;
240 240
241 EINA_SAFETY_ON_NULL_RETURN(win); 241 EINA_SAFETY_ON_NULL_RETURN(win);
242 242
@@ -285,7 +285,7 @@ ecore_wl_window_move(Ecore_Wl_Window *win, int x, int y)
285{ 285{
286 Ecore_Wl_Input *input; 286 Ecore_Wl_Input *input;
287 287
288 LOGFN(__FILE__, __LINE__, __FUNCTION__); 288 LOGFN;
289 289
290 EINA_SAFETY_ON_NULL_RETURN(win); 290 EINA_SAFETY_ON_NULL_RETURN(win);
291 291
@@ -314,7 +314,7 @@ ecore_wl_window_resize(Ecore_Wl_Window *win, int w EINA_UNUSED, int h EINA_UNUSE
314{ 314{
315 Ecore_Wl_Input *input; 315 Ecore_Wl_Input *input;
316 316
317 LOGFN(__FILE__, __LINE__, __FUNCTION__); 317 LOGFN;
318 318
319 EINA_SAFETY_ON_NULL_RETURN(win); 319 EINA_SAFETY_ON_NULL_RETURN(win);
320 320
@@ -341,7 +341,7 @@ ecore_wl_window_resize(Ecore_Wl_Window *win, int w EINA_UNUSED, int h EINA_UNUSE
341EAPI void 341EAPI void
342ecore_wl_window_damage(Ecore_Wl_Window *win, int x, int y, int w, int h) 342ecore_wl_window_damage(Ecore_Wl_Window *win, int x, int y, int w, int h)
343{ 343{
344 LOGFN(__FILE__, __LINE__, __FUNCTION__); 344 LOGFN;
345 345
346 EINA_SAFETY_ON_NULL_RETURN(win); 346 EINA_SAFETY_ON_NULL_RETURN(win);
347 347
@@ -351,7 +351,7 @@ ecore_wl_window_damage(Ecore_Wl_Window *win, int x, int y, int w, int h)
351EAPI void 351EAPI void
352ecore_wl_window_commit(Ecore_Wl_Window *win) 352ecore_wl_window_commit(Ecore_Wl_Window *win)
353{ 353{
354 LOGFN(__FILE__, __LINE__, __FUNCTION__); 354 LOGFN;
355 355
356 EINA_SAFETY_ON_NULL_RETURN(win); 356 EINA_SAFETY_ON_NULL_RETURN(win);
357 357
@@ -362,7 +362,7 @@ ecore_wl_window_commit(Ecore_Wl_Window *win)
362EAPI void 362EAPI void
363ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, int x, int y) 363ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, int x, int y)
364{ 364{
365 LOGFN(__FILE__, __LINE__, __FUNCTION__); 365 LOGFN;
366 366
367 EINA_SAFETY_ON_NULL_RETURN(win); 367 EINA_SAFETY_ON_NULL_RETURN(win);
368 368
@@ -391,7 +391,7 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, in
391EAPI struct wl_surface * 391EAPI struct wl_surface *
392ecore_wl_window_surface_create(Ecore_Wl_Window *win) 392ecore_wl_window_surface_create(Ecore_Wl_Window *win)
393{ 393{
394 LOGFN(__FILE__, __LINE__, __FUNCTION__); 394 LOGFN;
395 395
396 EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL); 396 EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
397 397
@@ -418,7 +418,7 @@ ecore_wl_window_surface_create(Ecore_Wl_Window *win)
418EAPI void 418EAPI void
419ecore_wl_window_show(Ecore_Wl_Window *win) 419ecore_wl_window_show(Ecore_Wl_Window *win)
420{ 420{
421 LOGFN(__FILE__, __LINE__, __FUNCTION__); 421 LOGFN;
422 422
423 if (!win) return; 423 if (!win) return;
424 424
@@ -430,7 +430,7 @@ ecore_wl_window_show(Ecore_Wl_Window *win)
430EAPI void 430EAPI void
431ecore_wl_window_hide(Ecore_Wl_Window *win) 431ecore_wl_window_hide(Ecore_Wl_Window *win)
432{ 432{
433 LOGFN(__FILE__, __LINE__, __FUNCTION__); 433 LOGFN;
434 434
435 EINA_SAFETY_ON_NULL_RETURN(win); 435 EINA_SAFETY_ON_NULL_RETURN(win);
436 436
@@ -450,7 +450,7 @@ ecore_wl_window_hide(Ecore_Wl_Window *win)
450EAPI void 450EAPI void
451ecore_wl_window_raise(Ecore_Wl_Window *win) 451ecore_wl_window_raise(Ecore_Wl_Window *win)
452{ 452{
453 LOGFN(__FILE__, __LINE__, __FUNCTION__); 453 LOGFN;
454 454
455 EINA_SAFETY_ON_NULL_RETURN(win); 455 EINA_SAFETY_ON_NULL_RETURN(win);
456 456
@@ -464,7 +464,7 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
464{ 464{
465 Eina_Bool prev; 465 Eina_Bool prev;
466 466
467 LOGFN(__FILE__, __LINE__, __FUNCTION__); 467 LOGFN;
468 468
469 EINA_SAFETY_ON_NULL_RETURN(win); 469 EINA_SAFETY_ON_NULL_RETURN(win);
470 470
@@ -494,7 +494,7 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
494EAPI Eina_Bool 494EAPI Eina_Bool
495ecore_wl_window_maximized_get(Ecore_Wl_Window *win) 495ecore_wl_window_maximized_get(Ecore_Wl_Window *win)
496{ 496{
497 LOGFN(__FILE__, __LINE__, __FUNCTION__); 497 LOGFN;
498 498
499 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE); 499 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
500 500
@@ -506,7 +506,7 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
506{ 506{
507 Eina_Bool prev; 507 Eina_Bool prev;
508 508
509 LOGFN(__FILE__, __LINE__, __FUNCTION__); 509 LOGFN;
510 510
511 EINA_SAFETY_ON_NULL_RETURN(win); 511 EINA_SAFETY_ON_NULL_RETURN(win);
512 512
@@ -541,7 +541,7 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
541EAPI Eina_Bool 541EAPI Eina_Bool
542ecore_wl_window_fullscreen_get(Ecore_Wl_Window *win) 542ecore_wl_window_fullscreen_get(Ecore_Wl_Window *win)
543{ 543{
544 LOGFN(__FILE__, __LINE__, __FUNCTION__); 544 LOGFN;
545 545
546 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE); 546 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
547 547
@@ -551,7 +551,7 @@ ecore_wl_window_fullscreen_get(Ecore_Wl_Window *win)
551EAPI void 551EAPI void
552ecore_wl_window_transparent_set(Ecore_Wl_Window *win, Eina_Bool transparent) 552ecore_wl_window_transparent_set(Ecore_Wl_Window *win, Eina_Bool transparent)
553{ 553{
554 LOGFN(__FILE__, __LINE__, __FUNCTION__); 554 LOGFN;
555 555
556 EINA_SAFETY_ON_NULL_RETURN(win); 556 EINA_SAFETY_ON_NULL_RETURN(win);
557 557
@@ -566,7 +566,7 @@ ecore_wl_window_transparent_set(Ecore_Wl_Window *win, Eina_Bool transparent)
566EAPI Eina_Bool 566EAPI Eina_Bool
567ecore_wl_window_alpha_get(Ecore_Wl_Window *win) 567ecore_wl_window_alpha_get(Ecore_Wl_Window *win)
568{ 568{
569 LOGFN(__FILE__, __LINE__, __FUNCTION__); 569 LOGFN;
570 570
571 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE); 571 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
572 572
@@ -576,7 +576,7 @@ ecore_wl_window_alpha_get(Ecore_Wl_Window *win)
576EAPI void 576EAPI void
577ecore_wl_window_alpha_set(Ecore_Wl_Window *win, Eina_Bool alpha) 577ecore_wl_window_alpha_set(Ecore_Wl_Window *win, Eina_Bool alpha)
578{ 578{
579 LOGFN(__FILE__, __LINE__, __FUNCTION__); 579 LOGFN;
580 580
581 EINA_SAFETY_ON_NULL_RETURN(win); 581 EINA_SAFETY_ON_NULL_RETURN(win);
582 582
@@ -591,7 +591,7 @@ ecore_wl_window_alpha_set(Ecore_Wl_Window *win, Eina_Bool alpha)
591EAPI Eina_Bool 591EAPI Eina_Bool
592ecore_wl_window_transparent_get(Ecore_Wl_Window *win) 592ecore_wl_window_transparent_get(Ecore_Wl_Window *win)
593{ 593{
594 LOGFN(__FILE__, __LINE__, __FUNCTION__); 594 LOGFN;
595 595
596 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE); 596 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
597 597
@@ -601,7 +601,7 @@ ecore_wl_window_transparent_get(Ecore_Wl_Window *win)
601EAPI void 601EAPI void
602ecore_wl_window_update_size(Ecore_Wl_Window *win, int w, int h) 602ecore_wl_window_update_size(Ecore_Wl_Window *win, int w, int h)
603{ 603{
604 LOGFN(__FILE__, __LINE__, __FUNCTION__); 604 LOGFN;
605 605
606 EINA_SAFETY_ON_NULL_RETURN(win); 606 EINA_SAFETY_ON_NULL_RETURN(win);
607 607
@@ -622,7 +622,7 @@ ecore_wl_window_update_size(Ecore_Wl_Window *win, int w, int h)
622EAPI void 622EAPI void
623ecore_wl_window_update_location(Ecore_Wl_Window *win, int x, int y) 623ecore_wl_window_update_location(Ecore_Wl_Window *win, int x, int y)
624{ 624{
625 LOGFN(__FILE__, __LINE__, __FUNCTION__); 625 LOGFN;
626 626
627 EINA_SAFETY_ON_NULL_RETURN(win); 627 EINA_SAFETY_ON_NULL_RETURN(win);
628 628
@@ -638,7 +638,7 @@ ecore_wl_window_update_location(Ecore_Wl_Window *win, int x, int y)
638EAPI struct wl_surface * 638EAPI struct wl_surface *
639ecore_wl_window_surface_get(Ecore_Wl_Window *win) 639ecore_wl_window_surface_get(Ecore_Wl_Window *win)
640{ 640{
641 LOGFN(__FILE__, __LINE__, __FUNCTION__); 641 LOGFN;
642 642
643 EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL); 643 EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
644 644
@@ -649,7 +649,7 @@ ecore_wl_window_surface_get(Ecore_Wl_Window *win)
649EAPI struct wl_shell_surface * 649EAPI struct wl_shell_surface *
650ecore_wl_window_shell_surface_get(Ecore_Wl_Window *win) 650ecore_wl_window_shell_surface_get(Ecore_Wl_Window *win)
651{ 651{
652 LOGFN(__FILE__, __LINE__, __FUNCTION__); 652 LOGFN;
653 653
654 EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL); 654 EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
655 655
@@ -660,7 +660,7 @@ ecore_wl_window_shell_surface_get(Ecore_Wl_Window *win)
660EAPI struct xdg_surface * 660EAPI struct xdg_surface *
661ecore_wl_window_xdg_surface_get(Ecore_Wl_Window *win) 661ecore_wl_window_xdg_surface_get(Ecore_Wl_Window *win)
662{ 662{
663 LOGFN(__FILE__, __LINE__, __FUNCTION__); 663 LOGFN;
664 664
665 EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL); 665 EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
666 666
@@ -680,7 +680,7 @@ ecore_wl_window_find(unsigned int id)
680EAPI void 680EAPI void
681ecore_wl_window_type_set(Ecore_Wl_Window *win, Ecore_Wl_Window_Type type) 681ecore_wl_window_type_set(Ecore_Wl_Window *win, Ecore_Wl_Window_Type type)
682{ 682{
683 LOGFN(__FILE__, __LINE__, __FUNCTION__); 683 LOGFN;
684 684
685 EINA_SAFETY_ON_NULL_RETURN(win); 685 EINA_SAFETY_ON_NULL_RETURN(win);
686 686
@@ -692,7 +692,7 @@ ecore_wl_window_pointer_set(Ecore_Wl_Window *win, struct wl_surface *surface, in
692{ 692{
693 Ecore_Wl_Input *input; 693 Ecore_Wl_Input *input;
694 694
695 LOGFN(__FILE__, __LINE__, __FUNCTION__); 695 LOGFN;
696 696
697 EINA_SAFETY_ON_NULL_RETURN(win); 697 EINA_SAFETY_ON_NULL_RETURN(win);
698 698
@@ -710,7 +710,7 @@ ecore_wl_window_cursor_from_name_set(Ecore_Wl_Window *win, const char *cursor_na
710{ 710{
711 Ecore_Wl_Input *input; 711 Ecore_Wl_Input *input;
712 712
713 LOGFN(__FILE__, __LINE__, __FUNCTION__); 713 LOGFN;
714 714
715 EINA_SAFETY_ON_NULL_RETURN(win); 715 EINA_SAFETY_ON_NULL_RETURN(win);
716 716
@@ -730,7 +730,7 @@ ecore_wl_window_cursor_default_restore(Ecore_Wl_Window *win)
730{ 730{
731 Ecore_Wl_Input *input; 731 Ecore_Wl_Input *input;
732 732
733 LOGFN(__FILE__, __LINE__, __FUNCTION__); 733 LOGFN;
734 734
735 EINA_SAFETY_ON_NULL_RETURN(win); 735 EINA_SAFETY_ON_NULL_RETURN(win);
736 736
@@ -744,7 +744,7 @@ ecore_wl_window_cursor_default_restore(Ecore_Wl_Window *win)
744EAPI void 744EAPI void
745ecore_wl_window_parent_set(Ecore_Wl_Window *win, Ecore_Wl_Window *parent) 745ecore_wl_window_parent_set(Ecore_Wl_Window *win, Ecore_Wl_Window *parent)
746{ 746{
747 LOGFN(__FILE__, __LINE__, __FUNCTION__); 747 LOGFN;
748 748
749 EINA_SAFETY_ON_NULL_RETURN(win); 749 EINA_SAFETY_ON_NULL_RETURN(win);
750 750
@@ -759,7 +759,7 @@ ecore_wl_window_iconified_set(Ecore_Wl_Window *win, Eina_Bool iconified)
759 struct wl_array states; 759 struct wl_array states;
760 uint32_t *s; 760 uint32_t *s;
761 761
762 LOGFN(__FILE__, __LINE__, __FUNCTION__); 762 LOGFN;
763 763
764 EINA_SAFETY_ON_NULL_RETURN(win); 764 EINA_SAFETY_ON_NULL_RETURN(win);
765 765
@@ -798,7 +798,7 @@ ecore_wl_window_iconified_set(Ecore_Wl_Window *win, Eina_Bool iconified)
798EAPI Eina_Bool 798EAPI Eina_Bool
799ecore_wl_window_iconified_get(Ecore_Wl_Window *win) 799ecore_wl_window_iconified_get(Ecore_Wl_Window *win)
800{ 800{
801 LOGFN(__FILE__, __LINE__, __FUNCTION__); 801 LOGFN;
802 802
803 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE); 803 EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
804 804
@@ -833,7 +833,7 @@ ecore_wl_window_surface_find(struct wl_surface *surface)
833EAPI void 833EAPI void
834ecore_wl_window_input_region_set(Ecore_Wl_Window *win, int x, int y, int w, int h) 834ecore_wl_window_input_region_set(Ecore_Wl_Window *win, int x, int y, int w, int h)
835{ 835{
836 LOGFN(__FILE__, __LINE__, __FUNCTION__); 836 LOGFN;
837 837
838 EINA_SAFETY_ON_NULL_RETURN(win); 838 EINA_SAFETY_ON_NULL_RETURN(win);
839 839
@@ -876,7 +876,7 @@ ecore_wl_window_opaque_region_set(Ecore_Wl_Window *win, int x, int y, int w, int
876{ 876{
877 struct wl_region *region; 877 struct wl_region *region;
878 878
879 LOGFN(__FILE__, __LINE__, __FUNCTION__); 879 LOGFN;
880 880
881 EINA_SAFETY_ON_NULL_RETURN(win); 881 EINA_SAFETY_ON_NULL_RETURN(win);
882 882
@@ -914,7 +914,7 @@ ecore_wl_window_opaque_region_set(Ecore_Wl_Window *win, int x, int y, int w, int
914EAPI void 914EAPI void
915ecore_wl_window_rotation_set(Ecore_Wl_Window *win, int rotation) 915ecore_wl_window_rotation_set(Ecore_Wl_Window *win, int rotation)
916{ 916{
917 LOGFN(__FILE__, __LINE__, __FUNCTION__); 917 LOGFN;
918 918
919 EINA_SAFETY_ON_NULL_RETURN(win); 919 EINA_SAFETY_ON_NULL_RETURN(win);
920 920
@@ -925,7 +925,7 @@ ecore_wl_window_rotation_set(Ecore_Wl_Window *win, int rotation)
925EAPI int 925EAPI int
926ecore_wl_window_rotation_get(Ecore_Wl_Window *win) 926ecore_wl_window_rotation_get(Ecore_Wl_Window *win)
927{ 927{
928 LOGFN(__FILE__, __LINE__, __FUNCTION__); 928 LOGFN;
929 929
930 EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0); 930 EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0);
931 931
@@ -936,7 +936,7 @@ ecore_wl_window_rotation_get(Ecore_Wl_Window *win)
936EAPI int 936EAPI int
937ecore_wl_window_id_get(Ecore_Wl_Window *win) 937ecore_wl_window_id_get(Ecore_Wl_Window *win)
938{ 938{
939 LOGFN(__FILE__, __LINE__, __FUNCTION__); 939 LOGFN;
940 940
941 EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0); 941 EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0);
942 942
@@ -947,7 +947,7 @@ ecore_wl_window_id_get(Ecore_Wl_Window *win)
947EAPI int 947EAPI int
948ecore_wl_window_surface_id_get(Ecore_Wl_Window *win) 948ecore_wl_window_surface_id_get(Ecore_Wl_Window *win)
949{ 949{
950 LOGFN(__FILE__, __LINE__, __FUNCTION__); 950 LOGFN;
951 951
952 EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0); 952 EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0);
953 953
@@ -958,7 +958,7 @@ ecore_wl_window_surface_id_get(Ecore_Wl_Window *win)
958EAPI void 958EAPI void
959ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title) 959ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title)
960{ 960{
961 LOGFN(__FILE__, __LINE__, __FUNCTION__); 961 LOGFN;
962 962
963 EINA_SAFETY_ON_NULL_RETURN(win); 963 EINA_SAFETY_ON_NULL_RETURN(win);
964 964
@@ -974,7 +974,7 @@ ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title)
974EAPI void 974EAPI void
975ecore_wl_window_class_name_set(Ecore_Wl_Window *win, const char *class_name) 975ecore_wl_window_class_name_set(Ecore_Wl_Window *win, const char *class_name)
976{ 976{
977 LOGFN(__FILE__, __LINE__, __FUNCTION__); 977 LOGFN;
978 978
979 EINA_SAFETY_ON_NULL_RETURN(win); 979 EINA_SAFETY_ON_NULL_RETURN(win);
980 980
@@ -991,7 +991,7 @@ ecore_wl_window_class_name_set(Ecore_Wl_Window *win, const char *class_name)
991EAPI Ecore_Wl_Input * 991EAPI Ecore_Wl_Input *
992ecore_wl_window_keyboard_get(Ecore_Wl_Window *win) 992ecore_wl_window_keyboard_get(Ecore_Wl_Window *win)
993{ 993{
994 LOGFN(__FILE__, __LINE__, __FUNCTION__); 994 LOGFN;
995 995
996 EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0); 996 EINA_SAFETY_ON_NULL_RETURN_VAL(win, 0);
997 997
@@ -1012,7 +1012,7 @@ _ecore_wl_window_cb_configure(void *data, struct wl_shell_surface *shell_surface
1012{ 1012{
1013 Ecore_Wl_Window *win; 1013 Ecore_Wl_Window *win;
1014 1014
1015 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1015 LOGFN;
1016 1016
1017 if (!(win = data)) return; 1017 if (!(win = data)) return;
1018 1018
@@ -1028,7 +1028,7 @@ _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface
1028 Ecore_Wl_Window *win; 1028 Ecore_Wl_Window *win;
1029 uint32_t *p; 1029 uint32_t *p;
1030 1030
1031 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1031 LOGFN;
1032 1032
1033 if (!(win = data)) return; 1033 if (!(win = data)) return;
1034 1034
@@ -1071,7 +1071,7 @@ _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface EIN
1071{ 1071{
1072 Ecore_Wl_Window *win; 1072 Ecore_Wl_Window *win;
1073 1073
1074 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1074 LOGFN;
1075 1075
1076 if (!(win = data)) return; 1076 if (!(win = data)) return;
1077 ecore_wl_window_free(win); 1077 ecore_wl_window_free(win);
@@ -1082,7 +1082,7 @@ _ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface *shell_surfac
1082{ 1082{
1083 Ecore_Wl_Window *win; 1083 Ecore_Wl_Window *win;
1084 1084
1085 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1085 LOGFN;
1086 1086
1087 if (!shell_surface) return; 1087 if (!shell_surface) return;
1088 if (!(win = data)) return; 1088 if (!(win = data)) return;
@@ -1094,7 +1094,7 @@ _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup)
1094{ 1094{
1095 Ecore_Wl_Window *win; 1095 Ecore_Wl_Window *win;
1096 1096
1097 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1097 LOGFN;
1098 1098
1099 if (!xdg_popup) return; 1099 if (!xdg_popup) return;
1100 if (!(win = data)) return; 1100 if (!(win = data)) return;
@@ -1107,7 +1107,7 @@ _ecore_session_recovery_uuid(void *data EINA_UNUSED, struct zwp_e_session_recove
1107 Ecore_Wl_Window *win; 1107 Ecore_Wl_Window *win;
1108 char uuid_string[37]; 1108 char uuid_string[37];
1109 1109
1110 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1110 LOGFN;
1111 1111
1112 if (!(win = data)) return; 1112 if (!(win = data)) return;
1113 if (!session_recovery) return; 1113 if (!session_recovery) return;
@@ -1122,7 +1122,7 @@ _ecore_wl_window_configure_send(Ecore_Wl_Window *win, int w, int h, int edges)
1122{ 1122{
1123 Ecore_Wl_Event_Window_Configure *ev; 1123 Ecore_Wl_Event_Window_Configure *ev;
1124 1124
1125 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1125 LOGFN;
1126 1126
1127 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Window_Configure)))) return; 1127 if (!(ev = calloc(1, sizeof(Ecore_Wl_Event_Window_Configure)))) return;
1128 ev->win = win->id; 1128 ev->win = win->id;
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index ff603bb43b..74e50efd01 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -352,7 +352,7 @@ clean_up:
352static Eina_Bool 352static Eina_Bool
353_ecore_x_init1(void) 353_ecore_x_init1(void)
354{ 354{
355 LOGFN(__FILE__, __LINE__, __FUNCTION__); 355 LOGFN;
356#ifdef LOGRT 356#ifdef LOGRT
357 _logrt_init(); 357 _logrt_init();
358#endif /* ifdef LOGRT */ 358#endif /* ifdef LOGRT */
@@ -762,7 +762,7 @@ _ecore_x_shutdown(void)
762 if (!_ecore_x_disp) 762 if (!_ecore_x_disp)
763 return 0; 763 return 0;
764 764
765 LOGFN(__FILE__, __LINE__, __FUNCTION__); 765 LOGFN;
766 766
767 ecore_event_type_flush(ECORE_X_EVENT_ANY, 767 ecore_event_type_flush(ECORE_X_EVENT_ANY,
768 ECORE_X_EVENT_MOUSE_IN, 768 ECORE_X_EVENT_MOUSE_IN,
@@ -928,7 +928,7 @@ ecore_x_display_get(void)
928EAPI int 928EAPI int
929ecore_x_fd_get(void) 929ecore_x_fd_get(void)
930{ 930{
931 LOGFN(__FILE__, __LINE__, __FUNCTION__); 931 LOGFN;
932 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 932 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
933 return ConnectionNumber(_ecore_x_disp); 933 return ConnectionNumber(_ecore_x_disp);
934} 934}
@@ -941,7 +941,7 @@ ecore_x_fd_get(void)
941EAPI Ecore_X_Screen * 941EAPI Ecore_X_Screen *
942ecore_x_default_screen_get(void) 942ecore_x_default_screen_get(void)
943{ 943{
944 LOGFN(__FILE__, __LINE__, __FUNCTION__); 944 LOGFN;
945 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL); 945 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
946 return (Ecore_X_Screen *)DefaultScreenOfDisplay(_ecore_x_disp); 946 return (Ecore_X_Screen *)DefaultScreenOfDisplay(_ecore_x_disp);
947} 947}
@@ -962,7 +962,7 @@ ecore_x_screen_size_get(const Ecore_X_Screen *screen,
962 int *h) 962 int *h)
963{ 963{
964 Screen *s = (Screen *)screen; 964 Screen *s = (Screen *)screen;
965 LOGFN(__FILE__, __LINE__, __FUNCTION__); 965 LOGFN;
966 if (w) *w = 0; 966 if (w) *w = 0;
967 if (h) *h = 0; 967 if (h) *h = 0;
968 EINA_SAFETY_ON_NULL_RETURN(screen); 968 EINA_SAFETY_ON_NULL_RETURN(screen);
@@ -981,7 +981,7 @@ ecore_x_screen_size_get(const Ecore_X_Screen *screen,
981EAPI int 981EAPI int
982ecore_x_screen_count_get(void) 982ecore_x_screen_count_get(void)
983{ 983{
984 LOGFN(__FILE__, __LINE__, __FUNCTION__); 984 LOGFN;
985 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 985 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
986 return ScreenCount(_ecore_x_disp); 986 return ScreenCount(_ecore_x_disp);
987} 987}
@@ -1065,7 +1065,7 @@ ecore_x_double_click_time_get(void)
1065EAPI void 1065EAPI void
1066ecore_x_flush(void) 1066ecore_x_flush(void)
1067{ 1067{
1068 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1068 LOGFN;
1069 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1069 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1070 XFlush(_ecore_x_disp); 1070 XFlush(_ecore_x_disp);
1071} 1071}
@@ -1078,7 +1078,7 @@ ecore_x_flush(void)
1078EAPI void 1078EAPI void
1079ecore_x_sync(void) 1079ecore_x_sync(void)
1080{ 1080{
1081 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1081 LOGFN;
1082 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1082 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1083 XSync(_ecore_x_disp, False); 1083 XSync(_ecore_x_disp, False);
1084} 1084}
@@ -1101,7 +1101,7 @@ ecore_x_killall(Ecore_X_Window root)
1101 Window *children_r = NULL; 1101 Window *children_r = NULL;
1102 unsigned int num_children = 0; 1102 unsigned int num_children = 0;
1103 1103
1104 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1104 LOGFN;
1105 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1105 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1106 XGrabServer(_ecore_x_disp); 1106 XGrabServer(_ecore_x_disp);
1107 /* Tranverse window tree starting from root, and drag each 1107 /* Tranverse window tree starting from root, and drag each
@@ -1130,7 +1130,7 @@ ecore_x_killall(Ecore_X_Window root)
1130EAPI void 1130EAPI void
1131ecore_x_kill(Ecore_X_Window win) 1131ecore_x_kill(Ecore_X_Window win)
1132{ 1132{
1133 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1133 LOGFN;
1134 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1134 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1135 XKillClient(_ecore_x_disp, win); 1135 XKillClient(_ecore_x_disp, win);
1136 if (_ecore_xlib_sync) ecore_x_sync(); 1136 if (_ecore_xlib_sync) ecore_x_sync();
@@ -1159,7 +1159,7 @@ ecore_x_dpi_get(void)
1159{ 1159{
1160 Screen *s; 1160 Screen *s;
1161 1161
1162 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1162 LOGFN;
1163 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 1163 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
1164 s = DefaultScreenOfDisplay(_ecore_x_disp); 1164 s = DefaultScreenOfDisplay(_ecore_x_disp);
1165 if (s->mwidth <= 0) 1165 if (s->mwidth <= 0)
@@ -1286,7 +1286,7 @@ ecore_x_window_root_list(int *num_ret)
1286 1286
1287 *num_ret = 0; 1287 *num_ret = 0;
1288 1288
1289 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1289 LOGFN;
1290 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL); 1290 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
1291 num = ScreenCount(_ecore_x_disp); 1291 num = ScreenCount(_ecore_x_disp);
1292 roots = malloc(num * sizeof(Ecore_X_Window)); 1292 roots = malloc(num * sizeof(Ecore_X_Window));
@@ -1308,7 +1308,7 @@ ecore_x_window_root_first_get(void)
1308 int num; 1308 int num;
1309 Ecore_X_Window root, *roots = NULL; 1309 Ecore_X_Window root, *roots = NULL;
1310 1310
1311 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1311 LOGFN;
1312 roots = ecore_x_window_root_list(&num); 1312 roots = ecore_x_window_root_list(&num);
1313 if (!(roots)) return 0; 1313 if (!(roots)) return 0;
1314 1314
@@ -1337,7 +1337,7 @@ ecore_x_window_manage(Ecore_X_Window win)
1337{ 1337{
1338 XWindowAttributes att; 1338 XWindowAttributes att;
1339 1339
1340 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1340 LOGFN;
1341 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1341 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1342 if (XGetWindowAttributes(_ecore_x_disp, win, &att) != True) 1342 if (XGetWindowAttributes(_ecore_x_disp, win, &att) != True)
1343 return EINA_FALSE; 1343 return EINA_FALSE;
@@ -1369,7 +1369,7 @@ ecore_x_window_manage(Ecore_X_Window win)
1369EAPI void 1369EAPI void
1370ecore_x_window_container_manage(Ecore_X_Window win) 1370ecore_x_window_container_manage(Ecore_X_Window win)
1371{ 1371{
1372 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1372 LOGFN;
1373 if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return; 1373 if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return;
1374 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1374 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1375 XSelectInput(_ecore_x_disp, win, 1375 XSelectInput(_ecore_x_disp, win,
@@ -1381,7 +1381,7 @@ ecore_x_window_container_manage(Ecore_X_Window win)
1381EAPI void 1381EAPI void
1382ecore_x_window_client_manage(Ecore_X_Window win) 1382ecore_x_window_client_manage(Ecore_X_Window win)
1383{ 1383{
1384 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1384 LOGFN;
1385 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1385 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1386 if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return; 1386 if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return;
1387 XSelectInput(_ecore_x_disp, win, 1387 XSelectInput(_ecore_x_disp, win,
@@ -1401,7 +1401,7 @@ ecore_x_window_client_manage(Ecore_X_Window win)
1401EAPI void 1401EAPI void
1402ecore_x_window_sniff(Ecore_X_Window win) 1402ecore_x_window_sniff(Ecore_X_Window win)
1403{ 1403{
1404 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1404 LOGFN;
1405 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1405 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1406 if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return; 1406 if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return;
1407 XSelectInput(_ecore_x_disp, win, 1407 XSelectInput(_ecore_x_disp, win,
@@ -1414,7 +1414,7 @@ ecore_x_window_sniff(Ecore_X_Window win)
1414EAPI void 1414EAPI void
1415ecore_x_window_root_properties_select(void) 1415ecore_x_window_root_properties_select(void)
1416{ 1416{
1417 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1417 LOGFN;
1418 if (_ecore_x_window_manage_succeeded) return; 1418 if (_ecore_x_window_manage_succeeded) return;
1419 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1419 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1420 XSelectInput(_ecore_x_disp, ecore_x_window_root_first_get(), PropertyChangeMask); 1420 XSelectInput(_ecore_x_disp, ecore_x_window_root_first_get(), PropertyChangeMask);
@@ -1424,7 +1424,7 @@ ecore_x_window_root_properties_select(void)
1424EAPI void 1424EAPI void
1425ecore_x_window_client_sniff(Ecore_X_Window win) 1425ecore_x_window_client_sniff(Ecore_X_Window win)
1426{ 1426{
1427 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1427 LOGFN;
1428 if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return; 1428 if (_ecore_x_window_manage_succeeded && (win == ecore_x_window_root_first_get())) return;
1429 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1429 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1430 XSelectInput(_ecore_x_disp, win, 1430 XSelectInput(_ecore_x_disp, win,
@@ -1446,7 +1446,7 @@ ecore_x_window_attributes_get(Ecore_X_Window win,
1446 XWindowAttributes att; 1446 XWindowAttributes att;
1447 Eina_Bool ret; 1447 Eina_Bool ret;
1448 1448
1449 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1449 LOGFN;
1450 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1450 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1451 ret = XGetWindowAttributes(_ecore_x_disp, win, &att); 1451 ret = XGetWindowAttributes(_ecore_x_disp, win, &att);
1452 if (_ecore_xlib_sync) ecore_x_sync(); 1452 if (_ecore_xlib_sync) ecore_x_sync();
@@ -1488,7 +1488,7 @@ ecore_x_window_attributes_get(Ecore_X_Window win,
1488EAPI void 1488EAPI void
1489ecore_x_window_save_set_add(Ecore_X_Window win) 1489ecore_x_window_save_set_add(Ecore_X_Window win)
1490{ 1490{
1491 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1491 LOGFN;
1492 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1492 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1493 XAddToSaveSet(_ecore_x_disp, win); 1493 XAddToSaveSet(_ecore_x_disp, win);
1494 if (_ecore_xlib_sync) ecore_x_sync(); 1494 if (_ecore_xlib_sync) ecore_x_sync();
@@ -1497,7 +1497,7 @@ ecore_x_window_save_set_add(Ecore_X_Window win)
1497EAPI void 1497EAPI void
1498ecore_x_window_save_set_del(Ecore_X_Window win) 1498ecore_x_window_save_set_del(Ecore_X_Window win)
1499{ 1499{
1500 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1500 LOGFN;
1501 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1501 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1502 XRemoveFromSaveSet(_ecore_x_disp, win); 1502 XRemoveFromSaveSet(_ecore_x_disp, win);
1503 if (_ecore_xlib_sync) ecore_x_sync(); 1503 if (_ecore_xlib_sync) ecore_x_sync();
@@ -1512,7 +1512,7 @@ ecore_x_window_children_get(Ecore_X_Window win,
1512 Window root_ret = 0, parent_ret = 0, *children_ret = NULL; 1512 Window root_ret = 0, parent_ret = 0, *children_ret = NULL;
1513 unsigned int children_ret_num = 0; 1513 unsigned int children_ret_num = 0;
1514 1514
1515 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1515 LOGFN;
1516 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL); 1516 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
1517 success = XQueryTree(_ecore_x_disp, win, &root_ret, &parent_ret, &children_ret, 1517 success = XQueryTree(_ecore_x_disp, win, &root_ret, &parent_ret, &children_ret,
1518 &children_ret_num); 1518 &children_ret_num);
@@ -1543,7 +1543,7 @@ ecore_x_pointer_control_set(int accel_num,
1543 int threshold) 1543 int threshold)
1544{ 1544{
1545 Eina_Bool ret; 1545 Eina_Bool ret;
1546 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1546 LOGFN;
1547 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1547 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1548 ret = !!XChangePointerControl(_ecore_x_disp, 1, 1, 1548 ret = !!XChangePointerControl(_ecore_x_disp, 1, 1,
1549 accel_num, accel_denom, threshold); 1549 accel_num, accel_denom, threshold);
@@ -1557,7 +1557,7 @@ ecore_x_pointer_control_get(int *accel_num,
1557 int *threshold) 1557 int *threshold)
1558{ 1558{
1559 Eina_Bool ret; 1559 Eina_Bool ret;
1560 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1560 LOGFN;
1561 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1561 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1562 ret = !!XGetPointerControl(_ecore_x_disp, 1562 ret = !!XGetPointerControl(_ecore_x_disp,
1563 accel_num, accel_denom, threshold); 1563 accel_num, accel_denom, threshold);
@@ -1570,7 +1570,7 @@ ecore_x_pointer_mapping_set(unsigned char *map,
1570 int nmap) 1570 int nmap)
1571{ 1571{
1572 Eina_Bool ret; 1572 Eina_Bool ret;
1573 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1573 LOGFN;
1574 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1574 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1575 ret = (XSetPointerMapping(_ecore_x_disp, map, nmap) == MappingSuccess); 1575 ret = (XSetPointerMapping(_ecore_x_disp, map, nmap) == MappingSuccess);
1576 if (_ecore_xlib_sync) ecore_x_sync(); 1576 if (_ecore_xlib_sync) ecore_x_sync();
@@ -1582,7 +1582,7 @@ ecore_x_pointer_mapping_get(unsigned char *map,
1582 int nmap) 1582 int nmap)
1583{ 1583{
1584 Eina_Bool ret; 1584 Eina_Bool ret;
1585 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1585 LOGFN;
1586 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1586 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1587 ret = !!XGetPointerMapping(_ecore_x_disp, map, nmap); 1587 ret = !!XGetPointerMapping(_ecore_x_disp, map, nmap);
1588 if (_ecore_xlib_sync) ecore_x_sync(); 1588 if (_ecore_xlib_sync) ecore_x_sync();
@@ -1593,7 +1593,7 @@ EAPI Eina_Bool
1593ecore_x_pointer_grab(Ecore_X_Window win) 1593ecore_x_pointer_grab(Ecore_X_Window win)
1594{ 1594{
1595 Eina_Bool ret; 1595 Eina_Bool ret;
1596 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1596 LOGFN;
1597 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1597 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1598 ret = (XGrabPointer(_ecore_x_disp, win, False, 1598 ret = (XGrabPointer(_ecore_x_disp, win, False,
1599 ButtonPressMask | ButtonReleaseMask | 1599 ButtonPressMask | ButtonReleaseMask |
@@ -1608,7 +1608,7 @@ EAPI Eina_Bool
1608ecore_x_pointer_confine_grab(Ecore_X_Window win) 1608ecore_x_pointer_confine_grab(Ecore_X_Window win)
1609{ 1609{
1610 Eina_Bool ret; 1610 Eina_Bool ret;
1611 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1611 LOGFN;
1612 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1612 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1613 ret = (XGrabPointer(_ecore_x_disp, win, False, 1613 ret = (XGrabPointer(_ecore_x_disp, win, False,
1614 ButtonPressMask | ButtonReleaseMask | 1614 ButtonPressMask | ButtonReleaseMask |
@@ -1622,7 +1622,7 @@ ecore_x_pointer_confine_grab(Ecore_X_Window win)
1622EAPI void 1622EAPI void
1623ecore_x_pointer_ungrab(void) 1623ecore_x_pointer_ungrab(void)
1624{ 1624{
1625 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1625 LOGFN;
1626 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1626 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1627 XUngrabPointer(_ecore_x_disp, CurrentTime); 1627 XUngrabPointer(_ecore_x_disp, CurrentTime);
1628 if (_ecore_xlib_sync) ecore_x_sync(); 1628 if (_ecore_xlib_sync) ecore_x_sync();
@@ -1634,7 +1634,7 @@ ecore_x_pointer_warp(Ecore_X_Window win,
1634 int y) 1634 int y)
1635{ 1635{
1636 Eina_Bool ret; 1636 Eina_Bool ret;
1637 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1637 LOGFN;
1638 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1638 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1639 ret = !!XWarpPointer(_ecore_x_disp, None, win, 0, 0, 0, 0, x, y); 1639 ret = !!XWarpPointer(_ecore_x_disp, None, win, 0, 0, 0, 0, x, y);
1640 if (_ecore_xlib_sync) ecore_x_sync(); 1640 if (_ecore_xlib_sync) ecore_x_sync();
@@ -1645,7 +1645,7 @@ EAPI Eina_Bool
1645ecore_x_keyboard_grab(Ecore_X_Window win) 1645ecore_x_keyboard_grab(Ecore_X_Window win)
1646{ 1646{
1647 Eina_Bool ret; 1647 Eina_Bool ret;
1648 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1648 LOGFN;
1649 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1649 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1650 ret = (XGrabKeyboard(_ecore_x_disp, win, False, 1650 ret = (XGrabKeyboard(_ecore_x_disp, win, False,
1651 GrabModeAsync, GrabModeAsync, 1651 GrabModeAsync, GrabModeAsync,
@@ -1657,7 +1657,7 @@ ecore_x_keyboard_grab(Ecore_X_Window win)
1657EAPI void 1657EAPI void
1658ecore_x_keyboard_ungrab(void) 1658ecore_x_keyboard_ungrab(void)
1659{ 1659{
1660 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1660 LOGFN;
1661 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1661 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1662 XUngrabKeyboard(_ecore_x_disp, CurrentTime); 1662 XUngrabKeyboard(_ecore_x_disp, CurrentTime);
1663} 1663}
@@ -1665,7 +1665,7 @@ ecore_x_keyboard_ungrab(void)
1665EAPI void 1665EAPI void
1666ecore_x_grab(void) 1666ecore_x_grab(void)
1667{ 1667{
1668 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1668 LOGFN;
1669 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1669 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1670 _ecore_x_grab_count++; 1670 _ecore_x_grab_count++;
1671 if (_ecore_x_grab_count == 1) 1671 if (_ecore_x_grab_count == 1)
@@ -1675,7 +1675,7 @@ ecore_x_grab(void)
1675EAPI void 1675EAPI void
1676ecore_x_ungrab(void) 1676ecore_x_ungrab(void)
1677{ 1677{
1678 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1678 LOGFN;
1679 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1679 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1680 _ecore_x_grab_count--; 1680 _ecore_x_grab_count--;
1681 if (_ecore_x_grab_count < 0) 1681 if (_ecore_x_grab_count < 0)
@@ -1696,7 +1696,7 @@ ecore_x_passive_grab_replay_func_set(Eina_Bool (*func)(void *data,
1696 void *event), 1696 void *event),
1697 void *data) 1697 void *data)
1698{ 1698{
1699 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1699 LOGFN;
1700 _ecore_window_grab_replay_func = func; 1700 _ecore_window_grab_replay_func = func;
1701 _ecore_window_grab_replay_data = data; 1701 _ecore_window_grab_replay_data = data;
1702} 1702}
@@ -1722,7 +1722,7 @@ _ecore_x_window_button_grab_internal(Ecore_X_Window win,
1722 unsigned int locks[8]; 1722 unsigned int locks[8];
1723 int i, ev; 1723 int i, ev;
1724 1724
1725 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1725 LOGFN;
1726 b = button; 1726 b = button;
1727 if (b == 0) 1727 if (b == 0)
1728 b = AnyButton; 1728 b = AnyButton;
@@ -1836,7 +1836,7 @@ _ecore_x_window_button_ungrab_internal(Ecore_X_Window win,
1836 unsigned int locks[8]; 1836 unsigned int locks[8];
1837 int i; 1837 int i;
1838 1838
1839 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1839 LOGFN;
1840 b = button; 1840 b = button;
1841 if (b == 0) 1841 if (b == 0)
1842 b = AnyButton; 1842 b = AnyButton;
@@ -1928,7 +1928,7 @@ _ecore_x_window_key_grab_internal(Ecore_X_Window win,
1928 unsigned int locks[8]; 1928 unsigned int locks[8];
1929 int i; 1929 int i;
1930 1930
1931 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1931 LOGFN;
1932 if (!strncmp(key, "Keycode-", 8)) 1932 if (!strncmp(key, "Keycode-", 8))
1933 keycode = atoi(key + 8); 1933 keycode = atoi(key + 8);
1934 else 1934 else
@@ -2044,7 +2044,7 @@ _ecore_x_window_key_ungrab_internal(Ecore_X_Window win,
2044 unsigned int locks[8]; 2044 unsigned int locks[8];
2045 int i; 2045 int i;
2046 2046
2047 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2047 LOGFN;
2048 if (!strncmp(key, "Keycode-", 8)) 2048 if (!strncmp(key, "Keycode-", 8))
2049 keycode = atoi(key + 8); 2049 keycode = atoi(key + 8);
2050 else 2050 else
@@ -2148,7 +2148,7 @@ ecore_x_client_message32_send(Ecore_X_Window win,
2148 XEvent xev = { 0 }; 2148 XEvent xev = { 0 };
2149 Eina_Bool ret; 2149 Eina_Bool ret;
2150 2150
2151 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2151 LOGFN;
2152 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 2152 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
2153 xev.xclient.window = win; 2153 xev.xclient.window = win;
2154 xev.xclient.type = ClientMessage; 2154 xev.xclient.type = ClientMessage;
@@ -2184,7 +2184,7 @@ ecore_x_client_message8_send(Ecore_X_Window win,
2184 XEvent xev = { 0 }; 2184 XEvent xev = { 0 };
2185 Eina_Bool ret; 2185 Eina_Bool ret;
2186 2186
2187 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2187 LOGFN;
2188 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 2188 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
2189 xev.xclient.window = win; 2189 xev.xclient.window = win;
2190 xev.xclient.type = ClientMessage; 2190 xev.xclient.type = ClientMessage;
@@ -2214,7 +2214,7 @@ ecore_x_mouse_move_send(Ecore_X_Window win,
2214 int rx, ry; 2214 int rx, ry;
2215 Eina_Bool ret; 2215 Eina_Bool ret;
2216 2216
2217 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2217 LOGFN;
2218 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 2218 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
2219 XGetWindowAttributes(_ecore_x_disp, win, &att); 2219 XGetWindowAttributes(_ecore_x_disp, win, &att);
2220 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw); 2220 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2247,7 +2247,7 @@ ecore_x_mouse_down_send(Ecore_X_Window win,
2247 int rx, ry; 2247 int rx, ry;
2248 Eina_Bool ret; 2248 Eina_Bool ret;
2249 2249
2250 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2250 LOGFN;
2251 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 2251 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
2252 XGetWindowAttributes(_ecore_x_disp, win, &att); 2252 XGetWindowAttributes(_ecore_x_disp, win, &att);
2253 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw); 2253 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2280,7 +2280,7 @@ ecore_x_mouse_up_send(Ecore_X_Window win,
2280 int rx, ry; 2280 int rx, ry;
2281 Eina_Bool ret; 2281 Eina_Bool ret;
2282 2282
2283 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2283 LOGFN;
2284 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 2284 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
2285 XGetWindowAttributes(_ecore_x_disp, win, &att); 2285 XGetWindowAttributes(_ecore_x_disp, win, &att);
2286 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw); 2286 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2312,7 +2312,7 @@ ecore_x_mouse_in_send(Ecore_X_Window win,
2312 int rx, ry; 2312 int rx, ry;
2313 Eina_Bool ret; 2313 Eina_Bool ret;
2314 2314
2315 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2315 LOGFN;
2316 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 2316 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
2317 XGetWindowAttributes(_ecore_x_disp, win, &att); 2317 XGetWindowAttributes(_ecore_x_disp, win, &att);
2318 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw); 2318 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2346,7 +2346,7 @@ ecore_x_mouse_out_send(Ecore_X_Window win,
2346 int rx, ry; 2346 int rx, ry;
2347 Eina_Bool ret; 2347 Eina_Bool ret;
2348 2348
2349 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2349 LOGFN;
2350 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 2350 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
2351 XGetWindowAttributes(_ecore_x_disp, win, &att); 2351 XGetWindowAttributes(_ecore_x_disp, win, &att);
2352 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw); 2352 XTranslateCoordinates(_ecore_x_disp, win, att.root, x, y, &rx, &ry, &tw);
@@ -2372,7 +2372,7 @@ ecore_x_mouse_out_send(Ecore_X_Window win,
2372EAPI void 2372EAPI void
2373ecore_x_focus_reset(void) 2373ecore_x_focus_reset(void)
2374{ 2374{
2375 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2375 LOGFN;
2376 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 2376 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
2377 XSetInputFocus(_ecore_x_disp, PointerRoot, RevertToPointerRoot, CurrentTime); 2377 XSetInputFocus(_ecore_x_disp, PointerRoot, RevertToPointerRoot, CurrentTime);
2378 if (_ecore_xlib_sync) ecore_x_sync(); 2378 if (_ecore_xlib_sync) ecore_x_sync();
@@ -2381,7 +2381,7 @@ ecore_x_focus_reset(void)
2381EAPI void 2381EAPI void
2382ecore_x_events_allow_all(void) 2382ecore_x_events_allow_all(void)
2383{ 2383{
2384 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2384 LOGFN;
2385 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 2385 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
2386 XAllowEvents(_ecore_x_disp, AsyncBoth, CurrentTime); 2386 XAllowEvents(_ecore_x_disp, AsyncBoth, CurrentTime);
2387 if (_ecore_xlib_sync) ecore_x_sync(); 2387 if (_ecore_xlib_sync) ecore_x_sync();
@@ -2407,7 +2407,7 @@ ecore_x_pointer_xy_get(Ecore_X_Window win,
2407 int rx, ry, wx, wy, ret; 2407 int rx, ry, wx, wy, ret;
2408 unsigned int mask; 2408 unsigned int mask;
2409 2409
2410 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2410 LOGFN;
2411 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 2411 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
2412 ret = XQueryPointer(_ecore_x_disp, win, &rwin, &cwin, 2412 ret = XQueryPointer(_ecore_x_disp, win, &rwin, &cwin,
2413 &rx, &ry, &wx, &wy, &mask); 2413 &rx, &ry, &wx, &wy, &mask);
@@ -2428,7 +2428,7 @@ ecore_x_pointer_root_xy_get(int *x, int *y)
2428 int i, num; 2428 int i, num;
2429 unsigned int mask; 2429 unsigned int mask;
2430 2430
2431 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2431 LOGFN;
2432 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 2432 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
2433 root = ecore_x_window_root_list(&num); 2433 root = ecore_x_window_root_list(&num);
2434 for (i = 0; i < num; i++) 2434 for (i = 0; i < num; i++)
diff --git a/src/lib/ecore_x/ecore_x_atoms.c b/src/lib/ecore_x/ecore_x_atoms.c
index 5276238fd4..d3d39fa29d 100644
--- a/src/lib/ecore_x/ecore_x_atoms.c
+++ b/src/lib/ecore_x/ecore_x_atoms.c
@@ -46,7 +46,7 @@ ecore_x_atom_get(const char *name)
46{ 46{
47 Ecore_X_Atom atom; 47 Ecore_X_Atom atom;
48 48
49 LOGFN(__FILE__, __LINE__, __FUNCTION__); 49 LOGFN;
50 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 50 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
51 atom = XInternAtom(_ecore_x_disp, name, False); 51 atom = XInternAtom(_ecore_x_disp, name, False);
52 if (_ecore_xlib_sync) ecore_x_sync(); 52 if (_ecore_xlib_sync) ecore_x_sync();
@@ -61,7 +61,7 @@ ecore_x_atoms_get(const char **names,
61 Atom *atoms_int; 61 Atom *atoms_int;
62 int i; 62 int i;
63 63
64 LOGFN(__FILE__, __LINE__, __FUNCTION__); 64 LOGFN;
65 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 65 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
66 atoms_int = alloca(num * sizeof(Atom)); 66 atoms_int = alloca(num * sizeof(Atom));
67 XInternAtoms(_ecore_x_disp, (char **)names, num, False, atoms_int); 67 XInternAtoms(_ecore_x_disp, (char **)names, num, False, atoms_int);
@@ -76,7 +76,7 @@ ecore_x_atom_name_get(Ecore_X_Atom atom)
76 char *name; 76 char *name;
77 char *xname; 77 char *xname;
78 78
79 LOGFN(__FILE__, __LINE__, __FUNCTION__); 79 LOGFN;
80 80
81 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL); 81 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
82 82
diff --git a/src/lib/ecore_x/ecore_x_composite.c b/src/lib/ecore_x/ecore_x_composite.c
index 913839f481..16ba2db635 100644
--- a/src/lib/ecore_x/ecore_x_composite.c
+++ b/src/lib/ecore_x/ecore_x_composite.c
@@ -38,7 +38,7 @@ _ecore_x_composite_init(void)
38EAPI Eina_Bool 38EAPI Eina_Bool
39ecore_x_composite_query(void) 39ecore_x_composite_query(void)
40{ 40{
41 LOGFN(__FILE__, __LINE__, __FUNCTION__); 41 LOGFN;
42 return _composite_available; 42 return _composite_available;
43} 43}
44 44
@@ -49,7 +49,7 @@ ecore_x_composite_redirect_window(Ecore_X_Window win,
49#ifdef ECORE_XCOMPOSITE 49#ifdef ECORE_XCOMPOSITE
50 int update = CompositeRedirectAutomatic; 50 int update = CompositeRedirectAutomatic;
51 51
52 LOGFN(__FILE__, __LINE__, __FUNCTION__); 52 LOGFN;
53 switch (type) 53 switch (type)
54 { 54 {
55 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: 55 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
@@ -72,7 +72,7 @@ ecore_x_composite_redirect_subwindows(Ecore_X_Window win,
72#ifdef ECORE_XCOMPOSITE 72#ifdef ECORE_XCOMPOSITE
73 int update = CompositeRedirectAutomatic; 73 int update = CompositeRedirectAutomatic;
74 74
75 LOGFN(__FILE__, __LINE__, __FUNCTION__); 75 LOGFN;
76 switch (type) 76 switch (type)
77 { 77 {
78 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: 78 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
@@ -95,7 +95,7 @@ ecore_x_composite_unredirect_window(Ecore_X_Window win,
95#ifdef ECORE_XCOMPOSITE 95#ifdef ECORE_XCOMPOSITE
96 int update = CompositeRedirectAutomatic; 96 int update = CompositeRedirectAutomatic;
97 97
98 LOGFN(__FILE__, __LINE__, __FUNCTION__); 98 LOGFN;
99 switch (type) 99 switch (type)
100 { 100 {
101 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: 101 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
@@ -118,7 +118,7 @@ ecore_x_composite_unredirect_subwindows(Ecore_X_Window win,
118#ifdef ECORE_XCOMPOSITE 118#ifdef ECORE_XCOMPOSITE
119 int update = CompositeRedirectAutomatic; 119 int update = CompositeRedirectAutomatic;
120 120
121 LOGFN(__FILE__, __LINE__, __FUNCTION__); 121 LOGFN;
122 switch (type) 122 switch (type)
123 { 123 {
124 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC: 124 case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
@@ -139,7 +139,7 @@ ecore_x_composite_name_window_pixmap_get(Ecore_X_Window win)
139{ 139{
140 Ecore_X_Pixmap pixmap = None; 140 Ecore_X_Pixmap pixmap = None;
141#ifdef ECORE_XCOMPOSITE 141#ifdef ECORE_XCOMPOSITE
142 LOGFN(__FILE__, __LINE__, __FUNCTION__); 142 LOGFN;
143 pixmap = XCompositeNameWindowPixmap(_ecore_x_disp, win); 143 pixmap = XCompositeNameWindowPixmap(_ecore_x_disp, win);
144 if (_ecore_xlib_sync) ecore_x_sync(); 144 if (_ecore_xlib_sync) ecore_x_sync();
145#endif /* ifdef ECORE_XCOMPOSITE */ 145#endif /* ifdef ECORE_XCOMPOSITE */
@@ -180,7 +180,7 @@ EAPI void
180ecore_x_composite_render_window_disable(Ecore_X_Window root) 180ecore_x_composite_render_window_disable(Ecore_X_Window root)
181{ 181{
182#ifdef ECORE_XCOMPOSITE 182#ifdef ECORE_XCOMPOSITE
183 LOGFN(__FILE__, __LINE__, __FUNCTION__); 183 LOGFN;
184 XCompositeReleaseOverlayWindow(_ecore_x_disp, root); 184 XCompositeReleaseOverlayWindow(_ecore_x_disp, root);
185 if (_ecore_xlib_sync) ecore_x_sync(); 185 if (_ecore_xlib_sync) ecore_x_sync();
186#endif /* ifdef ECORE_XCOMPOSITE */ 186#endif /* ifdef ECORE_XCOMPOSITE */
diff --git a/src/lib/ecore_x/ecore_x_cursor.c b/src/lib/ecore_x/ecore_x_cursor.c
index 46ac42e59a..c472c02af6 100644
--- a/src/lib/ecore_x/ecore_x_cursor.c
+++ b/src/lib/ecore_x/ecore_x_cursor.c
@@ -22,7 +22,7 @@ ecore_x_cursor_new(Ecore_X_Window win,
22{ 22{
23 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 23 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
24#ifdef ECORE_XCURSOR 24#ifdef ECORE_XCURSOR
25 LOGFN(__FILE__, __LINE__, __FUNCTION__); 25 LOGFN;
26 26
27 if (_ecore_x_xcursor) 27 if (_ecore_x_xcursor)
28 { 28 {
@@ -218,7 +218,7 @@ ecore_x_cursor_new(Ecore_X_Window win,
218EAPI void 218EAPI void
219ecore_x_cursor_free(Ecore_X_Cursor c) 219ecore_x_cursor_free(Ecore_X_Cursor c)
220{ 220{
221 LOGFN(__FILE__, __LINE__, __FUNCTION__); 221 LOGFN;
222 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 222 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
223 XFreeCursor(_ecore_x_disp, c); 223 XFreeCursor(_ecore_x_disp, c);
224 if (_ecore_xlib_sync) ecore_x_sync(); 224 if (_ecore_xlib_sync) ecore_x_sync();
@@ -233,7 +233,7 @@ EAPI Ecore_X_Cursor
233ecore_x_cursor_shape_get(int shape) 233ecore_x_cursor_shape_get(int shape)
234{ 234{
235 Ecore_X_Cursor cur; 235 Ecore_X_Cursor cur;
236 LOGFN(__FILE__, __LINE__, __FUNCTION__); 236 LOGFN;
237 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 237 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
238 /* Shapes are defined in Ecore_X_Cursor.h */ 238 /* Shapes are defined in Ecore_X_Cursor.h */
239 cur = XCreateFontCursor(_ecore_x_disp, shape); 239 cur = XCreateFontCursor(_ecore_x_disp, shape);
@@ -245,7 +245,7 @@ EAPI void
245ecore_x_cursor_size_set(int size) 245ecore_x_cursor_size_set(int size)
246{ 246{
247#ifdef ECORE_XCURSOR 247#ifdef ECORE_XCURSOR
248 LOGFN(__FILE__, __LINE__, __FUNCTION__); 248 LOGFN;
249 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 249 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
250 XcursorSetDefaultSize(_ecore_x_disp, size); 250 XcursorSetDefaultSize(_ecore_x_disp, size);
251 if (_ecore_xlib_sync) ecore_x_sync(); 251 if (_ecore_xlib_sync) ecore_x_sync();
@@ -258,7 +258,7 @@ EAPI int
258ecore_x_cursor_size_get(void) 258ecore_x_cursor_size_get(void)
259{ 259{
260#ifdef ECORE_XCURSOR 260#ifdef ECORE_XCURSOR
261 LOGFN(__FILE__, __LINE__, __FUNCTION__); 261 LOGFN;
262 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 262 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
263 return XcursorGetDefaultSize(_ecore_x_disp); 263 return XcursorGetDefaultSize(_ecore_x_disp);
264#else /* ifdef ECORE_XCURSOR */ 264#else /* ifdef ECORE_XCURSOR */
diff --git a/src/lib/ecore_x/ecore_x_damage.c b/src/lib/ecore_x/ecore_x_damage.c
index c5906b4531..8a19a03d07 100644
--- a/src/lib/ecore_x/ecore_x_damage.c
+++ b/src/lib/ecore_x/ecore_x_damage.c
@@ -17,7 +17,7 @@ _ecore_x_damage_init(void)
17 _damage_major = 1; 17 _damage_major = 1;
18 _damage_minor = 0; 18 _damage_minor = 0;
19 19
20 LOGFN(__FILE__, __LINE__, __FUNCTION__); 20 LOGFN;
21 if (XDamageQueryVersion(_ecore_x_disp, &_damage_major, &_damage_minor)) 21 if (XDamageQueryVersion(_ecore_x_disp, &_damage_major, &_damage_minor))
22 _damage_available = EINA_TRUE; 22 _damage_available = EINA_TRUE;
23 else 23 else
@@ -41,7 +41,7 @@ ecore_x_damage_new(Ecore_X_Drawable d,
41#ifdef ECORE_XDAMAGE 41#ifdef ECORE_XDAMAGE
42 Ecore_X_Damage damage; 42 Ecore_X_Damage damage;
43 43
44 LOGFN(__FILE__, __LINE__, __FUNCTION__); 44 LOGFN;
45 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 45 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
46 damage = XDamageCreate(_ecore_x_disp, d, level); 46 damage = XDamageCreate(_ecore_x_disp, d, level);
47 if (_ecore_xlib_sync) ecore_x_sync(); 47 if (_ecore_xlib_sync) ecore_x_sync();
@@ -55,7 +55,7 @@ EAPI void
55ecore_x_damage_free(Ecore_X_Damage damage) 55ecore_x_damage_free(Ecore_X_Damage damage)
56{ 56{
57#ifdef ECORE_XDAMAGE 57#ifdef ECORE_XDAMAGE
58 LOGFN(__FILE__, __LINE__, __FUNCTION__); 58 LOGFN;
59 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 59 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
60 XDamageDestroy(_ecore_x_disp, damage); 60 XDamageDestroy(_ecore_x_disp, damage);
61#endif /* ifdef ECORE_XDAMAGE */ 61#endif /* ifdef ECORE_XDAMAGE */
@@ -67,7 +67,7 @@ ecore_x_damage_subtract(Ecore_X_Damage damage,
67 Ecore_X_Region parts) 67 Ecore_X_Region parts)
68{ 68{
69#ifdef ECORE_XDAMAGE 69#ifdef ECORE_XDAMAGE
70 LOGFN(__FILE__, __LINE__, __FUNCTION__); 70 LOGFN;
71 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 71 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
72 XDamageSubtract(_ecore_x_disp, damage, repair, parts); 72 XDamageSubtract(_ecore_x_disp, damage, repair, parts);
73 if (_ecore_xlib_sync) ecore_x_sync(); 73 if (_ecore_xlib_sync) ecore_x_sync();
diff --git a/src/lib/ecore_x/ecore_x_dnd.c b/src/lib/ecore_x/ecore_x_dnd.c
index c5d6fd5cd2..b758be8e54 100644
--- a/src/lib/ecore_x/ecore_x_dnd.c
+++ b/src/lib/ecore_x/ecore_x_dnd.c
@@ -147,7 +147,7 @@ ecore_x_dnd_aware_set(Ecore_X_Window win,
147{ 147{
148 Ecore_X_Atom prop_data = ECORE_X_DND_VERSION; 148 Ecore_X_Atom prop_data = ECORE_X_DND_VERSION;
149 149
150 LOGFN(__FILE__, __LINE__, __FUNCTION__); 150 LOGFN;
151 if (on) 151 if (on)
152 ecore_x_window_prop_property_set(win, ECORE_X_ATOM_XDND_AWARE, 152 ecore_x_window_prop_property_set(win, ECORE_X_ATOM_XDND_AWARE,
153 XA_ATOM, 32, &prop_data, 1); 153 XA_ATOM, 32, &prop_data, 1);
@@ -162,7 +162,7 @@ ecore_x_dnd_version_get(Ecore_X_Window win)
162 int num; 162 int num;
163 Version_Cache_Item *t; 163 Version_Cache_Item *t;
164 164
165 LOGFN(__FILE__, __LINE__, __FUNCTION__); 165 LOGFN;
166 // this looks hacky - and it is, but we need a way of caching info about 166 // this looks hacky - and it is, but we need a way of caching info about
167 // a window while dragging, because we literally query this every mouse 167 // a window while dragging, because we literally query this every mouse
168 // move and going to and from x multiple times per move is EXPENSIVE 168 // move and going to and from x multiple times per move is EXPENSIVE
@@ -234,7 +234,7 @@ ecore_x_dnd_type_isset(Ecore_X_Window win,
234 unsigned char *data; 234 unsigned char *data;
235 Ecore_X_Atom *atoms, atom; 235 Ecore_X_Atom *atoms, atom;
236 236
237 LOGFN(__FILE__, __LINE__, __FUNCTION__); 237 LOGFN;
238 if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_XDND_TYPE_LIST, 238 if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_XDND_TYPE_LIST,
239 XA_ATOM, 32, &data, &num)) 239 XA_ATOM, 32, &data, &num))
240 return ret; 240 return ret;
@@ -266,10 +266,10 @@ ecore_x_dnd_type_set(Ecore_X_Window win,
266 unsigned char *data = NULL; 266 unsigned char *data = NULL;
267 unsigned char *old_data = NULL; 267 unsigned char *old_data = NULL;
268 268
269 LOGFN(__FILE__, __LINE__, __FUNCTION__); 269 LOGFN;
270 atom = ecore_x_atom_get(type); 270 atom = ecore_x_atom_get(type);
271 271
272 LOGFN(__FILE__, __LINE__, __FUNCTION__); 272 LOGFN;
273 if (on) 273 if (on)
274 { 274 {
275 if (ecore_x_window_prop_property_get(win, ECORE_X_ATOM_XDND_TYPE_LIST, 275 if (ecore_x_window_prop_property_get(win, ECORE_X_ATOM_XDND_TYPE_LIST,
@@ -341,7 +341,7 @@ ecore_x_dnd_types_set(Ecore_X_Window win,
341 unsigned int i; 341 unsigned int i;
342 unsigned char *data = NULL; 342 unsigned char *data = NULL;
343 343
344 LOGFN(__FILE__, __LINE__, __FUNCTION__); 344 LOGFN;
345 if (!num_types) 345 if (!num_types)
346 ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_TYPE_LIST); 346 ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_TYPE_LIST);
347 else 347 else
@@ -371,7 +371,7 @@ ecore_x_dnd_actions_set(Ecore_X_Window win,
371 unsigned int i; 371 unsigned int i;
372 unsigned char *data = NULL; 372 unsigned char *data = NULL;
373 373
374 LOGFN(__FILE__, __LINE__, __FUNCTION__); 374 LOGFN;
375 if (!num_actions) 375 if (!num_actions)
376 ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_ACTION_LIST); 376 ecore_x_window_prop_property_del(win, ECORE_X_ATOM_XDND_ACTION_LIST);
377 else 377 else
@@ -431,7 +431,7 @@ _ecore_x_dnd_begin(Ecore_X_Window source,
431 unsigned char *data, 431 unsigned char *data,
432 int size) 432 int size)
433{ 433{
434 LOGFN(__FILE__, __LINE__, __FUNCTION__); 434 LOGFN;
435 if (!ecore_x_dnd_version_get(source)) 435 if (!ecore_x_dnd_version_get(source))
436 return EINA_FALSE; 436 return EINA_FALSE;
437 437
@@ -469,7 +469,7 @@ _ecore_x_dnd_drop(Eina_Bool self)
469 XEvent xev = { 0 }; 469 XEvent xev = { 0 };
470 int status = EINA_FALSE; 470 int status = EINA_FALSE;
471 471
472 LOGFN(__FILE__, __LINE__, __FUNCTION__); 472 LOGFN;
473 if (_source->dest) 473 if (_source->dest)
474 { 474 {
475 xev.xany.type = ClientMessage; 475 xev.xany.type = ClientMessage;
@@ -553,7 +553,7 @@ ecore_x_dnd_send_status(Eina_Bool will_accept,
553 if (_target->state == ECORE_X_DND_TARGET_IDLE) 553 if (_target->state == ECORE_X_DND_TARGET_IDLE)
554 return; 554 return;
555 555
556 LOGFN(__FILE__, __LINE__, __FUNCTION__); 556 LOGFN;
557 memset(&xev, 0, sizeof(XEvent)); 557 memset(&xev, 0, sizeof(XEvent));
558 558
559 _target->will_accept = will_accept; 559 _target->will_accept = will_accept;
@@ -605,7 +605,7 @@ ecore_x_dnd_send_finished(void)
605 if (_target->state == ECORE_X_DND_TARGET_IDLE) 605 if (_target->state == ECORE_X_DND_TARGET_IDLE)
606 return; 606 return;
607 607
608 LOGFN(__FILE__, __LINE__, __FUNCTION__); 608 LOGFN;
609 xev.xany.type = ClientMessage; 609 xev.xany.type = ClientMessage;
610 xev.xany.display = _ecore_x_disp; 610 xev.xany.display = _ecore_x_disp;
611 xev.xclient.message_type = ECORE_X_ATOM_XDND_FINISHED; 611 xev.xclient.message_type = ECORE_X_ATOM_XDND_FINISHED;
diff --git a/src/lib/ecore_x/ecore_x_dpms.c b/src/lib/ecore_x/ecore_x_dpms.c
index ad946d45c9..b55c1992f5 100644
--- a/src/lib/ecore_x/ecore_x_dpms.c
+++ b/src/lib/ecore_x/ecore_x_dpms.c
@@ -54,7 +54,7 @@ EAPI Eina_Bool
54ecore_x_dpms_capable_get(void) 54ecore_x_dpms_capable_get(void)
55{ 55{
56#ifdef ECORE_XDPMS 56#ifdef ECORE_XDPMS
57 LOGFN(__FILE__, __LINE__, __FUNCTION__); 57 LOGFN;
58 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 58 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
59 return DPMSCapable(_ecore_x_disp) ? EINA_TRUE : EINA_FALSE; 59 return DPMSCapable(_ecore_x_disp) ? EINA_TRUE : EINA_FALSE;
60#else /* ifdef ECORE_XDPMS */ 60#else /* ifdef ECORE_XDPMS */
@@ -74,7 +74,7 @@ ecore_x_dpms_enabled_get(void)
74 unsigned char state; 74 unsigned char state;
75 unsigned short power_lvl; 75 unsigned short power_lvl;
76 76
77 LOGFN(__FILE__, __LINE__, __FUNCTION__); 77 LOGFN;
78 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 78 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
79 DPMSInfo(_ecore_x_disp, &power_lvl, &state); 79 DPMSInfo(_ecore_x_disp, &power_lvl, &state);
80 return state ? EINA_TRUE : EINA_FALSE; 80 return state ? EINA_TRUE : EINA_FALSE;
@@ -99,7 +99,7 @@ ecore_x_dpms_power_level_get(void)
99 unsigned char state; 99 unsigned char state;
100 unsigned short power_lvl; 100 unsigned short power_lvl;
101 101
102 LOGFN(__FILE__, __LINE__, __FUNCTION__); 102 LOGFN;
103 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, -1); 103 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, -1);
104 DPMSInfo(_ecore_x_disp, &power_lvl, &state); 104 DPMSInfo(_ecore_x_disp, &power_lvl, &state);
105 return (int)power_lvl; 105 return (int)power_lvl;
@@ -117,7 +117,7 @@ EAPI void
117ecore_x_dpms_enabled_set(int enabled) 117ecore_x_dpms_enabled_set(int enabled)
118{ 118{
119#ifdef ECORE_XDPMS 119#ifdef ECORE_XDPMS
120 LOGFN(__FILE__, __LINE__, __FUNCTION__); 120 LOGFN;
121 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 121 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
122 if (enabled) 122 if (enabled)
123 DPMSEnable(_ecore_x_disp); 123 DPMSEnable(_ecore_x_disp);
@@ -140,7 +140,7 @@ ecore_x_dpms_timeouts_get(unsigned int *standby,
140 unsigned int *off) 140 unsigned int *off)
141{ 141{
142#ifdef ECORE_XDPMS 142#ifdef ECORE_XDPMS
143 LOGFN(__FILE__, __LINE__, __FUNCTION__); 143 LOGFN;
144 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 144 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
145 DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby, 145 DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby,
146 (unsigned short *)suspend, (unsigned short *)off); 146 (unsigned short *)suspend, (unsigned short *)off);
@@ -160,7 +160,7 @@ ecore_x_dpms_timeouts_set(unsigned int standby,
160 unsigned int off) 160 unsigned int off)
161{ 161{
162#ifdef ECORE_XDPMS 162#ifdef ECORE_XDPMS
163 LOGFN(__FILE__, __LINE__, __FUNCTION__); 163 LOGFN;
164 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 164 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
165 return DPMSSetTimeouts(_ecore_x_disp, standby, suspend, off) ? EINA_TRUE : EINA_FALSE; 165 return DPMSSetTimeouts(_ecore_x_disp, standby, suspend, off) ? EINA_TRUE : EINA_FALSE;
166#else /* ifdef ECORE_XDPMS */ 166#else /* ifdef ECORE_XDPMS */
@@ -179,7 +179,7 @@ ecore_x_dpms_timeout_standby_get(void)
179#ifdef ECORE_XDPMS 179#ifdef ECORE_XDPMS
180 unsigned short standby, suspend, off; 180 unsigned short standby, suspend, off;
181 181
182 LOGFN(__FILE__, __LINE__, __FUNCTION__); 182 LOGFN;
183 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 183 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
184 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); 184 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
185 return standby; 185 return standby;
@@ -200,7 +200,7 @@ ecore_x_dpms_timeout_suspend_get(void)
200#ifdef ECORE_XDPMS 200#ifdef ECORE_XDPMS
201 unsigned short standby, suspend, off; 201 unsigned short standby, suspend, off;
202 202
203 LOGFN(__FILE__, __LINE__, __FUNCTION__); 203 LOGFN;
204 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 204 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
205 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); 205 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
206 return suspend; 206 return suspend;
@@ -221,7 +221,7 @@ ecore_x_dpms_timeout_off_get(void)
221#ifdef ECORE_XDPMS 221#ifdef ECORE_XDPMS
222 unsigned short standby, suspend, off; 222 unsigned short standby, suspend, off;
223 223
224 LOGFN(__FILE__, __LINE__, __FUNCTION__); 224 LOGFN;
225 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 225 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
226 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); 226 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
227 return off; 227 return off;
@@ -241,7 +241,7 @@ ecore_x_dpms_timeout_standby_set(unsigned int new_timeout)
241#ifdef ECORE_XDPMS 241#ifdef ECORE_XDPMS
242 unsigned short standby, suspend, off; 242 unsigned short standby, suspend, off;
243 243
244 LOGFN(__FILE__, __LINE__, __FUNCTION__); 244 LOGFN;
245 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 245 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
246 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); 246 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
247 DPMSSetTimeouts(_ecore_x_disp, new_timeout, suspend, off); 247 DPMSSetTimeouts(_ecore_x_disp, new_timeout, suspend, off);
@@ -259,7 +259,7 @@ ecore_x_dpms_timeout_suspend_set(unsigned int new_timeout)
259#ifdef ECORE_XDPMS 259#ifdef ECORE_XDPMS
260 unsigned short standby, suspend, off; 260 unsigned short standby, suspend, off;
261 261
262 LOGFN(__FILE__, __LINE__, __FUNCTION__); 262 LOGFN;
263 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 263 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
264 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); 264 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
265 DPMSSetTimeouts(_ecore_x_disp, standby, new_timeout, off); 265 DPMSSetTimeouts(_ecore_x_disp, standby, new_timeout, off);
@@ -277,7 +277,7 @@ ecore_x_dpms_timeout_off_set(unsigned int new_timeout)
277#ifdef ECORE_XDPMS 277#ifdef ECORE_XDPMS
278 unsigned short standby, suspend, off; 278 unsigned short standby, suspend, off;
279 279
280 LOGFN(__FILE__, __LINE__, __FUNCTION__); 280 LOGFN;
281 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 281 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
282 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off); 282 DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
283 DPMSSetTimeouts(_ecore_x_disp, standby, suspend, new_timeout); 283 DPMSSetTimeouts(_ecore_x_disp, standby, suspend, new_timeout);
@@ -293,7 +293,7 @@ EAPI void
293ecore_x_dpms_force(Eina_Bool on) 293ecore_x_dpms_force(Eina_Bool on)
294{ 294{
295#ifdef ECORE_XDPMS 295#ifdef ECORE_XDPMS
296 LOGFN(__FILE__, __LINE__, __FUNCTION__); 296 LOGFN;
297 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 297 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
298 if (on) DPMSForceLevel(_ecore_x_disp, DPMSModeOn); 298 if (on) DPMSForceLevel(_ecore_x_disp, DPMSModeOn);
299 else DPMSForceLevel(_ecore_x_disp, DPMSModeOff); 299 else DPMSForceLevel(_ecore_x_disp, DPMSModeOff);
diff --git a/src/lib/ecore_x/ecore_x_drawable.c b/src/lib/ecore_x/ecore_x_drawable.c
index e0edbe2776..dcd457c67d 100644
--- a/src/lib/ecore_x/ecore_x_drawable.c
+++ b/src/lib/ecore_x/ecore_x_drawable.c
@@ -31,7 +31,7 @@ ecore_x_drawable_geometry_get(Ecore_X_Drawable d,
31 int ret_x, ret_y; 31 int ret_x, ret_y;
32 unsigned int ret_w, ret_h, dummy_border, dummy_depth; 32 unsigned int ret_w, ret_h, dummy_border, dummy_depth;
33 33
34 LOGFN(__FILE__, __LINE__, __FUNCTION__); 34 LOGFN;
35 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 35 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
36 if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &ret_x, &ret_y, 36 if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &ret_x, &ret_y,
37 &ret_w, &ret_h, &dummy_border, &dummy_depth)) 37 &ret_w, &ret_h, &dummy_border, &dummy_depth))
@@ -69,7 +69,7 @@ ecore_x_drawable_border_width_get(Ecore_X_Drawable d)
69 int dummy_x, dummy_y; 69 int dummy_x, dummy_y;
70 unsigned int dummy_w, dummy_h, border_ret, dummy_depth; 70 unsigned int dummy_w, dummy_h, border_ret, dummy_depth;
71 71
72 LOGFN(__FILE__, __LINE__, __FUNCTION__); 72 LOGFN;
73 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 73 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
74 if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &dummy_x, &dummy_y, 74 if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &dummy_x, &dummy_y,
75 &dummy_w, &dummy_h, &border_ret, &dummy_depth)) 75 &dummy_w, &dummy_h, &border_ret, &dummy_depth))
@@ -91,7 +91,7 @@ ecore_x_drawable_depth_get(Ecore_X_Drawable d)
91 int dummy_x, dummy_y; 91 int dummy_x, dummy_y;
92 unsigned int dummy_w, dummy_h, dummy_border, depth_ret; 92 unsigned int dummy_w, dummy_h, dummy_border, depth_ret;
93 93
94 LOGFN(__FILE__, __LINE__, __FUNCTION__); 94 LOGFN;
95 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0); 95 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, 0);
96 if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &dummy_x, &dummy_y, 96 if (!XGetGeometry(_ecore_x_disp, d, &dummy_win, &dummy_x, &dummy_y,
97 &dummy_w, &dummy_h, &dummy_border, &depth_ret)) 97 &dummy_w, &dummy_h, &dummy_border, &depth_ret))
@@ -117,7 +117,7 @@ ecore_x_drawable_rectangle_fill(Ecore_X_Drawable d,
117 int width, 117 int width,
118 int height) 118 int height)
119{ 119{
120 LOGFN(__FILE__, __LINE__, __FUNCTION__); 120 LOGFN;
121 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 121 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
122 XFillRectangle(_ecore_x_disp, d, gc, x, y, width, height); 122 XFillRectangle(_ecore_x_disp, d, gc, x, y, width, height);
123 if (_ecore_xlib_sync) ecore_x_sync(); 123 if (_ecore_xlib_sync) ecore_x_sync();
diff --git a/src/lib/ecore_x/ecore_x_e.c b/src/lib/ecore_x/ecore_x_e.c
index 8d10ba0700..0444010c88 100644
--- a/src/lib/ecore_x/ecore_x_e.c
+++ b/src/lib/ecore_x/ecore_x_e.c
@@ -34,7 +34,7 @@ ecore_x_e_frame_size_set(Ecore_X_Window win,
34{ 34{
35 unsigned int frames[4]; 35 unsigned int frames[4];
36 36
37 LOGFN(__FILE__, __LINE__, __FUNCTION__); 37 LOGFN;
38 frames[0] = fl; 38 frames[0] = fl;
39 frames[1] = fr; 39 frames[1] = fr;
40 frames[2] = ft; 40 frames[2] = ft;
@@ -46,7 +46,7 @@ EAPI void
46ecore_x_e_virtual_keyboard_set(Ecore_X_Window win, 46ecore_x_e_virtual_keyboard_set(Ecore_X_Window win,
47 unsigned int is_keyboard) 47 unsigned int is_keyboard)
48{ 48{
49 LOGFN(__FILE__, __LINE__, __FUNCTION__); 49 LOGFN;
50 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD, 50 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD,
51 &is_keyboard, 1); 51 &is_keyboard, 1);
52} 52}
@@ -57,7 +57,7 @@ ecore_x_e_virtual_keyboard_get(Ecore_X_Window win)
57 unsigned int val = 0; 57 unsigned int val = 0;
58 int ret = 0; 58 int ret = 0;
59 59
60 LOGFN(__FILE__, __LINE__, __FUNCTION__); 60 LOGFN;
61 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD, 61 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD,
62 &val, 1); 62 &val, 1);
63 if ((ret == 0) || (ret == -1)) 63 if ((ret == 0) || (ret == -1))
@@ -178,7 +178,7 @@ ecore_x_e_virtual_keyboard_state_set(Ecore_X_Window win,
178{ 178{
179 Ecore_X_Atom atom = 0; 179 Ecore_X_Atom atom = 0;
180 180
181 LOGFN(__FILE__, __LINE__, __FUNCTION__); 181 LOGFN;
182 atom = _ecore_x_e_vkbd_atom_get(state); 182 atom = _ecore_x_e_vkbd_atom_get(state);
183 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE, 183 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE,
184 &atom, 1); 184 &atom, 1);
@@ -189,7 +189,7 @@ ecore_x_e_virtual_keyboard_state_get(Ecore_X_Window win)
189{ 189{
190 Ecore_X_Atom atom = 0; 190 Ecore_X_Atom atom = 0;
191 191
192 LOGFN(__FILE__, __LINE__, __FUNCTION__); 192 LOGFN;
193 if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE, 193 if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE,
194 &atom, 1)) 194 &atom, 1))
195 return ECORE_X_VIRTUAL_KEYBOARD_STATE_UNKNOWN; 195 return ECORE_X_VIRTUAL_KEYBOARD_STATE_UNKNOWN;
@@ -201,7 +201,7 @@ EAPI void
201ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win, 201ecore_x_e_virtual_keyboard_state_send(Ecore_X_Window win,
202 Ecore_X_Virtual_Keyboard_State state) 202 Ecore_X_Virtual_Keyboard_State state)
203{ 203{
204 LOGFN(__FILE__, __LINE__, __FUNCTION__); 204 LOGFN;
205 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE, 205 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE,
206 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 206 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
207 _ecore_x_e_vkbd_atom_get(state), 207 _ecore_x_e_vkbd_atom_get(state),
@@ -247,7 +247,7 @@ EAPI void
247ecore_x_e_illume_zone_set(Ecore_X_Window win, 247ecore_x_e_illume_zone_set(Ecore_X_Window win,
248 Ecore_X_Window zone) 248 Ecore_X_Window zone)
249{ 249{
250 LOGFN(__FILE__, __LINE__, __FUNCTION__); 250 LOGFN;
251 ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE, 251 ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE,
252 &zone, 1); 252 &zone, 1);
253} 253}
@@ -258,7 +258,7 @@ ecore_x_e_illume_zone_get(Ecore_X_Window win)
258 Ecore_X_Window zone = 0; 258 Ecore_X_Window zone = 0;
259 int ret; 259 int ret;
260 260
261 LOGFN(__FILE__, __LINE__, __FUNCTION__); 261 LOGFN;
262 ret = ecore_x_window_prop_window_get(win, ECORE_X_ATOM_E_ILLUME_ZONE, 262 ret = ecore_x_window_prop_window_get(win, ECORE_X_ATOM_E_ILLUME_ZONE,
263 &zone, 1); 263 &zone, 1);
264 if ((ret == 0) || (ret == -1)) 264 if ((ret == 0) || (ret == -1))
@@ -272,7 +272,7 @@ ecore_x_e_illume_zone_list_set(Ecore_X_Window win,
272 Ecore_X_Window *zones, 272 Ecore_X_Window *zones,
273 unsigned int n_zones) 273 unsigned int n_zones)
274{ 274{
275 LOGFN(__FILE__, __LINE__, __FUNCTION__); 275 LOGFN;
276 ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE_LIST, 276 ecore_x_window_prop_window_set(win, ECORE_X_ATOM_E_ILLUME_ZONE_LIST,
277 zones, n_zones); 277 zones, n_zones);
278} 278}
@@ -281,7 +281,7 @@ EAPI void
281ecore_x_e_illume_conformant_set(Ecore_X_Window win, 281ecore_x_e_illume_conformant_set(Ecore_X_Window win,
282 unsigned int is_conformant) 282 unsigned int is_conformant)
283{ 283{
284 LOGFN(__FILE__, __LINE__, __FUNCTION__); 284 LOGFN;
285 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT, 285 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT,
286 &is_conformant, 1); 286 &is_conformant, 1);
287} 287}
@@ -292,7 +292,7 @@ ecore_x_e_illume_conformant_get(Ecore_X_Window win)
292 unsigned int val = 0; 292 unsigned int val = 0;
293 int ret = 0; 293 int ret = 0;
294 294
295 LOGFN(__FILE__, __LINE__, __FUNCTION__); 295 LOGFN;
296 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT, 296 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_CONFORMANT,
297 &val, 1); 297 &val, 1);
298 if ((ret == 0) || (ret == -1)) 298 if ((ret == 0) || (ret == -1))
@@ -307,7 +307,7 @@ ecore_x_e_illume_mode_set(Ecore_X_Window win,
307{ 307{
308 Ecore_X_Atom atom = 0; 308 Ecore_X_Atom atom = 0;
309 309
310 LOGFN(__FILE__, __LINE__, __FUNCTION__); 310 LOGFN;
311 atom = _ecore_x_e_illume_atom_get(mode); 311 atom = _ecore_x_e_illume_atom_get(mode);
312 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_MODE, 312 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_MODE,
313 &atom, 1); 313 &atom, 1);
@@ -318,7 +318,7 @@ ecore_x_e_illume_mode_get(Ecore_X_Window win)
318{ 318{
319 Ecore_X_Atom atom = 0; 319 Ecore_X_Atom atom = 0;
320 320
321 LOGFN(__FILE__, __LINE__, __FUNCTION__); 321 LOGFN;
322 if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_ILLUME_MODE, &atom, 1)) 322 if (!ecore_x_window_prop_atom_get(win, ECORE_X_ATOM_E_ILLUME_MODE, &atom, 1))
323 return ECORE_X_ILLUME_MODE_UNKNOWN; 323 return ECORE_X_ILLUME_MODE_UNKNOWN;
324 324
@@ -329,7 +329,7 @@ EAPI void
329ecore_x_e_illume_mode_send(Ecore_X_Window win, 329ecore_x_e_illume_mode_send(Ecore_X_Window win,
330 Ecore_X_Illume_Mode mode) 330 Ecore_X_Illume_Mode mode)
331{ 331{
332 LOGFN(__FILE__, __LINE__, __FUNCTION__); 332 LOGFN;
333 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_MODE, 333 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_MODE,
334 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 334 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
335 _ecore_x_e_illume_atom_get(mode), 335 _ecore_x_e_illume_atom_get(mode),
@@ -339,7 +339,7 @@ ecore_x_e_illume_mode_send(Ecore_X_Window win,
339EAPI void 339EAPI void
340ecore_x_e_illume_focus_back_send(Ecore_X_Window win) 340ecore_x_e_illume_focus_back_send(Ecore_X_Window win)
341{ 341{
342 LOGFN(__FILE__, __LINE__, __FUNCTION__); 342 LOGFN;
343 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_BACK, 343 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_BACK,
344 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 344 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
345 1, 0, 0, 0, 0); 345 1, 0, 0, 0, 0);
@@ -348,7 +348,7 @@ ecore_x_e_illume_focus_back_send(Ecore_X_Window win)
348EAPI void 348EAPI void
349ecore_x_e_illume_focus_forward_send(Ecore_X_Window win) 349ecore_x_e_illume_focus_forward_send(Ecore_X_Window win)
350{ 350{
351 LOGFN(__FILE__, __LINE__, __FUNCTION__); 351 LOGFN;
352 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_FORWARD, 352 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_FORWARD,
353 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 353 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
354 1, 0, 0, 0, 0); 354 1, 0, 0, 0, 0);
@@ -357,7 +357,7 @@ ecore_x_e_illume_focus_forward_send(Ecore_X_Window win)
357EAPI void 357EAPI void
358ecore_x_e_illume_focus_home_send(Ecore_X_Window win) 358ecore_x_e_illume_focus_home_send(Ecore_X_Window win)
359{ 359{
360 LOGFN(__FILE__, __LINE__, __FUNCTION__); 360 LOGFN;
361 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_HOME, 361 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_FOCUS_HOME,
362 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 362 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
363 1, 0, 0, 0, 0); 363 1, 0, 0, 0, 0);
@@ -366,7 +366,7 @@ ecore_x_e_illume_focus_home_send(Ecore_X_Window win)
366EAPI void 366EAPI void
367ecore_x_e_illume_close_send(Ecore_X_Window win) 367ecore_x_e_illume_close_send(Ecore_X_Window win)
368{ 368{
369 LOGFN(__FILE__, __LINE__, __FUNCTION__); 369 LOGFN;
370 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_CLOSE, 370 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_CLOSE,
371 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 371 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
372 1, 0, 0, 0, 0); 372 1, 0, 0, 0, 0);
@@ -375,7 +375,7 @@ ecore_x_e_illume_close_send(Ecore_X_Window win)
375EAPI void 375EAPI void
376ecore_x_e_illume_home_new_send(Ecore_X_Window win) 376ecore_x_e_illume_home_new_send(Ecore_X_Window win)
377{ 377{
378 LOGFN(__FILE__, __LINE__, __FUNCTION__); 378 LOGFN;
379 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_NEW, 379 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_NEW,
380 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 380 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
381 1, 0, 0, 0, 0); 381 1, 0, 0, 0, 0);
@@ -384,7 +384,7 @@ ecore_x_e_illume_home_new_send(Ecore_X_Window win)
384EAPI void 384EAPI void
385ecore_x_e_illume_home_del_send(Ecore_X_Window win) 385ecore_x_e_illume_home_del_send(Ecore_X_Window win)
386{ 386{
387 LOGFN(__FILE__, __LINE__, __FUNCTION__); 387 LOGFN;
388 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_DEL, 388 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_HOME_DEL,
389 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 389 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
390 1, 0, 0, 0, 0); 390 1, 0, 0, 0, 0);
@@ -393,7 +393,7 @@ ecore_x_e_illume_home_del_send(Ecore_X_Window win)
393EAPI void 393EAPI void
394ecore_x_e_illume_access_action_next_send(Ecore_X_Window win) 394ecore_x_e_illume_access_action_next_send(Ecore_X_Window win)
395{ 395{
396 LOGFN(__FILE__, __LINE__, __FUNCTION__); 396 LOGFN;
397 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 397 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
398 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 398 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
399 win, 399 win,
@@ -404,7 +404,7 @@ ecore_x_e_illume_access_action_next_send(Ecore_X_Window win)
404EAPI void 404EAPI void
405ecore_x_e_illume_access_action_prev_send(Ecore_X_Window win) 405ecore_x_e_illume_access_action_prev_send(Ecore_X_Window win)
406{ 406{
407 LOGFN(__FILE__, __LINE__, __FUNCTION__); 407 LOGFN;
408 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 408 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
409 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 409 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
410 win, 410 win,
@@ -415,7 +415,7 @@ ecore_x_e_illume_access_action_prev_send(Ecore_X_Window win)
415EAPI void 415EAPI void
416ecore_x_e_illume_access_action_activate_send(Ecore_X_Window win) 416ecore_x_e_illume_access_action_activate_send(Ecore_X_Window win)
417{ 417{
418 LOGFN(__FILE__, __LINE__, __FUNCTION__); 418 LOGFN;
419 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 419 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
420 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 420 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
421 win, 421 win,
@@ -426,7 +426,7 @@ ecore_x_e_illume_access_action_activate_send(Ecore_X_Window win)
426EAPI void 426EAPI void
427ecore_x_e_illume_access_action_over_send(Ecore_X_Window win) 427ecore_x_e_illume_access_action_over_send(Ecore_X_Window win)
428{ 428{
429 LOGFN(__FILE__, __LINE__, __FUNCTION__); 429 LOGFN;
430 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 430 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
431 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 431 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
432 win, 432 win,
@@ -437,7 +437,7 @@ ecore_x_e_illume_access_action_over_send(Ecore_X_Window win)
437EAPI void 437EAPI void
438ecore_x_e_illume_access_action_read_send(Ecore_X_Window win) 438ecore_x_e_illume_access_action_read_send(Ecore_X_Window win)
439{ 439{
440 LOGFN(__FILE__, __LINE__, __FUNCTION__); 440 LOGFN;
441 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 441 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
442 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 442 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
443 win, 443 win,
@@ -448,7 +448,7 @@ ecore_x_e_illume_access_action_read_send(Ecore_X_Window win)
448EAPI void 448EAPI void
449ecore_x_e_illume_access_action_read_next_send(Ecore_X_Window win) 449ecore_x_e_illume_access_action_read_next_send(Ecore_X_Window win)
450{ 450{
451 LOGFN(__FILE__, __LINE__, __FUNCTION__); 451 LOGFN;
452 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 452 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
453 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 453 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
454 win, 454 win,
@@ -459,7 +459,7 @@ ecore_x_e_illume_access_action_read_next_send(Ecore_X_Window win)
459EAPI void 459EAPI void
460ecore_x_e_illume_access_action_read_prev_send(Ecore_X_Window win) 460ecore_x_e_illume_access_action_read_prev_send(Ecore_X_Window win)
461{ 461{
462 LOGFN(__FILE__, __LINE__, __FUNCTION__); 462 LOGFN;
463 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 463 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
464 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 464 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
465 win, 465 win,
@@ -470,7 +470,7 @@ ecore_x_e_illume_access_action_read_prev_send(Ecore_X_Window win)
470EAPI void 470EAPI void
471ecore_x_e_illume_access_action_up_send(Ecore_X_Window win) 471ecore_x_e_illume_access_action_up_send(Ecore_X_Window win)
472{ 472{
473 LOGFN(__FILE__, __LINE__, __FUNCTION__); 473 LOGFN;
474 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 474 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
475 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 475 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
476 win, 476 win,
@@ -481,7 +481,7 @@ ecore_x_e_illume_access_action_up_send(Ecore_X_Window win)
481EAPI void 481EAPI void
482ecore_x_e_illume_access_action_down_send(Ecore_X_Window win) 482ecore_x_e_illume_access_action_down_send(Ecore_X_Window win)
483{ 483{
484 LOGFN(__FILE__, __LINE__, __FUNCTION__); 484 LOGFN;
485 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, 485 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL,
486 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 486 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
487 win, 487 win,
@@ -493,7 +493,7 @@ EAPI void
493ecore_x_e_illume_drag_set(Ecore_X_Window win, 493ecore_x_e_illume_drag_set(Ecore_X_Window win,
494 unsigned int drag) 494 unsigned int drag)
495{ 495{
496 LOGFN(__FILE__, __LINE__, __FUNCTION__); 496 LOGFN;
497 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG, &drag, 1); 497 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG, &drag, 1);
498} 498}
499 499
@@ -503,7 +503,7 @@ ecore_x_e_illume_drag_get(Ecore_X_Window win)
503 unsigned int val = 0; 503 unsigned int val = 0;
504 int ret = 0; 504 int ret = 0;
505 505
506 LOGFN(__FILE__, __LINE__, __FUNCTION__); 506 LOGFN;
507 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_DRAG, 507 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_DRAG,
508 &val, 1); 508 &val, 1);
509 if ((ret == 0) || (ret == -1)) 509 if ((ret == 0) || (ret == -1))
@@ -516,7 +516,7 @@ EAPI void
516ecore_x_e_illume_drag_locked_set(Ecore_X_Window win, 516ecore_x_e_illume_drag_locked_set(Ecore_X_Window win,
517 unsigned int is_locked) 517 unsigned int is_locked)
518{ 518{
519 LOGFN(__FILE__, __LINE__, __FUNCTION__); 519 LOGFN;
520 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED, 520 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED,
521 &is_locked, 1); 521 &is_locked, 1);
522} 522}
@@ -527,7 +527,7 @@ ecore_x_e_illume_drag_locked_get(Ecore_X_Window win)
527 unsigned int val = 0; 527 unsigned int val = 0;
528 int ret = 0; 528 int ret = 0;
529 529
530 LOGFN(__FILE__, __LINE__, __FUNCTION__); 530 LOGFN;
531 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED, 531 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_DRAG_LOCKED,
532 &val, 1); 532 &val, 1);
533 if ((ret == 0) || (ret == -1)) 533 if ((ret == 0) || (ret == -1))
@@ -539,7 +539,7 @@ ecore_x_e_illume_drag_locked_get(Ecore_X_Window win)
539EAPI void 539EAPI void
540ecore_x_e_illume_drag_start_send(Ecore_X_Window win) 540ecore_x_e_illume_drag_start_send(Ecore_X_Window win)
541{ 541{
542 LOGFN(__FILE__, __LINE__, __FUNCTION__); 542 LOGFN;
543 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_START, 543 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_START,
544 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 544 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
545 1, 0, 0, 0, 0); 545 1, 0, 0, 0, 0);
@@ -548,7 +548,7 @@ ecore_x_e_illume_drag_start_send(Ecore_X_Window win)
548EAPI void 548EAPI void
549ecore_x_e_illume_drag_end_send(Ecore_X_Window win) 549ecore_x_e_illume_drag_end_send(Ecore_X_Window win)
550{ 550{
551 LOGFN(__FILE__, __LINE__, __FUNCTION__); 551 LOGFN;
552 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_END, 552 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_DRAG_END,
553 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 553 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
554 1, 0, 0, 0, 0); 554 1, 0, 0, 0, 0);
@@ -563,7 +563,7 @@ ecore_x_e_illume_indicator_geometry_set(Ecore_X_Window win,
563{ 563{
564 unsigned int geom[4]; 564 unsigned int geom[4];
565 565
566 LOGFN(__FILE__, __LINE__, __FUNCTION__); 566 LOGFN;
567 geom[0] = x; 567 geom[0] = x;
568 geom[1] = y; 568 geom[1] = y;
569 geom[2] = w; 569 geom[2] = w;
@@ -582,7 +582,7 @@ ecore_x_e_illume_indicator_geometry_get(Ecore_X_Window win,
582 int ret = 0; 582 int ret = 0;
583 unsigned int geom[4]; 583 unsigned int geom[4];
584 584
585 LOGFN(__FILE__, __LINE__, __FUNCTION__); 585 LOGFN;
586 ret = 586 ret =
587 ecore_x_window_prop_card32_get(win, 587 ecore_x_window_prop_card32_get(win,
588 ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY, 588 ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY,
@@ -614,7 +614,7 @@ ecore_x_e_illume_softkey_geometry_set(Ecore_X_Window win,
614{ 614{
615 unsigned int geom[4]; 615 unsigned int geom[4];
616 616
617 LOGFN(__FILE__, __LINE__, __FUNCTION__); 617 LOGFN;
618 geom[0] = x; 618 geom[0] = x;
619 geom[1] = y; 619 geom[1] = y;
620 geom[2] = w; 620 geom[2] = w;
@@ -633,7 +633,7 @@ ecore_x_e_illume_softkey_geometry_get(Ecore_X_Window win,
633 int ret = 0; 633 int ret = 0;
634 unsigned int geom[4]; 634 unsigned int geom[4];
635 635
636 LOGFN(__FILE__, __LINE__, __FUNCTION__); 636 LOGFN;
637 ret = 637 ret =
638 ecore_x_window_prop_card32_get(win, 638 ecore_x_window_prop_card32_get(win,
639 ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY, 639 ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY,
@@ -665,7 +665,7 @@ ecore_x_e_illume_keyboard_geometry_set(Ecore_X_Window win,
665{ 665{
666 unsigned int geom[4]; 666 unsigned int geom[4];
667 667
668 LOGFN(__FILE__, __LINE__, __FUNCTION__); 668 LOGFN;
669 geom[0] = x; 669 geom[0] = x;
670 geom[1] = y; 670 geom[1] = y;
671 geom[2] = w; 671 geom[2] = w;
@@ -684,7 +684,7 @@ ecore_x_e_illume_keyboard_geometry_get(Ecore_X_Window win,
684 int ret = 0; 684 int ret = 0;
685 unsigned int geom[4]; 685 unsigned int geom[4];
686 686
687 LOGFN(__FILE__, __LINE__, __FUNCTION__); 687 LOGFN;
688 ret = 688 ret =
689 ecore_x_window_prop_card32_get(win, 689 ecore_x_window_prop_card32_get(win,
690 ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY, 690 ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY,
@@ -740,7 +740,7 @@ EAPI void
740ecore_x_e_illume_quickpanel_set(Ecore_X_Window win, 740ecore_x_e_illume_quickpanel_set(Ecore_X_Window win,
741 unsigned int is_quickpanel) 741 unsigned int is_quickpanel)
742{ 742{
743 LOGFN(__FILE__, __LINE__, __FUNCTION__); 743 LOGFN;
744 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL, 744 ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL,
745 &is_quickpanel, 1); 745 &is_quickpanel, 1);
746} 746}
@@ -751,7 +751,7 @@ ecore_x_e_illume_quickpanel_get(Ecore_X_Window win)
751 unsigned int val = 0; 751 unsigned int val = 0;
752 int ret = 0; 752 int ret = 0;
753 753
754 LOGFN(__FILE__, __LINE__, __FUNCTION__); 754 LOGFN;
755 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL, 755 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL,
756 &val, 1); 756 &val, 1);
757 if ((ret == 0) || (ret == -1)) 757 if ((ret == 0) || (ret == -1))
@@ -766,7 +766,7 @@ ecore_x_e_illume_quickpanel_state_set(Ecore_X_Window win,
766{ 766{
767 Ecore_X_Atom atom = 0; 767 Ecore_X_Atom atom = 0;
768 768
769 LOGFN(__FILE__, __LINE__, __FUNCTION__); 769 LOGFN;
770 atom = _ecore_x_e_quickpanel_atom_get(state); 770 atom = _ecore_x_e_quickpanel_atom_get(state);
771 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE, 771 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE,
772 &atom, 1); 772 &atom, 1);
@@ -777,7 +777,7 @@ ecore_x_e_illume_quickpanel_state_get(Ecore_X_Window win)
777{ 777{
778 Ecore_X_Atom atom = 0; 778 Ecore_X_Atom atom = 0;
779 779
780 LOGFN(__FILE__, __LINE__, __FUNCTION__); 780 LOGFN;
781 if (!ecore_x_window_prop_atom_get(win, 781 if (!ecore_x_window_prop_atom_get(win,
782 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE, 782 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE,
783 &atom, 1)) 783 &atom, 1))
@@ -790,7 +790,7 @@ EAPI void
790ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win, 790ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win,
791 Ecore_X_Illume_Quickpanel_State state) 791 Ecore_X_Illume_Quickpanel_State state)
792{ 792{
793 LOGFN(__FILE__, __LINE__, __FUNCTION__); 793 LOGFN;
794 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE, 794 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE,
795 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 795 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
796 _ecore_x_e_quickpanel_atom_get(state), 796 _ecore_x_e_quickpanel_atom_get(state),
@@ -800,7 +800,7 @@ ecore_x_e_illume_quickpanel_state_send(Ecore_X_Window win,
800EAPI void 800EAPI void
801ecore_x_e_illume_quickpanel_state_toggle(Ecore_X_Window win) 801ecore_x_e_illume_quickpanel_state_toggle(Ecore_X_Window win)
802{ 802{
803 LOGFN(__FILE__, __LINE__, __FUNCTION__); 803 LOGFN;
804 ecore_x_client_message32_send(win, 804 ecore_x_client_message32_send(win,
805 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE_TOGGLE, 805 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_STATE_TOGGLE,
806 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 806 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -811,7 +811,7 @@ EAPI void
811ecore_x_e_illume_quickpanel_priority_major_set(Ecore_X_Window win, 811ecore_x_e_illume_quickpanel_priority_major_set(Ecore_X_Window win,
812 unsigned int priority) 812 unsigned int priority)
813{ 813{
814 LOGFN(__FILE__, __LINE__, __FUNCTION__); 814 LOGFN;
815 ecore_x_window_prop_card32_set(win, 815 ecore_x_window_prop_card32_set(win,
816 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR, 816 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR,
817 &priority, 1); 817 &priority, 1);
@@ -823,7 +823,7 @@ ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_Window win)
823 unsigned int val = 0; 823 unsigned int val = 0;
824 int ret = 0; 824 int ret = 0;
825 825
826 LOGFN(__FILE__, __LINE__, __FUNCTION__); 826 LOGFN;
827 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR, 827 ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MAJOR,
828 &val, 1); 828 &val, 1);
829 if ((ret == 0) || (ret == -1)) 829 if ((ret == 0) || (ret == -1))
@@ -836,7 +836,7 @@ EAPI void
836ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win, 836ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win,
837 unsigned int priority) 837 unsigned int priority)
838{ 838{
839 LOGFN(__FILE__, __LINE__, __FUNCTION__); 839 LOGFN;
840 ecore_x_window_prop_card32_set(win, 840 ecore_x_window_prop_card32_set(win,
841 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR, 841 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR,
842 &priority, 1); 842 &priority, 1);
@@ -848,7 +848,7 @@ ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win)
848 unsigned int val = 0; 848 unsigned int val = 0;
849 int ret = 0; 849 int ret = 0;
850 850
851 LOGFN(__FILE__, __LINE__, __FUNCTION__); 851 LOGFN;
852 ret = ecore_x_window_prop_card32_get(win, 852 ret = ecore_x_window_prop_card32_get(win,
853 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR, 853 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_PRIORITY_MINOR,
854 &val, 1); 854 &val, 1);
@@ -862,7 +862,7 @@ EAPI void
862ecore_x_e_illume_quickpanel_zone_set(Ecore_X_Window win, 862ecore_x_e_illume_quickpanel_zone_set(Ecore_X_Window win,
863 unsigned int zone) 863 unsigned int zone)
864{ 864{
865 LOGFN(__FILE__, __LINE__, __FUNCTION__); 865 LOGFN;
866 ecore_x_window_prop_card32_set(win, 866 ecore_x_window_prop_card32_set(win,
867 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE, 867 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE,
868 &zone, 1); 868 &zone, 1);
@@ -874,7 +874,7 @@ ecore_x_e_illume_quickpanel_zone_get(Ecore_X_Window win)
874 unsigned int val = 0; 874 unsigned int val = 0;
875 int ret = 0; 875 int ret = 0;
876 876
877 LOGFN(__FILE__, __LINE__, __FUNCTION__); 877 LOGFN;
878 ret = ecore_x_window_prop_card32_get(win, 878 ret = ecore_x_window_prop_card32_get(win,
879 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE, 879 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_ZONE,
880 &val, 1); 880 &val, 1);
@@ -887,7 +887,7 @@ ecore_x_e_illume_quickpanel_zone_get(Ecore_X_Window win)
887EAPI void 887EAPI void
888ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win) 888ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win)
889{ 889{
890 LOGFN(__FILE__, __LINE__, __FUNCTION__); 890 LOGFN;
891 ecore_x_client_message32_send(win, 891 ecore_x_client_message32_send(win,
892 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_POSITION_UPDATE, 892 ECORE_X_ATOM_E_ILLUME_QUICKPANEL_POSITION_UPDATE,
893 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 893 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -927,7 +927,7 @@ ecore_x_e_illume_clipboard_state_set(Ecore_X_Window win,
927{ 927{
928 Ecore_X_Atom atom = 0; 928 Ecore_X_Atom atom = 0;
929 929
930 LOGFN(__FILE__, __LINE__, __FUNCTION__); 930 LOGFN;
931 atom = _ecore_x_e_clipboard_atom_get(state); 931 atom = _ecore_x_e_clipboard_atom_get(state);
932 932
933 ecore_x_window_prop_atom_set(win, 933 ecore_x_window_prop_atom_set(win,
@@ -940,7 +940,7 @@ ecore_x_e_illume_clipboard_state_get(Ecore_X_Window win)
940{ 940{
941 Ecore_X_Atom atom = 0; 941 Ecore_X_Atom atom = 0;
942 942
943 LOGFN(__FILE__, __LINE__, __FUNCTION__); 943 LOGFN;
944 944
945 if (!ecore_x_window_prop_atom_get(win, 945 if (!ecore_x_window_prop_atom_get(win,
946 ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE, 946 ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE,
@@ -955,7 +955,7 @@ ecore_x_e_illume_clipboard_geometry_set(Ecore_X_Window win,
955{ 955{
956 unsigned int geom[4]; 956 unsigned int geom[4];
957 957
958 LOGFN(__FILE__, __LINE__, __FUNCTION__); 958 LOGFN;
959 geom[0] = x; 959 geom[0] = x;
960 geom[1] = y; 960 geom[1] = y;
961 geom[2] = w; 961 geom[2] = w;
@@ -972,7 +972,7 @@ ecore_x_e_illume_clipboard_geometry_get(Ecore_X_Window win,
972 int ret = 0; 972 int ret = 0;
973 unsigned int geom[4]; 973 unsigned int geom[4];
974 974
975 LOGFN(__FILE__, __LINE__, __FUNCTION__); 975 LOGFN;
976 ret = 976 ret =
977 ecore_x_window_prop_card32_get(win, 977 ecore_x_window_prop_card32_get(win,
978 ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY, 978 ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY,
@@ -992,7 +992,7 @@ EAPI void
992ecore_x_e_illume_sliding_win_state_set(Ecore_X_Window win, 992ecore_x_e_illume_sliding_win_state_set(Ecore_X_Window win,
993 unsigned int is_visible) 993 unsigned int is_visible)
994{ 994{
995 LOGFN(__FILE__, __LINE__, __FUNCTION__); 995 LOGFN;
996 ecore_x_window_prop_card32_set(win, 996 ecore_x_window_prop_card32_set(win,
997 ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, 997 ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE,
998 &is_visible, 1); 998 &is_visible, 1);
@@ -1004,7 +1004,7 @@ ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win)
1004 unsigned int is_visible = 0; 1004 unsigned int is_visible = 0;
1005 int ret = 0; 1005 int ret = 0;
1006 1006
1007 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1007 LOGFN;
1008 ret = ecore_x_window_prop_card32_get(win, 1008 ret = ecore_x_window_prop_card32_get(win,
1009 ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, 1009 ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE,
1010 &is_visible, 1); 1010 &is_visible, 1);
@@ -1023,7 +1023,7 @@ ecore_x_e_illume_sliding_win_geometry_set(Ecore_X_Window win,
1023{ 1023{
1024 unsigned int geom[4]; 1024 unsigned int geom[4];
1025 1025
1026 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1026 LOGFN;
1027 geom[0] = x; 1027 geom[0] = x;
1028 geom[1] = y; 1028 geom[1] = y;
1029 geom[2] = w; 1029 geom[2] = w;
@@ -1043,7 +1043,7 @@ ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win,
1043 int ret = 0; 1043 int ret = 0;
1044 unsigned int geom[4]; 1044 unsigned int geom[4];
1045 1045
1046 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1046 LOGFN;
1047 ret = 1047 ret =
1048 ecore_x_window_prop_card32_get(win, 1048 ecore_x_window_prop_card32_get(win,
1049 ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, 1049 ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY,
@@ -1070,7 +1070,7 @@ EAPI void
1070ecore_x_e_comp_sync_counter_set(Ecore_X_Window win, 1070ecore_x_e_comp_sync_counter_set(Ecore_X_Window win,
1071 Ecore_X_Sync_Counter counter) 1071 Ecore_X_Sync_Counter counter)
1072{ 1072{
1073 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1073 LOGFN;
1074 if (counter) 1074 if (counter)
1075 ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_SYNC_COUNTER, 1075 ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_SYNC_COUNTER,
1076 ECORE_X_ATOM_CARDINAL, &counter, 1); 1076 ECORE_X_ATOM_CARDINAL, &counter, 1);
@@ -1084,7 +1084,7 @@ ecore_x_e_comp_sync_counter_get(Ecore_X_Window win)
1084 int ret = 0; 1084 int ret = 0;
1085 Ecore_X_Sync_Counter counter = 0; 1085 Ecore_X_Sync_Counter counter = 0;
1086 1086
1087 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1087 LOGFN;
1088 ret = 1088 ret =
1089 ecore_x_window_prop_xid_get(win, 1089 ecore_x_window_prop_xid_get(win,
1090 ECORE_X_ATOM_E_COMP_SYNC_COUNTER, 1090 ECORE_X_ATOM_E_COMP_SYNC_COUNTER,
@@ -1102,7 +1102,7 @@ ecore_x_e_comp_sync_draw_done_send(Ecore_X_Window root,
1102{ 1102{
1103 XEvent xev = { 0 }; 1103 XEvent xev = { 0 };
1104 1104
1105 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1105 LOGFN;
1106 1106
1107 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1107 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1108 1108
@@ -1134,7 +1134,7 @@ ecore_x_e_comp_sync_draw_size_done_send(Ecore_X_Window root,
1134{ 1134{
1135 XEvent xev = { 0 }; 1135 XEvent xev = { 0 };
1136 1136
1137 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1137 LOGFN;
1138 1138
1139 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1139 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1140 1140
@@ -1169,7 +1169,7 @@ ecore_x_e_window_profile_list_set(Ecore_X_Window win,
1169{ 1169{
1170 Ecore_X_Atom *atoms; 1170 Ecore_X_Atom *atoms;
1171 1171
1172 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1172 LOGFN;
1173 if (!win) 1173 if (!win)
1174 return; 1174 return;
1175 1175
@@ -1199,7 +1199,7 @@ ecore_x_e_window_profile_list_get(Ecore_X_Window win,
1199 Ecore_X_Atom *atoms; 1199 Ecore_X_Atom *atoms;
1200 int num, i; 1200 int num, i;
1201 1201
1202 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1202 LOGFN;
1203 1203
1204 if (ret_num) 1204 if (ret_num)
1205 *ret_num = 0; 1205 *ret_num = 0;
@@ -1254,7 +1254,7 @@ ecore_x_e_window_profile_set(Ecore_X_Window win,
1254{ 1254{
1255 Ecore_X_Atom atom; 1255 Ecore_X_Atom atom;
1256 1256
1257 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1257 LOGFN;
1258 if (!win) 1258 if (!win)
1259 return; 1259 return;
1260 1260
@@ -1279,7 +1279,7 @@ ecore_x_e_window_profile_get(Ecore_X_Window win)
1279 char *profile = NULL; 1279 char *profile = NULL;
1280 int num; 1280 int num;
1281 1281
1282 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1282 LOGFN;
1283 if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_E_WINDOW_PROFILE, 1283 if (!ecore_x_window_prop_property_get(win, ECORE_X_ATOM_E_WINDOW_PROFILE,
1284 XA_ATOM, 32, &data, &num)) 1284 XA_ATOM, 32, &data, &num))
1285 { 1285 {
@@ -1304,7 +1304,7 @@ ecore_x_e_window_profile_supported_set(Ecore_X_Window root,
1304{ 1304{
1305 Ecore_X_Window win; 1305 Ecore_X_Window win;
1306 1306
1307 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1307 LOGFN;
1308 1308
1309 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1309 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1310 1310
@@ -1344,7 +1344,7 @@ ecore_x_e_window_profile_supported_get(Ecore_X_Window root)
1344 Ecore_X_Window win, win2; 1344 Ecore_X_Window win, win2;
1345 int ret; 1345 int ret;
1346 1346
1347 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1347 LOGFN;
1348 1348
1349 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1349 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1350 1350
@@ -1377,7 +1377,7 @@ ecore_x_e_window_available_profiles_set(Ecore_X_Window win,
1377{ 1377{
1378 Ecore_X_Atom *atoms; 1378 Ecore_X_Atom *atoms;
1379 1379
1380 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1380 LOGFN;
1381 1381
1382 if (!win) 1382 if (!win)
1383 return; 1383 return;
@@ -1404,7 +1404,7 @@ ecore_x_e_window_available_profiles_get(Ecore_X_Window win,
1404 Ecore_X_Atom *atoms; 1404 Ecore_X_Atom *atoms;
1405 int num, i; 1405 int num, i;
1406 1406
1407 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1407 LOGFN;
1408 1408
1409 if (count) 1409 if (count)
1410 *count = 0; 1410 *count = 0;
@@ -1460,7 +1460,7 @@ ecore_x_e_window_profile_change_send(Ecore_X_Window root,
1460 XEvent xev = { 0 }; 1460 XEvent xev = { 0 };
1461 Ecore_X_Atom atom; 1461 Ecore_X_Atom atom;
1462 1462
1463 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1463 LOGFN;
1464 1464
1465 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1465 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1466 1466
@@ -1496,7 +1496,7 @@ ecore_x_e_window_profile_change_request_send(Ecore_X_Window win,
1496 XEvent xev = { 0 }; 1496 XEvent xev = { 0 };
1497 Ecore_X_Atom atom; 1497 Ecore_X_Atom atom;
1498 1498
1499 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1499 LOGFN;
1500 1500
1501 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1501 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1502 1502
@@ -1529,7 +1529,7 @@ ecore_x_e_window_profile_change_done_send(Ecore_X_Window root,
1529 XEvent xev = { 0 }; 1529 XEvent xev = { 0 };
1530 Ecore_X_Atom atom; 1530 Ecore_X_Atom atom;
1531 1531
1532 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1532 LOGFN;
1533 1533
1534 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1534 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1535 1535
@@ -1566,7 +1566,7 @@ ecore_x_e_comp_sync_supported_set(Ecore_X_Window root,
1566 if (!root) 1566 if (!root)
1567 root = DefaultRootWindow(_ecore_x_disp); 1567 root = DefaultRootWindow(_ecore_x_disp);
1568 1568
1569 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1569 LOGFN;
1570 if (enabled) 1570 if (enabled)
1571 { 1571 {
1572 win = ecore_x_window_new(root, 1, 2, 3, 4); 1572 win = ecore_x_window_new(root, 1, 2, 3, 4);
@@ -1600,7 +1600,7 @@ ecore_x_e_comp_sync_supported_get(Ecore_X_Window root)
1600 Ecore_X_Window win, win2; 1600 Ecore_X_Window win, win2;
1601 int ret; 1601 int ret;
1602 1602
1603 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1603 LOGFN;
1604 1604
1605 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 1605 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
1606 1606
@@ -1631,7 +1631,7 @@ ecore_x_e_comp_sync_begin_send(Ecore_X_Window win)
1631{ 1631{
1632 XEvent xev = { 0 }; 1632 XEvent xev = { 0 };
1633 1633
1634 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1634 LOGFN;
1635 1635
1636 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1636 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1637 1637
@@ -1657,7 +1657,7 @@ ecore_x_e_comp_sync_end_send(Ecore_X_Window win)
1657{ 1657{
1658 XEvent xev = { 0 }; 1658 XEvent xev = { 0 };
1659 1659
1660 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1660 LOGFN;
1661 1661
1662 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1662 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1663 1663
@@ -1683,7 +1683,7 @@ ecore_x_e_comp_sync_cancel_send(Ecore_X_Window win)
1683{ 1683{
1684 XEvent xev = { 0 }; 1684 XEvent xev = { 0 };
1685 1685
1686 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1686 LOGFN;
1687 1687
1688 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1688 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1689 1689
@@ -1709,7 +1709,7 @@ ecore_x_e_comp_flush_send(Ecore_X_Window win)
1709{ 1709{
1710 XEvent xev = { 0 }; 1710 XEvent xev = { 0 };
1711 1711
1712 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1712 LOGFN;
1713 1713
1714 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1714 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1715 1715
@@ -1735,7 +1735,7 @@ ecore_x_e_comp_dump_send(Ecore_X_Window win)
1735{ 1735{
1736 XEvent xev = { 0 }; 1736 XEvent xev = { 0 };
1737 1737
1738 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1738 LOGFN;
1739 1739
1740 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 1740 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
1741 1741
@@ -1760,7 +1760,7 @@ EAPI void
1760ecore_x_e_comp_pixmap_set(Ecore_X_Window win, 1760ecore_x_e_comp_pixmap_set(Ecore_X_Window win,
1761 Ecore_X_Pixmap pixmap) 1761 Ecore_X_Pixmap pixmap)
1762{ 1762{
1763 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1763 LOGFN;
1764 if (pixmap) 1764 if (pixmap)
1765 ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_PIXMAP, 1765 ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_PIXMAP,
1766 ECORE_X_ATOM_PIXMAP, &pixmap, 1); 1766 ECORE_X_ATOM_PIXMAP, &pixmap, 1);
@@ -1774,7 +1774,7 @@ ecore_x_e_comp_pixmap_get(Ecore_X_Window win)
1774 int ret = 0; 1774 int ret = 0;
1775 Ecore_X_Pixmap pixmap = 0; 1775 Ecore_X_Pixmap pixmap = 0;
1776 1776
1777 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1777 LOGFN;
1778 ret = 1778 ret =
1779 ecore_x_window_prop_xid_get(win, 1779 ecore_x_window_prop_xid_get(win,
1780 ECORE_X_ATOM_E_COMP_PIXMAP, 1780 ECORE_X_ATOM_E_COMP_PIXMAP,
@@ -1821,7 +1821,7 @@ ecore_x_e_illume_indicator_state_set(Ecore_X_Window win,
1821{ 1821{
1822 Ecore_X_Atom atom = 0; 1822 Ecore_X_Atom atom = 0;
1823 1823
1824 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1824 LOGFN;
1825 atom = _ecore_x_e_indicator_atom_get(state); 1825 atom = _ecore_x_e_indicator_atom_get(state);
1826 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, 1826 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE,
1827 &atom, 1); 1827 &atom, 1);
@@ -1832,7 +1832,7 @@ ecore_x_e_illume_indicator_state_get(Ecore_X_Window win)
1832{ 1832{
1833 Ecore_X_Atom atom = 0; 1833 Ecore_X_Atom atom = 0;
1834 1834
1835 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1835 LOGFN;
1836 if (!ecore_x_window_prop_atom_get(win, 1836 if (!ecore_x_window_prop_atom_get(win,
1837 ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, 1837 ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE,
1838 &atom, 1)) 1838 &atom, 1))
@@ -1845,7 +1845,7 @@ EAPI void
1845ecore_x_e_illume_indicator_state_send(Ecore_X_Window win, 1845ecore_x_e_illume_indicator_state_send(Ecore_X_Window win,
1846 Ecore_X_Illume_Indicator_State state) 1846 Ecore_X_Illume_Indicator_State state)
1847{ 1847{
1848 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1848 LOGFN;
1849 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, 1849 ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE,
1850 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1850 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
1851 _ecore_x_e_indicator_atom_get(state), 1851 _ecore_x_e_indicator_atom_get(state),
@@ -1893,7 +1893,7 @@ ecore_x_e_illume_indicator_opacity_set(Ecore_X_Window win,
1893{ 1893{
1894 Ecore_X_Atom atom = 0; 1894 Ecore_X_Atom atom = 0;
1895 1895
1896 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1896 LOGFN;
1897 atom = _ecore_x_e_indicator_opacity_atom_get(mode); 1897 atom = _ecore_x_e_indicator_opacity_atom_get(mode);
1898 ecore_x_window_prop_atom_set(win, 1898 ecore_x_window_prop_atom_set(win,
1899 ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE, 1899 ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
@@ -1905,7 +1905,7 @@ ecore_x_e_illume_indicator_opacity_get(Ecore_X_Window win)
1905{ 1905{
1906 Ecore_X_Atom atom = 0; 1906 Ecore_X_Atom atom = 0;
1907 1907
1908 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1908 LOGFN;
1909 if (!ecore_x_window_prop_atom_get(win, 1909 if (!ecore_x_window_prop_atom_get(win,
1910 ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE, 1910 ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
1911 &atom, 1)) 1911 &atom, 1))
@@ -1918,7 +1918,7 @@ EAPI void
1918ecore_x_e_illume_indicator_opacity_send(Ecore_X_Window win, 1918ecore_x_e_illume_indicator_opacity_send(Ecore_X_Window win,
1919 Ecore_X_Illume_Indicator_Opacity_Mode mode) 1919 Ecore_X_Illume_Indicator_Opacity_Mode mode)
1920{ 1920{
1921 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1921 LOGFN;
1922 ecore_x_client_message32_send(win, 1922 ecore_x_client_message32_send(win,
1923 ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE, 1923 ECORE_X_ATOM_E_ILLUME_INDICATOR_OPACITY_MODE,
1924 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1924 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -1967,7 +1967,7 @@ ecore_x_e_illume_indicator_type_set(Ecore_X_Window win,
1967{ 1967{
1968 Ecore_X_Atom atom = 0; 1968 Ecore_X_Atom atom = 0;
1969 1969
1970 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1970 LOGFN;
1971 atom = _ecore_x_e_indicator_type_atom_get(mode); 1971 atom = _ecore_x_e_indicator_type_atom_get(mode);
1972 ecore_x_window_prop_atom_set(win, 1972 ecore_x_window_prop_atom_set(win,
1973 ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE, 1973 ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE,
@@ -1979,7 +1979,7 @@ ecore_x_e_illume_indicator_type_get(Ecore_X_Window win)
1979{ 1979{
1980 Ecore_X_Atom atom = 0; 1980 Ecore_X_Atom atom = 0;
1981 1981
1982 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1982 LOGFN;
1983 if (!ecore_x_window_prop_atom_get(win, 1983 if (!ecore_x_window_prop_atom_get(win,
1984 ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE, 1984 ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE,
1985 &atom, 1)) 1985 &atom, 1))
@@ -1992,7 +1992,7 @@ EAPI void
1992ecore_x_e_illume_indicator_type_send(Ecore_X_Window win, 1992ecore_x_e_illume_indicator_type_send(Ecore_X_Window win,
1993 Ecore_X_Illume_Indicator_Type_Mode mode) 1993 Ecore_X_Illume_Indicator_Type_Mode mode)
1994{ 1994{
1995 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1995 LOGFN;
1996 ecore_x_client_message32_send(win, 1996 ecore_x_client_message32_send(win,
1997 ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE, 1997 ECORE_X_ATOM_E_ILLUME_INDICATOR_TYPE_MODE,
1998 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1998 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -2035,7 +2035,7 @@ ecore_x_e_illume_window_state_set(Ecore_X_Window win,
2035{ 2035{
2036 Ecore_X_Atom atom = 0; 2036 Ecore_X_Atom atom = 0;
2037 2037
2038 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2038 LOGFN;
2039 atom = _ecore_x_e_illume_window_state_atom_get(state); 2039 atom = _ecore_x_e_illume_window_state_atom_get(state);
2040 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_WINDOW_STATE, 2040 ecore_x_window_prop_atom_set(win, ECORE_X_ATOM_E_ILLUME_WINDOW_STATE,
2041 &atom, 1); 2041 &atom, 1);
@@ -2046,7 +2046,7 @@ ecore_x_e_illume_window_state_get(Ecore_X_Window win)
2046{ 2046{
2047 Ecore_X_Atom atom; 2047 Ecore_X_Atom atom;
2048 2048
2049 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2049 LOGFN;
2050 if (!ecore_x_window_prop_atom_get(win, 2050 if (!ecore_x_window_prop_atom_get(win,
2051 ECORE_X_ATOM_E_ILLUME_WINDOW_STATE, 2051 ECORE_X_ATOM_E_ILLUME_WINDOW_STATE,
2052 &atom, 1)) 2052 &atom, 1))
@@ -2059,7 +2059,7 @@ EAPI void
2059ecore_x_e_illume_window_state_send(Ecore_X_Window win, 2059ecore_x_e_illume_window_state_send(Ecore_X_Window win,
2060 Ecore_X_Illume_Window_State state) 2060 Ecore_X_Illume_Window_State state)
2061{ 2061{
2062 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2062 LOGFN;
2063 ecore_x_client_message32_send(win, 2063 ecore_x_client_message32_send(win,
2064 ECORE_X_ATOM_E_ILLUME_WINDOW_STATE, 2064 ECORE_X_ATOM_E_ILLUME_WINDOW_STATE,
2065 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 2065 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
@@ -2073,7 +2073,7 @@ ecore_x_e_window_rotation_supported_set(Ecore_X_Window root,
2073{ 2073{
2074 Ecore_X_Window win; 2074 Ecore_X_Window win;
2075 2075
2076 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2076 LOGFN;
2077 2077
2078 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); 2078 EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
2079 2079
@@ -2112,7 +2112,7 @@ ecore_x_e_window_rotation_supported_get(Ecore_X_Window root)
2112 Ecore_X_Window win, win2; 2112 Ecore_X_Window win, win2;
2113 int ret; 2113 int ret;
2114 2114
2115 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2115 LOGFN;
2116 2116
2117 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE); 2117 EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, EINA_FALSE);
2118 2118