e_comp_wl: use ELOGF

Change-Id: I7536f42a1a4ebf08fa63089281ac85d299fe2dd3

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index a3c739d..a14d5a5 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -554,7 +554,7 @@ _e_comp_wl_send_touch_cancel(E_Client *ec)
         if (!e_comp_wl_input_touch_check(res)) continue;
 
         if (comp_conf && comp_conf->input_log_enable)
-           INF("[Server] Touch Cancel (win:%08zx, name:%20s)\n", e_client_util_win_get(ec), e_client_util_name_get(ec));
+           ELOGF("Touch", "Cancel name:%20s", ec, e_client_util_name_get(ec));
 
         wl_touch_send_cancel(res);
      }
@@ -1054,14 +1054,14 @@ _e_comp_wl_send_touch(E_Client *ec, int idx, int canvas_x, int canvas_y, uint32_
         if (pressed)
           {
              if (comp_conf && comp_conf->input_log_enable)
-               INF("[Server] Touch Down (id: %d, time: %d, x:%d, y:%d, win:0x%08zx, name:%20s)\n", idx, timestamp, canvas_x - ec->client.x, canvas_y - ec->client.y, e_client_util_win_get(ec), e_client_util_name_get(ec));
+               ELOGF("Touch", "Down (id: %d, time: %d, x:%d, y:%d, name:%20s)", ec, idx, timestamp, canvas_x - ec->client.x, canvas_y - ec->client.y, e_client_util_name_get(ec));
 
              wl_touch_send_down(res, serial, timestamp, ec->comp_data->surface, idx, x, y); //id 0 for the 1st finger
           }
         else
           {
              if (comp_conf && comp_conf->input_log_enable)
-               INF("[Server] Touch Up (id: %d, time: %d, x:%d, y:%d, win:0x%08zx, name:%20s)\n", idx, timestamp, canvas_x - ec->client.x, canvas_y - ec->client.y, e_client_util_win_get(ec), e_client_util_name_get(ec));
+               ELOGF("Touch", "Up (id: %d, time: %d, x:%d, y:%d, name:%20s)\n", ec, idx, timestamp, canvas_x - ec->client.x, canvas_y - ec->client.y, e_client_util_name_get(ec));
 
              wl_touch_send_up(res, serial, timestamp, idx);
           }
@@ -4565,7 +4565,7 @@ _e_comp_wl_key_send(Ecore_Event_Key *ev, enum wl_keyboard_key_state state, Eina_
         _e_comp_wl_send_event_device(wc, ev->timestamp, ev->dev, serial);
 
         if (comp_conf && comp_conf->input_log_enable)
-          INF("[Server] Key %s (time: %d)\n", (state ? "Down" : "Up"), ev->timestamp);
+          ELOGF("Key", "Send Key %s (time: %d)", ec, (state ? "Down" : "Up"), ev->timestamp);
 
         wl_keyboard_send_key(res, serial, ev->timestamp,
                              keycode, state);
@@ -4745,7 +4745,7 @@ e_comp_wl_evas_handle_mouse_button(E_Client *ec, uint32_t timestamp, uint32_t bu
         TRACE_INPUT_BEGIN(e_comp_wl_evas_handle_mouse_button);
 
         if (comp_conf && comp_conf->input_log_enable)
-          INF("[Server] Mouse Button %s (btn: %d, time: %d)\n", (state ? "Down" : "Up"), btn, timestamp);
+          ELOGF("Mouse", "Button %s (btn: %d, time: %d)", ec, (state ? "Down" : "Up"), btn, timestamp);
 
         wl_pointer_send_button(res, serial, timestamp, btn, state);
         TRACE_INPUT_END();
@@ -4886,7 +4886,7 @@ e_comp_wl_key_send(E_Client *ec, int keycode, Eina_Bool pressed, Ecore_Device *d
         else _e_comp_wl_device_send_last_event_device(ec, ECORE_DEVICE_CLASS_KEYBOARD, time);
 
         if (comp_conf && comp_conf->input_log_enable)
-          INF("[Server] Key %s (time: %d)\n", (state ? "Down" : "Up"), time);
+          ELOGF("Key", "Send Key %s (time: %d)", ec, (state ? "Down" : "Up"), time);
 
         wl_keyboard_send_key(res, serial, time,
                              wl_keycode, state);
@@ -5405,7 +5405,7 @@ e_comp_wl_trace_serial_debug(Eina_Bool on)
 {
    if (on == serial_trace_debug) return;
    serial_trace_debug = on;
-   INF("POSSIZE |\t\tserial trace_debug %s", on?"ON":"OFF");
+   ELOGF("POSSIZE", "serial trace_debug %s", NULL, (on ? "ON" : "OFF"));
 }
 
 static void
@@ -5425,7 +5425,7 @@ _e_comp_wl_surface_state_serial_update(E_Client *ec, E_Comp_Wl_Surface_State *st
    ec->surface_sync.serial = serial;
 
    if (serial_trace_debug)
-     INF("POSSIZE |win:0x%08zx|ec:%8p|Update serial(%u) wl_buffer(%u)", e_client_util_win_get(ec), ec, serial, wl_resource_get_id(buffer->resource));
+     ELOGF("POSSIZE", "Update serial(%u) wl_buffer(%u)", ec, serial, wl_resource_get_id(buffer->resource));
 }
 
 EINTERN Eina_Bool