From: Gwanglim Lee Date: Fri, 3 Jul 2015 08:50:44 +0000 (+0900) Subject: Fix coding conventions and style. X-Git-Tag: submit/tizen/20150703.125223~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=923516fb5068cbdbb01a05e9353c12c202b029c5;p=platform%2Fupstream%2Fenlightenment.git Fix coding conventions and style. Change name of request to dump from shot. Change-Id: I55a52ead7d983ce9223fa7835bea6d3dbde4cc72 --- diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c index 5443814..8e8ad07 100644 --- a/src/bin/e_info_client.c +++ b/src/bin/e_info_client.c @@ -7,13 +7,13 @@ typedef void (*E_Info_Message_Cb)(const Eldbus_Message *msg); typedef struct _E_Info_Client { /* eldbus */ - int eldbus_init; - Eldbus_Proxy *proxy; + int eldbus_init; + Eldbus_Proxy *proxy; Eldbus_Connection *conn; - Eldbus_Object *obj; + Eldbus_Object *obj; /* topvwins */ - Eina_List *win_list; + Eina_List *win_list; } E_Info_Client; typedef struct _E_Win_Info @@ -28,20 +28,11 @@ typedef struct _E_Win_Info static E_Info_Client e_info_client; -static Eina_Bool -_e_info_client_eldbus_message(const char *method, E_Info_Message_Cb cb); -static Eina_Bool -_e_info_client_eldbus_message_with_args(const char *method, E_Info_Message_Cb cb, - const char *signature, ...); +static Eina_Bool _e_info_client_eldbus_message(const char *method, E_Info_Message_Cb cb); +static Eina_Bool _e_info_client_eldbus_message_with_args(const char *method, E_Info_Message_Cb cb, const char *signature, ...); static E_Win_Info * -_e_win_info_new(Ecore_Window id, - Eina_Bool alpha, - const char *name, - int x, int y, - int w, int h, - int layer, - int visible) +_e_win_info_new(Ecore_Window id, Eina_Bool alpha, const char *name, int x, int y, int w, int h, int layer, int visible) { E_Win_Info *win = NULL; @@ -73,7 +64,7 @@ _e_win_info_free(E_Win_Info *win) } static void -_get_window_info_cb(const Eldbus_Message *msg) +_cb_window_info_get(const Eldbus_Message *msg) { const char *name = NULL, *text = NULL; Eldbus_Message_Iter *array, *ec; @@ -121,13 +112,13 @@ finish: } static void -_e_info_client_proc_topvwins(int argc, char **argv) +_e_info_client_proc_topvwins_info(int argc, char **argv) { E_Win_Info *win; Eina_List *l; int i = 0; - if (!_e_info_client_eldbus_message("get_window_info", _get_window_info_cb)) + if (!_e_info_client_eldbus_message("get_window_info", _cb_window_info_get)) return; printf("%d Top level windows\n", eina_list_count(e_info_client.win_list)); @@ -152,7 +143,7 @@ _e_info_client_proc_topvwins(int argc, char **argv) E_FREE_LIST(e_info_client.win_list, _e_win_info_free); } -static char* +static char * _directory_make(char *path) { char dir[PATH_MAX], curdir[PATH_MAX], stamp[PATH_MAX]; @@ -233,12 +224,12 @@ _directory_make(char *path) } static void -_e_info_client_proc_shot_topvwins(int argc, char **argv) +_e_info_client_proc_topvwins_shot(int argc, char **argv) { char *directory = _directory_make(argv[2]); EINA_SAFETY_ON_NULL_RETURN(directory); - if (!_e_info_client_eldbus_message_with_args("shot_topvwins", NULL, "s", directory)) + if (!_e_info_client_eldbus_message_with_args("dump_topvwins", NULL, "s", directory)) { free(directory); return; @@ -258,24 +249,21 @@ static struct { "topvwins", NULL, "Print top visible windows", - _e_info_client_proc_topvwins + _e_info_client_proc_topvwins_info }, { - "shot_topvwins", "[directory_path]", - "Dump topvwins (default directory_path : current working directory)", - _e_info_client_proc_shot_topvwins + "dump_topvwins", "[directory_path]", + "Dump top-level visible windows (default directory_path : current working directory)", + _e_info_client_proc_topvwins_shot }, }; static void -_e_info_client_eldbus_message_cb(void *data, - const Eldbus_Message *msg, - Eldbus_Pending *p EINA_UNUSED) +_e_info_client_eldbus_message_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p EINA_UNUSED) { E_Info_Message_Cb cb = (E_Info_Message_Cb)data; - if (cb) - cb(msg); + if (cb) cb(msg); ecore_main_loop_quit(); } @@ -295,8 +283,7 @@ _e_info_client_eldbus_message(const char *method, E_Info_Message_Cb cb) } static Eina_Bool -_e_info_client_eldbus_message_with_args(const char *method, E_Info_Message_Cb cb, - const char *signature, ...) +_e_info_client_eldbus_message_with_args(const char *method, E_Info_Message_Cb cb, const char *signature, ...) { Eldbus_Pending *p; va_list ap; @@ -320,16 +307,19 @@ _e_info_client_eldbus_disconnect(void) eldbus_proxy_unref(e_info_client.proxy); e_info_client.proxy = NULL; } + if (e_info_client.obj) { eldbus_object_unref(e_info_client.obj); e_info_client.obj = NULL; } + if (e_info_client.conn) { eldbus_connection_unref(e_info_client.conn); e_info_client.conn = NULL; } + if (e_info_client.eldbus_init) { eldbus_shutdown(); @@ -387,17 +377,19 @@ _e_info_client_print_usage(const char *exec) int nproc = sizeof(procs) / sizeof(procs[0]); int i; - printf("\n"); - printf("Usage:\n"); + printf("\nUsage:\n"); + for (i = 0; i < nproc; i++) printf(" %s -%s %s\n", exec, procs[i].option, (procs[i].params)?procs[i].params:""); - printf("\n"); - printf("Option:\n"); + + printf("\nOptions:\n"); + for (i = 0; i < nproc; i++) { printf(" -%s\n", procs[i].option); printf(" %s\n", (procs[i].description)?procs[i].description:""); } + printf("\n"); } @@ -417,7 +409,9 @@ main(int argc, char **argv) if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "-help") || !strcmp(argv[1], "--help")) - _e_info_client_print_usage(argv[0]); + { + _e_info_client_print_usage(argv[0]); + } else { /* handling a client request */ @@ -430,6 +424,7 @@ main(int argc, char **argv) /* disconnecting dbus */ _e_info_client_eldbus_disconnect(); + return 0; err: diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c index 605f295..4a6bdfa 100644 --- a/src/bin/e_info_server.c +++ b/src/bin/e_info_server.c @@ -14,7 +14,9 @@ typedef struct _E_Info_Server static E_Info_Server e_info_server; struct wl_drm; -struct wl_drm_buffer { + +struct wl_drm_buffer +{ struct wl_resource *resource; struct wl_drm *drm; int32_t width, height; @@ -26,7 +28,7 @@ struct wl_drm_buffer { }; static void -_message_append_clients(Eldbus_Message_Iter *iter) +_msg_clients_append(Eldbus_Message_Iter *iter) { Eldbus_Message_Iter *array_of_ec; E_Client *ec; @@ -47,12 +49,14 @@ _message_append_clients(Eldbus_Message_Iter *iter) win = e_client_util_win_get(ec); eldbus_message_iter_arguments_append(array_of_ec, "(usiiiiibb)", &struct_of_ec); + eldbus_message_iter_arguments_append (struct_of_ec, "usiiiiibb", win, e_client_util_name_get(ec) ?: "NO NAME", ec->x, ec->y, ec->w, ec->h, ec->layer, ec->visible, ec->argb); + eldbus_message_iter_container_close(array_of_ec, struct_of_ec); } @@ -61,19 +65,17 @@ _message_append_clients(Eldbus_Message_Iter *iter) /* Method Handlers */ static Eldbus_Message * -_e_info_server_cb_get_window_info(const Eldbus_Service_Interface *iface EINA_UNUSED, - const Eldbus_Message *msg) +_e_info_server_cb_window_info_get(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *reply = eldbus_message_method_return_new(msg); - _message_append_clients(eldbus_message_iter_get(reply)); + _msg_clients_append(eldbus_message_iter_get(reply)); return reply; } static Eldbus_Message * -_e_info_server_cb_shot_topvwins(const Eldbus_Service_Interface *iface EINA_UNUSED, - const Eldbus_Message *msg) +_e_info_server_cb_topvwins_dump(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *reply = eldbus_message_method_return_new(msg); const char *dir; @@ -135,6 +137,7 @@ _e_info_server_cb_shot_topvwins(const Eldbus_Service_Interface *iface EINA_UNUSE evas_object_image_alpha_set(img, ec->argb); evas_object_image_size_set(img, w, h); evas_object_image_data_set(img, data); + if (!evas_object_image_save(img, fname, NULL, "compress=1 quality=100")) ERR("Cannot save window to '%s'", fname); @@ -147,24 +150,16 @@ err: } #endif - if (img) - evas_object_del(img); - if (ee) - ecore_evas_free(ee); + if (img) evas_object_del(img); + if (ee) ecore_evas_free(ee); } return reply; } static const Eldbus_Method methods[] = { - { - "get_window_info", NULL, ELDBUS_ARGS({"a(usiiiiibb)", "array of ec"}), - _e_info_server_cb_get_window_info, 0 - }, - { - "shot_topvwins", ELDBUS_ARGS({"s", "directory"}), NULL, - _e_info_server_cb_shot_topvwins, ELDBUS_METHOD_FLAG_NOREPLY - }, + { "get_window_info", NULL, ELDBUS_ARGS({"a(usiiiiibb)", "array of ec"}), _e_info_server_cb_window_info_get, 0 }, + { "dump_topvwins", ELDBUS_ARGS({"s", "directory"}), NULL, _e_info_server_cb_topvwins_dump, ELDBUS_METHOD_FLAG_NOREPLY }, { NULL, NULL, NULL, NULL, 0 } }; @@ -186,6 +181,7 @@ e_info_server_init(void) EINA_SAFETY_ON_NULL_GOTO(e_info_server.iface, err); return 1; + err: e_info_server_shutdown(); return 0; @@ -199,6 +195,7 @@ e_info_server_shutdown(void) eldbus_service_interface_unregister(e_info_server.iface); e_info_server.iface = NULL; } + if (e_info_server.conn) { eldbus_connection_unref(e_info_server.conn);