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

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
This commit is contained in:
cpk 2001-10-17 22:34:27 +00:00 committed by cpk
parent c8e0c7f7be
commit 27379cbd44
28 changed files with 1394 additions and 1420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/actions.c
View File

@ -13,7 +13,7 @@ static Evas_List action_impls = NULL;
static Evas_List current_actions = NULL; static Evas_List current_actions = NULL;
static Evas_List current_timers = 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_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); 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_act_raise_next_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry);
static void 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; char *actions_db;
E_DB_File *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->key) && (strlen(a->key) > 0))
{ {
if (a->modifiers == -1) 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 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; a->grabbed = 1;
} }
} }
@ -210,9 +210,9 @@ e_action_free(E_Action *a)
if ((a->key) && (strlen(a->key) > 0) && (a->grabbed)) if ((a->key) && (strlen(a->key) > 0) && (a->grabbed))
{ {
if (a->modifiers == -1) 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 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->name);
IF_FREE(a->action); IF_FREE(a->action);
@ -222,7 +222,7 @@ e_action_free(E_Action *a)
} }
void 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; Evas_List l;
@ -260,7 +260,7 @@ e_action_start(char *action, E_Action_Type act, int button, char *key, Ev_Key_Mo
} }
void 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; Evas_List l;
@ -327,7 +327,7 @@ e_action_stop(char *action, E_Action_Type act, int button, char *key, Ev_Key_Mod
} }
void 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) void *o, void *data, int x, int y, int rx, int ry, int dx, int dy)
{ {
Evas_List l; Evas_List l;
@ -442,7 +442,7 @@ e_action_del_timer(void *o, char *name)
(at->name) && (at->name) &&
(!strcmp(at->name, 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); current_timers = evas_list_remove(current_timers, at);
IF_FREE(at->name); IF_FREE(at->name);
FREE(at); FREE(at);
@ -475,7 +475,7 @@ e_action_del_timer_object(void *o)
at = l->data; at = l->data;
if (at->object == o) if (at->object == o)
{ {
e_del_event_timer(at->name); ecore_del_event_timer(at->name);
current_timers = evas_list_remove(current_timers, at); current_timers = evas_list_remove(current_timers, at);
IF_FREE(at->name); IF_FREE(at->name);
FREE(at); 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 (b->current.shaded != 0) return;
if (resize_mode >= E_GUIDES_BOX) if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */ b->hold_changes = 1; /* if non opaque */
e_window_gravity_set(b->win.client, StaticGravity); ecore_window_gravity_set(b->win.client, StaticGravity);
e_window_gravity_set(b->win.l, NorthWestGravity); ecore_window_gravity_set(b->win.l, NorthWestGravity);
e_window_gravity_set(b->win.r, SouthEastGravity); ecore_window_gravity_set(b->win.r, SouthEastGravity);
e_window_gravity_set(b->win.t, NorthWestGravity); ecore_window_gravity_set(b->win.t, NorthWestGravity);
e_window_gravity_set(b->win.b, SouthEastGravity); ecore_window_gravity_set(b->win.b, SouthEastGravity);
e_window_gravity_set(b->win.input, NorthWestGravity); ecore_window_gravity_set(b->win.input, NorthWestGravity);
e_window_gravity_set(b->win.container, NorthWestGravity); ecore_window_gravity_set(b->win.container, NorthWestGravity);
/* 1 | 2 */ /* 1 | 2 */
/* --+-- */ /* --+-- */
/* 3 | 4 */ /* 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; b->mode.resize = 4;
/* e_border_set_gravity(b, NorthWestGravity); */ /* e_border_set_gravity(b, NorthWestGravity); */
/* e_window_gravity_set(b->win.container, SouthEastGravity);*/ /* ecore_window_gravity_set(b->win.container, SouthEastGravity);*/
} }
else else
{ {
b->mode.resize = 2; b->mode.resize = 2;
/* e_border_set_gravity(b, SouthWestGravity);*/ /* e_border_set_gravity(b, SouthWestGravity);*/
/* e_window_gravity_set(b->win.container, NorthEastGravity);*/ /* ecore_window_gravity_set(b->win.container, NorthEastGravity);*/
} }
} }
else 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; b->mode.resize = 3;
/* e_border_set_gravity(b, NorthEastGravity);*/ /* e_border_set_gravity(b, NorthEastGravity);*/
/* e_window_gravity_set(b->win.container, SouthWestGravity);*/ /* ecore_window_gravity_set(b->win.container, SouthWestGravity);*/
} }
else else
{ {
b->mode.resize = 1; b->mode.resize = 1;
/* e_border_set_gravity(b, SouthEastGravity);*/ /* 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->mode.resize = 0;
b->changed = 1; b->changed = 1;
e_border_adjust_limits(b); 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_border_set_gravity(b, NorthWestGravity);
e_guides_hide(); e_guides_hide();
return; 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 (b->current.shaded != 0) return;
if (resize_mode >= E_GUIDES_BOX) if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */ b->hold_changes = 1; /* if non opaque */
e_window_gravity_set(b->win.client, StaticGravity); ecore_window_gravity_set(b->win.client, StaticGravity);
e_window_gravity_set(b->win.l, NorthWestGravity); ecore_window_gravity_set(b->win.l, NorthWestGravity);
e_window_gravity_set(b->win.r, SouthEastGravity); ecore_window_gravity_set(b->win.r, SouthEastGravity);
e_window_gravity_set(b->win.t, NorthWestGravity); ecore_window_gravity_set(b->win.t, NorthWestGravity);
e_window_gravity_set(b->win.b, SouthEastGravity); ecore_window_gravity_set(b->win.b, SouthEastGravity);
e_window_gravity_set(b->win.input, NorthWestGravity); ecore_window_gravity_set(b->win.input, NorthWestGravity);
e_window_gravity_set(b->win.container, NorthWestGravity); ecore_window_gravity_set(b->win.container, NorthWestGravity);
/* 5 | 6 */ /* 5 | 6 */
if (x > (b->current.w / 2)) 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->mode.resize = 0;
b->changed = 1; b->changed = 1;
e_border_adjust_limits(b); 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_border_set_gravity(b, NorthWestGravity);
e_guides_hide(); e_guides_hide();
return; 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 (b->current.shaded != 0) return;
if (resize_mode >= E_GUIDES_BOX) if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */ b->hold_changes = 1; /* if non opaque */
e_window_gravity_set(b->win.client, StaticGravity); ecore_window_gravity_set(b->win.client, StaticGravity);
e_window_gravity_set(b->win.l, NorthWestGravity); ecore_window_gravity_set(b->win.l, NorthWestGravity);
e_window_gravity_set(b->win.r, SouthEastGravity); ecore_window_gravity_set(b->win.r, SouthEastGravity);
e_window_gravity_set(b->win.t, NorthWestGravity); ecore_window_gravity_set(b->win.t, NorthWestGravity);
e_window_gravity_set(b->win.b, SouthEastGravity); ecore_window_gravity_set(b->win.b, SouthEastGravity);
e_window_gravity_set(b->win.input, NorthWestGravity); ecore_window_gravity_set(b->win.input, NorthWestGravity);
e_window_gravity_set(b->win.container, NorthWestGravity); ecore_window_gravity_set(b->win.container, NorthWestGravity);
/* 7 */ /* 7 */
/* - */ /* - */
/* 8 */ /* 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->current.requested.h = b->current.h;
b->mode.resize = 0; b->mode.resize = 0;
e_border_adjust_limits(b); 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_border_set_gravity(b, NorthWestGravity);
b->changed = 1; b->changed = 1;
e_guides_hide(); 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) b = e_border_current_focused();
if (!b) return; if (!b) return;
if (b->client.is_desktop) 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; return;
UN(a); UN(a);
UN(data); UN(data);
@ -1142,13 +1142,13 @@ e_act_cb_shade(int val, void *data)
if (val == 0) if (val == 0)
{ {
OBJ_REF(b); OBJ_REF(b);
t = e_get_time(); t = ecore_get_time();
e_window_gravity_set(b->win.client, SouthWestGravity); ecore_window_gravity_set(b->win.client, SouthWestGravity);
e_action_del_timer(b, "shader"); e_action_del_timer(b, "shader");
e_action_add_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); si = (int)(dif * (double)pix_per_sec);
if (si > b->client.h) si = b->client.h; 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_adjust_limits(b);
e_border_apply_border(b); e_border_apply_border(b);
if (si < b->client.h) 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 else
{ {
e_action_del_timer(b, "shader"); e_action_del_timer(b, "shader");
e_window_gravity_reset(b->win.client); ecore_window_gravity_reset(b->win.client);
OBJ_UNREF(b); OBJ_UNREF(b);
} }
} }
@ -1183,13 +1183,13 @@ e_act_cb_unshade(int val, void *data)
if (val == 0) if (val == 0)
{ {
OBJ_REF(b); OBJ_REF(b);
t = e_get_time(); t = ecore_get_time();
e_window_gravity_set(b->win.client, SouthWestGravity); ecore_window_gravity_set(b->win.client, SouthWestGravity);
e_action_del_timer(b, "shader"); e_action_del_timer(b, "shader");
e_action_add_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); si = b->client.h - (int)(dif * (double)pix_per_sec);
if (si < 0) si = 0; if (si < 0) si = 0;
@ -1199,11 +1199,11 @@ e_act_cb_unshade(int val, void *data)
e_border_adjust_limits(b); e_border_adjust_limits(b);
e_border_apply_border(b); e_border_apply_border(b);
if (si > 0) 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 else
{ {
e_action_del_timer(b, "shader"); e_action_del_timer(b, "shader");
e_window_gravity_reset(b->win.client); ecore_window_gravity_reset(b->win.client);
OBJ_UNREF(b); OBJ_UNREF(b);
} }
} }

6
src/actions.h
View File

@ -57,13 +57,13 @@ struct _E_Action_Impl
void e_action_start(char *action, E_Action_Type act, int button, char *key, 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); int x, int y, int rx, int ry);
void e_action_stop(char *action, E_Action_Type act, int button, char *key, 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); int x, int y, int rx, int ry);
void e_action_cont(char *action, E_Action_Type act, int button, char *key, 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); 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_object(void *o, void *data, int x, int y, int rx, int ry);
void e_action_stop_by_type(char *action); void e_action_stop_by_type(char *action);

602
src/border.c
View File

File diff suppressed because it is too large Load Diff

2
src/border.h
View File

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

4
src/config.h
View File

@ -39,7 +39,7 @@ static E_Config_File _var = {_src, 0.0}
#define E_CONFIG_CHECK_VALIDITY(_var, _src) \ #define E_CONFIG_CHECK_VALIDITY(_var, _src) \
{ \ { \
double __time; \ double __time; \
__time = e_get_time(); \ __time = ecore_get_time(); \
if (_var.last_fetch < (__time - 5.0)) { \ if (_var.last_fetch < (__time - 5.0)) { \
_var.last_fetch = __time; _var.last_fetch = __time;
#define E_CONFIG_CHECK_VALIDITY_END \ #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) \ #define E_CFG_VALIDITY_CHECK(_var) \
{ \ { \
double __time; \ double __time; \
__time = e_get_time(); \ __time = ecore_get_time(); \
if (_var.last_fetch < (__time - 5.0)) { \ if (_var.last_fetch < (__time - 5.0)) { \
int __cfg_ok = 0; \ int __cfg_ok = 0; \
_var.last_fetch = __time; _var.last_fetch = __time;

36
src/cursors.c
View File

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

4
src/delayed.c
View File

@ -8,7 +8,7 @@ e_delayed_action_start(void *obs, void *obj)
E_Delayed_Action *eda = obs; E_Delayed_Action *eda = obs;
snprintf(event_name, 1024, "_e_delayed_action_notify(%d)", eda->e_event); 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 void
@ -17,7 +17,7 @@ e_delayed_action_cancel(void *obs)
E_Delayed_Action *eda = obs; E_Delayed_Action *eda = obs;
char event_name[1024]; char event_name[1024];
snprintf(event_name, 1024, "_e_delayed_action_notify(%d)", eda->e_event); 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 void

58
src/desktops.c
View File

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

8
src/e.h
View File

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

34
src/entry.c
View File

@ -4,8 +4,8 @@
static Evas_List entries; static Evas_List entries;
static void e_clear_selection(Eevent * ev); static void e_clear_selection(Ecore_Event * ev);
static void e_paste_request(Eevent * 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_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); 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_entry_configure(E_Entry *entry);
static void 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; Evas_List l;
e = ev->event; e = ev->event;
@ -28,7 +28,7 @@ e_clear_selection(Eevent * ev)
entry = l->data; entry = l->data;
if (entry->selection_win == e->win) if (entry->selection_win == e->win)
{ {
e_window_destroy(entry->selection_win); ecore_window_destroy(entry->selection_win);
entry->selection_win = 0; entry->selection_win = 0;
entry->select.start = -1; entry->select.start = -1;
entry->select.length = 0; entry->select.length = 0;
@ -38,9 +38,9 @@ e_clear_selection(Eevent * ev)
} }
static void 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; Evas_List l;
e = ev->event; 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; entry = _data;
if ((_b == 2) && (!entry->mouse_down)) if ((_b == 2) && (!entry->mouse_down))
{ {
if (entry->paste_win) e_window_destroy(entry->paste_win); if (entry->paste_win) ecore_window_destroy(entry->paste_win);
entry->paste_win = e_selection_request(); entry->paste_win = ecore_selection_request();
} }
else if (!entry->mouse_down) 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); str2 = e_entry_get_selection(entry);
if (str2) if (str2)
{ {
if (entry->selection_win) e_window_destroy(entry->selection_win); if (entry->selection_win) ecore_window_destroy(entry->selection_win);
entry->selection_win = e_selection_set(str2); entry->selection_win = ecore_selection_set(str2);
free(str2); free(str2);
} }
} }
@ -359,8 +359,8 @@ e_entry_configure(E_Entry *entry)
void void
e_entry_init(void) e_entry_init(void)
{ {
e_event_filter_handler_add(EV_PASTE_REQUEST, e_paste_request); ecore_event_filter_handler_add(ECORE_EVENT_PASTE_REQUEST, e_paste_request);
e_event_filter_handler_add(EV_CLEAR_SELECTION, e_clear_selection); ecore_event_filter_handler_add(ECORE_EVENT_CLEAR_SELECTION, e_clear_selection);
} }
void void
@ -387,7 +387,7 @@ e_entry_new(void)
} }
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 (!entry->focused) return;
if (!strcmp(e->key, "Up")) 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")) else if (!strcmp(e->key, "Insert"))
{ {
if (entry->paste_win) e_window_destroy(entry->paste_win); if (entry->paste_win) ecore_window_destroy(entry->paste_win);
entry->paste_win = e_selection_request(); entry->paste_win = ecore_selection_request();
} }
else if (!strcmp(e->key, "Home")) else if (!strcmp(e->key, "Home"))
{ {
@ -457,7 +457,7 @@ e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e)
{ {
char *type; char *type;
type = e_key_press_translate_into_typeable(e); type = ecore_keypress_translate_into_typeable(e);
if (type) if (type)
{ {
printf("%0x\n", type[0]); printf("%0x\n", type[0]);

2
src/entry.h
View File

@ -42,7 +42,7 @@ struct _E_Entry
void e_entry_init(void); void e_entry_init(void);
void e_entry_free(E_Entry *entry); void e_entry_free(E_Entry *entry);
E_Entry *e_entry_new(void); 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_set_evas(E_Entry *entry, Evas evas);
void e_entry_show(E_Entry *entry); void e_entry_show(E_Entry *entry);
void e_entry_hide(E_Entry *entry); void e_entry_hide(E_Entry *entry);

5
src/exec.c
View File

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

22
src/fs.c
View File

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

176
src/guides.c
View File

@ -69,16 +69,16 @@ e_guides_update(void)
{ {
if (!guides.win.display) if (!guides.win.display)
{ {
guides.win.display = e_window_override_new(0, 0, 0, 1, 1); guides.win.display = ecore_window_override_new(0, 0, 0, 1, 1);
guides.win.l = e_window_override_new(0, 0, 0, 1, 1); guides.win.l = ecore_window_override_new(0, 0, 0, 1, 1);
guides.win.r = e_window_override_new(0, 0, 0, 1, 1); guides.win.r = ecore_window_override_new(0, 0, 0, 1, 1);
guides.win.t = e_window_override_new(0, 0, 0, 1, 1); guides.win.t = ecore_window_override_new(0, 0, 0, 1, 1);
guides.win.b = e_window_override_new(0, 0, 0, 1, 1); guides.win.b = ecore_window_override_new(0, 0, 0, 1, 1);
e_window_save_under(guides.win.display); ecore_window_save_under(guides.win.display);
e_window_save_under(guides.win.l); ecore_window_save_under(guides.win.l);
e_window_save_under(guides.win.r); ecore_window_save_under(guides.win.r);
e_window_save_under(guides.win.t); ecore_window_save_under(guides.win.t);
e_window_save_under(guides.win.b); ecore_window_save_under(guides.win.b);
redraw = 1; redraw = 1;
} }
if (!guides.disp.evas) if (!guides.disp.evas)
@ -104,11 +104,11 @@ e_guides_update(void)
{ {
if (guides.win.display) if (guides.win.display)
{ {
e_window_destroy(guides.win.display); ecore_window_destroy(guides.win.display);
e_window_destroy(guides.win.l); ecore_window_destroy(guides.win.l);
e_window_destroy(guides.win.r); ecore_window_destroy(guides.win.r);
e_window_destroy(guides.win.t); ecore_window_destroy(guides.win.t);
e_window_destroy(guides.win.b); ecore_window_destroy(guides.win.b);
guides.win.display = 0; guides.win.display = 0;
guides.win.l = 0; guides.win.l = 0;
guides.win.r = 0; guides.win.r = 0;
@ -212,7 +212,7 @@ e_guides_update(void)
} }
if (guides.current.display.loc == E_GUIDES_DISPLAY_LOCATION_SCREEN_MIDDLE) 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); dx = (int)(((double)sw - (double)dw) * guides.current.display.align.x);
dy = (int)(((double)sh - (double)dh) * guides.current.display.align.y); dy = (int)(((double)sh - (double)dh) * guides.current.display.align.y);
} }
@ -242,8 +242,8 @@ e_guides_update(void)
{ {
Pixmap pmap, mask; Pixmap pmap, mask;
pmap = e_pixmap_new(guides.win.display, dw, dh, 0); pmap = ecore_pixmap_new(guides.win.display, dw, dh, 0);
mask = e_pixmap_new(guides.win.display, dw, dh, 1); mask = ecore_pixmap_new(guides.win.display, dw, dh, 1);
imlib_context_set_image(guides.disp.image); imlib_context_set_image(guides.disp.image);
@ -255,14 +255,14 @@ e_guides_update(void)
imlib_context_set_color_modifier(NULL); imlib_context_set_color_modifier(NULL);
imlib_render_image_on_drawable(0, 0); imlib_render_image_on_drawable(0, 0);
e_window_set_background_pixmap(guides.win.display, pmap); ecore_window_set_background_pixmap(guides.win.display, pmap);
e_window_set_shape_mask(guides.win.display, mask); ecore_window_set_shape_mask(guides.win.display, mask);
e_window_clear(guides.win.display); ecore_window_clear(guides.win.display);
e_pixmap_free(pmap); ecore_pixmap_free(pmap);
e_pixmap_free(mask); ecore_pixmap_free(mask);
} }
e_window_move(guides.win.display, dx, dy); ecore_window_move(guides.win.display, dx, dy);
e_window_resize(guides.win.display, dw, dh); ecore_window_resize(guides.win.display, dw, dh);
if (guides.current.mode == E_GUIDES_BOX) 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(0, 0, 0, h - 1, 0);
imlib_image_draw_line(2, 0, 2, h - 1, 0); imlib_image_draw_line(2, 0, 2, h - 1, 0);
pmap = e_pixmap_new(guides.win.l, w, h, 0); pmap = ecore_pixmap_new(guides.win.l, w, h, 0);
mask = e_pixmap_new(guides.win.l, w, h, 1); mask = ecore_pixmap_new(guides.win.l, w, h, 1);
imlib_context_set_drawable(pmap); imlib_context_set_drawable(pmap);
imlib_context_set_mask(mask); imlib_context_set_mask(mask);
imlib_render_image_on_drawable(0, 0); imlib_render_image_on_drawable(0, 0);
imlib_free_image(); imlib_free_image();
e_window_move(guides.win.l, x, y); ecore_window_move(guides.win.l, x, y);
e_window_resize(guides.win.l, w, h); ecore_window_resize(guides.win.l, w, h);
e_window_set_background_pixmap(guides.win.l, pmap); ecore_window_set_background_pixmap(guides.win.l, pmap);
e_window_set_shape_mask(guides.win.l, mask); ecore_window_set_shape_mask(guides.win.l, mask);
e_window_clear(guides.win.l); ecore_window_clear(guides.win.l);
e_pixmap_free(pmap); ecore_pixmap_free(pmap);
e_pixmap_free(mask); ecore_pixmap_free(mask);
} }
else 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; 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(0, 0, 0, h - 1, 0);
imlib_image_draw_line(2, 0, 2, h - 1, 0); imlib_image_draw_line(2, 0, 2, h - 1, 0);
pmap = e_pixmap_new(guides.win.r, w, h, 0); pmap = ecore_pixmap_new(guides.win.r, w, h, 0);
mask = e_pixmap_new(guides.win.r, w, h, 1); mask = ecore_pixmap_new(guides.win.r, w, h, 1);
imlib_context_set_drawable(pmap); imlib_context_set_drawable(pmap);
imlib_context_set_mask(mask); imlib_context_set_mask(mask);
imlib_render_image_on_drawable(0, 0); imlib_render_image_on_drawable(0, 0);
imlib_free_image(); imlib_free_image();
e_window_move(guides.win.r, x, y); ecore_window_move(guides.win.r, x, y);
e_window_resize(guides.win.r, w, h); ecore_window_resize(guides.win.r, w, h);
e_window_set_background_pixmap(guides.win.r, pmap); ecore_window_set_background_pixmap(guides.win.r, pmap);
e_window_set_shape_mask(guides.win.r, mask); ecore_window_set_shape_mask(guides.win.r, mask);
e_window_clear(guides.win.r); ecore_window_clear(guides.win.r);
e_pixmap_free(pmap); ecore_pixmap_free(pmap);
e_pixmap_free(mask); ecore_pixmap_free(mask);
} }
else else
{ {
e_window_resize(guides.win.r, 0, 0); ecore_window_resize(guides.win.r, 0, 0);
} }
x = guides.current.x; 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(1, 2, 1, 2, 0);
imlib_image_draw_line(w - 2, 2, w - 2, 2, 0); imlib_image_draw_line(w - 2, 2, w - 2, 2, 0);
pmap = e_pixmap_new(guides.win.t, w, h, 0); pmap = ecore_pixmap_new(guides.win.t, w, h, 0);
mask = e_pixmap_new(guides.win.t, w, h, 1); mask = ecore_pixmap_new(guides.win.t, w, h, 1);
imlib_context_set_drawable(pmap); imlib_context_set_drawable(pmap);
imlib_context_set_mask(mask); imlib_context_set_mask(mask);
imlib_render_image_on_drawable(0, 0); imlib_render_image_on_drawable(0, 0);
imlib_free_image(); imlib_free_image();
e_window_move(guides.win.t, x, y); ecore_window_move(guides.win.t, x, y);
e_window_resize(guides.win.t, w, h); ecore_window_resize(guides.win.t, w, h);
e_window_set_background_pixmap(guides.win.t, pmap); ecore_window_set_background_pixmap(guides.win.t, pmap);
e_window_set_shape_mask(guides.win.t, mask); ecore_window_set_shape_mask(guides.win.t, mask);
e_window_clear(guides.win.t); ecore_window_clear(guides.win.t);
e_pixmap_free(pmap); ecore_pixmap_free(pmap);
e_pixmap_free(mask); ecore_pixmap_free(mask);
} }
else else
{ {
e_window_resize(guides.win.t, 0, 0); ecore_window_resize(guides.win.t, 0, 0);
} }
x = guides.current.x; 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(1, 0, 1, 0, 0);
imlib_image_draw_line(w - 2, 0, w - 2, 0, 0); imlib_image_draw_line(w - 2, 0, w - 2, 0, 0);
pmap = e_pixmap_new(guides.win.b, w, h, 0); pmap = ecore_pixmap_new(guides.win.b, w, h, 0);
mask = e_pixmap_new(guides.win.b, w, h, 1); mask = ecore_pixmap_new(guides.win.b, w, h, 1);
imlib_context_set_drawable(pmap); imlib_context_set_drawable(pmap);
imlib_context_set_mask(mask); imlib_context_set_mask(mask);
imlib_render_image_on_drawable(0, 0); imlib_render_image_on_drawable(0, 0);
imlib_free_image(); imlib_free_image();
e_window_move(guides.win.b, x, y); ecore_window_move(guides.win.b, x, y);
e_window_resize(guides.win.b, w, h); ecore_window_resize(guides.win.b, w, h);
e_window_set_background_pixmap(guides.win.b, pmap); ecore_window_set_background_pixmap(guides.win.b, pmap);
e_window_set_shape_mask(guides.win.b, mask); ecore_window_set_shape_mask(guides.win.b, mask);
e_window_clear(guides.win.b); ecore_window_clear(guides.win.b);
e_pixmap_free(pmap); ecore_pixmap_free(pmap);
e_pixmap_free(mask); ecore_pixmap_free(mask);
} }
else 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) if (guides.current.mode != E_GUIDES_OPAQUE)
{ {
e_window_raise(guides.win.l); ecore_window_raise(guides.win.l);
e_window_show(guides.win.l); ecore_window_show(guides.win.l);
e_window_raise(guides.win.r); ecore_window_raise(guides.win.r);
e_window_show(guides.win.r); ecore_window_show(guides.win.r);
e_window_raise(guides.win.t); ecore_window_raise(guides.win.t);
e_window_show(guides.win.t); ecore_window_show(guides.win.t);
e_window_raise(guides.win.b); ecore_window_raise(guides.win.b);
e_window_show(guides.win.b); ecore_window_show(guides.win.b);
} }
e_window_raise(guides.win.display); ecore_window_raise(guides.win.display);
e_window_show(guides.win.display); ecore_window_show(guides.win.display);
} }
} }
if (guides.current.mode != guides.prev.mode) if (guides.current.mode != guides.prev.mode)
{ {
if (guides.current.mode == E_GUIDES_BOX) if (guides.current.mode == E_GUIDES_BOX)
{ {
e_window_raise(guides.win.l); ecore_window_raise(guides.win.l);
e_window_show(guides.win.l); ecore_window_show(guides.win.l);
e_window_raise(guides.win.r); ecore_window_raise(guides.win.r);
e_window_show(guides.win.r); ecore_window_show(guides.win.r);
e_window_raise(guides.win.t); ecore_window_raise(guides.win.t);
e_window_show(guides.win.t); ecore_window_show(guides.win.t);
e_window_raise(guides.win.b); ecore_window_raise(guides.win.b);
e_window_show(guides.win.b); ecore_window_show(guides.win.b);
} }
else if (guides.prev.mode == E_GUIDES_OPAQUE) else if (guides.prev.mode == E_GUIDES_OPAQUE)
{ {
e_window_hide(guides.win.l); ecore_window_hide(guides.win.l);
e_window_hide(guides.win.r); ecore_window_hide(guides.win.r);
e_window_hide(guides.win.t); ecore_window_hide(guides.win.t);
e_window_hide(guides.win.b); ecore_window_hide(guides.win.b);
} }
} }
guides.prev = guides.current; guides.prev = guides.current;
@ -592,5 +592,5 @@ void e_guides_init(void)
guides.disp.icon = NULL; guides.disp.icon = NULL;
guides.disp.image = NULL; guides.disp.image = NULL;
e_event_filter_idle_handler_add(e_guides_idle, NULL); ecore_event_filter_idle_handler_add(e_guides_idle, NULL);
} }

122
src/icccm.c
View File

@ -48,7 +48,7 @@ MWMHints;
void void
e_icccm_move_resize(Window win, int x, int y, int w, int h) e_icccm_move_resize(Window win, int x, int y, int w, int h)
{ {
e_window_send_event_move_resize(win, x, y, w, h); ecore_window_send_event_move_resize(win, x, y, w, h);
} }
void void
@ -60,10 +60,10 @@ e_icccm_delete(Window win)
int size; int size;
int del_win = 0; int del_win = 0;
E_ATOM(a_wm_delete_window, "WM_DELETE_WINDOW"); ECORE_ATOM(a_wm_delete_window, "WM_DELETE_WINDOW");
E_ATOM(a_wm_protocols, "WM_PROTOCOLS"); ECORE_ATOM(a_wm_protocols, "WM_PROTOCOLS");
props = e_window_property_get(win, a_wm_protocols, XA_ATOM, &size); props = ecore_window_property_get(win, a_wm_protocols, XA_ATOM, &size);
if (props) if (props)
{ {
int i, num; int i, num;
@ -81,11 +81,11 @@ e_icccm_delete(Window win)
data[0] = a_wm_delete_window; data[0] = a_wm_delete_window;
data[1] = CurrentTime; data[1] = CurrentTime;
e_window_send_client_message(win, a_wm_protocols, 32, data); ecore_window_send_client_message(win, a_wm_protocols, 32, data);
} }
else else
{ {
e_window_kill_client(win); ecore_window_kill_client(win);
} }
} }
@ -95,10 +95,10 @@ e_icccm_state_mapped(Window win)
static Atom a_wm_state = 0; static Atom a_wm_state = 0;
unsigned int data[2]; unsigned int data[2];
E_ATOM(a_wm_state, "WM_STATE"); ECORE_ATOM(a_wm_state, "WM_STATE");
data[0] = NormalState; data[0] = NormalState;
data[1] = 0; data[1] = 0;
e_window_property_set(win, a_wm_state, a_wm_state, 32, data, 2); ecore_window_property_set(win, a_wm_state, a_wm_state, 32, data, 2);
} }
void void
@ -107,10 +107,10 @@ e_icccm_state_iconified(Window win)
static Atom a_wm_state = 0; static Atom a_wm_state = 0;
unsigned int data[2]; unsigned int data[2];
E_ATOM(a_wm_state, "WM_STATE"); ECORE_ATOM(a_wm_state, "WM_STATE");
data[0] = IconicState; data[0] = IconicState;
data[1] = 0; data[1] = 0;
e_window_property_set(win, a_wm_state, a_wm_state, 32, data, 2); ecore_window_property_set(win, a_wm_state, a_wm_state, 32, data, 2);
} }
void void
@ -119,22 +119,22 @@ e_icccm_state_withdrawn(Window win)
static Atom a_wm_state = 0; static Atom a_wm_state = 0;
unsigned int data[2]; unsigned int data[2];
E_ATOM(a_wm_state, "WM_STATE"); ECORE_ATOM(a_wm_state, "WM_STATE");
data[0] = WithdrawnState; data[0] = WithdrawnState;
data[1] = 0; data[1] = 0;
e_window_property_set(win, a_wm_state, a_wm_state, 32, data, 2); ecore_window_property_set(win, a_wm_state, a_wm_state, 32, data, 2);
} }
void void
e_icccm_adopt(Window win) e_icccm_adopt(Window win)
{ {
e_window_add_to_save_set(win); ecore_window_add_to_save_set(win);
} }
void void
e_icccm_release(Window win) e_icccm_release(Window win)
{ {
e_window_del_from_save_set(win); ecore_window_del_from_save_set(win);
} }
void void
@ -143,7 +143,7 @@ e_icccm_get_pos_info(Window win, E_Border *b)
XSizeHints hint; XSizeHints hint;
int mask; int mask;
if (e_window_get_wm_size_hints(win, &hint, &mask)) if (ecore_window_get_wm_size_hints(win, &hint, &mask))
{ {
if ((hint.flags & USPosition) || ((hint.flags & PPosition))) if ((hint.flags & USPosition) || ((hint.flags & PPosition)))
{ {
@ -155,7 +155,7 @@ e_icccm_get_pos_info(Window win, E_Border *b)
if (hint.flags & PWinGravity) if (hint.flags & PWinGravity)
b->client.pos.gravity = hint.win_gravity; b->client.pos.gravity = hint.win_gravity;
x = y = w = h = 0; x = y = w = h = 0;
e_window_get_geometry(win, &x, &y, &w, &h); ecore_window_get_geometry(win, &x, &y, &w, &h);
b->client.pos.x = x; b->client.pos.x = x;
b->client.pos.y = y; b->client.pos.y = y;
} }
@ -186,7 +186,7 @@ e_icccm_get_size_info(Window win, E_Border *b)
step_h = 1; step_h = 1;
base_w = 0; base_w = 0;
base_h = 0; base_h = 0;
if (e_window_get_wm_size_hints(win, &hint, &mask)) if (ecore_window_get_wm_size_hints(win, &hint, &mask))
{ {
if (hint.flags & PMinSize) if (hint.flags & PMinSize)
{ {
@ -247,9 +247,9 @@ e_icccm_get_mwm_hints(Window win, E_Border *b)
MWMHints *mwmhints; MWMHints *mwmhints;
int size; int size;
E_ATOM(a_motif_wm_hints, "_MOTIF_WM_HINTS"); ECORE_ATOM(a_motif_wm_hints, "_MOTIF_WM_HINTS");
mwmhints = e_window_property_get(win, a_motif_wm_hints, a_motif_wm_hints, &size); mwmhints = ecore_window_property_get(win, a_motif_wm_hints, a_motif_wm_hints, &size);
if (mwmhints) if (mwmhints)
{ {
int num; int num;
@ -287,9 +287,9 @@ e_icccm_get_layer(Window win, E_Border *b)
int *props; int *props;
int size; int size;
E_ATOM(a_win_layer, "_WIN_LAYER"); ECORE_ATOM(a_win_layer, "_WIN_LAYER");
props = e_window_property_get(win, a_win_layer, XA_CARDINAL, &size); props = ecore_window_property_get(win, a_win_layer, XA_CARDINAL, &size);
if (props) if (props)
{ {
int num; int num;
@ -305,7 +305,7 @@ e_icccm_get_title(Window win, E_Border *b)
{ {
char *title; char *title;
title = e_window_get_title(win); title = ecore_window_get_title(win);
if (b->client.title) if (b->client.title)
{ {
@ -326,7 +326,7 @@ e_icccm_get_class(Window win, E_Border *b)
IF_FREE(b->client.class); IF_FREE(b->client.class);
b->client.name = NULL; b->client.name = NULL;
b->client.class = NULL; b->client.class = NULL;
e_window_get_name_class(win, &(b->client.name), &(b->client.class)); ecore_window_get_name_class(win, &(b->client.name), &(b->client.class));
if (!b->client.name) e_strdup(b->client.name, "Unknown"); if (!b->client.name) e_strdup(b->client.name, "Unknown");
if (!b->client.class) e_strdup(b->client.class, "Unknown"); if (!b->client.class) e_strdup(b->client.class, "Unknown");
} }
@ -334,7 +334,7 @@ e_icccm_get_class(Window win, E_Border *b)
void void
e_icccm_get_hints(Window win, E_Border *b) e_icccm_get_hints(Window win, E_Border *b)
{ {
e_window_get_hints(win, &(b->client.takes_focus), ecore_window_get_hints(win, &(b->client.takes_focus),
&(b->client.initial_state), NULL, NULL, NULL, &(b->client.initial_state), NULL, NULL, NULL,
&(b->client.group)); &(b->client.group));
} }
@ -344,7 +344,7 @@ e_icccm_get_machine(Window win, E_Border *b)
{ {
IF_FREE(b->client.machine); IF_FREE(b->client.machine);
b->client.machine = NULL; b->client.machine = NULL;
b->client.machine = e_window_get_machine(win); b->client.machine = ecore_window_get_machine(win);
} }
void void
@ -352,7 +352,7 @@ e_icccm_get_command(Window win, E_Border *b)
{ {
IF_FREE(b->client.command); IF_FREE(b->client.command);
b->client.command = NULL; b->client.command = NULL;
b->client.command = e_window_get_command(win); b->client.command = ecore_window_get_command(win);
} }
void void
@ -360,7 +360,7 @@ e_icccm_get_icon_name(Window win, E_Border *b)
{ {
IF_FREE(b->client.icon_name); IF_FREE(b->client.icon_name);
b->client.icon_name = NULL; b->client.icon_name = NULL;
b->client.icon_name = e_window_get_icon_name(win); b->client.icon_name = ecore_window_get_icon_name(win);
} }
void void
@ -374,12 +374,12 @@ e_icccm_set_frame_size(Window win, int l, int r, int t, int b)
static Atom a_e_frame_size = 0; static Atom a_e_frame_size = 0;
int props[4]; int props[4];
E_ATOM(a_e_frame_size, "_E_FRAME_SIZE"); ECORE_ATOM(a_e_frame_size, "_E_FRAME_SIZE");
props[0] = l; props[0] = l;
props[1] = r; props[1] = r;
props[2] = t; props[2] = t;
props[3] = b; props[3] = b;
e_window_property_set(win, a_e_frame_size, XA_CARDINAL, 32, props, 4); ecore_window_property_set(win, a_e_frame_size, XA_CARDINAL, 32, props, 4);
} }
void void
@ -388,10 +388,10 @@ e_icccm_set_desk_area(Window win, int ax, int ay)
static Atom a_win_area = 0; static Atom a_win_area = 0;
int props[2]; int props[2];
E_ATOM(a_win_area, "_WIN_AREA"); ECORE_ATOM(a_win_area, "_WIN_AREA");
props[0] = ax; props[0] = ax;
props[1] = ay; props[1] = ay;
e_window_property_set(win, a_win_area, XA_CARDINAL, 32, props, 2); ecore_window_property_set(win, a_win_area, XA_CARDINAL, 32, props, 2);
} }
void void
@ -400,10 +400,10 @@ e_icccm_set_desk_area_size(Window win, int ax, int ay)
static Atom a_win_area_count = 0; static Atom a_win_area_count = 0;
int props[2]; int props[2];
E_ATOM(a_win_area_count, "_WIN_AREA_COUNT"); ECORE_ATOM(a_win_area_count, "_WIN_AREA_COUNT");
props[0] = ax; props[0] = ax;
props[1] = ay; props[1] = ay;
e_window_property_set(win, a_win_area_count, XA_CARDINAL, 32, props, 2); ecore_window_property_set(win, a_win_area_count, XA_CARDINAL, 32, props, 2);
} }
void void
@ -412,9 +412,9 @@ e_icccm_set_desk(Window win, int d)
static Atom a_win_workspace = 0; static Atom a_win_workspace = 0;
int props[2]; int props[2];
E_ATOM(a_win_workspace, "_WIN_WORKSPACE"); ECORE_ATOM(a_win_workspace, "_WIN_WORKSPACE");
props[0] = d; props[0] = d;
e_window_property_set(win, a_win_workspace, XA_CARDINAL, 32, props, 1); ecore_window_property_set(win, a_win_workspace, XA_CARDINAL, 32, props, 1);
} }
int int
@ -424,8 +424,8 @@ e_icccm_is_shaped(Window win)
int shaped = 1; int shaped = 1;
XRectangle *rect; XRectangle *rect;
e_window_get_geometry(win, NULL, NULL, &w, &h); ecore_window_get_geometry(win, NULL, NULL, &w, &h);
rect = e_window_get_shape_rectangles(win, &num); rect = ecore_window_get_shape_rectangles(win, &num);
if (!rect) return 1; if (!rect) return 1;
if ((num == 1) && if ((num == 1) &&
(rect[0].x == 0) && (rect[0].y == 0) && (rect[0].x == 0) && (rect[0].y == 0) &&
@ -448,15 +448,15 @@ e_icccm_handle_property_change(Atom a, E_Border *b)
static Atom a_wm_icon_name = 0; static Atom a_wm_icon_name = 0;
static Atom a_wm_state = 0; static Atom a_wm_state = 0;
E_ATOM(a_wm_normal_hints, "WM_NORMAL_HINTS"); ECORE_ATOM(a_wm_normal_hints, "WM_NORMAL_HINTS");
E_ATOM(a_motif_wm_hints, "_MOTIF_WM_HINTS"); ECORE_ATOM(a_motif_wm_hints, "_MOTIF_WM_HINTS");
E_ATOM(a_wm_name, "WM_NAME"); ECORE_ATOM(a_wm_name, "WM_NAME");
E_ATOM(a_wm_class, "WM_CLASS"); ECORE_ATOM(a_wm_class, "WM_CLASS");
E_ATOM(a_wm_hints, "WM_HINTS"); ECORE_ATOM(a_wm_hints, "WM_HINTS");
E_ATOM(a_wm_client_machine, "WM_CLIENT_MACHINE"); ECORE_ATOM(a_wm_client_machine, "WM_CLIENT_MACHINE");
E_ATOM(a_wm_command, "WM_COMMAND"); ECORE_ATOM(a_wm_command, "WM_COMMAND");
E_ATOM(a_wm_icon_name, "WM_ICON_NAME"); ECORE_ATOM(a_wm_icon_name, "WM_ICON_NAME");
E_ATOM(a_wm_state, "WM_STATE"); ECORE_ATOM(a_wm_state, "WM_STATE");
if (a == a_wm_normal_hints) e_icccm_get_size_info(b->win.client, b); if (a == a_wm_normal_hints) e_icccm_get_size_info(b->win.client, b);
else if (a == a_motif_wm_hints) e_icccm_get_mwm_hints(b->win.client, b); else if (a == a_motif_wm_hints) e_icccm_get_mwm_hints(b->win.client, b);
@ -470,7 +470,7 @@ e_icccm_handle_property_change(Atom a, E_Border *b)
} }
void void
e_icccm_handle_client_message(Ev_Message *e) e_icccm_handle_client_message(Ecore_Event_Message *e)
{ {
return; return;
UN(e); UN(e);
@ -487,10 +487,10 @@ e_icccm_advertise_mwm_compat(void)
static Atom a_motif_wm_info = 0; static Atom a_motif_wm_info = 0;
int props[2]; int props[2];
E_ATOM(a_motif_wm_info, "_MOTIF_WM_INFO"); ECORE_ATOM(a_motif_wm_info, "_MOTIF_WM_INFO");
props[0] = 2; props[0] = 2;
props[0] = e_window_root(); props[0] = ecore_window_root();
e_window_property_set(0, a_motif_wm_info, a_motif_wm_info, 32, props, 2); ecore_window_property_set(0, a_motif_wm_info, a_motif_wm_info, 32, props, 2);
} }
void void
@ -504,21 +504,21 @@ e_icccm_advertise_gnome_compat(void)
int props[32]; int props[32];
Window win; Window win;
E_ATOM(a_win_protocols, "_WIN_PROTOCOLS"); ECORE_ATOM(a_win_protocols, "_WIN_PROTOCOLS");
E_ATOM(a_win_layer, "_WIN_LAYER"); ECORE_ATOM(a_win_layer, "_WIN_LAYER");
props[0] = a_win_protocols; props[0] = a_win_protocols;
e_window_property_set(0, a_win_protocols, XA_ATOM, 32, props, 1); ecore_window_property_set(0, a_win_protocols, XA_ATOM, 32, props, 1);
E_ATOM(a_win_wm_name, "_WIN_WM_NAME"); ECORE_ATOM(a_win_wm_name, "_WIN_WM_NAME");
e_window_property_set(0, a_win_wm_name, XA_STRING, 8, "Enlightenment", strlen("Enlightenment")); ecore_window_property_set(0, a_win_wm_name, XA_STRING, 8, "Enlightenment", strlen("Enlightenment"));
E_ATOM(a_win_wm_version, "_WIN_WM_VERSION"); ECORE_ATOM(a_win_wm_version, "_WIN_WM_VERSION");
e_window_property_set(0, a_win_wm_version, XA_STRING, 8, "0.17.0", strlen("0.17.0")); ecore_window_property_set(0, a_win_wm_version, XA_STRING, 8, "0.17.0", strlen("0.17.0"));
E_ATOM(a_win_supporting_wm_check, "_WIN_SUPPORTING_WM_CHECK"); ECORE_ATOM(a_win_supporting_wm_check, "_WIN_SUPPORTING_WM_CHECK");
win = e_window_override_new(0, 0, 0, 7, 7); win = ecore_window_override_new(0, 0, 0, 7, 7);
props[0] = win; props[0] = win;
e_window_property_set(win, a_win_supporting_wm_check, XA_CARDINAL, 32, props, 1); ecore_window_property_set(win, a_win_supporting_wm_check, XA_CARDINAL, 32, props, 1);
e_window_property_set(0, a_win_supporting_wm_check, XA_CARDINAL, 32, props, 1); ecore_window_property_set(0, a_win_supporting_wm_check, XA_CARDINAL, 32, props, 1);
} }
void void

2
src/icccm.h
View File

@ -27,7 +27,7 @@ void e_icccm_set_desk_area_size(Window win, int ax, int ay);
void e_icccm_set_desk(Window win, int d); void e_icccm_set_desk(Window win, int d);
int e_icccm_is_shaped(Window win); int e_icccm_is_shaped(Window win);
void e_icccm_handle_property_change(Atom a, E_Border *b); void e_icccm_handle_property_change(Atom a, E_Border *b);
void e_icccm_handle_client_message(Ev_Message *e); void e_icccm_handle_client_message(Ecore_Event_Message *e);
void e_icccm_advertise_e_compat(void); void e_icccm_advertise_e_compat(void);
void e_icccm_advertise_mwm_compat(void); void e_icccm_advertise_mwm_compat(void);
void e_icccm_advertise_gnome_compat(void); void e_icccm_advertise_gnome_compat(void);

969
src/iconbar.c
View File

File diff suppressed because it is too large Load Diff

137
src/iconbar.h
View File

@ -8,9 +8,8 @@
#define SCROLL_W 16 #define SCROLL_W 16
#define SCREEN_W 1280 #define SCREEN_W 1280
// structs
typedef struct _ib_icon E_IB_Icon; typedef struct _iconbar_icon E_Iconbar_Icon;
#ifndef E_ICONBAR_TYPEDEF #ifndef E_ICONBAR_TYPEDEF
#define E_ICONBAR_TYPEDEF #define E_ICONBAR_TYPEDEF
@ -23,88 +22,82 @@ typedef struct _E_View E_View;
#endif #endif
struct _ib_icon struct _iconbar_icon
{ {
OBJ_PROPERTIES; OBJ_PROPERTIES;
Evas_Object image; Evas_Object image;
char *exec; char *exec;
int w, h; int w, h;
double x, y; double x, y;
int selected; int selected;
}; };
struct _E_Iconbar struct _E_Iconbar
{ {
OBJ_PROPERTIES; OBJ_PROPERTIES;
char *name; char *name;
E_View *v; E_View *v;
Evas e; Evas e;
Evas_List icons; Evas_List icons;
char *db; char *db;
// E_DB_File *db;
struct {
struct { Evas_Object clip;
Evas_Object clip; Evas_Object scroll;
Evas_Object scroll; Evas_Object line_l;
Evas_Object line_l; Evas_Object line_c;
Evas_Object line_c; Evas_Object line_r;
Evas_Object line_r; Evas_Object title;
Evas_Object title; } obj;
} obj;
struct {
struct { char *title;
char *title; char *vline;
char *vline; char *hline;
char *hline; } image;
} image;
double start, speed, length;
double start, speed, length;
int scrolling, scroll_when_less;
int scrolling, scroll_when_less;
struct {
struct { int w;
int w; int h;
int h; int top;
int top; int left;
int left; int scroll_w;
int scroll_w; int title_w, title_h, line_w, line_h;
int title_w, title_h, line_w, line_h;
int horizontal; /* 1 - horiz, 0 - vert */
int horizontal; // 1 - horiz, 0 - vert
struct {
struct { int top;
int top; int left;
int left; int h;
int h; int w;
int w; } conf;
} conf; } geom;
} geom;
}; };
// functions
//static void e_idle(void *);
E_Iconbar *e_ib_new(E_View *); void e_iconbar_init(void);
int e_ib_config(E_Iconbar *); E_Iconbar *e_iconbar_new(E_View *);
void e_ib_realize(E_Iconbar *); int e_iconbar_config(E_Iconbar *);
void e_ib_redraw(E_Iconbar *); void e_iconbar_realize(E_Iconbar *);
E_IB_Icon *e_ib_new_icon(E_Iconbar *, char *, char *); void e_iconbar_redraw(E_Iconbar *);
void e_ib_fix_icons(E_Iconbar *); E_Iconbar_Icon *e_iconbar_new_icon(E_Iconbar *, char *, char *);
void e_ib_create_icons_from_db(E_Iconbar *); void e_iconbar_fix_icons(E_Iconbar *);
void e_ib_free(E_Iconbar *); void e_iconbar_create_icons_from_db(E_Iconbar *);
void e_ib_update(E_Iconbar *); void e_iconbar_free(E_Iconbar *);
//void ib_set_scroll_when_less(int); void e_iconbar_update(E_Iconbar *);
void i_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); void i_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
void i_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); void i_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
void i_mouse_down(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); void i_mouse_down(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
//void mouse_up(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
void s_mouse_move(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); void s_mouse_move(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
void s_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); void s_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);

32
src/keys.c
View File

@ -1,16 +1,16 @@
#include "keys.h" #include "keys.h"
#include "actions.h" #include "actions.h"
static void e_key_down(Eevent * ev); static void ecore_key_down(Ecore_Event * ev);
static void e_key_up(Eevent * ev); static void ecore_key_up(Ecore_Event * ev);
static void static void
e_key_down(Eevent * ev) ecore_key_down(Ecore_Event * ev)
{ {
Ev_Key_Down *e; Ecore_Event_Key_Down *e;
e = ev->event; e = ev->event;
if (e->win == e_get_key_grab_win()) if (e->win == ecore_get_key_grab_win())
{ {
e_action_stop("Key_Binding", ACT_KEY_DOWN, 0, e->key, e->mods, e_action_stop("Key_Binding", ACT_KEY_DOWN, 0, e->key, e->mods,
NULL, NULL, 0, 0, 0, 0); NULL, NULL, 0, 0, 0, 0);
@ -20,12 +20,12 @@ e_key_down(Eevent * ev)
} }
static void static void
e_key_up(Eevent * ev) ecore_key_up(Ecore_Event * ev)
{ {
Ev_Key_Up *e; Ecore_Event_Key_Up *e;
e = ev->event; e = ev->event;
if (e->win == e_get_key_grab_win()) if (e->win == ecore_get_key_grab_win())
{ {
e_action_stop("Key_Binding", ACT_KEY_UP, 0, e->key, e->mods, e_action_stop("Key_Binding", ACT_KEY_UP, 0, e->key, e->mods,
NULL, NULL, 0, 0, 0, 0); NULL, NULL, 0, 0, 0, 0);
@ -35,23 +35,23 @@ e_key_up(Eevent * ev)
} }
void void
e_keys_init(void) ecore_keys_init(void)
{ {
/* load up our actions .... once to get some grabbed keys */ /* load up our actions .... once to get some grabbed keys */
e_action_start("", ACT_KEY_DOWN, 0, NULL, EV_KEY_MODIFIER_NONE, e_action_start("", ACT_KEY_DOWN, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE,
NULL, NULL, 0, 0, 0, 0); NULL, NULL, 0, 0, 0, 0);
e_event_filter_handler_add(EV_KEY_DOWN, e_key_down); ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, ecore_key_down);
e_event_filter_handler_add(EV_KEY_UP, e_key_up); ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP, ecore_key_up);
} }
void void
e_keys_grab(char *key, Ev_Key_Modifiers mods, int anymod) ecore_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
{ {
e_key_grab(key, mods, anymod, 0); ecore_key_grab(key, mods, anymod, 0);
} }
void void
e_keys_ungrab(char *key, Ev_Key_Modifiers mods, int anymod) ecore_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
{ {
e_key_ungrab(key, mods, anymod); ecore_key_ungrab(key, mods, anymod);
} }

6
src/keys.h
View File

@ -3,8 +3,8 @@
#include "e.h" #include "e.h"
void e_keys_init(void); void ecore_keys_init(void);
void e_keys_grab(char *key, Ev_Key_Modifiers mods, int anymod); void ecore_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
void e_keys_ungrab(char *key, Ev_Key_Modifiers mods, int anymod); void ecore_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
#endif #endif

33
src/main.c
View File

@ -32,6 +32,7 @@ static void cb_exit(void)
} }
static void wm_running_error(Display * d, XErrorEvent * ev); static void wm_running_error(Display * d, XErrorEvent * ev);
static void static void
wm_running_error(Display * d, XErrorEvent * ev) wm_running_error(Display * d, XErrorEvent * ev)
{ {
@ -49,10 +50,10 @@ void setup(void);
void void
setup(void) setup(void)
{ {
e_grab(); ecore_grab();
e_sync(); ecore_sync();
e_border_adopt_children(0); e_border_adopt_children(0);
e_ungrab(); ecore_ungrab();
} }
int int
@ -97,25 +98,25 @@ main(int argc, char **argv)
} }
} }
if (!e_display_init(display)) if (!ecore_display_init(display))
{ {
fprintf(stderr, "Enlightenment Error: cannot connect to display!\n"); fprintf(stderr, "Enlightenment Error: cannot connect to display!\n");
fprintf(stderr, "Exiting Enlightenment. Error.\n"); fprintf(stderr, "Exiting Enlightenment. Error.\n");
exit(-1); exit(-1);
} }
e_ev_signal_init(); ecore_event_signal_init();
e_event_filter_init(); ecore_event_filter_init();
e_ev_x_init(); ecore_event_x_init();
/* become a wm */ /* become a wm */
e_grab(); ecore_grab();
e_sync(); ecore_sync();
e_set_error_handler(wm_running_error); ecore_set_error_handler(wm_running_error);
e_window_set_events(0, XEV_CHILD_REDIRECT | XEV_PROPERTY | XEV_COLORMAP); ecore_window_set_events(0, XEV_CHILD_REDIRECT | XEV_PROPERTY | XEV_COLORMAP);
e_sync(); ecore_sync();
e_reset_error_handler(); ecore_reset_error_handler();
e_ungrab(); ecore_ungrab();
e_fs_init(); e_fs_init();
e_desktops_init(); e_desktops_init();
@ -124,7 +125,7 @@ main(int argc, char **argv)
e_menu_init(); e_menu_init();
e_view_init(); e_view_init();
e_entry_init(); e_entry_init();
e_keys_init(); ecore_keys_init();
e_guides_init(); e_guides_init();
e_place_init(); e_place_init();
e_cursors_init(); e_cursors_init();
@ -138,7 +139,7 @@ main(int argc, char **argv)
setup(); setup();
e_event_loop(); ecore_event_loop();
#ifdef USE_FERITE #ifdef USE_FERITE
e_ferite_deinit(); e_ferite_deinit();

2
src/match.c
View File

@ -23,7 +23,7 @@ e_match_set_props(E_Border *b)
/* if we have a match specifying a size */ /* if we have a match specifying a size */
b->current.requested.w = match_w; b->current.requested.w = match_w;
b->current.requested.h = match_h; b->current.requested.h = match_h;
e_window_resize(b->win.client, match_w, match_h); ecore_window_resize(b->win.client, match_w, match_h);
/* if we have a match specifying a desktop */ /* if we have a match specifying a desktop */
b->client.desk = match_desk; b->client.desk = match_desk;
e_border_raise(b); e_border_raise(b);

126
src/menu.c
View File

@ -8,16 +8,16 @@ static int screen_w, screen_h;
static int mouse_x, mouse_y; static int mouse_x, mouse_y;
static int keyboard_nav = 0; static int keyboard_nav = 0;
static void e_idle(void *data); static void ecore_idle(void *data);
static void e_wheel(Eevent * ev); static void e_wheel(Ecore_Event * ev);
static void e_key_down(Eevent * ev); static void ecore_key_down(Ecore_Event * ev);
static void e_key_up(Eevent * ev); static void ecore_key_up(Ecore_Event * ev);
static void e_mouse_down(Eevent * ev); static void e_mouse_down(Ecore_Event * ev);
static void e_mouse_up(Eevent * ev); static void e_mouse_up(Ecore_Event * ev);
static void e_mouse_move(Eevent * ev); static void e_mouse_move(Ecore_Event * ev);
static void e_mouse_in(Eevent * ev); static void e_mouse_in(Ecore_Event * ev);
static void e_mouse_out(Eevent * ev); static void e_mouse_out(Ecore_Event * ev);
static void e_window_expose(Eevent * ev); static void ecore_window_expose(Ecore_Event * ev);
static void static void
e_scroller_timer(int val, void *data) e_scroller_timer(int val, void *data)
@ -36,7 +36,7 @@ e_scroller_timer(int val, void *data)
E_CONFIG_INT_GET(cfg_resist, resist); E_CONFIG_INT_GET(cfg_resist, resist);
E_CONFIG_INT_GET(cfg_scroll_speed, scroll_speed); E_CONFIG_INT_GET(cfg_scroll_speed, scroll_speed);
t = e_get_time(); t = ecore_get_time();
if (val != 0) if (val != 0)
scroll_speed = (int)(((t - last_time) / 0.02) * (double)scroll_speed); scroll_speed = (int)(((t - last_time) / 0.02) * (double)scroll_speed);
last_time = t; last_time = t;
@ -119,13 +119,13 @@ e_scroller_timer(int val, void *data)
} }
} }
if ((ok) && (open_menus)) if ((ok) && (open_menus))
e_add_event_timer("menu_scroller", 0.02, e_scroller_timer, val + 1, NULL); ecore_add_event_timer("menu_scroller", 0.02, e_scroller_timer, val + 1, NULL);
return; return;
UN(data); UN(data);
} }
static void static void
e_idle(void *data) ecore_idle(void *data)
{ {
Evas_List l; Evas_List l;
@ -171,9 +171,9 @@ e_idle(void *data)
} }
static void static void
e_wheel(Eevent * ev) e_wheel(Ecore_Event * ev)
{ {
Ev_Wheel *e; Ecore_Event_Wheel *e;
e = ev->event; e = ev->event;
if (e->win == menu_event_win) if (e->win == menu_event_win)
@ -182,9 +182,9 @@ e_wheel(Eevent * ev)
} }
static void static void
e_key_down(Eevent * ev) ecore_key_down(Ecore_Event * ev)
{ {
Ev_Key_Down *e; Ecore_Event_Key_Down *e;
int ok; int ok;
e = ev->event; e = ev->event;
@ -276,9 +276,9 @@ e_key_down(Eevent * ev)
} }
static void static void
e_key_up(Eevent * ev) ecore_key_up(Ecore_Event * ev)
{ {
Ev_Key_Up *e; Ecore_Event_Key_Up *e;
e = ev->event; e = ev->event;
{ {
@ -287,9 +287,9 @@ e_key_up(Eevent * ev)
/* handling mouse down events */ /* handling mouse down events */
static void static void
e_mouse_down(Eevent * ev) e_mouse_down(Ecore_Event * ev)
{ {
Ev_Mouse_Down *e; Ecore_Event_Mouse_Down *e;
e = ev->event; e = ev->event;
{ {
@ -298,9 +298,9 @@ e_mouse_down(Eevent * ev)
/* handling mouse up events */ /* handling mouse up events */
static void static void
e_mouse_up(Eevent * ev) e_mouse_up(Ecore_Event * ev)
{ {
Ev_Mouse_Up *e; Ecore_Event_Mouse_Up *e;
e = ev->event; e = ev->event;
keyboard_nav = 0; keyboard_nav = 0;
@ -340,9 +340,9 @@ e_mouse_up(Eevent * ev)
/* handling mouse move events */ /* handling mouse move events */
static void static void
e_mouse_move(Eevent * ev) e_mouse_move(Ecore_Event * ev)
{ {
Ev_Mouse_Move *e; Ecore_Event_Mouse_Move *e;
e = ev->event; e = ev->event;
keyboard_nav = 0; keyboard_nav = 0;
@ -384,9 +384,9 @@ e_mouse_move(Eevent * ev)
/* handling mouse enter events */ /* handling mouse enter events */
static void static void
e_mouse_in(Eevent * ev) e_mouse_in(Ecore_Event * ev)
{ {
Ev_Window_Enter *e; Ecore_Event_Window_Enter *e;
e = ev->event; e = ev->event;
keyboard_nav = 0; keyboard_nav = 0;
@ -397,9 +397,9 @@ e_mouse_in(Eevent * ev)
/* handling mouse leave events */ /* handling mouse leave events */
static void static void
e_mouse_out(Eevent * ev) e_mouse_out(Ecore_Event * ev)
{ {
Ev_Window_Leave *e; Ecore_Event_Window_Leave *e;
e = ev->event; e = ev->event;
keyboard_nav = 0; keyboard_nav = 0;
@ -425,9 +425,9 @@ e_mouse_out(Eevent * ev)
/* handling expose events */ /* handling expose events */
static void static void
e_window_expose(Eevent * ev) ecore_window_expose(Ecore_Event * ev)
{ {
Ev_Window_Expose *e; Ecore_Event_Window_Expose *e;
e = ev->event; e = ev->event;
{ {
@ -667,17 +667,17 @@ e_menu_select(int dx, int dy)
void void
e_menu_init(void) e_menu_init(void)
{ {
e_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h); ecore_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h);
e_event_filter_handler_add(EV_MOUSE_DOWN, e_mouse_down); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN, e_mouse_down);
e_event_filter_handler_add(EV_MOUSE_UP, e_mouse_up); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_UP, e_mouse_up);
e_event_filter_handler_add(EV_MOUSE_MOVE, e_mouse_move); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE, e_mouse_move);
e_event_filter_handler_add(EV_MOUSE_IN, e_mouse_in); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_IN, e_mouse_in);
e_event_filter_handler_add(EV_MOUSE_OUT, e_mouse_out); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT, e_mouse_out);
e_event_filter_handler_add(EV_WINDOW_EXPOSE, e_window_expose); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE, ecore_window_expose);
e_event_filter_handler_add(EV_KEY_DOWN, e_key_down); ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, ecore_key_down);
e_event_filter_handler_add(EV_KEY_UP, e_key_up); ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP, ecore_key_up);
e_event_filter_handler_add(EV_MOUSE_WHEEL, e_wheel); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_WHEEL, e_wheel);
e_event_filter_idle_handler_add(e_idle, NULL); ecore_event_filter_idle_handler_add(ecore_idle, NULL);
} }
void void
@ -686,14 +686,14 @@ e_menu_event_win_show(void)
/* create it */ /* create it */
if (!menu_event_win) if (!menu_event_win)
{ {
menu_event_win = e_window_input_new(0, 0, 0, screen_w, screen_h); menu_event_win = ecore_window_input_new(0, 0, 0, screen_w, screen_h);
e_window_set_events(menu_event_win, XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY); ecore_window_set_events(menu_event_win, XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY);
e_window_show(menu_event_win); ecore_window_show(menu_event_win);
e_keyboard_grab(menu_event_win); ecore_keyboard_grab(menu_event_win);
e_grab_mouse(menu_event_win, 1, 0); ecore_grab_mouse(menu_event_win, 1, 0);
} }
/* raise it */ /* raise it */
if (menu_event_win) e_window_raise(menu_event_win); if (menu_event_win) ecore_window_raise(menu_event_win);
} }
void void
@ -702,8 +702,8 @@ e_menu_event_win_hide(void)
/* destroy it */ /* destroy it */
if (menu_event_win) if (menu_event_win)
{ {
e_keyboard_ungrab(); ecore_keyboard_ungrab();
e_window_destroy(menu_event_win); ecore_window_destroy(menu_event_win);
menu_event_win = 0; menu_event_win = 0;
} }
} }
@ -885,7 +885,7 @@ e_menu_free(E_Menu *m)
evas_list_free(m->entries); evas_list_free(m->entries);
IF_FREE(m->bg_file); IF_FREE(m->bg_file);
evas_free(m->evas); evas_free(m->evas);
e_window_destroy(m->win.main); ecore_window_destroy(m->win.main);
menus = evas_list_remove(menus, m); menus = evas_list_remove(menus, m);
open_menus = evas_list_remove(open_menus, m); open_menus = evas_list_remove(open_menus, m);
free(m); free(m);
@ -907,8 +907,8 @@ e_menu_new(void)
OBJ_INIT(m, e_menu_free); OBJ_INIT(m, e_menu_free);
m->win.main = e_window_override_new(0, 0, 0, 1, 1); m->win.main = ecore_window_override_new(0, 0, 0, 1, 1);
m->evas = evas_new_all(e_display_get(), m->evas = evas_new_all(ecore_display_get(),
m->win.main, m->win.main,
0, 0, 1, 1, 0, 0, 1, 1,
RENDER_METHOD_ALPHA_SOFTWARE, RENDER_METHOD_ALPHA_SOFTWARE,
@ -933,9 +933,9 @@ e_menu_new(void)
evas_event_move(m->evas, -999999999, -99999999); evas_event_move(m->evas, -999999999, -99999999);
m->win.evas = evas_get_window(m->evas); m->win.evas = evas_get_window(m->evas);
e_window_set_events(m->win.evas, XEV_EXPOSE | XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY); ecore_window_set_events(m->win.evas, XEV_EXPOSE | XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY);
e_window_set_events(m->win.main, XEV_IN_OUT | XEV_KEY); ecore_window_set_events(m->win.main, XEV_IN_OUT | XEV_KEY);
e_window_show(m->win.evas); ecore_window_show(m->win.evas);
e_menu_set_background(m); e_menu_set_background(m);
@ -1361,21 +1361,21 @@ e_menu_update_base(E_Menu *m)
if ((location_changed) && (size_changed)) if ((location_changed) && (size_changed))
{ {
e_window_move_resize(m->win.main, m->current.x, m->current.y, m->current.w, m->current.h); ecore_window_move_resize(m->win.main, m->current.x, m->current.y, m->current.w, m->current.h);
e_menu_obscure_outside_screen(m); e_menu_obscure_outside_screen(m);
} }
else if (location_changed) else if (location_changed)
{ {
e_window_move(m->win.main, m->current.x, m->current.y); ecore_window_move(m->win.main, m->current.x, m->current.y);
e_menu_obscure_outside_screen(m); e_menu_obscure_outside_screen(m);
} }
else if (size_changed) else if (size_changed)
{ {
e_window_resize(m->win.main, m->current.w, m->current.h); ecore_window_resize(m->win.main, m->current.w, m->current.h);
} }
if (size_changed) if (size_changed)
{ {
e_window_resize(m->win.evas, m->current.w, m->current.h); ecore_window_resize(m->win.evas, m->current.w, m->current.h);
evas_set_output_size(m->evas, m->current.w, m->current.h); evas_set_output_size(m->evas, m->current.w, m->current.h);
evas_set_output_viewport(m->evas, 0, 0, m->current.w, m->current.h); evas_set_output_viewport(m->evas, 0, 0, m->current.w, m->current.h);
if (m->bg) ebits_resize(m->bg, m->current.w, m->current.h); if (m->bg) ebits_resize(m->bg, m->current.w, m->current.h);
@ -1398,9 +1398,9 @@ e_menu_update_shows(E_Menu *m)
{ {
if (m->current.visible) if (m->current.visible)
{ {
e_window_raise(m->win.main); ecore_window_raise(m->win.main);
e_menu_event_win_show(); e_menu_event_win_show();
e_window_show(m->win.main); ecore_window_show(m->win.main);
if (!open_menus) keyboard_nav = 0; if (!open_menus) keyboard_nav = 0;
open_menus = evas_list_append(open_menus, m); open_menus = evas_list_append(open_menus, m);
} }
@ -1438,7 +1438,7 @@ e_menu_update_hides(E_Menu *m)
m->selected = NULL; m->selected = NULL;
} }
open_menus = evas_list_remove(open_menus, m); open_menus = evas_list_remove(open_menus, m);
e_window_hide(m->win.main); ecore_window_hide(m->win.main);
if (!open_menus) e_menu_event_win_hide(); if (!open_menus) e_menu_event_win_hide();
} }
} }

10
src/menubuild.c
View File

@ -96,7 +96,7 @@ e_build_menu_db_poll(int val, void *data)
mod = e_file_modified_time(bm->file); mod = e_file_modified_time(bm->file);
if (mod <= bm->mod_time) if (mod <= bm->mod_time)
{ {
e_add_event_timer(bm->file, 1.0, e_build_menu_db_poll, 0, data); ecore_add_event_timer(bm->file, 1.0, e_build_menu_db_poll, 0, data);
return; return;
} }
bm->mod_time = mod; bm->mod_time = mod;
@ -105,7 +105,7 @@ e_build_menu_db_poll(int val, void *data)
e_build_menu_db_build(bm); e_build_menu_db_build(bm);
if (!bm->menu) bm->mod_time = 0; if (!bm->menu) bm->mod_time = 0;
e_add_event_timer(bm->file, 1.0, e_build_menu_db_poll, 0, data); ecore_add_event_timer(bm->file, 1.0, e_build_menu_db_poll, 0, data);
return; return;
UN(val); UN(val);
} }
@ -120,7 +120,7 @@ e_build_menu_gnome_apps_poll(int val, void *data)
mod = e_file_modified_time(bm->file); mod = e_file_modified_time(bm->file);
if (mod <= bm->mod_time) if (mod <= bm->mod_time)
{ {
e_add_event_timer(bm->file, 1.0, e_build_menu_gnome_apps_poll, 0, data); ecore_add_event_timer(bm->file, 1.0, e_build_menu_gnome_apps_poll, 0, data);
return; return;
} }
bm->mod_time = mod; bm->mod_time = mod;
@ -129,7 +129,7 @@ e_build_menu_gnome_apps_poll(int val, void *data)
e_build_menu_gnome_apps_build(bm); e_build_menu_gnome_apps_build(bm);
if (!bm->menu) bm->mod_time = 0; if (!bm->menu) bm->mod_time = 0;
e_add_event_timer(bm->file, 1.0, e_build_menu_gnome_apps_poll, 0, data); ecore_add_event_timer(bm->file, 1.0, e_build_menu_gnome_apps_poll, 0, data);
return; return;
UN(val); UN(val);
} }
@ -399,7 +399,7 @@ e_build_menu_gnome_apps_build(E_Build_Menu *bm)
void void
e_build_menu_free(E_Build_Menu *bm) e_build_menu_free(E_Build_Menu *bm)
{ {
e_del_event_timer(bm->file); ecore_del_event_timer(bm->file);
e_build_menu_unbuild(bm); e_build_menu_unbuild(bm);
IF_FREE(bm->file); IF_FREE(bm->file);
build_menus = evas_list_remove(build_menus, bm); build_menus = evas_list_remove(build_menus, bm);

46
src/place.c
View File

@ -3,45 +3,45 @@
#include "actions.h" #include "actions.h"
#include "guides.h" #include "guides.h"
static void e_mouse_down(Eevent * ev); static void e_mouse_down(Ecore_Event * ev);
static void e_mouse_up(Eevent * ev); static void e_mouse_up(Ecore_Event * ev);
static void e_mouse_move(Eevent * ev); static void e_mouse_move(Ecore_Event * ev);
static int prx, pry; static int prx, pry;
static Window win_place = 0; static Window win_place = 0;
static void static void
e_mouse_down(Eevent * ev) e_mouse_down(Ecore_Event * ev)
{ {
Ev_Mouse_Down *e; Ecore_Event_Mouse_Down *e;
e = ev->event; e = ev->event;
if (!win_place) return; if (!win_place) return;
} }
static void static void
e_mouse_up(Eevent * ev) e_mouse_up(Ecore_Event * ev)
{ {
Ev_Mouse_Up *e; Ecore_Event_Mouse_Up *e;
e = ev->event; e = ev->event;
if (!win_place) return; if (!win_place) return;
e_action_stop("Window_Place", ACT_MOUSE_UP, 1, NULL, e_action_stop("Window_Place", ACT_MOUSE_UP, 1, NULL,
EV_KEY_MODIFIER_NONE, NULL, NULL, e->x, e->y, e->rx, e->ry); ECORE_EVENT_KEY_MODIFIER_NONE, NULL, NULL, e->x, e->y, e->rx, e->ry);
e_window_destroy(win_place); ecore_window_destroy(win_place);
win_place = 0; win_place = 0;
return; return;
} }
static void static void
e_mouse_move(Eevent * ev) e_mouse_move(Ecore_Event * ev)
{ {
Ev_Mouse_Move *e; Ecore_Event_Mouse_Move *e;
e = ev->event; e = ev->event;
if (!win_place) return; if (!win_place) return;
e_action_cont("Window_Place", ACT_MOUSE_MOVE, 1, NULL, e_action_cont("Window_Place", ACT_MOUSE_MOVE, 1, NULL,
EV_KEY_MODIFIER_NONE, NULL, NULL, e->x, e->y, e->rx, e->ry, ECORE_EVENT_KEY_MODIFIER_NONE, NULL, NULL, e->x, e->y, e->rx, e->ry,
e->rx - prx, e->ry - pry); e->rx - prx, e->ry - pry);
prx = e->rx; prx = e->rx;
pry = e->ry; pry = e->ry;
@ -61,10 +61,10 @@ e_place_manual(E_Border *b, E_Desktop *desk, int *x, int *y)
if (!win_place) if (!win_place)
{ {
win_place = e_window_input_new(0, 0, 0, desk->real.w, desk->real.h); win_place = ecore_window_input_new(0, 0, 0, desk->real.w, desk->real.h);
e_window_set_events(win_place, XEV_MOUSE_MOVE | XEV_BUTTON); ecore_window_set_events(win_place, XEV_MOUSE_MOVE | XEV_BUTTON);
e_window_raise(win_place); ecore_window_raise(win_place);
e_window_show(win_place); ecore_window_show(win_place);
} }
else else
{ {
@ -72,14 +72,14 @@ e_place_manual(E_Border *b, E_Desktop *desk, int *x, int *y)
} }
/* get mouse coords */ /* get mouse coords */
e_pointer_xy(desk->win.main, &mx, &my); ecore_pointer_xy(desk->win.main, &mx, &my);
rx = mx; rx = mx;
ry = my; ry = my;
prx = rx; prx = rx;
pry = ry; pry = ry;
/* grab mouse to desktop */ /* grab mouse to desktop */
e_pointer_ungrab(CurrentTime); ecore_pointer_ungrab(CurrentTime);
e_pointer_grab(win_place, CurrentTime); ecore_pointer_grab(win_place, CurrentTime);
*x = mx - (w / 2); *x = mx - (w / 2);
*y = my - (h / 2); *y = my - (h / 2);
@ -87,7 +87,7 @@ e_place_manual(E_Border *b, E_Desktop *desk, int *x, int *y)
/* start a move mode */ /* start a move mode */
e_action_stop_by_type("Window_Place"); e_action_stop_by_type("Window_Place");
e_action_start("Window_Place", ACT_MOUSE_CLICK, 1, NULL, e_action_start("Window_Place", ACT_MOUSE_CLICK, 1, NULL,
EV_KEY_MODIFIER_NONE, b, NULL, mx, my, rx, ry); ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, mx, my, rx, ry);
if (move_mode != E_GUIDES_OPAQUE) return 0; if (move_mode != E_GUIDES_OPAQUE) return 0;
return 1; return 1;
@ -486,7 +486,7 @@ e_place_border(E_Border *b, E_Desktop *desk, int *x, int *y, E_Placement_Mode mo
void void
e_place_init(void) e_place_init(void)
{ {
e_event_filter_handler_add(EV_MOUSE_DOWN, e_mouse_down); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN, e_mouse_down);
e_event_filter_handler_add(EV_MOUSE_UP, e_mouse_up); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_UP, e_mouse_up);
e_event_filter_handler_add(EV_MOUSE_MOVE, e_mouse_move); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE, e_mouse_move);
} }

4
src/util.c
View File

@ -91,7 +91,7 @@ e_file_real(char *file)
} }
char * char *
e_file_get_file(char *file) e_filecore_get_file(char *file)
{ {
char *p; char *p;
char *f; char *f;
@ -107,7 +107,7 @@ e_file_get_file(char *file)
} }
char * char *
e_file_get_dir(char *file) e_filecore_get_dir(char *file)
{ {
char *p; char *p;
char *f; char *f;

264
src/view.c
View File

@ -12,10 +12,10 @@
#include "util.h" #include "util.h"
static Evas_List views = NULL; static Evas_List views = NULL;
static Eevent *current_ev = NULL; static Ecore_Event *current_ev = NULL;
static Ev_Key_Modifiers mulit_select_mod = EV_KEY_MODIFIER_SHIFT; static Ecore_Event_Key_Modifiers mulit_select_mod = ECORE_EVENT_KEY_MODIFIER_SHIFT;
static Ev_Key_Modifiers range_select_mod = EV_KEY_MODIFIER_CTRL; static Ecore_Event_Key_Modifiers range_select_mod = ECORE_EVENT_KEY_MODIFIER_CTRL;
static void e_bg_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); static void e_bg_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
static void e_bg_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); static void e_bg_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
@ -25,23 +25,23 @@ static void e_icon_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, i
static void e_icon_in_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); static void e_icon_in_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
static void e_icon_out_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); static void e_icon_out_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
static void e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); static void e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
static void e_idle(void *data); static void ecore_idle(void *data);
static void e_wheel(Eevent * ev); static void e_wheel(Ecore_Event * ev);
static void e_key_down(Eevent * ev); static void ecore_key_down(Ecore_Event * ev);
static void e_key_up(Eevent * ev); static void ecore_key_up(Ecore_Event * ev);
static void e_mouse_down(Eevent * ev); static void e_mouse_down(Ecore_Event * ev);
static void e_mouse_up(Eevent * ev); static void e_mouse_up(Ecore_Event * ev);
static void e_mouse_move(Eevent * ev); static void e_mouse_move(Ecore_Event * ev);
static void e_mouse_in(Eevent * ev); static void e_mouse_in(Ecore_Event * ev);
static void e_mouse_out(Eevent * ev); static void e_mouse_out(Ecore_Event * ev);
static void e_window_expose(Eevent * ev); static void ecore_window_expose(Ecore_Event * ev);
static void e_configure(Eevent * ev); static void e_configure(Ecore_Event * ev);
static void e_property(Eevent * ev); static void e_property(Ecore_Event * ev);
static void e_unmap(Eevent * ev); static void e_unmap(Ecore_Event * ev);
static void e_visibility(Eevent * ev); static void e_visibility(Ecore_Event * ev);
static void e_focus_in(Eevent * ev); static void ecore_focus_in(Ecore_Event * ev);
static void e_focus_out(Eevent * ev); static void ecore_focus_out(Ecore_Event * ev);
static void e_delete(Eevent * ev); static void e_delete(Ecore_Event * ev);
static void e_view_handle_fs(EfsdEvent *ev); static void e_view_handle_fs(EfsdEvent *ev);
static void e_view_handle_fs_restart(void *data); static void e_view_handle_fs_restart(void *data);
static void e_view_resort_timeout(int val, void *data); static void e_view_resort_timeout(int val, void *data);
@ -271,7 +271,7 @@ e_view_scrollbar_h_change_cb(void *_data, E_Scrollbar *sb, double val)
static void static void
e_bg_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) e_bg_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
{ {
Ev_Mouse_Down *ev; Ecore_Event_Mouse_Down *ev;
E_View *v; E_View *v;
if (!current_ev) return; if (!current_ev) return;
@ -307,7 +307,7 @@ e_bg_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
e_view_selection_update(v); e_view_selection_update(v);
} }
if( _b == 2 && ev->double_click ) if( _b == 2 && ev->double_click )
e_event_loop_quit(); ecore_event_loop_quit();
UN(_e); UN(_e);
UN(_o); UN(_o);
} }
@ -315,7 +315,7 @@ e_bg_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
static void static void
e_bg_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) e_bg_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
{ {
Ev_Mouse_Up *ev; Ecore_Event_Mouse_Up *ev;
E_View *v; E_View *v;
int dx, dy; int dx, dy;
@ -413,7 +413,7 @@ e_bg_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
static void static void
e_bg_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) e_bg_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
{ {
Ev_Mouse_Down *ev; Ecore_Event_Mouse_Down *ev;
E_View *v; E_View *v;
if (!current_ev) return; if (!current_ev) return;
@ -626,9 +626,9 @@ e_view_icon_exec(E_Icon *ic)
printf("new dir >%s<\n", buf); printf("new dir >%s<\n", buf);
v->dir = strdup(buf); v->dir = strdup(buf);
e_view_realize(v); e_view_realize(v);
e_window_set_title(v->win.base, ic->file); ecore_window_set_title(v->win.base, ic->file);
e_window_set_name_class(v->win.base, "FileView", "E"); ecore_window_set_name_class(v->win.base, "FileView", "E");
e_window_set_min_size(v->win.base, 8, 8); ecore_window_set_min_size(v->win.base, 8, 8);
} }
e_view_icon_deselect(ic); e_view_icon_deselect(ic);
} }
@ -806,8 +806,8 @@ static void
e_icon_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) e_icon_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
{ {
E_Icon *ic; E_Icon *ic;
Eevent *ev; Ecore_Event *ev;
Ev_Mouse_Down *e; Ecore_Event_Mouse_Down *e;
ev = e_view_get_current_event(); ev = e_view_get_current_event();
if (!ev) return; if (!ev) return;
@ -855,8 +855,8 @@ static void
e_icon_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) e_icon_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
{ {
E_Icon *ic; E_Icon *ic;
Eevent *ev; Ecore_Event *ev;
Ev_Mouse_Up *e; Ecore_Event_Mouse_Up *e;
ev = e_view_get_current_event(); ev = e_view_get_current_event();
if (!ev) return; if (!ev) return;
@ -867,7 +867,7 @@ e_icon_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
ic->state.clicked = 0; ic->state.clicked = 0;
ic->state.just_selected = 0; ic->state.just_selected = 0;
e_view_icon_update_state(ic); e_view_icon_update_state(ic);
e_window_destroy(ic->view->drag.win); ecore_window_destroy(ic->view->drag.win);
ic->view->drag.started = 0; ic->view->drag.started = 0;
return; return;
} }
@ -932,8 +932,8 @@ static void
e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
{ {
E_Icon *ic; E_Icon *ic;
Eevent *ev; Ecore_Event *ev;
Ev_Mouse_Move *e; Ecore_Event_Mouse_Move *e;
ev = e_view_get_current_event(); ev = e_view_get_current_event();
if (!ev) return; if (!ev) return;
@ -989,7 +989,7 @@ e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
} }
} }
} }
e_window_get_geometry(0, NULL, NULL, &rw, &rh); ecore_window_get_geometry(0, NULL, NULL, &rw, &rh);
downx = ic->view->select.down.x + ic->view->location.x; downx = ic->view->select.down.x + ic->view->location.x;
downy = ic->view->select.down.y + ic->view->location.y; downy = ic->view->select.down.y + ic->view->location.y;
@ -1019,9 +1019,9 @@ e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
ic->view->drag.offset.y = downy - ic->view->drag.y; ic->view->drag.offset.y = downy - ic->view->drag.y;
if ((ww < 1) || (wh < 1)) return; if ((ww < 1) || (wh < 1)) return;
ic->view->drag.win = e_window_override_new(0, wx, wy, ww, wh); ic->view->drag.win = ecore_window_override_new(0, wx, wy, ww, wh);
pmap = e_pixmap_new(ic->view->drag.win, ww, wh, 0); pmap = ecore_pixmap_new(ic->view->drag.win, ww, wh, 0);
mask = e_pixmap_new(ic->view->drag.win, ww, wh, 1); mask = ecore_pixmap_new(ic->view->drag.win, ww, wh, 1);
{ {
Imlib_Image im; Imlib_Image im;
@ -1110,13 +1110,13 @@ e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
imlib_render_image_on_drawable(0, 0); imlib_render_image_on_drawable(0, 0);
imlib_free_image(); imlib_free_image();
} }
e_window_set_background_pixmap(ic->view->drag.win, pmap); ecore_window_set_background_pixmap(ic->view->drag.win, pmap);
e_window_set_shape_mask(ic->view->drag.win, mask); ecore_window_set_shape_mask(ic->view->drag.win, mask);
e_window_ignore(ic->view->drag.win); ecore_window_ignore(ic->view->drag.win);
e_window_raise(ic->view->drag.win); ecore_window_raise(ic->view->drag.win);
e_window_show(ic->view->drag.win); ecore_window_show(ic->view->drag.win);
e_pixmap_free(pmap); ecore_pixmap_free(pmap);
e_pixmap_free(mask); ecore_pixmap_free(mask);
ic->view->drag.started = 1; ic->view->drag.started = 1;
} }
} }
@ -1137,7 +1137,7 @@ e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
} }
static void static void
e_idle(void *data) ecore_idle(void *data)
{ {
Evas_List l; Evas_List l;
@ -1159,7 +1159,7 @@ e_view_geometry_record(E_View *v)
{ {
int left, top; int left, top;
e_window_get_frame_size(v->win.base, &left, NULL, ecore_window_get_frame_size(v->win.base, &left, NULL,
&top, NULL); &top, NULL);
efsd_set_metadata_int(e_fs_get_connection(), efsd_set_metadata_int(e_fs_get_connection(),
"/view/x", v->dir, "/view/x", v->dir,
@ -1192,7 +1192,7 @@ e_view_queue_geometry_record(E_View *v)
char name[PATH_MAX]; char name[PATH_MAX];
sprintf(name, "geometry_record.%s", v->dir); sprintf(name, "geometry_record.%s", v->dir);
e_add_event_timer(name, 0.10, e_view_geometry_record_timeout, 0, v); ecore_add_event_timer(name, 0.10, e_view_geometry_record_timeout, 0, v);
} }
void void
@ -1201,14 +1201,14 @@ e_view_queue_icon_xy_record(E_View *v)
char name[PATH_MAX]; char name[PATH_MAX];
sprintf(name, "icon_xy_record.%s", v->dir); sprintf(name, "icon_xy_record.%s", v->dir);
e_add_event_timer(name, 0.10, e_view_write_icon_xy_timeout, 0, v); ecore_add_event_timer(name, 0.10, e_view_write_icon_xy_timeout, 0, v);
} }
static void static void
e_configure(Eevent * ev) e_configure(Ecore_Event * ev)
{ {
Ev_Window_Configure *e; Ecore_Event_Window_Configure *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1238,17 +1238,17 @@ e_configure(Eevent * ev)
printf("... a new size!\n"); printf("... a new size!\n");
v->size.w = e->w; v->size.w = e->w;
v->size.h = e->h; v->size.h = e->h;
if (v->pmap) e_pixmap_free(v->pmap); if (v->pmap) ecore_pixmap_free(v->pmap);
v->pmap = 0; v->pmap = 0;
e_window_resize(v->win.main, v->size.w, v->size.h); ecore_window_resize(v->win.main, v->size.w, v->size.h);
if (v->options.back_pixmap) if (v->options.back_pixmap)
{ {
v->pmap = e_pixmap_new(v->win.main, v->size.w, v->size.h, 0); v->pmap = ecore_pixmap_new(v->win.main, v->size.w, v->size.h, 0);
evas_set_output(v->evas, e_display_get(), v->pmap, evas_set_output(v->evas, ecore_display_get(), v->pmap,
evas_get_visual(v->evas), evas_get_visual(v->evas),
evas_get_colormap(v->evas)); evas_get_colormap(v->evas));
e_window_set_background_pixmap(v->win.main, v->pmap); ecore_window_set_background_pixmap(v->win.main, v->pmap);
e_window_clear(v->win.main); ecore_window_clear(v->win.main);
} }
if (v->bg) if (v->bg)
{ {
@ -1270,9 +1270,9 @@ e_configure(Eevent * ev)
} }
static void static void
e_property(Eevent * ev) e_property(Ecore_Event * ev)
{ {
Ev_Window_Configure *e; Ecore_Event_Window_Configure *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1288,9 +1288,9 @@ e_property(Eevent * ev)
} }
static void static void
e_unmap(Eevent * ev) e_unmap(Ecore_Event * ev)
{ {
Ev_Window_Unmap *e; Ecore_Event_Window_Unmap *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1306,9 +1306,9 @@ e_unmap(Eevent * ev)
} }
static void static void
e_visibility(Eevent * ev) e_visibility(Ecore_Event * ev)
{ {
Ev_Window_Unmap *e; Ecore_Event_Window_Unmap *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1324,9 +1324,9 @@ e_visibility(Eevent * ev)
} }
static void static void
e_focus_in(Eevent * ev) ecore_focus_in(Ecore_Event * ev)
{ {
Ev_Window_Focus_In *e; Ecore_Event_Window_Focus_In *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1342,9 +1342,9 @@ e_focus_in(Eevent * ev)
} }
static void static void
e_focus_out(Eevent * ev) ecore_focus_out(Ecore_Event * ev)
{ {
Ev_Window_Focus_Out *e; Ecore_Event_Window_Focus_Out *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1360,9 +1360,9 @@ e_focus_out(Eevent * ev)
} }
static void static void
e_delete(Eevent * ev) e_delete(Ecore_Event * ev)
{ {
Ev_Window_Delete *e; Ecore_Event_Window_Delete *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1380,9 +1380,9 @@ e_delete(Eevent * ev)
} }
static void static void
e_wheel(Eevent * ev) e_wheel(Ecore_Event * ev)
{ {
Ev_Wheel *e; Ecore_Event_Wheel *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1398,9 +1398,9 @@ e_wheel(Eevent * ev)
} }
static void static void
e_key_down(Eevent * ev) ecore_key_down(Ecore_Event * ev)
{ {
Ev_Key_Down *e; Ecore_Event_Key_Down *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1435,7 +1435,7 @@ e_key_down(Eevent * ev)
{ {
char *type; char *type;
type = e_key_press_translate_into_typeable(e); type = ecore_keypress_translate_into_typeable(e);
if (type) if (type)
{ {
} }
@ -1446,9 +1446,9 @@ e_key_down(Eevent * ev)
} }
static void static void
e_key_up(Eevent * ev) ecore_key_up(Ecore_Event * ev)
{ {
Ev_Key_Up *e; Ecore_Event_Key_Up *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1462,9 +1462,9 @@ e_key_up(Eevent * ev)
} }
static void static void
e_mouse_down(Eevent * ev) e_mouse_down(Ecore_Event * ev)
{ {
Ev_Mouse_Down *e; Ecore_Event_Mouse_Down *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1485,9 +1485,9 @@ e_mouse_down(Eevent * ev)
} }
static void static void
e_mouse_up(Eevent * ev) e_mouse_up(Ecore_Event * ev)
{ {
Ev_Mouse_Up *e; Ecore_Event_Mouse_Up *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1508,9 +1508,9 @@ e_mouse_up(Eevent * ev)
} }
static void static void
e_mouse_move(Eevent * ev) e_mouse_move(Ecore_Event * ev)
{ {
Ev_Mouse_Move *e; Ecore_Event_Mouse_Move *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1531,9 +1531,9 @@ e_mouse_move(Eevent * ev)
} }
static void static void
e_mouse_in(Eevent * ev) e_mouse_in(Ecore_Event * ev)
{ {
Ev_Window_Enter *e; Ecore_Event_Window_Enter *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1557,9 +1557,9 @@ e_mouse_in(Eevent * ev)
} }
static void static void
e_mouse_out(Eevent * ev) e_mouse_out(Ecore_Event * ev)
{ {
Ev_Window_Leave *e; Ecore_Event_Window_Leave *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1580,9 +1580,9 @@ e_mouse_out(Eevent * ev)
} }
static void static void
e_window_expose(Eevent * ev) ecore_window_expose(Ecore_Event * ev)
{ {
Ev_Window_Expose *e; Ecore_Event_Window_Expose *e;
Evas_List l; Evas_List l;
e = ev->event; e = ev->event;
@ -1653,7 +1653,7 @@ e_view_handle_fs_restart(void *data)
v->is_listing = 1; v->is_listing = 1;
} }
Eevent * Ecore_Event *
e_view_get_current_event(void) e_view_get_current_event(void)
{ {
return current_ev; return current_ev;
@ -1946,7 +1946,7 @@ e_view_queue_resort(E_View *v)
if (v->have_resort_queued) return; if (v->have_resort_queued) return;
v->have_resort_queued = 1; v->have_resort_queued = 1;
sprintf(name, "resort_timer.%s", v->dir); sprintf(name, "resort_timer.%s", v->dir);
e_add_event_timer(name, 1.0, e_view_resort_timeout, 0, v); ecore_add_event_timer(name, 1.0, e_view_resort_timeout, 0, v);
} }
void void
@ -2186,20 +2186,20 @@ e_view_free(E_View *v)
sprintf(name, "resort_timer.%s", v->dir); sprintf(name, "resort_timer.%s", v->dir);
e_del_event_timer(name); ecore_del_event_timer(name);
sprintf(name, "geometry_record.%s", v->dir); sprintf(name, "geometry_record.%s", v->dir);
e_del_event_timer(name); ecore_del_event_timer(name);
sprintf(name, "icon_xy_record.%s", v->dir); sprintf(name, "icon_xy_record.%s", v->dir);
e_del_event_timer(name); ecore_del_event_timer(name);
views = evas_list_remove(views, v); views = evas_list_remove(views, v);
efsd_stop_monitor(e_fs_get_connection(), v->dir, TRUE); efsd_stop_monitor(e_fs_get_connection(), v->dir, TRUE);
if (v->restarter) if (v->restarter)
e_fs_del_restart_handler(v->restarter); e_fs_del_restart_handler(v->restarter);
v->restarter = NULL; v->restarter = NULL;
e_window_destroy(v->win.base); ecore_window_destroy(v->win.base);
if (v->iconbar) e_ib_free(v->iconbar); if (v->iconbar) e_iconbar_free(v->iconbar);
FREE(v); FREE(v);
} }
@ -2252,7 +2252,7 @@ _member.r = _r; _member.g = _g; _member.b = _b; _member.a = _a;
v->spacing.icon.s = 7; v->spacing.icon.s = 7;
v->spacing.icon.g = 7; v->spacing.icon.g = 7;
v->spacing.icon.b = 7; v->spacing.icon.b = 7;
// v->iconbar = e_ib_new(v); // v->iconbar = e_iconbar_new(v);
views = evas_list_append(views, v); views = evas_list_append(views, v);
return v; return v;
@ -2311,12 +2311,12 @@ e_view_realize(E_View *v)
char *font_dir; char *font_dir;
if (v->evas) return; if (v->evas) return;
v->win.base = e_window_new(0, v->win.base = ecore_window_new(0,
v->location.x, v->location.y, v->location.x, v->location.y,
v->size.w, v->size.h); v->size.w, v->size.h);
e_window_set_delete_inform(v->win.base); ecore_window_set_delete_inform(v->win.base);
font_dir = e_config_get("fonts"); font_dir = e_config_get("fonts");
v->evas = evas_new_all(e_display_get(), v->evas = evas_new_all(ecore_display_get(),
v->win.base, v->win.base,
0, 0, v->size.w, v->size.h, 0, 0, v->size.w, v->size.h,
v->options.render_method, v->options.render_method,
@ -2327,19 +2327,19 @@ e_view_realize(E_View *v)
v->win.main = evas_get_window(v->evas); v->win.main = evas_get_window(v->evas);
e_cursors_display_in_window(v->win.main, "View"); e_cursors_display_in_window(v->win.main, "View");
evas_event_move(v->evas, -999999, -999999); evas_event_move(v->evas, -999999, -999999);
e_window_set_events(v->win.base, ecore_window_set_events(v->win.base,
XEV_VISIBILITY | XEV_CONFIGURE | XEV_VISIBILITY | XEV_CONFIGURE |
XEV_PROPERTY | XEV_FOCUS); XEV_PROPERTY | XEV_FOCUS);
e_window_set_events(v->win.main, ecore_window_set_events(v->win.main,
XEV_EXPOSE | XEV_MOUSE_MOVE | XEV_EXPOSE | XEV_MOUSE_MOVE |
XEV_BUTTON | XEV_IN_OUT | XEV_KEY); XEV_BUTTON | XEV_IN_OUT | XEV_KEY);
if (v->options.back_pixmap) if (v->options.back_pixmap)
{ {
v->pmap = e_pixmap_new(v->win.main, v->size.w, v->size.h, 0); v->pmap = ecore_pixmap_new(v->win.main, v->size.w, v->size.h, 0);
evas_set_output(v->evas, e_display_get(), v->pmap, evas_set_output(v->evas, ecore_display_get(), v->pmap,
evas_get_visual(v->evas), evas_get_visual(v->evas),
evas_get_colormap(v->evas)); evas_get_colormap(v->evas));
e_window_set_background_pixmap(v->win.main, v->pmap); ecore_window_set_background_pixmap(v->win.main, v->pmap);
} }
if (v->bg) if (v->bg)
{ {
@ -2380,7 +2380,7 @@ e_view_realize(E_View *v)
e_scrollbar_resize(v->scrollbar.h, v->size.w - 12, 12); e_scrollbar_resize(v->scrollbar.h, v->size.w - 12, 12);
e_window_show(v->win.main); ecore_window_show(v->win.main);
{ {
char *dir; char *dir;
@ -2391,9 +2391,9 @@ e_view_realize(E_View *v)
IF_FREE(dir); IF_FREE(dir);
} }
v->iconbar = e_ib_new(v); v->iconbar = e_iconbar_new(v);
if(v->iconbar) e_ib_realize(v->iconbar); if(v->iconbar) e_iconbar_realize(v->iconbar);
v->changed = 1; v->changed = 1;
} }
@ -2413,7 +2413,7 @@ e_view_update(E_View *v)
} }
if (v->drag.update) if (v->drag.update)
{ {
e_window_move(v->drag.win, v->drag.x, v->drag.y); ecore_window_move(v->drag.win, v->drag.x, v->drag.y);
v->drag.update = 0; v->drag.update = 0;
} }
} }
@ -2433,7 +2433,7 @@ e_view_update(E_View *v)
int x, y, w, h; int x, y, w, h;
imlib_updates_get_coordinates(u, &x, &y, &w, &h); imlib_updates_get_coordinates(u, &x, &y, &w, &h);
e_window_clear_area(v->win.main, x, y, w, h); ecore_window_clear_area(v->win.main, x, y, w, h);
} }
imlib_updates_free(up); imlib_updates_free(up);
} }
@ -2628,10 +2628,10 @@ e_view_handle_fs(EfsdEvent *ev)
if (efsd_metadata_get_int(ev, if (efsd_metadata_get_int(ev,
&(v->location.x))) &(v->location.x)))
{ {
e_window_move(v->win.base, ecore_window_move(v->win.base,
v->location.x, v->location.x,
v->location.y); v->location.y);
e_window_set_xy_hints(v->win.base, ecore_window_set_xy_hints(v->win.base,
v->location.x, v->location.x,
v->location.y); v->location.y);
} }
@ -2649,10 +2649,10 @@ e_view_handle_fs(EfsdEvent *ev)
if (efsd_metadata_get_int(ev, if (efsd_metadata_get_int(ev,
&(v->location.y))) &(v->location.y)))
{ {
e_window_move(v->win.base, ecore_window_move(v->win.base,
v->location.x, v->location.x,
v->location.y); v->location.y);
e_window_set_xy_hints(v->win.base, ecore_window_set_xy_hints(v->win.base,
v->location.x, v->location.x,
v->location.y); v->location.y);
} }
@ -2670,7 +2670,7 @@ e_view_handle_fs(EfsdEvent *ev)
if (efsd_metadata_get_int(ev, if (efsd_metadata_get_int(ev,
&(v->size.w))) &(v->size.w)))
{ {
e_window_resize(v->win.base, ecore_window_resize(v->win.base,
v->size.w, v->size.w,
v->size.h); v->size.h);
v->size.force = 1; v->size.force = 1;
@ -2689,7 +2689,7 @@ e_view_handle_fs(EfsdEvent *ev)
if (efsd_metadata_get_int(ev, if (efsd_metadata_get_int(ev,
&(v->size.h))) &(v->size.h)))
{ {
e_window_resize(v->win.base, ecore_window_resize(v->win.base,
v->size.w, v->size.w,
v->size.h); v->size.h);
v->size.force = 1; v->size.force = 1;
@ -2762,22 +2762,22 @@ e_view_handle_fs(EfsdEvent *ev)
void void
e_view_init(void) e_view_init(void)
{ {
e_event_filter_handler_add(EV_MOUSE_DOWN, e_mouse_down); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN, e_mouse_down);
e_event_filter_handler_add(EV_MOUSE_UP, e_mouse_up); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_UP, e_mouse_up);
e_event_filter_handler_add(EV_MOUSE_MOVE, e_mouse_move); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE, e_mouse_move);
e_event_filter_handler_add(EV_MOUSE_IN, e_mouse_in); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_IN, e_mouse_in);
e_event_filter_handler_add(EV_MOUSE_OUT, e_mouse_out); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT, e_mouse_out);
e_event_filter_handler_add(EV_WINDOW_EXPOSE, e_window_expose); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE, ecore_window_expose);
e_event_filter_handler_add(EV_KEY_DOWN, e_key_down); ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, ecore_key_down);
e_event_filter_handler_add(EV_KEY_UP, e_key_up); ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP, ecore_key_up);
e_event_filter_handler_add(EV_MOUSE_WHEEL, e_wheel); ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_WHEEL, e_wheel);
e_event_filter_handler_add(EV_WINDOW_CONFIGURE, e_configure); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_CONFIGURE, e_configure);
e_event_filter_handler_add(EV_WINDOW_PROPERTY, e_property); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_PROPERTY, e_property);
e_event_filter_handler_add(EV_WINDOW_UNMAP, e_unmap); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_UNMAP, e_unmap);
e_event_filter_handler_add(EV_WINDOW_VISIBILITY, e_visibility); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_VISIBILITY, e_visibility);
e_event_filter_handler_add(EV_WINDOW_FOCUS_IN, e_focus_in); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_FOCUS_IN, ecore_focus_in);
e_event_filter_handler_add(EV_WINDOW_FOCUS_OUT, e_focus_out); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_FOCUS_OUT, ecore_focus_out);
e_event_filter_handler_add(EV_WINDOW_DELETE, e_delete); ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_DELETE, e_delete);
e_event_filter_idle_handler_add(e_idle, NULL); ecore_event_filter_idle_handler_add(ecore_idle, NULL);
e_fs_add_event_handler(e_view_handle_fs); e_fs_add_event_handler(e_view_handle_fs);
} }

2
src/view.h
View File

@ -207,7 +207,7 @@ struct _E_Icon
void e_view_selection_update(E_View *v); void e_view_selection_update(E_View *v);
void e_view_deselect_all(void); void e_view_deselect_all(void);
void e_view_deselect_all_except(E_Icon *not_ic); void e_view_deselect_all_except(E_Icon *not_ic);
Eevent *e_view_get_current_event(void); Ecore_Event *e_view_get_current_event(void);
int e_view_filter_file(E_View *v, char *file); int e_view_filter_file(E_View *v, char *file);
void e_view_icons_get_extents(E_View *v, int *min_x, int *min_y, int *max_x, int *max_y); void e_view_icons_get_extents(E_View *v, int *min_x, int *min_y, int *max_x, int *max_y);
void e_view_icons_apply_xy(E_View *v); void e_view_icons_apply_xy(E_View *v);