e_log: get rid of unused e_pixmap parameter of ELOG 24/196124/7 accepted/tizen/unified/20181226.063554 submit/tizen/20181224.063831
authorGwanglim Lee <gl77.lee@samsung.com>
Mon, 24 Dec 2018 02:04:02 +0000 (11:04 +0900)
committerGwanglim Lee <gl77.lee@samsung.com>
Mon, 24 Dec 2018 06:28:54 +0000 (15:28 +0900)
Change-Id: I3b0a2d95a13e7683d42f137067e67b941237336c

45 files changed:
src/bin/Makefile.mk
src/bin/e_client.c
src/bin/e_comp_canvas.c
src/bin/e_comp_object.c
src/bin/e_comp_screen.c
src/bin/e_comp_wl.c
src/bin/e_comp_wl_rsm.c
src/bin/e_comp_wl_screenshooter.c
src/bin/e_comp_wl_shell.c
src/bin/e_comp_wl_viewport.c
src/bin/e_config.c
src/bin/e_desk.c
src/bin/e_error.c
src/bin/e_focus.c
src/bin/e_hints.c
src/bin/e_hwc.c
src/bin/e_hwc_planes.c
src/bin/e_log.h
src/bin/e_main.c
src/bin/e_output.c
src/bin/e_pixmap.c
src/bin/e_plane.c
src/bin/e_plane_renderer.c
src/bin/e_policy.c
src/bin/e_policy_stack.c
src/bin/e_policy_visibility.c
src/bin/e_policy_wl.c
src/bin/e_policy_wl_display.c
src/bin/e_process.c
src/bin/e_security.c
src/bin/e_slot.c
src/bin/e_splitlayout.c
src/bin/e_xdg_shell_v6.c
src/bin/services/e_service_cbhm.c
src/bin/services/e_service_indicator.c
src/bin/services/e_service_lockscreen.c
src/bin/services/e_service_quickpanel.c
src/bin/services/e_service_scrsaver.c
src/bin/services/e_service_softkey.c
src/bin/services/e_service_volume.c
src/bin/video/e_client_video.c
src/bin/video/e_comp_wl_video.c
src/bin/video/iface/e_video_hwc_planes.c
src/bin/video/iface/e_video_hwc_windows.c
src/modules/Makefile.mk

index 6177c9d..eb4235f 100644 (file)
@@ -266,7 +266,7 @@ src/bin/e_devicemgr_input.c \
 src/bin/e_devicemgr_inputgen.c \
 src/bin/e_devicemgr_wl.c
 
-src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ $(TTRACE_CFLAGS) $(DLOG_CFLAGS) $(PIXMAN_CFLAGS) $(POLICY_CFLAGS) @TIZEN_REMOTE_SURFACE_CFLAGS@
+src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=2 @WAYLAND_CFLAGS@ $(TTRACE_CFLAGS) $(DLOG_CFLAGS) $(PIXMAN_CFLAGS) $(POLICY_CFLAGS) @TIZEN_REMOTE_SURFACE_CFLAGS@
 if HAVE_LIBGOMP
 src_bin_enlightenment_CPPFLAGS += -fopenmp
 endif
index 3bfba50..3732a91 100644 (file)
@@ -250,7 +250,7 @@ cleanup:
         
         if (!warp_client->lock_focus_out)
           {
-             ELOGF("FOCUS", "focus set | pointer_warp_to_center", NULL, warp_client);
+             ELOGF("FOCUS", "focus set | pointer_warp_to_center", warp_client);
              evas_object_focus_set(warp_client->frame, 1);
              e_client_focus_latest_set(warp_client);
           }
@@ -874,10 +874,10 @@ e_client_revert_focus(E_Client *ec)
         if (focus_ec != ec)
           {
              e_client_focus_defer_unset(ec);
-             ELOGF("FOCUS", "focus unset | revert_focus", NULL, ec);
+             ELOGF("FOCUS", "focus unset | revert_focus", ec);
              evas_object_focus_set(ec->frame, EINA_FALSE);
           }
-        ELOGF("FOCUS", "focus set | revert_focus", NULL, focus_ec);
+        ELOGF("FOCUS", "focus set | revert_focus", focus_ec);
         evas_object_focus_set(focus_ec->frame, EINA_TRUE);
      }
 }
@@ -1006,7 +1006,7 @@ _e_client_free(E_Client *ec)
    ec->e.state.profile.wait_desk = NULL;
    E_FREE_FUNC(ec->frame, evas_object_del);
    E_OBJECT(ec)->references--;
-   ELOG("CLIENT FREE", ec->pixmap, ec);
+   ELOG("CLIENT FREE", ec);
 
    e_uuid_store_entry_del(ec->uuid);
 
@@ -1071,19 +1071,19 @@ _e_client_del(E_Client *ec)
 
    if ((!ec->new_client) && (!stopping))
      {
-        ELOGF("COMP", "SEND E_EVENT_CLIENT_REMOVE event", ec->pixmap, ec);
+        ELOGF("COMP", "SEND E_EVENT_CLIENT_REMOVE event", ec);
         _e_client_event_simple(ec, E_EVENT_CLIENT_REMOVE);
      }
    else
      {
         if (stopping)
           {
-             ELOGF("COMP", "SEND E_EVENT_CLIENT_REMOVE event on stopping env", ec->pixmap, ec);
+             ELOGF("COMP", "SEND E_EVENT_CLIENT_REMOVE event on stopping env", ec);
              _e_client_event_simple(ec, E_EVENT_CLIENT_REMOVE);
           }
      }
 
-   ELOG("CLIENT DEL", ec->pixmap, ec);
+   ELOG("CLIENT DEL", ec);
 
    if (ec->parent)
      {
@@ -1816,7 +1816,7 @@ _e_client_reset_lost_window(E_Client *ec)
    evas_object_raise(ec->frame);
    if (!ec->lock_focus_out)
      {
-        ELOGF("FOCUS", "focus set | reset_lost_window", NULL, ec);
+        ELOGF("FOCUS", "focus set | reset_lost_window", ec);
         evas_object_focus_set(ec->frame, 1);
      }
 
@@ -2264,7 +2264,7 @@ _e_client_aux_hint_eval(E_Client *ec)
              hint->changed = EINA_FALSE;
              if (hint->deleted)
                {
-                  ELOGF("COMP", "AUX_HINT |Del [%d:%s:%s]", ec->pixmap, ec, hint->id, hint->hint, hint->val);
+                  ELOGF("COMP", "AUX_HINT |Del [%d:%s:%s]", ec, hint->id, hint->hint, hint->val);
                   if (hint->hint) eina_stringshare_del(hint->hint);
                   if (hint->val) eina_stringshare_del(hint->val);
                   cdata->aux_hint.hints = eina_list_remove_list(cdata->aux_hint.hints, l);
@@ -2631,7 +2631,7 @@ _e_client_eval(E_Client *ec)
                   ec->cur_mouse_action->func.go(E_OBJECT(ec), NULL);
                   if (e_config->border_raise_on_mouse_action)
                     evas_object_raise(ec->frame);
-                  ELOGF("FOCUS", "focus set | client eval", NULL, ec);
+                  ELOGF("FOCUS", "focus set | client eval", ec);
                   evas_object_focus_set(ec->frame, 1);
                }
              ec->changes.visible = 0;
@@ -3169,13 +3169,13 @@ _e_client_visibility_zone_calculate(E_Zone *zone)
                        /* previous state is obscured: -1 or 1 */
                        ec->visibility.obscured = E_VISIBILITY_UNOBSCURED;
                        ec->visibility.changed = 1;
-                       ELOGF("POL_VIS", "CLIENT VIS ON.  argb:%d, opaque:%2d, frame_v:%d", ec->pixmap, ec, ec->argb, ec->visibility.opaque, ec_frame_visible);
+                       ELOGF("POL_VIS", "CLIENT VIS ON.  argb:%d, opaque:%2d, frame_v:%d", ec, ec->argb, ec->visibility.opaque, ec_frame_visible);
                     }
                   else
                     {
                        if (!is_above_rot_pending)
                          is_vis_on_skip = EINA_TRUE;
-                       ELOGF("POL_VIS", "CLIENT VIS ON-SKIP. argb:%d, opaque:%2d, frame_v:%d", ec->pixmap, ec, ec->argb, ec->visibility.opaque, ec_frame_visible);
+                       ELOGF("POL_VIS", "CLIENT VIS ON-SKIP. argb:%d, opaque:%2d, frame_v:%d", ec, ec->argb, ec->visibility.opaque, ec_frame_visible);
                     }
                }
 
@@ -3221,7 +3221,7 @@ _e_client_visibility_zone_calculate(E_Zone *zone)
                        ec->visibility.obscured = E_VISIBILITY_FULLY_OBSCURED;
                        ec->visibility.changed = 1;
                        ELOGF("POL_VIS", "CLIENT VIS OFF. argb:%d, opaque:%2d, frame_v:%d, canvas_v:%d, calc_r:%d(%d), rot_p:%d",
-                             ec->pixmap, ec, ec->argb, ec->visibility.opaque,
+                             ec, ec->argb, ec->visibility.opaque,
                              ec_frame_visible, canvas_vis, calc_region, calc_skip_type, skip_rot_pending_show);
                     }
                }
@@ -3333,7 +3333,7 @@ _e_client_focus_calculate(E_Zone *zone)
         if (!reverted_focus_ec && focused)
           {
              e_client_focus_defer_unset(focused);
-             ELOGF("FOCUS", "focus unset | focus calculate", NULL, focused);
+             ELOGF("FOCUS", "focus unset | focus calculate", focused);
              evas_object_focus_set(focused->frame, EINA_FALSE);
           }
      }
@@ -3368,7 +3368,7 @@ _e_client_focus_calculate(E_Zone *zone)
      {
         if (defered_focus_ec != focused)
           {
-             ELOGF("FOCUS", "focus set | defer_focus", NULL, defered_focus_ec);
+             ELOGF("FOCUS", "focus set | defer_focus", defered_focus_ec);
              if (focused)
                e_client_focus_defer_unset(focused);
              evas_object_focus_set(defered_focus_ec->frame, EINA_TRUE);
@@ -3382,7 +3382,7 @@ _e_client_focus_calculate(E_Zone *zone)
      {
         if (reverted_focus_ec != focused)
           {
-             ELOGF("FOCUS", "focus set | revert_focus", NULL, reverted_focus_ec);
+             ELOGF("FOCUS", "focus set | revert_focus", reverted_focus_ec);
              if (focused)
                e_client_focus_defer_unset(focused);
              evas_object_focus_set(reverted_focus_ec->frame, EINA_TRUE);
@@ -3540,7 +3540,7 @@ _e_client_transform_core_boundary_update(E_Client *ec, E_Util_Transform_Rect_Ver
    ec->transform_core.result.boundary.h = maxy - miny;
 
    ELOGF("COMP", "[Transform][boundary][%d %d %d %d]",
-         ec->pixmap, ec,
+         ec,
          ec->transform_core.result.boundary.x,
          ec->transform_core.result.boundary.y,
          ec->transform_core.result.boundary.w,
@@ -3981,7 +3981,7 @@ e_client_new(E_Pixmap *cp, int first_map, int internal)
    e_comp->clients = eina_list_append(e_comp->clients, ec);
    eina_hash_add(clients_hash[e_pixmap_type_get(cp)], &ec->pixmap, ec);
 
-   ELOGF("COMP", "CLIENT ADD. cp:%p", ec->pixmap, ec, cp);
+   ELOGF("COMP", "CLIENT ADD. cp:%p", ec, cp);
    if (!ec->ignored)
      _e_client_event_simple(ec, E_EVENT_CLIENT_ADD);
    e_comp_object_client_add(ec);
@@ -4647,7 +4647,7 @@ e_client_above_get(const E_Client *ec)
           {
              if (ec == ec2)
                {
-                  ELOGF("FATAL", "CHECK the ec inlist next", ec->pixmap, ec);
+                  ELOGF("FATAL", "CHECK the ec inlist next", ec);
                   continue;
                }
              if (!e_object_is_del(E_OBJECT(ec2)))
@@ -4666,7 +4666,7 @@ e_client_above_get(const E_Client *ec)
              if (ec == ec2)
                {
                   ELOGF("FATAL", "EC exist above layer. ec layer_map:%d, cur layer_map:%d",
-                        ec->pixmap, ec, e_comp_canvas_layer_map(ec->layer), x);
+                        ec, e_comp_canvas_layer_map(ec->layer), x);
                   continue;
                }
              if (!e_object_is_del(E_OBJECT(ec2)))
@@ -4694,7 +4694,7 @@ e_client_below_get(const E_Client *ec)
              ec2 = EINA_INLIST_CONTAINER_GET(l, E_Client);
              if (ec == ec2)
                {
-                  ELOGF("FATAL", "CHECK the ec inlist prev", ec->pixmap, ec);
+                  ELOGF("FATAL", "CHECK the ec inlist prev", ec);
                   continue;
                }
              if (!e_object_is_del(E_OBJECT(ec2)))
@@ -4717,7 +4717,7 @@ e_client_below_get(const E_Client *ec)
              if (ec == ec2)
                {
                   ELOGF("FATAL", "EC exist below layer. ec layer_map:%d, cur layer_map:%d",
-                        ec->pixmap, ec, e_comp_canvas_layer_map(ec->layer), x);
+                        ec, e_comp_canvas_layer_map(ec->layer), x);
                   continue;
                }
              if (!e_object_is_del(E_OBJECT(ec2)))
@@ -4919,7 +4919,7 @@ e_client_refocus(void)
      if (ec->desk && ec->desk->visible && (!ec->iconic))
        {
           if (e_comp->input_key_grabs || e_comp->input_mouse_grabs) break;
-          ELOGF("FOCUS", "focus set | refocus", NULL, ec);
+          ELOGF("FOCUS", "focus set | refocus", ec);
           evas_object_focus_set(ec->frame, 1);
           break;
        }
@@ -4966,7 +4966,7 @@ e_client_focus_set_with_pointer(E_Client *ec)
    if (ec == focused) return;
 
    TRACE_DS_BEGIN(CLIENT:FOCUS SET WITH POINTER);
-   ELOGF("FOCUS", "focus set | focus with pointer", NULL, ec);
+   ELOGF("FOCUS", "focus set | focus with pointer", ec);
    evas_object_focus_set(ec->frame, 1);
 
    if (e_config->focus_policy == E_FOCUS_CLICK)
@@ -4993,7 +4993,7 @@ e_client_focused_set(E_Client *ec)
 
    TRACE_DS_BEGIN(CLIENT:FOCUSED SET);
 
-   ELOG("CLIENT FOCUS_SET", (ec ? ec->pixmap : NULL), ec);
+   ELOG("CLIENT FOCUS_SET", ec);
    focused = ec;
    if ((ec) && (ec->zone))
      {
@@ -5097,7 +5097,7 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
           (e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))) ||
        (just_do_it))
      {
-        ELOGF("COMP", "Set launching flag..", ec->pixmap, ec);
+        ELOGF("COMP", "Set launching flag..", ec);
         ec->launching = EINA_TRUE;
 
         ec->exp_iconify.not_raise = 0;
@@ -5107,7 +5107,7 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
              if (!ec->lock_user_iconify)
                e_client_uniconify(ec);
           }
-        ELOG("Un-Set ICONIFY BY CLIENT", ec->pixmap, ec);
+        ELOG("Un-Set ICONIFY BY CLIENT", ec);
         ec->exp_iconify.by_client = 0;
 
         if ((!ec->iconic) && (!ec->sticky))
@@ -5139,7 +5139,7 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
                     }
                   else
                     {
-                       ELOGF("FOCUS", "focus set | client activate", NULL, ec);
+                       ELOGF("FOCUS", "focus set | client activate", ec);
                        evas_object_focus_set(focus_ec->frame, 1);
                     }
                }
@@ -5546,7 +5546,7 @@ e_client_iconify(E_Client *ec)
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    ELOGF("TZVIS", "ICONIFY  |not_raise:%d       |by_client:%d",
-         ec->pixmap, ec, (unsigned int)ec->exp_iconify.not_raise,
+         ec, (unsigned int)ec->exp_iconify.not_raise,
          ec->exp_iconify.by_client);
 
    if (!ec->zone) return;
@@ -5557,12 +5557,12 @@ e_client_iconify(E_Client *ec)
      {
         if (!ec->exp_iconify.by_client)
           {
-             ELOGF("TZVIS", "Not mapped.. So, don't iconify", ec->pixmap, ec);
+             ELOGF("TZVIS", "Not mapped.. So, don't iconify", ec);
              return;
           }
         else
           {
-             ELOGF("TZVIS", "Not mapped.. But, iconify by user request", ec->pixmap, ec);
+             ELOGF("TZVIS", "Not mapped.. But, iconify by user request", ec);
           }
      }
 
@@ -5603,7 +5603,7 @@ e_client_uniconify(E_Client *ec)
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    ELOGF("TZVIS", "UNICONIFY|not_raise:%d       |by_client:%d\t| mapped:%d",
-         ec->pixmap, ec, (unsigned int)ec->exp_iconify.not_raise,
+         ec, (unsigned int)ec->exp_iconify.not_raise,
          ec->exp_iconify.by_client,
          ec->comp_data ? ec->comp_data->mapped : 0);
 
@@ -5636,7 +5636,7 @@ e_client_uniconify(E_Client *ec)
 
    if (ec->internal)
      {
-        ELOGF("TZVIS", "UNICONIFY|internal object force show", ec->pixmap, ec);
+        ELOGF("TZVIS", "UNICONIFY|internal object force show", ec);
         evas_object_show(ec->frame);
      }
 
@@ -5644,12 +5644,12 @@ e_client_uniconify(E_Client *ec)
      {
         if (ec->comp_data && ec->comp_data->mapped)
           {
-             ELOGF("TZVIS", "UNICONIFY|object show", ec->pixmap, ec);
+             ELOGF("TZVIS", "UNICONIFY|object show", ec);
              evas_object_show(ec->frame);
           }
         else
           {
-             ELOGF("TZVIS", "UNICONIFY|object no show. currently unmapped", ec->pixmap, ec);
+             ELOGF("TZVIS", "UNICONIFY|object no show. currently unmapped", ec);
           }
      }
 
@@ -6979,7 +6979,7 @@ e_client_visibility_force_obscured_set(E_Client *ec, Eina_Bool set)
 {
    if (!ec) return;
 
-   ELOGF("TZVIS", "VIS_FORCE_OBSCURED :%d", ec->pixmap, ec, set);
+   ELOGF("TZVIS", "VIS_FORCE_OBSCURED :%d", ec, set);
 
    ec->visibility.force_obscured = set;
    e_client_visibility_calculate();
@@ -7007,6 +7007,6 @@ e_client_pending_geometry_flush(E_Client *ec)
              E_FREE(geo);
           }
         ec->surface_sync.wait_commit = EINA_FALSE;
-        ELOGF("POSSIZE", "pending geometry has flushed", ec->pixmap, ec);
+        ELOGF("POSSIZE", "pending geometry has flushed", ec);
      }
 }
index f18148b..49db4ae 100644 (file)
@@ -586,7 +586,7 @@ e_comp_canvas_layer_map(E_Layer layer)
      }
 
    /* prevents to access the e_comp->layers list out of bounds. */
-   ELOGF("WARNING", "Used not defined layer:%d", NULL, NULL, layer);
+   ELOGF("WARNING", "Used not defined layer:%d", NULL, layer);
    return E_LAYER_COUNT - 1;
 }
 
index a191b64..e0f7098 100644 (file)
@@ -1081,11 +1081,11 @@ _e_comp_object_animating_end(E_Comp_Object *cw)
                     {
                        if (!cw->ec->extra_animating)
                          {
-                            ELOGF("COMP", "Un-Set launching flag..", cw->ec->pixmap, cw->ec);
+                            ELOGF("COMP", "Un-Set launching flag..", cw->ec);
                             cw->ec->launching = EINA_FALSE;
                             if (cw->ec->first_mapped)
                               {
-                                 ELOGF("LAUNCH", "SHOW real win", cw->ec->pixmap, cw->ec);
+                                 ELOGF("LAUNCH", "SHOW real win", cw->ec);
                                  e_comp_object_signal_emit(cw->ec->frame, "e,action,launch_real,done", "e");
                               }
 
@@ -2054,7 +2054,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
 
    if (cw->ec->launching == EINA_TRUE)
      {
-        ELOGF("COMP", "Hide. Cancel launching flag", cw->ec->pixmap, cw->ec);
+        ELOGF("COMP", "Hide. Cancel launching flag", cw->ec);
         cw->ec->launching = EINA_FALSE;
      }
 
@@ -2910,7 +2910,7 @@ _e_comp_smart_hide(Evas_Object *obj)
    /* ensure focus-out */
    if (cw->ec->focused)
      {
-        ELOGF("FOCUS", "focus unset | smart_hide", NULL, cw->ec);
+        ELOGF("FOCUS", "focus unset | smart_hide", cw->ec);
         evas_object_focus_set(cw->ec->frame, 0);
         e_client_focus_defer_unset(cw->ec);
      }
@@ -2965,7 +2965,7 @@ _e_comp_smart_show(Evas_Object *obj)
      {
         if (cw->ec->exp_iconify.by_client)
           {
-             ELOGF("COMP", "Set launching flag..", cw->ec->pixmap, cw->ec);
+             ELOGF("COMP", "Set launching flag..", cw->ec);
              cw->ec->launching = EINA_TRUE;
           }
 
@@ -2974,7 +2974,7 @@ _e_comp_smart_show(Evas_Object *obj)
    else if (!cw->showing) /* if set, client was ec->hidden during show animation */
      {
         cw->showing = 1;
-        ELOGF("COMP", "Set launching flag..", cw->ec->pixmap, cw->ec);
+        ELOGF("COMP", "Set launching flag..", cw->ec);
         cw->ec->launching = EINA_TRUE;
 
         e_comp_object_signal_emit(cw->smart_obj, "e,state,visible", "e");
@@ -5142,7 +5142,7 @@ e_comp_object_mask_set(Evas_Object *obj, Eina_Bool set)
              if (cw->visible) evas_object_show(o);
 
              cw->mask.obj = o;
-             ELOGF("COMP", "         |mask_obj", cw->ec->pixmap, cw->ec);
+             ELOGF("COMP", "         |mask_obj", cw->ec);
           }
      }
    else
@@ -5751,7 +5751,7 @@ e_comp_object_map_update(Evas_Object *obj)
      {
         if (evas_object_map_enable_get(cw->effect_obj))
           {
-             ELOGF("TRANSFORM", "map: disable", cw->ec->pixmap, cw->ec);
+             ELOGF("TRANSFORM", "map: disable", cw->ec);
              evas_object_map_enable_set(cw->effect_obj, EINA_FALSE);
              evas_object_hide(cw->map_input_obj);
           }
@@ -5792,7 +5792,7 @@ e_comp_object_map_update(Evas_Object *obj)
    p += l, remain -= l;
 
    ELOGF("TRANSFORM", "map: point(%d,%d %dx%d) uv(%d,%d %d,%d %d,%d %d,%d=>%s)",
-         cw->ec->pixmap, cw->ec,
+         cw->ec,
          ec->x, ec->y, bw, bh, x1, y1, x2, y1, x2, y2, x1, y2, buffer);
 
    evas_object_map_set(cw->effect_obj, map);
index 997d252..b4b90a6 100644 (file)
@@ -64,7 +64,7 @@ _tz_surface_rotation_find_with_resource(struct wl_resource *resource)
 static void
 _tz_surface_rotation_free(E_Comp_Screen_Tzsr *tzsr)
 {
-   ELOGF("TRANSFORM", "|tzsr(%p) freed", NULL, tzsr->ec, tzsr);
+   ELOGF("TRANSFORM", "|tzsr(%p) freed", tzsr->ec, tzsr);
    tzsr_list = eina_list_remove(tzsr_list, tzsr);
    free(tzsr);
 }
@@ -99,7 +99,7 @@ _tz_screen_rotation_get_ignore_output_transform(struct wl_client *client, struct
    tzsr->resource = resource;
    tzsr->ec = ec;
 
-   ELOGF("TRANSFORM", "|tzsr(%p) client_ignore(%d)", NULL, ec, tzsr, e_config->screen_rotation_client_ignore);
+   ELOGF("TRANSFORM", "|tzsr(%p) client_ignore(%d)", ec, tzsr, e_config->screen_rotation_client_ignore);
 
    tzsr_list = eina_list_append(tzsr_list, tzsr);
 
@@ -187,7 +187,7 @@ _e_comp_screen_dbus_init()
    if (e_comp_screen->rotation)
      {
         eldbus_service_signal_emit(e_comp_screen_iface, E_COMP_SCREEN_SIGNAL_ROTATION_CHANGED, e_comp_screen->rotation);
-        ELOGF("TRANSFORM", "screen-rotation sends signal: %d", NULL, NULL, e_comp_screen->rotation);
+        ELOGF("TRANSFORM", "screen-rotation sends signal: %d", NULL, e_comp_screen->rotation);
      }
 
    return;
@@ -1174,7 +1174,7 @@ e_comp_screen_rotation_setting_set(E_Comp_Screen *e_comp_screen, int rotation)
    if (e_comp_screen_iface)
      {
         eldbus_service_signal_emit(e_comp_screen_iface, E_COMP_SCREEN_SIGNAL_ROTATION_CHANGED, e_comp_screen->rotation);
-        ELOGF("TRANSFORM", "screen-rotation sends signal: %d", NULL, NULL, e_comp_screen->rotation);
+        ELOGF("TRANSFORM", "screen-rotation sends signal: %d", NULL, e_comp_screen->rotation);
      }
 
    INF("EE Rotated and Resized: %d, %dx%d", e_comp_screen->rotation, w, h);
@@ -1195,18 +1195,18 @@ e_comp_screen_rotation_ignore_output_transform_send(E_Client *ec, Eina_Bool igno
         /* exception */
         if (e_config->screen_rotation_client_ignore)
           {
-             ELOGF("TRANSFORM", "|tzsr(%p) ignore_output_transform: client_ignore", NULL, ec, tzsr);
+             ELOGF("TRANSFORM", "|tzsr(%p) ignore_output_transform: client_ignore", ec, tzsr);
              return;
           }
 
         if (e_policy_client_is_quickpanel(ec))
            {
-              ELOGF("TRANSFORM", "|tzsr(%p) ignore_output_transform: quickpanel", NULL, ec, tzsr);
+              ELOGF("TRANSFORM", "|tzsr(%p) ignore_output_transform: quickpanel", ec, tzsr);
               return;
            }
      }
 
-   ELOGF("TRANSFORM", "|tzsr(%p) ignore_output_transform(%d)", NULL, ec, tzsr, ignore);
+   ELOGF("TRANSFORM", "|tzsr(%p) ignore_output_transform(%d)", ec, tzsr, ignore);
 
    tizen_screen_rotation_send_ignore_output_transform(tzsr->resource, ec->comp_data->surface, ignore);
 }
index 49eb212..4d3ee04 100644 (file)
@@ -431,7 +431,7 @@ e_comp_wl_map_apply(E_Client *ec)
    e_util_transform_texcoord_set(cdata->viewport_transform, 3, x1, y2);
 
    ELOGF("TRANSFORM", "viewport map: point(%d,%d %dx%d) uv(%d,%d %d,%d %d,%d %d,%d)",
-         ec->pixmap, ec, ec->x, ec->y, ec->comp_data->width_from_viewport,
+         ec, ec->x, ec->y, ec->comp_data->width_from_viewport,
          ec->comp_data->height_from_viewport, x1, y1, x2, y1, x2, y2, x1, y2);
 
    e_client_transform_core_update(ec);
@@ -2501,7 +2501,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
              EC_CHANGED(ec);
              ec->new_client = 1;
              e_comp->new_clients++;
-             ELOGF("COMP", "Unignore", ec->pixmap, ec);
+             ELOGF("COMP", "Unignore", ec);
              e_client_unignore(ec);
           }
      }
@@ -2514,7 +2514,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
         state->buffer_viewport.changed = EINA_TRUE;
 
         ELOGF("TRANSFORM", "buffer_transform changed: old(%d) new(%d)",
-              ec->pixmap, ec,
+              ec,
               vp->buffer.transform, state->buffer_viewport.buffer.transform);
 
         if (transform_change == vp->wait_for_transform_change)
@@ -2586,7 +2586,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
              if ((ec->comp_data->shell.surface) &&
                  (ec->comp_data->shell.unmap))
                {
-                  ELOGF("COMP", "Try to unmap. Call shell.unmap.", ec->pixmap, ec);
+                  ELOGF("COMP", "Try to unmap. Call shell.unmap.", ec);
                   ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
                }
              else if ((ec->internal) ||
@@ -2594,7 +2594,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
                       (ec == e_comp_wl->drag_client))
                {
                   ELOGF("COMP", "Try to unmap. Hide window. internal:%d, sub:%p, drag:%d",
-                        ec->pixmap, ec, ec->internal, ec->comp_data->sub.data, (ec == e_comp_wl->drag_client));
+                        ec, ec->internal, ec->comp_data->sub.data, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_FALSE;
                   evas_object_hide(ec->frame);
                   ec->comp_data->mapped = 0;
@@ -2616,7 +2616,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
                  (ec->comp_data->shell.map) &&
                  (!ec->ignored))
                {
-                  ELOGF("COMP", "Try to map. Call shell.map.", ec->pixmap, ec);
+                  ELOGF("COMP", "Try to map. Call shell.map.", ec);
                   ec->comp_data->shell.map(ec->comp_data->shell.surface);
                }
              else if ((ec->internal) ||
@@ -2624,7 +2624,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
                       (ec == e_comp_wl->drag_client))
                {
                   ELOGF("COMP", "Try to map. Show window. internal:%d, drag:%d",
-                        ec->pixmap, ec, ec->internal, (ec == e_comp_wl->drag_client));
+                        ec, ec->internal, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_TRUE;
                   ec->ignored = 0;
                   evas_object_show(ec->frame);
@@ -2871,7 +2871,7 @@ _e_comp_wl_surface_cb_attach(struct wl_client *client EINA_UNUSED, struct wl_res
         if (ec->comp_data->shell.surface &&
             !ec->internal && !ec->comp_data->sub.data && !ec->remote_surface.provider)
           {
-             ELOGF("COMP", "Current unmapped. ATTACH buffer:%p", ec->pixmap, ec, buffer);
+             ELOGF("COMP", "Current unmapped. ATTACH buffer:%p", ec, buffer);
           }
      }
 
@@ -3005,7 +3005,7 @@ _e_comp_wl_surface_cb_input_region_set(struct wl_client *client EINA_UNUSED, str
 
         if (eina_tiler_empty(tmp))
           {
-             ELOGF("COMP", "         |unset input rect", NULL, NULL);
+             ELOGF("COMP", "         |unset input rect", NULL);
              e_comp_object_input_objs_del(ec->frame);
              e_comp_object_input_area_set(ec->frame, -1, -1, 1, 1);
           }
@@ -3033,7 +3033,7 @@ _e_comp_wl_surface_cb_commit(struct wl_client *client EINA_UNUSED, struct wl_res
         if (ec->comp_data->shell.surface && ec->comp_data->pending.new_attach &&
             !ec->internal && !ec->comp_data->sub.data && !ec->remote_surface.provider)
           {
-             ELOGF("COMP", "Current unmapped. COMMIT. pixmap_usable:%d", ec->pixmap, ec, e_pixmap_usable_get(ec->pixmap));
+             ELOGF("COMP", "Current unmapped. COMMIT. pixmap_usable:%d", ec, e_pixmap_usable_get(ec->pixmap));
           }
      }
 
@@ -3413,7 +3413,7 @@ _e_comp_wl_pname_print(pid_t pid)
 
    fclose(h);
 
-   ELOGF("COMP", "         |%s", NULL, NULL, pname);
+   ELOGF("COMP", "         |%s", NULL, pname);
 }
 
 
@@ -3434,7 +3434,7 @@ _e_comp_wl_compositor_cb_unbind(struct wl_resource *res_comp)
 
    ELOGF("COMP",
          "UNBIND   |res_comp:%8p|client:%8p|%d|%d|%d",
-         NULL, NULL,
+         NULL,
          res_comp,
          client,
          pid, uid, gid);
@@ -3483,7 +3483,7 @@ _e_comp_wl_compositor_cb_bind(struct wl_client *client, void *data EINA_UNUSED,
 
    ELOGF("COMP",
          "BIND     |res_comp:%8p|client:%8p|%d|%d|%d",
-         NULL, NULL,
+         NULL,
          res,
          client,
          pid, uid, gid);
@@ -3602,7 +3602,7 @@ _e_comp_wl_subsurface_check_below_bg_rectangle(E_Client *ec)
         ec->comp_data->sub.below_obj = evas_object_rectangle_add(e_comp->evas);
         EINA_SAFETY_ON_NULL_RETURN(ec->comp_data->sub.below_obj);
 
-        ELOGF("COMP", "         |bg_rectangle(%p) created", NULL, ec, ec->comp_data->sub.below_obj);
+        ELOGF("COMP", "         |bg_rectangle(%p) created", ec, ec->comp_data->sub.below_obj);
 
         layer = evas_object_layer_get(ec->frame);
         evas_object_layer_set(ec->comp_data->sub.below_obj, layer);
@@ -4013,9 +4013,9 @@ e_comp_wl_subsurface_create(E_Client *ec, E_Client *epc, uint32_t id, struct wl_
    ec->no_shape_cut = EINA_TRUE;
    ec->border_size = 0;
 
-   ELOGF("COMP", "         |subsurface_parent:%p", NULL, ec, epc);
+   ELOGF("COMP", "         |subsurface_parent:%p", ec, epc);
    if (offscreen_parent)
-     ELOGF("COMP", "         |offscreen_parent:%p", NULL, ec, offscreen_parent);
+     ELOGF("COMP", "         |offscreen_parent:%p", ec, offscreen_parent);
 
    if (epc)
      {
@@ -4488,7 +4488,7 @@ _e_comp_wl_client_usable_get(pid_t pid, E_Pixmap *ep)
              if (!ec->comp_data) return NULL;
              _e_comp_wl_client_evas_init(ec);
 
-             ELOGF("COMP", "Reusable ec. new_pixmap:%p", ec->pixmap, ec, ec->pixmap);
+             ELOGF("COMP", "Reusable ec. new_pixmap:%p", ec, ec->pixmap);
              _e_comp_wl_hook_call(E_COMP_WL_HOOK_CLIENT_REUSE, ec);
           }
      }
@@ -5007,14 +5007,14 @@ e_comp_wl_surface_commit(E_Client *ec)
           {
              if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
                {
-                  ELOGF("COMP", "Try to unmap2. Call shell.unmap.", ec->pixmap, ec);
+                  ELOGF("COMP", "Try to unmap2. Call shell.unmap.", ec);
                   ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
                }
              else if (e_client_has_xwindow(ec) || ec->internal || ec->comp_data->sub.data ||
                       (ec == e_comp_wl->drag_client))
                {
                   ELOGF("COMP", "Try to unmap2. Hide window. internal:%d, sub:%p, drag:%d",
-                        ec->pixmap, ec, ec->internal, ec->comp_data->sub.data, (ec == e_comp_wl->drag_client));
+                        ec, ec->internal, ec->comp_data->sub.data, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_FALSE;
                   evas_object_hide(ec->frame);
                   ec->comp_data->mapped = 0;
@@ -5031,14 +5031,14 @@ e_comp_wl_surface_commit(E_Client *ec)
              if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map) &&
                  (!ec->ignored))
                {
-                  ELOGF("COMP", "Try to map2. Call shell.map.", ec->pixmap, ec);
+                  ELOGF("COMP", "Try to map2. Call shell.map.", ec);
                   ec->comp_data->shell.map(ec->comp_data->shell.surface);
                }
              else if (e_client_has_xwindow(ec) || ec->internal || _e_comp_wl_subsurface_can_show(ec) ||
                       (ec == e_comp_wl->drag_client))
                {
                   ELOGF("COMP", "Try to map2. Show window. internal:%d, drag:%d",
-                        ec->pixmap, ec, ec->internal, (ec == e_comp_wl->drag_client));
+                        ec, ec->internal, (ec == e_comp_wl->drag_client));
                   ec->visible = EINA_TRUE;
                   ec->ignored = 0;
                   evas_object_show(ec->frame);
@@ -6336,7 +6336,7 @@ e_comp_wl_commit_sync_client_geometry_add(E_Client *ec,
    return EINA_TRUE;
 
 err:
-   ELOGF("POSSIZE", "Could not add geometry(new:%d full:%d max:%d)", ec->pixmap, ec, ec->new_client, ec->fullscreen, ec->maximized);
+   ELOGF("POSSIZE", "Could not add geometry(new:%d full:%d max:%d)", ec, ec->new_client, ec->fullscreen, ec->maximized);
 
 ret:
    return EINA_FALSE;
@@ -6425,7 +6425,7 @@ e_comp_wl_commit_sync_configure(E_Client *ec)
           }
 
         if (change)
-          ELOGF("POSSIZE", "Configure pending geometry mode:%d(%d,%d - %dx%d)", ec->pixmap, ec, change, ec->x, ec->y, ec->w, ec->h);
+          ELOGF("POSSIZE", "Configure pending geometry mode:%d(%d,%d - %dx%d)", ec, change, ec->x, ec->y, ec->w, ec->h);
      }
 
    // cw interceptor(move,resize) won't work if wait_commit is TRUE
@@ -6446,7 +6446,7 @@ e_comp_wl_commit_sync_configure(E_Client *ec)
    return EINA_TRUE;
 
 err:
-   ELOGF("POSSIZE", "Could not configure geometry (%d,%d - %dx%d) bw:%d bh:%d", ec->pixmap, ec, ec->x, ec->y, ec->w, ec->h, bw, bh);
+   ELOGF("POSSIZE", "Could not configure geometry (%d,%d - %dx%d) bw:%d bh:%d", ec, ec->x, ec->y, ec->w, ec->h, bw, bh);
 
 ret:
    return EINA_FALSE;
@@ -6478,7 +6478,7 @@ _tz_move_resize_iface_cb_set_geometry(struct wl_client *client EINA_UNUSED,
    return;
 
 err:
-   ELOGF("POSSIZE", "Could not add set_geometry request(serial:%d, %d,%d - %dx%d)", ec->pixmap, ec, serial, x, y, w, h);
+   ELOGF("POSSIZE", "Could not add set_geometry request(serial:%d, %d,%d - %dx%d)", ec, serial, x, y, w, h);
 }
 
 static const struct tizen_move_resize_interface _tz_move_resize_iface =
index 8171e9c..a988e54 100644 (file)
@@ -363,7 +363,7 @@ _remote_provider_offscreen_set(E_Comp_Wl_Remote_Provider* provider, Eina_Bool se
         //TODO: save original values
         if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
           {
-             ELOGF("COMP", "Call shell.unmap by rsm", ec->pixmap, ec);
+             ELOGF("COMP", "Call shell.unmap by rsm", ec);
              ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
           }
         else
@@ -896,7 +896,7 @@ _remote_surface_ignore_output_transform_send(E_Comp_Wl_Remote_Common *common)
 ignore:
    if (common->ignore_output_transform != EINA_TRUE)
      {
-        ELOGF("TRANSFORM", "ignore output transform: %s", common->ec->pixmap, common->ec, msg);
+        ELOGF("TRANSFORM", "ignore output transform: %s", common->ec, msg);
         e_comp_screen_rotation_ignore_output_transform_send(common->ec, EINA_TRUE);
         common->ignore_output_transform = EINA_TRUE;
      }
@@ -905,7 +905,7 @@ ignore:
 no_ignore:
    if (common->ignore_output_transform != EINA_FALSE)
      {
-        ELOGF("TRANSFORM", "not ignore output transform: %s", common->ec->pixmap, common->ec, msg);
+        ELOGF("TRANSFORM", "not ignore output transform: %s", common->ec, msg);
         e_comp_screen_rotation_ignore_output_transform_send(common->ec, EINA_FALSE);
         common->ignore_output_transform = EINA_FALSE;
      }
@@ -3001,7 +3001,7 @@ _remote_manager_cb_surface_create(struct wl_client *client,
           {
              ELOGF("TRS",
                    "Privilege Check Failed! DENY creating tizen_remote_surface pid:%d",
-                   NULL, NULL, pid);
+                   NULL, pid);
              goto fail;
           }
 
@@ -3438,7 +3438,7 @@ _e_comp_wl_remote_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *st
         int transform_change = (4 + state->buffer_viewport.buffer.transform - vp->buffer.transform) & 0x3;
 
         ELOGF("TRANSFORM", "buffer_transform changed: old(%d) new(%d)",
-              ec->pixmap, ec,
+              ec,
               vp->buffer.transform, state->buffer_viewport.buffer.transform);
 
         if (transform_change == vp->wait_for_transform_change)
index f825890..9ad3433 100644 (file)
@@ -81,7 +81,7 @@ _e_screenmirror_privilege_check(struct wl_client *client)
      {
         ELOGF("EOM",
               "Privilege Check Failed! DENY screenshot pid:%d",
-              NULL, NULL, pid);
+              NULL, pid);
         return EINA_FALSE;
      }
 
index 229772c..2170e6a 100644 (file)
@@ -24,19 +24,19 @@ e_shell_e_client_shell_assignable_check(E_Client *ec)
    if (e_object_is_del(E_OBJECT(ec)))
      {
         ELOGF("SHELL", "ERR: Could not assign shell: being deleted by compositor",
-              ec->pixmap, ec);
+              ec);
         return EINA_FALSE;
      }
    else if (!ec->comp_data)
      {
         ELOGF("SHELL", "ERR: Could not assign shell: No E_Comp_Client_Data",
-              ec->pixmap, ec);
+              ec);
         return EINA_FALSE;
      }
    else if (ec->comp_data->shell.surface)
      {
         ELOGF("SHELL", "ERR: Could not assign shell: Already assigned",
-              ec->pixmap, ec);
+              ec);
         return EINA_FALSE;
      }
 
@@ -57,7 +57,7 @@ e_shell_e_client_shsurface_assign(E_Client *ec,
    if (!cdata)
      {
         ELOGF("SHELL", "ERR: E_Client must have E_Comp_Client_Data",
-              ec->pixmap, ec);
+              ec);
         return;
      }
 
@@ -87,7 +87,7 @@ e_shell_e_client_shsurface_api_set(E_Client *ec, E_Shell_Surface_Api *api)
    if (!cdata)
      {
         ELOGF("SHELL", "ERR: E_Client must have E_Comp_Client_Data",
-              ec->pixmap, ec);
+              ec);
         return;
      }
 
@@ -103,7 +103,7 @@ e_shell_e_client_toplevel_set(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("SHELL", "Set toplevel", ec->pixmap, ec);
+   ELOGF("SHELL", "Set toplevel", ec);
 
    /* set toplevel client properties */
    if (!ec->internal)
@@ -121,7 +121,7 @@ e_shell_e_client_popup_set(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("SHELL", "Set popup", ec->pixmap, ec);
+   ELOGF("SHELL", "Set popup", ec);
 
    EC_CHANGED(ec);
    ec->new_client = ec->override = 1;
@@ -145,7 +145,7 @@ e_shell_e_client_pong(E_Client *ec)
 
    if (e_object_is_del(E_OBJECT(ec))) return;
 
-   ELOGF("SHELL", "Pong", ec->pixmap, ec);
+   ELOGF("SHELL", "Pong", ec);
 
    ec->ping_ok = EINA_TRUE;
    ec->hung = EINA_FALSE;
@@ -373,7 +373,7 @@ e_shell_e_client_destroy(E_Client *ec)
 
    if (e_policy_visibility_client_grab_cancel(ec))
      {
-        ELOGF("POL_VIS", "CLIENT VIS ON(temp).", ec->pixmap, ec);
+        ELOGF("POL_VIS", "CLIENT VIS ON(temp).", ec);
         ec->visibility.obscured = E_VISIBILITY_UNOBSCURED;
         ec->visibility.changed = 1;
      }
@@ -386,7 +386,7 @@ e_shell_e_client_destroy(E_Client *ec)
              if ((ec->comp_data->shell.surface) &&
                  (ec->comp_data->shell.unmap))
                {
-                  ELOGF("SHELL", "Call shell.unmap by destory surface", ec->pixmap, ec);
+                  ELOGF("SHELL", "Call shell.unmap by destory surface", ec);
                   ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
                }
           }
@@ -403,7 +403,7 @@ e_shell_e_client_destroy(E_Client *ec)
    if (ec->comp_data)
      ec->comp_data->shell.surface = NULL;
 
-   ELOGF("SHELL", "Destroy shell surface", ec->pixmap, ec);
+   ELOGF("SHELL", "Destroy shell surface", ec);
 
    e_policy_client_unmap(ec);
 }
@@ -718,7 +718,7 @@ _e_shell_client_map_common_pre(E_Client *ec)
 
    if (ec->use_splash)
      {
-        ELOGF("LAUNCH", "SHOW real win after splash effect", ec->pixmap, ec);
+        ELOGF("LAUNCH", "SHOW real win after splash effect", ec);
         e_comp_object_signal_emit(ec->frame, "e,action,launch_real,done", "e");
      }
    ec->use_splash = EINA_FALSE;
@@ -766,7 +766,7 @@ _e_shell_client_map_common_post(E_Client *ec)
    if (!(ec->iconic && ec->exp_iconify.by_client))
      e_vis_client_check_send_pre_visibility_event(ec, EINA_FALSE);
 
-   ELOGF("COMP", "Un-Set launching flag", ec->pixmap, ec);
+   ELOGF("COMP", "Un-Set launching flag", ec);
    ec->launching = EINA_FALSE;
 
    EC_CHANGED(ec);
@@ -794,13 +794,13 @@ _e_shell_surface_map(struct wl_resource *resource)
      {
         ELOGF("SHELL",
               "Map window  |win:0x%08x|ec_size:%d,%d|pid:%d|title:%s, name:%s",
-              ec->pixmap, ec,
+              ec,
               (unsigned int)e_client_util_win_get(ec),
               ec->w, ec->h, ec->netwm.pid, ec->icccm.title, ec->netwm.name);
 
         ELOGF("SHELL",
               "spash:%d, first_mapped:%d, iconic:%d(client:%d), raise:%d, lower:%d, ignore:%d, override:%d, input_only:%d",
-              ec->pixmap, ec,
+              ec,
               ec->use_splash, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client,
               ec->post_raise, ec->post_lower, ec->ignored, ec->override, ec->input_only);
 
@@ -838,7 +838,7 @@ _e_shell_surface_unmap(struct wl_resource *resource)
 
         ELOGF("SHELL",
               "Unmap window  |win:0x%08x|ec_size:%d,%d",
-              ec->pixmap, ec,
+              ec,
               (unsigned int)e_client_util_win_get(ec),
               ec->w, ec->h);
      }
@@ -886,7 +886,7 @@ _e_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resource *reso
                                   ec,
                                   _e_shell_surface_cb_destroy);
 
-   ELOGF("SHELL", "Create shell surface", ec->pixmap, ec);
+   ELOGF("SHELL", "Create shell surface", ec);
 
    e_shell_e_client_shsurface_assign(ec, shsurf_resource, &api);
    e_comp_wl_shell_surface_ready(ec);
@@ -1314,13 +1314,13 @@ _e_xdg_shell_surface_map_cb_timer(void *data)
      {
         ELOGF("SHELL",
               "Map window by map_timer |win:0x%08x|ec_size:%d,%d|pid:%d|title:%s, name:%s",
-              ec->pixmap, ec,
+              ec,
               (unsigned int)e_client_util_win_get(ec),
               ec->w, ec->h, ec->netwm.pid, ec->icccm.title, ec->netwm.name);
 
         ELOGF("SHELL",
               "spash:%d, first_mapped:%d, iconic:%d(client:%d), raise:%d, lower:%d, ignore:%d, override:%d, input_only:%d",
-              ec->pixmap, ec,
+              ec,
               ec->use_splash, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client,
               ec->post_raise, ec->post_lower, ec->ignored, ec->override, ec->input_only);
 
@@ -1351,13 +1351,13 @@ e_shell_e_client_map(E_Client *ec)
 
    if (ec->comp_data->mapped)
      {
-        ELOGF("SHELL", "Map window  | Already mapped.", ec->pixmap, ec);
+        ELOGF("SHELL", "Map window  | Already mapped.", ec);
         return;
      }
 
    if (!e_pixmap_usable_get(ec->pixmap))
      {
-        ELOGF("SHELL", "Map window  | No operation. Pixmap(%p) is not usable.", ec->pixmap, ec, ec->pixmap);
+        ELOGF("SHELL", "Map window  | No operation. Pixmap(%p) is not usable.", ec, ec->pixmap);
         return;
      }
 
@@ -1380,7 +1380,7 @@ e_shell_e_client_map(E_Client *ec)
              // skip. because the pixmap's size doesnot same to ec's size
              ELOGF("SHELL",
                    "Deny Map |win:0x%08x|ec_size:%d,%d|get_size:%d,%d|pix_size:%d,%d",
-                   ec->pixmap, ec,
+                   ec,
                    (unsigned int)e_client_util_win_get(ec),
                    ec->w, ec->h, cw, ch, pw, ph);
 
@@ -1395,13 +1395,13 @@ e_shell_e_client_map(E_Client *ec)
 
    ELOGF("SHELL",
          "Map window  |win:0x%08x|ec_size:%d,%d|pid:%d|title:%s, name:%s",
-         ec->pixmap, ec,
+         ec,
          (unsigned int)e_client_util_win_get(ec),
          ec->w, ec->h, ec->netwm.pid, ec->icccm.title, ec->netwm.name);
 
    ELOGF("SHELL",
          "spash:%d, first_mapped:%d, iconic:%d(client:%d), raise:%d, lower:%d, ignore:%d, override:%d, input_only:%d",
-         ec->pixmap, ec,
+         ec,
          ec->use_splash, ec->first_mapped, ec->iconic, ec->exp_iconify.by_client,
          ec->post_raise, ec->post_lower, ec->ignored, ec->override, ec->input_only);
 
@@ -1451,7 +1451,7 @@ e_shell_e_client_unmap(E_Client *ec)
 
         ELOGF("SHELL",
               "Unmap window  |win:0x%08x|ec_size:%d,%d",
-              ec->pixmap, ec,
+              ec,
               (unsigned int)e_client_util_win_get(ec),
               ec->w, ec->h);
      }
@@ -1519,7 +1519,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
         wl_resource_post_no_memory(surface_resource);
         return;
      }
-   ELOGF("SHELL", "Create xdg shell surface", ec->pixmap, ec);
+   ELOGF("SHELL", "Create xdg shell surface", ec);
 
    wl_resource_set_implementation(shsurf_resource,
                                   &_e_xdg_surface_interface,
@@ -1591,7 +1591,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
         wl_resource_post_no_memory(surface_resource);
         return;
      }
-   ELOGF("SHELL", "Create xdg shell popup surface", ec->pixmap, ec);
+   ELOGF("SHELL", "Create xdg shell popup surface", ec);
 
    wl_resource_set_implementation(shsurf_resource,
                                   &_e_xdg_popup_interface,
index 1fbcb3b..cb6201e 100644 (file)
@@ -9,13 +9,13 @@
 #include <tizen-extension-server-protocol.h>
 
 #define PER(fmt,arg...) ELOGF("VIEWPORT", "<ERR> window(0x%08"PRIxPTR") epc(%p): " \
-                              fmt, viewport->ec->pixmap, viewport->ec, \
+                              fmt, viewport->ec, \
                               viewport->window, viewport->epc, ##arg)
 #define PWR(fmt,arg...) ELOGF("VIEWPORT", "<WRN> window(0x%08"PRIxPTR") epc(%p): " \
-                              fmt, viewport->ec->pixmap, viewport->ec, \
+                              fmt, viewport->ec, \
                               viewport->window, viewport->epc, ##arg)
 #define PIN(fmt,arg...) ELOGF("VIEWPORT", "<INF> window(0x%08"PRIxPTR") epc(%p): " \
-                              fmt, viewport->ec->pixmap, viewport->ec, \
+                              fmt, viewport->ec, \
                               viewport->window, viewport->epc, ##arg)
 #define PDB(fmt,arg...) DBG("window(0x%08"PRIxPTR") ec(%p) epc(%p): "fmt, \
                             viewport->window, viewport->ec, viewport->epc, ##arg)
index 0ab735e..bc5c643 100644 (file)
@@ -695,12 +695,12 @@ _e_config_domain_user_load(const char *domain, E_Config_DD *edd)
         _e_config_eet_close_handle(ef, buf);
         if (data)
           {
-             ELOGF("CFG", "Loaded %s", NULL, NULL, buf);
+             ELOGF("CFG", "Loaded %s", NULL, buf);
              return data;
           }
      }
 
-   ELOGF("CFG", "Could not load %s", NULL, NULL, buf);
+   ELOGF("CFG", "Could not load %s", NULL, buf);
 
    return data;
 }
@@ -734,7 +734,7 @@ e_config_domain_load(const char *domain, E_Config_DD *edd)
           }
         if (data) return data;
 
-        ELOGF("CFG", "Enlightenment has an error again while loading domain %s", NULL, NULL, domain);
+        ELOGF("CFG", "Enlightenment has an error again while loading domain %s", NULL, domain);
      }
 
    return e_config_domain_system_load(domain, edd);
@@ -756,14 +756,14 @@ e_config_domain_system_load(const char *domain, E_Config_DD *edd)
         _e_config_eet_close_handle(ef, buf);
         if (data)
           {
-             ELOGF("CFG", "Loaded %s", NULL, NULL, buf);
+             ELOGF("CFG", "Loaded %s", NULL, buf);
              return data;
           }
 
-        ELOGF("CFG", "Could not read data %s", NULL, NULL, buf);
+        ELOGF("CFG", "Could not read data %s", NULL, buf);
      }
 
-   ELOGF("CFG", "Could not load %s", NULL, NULL, buf);
+   ELOGF("CFG", "Could not load %s", NULL, buf);
 
    return data;
 }
@@ -1143,7 +1143,7 @@ _e_config_eet_close_handle(Eet_File *ef, char *file)
           }
         return 0;
 #else
-        ELOGF("CFG", "EET ERROR %s", NULL, NULL, erstr);
+        ELOGF("CFG", "EET ERROR %s", NULL, erstr);
         return 0;
 #endif
      }
index ca2f5ba..b57b59b 100644 (file)
@@ -467,7 +467,7 @@ e_desk_last_focused_focus(E_Desk *desk)
      }
    if (e_client_focused_get())
      {
-        ELOGF("FOCUS", "focus unset | last_focused_focus", NULL, e_client_focused_get());
+        ELOGF("FOCUS", "focus unset | last_focused_focus", e_client_focused_get());
         evas_object_focus_set(e_client_focused_get()->frame, 0);
      }
    return NULL;
@@ -744,7 +744,7 @@ e_desk_flip_end(E_Desk *desk)
               if (e_client_util_ignored_get(ec)) continue;
               if (!e_client_util_desk_visible(ec, desk)) continue;
               if (ec->iconic) continue;
-              ELOGF("FOCUS", "focus set | desk flip end", NULL, ec);
+              ELOGF("FOCUS", "focus set | desk flip end", ec);
               evas_object_focus_set(ec->frame, 1);
               if (e_config->raise_on_revert_focus)
                 evas_object_raise(ec->frame);
index 09336fb..fa7e2b4 100644 (file)
@@ -8,7 +8,7 @@
 E_API void
 e_error_message_show_internal(char *txt)
 {
-   ELOGF("E ERROR", "%s", NULL, NULL, txt);
+   ELOGF("E ERROR", "%s", NULL, txt);
 }
 
 /* local subsystem functions */
index 55aa24a..e3b2ae0 100644 (file)
@@ -12,7 +12,7 @@ e_focus_event_mouse_in(E_Client *ec)
    if ((e_config->focus_policy == E_FOCUS_MOUSE) ||
        (e_config->focus_policy == E_FOCUS_SLOPPY))
      {
-        ELOGF("FOCUS", "focus set | moues in", NULL, ec);
+        ELOGF("FOCUS", "focus set | moues in", ec);
         evas_object_focus_set(ec->frame, 1);
      }
    if (e_config->use_auto_raise)
@@ -31,7 +31,7 @@ e_focus_event_mouse_out(E_Client *ec)
           {
              if (ec->focused)
                {
-                  ELOGF("FOCUS", "focus unset | moues out", NULL, ec);
+                  ELOGF("FOCUS", "focus unset | moues out", ec);
                   evas_object_focus_set(ec->frame, 0);
                }
           }
@@ -44,7 +44,7 @@ e_focus_event_mouse_down(E_Client *ec)
    if (e_client_focus_policy_click(ec) ||
        e_config->always_click_to_focus)
      {
-        ELOGF("FOCUS", "focus set | moues down", NULL, ec);
+        ELOGF("FOCUS", "focus set | moues down", ec);
         evas_object_focus_set(ec->frame, 1);
 
         if (ec->floating)
index 117079c..d82cef4 100644 (file)
@@ -278,8 +278,8 @@ e_hints_aux_hint_add_with_pixmap(E_Pixmap *cp, int32_t id, const char *name, con
              if (strcmp(hint->val, val) != 0)
                {
                   ELOGF("COMP", "AUX_HINT |Change [pixmap] [%d:%s:%s -> %s]",
-                        cp, e_pixmap_client_get(cp),
-                         id, hint->hint, hint->val, val);
+                        e_pixmap_client_get(cp),
+                        id, hint->hint, hint->val, val);
                   eina_stringshare_del(hint->val);
                   hint->val = eina_stringshare_add(val);
                   hint->changed = EINA_TRUE;
@@ -306,7 +306,7 @@ e_hints_aux_hint_add_with_pixmap(E_Pixmap *cp, int32_t id, const char *name, con
         hint->deleted = EINA_FALSE;
         cdata->aux_hint.hints = eina_list_append(cdata->aux_hint.hints, hint);
         cdata->aux_hint.changed = 1;
-        ELOGF("COMP", "AUX_HINT |Add [%d:%s:%s]", cp, e_pixmap_client_get(cp),
+        ELOGF("COMP", "AUX_HINT |Add [%d:%s:%s]", e_pixmap_client_get(cp),
               id, hint->hint, hint->val);
      }
 
@@ -334,7 +334,7 @@ e_hints_aux_hint_change_with_pixmap(E_Pixmap *cp, int32_t id, const char *val)
           {
              if ((hint->val) && (strcmp(hint->val, val) != 0))
                {
-                  ELOGF("COMP", "AUX_HINT |Change [%d:%s:%s -> %s]", cp, e_pixmap_client_get(cp),
+                  ELOGF("COMP", "AUX_HINT |Change [%d:%s:%s -> %s]", e_pixmap_client_get(cp),
                         id, hint->hint, hint->val, val);
                   eina_stringshare_del(hint->val);
                   hint->val = eina_stringshare_add(val);
@@ -372,7 +372,7 @@ e_hints_aux_hint_del_with_pixmap(E_Pixmap *cp, int32_t id)
      {
         if (hint->id == id)
           {
-             ELOGF("COMP", "AUX_HINT |Del (pending) [%d:%s:%s]", cp, e_pixmap_client_get(cp), id, hint->hint, hint->val);
+             ELOGF("COMP", "AUX_HINT |Del (pending) [%d:%s:%s]", e_pixmap_client_get(cp), id, hint->hint, hint->val);
              hint->changed = EINA_TRUE;
              hint->deleted = EINA_TRUE;
              cdata->aux_hint.changed = 1;
index 412ca95..532e7ca 100644 (file)
@@ -429,7 +429,7 @@ e_hwc_deactive_set(E_Hwc *hwc, Eina_Bool set)
    e_hwc_planes_end(hwc, __FUNCTION__);
    hwc->hwc_deactive = set;
 
-   ELOGF("HWC", "e_hwc_deactive_set : %d", NULL, NULL, set);
+   ELOGF("HWC", "e_hwc_deactive_set : %d", NULL, set);
 }
 
 EINTERN Eina_Bool
index e050def..1e91ed3 100644 (file)
@@ -297,7 +297,7 @@ _e_hwc_planes_unset(E_Plane *ep)
    e_plane_ec_prepare_set(ep, NULL);
    e_plane_ec_set(ep, NULL);
 
-   ELOGF("HWC-PLNS", "unset plane %d to NULL", NULL, NULL, ep->zpos);
+   ELOGF("HWC-PLNS", "unset plane %d to NULL", NULL, ep->zpos);
 }
 
 static Eina_Bool
@@ -308,10 +308,10 @@ _e_hwc_planes_change_ec(E_Plane *ep, E_Client *new_ec)
 
    if (new_ec)
      ELOGF("HWC-PLNS", "new_ec(%s) is set on %d",
-           new_ec->pixmap, new_ec,
+           new_ec,
            e_client_util_name_get(new_ec) ? new_ec->icccm.name : "no name", ep->zpos);
    else
-     ELOGF("HWC-PLNS", "NULL is set on %d", NULL, NULL, ep->zpos);
+     ELOGF("HWC-PLNS", "NULL is set on %d", NULL, ep->zpos);
 
    return EINA_TRUE;
 }
@@ -341,7 +341,7 @@ _e_hwc_planes_changed(E_Hwc *hwc)
             ep->prepare_ec == NULL)
           {
              e_plane_reserved_set(ep, 0);
-             ELOGF("HWC-PLNS", "unset reserved mem on %d", NULL, NULL, ep->zpos);
+             ELOGF("HWC-PLNS", "unset reserved mem on %d", NULL, ep->zpos);
           }
 
         if (ep->ec != ep->prepare_ec)
@@ -362,7 +362,7 @@ _e_hwc_planes_changed(E_Hwc *hwc)
    if (hwc->hwc_mode != mode)
      {
         ELOGF("HWC-PLNS", "mode changed (from %d to %d) due to surface changes",
-              NULL, NULL,
+              NULL,
               hwc->hwc_mode, mode);
 
         if (mode == E_HWC_MODE_FULL)
@@ -382,9 +382,9 @@ _e_hwc_planes_changed(E_Hwc *hwc)
    if (ret)
      {
         if (hwc->hwc_mode == E_HWC_MODE_NONE)
-          ELOGF("HWC-PLNS", " End...  due to surface changes", NULL, NULL);
+          ELOGF("HWC-PLNS", " End...  due to surface changes", NULL);
         else
-          ELOGF("HWC-PLNS", " hwc surface changed", NULL, NULL);
+          ELOGF("HWC-PLNS", " hwc surface changed", NULL);
      }
 }
 
@@ -570,7 +570,7 @@ _e_hwc_planes_begin(E_Hwc *hwc)
 
              if (e_plane_is_fb_target(ep))
                {
-                  ELOGF("HWC-PLNS", "is set on fb_target( %d)", ep->prepare_ec->pixmap, ep->prepare_ec, ep->zpos);
+                  ELOGF("HWC-PLNS", "is set on fb_target( %d)", ep->prepare_ec, ep->zpos);
                   mode = E_HWC_MODE_FULL;
 
                   // fb target is occupied by a client surface, means compositor disabled
@@ -578,13 +578,13 @@ _e_hwc_planes_begin(E_Hwc *hwc)
                }
              else
                {
-                  ELOGF("HWC-PLNS", "is set on %d", ep->prepare_ec->pixmap, ep->prepare_ec, ep->zpos);
+                  ELOGF("HWC-PLNS", "is set on %d", ep->prepare_ec, ep->zpos);
                   mode = E_HWC_MODE_HYBRID;
                }
           }
 
         if (mode != E_HWC_MODE_NONE)
-          ELOGF("HWC-PLNS", " Begin ...", NULL, NULL);
+          ELOGF("HWC-PLNS", " Begin ...", NULL);
      }
 
    hwc->hwc_mode = mode;
@@ -617,7 +617,7 @@ e_hwc_planes_multi_plane_set(E_Hwc *hwc, Eina_Bool set)
    e_hwc_planes_end(hwc, __FUNCTION__);
    hwc->hwc_use_multi_plane = set;
 
-   ELOGF("HWC-PLNS", "e_hwc_planes_multi_plane_set : %d", NULL, NULL, set);
+   ELOGF("HWC-PLNS", "e_hwc_planes_multi_plane_set : %d", NULL, set);
 }
 
 EINTERN Eina_Bool
@@ -665,7 +665,7 @@ end:
 
    hwc->hwc_mode = new_mode;
 
-   ELOGF("HWC-PLNS", " End...  at %s.", NULL, NULL, location);
+   ELOGF("HWC-PLNS", " End...  at %s.", NULL, location);
 }
 
 EINTERN void
@@ -720,7 +720,7 @@ e_hwc_planes_client_end(E_Hwc *hwc, E_Client *ec, const char *location)
    if ((old_hwc == E_HWC_MODE_FULL) && (new_hwc != E_HWC_MODE_FULL))
      ecore_event_add(E_EVENT_COMPOSITOR_ENABLE, NULL, NULL, NULL);
 
-   ELOGF("HWC-PLNS", " End client:%p(%s)...  at %s.", NULL, NULL, ec, e_client_util_name_get(ec), location);
+   ELOGF("HWC-PLNS", " End client:(%s)...  at %s.", ec, e_client_util_name_get(ec), location);
 
    hwc->hwc_mode = new_hwc;
 }
index 7c2f9ae..4393b2c 100644 (file)
 # define DLOG_BACKTRACE
 #endif
 
-#define ELOG(t, cp, ec)                        \
-   do                                          \
-     {                                         \
-        INF("EWL|%20.20s|win:0x%08zx|ec:%8p|", \
-            (t),                               \
-            (e_client_util_win_get(ec)),       \
-            (ec));                             \
-     }                                         \
+# if (E_LOGGING >= 2) /* new version */
+#  define ELOG(t, ec)                                       \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|",              \
+              (t), (e_client_util_win_get(ec)), (ec));      \
+        else                                                \
+          INF("EWL|%20.20s|            |             |",    \
+              (t));                                         \
+     }                                                      \
    while (0)
 
-#define ELOGF(t, f, cp, ec, x...)              \
-   do                                          \
-     {                                         \
-        INF("EWL|%20.20s|win:0x%08zx|ec:%8p|"f,\
-            (t),                               \
-            (e_client_util_win_get(ec)),       \
-            (ec),                              \
-            ##x);                              \
-     }                                         \
+#  define ELOGF(t, f, ec, x...)                             \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|"f,             \
+              (t), (e_client_util_win_get(ec)), (ec), ##x); \
+        else                                                \
+          INF("EWL|%20.20s|            |             |"f,   \
+              (t), ##x);                                    \
+     }                                                      \
    while (0)
+# else /* old version */
+#  define ELOG(t, cp, ec)                                   \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|",              \
+              (t), (e_client_util_win_get(ec)), (ec));      \
+        else                                                \
+          INF("EWL|%20.20s|            |             |",    \
+              (t));                                         \
+     }                                                      \
+   while (0)
+
+#  define ELOGF(t, f, cp, ec, x...)                         \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|"f,             \
+              (t), (e_client_util_win_get(ec)), (ec), ##x); \
+        else                                                \
+          INF("EWL|%20.20s|            |             |"f,   \
+              (t), ##x);                                    \
+     }                                                      \
+   while (0)
+# endif /* end of if (E_LOGGING >= 2) */
 
 typedef enum _E_Log_Type
 {
index de33d66..6d2af90 100644 (file)
@@ -763,7 +763,7 @@ main(int argc, char **argv)
 #endif
    ecore_main_loop_begin();
 
-   ELOGF("COMP", "STOPPING enlightenment...", NULL, NULL);
+   ELOGF("COMP", "STOPPING enlightenment...", NULL);
    stopping = EINA_TRUE;
 
    _e_main_desk_save();
index 67cd354..bed1b07 100644 (file)
@@ -2188,7 +2188,7 @@ e_output_rotate(E_Output *output, int rotate)
                          output->info.size.w, output->info.size.h,
                          output->config.mode.refresh, 0, transform);
 
-   ELOGF("TRANSFORM", "output(%s) transform(%d)", NULL, NULL, output->info.name, transform);
+   ELOGF("TRANSFORM", "output(%s) transform(%d)", NULL, output->info.name, transform);
 
    return EINA_TRUE;
 }
@@ -3132,8 +3132,8 @@ e_output_zoom_set(E_Output *output, double zoomx, double zoomy, int cx, int cy)
    if (!output->zoom_set) output->zoom_set = EINA_TRUE;
 
    ELOGF("ZOOM", "zoom set output:%s, zoom(x:%f, y:%f, cx:%d, cy:%d) rect(x:%d, y:%d, w:%d, h:%d)",
-       NULL, NULL, output->id, zoomx, zoomy, cx, cy,
-       output->zoom_conf.rect.x, output->zoom_conf.rect.y, output->zoom_conf.rect.w, output->zoom_conf.rect.h);
+         NULL, output->id, zoomx, zoomy, cx, cy,
+         output->zoom_conf.rect.x, output->zoom_conf.rect.y, output->zoom_conf.rect.w, output->zoom_conf.rect.h);
 
    return EINA_TRUE;
 }
@@ -3215,7 +3215,7 @@ e_output_zoom_unset(E_Output *output)
    /* update the ecore_evas */
    _e_output_render_update(output);
 
-   ELOGF("ZOOM", "e_output_zoom_unset: output:%s", NULL, NULL, output->id);
+   ELOGF("ZOOM", "e_output_zoom_unset: output:%s", NULL, output->id);
 }
 
 E_API E_Output_Hook *
index 3b05fcc..a5f8de7 100644 (file)
@@ -115,7 +115,7 @@ _e_pixmap_clear(E_Pixmap *cp, Eina_Bool cache)
 
    if (cp->type != E_PIXMAP_TYPE_WL) return;
    e_pixmap_image_clear(cp, cache);
-   ELOGF("PIXMAP", "PIXMAP CLEAR. cp:%p", cp, cp->client, cp);
+   ELOGF("PIXMAP", "PIXMAP CLEAR. cp:%p", cp->client, cp);
 }
 
 static void
@@ -135,7 +135,7 @@ _e_pixmap_free(E_Pixmap *cp)
         cp->data_pool = NULL;
      }
    _e_pixmap_clear(cp, 1);
-   ELOGF("PIXMAP", "PIXMAP FREE. cp:%p", cp, cp->client, cp);
+   ELOGF("PIXMAP", "PIXMAP FREE. cp:%p", cp->client, cp);
 
    if (cp->shm_flusher)
      {
@@ -280,7 +280,7 @@ e_pixmap_free(E_Pixmap *cp)
 {
    if (!cp) return 0;
    if (--cp->refcount) return cp->refcount;
-   ELOGF("PIXMAP", "PIXMAP DEL. cp:%p", NULL, NULL, cp);
+   ELOGF("PIXMAP", "PIXMAP DEL. cp:%p", NULL, cp);
    if (cp->usable)
      e_pixmap_usable_set(cp, 0);
 
@@ -350,7 +350,7 @@ e_pixmap_new(E_Pixmap_Type type, ...)
    if (!cp)
      {
         va_end(l);
-        ELOGF("PIXMAP", "NEW failed id:%p", NULL, NULL, (void *)id);
+        ELOGF("PIXMAP", "NEW failed id:%p", NULL, (void *)id);
         return NULL;
      }
 
@@ -363,7 +363,7 @@ e_pixmap_new(E_Pixmap_Type type, ...)
 
    cp->res_id = ++res_id;
    eina_hash_add(res_ids, &res_id, cp);
-   ELOGF("PIXMAP", "PIXMAP NEW. cp:%p, id:%d", NULL, NULL, cp, cp->res_id);
+   ELOGF("PIXMAP", "PIXMAP NEW. cp:%p, id:%d", NULL, cp, cp->res_id);
 
 end:
    va_end(l);
@@ -561,7 +561,7 @@ e_pixmap_client_set(E_Pixmap *cp, E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(cp);
    if (cp->client && ec) CRI("ACK!");
-   ELOGF("PIXMAP", "PIXMAP CLIENT SET. cp:%p ec:%p", NULL, ec, cp, ec);
+   ELOGF("PIXMAP", "PIXMAP CLIENT SET. cp:%p", ec, cp);
    cp->client = ec;
 }
 
index cebef1e..00a6d8d 100644 (file)
@@ -103,7 +103,7 @@ _e_plane_surface_can_set(E_Plane *plane, tbm_surface_h tsurface)
           {
              if (plane_trace_debug)
                ELOGF("E_PLANE", "Used    Plane(%p) zpos(%d) tsurface(%p)",
-                      NULL, NULL, tmp_plane, tmp_plane->zpos, tsurface);
+                      NULL, tmp_plane, tmp_plane->zpos, tsurface);
 
              return EINA_FALSE;
           }
@@ -161,7 +161,7 @@ _e_plane_surface_unset(E_Plane *plane)
    if (plane->skip_surface_set) return EINA_TRUE;
 
    if (plane_trace_debug)
-     ELOGF("E_PLANE", "Unset   Plane(%p) zpos(%d)", NULL, NULL, plane, plane->zpos);
+     ELOGF("E_PLANE", "Unset   Plane(%p) zpos(%d)", NULL, plane, plane->zpos);
 
    CLEAR(plane->info);
 
@@ -214,7 +214,7 @@ _e_plane_tlayer_info_set(E_Plane *plane, unsigned int size_w, unsigned int size_
    if (plane_trace_debug)
      {
         ELOGF("E_PLANE", "Set  Plane(%p)     (%dx%d,[%d,%d,%d,%d]=>[%d,%d,%d,%d])",
-              NULL, NULL, plane,
+              NULL, plane,
               plane->info.src_config.size.h, plane->info.src_config.size.v,
               plane->info.src_config.pos.x, plane->info.src_config.pos.y,
               plane->info.src_config.pos.w, plane->info.src_config.pos.h,
@@ -400,7 +400,7 @@ _e_plane_surface_set(E_Plane *plane, tbm_surface_h tsurface)
      tbm_surface_internal_set_damage(tsurface, 0, 0, surf_info.width, surf_info.height);
 
    if (plane_trace_debug)
-     ELOGF("E_PLANE", "Set  Plane(%p)     tsurface(%p)", NULL, NULL, plane, tsurface);
+     ELOGF("E_PLANE", "Set  Plane(%p)     tsurface(%p)", NULL, plane, tsurface);
 
    error = tdm_layer_set_buffer(tlayer, tsurface);
    if (error != TDM_ERROR_NONE)
@@ -453,7 +453,7 @@ _e_plane_surface_from_client_acquire_reserved(E_Plane *plane)
 
         if (plane_trace_debug)
           ELOGF("E_PLANE", "Display Plane(%p) zpos(%d)   Client ec(%p, %s)",
-                ec->pixmap, ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
+                ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
 
         /* acquire the surface from the client_queue */
         tsurface = e_plane_renderer_client_surface_recieve(renderer_client);
@@ -489,7 +489,7 @@ _e_plane_surface_from_client_acquire(E_Plane *plane)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "Display Plane(%p) zpos(%d)   Client ec(%p, %s)",
-           ec->pixmap, ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
+           ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
 
    e_comp_object_hwc_update_set(ec->frame, EINA_FALSE);
 
@@ -536,7 +536,7 @@ _e_plane_cursor_surface_acquire(E_Plane *plane)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "Display Cursor Plane(%p) zpos(%d)   ec(%p)",
-           NULL, ec, plane, plane->zpos, ec);
+           ec, plane, plane->zpos, ec);
 
    e_comp_object_hwc_update_set(ec->frame, EINA_FALSE);
 
@@ -588,7 +588,7 @@ _e_plane_surface_from_ecore_evas_acquire(E_Plane *plane)
      {
         if (plane_trace_debug)
           ELOGF("E_PLANE", "Display Plane(%p) zpos(%d)   Canvas",
-                NULL, NULL, plane, plane->zpos);
+                NULL, plane, plane->zpos);
      }
 
    return tsurface;
@@ -734,7 +734,7 @@ _e_plane_fb_target_all_set_unset_counter_reset(E_Plane *fb_target)
              plane->unset_counter = 1;
 
              if (plane_trace_debug)
-               ELOGF("E_PLANE", " Plane(%p) Unset Counter Reset", NULL, NULL, plane);
+               ELOGF("E_PLANE", " Plane(%p) Unset Counter Reset", NULL, plane);
           }
 
         /* reset the set_counter */
@@ -743,7 +743,7 @@ _e_plane_fb_target_all_set_unset_counter_reset(E_Plane *fb_target)
              plane->set_counter = 1;
 
              if (plane_trace_debug)
-               ELOGF("E_PLANE", " Plane(%p) Set Counter Reset", NULL, NULL, plane);
+               ELOGF("E_PLANE", " Plane(%p) Set Counter Reset", NULL, plane);
           }
      }
 }
@@ -784,7 +784,7 @@ _e_plane_unset_reset(E_Plane *plane)
    if (plane->unset_commit)      { plane->unset_commit = EINA_FALSE;    print_log = EINA_TRUE; }
 
    if (print_log && plane_trace_debug)
-     ELOGF("E_PLANE", " Plane(%p) Unset flags Reset", NULL, NULL, plane);
+     ELOGF("E_PLANE", " Plane(%p) Unset flags Reset", NULL, plane);
 }
 
 static void
@@ -858,7 +858,7 @@ _e_plane_set_counter_set(E_Plane *plane, E_Client *ec)
      }
 
     if (plane_trace_debug)
-      ELOGF("E_PLANE", "Plane(%p) set_counter(%d)", NULL, NULL, plane, plane->set_counter);
+      ELOGF("E_PLANE", "Plane(%p) set_counter(%d)", NULL, plane, plane->set_counter);
 }
 
 static Eina_Bool
@@ -923,7 +923,7 @@ _e_plane_pp_info_set(E_Plane *plane, tbm_surface_h dst_tsurface)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "PP Info  Plane(%p) src_rect(%d,%d),(%d,%d), dst_rect(%d,%d),(%d,%d)",
-           NULL, NULL, plane,
+           NULL, plane,
            pp_info.src_config.pos.x, pp_info.src_config.pos.y, pp_info.src_config.pos.w, pp_info.src_config.pos.h,
            pp_info.dst_config.pos.x, pp_info.dst_config.pos.y, pp_info.dst_config.pos.w, pp_info.dst_config.pos.h);
 
@@ -947,7 +947,7 @@ _e_plane_ext_pp_commit_data_release(E_Plane_Commit_Data *data)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE EXT", "Done    Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)::Canvas",
-           NULL, NULL, plane, plane->zpos, tsurface, renderer ? renderer->tqueue : NULL,
+           NULL, plane, plane->zpos, tsurface, renderer ? renderer->tqueue : NULL,
            data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
 
    e_comp_wl_buffer_reference(&data->buffer_ref, NULL);
@@ -1065,7 +1065,7 @@ _e_plane_pp_layer_commit_handler(tdm_layer *layer, unsigned int sequence,
      }
 
    if (plane_trace_debug)
-     ELOGF("E_PLANE", "PP Layer Commit Handler Plane(%p)", NULL, NULL, plane);
+     ELOGF("E_PLANE", "PP Layer Commit Handler Plane(%p)", NULL, plane);
 
    output = plane->output;
    if (e_output_dpms_get(output) == E_OUTPUT_DPMS_OFF)
@@ -1090,7 +1090,7 @@ _e_plane_pp_layer_commit_handler(tdm_layer *layer, unsigned int sequence,
              plane->pending_pp_commit_data_list = eina_list_remove(plane->pending_pp_commit_data_list, data);
 
              if (plane_trace_debug)
-               ELOGF("E_PLANE", "PP Layer Commit Handler start pending commit data(%p) tsurface(%p)", NULL, NULL, data, data->tsurface);
+               ELOGF("E_PLANE", "PP Layer Commit Handler start pending commit data(%p) tsurface(%p)", NULL, data, data->tsurface);
 
              if (!_e_plane_pp_layer_data_commit(plane, data))
                {
@@ -1112,7 +1112,7 @@ _e_plane_pp_layer_commit_handler(tdm_layer *layer, unsigned int sequence,
              plane->pending_pp_data_list = eina_list_remove(plane->pending_pp_data_list, data);
 
              if (plane_trace_debug)
-               ELOGF("E_PLANE", "PP Layer Commit Handler start pending pp data(%p) tsurface(%p)", NULL, NULL, data, data->tsurface);
+               ELOGF("E_PLANE", "PP Layer Commit Handler start pending pp data(%p) tsurface(%p)", NULL, data, data->tsurface);
 
              if (!_e_plane_pp_commit(plane, data))
                {
@@ -1132,7 +1132,7 @@ _e_plane_pp_layer_commit(E_Plane *plane, tbm_surface_h tsurface)
    E_Plane_Commit_Data *data = NULL;
 
    if (plane_trace_debug)
-     ELOGF("E_PLANE", "PP Layer Commit  Plane(%p)     pp_tsurface(%p)", NULL, NULL, plane, tsurface);
+     ELOGF("E_PLANE", "PP Layer Commit  Plane(%p)     pp_tsurface(%p)", NULL, plane, tsurface);
 
    tbm_err = tbm_surface_queue_enqueue(plane->pp_tqueue, tsurface);
    if (tbm_err != TBM_ERROR_NONE)
@@ -1292,7 +1292,7 @@ _e_plane_pp_commit_handler(tdm_pp *pp, tbm_surface_h tsurface_src, tbm_surface_h
    EINA_SAFETY_ON_NULL_RETURN(data);
 
    if (plane_trace_debug)
-     ELOGF("E_PLANE", "PP Commit Handler Plane(%p), data(%p)", NULL, NULL, plane, data);
+     ELOGF("E_PLANE", "PP Commit Handler Plane(%p), data(%p)", NULL, plane, data);
 
    plane->pp_data_list = eina_list_remove(plane->pp_data_list, data);
 
@@ -1346,7 +1346,7 @@ _e_plane_pp_commit(E_Plane *plane, E_Plane_Commit_Data *data)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "PP Commit  Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)",
-           NULL, NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
+           NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
            data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
 
    output = plane->output;
@@ -1450,7 +1450,7 @@ _e_plane_external_commit(E_Plane *plane, E_Plane_Commit_Data *data)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "Ex Commit  Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)",
-           NULL, NULL, plane, plane->zpos, data->tsurface, plane->renderer ? plane->renderer->tqueue : NULL,
+           NULL, plane, plane->zpos, data->tsurface, plane->renderer ? plane->renderer->tqueue : NULL,
            data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
 
    tbm_surface_info_s surf_info;
@@ -1802,7 +1802,7 @@ _e_plane_fb_sync_vblank_handler(tdm_output *output, unsigned int sequence,
    EINA_SAFETY_ON_NULL_RETURN(plane);
 
    if (plane_trace_debug)
-     ELOGF("E_PLANE", "Done fb_target_sync plane(%p) zpos(%d)", NULL, NULL, plane, plane->zpos);
+     ELOGF("E_PLANE", "Done fb_target_sync plane(%p) zpos(%d)", NULL, plane, plane->zpos);
 
    plane->fb_sync_wait = EINA_FALSE;
    plane->fb_sync_done = EINA_TRUE;
@@ -1872,7 +1872,7 @@ _e_plane_fb_target_sync_set(E_Plane *plane)
      }
 
    if (plane_trace_debug)
-     ELOGF("E_PLANE", "Set fb_target_sync plane(%p) zpos(%d)", NULL, NULL, plane, plane->zpos);
+     ELOGF("E_PLANE", "Set fb_target_sync plane(%p) zpos(%d)", NULL, plane, plane->zpos);
 
    plane->fb_sync_wait = EINA_TRUE;
 
@@ -1893,7 +1893,7 @@ e_plane_fetch(E_Plane *plane)
    if (e_comp_canvas_norender_get() > 0)
      {
         if (plane_trace_debug)
-          ELOGF("E_PLANE_RENDERER", "Canvas norender is set. No Display.", NULL, NULL);
+          ELOGF("E_PLANE_RENDERER", "Canvas norender is set. No Display.", NULL);
 
         return EINA_FALSE;
      }
@@ -2068,7 +2068,7 @@ _e_plane_fb_target_change(E_Plane *fb_target, E_Plane *plane)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "Change fb_target Plane(%p) zpos(%d) -> plane(%p) zpos(%d)",
-           NULL, NULL, fb_target, fb_target->zpos, plane, plane->zpos);
+           NULL, fb_target, fb_target->zpos, plane, plane->zpos);
 
    return EINA_TRUE;
 }
@@ -2160,7 +2160,7 @@ e_plane_offscreen_commit(E_Plane *plane)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "Commit  Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p) Offscreen",
-           NULL, NULL, plane, plane->zpos, data->tsurface, plane->renderer ? plane->renderer->tqueue : NULL,
+           NULL, plane, plane->zpos, data->tsurface, plane->renderer ? plane->renderer->tqueue : NULL,
            data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
 
    e_plane_commit_data_release(data);
@@ -2197,7 +2197,7 @@ e_plane_commit(E_Plane *plane)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "Commit  Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)",
-           NULL, NULL, plane, plane->zpos, data->tsurface, plane->renderer ? plane->renderer->tqueue : NULL,
+           NULL, plane, plane->zpos, data->tsurface, plane->renderer ? plane->renderer->tqueue : NULL,
            data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
 
    error = tdm_layer_commit(plane->tlayer, _e_plane_commit_hanler, data);
@@ -2329,7 +2329,7 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data)
    if (!tsurface)
      {
         if (plane_trace_debug)
-          ELOGF("E_PLANE", "Done    Plane(%p) zpos(%d)   data(%p)::Unset", NULL, NULL, plane, plane->zpos, data);
+          ELOGF("E_PLANE", "Done    Plane(%p) zpos(%d)   data(%p)::Unset", NULL, plane, plane->zpos, data);
 
         e_comp_wl_buffer_reference(&plane->display_info.buffer_ref, NULL);
 
@@ -2340,7 +2340,7 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data)
              plane->is_video = EINA_TRUE;
 
              if (plane_trace_debug)
-               ELOGF("E_PLANE", "Call HOOK_VIDEO_SET Plane(%p) zpos(%d)", NULL, NULL, plane, plane->zpos);
+               ELOGF("E_PLANE", "Call HOOK_VIDEO_SET Plane(%p) zpos(%d)", NULL, plane, plane->zpos);
 
              _e_plane_hook_call(E_PLANE_HOOK_VIDEO_SET, plane);
           }
@@ -2351,7 +2351,7 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data)
         /* debug */
         if (plane_trace_debug)
           ELOGF("E_PLANE", "Done    Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)::Canvas",
-                NULL, NULL, plane, plane->zpos, tsurface, renderer ? renderer->tqueue : NULL,
+                NULL, plane, plane->zpos, tsurface, renderer ? renderer->tqueue : NULL,
                 data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
 
         e_comp_wl_buffer_reference(&plane->display_info.buffer_ref, NULL);
@@ -2362,7 +2362,7 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data)
         /* debug */
         if (plane_trace_debug)
           ELOGF("E_PLANE", "Done    Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)::Client",
-                ec->pixmap, ec, plane, plane->zpos, tsurface, (renderer ? renderer->tqueue : NULL),
+                ec, plane, plane->zpos, tsurface, (renderer ? renderer->tqueue : NULL),
                 data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
 
         e_comp_wl_buffer_reference(&plane->display_info.buffer_ref, data->buffer_ref.buffer);
@@ -2498,7 +2498,7 @@ e_plane_unset_try_set(E_Plane *plane, Eina_Bool set)
         plane->unset_try = EINA_TRUE;
 
         if (plane_trace_debug)
-          ELOGF("E_PLANE", "Plane(%p) Set unset_try. unset_counter(%d)", NULL, NULL, plane, plane->unset_counter);
+          ELOGF("E_PLANE", "Plane(%p) Set unset_try. unset_counter(%d)", NULL, plane, plane->unset_counter);
      }
    else
      {
@@ -2506,7 +2506,7 @@ e_plane_unset_try_set(E_Plane *plane, Eina_Bool set)
         plane->unset_try = EINA_FALSE;
 
         if (plane_trace_debug)
-          ELOGF("E_PLANE", "Plane(%p) UnSet unset_try. unset_counter(%d)", NULL, NULL, plane, plane->unset_counter);
+          ELOGF("E_PLANE", "Plane(%p) UnSet unset_try. unset_counter(%d)", NULL, plane, plane->unset_counter);
      }
 }
 
@@ -2532,7 +2532,7 @@ e_plane_unset_commit_check(E_Plane *plane, Eina_Bool fb_commit)
         if (fb_target) e_plane_renderer_ecore_evas_force_render(fb_target->renderer);
 
         if (plane_trace_debug)
-          ELOGF("E_PLANE", "Plane(%p) Check unset_commit. unset_counter(%d)", NULL, NULL, plane, plane->unset_counter);
+          ELOGF("E_PLANE", "Plane(%p) Check unset_commit. unset_counter(%d)", NULL, plane, plane->unset_counter);
      }
 
    if (plane->unset_counter > 0) return EINA_FALSE;
@@ -2559,7 +2559,7 @@ e_plane_set_commit_check(E_Plane *plane, Eina_Bool fb_commit)
         if (fb_target) e_plane_renderer_ecore_evas_force_render(fb_target->renderer);
 
         if (plane_trace_debug)
-          ELOGF("E_PLANE", "Plane(%p) Check set counter. set_counter(%d)", NULL, NULL, plane, plane->set_counter);
+          ELOGF("E_PLANE", "Plane(%p) Check set counter. set_counter(%d)", NULL, plane, plane->set_counter);
      }
 
    if (plane->set_counter > 0) return EINA_FALSE;
@@ -2631,7 +2631,7 @@ _e_plane_ec_used_check(E_Plane *plane, E_Client *ec)
           {
              if (plane_trace_debug)
                ELOGF("E_PLANE", "Used    Plane(%p) zpos(%d) ec(%p)",
-                      NULL, NULL, tmp_plane, tmp_plane->zpos, ec);
+                      NULL, tmp_plane, tmp_plane->zpos, ec);
 
              return tmp_plane;
           }
@@ -2649,7 +2649,7 @@ e_plane_ec_set(E_Plane *plane, E_Client *ec)
 
    if (plane_trace_debug)
      ELOGF("E_PLANE", "Request Plane(%p) zpos(%d)   Set ec(%p, %s)",
-           (ec ? ec->pixmap : NULL), ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
+           ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
 
    if (plane->is_external) goto end;
 
@@ -2793,7 +2793,7 @@ e_plane_ec_set(E_Plane *plane, E_Client *ec)
                     _e_plane_unset_candidate_set(plane, EINA_FALSE);
 
                   if (plane_trace_debug)
-                    ELOGF("E_PLANE", "Plane(%p) Set the unset_candidate", (plane->ec ? ec->pixmap : NULL), ec, plane);
+                    ELOGF("E_PLANE", "Plane(%p) Set the unset_candidate", ec, plane);
                }
 
              if (plane->renderer)
@@ -2824,7 +2824,7 @@ e_plane_ec_set(E_Plane *plane, E_Client *ec)
              plane->need_ev = EINA_TRUE;
 
              ELOGF("E_PLANE", "Plane(%p) zpos(%d)   Set NULL",
-                   (ec ? ec->pixmap : NULL), ec, plane, plane->zpos);
+                   ec, plane, plane->zpos);
 
              return EINA_FALSE;
           }
@@ -2832,7 +2832,7 @@ e_plane_ec_set(E_Plane *plane, E_Client *ec)
 end:
    if (plane->ec != ec)
      ELOGF("E_PLANE", "Plane(%p) zpos(%d)   Set ec(%p, %s)",
-           (ec ? ec->pixmap : NULL), ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
+           ec, plane, plane->zpos, ec, e_client_util_name_get(ec));
 
    plane->ec = ec;
    plane->need_ev = EINA_TRUE;
@@ -2977,7 +2977,7 @@ e_plane_show_state(E_Plane *plane)
    EINA_SAFETY_ON_NULL_RETURN(plane);
 
    ELOGF("E_PLANE", "Plane(%p) zpos(%d) ec(%p) display tsurface(%p)",
-         NULL, NULL, plane, plane->zpos, plane->ec, plane->display_info.tsurface);
+         NULL, plane, plane->zpos, plane->ec, plane->display_info.tsurface);
 
    if (plane->renderer)
      e_plane_renderer_show_state(plane->renderer);
@@ -3076,7 +3076,7 @@ e_plane_video_set(E_Plane *plane, Eina_Bool set, Eina_Bool *wait)
 
         if (plane_trace_debug)
           ELOGF("E_PLANE", "Video   Plane(%p) zpos(%d) Set wait(%d) counter(%d) change_plane(%p) zpos(%d)",
-                NULL, NULL, plane, plane->zpos, wait ? *wait : 0, fb_target->fb_change_counter,
+                NULL, plane, plane->zpos, wait ? *wait : 0, fb_target->fb_change_counter,
                 change_plane, change_plane->zpos);
      }
    else
@@ -3115,7 +3115,7 @@ e_plane_video_set(E_Plane *plane, Eina_Bool set, Eina_Bool *wait)
 
         if (plane_trace_debug)
           ELOGF("E_PLANE", "Video   Plane(%p) zpos(%d) Unset default_fb(%p) zpos(%d)",
-                NULL, NULL, plane, plane->zpos, default_fb, default_fb->zpos);
+                NULL, plane, plane->zpos, default_fb, default_fb->zpos);
      }
 
    return EINA_TRUE;
@@ -3136,7 +3136,7 @@ e_plane_pp_commit(E_Plane *plane)
      {
         if (plane_trace_debug)
           ELOGF("E_PLANE", "PP Commit  Can Dequeue failed Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)",
-                NULL, NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
+                NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
                 data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
         plane->pending_pp_data_list = eina_list_append(plane->pending_pp_data_list, data);
         return EINA_TRUE;
@@ -3146,7 +3146,7 @@ e_plane_pp_commit(E_Plane *plane)
      {
         if (plane_trace_debug)
           ELOGF("E_PLANE", "PP Commit  Pending pp data remained Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)",
-                NULL, NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
+                NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
                 data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
         plane->pending_pp_data_list = eina_list_append(plane->pending_pp_data_list, data);
         return EINA_TRUE;
@@ -3412,7 +3412,7 @@ e_plane_external_commit(E_Plane *plane)
           {
              if (plane_trace_debug)
                ELOGF("E_PLANE", "Ex Commit  Can Dequeue failed Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)",
-                     NULL, NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
+                     NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
                      data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
              plane->pending_pp_data_list = eina_list_append(plane->pending_pp_data_list, data);
              return EINA_TRUE;
@@ -3422,7 +3422,7 @@ e_plane_external_commit(E_Plane *plane)
           {
              if (plane_trace_debug)
                ELOGF("E_PLANE", "Ex Commit  Pending pp data remained Plane(%p) zpos(%d)   tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)",
-                     NULL, NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
+                     NULL, plane, plane->zpos, data->tsurface, plane->pp_tqueue,
                      data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data);
              plane->pending_pp_data_list = eina_list_append(plane->pending_pp_data_list, data);
              return EINA_TRUE;
index 5564d5f..1f5cbce 100644 (file)
@@ -339,7 +339,7 @@ _e_plane_renderer_client_copied_surface_create(E_Plane_Renderer_Client *renderer
 
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Create backup buffer   wl_buffer(%p) tsurface(%p) new_tsurface(%p)",
-           ec->pixmap, ec, _get_wl_buffer(ec), tsurface, new_tsurface);
+           ec, _get_wl_buffer(ec), tsurface, new_tsurface);
 
    return new_tsurface;
 }
@@ -507,7 +507,7 @@ _e_plane_renderer_exported_surface_release(E_Plane_Renderer *renderer, tbm_surfa
 
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Import  Renderer(%p)        tsurface(%p) tqueue(%p)",
-           NULL, NULL, renderer, tsurface, renderer->tqueue);
+           NULL, renderer, tsurface, renderer->tqueue);
 }
 
 static Eina_Bool
@@ -653,7 +653,7 @@ _e_plane_renderer_exported_surfaces_release(E_Plane_Renderer *renderer, Eina_Boo
 
         if (renderer_trace_debug)
           ELOGF("E_PLANE_RENDERER", "Import  Renderer(%p)        tsurface(%p) tqueue(%p)",
-                NULL, NULL, renderer, tsurface, renderer->tqueue);
+                NULL, renderer, tsurface, renderer->tqueue);
       }
 
    if (!eina_list_count(renderer->exported_surfaces))
@@ -793,7 +793,7 @@ _e_plane_renderer_exported_surface_dequeue_cb(struct wayland_tbm_client_queue *c
 
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Client  Renderer(%p)        tsurface(%p) tqueue(%p) Dequeued",
-           NULL, NULL, renderer, tsurface, renderer->tqueue);
+           NULL, renderer, tsurface, renderer->tqueue);
 }
 
 static void
@@ -823,7 +823,7 @@ _e_plane_renderer_surface_exported_surface_detach_cb(struct wayland_tbm_client_q
 
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Detach  Renderer(%p)        tsurface(%p) tqueue(%p)",
-           NULL, NULL, renderer, tsurface, renderer->tqueue);
+           NULL, renderer, tsurface, renderer->tqueue);
 
    if (renderer_buffer->exported)
      {
@@ -854,7 +854,7 @@ _e_plane_renderer_surface_exported_surface_destroy_cb(tbm_surface_h tsurface, vo
 
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Destroy Renderer(%p)        tsurface(%p) tqueue(%p)",
-           NULL, NULL, renderer, tsurface, renderer->tqueue);
+           NULL, renderer, tsurface, renderer->tqueue);
 
    renderer_buffer = _e_plane_renderer_buffer_get(renderer, tsurface);
    if (renderer_buffer)
@@ -905,7 +905,7 @@ _e_plane_renderer_client_ec_buffer_change_cb(void *data, int type, void *event)
 
         if (renderer_trace_debug)
           ELOGF("E_PLANE_RENDERER", "Set    backup buffer   wl_buffer(%p)::buffer_change_exception",
-                ec->pixmap, ec, _get_wl_buffer(ec));
+                ec, _get_wl_buffer(ec));
 
         return ECORE_CALLBACK_PASS_ON;
      }
@@ -920,7 +920,7 @@ _e_plane_renderer_client_ec_buffer_change_cb(void *data, int type, void *event)
 
         if (renderer_trace_debug)
           ELOGF("E_PLANE_RENDERER", "Set    backup buffer   wl_buffer(%p)::buffer_change",
-                ec->pixmap, ec, _get_wl_buffer(ec));
+                ec, _get_wl_buffer(ec));
 
         if (!e_comp->hwc_use_detach &&
             renderer_client->state == E_PLANE_RENDERER_CLIENT_STATE_PENDING_DEACTIVATED)
@@ -1647,7 +1647,7 @@ e_plane_renderer_render(E_Plane_Renderer *renderer, Eina_Bool is_fb)
         if (e_comp_canvas_norender_get() > 0)
           {
              if (renderer_trace_debug)
-               ELOGF("E_PLANE_RENDERER", "Canvas norender is set. No Display.", NULL, NULL);
+               ELOGF("E_PLANE_RENDERER", "Canvas norender is set. No Display.", NULL);
 
              return EINA_TRUE;
           }
@@ -1726,7 +1726,7 @@ e_plane_renderer_activate(E_Plane_Renderer *renderer, E_Client *ec)
    wayland_tbm_server_client_queue_activate(cqueue, 0, 0, 0);
 
    if (renderer_trace_debug)
-     ELOGF("E_PLANE_RENDERER", "Activate Renderer(%p)", ec->pixmap, ec, renderer);
+     ELOGF("E_PLANE_RENDERER", "Activate Renderer(%p)", ec, renderer);
 
    renderer->need_change_buffer_transform = EINA_TRUE;
 
@@ -1762,7 +1762,7 @@ e_plane_renderer_deactivate(E_Plane_Renderer *renderer)
    cqueue = _e_plane_renderer_wayland_tbm_client_queue_get(ec);
 
    if (renderer_trace_debug)
-     ELOGF("E_PLANE_RENDERER", "Deactivate Renderer(%p)", ec->pixmap, ec, renderer);
+     ELOGF("E_PLANE_RENDERER", "Deactivate Renderer(%p)", ec, renderer);
 
    if (cqueue)
      wayland_tbm_server_client_queue_deactivate(cqueue);
@@ -1917,7 +1917,7 @@ e_plane_renderer_reserved_activate(E_Plane_Renderer *renderer, E_Client *ec)
           ERR("fail to tbm_surface_queue_notify_reset");
 
         ELOGF("E_PLANE_RENDERER", "Candidate Renderer(%p) Plane(%p) ec(%p, %s)",
-              ec->pixmap, ec, renderer, renderer->plane,  ec, e_client_util_name_get(ec));
+              ec, renderer, renderer->plane,  ec, e_client_util_name_get(ec));
 
         renderer->state = E_PLANE_RENDERER_STATE_CANDIDATE;
         renderer->ec = ec;
@@ -1944,7 +1944,7 @@ e_plane_renderer_reserved_activate(E_Plane_Renderer *renderer, E_Client *ec)
      }
 
    ELOGF("E_PLANE_RENDERER", "Activate Renderer(%p) Plane(%p) ec(%p, %s)",
-         ec->pixmap, ec, renderer, renderer->plane, ec, e_client_util_name_get(ec));
+         ec, renderer, renderer->plane, ec, e_client_util_name_get(ec));
 
    renderer->need_change_buffer_transform = EINA_TRUE;
 
@@ -1997,7 +1997,7 @@ e_plane_renderer_reserved_deactivate(E_Plane_Renderer *renderer)
 
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Set    backup buffer   wl_buffer(%p)::Deactivate",
-           ec->pixmap, ec, _get_wl_buffer(ec));
+           ec, _get_wl_buffer(ec));
 
    usable = e_pixmap_usable_get(ec->pixmap);
 
@@ -2017,7 +2017,7 @@ e_plane_renderer_reserved_deactivate(E_Plane_Renderer *renderer)
      }
 done:
    ELOGF("E_PLANE_RENDERER", "Deactivate Renderer(%p) Plane(%p) ec(%p, %s)",
-         ec->pixmap, ec, renderer, renderer->plane, ec, e_client_util_name_get(ec));
+         ec, renderer, renderer->plane, ec, e_client_util_name_get(ec));
 
    if (e_comp->hwc_sync_mode_change)
      {
@@ -2195,7 +2195,7 @@ e_plane_renderer_client_surface_recieve(E_Plane_Renderer_Client *renderer_client
 
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Receive Renderer(%p)        tsurface(%p) tqueue(%p) wl_buffer(%p) flags(%d)",
-           ec->pixmap, ec, renderer, tsurface, renderer->tqueue, _get_wl_buffer(ec), flags);
+           ec, renderer, tsurface, renderer->tqueue, _get_wl_buffer(ec), flags);
 
    if (flags != E_PLANE_RENDERER_CLIENT_SURFACE_FLAGS_RESERVED)
      {
@@ -2280,7 +2280,7 @@ _e_plane_renderer_surface_queue_recreate_alloc_cb(tbm_surface_queue_h surface_qu
 
         if (renderer_trace_debug)
           ELOGF("E_PLANE_RENDERER", "Renderer(%p) Reset tsurface:%p new_tsurface:%p tqueue:%p",
-                NULL, NULL, renderer, renderer_buffer->tsurface, tsurface, surface_queue);
+                NULL, renderer, renderer_buffer->tsurface, tsurface, surface_queue);
 
         renderer_buffer->alloced = EINA_TRUE;
 
@@ -2567,7 +2567,7 @@ e_plane_renderer_surface_queue_acquire(E_Plane_Renderer *renderer)
    /* debug */
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Acquire Renderer(%p)        tsurface(%p) tqueue(%p)",
-           NULL, NULL, renderer, tsurface, tqueue);
+           NULL, renderer, tsurface, tqueue);
 
    return tsurface;
 }
@@ -2598,7 +2598,7 @@ e_plane_renderer_surface_queue_release(E_Plane_Renderer *renderer, tbm_surface_h
         E_Client *ec = renderer->ec;
 
         ELOGF("E_PLANE_RENDERER", "Release Renderer(%p)        tsurface(%p) tqueue(%p)",
-              ec ? ec->pixmap : NULL, ec, renderer, tsurface, renderer->tqueue);
+              ec, renderer, tsurface, renderer->tqueue);
      }
 
    tsq_err = tbm_surface_queue_release(tqueue, tsurface);
@@ -2631,7 +2631,7 @@ e_plane_renderer_surface_queue_enqueue(E_Plane_Renderer *renderer, tbm_surface_h
      {
         E_Client *ec = renderer->ec;
         ELOGF("E_PLANE_RENDERER", "Enqueue Renderer(%p)        tsurface(%p) tqueue(%p) wl_buffer(%p) ",
-              ec->pixmap, ec, renderer, tsurface, renderer->tqueue, _get_wl_buffer(ec));
+              ec, renderer, tsurface, renderer->tqueue, _get_wl_buffer(ec));
      }
 
    tsq_err = tbm_surface_queue_enqueue(tqueue, tsurface);
@@ -2661,7 +2661,7 @@ e_plane_renderer_surface_queue_cancel_acquire(E_Plane_Renderer *renderer, tbm_su
     {
         E_Client *ec = renderer->ec;
         ELOGF("E_PLANE_RENDERER", "Cancel Acquire Renderer(%p)  tsurface(%p) tqueue(%p) wl_buffer(%p) ",
-              ec->pixmap, ec, renderer, tsurface, renderer->tqueue, _get_wl_buffer(ec));
+              ec, renderer, tsurface, renderer->tqueue, _get_wl_buffer(ec));
     }
 
    tsq_err = tbm_surface_queue_cancel_acquire(tqueue, tsurface);
@@ -2731,7 +2731,7 @@ e_plane_renderer_surface_queue_dequeue(E_Plane_Renderer *renderer)
         E_Client *ec = renderer->ec;
 
         ELOGF("E_PLANE_RENDERER", "Dequeue Renderer(%p)        tsurface(%p) tqueue(%p)",
-              ec ? ec->pixmap : NULL, ec, renderer, tsurface, renderer->tqueue);
+              ec, renderer, tsurface, renderer->tqueue);
      }
 
    return tsurface;
@@ -2815,7 +2815,7 @@ e_plane_renderer_surface_usable_send(E_Plane_Renderer *renderer, E_Client *ec, t
 
    if (renderer_trace_debug)
    ELOGF("E_PLANE_RENDERER", "Usable  Renderer(%p)        tsurface(%p) tqueue(%p) wl_buffer(%p)",
-         ec->pixmap, ec, renderer, tsurface, renderer->tqueue, renderer_buffer->exported_wl_buffer);
+         ec, renderer, tsurface, renderer->tqueue, renderer_buffer->exported_wl_buffer);
 
    return EINA_TRUE;
 }
@@ -2865,7 +2865,7 @@ e_plane_renderer_surface_send(E_Plane_Renderer *renderer, E_Client *ec, tbm_surf
 
         if (wl_buffer && renderer_trace_debug)
           ELOGF("E_PLANE_RENDERER", "Export  Renderer(%p)        tsurface(%p) tqueue(%p) wl_buffer(%p)",
-                ec->pixmap, ec, renderer, tsurface, renderer->tqueue, wl_buffer);
+                ec, renderer, tsurface, renderer->tqueue, wl_buffer);
      }
 }
 
@@ -2888,33 +2888,33 @@ e_plane_renderer_show_state(E_Plane_Renderer *renderer)
 
    if (renderer->ec)
      ELOGF("E_PLANE_RENDERER", "Renderer(%p) Plane(%p) ec(%p) state(%d) mode_chage_age(%d)",
-           NULL, NULL, renderer, renderer->plane, renderer->ec, renderer->state, renderer->mode_change_age);
+           NULL, renderer, renderer->plane, renderer->ec, renderer->state, renderer->mode_change_age);
    else
      ELOGF("E_PLANE_RENDERER", "Renderer(%p) Plane(%p) ee_engine:%s state(%d) mode_chage_age(%d)",
-           NULL, NULL, renderer, renderer->plane, ecore_evas_engine_name_get(renderer->ee), renderer->state, renderer->mode_change_age);
+           NULL, renderer, renderer->plane, ecore_evas_engine_name_get(renderer->ee), renderer->state, renderer->mode_change_age);
 
    EINA_LIST_FOREACH(renderer->disp_surfaces, l, tmp_tsurface)
      {
         if (!tmp_tsurface) continue;
 
-        ELOGF("E_PLANE_RENDERER", "Dispay Surfaces tsurface(%p)", NULL, NULL, tmp_tsurface);
+        ELOGF("E_PLANE_RENDERER", "Dispay Surfaces tsurface(%p)", NULL, tmp_tsurface);
      }
 
-   ELOGF("E_PLANE_RENDERER", "Displaying tsurface(%p)", NULL, NULL, renderer->displaying_tsurface);
-   ELOGF("E_PLANE_RENDERER", "Previous  tsurface(%p)", NULL, NULL, renderer->previous_tsurface);
+   ELOGF("E_PLANE_RENDERER", "Displaying tsurface(%p)", NULL, renderer->displaying_tsurface);
+   ELOGF("E_PLANE_RENDERER", "Previous  tsurface(%p)", NULL, renderer->previous_tsurface);
 
    EINA_LIST_FOREACH(renderer->exported_surfaces, l, tmp_tsurface)
      {
         if (!tmp_tsurface) continue;
 
-        ELOGF("E_PLANE_RENDERER", "Exported tsurface(%p)", NULL, NULL, tmp_tsurface);
+        ELOGF("E_PLANE_RENDERER", "Exported tsurface(%p)", NULL, tmp_tsurface);
      }
 
    EINA_LIST_FOREACH(renderer->released_surfaces, l, tmp_tsurface)
      {
         if (!tmp_tsurface) continue;
 
-        ELOGF("E_PLANE_RENDERER", "Released tsurface(%p)", NULL, NULL, tmp_tsurface);
+        ELOGF("E_PLANE_RENDERER", "Released tsurface(%p)", NULL, tmp_tsurface);
      }
 
    if (renderer->ec)
@@ -2926,7 +2926,7 @@ e_plane_renderer_show_state(E_Plane_Renderer *renderer)
           {
              if (!tmp_tsurface) continue;
 
-             ELOGF("E_PLANE_RENDERER", "Client ec(%p) exported tsurface(%p)", NULL, NULL, renderer->ec, tmp_tsurface);
+             ELOGF("E_PLANE_RENDERER", "Client ec(%p) exported tsurface(%p)", NULL, renderer->ec, tmp_tsurface);
           }
      }
 }
@@ -2991,7 +2991,7 @@ e_plane_renderer_surface_queue_sync_count_set(E_Plane_Renderer *renderer, unsign
 
    if (renderer_trace_debug)
      ELOGF("E_PLANE_RENDERER", "Set      Renderer(%p) sync_count(%d)",
-           NULL, NULL, renderer, sync_count);
+           NULL, renderer, sync_count);
 }
 
 EINTERN void
index 0d75b2a..aeaf14f 100644 (file)
@@ -669,7 +669,7 @@ _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec)
         if (ec->frame)
           {
              ly = evas_object_layer_get(ec->frame);
-             ELOGF("NOTI", "         |ec->layer:%d object->layer:%d", ec->pixmap, ec, ec->layer, ly);
+             ELOGF("NOTI", "         |ec->layer:%d object->layer:%d", ec, ec->layer, ly);
              if (ly != ec->layer)
                evas_object_layer_set(ec->frame, ec->layer);
           }
@@ -868,7 +868,7 @@ _e_policy_cb_hook_client_visibility(void *d EINA_UNUSED, E_Client *ec)
              e_policy_client_uniconify_by_visibility(ec);
              if (ec->visibility.last_sent_type != E_VISIBILITY_PRE_UNOBSCURED)
                {
-                  ELOGF("POL_VIS", "SEND pre-unobscured visibility event", ec->pixmap, ec);
+                  ELOGF("POL_VIS", "SEND pre-unobscured visibility event", ec);
                   e_vis_client_send_pre_visibility_event(ec);
                }
              e_policy_client_visibility_send(ec);
@@ -900,7 +900,7 @@ _e_policy_cb_hook_client_visibility(void *d EINA_UNUSED, E_Client *ec)
                     {
                        if (ec->visibility.last_sent_type == E_VISIBILITY_PRE_UNOBSCURED)
                          {
-                            ELOGF("POL_VIS", "SEND unobscured/fully-obscured visibility event because iconify visibility", ec->pixmap, ec);
+                            ELOGF("POL_VIS", "SEND unobscured/fully-obscured visibility event because iconify visibility", ec);
                             e_policy_wl_visibility_send(ec, E_VISIBILITY_UNOBSCURED);
                             e_policy_wl_visibility_send(ec, E_VISIBILITY_FULLY_OBSCURED);
                          }
@@ -948,7 +948,7 @@ _e_policy_cb_hook_client_visibility(void *d EINA_UNUSED, E_Client *ec)
                          {
                             if (!e_policy_visibility_client_is_uniconify_render_running(ec))
                               {
-                                 ELOGF("POL_VIS", "SEND unobscured/fully-obscured visibility event because iconify visibility", ec->pixmap, ec);
+                                 ELOGF("POL_VIS", "SEND unobscured/fully-obscured visibility event because iconify visibility", ec);
                                  e_policy_wl_visibility_send(ec, E_VISIBILITY_UNOBSCURED);
                                  e_policy_wl_visibility_send(ec, E_VISIBILITY_FULLY_OBSCURED);
                               }
@@ -979,7 +979,7 @@ _e_policy_cb_hook_client_uniconify(void *d EINA_UNUSED, E_Client *ec)
    if (!e_policy_wl_iconify_state_supported_get(ec))
      {
         ELOGF("TZPOL", "Force Update the client not supporting iconify state",
-              ec->pixmap, ec);
+              ec);
 
         /* force render for an iconifed e_client having shm buffer not used yet*/
         if ((e_pixmap_image_data_get(ec->pixmap)) &&
@@ -1390,7 +1390,7 @@ _e_policy_client_stack_change_send(E_Client *ec)
    if (below) below_pid = below->netwm.pid;
 
    ELOGF("TZPOL", "Send stack change.  above(win:%zx, pid:%d), below(win:%zx, pid:%d)",
-         ec->pixmap, ec, e_client_util_win_get(above), above_pid, e_client_util_win_get(below), below_pid);
+         ec, e_client_util_win_get(above), above_pid, e_client_util_win_get(below), below_pid);
 
    e_policy_aux_message_send_from_int(ec, "stack_changed", "pid", 2, above_pid, below_pid);
 }
@@ -1573,7 +1573,7 @@ e_policy_client_unmap(E_Client *ec)
    if (!ec) return;
    if (e_object_is_del(E_OBJECT(ec))) return;
 
-   ELOG("Reset ec information by unmap", ec->pixmap, ec);
+   ELOG("Reset ec information by unmap", ec);
 
    if (ec->iconic)
      send_event = EINA_TRUE;
@@ -2229,7 +2229,7 @@ e_policy_animatable_lock(E_Client *ec,
    else
      ec->animatable = EINA_TRUE;
 
-   ELOGF("TZPOL","EFFECT(animatable:%d) due to %d is applied on the state %d --> result:%d", ec->pixmap, ec,
+   ELOGF("TZPOL","EFFECT(animatable:%d) due to %d is applied on the state %d --> result:%d", ec,
         ec->animatable, set, lock, pc->lock_animatable);
 }
 
index 88c5a7b..b3e810f 100644 (file)
@@ -63,12 +63,12 @@ _e_policy_stack_transient_for_apply(E_Client *ec)
      {
         ELOGF("TZPOL",
               "Fetch for statck transient_for was successfully intercepted",
-              ec->pixmap, ec);
+              ec);
         return;
      }
 
    ELOGF("TZPOL", "Fetch for stack transient_for. ec_layer:%d, parent(win:%zx, ec:%p, layer:%d)",
-         ec->pixmap, ec, ec->layer, e_client_util_win_get(ec->parent), ec->parent, ec->parent ? ec->parent->layer:-1);
+         ec, ec->layer, e_client_util_win_get(ec->parent), ec->parent, ec->parent ? ec->parent->layer:-1);
 
    if (ec->parent == NULL)
      {
@@ -76,7 +76,7 @@ _e_policy_stack_transient_for_apply(E_Client *ec)
         if (ec->layer == ec->saved.layer)
           return;
 
-        ELOGF("TZPOL", "Fetch(restore) for stack transient_for. Restore layer(%d->%d)", ec->pixmap, ec, ec->layer, ec->saved.layer);
+        ELOGF("TZPOL", "Fetch(restore) for stack transient_for. Restore layer(%d->%d)", ec, ec->layer, ec->saved.layer);
         evas_object_layer_set(ec->frame, ec->saved.layer);
 
         return;
@@ -170,7 +170,7 @@ _e_policy_stack_fetch_transient(E_Client *ec)
                             new_focus = e_client_transient_child_top_get(ec->parent, EINA_TRUE);
                             if (new_focus)
                               {
-                                 ELOGF("FOCUS", "focus set | tranient_for fetch", NULL, new_focus);
+                                 ELOGF("FOCUS", "focus set | tranient_for fetch", new_focus);
                                  evas_object_focus_set(new_focus->frame, 1);
                               }
                          }
@@ -463,7 +463,7 @@ e_policy_stack_clients_restack_above_lockscreen(E_Client *ec_lock, Eina_Bool sho
                   EINA_LIST_FOREACH(restore_list, l, ec)
                     {
                        org_layer = ec->changable_layer[E_CHANGABLE_LAYER_TYPE_ABOVE_NOTIFICATION].saved_layer;
-                       ELOGF("CHANGE to Original layer", "AboveLock|layer: %d -> %d", ec->pixmap, ec, ec->layer, org_layer);
+                       ELOGF("CHANGE to Original layer", "AboveLock|layer: %d -> %d", ec, ec->layer, org_layer);
                        evas_object_layer_set(ec->frame, org_layer);
                        ec->layer = org_layer;
 
@@ -527,7 +527,7 @@ e_policy_stack_clients_restack_above_lockscreen(E_Client *ec_lock, Eina_Bool sho
                        ec->changable_layer[E_CHANGABLE_LAYER_TYPE_ABOVE_NOTIFICATION].saved_layer = ec->layer;
                     }
 
-                  ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec->pixmap, ec, ec->layer, lock_layer);
+                  ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec, ec->layer, lock_layer);
                   if (ec->layer == lock_layer)
                     evas_object_raise(ec->frame);
                   else
@@ -565,7 +565,7 @@ e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer, E_Layer *new_
 
              if (set_layer)
                {
-                  ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec->pixmap, ec, ec->layer, lock_layer);
+                  ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec, ec->layer, lock_layer);
                   if (ec->layer == lock_layer)
                     evas_object_raise(ec->frame);
                   else
@@ -582,7 +582,7 @@ e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer, E_Layer *new_
                {
                   if (ec->layer != layer)
                     {
-                       ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec->pixmap, ec, ec->layer, lock_layer);
+                       ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec, ec->layer, lock_layer);
                        evas_object_layer_set(ec->frame, lock_layer);
                        ec->layer = lock_layer;
                     }
index e9b580a..8acb3a8 100644 (file)
@@ -183,7 +183,7 @@ _e_policy_check_transient_child_visible(E_Client *ancestor_ec, E_Client *ec)
              if (child_ec->visibility.obscured == E_VISIBILITY_UNOBSCURED)
                {
                   ELOGF("Find visible child", "ancestor(win:0x%08zx, ec:%p), child(win:0x%08zx, ec:%p)",
-                        ec->pixmap, ec,
+                        ec,
                         e_client_util_win_get(ancestor_ec), ancestor_ec,
                         e_client_util_win_get(child_ec), child_ec);
                   return EINA_TRUE;
@@ -196,7 +196,7 @@ _e_policy_check_transient_child_visible(E_Client *ancestor_ec, E_Client *ec)
                        if (E_CONTAINS(child_x, child_y, child_w, child_h, anc_x, anc_y, anc_w, anc_h))
                          {
                             ELOGF("Find visible child", "ancestor(win:0x%08zx, ec:%p), child(win:0x%08zx, ec:%p)",
-                                  ec->pixmap, ec,
+                                  ec,
                                   e_client_util_win_get(ancestor_ec), ancestor_ec,
                                   e_client_util_win_get(child_ec), child_ec);
                             return EINA_TRUE;
@@ -210,7 +210,7 @@ _e_policy_check_transient_child_visible(E_Client *ancestor_ec, E_Client *ec)
                  (child_ec->visibility.obscured == E_VISIBILITY_UNOBSCURED))
                {
                   ELOGF("Find visible child", "ancestor(win:0x%08zx, ec:%p), child(win:0x%08zx, ec:%p)",
-                        ec->pixmap, ec,
+                        ec,
                         e_client_util_win_get(ancestor_ec), ancestor_ec,
                         e_client_util_win_get(child_ec), child_ec);
                   return EINA_TRUE;
@@ -298,13 +298,13 @@ _e_policy_client_iconify_by_visibility(E_Client *ec)
 
    if (skip_iconify)
      {
-        ELOGF("SKIP.. ICONIFY_BY_WM", "win:0x%08zx cause_type:%d", ec->pixmap, ec, e_client_util_win_get(ec), skip_iconify);
+        ELOGF("SKIP.. ICONIFY_BY_WM", "win:0x%08zx cause_type:%d", ec, e_client_util_win_get(ec), skip_iconify);
         if (pol_vis)
           _e_vis_update_forground_list();
         return;
      }
 
-   ELOGF("ICONIFY_BY_WM", "win:0x%08zx", ec->pixmap, ec, e_client_util_win_get(ec));
+   ELOGF("ICONIFY_BY_WM", "win:0x%08zx", ec, e_client_util_win_get(ec));
    e_policy_wl_iconify_state_change_send(ec, 1);
    e_client_iconify(ec);
 
@@ -352,7 +352,7 @@ _e_policy_client_ancestor_uniconify(E_Client *ec)
         if (count > 10)
           {
              // something strange state.
-             ELOGF("CHECK transient_for tree", "win:0x%08zx, parent:0x%08zx", NULL, NULL, e_client_util_win_get(ec), e_client_util_win_get(parent));
+             ELOGF("CHECK transient_for tree", "win:0x%08zx, parent:0x%08zx", NULL, e_client_util_win_get(ec), e_client_util_win_get(parent));
              break;
           }
 
@@ -366,7 +366,7 @@ _e_policy_client_ancestor_uniconify(E_Client *ec)
         if (eina_list_data_find(list, parent))
           {
              // very bad. there are loop for parenting
-             ELOGF("Very BAD. Circling transient_for window", "win:0x%08zx, parent:0x%08zx", NULL, NULL, e_client_util_win_get(ec), e_client_util_win_get(parent));
+             ELOGF("Very BAD. Circling transient_for window", "win:0x%08zx, parent:0x%08zx", NULL, e_client_util_win_get(ec), e_client_util_win_get(parent));
              break;
           }
 
@@ -383,7 +383,7 @@ _e_policy_client_ancestor_uniconify(E_Client *ec)
    parent = NULL;
    EINA_LIST_FOREACH(list, l, parent)
      {
-        ELOGF("UNICONIFY_BY_WM", "parent_win:0x%08zx", parent->pixmap, parent, e_client_util_win_get(parent));
+        ELOGF("UNICONIFY_BY_WM", "parent_win:0x%08zx", parent, e_client_util_win_get(parent));
         ret = e_policy_visibility_client_uniconify(parent, 0);
         if (!ret)
           {
@@ -439,7 +439,7 @@ _e_policy_client_uniconify_by_visibility(E_Client *ec)
 
    _e_policy_client_ancestor_uniconify(ec);
 
-   ELOGF("UNICONIFY_BY_WM", "win:0x%08zx", ec->pixmap, ec, e_client_util_win_get(ec));
+   ELOGF("UNICONIFY_BY_WM", "win:0x%08zx", ec, e_client_util_win_get(ec));
    ret = e_policy_visibility_client_uniconify(ec, 0);
    if (!ret)
      {
@@ -1160,7 +1160,7 @@ e_vis_client_send_pre_visibility_event(E_Client *ec)
    intercepted = e_policy_interceptor_call(E_POLICY_INTERCEPT_SEND_PRE_VISIBILITY, ec);
    if (intercepted)
      {
-        ELOGF("POL_VIS", "Handled by Intercept function", ec->pixmap, ec);
+        ELOGF("POL_VIS", "Handled by Intercept function", ec);
         return;
      }
 
@@ -1176,7 +1176,7 @@ e_vis_client_check_send_pre_visibility_event(E_Client *ec, Eina_Bool raise)
 
    if (_e_vis_client_check_send_pre_visibility(vc, raise))
      {
-        ELOGF("POL_VIS", "SEND pre-unobscured visibility event", ec->pixmap, ec);
+        ELOGF("POL_VIS", "SEND pre-unobscured visibility event", ec);
         e_vis_client_send_pre_visibility_event(ec);
      }
 }
@@ -1221,7 +1221,7 @@ _e_vis_client_check_obscured_by_children(E_Client *ec)
         if (!child->argb)
           {
              ELOGF("POL_VIS", "Fully Obscured by child (win:%zx, child:%p)",
-                   ec->pixmap, ec, e_client_util_win_get(child), child);
+                   ec, e_client_util_win_get(child), child);
              obscured = EINA_TRUE;
              break;
           }
@@ -1230,7 +1230,7 @@ _e_vis_client_check_obscured_by_children(E_Client *ec)
              if (child->visibility.opaque > 0)
                {
                   ELOGF("POL_VIS", "Fully Obscured by alpha opaque child (win:%zx, child:%p)",
-                        ec->pixmap, ec, e_client_util_win_get(child), child);
+                        ec, e_client_util_win_get(child), child);
                   obscured = EINA_TRUE;
                   break;
                }
@@ -1259,7 +1259,7 @@ _e_vis_client_check_obscured_by_same_layer(E_Client *ec)
         if (!above->argb)
           {
              ELOGF("POL_VIS", "Fully Obscured by above (win:%zx, ec:%p, layer:%d)",
-                   ec->pixmap, ec, e_client_util_win_get(above), above, above->layer);
+                   ec, e_client_util_win_get(above), above, above->layer);
              obscured = EINA_TRUE;
              break;
           }
@@ -1270,7 +1270,7 @@ _e_vis_client_check_obscured_by_same_layer(E_Client *ec)
              else
                {
                   ELOGF("POL_VIS", "Fully Obscured by alpha opaque above (win:%zx, ec:%p, layer:%d)",
-                        ec->pixmap, ec, e_client_util_win_get(above), above, above->layer);
+                        ec, e_client_util_win_get(above), above, above->layer);
                   obscured = EINA_TRUE;
                   break;
                }
@@ -1299,7 +1299,7 @@ _e_vis_client_check_obscured_by_above_layers(E_Client *ec)
         if (!above->argb)
           {
              ELOGF("POL_VIS", "Fully Obscured by above (win:%zx, ec:%p, layer:%d)",
-                   ec->pixmap, ec, e_client_util_win_get(above), above, above->layer);
+                   ec, e_client_util_win_get(above), above, above->layer);
              obscured = EINA_TRUE;
              break;
           }
@@ -1310,7 +1310,7 @@ _e_vis_client_check_obscured_by_above_layers(E_Client *ec)
              else
                {
                   ELOGF("POL_VIS", "Fully Obscured by alpha opaque above (win:%zx, ec:%p, layer:%d)",
-                        ec->pixmap, ec, e_client_util_win_get(above), above, above->layer);
+                        ec, e_client_util_win_get(above), above, above->layer);
                   obscured = EINA_TRUE;
                   break;
                }
@@ -1337,7 +1337,7 @@ _e_vis_client_check_send_pre_visibility(E_Vis_Client *vc, Eina_Bool raise)
    // check all windows on above layers, if obscured by above then return FALSE
    if (_e_vis_client_check_obscured_by_above_layers(ec))
      {
-        ELOGF("POL_VIS", "DO NOT Need to SEND pre-visibility.. obscured by above (above layer)", ec->pixmap, ec);
+        ELOGF("POL_VIS", "DO NOT Need to SEND pre-visibility.. obscured by above (above layer)", ec);
         return EINA_FALSE;
      }
 
@@ -1346,7 +1346,7 @@ _e_vis_client_check_send_pre_visibility(E_Vis_Client *vc, Eina_Bool raise)
         // check above windows in same layer
         if (_e_vis_client_check_obscured_by_same_layer(ec))
           {
-             ELOGF("POL_VIS", "DO NOT Need to SEND pre-visibility.. obscured by above (same layer)", ec->pixmap, ec);
+             ELOGF("POL_VIS", "DO NOT Need to SEND pre-visibility.. obscured by above (same layer)", ec);
              send_vis_event = EINA_FALSE;
           }
      }
@@ -1357,7 +1357,7 @@ _e_vis_client_check_send_pre_visibility(E_Vis_Client *vc, Eina_Bool raise)
              // check children windows
              if (_e_vis_client_check_obscured_by_children(ec))
                {
-                  ELOGF("POL_VIS", "DO NOT Need to SEND pre-visibility.. obscured by child", ec->pixmap, ec);
+                  ELOGF("POL_VIS", "DO NOT Need to SEND pre-visibility.. obscured by child", ec);
                   send_vis_event = EINA_FALSE;
                }
           }
@@ -1382,7 +1382,7 @@ _e_vis_client_add_uniconify_render_pending(E_Vis_Client *vc, E_Vis_Job_Type type
 
    if (ec->comp_data && !ec->comp_data->mapped)
      {
-        ELOGF("POL_VIS", "Not mapped. no need to uniconify render.", ec->pixmap, ec);
+        ELOGF("POL_VIS", "Not mapped. no need to uniconify render.", ec);
         return EINA_FALSE;
      }
 
@@ -1403,7 +1403,7 @@ _e_vis_client_add_uniconify_render_pending(E_Vis_Client *vc, E_Vis_Job_Type type
 
    if (send_vis_event)
      {
-        ELOGF("POL_VIS", "SEND pre-unobscured visibility event", ec->pixmap, ec);
+        ELOGF("POL_VIS", "SEND pre-unobscured visibility event", ec);
         e_vis_client_send_pre_visibility_event(ec);
      }
 
@@ -1701,7 +1701,7 @@ _e_vis_ec_below_uniconify(E_Client *ec, E_Pol_Vis_Type above_vis_type)
                        continue;
                     }
 
-                  ELOGF("POL_VIS", "SEND pre-unobscured visibility event", below_ec->pixmap, below_ec);
+                  ELOGF("POL_VIS", "SEND pre-unobscured visibility event", below_ec);
                   e_vis_client_send_pre_visibility_event(below_ec);
                }
 
@@ -1875,11 +1875,11 @@ _e_vis_intercept_show(void *data EINA_UNUSED, E_Client *ec)
                     {
                        if (e_policy_visibility_client_is_uniconic(topmost))
                          {
-                            ELOGF("COMP", "Already child(win:0x%08zx ec:%p) uniconify_render done..", ec->pixmap, ec, e_client_util_win_get(topmost), topmost);
+                            ELOGF("COMP", "Already child(win:0x%08zx ec:%p) uniconify_render done..", ec, e_client_util_win_get(topmost), topmost);
                             return EINA_TRUE;
                          }
 
-                       ELOGF("COMP", "Set launching flag..", topmost->pixmap, topmost);
+                       ELOGF("COMP", "Set launching flag..", topmost);
                        topmost->launching = EINA_TRUE;
 
                        vc->state = E_VIS_ICONIFY_STATE_RUNNING_UNICONIFY_WAITING_FOR_CHILD;
@@ -2134,7 +2134,7 @@ e_policy_visibility_client_uniconify(E_Client *ec, Eina_Bool raise)
 
    if (!ec->visible)
      {
-        ELOGF("POL", "UNICONIFY. but NOT MAPPED. So skip...", ec->pixmap, ec);
+        ELOGF("POL", "UNICONIFY. but NOT MAPPED. So skip...", ec);
         return EINA_FALSE;
      }
 
index e6c9f56..e024418 100644 (file)
@@ -458,7 +458,7 @@ _e_policy_wl_tzsh_get_from_client(E_Client *ec)
                {
                   ELOGF("TZSH",
                         "CRI ERR!!|tzsh_cp:%8p|tzsh_ec:%8p|tzsh:%8p",
-                        ec->pixmap, ec,
+                        ec,
                         tzsh->cp,
                         tzsh->ec,
                         tzsh);
@@ -682,7 +682,7 @@ _e_policy_wl_tzsh_srv_tvsrv_bind_update(void)
      {
         ELOGF("TZSH",
               "TR_SET   |parent_ec:0x%08zx|child_ec:0x%08zx",
-              NULL, NULL,
+              NULL,
               e_client_util_win_get(tzsh_client_ec),
               e_client_util_win_get(tzsh_srv_ec));
 
@@ -695,7 +695,7 @@ _e_policy_wl_tzsh_srv_tvsrv_bind_update(void)
           {
              ELOGF("TZSH",
                    "TR_UNSET |                    |child_ec:0x%08zx",
-                   NULL, NULL,
+                   NULL,
                    e_client_util_win_get(tzsh_srv_ec));
 
              e_policy_stack_transient_for_set(tzsh_srv_ec, NULL);
@@ -886,7 +886,6 @@ _e_policy_wl_surf_client_set(E_Client *ec)
                {
                   ELOGF("POLSURF",
                         "CRI ERR!!|s:%8p|tzpol:%8p|ps:%8p|new_ec:%8p|new_cp:%8p",
-                        psurf->cp,
                         psurf->ec,
                         psurf->surf,
                         psurf->tzpol,
@@ -963,7 +962,7 @@ _e_policy_wl_e_pixmap_get_from_id(struct wl_client *client, uint32_t id)
      {
         ELOGF("POLWL",
               "CRI ERR!!|cp2:%8p|ec2:%8p|res_surf:%8p",
-              ec->pixmap, ec,
+              ec,
               cp,
               e_pixmap_client_get(cp),
               res_surf);
@@ -1140,7 +1139,7 @@ e_policy_wl_visibility_send(E_Client *ec, int vis)
 
                ELOGF("POL_VIS",
                      "SEND     |win:0x%08zx|res_tzvis:%8p|ver:%d|sent_vis:%d|pid:%d|title:%s, name:%s",
-                     ec->pixmap, ec,
+                     ec,
                      win,
                      res_tzvis,
                      ver,
@@ -1226,7 +1225,7 @@ e_policy_wl_iconify_state_change_send(E_Client *ec, int iconic)
           tizen_policy_send_iconify_state_changed(tzpol->res_tzpol, psurf->surf, iconic, 1);
           ELOGF("ICONIFY",
                 "SEND     |win:0x%08zx|iconic:%d |sur:%p",
-                ec->pixmap, ec,
+                ec,
                 win,
                 iconic, psurf->surf);
           break;
@@ -1356,7 +1355,7 @@ e_policy_wl_position_send(E_Client *ec)
                tizen_position_send_changed(res_tzpos, ec->client.x, ec->client.y);
                ELOGF("TZPOS",
                      "SEND     |win:0x%08zx|res_tzpos:%8p|ec->x:%d, ec->y:%d, ec->client.x:%d, ec->client.y:%d",
-                     ec->pixmap, ec,
+                     ec,
                      win,
                      res_tzpos,
                      ec->x, ec->y,
@@ -1376,7 +1375,7 @@ e_policy_wl_activate(E_Client *ec)
    EINA_SAFETY_ON_NULL_RETURN(ec);
    EINA_SAFETY_ON_NULL_RETURN(ec->frame);
 
-   ELOGF("TZPOL", "REAL ACTIVATE", ec->pixmap, ec);
+   ELOGF("TZPOL", "REAL ACTIVATE", ec);
 
    if ((!starting) && (!ec->focused) && (!ec->visibility.force_obscured))
      {
@@ -1409,7 +1408,7 @@ _tzpol_iface_cb_activate(struct wl_client *client EINA_UNUSED, struct wl_resourc
    EINA_SAFETY_ON_NULL_RETURN(ec->frame);
    e_policy_hook_call(E_POLICY_HOOK_CLIENT_ACTIVE_REQ, ec);
 
-   ELOGF("TZPOL", "ACTIVATE", ec->pixmap, ec);
+   ELOGF("TZPOL", "ACTIVATE", ec);
    ec->post_lower = EINA_FALSE;
    if (ec->comp_data && !ec->comp_data->mapped)
      ec->post_raise = EINA_TRUE;
@@ -1452,7 +1451,7 @@ e_policy_wl_stack_changed_send(E_Client *ec)
    if (below) below_pid = below->netwm.pid;
 
    ELOGF("TZPOL", "Send stack_changed by activate_below. above(win:%zx, pid:%d), below(win:%zx, pid:%d)",
-         ec->pixmap, ec, e_client_util_win_get(above), above_pid, e_client_util_win_get(below), below_pid);
+         ec, e_client_util_win_get(above), above_pid, e_client_util_win_get(below), below_pid);
 
 
    e_policy_aux_message_send_from_int(ec, "stack_changed", "activate_below", 2, above_pid, below_pid);
@@ -1479,14 +1478,13 @@ _tzpol_iface_cb_activate_below_by_res_id(struct wl_client *client EINA_UNUSED, s
 
    ELOGF("TZPOL",
          "ACTIVATE_BELOW|win:0x%08zx(res_id:%d)|below_win:0x%08zx(res_id:%d)",
-         NULL, NULL, e_client_util_win_get(ec), res_id, e_client_util_win_get(below_ec), below_res_id);
+         NULL, e_client_util_win_get(ec), res_id, e_client_util_win_get(below_ec), below_res_id);
 
    intercepted = e_policy_interceptor_call(E_POLICY_INTERCEPT_ACTIVATE_BELOW,
                                            ec, below_ec);
    if (intercepted)
      {
-        ELOGF("TZPOL", "ACTIVATE_BELOW|Handled by Intercept function",
-              ec->pixmap, ec);
+        ELOGF("TZPOL", "ACTIVATE_BELOW|Handled by Intercept function", ec);
         return;
      }
 
@@ -1516,7 +1514,7 @@ _tzpol_iface_cb_activate_below_by_res_id(struct wl_client *client EINA_UNUSED, s
 
    if ((ec->comp_data) && (!ec->comp_data->mapped))
      {
-        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec->pixmap, ec, EINA_FALSE, EINA_FALSE);
+        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec, EINA_FALSE, EINA_FALSE);
         e_client_post_raise_lower_set(ec, EINA_FALSE, EINA_FALSE);
      }
 
@@ -1547,14 +1545,13 @@ _tzpol_iface_cb_activate_above_by_res_id(struct wl_client *client EINA_UNUSED, s
 
    ELOGF("TZPOL",
          "ACTIVATE_ABOVE|win:0x%08zx(res_id:%d)|above_win:0x%08zx(res_id:%d)",
-         NULL, NULL, e_client_util_win_get(ec), res_id, e_client_util_win_get(above_ec), above_res_id);
+         NULL, e_client_util_win_get(ec), res_id, e_client_util_win_get(above_ec), above_res_id);
 
    intercepted = e_policy_interceptor_call(E_POLICY_INTERCEPT_ACTIVATE_ABOVE,
                                            ec, above_ec);
    if (intercepted)
      {
-        ELOGF("TZPOL", "ACTIVATE_ABOVE|Handled by Intercept function",
-              ec->pixmap, ec);
+        ELOGF("TZPOL", "ACTIVATE_ABOVE|Handled by Intercept function", ec);
         return;
      }
 
@@ -1585,7 +1582,7 @@ _tzpol_iface_cb_activate_above_by_res_id(struct wl_client *client EINA_UNUSED, s
 
    if ((ec->comp_data) && (!ec->comp_data->mapped))
      {
-        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec->pixmap, ec, EINA_FALSE, EINA_FALSE);
+        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec, EINA_FALSE, EINA_FALSE);
         e_client_post_raise_lower_set(ec, EINA_FALSE, EINA_FALSE);
      }
 }
@@ -1600,13 +1597,13 @@ _tzpol_iface_cb_raise(struct wl_client *client EINA_UNUSED, struct wl_resource *
    EINA_SAFETY_ON_NULL_RETURN(ec->frame);
    e_policy_hook_call(E_POLICY_HOOK_CLIENT_RAISE_REQ, ec);
 
-   ELOGF("TZPOL", "RAISE", ec->pixmap, ec);
+   ELOGF("TZPOL", "RAISE", ec);
 
    evas_object_raise(ec->frame);
 
    if ((ec->comp_data) && (!ec->comp_data->mapped))
      {
-        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec->pixmap, ec, EINA_TRUE, EINA_FALSE);
+        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec, EINA_TRUE, EINA_FALSE);
         e_client_post_raise_lower_set(ec, EINA_TRUE, EINA_FALSE);
      }
 }
@@ -1621,7 +1618,7 @@ _tzpol_iface_cb_lower(struct wl_client *client EINA_UNUSED, struct wl_resource *
    EINA_SAFETY_ON_NULL_RETURN(ec->frame);
    e_policy_hook_call(E_POLICY_HOOK_CLIENT_LOWER_REQ, ec);
 
-   ELOGF("TZPOL", "LOWER", ec->pixmap, ec);
+   ELOGF("TZPOL", "LOWER", ec);
 
    if (e_policy_visibility_client_lower(ec))
      return;
@@ -1630,7 +1627,7 @@ _tzpol_iface_cb_lower(struct wl_client *client EINA_UNUSED, struct wl_resource *
 
    if ((ec->comp_data) && (!ec->comp_data->mapped))
      {
-        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec->pixmap, ec, EINA_FALSE, EINA_TRUE);
+        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec, EINA_FALSE, EINA_TRUE);
         e_client_post_raise_lower_set(ec, EINA_FALSE, EINA_TRUE);
      }
 
@@ -1647,12 +1644,12 @@ _tzpol_iface_cb_lower_by_res_id(struct wl_client *client EINA_UNUSED, struct wl_
    EINA_SAFETY_ON_NULL_RETURN(ec);
    EINA_SAFETY_ON_NULL_RETURN(ec->frame);
 
-   ELOGF("TZPOL", "LOWER by res id:%d", ec->pixmap, ec, res_id);
+   ELOGF("TZPOL", "LOWER by res id:%d", ec, res_id);
    evas_object_lower(ec->frame);
 
    if ((ec->comp_data) && (!ec->comp_data->mapped))
      {
-        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec->pixmap, ec, EINA_FALSE, EINA_TRUE);
+        ELOGF("TZPOL", "POST_RAISE_LOWER SET... raise:%d, lower:%d", ec, EINA_FALSE, EINA_TRUE);
         e_client_post_raise_lower_set(ec, EINA_FALSE, EINA_TRUE);
      }
 }
@@ -1670,7 +1667,7 @@ _tzpol_iface_cb_focus_skip_set(struct wl_client *client EINA_UNUSED, struct wl_r
 
    if (ec->icccm.accepts_focus)
      {
-        ELOGF("TZPOL", "FOCUS|SKIP SET", ec->pixmap, ec);
+        ELOGF("TZPOL", "FOCUS|SKIP SET", ec);
         ec->icccm.accepts_focus = ec->icccm.take_focus = 0;
         ec->changes.accepts_focus = 1;
         EC_CHANGED(ec);
@@ -1687,7 +1684,7 @@ _tzpol_iface_cb_focus_skip_unset(struct wl_client *client EINA_UNUSED, struct wl
 
    if (!ec->icccm.accepts_focus)
      {
-        ELOGF("TZPOL", "FOCUS|SKIP UNSET", ec->pixmap, ec);
+        ELOGF("TZPOL", "FOCUS|SKIP UNSET", ec);
         ec->icccm.accepts_focus = ec->icccm.take_focus = 1;
         ec->changes.accepts_focus = 1;
         EC_CHANGED(ec);
@@ -1708,7 +1705,7 @@ _tzpol_iface_cb_role_set(struct wl_client *client EINA_UNUSED, struct wl_resourc
    EINA_SAFETY_ON_NULL_RETURN(ec);
    EINA_SAFETY_ON_NULL_RETURN(ec->frame);
 
-   ELOGF("TZPOL", "ROLE SET (role:%s)", ec->pixmap, ec, role);
+   ELOGF("TZPOL", "ROLE SET (role:%s)", ec, role);
    e_client_window_role_set(ec, role);
 
    /* TODO: support multiple roles */
@@ -1729,7 +1726,7 @@ _tzpol_iface_cb_role_set(struct wl_client *client EINA_UNUSED, struct wl_resourc
      }
    else if (!e_util_strcmp("wl_pointer-cursor", role))
      {
-        ELOGF("TZPOL", "Set CURSOR role", ec->pixmap, ec);
+        ELOGF("TZPOL", "Set CURSOR role", ec);
         evas_object_layer_set(ec->frame, E_LAYER_CLIENT_CURSOR);
         ec->layer = E_LAYER_CLIENT_CURSOR;
         ec->is_cursor = EINA_TRUE;
@@ -1778,7 +1775,7 @@ _tzpol_iface_cb_type_set(struct wl_client *client EINA_UNUSED, struct wl_resourc
 
    ELOGF("TZPOL",
          "TYPE_SET |win:0x%08zx|s:%8p|res_tzpol:%8p|tizen_win_type:%d, e_win_type:%d",
-         ec->pixmap, ec,
+         ec,
          e_client_util_win_get(ec),
          surf,
          res_tzpol,
@@ -1880,7 +1877,7 @@ _tzpol_iface_cb_notilv_set(struct wl_client *client, struct wl_resource *res_tzp
      {
         ELOGF("TZPOL",
               "Privilege Check Failed! DENY set_notification_level",
-              ec->pixmap, ec);
+              ec);
 
         tizen_policy_send_notification_done
            (res_tzpol,
@@ -1890,7 +1887,7 @@ _tzpol_iface_cb_notilv_set(struct wl_client *client, struct wl_resource *res_tzp
         return;
      }
 
-   ELOGF("TZPOL", "NOTI_LEVEL|level:%d", ec->pixmap, ec, lv);
+   ELOGF("TZPOL", "NOTI_LEVEL|level:%d", ec, lv);
    _tzpol_notilv_set(ec, lv);
 
    psurf->notilv = lv;
@@ -1972,7 +1969,7 @@ _tzpol_iface_cb_transient_for_set(struct wl_client *client EINA_UNUSED, struct w
 
    ELOGF("TZPOL",
          "TF_SET   |res_tzpol:%8p|parent:%d|child:%d",
-         NULL, NULL, res_tzpol, parent_id, child_id);
+         NULL, res_tzpol, parent_id, child_id);
 
    ec = e_pixmap_find_client_by_res_id(child_id);
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -1987,13 +1984,13 @@ _tzpol_iface_cb_transient_for_set(struct wl_client *client EINA_UNUSED, struct w
 
    ELOGF("TZPOL",
          "         |win:0x%08zx|parent|s:%8p",
-         pc->pixmap, pc,
+         pc,
          e_client_util_win_get(pc),
          parent_surf);
 
    ELOGF("TZPOL",
          "         |win:0x%08zx|child |s:%8p",
-         ec->pixmap, ec,
+         ec,
          e_client_util_win_get(ec),
          (ec->comp_data ? ec->comp_data->surface : NULL));
 
@@ -2009,7 +2006,7 @@ _tzpol_iface_cb_transient_for_unset(struct wl_client *client EINA_UNUSED, struct
 
    ELOGF("TZPOL",
          "TF_UNSET |res_tzpol:%8p|child:%d",
-         NULL, NULL, res_tzpol, child_id);
+         NULL, res_tzpol, child_id);
 
    ec = e_pixmap_find_client_by_res_id(child_id);
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -2042,7 +2039,7 @@ _tzpol_iface_cb_win_scrmode_set(struct wl_client *client, struct wl_resource *re
      {
         ELOGF("TZPOL",
               "Privilege Check Failed! DENY set_screen_mode",
-              ec->pixmap, ec);
+              ec);
 
         tizen_policy_send_window_screen_mode_done
            (res_tzpol,
@@ -2052,7 +2049,7 @@ _tzpol_iface_cb_win_scrmode_set(struct wl_client *client, struct wl_resource *re
         return;
      }
 
-   ELOGF("TZPOL", "SCR_MODE |mode:%d", ec->pixmap, ec, mode);
+   ELOGF("TZPOL", "SCR_MODE |mode:%d", ec, mode);
 
    e_policy_display_screen_mode_set(ec, mode);
    e_policy_wl_win_scrmode_apply();
@@ -2090,7 +2087,7 @@ _tzpol_iface_cb_subsurf_place_below_parent(struct wl_client *client EINA_UNUSED,
    /* check if a subsurface has already placed below a parent */
    if (eina_list_data_find(epc->comp_data->sub.below_list, ec)) return;
 
-   ELOGF("TZPOL", "SUBSURF|BELOW_PARENT", ec->pixmap, ec);
+   ELOGF("TZPOL", "SUBSURF|BELOW_PARENT", ec);
    epc->comp_data->sub.list = eina_list_remove(epc->comp_data->sub.list, ec);
    epc->comp_data->sub.list_pending = eina_list_remove(epc->comp_data->sub.list_pending, ec);
    epc->comp_data->sub.below_list = eina_list_append(epc->comp_data->sub.below_list, ec);
@@ -2110,7 +2107,7 @@ _tzpol_iface_cb_subsurf_stand_alone_set(struct wl_client *client EINA_UNUSED, st
    sdata = ec->comp_data->sub.data;
    EINA_SAFETY_ON_NULL_RETURN(sdata);
 
-   ELOGF("TZPOL", "SUBSURF|STAND_ALONE", ec->pixmap, ec);
+   ELOGF("TZPOL", "SUBSURF|STAND_ALONE", ec);
    sdata->stand_alone = EINA_TRUE;
 }
 
@@ -2121,7 +2118,7 @@ _tzpol_iface_cb_subsurface_get(struct wl_client *client, struct wl_resource *res
 
    ELOGF("TZPOL",
          "SUBSURF   |wl_surface@%d|parent_id:%d",
-         NULL, NULL, wl_resource_get_id(surface), parent_id);
+         NULL, wl_resource_get_id(surface), parent_id);
 
    ec = wl_resource_get_user_data(surface);
    if (!ec)
@@ -2166,7 +2163,7 @@ _tzpol_iface_cb_opaque_state_set(struct wl_client *client, struct wl_resource *r
    ec = wl_resource_get_user_data(surface);
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("TZPOL", "OPAQUE   |opaque_state:%d", ec->pixmap, ec, state);
+   ELOGF("TZPOL", "OPAQUE   |opaque_state:%d", ec, state);
    if(ec->visibility.opaque == state)
      return;
    ec->visibility.opaque = state;
@@ -2184,7 +2181,7 @@ e_policy_wl_iconify(E_Client *ec)
    EINA_SAFETY_ON_NULL_RETURN(ec);
    EINA_SAFETY_ON_NULL_RETURN(ec->frame);
 
-   ELOG("Set ICONIFY BY CLIENT", ec->pixmap, ec);
+   ELOG("Set ICONIFY BY CLIENT", ec);
 
    if (e_policy_visibility_client_iconify(ec))
      {
@@ -2217,7 +2214,7 @@ e_policy_wl_uniconify(E_Client *ec)
      e_policy_wl_iconify_state_change_send(ec, 0);
 
    e_client_uniconify(ec);
-   ELOG("Un-Set ICONIFY BY CLIENT", ec->pixmap, ec);
+   ELOG("Un-Set ICONIFY BY CLIENT", ec);
    ec->exp_iconify.by_client = 0;
 
    EC_CHANGED(ec);
@@ -2231,7 +2228,7 @@ _tzpol_iface_cb_iconify(struct wl_client *client EINA_UNUSED, struct wl_resource
    ec = wl_resource_get_user_data(surf);
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("TZPOL", "ICONIFY", ec->pixmap, ec);
+   ELOGF("TZPOL", "ICONIFY", ec);
    e_policy_wl_iconify(ec);
 }
 
@@ -2243,7 +2240,7 @@ _tzpol_iface_cb_uniconify(struct wl_client *client EINA_UNUSED, struct wl_resour
    ec = wl_resource_get_user_data(surf);
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("TZPOL", "UNICONIFY", ec->pixmap, ec);
+   ELOGF("TZPOL", "UNICONIFY", ec);
    e_policy_wl_uniconify(ec);
 }
 
@@ -2268,7 +2265,7 @@ _e_policy_wl_allowed_aux_hint_send(E_Client *ec, int id)
              id);
           ELOGF("TZPOL",
                 "SEND     |res_tzpol:%8p|allowed hint->id:%d",
-                ec->pixmap, ec,
+                ec,
                 tzpol->res_tzpol,
                 id);
        }
@@ -2434,12 +2431,12 @@ _e_policy_wl_aux_hint_apply(E_Client *ec)
           {
              if ((hint->deleted) || (!strcmp(hint->val, "0")))
                {
-                  ELOGF("ROTATION", "nopending render:0", ec->pixmap, ec);
+                  ELOGF("ROTATION", "nopending render:0", ec);
                   ec->e.state.rot.nopending_render = 0;
                }
              else if (!strcmp(hint->val, "1"))
                {
-                  ELOGF("ROTATION", "nopending render:1", ec->pixmap, ec);
+                  ELOGF("ROTATION", "nopending render:1", ec);
                   ec->e.state.rot.nopending_render = 1;
                }
           }
@@ -2476,7 +2473,7 @@ _tzpol_iface_cb_aux_hint_add(struct wl_client *client EINA_UNUSED, struct wl_res
 
    res = e_hints_aux_hint_add(ec, id, name, value);
 
-   ELOGF("TZPOL", "HINT_ADD |res_tzpol:%8p|id:%d, name:%s, val:%s, res:%d", ec->pixmap, ec, res_tzpol, id, name, value, res);
+   ELOGF("TZPOL", "HINT_ADD |res_tzpol:%8p|id:%d, name:%s, val:%s, res:%d", ec, res_tzpol, id, name, value, res);
 
    if (res)
      {
@@ -2497,7 +2494,7 @@ _tzpol_iface_cb_aux_hint_change(struct wl_client *client EINA_UNUSED, struct wl_
 
    res = e_hints_aux_hint_change(ec, id, value);
 
-   ELOGF("TZPOL", "HINT_CHD |res_tzpol:%8p|id:%d, val:%s, result:%d", ec->pixmap, ec, res_tzpol, id, value, res);
+   ELOGF("TZPOL", "HINT_CHD |res_tzpol:%8p|id:%d, val:%s, result:%d", ec, res_tzpol, id, value, res);
 
    if (res)
      {
@@ -2517,7 +2514,7 @@ _tzpol_iface_cb_aux_hint_del(struct wl_client *client EINA_UNUSED, struct wl_res
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
    res = e_hints_aux_hint_del(ec, id);
-   ELOGF("TZPOL", "HINT_DEL |res_tzpol:%8p|id:%d, result:%d", ec->pixmap, ec, res_tzpol, id, res);
+   ELOGF("TZPOL", "HINT_DEL |res_tzpol:%8p|id:%d, result:%d", ec, res_tzpol, id, res);
 
    if (res)
      {
@@ -2556,7 +2553,7 @@ _tzpol_iface_cb_supported_aux_hints_get(struct wl_client *client EINA_UNUSED, st
    tizen_policy_send_supported_aux_hints(res_tzpol, surf, &hints, eina_list_count(hints_list));
    ELOGF("TZPOL",
          "SEND     |res_tzpol:%8p|supported_hints size:%d",
-         ec->pixmap, ec,
+         ec,
          res_tzpol,
          eina_list_count(hints_list));
    wl_array_release(&hints);
@@ -2569,7 +2566,7 @@ e_client_background_state_set(E_Client *ec, Eina_Bool state)
 
    ELOGF("TZPOL",
          "BACKGROUND STATE %s for PID(%u)",
-         ec->pixmap, ec,
+         ec,
          state?"SET":"UNSET", ec->netwm.pid);
 
    if (state)
@@ -2603,7 +2600,7 @@ _e_policy_wl_background_state_set(E_Policy_Wl_Surface *psurf, Eina_Bool state)
           {
              ELOGF("TZPOL",
                    "PENDING BACKGROUND STATE SET for PID(%u) psurf:%p tzpol:%p",
-                   NULL, NULL, psurf->pid, psurf, psurf->tzpol);
+                   NULL, psurf->pid, psurf, psurf->tzpol);
 
              if (!eina_list_data_find(psurf->tzpol->pending_bg, psurf))
                psurf->tzpol->pending_bg =
@@ -2618,7 +2615,7 @@ _e_policy_wl_background_state_set(E_Policy_Wl_Surface *psurf, Eina_Bool state)
           {
              ELOGF("TZPOL",
                    "UNSET PENDING BACKGROUND STATE for PID(%u) psurf:%p tzpol:%p",
-                   NULL, NULL, psurf->pid, psurf, psurf->tzpol);
+                   NULL, psurf->pid, psurf, psurf->tzpol);
 
              if (eina_list_data_find(psurf->tzpol->pending_bg, psurf))
                psurf->tzpol->pending_bg =
@@ -2640,8 +2637,8 @@ _e_policy_wl_tzlaunch_effect_type_sync(E_Client *ec)
         if (effect_info->pid == ec->netwm.pid)
           {
              ELOGF("TZPOL",
-                    "Launchscreen effect type sync | pid (%d) effect_type (%d)",
-                    ec->pixmap, ec, ec->netwm.pid, effect_info->effect_type);
+                   "Launchscreen effect type sync | pid (%d) effect_type (%d)",
+                   ec, ec->netwm.pid, effect_info->effect_type);
              ec->effect_type = effect_info->effect_type;
              _e_policy_wl_tzlaunch_effect_type_unset(ec->netwm.pid);
              break;
@@ -2671,8 +2668,8 @@ _e_policy_wl_tzlaunch_effect_type_unset(uint32_t pid)
         if (effect_info->pid == pid)
           {
              ELOGF("TZPOL",
-                    "Launchscreen effect type unset | pid (%d)",
-                    NULL, NULL, pid);
+                   "Launchscreen effect type unset | pid (%d)",
+                   NULL, pid);
              polwl->tzlaunch_effect_info = eina_list_remove(polwl->tzlaunch_effect_info, effect_info);
              memset(effect_info, 0x0, sizeof(E_Policy_Wl_Tzlaunch_Effect_Info));
              E_FREE(effect_info);
@@ -2715,7 +2712,7 @@ _tzpol_iface_cb_background_state_set(struct wl_client *client EINA_UNUSED, struc
 
              ELOGF("TZPOL",
                    "Register PID(%u) for BACKGROUND STATE psurf:%p tzpol:%p",
-                   ec->pixmap, ec, pid, psurf, psurf ? psurf->tzpol : NULL);
+                   ec, pid, psurf, psurf ? psurf->tzpol : NULL);
 
              psurf->is_background = EINA_TRUE;
              _e_policy_wl_background_state_set(psurf, EINA_TRUE);
@@ -2736,7 +2733,7 @@ _tzpol_iface_cb_background_state_set(struct wl_client *client EINA_UNUSED, struc
 
         ELOGF("TZPOL",
               "Register PID(%u) for BACKGROUND STATE psurf:%p tzpol:%p",
-              NULL, NULL, pid, psurf, psurf->tzpol);
+              NULL, pid, psurf, psurf->tzpol);
      }
    if (psurf)
      {
@@ -2794,7 +2791,7 @@ _tzpol_iface_cb_floating_mode_set(struct wl_client *client EINA_UNUSED, struct w
    ec = wl_resource_get_user_data(surf);
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("TZPOL", "FLOATING Set", ec->pixmap, ec);
+   ELOGF("TZPOL", "FLOATING Set", ec);
 
    _e_policy_wl_floating_mode_apply(ec, EINA_TRUE);
 }
@@ -2807,7 +2804,7 @@ _tzpol_iface_cb_floating_mode_unset(struct wl_client *client EINA_UNUSED, struct
    ec = wl_resource_get_user_data(surf);
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("TZPOL", "FLOATING Unset", ec->pixmap, ec);
+   ELOGF("TZPOL", "FLOATING Unset", ec);
 
    e_client_pending_geometry_flush(ec);
 
@@ -2822,7 +2819,7 @@ _tzpol_iface_cb_stack_mode_set(struct wl_client *client EINA_UNUSED, struct wl_r
    ec = wl_resource_get_user_data(surf);
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   ELOGF("TZPOL", "STACK Mode Set. mode:%d", ec->pixmap, ec, mode);
+   ELOGF("TZPOL", "STACK Mode Set. mode:%d", ec, mode);
 
    if (ec->frame)
      {
@@ -3087,20 +3084,20 @@ e_policy_wl_win_brightness_apply(E_Client *ec)
    // use system brightness
    if (dpy_surf->brightness < 0)
      {
-        ELOGF("TZ_DPY_POL", "Restore system brightness. Win(0x%08zx)'s brightness:%d", ec->pixmap, ec, e_client_util_win_get(ec), dpy_surf->brightness);
+        ELOGF("TZ_DPY_POL", "Restore system brightness. Win(0x%08zx)'s brightness:%d", ec, e_client_util_win_get(ec), dpy_surf->brightness);
         ret = _e_policy_restore_system_brightness();
         return ret;
      }
 
    if (ec_visibility == E_VISIBILITY_UNOBSCURED)
      {
-        ELOGF("TZ_DPY_POL", "Change system brightness(%d). Win(0x%08zx) is un-obscured", ec->pixmap, ec, dpy_surf->brightness, e_client_util_win_get(ec));
+        ELOGF("TZ_DPY_POL", "Change system brightness(%d). Win(0x%08zx) is un-obscured", ec, dpy_surf->brightness, e_client_util_win_get(ec));
         ret = _e_policy_change_system_brightness(dpy_surf->brightness);
         if (!ret) return EINA_FALSE;
      }
    else
      {
-        ELOGF("TZ_DPY_POL", "Restore system brightness. Win(0x%08zx) is obscured", ec->pixmap, ec, e_client_util_win_get(ec));
+        ELOGF("TZ_DPY_POL", "Restore system brightness. Win(0x%08zx) is obscured", ec, e_client_util_win_get(ec));
         ret = _e_policy_restore_system_brightness();
         if (!ret) return EINA_FALSE;
      }
@@ -3130,7 +3127,7 @@ _tz_dpy_pol_iface_cb_brightness_set(struct wl_client *client, struct wl_resource
      {
         ELOGF("TZ_DPY_POL",
               "Privilege Check Failed! DENY set_brightness",
-              ec->pixmap, ec);
+              ec);
 
         tizen_display_policy_send_window_brightness_done
            (res_tz_dpy_pol,
@@ -3139,7 +3136,7 @@ _tz_dpy_pol_iface_cb_brightness_set(struct wl_client *client, struct wl_resource
             TIZEN_DISPLAY_POLICY_ERROR_STATE_PERMISSION_DENIED);
         return;
      }
-   ELOGF("TZ_DPY_POL", "Set Win(0x%08zx)'s brightness:%d", ec->pixmap, ec, e_client_util_win_get(ec), brightness);
+   ELOGF("TZ_DPY_POL", "Set Win(0x%08zx)'s brightness:%d", ec, e_client_util_win_get(ec), brightness);
    dpy_surf->set = EINA_TRUE;
    dpy_surf->brightness = brightness;
 
@@ -3208,7 +3205,7 @@ _tzpol_iface_cb_parent_set(struct wl_client *client, struct wl_resource *res_tzp
 
    ELOGF("TZPOL",
          "PARENT_SET   |res_tzpol:%8p|parent:%8p|child:%8p",
-         NULL, NULL, res_tzpol, parent, child);
+         NULL, res_tzpol, parent, child);
 
    ec = wl_resource_get_user_data(child);
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -3227,13 +3224,13 @@ _tzpol_iface_cb_parent_set(struct wl_client *client, struct wl_resource *res_tzp
 
         ELOGF("TZPOL",
               "         |win:0x%08zx|parent|s:%8p",
-              pc->pixmap, pc,
+              pc,
               e_client_util_win_get(pc),
               parent_surf);
 
         ELOGF("TZPOL",
               "         |win:0x%08zx|child |s:%8p",
-              ec->pixmap, ec,
+              ec,
               e_client_util_win_get(ec),
               (ec->comp_data ? ec->comp_data->surface : NULL));
      }
@@ -3266,7 +3263,7 @@ _tzpol_iface_cb_has_video(struct wl_client *client, struct wl_resource *res_tzpo
    if (e_object_is_del(E_OBJECT(ec))) return;
    if (ec->comp_data->has_video_client == has) return;
 
-   ELOGF("TZPOL", "video client has(%d)", ec->pixmap, ec, has);
+   ELOGF("TZPOL", "video client has(%d)", ec, has);
 
    ec->comp_data->has_video_client = has;
 }
@@ -3651,13 +3648,13 @@ _tzsh_srv_iface_cb_softkey_get(struct wl_client *client, struct wl_resource *res
         return;
      }
 
-   ELOGF("TZSH", "[SOFTKEY SERVICE] resource created. res:%p, res_tzsh_srv:%p, id:%d", NULL, NULL, res, res_tzsh_srv, id);
+   ELOGF("TZSH", "[SOFTKEY SERVICE] resource created. res:%p, res_tzsh_srv:%p, id:%d", NULL, res, res_tzsh_srv, id);
 
    if (tzsh_srv->tzsh && tzsh_srv->tzsh->ec)
      {
         E_Client *softkey_ec = tzsh_srv->tzsh->ec;
         softkey = e_service_softkey_get(softkey_ec->zone);
-        ELOGF("TZSH", "[SOFTKEY SERVICE] resource set. res:%p, softkey:%p, softkey_ec:%p", NULL, NULL, res, softkey, softkey_ec);
+        ELOGF("TZSH", "[SOFTKEY SERVICE] resource set. res:%p, softkey:%p, softkey_ec:%p", NULL, res, softkey, softkey_ec);
         if (softkey)
           e_service_softkey_wl_resource_set(softkey, res);
      }
@@ -4053,7 +4050,7 @@ e_tzsh_extension_add(const char *name, E_Policy_Wl_Tzsh_Ext_Hook_Cb cb)
    polwl->tzsh_extensions = eina_list_append(polwl->tzsh_extensions, tzsh_ext);
    ELOGF("TZSH",
          "EXTENSION_ADD | name:%s | cb:%p",
-         NULL, NULL,
+         NULL,
          name, cb);
 
    return EINA_TRUE;
@@ -4077,7 +4074,7 @@ e_tzsh_extension_del(const char *name)
 
    ELOGF("TZSH",
          "EXTENSION_DEL | name:%s",
-         NULL, NULL,
+         NULL,
          name);
 }
 
@@ -4278,13 +4275,13 @@ e_tzsh_indicator_srv_property_change_send(E_Client *ec, int angle)
    if (!ec) return;
    if (!_indicator_srv_res)
      {
-        ELOGF("TZ_IND", "NO indicator service", NULL, NULL);
+        ELOGF("TZ_IND", "NO indicator service", NULL);
         return;
      }
 
    opacity = ec->indicator.opacity_mode;
 
-   ELOGF("TZ_IND", "SEND indicator info. angle:%d, opacity:%d", ec->pixmap, ec, angle, opacity);
+   ELOGF("TZ_IND", "SEND indicator info. angle:%d, opacity:%d", ec, angle, opacity);
    tws_service_indicator_send_property_change(_indicator_srv_res, angle, opacity);
 }
 
@@ -4317,13 +4314,13 @@ e_tzsh_indicator_srv_ower_win_update(E_Zone *zone)
 
    if (ec != ec_cur_owner)
      {
-        ELOGF("TZ_IND", "Changed OWNER. win:%zx, state:%d, opacity:%d, vtype:%d", NULL, NULL, e_client_util_win_get(ec),
+        ELOGF("TZ_IND", "Changed OWNER. win:%zx, state:%d, opacity:%d, vtype:%d", NULL, e_client_util_win_get(ec),
               ec ? ec->indicator.state:-1, ec ? ec->indicator.opacity_mode:-1, ec ? ec->indicator.visible_type:-1);
         e_mod_indicator_owner_set(ec);
 
         if (ec && !ec->e.state.rot.pending_show)
           {
-             ELOGF("TZ_IND", "Property Update. name:%s curr:%d, next:%d", NULL, NULL, ec->icccm.name?:"NULL",
+             ELOGF("TZ_IND", "Property Update. name:%s curr:%d, next:%d", NULL, ec->icccm.name?:"NULL",
                    ec->e.state.rot.ang.curr, ec->e.state.rot.ang.next);
              e_tzsh_indicator_srv_property_update(ec);
           }
@@ -4374,7 +4371,7 @@ e_tzsh_qp_state_visible_update(E_Client *ec, Eina_Bool vis)
                {
                   ELOGF("TZSH",
                         "CRI ERR!!|tzsh_cp:%8p|tzsh_ec:%8p|tzsh:%8p",
-                        ec->pixmap, ec,
+                        ec,
                         tzsh_client->tzsh->cp,
                         tzsh_client->tzsh->ec,
                         tzsh_client->tzsh);
@@ -4410,7 +4407,7 @@ e_tzsh_qp_state_scrollable_update(E_Client *ec, Eina_Bool scrollable)
                {
                   ELOGF("TZSH",
                         "CRI ERR!!|tzsh_cp:%8p|tzsh_ec:%8p|tzsh:%8p",
-                        ec->pixmap, ec,
+                        ec,
                         tzsh_client->tzsh->cp,
                         tzsh_client->tzsh->ec,
                         tzsh_client->tzsh);
@@ -4446,7 +4443,7 @@ e_tzsh_qp_state_orientation_update(E_Client *ec, int ridx)
                {
                   ELOGF("TZSH",
                         "CRI ERR!!|tzsh_cp:%8p|tzsh_ec:%8p|tzsh:%8p",
-                        ec->pixmap, ec,
+                        ec,
                         tzsh_client->tzsh->cp,
                         tzsh_client->tzsh->ec,
                         tzsh_client->tzsh);
@@ -4918,7 +4915,7 @@ _tzsh_softkey_iface_cb_support_check(struct wl_client *client EINA_UNUSED, struc
    E_Policy_Wl_Tzsh_Client *tzsh_client;
    int support;
 
-   ELOGF("TZ_SOFTKEY", "Request to Check supporting softkey", NULL, NULL);
+   ELOGF("TZ_SOFTKEY", "Request to Check supporting softkey", NULL);
 
    tzsh_client = wl_resource_get_user_data(res_tzsh_softkey);
    EINA_SAFETY_ON_NULL_RETURN(tzsh_client);
@@ -4933,7 +4930,7 @@ _tzsh_softkey_iface_cb_support_check(struct wl_client *client EINA_UNUSED, struc
    else
      support = 0;
 
-   ELOGF("TZ_SOFTKEY", "Send SUPPORT_CHECK_DONE. support:%d", NULL, NULL, support);
+   ELOGF("TZ_SOFTKEY", "Send SUPPORT_CHECK_DONE. support:%d", NULL, support);
    tws_softkey_send_support_check_done(res_tzsh_softkey, support);
 }
 
@@ -4942,7 +4939,7 @@ _tzsh_softkey_iface_cb_show(struct wl_client *client EINA_UNUSED, struct wl_reso
 {
    E_Policy_Wl_Tzsh_Client *tzsh_client;
 
-   ELOGF("TZ_SOFTKEY", "Request to Show softkey", NULL, NULL);
+   ELOGF("TZ_SOFTKEY", "Request to Show softkey", NULL);
 
    if (!e_config->use_softkey && !e_config->use_softkey_service)
      return;
@@ -4961,7 +4958,7 @@ _tzsh_softkey_iface_cb_show(struct wl_client *client EINA_UNUSED, struct wl_reso
         softkey = e_policy_softkey_get(tzsh_client->tzsh->ec->zone);
         if (softkey)
           {
-             ELOGF("TZ_SOFTKEY", "SHOW softkey", NULL, NULL);
+             ELOGF("TZ_SOFTKEY", "SHOW softkey", NULL);
              e_policy_softkey_show(softkey);
           }
      }
@@ -4972,7 +4969,7 @@ _tzsh_softkey_iface_cb_show(struct wl_client *client EINA_UNUSED, struct wl_reso
         softkey = e_service_softkey_get(tzsh_client->tzsh->ec->zone);
         if (softkey)
           {
-             ELOGF("TZ_SOFTKEY", "Request to SHOW softkey. (service:%p)", NULL, NULL, softkey);
+             ELOGF("TZ_SOFTKEY", "Request to SHOW softkey. (service:%p)", NULL, softkey);
              e_service_softkey_visible_set(softkey, 1);
           }
      }
@@ -4983,7 +4980,7 @@ _tzsh_softkey_iface_cb_hide(struct wl_client *client EINA_UNUSED, struct wl_reso
 {
    E_Policy_Wl_Tzsh_Client *tzsh_client;
 
-   ELOGF("TZ_SOFTKEY", "Request to Hide softkey", NULL, NULL);
+   ELOGF("TZ_SOFTKEY", "Request to Hide softkey", NULL);
 
    if (!e_config->use_softkey && !e_config->use_softkey_service)
      return;
@@ -5002,7 +4999,7 @@ _tzsh_softkey_iface_cb_hide(struct wl_client *client EINA_UNUSED, struct wl_reso
         softkey = e_policy_softkey_get(tzsh_client->tzsh->ec->zone);
         if (softkey)
           {
-             ELOGF("TZ_SOFTKEY", "HIDE softkey", NULL, NULL);
+             ELOGF("TZ_SOFTKEY", "HIDE softkey", NULL);
              e_policy_softkey_hide(softkey);
           }
      }
@@ -5013,7 +5010,7 @@ _tzsh_softkey_iface_cb_hide(struct wl_client *client EINA_UNUSED, struct wl_reso
         softkey = e_service_softkey_get(tzsh_client->tzsh->ec->zone);
         if (softkey)
           {
-             ELOGF("TZ_SOFTKEY", "Request to HIDE softkey. (service:%p)", NULL, NULL, softkey);
+             ELOGF("TZ_SOFTKEY", "Request to HIDE softkey. (service:%p)", NULL, softkey);
              e_service_softkey_visible_set(softkey, 0);
           }
      }
@@ -5026,7 +5023,7 @@ _tzsh_softkey_iface_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl
    E_Policy_Softkey_Expand expand;
    E_Policy_Softkey_Opacity opacity;
 
-   ELOGF("TZ_SOFTKEY", "Request to Set state (tz_type:%d, tz_val:%d)", NULL, NULL, type, val);
+   ELOGF("TZ_SOFTKEY", "Request to Set state (tz_type:%d, tz_val:%d)", NULL, type, val);
 
    if (!e_config->use_softkey && !e_config->use_softkey_service)
      return;
@@ -5053,7 +5050,7 @@ _tzsh_softkey_iface_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl
               else
                 expand = E_POLICY_SOFTKEY_EXPAND_OFF;
 
-              ELOGF("TZ_SOFTKEY", "Set EXPAND state to %d", NULL, NULL, expand);
+              ELOGF("TZ_SOFTKEY", "Set EXPAND state to %d", NULL, expand);
               e_policy_softkey_expand_set(softkey, expand);
               break;
 
@@ -5063,7 +5060,7 @@ _tzsh_softkey_iface_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl
               else
                 opacity = E_POLICY_SOFTKEY_OPACITY_OPAQUE;
 
-              ELOGF("TZ_SOFTKEY", "Set OPACITY state to %d", NULL, NULL, opacity);
+              ELOGF("TZ_SOFTKEY", "Set OPACITY state to %d", NULL, opacity);
               e_policy_softkey_opacity_set(softkey, opacity);
               break;
 
@@ -5087,7 +5084,7 @@ _tzsh_softkey_iface_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl
               else
                 expand = E_POLICY_SOFTKEY_EXPAND_OFF;
 
-              ELOGF("TZ_SOFTKEY", "Request to Change EXPAND state to %d. (service:%p)", NULL, NULL, expand, softkey);
+              ELOGF("TZ_SOFTKEY", "Request to Change EXPAND state to %d. (service:%p)", NULL, expand, softkey);
               e_service_softkey_expand_set(softkey, expand);
               break;
 
@@ -5097,7 +5094,7 @@ _tzsh_softkey_iface_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl
               else
                 opacity = E_POLICY_SOFTKEY_OPACITY_OPAQUE;
 
-              ELOGF("TZ_SOFTKEY", "Request to Change OPACITY state to %d. (service:%p)", NULL, NULL, opacity, softkey);
+              ELOGF("TZ_SOFTKEY", "Request to Change OPACITY state to %d. (service:%p)", NULL, opacity, softkey);
               e_service_softkey_opacity_set(softkey, opacity);
               break;
 
@@ -5116,7 +5113,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl
    int visible;
    int val;
 
-   ELOGF("TZ_SOFTKEY", "Request to Get state (tz_type:%d)", NULL, NULL, type);
+   ELOGF("TZ_SOFTKEY", "Request to Get state (tz_type:%d)", NULL, type);
 
    if (!e_config->use_softkey && !e_config->use_softkey_service)
      return;
@@ -5144,7 +5141,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl
               else
                 val = TWS_SOFTKEY_STATE_VISIBLE_HIDE;
 
-              ELOGF("TZ_SOFTKEY", "Send current VISIBLE state: %d (tz_val:%d)", NULL, NULL, visible, val);
+              ELOGF("TZ_SOFTKEY", "Send current VISIBLE state: %d (tz_val:%d)", NULL, visible, val);
               tws_softkey_send_state_get_done(res_tzsh_softkey, type, val, 0);
               break;
 
@@ -5155,7 +5152,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl
               else
                 val = TWS_SOFTKEY_STATE_EXPAND_OFF;
 
-              ELOGF("TZ_SOFTKEY", "Send current EXPAND state: %d (tz_val:%d)", NULL, NULL, expand, val);
+              ELOGF("TZ_SOFTKEY", "Send current EXPAND state: %d (tz_val:%d)", NULL, expand, val);
               tws_softkey_send_state_get_done(res_tzsh_softkey, type, val, 0);
               break;
 
@@ -5166,7 +5163,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl
               else
                 val = TWS_SOFTKEY_STATE_OPACITY_OPAQUE;
 
-              ELOGF("TZ_SOFTKEY", "Send current OPACITY state: %d (tz_val:%d)", NULL, NULL, opacity, val);
+              ELOGF("TZ_SOFTKEY", "Send current OPACITY state: %d (tz_val:%d)", NULL, opacity, val);
               tws_softkey_send_state_get_done(res_tzsh_softkey, type, val, 0);
               break;
 
@@ -5190,7 +5187,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl
               else
                 val = TWS_SOFTKEY_STATE_VISIBLE_HIDE;
 
-              ELOGF("TZ_SOFTKEY", "Send service's current VISIBLE state: %d (tz_val:%d)", NULL, NULL, visible, val);
+              ELOGF("TZ_SOFTKEY", "Send service's current VISIBLE state: %d (tz_val:%d)", NULL, visible, val);
               tws_softkey_send_state_get_done(res_tzsh_softkey, type, val, 0);
               break;
 
@@ -5201,7 +5198,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl
               else
                 val = TWS_SOFTKEY_STATE_EXPAND_OFF;
 
-              ELOGF("TZ_SOFTKEY", "Send service's current EXPAND state: %d (tz_val:%d)", NULL, NULL, expand, val);
+              ELOGF("TZ_SOFTKEY", "Send service's current EXPAND state: %d (tz_val:%d)", NULL, expand, val);
               tws_softkey_send_state_get_done(res_tzsh_softkey, type, val, 0);
               break;
 
@@ -5212,7 +5209,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl
               else
                 val = TWS_SOFTKEY_STATE_OPACITY_OPAQUE;
 
-              ELOGF("TZ_SOFTKEY", "Send service's current OPACITY state: %d (tz_val:%d)", NULL, NULL, opacity, val);
+              ELOGF("TZ_SOFTKEY", "Send service's current OPACITY state: %d (tz_val:%d)", NULL, opacity, val);
               tws_softkey_send_state_get_done(res_tzsh_softkey, type, val, 0);
               break;
 
@@ -5428,7 +5425,7 @@ _launchscreen_splash_cb_indicator_resized(Ecore_Evas *ee)
 
    ecore_evas_geometry_get(ee, NULL, NULL, &(size.w), &(size.h));
    ELOGF("TZPOL", "Launchscreen indicator_obj resized(%d x %d)",
-         NULL, NULL,
+         NULL,
          size.w, size.h);
    evas_object_size_hint_min_set(indicator_obj, size.w, size.h);
    evas_object_size_hint_max_set(indicator_obj, size.w, size.h);
@@ -5473,7 +5470,7 @@ _launch_splash_off(E_Policy_Wl_Tzlaunch_Splash *tzlaunch_splash)
 
    ELOGF("TZPOL",
          "Launchscreen hide | pid %d, replaced:%d, tzlaunch_pixmap:%p, ec_pixmap:%p",
-         ec->pixmap, ec, tzlaunch_splash->pid, tzlaunch_splash->replaced, tzlaunch_splash->ep, ec->pixmap);
+         ec, tzlaunch_splash->pid, tzlaunch_splash->replaced, tzlaunch_splash->ep, ec->pixmap);
 
    if (tzlaunch_splash->indicator_obj)
      {
@@ -5580,7 +5577,7 @@ _tzlaunch_splash_iface_cb_launch(struct wl_client *client EINA_UNUSED, struct wl
    // invaid parameter handle
    ELOGF("TZPOL",
          "Launchscreen launch | path %s(%d), indicator(%d), angle(%d), effect_type(%s), theme_type(%s)",
-         ec->pixmap, ec, pfname, ftype, indicator, angle, effect_type, theme_type);
+         ec, pfname, ftype, indicator, angle, effect_type, theme_type);
 
    tzlaunch_splash->path = pfname;
    tzlaunch_splash->type = ftype;
@@ -5605,7 +5602,7 @@ _tzlaunch_splash_iface_cb_launch(struct wl_client *client EINA_UNUSED, struct wl
 
         ELOGF("TZPOL",
               "Launchscreen object setup was successfully intercepted content(%p)",
-              ec->pixmap, ec, tzlaunch_splash->obj);
+              ec, tzlaunch_splash->obj);
      }
    else
      {
@@ -5657,7 +5654,7 @@ _tzlaunch_splash_iface_cb_launch(struct wl_client *client EINA_UNUSED, struct wl
           {
              ELOGF("TZPOL",
                    "Launchscreen launch | Faild to create ecore_evas_plug for indicator",
-                   ec->pixmap, ec);
+                   ec);
           }
         else
           {
@@ -5676,7 +5673,7 @@ _tzlaunch_splash_iface_cb_launch(struct wl_client *client EINA_UNUSED, struct wl
                        evas_object_ref(indicator_obj);
                        ELOGF("TZPOL",
                              "Launchscreen launch | Succeeded to add indicator object plug_name(%s) indicator_obj(%p)",
-                             ec->pixmap, ec, e_config->indicator_plug_name, indicator_obj);
+                             ec, e_config->indicator_plug_name, indicator_obj);
                     }
                   else
                     {
@@ -5689,7 +5686,7 @@ _tzlaunch_splash_iface_cb_launch(struct wl_client *client EINA_UNUSED, struct wl
                {
                   ELOGF("TZPOL",
                         "Launchscreen launch | Failed to add indicator object plug_name(%s)",
-                        ec->pixmap, ec, e_config->indicator_plug_name?:"NO PLUG NAME");
+                        ec, e_config->indicator_plug_name?:"NO PLUG NAME");
                }
           }
 
@@ -5785,7 +5782,7 @@ _tzlaunch_splash_iface_cb_owner(struct wl_client *client EINA_UNUSED, struct wl_
 
              ELOGF("TZPOL",
                    "Launchscreen client changed | old(%p) new(%p) using obj(%p)",
-                   new_ec->pixmap, new_ec,
+                   new_ec,
                    old_ec, new_ec, tzlaunch_splash->obj);
 
              if (tzlaunch_splash->indicator_obj)
@@ -5816,7 +5813,6 @@ _tzlaunch_splash_iface_cb_owner(struct wl_client *client EINA_UNUSED, struct wl_
      }
 
    ELOGF("TZPOL", "Launchscreen img(%d) set owner pid: %d",
-         (tzlaunch_splash->ec? tzlaunch_splash->ec->pixmap : NULL),
          tzlaunch_splash->ec,
          wl_resource_get_id(res_tzlaunch_splash), pid);
 
@@ -5955,7 +5951,7 @@ _tzlaunch_effect_iface_cb_type_set(struct wl_client *client, struct wl_resource
              effect_set = 1;
              ELOGF("TZPOL",
                     "Launchscreen effect type set | exist ec | effect (%d) pid (%d)",
-                    _ec->pixmap, _ec, tzlaunch_effect_type, pid);
+                    _ec, tzlaunch_effect_type, pid);
           }
      }
    eina_list_free(clients);
@@ -5973,7 +5969,8 @@ _tzlaunch_effect_iface_cb_type_set(struct wl_client *client, struct wl_resource
         polwl->tzlaunch_effect_info = eina_list_append(polwl->tzlaunch_effect_info, tzlaunch_effect_info);
 
         ELOGF("TZPOL",
-               "Launchscreen effect type set | no match ec | effect (%d) pid (%d)", NULL, NULL, tzlaunch_effect_type, pid);
+              "Launchscreen effect type set | no match ec | effect (%d) pid (%d)",
+              NULL, tzlaunch_effect_type, pid);
      }
 }
 
@@ -6095,7 +6092,7 @@ _e_policy_wl_cb_hook_intercept_show_helper(void *data, E_Client *ec)
                {
                   ELOGF("TZPOL",
                         "BACKGROUND State is On, Deny Show",
-                        ec->pixmap, ec);
+                        ec);
                   return EINA_FALSE;
                }
           }
@@ -6229,7 +6226,7 @@ _tz_indicator_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl_resou
    else
      ind_state = E_INDICATOR_STATE_UNKNOWN;
 
-   ELOGF("TZ_IND", "TZ_STATE:%d, E_STATE:%d", ec->pixmap, ec, state, ind_state);
+   ELOGF("TZ_IND", "TZ_STATE:%d, E_STATE:%d", ec, state, ind_state);
    _e_policy_wl_tz_indicator_set_client(res_tz_indicator, ec);
    ec->indicator.state = ind_state;
 
@@ -6269,7 +6266,7 @@ _tz_indicator_cb_opacity_mode_set(struct wl_client *client EINA_UNUSED, struct w
         break;
      }
 
-   ELOGF("TZ_IND", "TZ_OP_MODE:%d, E_OP_MODE:%d", ec->pixmap, ec, mode, op_mode);
+   ELOGF("TZ_IND", "TZ_OP_MODE:%d, E_OP_MODE:%d", ec, mode, op_mode);
    _e_policy_wl_tz_indicator_set_client(res_tz_indicator, ec);
 
    if (ec->indicator.opacity_mode == op_mode) return;
@@ -6295,7 +6292,7 @@ _tz_indicator_cb_visible_type_set(struct wl_client *client EINA_UNUSED, struct w
    else
      vis_type = E_INDICATOR_VISIBLE_TYPE_HIDDEN;
 
-   ELOGF("TZ_IND", "TZ_VIS_TYPE:%d, E_VIS_TYPE:%d", ec->pixmap, ec, vtype, vis_type);
+   ELOGF("TZ_IND", "TZ_VIS_TYPE:%d, E_VIS_TYPE:%d", ec, vtype, vis_type);
    _e_policy_wl_tz_indicator_set_client(res_tz_indicator, ec);
    ec->indicator.visible_type = vis_type;
 
@@ -6366,7 +6363,7 @@ e_policy_wl_indicator_flick_send(E_Client *ec)
    else
      surf = NULL;
 
-   ELOGF("TZ_IND", "SEND FLICK EVENT", ec->pixmap, ec);
+   ELOGF("TZ_IND", "SEND FLICK EVENT", ec);
    tizen_indicator_send_flick(tz_indicator->res_tz_indicator, surf, 0);
 }
 
@@ -6500,7 +6497,7 @@ _tz_clipboard_cb_data_only_set(struct wl_client *client, struct wl_resource *res
         ELOGF("TZPOL",
               "Unable to set data only mode for wl_client(%p) : "
               "ec_list exists",
-              NULL, NULL, client);
+              NULL, client);
         goto send_deny;
      }
 
@@ -6509,7 +6506,7 @@ _tz_clipboard_cb_data_only_set(struct wl_client *client, struct wl_resource *res
         ELOGF("TZPOL",
               "Unable to set data only mode for wl_client(%p) : "
               "no wl_data_device resource",
-              NULL, NULL, client);
+              NULL, client);
         goto send_deny;
      }
 
@@ -6533,7 +6530,7 @@ _tz_clipboard_cb_data_only_set(struct wl_client *client, struct wl_resource *res
         ELOGF("TZPOL",
               "Unable to set data only mode for wl_client(%p) : "
               "have ec(%p)",
-              NULL, NULL, client, ec);
+              NULL, client, ec);
         goto send_deny;
      }
 
@@ -6545,13 +6542,13 @@ _tz_clipboard_cb_data_only_set(struct wl_client *client, struct wl_resource *res
      {
         ELOGF("TZPOL",
               "Privilege Check Failed! DENY data_only_set",
-              NULL, NULL);
+              NULL);
         goto send_deny;
      }
 
    ELOGF("TZPOL",
          "Set data only mode :%d for wl_client(%p)",
-         NULL, NULL, set, client);
+         NULL, set, client);
    e_comp_wl_data_device_only_set(data_res, !(set == 0));
    tizen_clipboard_send_allowed_data_only(res_tz_clipboard, (uint32_t)1);
    return;
@@ -6735,7 +6732,7 @@ e_policy_wl_aux_message_send(E_Client *ec,
                                          key, val, &opt_array);
           ELOGF("TZPOL",
                 "SEND     |res_tzpol:%8p|aux message key:%s val:%s opt_count:%d",
-                ec->pixmap, ec,
+                ec,
                 tzpol->res_tzpol,
                 key, val, eina_list_count(options));
         }
index f69b466..06fb9cf 100644 (file)
@@ -244,7 +244,7 @@ _e_policy_wl_display_screen_mode_send(E_Display_Screen_Mode mode)
      }
 
    _e_display_screen_mode = mode;
-   ELOGF("TZPOL", "SCR_MODE | Send screen mode:%d to system", NULL, NULL, mode);
+   ELOGF("TZPOL", "SCR_MODE | Send screen mode:%d to system", NULL, mode);
 
    eldbus_connection_send(_e_display_dbus_info.edbus_conn, msg, NULL, NULL, -1);
 }
@@ -316,7 +316,7 @@ e_policy_display_screen_mode_apply(void)
      {
         if (_e_display_screen_mode == E_DISPLAY_SCREEN_MODE_DEFAULT)
           {
-             ELOGF("TZPOL", "SCR_MODE | Request to change screen mode:%d", ec->pixmap, ec, E_DISPLAY_SCREEN_MODE_ALWAYS_ON);
+             ELOGF("TZPOL", "SCR_MODE | Request to change screen mode:%d", ec, E_DISPLAY_SCREEN_MODE_ALWAYS_ON);
              _e_policy_wl_display_screen_mode_send(E_DISPLAY_SCREEN_MODE_ALWAYS_ON);
           }
      }
@@ -324,7 +324,7 @@ e_policy_display_screen_mode_apply(void)
      {
         if (_e_display_screen_mode == E_DISPLAY_SCREEN_MODE_ALWAYS_ON)
           {
-             ELOGF("TZPOL", "SCR_MODE | Request to change screen mode:%d", NULL, NULL, E_DISPLAY_SCREEN_MODE_DEFAULT);
+             ELOGF("TZPOL", "SCR_MODE | Request to change screen mode:%d", NULL, E_DISPLAY_SCREEN_MODE_DEFAULT);
              _e_policy_wl_display_screen_mode_send(E_DISPLAY_SCREEN_MODE_DEFAULT);
           }
      }
index d9ef21d..f7a401a 100644 (file)
@@ -130,7 +130,7 @@ _e_process_client_info_del(E_Client *ec)
    if (_e_process_manager->active_win == ec)
      {
         _e_process_manager->active_win = NULL;
-        ELOGF("PROCESS", "ACTION DEACTIVATE. PID:%d", NULL, NULL, pid);
+        ELOGF("PROCESS", "ACTION DEACTIVATE. PID:%d", NULL, pid);
         _e_process_action_change(pinfo, E_PROCESS_ACT_DEACTIVATE);
      }
 
@@ -332,7 +332,7 @@ _e_process_cb_client_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void
 
    if (change_active)
      {
-        ELOGF("PROCESS", "ACTION ACTIVATE. PID:%d", NULL, NULL, pid);
+        ELOGF("PROCESS", "ACTION ACTIVATE. PID:%d", NULL, pid);
         _e_process_action_change(pinfo, E_PROCESS_ACT_ACTIVATE);
 
         if (ec_deactive)
@@ -340,7 +340,7 @@ _e_process_cb_client_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void
              pinfo_deactive = _e_process_find(_e_process_manager, ec_deactive->netwm.pid);
              if (pinfo_deactive)
                {
-                  ELOGF("PROCESS", "ACTION DEACTIVATE. PID:%d", NULL, NULL, pinfo_deactive->pid);
+                  ELOGF("PROCESS", "ACTION DEACTIVATE. PID:%d", NULL, pinfo_deactive->pid);
                   _e_process_action_change(pinfo_deactive, E_PROCESS_ACT_DEACTIVATE);
                }
           }
@@ -402,7 +402,7 @@ _e_process_windows_act_no_visible_update(pid_t pid)
 
    _e_process_state_change(pinfo, E_PROCESS_STATE_BACKGROUND, EINA_FALSE);
 
-   ELOGF("PROCESS", "ACTION WINDOWS_HIDDEN. PID:%d", NULL, NULL, pinfo->pid);
+   ELOGF("PROCESS", "ACTION WINDOWS_HIDDEN. PID:%d", NULL, pinfo->pid);
    _e_process_action_change(pinfo, E_PROCESS_ACT_NO_VISIBLE_WINDOWS);
 }
 
@@ -451,7 +451,7 @@ _e_process_freeze(pid_t pid)
 
    if (pinfo->state != E_PROCESS_STATE_BACKGROUND)
      {
-        ELOGF("PROCESS", "STATE  BACKGROUND. PID:%d", NULL, NULL, pid);
+        ELOGF("PROCESS", "STATE  BACKGROUND. PID:%d", NULL, pid);
         _e_process_state_change(pinfo, E_PROCESS_STATE_BACKGROUND, EINA_TRUE);
      }
 
@@ -470,7 +470,7 @@ _e_process_thaw(pid_t pid)
 
    if (pinfo->state != E_PROCESS_STATE_FOREGROUND)
      {
-        ELOGF("PROCESS", "STATE  FOREGROUND. PID:%d", NULL, NULL, pid);
+        ELOGF("PROCESS", "STATE  FOREGROUND. PID:%d", NULL, pid);
         _e_process_state_change(pinfo, E_PROCESS_STATE_FOREGROUND, EINA_TRUE);
      }
 
@@ -500,14 +500,14 @@ _e_process_state_change(E_Process *epro, E_Process_State state, Eina_Bool send_e
 
         if (state == E_PROCESS_STATE_FOREGROUND)
           {
-             ELOGF("PROCESS", "ACTION FOREGROUND. PID:%d", NULL, NULL, epro->pid);
+             ELOGF("PROCESS", "ACTION FOREGROUND. PID:%d", NULL, epro->pid);
              _e_process_action_change(epro, E_PROCESS_ACT_FOREGROUND);
           }
         else if (state == E_PROCESS_STATE_BACKGROUND)
           {
-             ELOGF("PROCESS", "ACTION WINDOWS_HIDDEN. PID:%d", NULL, NULL, epro->pid);
+             ELOGF("PROCESS", "ACTION WINDOWS_HIDDEN. PID:%d", NULL, epro->pid);
              _e_process_action_change(epro, E_PROCESS_ACT_NO_VISIBLE_WINDOWS);
-             ELOGF("PROCESS", "ACTION BACKGROUND. PID:%d", NULL, NULL, epro->pid);
+             ELOGF("PROCESS", "ACTION BACKGROUND. PID:%d", NULL, epro->pid);
              _e_process_action_change(epro, E_PROCESS_ACT_BACKGROUND);
           }
      }
@@ -675,6 +675,6 @@ e_process_state_get(pid_t pid)
    pinfo = _e_process_find(_e_process_manager, pid);
    if (!pinfo) return E_PROCESS_STATE_UNKNOWN;
 
-   ELOGF("PROCESS", "GET STATE. PID:%d, state:%d", NULL, NULL, pid, pinfo->state);
+   ELOGF("PROCESS", "GET STATE. PID:%d, state:%d", NULL, pid, pinfo->state);
    return pinfo->state;
 }
index 3fc4536..183d362 100644 (file)
@@ -47,7 +47,7 @@ e_security_privilege_check(pid_t pid, uid_t uid, const char *privilege)
 finish:
    ELOGF("E_SECURITY",
          "Privilege Check For '%s' %s pid:%u uid:%u client_smack:%s(len:%d) client_session:%s ret:%d",
-         NULL, NULL,
+         NULL,
          privilege,
          res ? "SUCCESS" : "FAIL",
          pid,
index 2ad3baf..6f7dd4c 100644 (file)
@@ -210,7 +210,7 @@ e_slot_layout_cb(void)
 EINTERN void
 e_slot_init(void)
 {
-   ELOGF("SLOT", "e_slot_init", NULL, NULL);
+   ELOGF("SLOT", "e_slot_init", NULL);
    E_Slot_G *g = NULL;
    g = E_NEW(E_Slot_G, 1);
 
@@ -226,7 +226,7 @@ e_slot_init(void)
 EINTERN int
 e_slot_shutdown(void)
 {
-   ELOGF("SLOT", "e_slot_shutdown", NULL, NULL);
+   ELOGF("SLOT", "e_slot_shutdown", NULL);
 
    E_FREE_FUNC(_e_slot_g->slot_objs, eina_list_free);
 
@@ -276,7 +276,7 @@ e_slot_new(Evas_Object *parent)
 
    evas_object_show(o);
 
-   ELOGF("SLOT", "|Create new slot - id:%d ", NULL, NULL, sd->id);
+   ELOGF("SLOT", "|Create new slot - id:%d ", NULL, sd->id);
    evas_object_data_set(o, "e_slot_object", (void*)1);
 
    return o;
@@ -286,7 +286,7 @@ E_API void
 e_slot_del(Evas_Object *obj)
 {
    SLOT_SMART_ENTRY
-   ELOGF("SLOT", "|Remove slot - id:%d ", NULL, NULL, sd->id);
+   ELOGF("SLOT", "|Remove slot - id:%d ", NULL, sd->id);
 
    eina_hash_del_by_key(_e_slot_g->hash_slot_objs, &sd->id);
    evas_object_del(obj);
@@ -299,7 +299,7 @@ e_slot_move(Evas_Object *obj, int x, int y)
 
    if (sd->x == x && sd->y == y) return;
 
-   ELOGF("SLOT", "|Move slot - id:%d  (%d, %d) -> (%d, %d)", NULL, NULL,
+   ELOGF("SLOT", "|Move slot - id:%d  (%d, %d) -> (%d, %d)", NULL,
          sd->id, sd->x, sd->y, x, y);
 
    evas_object_move(obj, x, y);
@@ -316,7 +316,7 @@ e_slot_resize(Evas_Object *obj, int w, int h)
 
    if (sd->w == w && sd->h == h) return;
 
-   ELOGF("SLOT", "|Resize slot - id:%d  (%dx%d) -> (%dx%d)", NULL, NULL,
+   ELOGF("SLOT", "|Resize slot - id:%d  (%dx%d) -> (%dx%d)", NULL,
          sd->id, sd->w, sd->h, w, h);
 
    evas_object_resize(obj, w, h);
@@ -347,7 +347,7 @@ e_slot_raise(Evas_Object *obj)
         if (e_object_is_del(E_OBJECT(ec))) continue;
         if (e_client_util_ignored_get(ec)) continue;
         if (ec->layout.s_id != sd->id) continue;
-        ELOGF("SLOT", "|raise ec[list add] - id:%d [cnt:%d]pid:%d", ec->pixmap, ec, sd->id, cnt++, ec->netwm.pid);
+        ELOGF("SLOT", "|raise ec[list add] - id:%d [cnt:%d]pid:%d", ec, sd->id, cnt++, ec->netwm.pid);
         if (!top_ec) top_ec = ec;
         l = eina_list_append(l, ec);
      }
@@ -358,7 +358,7 @@ e_slot_raise(Evas_Object *obj)
    cnt = 0;
    EINA_LIST_FREE(l, ec2)
      {
-        ELOGF("SLOT", "e_slot_raise |raise ec - id:%d [cnt:%d]pid:%d", ec2->pixmap, ec2, sd->id, cnt++, ec2->netwm.pid);
+        ELOGF("SLOT", "e_slot_raise |raise ec - id:%d [cnt:%d]pid:%d", ec2, sd->id, cnt++, ec2->netwm.pid);
         if (top_ec == ec2) evas_object_raise(ec2->frame);
         else evas_object_stack_below(ec2->frame, below_ec->frame);
         below_ec = ec2;
@@ -387,14 +387,14 @@ e_slot_lower(Evas_Object *obj)
         if (e_object_is_del(E_OBJECT(ec))) continue;
         if (e_client_util_ignored_get(ec)) continue;
         if (ec->layout.s_id != sd->id) continue;
-        ELOGF("SLOT", "e_slot_lower |lower ec[list add] - id:%d [cnt:%d]", ec->pixmap, ec, sd->id, cnt++);
+        ELOGF("SLOT", "e_slot_lower |lower ec[list add] - id:%d [cnt:%d]", ec, sd->id, cnt++);
         l = eina_list_append(l, ec);
      }
 
    cnt = 0;
    EINA_LIST_FREE(l, ec2)
      {
-        ELOGF("SLOT", "e_slot_lower |lower ec - id:%d [cnt:%d]", ec2->pixmap, ec2, sd->id, cnt++);
+        ELOGF("SLOT", "e_slot_lower |lower ec - id:%d [cnt:%d]", ec2, sd->id, cnt++);
         evas_object_lower(ec2->frame);
      }
 
@@ -421,7 +421,7 @@ e_slot_focus_set(Evas_Object *obj)
         if (e_object_is_del(E_OBJECT(ec))) continue;
         if (e_client_util_ignored_get(ec)) continue;
         if (ec->layout.s_id != sd->id) continue;
-        ELOGF("SLOT", "e_slot_focus_set |ec foucsed set - id:%d [cnt:%d]", ec->pixmap, ec, sd->id, cnt++);
+        ELOGF("SLOT", "e_slot_focus_set |ec foucsed set - id:%d [cnt:%d]", ec, sd->id, cnt++);
         if (ec->frame) evas_object_raise(ec->frame);
         break;
      }
@@ -474,7 +474,7 @@ e_slot_update(Evas_Object *obj)
                        e_util_transform_scale(slot_client->transform,  (double)sd->w /(double)slot_client->ec->w, (double)sd->h /(double)slot_client->ec->h, 1.0);
                        e_client_transform_core_update(slot_client->ec);
 
-                       ELOGF("SLOT", "e_slot_update |transform update - id:%d (%d,%d) (%lf x %lf) [cnt:%d] [pid:%d]", slot_client->ec->pixmap, slot_client->ec,
+                       ELOGF("SLOT", "e_slot_update |transform update - id:%d (%d,%d) (%lf x %lf) [cnt:%d] [pid:%d]", slot_client->ec,
                              sd->id, sd->x, sd->y, (double)sd->w/(double)slot_client->ec->w, (double)sd->h /(double)slot_client->ec->h, cnt++, ec->netwm.pid);
                     }
                }
@@ -484,7 +484,7 @@ e_slot_update(Evas_Object *obj)
                     {
                        evas_object_move(slot_client->ec->frame, sd->x, sd->y);
                        evas_object_resize(slot_client->ec->frame, sd->w, sd->h);
-                       ELOGF("SLOT", "e_slot_update |resize update - id:%d (%d,%d,%dx%d) [cnt:%d] [pid:%d]", slot_client->ec->pixmap, slot_client->ec,
+                       ELOGF("SLOT", "e_slot_update |resize update - id:%d (%d,%d,%dx%d) [cnt:%d] [pid:%d]", slot_client->ec,
                              sd->id, sd->x, sd->y, sd->w, sd->h, cnt++, ec->netwm.pid);
                     }
                }
@@ -550,7 +550,7 @@ e_slot_client_add(Evas_Object *obj, E_Client *ec, Eina_Bool resizable)
    slot_client = eina_hash_find(_e_slot_g->hash_slot_clients, &ec);
    if (slot_client)
      {
-        ELOGF("SLOT", "%s | Remove already allocated in other slot", slot_client->ec->pixmap, slot_client->ec, __FUNCTION__);
+        ELOGF("SLOT", "%s | Remove already allocated in other slot", slot_client->ec, __FUNCTION__);
         e_slot_client_remove(slot_client->slot, ec);
      }
 
@@ -563,7 +563,7 @@ e_slot_client_add(Evas_Object *obj, E_Client *ec, Eina_Bool resizable)
    ec->layout.s_id = sd->id;
    ec->layout.splited = EINA_TRUE;
    sd->changed = EINA_TRUE;
-   ELOGF("SLOT", "%s | Add - id:%d type:%d", ec->pixmap, ec, __FUNCTION__, sd->id, type);
+   ELOGF("SLOT", "%s | Add - id:%d type:%d", ec, __FUNCTION__, sd->id, type);
 
    return EINA_TRUE;
 }
@@ -643,7 +643,7 @@ e_slot_client_update(E_Client *ec)
                   e_util_transform_scale(slot_client->transform,  (double)sd->w/(double)slot_client->ec->w, (double)sd->h /(double)slot_client->ec->h, 1.0);
                   e_client_transform_core_update(slot_client->ec);
 
-                  ELOGF("SLOT", "e_slot_client_update |transform update - id:%d (%d,%d) (%lf x %lf) ", slot_client->ec->pixmap, slot_client->ec,
+                  ELOGF("SLOT", "e_slot_client_update |transform update - id:%d (%d,%d) (%lf x %lf) ", slot_client->ec,
                         ec->layout.s_id, sd->x, sd->y, (double)sd->w/(double)slot_client->ec->w, (double)sd->h /(double)slot_client->ec->h);
                }
           }
@@ -653,7 +653,7 @@ e_slot_client_update(E_Client *ec)
                {
                   evas_object_move(slot_client->ec->frame, sd->x, sd->y);
                   evas_object_resize(slot_client->ec->frame, sd->w, sd->h);
-                  ELOGF("SLOT", "e_slot_client_update |resize update - id:%d (%d,%d,%dx%d)", slot_client->ec->pixmap, slot_client->ec,
+                  ELOGF("SLOT", "e_slot_client_update |resize update - id:%d (%d,%d,%dx%d)", slot_client->ec,
                         ec->layout.s_id, sd->x, sd->y, sd->w, sd->h);
                }
           }
@@ -717,7 +717,7 @@ _e_slot_client_new(Evas_Object *obj, E_Client* ec, E_Slot_Client_Type type)
         e_client_transform_core_add(slot_client->ec, slot_client->transform);
      }
 
-   ELOGF("SLOT", "|Create slot client - type:%d orig: %d,%d,%dx%d", ec->pixmap, ec,
+   ELOGF("SLOT", "|Create slot client - type:%d orig: %d,%d,%dx%d", ec,
          type, ec->x, ec->y, ec->w, ec->h);
 
    return slot_client;
@@ -747,7 +747,7 @@ _e_slot_client_type_restore(E_Slot_Client* slot_client)
               e_util_transform_del(slot_client->transform);
               slot_client->transform = NULL;
 
-              ELOGF("SLOT", "Restore client |unset transform ", slot_client->ec->pixmap, slot_client->ec);
+              ELOGF("SLOT", "Restore client |unset transform ", slot_client->ec);
 
               ret = EINA_TRUE;
            }
@@ -761,14 +761,14 @@ _e_slot_client_type_restore(E_Slot_Client* slot_client)
               evas_object_move(slot_client->ec->frame, slot_client->orig.x, slot_client->orig.y);
               evas_object_resize(slot_client->ec->frame, slot_client->orig.w, slot_client->orig.h);
 
-              ELOGF("SLOT", "Restore client |restore its origin size: %d,%d,%dx%d", slot_client->ec->pixmap, slot_client->ec,
+              ELOGF("SLOT", "Restore client |restore its origin size: %d,%d,%dx%d", slot_client->ec,
                     slot_client->orig.x, slot_client->orig.y, slot_client->orig.w, slot_client->orig.h);
               ret = EINA_TRUE;
            }
          break;
      }
 
-   if (!ret) ELOGF("SLOT", "Restore client |failed", slot_client->ec->pixmap, slot_client->ec);
+   if (!ret) ELOGF("SLOT", "Restore client |failed", slot_client->ec);
    return ret;
 }
 
index 3836bd8..cd60e1e 100644 (file)
@@ -419,7 +419,7 @@ e_splitlayout_add(E_Desk *desk)
    INF("%s bg - x(%d) y(%d) w(%d) h(%d)", __FUNCTION__ , eo_x, eo_y, eo_w, eo_h);
 #endif
 
-   ELOGF("SPLIT", "Added Split layout", NULL, NULL);
+   ELOGF("SPLIT", "Added Split layout", NULL);
 
    return sd->obj;
 }
index ab6fd79..885b336 100644 (file)
@@ -8,8 +8,8 @@
 #undef ERR
 #endif
 
-#define LOG(f, p, e, x...)  ELOGF("XDG6 <LOG>", f, p, e, ##x)
-#define ERR(f, p, e, x...)  ELOGF("XDG6 <ERR>", f, p, e, ##x)
+#define LOG(f, e, x...)  ELOGF("XDG6 <LOG>", f, e, ##x)
+#define ERR(f, e, x...)  ELOGF("XDG6 <ERR>", f, e, ##x)
 
 #define e_xdg_surface_role_biggest_struct E_Xdg_Toplevel
 #define E_XDG_SURFACE_V6_TYPE (int)0xE0b06000
@@ -146,7 +146,7 @@ _e_client_shsurface_assignable_check(E_Client *ec)
 {
    if (!e_shell_e_client_shell_assignable_check(ec))
      {
-        ERR("Could not assign shell", ec->pixmap, ec);
+        ERR("Could not assign shell", ec);
         wl_resource_post_error(ec->comp_data->surface,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "Could not assign shell surface to wl_surface");
@@ -302,25 +302,25 @@ _e_xdg_toplevel_committed(E_Xdg_Toplevel *toplevel)
    ec = toplevel->base.ec;
    if (!ec)
      {
-        ERR("E_Xdg_Toplevel must have E_Client", NULL, NULL);
+        ERR("E_Xdg_Toplevel must have E_Client", NULL);
         return;
      }
 
    if (!ec->comp_data)
      {
-        ERR("E_Client must have E_Comp_Client_Data", ec->pixmap, ec);
+        ERR("E_Client must have E_Comp_Client_Data", ec);
         return;
      }
 
    if (!toplevel->resource)
      {
-        ERR("E_Client must have xdg_toplevel instance", ec->pixmap, ec);
+        ERR("E_Client must have xdg_toplevel instance", ec);
         return;
      }
 
    if (!e_pixmap_usable_get(ec->pixmap))
      {
-        ERR("E_Pixmap should be valid here", ec->pixmap, ec);
+        ERR("E_Pixmap should be valid here", ec);
         return;
      }
 
@@ -334,7 +334,7 @@ _e_xdg_toplevel_committed(E_Xdg_Toplevel *toplevel)
      {
         ERR("Xdg_surface buffer does not match the configured state\nmaximized: "
             "%d fullscreen: %d, size:expected(%d %d) shell.request(%d %d) pixmap(%d %d)",
-            ec->pixmap, ec,
+            ec,
             toplevel->next.state.maximized,
             toplevel->next.state.fullscreen,
             toplevel->next.size.w, toplevel->next.size.h,
@@ -366,7 +366,7 @@ _e_xdg_toplevel_configure_ack(E_Xdg_Toplevel *toplevel,
 {
    LOG("Ack configure TOPLEVEL size (%d %d) "
        "state (f %d m %d r %d a %d)",
-       toplevel->base.ec->pixmap, toplevel->base.ec,
+       toplevel->base.ec,
        configure->size.w, configure->size.h,
        configure->state.fullscreen, configure->state.maximized,
        configure->state.resizing, configure->state.activated);
@@ -412,7 +412,7 @@ _e_xdg_toplevel_configure_send(E_Xdg_Toplevel *toplevel,
 
    LOG("Send configure: Topevel size (%d %d) "
        "state (f %d m %d r %d a %d)",
-       toplevel->base.ec->pixmap, toplevel->base.ec,
+       toplevel->base.ec,
        toplevel->pending.size.w, toplevel->pending.size.h,
        toplevel->pending.state.fullscreen, toplevel->pending.state.maximized,
        toplevel->pending.state.resizing, toplevel->pending.state.activated);
@@ -452,7 +452,7 @@ _e_xdg_toplevel_configure_pending_set(E_Xdg_Toplevel *toplevel,
          */
         LOG("FORCELY STAY current size (%d %d) of E_Client, requested size "
             "is (%d %d), the state (maximize %d, fullscreen %d)",
-            ec->pixmap, ec, ec->w, ec->h, width, height,
+            ec, ec->w, ec->h, width, height,
             toplevel->pending.state.maximized,
             toplevel->pending.state.fullscreen);
         toplevel->pending.size.w = ec->w;
@@ -464,7 +464,7 @@ _e_xdg_toplevel_configure_pending_set(E_Xdg_Toplevel *toplevel,
 
    LOG("Set pending state: edges %d size (%d %d) "
        "state (f %d m %d r %d a %d)",
-       ec->pixmap, ec,
+       ec,
        toplevel->pending.edges,
        toplevel->pending.size.w, toplevel->pending.size.h,
        toplevel->pending.state.fullscreen, toplevel->pending.state.maximized,
@@ -498,7 +498,7 @@ _e_xdg_toplevel_pending_state_compare(E_Xdg_Toplevel *toplevel)
           {
              ERR("The size of buffer is different with expected "
                  "client size. So, here, let it compare with buffer size.",
-                 toplevel->base.ec->pixmap, toplevel->base.ec);
+                 toplevel->base.ec);
           }
 
         configured.state = toplevel->current.state;
@@ -567,7 +567,7 @@ _e_xdg_toplevel_cb_parent_set(struct wl_client *client,
         parent = wl_resource_get_user_data(res_parent);
         if (!parent)
           {
-             ERR("No E_Xdg_Toplevel data in wl_resource", NULL, NULL);
+             ERR("No E_Xdg_Toplevel data in wl_resource", NULL);
              wl_resource_post_error(res_parent,
                                     WL_DISPLAY_ERROR_INVALID_OBJECT,
                                     "No E_Xdg_Toplevel data in wl_resource");
@@ -578,7 +578,7 @@ _e_xdg_toplevel_cb_parent_set(struct wl_client *client,
         pc = parent->base.ec;
         if (!pc)
           {
-             ERR("Toplevel must have E_Client", NULL, NULL);
+             ERR("Toplevel must have E_Client", NULL);
              wl_resource_post_error(res_parent,
                                     WL_DISPLAY_ERROR_INVALID_OBJECT,
                                     "No E_Client data in wl_resource");
@@ -623,7 +623,7 @@ _e_xdg_toplevel_cb_app_id_set(struct wl_client *client,
    ec = toplevel->base.ec;
    if (!ec)
      {
-        ERR("Toplevel must have E_Client", NULL, NULL);
+        ERR("Toplevel must have E_Client", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No E_Client data in wl_resource");
@@ -661,7 +661,7 @@ _e_xdg_toplevel_cb_move(struct wl_client *client,
 
    if (!e_shell_e_client_interactive_move(toplevel->base.ec, res_seat))
      {
-        ERR("Failed to move this Toplevel", NULL, NULL);
+        ERR("Failed to move this Toplevel", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "Can't move this surface");
@@ -684,7 +684,7 @@ _e_xdg_toplevel_cb_resize(struct wl_client *client,
 
    if (!e_shell_e_client_interactive_resize(toplevel->base.ec, resource, res_seat, edges))
      {
-        ERR("Failed to resize this Toplevel", NULL, NULL);
+        ERR("Failed to resize this Toplevel", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "Can't resize this surface");
@@ -738,7 +738,7 @@ _e_xdg_toplevel_cb_maximized_set(struct wl_client *client, struct wl_resource *r
    ec = toplevel->base.ec;
    if (!ec)
      {
-        ERR("Toplevel must have E_Client", NULL, NULL);
+        ERR("Toplevel must have E_Client", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No E_Client data in wl_resource");
@@ -765,7 +765,7 @@ _e_xdg_toplevel_cb_maximized_unset(struct wl_client *client, struct wl_resource
    ec = toplevel->base.ec;
    if (!ec)
      {
-        ERR("Toplevel must have E_Client", NULL, NULL);
+        ERR("Toplevel must have E_Client", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No E_Client data in wl_resource");
@@ -791,7 +791,7 @@ _e_xdg_toplevel_cb_fullscreen_set(struct wl_client *client,
    ec = toplevel->base.ec;
    if (!ec)
      {
-        ERR("Toplevel must have E_Client", NULL, NULL);
+        ERR("Toplevel must have E_Client", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No E_Client data in wl_resource");
@@ -815,7 +815,7 @@ _e_xdg_toplevel_cb_fullscreen_unset(struct wl_client *client, struct wl_resource
    ec = toplevel->base.ec;
    if (!ec)
      {
-        ERR("Toplevel must have E_Client", NULL, NULL);
+        ERR("Toplevel must have E_Client", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No E_Client data in wl_resource");
@@ -839,7 +839,7 @@ _e_xdg_toplevel_cb_minimized_set(struct wl_client *client, struct wl_resource *r
    ec = toplevel->base.ec;
    if (!ec)
      {
-        ERR("Toplevel must have E_Client", NULL, NULL);
+        ERR("Toplevel must have E_Client", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No E_Client data in wl_resource");
@@ -1101,7 +1101,7 @@ _e_xdg_surface_cb_configure_send(void *data)
    configure = E_NEW(E_Xdg_Surface_Configure, 1);
    if (!configure)
      {
-        ERR("Failed to allocate memory: E_Xdg_Surface_Configure", NULL, NULL);
+        ERR("Failed to allocate memory: E_Xdg_Surface_Configure", NULL);
         goto end;
      }
 
@@ -1111,7 +1111,7 @@ _e_xdg_surface_cb_configure_send(void *data)
    switch (exsurf->role)
      {
       case E_XDG_SURFACE_ROLE_NONE:
-         ERR("Cannot reach here", NULL, NULL);
+         ERR("Cannot reach here", NULL);
          break;
       case E_XDG_SURFACE_ROLE_POPUP:
          _e_xdg_popup_configure_send((E_Xdg_Popup *)exsurf);
@@ -1123,7 +1123,7 @@ _e_xdg_surface_cb_configure_send(void *data)
 
    zxdg_surface_v6_send_configure(exsurf->resource, configure->serial);
 
-   LOG("Send configure: %s serial %d", exsurf->ec->pixmap, exsurf->ec,
+   LOG("Send configure: %s serial %d", exsurf->ec,
        _e_xdg_surface_util_role_string_get(exsurf), configure->serial);
 
 end:
@@ -1145,19 +1145,19 @@ _e_xdg_surface_configure_send(struct wl_resource *resource,
    exsurf = wl_resource_get_user_data(resource);
    if (!exsurf)
      {
-        ERR("Invalid wl_resource", NULL, NULL);
+        ERR("Invalid wl_resource", NULL);
         return;
      }
 
    LOG("Scheduling task to send configure %s edges %d w %d h %d",
-       exsurf->ec->pixmap, exsurf->ec,
+       exsurf->ec,
        _e_xdg_surface_util_role_string_get(exsurf), edges, width, height);
 
    switch (exsurf->role)
      {
       case E_XDG_SURFACE_ROLE_NONE:
       default:
-         ERR("Cannot reach here", exsurf->ec->pixmap, exsurf->ec);
+         ERR("Cannot reach here", exsurf->ec);
          break;
       case E_XDG_SURFACE_ROLE_TOPLEVEL:
          _e_xdg_toplevel_configure_pending_set((E_Xdg_Toplevel *)exsurf,
@@ -1167,7 +1167,7 @@ _e_xdg_surface_configure_send(struct wl_resource *resource,
          if (pending_same)
            {
               LOG("\tSKIP Configuring state is same with current state",
-                  exsurf->ec->pixmap, exsurf->ec);
+                  exsurf->ec);
            }
          break;
       case E_XDG_SURFACE_ROLE_POPUP:
@@ -1179,7 +1179,7 @@ _e_xdg_surface_configure_send(struct wl_resource *resource,
         if (!pending_same)
           return;
 
-        LOG("\tRemove configure idler", exsurf->ec->pixmap, exsurf->ec);
+        LOG("\tRemove configure idler", exsurf->ec);
 
         E_FREE_FUNC(exsurf->configure_idle, ecore_idle_enterer_del);
      }
@@ -1192,7 +1192,7 @@ _e_xdg_surface_configure_send(struct wl_resource *resource,
            ecore_idle_enterer_add(_e_xdg_surface_cb_configure_send, exsurf);
 
         LOG("\tAdd configure idler %p",
-            exsurf->ec->pixmap, exsurf->ec, exsurf->configure_idle);
+            exsurf->ec, exsurf->configure_idle);
      }
 }
 
@@ -1209,7 +1209,7 @@ _e_xdg_surface_configure(struct wl_resource *resource,
    exsurf = wl_resource_get_user_data(resource);
    if (!exsurf)
      {
-        ERR("No E_Xdg_Surface data in wl_resource", NULL, NULL);
+        ERR("No E_Xdg_Surface data in wl_resource", NULL);
         return;
      }
 
@@ -1218,8 +1218,8 @@ _e_xdg_surface_configure(struct wl_resource *resource,
         // any attempts by a client to attach or manipulate a buffer prior to the first xdg_surface.configure call must
         // be treated as errors.
         ERR("Could not handle %s prior to the first xdg_surface.configure",
-           exsurf->ec->pixmap, exsurf->ec,
-           _e_xdg_surface_util_role_string_get(exsurf));
+            exsurf->ec,
+            _e_xdg_surface_util_role_string_get(exsurf));
         return;
      }
 
@@ -1236,7 +1236,7 @@ _e_xdg_surface_ping(struct wl_resource *resource)
    exsurf = wl_resource_get_user_data(resource);
    if (!exsurf)
      {
-        ERR("No E_Xdg_Surface data in wl_resource", NULL, NULL);
+        ERR("No E_Xdg_Surface data in wl_resource", NULL);
         return;
      }
 
@@ -1254,7 +1254,7 @@ _e_xdg_surface_map(struct wl_resource *resource)
    exsurf = wl_resource_get_user_data(resource);
    if (!exsurf)
      {
-        ERR("No E_Xdg_Surface in wl_resource", NULL, NULL);
+        ERR("No E_Xdg_Surface in wl_resource", NULL);
         return;
      }
 
@@ -1269,7 +1269,7 @@ _e_xdg_surface_unmap(struct wl_resource *resource)
    exsurf = wl_resource_get_user_data(resource);
    if (!exsurf)
      {
-        ERR("No E_Xdg_Surface in wl_resource", NULL, NULL);
+        ERR("No E_Xdg_Surface in wl_resource", NULL);
         return;
      }
 
@@ -1305,7 +1305,7 @@ _e_xdg_surface_role_assign(E_Xdg_Surface *exsurf,
      {
       case E_XDG_SURFACE_ROLE_NONE:
       default:
-         ERR("Cannot reach here", exsurf->ec->pixmap, exsurf->ec);
+         ERR("Cannot reach here", exsurf->ec);
          return EINA_FALSE;
 
       case E_XDG_SURFACE_ROLE_TOPLEVEL:
@@ -1344,7 +1344,7 @@ _e_xdg_surface_cb_toplevel_get(struct wl_client *client, struct wl_resource *res
    toplevel_resource = wl_resource_create(client, &zxdg_toplevel_v6_interface, 1, id);
    if (!toplevel_resource)
      {
-        ERR("Could not create xdg toplevel resource", NULL, NULL);
+        ERR("Could not create xdg toplevel resource", NULL);
         wl_resource_post_no_memory(resource);
         return;
      }
@@ -1356,7 +1356,7 @@ _e_xdg_surface_cb_toplevel_get(struct wl_client *client, struct wl_resource *res
 
    if (!_e_xdg_surface_role_assign(exsurf, toplevel_resource, E_XDG_SURFACE_ROLE_TOPLEVEL))
      {
-        ERR("Failed to assign TOPLEVEL role", exsurf->ec->pixmap, exsurf->ec);
+        ERR("Failed to assign TOPLEVEL role", exsurf->ec);
         wl_resource_destroy(toplevel_resource);
         return;
      }
@@ -1421,7 +1421,7 @@ _e_xdg_surface_cb_popup_get(struct wl_client *client,
    popup_resource = wl_resource_create(client, &zxdg_popup_v6_interface, 1, id);
    if (!popup_resource)
      {
-        ERR("Could not create xdg popup resource", NULL, NULL);
+        ERR("Could not create xdg popup resource", NULL);
         wl_resource_post_no_memory(resource);
         return;
      }
@@ -1434,7 +1434,7 @@ _e_xdg_surface_cb_popup_get(struct wl_client *client,
 
    if (!_e_xdg_surface_role_assign(exsurf, popup_resource, E_XDG_SURFACE_ROLE_POPUP))
      {
-        ERR("Failed to assign role to surface", exsurf->ec->pixmap, exsurf->ec);
+        ERR("Failed to assign role to surface", exsurf->ec);
         wl_resource_destroy(popup_resource);
         return;
      }
@@ -1465,7 +1465,7 @@ _e_xdg_surface_cb_win_geometry_set(struct wl_client *client,
      }
 
    LOG("Set window geometry: geometry(%d %d %d %d)",
-       exsurf->ec->pixmap, exsurf->ec, x, y, w, h);
+       exsurf->ec, x, y, w, h);
 
    exsurf->has_window_geometry = EINA_TRUE;
    EINA_RECTANGLE_SET(&exsurf->window_geometry, x, y, w, h);
@@ -1490,7 +1490,7 @@ _e_xdg_surface_cb_configure_ack(struct wl_client *client, struct wl_resource *re
         return;
      }
 
-   LOG("Ack configure", exsurf->ec->pixmap, exsurf->ec);
+   LOG("Ack configure", exsurf->ec);
 
    if ((exsurf->role != E_XDG_SURFACE_ROLE_TOPLEVEL) &&
        (exsurf->role != E_XDG_SURFACE_ROLE_POPUP))
@@ -1521,7 +1521,7 @@ _e_xdg_surface_cb_configure_ack(struct wl_client *client, struct wl_resource *re
      }
 
    LOG("Ack configure %s first %d serial %d found %d",
-       exsurf->ec->pixmap, exsurf->ec,
+       exsurf->ec,
        _e_xdg_surface_util_role_string_get(exsurf),
        !exsurf->configured,
        serial, found);
@@ -1539,7 +1539,7 @@ _e_xdg_surface_cb_configure_ack(struct wl_client *client, struct wl_resource *re
    switch (exsurf->role)
      {
       case E_XDG_SURFACE_ROLE_NONE:
-         ERR("Cannot reach here", exsurf->ec->pixmap, exsurf->ec);
+         ERR("Cannot reach here", exsurf->ec);
          break;
       case E_XDG_SURFACE_ROLE_TOPLEVEL:
          _e_xdg_toplevel_configure_ack((E_Xdg_Toplevel *)exsurf, configure);
@@ -1576,7 +1576,7 @@ _e_xdg_surface_cb_commit(void *data, int type, void *event)
      goto end;
 
    LOG("Wl_Surface Commit, Update Xdg_Surface state %s",
-       exsurf->ec->pixmap, exsurf->ec,
+       exsurf->ec,
        _e_xdg_surface_util_role_string_get(exsurf));
 
    exsurf->wait_next_commit = EINA_FALSE;
@@ -1636,13 +1636,13 @@ _e_xdg_surface_cb_resource_destroy(struct wl_resource *resource)
    exsurf = wl_resource_get_user_data(resource);
    if (!exsurf)
      {
-        ERR("No E_Xdg_Surface data in wl_resource", NULL, NULL);
+        ERR("No E_Xdg_Surface data in wl_resource", NULL);
         return;
 
      }
 
    LOG("Destroy resource of Xdg_Surface %s",
-       exsurf->ec->pixmap, exsurf->ec,
+       exsurf->ec,
        _e_xdg_surface_util_role_string_get(exsurf));
 
    /* Although zxdg_toplevel_v6 or zxdg_popup_v6 are still existed, unset
@@ -1668,18 +1668,18 @@ _e_xdg_surface_create(E_Xdg_Shell *shell,
    ec = wl_resource_get_user_data(wsurface);
    if (!ec)
      {
-        ERR("No E_Client data in wl_resource", NULL, NULL);
+        ERR("No E_Client data in wl_resource", NULL);
         wl_resource_post_error(wsurface,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No data in wl_resource");
         return NULL;
      }
 
-   LOG("Create Xdg_Surface", ec->pixmap, ec);
+   LOG("Create Xdg_Surface", ec);
 
    if (!_e_client_shsurface_assignable_check(ec))
      {
-        ERR("Cannot get xdg_surface with this wl_surface", ec->pixmap, ec);
+        ERR("Cannot get xdg_surface with this wl_surface", ec);
         return NULL;
      }
 
@@ -1699,7 +1699,7 @@ _e_xdg_surface_create(E_Xdg_Shell *shell,
                                          id);
    if (!exsurf->resource)
      {
-        ERR("Could not create wl_resource for xdg surface", ec->pixmap, ec);
+        ERR("Could not create wl_resource for xdg surface", ec);
         wl_client_post_no_memory(shell->wclient);
         e_object_del(E_OBJECT(exsurf));
         return NULL;
@@ -1759,7 +1759,7 @@ _e_xdg_shell_ping(E_Xdg_Shell *shell)
 static void
 _e_xdg_shell_cb_destroy(struct wl_client *client, struct wl_resource *resource)
 {
-   LOG("Destroy Xdg_Shell", NULL, NULL);
+   LOG("Destroy Xdg_Shell", NULL);
 
    wl_resource_destroy(resource);
 }
@@ -1771,7 +1771,7 @@ _e_xdg_shell_cb_positioner_create(struct wl_client *client, struct wl_resource *
    E_Xdg_Positioner *p;
    struct wl_resource *new_res;
 
-   LOG("Create Positioner", NULL, NULL);
+   LOG("Create Positioner", NULL);
 
    shell = wl_resource_get_user_data(resource);
    if (!shell)
@@ -1816,7 +1816,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
    shell = wl_resource_get_user_data(resource);
    if (!shell)
      {
-        ERR("No E_Xdg_Shell data in wl_resource", NULL, NULL);
+        ERR("No E_Xdg_Shell data in wl_resource", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No shell data in wl_resource");
@@ -1826,7 +1826,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
    exsurf = _e_xdg_surface_create(shell, wsurface, id);
    if (!exsurf)
      {
-        ERR("Failed to create E_Xdg_Surface", NULL, NULL);
+        ERR("Failed to create E_Xdg_Surface", NULL);
         return;
      }
 }
@@ -1838,12 +1838,12 @@ _e_xdg_shell_cb_pong(struct wl_client *client, struct wl_resource *resource, uin
    E_Xdg_Surface *exsurf;
    Eina_List *l;
 
-   LOG("Pong", NULL, NULL);
+   LOG("Pong", NULL);
 
    shell = wl_resource_get_user_data(resource);
    if (!shell)
      {
-        ERR("No E_Xdg_Shell data in wl_resource", NULL, NULL);
+        ERR("No E_Xdg_Shell data in wl_resource", NULL);
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No E_Xdg_Shell data in wl_resource");
@@ -1903,12 +1903,12 @@ _e_xdg_shell_cb_unbind(struct wl_resource *resource)
 {
    E_Xdg_Shell *shell;
 
-   LOG("Unbind Xdg_Shell", NULL, NULL);
+   LOG("Unbind Xdg_Shell", NULL);
 
    shell = wl_resource_get_user_data(resource);
    if (!shell)
      {
-        ERR("No E_Xdg_Shell in wl_resource", NULL, NULL);
+        ERR("No E_Xdg_Shell in wl_resource", NULL);
         return;
      }
 
@@ -1921,7 +1921,7 @@ _e_xdg_shell_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t
    E_Xdg_Shell *shell;
    struct wl_resource *resource;
 
-   LOG("Bind Xdg_Shell", NULL, NULL);
+   LOG("Bind Xdg_Shell", NULL);
 
    /* Create resource for zxdg_shell_v6 */
    resource = wl_resource_create(client,
@@ -1935,7 +1935,7 @@ _e_xdg_shell_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t
    shell = _e_xdg_shell_create(client, resource);
    if (!shell)
      {
-        ERR("Failed to create E_Xdg_Shell", NULL, NULL);
+        ERR("Failed to create E_Xdg_Shell", NULL);
         goto err_shell;
      }
 
@@ -1952,7 +1952,7 @@ err_res:
 EINTERN Eina_Bool
 e_xdg_shell_v6_init(void)
 {
-   LOG("Initializing Xdg_Shell_V6", NULL, NULL);
+   LOG("Initializing Xdg_Shell_V6", NULL);
 
    /* try to create global xdg_shell interface */
    global_resource = wl_global_create(e_comp_wl->wl.disp,
@@ -1962,7 +1962,7 @@ e_xdg_shell_v6_init(void)
                                       _e_xdg_shell_cb_bind);
    if (!global_resource)
      {
-        ERR("Could not create zxdg_shell_v6 global: %m", NULL, NULL);
+        ERR("Could not create zxdg_shell_v6 global: %m", NULL);
         return EINA_FALSE;
      }
 
index 1d3e695..16f35a3 100644 (file)
@@ -112,7 +112,7 @@ _e_cbhm_vis_change(E_Policy_Cbhm *cbhm, Eina_Bool vis)
         cbhm->show_block = EINA_FALSE;
         if (ec->iconic)
           {
-             ELOGF("CBHM", "Un-set ICONIFY BY CBHM", ec->pixmap, ec);
+             ELOGF("CBHM", "Un-set ICONIFY BY CBHM", ec);
              if ((ec->iconic) && (!ec->exp_iconify.by_client))
                e_policy_wl_iconify_state_change_send(ec, 0);
              ec->exp_iconify.not_raise = 0;
@@ -133,7 +133,7 @@ _e_cbhm_vis_change(E_Policy_Cbhm *cbhm, Eina_Bool vis)
      {
         if (!ec->iconic)
           {
-             ELOGF("CBHM", "Set ICONIFY BY CBHM", ec->pixmap, ec);
+             ELOGF("CBHM", "Set ICONIFY BY CBHM", ec);
              e_policy_wl_iconify_state_change_send(ec, 1);
              ec->exp_iconify.by_client = 0;
              e_client_iconify(ec);
@@ -193,7 +193,7 @@ e_service_cbhm_client_set(E_Client *ec)
         return;
      }
 
-   ELOGF("CBHM", "Set Client | ec %p", NULL, NULL, ec);
+   ELOGF("CBHM", "Set Client", ec);
 
    cbhm = calloc(1, sizeof(*cbhm));
    if (!cbhm)
index 67a0d43..0b1e538 100644 (file)
@@ -24,7 +24,7 @@ _indicator_cb_rot_begin(void *data EINA_UNUSED, int type EINA_UNUSED, void *even
      {
         if (ec->e.state.rot.ang.next != -1)
           {
-             ELOGF("TZ_IND", "Rotation begins.(ec:%s) Set indicator's angle to next angle:%d", ec->pixmap, ec, ec->icccm.name?:"NULL", ec->e.state.rot.ang.next);
+             ELOGF("TZ_IND", "Rotation begins.(ec:%s) Set indicator's angle to next angle:%d", ec, ec->icccm.name?:"NULL", ec->e.state.rot.ang.next);
              _ind_angle = ec->e.state.rot.ang.next;
              e_tzsh_indicator_srv_property_change_send(ec, ec->e.state.rot.ang.next);
           }
@@ -47,7 +47,7 @@ _indicator_cb_rot_done(void *data EINA_UNUSED, int type EINA_UNUSED, void *event
      {
         if (_ind_angle != ec->e.state.rot.ang.curr)
           {
-             ELOGF("TZ_IND", "Rotation is done.(ec:%s) Set indicator's angle to curr angle:%d", ec->pixmap, ec, ec->icccm.name?:"NULL", ec->e.state.rot.ang.curr);
+             ELOGF("TZ_IND", "Rotation is done.(ec:%s) Set indicator's angle to curr angle:%d", ec, ec->icccm.name?:"NULL", ec->e.state.rot.ang.curr);
              _ind_angle = ec->e.state.rot.ang.curr;
              e_tzsh_indicator_srv_property_change_send(ec, ec->e.state.rot.ang.curr);
           }
@@ -98,7 +98,7 @@ e_mod_indicator_client_set(E_Client *ec)
 
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   ELOGF("TZ_IND", "Set indicator service", ec->pixmap, ec);
+   ELOGF("TZ_IND", "Set indicator service", ec);
 
    e_client_window_role_set(ec, "indicator");
 
index a18694e..75924c6 100644 (file)
@@ -7,7 +7,7 @@ e_service_lockscreen_client_set(E_Client *ec)
    if (!ec) return EINA_TRUE;
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   ELOGF("LOCKSCREEN","Set Client", ec->pixmap, ec);
+   ELOGF("LOCKSCREEN","Set Client", ec);
 
    e_client_window_role_set(ec, "lockscreen");
 
index 06af424..958b8cd 100644 (file)
@@ -675,7 +675,7 @@ _quickpanel_send_gesture_to_indicator(void)
    if (focused)
      {
         ELOGF("TZ_IND", "INDICATOR state:%d, opacity:%d, vtype:%d",
-              focused->pixmap, focused, focused->indicator.state, focused->indicator.opacity_mode, focused->indicator.visible_type);
+              focused, focused->indicator.state, focused->indicator.opacity_mode, focused->indicator.visible_type);
 
         if (focused->indicator.state == 2) // state: on
           {
@@ -910,7 +910,7 @@ _region_obj_cb_gesture_start(void *data, Evas_Object *handler, int x, int y, uns
 
    if (!pos_ec)
      {
-        ELOGF("QUICKPANEL", "NO visible client under pos(%d,%d)", NULL, NULL, x, y);
+        ELOGF("QUICKPANEL", "NO visible client under pos(%d,%d)", NULL, x, y);
         return;
      }
 
@@ -950,13 +950,13 @@ _region_obj_cb_gesture_start(void *data, Evas_Object *handler, int x, int y, uns
 
         if (!E_INSIDE(x, y, ix, iy, iw, ih))
           {
-             ELOGF("QUICKPANEL", "NOT in indicator area", NULL, NULL);
+             ELOGF("QUICKPANEL", "NOT in indicator area", NULL);
              return;
           }
 
         if (_quickpanel_send_gesture_to_indicator())
           {
-             ELOGF("QUICKPANEL", "SEND to change indicator state", NULL, NULL);
+             ELOGF("QUICKPANEL", "SEND to change indicator state", NULL);
              return;
           }
      }
@@ -1029,7 +1029,7 @@ _region_obj_cb_gesture_end(void *data EINA_UNUSED, Evas_Object *handler, int x,
 static void
 _quickpanel_free(E_Policy_Quickpanel *qp)
 {
-   ELOGF("QUICKPANEL", "Remove Client | qp %p", qp->ec->pixmap, qp->ec, qp);
+   ELOGF("QUICKPANEL", "Remove Client | qp %p", qp->ec, qp);
 
    evas_object_event_callback_del(qp->ec->frame, EVAS_CALLBACK_SHOW, _quickpanel_client_evas_cb_show);
    evas_object_event_callback_del(qp->ec->frame, EVAS_CALLBACK_HIDE, _quickpanel_client_evas_cb_hide);
@@ -1204,7 +1204,7 @@ _quickpanel_handler_obj_region_convert_set(E_Policy_Quickpanel *qp, E_Policy_Ang
      }
 
    e_service_region_rectangle_set(qp->handler_obj, ridx, nx, ny, nw, nh);
-   ELOGF("QUICKPANEL", "handler obj:%p, angle:%d, geo(%d,%d,%d,%d)", NULL, NULL, qp->handler_obj, ridx, nx, ny, nw, nh);
+   ELOGF("QUICKPANEL", "handler obj:%p, angle:%d, geo(%d,%d,%d,%d)", NULL, qp->handler_obj, ridx, nx, ny, nw, nh);
 }
 
 static void
@@ -1216,7 +1216,7 @@ _quickpanel_handler_rect_add(E_Policy_Quickpanel *qp, E_Policy_Angle_Map ridx, i
    ec = qp->ec;
 
    ELOGF("QUICKPANEL", "Handler Geo Set | x %d, y %d, w %d, h %d",
-         NULL, NULL, x, y, w, h);
+         NULL, x, y, w, h);
 
    if (qp->handler_obj)
      goto end;
@@ -1289,7 +1289,7 @@ void _quickpanel_indi_obj_region_convert_set(E_Policy_Quickpanel *qp, int angle,
      }
 
    e_service_region_rectangle_set(qp->indi_obj, angle, nx, ny, nw, nh);
-   ELOGF("QUICKPANEL", "indicator obj:%p, angle:%d, geo(%d,%d,%d,%d)", NULL, NULL, qp->indi_obj, angle, nx, ny, nw, nh);
+   ELOGF("QUICKPANEL", "indicator obj:%p, angle:%d, geo(%d,%d,%d,%d)", NULL, qp->indi_obj, angle, nx, ny, nw, nh);
 }
 
 static void
@@ -1837,7 +1837,7 @@ e_service_quickpanel_client_add(E_Client *ec, E_Service_Quickpanel_Type type)
    qp = E_NEW(E_Policy_Quickpanel, 1);
    EINA_SAFETY_ON_NULL_RETURN(qp);
 
-   ELOGF("QUICKPANEL", "Set Client | qp %p", ec->pixmap, ec, qp);
+   ELOGF("QUICKPANEL", "Set Client | qp %p", ec, qp);
 
    qp->ec = ec;
    qp->show_block = EINA_TRUE;
@@ -1986,7 +1986,7 @@ e_service_quickpanel_scroll_lock_set(E_Client *ec, Eina_Bool lock)
    if (qp->scroll_lock == lock)
      return;
 
-   ELOGF("QUICKPANEL", "Scroll lock is set to %d", NULL, NULL, lock);
+   ELOGF("QUICKPANEL", "Scroll lock is set to %d", NULL, lock);
    qp->scroll_lock = lock;
 }
 
index 7a3f9f1..f8ecdb6 100644 (file)
@@ -7,7 +7,7 @@ e_service_scrsaver_client_set(E_Client *ec)
    if (!ec) return EINA_TRUE;
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   ELOGF("SCRSAVER","Set Client", ec->pixmap, ec);
+   ELOGF("SCRSAVER","Set Client", ec);
 
    // set screensaver layer
    if (E_POLICY_SCRSAVER_LAYER != evas_object_layer_get(ec->frame))
index 198dc2e..f7976f4 100644 (file)
@@ -72,7 +72,7 @@ e_service_softkey_module_func_unset(void)
 E_API E_Service_Softkey *
 e_service_softkey_add(E_Zone *zone, E_Client *ec)
 {
-   ELOGF("SOFTKEY_SRV", "%s (zone:%p)", NULL, ec, __func__, zone);
+   ELOGF("SOFTKEY_SRV", "%s (zone:%p)", ec, __func__, zone);
 
    if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_add)
      {
@@ -83,7 +83,7 @@ e_service_softkey_add(E_Zone *zone, E_Client *ec)
 
    E_Service_Softkey *softkey;
 
-   ELOGF("SOFTKEY_SRV", "Softkey service window add... win:%zx (ec:%p), zone:%p (id:%d)", NULL, NULL, e_client_util_win_get(ec), ec, zone, zone->id);
+   ELOGF("SOFTKEY_SRV", "Softkey service window add. zone:%p (id:%d)", ec, zone, zone->id);
    softkey = E_NEW(E_Service_Softkey, 1);
    EINA_SAFETY_ON_NULL_RETURN_VAL(softkey, NULL);
 
@@ -98,7 +98,7 @@ e_service_softkey_add(E_Zone *zone, E_Client *ec)
 E_API void
 e_service_softkey_del(E_Service_Softkey *softkey)
 {
-   ELOGF("SOFTKEY_SRV", "%s (softkey:%p)", NULL, NULL, __func__, softkey);
+   ELOGF("SOFTKEY_SRV", "%s (softkey:%p)", NULL, __func__, softkey);
 
    if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_del)
      {
@@ -119,7 +119,7 @@ e_service_softkey_del(E_Service_Softkey *softkey)
 E_API Eina_Bool
 e_service_softkey_wl_resource_set(E_Service_Softkey *softkey, struct wl_resource *wl_res)
 {
-   ELOGF("SOFTKEY_SRV", "%s (softkey:%p, res:%p)", NULL, NULL, __func__, softkey, wl_res);
+   ELOGF("SOFTKEY_SRV", "%s (softkey:%p, res:%p)", NULL, __func__, softkey, wl_res);
 
    if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_wl_resource_set)
      {
@@ -129,7 +129,7 @@ e_service_softkey_wl_resource_set(E_Service_Softkey *softkey, struct wl_resource
    if (!softkey)
      return EINA_FALSE;
 
-   ELOGF("SOFTKEY_SRV", "SET Softkey service wl res:%p. softkey(%p), win(%zx), ec(%p)", NULL, NULL, wl_res, softkey, e_client_util_win_get(softkey->ec), softkey->ec);
+   ELOGF("SOFTKEY_SRV", "SET Softkey service (softkey:%p, res:%p)", softkey->ec, softkey, wl_res);
    softkey->wl_res = wl_res;
 
    return EINA_TRUE;
@@ -138,7 +138,7 @@ e_service_softkey_wl_resource_set(E_Service_Softkey *softkey, struct wl_resource
 E_API struct wl_resource *
 e_service_softkey_wl_resource_get(E_Service_Softkey *softkey)
 {
-   ELOGF("SOFTKEY_SRV", "%s (softkey:%p)", NULL, NULL, __func__, softkey);
+   ELOGF("SOFTKEY_SRV", "%s (softkey:%p)", NULL, __func__, softkey);
 
    if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_wl_resource_get)
      {
@@ -189,7 +189,7 @@ end:
 EINTERN void
 e_service_softkey_client_set(E_Client *ec)
 {
-   ELOGF("SOFTKEY_SRV", "%s", NULL, ec, __func__);
+   ELOGF("SOFTKEY_SRV", "%s", ec, __func__);
 
    E_Service_Softkey *softkey;
 
@@ -207,7 +207,7 @@ e_service_softkey_client_set(E_Client *ec)
    /* check for wayland pixmap */
    if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
 
-   ELOGF("SOFTKEY_SRV", "SET Softkey service", ec->pixmap, ec);
+   ELOGF("SOFTKEY_SRV", "SET Softkey service", ec);
 
    softkey = e_service_softkey_get(ec->zone);
    if (!softkey)
@@ -224,7 +224,7 @@ e_service_softkey_client_set(E_Client *ec)
    if (!softkey)
      return;
 
-   ELOGF("SOFTKEY", "Set Client | softkey %p", ec->pixmap, ec, softkey);
+   ELOGF("SOFTKEY", "Set Client | softkey %p", ec, softkey);
 
    softkey->ec = ec;
    e_client_window_role_set(ec, "softkey");
@@ -251,7 +251,7 @@ e_service_softkey_client_set(E_Client *ec)
 EINTERN void
 e_service_softkey_client_unset(E_Client *ec)
 {
-   ELOGF("SOFTKEY_SRV", "%s", NULL, ec, __func__);
+   ELOGF("SOFTKEY_SRV", "%s", ec, __func__);
 
    E_Service_Softkey *softkey;
 
@@ -310,7 +310,7 @@ e_service_softkey_visible_set(E_Service_Softkey *softkey, int visible)
    if (!softkey) return;
    if (!softkey->wl_res)
      {
-        ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL, NULL);
+        ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL);
         return;
      }
 
@@ -347,7 +347,7 @@ e_service_softkey_expand_set(E_Service_Softkey *softkey, E_Policy_Softkey_Expand
    if (!softkey) return;
    if (!softkey->wl_res)
      {
-        ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL, NULL);
+        ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL);
         return;
      }
 
@@ -391,7 +391,7 @@ e_service_softkey_opacity_set(E_Service_Softkey *softkey, E_Policy_Softkey_Opaci
    if (!softkey) return;
    if (!softkey->wl_res)
      {
-        ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL, NULL);
+        ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL);
         return;
      }
 
index 4c22a89..2ce2734 100644 (file)
@@ -215,7 +215,7 @@ _volume_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
    if (EINA_UNLIKELY(!ec)) return;
    if (EINA_LIKELY(_volume_ec != ec)) return;
 
-   ELOGF("VOLUME","Del Client", ec->pixmap, ec);
+   ELOGF("VOLUME","Del Client", ec);
 
    _volume_client_unset();
 }
@@ -273,7 +273,7 @@ e_service_volume_client_set(E_Client *ec)
 
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   ELOGF("VOLUME","Set Client", ec->pixmap, ec);
+   ELOGF("VOLUME","Set Client", ec);
 
    _volume_ec = ec;
    _volume_cur_angle_map = e_policy_angle_map(ec->e.state.rot.ang.curr);
@@ -447,7 +447,7 @@ e_service_volume_region_set(int type, int angle, Eina_Tiler *tiler)
      }
 
    ELOGF("VOLUME","Content Region Set: angle %d, tiler %p",
-         NULL, NULL, angle, tiler);
+         NULL, angle, tiler);
 
    _volume_content_region_set(angle_map, tiler);
 
index 11098ae..887674c 100644 (file)
@@ -13,7 +13,7 @@
 #define IFACE_CHECK_RET(iname, ret)                   \
    INTERNAL_DATA_GET;                                 \
    EINA_SAFETY_ON_NULL_RETURN_VAL(ecv, ret);          \
-   ELOGF("VIDEO <INF>", #iname, ec->pixmap, ec);    \
+   ELOGF("VIDEO <INF>", #iname, ec);                  \
    if (!ecv->iface->iname)                            \
       return ret
 
@@ -161,7 +161,7 @@ e_client_video_set(E_Client *ec)
    E_Client_Video *ecv;
    Eina_Bool res;
 
-   ELOGF("VIDEO", "<INF> video set", ec->pixmap, ec);
+   ELOGF("VIDEO", "<INF> video set", ec);
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec->frame, EINA_FALSE);
@@ -205,7 +205,7 @@ e_client_video_unset(E_Client *ec)
 {
    API_ENTRY;
 
-   ELOGF("VIDEO", "<INF> unset video", ec->pixmap, ec);
+   ELOGF("VIDEO", "<INF> unset video", ec);
 
    _e_client_video_deinit(ecv);
 
index eb55970..868ee5c 100644 (file)
 static int _video_detail_log_dom = -1;
 
 #define VER(fmt, arg...) ELOGF("VIDEO", "<ERR> window(0x%08"PRIxPTR"): "fmt, \
-                               video->ec->pixmap, video->ec, video->window, ##arg)
+                               video->ec, video->window, ##arg)
 #define VWR(fmt, arg...) ELOGF("VIDEO", "<WRN> window(0x%08"PRIxPTR"): "fmt, \
-                               video->ec->pixmap, video->ec, video->window, ##arg)
+                               video->ec, video->window, ##arg)
 #define VIN(fmt, arg...) ELOGF("VIDEO", "<INF> window(0x%08"PRIxPTR"): "fmt, \
-                               video->ec->pixmap, video->ec, video->window, ##arg)
+                               video->ec, video->window, ##arg)
 #define VDB(fmt, arg...) DBG("window(0x%08"PRIxPTR") ec(%p): "fmt, video->window, video->ec, ##arg)
 
 #define DET(...)          EINA_LOG_DOM_DBG(_video_detail_log_dom, __VA_ARGS__)
index d714173..ecec41e 100644 (file)
@@ -5,11 +5,11 @@
 #include "../e_video_internal.h"
 
 #define VER(fmt, arg...)   ELOGF("VIDEO", "<ERR> window(0x%08"PRIxPTR"): "fmt, \
-                                 evhp->ec->pixmap, evhp->ec, evhp->window, ##arg)
+                                 evhp->ec, evhp->window, ##arg)
 #define VWR(fmt, arg...)   ELOGF("VIDEO", "<WRN> window(0x%08"PRIxPTR"): "fmt, \
-                                 evhp->ec->pixmap, evhp->ec, evhp->window, ##arg)
+                                 evhp->ec, evhp->window, ##arg)
 #define VIN(fmt, arg...)   ELOGF("VIDEO", "<INF> window(0x%08"PRIxPTR"): "fmt, \
-                                 evhp->ec->pixmap, evhp->ec, evhp->window, ##arg)
+                                 evhp->ec, evhp->window, ##arg)
 #define VDB(fmt, arg...)   DBG("window(0x%08"PRIxPTR") ec(%p): "fmt, evhp->window, evhp->ec, ##arg)
 
 //#define DUMP_BUFFER
index 94084d8..a2e0788 100644 (file)
@@ -5,11 +5,11 @@
 #include "../e_video_internal.h"
 
 #define VER(fmt, arg...)   ELOGF("VIDEO", "<ERR> window(0x%08"PRIxPTR"): "fmt, \
-                                 evhw->ec->pixmap, evhw->ec, evhw->window, ##arg)
+                                 evhw->ec, evhw->window, ##arg)
 #define VWR(fmt, arg...)   ELOGF("VIDEO", "<WRN> window(0x%08"PRIxPTR"): "fmt, \
-                                 evhw->ec->pixmap, evhw->ec, evhw->window, ##arg)
+                                 evhw->ec, evhw->window, ##arg)
 #define VIN(fmt, arg...)   ELOGF("VIDEO", "<INF> window(0x%08"PRIxPTR"): "fmt, \
-                                 evhw->ec->pixmap, evhw->ec, evhw->window, ##arg)
+                                 evhw->ec, evhw->window, ##arg)
 #define VDB(fmt, arg...)   DBG("window(0x%08"PRIxPTR") ec(%p): "fmt, evhw->window, evhw->ec, ##arg)
 
 //#define DUMP_BUFFER
index 0732a98..4cc4547 100644 (file)
@@ -1,6 +1,6 @@
 MDIR = $(libdir)/enlightenment/modules
 MOD_LDFLAGS = -module -avoid-version
-MOD_CPPFLAGS = -I. -DE_LOGGING=1 \
+MOD_CPPFLAGS = -I. -DE_LOGGING=2 \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/bin \
 -I$(top_srcdir)/src/bin/video \