Enlightenment CVS committal
Author : mej
Project : e_modules
Module : tclock
Dir : e_modules/tclock
Modified Files:
e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h
Log Message:
Sun Jan 29 22:16:32 2006 Michael Jennings (mej)
Attempt #2 to get rid of tabs.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_config.c 22 Jan 2006 18:18:34 -0000 1.8
+++ e_mod_config.c 30 Jan 2006 03:16:42 -0000 1.9
@@ -4,51 +4,52 @@
typedef struct _Cfg_File_Data Cfg_File_Data;
-struct _E_Config_Dialog_Data
-{
- int resolution;
+struct _E_Config_Dialog_Data {
+ int resolution;
};
-struct _Cfg_File_Data
-{
- E_Config_Dialog *cfd;
- char *file;
+struct _Cfg_File_Data {
+ E_Config_Dialog *cfd;
+ char *file;
};
/* 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 *_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);
void
-_config_tclock_module(E_Container *con, TClock_Face *f)
+_config_tclock_module(E_Container * con, TClock_Face * f)
{
- E_Config_Dialog *cfd;
+ E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
-
+
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;
-
- cfd = e_config_dialog_new(con, _("Tclock Configuration"), NULL, 0, v, f);
+
+ cfd = e_config_dialog_new(con, _("Tclock Configuration"), NULL, 0, v, f);
}
-static void
-_fill_data(TClock_Face *f, E_Config_Dialog_Data *cfdata)
+static void
+_fill_data(TClock_Face * f, E_Config_Dialog_Data * cfdata)
{
cfdata->resolution = f->conf->resolution;
}
-static void *
-_create_data(E_Config_Dialog *cfd)
+static void *
+_create_data(E_Config_Dialog * cfd)
{
E_Config_Dialog_Data *cfdata;
- TClock_Face *f;
-
+ TClock_Face *f;
+
f = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(f, cfdata);
@@ -56,32 +57,33 @@
}
static void
-_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_free_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
{
free(cfdata);
}
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;
- E_Radio_Group *rg;
-
+ Evas_Object *o, *of, *ob;
+ E_Radio_Group *rg;
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Resolution"), 0);
rg = e_widget_radio_group_new(&(cfdata->resolution));
- ob = e_widget_radio_add(evas, _("1 Minute"), RESOLUTION_MINUTE ,rg);
+ ob = e_widget_radio_add(evas, _("1 Minute"), RESOLUTION_MINUTE, rg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("1 Second"), RESOLUTION_SECOND ,rg);
+ ob = e_widget_radio_add(evas, _("1 Second"), RESOLUTION_SECOND, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
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)
{
- TClock_Face *f;
+ TClock_Face *f;
f = cfd->data;
e_border_button_bindings_ungrab_all();
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.h 8 Jan 2006 10:33:23 -0000 1.2
+++ e_mod_config.h 30 Jan 2006 03:16:42 -0000 1.3
@@ -3,6 +3,6 @@
#ifndef E_MOD_CONFIG_H
#define E_MOD_CONFIG_H
#include "e_mod_main.h"
-void _config_tclock_module(E_Container *con, TClock_Face *f);
+void _config_tclock_module(E_Container * con, TClock_Face * f);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c 14 Jan 2006 12:59:55 -0000 1.10
+++ e_mod_main.c 30 Jan 2006 03:16:42 -0000 1.11
@@ -3,70 +3,76 @@
#include "e_mod_main.h"
#include "e_mod_config.h"
-static TClock* _tclock_new();
-static void _tclock_shutdown(TClock *tclock);
-static void _tclock_config_menu_new(TClock *tclock);
+static TClock *_tclock_new();
+static void _tclock_shutdown(TClock * tclock);
+static void _tclock_config_menu_new(TClock * tclock);
+
+static TClock_Face *_tclock_face_new(E_Container * con);
+static void _tclock_face_free(TClock_Face * face);
+static void _tclock_face_menu_new(TClock_Face * face);
+
+static void _tclock_face_cb_gmc_change(void *data,
+ E_Gadman_Client * gmc,
+ E_Gadman_Change change);
+
+static void _tclock_face_cb_mouse_down(void *data, Evas * e,
+ Evas_Object * obj,
+ void *event_info);
+static void _tclock_face_cb_menu_edit(void *data, E_Menu * m,
+ E_Menu_Item * mi);
+static void _tclock_face_cb_menu_configure(void *data, E_Menu * m,
+ E_Menu_Item * mi);
-static TClock_Face *_tclock_face_new(E_Container *con);
-static void _tclock_face_free(TClock_Face *face);
-static void _tclock_face_menu_new(TClock_Face *face);
-
-static void _tclock_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
-
-static void _tclock_face_cb_mouse_down(void *data, Evas *e, Evas_Object
*obj,void *event_info);
-static void _tclock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _tclock_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item
*mi);
-
-static int _tclock_cb_check(void *data);
+static int _tclock_cb_check(void *data);
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
-static int _tclock_count;
+static int _tclock_count;
/*public code******************************/
-EAPI E_Module_Api e_modapi =
-{
+EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
- "TClock"
+ "TClock"
};
-EAPI void *
-e_modapi_init(E_Module *module)
+EAPI void *
+e_modapi_init(E_Module * module)
{
- TClock *tclock;
+ TClock *tclock;
+
tclock = _tclock_new();
- module->config_menu =tclock->config_menu;
+ module->config_menu = tclock->config_menu;
return tclock;
}
EAPI int
-e_modapi_shutdown(E_Module *module)
+e_modapi_shutdown(E_Module * module)
{
- TClock *tclock;
+ TClock *tclock;
if (module->config_menu)
- module->config_menu = NULL;
+ module->config_menu = NULL;
tclock = module->data;
- if (tclock)
+ if (tclock)
{
- _tclock_shutdown(tclock);
+ _tclock_shutdown(tclock);
}
return 1;
}
EAPI int
-e_modapi_info(E_Module *module)
+e_modapi_info(E_Module * module)
{
module->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
return 1;
}
EAPI int
-e_modapi_save(E_Module *module)
+e_modapi_save(E_Module * module)
{
- TClock *tclock;
+ TClock *tclock;
tclock = module->data;
e_config_domain_save("module.tclock", conf_edd, tclock->conf);
@@ -74,33 +80,37 @@
}
EAPI int
-e_modapi_about(E_Module *module)
+e_modapi_about(E_Module * module)
{
- e_module_dialog_show(_("Simple Digital Clock"),
- _("Displays a digital clock on the desktop"));
+ e_module_dialog_show(_("Simple Digital Clock"),
+ _("Displays a digital clock on the desktop"));
return 1;
}
EAPI int
-e_modapi_config(E_Module *module)
+e_modapi_config(E_Module * module)
{
- Evas_List *l;
- TClock *t;
+ Evas_List *l;
+ TClock *t;
t = module->data;
- if (!t) return 0;
- if (!t->faces) return 0;
+ if (!t)
+ return 0;
+ if (!t->faces)
+ return 0;
for (l = t->faces; l; l = l->next)
{
- TClock_Face *tf;
- tf = l->data;
- if (!tf) return 0;
- if (tf->con == e_container_current_get(e_manager_current_get()))
- {
- /* Configure Clock */
- _config_tclock_module(tf->con, tf);
- break;
- }
+ TClock_Face *tf;
+
+ tf = l->data;
+ if (!tf)
+ return 0;
+ if (tf->con == e_container_current_get(e_manager_current_get()))
+ {
+ /* Configure Clock */
+ _config_tclock_module(tf->con, tf);
+ break;
+ }
}
return 1;
}
@@ -108,17 +118,18 @@
/******************************************************************
* private functions
****************************************************************/
-static TClock *
+static TClock *
_tclock_new()
{
- TClock *tclock;
- Evas_List *managers, *l, *l2, *cl;
- E_Menu_Item *mi;
+ TClock *tclock;
+ Evas_List *managers, *l, *l2, *cl;
+ E_Menu_Item *mi;
_tclock_count = 0;
- tclock=E_NEW(TClock,1);
- if (!tclock) return NULL;
+ tclock = E_NEW(TClock, 1);
+ if (!tclock)
+ return NULL;
conf_face_edd = E_CONFIG_DD_NEW("TClock_Config_Face", Config_Face);
#undef T
@@ -141,8 +152,8 @@
if (!tclock->conf)
{
- tclock->conf = E_NEW(Config, 1);
- tclock->conf->poll_time = 60.0;
+ tclock->conf = E_NEW(Config, 1);
+ tclock->conf->poll_time = 60.0;
}
_tclock_config_menu_new(tclock);
@@ -151,70 +162,76 @@
cl = tclock->conf->faces;
for (l = managers; l; l = l->next)
{
- E_Manager *man;
+ E_Manager *man;
- man = l->data;
- for (l2 = man->containers; l2; l2 = l2->next)
- {
- E_Container *con;
- TClock_Face *face;
-
- con = l2->data;
- face = _tclock_face_new(con);
- if (face)
- {
- face->tclock = tclock;
- tclock->faces = evas_list_append(tclock->faces, face);
-
- /* Config */
- if (!cl)
- {
- face->conf = E_NEW(Config_Face, 1);
- /* set instance config values*/
- face->conf->enabled = 1;
- face->conf->resolution = RESOLUTION_MINUTE;
- tclock->conf->faces =
evas_list_append(tclock->conf->faces, face->conf);
- }
- else
- {
- face->conf = cl->data;
- cl = cl->next;
- }
-
- if (face->conf->resolution == RESOLUTION_SECOND)
- {
- E_CONFIG_LIMIT(tclock->conf->poll_time, 0.1, 1.0);
- tclock->tclock_check_timer =
ecore_timer_add(tclock->conf->poll_time, _tclock_cb_check, tclock);
- TCLOCK_DEBUG("RES_SEC");
- }
- else
- {
- E_CONFIG_LIMIT(tclock->conf->poll_time, 1.0, 60.0);
- tclock->tclock_check_timer =
ecore_timer_add(tclock->conf->poll_time, _tclock_cb_check, tclock);
- TCLOCK_DEBUG("RES_MIN");
- }
-
- /* Menu */
- /* This menu must be initialized after conf */
- _tclock_face_menu_new(face);
-
- mi = e_menu_item_new(tclock->config_menu);
- e_menu_item_label_set(mi, _("Configuration"));
- e_menu_item_callback_set(mi, _tclock_face_cb_menu_configure,
face);
-
- mi = e_menu_item_new(tclock->config_menu);
- e_menu_item_label_set(mi, con->name);
- e_menu_item_submenu_set(mi, face->menu);
- }
- }
+ man = l->data;
+ for (l2 = man->containers; l2; l2 = l2->next)
+ {
+ E_Container *con;
+ TClock_Face *face;
+
+ con = l2->data;
+ face = _tclock_face_new(con);
+ if (face)
+ {
+ face->tclock = tclock;
+ tclock->faces = evas_list_append(tclock->faces, face);
+
+ /* Config */
+ if (!cl)
+ {
+ face->conf = E_NEW(Config_Face, 1);
+ /* set instance config values */
+ face->conf->enabled = 1;
+ face->conf->resolution = RESOLUTION_MINUTE;
+ tclock->conf->faces =
+ evas_list_append(tclock->conf->faces, face->conf);
+ }
+ else
+ {
+ face->conf = cl->data;
+ cl = cl->next;
+ }
+
+ if (face->conf->resolution == RESOLUTION_SECOND)
+ {
+ E_CONFIG_LIMIT(tclock->conf->poll_time, 0.1, 1.0);
+ tclock->tclock_check_timer =
+ ecore_timer_add(tclock->conf->poll_time,
+ _tclock_cb_check, tclock);
+ TCLOCK_DEBUG("RES_SEC");
+ }
+ else
+ {
+ E_CONFIG_LIMIT(tclock->conf->poll_time, 1.0, 60.0);
+ tclock->tclock_check_timer =
+ ecore_timer_add(tclock->conf->poll_time,
+ _tclock_cb_check, tclock);
+ TCLOCK_DEBUG("RES_MIN");
+ }
+
+ /* Menu */
+ /* This menu must be initialized after conf */
+ _tclock_face_menu_new(face);
+
+ mi = e_menu_item_new(tclock->config_menu);
+ e_menu_item_label_set(mi, _("Configuration"));
+ e_menu_item_callback_set(mi, _tclock_face_cb_menu_configure,
+ face);
+
+ mi = e_menu_item_new(tclock->config_menu);
+ e_menu_item_label_set(mi, con->name);
+ e_menu_item_submenu_set(mi, face->menu);
+ }
+ }
}
return tclock;
}
static void
-_tclock_shutdown(TClock *tclock)
+_tclock_shutdown(TClock * tclock)
{
- Evas_List *list;
+ Evas_List *list;
E_CONFIG_DD_FREE(conf_edd);
E_CONFIG_DD_FREE(conf_face_edd);
@@ -222,7 +239,7 @@
ecore_timer_del(tclock->tclock_check_timer);
for (list = tclock->faces; list; list = list->next)
- _tclock_face_free(list->data);
+ _tclock_face_free(list->data);
evas_list_free(tclock->faces);
e_object_del(E_OBJECT(tclock->config_menu));
@@ -233,21 +250,22 @@
}
static void
-_tclock_config_menu_new(TClock *tclock)
+_tclock_config_menu_new(TClock * tclock)
{
tclock->config_menu = e_menu_new();
}
static TClock_Face *
-_tclock_face_new(E_Container *con)
+_tclock_face_new(E_Container * con)
{
- TClock_Face *face;
- Evas_Object *o;
- Evas_Coord x, y, w, h;
- char buff[4096];
-
+ TClock_Face *face;
+ Evas_Object *o;
+ Evas_Coord x, y, w, h;
+ char buff[4096];
+
face = E_NEW(TClock_Face, 1);
- if (!face) return NULL;
+ if (!face)
+ return NULL;
face->con = con;
e_object_ref(E_OBJECT(con));
@@ -256,9 +274,10 @@
o = edje_object_add(con->bg_evas);
face->tclock_object = o;
- snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR"/tclock.edj");
- if (!e_theme_edje_object_set(o, "base/theme/modules/tclock",
"modules/tclock/main"))
- edje_object_file_set(o, buff, "modules/tclock/main");
+ snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR "/tclock.edj");
+ if (!e_theme_edje_object_set
+ (o, "base/theme/modules/tclock", "modules/tclock/main"))
+ edje_object_file_set(o, buff, "modules/tclock/main");
evas_object_show(o);
o = evas_object_rectangle_add(con->bg_evas);
@@ -266,7 +285,8 @@
evas_object_layer_set(o, 2);
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,
_tclock_face_cb_mouse_down, face);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
+ _tclock_face_cb_mouse_down, face);
evas_object_show(o);
evas_object_resize(face->tclock_object, 200, 200);
@@ -280,26 +300,25 @@
face->gmc = e_gadman_client_new(con->gadman);
e_gadman_client_domain_set(face->gmc, "module.tclock", _tclock_count++);
e_gadman_client_policy_set(face->gmc,
- E_GADMAN_POLICY_ANYWHERE |
- E_GADMAN_POLICY_HMOVE |
- E_GADMAN_POLICY_VMOVE |
- E_GADMAN_POLICY_HSIZE |
- E_GADMAN_POLICY_VSIZE);
+ E_GADMAN_POLICY_ANYWHERE |
+ E_GADMAN_POLICY_HMOVE |
+ E_GADMAN_POLICY_VMOVE |
+ E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VSIZE);
e_gadman_client_min_size_set(face->gmc, 4, 4);
e_gadman_client_max_size_set(face->gmc, 512, 512);
e_gadman_client_auto_size_set(face->gmc,
- 40 + (face->inset.l + face->inset.r),
- 40 + (face->inset.t + face->inset.b));
+ 40 + (face->inset.l + face->inset.r),
+ 40 + (face->inset.t + face->inset.b));
e_gadman_client_align_set(face->gmc, 1.0, 1.0);
//e_gadman_client_aspect_set(face->gmc, 1.0, 1.0);
e_gadman_client_padding_set(face->gmc,
- face->inset.l, face->inset.r,
- face->inset.t, face->inset.b);
+ face->inset.l, face->inset.r,
+ face->inset.t, face->inset.b);
e_gadman_client_resize(face->gmc,
- 40 + (face->inset.l + face->inset.r),
- 40 + (face->inset.t + face->inset.b));
+ 40 + (face->inset.l + face->inset.r),
+ 40 + (face->inset.t + face->inset.b));
e_gadman_client_change_func_set(face->gmc, _tclock_face_cb_gmc_change,
face);
e_gadman_client_load(face->gmc);
@@ -310,7 +329,7 @@
}
static void
-_tclock_face_free(TClock_Face *face)
+_tclock_face_free(TClock_Face * face)
{
e_object_unref(E_OBJECT(face->con));
e_object_del(E_OBJECT(face->gmc));
@@ -326,40 +345,44 @@
static int
_tclock_cb_check(void *data)
{
- TClock *tclock;
- Evas_List *l;
- time_t current_time;
- struct tm *local_time;
- char buf[TIME_BUF];
+ TClock *tclock;
+ Evas_List *l;
+ time_t current_time;
+ struct tm *local_time;
+ char buf[TIME_BUF];
memset(buf, 0, sizeof(buf));
- current_time=time(NULL);
+ current_time = time(NULL);
local_time = localtime(¤t_time);
tclock = data;
for (l = tclock->faces; l; l = l->next)
{
- TClock_Face *face;
- face = l->data;
+ TClock_Face *face;
+
+ face = l->data;
+
+ const char *format;
+
+ format =
+ edje_object_part_state_get(face->tclock_object, "tclock_format",
+ NULL);
+ face->conf->format = format;
+
+ strftime(buf, TIME_BUF, face->conf->format, local_time);
- const char *format;
- format = edje_object_part_state_get(face->tclock_object,
"tclock_format",NULL);
- face->conf->format = format;
-
- strftime (buf,TIME_BUF, face->conf->format, local_time);
-
- TCLOCK_DEBUG(face->conf->format);
- edje_object_part_text_set(face->tclock_object, "tclock_text", buf);
- e_config_save_queue();
+ TCLOCK_DEBUG(face->conf->format);
+ edje_object_part_text_set(face->tclock_object, "tclock_text", buf);
+ e_config_save_queue();
}
return 1;
}
static void
-_tclock_face_menu_new(TClock_Face *face)
+_tclock_face_menu_new(TClock_Face * face)
{
- E_Menu *mn;
- E_Menu_Item *mi;
+ E_Menu *mn;
+ E_Menu_Item *mi;
mn = e_menu_new();
face->menu = mn;
@@ -368,45 +391,47 @@
e_menu_item_label_set(mi, _("Configuration"));
e_menu_item_callback_set(mi, _tclock_face_cb_menu_configure, face);
- /* Edit */
+ /* Edit */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Edit Mode"));
e_menu_item_callback_set(mi, _tclock_face_cb_menu_edit, face);
}
static void
-_tclock_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change
change)
+_tclock_face_cb_gmc_change(void *data, E_Gadman_Client * gmc,
+ E_Gadman_Change change)
{
- TClock_Face *face;
- Evas_Coord x, y, w, h;
+ TClock_Face *face;
+ Evas_Coord x, y, w, h;
face = data;
switch (change)
{
- case E_GADMAN_CHANGE_MOVE_RESIZE:
- e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
- evas_object_move(face->tclock_object, x, y);
- evas_object_move(face->event_object, x, y);
- evas_object_resize(face->tclock_object, w, h);
- evas_object_resize(face->event_object, w, h);
- break;
- case E_GADMAN_CHANGE_RAISE:
- evas_object_raise(face->tclock_object);
- evas_object_raise(face->event_object);
- break;
- case E_GADMAN_CHANGE_EDGE:
- case E_GADMAN_CHANGE_ZONE:
- /* FIXME
- * Must we do something here?
- */
- break;
+ case E_GADMAN_CHANGE_MOVE_RESIZE:
+ e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
+ evas_object_move(face->tclock_object, x, y);
+ evas_object_move(face->event_object, x, y);
+ evas_object_resize(face->tclock_object, w, h);
+ evas_object_resize(face->event_object, w, h);
+ break;
+ case E_GADMAN_CHANGE_RAISE:
+ evas_object_raise(face->tclock_object);
+ evas_object_raise(face->event_object);
+ break;
+ case E_GADMAN_CHANGE_EDGE:
+ case E_GADMAN_CHANGE_ZONE:
+ /* FIXME
+ * Must we do something here?
+ */
+ break;
}
}
static void
-_tclock_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+_tclock_face_cb_mouse_down(void *data, Evas * e, Evas_Object * obj,
+ void *event_info)
{
- TClock_Face *face;
+ TClock_Face *face;
Evas_Event_Mouse_Down *ev;
face = data;
@@ -414,28 +439,29 @@
if (ev->button == 3)
{
- e_menu_activate_mouse(face->menu, e_zone_current_get(face->con),
- ev->output.x, ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_container_fake_mouse_up_all_later(face->con);
+ e_menu_activate_mouse(face->menu, e_zone_current_get(face->con),
+ ev->output.x, ev->output.y, 1, 1,
+ E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+ e_util_container_fake_mouse_up_all_later(face->con);
}
}
static void
-_tclock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
+_tclock_face_cb_menu_edit(void *data, E_Menu * m, E_Menu_Item * mi)
{
- TClock_Face *face;
+ TClock_Face *face;
face = data;
e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT);
}
static void
-_tclock_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+_tclock_face_cb_menu_configure(void *data, E_Menu * m, E_Menu_Item * mi)
{
- TClock_Face *f;
+ TClock_Face *f;
f = data;
- if (!f) return;
+ if (!f)
+ return;
_config_tclock_module(f->con, f);
}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.h 8 Jan 2006 10:42:01 -0000 1.4
+++ e_mod_main.h 30 Jan 2006 03:16:42 -0000 1.5
@@ -10,56 +10,51 @@
#undef TCLOCK_DEBUG
#define TCLOCK_DEBUG(X)
-typedef struct _Config
-{
- Evas_List *faces;
- double poll_time;
-
-}Config;
-
-typedef struct _Config_Face
-{
- unsigned char enabled;
- unsigned int resolution;
- const char *format;
-}Config_Face;
-
-
-typedef struct _TClock
-{
- Evas_List *faces;
- E_Menu *config_menu;
- Config *conf;
-
- Ecore_Timer *tclock_check_timer;
-}TClock;
-
-typedef struct _TClock_Face
-{
- E_Container *con;
- E_Menu *menu;
- E_Menu *resolution_menu;
- Config_Face *conf;
- TClock *tclock;
-
- struct {
- Evas_Coord l, r, t, b;
- } inset;
-
- Evas_Object *tclock_object;
- Evas_Object *event_object;
- E_Gadman_Client *gmc;
-}TClock_Face;
+typedef struct _Config {
+ Evas_List *faces;
+ double poll_time;
+
+} Config;
+
+typedef struct _Config_Face {
+ unsigned char enabled;
+ unsigned int resolution;
+ const char *format;
+} Config_Face;
+
+typedef struct _TClock {
+ Evas_List *faces;
+ E_Menu *config_menu;
+ Config *conf;
+
+ Ecore_Timer *tclock_check_timer;
+} TClock;
+
+typedef struct _TClock_Face {
+ E_Container *con;
+ E_Menu *menu;
+ E_Menu *resolution_menu;
+ Config_Face *conf;
+ TClock *tclock;
+
+ struct {
+ Evas_Coord l, r, t, b;
+ } inset;
+
+ Evas_Object *tclock_object;
+ Evas_Object *event_object;
+ E_Gadman_Client *gmc;
+} TClock_Face;
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 _tclock_cb_config_updated(void *data);
+void _tclock_cb_config_updated(void *data);
#endif
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
