vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sebastians module patch, tidy up and fix clock faces + menus 

SVN revision: 13215
This commit is contained in:
handyande 2005-02-07 11:29:36 +00:00 committed by handyande
parent e0e6ee040d
commit e73892ca59
6 changed files with 338 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/battery/e_mod_main.c
View File

@ -16,7 +16,6 @@ static void _battery_face_init(Battery_Face *ef);
static void _battery_face_free(Battery_Face *ef);
static void _battery_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change);
static void _battery_cb_face_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static int _battery_cb_event_container_resize(void *data, int type, void *event);
static int _battery_cb_check(void *data);
static int _battery_linux_acpi_check(Battery_Face *ef);
static int _battery_linux_apm_check(Battery_Face *ef);
@ -407,7 +406,6 @@ _battery_config_menu_del(Battery *e, E_Menu *m)
static void
_battery_face_init(Battery_Face *ef)
{
Evas_Coord ww, hh, bw, bh;
Evas_Object *o;
evas_event_freeze(ef->evas);
@ -458,7 +456,7 @@ static void
_battery_face_free(Battery_Face *ef)
{
ecore_timer_del(ef->battery_check_timer);
e_object_del(ef->gmc);
e_object_del(E_OBJECT(ef->gmc));
evas_object_del(ef->bat_object);
evas_object_del(ef->event_object);
free(ef);
@ -691,7 +689,7 @@ _battery_linux_acpi_check(Battery_Face *ef)
}
if (level_unknown)
{
edje_object_part_text_set(ef->bat_object, "reading", "BAD DIRVER");
edje_object_part_text_set(ef->bat_object, "reading", "BAD DRIVER");
edje_object_part_text_set(ef->bat_object, "time", "--:--");
_battery_level_set(ef, 0.0);
}

274
src/modules/clock/e_mod_main.c
View File

@ -1,3 +1,6 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "e.h"
#include "e_mod_main.h"
@ -8,23 +11,28 @@
*/
/* module private routines */
static Clock *_clock_init(E_Module *m);
static void _clock_shutdown(Clock *e);
static E_Menu *_clock_config_menu_new(Clock *e);
static void _clock_config_menu_del(Clock *e, E_Menu *m);
static void _clock_face_init(Clock_Face *ef);
static void _clock_face_free(Clock_Face *ef);
static Clock *_clock_init(E_Module *module);
static void _clock_shutdown(Clock *clock);
static E_Menu *_clock_config_menu_new();
static void _clock_config_menu_del(E_Menu *menu);
static void _clock_face_init(Clock_Face *face);
static void _clock_face_free(Clock_Face *face);
static void _clock_face_enable(Clock_Face *face);
static void _clock_face_disable(Clock_Face *face);
static void _clock_face_menu_new(Clock_Face *face);
static void _clock_face_menu_del(E_Menu *menu);
static void _clock_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change);
static void _clock_cb_face_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi);
/* public module routines. all modules must have these */
void *
init(E_Module *m)
init(E_Module *module)
{
Clock *e;
Clock *clock;
/* check module api version */
if (m->api->version < E_MODULE_API_VERSION)
if (module->api->version < E_MODULE_API_VERSION)
{
e_error_dialog_show("Module API Error",
"Error initializing Module: Clock\n"
@ -32,56 +40,56 @@ init(E_Module *m)
"The module API advertized by Enlightenment is: %i.\n"
"Aborting module.",
E_MODULE_API_VERSION,
m->api->version);
module->api->version);
return NULL;
}
/* actually init clock */
e = _clock_init(m);
m->config_menu = _clock_config_menu_new(e);
return e;
module->config_menu = _clock_config_menu_new();
clock = _clock_init(module);
return clock;
}
int
shutdown(E_Module *m)
shutdown(E_Module *module)
{
Clock *e;
Clock *clock;
e = m->data;
if (e)
clock = module->data;
if (clock)
{
if (m->config_menu)
if (module->config_menu)
{
_clock_config_menu_del(e, m->config_menu);
m->config_menu = NULL;
_clock_config_menu_del(module->config_menu);
module->config_menu = NULL;
}
_clock_shutdown(e);
_clock_shutdown(clock);
}
return 1;
}
int
save(E_Module *m)
save(E_Module *module)
{
Clock *e;
Clock *clock;
e = m->data;
clock = module->data;
/* e_config_domain_save("module.clock", e->conf_edd, e->conf);*/
return 1;
}
int
info(E_Module *m)
info(E_Module *module)
{
char buf[4096];
m->label = strdup("Clock");
snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
m->icon_file = strdup(buf);
module->label = strdup("Clock");
snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(module));
module->icon_file = strdup(buf);
return 1;
}
int
about(E_Module *m)
about(E_Module *module)
{
e_error_dialog_show("Enlightenment Clock Module",
"A simple module to give E17 a clock.");
@ -90,13 +98,14 @@ about(E_Module *m)
/* module private routines */
static Clock *
_clock_init(E_Module *m)
_clock_init(E_Module *module)
{
Clock *e;
Clock *clock;
Evas_List *managers, *l, *l2;
E_Menu_Item *mi;
e = calloc(1, sizeof(Clock));
if (!e) return NULL;
clock = E_NEW(Clock, 1);
if (!clock) return NULL;
/*
e->conf_edd = E_CONFIG_DD_NEW("Clock_Config", Config);
@ -116,64 +125,69 @@ _clock_init(E_Module *m)
for (l2 = man->containers; l2; l2 = l2->next)
{
E_Container *con;
Clock_Face *ef;
Clock_Face *face;
con = l2->data;
ef = calloc(1, sizeof(Clock_Face));
if (ef)
face = E_NEW(Clock_Face, 1);
if (face)
{
ef->clock = e;
ef->con = con;
ef->evas = con->bg_evas;
_clock_face_init(ef);
e->face = ef;
/* FIXME : config */
face->enabled = 1;
face->clock = clock;
face->con = con;
e_object_ref(E_OBJECT(con));
face->evas = con->bg_evas;
_clock_face_init(face);
clock->faces = evas_list_append(clock->faces, face);
mi = e_menu_item_new(module->config_menu);
e_menu_item_label_set(mi, con->name);
e_menu_item_submenu_set(mi, face->menu);
}
}
}
return e;
return clock;
}
static void
_clock_shutdown(Clock *e)
_clock_shutdown(Clock *clock)
{
free(e->conf);
Evas_List *list;
free(clock->conf);
/* E_CONFIG_DD_FREE(e->conf_edd);*/
_clock_face_free(e->face);
free(e);
for (list = clock->faces; list; list = list->next)
_clock_face_free(list->data);
evas_list_free(clock->faces);
free(clock);
}
static E_Menu *
_clock_config_menu_new(Clock *e)
_clock_config_menu_new()
{
E_Menu *mn;
E_Menu_Item *mi;
/* FIXME: hook callbacks to each menu item */
mn = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "(Unused)");
/* e_menu_item_callback_set(mi, _clock_cb_time_set, e);*/
e->config_menu = mn;
return mn;
}
static void
_clock_config_menu_del(Clock *e, E_Menu *m)
_clock_config_menu_del(E_Menu *menu)
{
e_object_del(E_OBJECT(m));
e_object_del(E_OBJECT(menu));
}
static void
_clock_face_init(Clock_Face *ef)
_clock_face_init(Clock_Face *face)
{
Evas_Coord ww, hh, bw, bh;
Evas_Object *o;
evas_event_freeze(ef->evas);
o = edje_object_add(ef->evas);
ef->clock_object = o;
evas_event_freeze(face->evas);
o = edje_object_add(face->evas);
face->clock_object = o;
edje_object_file_set(o,
/* FIXME: "default.eet" needs to come from conf */
@ -181,77 +195,141 @@ _clock_face_init(Clock_Face *ef)
"modules/clock/main");
evas_object_show(o);
o = evas_object_rectangle_add(ef->evas);
ef->event_object = o;
o = evas_object_rectangle_add(face->evas);
face->event_object = o;
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, _clock_cb_face_down, ef);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _clock_face_cb_mouse_down, face);
evas_object_show(o);
ef->gmc = e_gadman_client_new(ef->con->gadman);
e_gadman_client_domain_set(ef->gmc, "module.clock", 0);
e_gadman_client_policy_set(ef->gmc,
face->gmc = e_gadman_client_new(face->con->gadman);
e_gadman_client_domain_set(face->gmc, "module.clock", 0);
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_client_min_size_set(ef->gmc, 4, 4);
e_gadman_client_max_size_set(ef->gmc, 512, 512);
e_gadman_client_auto_size_set(ef->gmc, 64, 64);
e_gadman_client_align_set(ef->gmc, 0.0, 1.0);
e_gadman_client_aspect_set(ef->gmc, 1.0, 1.0);
e_gadman_client_resize(ef->gmc, 64, 64);
e_gadman_client_change_func_set(ef->gmc, _clock_cb_gmc_change, ef);
e_gadman_client_load(ef->gmc);
evas_event_thaw(ef->evas);
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, 64, 64);
e_gadman_client_align_set(face->gmc, 0.0, 1.0);
e_gadman_client_aspect_set(face->gmc, 1.0, 1.0);
e_gadman_client_resize(face->gmc, 64, 64);
e_gadman_client_change_func_set(face->gmc, _clock_cb_gmc_change, face);
e_gadman_client_load(face->gmc);
_clock_face_menu_new(face);
evas_event_thaw(face->evas);
}
static void
_clock_face_free(Clock_Face *ef)
_clock_face_free(Clock_Face *face)
{
e_object_del(E_OBJECT(ef->gmc));
evas_object_del(ef->clock_object);
evas_object_del(ef->event_object);
free(ef);
e_object_del(E_OBJECT(face->gmc));
evas_object_del(face->clock_object);
evas_object_del(face->event_object);
_clock_face_menu_del(face->menu);
e_object_unref(E_OBJECT(face->con));
free(face);
}
static void
_clock_face_enable(Clock_Face *face)
{
face->enabled = 1;
evas_object_show(face->clock_object);
evas_object_show(face->event_object);
}
static void
_clock_face_disable(Clock_Face *face)
{
face->enabled = 0;
evas_object_hide(face->clock_object);
evas_object_hide(face->event_object);
}
static void
_clock_face_menu_new(Clock_Face *face)
{
E_Menu *mn;
E_Menu_Item *mi;
/* FIXME: hook callbacks to each menu item */
mn = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Enabled");
e_menu_item_check_set(mi, 1);
if (face->enabled) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _clock_face_cb_menu_enabled, face);
face->menu = mn;
}
static void
_clock_face_menu_del(E_Menu *menu)
{
e_object_del(E_OBJECT(menu));
}
static void
_clock_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change)
{
Clock_Face *ef;
Clock_Face *face;
Evas_Coord x, y, w, h;
ef = data;
face = data;
if (change == E_GADMAN_CHANGE_MOVE_RESIZE)
{
e_gadman_client_geometry_get(ef->gmc, &x, &y, &w, &h);
evas_object_move(ef->clock_object, x, y);
evas_object_move(ef->event_object, x, y);
evas_object_resize(ef->clock_object, w, h);
evas_object_resize(ef->event_object, w, h);
e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
evas_object_move(face->clock_object, x, y);
evas_object_move(face->event_object, x, y);
evas_object_resize(face->clock_object, w, h);
evas_object_resize(face->event_object, w, h);
}
else if (change == E_GADMAN_CHANGE_RAISE)
{
evas_object_raise(ef->clock_object);
evas_object_raise(ef->event_object);
evas_object_raise(face->clock_object);
evas_object_raise(face->event_object);
}
}
static void
_clock_cb_face_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
_clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Clock_Face *face;
Evas_Event_Mouse_Down *ev;
Clock_Face *ef;
face = data;
ev = event_info;
ef = data;
if (ev->button == 3)
{
e_menu_activate_mouse(ef->clock->config_menu, e_zone_current_get(ef->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);
e_util_container_fake_mouse_up_all_later(ef->con);
e_util_container_fake_mouse_up_all_later(face->con);
}
}
static void
_clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
unsigned char enabled;
face = data;
enabled = e_menu_item_toggle_get(mi);
if ((face->enabled) && (!enabled))
{
_clock_face_disable(face);
}
else if ((!face->enabled) && (enabled))
{
_clock_face_enable(face);
}
e_menu_item_toggle_set(mi, face->enabled);
}

19
src/modules/clock/e_mod_main.h
View File

@ -1,3 +1,6 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
@ -12,8 +15,7 @@ struct _Config
struct _Clock
{
E_Menu *config_menu;
Clock_Face *face;
Evas_List *faces;
/* E_Config_DD *conf_edd;*/
Config *conf;
@ -24,18 +26,19 @@ struct _Clock_Face
Clock *clock;
E_Container *con;
Evas *evas;
E_Menu *menu;
Evas_Object *clock_object;
Evas_Object *event_object;
E_Gadman_Client *gmc;
/* Ecore_Event_Handler *ev_handler_container_resize;*/
unsigned char enabled : 1;
};
EAPI void *init (E_Module *m);
EAPI int shutdown (E_Module *m);
EAPI int save (E_Module *m);
EAPI int info (E_Module *m);
EAPI int about (E_Module *m);
EAPI void *init (E_Module *module);
EAPI int shutdown (E_Module *module);
EAPI int save (E_Module *module);
EAPI int info (E_Module *module);
EAPI int about (E_Module *module);
#endif

185
src/modules/pager/e_mod_main.c
View File

@ -1,26 +1,30 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "e.h"
#include "e_mod_main.h"
/* TODO List:
*
* * Get E_EVENT_BORDER_ADD when a window is moved from one desk to another by the wm
*/
/* module private routines */
static Evas_List *_pager_init(E_Module *m);
static Evas_List *_pager_init(E_Module *module);
static void _pager_shutdown(Evas_List *pagers);
static E_Menu *_pager_config_menu_new();
static void _pager_config_menu_del(E_Menu *menu);
static Pager *_pager_new(E_Zone *zone);
static void _pager_destroy(Pager *pager);
static void _pager_menu_new(Pager *pager);
static void _pager_menu_del(E_Menu *menu);
static void _pager_enable(Pager *pager);
static void _pager_disable(Pager *pager);
static void _pager_zone_set(Pager *pager, E_Zone *zone);
static void _pager_zone_leave(Pager *pager);
static Pager_Desk *_pager_desk_new(Pager *pager, E_Desk *desk);
static Pager_Desk *_pager_desk_new(Pager *pager, E_Desk *desk, int x, int y);
static void _pager_desk_destroy(Pager_Desk *d);
static Pager_Win *_pager_window_new(Pager_Desk *owner, E_Border *border);
static void _pager_window_destroy(Pager_Win *win);
@ -41,14 +45,14 @@ static int _pager_cb_event_border_hide(void *data, int type, void *event
static int _pager_cb_event_border_show(void *data, int type, void *event);
static int _pager_cb_event_border_desk_set(void *data, int type, void *event);
static int _pager_cb_event_zone_desk_count_set(void *data, int type, void *event);
static void _pager_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi);
static int _pager_count;
/* public module routines. all modules must have these */
void *
init(E_Module *module)
{
Evas_List *pagers = NULL, *l;
Pager *pager;
Evas_List *pagers = NULL;
/* check module api version */
if (module->api->version < E_MODULE_API_VERSION)
@ -63,13 +67,9 @@ init(E_Module *module)
return NULL;
}
/* actually init pager */
pagers = _pager_init(module);
module->config_menu = _pager_config_menu_new();
pagers = _pager_init(module);
for (l = pagers; l; l = l->next) {
pager = l->data;
pager->config_menu = module->config_menu;
}
return pagers;
}
@ -114,7 +114,7 @@ info(E_Module *module)
}
int
about(E_Module *m)
about(E_Module *module)
{
e_error_dialog_show("Enlightenment Pager Module",
"A pager module to navigate E17 desktops.");
@ -123,7 +123,7 @@ about(E_Module *m)
/* module private routines */
static Evas_List *
_pager_init(E_Module *m)
_pager_init(E_Module *module)
{
Evas_List *pagers = NULL;
Evas_List *managers, *l, *l2, *l3;
@ -131,8 +131,11 @@ _pager_init(E_Module *m)
E_Container *con;
E_Zone *zone;
Pager *pager;
E_Menu *mn;
E_Menu_Item *mi;
_pager_count = 0;
/* e->conf_edd = E_CONFIG_DD_NEW("Pager_Config", Config);
#undef T
#undef D
@ -154,13 +157,29 @@ _pager_init(E_Module *m)
{
con = l2->data;
mi = e_menu_item_new(module->config_menu);
e_menu_item_label_set(mi, con->name);
mn = e_menu_new();
e_menu_item_submenu_set(mi, mn);
for (l3 = con->zones; l3; l3 = l3->next)
{
zone = l3->data;
pager = _pager_new(zone);
if (pager)
pagers = evas_list_append(pagers, pager);
{
/* FIXME : config */
pager->enabled = 1;
pagers = evas_list_append(pagers, pager);
_pager_menu_new(pager);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, zone->name);
e_menu_item_submenu_set(mi, pager->menu);
}
}
}
}
@ -175,9 +194,7 @@ _pager_shutdown(Evas_List *pagers)
/* E_CONFIG_DD_FREE(e->conf_edd);*/
for (list = pagers; list; list = list->next)
{
_pager_destroy(list->data);
}
_pager_destroy(list->data);
evas_list_free(pagers);
}
@ -185,13 +202,9 @@ static E_Menu *
_pager_config_menu_new()
{
E_Menu *mn;
E_Menu_Item *mi;
mn = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "(Unused)");
return mn;
}
@ -292,9 +305,92 @@ _pager_destroy(Pager *pager)
ecore_event_handler_del(pager->ev_handler_border_desk_set);
ecore_event_handler_del(pager->ev_handler_zone_desk_count_set);
_pager_menu_del(pager->menu);
E_FREE(pager);
}
static void
_pager_menu_new(Pager *pager)
{
E_Menu *mn;
E_Menu_Item *mi;
mn = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Enabled");
e_menu_item_check_set(mi, 1);
if (pager->enabled) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _pager_cb_menu_enabled, pager);
pager->menu = mn;
}
static void
_pager_menu_del(E_Menu *menu)
{
e_object_del(E_OBJECT(menu));
}
static void
_pager_enable(Pager *pager)
{
Evas_List *desks, *wins;
Pager_Desk *pd;
Pager_Win *pw;
pager->enabled = 1;
evas_object_show(pager->base);
evas_object_show(pager->screen);
for (desks = pager->desks; desks; desks = desks->next)
{
pd = desks->data;
evas_object_show(pd->obj);
for (wins = pd->wins; wins; wins = wins->next)
{
pw = wins->data;
if (!pw->border->iconic)
{
evas_object_show(pw->obj);
if (pw->icon)
evas_object_show(pw->icon);
}
}
}
}
static void
_pager_disable(Pager *pager)
{
Evas_List *desks, *wins;
Pager_Desk *pd;
Pager_Win *pw;
pager->enabled = 0;
evas_object_hide(pager->base);
evas_object_hide(pager->screen);
for (desks = pager->desks; desks; desks = desks->next)
{
pd = desks->data;
evas_object_hide(pd->obj);
for (wins = pd->wins; wins; wins = wins->next)
{
pw = wins->data;
if (!pw->border->iconic)
{
evas_object_hide(pw->obj);
if (pw->icon)
evas_object_hide(pw->icon);
}
}
}
}
static void
_pager_zone_set(Pager *pager, E_Zone *zone)
{
@ -315,7 +411,7 @@ _pager_zone_set(Pager *pager, E_Zone *zone)
E_Desk *desk;
desk = e_desk_at_xy_get(zone, x, y);
pd = _pager_desk_new(pager, desk);
pd = _pager_desk_new(pager, desk, x, y);
pager->desks = evas_list_append(pager->desks, pd);
}
evas_object_resize(pager->base, pager->fw * desks_x, pager->fh * desks_y);
@ -328,14 +424,12 @@ _pager_zone_leave(Pager *pager)
e_object_unref(E_OBJECT(pager->zone));
for (list = pager->desks; list; list = list->next)
{
_pager_desk_destroy(list->data);
}
_pager_desk_destroy(list->data);
evas_list_free(pager->desks);
}
static Pager_Desk *
_pager_desk_new(Pager *pager, E_Desk *desk)
_pager_desk_new(Pager *pager, E_Desk *desk, int xpos, int ypos)
{
Pager_Desk *pd;
Pager_Win *pw;
@ -344,20 +438,10 @@ _pager_desk_new(Pager *pager, E_Desk *desk)
Evas_Object *o;
Evas_List *wins;
int xpos, ypos, xcount, ycount;
pd = E_NEW(Pager_Desk, 1);
e_zone_desk_count_get(desk->zone, &xcount, &ycount);
for (xpos = 0; xpos < xcount; xpos++)
for (ypos = 0; ypos < ycount; ypos++)
{
if (desk == e_desk_at_xy_get(desk->zone, xpos, ypos))
{
pd->xpos = xpos;
pd->ypos = ypos;
break;
}
}
pd->xpos = xpos;
pd->ypos = ypos;
if (desk == e_desk_current_get(desk->zone))
{
pd->current = 1;
@ -408,9 +492,7 @@ _pager_desk_destroy(Pager_Desk *desk)
e_object_unref(E_OBJECT(desk->desk));
for (list = desk->wins; list; list = list->next)
{
_pager_window_destroy(list->data);
}
_pager_window_destroy(list->data);
evas_list_free(desk->wins);
E_FREE(desk);
}
@ -527,7 +609,7 @@ _pager_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
pager = data;
if (ev->button == 3)
{
e_menu_activate_mouse(pager->config_menu, pager->zone,
e_menu_activate_mouse(pager->menu, pager->zone,
ev->output.x, ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN);
e_util_container_fake_mouse_up_all_later(pager->zone->container);
@ -842,7 +924,7 @@ _pager_cb_event_zone_desk_count_set(void *data, int type, void *event)
{
/* Add desk */
desk = e_desk_at_xy_get(ev->zone, x, y);
pd = _pager_desk_new(pager, desk);
pd = _pager_desk_new(pager, desk, x, y);
pager->desks = evas_list_append(pager->desks, pd);
}
else if ((x >= desks_x) || (y >= desks_y))
@ -871,3 +953,22 @@ _pager_cb_event_zone_desk_count_set(void *data, int type, void *event)
_pager_draw(pager);
return 1;
}
static void
_pager_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi)
{
Pager *pager;
unsigned char enabled;
pager = data;
enabled = e_menu_item_toggle_get(mi);
if ((pager->enabled) && (!enabled))
{
_pager_disable(pager);
}
else if ((!pager->enabled) && (enabled))
{
_pager_enable(pager);
}
e_menu_item_toggle_set(mi, pager->enabled);
}

7
src/modules/pager/e_mod_main.h
View File

@ -1,3 +1,6 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
@ -16,7 +19,7 @@ struct _Pager
E_Zone *zone;
Evas_List *desks;
E_Menu *config_menu;
E_Menu *menu;
Evas *evas;
Evas_Object *base, *screen;
@ -28,6 +31,8 @@ struct _Pager
/* Current nr. of desktops */
int xnum, ynum;
unsigned char enabled : 1;
Ecore_Event_Handler *ev_handler_border_resize;
Ecore_Event_Handler *ev_handler_border_move;

2
src/modules/temperature/e_mod_main.c
View File

@ -14,7 +14,6 @@ static E_Menu *_temperature_config_menu_new(Temperature *e);
static void _temperature_config_menu_del(Temperature *e, E_Menu *m);
static void _temperature_face_init(Temperature_Face *ef);
static void _temperature_face_free(Temperature_Face *ef);
static void _temperature_face_reconfigure(Temperature_Face *ef);
static void _temperature_cb_face_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _temperature_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change);
static int _temperature_cb_check(void *data);
@ -556,7 +555,6 @@ _temperature_config_menu_del(Temperature *e, E_Menu *m)
static void
_temperature_face_init(Temperature_Face *ef)
{
Evas_Coord ww, hh, bw, bh;
Evas_Object *o;
evas_event_freeze(ef->evas);