summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2020-05-06 09:18:31 -0400
committerChristopher Michael <devilhorns@comcast.net>2020-05-06 09:18:31 -0400
commit8db62cb22b9bfb8f52e86b76575e5b61f67d9351 (patch)
tree3c03a33bf53d33e667b7a6fb4d3759aa2f9cc3f1
parent93663b6283d67d5ec0d875cc61a6af7869a1a05d (diff)
remove arguments of LOGFN in ecore_wayland modules as the are always the same
Reviewers: raster, devilhorns Reviewed By: devilhorns Subscribers: devilhorns, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11777
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c76
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c2
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h6
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c10
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.h5
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_outbuf.c16
7 files changed, 59 insertions, 58 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index dd772a6f34..4722663e38 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -114,7 +114,7 @@ _ecore_evas_wl_common_cb_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED,
114 Ecore_Evas *ee; 114 Ecore_Evas *ee;
115 Ecore_Event_Mouse_IO *ev; 115 Ecore_Event_Mouse_IO *ev;
116 116
117 LOGFN(__FILE__, __LINE__, __FUNCTION__); 117 LOGFN;
118 118
119 ev = event; 119 ev = event;
120 ee = ecore_event_window_match((Ecore_Window)ev->window); 120 ee = ecore_event_window_match((Ecore_Window)ev->window);
@@ -135,7 +135,7 @@ _ecore_evas_wl_common_cb_mouse_out(void *data EINA_UNUSED, int type EINA_UNUSED,
135 Ecore_Evas *ee; 135 Ecore_Evas *ee;
136 Ecore_Event_Mouse_IO *ev; 136 Ecore_Event_Mouse_IO *ev;
137 137
138 LOGFN(__FILE__, __LINE__, __FUNCTION__); 138 LOGFN;
139 139
140 ev = event; 140 ev = event;
141 ee = ecore_event_window_match((Ecore_Window)ev->window); 141 ee = ecore_event_window_match((Ecore_Window)ev->window);
@@ -157,7 +157,7 @@ _ecore_evas_wl_common_cb_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED,
157 Ecore_Evas *ee; 157 Ecore_Evas *ee;
158 Ecore_Wl2_Event_Focus_In *ev; 158 Ecore_Wl2_Event_Focus_In *ev;
159 159
160 LOGFN(__FILE__, __LINE__, __FUNCTION__); 160 LOGFN;
161 161
162 ev = event; 162 ev = event;
163 ee = ecore_event_window_match((Ecore_Window)ev->window); 163 ee = ecore_event_window_match((Ecore_Window)ev->window);
@@ -173,7 +173,7 @@ _ecore_evas_wl_common_cb_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED,
173 Ecore_Evas *ee; 173 Ecore_Evas *ee;
174 Ecore_Wl2_Event_Focus_Out *ev; 174 Ecore_Wl2_Event_Focus_Out *ev;
175 175
176 LOGFN(__FILE__, __LINE__, __FUNCTION__); 176 LOGFN;
177 177
178 ev = event; 178 ev = event;
179 ee = ecore_event_window_match((Ecore_Window)ev->window); 179 ee = ecore_event_window_match((Ecore_Window)ev->window);
@@ -318,7 +318,7 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
318 int ow, oh, ew, eh, fw, fh; 318 int ow, oh, ew, eh, fw, fh;
319 int diff = 0; 319 int diff = 0;
320 320
321 LOGFN(__FILE__, __LINE__, __FUNCTION__); 321 LOGFN;
322 322
323 if (!ee) return; 323 if (!ee) return;
324 324
@@ -568,7 +568,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
568 int framew, frameh; 568 int framew, frameh;
569 Eina_Bool active, prev_max, prev_full, state_change = EINA_FALSE; 569 Eina_Bool active, prev_max, prev_full, state_change = EINA_FALSE;
570 570
571 LOGFN(__FILE__, __LINE__, __FUNCTION__); 571 LOGFN;
572 572
573 ev = event; 573 ev = event;
574 ee = ecore_event_window_match((Ecore_Window)ev->win); 574 ee = ecore_event_window_match((Ecore_Window)ev->win);
@@ -697,7 +697,7 @@ _ecore_evas_wl_common_cb_window_configure_complete(void *data EINA_UNUSED, int t
697 Evas_Engine_Info_Wayland *einfo; 697 Evas_Engine_Info_Wayland *einfo;
698 Ecore_Evas_Engine_Wl_Data *wdata; 698 Ecore_Evas_Engine_Wl_Data *wdata;
699 699
700 LOGFN(__FILE__, __LINE__, __FUNCTION__); 700 LOGFN;
701 701
702 ev = event; 702 ev = event;
703 ee = ecore_event_window_match((Ecore_Window)ev->win); 703 ee = ecore_event_window_match((Ecore_Window)ev->win);
@@ -790,7 +790,7 @@ _ecore_evas_wl_common_cb_window_rotate(void *data EINA_UNUSED, int type EINA_UNU
790 Ecore_Evas *ee; 790 Ecore_Evas *ee;
791 Ecore_Wl2_Event_Window_Rotation *ev; 791 Ecore_Wl2_Event_Window_Rotation *ev;
792 792
793 LOGFN(__FILE__, __LINE__, __FUNCTION__); 793 LOGFN;
794 794
795 ev = event; 795 ev = event;
796 ee = ecore_event_window_match((Ecore_Window)ev->win); 796 ee = ecore_event_window_match((Ecore_Window)ev->win);
@@ -1299,7 +1299,7 @@ static int
1299_ecore_evas_wl_common_init(void) 1299_ecore_evas_wl_common_init(void)
1300{ 1300{
1301 Ecore_Event_Handler *h; 1301 Ecore_Event_Handler *h;
1302 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1302 LOGFN;
1303 1303
1304 if (++_ecore_evas_wl_init_count != 1) 1304 if (++_ecore_evas_wl_init_count != 1)
1305 return _ecore_evas_wl_init_count; 1305 return _ecore_evas_wl_init_count;
@@ -1388,7 +1388,7 @@ _ecore_evas_wl_common_init(void)
1388static int 1388static int
1389_ecore_evas_wl_common_shutdown(void) 1389_ecore_evas_wl_common_shutdown(void)
1390{ 1390{
1391 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1391 LOGFN;
1392 1392
1393 if (--_ecore_evas_wl_init_count != 0) 1393 if (--_ecore_evas_wl_init_count != 0)
1394 return _ecore_evas_wl_init_count; 1394 return _ecore_evas_wl_init_count;
@@ -1409,7 +1409,7 @@ _ecore_evas_wl_common_free(Ecore_Evas *ee)
1409 Ecore_Evas_Engine_Wl_Data *wdata; 1409 Ecore_Evas_Engine_Wl_Data *wdata;
1410 EE_Wl_Device *device; 1410 EE_Wl_Device *device;
1411 1411
1412 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1412 LOGFN;
1413 1413
1414 if (!ee) return; 1414 if (!ee) return;
1415 1415
@@ -1452,7 +1452,7 @@ _ecore_evas_wl_common_free(Ecore_Evas *ee)
1452static void 1452static void
1453_ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x EINA_UNUSED, int y EINA_UNUSED, int w, int h) 1453_ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x EINA_UNUSED, int y EINA_UNUSED, int w, int h)
1454{ 1454{
1455 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1455 LOGFN;
1456 1456
1457 if (!ee) return; 1457 if (!ee) return;
1458 if ((ee->w != w) || (ee->h != h)) 1458 if ((ee->w != w) || (ee->h != h))
@@ -1514,7 +1514,7 @@ _ecore_evas_wl_common_pointer_xy_get(const Ecore_Evas *ee, Evas_Coord *x, Evas_C
1514 Ecore_Evas_Engine_Wl_Data *wdata; 1514 Ecore_Evas_Engine_Wl_Data *wdata;
1515 Ecore_Wl2_Input *input; 1515 Ecore_Wl2_Input *input;
1516 1516
1517 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1517 LOGFN;
1518 1518
1519 wdata = ee->engine.data; 1519 wdata = ee->engine.data;
1520 input = ecore_wl2_display_input_find_by_name(ecore_wl2_window_display_get(wdata->win), "default"); 1520 input = ecore_wl2_display_input_find_by_name(ecore_wl2_window_display_get(wdata->win), "default");
@@ -1589,7 +1589,7 @@ _ecore_evas_wl_common_pointer_device_xy_get(const Ecore_Evas *ee, const Efl_Inpu
1589 Ecore_Wl2_Input *input; 1589 Ecore_Wl2_Input *input;
1590 const Eo *seat; 1590 const Eo *seat;
1591 1591
1592 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1592 LOGFN;
1593 1593
1594 wdata = ee->engine.data; 1594 wdata = ee->engine.data;
1595 seat = evas_device_parent_get(pointer); 1595 seat = evas_device_parent_get(pointer);
@@ -1604,7 +1604,7 @@ _ecore_evas_wl_common_aux_hints_supported_update(Ecore_Evas *ee)
1604{ 1604{
1605 Ecore_Evas_Engine_Wl_Data *wdata; 1605 Ecore_Evas_Engine_Wl_Data *wdata;
1606 1606
1607 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1607 LOGFN;
1608 1608
1609 if (!ee) return; 1609 if (!ee) return;
1610 wdata = ee->engine.data; 1610 wdata = ee->engine.data;
@@ -1616,7 +1616,7 @@ _ecore_evas_wl_common_title_set(Ecore_Evas *ee, const char *title)
1616{ 1616{
1617 Ecore_Evas_Engine_Wl_Data *wdata; 1617 Ecore_Evas_Engine_Wl_Data *wdata;
1618 1618
1619 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1619 LOGFN;
1620 1620
1621 if (!ee) return; 1621 if (!ee) return;
1622 if (eina_streq(ee->prop.title, title)) return; 1622 if (eina_streq(ee->prop.title, title)) return;
@@ -1635,7 +1635,7 @@ _ecore_evas_wl_common_name_class_set(Ecore_Evas *ee, const char *n, const char *
1635{ 1635{
1636 Ecore_Evas_Engine_Wl_Data *wdata; 1636 Ecore_Evas_Engine_Wl_Data *wdata;
1637 1637
1638 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1638 LOGFN;
1639 1639
1640 if (!ee) return; 1640 if (!ee) return;
1641 wdata = ee->engine.data; 1641 wdata = ee->engine.data;
@@ -1661,7 +1661,7 @@ _ecore_evas_wl_common_size_min_set(Ecore_Evas *ee, int w, int h)
1661{ 1661{
1662 int fw, fh; 1662 int fw, fh;
1663 Ecore_Evas_Engine_Wl_Data *wdata; 1663 Ecore_Evas_Engine_Wl_Data *wdata;
1664 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1664 LOGFN;
1665 1665
1666 if (!ee) return; 1666 if (!ee) return;
1667 1667
@@ -1692,7 +1692,7 @@ _ecore_evas_wl_common_size_max_set(Ecore_Evas *ee, int w, int h)
1692{ 1692{
1693 int fw, fh; 1693 int fw, fh;
1694 Ecore_Evas_Engine_Wl_Data *wdata; 1694 Ecore_Evas_Engine_Wl_Data *wdata;
1695 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1695 LOGFN;
1696 1696
1697 if (!ee) return; 1697 if (!ee) return;
1698 if (w < 0) w = 0; 1698 if (w < 0) w = 0;
@@ -1720,7 +1720,7 @@ _ecore_evas_wl_common_size_max_set(Ecore_Evas *ee, int w, int h)
1720static void 1720static void
1721_ecore_evas_wl_common_size_base_set(Ecore_Evas *ee, int w, int h) 1721_ecore_evas_wl_common_size_base_set(Ecore_Evas *ee, int w, int h)
1722{ 1722{
1723 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1723 LOGFN;
1724 1724
1725 if (!ee) return; 1725 if (!ee) return;
1726 if (w < 0) w = 0; 1726 if (w < 0) w = 0;
@@ -1734,7 +1734,7 @@ _ecore_evas_wl_common_size_base_set(Ecore_Evas *ee, int w, int h)
1734static void 1734static void
1735_ecore_evas_wl_common_size_step_set(Ecore_Evas *ee, int w, int h) 1735_ecore_evas_wl_common_size_step_set(Ecore_Evas *ee, int w, int h)
1736{ 1736{
1737 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1737 LOGFN;
1738 1738
1739 if (!ee) return; 1739 if (!ee) return;
1740 if (w < 0) w = 0; 1740 if (w < 0) w = 0;
@@ -1748,7 +1748,7 @@ _ecore_evas_wl_common_size_step_set(Ecore_Evas *ee, int w, int h)
1748static void 1748static void
1749_ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double aspect) 1749_ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double aspect)
1750{ 1750{
1751 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1751 LOGFN;
1752 1752
1753 if (!ee) return; 1753 if (!ee) return;
1754 if (EINA_FLT_EQ(ee->prop.aspect, aspect)) return; 1754 if (EINA_FLT_EQ(ee->prop.aspect, aspect)) return;
@@ -1783,7 +1783,7 @@ _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int la
1783static void 1783static void
1784_ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer) 1784_ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer)
1785{ 1785{
1786 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1786 LOGFN;
1787 1787
1788 if (!ee) return; 1788 if (!ee) return;
1789 if (ee->prop.layer == layer) return; 1789 if (ee->prop.layer == layer) return;
@@ -1798,7 +1798,7 @@ _ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on)
1798{ 1798{
1799 Ecore_Evas_Engine_Wl_Data *wdata; 1799 Ecore_Evas_Engine_Wl_Data *wdata;
1800 1800
1801 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1801 LOGFN;
1802 1802
1803 if (!ee) return; 1803 if (!ee) return;
1804 ee->prop.iconified = on; 1804 ee->prop.iconified = on;
@@ -1810,7 +1810,7 @@ _ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on)
1810static void 1810static void
1811_ecore_evas_wl_common_borderless_set(Ecore_Evas *ee, Eina_Bool on) 1811_ecore_evas_wl_common_borderless_set(Ecore_Evas *ee, Eina_Bool on)
1812{ 1812{
1813 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1813 LOGFN;
1814 1814
1815 if (!ee) return; 1815 if (!ee) return;
1816 if (ee->prop.borderless == on) return; 1816 if (ee->prop.borderless == on) return;
@@ -1824,7 +1824,7 @@ _ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, Eina_Bool on)
1824{ 1824{
1825 Ecore_Evas_Engine_Wl_Data *wdata; 1825 Ecore_Evas_Engine_Wl_Data *wdata;
1826 1826
1827 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1827 LOGFN;
1828 1828
1829 if (!ee) return; 1829 if (!ee) return;
1830 if (ee->prop.maximized == on) return; 1830 if (ee->prop.maximized == on) return;
@@ -1838,7 +1838,7 @@ _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
1838{ 1838{
1839 Ecore_Evas_Engine_Wl_Data *wdata; 1839 Ecore_Evas_Engine_Wl_Data *wdata;
1840 1840
1841 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1841 LOGFN;
1842 1842
1843 if (!ee) return; 1843 if (!ee) return;
1844 if (ee->prop.fullscreen == on) return; 1844 if (ee->prop.fullscreen == on) return;
@@ -1850,7 +1850,7 @@ _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
1850static void 1850static void
1851_ecore_evas_wl_common_ignore_events_set(Ecore_Evas *ee, int ignore) 1851_ecore_evas_wl_common_ignore_events_set(Ecore_Evas *ee, int ignore)
1852{ 1852{
1853 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1853 LOGFN;
1854 1854
1855 if (!ee) return; 1855 if (!ee) return;
1856 ee->ignore_events = ignore; 1856 ee->ignore_events = ignore;
@@ -1915,7 +1915,7 @@ _ecore_evas_wayland_alpha_do(Ecore_Evas *ee, int alpha)
1915{ 1915{
1916 Ecore_Evas_Engine_Wl_Data *wdata; 1916 Ecore_Evas_Engine_Wl_Data *wdata;
1917 1917
1918 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1918 LOGFN;
1919 1919
1920 if (!ee) return; 1920 if (!ee) return;
1921 if (ee->alpha == alpha) return; 1921 if (ee->alpha == alpha) return;
@@ -1965,7 +1965,7 @@ _ecore_evas_wl_common_prepare(Ecore_Evas *ee)
1965static void 1965static void
1966_ecore_evas_wl_common_withdrawn_set(Ecore_Evas *ee, Eina_Bool on) 1966_ecore_evas_wl_common_withdrawn_set(Ecore_Evas *ee, Eina_Bool on)
1967{ 1967{
1968 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1968 LOGFN;
1969 1969
1970 if (ee->prop.withdrawn == on) return; 1970 if (ee->prop.withdrawn == on) return;
1971 1971
@@ -1984,7 +1984,7 @@ _ecore_evas_wl_common_screen_geometry_get(const Ecore_Evas *ee, int *x, int *y,
1984{ 1984{
1985 Ecore_Evas_Engine_Wl_Data *wdata; 1985 Ecore_Evas_Engine_Wl_Data *wdata;
1986 1986
1987 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1987 LOGFN;
1988 1988
1989 if (x) *x = 0; 1989 if (x) *x = 0;
1990 if (y) *y = 0; 1990 if (y) *y = 0;
@@ -2000,7 +2000,7 @@ _ecore_evas_wl_common_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
2000 Ecore_Wl2_Output *output; 2000 Ecore_Wl2_Output *output;
2001 int dpi = 0; 2001 int dpi = 0;
2002 2002
2003 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2003 LOGFN;
2004 2004
2005 if (!ee) return; 2005 if (!ee) return;
2006 if (xdpi) *xdpi = 0; 2006 if (xdpi) *xdpi = 0;
@@ -2021,7 +2021,7 @@ _ecore_evas_wayland_resize(Ecore_Evas *ee, int location)
2021{ 2021{
2022 Ecore_Evas_Engine_Wl_Data *wdata; 2022 Ecore_Evas_Engine_Wl_Data *wdata;
2023 2023
2024 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2024 LOGFN;
2025 2025
2026 if (!ee) return; 2026 if (!ee) return;
2027 wdata = ee->engine.data; 2027 wdata = ee->engine.data;
@@ -2034,7 +2034,7 @@ _ecore_evas_wayland_move(Ecore_Evas *ee, int x EINA_UNUSED, int y EINA_UNUSED)
2034{ 2034{
2035 Ecore_Evas_Engine_Wl_Data *wdata; 2035 Ecore_Evas_Engine_Wl_Data *wdata;
2036 2036
2037 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2037 LOGFN;
2038 2038
2039 if (!ee) return; 2039 if (!ee) return;
2040 wdata = ee->engine.data; 2040 wdata = ee->engine.data;
@@ -2129,7 +2129,7 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
2129 Evas_Engine_Info_Wayland *einfo; 2129 Evas_Engine_Info_Wayland *einfo;
2130 Ecore_Evas_Engine_Wl_Data *wdata; 2130 Ecore_Evas_Engine_Wl_Data *wdata;
2131 2131
2132 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2132 LOGFN;
2133 2133
2134 if ((!ee) || (ee->visible)) return; 2134 if ((!ee) || (ee->visible)) return;
2135 2135
@@ -2199,7 +2199,7 @@ _ecore_evas_wl_common_hide(Ecore_Evas *ee)
2199 Evas_Engine_Info_Wayland *einfo; 2199 Evas_Engine_Info_Wayland *einfo;
2200 Ecore_Evas_Engine_Wl_Data *wdata; 2200 Ecore_Evas_Engine_Wl_Data *wdata;
2201 2201
2202 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2202 LOGFN;
2203 2203
2204 if ((!ee) || (!ee->visible)) return; 2204 if ((!ee) || (!ee->visible)) return;
2205 wdata = ee->engine.data; 2205 wdata = ee->engine.data;
@@ -2248,7 +2248,7 @@ _ecore_evas_wl_common_alpha_set(Ecore_Evas *ee, int alpha)
2248static void 2248static void
2249_ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize) 2249_ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize)
2250{ 2250{
2251 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2251 LOGFN;
2252 2252
2253 if (ee->rotation == rotation) return; 2253 if (ee->rotation == rotation) return;
2254 2254
@@ -2952,7 +2952,7 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, Ecore_Window parent, i
2952 Ecore_Evas *ee = NULL; 2952 Ecore_Evas *ee = NULL;
2953 int method = 0; 2953 int method = 0;
2954 2954
2955 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2955 LOGFN;
2956 2956
2957 if (!(method = evas_render_method_lookup(engine_name))) 2957 if (!(method = evas_render_method_lookup(engine_name)))
2958 { 2958 {
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index f5530bc61d..fd9415de41 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -31,7 +31,7 @@
31EAPI Ecore_Evas * 31EAPI Ecore_Evas *
32ecore_evas_wayland_egl_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame, const int *opt) 32ecore_evas_wayland_egl_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame, const int *opt)
33{ 33{
34 LOGFN(__FILE__, __LINE__, __FUNCTION__); 34 LOGFN;
35 35
36 return _ecore_evas_wl_common_new_internal(disp_name, parent, 36 return _ecore_evas_wl_common_new_internal(disp_name, parent,
37 x, y, w, h, frame, 37 x, y, w, h, frame,
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index d042719d93..8213dc2b32 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -11,10 +11,10 @@
11//#define LOGFNS 1 11//#define LOGFNS 1
12# ifdef LOGFNS 12# ifdef LOGFNS
13# include <stdio.h> 13# include <stdio.h>
14# define LOGFN(fl, ln, fn) \ 14# define LOGFN \
15 printf("-ECORE_EVAS-WL: %25s: %5i - %s\n", fl, ln, fn); 15 printf("-ECORE_EVAS-WL: %25s: %5i - %s\n", __FILE__, __LINE__, __func__)
16# else 16# else
17# define LOGFN(fl, ln, fn) 17# define LOGFN
18# endif 18# endif
19 19
20# include <Eina.h> 20# include <Eina.h>
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 252b1ffa02..1481bf6f2b 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -31,7 +31,7 @@
31EAPI Ecore_Evas * 31EAPI Ecore_Evas *
32ecore_evas_wayland_shm_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame) 32ecore_evas_wayland_shm_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame)
33{ 33{
34 LOGFN(__FILE__, __LINE__, __FUNCTION__); 34 LOGFN;
35 35
36 return _ecore_evas_wl_common_new_internal(disp_name, parent, x, y, w, h, 36 return _ecore_evas_wl_common_new_internal(disp_name, parent, x, y, w, h,
37 frame, NULL, "wayland_shm"); 37 frame, NULL, "wayland_shm");
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 6051a2d840..de6f5d1c66 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -31,7 +31,7 @@ eng_output_setup(void *engine, void *info, unsigned int w, unsigned int h)
31 Render_Engine *re; 31 Render_Engine *re;
32 Outbuf *ob; 32 Outbuf *ob;
33 33
34 LOGFN(__FILE__, __LINE__, __FUNCTION__); 34 LOGFN;
35 35
36 /* try to allocate space for new render engine */ 36 /* try to allocate space for new render engine */
37 if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL; 37 if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL;
@@ -91,7 +91,7 @@ eng_output_info_setup(void *info)
91{ 91{
92 Evas_Engine_Info_Wayland *einfo = info; 92 Evas_Engine_Info_Wayland *einfo = info;
93 93
94 LOGFN(__FILE__, __LINE__, __FUNCTION__); 94 LOGFN;
95 95
96 einfo->render_mode = EVAS_RENDER_MODE_BLOCKING; 96 einfo->render_mode = EVAS_RENDER_MODE_BLOCKING;
97} 97}
@@ -102,7 +102,7 @@ eng_output_resize(void *engine EINA_UNUSED, void *data, int w, int h)
102 Render_Engine *re; 102 Render_Engine *re;
103 Evas_Engine_Info_Wayland *einfo; 103 Evas_Engine_Info_Wayland *einfo;
104 104
105 LOGFN(__FILE__, __LINE__, __FUNCTION__); 105 LOGFN;
106 106
107 if (!(re = (Render_Engine *)data)) return; 107 if (!(re = (Render_Engine *)data)) return;
108 if (!(einfo = re->generic.ob->info)) return; 108 if (!(einfo = re->generic.ob->info)) return;
@@ -291,7 +291,7 @@ eng_image_native_get(void *engine EINA_UNUSED, void *image)
291static int 291static int
292module_open(Evas_Module *em) 292module_open(Evas_Module *em)
293{ 293{
294 LOGFN(__FILE__, __LINE__, __FUNCTION__); 294 LOGFN;
295 295
296 /* check for valid evas module */ 296 /* check for valid evas module */
297 if (!em) return 0; 297 if (!em) return 0;
@@ -335,7 +335,7 @@ module_open(Evas_Module *em)
335static void 335static void
336module_close(Evas_Module *em EINA_UNUSED) 336module_close(Evas_Module *em EINA_UNUSED)
337{ 337{
338 LOGFN(__FILE__, __LINE__, __FUNCTION__); 338 LOGFN;
339 339
340 /* unregister logging domain */ 340 /* unregister logging domain */
341 if (_evas_engine_way_shm_log_dom >= 0) 341 if (_evas_engine_way_shm_log_dom >= 0)
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index c61b36a97a..3b59553337 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -33,9 +33,10 @@
33 33
34# ifdef LOGFNS 34# ifdef LOGFNS
35# include <stdio.h> 35# include <stdio.h>
36# define LOGFN(fl, ln, fn) printf("-EVAS-WL: %25s: %5i - %s\n", fl, ln, fn); 36# define LOGFN printf("-EVAS-WL: %25s: %5i - %s\n", __FILE__, __LINE__, __func__)
37
37# else 38# else
38# define LOGFN(fl, ln, fn) 39# define LOGFN
39# endif 40# endif
40 41
41extern int _evas_engine_way_shm_log_dom; 42extern int _evas_engine_way_shm_log_dom;
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index 1dd64934f3..8638e0d593 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -11,7 +11,7 @@ _evas_outbuf_setup(int w, int h, Evas_Engine_Info_Wayland *info)
11{ 11{
12 Outbuf *ob = NULL; 12 Outbuf *ob = NULL;
13 13
14 LOGFN(__FILE__, __LINE__, __FUNCTION__); 14 LOGFN;
15 15
16 /* try to allocate space for new Outbuf */ 16 /* try to allocate space for new Outbuf */
17 if (!(ob = calloc(1, sizeof(Outbuf)))) return NULL; 17 if (!(ob = calloc(1, sizeof(Outbuf)))) return NULL;
@@ -41,7 +41,7 @@ surf_err:
41void 41void
42_evas_outbuf_free(Outbuf *ob) 42_evas_outbuf_free(Outbuf *ob)
43{ 43{
44 LOGFN(__FILE__, __LINE__, __FUNCTION__); 44 LOGFN;
45 45
46 while (ob->priv.pending_writes) 46 while (ob->priv.pending_writes)
47 { 47 {
@@ -108,7 +108,7 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf
108 RGBA_Image *img; 108 RGBA_Image *img;
109 unsigned int i = 0; 109 unsigned int i = 0;
110 110
111 LOGFN(__FILE__, __LINE__, __FUNCTION__); 111 LOGFN;
112 112
113 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return; 113 if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return;
114 114
@@ -212,7 +212,7 @@ _evas_outbuf_swap_mode_get(Outbuf *ob)
212{ 212{
213 int age; 213 int age;
214 214
215 LOGFN(__FILE__, __LINE__, __FUNCTION__); 215 LOGFN;
216 216
217 age = ecore_wl2_surface_assign(ob->surface); 217 age = ecore_wl2_surface_assign(ob->surface);
218 if (!age) return MODE_FULL; 218 if (!age) return MODE_FULL;
@@ -228,7 +228,7 @@ _evas_outbuf_swap_mode_get(Outbuf *ob)
228int 228int
229_evas_outbuf_rotation_get(Outbuf *ob) 229_evas_outbuf_rotation_get(Outbuf *ob)
230{ 230{
231 LOGFN(__FILE__, __LINE__, __FUNCTION__); 231 LOGFN;
232 232
233 return ob->rotation; 233 return ob->rotation;
234} 234}
@@ -236,7 +236,7 @@ _evas_outbuf_rotation_get(Outbuf *ob)
236void 236void
237_evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize) 237_evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize)
238{ 238{
239 LOGFN(__FILE__, __LINE__, __FUNCTION__); 239 LOGFN;
240 240
241 if ((depth == OUTBUF_DEPTH_NONE) || 241 if ((depth == OUTBUF_DEPTH_NONE) ||
242 (depth == OUTBUF_DEPTH_INHERIT)) 242 (depth == OUTBUF_DEPTH_INHERIT))
@@ -271,7 +271,7 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx,
271 RGBA_Image *img; 271 RGBA_Image *img;
272 Eina_Rectangle *rect; 272 Eina_Rectangle *rect;
273 273
274 LOGFN(__FILE__, __LINE__, __FUNCTION__); 274 LOGFN;
275 275
276 RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, ob->w, ob->h); 276 RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, ob->w, ob->h);
277 if ((w <= 0) || (h <= 0)) return NULL; 277 if ((w <= 0) || (h <= 0)) return NULL;
@@ -364,7 +364,7 @@ _evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, in
364 int ww = 0, hh = 0; 364 int ww = 0, hh = 0;
365 int rx = 0, ry = 0; 365 int rx = 0, ry = 0;
366 366
367 LOGFN(__FILE__, __LINE__, __FUNCTION__); 367 LOGFN;
368 368
369 /* check for valid output buffer */ 369 /* check for valid output buffer */
370 if (!ob) return; 370 if (!ob) return;