diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c index 02a99fb9b..b876f98f3 100644 --- a/src/bin/e_focus.c +++ b/src/bin/e_focus.c @@ -41,47 +41,9 @@ static int _e_focus_cb_window_focus_in(void *data, int ev_type, void *ev) { Ecore_X_Event_Window_Focus_In *e; - const char *modes[] = { - "ECORE_X_EVENT_MODE_NORMAL", - "ECORE_X_EVENT_MODE_WHILE_GRABBED", - "ECORE_X_EVENT_MODE_GRAB", - "ECORE_X_EVENT_MODE_UNGRAB" - }; - const char *details[] = { - "ECORE_X_EVENT_DETAIL_ANCESTOR", - "ECORE_X_EVENT_DETAIL_VIRTUAL", - "ECORE_X_EVENT_DETAIL_INFERIOR", - "ECORE_X_EVENT_DETAIL_NON_LINEAR", - "ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL", - "ECORE_X_EVENT_DETAIL_POINTER", - "ECORE_X_EVENT_DETAIL_POINTER_ROOT", - "ECORE_X_EVENT_DETAIL_DETAIL_NONE" - }; - - e = ev; -#if 0 - if (e_border_find_by_client_window(e->win)) - { - printf("BI 0x%x md=%s dt=%s\n", - e->win, - modes[e->mode], - details[e->detail]); - } - else - { - printf("FI 0x%x md=%s dt=%s\n", - e->win, - modes[e->mode], - details[e->detail]); - } -#endif - return 1; -} -static int -_e_focus_cb_window_focus_out(void *data, int ev_type, void *ev) -{ - Ecore_X_Event_Window_Focus_Out *e; + e = ev; +#if 0 const char *modes[] = { "ECORE_X_EVENT_MODE_NORMAL", "ECORE_X_EVENT_MODE_WHILE_GRABBED", @@ -98,19 +60,59 @@ _e_focus_cb_window_focus_out(void *data, int ev_type, void *ev) "ECORE_X_EVENT_DETAIL_POINTER_ROOT", "ECORE_X_EVENT_DETAIL_DETAIL_NONE" }; - - e = ev; -#if 0 + if (e_border_find_by_client_window(e->win)) { - printf("BO 0x%x md=%s dt=%s\n", + printf("BI 0x%x md=%s dt=%s\n", e->win, modes[e->mode], details[e->detail]); } else { - printf("FO 0x%x md=%s dt=%s\n", + printf("FI 0x%x md=%s dt=%s\n", + e->win, + modes[e->mode], + details[e->detail]); + } +#endif + return 1; +} + +static int +_e_focus_cb_window_focus_out(void *data, int ev_type, void *ev) +{ + Ecore_X_Event_Window_Focus_Out *e; + + e = ev; +#if 0 + const char *modes[] = { + "ECORE_X_EVENT_MODE_NORMAL", + "ECORE_X_EVENT_MODE_WHILE_GRABBED", + "ECORE_X_EVENT_MODE_GRAB", + "ECORE_X_EVENT_MODE_UNGRAB" + }; + const char *details[] = { + "ECORE_X_EVENT_DETAIL_ANCESTOR", + "ECORE_X_EVENT_DETAIL_VIRTUAL", + "ECORE_X_EVENT_DETAIL_INFERIOR", + "ECORE_X_EVENT_DETAIL_NON_LINEAR", + "ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL", + "ECORE_X_EVENT_DETAIL_POINTER", + "ECORE_X_EVENT_DETAIL_POINTER_ROOT", + "ECORE_X_EVENT_DETAIL_DETAIL_NONE" + }; + + if (e_border_find_by_client_window(e->win)) + { + printf("BO 0x%x md=%s dt=%s\n", + e->win, + modes[e->mode], + details[e->detail]); + } + else + { + printf("FO 0x%x md=%s dt=%s\n", e->win, modes[e->mode], details[e->detail]); diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c index cc99c2016..982e38fb3 100644 --- a/src/bin/e_ipc.c +++ b/src/bin/e_ipc.c @@ -634,7 +634,7 @@ _e_ipc_path_str_get(char **paths, int *bytes) static char * _e_ipc_str_list_get(Evas_List *strs, int *bytes) { - char *data = NULL, **cur; + char *data = NULL; int pos = 0; Evas_List *l; diff --git a/src/bin/e_remote_main.c b/src/bin/e_remote_main.c index 192c0747b..0561358ac 100644 --- a/src/bin/e_remote_main.c +++ b/src/bin/e_remote_main.c @@ -564,7 +564,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event) case E_IPC_OP_BG_GET_REPLY: if (e->data) { - printf("REPLY: %s\n", e->data); + printf("REPLY: %s\n", (char *)e->data); } break; case E_IPC_OP_BG_DIRS_LIST_REPLY: @@ -660,7 +660,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event) Evas_List *l; for (l = langs; l; l = l->next) - printf("REPLY: LANG=\"%s\"\n", l->data); + printf("REPLY: LANG=\"%s\"\n", (char *)l->data); evas_list_free(langs); } } @@ -670,7 +670,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event) case E_IPC_OP_LANG_GET_REPLY: if (e->data) { - printf("REPLY: %s\n", e->data); + printf("REPLY: %s\n", (char *)e->data); } break; case E_IPC_OP_BINDING_MOUSE_LIST_REPLY: