kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Vincent Torri 2020-05-06 09:18:31 -04:00 committed by Christopher Michael
parent 93663b6283
commit 8db62cb22b
7 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -114,7 +114,7 @@ _ecore_evas_wl_common_cb_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED,
Ecore_Evas *ee;
Ecore_Event_Mouse_IO *ev;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
ev = event;
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,
Ecore_Evas *ee;
Ecore_Event_Mouse_IO *ev;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
ev = event;
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,
Ecore_Evas *ee;
Ecore_Wl2_Event_Focus_In *ev;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
ev = event;
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,
Ecore_Evas *ee;
Ecore_Wl2_Event_Focus_Out *ev;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
ev = event;
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)
int ow, oh, ew, eh, fw, fh;
int diff = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
@ -568,7 +568,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
int framew, frameh;
Eina_Bool active, prev_max, prev_full, state_change = EINA_FALSE;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
ev = event;
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
Evas_Engine_Info_Wayland *einfo;
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
ev = event;
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
Ecore_Evas *ee;
Ecore_Wl2_Event_Window_Rotation *ev;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
ev = event;
ee = ecore_event_window_match((Ecore_Window)ev->win);
@ -1299,7 +1299,7 @@ static int
_ecore_evas_wl_common_init(void)
{
Ecore_Event_Handler *h;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (++_ecore_evas_wl_init_count != 1)
return _ecore_evas_wl_init_count;
@ -1388,7 +1388,7 @@ _ecore_evas_wl_common_init(void)
static int
_ecore_evas_wl_common_shutdown(void)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (--_ecore_evas_wl_init_count != 0)
return _ecore_evas_wl_init_count;
@ -1409,7 +1409,7 @@ _ecore_evas_wl_common_free(Ecore_Evas *ee)
Ecore_Evas_Engine_Wl_Data *wdata;
EE_Wl_Device *device;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
@ -1452,7 +1452,7 @@ _ecore_evas_wl_common_free(Ecore_Evas *ee)
static void
_ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x EINA_UNUSED, int y EINA_UNUSED, int w, int h)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
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
Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Wl2_Input *input;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
wdata = ee->engine.data;
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
Ecore_Wl2_Input *input;
const Eo *seat;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
wdata = ee->engine.data;
seat = evas_device_parent_get(pointer);
@ -1604,7 +1604,7 @@ _ecore_evas_wl_common_aux_hints_supported_update(Ecore_Evas *ee)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
wdata = ee->engine.data;
@ -1616,7 +1616,7 @@ _ecore_evas_wl_common_title_set(Ecore_Evas *ee, const char *title)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
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 *
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
wdata = ee->engine.data;
@ -1661,7 +1661,7 @@ _ecore_evas_wl_common_size_min_set(Ecore_Evas *ee, int w, int h)
{
int fw, fh;
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
@ -1692,7 +1692,7 @@ _ecore_evas_wl_common_size_max_set(Ecore_Evas *ee, int w, int h)
{
int fw, fh;
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (w < 0) w = 0;
@ -1720,7 +1720,7 @@ _ecore_evas_wl_common_size_max_set(Ecore_Evas *ee, int w, int h)
static void
_ecore_evas_wl_common_size_base_set(Ecore_Evas *ee, int w, int h)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (w < 0) w = 0;
@ -1734,7 +1734,7 @@ _ecore_evas_wl_common_size_base_set(Ecore_Evas *ee, int w, int h)
static void
_ecore_evas_wl_common_size_step_set(Ecore_Evas *ee, int w, int h)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (w < 0) w = 0;
@ -1748,7 +1748,7 @@ _ecore_evas_wl_common_size_step_set(Ecore_Evas *ee, int w, int h)
static void
_ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double aspect)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
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
static void
_ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (ee->prop.layer == layer) return;
@ -1798,7 +1798,7 @@ _ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
ee->prop.iconified = on;
@ -1810,7 +1810,7 @@ _ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on)
static void
_ecore_evas_wl_common_borderless_set(Ecore_Evas *ee, Eina_Bool on)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (ee->prop.borderless == on) return;
@ -1824,7 +1824,7 @@ _ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (ee->prop.maximized == on) return;
@ -1838,7 +1838,7 @@ _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (ee->prop.fullscreen == on) return;
@ -1850,7 +1850,7 @@ _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
static void
_ecore_evas_wl_common_ignore_events_set(Ecore_Evas *ee, int ignore)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
ee->ignore_events = ignore;
@ -1915,7 +1915,7 @@ _ecore_evas_wayland_alpha_do(Ecore_Evas *ee, int alpha)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (ee->alpha == alpha) return;
@ -1965,7 +1965,7 @@ _ecore_evas_wl_common_prepare(Ecore_Evas *ee)
static void
_ecore_evas_wl_common_withdrawn_set(Ecore_Evas *ee, Eina_Bool on)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (ee->prop.withdrawn == on) return;
@ -1984,7 +1984,7 @@ _ecore_evas_wl_common_screen_geometry_get(const Ecore_Evas *ee, int *x, int *y,
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (x) *x = 0;
if (y) *y = 0;
@ -2000,7 +2000,7 @@ _ecore_evas_wl_common_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
Ecore_Wl2_Output *output;
int dpi = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
if (xdpi) *xdpi = 0;
@ -2021,7 +2021,7 @@ _ecore_evas_wayland_resize(Ecore_Evas *ee, int location)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
wdata = ee->engine.data;
@ -2034,7 +2034,7 @@ _ecore_evas_wayland_move(Ecore_Evas *ee, int x EINA_UNUSED, int y EINA_UNUSED)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!ee) return;
wdata = ee->engine.data;
@ -2129,7 +2129,7 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
Evas_Engine_Info_Wayland *einfo;
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if ((!ee) || (ee->visible)) return;
@ -2199,7 +2199,7 @@ _ecore_evas_wl_common_hide(Ecore_Evas *ee)
Evas_Engine_Info_Wayland *einfo;
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if ((!ee) || (!ee->visible)) return;
wdata = ee->engine.data;
@ -2248,7 +2248,7 @@ _ecore_evas_wl_common_alpha_set(Ecore_Evas *ee, int alpha)
static void
_ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (ee->rotation == rotation) return;
@ -2952,7 +2952,7 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, Ecore_Window parent, i
Ecore_Evas *ee = NULL;
int method = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!(method = evas_render_method_lookup(engine_name)))
{

2
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
View File

@ -31,7 +31,7 @@
EAPI Ecore_Evas *
ecore_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)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
return _ecore_evas_wl_common_new_internal(disp_name, parent,
x, y, w, h, frame,

6
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
View File

@ -11,10 +11,10 @@
//#define LOGFNS 1
# ifdef LOGFNS
# include <stdio.h>
# define LOGFN(fl, ln, fn) \
printf("-ECORE_EVAS-WL: %25s: %5i - %s\n", fl, ln, fn);
# define LOGFN \
printf("-ECORE_EVAS-WL: %25s: %5i - %s\n", __FILE__, __LINE__, __func__)
# else
# define LOGFN(fl, ln, fn)
# define LOGFN
# endif
# include <Eina.h>

2
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
View File

@ -31,7 +31,7 @@
EAPI Ecore_Evas *
ecore_evas_wayland_shm_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
return _ecore_evas_wl_common_new_internal(disp_name, parent, x, y, w, h,
frame, NULL, "wayland_shm");

10
src/modules/evas/engines/wayland_shm/evas_engine.c
View File

@ -31,7 +31,7 @@ eng_output_setup(void *engine, void *info, unsigned int w, unsigned int h)
Render_Engine *re;
Outbuf *ob;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
/* try to allocate space for new render engine */
if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL;
@ -91,7 +91,7 @@ eng_output_info_setup(void *info)
{
Evas_Engine_Info_Wayland *einfo = info;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
einfo->render_mode = EVAS_RENDER_MODE_BLOCKING;
}
@ -102,7 +102,7 @@ eng_output_resize(void *engine EINA_UNUSED, void *data, int w, int h)
Render_Engine *re;
Evas_Engine_Info_Wayland *einfo;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (!(re = (Render_Engine *)data)) return;
if (!(einfo = re->generic.ob->info)) return;
@ -291,7 +291,7 @@ eng_image_native_get(void *engine EINA_UNUSED, void *image)
static int
module_open(Evas_Module *em)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
/* check for valid evas module */
if (!em) return 0;
@ -335,7 +335,7 @@ module_open(Evas_Module *em)
static void
module_close(Evas_Module *em EINA_UNUSED)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
/* unregister logging domain */
if (_evas_engine_way_shm_log_dom >= 0)

5
src/modules/evas/engines/wayland_shm/evas_engine.h
View File

@ -33,9 +33,10 @@
# ifdef LOGFNS
# include <stdio.h>
# define LOGFN(fl, ln, fn) printf("-EVAS-WL: %25s: %5i - %s\n", fl, ln, fn);
# define LOGFN printf("-EVAS-WL: %25s: %5i - %s\n", __FILE__, __LINE__, __func__)
# else
# define LOGFN(fl, ln, fn)
# define LOGFN
# endif
extern int _evas_engine_way_shm_log_dom;

16
src/modules/evas/engines/wayland_shm/evas_outbuf.c
View File

@ -11,7 +11,7 @@ _evas_outbuf_setup(int w, int h, Evas_Engine_Info_Wayland *info)
{
Outbuf *ob = NULL;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
/* try to allocate space for new Outbuf */
if (!(ob = calloc(1, sizeof(Outbuf)))) return NULL;
@ -41,7 +41,7 @@ surf_err:
void
_evas_outbuf_free(Outbuf *ob)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
while (ob->priv.pending_writes)
{
@ -108,7 +108,7 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf
RGBA_Image *img;
unsigned int i = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return;
@ -212,7 +212,7 @@ _evas_outbuf_swap_mode_get(Outbuf *ob)
{
int age;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
age = ecore_wl2_surface_assign(ob->surface);
if (!age) return MODE_FULL;
@ -228,7 +228,7 @@ _evas_outbuf_swap_mode_get(Outbuf *ob)
int
_evas_outbuf_rotation_get(Outbuf *ob)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
return ob->rotation;
}
@ -236,7 +236,7 @@ _evas_outbuf_rotation_get(Outbuf *ob)
void
_evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
if ((depth == OUTBUF_DEPTH_NONE) ||
(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,
RGBA_Image *img;
Eina_Rectangle *rect;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, ob->w, ob->h);
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
int ww = 0, hh = 0;
int rx = 0, ry = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
LOGFN;
/* check for valid output buffer */
if (!ob) return;