Enlightenment CVS committal Author : devilhorns Project : e_modules Module : wlan
Dir : e_modules/wlan Modified Files: e_mod_config.c e_mod_main.c Log Message: Indent =================================================================== RCS file: /cvs/e/e_modules/wlan/e_mod_config.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_config.c 17 Jul 2006 23:34:09 -0000 1.11 +++ e_mod_config.c 18 Jul 2006 00:03:04 -0000 1.12 @@ -5,203 +5,211 @@ struct _E_Config_Dialog_Data { - char *device; - int check_interval; - int show_text; - int show_graph; + char *device; + int check_interval; + int show_text; + int show_graph; - Ecore_List *devs; - int dev_num; + Ecore_List *devs; + int dev_num; }; /* Protos */ -static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _fill_data(Wlan_Face *nf, E_Config_Dialog_Data *cfdata); -static void _wlan_config_get_devices(Ecore_List *devs); +static void *_create_data (E_Config_Dialog * cfd); +static void _free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata); +static Evas_Object *_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas, + E_Config_Dialog_Data * cfdata); +static int _basic_apply_data (E_Config_Dialog * cfd, + E_Config_Dialog_Data * cfdata); +static void _fill_data (Wlan_Face * nf, E_Config_Dialog_Data * cfdata); +static void _wlan_config_get_devices (Ecore_List * devs); /* Config Calls */ void -_configure_wlan_module(Wlan_Face *nf) +_configure_wlan_module (Wlan_Face * nf) { - E_Config_Dialog *cfd; - E_Config_Dialog_View *v; - char buf[4096]; - - v = E_NEW(E_Config_Dialog_View, 1); - - v->create_cfdata = _create_data; - v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply_data; - v->basic.create_widgets = _basic_create_widgets; - - snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(nf->wlan->module)); - cfd = e_config_dialog_new(nf->con, D_("Wlan Configuration"), buf, 0, v, nf); - nf->wlan->cfd = cfd; + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + char buf[4096]; + + v = E_NEW (E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + + snprintf (buf, sizeof (buf), "%s/module.eap", + e_module_dir_get (nf->wlan->module)); + cfd = + e_config_dialog_new (nf->con, D_ ("Wlan Configuration"), buf, 0, v, nf); + nf->wlan->cfd = cfd; } static void -_fill_data(Wlan_Face *nf, E_Config_Dialog_Data *cfdata) +_fill_data (Wlan_Face * nf, E_Config_Dialog_Data * cfdata) { - char *tmp; - int i; + char *tmp; + int i; - cfdata->check_interval = nf->conf->check_interval; - cfdata->show_text = nf->conf->show_text; - cfdata->show_graph = nf->conf->show_graph; - - if (nf->conf->device != NULL) - cfdata->device = strdup(nf->conf->device); - else - cfdata->device = NULL; - - if (!cfdata->device) - return; - - cfdata->devs = ecore_list_new(); - _wlan_config_get_devices(cfdata->devs); - - if (!cfdata->devs) - return; - - i = 0; - ecore_list_goto_first(cfdata->devs); - while ((tmp = ecore_list_next(cfdata->devs)) != NULL) - { - if (!strcmp(cfdata->device, tmp)) - { - cfdata->dev_num = i; - break; - } - i++; - } + cfdata->check_interval = nf->conf->check_interval; + cfdata->show_text = nf->conf->show_text; + cfdata->show_graph = nf->conf->show_graph; + + if (nf->conf->device != NULL) + cfdata->device = strdup (nf->conf->device); + else + cfdata->device = NULL; + + if (!cfdata->device) + return; + + cfdata->devs = ecore_list_new (); + _wlan_config_get_devices (cfdata->devs); + + if (!cfdata->devs) + return; + + i = 0; + ecore_list_goto_first (cfdata->devs); + while ((tmp = ecore_list_next (cfdata->devs)) != NULL) + { + if (!strcmp (cfdata->device, tmp)) + { + cfdata->dev_num = i; + break; + } + i++; + } } static void * -_create_data(E_Config_Dialog *cfd) +_create_data (E_Config_Dialog * cfd) { - E_Config_Dialog_Data *cfdata; - Wlan_Face *nf; + E_Config_Dialog_Data *cfdata; + Wlan_Face *nf; - nf = cfd->data; - cfdata = E_NEW(E_Config_Dialog_Data, 1); + nf = cfd->data; + cfdata = E_NEW (E_Config_Dialog_Data, 1); - _fill_data(nf, cfdata); - return cfdata; + _fill_data (nf, cfdata); + return cfdata; } static void -_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) { - Wlan_Face *nf; + Wlan_Face *nf; - nf = cfd->data; - nf->wlan->cfd = NULL; - E_FREE(cfdata->device); - if (cfdata->devs) - ecore_list_destroy(cfdata->devs); - free(cfdata); - cfdata = NULL; + nf = cfd->data; + nf->wlan->cfd = NULL; + E_FREE (cfdata->device); + if (cfdata->devs) + ecore_list_destroy (cfdata->devs); + free (cfdata); + cfdata = NULL; } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas, + E_Config_Dialog_Data * cfdata) { - Evas_Object *o, *of, *ob, *ot; - E_Radio_Group *rg; - char *tmp; - int i; - - o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, D_("General Settings"), 0); - ob = e_widget_check_add(evas, D_("Show Text"), (&(cfdata->show_text))); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, D_("Show Graph"), (&(cfdata->show_graph))); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - of = e_widget_framelist_add(evas, D_("Device Settings"), 0); - ot = e_widget_table_add(evas, 0); - rg = e_widget_radio_group_new(&(cfdata->dev_num)); - i = 0; - ecore_list_goto_first(cfdata->devs); - while ((tmp = ecore_list_next(cfdata->devs)) != NULL) - { - ob = e_widget_radio_add(evas, tmp, i, rg); - e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0); - i++; - } - i++; - ob = e_widget_label_add(evas, D_("Check Interval:")); - e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 1, 0); - i++; - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1, 60, 1, 0, NULL, &(cfdata->check_interval), 150); - e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0); - e_widget_framelist_object_append(of, ot); - e_widget_list_object_append(o, of, 1, 1, 0.5); + Evas_Object *o, *of, *ob, *ot; + E_Radio_Group *rg; + char *tmp; + int i; + + o = e_widget_list_add (evas, 0, 0); + of = e_widget_framelist_add (evas, D_ ("General Settings"), 0); + ob = e_widget_check_add (evas, D_ ("Show Text"), (&(cfdata->show_text))); + e_widget_framelist_object_append (of, ob); + ob = e_widget_check_add (evas, D_ ("Show Graph"), (&(cfdata->show_graph))); + e_widget_framelist_object_append (of, ob); + e_widget_list_object_append (o, of, 1, 1, 0.5); + + of = e_widget_framelist_add (evas, D_ ("Device Settings"), 0); + ot = e_widget_table_add (evas, 0); + rg = e_widget_radio_group_new (&(cfdata->dev_num)); + i = 0; + ecore_list_goto_first (cfdata->devs); + while ((tmp = ecore_list_next (cfdata->devs)) != NULL) + { + ob = e_widget_radio_add (evas, tmp, i, rg); + e_widget_table_object_append (ot, ob, 0, i, 1, 1, 1, 0, 1, 0); + i++; + } + i++; + ob = e_widget_label_add (evas, D_ ("Check Interval:")); + e_widget_table_object_append (ot, ob, 0, i, 1, 1, 0, 0, 1, 0); + i++; + ob = + e_widget_slider_add (evas, 1, 0, _("%1.0f seconds"), 1, 60, 1, 0, NULL, + &(cfdata->check_interval), 150); + e_widget_table_object_append (ot, ob, 0, i, 1, 1, 1, 0, 1, 0); + e_widget_framelist_object_append (of, ot); + e_widget_list_object_append (o, of, 1, 1, 0.5); - return o; + return o; } static int -_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_basic_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) { - char *tmp; - Wlan_Face *nf; + char *tmp; + Wlan_Face *nf; - nf = cfd->data; - tmp = ecore_list_goto_index(cfdata->devs, cfdata->dev_num); - if (tmp != NULL) - { - if (strcmp(tmp, nf->conf->device)) - { - _wlan_face_graph_clear(nf); - nf->conf->device = (char *)evas_stringshare_add(strdup(tmp)); - } - } - - nf->conf->check_interval = cfdata->check_interval; - nf->conf->show_text = cfdata->show_text; - nf->conf->show_graph = cfdata->show_graph; + nf = cfd->data; + tmp = ecore_list_goto_index (cfdata->devs, cfdata->dev_num); + if (tmp != NULL) + { + if (strcmp (tmp, nf->conf->device)) + { + _wlan_face_graph_clear (nf); + nf->conf->device = (char *) evas_stringshare_add (strdup (tmp)); + } + } + + nf->conf->check_interval = cfdata->check_interval; + nf->conf->show_text = cfdata->show_text; + nf->conf->show_graph = cfdata->show_graph; - e_config_save_queue(); + e_config_save_queue (); - if (nf->monitor) - ecore_timer_interval_set(nf->monitor, (double)cfdata->check_interval); + if (nf->monitor) + ecore_timer_interval_set (nf->monitor, (double) cfdata->check_interval); - return 1; + return 1; } static void -_wlan_config_get_devices(Ecore_List *devs) +_wlan_config_get_devices (Ecore_List * devs) { - FILE *stat; - char iface[64]; - char buf[256]; - unsigned long dummy; - int wlan_status = 0; - int wlan_link = 0; - int wlan_level = 0; - int wlan_noise = 0; - - stat = fopen("/proc/net/wireless", "r"); - if (!stat) - return; - - while (fgets(buf, 256, stat)) - { - int i = 0; - - for (; buf[i] != 0; i++) - if (buf[i] == ':' || buf[i] == '.') - buf[i] = ' '; - - if (sscanf(buf, "%s %u %u %u %u %lu %lu %lu %lu %lu %lu", - iface, &wlan_status, &wlan_link, &wlan_level, &wlan_noise, &dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 11) - continue; - ecore_list_append(devs, strdup(iface)); - } - fclose(stat); + FILE *stat; + char iface[64]; + char buf[256]; + unsigned long dummy; + int wlan_status = 0; + int wlan_link = 0; + int wlan_level = 0; + int wlan_noise = 0; + + stat = fopen ("/proc/net/wireless", "r"); + if (!stat) + return; + + while (fgets (buf, 256, stat)) + { + int i = 0; + + for (; buf[i] != 0; i++) + if (buf[i] == ':' || buf[i] == '.') + buf[i] = ' '; + + if (sscanf (buf, "%s %u %u %u %u %lu %lu %lu %lu %lu %lu", + iface, &wlan_status, &wlan_link, &wlan_level, &wlan_noise, + &dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 11) + continue; + ecore_list_append (devs, strdup (iface)); + } + fclose (stat); } =================================================================== RCS file: /cvs/e/e_modules/wlan/e_mod_main.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_mod_main.c 17 Jul 2006 23:34:09 -0000 1.26 +++ e_mod_main.c 18 Jul 2006 00:03:04 -0000 1.27 @@ -3,587 +3,603 @@ #include "e_mod_config.h" #include "config.h" -static Wlan *_wlan_init(E_Module *m); -static void _wlan_shutdown(Wlan *n); -static void _wlan_config_menu_new(Wlan *n); - -static Wlan_Face *_wlan_face_init(Wlan *n, E_Container *con); -static void _wlan_face_menu_new(Wlan_Face *nf); -static void _wlan_face_enable(Wlan_Face *nf); -static void _wlan_face_disable(Wlan_Face *nf); -static void _wlan_face_free(Wlan_Face *nf); -static void _wlan_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); -static void _wlan_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); -static void _wlan_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi); -static void _wlan_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi); -static int _wlan_face_update_values(void *data); -static void _wlan_face_graph_values(Wlan_Face *wf, int val); +static Wlan *_wlan_init (E_Module * m); +static void _wlan_shutdown (Wlan * n); +static void _wlan_config_menu_new (Wlan * n); + +static Wlan_Face *_wlan_face_init (Wlan * n, E_Container * con); +static void _wlan_face_menu_new (Wlan_Face * nf); +static void _wlan_face_enable (Wlan_Face * nf); +static void _wlan_face_disable (Wlan_Face * nf); +static void _wlan_face_free (Wlan_Face * nf); +static void _wlan_face_cb_gmc_change (void *data, E_Gadman_Client * gmc, + E_Gadman_Change change); +static void _wlan_face_cb_mouse_down (void *data, Evas * evas, + Evas_Object * obj, void *event_info); +static void _wlan_face_cb_menu_edit (void *data, E_Menu * mn, + E_Menu_Item * mi); +static void _wlan_face_cb_menu_configure (void *data, E_Menu * mn, + E_Menu_Item * mi); +static int _wlan_face_update_values (void *data); +static void _wlan_face_graph_values (Wlan_Face * wf, int val); static int wlan_count; static E_Config_DD *conf_edd; static E_Config_DD *conf_face_edd; EAPI E_Module_Api e_modapi = { - E_MODULE_API_VERSION, - "Wlan" + E_MODULE_API_VERSION, + "Wlan" }; EAPI void * -e_modapi_init(E_Module *m) +e_modapi_init (E_Module * m) { - Wlan *n; + Wlan *n; - /* Set up module's message catalogue */ - bindtextdomain(PACKAGE, LOCALEDIR); - bind_textdomain_codeset(PACKAGE, "UTF-8"); + /* Set up module's message catalogue */ + bindtextdomain (PACKAGE, LOCALEDIR); + bind_textdomain_codeset (PACKAGE, "UTF-8"); - n = _wlan_init(m); - if (!n) - return NULL; + n = _wlan_init (m); + if (!n) + return NULL; - n->module = m; - return n; + n->module = m; + return n; } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown (E_Module * m) { - Wlan *n; + Wlan *n; - n = m->data; - if (!n) - return 0; - - if (n->cfd) - { - e_object_del(E_OBJECT(n->cfd)); - n->cfd = NULL; - } - _wlan_shutdown(n); - return 1; + n = m->data; + if (!n) + return 0; + + if (n->cfd) + { + e_object_del (E_OBJECT (n->cfd)); + n->cfd = NULL; + } + _wlan_shutdown (n); + return 1; } EAPI int -e_modapi_save(E_Module *m) +e_modapi_save (E_Module * m) { - Wlan *n; + Wlan *n; - n = m->data; - if (!n) - return 0; - e_config_domain_save("module.wlan", conf_edd, n->conf); - return 1; + n = m->data; + if (!n) + return 0; + e_config_domain_save ("module.wlan", conf_edd, n->conf); + return 1; } EAPI int -e_modapi_about(E_Module *m) +e_modapi_about (E_Module * m) { - e_module_dialog_show(m, D_("Enlightenment Wlan Monitor Module"), D_("This module is used to monitor a wlan device.")); - return 1; + e_module_dialog_show (m, D_ ("Enlightenment Wlan Monitor Module"), + D_ ("This module is used to monitor a wlan device.")); + return 1; } EAPI int -e_modapi_config(E_Module *m) +e_modapi_config (E_Module * m) { - Wlan *n; - Evas_List *l; - E_Container *con; - - n = m->data; - if (!n) - return 0; - if (!n->faces) - return 0; - - for (l = n->faces; l; l = l->next) - { - Wlan_Face *nf; - - nf = l->data; - if (!nf) - continue; - - con = e_container_current_get(e_manager_current_get()); - if (nf->con == con) - { - _configure_wlan_module(nf); - break; - } - } - return 1; + Wlan *n; + Evas_List *l; + E_Container *con; + + n = m->data; + if (!n) + return 0; + if (!n->faces) + return 0; + + for (l = n->faces; l; l = l->next) + { + Wlan_Face *nf; + + nf = l->data; + if (!nf) + continue; + + con = e_container_current_get (e_manager_current_get ()); + if (nf->con == con) + { + _configure_wlan_module (nf); + break; + } + } + return 1; } static Wlan * -_wlan_init(E_Module *m) +_wlan_init (E_Module * m) { - Wlan *n; - E_Menu_Item *mi; - Evas_List *mans, *l, *l2, *fl; + Wlan *n; + E_Menu_Item *mi; + Evas_List *mans, *l, *l2, *fl; - n = E_NEW(Wlan, 1); + n = E_NEW (Wlan, 1); - if (!n) - return NULL; + if (!n) + return NULL; - conf_face_edd = E_CONFIG_DD_NEW("Wlan_Config_Face", Config_Face); + conf_face_edd = E_CONFIG_DD_NEW ("Wlan_Config_Face", Config_Face); #undef T #undef D #define T Config_Face #define D conf_face_edd - E_CONFIG_VAL(D, T, enabled, UCHAR); - E_CONFIG_VAL(D, T, device, STR); - E_CONFIG_VAL(D, T, check_interval, INT); - E_CONFIG_VAL(D, T, show_text, INT); - E_CONFIG_VAL(D, T, show_graph, INT); + E_CONFIG_VAL (D, T, enabled, UCHAR); + E_CONFIG_VAL (D, T, device, STR); + E_CONFIG_VAL (D, T, check_interval, INT); + E_CONFIG_VAL (D, T, show_text, INT); + E_CONFIG_VAL (D, T, show_graph, INT); - conf_edd = E_CONFIG_DD_NEW("Wlan_Config", Config); + conf_edd = E_CONFIG_DD_NEW ("Wlan_Config", Config); #undef T #undef D #define T Config #define D conf_edd - E_CONFIG_LIST(D, T, faces, conf_face_edd); + E_CONFIG_LIST (D, T, faces, conf_face_edd); - n->conf = e_config_domain_load("module.wlan", conf_edd); - if (!n->conf) - n->conf = E_NEW(Config, 1); + n->conf = e_config_domain_load ("module.wlan", conf_edd); + if (!n->conf) + n->conf = E_NEW (Config, 1); - _wlan_config_menu_new(n); + _wlan_config_menu_new (n); - mans = e_manager_list(); - fl = n->conf->faces; - for (l = mans; l; l = l->next) - { - E_Manager *man; + mans = e_manager_list (); + fl = n->conf->faces; + for (l = mans; l; l = l->next) + { + E_Manager *man; - man = l->data; - for (l2 = man->containers; l2; l2 = l2->next) - { - E_Container *con; - Wlan_Face *nf; + man = l->data; + for (l2 = man->containers; l2; l2 = l2->next) + { + E_Container *con; + Wlan_Face *nf; - con = l2->data; - nf = _wlan_face_init(n, con); - if (nf) - { - if (!fl) - { - nf->conf = E_NEW(Config_Face, 1); + con = l2->data; + nf = _wlan_face_init (n, con); + if (nf) + { + if (!fl) + { + nf->conf = E_NEW (Config_Face, 1); - nf->conf->enabled = 1; //wlan0 - nf->conf->device = (char *)evas_stringshare_add("eth0"); - nf->conf->check_interval = 30; - nf->conf->show_text = 1; - nf->conf->show_graph = 1; - n->conf->faces = evas_list_append(n->conf->faces, nf->conf); - } - else - { - nf->conf = fl->data; - fl = fl->next; - } - E_CONFIG_LIMIT(nf->conf->check_interval, 0, 60); - E_CONFIG_LIMIT(nf->conf->show_text, 0, 1); - E_CONFIG_LIMIT(nf->conf->show_graph, 0, 1); + nf->conf->enabled = 1; //wlan0 + nf->conf->device = (char *) evas_stringshare_add ("eth0"); + nf->conf->check_interval = 30; + nf->conf->show_text = 1; + nf->conf->show_graph = 1; + n->conf->faces = + evas_list_append (n->conf->faces, nf->conf); + } + else + { + nf->conf = fl->data; + fl = fl->next; + } + E_CONFIG_LIMIT (nf->conf->check_interval, 0, 60); + E_CONFIG_LIMIT (nf->conf->show_text, 0, 1); + E_CONFIG_LIMIT (nf->conf->show_graph, 0, 1); - nf->monitor = ecore_timer_add((double)nf->conf->check_interval, _wlan_face_update_values, nf); + nf->monitor = + ecore_timer_add ((double) nf->conf->check_interval, + _wlan_face_update_values, nf); - _wlan_face_menu_new(nf); + _wlan_face_menu_new (nf); - mi = e_menu_item_new(n->config_menu); - e_menu_item_label_set(mi, _("Configuration")); - e_menu_item_callback_set(mi, _wlan_face_cb_menu_configure, nf); + mi = e_menu_item_new (n->config_menu); + e_menu_item_label_set (mi, _("Configuration")); + e_menu_item_callback_set (mi, _wlan_face_cb_menu_configure, nf); - mi = e_menu_item_new(n->config_menu); - e_menu_item_label_set(mi, con->name); - e_menu_item_submenu_set(mi, nf->menu); + mi = e_menu_item_new (n->config_menu); + e_menu_item_label_set (mi, con->name); + e_menu_item_submenu_set (mi, nf->menu); - if (!nf->conf->enabled) - _wlan_face_disable(nf); - } - } - } - return n; + if (!nf->conf->enabled) + _wlan_face_disable (nf); + } + } + } + return n; } static void -_wlan_shutdown(Wlan *n) +_wlan_shutdown (Wlan * n) { - E_CONFIG_DD_FREE(conf_edd); - E_CONFIG_DD_FREE(conf_face_edd); + E_CONFIG_DD_FREE (conf_edd); + E_CONFIG_DD_FREE (conf_face_edd); - while (n->faces) - _wlan_face_free(n->faces->data); + while (n->faces) + _wlan_face_free (n->faces->data); - e_object_del(E_OBJECT(n->config_menu)); - evas_list_free(n->conf->faces); + e_object_del (E_OBJECT (n->config_menu)); + evas_list_free (n->conf->faces); - n->module = NULL; - E_FREE(n->conf); - E_FREE(n); + n->module = NULL; + E_FREE (n->conf); + E_FREE (n); } static void -_wlan_config_menu_new(Wlan *n) +_wlan_config_menu_new (Wlan * n) { - E_Menu *mn; + E_Menu *mn; - mn = e_menu_new(); - n->config_menu = mn; + mn = e_menu_new (); + n->config_menu = mn; } static Wlan_Face * -_wlan_face_init(Wlan *n, E_Container *con) +_wlan_face_init (Wlan * n, E_Container * con) { - Wlan_Face *nf; - Evas_Object *o; - char buf[4096]; + Wlan_Face *nf; + Evas_Object *o; + char buf[4096]; - nf = E_NEW(Wlan_Face, 1); + nf = E_NEW (Wlan_Face, 1); - if (!nf) - return NULL; - nf->wlan = n; - n->faces = evas_list_append(n->faces, nf); + if (!nf) + return NULL; + nf->wlan = n; + n->faces = evas_list_append (n->faces, nf); - nf->con = con; - e_object_ref(E_OBJECT(con)); - nf->evas = con->bg_evas; + nf->con = con; + e_object_ref (E_OBJECT (con)); + nf->evas = con->bg_evas; - evas_event_freeze(nf->evas); + evas_event_freeze (nf->evas); - o = edje_object_add(nf->evas); - nf->wlan_obj = o; + o = edje_object_add (nf->evas); + nf->wlan_obj = o; - if (!e_theme_edje_object_set(o, "base/theme/modules/wlan", "modules/wlan/main")) - { - snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/wlan.edj"); - edje_object_file_set(o, buf, "modules/wlan/main"); - } - evas_object_layer_set(o, 1); - evas_object_show(o); + if (!e_theme_edje_object_set + (o, "base/theme/modules/wlan", "modules/wlan/main")) + { + snprintf (buf, sizeof (buf), PACKAGE_DATA_DIR "/wlan.edj"); + edje_object_file_set (o, buf, "modules/wlan/main"); + } + evas_object_layer_set (o, 1); + evas_object_show (o); - o = edje_object_add(nf->evas); - nf->chart_obj = o; - evas_object_layer_set(o, 2); - evas_object_repeat_events_set(o, 1); - evas_object_pass_events_set(o, 1); - evas_object_color_set(o, 255, 255, 255, 255); - evas_object_show(o); + o = edje_object_add (nf->evas); + nf->chart_obj = o; + evas_object_layer_set (o, 2); + evas_object_repeat_events_set (o, 1); + evas_object_pass_events_set (o, 1); + evas_object_color_set (o, 255, 255, 255, 255); + evas_object_show (o); - o = edje_object_add(nf->evas); - nf->txt_obj = o; - if (!e_theme_edje_object_set(o, "base/theme/modules/wlan", "modules/wlan/text")) - { - snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/wlan.edj"); - edje_object_file_set(o, buf, "modules/wlan/text"); - } - evas_object_layer_set(o, 3); - evas_object_repeat_events_set(o, 1); - evas_object_pass_events_set(o, 1); - evas_object_color_set(o, 255, 255, 255, 255); - evas_object_show(o); + o = edje_object_add (nf->evas); + nf->txt_obj = o; + if (!e_theme_edje_object_set + (o, "base/theme/modules/wlan", "modules/wlan/text")) + { + snprintf (buf, sizeof (buf), PACKAGE_DATA_DIR "/wlan.edj"); + edje_object_file_set (o, buf, "modules/wlan/text"); + } + evas_object_layer_set (o, 3); + evas_object_repeat_events_set (o, 1); + evas_object_pass_events_set (o, 1); + evas_object_color_set (o, 255, 255, 255, 255); + evas_object_show (o); - o = evas_object_rectangle_add(nf->evas); - nf->event_obj = o; - evas_object_layer_set(o, 4); - evas_object_repeat_events_set(o, 1); - evas_object_color_set(o, 0, 0, 0, 0); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _wlan_face_cb_mouse_down, nf); - evas_object_show(o); + o = evas_object_rectangle_add (nf->evas); + nf->event_obj = o; + evas_object_layer_set (o, 4); + evas_object_repeat_events_set (o, 1); + evas_object_color_set (o, 0, 0, 0, 0); + evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN, + _wlan_face_cb_mouse_down, nf); + evas_object_show (o); - nf->gmc = e_gadman_client_new(nf->con->gadman); - e_gadman_client_domain_set(nf->gmc, "module.wlan", wlan_count++); - e_gadman_client_policy_set(nf->gmc, - E_GADMAN_POLICY_ANYWHERE | - E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_VSIZE); - e_gadman_client_auto_size_set(nf->gmc, 40, 40); - e_gadman_client_align_set(nf->gmc, 1.0, 1.0); - e_gadman_client_resize(nf->gmc, 40, 40); - e_gadman_client_change_func_set(nf->gmc, _wlan_face_cb_gmc_change, nf); - e_gadman_client_load(nf->gmc); - evas_event_thaw(nf->evas); + nf->gmc = e_gadman_client_new (nf->con->gadman); + e_gadman_client_domain_set (nf->gmc, "module.wlan", wlan_count++); + e_gadman_client_policy_set (nf->gmc, + E_GADMAN_POLICY_ANYWHERE | + E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_HSIZE | + E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_VSIZE); + e_gadman_client_auto_size_set (nf->gmc, 40, 40); + e_gadman_client_align_set (nf->gmc, 1.0, 1.0); + e_gadman_client_resize (nf->gmc, 40, 40); + e_gadman_client_change_func_set (nf->gmc, _wlan_face_cb_gmc_change, nf); + e_gadman_client_load (nf->gmc); + evas_event_thaw (nf->evas); - return nf; + return nf; } static void -_wlan_face_menu_new(Wlan_Face *nf) +_wlan_face_menu_new (Wlan_Face * nf) { - E_Menu *mn; - E_Menu_Item *mi; + E_Menu *mn; + E_Menu_Item *mi; - mn = e_menu_new(); - nf->menu = mn; + mn = e_menu_new (); + nf->menu = mn; - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Configuration")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); - e_menu_item_callback_set(mi, _wlan_face_cb_menu_configure, nf); + mi = e_menu_item_new (mn); + e_menu_item_label_set (mi, _("Configuration")); + e_util_menu_item_edje_icon_set (mi, "enlightenment/configuration"); + e_menu_item_callback_set (mi, _wlan_face_cb_menu_configure, nf); - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Edit Mode")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets"); - e_menu_item_callback_set(mi, _wlan_face_cb_menu_edit, nf); + mi = e_menu_item_new (mn); + e_menu_item_label_set (mi, _("Edit Mode")); + e_util_menu_item_edje_icon_set (mi, "enlightenment/gadgets"); + e_menu_item_callback_set (mi, _wlan_face_cb_menu_edit, nf); } static void -_wlan_face_enable(Wlan_Face *nf) +_wlan_face_enable (Wlan_Face * nf) { - nf->conf->enabled = 1; - e_config_save_queue(); - evas_object_show(nf->wlan_obj); - evas_object_show(nf->chart_obj); - evas_object_show(nf->event_obj); - evas_object_show(nf->txt_obj); + nf->conf->enabled = 1; + e_config_save_queue (); + evas_object_show (nf->wlan_obj); + evas_object_show (nf->chart_obj); + evas_object_show (nf->event_obj); + evas_object_show (nf->txt_obj); } static void -_wlan_face_disable(Wlan_Face *nf) +_wlan_face_disable (Wlan_Face * nf) { - nf->conf->enabled = 0; - e_config_save_queue(); - evas_object_hide(nf->event_obj); - evas_object_hide(nf->chart_obj); - evas_object_hide(nf->wlan_obj); - evas_object_hide(nf->txt_obj); + nf->conf->enabled = 0; + e_config_save_queue (); + evas_object_hide (nf->event_obj); + evas_object_hide (nf->chart_obj); + evas_object_hide (nf->wlan_obj); + evas_object_hide (nf->txt_obj); } static void -_wlan_face_free(Wlan_Face *nf) +_wlan_face_free (Wlan_Face * nf) { - e_object_unref(E_OBJECT(nf->con)); + e_object_unref (E_OBJECT (nf->con)); - if (nf->monitor) - ecore_timer_del(nf->monitor); - if (nf->menu) - e_object_del(E_OBJECT(nf->menu)); - if (nf->event_obj) - evas_object_del(nf->event_obj); - if (nf->wlan_obj) - evas_object_del(nf->wlan_obj); - if (nf->chart_obj) - evas_object_del(nf->chart_obj); - if (nf->txt_obj) - evas_object_del(nf->txt_obj); - if (nf->old_values) - _wlan_face_graph_clear(nf); + if (nf->monitor) + ecore_timer_del (nf->monitor); + if (nf->menu) + e_object_del (E_OBJECT (nf->menu)); + if (nf->event_obj) + evas_object_del (nf->event_obj); + if (nf->wlan_obj) + evas_object_del (nf->wlan_obj); + if (nf->chart_obj) + evas_object_del (nf->chart_obj); + if (nf->txt_obj) + evas_object_del (nf->txt_obj); + if (nf->old_values) + _wlan_face_graph_clear (nf); - if (nf->gmc) - { - e_gadman_client_save(nf->gmc); - e_object_del(E_OBJECT(nf->gmc)); - } + if (nf->gmc) + { + e_gadman_client_save (nf->gmc); + e_object_del (E_OBJECT (nf->gmc)); + } - nf->wlan->faces = evas_list_remove(nf->wlan->faces, nf); + nf->wlan->faces = evas_list_remove (nf->wlan->faces, nf); - E_FREE(nf->conf); - E_FREE(nf); - wlan_count--; + E_FREE (nf->conf); + E_FREE (nf); + wlan_count--; } static void -_wlan_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) +_wlan_face_cb_gmc_change (void *data, E_Gadman_Client * gmc, + E_Gadman_Change change) { - Wlan_Face *nf; - Evas_Coord x, y, w, h; + Wlan_Face *nf; + Evas_Coord x, y, w, h; - nf = data; - switch (change) - { - case E_GADMAN_CHANGE_MOVE_RESIZE: - e_gadman_client_geometry_get(nf->gmc, &x, &y, &w, &h); - evas_object_move(nf->wlan_obj, x, y); - evas_object_move(nf->event_obj, x, y); - evas_object_move(nf->chart_obj, x, y); - evas_object_move(nf->txt_obj, x, y); - evas_object_resize(nf->wlan_obj, w, h); - evas_object_resize(nf->event_obj, w, h); - evas_object_resize(nf->chart_obj, w, h); - evas_object_resize(nf->txt_obj, w, h); - _wlan_face_graph_clear(nf); - break; - case E_GADMAN_CHANGE_RAISE: - evas_object_raise(nf->wlan_obj); - evas_object_raise(nf->event_obj); - evas_object_raise(nf->chart_obj); - evas_object_raise(nf->txt_obj); - break; - default: - break; - } + nf = data; + switch (change) + { + case E_GADMAN_CHANGE_MOVE_RESIZE: + e_gadman_client_geometry_get (nf->gmc, &x, &y, &w, &h); + evas_object_move (nf->wlan_obj, x, y); + evas_object_move (nf->event_obj, x, y); + evas_object_move (nf->chart_obj, x, y); + evas_object_move (nf->txt_obj, x, y); + evas_object_resize (nf->wlan_obj, w, h); + evas_object_resize (nf->event_obj, w, h); + evas_object_resize (nf->chart_obj, w, h); + evas_object_resize (nf->txt_obj, w, h); + _wlan_face_graph_clear (nf); + break; + case E_GADMAN_CHANGE_RAISE: + evas_object_raise (nf->wlan_obj); + evas_object_raise (nf->event_obj); + evas_object_raise (nf->chart_obj); + evas_object_raise (nf->txt_obj); + break; + default: + break; + } } static void -_wlan_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) +_wlan_face_cb_mouse_down (void *data, Evas * evas, Evas_Object * obj, + void *event_info) { - Wlan_Face *nf; - Evas_Event_Mouse_Down *ev; + Wlan_Face *nf; + Evas_Event_Mouse_Down *ev; - ev = event_info; - nf = data; - if (ev->button == 3) - { - e_menu_activate_mouse(nf->menu, e_zone_current_get(nf->con), - ev->output.x, ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); - e_util_container_fake_mouse_up_all_later(nf->con); - } + ev = event_info; + nf = data; + if (ev->button == 3) + { + e_menu_activate_mouse (nf->menu, e_zone_current_get (nf->con), + ev->output.x, ev->output.y, 1, 1, + E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + e_util_container_fake_mouse_up_all_later (nf->con); + } } static void -_wlan_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi) +_wlan_face_cb_menu_edit (void *data, E_Menu * mn, E_Menu_Item * mi) { - Wlan_Face *nf; + Wlan_Face *nf; - nf = data; - e_gadman_mode_set(nf->gmc->gadman, E_GADMAN_MODE_EDIT); + nf = data; + e_gadman_mode_set (nf->gmc->gadman, E_GADMAN_MODE_EDIT); } static void -_wlan_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi) +_wlan_face_cb_menu_configure (void *data, E_Menu * mn, E_Menu_Item * mi) { - Wlan_Face *nf; + Wlan_Face *nf; - nf = data; - if (!nf) - return; + nf = data; + if (!nf) + return; - _configure_wlan_module(nf); + _configure_wlan_module (nf); } static int -_wlan_face_update_values(void *data) +_wlan_face_update_values (void *data) { - Wlan_Face *nf; - unsigned int dummy; - char iface[64]; - char buf[256]; - FILE *stat; - int found_dev = 0; - int wlan_status = 0; - int wlan_link = 0; - int wlan_level = 0; - int wlan_noise = 0; - Edje_Message_Float msg; - - char in_str[100]; - - nf = data; - stat = fopen("/proc/net/wireless", "r"); - if (!stat) - return 1; - - while (fgets(buf, 256, stat)) - { - int i = 0; - - /* remove : */ - for (; buf[i] != 0; i++) - if (buf[i] == ':' || buf[i] == '.') - buf[i] = ' '; - - if (sscanf(buf, "%s %u %u %u %u %u %u %u %u %u %u", - iface, &wlan_status, &wlan_link, &wlan_level, &wlan_noise, &dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 11) - continue; - if (!strcmp(iface, strdup(nf->conf->device))) - { - found_dev = 1; - break; - } - } - fclose(stat); - - if (!found_dev) - return 1; - - /* Update the modules text */ - if (nf->conf->show_text) - { - snprintf(in_str, sizeof(in_str), "LNK: %d%%", wlan_link); - edje_object_part_text_set(nf->txt_obj, "link-text", in_str); - } - else - edje_object_part_text_set(nf->txt_obj, "link-text", ""); - - msg.val = wlan_link; - edje_object_message_send(nf->wlan_obj, EDJE_MESSAGE_FLOAT, 1, &msg); - - if (nf->conf->show_graph) - _wlan_face_graph_values(nf, wlan_link); - else - _wlan_face_graph_clear(nf); - - return 1; -} - -static void -_wlan_face_graph_values(Wlan_Face *wf, int val) -{ - int x, y, w, h; - Evas_Object *o; - Evas_Object *last = NULL; - Evas_List *l; - int i, j = 0; - int v; - - evas_event_freeze(wf->evas); - - evas_object_geometry_get(wf->chart_obj, &x, &y, &w, &h); - - v = (int)((double)val * ((double)h / (double)100)); - o = evas_object_line_add(wf->evas); - edje_object_part_swallow(wf->chart_obj, "lines", o); - evas_object_layer_set(o, 1); - if (val == 0) - evas_object_hide(o); - else - { - evas_object_line_xy_set(o, (x + w), (y + h), (x + w), ((y + h) - v)); - evas_object_color_set(o, 255, 0, 0, 100); - evas_object_pass_events_set(o, 1); - evas_object_show(o); - } - - wf->old_values = evas_list_prepend(wf->old_values, o); - l = wf->old_values; - for (i = (x + w); l && (j - 2) < w; l = l->next, j++) - { - Evas_Coord oy; - Evas_Object *lo; - - lo = (Evas_Object *)evas_list_data(l); - evas_object_geometry_get(lo, NULL, &oy, NULL, NULL); - evas_object_move(lo, i--, oy); - last = lo; - } - - if ((j - 2) >= w) - { - wf->old_values = evas_list_remove(wf->old_values, last); - edje_object_part_unswallow(wf->chart_obj, last); - evas_object_del(last); - } + Wlan_Face *nf; + unsigned int dummy; + char iface[64]; + char buf[256]; + FILE *stat; + int found_dev = 0; + int wlan_status = 0; + int wlan_link = 0; + int wlan_level = 0; + int wlan_noise = 0; + Edje_Message_Float msg; + + char in_str[100]; + + nf = data; + stat = fopen ("/proc/net/wireless", "r"); + if (!stat) + return 1; + + while (fgets (buf, 256, stat)) + { + int i = 0; + + /* remove : */ + for (; buf[i] != 0; i++) + if (buf[i] == ':' || buf[i] == '.') + buf[i] = ' '; + + if (sscanf (buf, "%s %u %u %u %u %u %u %u %u %u %u", + iface, &wlan_status, &wlan_link, &wlan_level, &wlan_noise, + &dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 11) + continue; + if (!strcmp (iface, strdup (nf->conf->device))) + { + found_dev = 1; + break; + } + } + fclose (stat); + + if (!found_dev) + return 1; + + /* Update the modules text */ + if (nf->conf->show_text) + { + snprintf (in_str, sizeof (in_str), "LNK: %d%%", wlan_link); + edje_object_part_text_set (nf->txt_obj, "link-text", in_str); + } + else + edje_object_part_text_set (nf->txt_obj, "link-text", ""); + + msg.val = wlan_link; + edje_object_message_send (nf->wlan_obj, EDJE_MESSAGE_FLOAT, 1, &msg); + + if (nf->conf->show_graph) + _wlan_face_graph_values (nf, wlan_link); + else + _wlan_face_graph_clear (nf); + + return 1; +} + +static void +_wlan_face_graph_values (Wlan_Face * wf, int val) +{ + int x, y, w, h; + Evas_Object *o; + Evas_Object *last = NULL; + Evas_List *l; + int i, j = 0; + int v; + + evas_event_freeze (wf->evas); + + evas_object_geometry_get (wf->chart_obj, &x, &y, &w, &h); + + v = (int) ((double) val * ((double) h / (double) 100)); + o = evas_object_line_add (wf->evas); + edje_object_part_swallow (wf->chart_obj, "lines", o); + evas_object_layer_set (o, 1); + if (val == 0) + evas_object_hide (o); + else + { + evas_object_line_xy_set (o, (x + w), (y + h), (x + w), ((y + h) - v)); + evas_object_color_set (o, 255, 0, 0, 100); + evas_object_pass_events_set (o, 1); + evas_object_show (o); + } + + wf->old_values = evas_list_prepend (wf->old_values, o); + l = wf->old_values; + for (i = (x + w); l && (j - 2) < w; l = l->next, j++) + { + Evas_Coord oy; + Evas_Object *lo; + + lo = (Evas_Object *) evas_list_data (l); + evas_object_geometry_get (lo, NULL, &oy, NULL, NULL); + evas_object_move (lo, i--, oy); + last = lo; + } + + if ((j - 2) >= w) + { + wf->old_values = evas_list_remove (wf->old_values, last); + edje_object_part_unswallow (wf->chart_obj, last); + evas_object_del (last); + } - evas_event_thaw(wf->evas); + evas_event_thaw (wf->evas); } void -_wlan_face_graph_clear(Wlan_Face *wf) +_wlan_face_graph_clear (Wlan_Face * wf) { - Evas_List *l; + Evas_List *l; - evas_event_freeze(wf->evas); + evas_event_freeze (wf->evas); - for (l = wf->old_values; l; l = l->next) - { - Evas_Object *o; + for (l = wf->old_values; l; l = l->next) + { + Evas_Object *o; - o = evas_list_data(l); - edje_object_part_unswallow(wf->chart_obj, o); - evas_object_del(o); - } - evas_list_free(wf->old_values); - wf->old_values = NULL; + o = evas_list_data (l); + edje_object_part_unswallow (wf->chart_obj, o); + evas_object_del (o); + } + evas_list_free (wf->old_values); + wf->old_values = NULL; - evas_event_thaw(wf->evas); + evas_event_thaw (wf->evas); } ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs