Enlightenment CVS committal

Author  : mej
Project : e_modules
Module  : wlan

Dir     : e_modules/wlan


Modified Files:
        e_mod_config.c e_mod_main.c e_mod_main.h 


Log Message:
Wed Apr  5 13:48:36 2006                        Michael Jennings (mej)

Indent!
----------------------------------------------------------------------

===================================================================
RCS file: /cvs/e/e_modules/wlan/e_mod_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_config.c      12 Mar 2006 19:01:34 -0000      1.7
+++ e_mod_config.c      5 Apr 2006 17:48:50 -0000       1.8
@@ -9,18 +9,18 @@
    int check_interval;
    int show_text;
    int show_graph;
-   
+
    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
@@ -35,7 +35,7 @@
    v->free_cfdata = _free_data;
    v->basic.apply_cfdata = _basic_apply_data;
    v->basic.create_widgets = _basic_create_widgets;
-   
+
    cfd = e_config_dialog_new(nf->con, D_("Wlan Configuration"), NULL, 0, v, 
nf);
    nf->wlan->cfd = cfd;
 }
@@ -49,32 +49,32 @@
    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);
+      cfdata->device = strdup(nf->conf->device);
    else
-     cfdata->device = NULL;
-   
+      cfdata->device = NULL;
+
    if (!cfdata->device)
-     return;
+      return;
 
    cfdata->devs = ecore_list_new();
    _wlan_config_get_devices(cfdata->devs);
 
    if (!cfdata->devs)
-     return;
-   
+      return;
+
    i = 0;
    ecore_list_goto_first(cfdata->devs);
-   while ((tmp = ecore_list_next(cfdata->devs)) != NULL) 
+   while ((tmp = ecore_list_next(cfdata->devs)) != NULL)
      {
-       if (!strcmp(cfdata->device, tmp)) 
-         {
-            cfdata->dev_num = i;
-            break;
-         }
-       i++;
-     }   
+        if (!strcmp(cfdata->device, tmp))
+          {
+             cfdata->dev_num = i;
+             break;
+          }
+        i++;
+     }
 }
 
 static void *
@@ -85,6 +85,7 @@
 
    nf = cfd->data;
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
    _fill_data(nf, cfdata);
    return cfdata;
 }
@@ -98,7 +99,7 @@
    nf->wlan->cfd = NULL;
    E_FREE(cfdata->device);
    if (cfdata->devs)
-     ecore_list_destroy(cfdata->devs);
+      ecore_list_destroy(cfdata->devs);
    free(cfdata);
 }
 
@@ -109,7 +110,7 @@
    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)));
@@ -117,17 +118,17 @@
    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);   
+   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) 
+   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++;
+        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:"));
@@ -149,29 +150,29 @@
 
    nf = cfd->data;
    tmp = ecore_list_goto_index(cfdata->devs, cfdata->dev_num);
-   if (tmp != NULL) 
+   if (tmp != NULL)
      {
-       if (strcmp(tmp, nf->conf->device)) 
-         {
-            _wlan_face_graph_clear(nf);
-            nf->conf->device = (char *)evas_stringshare_add(strdup(tmp));
-         }     
+        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);
-   
+      ecore_timer_interval_set(nf->monitor, (double)cfdata->check_interval);
+
    return 1;
 }
 
 static void
-_wlan_config_get_devices(Ecore_List *devs) 
+_wlan_config_get_devices(Ecore_List *devs)
 {
    FILE *stat;
    char iface[64];
@@ -181,24 +182,23 @@
    int wlan_link = 0;
    int wlan_level = 0;
    int wlan_noise = 0;
-   
+
    stat = fopen("/proc/net/wireless", "r");
    if (!stat)
-     return;
+      return;
 
-   while (fgets(buf, 256, stat)) 
+   while (fgets(buf, 256, stat))
      {
-       int i = 0;
+        int i = 0;
+
         for (; buf[i] != 0; i++)
-         if (buf[i] == ':' || buf[i] == '.')
-           buf[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;
-       ecore_list_append(devs, strdup(iface)); 
+                   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.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_main.c        3 Apr 2006 10:26:34 -0000       1.21
+++ e_mod_main.c        5 Apr 2006 17:48:50 -0000       1.22
@@ -3,30 +3,29 @@
 #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 *_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 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 =
-{
+EAPI E_Module_Api e_modapi = {
    E_MODULE_API_VERSION,
-     "Wlan"
+   "Wlan"
 };
 
 EAPI void *
@@ -40,7 +39,7 @@
 
    n = _wlan_init(m);
    if (!n)
-     return NULL;
+      return NULL;
 
    m->config_menu = n->config_menu;
    return n;
@@ -53,18 +52,18 @@
 
    n = m->data;
    if (!n)
-     return 0;
+      return 0;
 
    if (m->config_menu)
      {
-       e_menu_deactivate(m->config_menu);
-       e_object_del(E_OBJECT(m->config_menu));
-       m->config_menu = NULL;
+        e_menu_deactivate(m->config_menu);
+        e_object_del(E_OBJECT(m->config_menu));
+        m->config_menu = NULL;
      }
    if (n->cfd)
      {
-       e_object_del(E_OBJECT(n->cfd));
-       n->cfd = NULL;
+        e_object_del(E_OBJECT(n->cfd));
+        n->cfd = NULL;
      }
    _wlan_shutdown(n);
    return 1;
@@ -77,7 +76,7 @@
 
    n = m->data;
    if (!n)
-     return 0;
+      return 0;
    e_config_domain_save("module.wlan", conf_edd, n->conf);
    return 1;
 }
@@ -85,15 +84,14 @@
 EAPI int
 e_modapi_info(E_Module *m)
 {
-   m->icon_file = strdup(PACKAGE_DATA_DIR"/module_icon.png");
+   m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
    return 1;
 }
 
 EAPI int
 e_modapi_about(E_Module *m)
 {
-   e_module_dialog_show(D_("Enlightenment Wlan Monitor Module"),
-                       D_("This module is used to monitor a wlan device."));
+   e_module_dialog_show(D_("Enlightenment Wlan Monitor Module"), D_("This 
module is used to monitor a wlan device."));
    return 1;
 }
 
@@ -106,24 +104,24 @@
 
    n = m->data;
    if (!n)
-     return 0;
+      return 0;
    if (!n->faces)
-     return 0;
+      return 0;
 
    for (l = n->faces; l; l = l->next)
      {
-       Wlan_Face *nf;
+        Wlan_Face *nf;
+
+        nf = l->data;
+        if (!nf)
+           continue;
 
-       nf = l->data;
-       if (!nf)
-         continue;
-
-       con = e_container_current_get(e_manager_current_get());
-       if (nf->con == con)
-         {
-            _configure_wlan_module(nf);
-            break;
-         }
+        con = e_container_current_get(e_manager_current_get());
+        if (nf->con == con)
+          {
+             _configure_wlan_module(nf);
+             break;
+          }
      }
    return 1;
 }
@@ -136,8 +134,9 @@
    Evas_List *mans, *l, *l2, *fl;
 
    n = E_NEW(Wlan, 1);
+
    if (!n)
-     return NULL;
+      return NULL;
 
    conf_face_edd = E_CONFIG_DD_NEW("Wlan_Config_Face", Config_Face);
 #undef T
@@ -151,6 +150,7 @@
    E_CONFIG_VAL(D, T, show_graph, INT);
 
    conf_edd = E_CONFIG_DD_NEW("Wlan_Config", Config);
+
 #undef T
 #undef D
 #define T Config
@@ -159,7 +159,7 @@
 
    n->conf = e_config_domain_load("module.wlan", conf_edd);
    if (!n->conf)
-     n->conf = E_NEW(Config, 1);
+      n->conf = E_NEW(Config, 1);
 
    _wlan_config_menu_new(n);
 
@@ -167,53 +167,54 @@
    fl = n->conf->faces;
    for (l = mans; l; l = l->next)
      {
-       E_Manager *man;
+        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);
-                      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);
-
-                 _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, con->name);
-                 e_menu_item_submenu_set(mi, nf->menu);
-
-                 if (!nf->conf->enabled)
-                   _wlan_face_disable(nf);
-              }
-         }
+             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->monitor = 
ecore_timer_add((double)nf->conf->check_interval, _wlan_face_update_values, 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, con->name);
+                  e_menu_item_submenu_set(mi, nf->menu);
+
+                  if (!nf->conf->enabled)
+                     _wlan_face_disable(nf);
+               }
+          }
      }
    return n;
 }
@@ -225,7 +226,7 @@
    E_CONFIG_DD_FREE(conf_face_edd);
 
    while (n->faces)
-     _wlan_face_free(n->faces->data);
+      _wlan_face_free(n->faces->data);
 
    e_object_del(E_OBJECT(n->config_menu));
    evas_list_free(n->conf->faces);
@@ -251,8 +252,9 @@
    char buf[4096];
 
    nf = E_NEW(Wlan_Face, 1);
+
    if (!nf)
-     return NULL;
+      return NULL;
    nf->wlan = n;
    n->faces = evas_list_append(n->faces, nf);
 
@@ -267,8 +269,8 @@
 
    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");
+        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);
@@ -285,32 +287,28 @@
    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");
-     }   
+        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_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_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);
@@ -349,7 +347,7 @@
    evas_object_show(nf->wlan_obj);
    evas_object_show(nf->chart_obj);
    evas_object_show(nf->event_obj);
-   evas_object_show(nf->txt_obj);   
+   evas_object_show(nf->txt_obj);
 }
 
 static void
@@ -360,7 +358,7 @@
    evas_object_hide(nf->event_obj);
    evas_object_hide(nf->chart_obj);
    evas_object_hide(nf->wlan_obj);
-   evas_object_hide(nf->txt_obj);   
+   evas_object_hide(nf->txt_obj);
 }
 
 static void
@@ -369,24 +367,24 @@
    e_object_unref(E_OBJECT(nf->con));
 
    if (nf->monitor)
-     ecore_timer_del(nf->monitor);
+      ecore_timer_del(nf->monitor);
    if (nf->menu)
-     e_object_del(E_OBJECT(nf->menu));
+      e_object_del(E_OBJECT(nf->menu));
    if (nf->event_obj)
-     evas_object_del(nf->event_obj);
+      evas_object_del(nf->event_obj);
    if (nf->wlan_obj)
-     evas_object_del(nf->wlan_obj);
+      evas_object_del(nf->wlan_obj);
    if (nf->chart_obj)
-     evas_object_del(nf->chart_obj);
+      evas_object_del(nf->chart_obj);
    if (nf->txt_obj)
-     evas_object_del(nf->txt_obj);
+      evas_object_del(nf->txt_obj);
    if (nf->old_values)
-     _wlan_face_graph_clear(nf);
-   
+      _wlan_face_graph_clear(nf);
+
    if (nf->gmc)
      {
-       e_gadman_client_save(nf->gmc);
-       e_object_del(E_OBJECT(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);
@@ -405,26 +403,26 @@
    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;
+     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;
      }
 }
 
@@ -438,10 +436,9 @@
    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);
+        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);
      }
 }
 
@@ -461,7 +458,7 @@
 
    nf = data;
    if (!nf)
-     return;
+      return;
 
    _configure_wlan_module(nf);
 }
@@ -481,13 +478,13 @@
    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;
+      return 1;
 
    while (fgets(buf, 256, stat))
      {
@@ -495,14 +492,12 @@
 
         /* remove : */
         for (; buf[i] != 0; i++)
-         if (buf[i] == ':' || buf[i] == '.')
-           buf[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;
+                   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;
@@ -512,25 +507,25 @@
    fclose(stat);
 
    if (!found_dev)
-     return 1;
-   
+      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);
-     }   
+        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", "");
+      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);
+
+   if (nf->conf->show_graph)
+      _wlan_face_graph_values(nf, wlan_link);
    else
-     _wlan_face_graph_clear(nf);
-     
+      _wlan_face_graph_clear(nf);
+
    return 1;
 }
 
@@ -545,43 +540,43 @@
    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));      
+   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_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);
+        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++) 
+   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_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);
 }
 
@@ -591,17 +586,17 @@
    Evas_List *l;
 
    evas_event_freeze(wf->evas);
-   
-   for (l = wf->old_values; l; l = l->next) 
+
+   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_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;
-   
+
    evas_event_thaw(wf->evas);
 }
-
===================================================================
RCS file: /cvs/e/e_modules/wlan/e_mod_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_main.h        12 Mar 2006 19:01:34 -0000      1.6
+++ e_mod_main.h        5 Apr 2006 17:48:50 -0000       1.7
@@ -8,12 +8,12 @@
 typedef struct _Wlan Wlan;
 typedef struct _Wlan_Face Wlan_Face;
 
-struct _Config 
+struct _Config
 {
    Evas_List *faces;
 };
 
-struct _Config_Face 
+struct _Config_Face
 {
    unsigned char enabled;
    char *device;
@@ -22,7 +22,7 @@
    int show_graph;
 };
 
-struct _Wlan 
+struct _Wlan
 {
    E_Menu *config_menu;
    Evas_List *faces;
@@ -30,34 +30,34 @@
    E_Config_Dialog *cfd;
 };
 
-struct _Wlan_Face 
+struct _Wlan_Face
 {
    Evas *evas;
    E_Container *con;
    E_Menu *menu;
    Wlan *wlan;
    Evas_List *old_values;
-   
+
    Config_Face *conf;
-   
+
    Evas_Object *wlan_obj;
    Evas_Object *event_obj;
    Evas_Object *chart_obj;
    Evas_Object *txt_obj;
-   
+
    Ecore_Timer *monitor;
-   
+
    E_Gadman_Client *gmc;
 };
 
 EAPI extern E_Module_Api e_modapi;
 
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-EAPI int   e_modapi_info     (E_Module *m);
-EAPI int   e_modapi_about    (E_Module *m);
-EAPI int   e_modapi_config   (E_Module *m);
+EAPI void *e_modapi_init(E_Module *m);
+EAPI int e_modapi_shutdown(E_Module *m);
+EAPI int e_modapi_save(E_Module *m);
+EAPI int e_modapi_info(E_Module *m);
+EAPI int e_modapi_about(E_Module *m);
+EAPI int e_modapi_config(E_Module *m);
 
 void _wlan_face_graph_clear(Wlan_Face *wf);
 




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to