Back with another one of those blockrockin' BUILDS :o)

* Should compile against new ecore. Yay!
* Cleaned up iconbar code a good deal (no c++ comments!)


SVN revision: 5511
devs/princeamd/enlightenment-0.17-elive
cpk 21 years ago committed by cpk
parent c8e0c7f7be
commit 27379cbd44
  1. 100
      src/actions.c
  2. 6
      src/actions.h
  3. 604
      src/border.c
  4. 2
      src/border.h
  5. 4
      src/config.h
  6. 36
      src/cursors.c
  7. 4
      src/delayed.c
  8. 58
      src/desktops.c
  9. 8
      src/e.h
  10. 34
      src/entry.c
  11. 2
      src/entry.h
  12. 5
      src/exec.c
  13. 22
      src/fs.c
  14. 176
      src/guides.c
  15. 122
      src/icccm.c
  16. 2
      src/icccm.h
  17. 977
      src/iconbar.c
  18. 137
      src/iconbar.h
  19. 32
      src/keys.c
  20. 6
      src/keys.h
  21. 33
      src/main.c
  22. 2
      src/match.c
  23. 126
      src/menu.c
  24. 10
      src/menubuild.c
  25. 46
      src/place.c
  26. 4
      src/util.c
  27. 264
      src/view.c
  28. 2
      src/view.h

@ -13,7 +13,7 @@ static Evas_List action_impls = NULL;
static Evas_List current_actions = NULL;
static Evas_List current_timers = NULL;
static void e_action_find(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, void *o);
static void e_action_find(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o);
static void e_action_free(E_Action *a);
static void e_act_move_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry);
@ -68,7 +68,7 @@ static void e_act_desk_start (void *o, E_Action *a, void *data, int x, int y, in
static void e_act_raise_next_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry);
static void
e_action_find(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, void *o)
e_action_find(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o)
{
char *actions_db;
E_DB_File *db;
@ -140,9 +140,9 @@ e_action_find(char *action, E_Action_Type act, int button, char *key, Ev_Key_Mod
if ((a->key) && (strlen(a->key) > 0))
{
if (a->modifiers == -1)
e_keys_grab(a->key, EV_KEY_MODIFIER_NONE, 1);
ecore_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
else
e_keys_grab(a->key, (Ev_Key_Modifiers)a->modifiers, 0);
ecore_keys_grab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
a->grabbed = 1;
}
}
@ -210,9 +210,9 @@ e_action_free(E_Action *a)
if ((a->key) && (strlen(a->key) > 0) && (a->grabbed))
{
if (a->modifiers == -1)
e_keys_ungrab(a->key, EV_KEY_MODIFIER_NONE, 1);
ecore_keys_ungrab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
else
e_keys_ungrab(a->key, (Ev_Key_Modifiers)a->modifiers, 0);
ecore_keys_ungrab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
}
IF_FREE(a->name);
IF_FREE(a->action);
@ -222,7 +222,7 @@ e_action_free(E_Action *a)
}
void
e_action_start(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry)
e_action_start(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry)
{
Evas_List l;
@ -260,7 +260,7 @@ e_action_start(char *action, E_Action_Type act, int button, char *key, Ev_Key_Mo
}
void
e_action_stop(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry)
e_action_stop(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry)
{
Evas_List l;
@ -327,7 +327,7 @@ e_action_stop(char *action, E_Action_Type act, int button, char *key, Ev_Key_Mod
}
void
e_action_cont(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods,
e_action_cont(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods,
void *o, void *data, int x, int y, int rx, int ry, int dx, int dy)
{
Evas_List l;
@ -442,7 +442,7 @@ e_action_del_timer(void *o, char *name)
(at->name) &&
(!strcmp(at->name, name)))
{
e_del_event_timer(at->name);
ecore_del_event_timer(at->name);
current_timers = evas_list_remove(current_timers, at);
IF_FREE(at->name);
FREE(at);
@ -475,7 +475,7 @@ e_action_del_timer_object(void *o)
at = l->data;
if (at->object == o)
{
e_del_event_timer(at->name);
ecore_del_event_timer(at->name);
current_timers = evas_list_remove(current_timers, at);
IF_FREE(at->name);
FREE(at);
@ -669,13 +669,13 @@ e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int
if (b->current.shaded != 0) return;
if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */
e_window_gravity_set(b->win.client, StaticGravity);
e_window_gravity_set(b->win.l, NorthWestGravity);
e_window_gravity_set(b->win.r, SouthEastGravity);
e_window_gravity_set(b->win.t, NorthWestGravity);
e_window_gravity_set(b->win.b, SouthEastGravity);
e_window_gravity_set(b->win.input, NorthWestGravity);
e_window_gravity_set(b->win.container, NorthWestGravity);
ecore_window_gravity_set(b->win.client, StaticGravity);
ecore_window_gravity_set(b->win.l, NorthWestGravity);
ecore_window_gravity_set(b->win.r, SouthEastGravity);
ecore_window_gravity_set(b->win.t, NorthWestGravity);
ecore_window_gravity_set(b->win.b, SouthEastGravity);
ecore_window_gravity_set(b->win.input, NorthWestGravity);
ecore_window_gravity_set(b->win.container, NorthWestGravity);
/* 1 | 2 */
/* --+-- */
/* 3 | 4 */
@ -685,13 +685,13 @@ e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int
{
b->mode.resize = 4;
/* e_border_set_gravity(b, NorthWestGravity); */
/* e_window_gravity_set(b->win.container, SouthEastGravity);*/
/* ecore_window_gravity_set(b->win.container, SouthEastGravity);*/
}
else
{
b->mode.resize = 2;
/* e_border_set_gravity(b, SouthWestGravity);*/
/* e_window_gravity_set(b->win.container, NorthEastGravity);*/
/* ecore_window_gravity_set(b->win.container, NorthEastGravity);*/
}
}
else
@ -700,13 +700,13 @@ e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int
{
b->mode.resize = 3;
/* e_border_set_gravity(b, NorthEastGravity);*/
/* e_window_gravity_set(b->win.container, SouthWestGravity);*/
/* ecore_window_gravity_set(b->win.container, SouthWestGravity);*/
}
else
{
b->mode.resize = 1;
/* e_border_set_gravity(b, SouthEastGravity);*/
/* e_window_gravity_set(b->win.container, NorthWestGravity); */
/* ecore_window_gravity_set(b->win.container, NorthWestGravity); */
}
}
{
@ -749,7 +749,7 @@ e_act_resize_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int
b->mode.resize = 0;
b->changed = 1;
e_border_adjust_limits(b);
e_window_gravity_set(b->win.client, NorthWestGravity);
ecore_window_gravity_set(b->win.client, NorthWestGravity);
e_border_set_gravity(b, NorthWestGravity);
e_guides_hide();
return;
@ -840,13 +840,13 @@ e_act_resize_h_start (void *o, E_Action *a, void *data, int x, int y, int rx, in
if (b->current.shaded != 0) return;
if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */
e_window_gravity_set(b->win.client, StaticGravity);
e_window_gravity_set(b->win.l, NorthWestGravity);
e_window_gravity_set(b->win.r, SouthEastGravity);
e_window_gravity_set(b->win.t, NorthWestGravity);
e_window_gravity_set(b->win.b, SouthEastGravity);
e_window_gravity_set(b->win.input, NorthWestGravity);
e_window_gravity_set(b->win.container, NorthWestGravity);
ecore_window_gravity_set(b->win.client, StaticGravity);
ecore_window_gravity_set(b->win.l, NorthWestGravity);
ecore_window_gravity_set(b->win.r, SouthEastGravity);
ecore_window_gravity_set(b->win.t, NorthWestGravity);
ecore_window_gravity_set(b->win.b, SouthEastGravity);
ecore_window_gravity_set(b->win.input, NorthWestGravity);
ecore_window_gravity_set(b->win.container, NorthWestGravity);
/* 5 | 6 */
if (x > (b->current.w / 2))
{
@ -898,7 +898,7 @@ e_act_resize_h_stop (void *o, E_Action *a, void *data, int x, int y, int rx, in
b->mode.resize = 0;
b->changed = 1;
e_border_adjust_limits(b);
e_window_gravity_set(b->win.client, NorthWestGravity);
ecore_window_gravity_set(b->win.client, NorthWestGravity);
e_border_set_gravity(b, NorthWestGravity);
e_guides_hide();
return;
@ -974,13 +974,13 @@ e_act_resize_v_start (void *o, E_Action *a, void *data, int x, int y, int rx, in
if (b->current.shaded != 0) return;
if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */
e_window_gravity_set(b->win.client, StaticGravity);
e_window_gravity_set(b->win.l, NorthWestGravity);
e_window_gravity_set(b->win.r, SouthEastGravity);
e_window_gravity_set(b->win.t, NorthWestGravity);
e_window_gravity_set(b->win.b, SouthEastGravity);
e_window_gravity_set(b->win.input, NorthWestGravity);
e_window_gravity_set(b->win.container, NorthWestGravity);
ecore_window_gravity_set(b->win.client, StaticGravity);
ecore_window_gravity_set(b->win.l, NorthWestGravity);
ecore_window_gravity_set(b->win.r, SouthEastGravity);
ecore_window_gravity_set(b->win.t, NorthWestGravity);
ecore_window_gravity_set(b->win.b, SouthEastGravity);
ecore_window_gravity_set(b->win.input, NorthWestGravity);
ecore_window_gravity_set(b->win.container, NorthWestGravity);
/* 7 */
/* - */
/* 8 */
@ -1033,7 +1033,7 @@ e_act_resize_v_stop (void *o, E_Action *a, void *data, int x, int y, int rx, in
b->current.requested.h = b->current.h;
b->mode.resize = 0;
e_border_adjust_limits(b);
e_window_gravity_set(b->win.client, NorthWestGravity);
ecore_window_gravity_set(b->win.client, NorthWestGravity);
e_border_set_gravity(b, NorthWestGravity);
b->changed = 1;
e_guides_hide();
@ -1115,7 +1115,7 @@ e_act_kill_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry
if (!b) b = e_border_current_focused();
if (!b) return;
if (b->client.is_desktop) return;
if (b->win.client) e_window_kill_client(b->win.client);
if (b->win.client) ecore_window_kill_client(b->win.client);
return;
UN(a);
UN(data);
@ -1142,13 +1142,13 @@ e_act_cb_shade(int val, void *data)
if (val == 0)
{
OBJ_REF(b);
t = e_get_time();
e_window_gravity_set(b->win.client, SouthWestGravity);
t = ecore_get_time();
ecore_window_gravity_set(b->win.client, SouthWestGravity);
e_action_del_timer(b, "shader");
e_action_add_timer(b, "shader");
}
dif = e_get_time() - t;
dif = ecore_get_time() - t;
si = (int)(dif * (double)pix_per_sec);
if (si > b->client.h) si = b->client.h;
@ -1157,11 +1157,11 @@ e_act_cb_shade(int val, void *data)
e_border_adjust_limits(b);
e_border_apply_border(b);
if (si < b->client.h)
e_add_event_timer("shader", 0.01, e_act_cb_shade, 1, data);
ecore_add_event_timer("shader", 0.01, e_act_cb_shade, 1, data);
else
{
e_action_del_timer(b, "shader");
e_window_gravity_reset(b->win.client);
ecore_window_gravity_reset(b->win.client);
OBJ_UNREF(b);
}
}
@ -1183,13 +1183,13 @@ e_act_cb_unshade(int val, void *data)
if (val == 0)
{
OBJ_REF(b);
t = e_get_time();
e_window_gravity_set(b->win.client, SouthWestGravity);
t = ecore_get_time();
ecore_window_gravity_set(b->win.client, SouthWestGravity);
e_action_del_timer(b, "shader");
e_action_add_timer(b, "shader");
}
dif = e_get_time() - t;
dif = ecore_get_time() - t;
si = b->client.h - (int)(dif * (double)pix_per_sec);
if (si < 0) si = 0;
@ -1199,11 +1199,11 @@ e_act_cb_unshade(int val, void *data)
e_border_adjust_limits(b);
e_border_apply_border(b);
if (si > 0)
e_add_event_timer("shader", 0.01, e_act_cb_unshade, 1, data);
ecore_add_event_timer("shader", 0.01, e_act_cb_unshade, 1, data);
else
{
e_action_del_timer(b, "shader");
e_window_gravity_reset(b->win.client);
ecore_window_gravity_reset(b->win.client);
OBJ_UNREF(b);
}
}

@ -57,13 +57,13 @@ struct _E_Action_Impl
void e_action_start(char *action, E_Action_Type act, int button, char *key,
Ev_Key_Modifiers mods, void *o, void *data,
Ecore_Event_Key_Modifiers mods, void *o, void *data,
int x, int y, int rx, int ry);
void e_action_stop(char *action, E_Action_Type act, int button, char *key,
Ev_Key_Modifiers mods, void *o, void *data,
Ecore_Event_Key_Modifiers mods, void *o, void *data,
int x, int y, int rx, int ry);
void e_action_cont(char *action, E_Action_Type act, int button, char *key,
Ev_Key_Modifiers mods, void *o, void *data,
Ecore_Event_Key_Modifiers mods, void *o, void *data,
int x, int y, int rx, int ry, int dx, int dy);
void e_action_stop_by_object(void *o, void *data, int x, int y, int rx, int ry);
void e_action_stop_by_type(char *action);

File diff suppressed because it is too large Load Diff

@ -14,7 +14,7 @@ typedef struct _E_Border E_Border;
struct _E_Grab
{
int button;
Ev_Key_Modifiers mods;
Ecore_Event_Key_Modifiers mods;
int any_mod;
int remove_after;
int allow;

@ -39,7 +39,7 @@ static E_Config_File _var = {_src, 0.0}
#define E_CONFIG_CHECK_VALIDITY(_var, _src) \
{ \
double __time; \
__time = e_get_time(); \
__time = ecore_get_time(); \
if (_var.last_fetch < (__time - 5.0)) { \
_var.last_fetch = __time;
#define E_CONFIG_CHECK_VALIDITY_END \
@ -85,7 +85,7 @@ static E_Config_Element _var = { _src, _key, 0.0, E_CFG_DATAT_T, \
#define E_CFG_VALIDITY_CHECK(_var) \
{ \
double __time; \
__time = e_get_time(); \
__time = ecore_get_time(); \
if (_var.last_fetch < (__time - 5.0)) { \
int __cfg_ok = 0; \
_var.last_fetch = __time;

@ -68,7 +68,7 @@ e_cursors_find(char *type)
{
cursors = evas_list_remove(cursors, c);
IF_FREE(c->type);
e_cursor_free(c->cursor);
ecore_cursor_free(c->cursor);
FREE(c);
return NULL;
}
@ -117,8 +117,8 @@ e_cursors_display_in_window(Window win, char *type)
imlib_context_set_image(im);
w = imlib_image_get_width();
h = imlib_image_get_height();
pmap = e_pixmap_new(0, w, h, 1);
mask = e_pixmap_new(0, w, h, 1);
pmap = ecore_pixmap_new(0, w, h, 1);
mask = ecore_pixmap_new(0, w, h, 1);
data = imlib_image_get_data_for_reading_only();
/* figure out fg & bg */
@ -166,14 +166,14 @@ e_cursors_display_in_window(Window win, char *type)
/* use XImages & XShm */
/* get some gc's set up */
gcb = e_gc_new(pmap);
gcf = e_gc_new(pmap);
e_gc_set_fg(gcb, 0);
e_gc_set_fg(gcf, 1);
gcb = ecore_gc_new(pmap);
gcf = ecore_gc_new(pmap);
ecore_gc_set_fg(gcb, 0);
ecore_gc_set_fg(gcf, 1);
/* fill out cursor pixmap with 0's (bg) */
e_fill_rectangle(pmap, gcb, 0, 0, w, h);
e_fill_rectangle(mask, gcb, 0, 0, w, h);
ecore_fill_rectangle(pmap, gcb, 0, 0, w, h);
ecore_fill_rectangle(mask, gcb, 0, 0, w, h);
if (!data) goto done2;
for (y = 0; y < h; y++)
{
@ -190,16 +190,16 @@ e_cursors_display_in_window(Window win, char *type)
if (a > 127)
{
e_draw_point(mask, gcf, x, y);
ecore_draw_point(mask, gcf, x, y);
if ((r == fr) && (g == fg) && (b == fb))
e_draw_point(pmap, gcf, x, y);
ecore_draw_point(pmap, gcf, x, y);
}
}
}
done2:
/* clean up */
e_gc_free(gcb);
e_gc_free(gcf);
ecore_gc_free(gcb);
ecore_gc_free(gcf);
imlib_image_put_back_data(data);
imlib_free_image();
@ -212,14 +212,14 @@ e_cursors_display_in_window(Window win, char *type)
}
if (c)
{
c->cursor = e_cursor_new(pmap, mask, hx, hy, fr, fg, fb, br, bg, bb);
e_pixmap_free(pmap);
e_pixmap_free(mask);
c->cursor = ecore_cursor_new(pmap, mask, hx, hy, fr, fg, fb, br, bg, bb);
ecore_pixmap_free(pmap);
ecore_pixmap_free(mask);
cursors = evas_list_append(cursors, c);
}
}
if (c)
e_cursor_set(win, c->cursor);
ecore_cursor_set(win, c->cursor);
else
{
if (!strcmp(type, "Default")) return;
@ -239,6 +239,6 @@ e_cursors_display(char *type)
void
e_cursors_init(void)
{
e_event_filter_idle_handler_add(e_cursors_idle, NULL);
ecore_event_filter_idle_handler_add(e_cursors_idle, NULL);
e_cursors_set("Default");
}

@ -8,7 +8,7 @@ e_delayed_action_start(void *obs, void *obj)
E_Delayed_Action *eda = obs;
snprintf(event_name, 1024, "_e_delayed_action_notify(%d)", eda->e_event);
e_add_event_timer(event_name, eda->delay, eda->delay_func, 0, obj);
ecore_add_event_timer(event_name, eda->delay, eda->delay_func, 0, obj);
}
void
@ -17,7 +17,7 @@ e_delayed_action_cancel(void *obs)
E_Delayed_Action *eda = obs;
char event_name[1024];
snprintf(event_name, 1024, "_e_delayed_action_notify(%d)", eda->e_event);
e_del_event_timer(event_name);
ecore_del_event_timer(event_name);
}
void

@ -11,10 +11,10 @@ static Evas_List desktops = NULL;
static Window e_base_win = 0;
static int screen_w, screen_h;
static void e_idle(void *data);
static void ecore_idle(void *data);
static void
e_idle(void *data)
ecore_idle(void *data)
{
e_db_flush();
return;
@ -26,12 +26,12 @@ e_desktops_init(void)
{
E_Desktop *desk;
e_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h);
e_base_win = e_window_override_new(0, 0, 0, screen_w, screen_h);
e_window_show(e_base_win);
ecore_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h);
e_base_win = ecore_window_override_new(0, 0, 0, screen_w, screen_h);
ecore_window_show(e_base_win);
desk = e_desktops_new();
e_desktops_show(desk);
e_event_filter_idle_handler_add(e_idle, NULL);
ecore_event_filter_idle_handler_add(ecore_idle, NULL);
e_icccm_advertise_e_compat();
e_icccm_advertise_mwm_compat();
@ -101,13 +101,13 @@ e_desktops_scroll(E_Desktop *desk, int dx, int dy)
b = l->data;
/* if sticky */
if ((b->client.sticky) && (!b->mode.move))
e_window_gravity_set(b->win.main, StaticGravity);
ecore_window_gravity_set(b->win.main, StaticGravity);
else
e_window_gravity_set(b->win.main, grav);
ecore_window_gravity_set(b->win.main, grav);
}
grav_stick = StaticGravity;
/* scroll */
e_window_move_resize(desk->win.container,
ecore_window_move_resize(desk->win.container,
xd, yd,
screen_w + wd, screen_h + hd);
/* reset */
@ -118,18 +118,18 @@ e_desktops_scroll(E_Desktop *desk, int dx, int dy)
b = l->data;
/* if sticky */
if (b->client.sticky)
e_window_gravity_set(b->win.main, StaticGravity);
ecore_window_gravity_set(b->win.main, StaticGravity);
else
e_window_gravity_set(b->win.main, grav_stick);
/* e_window_gravity_set(b->win.main, grav_stick);*/
ecore_window_gravity_set(b->win.main, grav_stick);
/* ecore_window_gravity_set(b->win.main, grav_stick);*/
}
e_window_move_resize(desk->win.container, 0, 0, screen_w, screen_h);
ecore_window_move_resize(desk->win.container, 0, 0, screen_w, screen_h);
for (l = desk->windows; l; l = l->next)
{
E_Border *b;
b = l->data;
e_window_gravity_reset(b->win.main);
ecore_window_gravity_reset(b->win.main);
if ((!b->client.sticky) && (!b->mode.move))
{
b->current.requested.x += dx;
@ -157,12 +157,12 @@ e_desktops_free(E_Desktop *desk)
OBJ_UNREF(b);
OBJ_IF_FREE(b)
{
e_window_reparent(b->win.client, 0, 0, 0);
ecore_window_reparent(b->win.client, 0, 0, 0);
e_icccm_release(b->win.client);
OBJ_FREE(b);
}
}
e_window_destroy(desk->win.main);
ecore_window_destroy(desk->win.main);
IF_FREE(desk->name);
IF_FREE(desk->dir);
FREE(desk);
@ -194,13 +194,13 @@ e_desktops_init_file_display(E_Desktop *desk)
}
e_view_realize(v);
e_window_hint_set_borderless(v->win.base);
e_window_hint_set_sticky(v->win.base, 1);
e_window_hint_set_layer(v->win.base, 1);
e_window_set_title(v->win.base, "Desktop");
e_window_set_name_class(v->win.base, "FileView", "Desktop");
e_window_set_min_size(v->win.base, desk->real.w, desk->real.h);
e_window_set_max_size(v->win.base, desk->real.w, desk->real.h);
ecore_window_hint_set_borderless(v->win.base);
ecore_window_hint_set_sticky(v->win.base, 1);
ecore_window_hint_set_layer(v->win.base, 1);
ecore_window_set_title(v->win.base, "Desktop");
ecore_window_set_name_class(v->win.base, "FileView", "Desktop");
ecore_window_set_min_size(v->win.base, desk->real.w, desk->real.h);
ecore_window_set_max_size(v->win.base, desk->real.w, desk->real.h);
b = e_border_adopt(v->win.base, 1);
b->client.sticky = 1;
b->client.fixed = 1;
@ -219,11 +219,11 @@ e_desktops_new(void)
OBJ_INIT(desk, e_desktops_free);
desk->win.main = e_window_override_new(e_base_win, 0, 0, screen_w, screen_h);
desk->win.container = e_window_override_new(desk->win.main, 0, 0, screen_w, screen_h);
e_window_lower(desk->win.container);
desk->win.main = ecore_window_override_new(e_base_win, 0, 0, screen_w, screen_h);
desk->win.container = ecore_window_override_new(desk->win.main, 0, 0, screen_w, screen_h);
ecore_window_lower(desk->win.container);
e_window_show(desk->win.container);
ecore_window_show(desk->win.container);
desk->x = 0;
desk->y = 0;
@ -265,13 +265,13 @@ e_desktops_delete(E_Desktop *d)
void
e_desktops_show(E_Desktop *d)
{
e_window_show(d->win.main);
ecore_window_show(d->win.main);
}
void
e_desktops_hide(E_Desktop *d)
{
e_window_hide(d->win.main);
ecore_window_hide(d->win.main);
}
int

@ -57,11 +57,11 @@ E_Prof __p, *__pp; \
Evas_List __pl; \
__p.func = _prof_func; \
__p.total = 0.0; \
__p.t1 = e_get_time(); \
__p.t1 = ecore_get_time(); \
__p.t2 = 0.0;
#define E_PROF_STOP \
__p.t2 = e_get_time(); \
__p.t2 = ecore_get_time(); \
for (__pl = __e_profiles; __pl; __pl = __pl->next) \
{ \
__pp = __pl->data; \
@ -100,7 +100,7 @@ printf("%3.3f : %s()\n", __p->total, __p->func); \
/* Observer macros */
#define OBS_PROPERTIES \
Evas_List watched; \
Eevent_Type e_event; \
Ecore_Event_Type e_event; \
void (*e_obs_notify)(void *_e_obs, void *_e_obj); \
void (*e_obs_free)(void *_e_obs);
#define OBS_INIT(_e_obs, _e_event, _e_obs_notify, _e_obs_free) \
@ -125,7 +125,7 @@ void (*e_obs_free)(void *_e_obs);
Evas_List obs; \
obs = _e_obj->observers; \
while (obs) { \
if (((E_Observer *)obs->data)->e_event == EV_MAX || \
if (((E_Observer *)obs->data)->e_event == ECORE_EVENT_MAX || \
((E_Observer *)obs->data)->e_event == _e_event) \
((E_Observer *)obs->data)->e_obs_notify(obs->data, _e_obj); \
obs = obs->next; \

@ -4,8 +4,8 @@
static Evas_List entries;
static void e_clear_selection(Eevent * ev);
static void e_paste_request(Eevent * ev);
static void e_clear_selection(Ecore_Event * ev);
static void e_paste_request(Ecore_Event * ev);
static void e_entry_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
static void e_entry_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
@ -15,9 +15,9 @@ static void e_entry_unrealize(E_Entry *entry);
static void e_entry_configure(E_Entry *entry);
static void
e_clear_selection(Eevent * ev)
e_clear_selection(Ecore_Event * ev)
{
Ev_Clear_Selection *e;
Ecore_Event_Clear_Selection *e;
Evas_List l;
e = ev->event;
@ -28,7 +28,7 @@ e_clear_selection(Eevent * ev)
entry = l->data;
if (entry->selection_win == e->win)
{
e_window_destroy(entry->selection_win);
ecore_window_destroy(entry->selection_win);
entry->selection_win = 0;
entry->select.start = -1;
entry->select.length = 0;
@ -38,9 +38,9 @@ e_clear_selection(Eevent * ev)
}
static void
e_paste_request(Eevent * ev)
e_paste_request(Ecore_Event * ev)
{
Ev_Paste_Request *e;
Ecore_Event_Paste_Request *e;
Evas_List l;
e = ev->event;
@ -69,8 +69,8 @@ e_entry_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
entry = _data;
if ((_b == 2) && (!entry->mouse_down))
{
if (entry->paste_win) e_window_destroy(entry->paste_win);
entry->paste_win = e_selection_request();
if (entry->paste_win) ecore_window_destroy(entry->paste_win);
entry->paste_win = ecore_selection_request();
}
else if (!entry->mouse_down)
{
@ -185,8 +185,8 @@ e_entry_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
str2 = e_entry_get_selection(entry);
if (str2)
{
if (entry->selection_win) e_window_destroy(entry->selection_win);
entry->selection_win = e_selection_set(str2);
if (entry->selection_win) ecore_window_destroy(entry->selection_win);
entry->selection_win = ecore_selection_set(str2);
free(str2);
}
}
@ -359,8 +359,8 @@ e_entry_configure(E_Entry *entry)
void
e_entry_init(void)
{
e_event_filter_handler_add(EV_PASTE_REQUEST, e_paste_request);
e_event_filter_handler_add(EV_CLEAR_SELECTION, e_clear_selection);
ecore_event_filter_handler_add(ECORE_EVENT_PASTE_REQUEST, e_paste_request);
ecore_event_filter_handler_add(ECORE_EVENT_CLEAR_SELECTION, e_clear_selection);
}
void
@ -387,7 +387,7 @@ e_entry_new(void)
}
void
e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e)
e_entry_handlecore_keypress(E_Entry *entry, Ecore_Event_Key_Down *e)
{
if (!entry->focused) return;
if (!strcmp(e->key, "Up"))
@ -428,8 +428,8 @@ e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e)
}
else if (!strcmp(e->key, "Insert"))
{
if (entry->paste_win) e_window_destroy(entry->paste_win);
entry->paste_win = e_selection_request();
if (entry->paste_win) ecore_window_destroy(entry->paste_win);
entry->paste_win = ecore_selection_request();
}
else if (!strcmp(e->key, "Home"))
{
@ -457,7 +457,7 @@ e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e)
{
char *type;
type = e_key_press_translate_into_typeable(e);
type = ecore_keypress_translate_into_typeable(e);
if (type)
{
printf("%0x\n", type[0]);

@ -42,7 +42,7 @@ struct _E_Entry
void e_entry_init(void);
void e_entry_free(E_Entry *entry);
E_Entry *e_entry_new(void);
void e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e);
void e_entry_handlecore_keypress(E_Entry *entry, Ecore_Event_Key_Down *e);
void e_entry_set_evas(E_Entry *entry, Evas evas);
void e_entry_show(E_Entry *entry);
void e_entry_hide(E_Entry *entry);

@ -20,7 +20,7 @@ e_exec_restart(void)
printf("e_exec_restart()\n");
/* unset events on root */
e_window_set_events(0, XEV_NONE);
ecore_window_set_events(0, XEV_NONE);
/* destroy all desktops */
num = e_desktops_get_num();
for (i = 0; i < num; i++)
@ -31,7 +31,7 @@ e_exec_restart(void)
e_desktops_delete(desk);
}
/* ensure it's all done */
e_sync();
ecore_sync();
/* rerun myself */
exe[0] = 0;
for (i = 0; i < e_argc; i++)
@ -105,6 +105,7 @@ e_exec_in_dir_with_env(char *exe, char *dir, int *launch_id_ret, char **env, cha
strlen(preload_paths) + 1 +
strlen(preload) + 1);
sprintf(exe2, "%s %s %s", preload_paths, preload, exe);
execl("/bin/sh", "/bin/sh", "-c", exe2, NULL);
exit(0);
return 0;

@ -6,7 +6,7 @@ static Evas_List fs_handlers = NULL;
static Evas_List fs_restart_handlers = NULL;
static pid_t efsd_pid = 0;
static void e_fs_child_handle(Eevent *ev);
static void e_fs_child_handle(Ecore_Event *ev);
static void _e_fs_fd_handle(int fd);
static void _e_fs_restarter(int val, void *data);
static void e_fs_idle(void *data);
@ -19,7 +19,7 @@ e_fs_flush_timeout(int val, void *data)
if (efsd_commands_pending(ec) > 0)
{
if (efsd_flush(ec) > 0)
e_add_event_timer("e_fs_flush_timeout()",
ecore_add_event_timer("e_fs_flush_timeout()",
0.00, e_fs_flush_timeout, 0, NULL);
}
UN(data);
@ -34,9 +34,9 @@ e_fs_idle(void *data)
}
static void
e_fs_child_handle(Eevent *ev)
e_fs_child_handle(Ecore_Event *ev)
{
Ev_Child *e;
Ecore_Event_Child *e;
e = ev->event;
printf("pid went splat! (%i)\n", e->pid);
@ -55,7 +55,7 @@ _e_fs_fd_handle(int fd)
{
double start, current;
start = e_get_time();
start = ecore_get_time();
while ((ec) && efsd_events_pending(ec))
{
EfsdEvent ev;
@ -76,7 +76,7 @@ _e_fs_fd_handle(int fd)
else
{
efsd_close(ec);
e_del_event_fd(fd);
ecore_del_event_fd(fd);
ec = NULL;
_e_fs_restarter(0, NULL);
/* FIXME: need to queue a popup dialog here saying */
@ -85,7 +85,7 @@ _e_fs_fd_handle(int fd)
}
/* spent more thna 1/20th of a second here.. get out */
current = e_get_time();
current = ecore_get_time();
if ((current - start) > 0.05)
{
printf("fs... too much time spent..\n");
@ -113,7 +113,7 @@ _e_fs_restarter(int val, void *data)
{
Evas_List l;
e_add_event_fd(efsd_get_connection_fd(ec), _e_fs_fd_handle);
ecore_add_event_fd(efsd_get_connection_fd(ec), _e_fs_fd_handle);
for (l = fs_restart_handlers; l; l = l->next)
{
E_FS_Restarter *rs;
@ -128,7 +128,7 @@ _e_fs_restarter(int val, void *data)
gap = (double)val / 10;
if (gap > 10.0) gap = 10.0;
e_add_event_timer("e_fs_restarter", gap, _e_fs_restarter, val + 1, NULL);
ecore_add_event_timer("e_fs_restarter", gap, _e_fs_restarter, val + 1, NULL);
}
UN(data);
}
@ -167,8 +167,8 @@ e_fs_add_event_handler(void (*func) (EfsdEvent *ev))
void
e_fs_init(void)
{
e_event_filter_handler_add(EV_CHILD, e_fs_child_handle);
e_event_filter_idle_handler_add(e_fs_idle, NULL);
ecore_event_filter_handler_add(ECORE_EVENT_CHILD, e_fs_child_handle);
ecore_event_filter_idle_handler_add(e_fs_idle, NULL);
_e_fs_restarter(0, NULL);
}

@ -69,16 +69,16 @@ e_guides_update(void)
{
if (!guides.win.display)
{
guides.win.display = e_window_override_new(0, 0, 0, 1, 1);
guides.win.l = e_window_override_new(0, 0, 0, 1, 1);
guides.win.r = e_window_override_new(0, 0, 0, 1, 1);
guides.win.t = e_window_override_new(0, 0, 0, 1, 1);
guides.win.b = e_window_override_new(0, 0, 0, 1, 1);
e_window_save_under(guides.win.display);
e_window_save_under(guides.win.l);
e_window_save_under(guides.win.r);
e_window_save_under(guides.win.t);
e_window_save_under(guides.win.b);
guides.win.display = ecore_window_override_new(0, 0, 0, 1, 1);
guides.win.l = ecore_window_override_new(0, 0, 0, 1, 1);
guides.win.r = ecore_window_override_new(0, 0, 0, 1, 1);
guides.win.t = ecore_window_override_new(0, 0, 0, 1, 1);
guides.win.b = ecore_window_override_new(0, 0, 0, 1, 1);
ecore_window_save_under(guides.win.display);
ecore_window_save_under(guides.win.l);
ecore_window_save_under(guides.win.r);
ecore_window_save_under(guides.win.t);
ecore_window_save_under(guides.win.b);
redraw = 1;
}
if (!guides.disp.evas)
@ -104,11 +104,11 @@ e_guides_update(void)
{
if (guides.win.display)
{
e_window_destroy(guides.win.display);
e_window_destroy(guides.win.l);
e_window_destroy(guides.win.r);
e_window_destroy(guides.win.t);
e_window_destroy(guides.win.b);
ecore_window_destroy(guides.win.display);
ecore_window_destroy(guides.win.l);
ecore_window_destroy(guides.win.r);
ecore_window_destroy(guides.win.t);
ecore_window_destroy(guides.win.b);
guides.win.display = 0;
guides.win.l = 0;
guides.win.r = 0;
@ -212,7 +212,7 @@ e_guides_update(void)
}
if (guides.current.display.loc == E_GUIDES_DISPLAY_LOCATION_SCREEN_MIDDLE)
{
e_window_get_geometry(0, NULL, NULL, &sw, &sh);
ecore_window_get_geometry(0, NULL, NULL, &sw, &sh);
dx = (int)(((double)sw - (double)dw) * guides.current.display.align.x);
dy = (int)(((double)sh - (double)dh) * guides.current.display.align.y);
}
@ -242,8 +242,8 @@ e_guides_update(void)
{
Pixmap pmap, mask;
pmap = e_pixmap_new(guides.win.display, dw, dh, 0);
mask = e_pixmap_new(guides.win.display, dw, dh, 1);
pmap = ecore_pixmap_new(guides.win.display, dw, dh, 0);
mask = ecore_pixmap_new(guides.win.display, dw, dh, 1);
imlib_context_set_image(guides.disp.image);
@ -255,14 +255,14 @@ e_guides_update(void)
imlib_context_set_color_modifier(NULL);
imlib_render_image_on_drawable(0, 0);
e_window_set_background_pixmap(guides.win.display, pmap);
e_window_set_shape_mask(guides.win.display, mask);
e_window_clear(guides.win.display);
e_pixmap_free(pmap);
e_pixmap_free(mask);
ecore_window_set_background_pixmap(guides.win.display, pmap);
ecore_window_set_shape_mask(guides.win.display, mask);
ecore_window_clear(guides.win.display);
ecore_pixmap_free(pmap);
ecore_pixmap_free(mask);
}
e_window_move(guides.win.display, dx, dy);
e_window_resize(guides.win.display, dw, dh);
ecore_window_move(guides.win.display, dx, dy);
ecore_window_resize(guides.win.display, dw, dh);
if (guides.current.mode == E_GUIDES_BOX)
{
@ -296,23 +296,23 @@ e_guides_update(void)
imlib_image_draw_line(0, 0, 0, h - 1, 0);
imlib_image_draw_line(2, 0, 2, h - 1, 0);
pmap = e_pixmap_new(guides.win.l, w, h, 0);
mask = e_pixmap_new(guides.win.l, w, h, 1);
pmap = ecore_pixmap_new(guides.win.l, w, h, 0);
mask = ecore_pixmap_new(guides.win.l, w, h, 1);
imlib_context_set_drawable(pmap);
imlib_context_set_mask(mask);
imlib_render_image_on_drawable(0, 0);
imlib_free_image();
e_window_move(guides.win.l, x, y);
e_window_resize(guides.win.l, w, h);
e_window_set_background_pixmap(guides.win.l, pmap);
e_window_set_shape_mask(guides.win.l, mask);
e_window_clear(guides.win.l);
e_pixmap_free(pmap);
e_pixmap_free(mask);
ecore_window_move(guides.win.l, x, y);
ecore_window_resize(guides.win.l, w, h);
ecore_window_set_background_pixmap(guides.win.l, pmap);
ecore_window_set_shape_mask(guides.win.l, mask);
ecore_window_clear(guides.win.l);
ecore_pixmap_free(pmap);
ecore_pixmap_free(mask);
}
else
{
e_window_resize(guides.win.l, 0, 0);
ecore_window_resize(guides.win.l, 0, 0);
}
x = guides.current.x + guides.current.w - 3;
@ -332,23 +332,23 @@ e_guides_update(void)
imlib_image_draw_line(0, 0, 0, h - 1, 0);
imlib_image_draw_line(2, 0, 2, h - 1, 0);
pmap = e_pixmap_new(guides.win.r, w, h, 0);
mask = e_pixmap_new(guides.win.r, w, h, 1);
pmap = ecore_pixmap_new(guides.win.r, w, h, 0);
mask = ecore_pixmap_new(guides.win.r, w, h, 1);
imlib_context_set_drawable(pmap);
imlib_context_set_mask(mask);
imlib_render_image_on_drawable(0, 0);
imlib_free_image();
e_window_move(guides.win.r, x, y);
e_window_resize(guides.win.r, w, h);
e_window_set_background_pixmap(guides.win.r, pmap);
e_window_set_shape_mask(guides.win.r, mask);
e_window_clear(guides.win.r);
e_pixmap_free(pmap);
e_pixmap_free(mask);
ecore_window_move(guides.win.r, x, y);
ecore_window_resize(guides.win.r, w, h);
ecore_window_set_background_pixmap(guides.win.r, pmap);
ecore_window_set_shape_mask(guides.win.r, mask);
ecore_window_clear(guides.win.r);
ecore_pixmap_free(pmap);
ecore_pixmap_free(mask);
}
else
{
e_window_resize(guides.win.r, 0, 0);
ecore_window_resize(guides.win.r, 0, 0);
}
x = guides.current.x;
@ -372,23 +372,23 @@ e_guides_update(void)
imlib_image_draw_line(1, 2, 1, 2, 0);
imlib_image_draw_line(w - 2, 2, w - 2, 2, 0);
pmap = e_pixmap_new(guides.win.t, w, h, 0);
mask = e_pixmap_new(guides.win.t, w, h, 1);
pmap = ecore_pixmap_new(guides.win.t, w, h, 0);
mask = ecore_pixmap_new(guides.win.t, w, h, 1);
imlib_context_set_drawable(pmap);
imlib_context_set_mask(mask);
imlib_render_image_on_drawable(0, 0);
imlib_free_image();
e_window_move(guides.win.t, x, y);
e_window_resize(guides.win.t, w, h);
e_window_set_background_pixmap(guides.win.t, pmap);
e_window_set_shape_mask(guides.win.t, mask);
e_window_clear(guides.win.t);
e_pixmap_free(pmap);
e_pixmap_free(mask);
ecore_window_move(guides.win.t, x, y);
ecore_window_resize(guides.win.t, w, h);
ecore_window_set_background_pixmap(guides.win.t, pmap);
ecore_window_set_shape_mask(guides.win.t, mask);
ecore_window_clear(guides.win.t);
ecore_pixmap_free(pmap);
ecore_pixmap_free(mask);
}
else
{
e_window_resize(guides.win.t, 0, 0);
ecore_window_resize(guides.win.t, 0, 0);
}
x = guides.current.x;
@ -412,23 +412,23 @@ e_guides_update(void)
imlib_image_draw_line(1, 0, 1, 0, 0);
imlib_image_draw_line(w - 2, 0, w - 2, 0, 0);
pmap = e_pixmap_new(guides.win.b, w, h, 0);
mask = e_pixmap_new(guides.win.b, w, h, 1);
pmap = ecore_pixmap_new(guides.win.b, w, h, 0);
mask = ecore_pixmap_new(guides.win.b, w, h, 1);
imlib_context_set_drawable(pmap);
imlib_context_set_mask(mask);
imlib_render_image_on_drawable(0, 0);
imlib_free_image();
e_window_move(guides.win.b, x, y);
e_window_resize(guides.win.b, w, h);
e_window_set_background_pixmap(guides.win.b, pmap);
e_window_set_shape_mask(guides.win.b, mask);
e_window_clear(guides.win.b);
e_pixmap_free(pmap);
e_pixmap_free(mask);
ecore_window_move(guides.win.b, x, y);
ecore_window_resize(guides.win.b, w, h);
ecore_window_set_background_pixmap(guides.win.b, pmap);
ecore_window_set_shape_mask(guides.win.b, mask);
ecore_window_clear(guides.win.b);
ecore_pixmap_free(pmap);
ecore_pixmap_free(mask);
}
else
{
e_window_resize(guides.win.b, 0, 0);
ecore_window_resize(guides.win.b, 0, 0);
}
}
}
@ -439,38 +439,38 @@ e_guides_update(void)
{
if (guides.current.mode != E_GUIDES_OPAQUE)
{
e_window_raise(guides.win.l);
e_window_show(guides.win.l);
e_window_raise(guides.win.r);
e_window_show(guides.win.r);
e_window_raise(guides.win.t);
e_window_show(guides.win.t);
e_window_raise(guides.win.b);
e_window_show(guides.win.b);
ecore_window_raise(guides.win.l);
ecore_window_show(guides.win.l);
ecore_window_raise(guides.win.r);
ecore_window_show(guides.win.r);
ecore_window_raise(guides.win.t);
ecore_window_show(guides.win.t);
ecore_window_raise(guides.win.b);
ecore_window_show(guides.win.b);
}
e_window_raise(guides.win.display);
e_window_show(guides.win.display);
ecore_window_raise(guides.win.display);
ecore_window_show(guides.win.display);
}
}
if (guides.current.mode != guides.prev.mode)
{
if (guides.current.mode == E_GUIDES_BOX)
{
e_window_raise(guides.win.l);
e_window_show(guides.win.l);
e_window_raise(guides.win.r);
e_window_show(guides.win.r);
e_window_raise(guides.win.t);
e_window_show(guides.win.t);
e_window_raise(guides.win.b);
e_window_show(guides.win.b);