From 689aedb1bd70a852d7fb5c3bf40ab00a1d16a6ac Mon Sep 17 00:00:00 2001 From: Gwanglim Lee Date: Tue, 18 Dec 2018 21:24:40 +0900 Subject: [PATCH] fixed warnings while building on the 64-bit system Change-Id: I73c5b63daa88c39016889a162f3b2c550cacaf9a --- src/bin/e_comp_wl.c | 22 ++--- src/bin/e_comp_wl_rsm.c | 78 ++++++++-------- src/bin/e_hwc_window.c | 42 ++++----- src/bin/e_hwc_window_queue.c | 42 ++++----- src/bin/e_hwc_windows.c | 34 +++---- src/bin/e_info_client.c | 28 +++--- src/bin/e_info_server.c | 78 ++++++++-------- src/bin/e_log.h | 34 +++---- src/bin/e_output.c | 8 +- src/bin/e_plane.c | 8 +- src/bin/e_plane_renderer.c | 4 +- src/bin/e_policy.c | 4 +- src/bin/e_policy_conformant.c | 24 ++--- src/bin/e_policy_stack.c | 4 +- src/bin/e_policy_visibility.c | 34 +++---- src/bin/e_policy_visibility_internal.h | 6 +- src/bin/e_policy_wl.c | 156 ++++++++++++++++---------------- src/bin/e_slot.c | 12 +-- src/bin/services/e_service_quickpanel.c | 2 +- src/bin/services/e_service_softkey.c | 4 +- 20 files changed, 312 insertions(+), 312 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 70df05c..49eb212 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -580,7 +580,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:0x%08x, name:%20s)\n", e_client_util_win_get(ec), e_client_util_name_get(ec)); + INF("[Server] Touch Cancel (win:%08zx, name:%20s)\n", e_client_util_win_get(ec), e_client_util_name_get(ec)); wl_touch_send_cancel(res); } @@ -1043,14 +1043,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%08x, 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)); + 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)); 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%08x, 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)); + 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)); wl_touch_send_up(res, serial, timestamp, idx); } @@ -3433,10 +3433,10 @@ _e_comp_wl_compositor_cb_unbind(struct wl_resource *res_comp) &gid); ELOGF("COMP", - "UNBIND |res_comp:0x%08x|client:0x%08x|%d|%d|%d", + "UNBIND |res_comp:%8p|client:%8p|%d|%d|%d", NULL, NULL, - (unsigned int)res_comp, - (unsigned int)client, + res_comp, + client, pid, uid, gid); E_Comp *comp; @@ -3482,10 +3482,10 @@ _e_comp_wl_compositor_cb_bind(struct wl_client *client, void *data EINA_UNUSED, wl_client_get_credentials(client, &pid, &uid, &gid); ELOGF("COMP", - "BIND |res_comp:0x%08x|client:0x%08x|%d|%d|%d", + "BIND |res_comp:%8p|client:%8p|%d|%d|%d", NULL, NULL, - (unsigned int)res, - (unsigned int)client, + res, + client, pid, uid, gid); _e_comp_wl_pname_print(pid); @@ -3960,7 +3960,7 @@ e_comp_wl_subsurface_create(E_Client *ec, E_Client *epc, uint32_t id, struct wl_ { if (ec == parent) { - ERR("Subsurface parent relationship is a cycle : [child win : %x, %s], [parent win : %x, %s]", + ERR("Subsurface parent relationship is a cycle : [child win : %zx, %s], [parent win : %zx, %s]", e_client_util_win_get(ec), e_client_util_name_get(ec), e_client_util_win_get(epc), e_client_util_name_get(epc)); @@ -6295,7 +6295,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%08x|ec:0x%08x|Update serial(%u) wl_buffer(%u)", (unsigned int)(e_client_util_win_get(ec)), (unsigned int)ec, serial, wl_resource_get_id(buffer->resource)); + 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)); } EINTERN Eina_Bool diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c index bb14c07..6001dd1 100644 --- a/src/bin/e_comp_wl_rsm.c +++ b/src/bin/e_comp_wl_rsm.c @@ -10,36 +10,36 @@ #include -#define RSMINF(f, cp, ec, obj, ptr, x...) \ - do \ - { \ - if ((!cp) && (!ec)) \ +#define RSMINF(f, cp, ec, obj, ptr, x...) \ + do \ + { \ + if ((!cp) && (!ec)) \ INF("EWL|%20.20s| | |%10.10s|%p|"f,\ - "RSM", (obj), (ptr), ##x); \ - else \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x|%10.10s|%p|"f, \ - "RSM", \ - (unsigned int)(cp ? e_pixmap_window_get(cp) : 0), \ - (unsigned int)(ec), \ - (obj), (ptr), \ - ##x); \ - } \ + "RSM", (obj), (ptr), ##x); \ + else \ + INF("EWL|%20.20s|win:0x%08zx|ec:%8p|%10.10s|%p|"f, \ + "RSM", \ + (e_client_util_win_get(ec)), \ + (ec), \ + (obj), (ptr), \ + ##x); \ + } \ while (0) -#define RSMDBG(f, cp, ec, obj, ptr, x...) \ - do \ - { \ - if ((!cp) && (!ec)) \ +#define RSMDBG(f, cp, ec, obj, ptr, x...) \ + do \ + { \ + if ((!cp) && (!ec)) \ DBG("EWL|%20.20s| | |%10.10s|%p|"f,\ - "RSM", (obj), (ptr), ##x); \ - else \ - DBG("EWL|%20.20s|win:0x%08x|ec:0x%08x|%10.10s|%p|"f, \ - "RSM", \ - (unsigned int)(cp ? e_pixmap_window_get(cp) : 0), \ - (unsigned int)(ec), \ - (obj), (ptr), \ - ##x); \ - } \ + "RSM", (obj), (ptr), ##x); \ + else \ + DBG("EWL|%20.20s|win:0x%08zx|ec:%8p|%10.10s|%p|"f, \ + "RSM", \ + (e_client_util_win_get(ec)), \ + (ec), \ + (obj), (ptr), \ + ##x); \ + } \ while (0) #define container_of(ptr, type, member) \ @@ -1248,7 +1248,7 @@ _remote_source_image_data_transform(Thread_Data *td, int w, int h) pixman_image_composite(PIXMAN_OP_SRC, c_src_img, NULL, c_dst_img, 0, 0, 0, 0, 0, 0, c_tw, c_th); - RSMDBG("image composite with child. child(win:%x, ec:%p)", + RSMDBG("image composite with child. child(win:%zx, ec:%p)", td->ec->pixmap, td->ec, "SOURCE", NULL, e_client_util_win_get(td->child_data->ec), td->child_data->ec); @@ -3756,8 +3756,8 @@ e_comp_wl_remote_surface_debug_info_get(Eldbus_Message_Iter *iter) if (!ec) continue; snprintf(info_str, sizeof(info_str), - "%10s [%d] 0x%08x win(0x%08x) res(%d) pid(%d) vis(%d) name(%s)", - "PROVIDER", idx++, (unsigned int)provider, + "%10s [%d] %8p win(0x%08zx) res(%d) pid(%d) vis(%d) name(%s)", + "PROVIDER", idx++, provider, e_client_util_win_get(ec), e_pixmap_res_id_get(ec->pixmap), ec->netwm.pid, @@ -3793,10 +3793,10 @@ e_comp_wl_remote_surface_debug_info_get(Eldbus_Message_Iter *iter) is_last = EINA_TRUE; snprintf(info_str, sizeof(info_str), - "%10s CONSUMER [%d] 0x%08x ec(0x%08x) win(0x%08x) pid(%d) vis(%d) redirected(%d) name(%s)", - is_last? "└─" : "├─", s_idx++, (unsigned int)remote_surface, - (unsigned int)owner?:0, - owner?e_client_util_win_get(owner):0, + "%10s CONSUMER [%d] %8p ec(%8p) win(0x%08zx) pid(%d) vis(%d) redirected(%d) name(%s)", + is_last? "└─" : "├─", s_idx++, remote_surface, + owner ? owner : NULL, + owner ? e_client_util_win_get(owner) : 0, pid, remote_surface->visible, remote_surface->redirect, @@ -3819,8 +3819,8 @@ e_comp_wl_remote_surface_debug_info_get(Eldbus_Message_Iter *iter) if (!ec) continue; snprintf(info_str, sizeof(info_str), - "%10s [%d] 0x%08x win(0x%08x) res(%d) pid(%d) offscreen(%d) name(%s)", - "SOURCE", idx++, (unsigned int)source, + "%10s [%d] %8p win(0x%08zx) res(%d) pid(%d) offscreen(%d) name(%s)", + "SOURCE", idx++, source, e_client_util_win_get(ec), e_pixmap_res_id_get(ec->pixmap), ec->netwm.pid, @@ -3856,10 +3856,10 @@ e_comp_wl_remote_surface_debug_info_get(Eldbus_Message_Iter *iter) is_last = EINA_TRUE; snprintf(info_str, sizeof(info_str), - "%10s CONSUMER [%d] 0x%08x ec(0x%08x) win(0x%08x) pid(%d) vis(%d) redirected(%d) name(%s)", - is_last? "└─" : "├─", s_idx++, (unsigned int)remote_surface, - (unsigned int)owner?:0, - owner?e_client_util_win_get(owner):0, + "%10s CONSUMER [%d] %8p ec(%8p) win(0x%08zx) pid(%d) vis(%d) redirected(%d) name(%s)", + is_last? "└─" : "├─", s_idx++, remote_surface, + owner ? owner : NULL, + owner ? e_client_util_win_get(owner) : 0, pid, remote_surface->visible, remote_surface->redirect, diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index 1d76502..8947ed2 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -10,32 +10,32 @@ INF("EWL|%20.20s| | |"f, \ "HWC-WIN", ##x); \ else \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x| ehw:0x%08x "f, \ + INF("EWL|%20.20s|win:0x%08zx|ec:%8p| ehw:%8p "f, \ "HWC-WIN", \ - (unsigned int)(e_client_util_win_get(ec)), \ - (unsigned int)(ec), \ - (unsigned int)(ehw), \ + (e_client_util_win_get(ec)), \ + (ec), \ + (ehw), \ ##x); \ } \ while (0) -#define EHWTRACE(f, ec, ehw, x...) \ - do \ - { \ - if (ehw_trace) \ - { \ - if ((!ec) && (!ehw)) \ - INF("EWL|%20.20s| | |"f, \ - "HWC-WIN", ##x); \ - else \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x| ehw:0x%08x "f, \ - "HWC-WIN", \ - (unsigned int)(e_client_util_win_get(ec)), \ - (unsigned int)(ec), \ - (unsigned int)(ehw), \ - ##x); \ - } \ - } \ +#define EHWTRACE(f, ec, ehw, x...) \ + do \ + { \ + if (ehw_trace) \ + { \ + if ((!ec) && (!ehw)) \ + INF("EWL|%20.20s| | |"f, \ + "HWC-WIN", ##x); \ + else \ + INF("EWL|%20.20s|win:0x%08zx|ec:%8p| ehw:%8p "f, \ + "HWC-WIN", \ + (e_client_util_win_get(ec)), \ + (ec), \ + (ehw), \ + ##x); \ + } \ + } \ while (0) static Eina_Bool ehw_trace = EINA_TRUE; diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c index e9c09a8..f1775db 100644 --- a/src/bin/e_hwc_window_queue.c +++ b/src/bin/e_hwc_window_queue.c @@ -26,32 +26,32 @@ INF("EWL|%20.20s| | |"f, \ "HWC-WINQ", ##x); \ else \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x| ehwq:0x%08x "f, \ + INF("EWL|%20.20s|win:0x%08zx|ec:%8p| ehwq:%8p "f, \ "HWC-WINQ", \ - (unsigned int)(e_client_util_win_get(ec)), \ - (unsigned int)(ec), \ - (unsigned int)(ehwq), \ + (e_client_util_win_get(ec)), \ + (ec), \ + (ehwq), \ ##x); \ } \ while (0) -#define EHWQTRACE(f, ec, ehwq, x...) \ - do \ - { \ - if (ehwq_trace) \ - { \ - if ((!ec) && (!ehwq)) \ - INF("EWL|%20.20s| | |"f, \ - "HWC-WINQ", ##x); \ - else \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x| ehwq:0x%08x "f, \ - "HWC-WINQ", \ - (unsigned int)(e_client_util_win_get(ec)), \ - (unsigned int)(ec), \ - (unsigned int)(ehwq), \ - ##x); \ - } \ - } \ +#define EHWQTRACE(f, ec, ehwq, x...) \ + do \ + { \ + if (ehwq_trace) \ + { \ + if ((!ec) && (!ehwq)) \ + INF("EWL|%20.20s| | |"f, \ + "HWC-WINQ", ##x); \ + else \ + INF("EWL|%20.20s|win:0x%08zx|ec:%8p| ehwq:%8p "f, \ + "HWC-WINQ", \ + (e_client_util_win_get(ec)), \ + (ec), \ + (ehwq), \ + ##x); \ + } \ + } \ while (0) static Eina_Bool ehwq_trace = EINA_TRUE; diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c index 8b53fcb..4873c89 100644 --- a/src/bin/e_hwc_windows.c +++ b/src/bin/e_hwc_windows.c @@ -12,22 +12,22 @@ #define CLEAR(x) memset(&(x), 0, sizeof (x)) #endif -#define EHWSINF(f, ec, x...) \ - do \ - { \ - if (!ec) \ - INF("EWL|%20.20s| | |"f, \ - "HWC-WINS", ##x); \ - else \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x|"f, \ - "HWC-WINS", \ - (unsigned int)(e_client_util_win_get(ec)), \ - (unsigned int)(ec), \ - ##x); \ - } \ +#define EHWSINF(f, ec, x...) \ + do \ + { \ + if (!ec) \ + INF("EWL|%20.20s| | |"f, \ + "HWC-WINS", ##x); \ + else \ + INF("EWL|%20.20s|win:0x%08zx|ec:%8p|"f, \ + "HWC-WINS", \ + (e_client_util_win_get(ec)), \ + (ec), \ + ##x); \ + } \ while (0) -#define EHWSTRACE(f, ec, x...) \ +#define EHWSTRACE(f, ec, x...) \ do \ { \ if (ehws_trace) \ @@ -36,10 +36,10 @@ INF("EWL|%20.20s| | |"f, \ "HWC-WINS", ##x); \ else \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x|"f, \ + INF("EWL|%20.20s|win:0x%08zx|ec:%8p|"f, \ "HWC-WINS", \ - (unsigned int)(e_client_util_win_get(ec)), \ - (unsigned int)(ec), \ + (e_client_util_win_get(ec)), \ + (ec), \ ##x); \ } \ } \ diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c index 9fd80af..aafa444 100644 --- a/src/bin/e_info_client.c +++ b/src/bin/e_info_client.c @@ -838,7 +838,7 @@ _cb_input_keymap_info_get(const Eldbus_Message *msg) memset(keyname, 0, sizeof(keyname)); xkb_keysym_get_name(sym, keyname, sizeof(keyname)); - printf("\t%4d%-5s%-25s%-20p%-5d\n", i, "", keyname, (void *)sym, xkb_keymap_key_repeats(keymap, i)); + printf("\t%4d%-5s%-25s%-20x%-5d\n", i, "", keyname, sym, xkb_keymap_key_repeats(keymap, i)); } finish: if ((name) || (text )) @@ -1059,8 +1059,8 @@ _e_info_client_proc_topvwins_info(int argc, char **argv) snprintf(tmp, sizeof(tmp), " - "); } - printf("%3d 0x%08x %5d %5d %5d %5d %6d %6d %c %c %3d %2d ", i, win->id, win->res_id, win->pid, win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->has_input_region?'C':' ', win->alpha? 32:24, win->opaque); - printf("%2d %d %d %s %3d %-8s %-8x %s\n", win->visibility, win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name"); + printf("%3d 0x%08zx %5d %5d %5d %5d %6d %6d %c %c %3d %2d ", i, win->id, win->res_id, win->pid, win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->has_input_region?'C':' ', win->alpha? 32:24, win->opaque); + printf("%2d %d %d %s %3d %-8s %-8zx %s\n", win->visibility, win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name"); } if (prev_layer_name) @@ -1138,8 +1138,8 @@ _e_info_client_proc_topwins_info(int argc, char **argv) snprintf(tmp, sizeof(tmp), " - "); } - printf("%3d 0x%08x %5d %5d %5d %5d %6d %6d %c %c %3d %2d ", i, win->id, win->res_id, win->pid, win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->has_input_region ? 'C':' ',win->alpha? 32:24, win->opaque); - printf("%2d %d %d %s %3d %-8s %-8x %s\n", win->visibility, win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name"); + printf("%3d 0x%08zx %5d %5d %5d %5d %6d %6d %c %c %3d %2d ", i, win->id, win->res_id, win->pid, win->w, win->h, win->x, win->y, win->focused ? 'O':' ', win->has_input_region ? 'C':' ',win->alpha? 32:24, win->opaque); + printf("%2d %d %d %s %3d %-8s %-8zx %s\n", win->visibility, win->iconic, win->vis, win->mapped? "V":"N", win->frame_visible, tmp, win->parent_id, win->name?:"No Name"); } if (prev_layer_name) @@ -1474,9 +1474,9 @@ _cb_subsurface_info_get(const Eldbus_Message *msg) count++; - printf("%3d 0x%08x ", count, win); + printf("%3d 0x%08zx ", count, win); temp[0] = '\0'; - if (parent > 0) snprintf(temp, sizeof(temp), "0x%08x", parent); + if (parent > 0) snprintf(temp, sizeof(temp), "0x%08zx", parent); printf("%10s", temp); temp[0] = '\0'; if (buf_id != 0) @@ -1488,7 +1488,7 @@ _cb_subsurface_info_get(const Eldbus_Message *msg) w, h, x, y, (4 - (transform & 3)) * 90 % 360, (transform & 4) ? 1 : 0, (visible)?"O":"", (alpha)?"O":"", (ignore)?"O":"", (maskobj)?"O":"", (video)?"O":"", (stand)?"O":""); temp[0] = '\0'; - if (bgrect > 0) snprintf(temp, sizeof(temp), "0x%08x", bgrect); + if (bgrect > 0) snprintf(temp, sizeof(temp), "0x%08zx", bgrect); printf("%10s", temp); printf(" %s\n", name); } @@ -3113,12 +3113,12 @@ _e_info_client_proc_show_pending_commit(int argc, char **argv) EINA_LIST_FOREACH(e_info_client.pending_commit_list, l, pending_commit) { i++; - printf("%3d %12p %5d %12p %12p\n", + printf("%3d %12zx %5d %12zx %12zx\n", i, - (void *)pending_commit->plane, + (uintptr_t)pending_commit->plane, pending_commit->zpos, - (void *)pending_commit->data, - (void *)pending_commit->tsurface); + (uintptr_t)pending_commit->data, + (uintptr_t)pending_commit->tsurface); } E_FREE_LIST(e_info_client.pending_commit_list, _e_pending_commit_info_free); @@ -4446,7 +4446,7 @@ _e_info_client_proc_buffer_flush(int argc, char **argv) return; } - printf("%s %s: window(%s) id : 0x%08x\n", argv[0], argv[1], win_name, win); + printf("%s %s: window(%s) id : 0x%08zx\n", argv[0], argv[1], win_name, win); send_winid = (uint64_t) win; free(win_name); @@ -4566,7 +4566,7 @@ _e_info_client_proc_deiconify_approve(int argc, char **argv) return; } - printf("%s %s: window(%s) id : 0x%08x\n", argv[0], argv[1], win_name, win); + printf("%s %s: window(%s) id : 0x%08zx\n", argv[0], argv[1], win_name, win); send_winid = (uint64_t) win; free(win_name); diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c index ec1274b..e26e068 100644 --- a/src/bin/e_info_server.c +++ b/src/bin/e_info_server.c @@ -389,7 +389,7 @@ _compobj_info_get(Evas_Object *po, Evas_Object *o, int depth) cobj = E_NEW(E_Info_Comp_Obj, 1); EINA_SAFETY_ON_NULL_RETURN_VAL(cobj, NULL); - cobj->obj = (unsigned int)o; + cobj->obj = (uintptr_t)o; cobj->depth = depth; type = evas_object_type_get(o); @@ -448,7 +448,7 @@ _compobj_info_get(Evas_Object *po, Evas_Object *o, int depth) /* append window id, client pid and window title */ eina_stringshare_del(cobj->name); - snprintf(buf, sizeof(buf), "%x %d %s", + snprintf(buf, sizeof(buf), "%zx %d %s", e_client_util_win_get(ec), ec->netwm.pid, e_client_util_name_get(ec)); @@ -524,11 +524,11 @@ _compobj_info_get(Evas_Object *po, Evas_Object *o, int depth) { case EVAS_NATIVE_SURFACE_WL: cobj->img.native_type = eina_stringshare_add("WL"); - cobj->img.data = (unsigned int)ns->data.wl.legacy_buffer; + cobj->img.data = (uintptr_t)ns->data.wl.legacy_buffer; break; case EVAS_NATIVE_SURFACE_TBM: cobj->img.native_type = eina_stringshare_add("TBM"); - cobj->img.data = (unsigned int)ns->data.tbm.buffer; + cobj->img.data = (uintptr_t)ns->data.tbm.buffer; break; default: cobj->img.native_type = eina_stringshare_add("?"); @@ -552,7 +552,7 @@ _compobj_info_get(Evas_Object *po, Evas_Object *o, int depth) cobj->img.key = eina_stringshare_add(key); } - cobj->img.data = (unsigned int)evas_object_image_data_get(o, 0); + cobj->img.data = (uintptr_t)evas_object_image_data_get(o, 0); } evas_object_image_size_get(o, &cobj->img.w, &cobj->img.h); @@ -779,7 +779,7 @@ _msg_connected_clients_append(Eldbus_Message_Iter *iter) } if (cinfo->pid == pid) { - __CONNECTED_CLIENTS_ARG_APPEND_TYPE("[E_Client Info]", "win:0x%08x res_id:%5d, name:%20s, geo:(%4d, %4d, %4dx%4d), layer:%5d, visible:%d, argb:%d", + __CONNECTED_CLIENTS_ARG_APPEND_TYPE("[E_Client Info]", "win:0x%08zx res_id:%5d, name:%20s, geo:(%4d, %4d, %4dx%4d), layer:%5d, visible:%d, argb:%d", win, res_id, e_client_util_name_get(ec) ?: "NO_NAME", ec->x, ec->y, ec->w, ec->h, ec->layer, ec->visible, ec->argb); } } @@ -1103,7 +1103,7 @@ _get_win_prop_Subsurface_Below_Child_List(const Evas_Object *evas_obj) return strdup("None"); EINA_LIST_FOREACH(list, l, child) - astrcat_(&str, "0x%x, ", e_client_util_win_get(child)); + astrcat_(&str, "0x%zx, ", e_client_util_win_get(child)); return str; @@ -1135,7 +1135,7 @@ _get_win_prop_Subsurface_Child_List(const Evas_Object *evas_obj) return strdup("None"); EINA_LIST_FOREACH(list, l, child) - astrcat_(&str, "0x%x, ", e_client_util_win_get(child)); + astrcat_(&str, "0x%zx, ", e_client_util_win_get(child)); return str; @@ -1158,7 +1158,7 @@ _get_win_prop_Subsurface_Parent(const Evas_Object *evas_obj) cdata = (E_Comp_Wl_Client_Data*)ec->comp_data; - if (asprintf(&str, "0x%x", cdata->sub.data ? e_client_util_win_get(cdata->sub.data->parent) : 0) < 0) + if (asprintf(&str, "0x%zx", cdata->sub.data ? e_client_util_win_get(cdata->sub.data->parent) : 0) < 0) return NULL; return str; @@ -1742,7 +1742,7 @@ _get_win_prop_Transients(const Evas_Object *evas_obj) return strdup("None"); EINA_LIST_FOREACH(ec->transients, l, child) - astrcat_(&str, "0x%x, ", e_client_util_win_get(child)); + astrcat_(&str, "0x%zx, ", e_client_util_win_get(child)); return str; @@ -1762,7 +1762,7 @@ _get_win_prop_ParentWindowID(const Evas_Object *evas_obj) if (!ec->parent) return strdup("None"); - if (asprintf(&str, "0x%x", e_client_util_win_get(ec->parent)) < 0) + if (asprintf(&str, "0x%zx", e_client_util_win_get(ec->parent)) < 0) return NULL; return str; @@ -1900,7 +1900,7 @@ _get_win_prop_Window_ID(const Evas_Object *evas_obj) ec = evas_object_data_get(evas_obj, "E_Client"); - if (asprintf(&str, "0x%x", e_client_util_win_get(ec)) < 0) + if (asprintf(&str, "0x%zx", e_client_util_win_get(ec)) < 0) return NULL; return str; @@ -2482,7 +2482,7 @@ static void _e_info_server_cb_wins_dump_topvwins(const char *dir) win = e_client_util_win_get(ec); if (ec->comp_data) rotation = ec->comp_data->scaler.buffer_viewport.buffer.transform * 90; - snprintf(fname, sizeof(fname), "%s/0x%08x_%d.png", dir, win, rotation); + snprintf(fname, sizeof(fname), "%s/0x%08zx_%d.png", dir, win, rotation); e_info_server_dump_client(ec, fname); } @@ -2542,14 +2542,14 @@ static void _e_info_server_cb_wins_dump_ns(const char *dir) switch (ns->type) { case EVAS_NATIVE_SURFACE_WL: - snprintf(fname, sizeof(fname), "%s/0x%08x_wl_%p.png", dir, win, co); + snprintf(fname, sizeof(fname), "%s/0x%08zx_wl_%p.png", dir, win, co); if (ns->data.wl.legacy_buffer) tbm_surface = wayland_tbm_server_get_surface(NULL, ns->data.wl.legacy_buffer); if (tbm_surface) tdm_helper_dump_buffer(tbm_surface, fname); break; case EVAS_NATIVE_SURFACE_TBM: - snprintf(fname, sizeof(fname), "%s/0x%08x_tbm_%p.png", dir, win, co); + snprintf(fname, sizeof(fname), "%s/0x%08zx_tbm_%p.png", dir, win, co); if (ns->data.tbm.buffer) tdm_helper_dump_buffer(ns->data.tbm.buffer, fname); break; @@ -3451,7 +3451,7 @@ e_info_server_cb_slot_message(const Eldbus_Service_Interface *iface EINA_UNUSED, EINA_LIST_FOREACH(clist, ll, ec) { if (ec) - __SLOT_ARG_APPEND_TYPE("[SLOT CLIENT]", "slot_client win:%08x name:%s \n", e_client_util_win_get(ec), e_client_util_name_get(ec) ?: "NO NAME"); + __SLOT_ARG_APPEND_TYPE("[SLOT CLIENT]", "slot_client win:%08zx name:%s \n", e_client_util_win_get(ec), e_client_util_name_get(ec) ?: "NO NAME"); } } } @@ -3531,7 +3531,7 @@ e_info_server_cb_slot_message(const Eldbus_Service_Interface *iface EINA_UNUSED, { e_slot_client_add(slot, ec, 0); e_slot_client_update(ec); - __SLOT_ARG_APPEND_TYPE("[SLOT INFO]", "[SLOT ADD EC as transform] slot_id:%02d (%08x)\n", slot_id, win); + __SLOT_ARG_APPEND_TYPE("[SLOT INFO]", "[SLOT ADD EC as transform] slot_id:%02d (%08zx)\n", slot_id, win); } } else if (mode == E_INFO_CMD_MESSAGE_DEL_EC) @@ -3549,7 +3549,7 @@ e_info_server_cb_slot_message(const Eldbus_Service_Interface *iface EINA_UNUSED, if (ec) { e_slot_client_remove(slot, ec); - __SLOT_ARG_APPEND_TYPE("[SLOT INFO]", "[SLOT DEL EC] slot_id:%02d (%08x)\n", slot_id, win); + __SLOT_ARG_APPEND_TYPE("[SLOT INFO]", "[SLOT DEL EC] slot_id:%02d (%08zx)\n", slot_id, win); } } else if (mode == E_INFO_CMD_MESSAGE_ADD_EC_RESIZE) @@ -3568,7 +3568,7 @@ e_info_server_cb_slot_message(const Eldbus_Service_Interface *iface EINA_UNUSED, { e_slot_client_add(slot, ec, 1); e_slot_client_update(ec); - __SLOT_ARG_APPEND_TYPE("[SLOT INFO]", "[SLOT ADD EC as resize] slot_id:%02d (%08x)\n", slot_id, win); + __SLOT_ARG_APPEND_TYPE("[SLOT INFO]", "[SLOT ADD EC as resize] slot_id:%02d (%08zx)\n", slot_id, win); } } else if (mode == E_INFO_CMD_MESSAGE_FOCUS) @@ -3692,19 +3692,19 @@ _e_info_server_cb_buffer_change(void *data, int type, void *event) switch (buffer->type) { case E_COMP_WL_BUFFER_TYPE_SHM: - snprintf(fname, sizeof(fname), "buffer_commit_shm_0x%08x_%d", event_win, rotation); + snprintf(fname, sizeof(fname), "buffer_commit_shm_0x%08zx_%d", event_win, rotation); break; case E_COMP_WL_BUFFER_TYPE_NATIVE: - snprintf(fname, sizeof(fname), "buffer_commit_native_0x%08x_%d", event_win, rotation); + snprintf(fname, sizeof(fname), "buffer_commit_native_0x%08zx_%d", event_win, rotation); break; case E_COMP_WL_BUFFER_TYPE_VIDEO: - snprintf(fname, sizeof(fname), "buffer_commit_video_0x%08x_%d", event_win, rotation); + snprintf(fname, sizeof(fname), "buffer_commit_video_0x%08zx_%d", event_win, rotation); break; case E_COMP_WL_BUFFER_TYPE_TBM: - snprintf(fname, sizeof(fname), "buffer_commit_tbm_0x%08x_%d", event_win, rotation); + snprintf(fname, sizeof(fname), "buffer_commit_tbm_0x%08zx_%d", event_win, rotation); break; default: - snprintf(fname, sizeof(fname), "buffer_commit_none_0x%08x_%d", event_win, rotation); + snprintf(fname, sizeof(fname), "buffer_commit_none_0x%08zx_%d", event_win, rotation); break; } @@ -3906,7 +3906,7 @@ _e_info_server_cb_selected_buffer_dump(const Eldbus_Service_Interface *iface EIN else { if (strlen(win_id_s) >= 2 && win_id_s[0] == '0' && win_id_s[1] == 'x') - sscanf(win_id_s, "%x", &win_id); + sscanf(win_id_s, "%zx", (uintptr_t *)&win_id); else sscanf(win_id_s, "%d", &win_id); } @@ -3924,7 +3924,7 @@ _e_info_server_cb_selected_buffer_dump(const Eldbus_Service_Interface *iface EIN if (win_id != win) continue; - snprintf(fname, sizeof(fname), "%s/0x%08x.png", path, win); + snprintf(fname, sizeof(fname), "%s/0x%08zx.png", path, win); e_info_server_dump_client(ec, fname); break; @@ -4278,10 +4278,10 @@ _msg_show_pending_commit_append(Eldbus_Message_Iter *iter) eldbus_message_iter_arguments_append (struct_of_pending_commit, VALUE_TYPE_FOR_PENDING_COMMIT, - (unsigned int)plane, + (uintptr_t)plane, plane->zpos, - (unsigned int)data, - (unsigned int)data->tsurface); + (uintptr_t)data, + (uintptr_t)data->tsurface); eldbus_message_iter_container_close(array_of_pending_commit, struct_of_pending_commit); } @@ -4762,8 +4762,8 @@ _e_info_server_ec_kill(uint32_t mode, void *value, Eldbus_Message_Iter *array_of count++; e_client_act_kill_begin(ec); - snprintf(result, sizeof(result), "[Server] killing creator(%s) of resource 0x%lx", - ec_name, (unsigned long)e_client_util_win_get(ec)); + snprintf(result, sizeof(result), "[Server] killing creator(%s) of resource 0x%zx", + ec_name, e_client_util_win_get(ec)); eldbus_message_iter_arguments_append(array_of_string, VALUE_TYPE_REPLY_KILL, result); } @@ -4810,8 +4810,8 @@ _e_info_server_cb_kill_client(const Eldbus_Service_Interface *iface EINA_UNUSED, e_client_act_kill_begin(ec); snprintf(result, sizeof(result), - "[Server] killing creator(%s) of resource 0x%lx", - e_client_util_name_get(ec) ?: "NO NAME", (unsigned long)win); + "[Server] killing creator(%s) of resource 0x%zx", + e_client_util_name_get(ec) ?: "NO NAME", win); } else if (mode >= KILL_NAME_MODE && mode <= KILL_PID_FORCE_MODE) { @@ -5419,7 +5419,7 @@ _e_info_server_cb_buffer_flush(const Eldbus_Service_Interface *iface EINA_UNUSED ec = _e_info_server_ec_find_by_win(win); if (ec == NULL) { - snprintf(msg_to_client, sizeof(msg_to_client), "Cannot find win 0x%08x!", win); + snprintf(msg_to_client, sizeof(msg_to_client), "Cannot find win 0x%08zx!", win); goto finish; } } @@ -5434,7 +5434,7 @@ _e_info_server_cb_buffer_flush(const Eldbus_Service_Interface *iface EINA_UNUSED ec->exp_iconify.buffer_flush = msg_from_client; snprintf(msg_to_client, sizeof(msg_to_client), "Successfully changed!\n" - "win(0x%08x/%s)->buffer_flush : %s", + "win(0x%08zx/%s)->buffer_flush : %s", win, ec->icccm.name, ec->exp_iconify.buffer_flush ? "on" : "off"); @@ -5461,7 +5461,7 @@ _e_info_server_cb_buffer_flush(const Eldbus_Service_Interface *iface EINA_UNUSED { snprintf(msg_to_client + strlen(msg_to_client), sizeof(msg_to_client) - strlen(msg_to_client), - "\n\t\twin(0x%08x)->buffer_flush : %s", + "\n\t\twin(0x%08zx)->buffer_flush : %s", win, ec->exp_iconify.buffer_flush ? "on" : "off"); } @@ -5496,7 +5496,7 @@ _e_info_server_cb_deiconify_approve(const Eldbus_Service_Interface *iface EINA_U ec = _e_info_server_ec_find_by_win(win); if (ec == NULL) { - snprintf(msg_to_client, sizeof(msg_to_client), "Cannot find win 0x%08x!", win); + snprintf(msg_to_client, sizeof(msg_to_client), "Cannot find win 0x%08zx!", win); goto finish; } } @@ -5511,7 +5511,7 @@ _e_info_server_cb_deiconify_approve(const Eldbus_Service_Interface *iface EINA_U ec->exp_iconify.deiconify_update = msg_from_client; snprintf(msg_to_client, sizeof(msg_to_client), "Successfully changed!\n" - "win(0x%08x/%s)->deiconify_update : %s", + "win(0x%08zx/%s)->deiconify_update : %s", win, ec->icccm.name, ec->exp_iconify.deiconify_update ? "on" : "off"); @@ -5538,7 +5538,7 @@ _e_info_server_cb_deiconify_approve(const Eldbus_Service_Interface *iface EINA_U { snprintf(msg_to_client + strlen(msg_to_client), sizeof(msg_to_client) - strlen(msg_to_client), - "\n\t\twin(0x%08x)->deiconify_update : %s", + "\n\t\twin(0x%08zx)->deiconify_update : %s", win, ec->exp_iconify.deiconify_update ? "on" : "off"); } diff --git a/src/bin/e_log.h b/src/bin/e_log.h index 306d97c..7c2f9ae 100644 --- a/src/bin/e_log.h +++ b/src/bin/e_log.h @@ -77,25 +77,25 @@ # define DLOG_BACKTRACE #endif -#define ELOG(t, cp, ec) \ - do \ - { \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x|", \ - (t), \ - (unsigned int)(e_client_util_win_get(ec)), \ - (unsigned int)(ec)); \ - } \ +#define ELOG(t, cp, ec) \ + do \ + { \ + INF("EWL|%20.20s|win:0x%08zx|ec:%8p|", \ + (t), \ + (e_client_util_win_get(ec)), \ + (ec)); \ + } \ while (0) -#define ELOGF(t, f, cp, ec, x...) \ - do \ - { \ - INF("EWL|%20.20s|win:0x%08x|ec:0x%08x|"f, \ - (t), \ - (unsigned int)(e_client_util_win_get(ec)), \ - (unsigned int)(ec), \ - ##x); \ - } \ +#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); \ + } \ while (0) typedef enum _E_Log_Type diff --git a/src/bin/e_output.c b/src/bin/e_output.c index 47e9f9a..67cd354 100644 --- a/src/bin/e_output.c +++ b/src/bin/e_output.c @@ -2875,14 +2875,14 @@ e_output_util_planes_print(void) EINA_LIST_REVERSE_FOREACH(output->planes, p_l, plane) { ec = plane->ec; - if (ec) fprintf(stderr, "HWC \t[%d]%s\t %s (0x%08x)", + if (ec) fprintf(stderr, "HWC \t[%d]%s\t %s (%8p)", plane->zpos, plane->is_primary ? "--" : " ", - ec->icccm.title, (unsigned int)ec->frame); + ec->icccm.title, ec->frame); ec = plane->prepare_ec; - if (ec) fprintf(stderr, "\t\t\t %s (0x%08x)", - ec->icccm.title, (unsigned int)ec->frame); + if (ec) fprintf(stderr, "\t\t\t %s (%8p)", + ec->icccm.title, ec->frame); fputc('\n', stderr); } fputc('\n', stderr); diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c index 51b7d2b3..cebef1e 100644 --- a/src/bin/e_plane.c +++ b/src/bin/e_plane.c @@ -1411,7 +1411,7 @@ _e_plane_ex_commit_handler(tdm_layer *layer, unsigned int sequence, EINA_SAFETY_ON_NULL_RETURN(data); - TRACE_DS_ASYNC_END((unsigned int)layer, [PLANE:COMMIT~HANDLER]); + TRACE_DS_ASYNC_END((intptr_t)layer, [PLANE:COMMIT~HANDLER]); plane = data->plane; @@ -1446,7 +1446,7 @@ _e_plane_external_commit(E_Plane *plane, E_Plane_Commit_Data *data) { tdm_error error = TDM_ERROR_NONE; - TRACE_DS_ASYNC_BEGIN((unsigned int)plane->tlayer, [PLANE:COMMIT~HANDLER]); + TRACE_DS_ASYNC_BEGIN((intptr_t)plane->tlayer, [PLANE:COMMIT~HANDLER]); if (plane_trace_debug) ELOGF("E_PLANE", "Ex Commit Plane(%p) zpos(%d) tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)", @@ -2083,7 +2083,7 @@ _e_plane_commit_hanler(tdm_layer *layer, unsigned int sequence, EINA_SAFETY_ON_NULL_RETURN(data); - TRACE_DS_ASYNC_END((unsigned int)layer, [PLANE:COMMIT~HANDLER]); + TRACE_DS_ASYNC_END((intptr_t)layer, [PLANE:COMMIT~HANDLER]); plane = data->plane; @@ -2193,7 +2193,7 @@ e_plane_commit(E_Plane *plane) _e_plane_fb_target_change_check(plane); - TRACE_DS_ASYNC_BEGIN((unsigned int)plane->tlayer, [PLANE:COMMIT~HANDLER]); + TRACE_DS_ASYNC_BEGIN((intptr_t)plane->tlayer, [PLANE:COMMIT~HANDLER]); if (plane_trace_debug) ELOGF("E_PLANE", "Commit Plane(%p) zpos(%d) tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)", diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c index 12c7a4b..54cfef0 100644 --- a/src/bin/e_plane_renderer.c +++ b/src/bin/e_plane_renderer.c @@ -459,7 +459,7 @@ _e_plane_renderer_surface_find_released_surface(E_Plane_Renderer *renderer, tbm_ static void _e_plane_renderer_cb_acquirable(tbm_surface_queue_h surface_queue, void *data) { - int fd = (int)data; + int fd = (intptr_t)data; uint64_t value = 1; int ret; @@ -2449,7 +2449,7 @@ e_plane_renderer_surface_queue_set(E_Plane_Renderer *renderer, tbm_surface_queue if (renderer->ee) { - tsq_err = tbm_surface_queue_add_acquirable_cb(tqueue, _e_plane_renderer_cb_acquirable, (void *)renderer->event_fd); + tsq_err = tbm_surface_queue_add_acquirable_cb(tqueue, _e_plane_renderer_cb_acquirable, (void *)(intptr_t)renderer->event_fd); if (tsq_err != TBM_SURFACE_QUEUE_ERROR_NONE) { ERR("fail to add acquirable cb"); diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c index 864faab..0d75b2a 100644 --- a/src/bin/e_policy.c +++ b/src/bin/e_policy.c @@ -1389,7 +1389,7 @@ _e_policy_client_stack_change_send(E_Client *ec) if (above) above_pid = above->netwm.pid; if (below) below_pid = below->netwm.pid; - ELOGF("TZPOL", "Send stack change. above(win:%x, pid:%d), below(win:%x, pid:%d)", + 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); e_policy_aux_message_send_from_int(ec, "stack_changed", "pid", 2, above_pid, below_pid); @@ -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 %08x --> result:%08x", ec->pixmap, ec, + ELOGF("TZPOL","EFFECT(animatable:%d) due to %d is applied on the state %d --> result:%d", ec->pixmap, ec, ec->animatable, set, lock, pc->lock_animatable); } diff --git a/src/bin/e_policy_conformant.c b/src/bin/e_policy_conformant.c index 842c3a6..c9a580a 100644 --- a/src/bin/e_policy_conformant.c +++ b/src/bin/e_policy_conformant.c @@ -186,7 +186,7 @@ _conf_state_update(Conformant_Type type, Eina_Bool visible, int x, int y, int w, return; } - DBG("\t=> '%s'(win:%x, ec:%p)", cfc->ec ? (cfc->ec->icccm.name ?:"") : "", e_client_util_win_get(cfc->ec), cfc->ec); + DBG("\t=> '%s'(win:%zx, ec:%p)", cfc->ec ? (cfc->ec->icccm.name ?:"") : "", e_client_util_win_get(cfc->ec), cfc->ec); EINA_LIST_FOREACH(cfc->res_list, l, cres) { cres->ack_done = EINA_FALSE; @@ -537,7 +537,7 @@ _conf_cb_part_obj_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN if (!g_conf) return; - DBG("PART %s win(%x), ec(%p) Show", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); + DBG("PART %s win(%zx), ec(%p) Show", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); owner = _conf_part_owner_find(g_conf->part[type].ec, type); g_conf->part[type].owner = owner; @@ -556,7 +556,7 @@ _conf_cb_part_obj_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN if (!g_conf) return; - DBG("PART %s win(%x), ec(%p) Hide", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); + DBG("PART %s win(%zx), ec(%p) Hide", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); _conf_state_update(type, EINA_FALSE, g_conf->part[type].state.x, @@ -578,7 +578,7 @@ _conf_cb_part_obj_hiding(void *data, Evas_Object *obj EINA_UNUSED, void *event_i if (!g_conf) return; - DBG("PART %s win(%x), ec(%p) Hiding", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); + DBG("PART %s win(%zx), ec(%p) Hiding", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); _conf_state_update(type, EINA_FALSE, g_conf->part[type].state.x, @@ -595,7 +595,7 @@ _conf_cb_part_obj_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN if (!g_conf) return; - DBG("PART %s win(%x), ec(%p) Move", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); + DBG("PART %s win(%zx), ec(%p) Move", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); g_conf->part[type].changed = 1; } @@ -608,7 +608,7 @@ _conf_cb_part_obj_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ if (!g_conf) return; - DBG("PART %s win(%x), ec(%p) Resize", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); + DBG("PART %s win(%zx), ec(%p) Resize", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); g_conf->part[type].changed = 1; } @@ -754,7 +754,7 @@ _conf_cb_client_rot_change_cancel(void *data, int evtype EINA_UNUSED, void *even if (g_conf->part[type].state.restore) { - DBG("Rotation Cancel %s win(%x), ec(%p)", _conf_type_to_str(type), e_client_util_win_get(ev->ec), ev->ec); + DBG("Rotation Cancel %s win(%zx), ec(%p)", _conf_type_to_str(type), e_client_util_win_get(ev->ec), ev->ec); _conf_state_update(type, EINA_TRUE, g_conf->part[type].state.x, @@ -811,7 +811,7 @@ _conf_cb_intercept_hook_hide(void *data EINA_UNUSED, E_Client *ec) pre_serial = wl_display_next_serial(e_comp_wl->wl.disp); - DBG("PART %s win(%x) ec(%p) Intercept Hide", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); + DBG("PART %s win(%zx) ec(%p) Intercept Hide", _conf_type_to_str(type), e_client_util_win_get(g_conf->part[type].ec), g_conf->part[type].ec); _conf_state_update(type, EINA_FALSE, g_conf->part[type].state.x, @@ -1048,7 +1048,7 @@ e_policy_conformant_part_update(E_Client *ec) if (owner != g_conf->part[type].owner) { - DBG("Update state %s ec(%p). new_owner(win:%x, ec:%p)", _conf_type_to_str(type), ec, e_client_util_win_get(owner), owner); + DBG("Update state %s ec(%p). new_owner(win:%zx, ec:%p)", _conf_type_to_str(type), ec, e_client_util_win_get(owner), owner); g_conf->part[type].owner = owner; g_conf->part[type].changed = EINA_TRUE; } @@ -1065,7 +1065,7 @@ e_policy_conformant_client_add(E_Client *ec, struct wl_resource *res) EINA_SAFETY_ON_NULL_RETURN(g_conf); EINA_SAFETY_ON_NULL_RETURN(ec); - DBG("Client Add '%s'(win:%x, ec:%p)", ec->icccm.name ? ec->icccm.name : "", e_client_util_win_get(ec), ec); + DBG("Client Add '%s'(win:%zx, ec:%p)", ec->icccm.name ? ec->icccm.name : "", e_client_util_win_get(ec), ec); if (g_conf->client_hash) { @@ -1096,7 +1096,7 @@ e_policy_conformant_client_del(E_Client *ec) EINA_SAFETY_ON_NULL_RETURN(g_conf); EINA_SAFETY_ON_NULL_RETURN(ec); - DBG("Client Del '%s'(win:%x, ec:%p)", ec->icccm.name ? ec->icccm.name : "", e_client_util_win_get(ec), ec); + DBG("Client Del '%s'(win:%zx, ec:%p)", ec->icccm.name ? ec->icccm.name : "", e_client_util_win_get(ec), ec); cfc = eina_hash_find(g_conf->client_hash, &ec); if (cfc) @@ -1138,7 +1138,7 @@ e_policy_conformant_client_ack(E_Client *ec, struct wl_resource *res, uint32_t s { if (serial == cres->serial) { - DBG("Ack conformant region win(%x) ec(%p) res(%p) serial(%u)", e_client_util_win_get(ec), ec, res, serial); + DBG("Ack conformant region win(%zx) ec(%p) res(%p) serial(%u)", e_client_util_win_get(ec), ec, res, serial); cres->ack_done = EINA_TRUE; } break; diff --git a/src/bin/e_policy_stack.c b/src/bin/e_policy_stack.c index 358b7b9..88c5a7b 100644 --- a/src/bin/e_policy_stack.c +++ b/src/bin/e_policy_stack.c @@ -67,8 +67,8 @@ _e_policy_stack_transient_for_apply(E_Client *ec) return; } - ELOGF("TZPOL", "Fetch for stack transient_for. ec_layer:%d, parent(win:%x, ec:%x, layer:%d)", - ec->pixmap, ec, ec->layer, e_client_util_win_get(ec->parent), (unsigned int)ec->parent, ec->parent ? ec->parent->layer:-1); + 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); if (ec->parent == NULL) { diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c index 19bb669..e9b580a 100644 --- a/src/bin/e_policy_visibility.c +++ b/src/bin/e_policy_visibility.c @@ -182,7 +182,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%08x, ec:%p), child(win:0x%08x, ec:%p)", + ELOGF("Find visible child", "ancestor(win:0x%08zx, ec:%p), child(win:0x%08zx, ec:%p)", ec->pixmap, ec, e_client_util_win_get(ancestor_ec), ancestor_ec, e_client_util_win_get(child_ec), child_ec); @@ -195,7 +195,7 @@ _e_policy_check_transient_child_visible(E_Client *ancestor_ec, E_Client *ec) e_client_geometry_get(child_ec, &child_x, &child_y, &child_w, &child_h); 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%08x, ec:%p), child(win:0x%08x, ec:%p)", + ELOGF("Find visible child", "ancestor(win:0x%08zx, ec:%p), child(win:0x%08zx, ec:%p)", ec->pixmap, ec, e_client_util_win_get(ancestor_ec), ancestor_ec, e_client_util_win_get(child_ec), child_ec); @@ -209,7 +209,7 @@ _e_policy_check_transient_child_visible(E_Client *ancestor_ec, E_Client *ec) if ((!child_ec->iconic) || (child_ec->visibility.obscured == E_VISIBILITY_UNOBSCURED)) { - ELOGF("Find visible child", "ancestor(win:0x%08x, ec:%p), child(win:0x%08x, ec:%p)", + ELOGF("Find visible child", "ancestor(win:0x%08zx, ec:%p), child(win:0x%08zx, ec:%p)", ec->pixmap, ec, e_client_util_win_get(ancestor_ec), ancestor_ec, e_client_util_win_get(child_ec), child_ec); @@ -298,13 +298,13 @@ _e_policy_client_iconify_by_visibility(E_Client *ec) if (skip_iconify) { - ELOGF("SKIP.. ICONIFY_BY_WM", "win:0x%08x 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->pixmap, ec, e_client_util_win_get(ec), skip_iconify); if (pol_vis) _e_vis_update_forground_list(); return; } - ELOGF("ICONIFY_BY_WM", "win:0x%08x", ec->pixmap, ec, e_client_util_win_get(ec)); + ELOGF("ICONIFY_BY_WM", "win:0x%08zx", ec->pixmap, ec, e_client_util_win_get(ec)); e_policy_wl_iconify_state_change_send(ec, 1); e_client_iconify(ec); @@ -320,7 +320,7 @@ _e_policy_client_iconify_by_visibility(E_Client *ec) { if (_e_vis_client_is_uniconify_render_running(vc)) { - VS_INF(ec, "Uniconify render because parent(win:%x, ec:%p)", e_client_util_win_get(ec->parent), ec->parent); + VS_INF(ec, "Uniconify render because parent(win:%zx, ec:%p)", e_client_util_win_get(ec->parent), ec->parent); e_policy_visibility_client_uniconify(ec, !ec->parent->exp_iconify.not_raise); } } @@ -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%08x, parent:0x%08x", 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, 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%08x, parent:0x%08x", 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, 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%08x", parent->pixmap, parent, e_client_util_win_get(parent)); + ELOGF("UNICONIFY_BY_WM", "parent_win:0x%08zx", parent->pixmap, 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%08x", ec->pixmap, ec, e_client_util_win_get(ec)); + ELOGF("UNICONIFY_BY_WM", "win:0x%08zx", ec->pixmap, ec, e_client_util_win_get(ec)); ret = e_policy_visibility_client_uniconify(ec, 0); if (!ret) { @@ -1220,7 +1220,7 @@ _e_vis_client_check_obscured_by_children(E_Client *ec) if (!child->argb) { - ELOGF("POL_VIS", "Fully Obscured by child (win:%x, child:%p)", + ELOGF("POL_VIS", "Fully Obscured by child (win:%zx, child:%p)", ec->pixmap, ec, e_client_util_win_get(child), child); obscured = EINA_TRUE; break; @@ -1229,7 +1229,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:%x, child:%p)", + ELOGF("POL_VIS", "Fully Obscured by alpha opaque child (win:%zx, child:%p)", ec->pixmap, ec, e_client_util_win_get(child), child); obscured = EINA_TRUE; break; @@ -1258,7 +1258,7 @@ _e_vis_client_check_obscured_by_same_layer(E_Client *ec) if (!above->argb) { - ELOGF("POL_VIS", "Fully Obscured by above (win:%x, ec:%p, layer:%d)", + 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); obscured = EINA_TRUE; break; @@ -1269,7 +1269,7 @@ _e_vis_client_check_obscured_by_same_layer(E_Client *ec) continue; else { - ELOGF("POL_VIS", "Fully Obscured by alpha opaque above (win:%x, ec:%p, layer:%d)", + 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); obscured = EINA_TRUE; break; @@ -1298,7 +1298,7 @@ _e_vis_client_check_obscured_by_above_layers(E_Client *ec) if (!above->argb) { - ELOGF("POL_VIS", "Fully Obscured by above (win:%x, ec:%p, layer:%d)", + 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); obscured = EINA_TRUE; break; @@ -1309,7 +1309,7 @@ _e_vis_client_check_obscured_by_above_layers(E_Client *ec) continue; else { - ELOGF("POL_VIS", "Fully Obscured by alpha opaque above (win:%x, ec:%p, layer:%d)", + 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); obscured = EINA_TRUE; break; @@ -1875,7 +1875,7 @@ _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%08x 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->pixmap, ec, e_client_util_win_get(topmost), topmost); return EINA_TRUE; } diff --git a/src/bin/e_policy_visibility_internal.h b/src/bin/e_policy_visibility_internal.h index adda1b5..60df2c4 100644 --- a/src/bin/e_policy_visibility_internal.h +++ b/src/bin/e_policy_visibility_internal.h @@ -13,11 +13,11 @@ vc->state == E_VIS_ICONIFY_STATE_RUNNING_UNICONIFY ? "RUNNING UNICONIFY" : "OTHERS") #define VS_DBG(ec, f, x...) \ - DBG("VISIBILITY | "f" | '%s'(win:0x%08x, ec:%p) RscID %d", ##x, ec ? NAME(ec) : "", e_client_util_win_get(ec), ec, ec ? e_pixmap_res_id_get(ec->pixmap) : 0) + DBG("VISIBILITY | "f" | '%s'(win:0x%08zx, ec:%p) RscID %d", ##x, ec ? NAME(ec) : "", e_client_util_win_get(ec), ec, ec ? e_pixmap_res_id_get(ec->pixmap) : 0) #define VS_INF(ec, f, x...) \ - INF("VISIBILITY | "f" | '%s'(win:0x%08x, ec:%p) RscID %d", ##x, ec ? NAME(ec) : "", e_client_util_win_get(ec), ec, ec ? e_pixmap_res_id_get(ec->pixmap) : 0) + INF("VISIBILITY | "f" | '%s'(win:0x%08zx, ec:%p) RscID %d", ##x, ec ? NAME(ec) : "", e_client_util_win_get(ec), ec, ec ? e_pixmap_res_id_get(ec->pixmap) : 0) #define VS_ERR(ec, f, x...) \ - ERR("VISIBILITY | "f" | '%s'(win:0x%08x, ec:%p) RscID %d", ##x, ec ? NAME(ec) : "", e_client_util_win_get(ec), ec, ec ? e_pixmap_res_id_get(ec->pixmap) : 0) + ERR("VISIBILITY | "f" | '%s'(win:0x%08zx, ec:%p) RscID %d", ##x, ec ? NAME(ec) : "", e_client_util_win_get(ec), ec, ec ? e_pixmap_res_id_get(ec->pixmap) : 0) #undef E_COMP_OBJECT_INTERCEPT_HOOK_APPEND #define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(l, t, cb, d) \ diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c index 4ffe633..e6c9f56 100644 --- a/src/bin/e_policy_wl.c +++ b/src/bin/e_policy_wl.c @@ -457,11 +457,11 @@ _e_policy_wl_tzsh_get_from_client(E_Client *ec) (tzsh->ec != ec)) { ELOGF("TZSH", - "CRI ERR!!|tzsh_cp:0x%08x|tzsh_ec:0x%08x|tzsh:0x%08x", + "CRI ERR!!|tzsh_cp:%8p|tzsh_ec:%8p|tzsh:%8p", ec->pixmap, ec, - (unsigned int)tzsh->cp, - (unsigned int)tzsh->ec, - (unsigned int)tzsh); + tzsh->cp, + tzsh->ec, + tzsh); } return tzsh; @@ -681,10 +681,10 @@ _e_policy_wl_tzsh_srv_tvsrv_bind_update(void) if ((tzsh_client_ec) && (tzsh_srv_ec)) { ELOGF("TZSH", - "TR_SET |parent_ec:0x%08x|child_ec:0x%08x", + "TR_SET |parent_ec:0x%08zx|child_ec:0x%08zx", NULL, NULL, - (unsigned int)e_client_util_win_get(tzsh_client_ec), - (unsigned int)e_client_util_win_get(tzsh_srv_ec)); + e_client_util_win_get(tzsh_client_ec), + e_client_util_win_get(tzsh_srv_ec)); e_policy_stack_transient_for_set(tzsh_srv_ec, tzsh_client_ec); evas_object_stack_below(tzsh_srv_ec->frame, tzsh_client_ec->frame); @@ -694,9 +694,9 @@ _e_policy_wl_tzsh_srv_tvsrv_bind_update(void) if (tzsh_srv_ec) { ELOGF("TZSH", - "TR_UNSET | |child_ec:0x%08x", + "TR_UNSET | |child_ec:0x%08zx", NULL, NULL, - (unsigned int)e_client_util_win_get(tzsh_srv_ec)); + e_client_util_win_get(tzsh_srv_ec)); e_policy_stack_transient_for_set(tzsh_srv_ec, NULL); } @@ -885,14 +885,14 @@ _e_policy_wl_surf_client_set(E_Client *ec) if ((psurf->ec) && (psurf->ec != ec)) { ELOGF("POLSURF", - "CRI ERR!!|s:0x%08x|tzpol:0x%08x|ps:0x%08x|new_ec:0x%08x|new_cp:0x%08x", + "CRI ERR!!|s:%8p|tzpol:%8p|ps:%8p|new_ec:%8p|new_cp:%8p", psurf->cp, psurf->ec, - (unsigned int)psurf->surf, - (unsigned int)psurf->tzpol, - (unsigned int)psurf, - (unsigned int)ec, - (unsigned int)ec->pixmap); + psurf->surf, + psurf->tzpol, + psurf, + ec, + ec->pixmap); } psurf->ec = ec; @@ -962,11 +962,11 @@ _e_policy_wl_e_pixmap_get_from_id(struct wl_client *client, uint32_t id) if (cp != ec->pixmap) { ELOGF("POLWL", - "CRI ERR!!|cp2:0x%08x|ec2:0x%08x|res_surf:0x%08x", + "CRI ERR!!|cp2:%8p|ec2:%8p|res_surf:%8p", ec->pixmap, ec, - (unsigned int)cp, - (unsigned int)e_pixmap_client_get(cp), - (unsigned int)res_surf); + cp, + e_pixmap_client_get(cp), + res_surf); return NULL; } @@ -1139,10 +1139,10 @@ e_policy_wl_visibility_send(E_Client *ec, int vis) } ELOGF("POL_VIS", - "SEND |win:0x%08x|res_tzvis:0x%08x|ver:%d|sent_vis:%d|pid:%d|title:%s, name:%s", + "SEND |win:0x%08zx|res_tzvis:%8p|ver:%d|sent_vis:%d|pid:%d|title:%s, name:%s", ec->pixmap, ec, - (unsigned int)win, - (unsigned int)res_tzvis, + win, + res_tzvis, ver, sent_vis, ec->netwm.pid, ec->icccm.title, ec->netwm.name); @@ -1225,9 +1225,9 @@ 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%08x|iconic:%d |sur:%p", + "SEND |win:0x%08zx|iconic:%d |sur:%p", ec->pixmap, ec, - (unsigned int)win, + win, iconic, psurf->surf); break; } @@ -1355,10 +1355,10 @@ 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%08x|res_tzpos:0x%08x|ec->x:%d, ec->y:%d, ec->client.x:%d, ec->client.y:%d", + "SEND |win:0x%08zx|res_tzpos:%8p|ec->x:%d, ec->y:%d, ec->client.x:%d, ec->client.y:%d", ec->pixmap, ec, - (unsigned int)win, - (unsigned int)res_tzpos, + win, + res_tzpos, ec->x, ec->y, ec->client.x, ec->client.y); } @@ -1451,7 +1451,7 @@ e_policy_wl_stack_changed_send(E_Client *ec) if (above) above_pid = above->netwm.pid; if (below) below_pid = below->netwm.pid; - ELOGF("TZPOL", "Send stack_changed by activate_below. above(win:%x, pid:%d), below(win:%x, pid:%d)", + 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); @@ -1478,7 +1478,7 @@ _tzpol_iface_cb_activate_below_by_res_id(struct wl_client *client EINA_UNUSED, s EINA_SAFETY_ON_NULL_RETURN(below_ec->frame); ELOGF("TZPOL", - "ACTIVATE_BELOW|win:0x%08x(res_id:%d)|below_win:0x%08x(res_id:%d)", + "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); intercepted = e_policy_interceptor_call(E_POLICY_INTERCEPT_ACTIVATE_BELOW, @@ -1546,7 +1546,7 @@ _tzpol_iface_cb_activate_above_by_res_id(struct wl_client *client EINA_UNUSED, s EINA_SAFETY_ON_NULL_RETURN(above_ec->frame); ELOGF("TZPOL", - "ACTIVATE_ABOVE|win:0x%08x(res_id:%d)|above_win:0x%08x(res_id:%d)", + "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); intercepted = e_policy_interceptor_call(E_POLICY_INTERCEPT_ACTIVATE_ABOVE, @@ -1777,11 +1777,11 @@ _tzpol_iface_cb_type_set(struct wl_client *client EINA_UNUSED, struct wl_resourc } ELOGF("TZPOL", - "TYPE_SET |win:0x%08x|s:0x%08x|res_tzpol:0x%08x|tizen_win_type:%d, e_win_type:%d", + "TYPE_SET |win:0x%08zx|s:%8p|res_tzpol:%8p|tizen_win_type:%d, e_win_type:%d", ec->pixmap, ec, - (unsigned int)e_client_util_win_get(ec), - (unsigned int)surf, - (unsigned int)res_tzpol, + e_client_util_win_get(ec), + surf, + res_tzpol, type, win_type); ec->netwm.type = win_type; @@ -1971,8 +1971,8 @@ _tzpol_iface_cb_transient_for_set(struct wl_client *client EINA_UNUSED, struct w struct wl_resource *parent_surf; ELOGF("TZPOL", - "TF_SET |res_tzpol:0x%08x|parent:%d|child:%d", - NULL, NULL, (unsigned int)res_tzpol, parent_id, child_id); + "TF_SET |res_tzpol:%8p|parent:%d|child:%d", + NULL, NULL, res_tzpol, parent_id, child_id); ec = e_pixmap_find_client_by_res_id(child_id); EINA_SAFETY_ON_NULL_RETURN(ec); @@ -1986,16 +1986,16 @@ _tzpol_iface_cb_transient_for_set(struct wl_client *client EINA_UNUSED, struct w _e_policy_wl_parent_surf_set(ec, parent_surf); ELOGF("TZPOL", - " |win:0x%08x|parent|s:0x%08x", + " |win:0x%08zx|parent|s:%8p", pc->pixmap, pc, - (unsigned int)e_client_util_win_get(pc), - (unsigned int)parent_surf); + e_client_util_win_get(pc), + parent_surf); ELOGF("TZPOL", - " |win:0x%08x|child |s:0x%08x", + " |win:0x%08zx|child |s:%8p", ec->pixmap, ec, - (unsigned int)e_client_util_win_get(ec), - (unsigned int)(ec->comp_data ? ec->comp_data->surface : NULL)); + e_client_util_win_get(ec), + (ec->comp_data ? ec->comp_data->surface : NULL)); tizen_policy_send_transient_for_done(res_tzpol, child_id); @@ -2008,8 +2008,8 @@ _tzpol_iface_cb_transient_for_unset(struct wl_client *client EINA_UNUSED, struct E_Client *ec; ELOGF("TZPOL", - "TF_UNSET |res_tzpol:0x%08x|child:%d", - NULL, NULL, (unsigned int)res_tzpol, child_id); + "TF_UNSET |res_tzpol:%8p|child:%d", + NULL, NULL, res_tzpol, child_id); ec = e_pixmap_find_client_by_res_id(child_id); EINA_SAFETY_ON_NULL_RETURN(ec); @@ -2267,9 +2267,9 @@ _e_policy_wl_allowed_aux_hint_send(E_Client *ec, int id) psurf->surf, id); ELOGF("TZPOL", - "SEND |res_tzpol:0x%08x|allowed hint->id:%d", + "SEND |res_tzpol:%8p|allowed hint->id:%d", ec->pixmap, ec, - (unsigned int)tzpol->res_tzpol, + tzpol->res_tzpol, id); } eina_iterator_free(it); @@ -2476,7 +2476,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:0x%08x|id:%d, name:%s, val:%s, res:%d", ec->pixmap, ec, (unsigned int)res_tzpol, id, name, value, res); + ELOGF("TZPOL", "HINT_ADD |res_tzpol:%8p|id:%d, name:%s, val:%s, res:%d", ec->pixmap, ec, res_tzpol, id, name, value, res); if (res) { @@ -2497,7 +2497,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:0x%08x|id:%d, val:%s, result:%d", ec->pixmap, ec, (unsigned int)res_tzpol, id, value, res); + ELOGF("TZPOL", "HINT_CHD |res_tzpol:%8p|id:%d, val:%s, result:%d", ec->pixmap, ec, res_tzpol, id, value, res); if (res) { @@ -2517,7 +2517,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:0x%08x|id:%d, result:%d", ec->pixmap, ec, (unsigned int)res_tzpol, id, res); + ELOGF("TZPOL", "HINT_DEL |res_tzpol:%8p|id:%d, result:%d", ec->pixmap, ec, res_tzpol, id, res); if (res) { @@ -2555,9 +2555,9 @@ _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:0x%08x|supported_hints size:%d", + "SEND |res_tzpol:%8p|supported_hints size:%d", ec->pixmap, ec, - (unsigned int)res_tzpol, + res_tzpol, eina_list_count(hints_list)); wl_array_release(&hints); } @@ -3087,20 +3087,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%08x)'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->pixmap, 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%08x) 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->pixmap, 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%08x) is obscured", ec->pixmap, ec, e_client_util_win_get(ec)); + ELOGF("TZ_DPY_POL", "Restore system brightness. Win(0x%08zx) is obscured", ec->pixmap, ec, e_client_util_win_get(ec)); ret = _e_policy_restore_system_brightness(); if (!ret) return EINA_FALSE; } @@ -3139,7 +3139,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%08x)'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->pixmap, ec, e_client_util_win_get(ec), brightness); dpy_surf->set = EINA_TRUE; dpy_surf->brightness = brightness; @@ -3207,8 +3207,8 @@ _tzpol_iface_cb_parent_set(struct wl_client *client, struct wl_resource *res_tzp struct wl_resource *parent_surf; ELOGF("TZPOL", - "PARENT_SET |res_tzpol:0x%08x|parent:0x%08x|child:0x%08x", - NULL, NULL, (unsigned int)res_tzpol, (unsigned int)parent, (unsigned int)child); + "PARENT_SET |res_tzpol:%8p|parent:%8p|child:%8p", + NULL, NULL, res_tzpol, parent, child); ec = wl_resource_get_user_data(child); EINA_SAFETY_ON_NULL_RETURN(ec); @@ -3226,16 +3226,16 @@ _tzpol_iface_cb_parent_set(struct wl_client *client, struct wl_resource *res_tzp _e_policy_wl_parent_surf_set(ec, parent_surf); ELOGF("TZPOL", - " |win:0x%08x|parent|s:0x%08x", + " |win:0x%08zx|parent|s:%8p", pc->pixmap, pc, - (unsigned int)e_client_util_win_get(pc), - (unsigned int)parent_surf); + e_client_util_win_get(pc), + parent_surf); ELOGF("TZPOL", - " |win:0x%08x|child |s:0x%08x", + " |win:0x%08zx|child |s:%8p", ec->pixmap, ec, - (unsigned int)e_client_util_win_get(ec), - (unsigned int)(ec->comp_data ? ec->comp_data->surface : NULL)); + e_client_util_win_get(ec), + (ec->comp_data ? ec->comp_data->surface : NULL)); } EC_CHANGED(ec); @@ -4317,7 +4317,7 @@ e_tzsh_indicator_srv_ower_win_update(E_Zone *zone) if (ec != ec_cur_owner) { - ELOGF("TZ_IND", "Changed OWNER. win:%x, 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, 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); @@ -4373,11 +4373,11 @@ e_tzsh_qp_state_visible_update(E_Client *ec, Eina_Bool vis) if (tzsh_client->tzsh->ec != ec) { ELOGF("TZSH", - "CRI ERR!!|tzsh_cp:0x%08x|tzsh_ec:0x%08x|tzsh:0x%08x", + "CRI ERR!!|tzsh_cp:%8p|tzsh_ec:%8p|tzsh:%8p", ec->pixmap, ec, - (unsigned int)tzsh_client->tzsh->cp, - (unsigned int)tzsh_client->tzsh->ec, - (unsigned int)tzsh_client->tzsh); + tzsh_client->tzsh->cp, + tzsh_client->tzsh->ec, + tzsh_client->tzsh); continue; } @@ -4409,11 +4409,11 @@ e_tzsh_qp_state_scrollable_update(E_Client *ec, Eina_Bool scrollable) if (tzsh_client->tzsh->ec != ec) { ELOGF("TZSH", - "CRI ERR!!|tzsh_cp:0x%08x|tzsh_ec:0x%08x|tzsh:0x%08x", + "CRI ERR!!|tzsh_cp:%8p|tzsh_ec:%8p|tzsh:%8p", ec->pixmap, ec, - (unsigned int)tzsh_client->tzsh->cp, - (unsigned int)tzsh_client->tzsh->ec, - (unsigned int)tzsh_client->tzsh); + tzsh_client->tzsh->cp, + tzsh_client->tzsh->ec, + tzsh_client->tzsh); continue; } @@ -4445,11 +4445,11 @@ e_tzsh_qp_state_orientation_update(E_Client *ec, int ridx) if (tzsh_client->tzsh->ec != ec) { ELOGF("TZSH", - "CRI ERR!!|tzsh_cp:0x%08x|tzsh_ec:0x%08x|tzsh:0x%08x", + "CRI ERR!!|tzsh_cp:%8p|tzsh_ec:%8p|tzsh:%8p", ec->pixmap, ec, - (unsigned int)tzsh_client->tzsh->cp, - (unsigned int)tzsh_client->tzsh->ec, - (unsigned int)tzsh_client->tzsh); + tzsh_client->tzsh->cp, + tzsh_client->tzsh->ec, + tzsh_client->tzsh); continue; } @@ -6734,9 +6734,9 @@ e_policy_wl_aux_message_send(E_Client *ec, psurf->surf, key, val, &opt_array); ELOGF("TZPOL", - "SEND |res_tzpol:0x%08x|aux message key:%s val:%s opt_count:%d", + "SEND |res_tzpol:%8p|aux message key:%s val:%s opt_count:%d", ec->pixmap, ec, - (unsigned int)tzpol->res_tzpol, + tzpol->res_tzpol, key, val, eina_list_count(options)); } eina_iterator_free(it); diff --git a/src/bin/e_slot.c b/src/bin/e_slot.c index 40c3745..2ad3baf 100644 --- a/src/bin/e_slot.c +++ b/src/bin/e_slot.c @@ -210,7 +210,7 @@ e_slot_layout_cb(void) EINTERN void e_slot_init(void) { - ELOGF("SLOT", "e_slot_init", 0, 0); + ELOGF("SLOT", "e_slot_init", NULL, 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", 0, 0); + ELOGF("SLOT", "e_slot_shutdown", NULL, 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 ", 0, 0, sd->id); + ELOGF("SLOT", "|Create new slot - id:%d ", NULL, 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 ", 0, 0, sd->id); + ELOGF("SLOT", "|Remove slot - id:%d ", NULL, 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)", 0, 0, + ELOGF("SLOT", "|Move slot - id:%d (%d, %d) -> (%d, %d)", NULL, 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)", 0, 0, + ELOGF("SLOT", "|Resize slot - id:%d (%dx%d) -> (%dx%d)", NULL, NULL, sd->id, sd->w, sd->h, w, h); evas_object_resize(obj, w, h); diff --git a/src/bin/services/e_service_quickpanel.c b/src/bin/services/e_service_quickpanel.c index 91c1b63..06af424 100644 --- a/src/bin/services/e_service_quickpanel.c +++ b/src/bin/services/e_service_quickpanel.c @@ -1602,7 +1602,7 @@ _quickpanel_cb_client_focus_in(void *data, int type, void *event) if (ec->visible) { - DBG("Focus changed to '%s'(%x), Hide QP", + DBG("Focus changed to '%s'(%zx), Hide QP", ec->icccm.name ? ec->icccm.name : "", e_client_util_win_get(ec)); e_service_quickpanel_hide(qp->ec); } diff --git a/src/bin/services/e_service_softkey.c b/src/bin/services/e_service_softkey.c index 861d54c..198dc2e 100644 --- a/src/bin/services/e_service_softkey.c +++ b/src/bin/services/e_service_softkey.c @@ -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:%x (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... win:%zx (ec:%p), zone:%p (id:%d)", NULL, NULL, e_client_util_win_get(ec), ec, zone, zone->id); softkey = E_NEW(E_Service_Softkey, 1); EINA_SAFETY_ON_NULL_RETURN_VAL(softkey, NULL); @@ -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(%x), ec(%p)", NULL, NULL, wl_res, softkey, e_client_util_win_get(softkey->ec), softkey->ec); + 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); softkey->wl_res = wl_res; return EINA_TRUE; -- 2.7.4