From 27379cbd44e6e615eda1a3b913f8d8493246be81 Mon Sep 17 00:00:00 2001 From: cpk Date: Wed, 17 Oct 2001 22:34:27 +0000 Subject: [PATCH] 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 --- src/actions.c | 100 ++--- src/actions.h | 6 +- src/border.c | 602 +++++++++++++++--------------- src/border.h | 2 +- src/config.h | 4 +- src/cursors.c | 36 +- src/delayed.c | 4 +- src/desktops.c | 58 +-- src/e.h | 8 +- src/entry.c | 34 +- src/entry.h | 2 +- src/exec.c | 5 +- src/fs.c | 22 +- src/guides.c | 176 ++++----- src/icccm.c | 122 +++--- src/icccm.h | 2 +- src/iconbar.c | 969 +++++++++++++++++++++++------------------------- src/iconbar.h | 137 ++++--- src/keys.c | 32 +- src/keys.h | 6 +- src/main.c | 33 +- src/match.c | 2 +- src/menu.c | 126 +++---- src/menubuild.c | 10 +- src/place.c | 46 +-- src/util.c | 4 +- src/view.c | 264 ++++++------- src/view.h | 2 +- 28 files changed, 1394 insertions(+), 1420 deletions(-) diff --git a/src/actions.c b/src/actions.c index 847b34e4d..7ac5bcc70 100644 --- a/src/actions.c +++ b/src/actions.c @@ -13,7 +13,7 @@ static Evas_List action_impls = NULL; static Evas_List current_actions = NULL; static Evas_List current_timers = NULL; -static void e_action_find(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, void *o); +static void e_action_find(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o); static void e_action_free(E_Action *a); static void e_act_move_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); @@ -68,7 +68,7 @@ static void e_act_desk_start (void *o, E_Action *a, void *data, int x, int y, in static void e_act_raise_next_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); static void -e_action_find(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, void *o) +e_action_find(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o) { char *actions_db; E_DB_File *db; @@ -140,9 +140,9 @@ e_action_find(char *action, E_Action_Type act, int button, char *key, Ev_Key_Mod if ((a->key) && (strlen(a->key) > 0)) { if (a->modifiers == -1) - e_keys_grab(a->key, EV_KEY_MODIFIER_NONE, 1); + ecore_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1); else - e_keys_grab(a->key, (Ev_Key_Modifiers)a->modifiers, 0); + ecore_keys_grab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0); a->grabbed = 1; } } @@ -210,9 +210,9 @@ e_action_free(E_Action *a) if ((a->key) && (strlen(a->key) > 0) && (a->grabbed)) { if (a->modifiers == -1) - e_keys_ungrab(a->key, EV_KEY_MODIFIER_NONE, 1); + ecore_keys_ungrab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1); else - e_keys_ungrab(a->key, (Ev_Key_Modifiers)a->modifiers, 0); + ecore_keys_ungrab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0); } IF_FREE(a->name); IF_FREE(a->action); @@ -222,7 +222,7 @@ e_action_free(E_Action *a) } void -e_action_start(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry) +e_action_start(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry) { Evas_List l; @@ -260,7 +260,7 @@ e_action_start(char *action, E_Action_Type act, int button, char *key, Ev_Key_Mo } void -e_action_stop(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry) +e_action_stop(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry) { Evas_List l; @@ -327,7 +327,7 @@ e_action_stop(char *action, E_Action_Type act, int button, char *key, Ev_Key_Mod } void -e_action_cont(char *action, E_Action_Type act, int button, char *key, Ev_Key_Modifiers mods, +e_action_cont(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry, int dx, int dy) { Evas_List l; @@ -442,7 +442,7 @@ e_action_del_timer(void *o, char *name) (at->name) && (!strcmp(at->name, name))) { - e_del_event_timer(at->name); + ecore_del_event_timer(at->name); current_timers = evas_list_remove(current_timers, at); IF_FREE(at->name); FREE(at); @@ -475,7 +475,7 @@ e_action_del_timer_object(void *o) at = l->data; if (at->object == o) { - e_del_event_timer(at->name); + ecore_del_event_timer(at->name); current_timers = evas_list_remove(current_timers, at); IF_FREE(at->name); FREE(at); @@ -669,13 +669,13 @@ e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int if (b->current.shaded != 0) return; if (resize_mode >= E_GUIDES_BOX) b->hold_changes = 1; /* if non opaque */ - e_window_gravity_set(b->win.client, StaticGravity); - e_window_gravity_set(b->win.l, NorthWestGravity); - e_window_gravity_set(b->win.r, SouthEastGravity); - e_window_gravity_set(b->win.t, NorthWestGravity); - e_window_gravity_set(b->win.b, SouthEastGravity); - e_window_gravity_set(b->win.input, NorthWestGravity); - e_window_gravity_set(b->win.container, NorthWestGravity); + ecore_window_gravity_set(b->win.client, StaticGravity); + ecore_window_gravity_set(b->win.l, NorthWestGravity); + ecore_window_gravity_set(b->win.r, SouthEastGravity); + ecore_window_gravity_set(b->win.t, NorthWestGravity); + ecore_window_gravity_set(b->win.b, SouthEastGravity); + ecore_window_gravity_set(b->win.input, NorthWestGravity); + ecore_window_gravity_set(b->win.container, NorthWestGravity); /* 1 | 2 */ /* --+-- */ /* 3 | 4 */ @@ -685,13 +685,13 @@ e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int { b->mode.resize = 4; /* e_border_set_gravity(b, NorthWestGravity); */ - /* e_window_gravity_set(b->win.container, SouthEastGravity);*/ + /* ecore_window_gravity_set(b->win.container, SouthEastGravity);*/ } else { b->mode.resize = 2; /* e_border_set_gravity(b, SouthWestGravity);*/ - /* e_window_gravity_set(b->win.container, NorthEastGravity);*/ + /* ecore_window_gravity_set(b->win.container, NorthEastGravity);*/ } } else @@ -700,13 +700,13 @@ e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int { b->mode.resize = 3; /* e_border_set_gravity(b, NorthEastGravity);*/ -/* e_window_gravity_set(b->win.container, SouthWestGravity);*/ +/* ecore_window_gravity_set(b->win.container, SouthWestGravity);*/ } else { b->mode.resize = 1; /* e_border_set_gravity(b, SouthEastGravity);*/ -/* e_window_gravity_set(b->win.container, NorthWestGravity); */ +/* ecore_window_gravity_set(b->win.container, NorthWestGravity); */ } } { @@ -749,7 +749,7 @@ e_act_resize_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int b->mode.resize = 0; b->changed = 1; e_border_adjust_limits(b); - e_window_gravity_set(b->win.client, NorthWestGravity); + ecore_window_gravity_set(b->win.client, NorthWestGravity); e_border_set_gravity(b, NorthWestGravity); e_guides_hide(); return; @@ -840,13 +840,13 @@ e_act_resize_h_start (void *o, E_Action *a, void *data, int x, int y, int rx, in if (b->current.shaded != 0) return; if (resize_mode >= E_GUIDES_BOX) b->hold_changes = 1; /* if non opaque */ - e_window_gravity_set(b->win.client, StaticGravity); - e_window_gravity_set(b->win.l, NorthWestGravity); - e_window_gravity_set(b->win.r, SouthEastGravity); - e_window_gravity_set(b->win.t, NorthWestGravity); - e_window_gravity_set(b->win.b, SouthEastGravity); - e_window_gravity_set(b->win.input, NorthWestGravity); - e_window_gravity_set(b->win.container, NorthWestGravity); + ecore_window_gravity_set(b->win.client, StaticGravity); + ecore_window_gravity_set(b->win.l, NorthWestGravity); + ecore_window_gravity_set(b->win.r, SouthEastGravity); + ecore_window_gravity_set(b->win.t, NorthWestGravity); + ecore_window_gravity_set(b->win.b, SouthEastGravity); + ecore_window_gravity_set(b->win.input, NorthWestGravity); + ecore_window_gravity_set(b->win.container, NorthWestGravity); /* 5 | 6 */ if (x > (b->current.w / 2)) { @@ -898,7 +898,7 @@ e_act_resize_h_stop (void *o, E_Action *a, void *data, int x, int y, int rx, in b->mode.resize = 0; b->changed = 1; e_border_adjust_limits(b); - e_window_gravity_set(b->win.client, NorthWestGravity); + ecore_window_gravity_set(b->win.client, NorthWestGravity); e_border_set_gravity(b, NorthWestGravity); e_guides_hide(); return; @@ -974,13 +974,13 @@ e_act_resize_v_start (void *o, E_Action *a, void *data, int x, int y, int rx, in if (b->current.shaded != 0) return; if (resize_mode >= E_GUIDES_BOX) b->hold_changes = 1; /* if non opaque */ - e_window_gravity_set(b->win.client, StaticGravity); - e_window_gravity_set(b->win.l, NorthWestGravity); - e_window_gravity_set(b->win.r, SouthEastGravity); - e_window_gravity_set(b->win.t, NorthWestGravity); - e_window_gravity_set(b->win.b, SouthEastGravity); - e_window_gravity_set(b->win.input, NorthWestGravity); - e_window_gravity_set(b->win.container, NorthWestGravity); + ecore_window_gravity_set(b->win.client, StaticGravity); + ecore_window_gravity_set(b->win.l, NorthWestGravity); + ecore_window_gravity_set(b->win.r, SouthEastGravity); + ecore_window_gravity_set(b->win.t, NorthWestGravity); + ecore_window_gravity_set(b->win.b, SouthEastGravity); + ecore_window_gravity_set(b->win.input, NorthWestGravity); + ecore_window_gravity_set(b->win.container, NorthWestGravity); /* 7 */ /* - */ /* 8 */ @@ -1033,7 +1033,7 @@ e_act_resize_v_stop (void *o, E_Action *a, void *data, int x, int y, int rx, in b->current.requested.h = b->current.h; b->mode.resize = 0; e_border_adjust_limits(b); - e_window_gravity_set(b->win.client, NorthWestGravity); + ecore_window_gravity_set(b->win.client, NorthWestGravity); e_border_set_gravity(b, NorthWestGravity); b->changed = 1; e_guides_hide(); @@ -1115,7 +1115,7 @@ e_act_kill_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry if (!b) b = e_border_current_focused(); if (!b) return; if (b->client.is_desktop) return; - if (b->win.client) e_window_kill_client(b->win.client); + if (b->win.client) ecore_window_kill_client(b->win.client); return; UN(a); UN(data); @@ -1142,13 +1142,13 @@ e_act_cb_shade(int val, void *data) if (val == 0) { OBJ_REF(b); - t = e_get_time(); - e_window_gravity_set(b->win.client, SouthWestGravity); + t = ecore_get_time(); + ecore_window_gravity_set(b->win.client, SouthWestGravity); e_action_del_timer(b, "shader"); e_action_add_timer(b, "shader"); } - dif = e_get_time() - t; + dif = ecore_get_time() - t; si = (int)(dif * (double)pix_per_sec); if (si > b->client.h) si = b->client.h; @@ -1157,11 +1157,11 @@ e_act_cb_shade(int val, void *data) e_border_adjust_limits(b); e_border_apply_border(b); if (si < b->client.h) - e_add_event_timer("shader", 0.01, e_act_cb_shade, 1, data); + ecore_add_event_timer("shader", 0.01, e_act_cb_shade, 1, data); else { e_action_del_timer(b, "shader"); - e_window_gravity_reset(b->win.client); + ecore_window_gravity_reset(b->win.client); OBJ_UNREF(b); } } @@ -1183,13 +1183,13 @@ e_act_cb_unshade(int val, void *data) if (val == 0) { OBJ_REF(b); - t = e_get_time(); - e_window_gravity_set(b->win.client, SouthWestGravity); + t = ecore_get_time(); + ecore_window_gravity_set(b->win.client, SouthWestGravity); e_action_del_timer(b, "shader"); e_action_add_timer(b, "shader"); } - dif = e_get_time() - t; + dif = ecore_get_time() - t; si = b->client.h - (int)(dif * (double)pix_per_sec); if (si < 0) si = 0; @@ -1199,11 +1199,11 @@ e_act_cb_unshade(int val, void *data) e_border_adjust_limits(b); e_border_apply_border(b); if (si > 0) - e_add_event_timer("shader", 0.01, e_act_cb_unshade, 1, data); + ecore_add_event_timer("shader", 0.01, e_act_cb_unshade, 1, data); else { e_action_del_timer(b, "shader"); - e_window_gravity_reset(b->win.client); + ecore_window_gravity_reset(b->win.client); OBJ_UNREF(b); } } diff --git a/src/actions.h b/src/actions.h index 76ea0fc1e..d98d68256 100644 --- a/src/actions.h +++ b/src/actions.h @@ -57,13 +57,13 @@ struct _E_Action_Impl void e_action_start(char *action, E_Action_Type act, int button, char *key, - Ev_Key_Modifiers mods, void *o, void *data, + Ecore_Event_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry); void e_action_stop(char *action, E_Action_Type act, int button, char *key, - Ev_Key_Modifiers mods, void *o, void *data, + Ecore_Event_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry); void e_action_cont(char *action, E_Action_Type act, int button, char *key, - Ev_Key_Modifiers mods, void *o, void *data, + Ecore_Event_Key_Modifiers mods, void *o, void *data, int x, int y, int rx, int ry, int dx, int dy); void e_action_stop_by_object(void *o, void *data, int x, int y, int rx, int ry); void e_action_stop_by_type(char *action); diff --git a/src/border.c b/src/border.c index de1565be0..4d8855da1 100644 --- a/src/border.c +++ b/src/border.c @@ -23,28 +23,28 @@ static int border_mouse_x = 0; static int border_mouse_y = 0; static int border_mouse_buttons = 0; -static Eevent *current_ev = NULL; +static Ecore_Event *current_ev = NULL; /* Global delayed window raise action */ E_Delayed_Action *delayed_window_raise = NULL; -static void e_idle(void *data); -static void e_map_request(Eevent * ev); -static void e_configure_request(Eevent * ev); -static void e_property(Eevent * ev); -static void e_unmap(Eevent * ev); -static void e_destroy(Eevent * ev); -static void e_circulate_request(Eevent * ev); -static void e_reparent(Eevent * ev); -static void e_shape(Eevent * ev); -static void e_focus_in(Eevent * ev); -static void e_focus_out(Eevent * ev); -static void e_colormap(Eevent * ev); -static void e_mouse_down(Eevent * ev); -static void e_mouse_up(Eevent * ev); -static void e_mouse_in(Eevent * ev); -static void e_mouse_out(Eevent * ev); -static void e_window_expose(Eevent * ev); +static void ecore_idle(void *data); +static void e_map_request(Ecore_Event * ev); +static void e_configure_request(Ecore_Event * ev); +static void e_property(Ecore_Event * ev); +static void e_unmap(Ecore_Event * ev); +static void e_destroy(Ecore_Event * ev); +static void e_circulate_request(Ecore_Event * ev); +static void e_reparent(Ecore_Event * ev); +static void e_shape(Ecore_Event * ev); +static void ecore_focus_in(Ecore_Event * ev); +static void ecore_focus_out(Ecore_Event * ev); +static void e_colormap(Ecore_Event * ev); +static void e_mouse_down(Ecore_Event * ev); +static void e_mouse_up(Ecore_Event * ev); +static void e_mouse_in(Ecore_Event * ev); +static void e_mouse_out(Ecore_Event * ev); +static void ecore_window_expose(Ecore_Event * ev); static void e_cb_mouse_in(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); @@ -57,11 +57,11 @@ static void e_cb_mouse_up(void *data, Ebits_Object o, char *class, int bt, static void e_cb_mouse_move(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); -static void e_cb_border_mouse_in(E_Border *b, Eevent *e); -static void e_cb_border_mouse_out(E_Border *b, Eevent *e); -static void e_cb_border_mouse_down(E_Border *b, Eevent *e); -static void e_cb_border_mouse_up(E_Border *b, Eevent *e); -static void e_cb_border_mouse_move(E_Border *b, Eevent *e); +static void e_cb_border_mouse_in(E_Border *b, Ecore_Event *e); +static void e_cb_border_mouse_out(E_Border *b, Ecore_Event *e); +static void e_cb_border_mouse_down(E_Border *b, Ecore_Event *e); +static void e_cb_border_mouse_up(E_Border *b, Ecore_Event *e); +static void e_cb_border_mouse_move(E_Border *b, Ecore_Event *e); static void e_cb_border_move_resize(E_Border *b); static void e_cb_border_visibility(E_Border *b); @@ -98,7 +98,7 @@ e_border_update_borders(void) } static void -e_idle(void *data) +ecore_idle(void *data) { e_border_update_borders(); return; @@ -107,9 +107,9 @@ e_idle(void *data) /* */ static void -e_map_request(Eevent * ev) +e_map_request(Ecore_Event * ev) { - Ev_Window_Map_Request *e; + Ecore_Event_Window_Map_Request *e; current_ev = ev; e = ev->event; @@ -119,7 +119,7 @@ e_map_request(Eevent * ev) b = e_border_find_by_window(e->win); if (!b) { - if (e_window_exists(e->win)) + if (ecore_window_exists(e->win)) b = e_border_adopt(e->win, 0); } } @@ -128,9 +128,9 @@ e_map_request(Eevent * ev) /* */ static void -e_configure_request(Eevent * ev) +e_configure_request(Ecore_Event * ev) { - Ev_Window_Configure_Request *e; + Ecore_Event_Window_Configure_Request *e; current_ev = ev; e = ev->event; @@ -144,11 +144,11 @@ e_configure_request(Eevent * ev) pl = pr = pt = pb = 0; if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb); - if (e->mask & EV_VALUE_X) + if (e->mask & ECORE_EVENT_VALUE_X) b->current.requested.x = e->x; - if (e->mask & EV_VALUE_Y) + if (e->mask & ECORE_EVENT_VALUE_Y) b->current.requested.y = e->y; - if ((e->mask & EV_VALUE_W) || (e->mask & EV_VALUE_H)) + if ((e->mask & ECORE_EVENT_VALUE_W) || (e->mask & ECORE_EVENT_VALUE_H)) { if (b->current.shaded == b->client.h) { @@ -168,47 +168,47 @@ e_configure_request(Eevent * ev) b->current.requested.w = e->w + pl + pr; b->current.requested.h = e->h + pt + pb; } - if ((e->mask & EV_VALUE_SIBLING) && (e->mask & EV_VALUE_STACKING)) + if ((e->mask & ECORE_EVENT_VALUE_SIBLING) && (e->mask & ECORE_EVENT_VALUE_STACKING)) { E_Border *b_rel; b_rel = e_border_find_by_window(e->stack_win); if (b_rel) { - if (e->detail == EV_STACK_ABOVE) e_border_raise_above(b, b_rel); - else if (e->detail == EV_STACK_BELOW) e_border_lower_below(b, b_rel); + if (e->detail == ECORE_EVENT_STACK_ABOVE) e_border_raise_above(b, b_rel); + else if (e->detail == ECORE_EVENT_STACK_BELOW) e_border_lower_below(b, b_rel); /* FIXME: need to handle & fix - * EV_STACK_TOP_IF - * EV_STACK_BOTTOM_IF - * EV_STACK_OPPOSITE + * ECORE_EVENT_STACK_TOP_IF + * ECORE_EVENT_STACK_BOTTOM_IF + * ECORE_EVENT_STACK_OPPOSITE */ - else if (e->detail == EV_STACK_TOP_IF) e_border_raise(b); - else if (e->detail == EV_STACK_BOTTOM_IF) e_border_lower(b); + else if (e->detail == ECORE_EVENT_STACK_TOP_IF) e_border_raise(b); + else if (e->detail == ECORE_EVENT_STACK_BOTTOM_IF) e_border_lower(b); } } - else if (e->mask & EV_VALUE_STACKING) + else if (e->mask & ECORE_EVENT_VALUE_STACKING) { - if (e->detail == EV_STACK_ABOVE) e_border_raise(b); - else if (e->detail == EV_STACK_BELOW) e_border_lower(b); + if (e->detail == ECORE_EVENT_STACK_ABOVE) e_border_raise(b); + else if (e->detail == ECORE_EVENT_STACK_BELOW) e_border_lower(b); /* FIXME: need to handle & fix - * EV_STACK_TOP_IF - * EV_STACK_BOTTOM_IF - * EV_STACK_OPPOSITE + * ECORE_EVENT_STACK_TOP_IF + * ECORE_EVENT_STACK_BOTTOM_IF + * ECORE_EVENT_STACK_OPPOSITE */ - else if (e->detail == EV_STACK_TOP_IF) e_border_raise(b); - else if (e->detail == EV_STACK_BOTTOM_IF) e_border_lower(b); + else if (e->detail == ECORE_EVENT_STACK_TOP_IF) e_border_raise(b); + else if (e->detail == ECORE_EVENT_STACK_BOTTOM_IF) e_border_lower(b); } b->changed = 1; e_border_adjust_limits(b); } else { - if ((e->mask & EV_VALUE_X) && (e->mask & EV_VALUE_W)) - e_window_move_resize(e->win, e->x, e->y, e->w, e->h); - else if ((e->mask & EV_VALUE_W) || (e->mask & EV_VALUE_H)) - e_window_resize(e->win, e->w, e->h); - else if ((e->mask & EV_VALUE_X)) - e_window_move(e->win, e->x, e->y); + if ((e->mask & ECORE_EVENT_VALUE_X) && (e->mask & ECORE_EVENT_VALUE_W)) + ecore_window_move_resize(e->win, e->x, e->y, e->w, e->h); + else if ((e->mask & ECORE_EVENT_VALUE_W) || (e->mask & ECORE_EVENT_VALUE_H)) + ecore_window_resize(e->win, e->w, e->h); + else if ((e->mask & ECORE_EVENT_VALUE_X)) + ecore_window_move(e->win, e->x, e->y); } } current_ev = NULL; @@ -216,9 +216,9 @@ e_configure_request(Eevent * ev) /* */ static void -e_property(Eevent * ev) +e_property(Ecore_Event * ev) { - Ev_Window_Property *e; + Ecore_Event_Window_Property *e; current_ev = ev; e = ev->event; @@ -236,9 +236,9 @@ e_property(Eevent * ev) /* */ static void -e_client_message(Eevent * ev) +e_client_message(Ecore_Event * ev) { - Ev_Message *e; + Ecore_Event_Message *e; current_ev = ev; e = ev->event; @@ -250,9 +250,9 @@ e_client_message(Eevent * ev) /* */ static void -e_unmap(Eevent * ev) +e_unmap(Ecore_Event * ev) { - Ev_Window_Unmap *e; + Ecore_Event_Window_Unmap *e; current_ev = ev; e = ev->event; @@ -273,7 +273,7 @@ e_unmap(Eevent * ev) OBJ_UNREF(b); OBJ_IF_FREE(b) { - e_window_reparent(e->win, 0, 0, 0); + ecore_window_reparent(e->win, 0, 0, 0); e_icccm_release(e->win); OBJ_FREE(b); } @@ -286,9 +286,9 @@ e_unmap(Eevent * ev) /* */ static void -e_destroy(Eevent * ev) +e_destroy(Ecore_Event * ev) { - Ev_Window_Destroy *e; + Ecore_Event_Window_Destroy *e; current_ev = ev; e = ev->event; @@ -306,7 +306,7 @@ e_destroy(Eevent * ev) OBJ_UNREF(b); OBJ_IF_FREE(b) { - e_window_reparent(e->win, 0, 0, 0); + ecore_window_reparent(e->win, 0, 0, 0); e_icccm_release(e->win); OBJ_FREE(b); } @@ -318,9 +318,9 @@ e_destroy(Eevent * ev) /* */ static void -e_circulate_request(Eevent * ev) +e_circulate_request(Ecore_Event * ev) { - Ev_Window_Circulate_Request *e; + Ecore_Event_Window_Circulate_Request *e; current_ev = ev; e = ev->event; @@ -339,9 +339,9 @@ e_circulate_request(Eevent * ev) /* */ static void -e_reparent(Eevent * ev) +e_reparent(Ecore_Event * ev) { - Ev_Window_Reparent *e; + Ecore_Event_Window_Reparent *e; current_ev = ev; e = ev->event; @@ -360,7 +360,7 @@ e_reparent(Eevent * ev) OBJ_UNREF(b); OBJ_IF_FREE(b) { - e_window_reparent(e->win, 0, 0, 0); + ecore_window_reparent(e->win, 0, 0, 0); e_icccm_release(e->win); OBJ_FREE(b); } @@ -373,9 +373,9 @@ e_reparent(Eevent * ev) /* */ static void -e_shape(Eevent * ev) +e_shape(Ecore_Event * ev) { - Ev_Window_Shape *e; + Ecore_Event_Window_Shape *e; current_ev = ev; e = ev->event; @@ -395,9 +395,9 @@ e_shape(Eevent * ev) /* */ static void -e_focus_in(Eevent * ev) +ecore_focus_in(Ecore_Event * ev) { - Ev_Window_Focus_In *e; + Ecore_Event_Window_Focus_In *e; current_ev = ev; e = ev->event; @@ -410,7 +410,7 @@ e_focus_in(Eevent * ev) b->current.selected = 1; e_border_focus_grab_ended(); b->changed = 1; - OBS_NOTIFY(b, EV_WINDOW_FOCUS_IN); + OBS_NOTIFY(b, ECORE_EVENT_WINDOW_FOCUS_IN); } } current_ev = NULL; @@ -418,9 +418,9 @@ e_focus_in(Eevent * ev) /* */ static void -e_focus_out(Eevent * ev) +ecore_focus_out(Ecore_Event * ev) { - Ev_Window_Focus_Out *e; + Ecore_Event_Window_Focus_Out *e; current_ev = ev; e = ev->event; @@ -447,14 +447,14 @@ e_focus_out(Eevent * ev) g = NEW(E_Grab, 1); ZERO(g, E_Grab, 1); g->button = 0; - g->mods = EV_KEY_MODIFIER_NONE; + g->mods = ECORE_EVENT_KEY_MODIFIER_NONE; g->any_mod = 1; g->remove_after = 1; b->grabs = evas_list_append(b->grabs, g); printf("grab me baaaybe %s\n", b->client.title); - e_button_grab(b->win.main, 0, - XEV_BUTTON_PRESS, EV_KEY_MODIFIER_NONE, 1); - e_window_button_grab_auto_replay_set(b->win.main, 1); + ecore_button_grab(b->win.main, 0, + XEV_BUTTON_PRESS, ECORE_EVENT_KEY_MODIFIER_NONE, 1); + ecore_window_button_grab_auto_replay_set(b->win.main, 1); } } b->changed = 1; @@ -466,9 +466,9 @@ e_focus_out(Eevent * ev) /* */ static void -e_colormap(Eevent * ev) +e_colormap(Ecore_Event * ev) { - Ev_Colormap *e; + Ecore_Event_Colormap *e; current_ev = ev; e = ev->event; @@ -485,9 +485,9 @@ e_colormap(Eevent * ev) /* handling mouse down events */ static void -e_mouse_down(Eevent * ev) +e_mouse_down(Ecore_Event * ev) { - Ev_Mouse_Down *e; + Ecore_Event_Mouse_Down *e; current_ev = ev; e = ev->event; @@ -509,25 +509,25 @@ e_mouse_down(Eevent * ev) int x, y; evas = b->evas.l; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_button_down(evas, x, y, e->button); evas = b->evas.r; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_button_down(evas, x, y, e->button); evas = b->evas.t; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_button_down(evas, x, y, e->button); evas = b->evas.b; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; @@ -540,9 +540,9 @@ e_mouse_down(Eevent * ev) /* handling mouse up events */ static void -e_mouse_up(Eevent * ev) +e_mouse_up(Ecore_Event * ev) { - Ev_Mouse_Up *e; + Ecore_Event_Mouse_Up *e; current_ev = ev; e = ev->event; @@ -564,25 +564,25 @@ e_mouse_up(Eevent * ev) int x, y; evas = b->evas.l; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_button_up(evas, x, y, e->button); evas = b->evas.r; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_button_up(evas, x, y, e->button); evas = b->evas.t; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_button_up(evas, x, y, e->button); evas = b->evas.b; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; @@ -595,9 +595,9 @@ e_mouse_up(Eevent * ev) /* handling mouse move events */ static void -e_mouse_move(Eevent * ev) +e_mouse_move(Ecore_Event * ev) { - Ev_Mouse_Move *e; + Ecore_Event_Mouse_Move *e; current_ev = ev; e = ev->event; @@ -618,25 +618,25 @@ e_mouse_move(Eevent * ev) int x, y; evas = b->evas.l; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_move(evas, x, y); evas = b->evas.r; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_move(evas, x, y); evas = b->evas.t; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_move(evas, x, y); evas = b->evas.b; - e_window_get_root_relative_location(evas_get_window(evas), + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; @@ -649,9 +649,9 @@ e_mouse_move(Eevent * ev) /* handling mouse enter events */ static void -e_mouse_in(Eevent * ev) +e_mouse_in(Ecore_Event * ev) { - Ev_Window_Enter *e; + Ecore_Event_Window_Enter *e; current_ev = ev; e = ev->event; @@ -668,28 +668,28 @@ e_mouse_in(Eevent * ev) Evas evas; evas = b->evas.l; - e_window_get_root_relative_location(evas_get_window(evas), &x, &y); + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_move(evas, x, y); evas_event_enter(evas); evas = b->evas.r; - e_window_get_root_relative_location(evas_get_window(evas), &x, &y); + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_move(evas, x, y); evas_event_enter(evas); evas = b->evas.t; - e_window_get_root_relative_location(evas_get_window(evas), &x, &y); + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_move(evas, x, y); evas_event_enter(evas); evas = b->evas.b; - e_window_get_root_relative_location(evas_get_window(evas), &x, &y); + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); x = e->rx - x; y = e->ry - y; evas_event_move(evas, x, y); @@ -702,9 +702,9 @@ e_mouse_in(Eevent * ev) /* handling mouse leave events */ static void -e_mouse_out(Eevent * ev) +e_mouse_out(Ecore_Event * ev) { - Ev_Window_Leave *e; + Ecore_Event_Window_Leave *e; current_ev = ev; e = ev->event; @@ -730,9 +730,9 @@ e_mouse_out(Eevent * ev) /* handling expose events */ static void -e_window_expose(Eevent * ev) +ecore_window_expose(Ecore_Event * ev) { - Ev_Window_Expose *e; + Ecore_Event_Window_Expose *e; current_ev = ev; e = ev->event; @@ -770,9 +770,9 @@ e_cb_mouse_in(void *data, Ebits_Object o, char *class, else e_cursors_display_in_window(b->win.main, "Default"); if (!current_ev) return; - e_action_stop(class, ACT_MOUSE_IN, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_stop(class, ACT_MOUSE_IN, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y); - e_action_start(class, ACT_MOUSE_IN, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_start(class, ACT_MOUSE_IN, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y); return; UN(o); @@ -795,9 +795,9 @@ e_cb_mouse_out(void *data, Ebits_Object o, char *class, border_mouse_y = mouse_y; if (!current_ev) return; e_cursors_display_in_window(b->win.main, "Default"); - e_action_stop(class, ACT_MOUSE_OUT, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_stop(class, ACT_MOUSE_OUT, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y); - e_action_start(class, ACT_MOUSE_OUT, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_start(class, ACT_MOUSE_OUT, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y); return; UN(o); @@ -821,14 +821,14 @@ e_cb_mouse_down(void *data, Ebits_Object o, char *class, if (!current_ev) return; { E_Action_Type act; - Ev_Key_Modifiers mods; + Ecore_Event_Key_Modifiers mods; - mods = ((Ev_Mouse_Down *)(current_ev->event))->mods; + mods = ((Ecore_Event_Mouse_Down *)(current_ev->event))->mods; act = ACT_MOUSE_CLICK; - if (((Ev_Mouse_Down *)(current_ev->event))->double_click) + if (((Ecore_Event_Mouse_Down *)(current_ev->event))->double_click) act = ACT_MOUSE_DOUBLE; - else if (((Ev_Mouse_Down *)(current_ev->event))->triple_click) + else if (((Ecore_Event_Mouse_Down *)(current_ev->event))->triple_click) act = ACT_MOUSE_TRIPLE; e_action_stop(class, act, bt, NULL, mods, b, @@ -857,9 +857,9 @@ e_cb_mouse_up(void *data, Ebits_Object o, char *class, if (!current_ev) return; { E_Action_Type act; - Ev_Key_Modifiers mods; + Ecore_Event_Key_Modifiers mods; - mods = ((Ev_Mouse_Up *)(current_ev->event))->mods; + mods = ((Ecore_Event_Mouse_Up *)(current_ev->event))->mods; act = ACT_MOUSE_UP; if ((x >= ox) && (x < (ox + ow)) && (y >= oy) && (y < (oy + oh))) @@ -890,7 +890,7 @@ e_cb_mouse_move(void *data, Ebits_Object o, char *class, if (!current_ev) return; - e_action_cont(class, ACT_MOUSE_MOVE, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_cont(class, ACT_MOUSE_MOVE, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y, dx, dy); return; @@ -904,7 +904,7 @@ e_cb_mouse_move(void *data, Ebits_Object o, char *class, /* callbacks for certain things */ static void -e_cb_border_mouse_in(E_Border *b, Eevent *e) +e_cb_border_mouse_in(E_Border *b, Ecore_Event *e) { int x, y; char *class = "Window_Grab"; @@ -916,7 +916,7 @@ e_cb_border_mouse_in(E_Border *b, Eevent *e) /* pointer focus stuff */ if (focus_mode == 0) { - if (b->client.takes_focus) e_focus_to_window(b->win.client); + if (b->client.takes_focus) ecore_focus_to_window(b->win.client); } border_mouse_x = mouse_x; @@ -924,24 +924,24 @@ e_cb_border_mouse_in(E_Border *b, Eevent *e) border_mouse_buttons = mouse_buttons; if (!current_ev) return; - x = ((Ev_Window_Enter *)(e->event))->x; - y = ((Ev_Window_Enter *)(e->event))->y; + x = ((Ecore_Event_Window_Enter *)(e->event))->x; + y = ((Ecore_Event_Window_Enter *)(e->event))->y; - e_action_stop(class, ACT_MOUSE_IN, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_stop(class, ACT_MOUSE_IN, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y); - e_action_start(class, ACT_MOUSE_IN, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_start(class, ACT_MOUSE_IN, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y); } static void -e_cb_border_mouse_out(E_Border *b, Eevent *e) +e_cb_border_mouse_out(E_Border *b, Ecore_Event *e) { int x, y; char *class = "Window_Grab"; if (border_mouse_buttons) return; /* pointer focus stuff */ -/* e_focus_to_window(0);*/ +/* ecore_focus_to_window(0);*/ x = mouse_x; y = mouse_y; @@ -950,16 +950,16 @@ e_cb_border_mouse_out(E_Border *b, Eevent *e) border_mouse_buttons = mouse_buttons; if (!current_ev) return; - e_action_stop(class, ACT_MOUSE_OUT, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_stop(class, ACT_MOUSE_OUT, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y); - e_action_start(class, ACT_MOUSE_OUT, 0, NULL, EV_KEY_MODIFIER_NONE, + e_action_start(class, ACT_MOUSE_OUT, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y); return; UN(e); } static void -e_cb_border_mouse_down(E_Border *b, Eevent *e) +e_cb_border_mouse_down(E_Border *b, Ecore_Event *e) { int x, y, bt; char *class = "Window_Grab"; @@ -967,15 +967,15 @@ e_cb_border_mouse_down(E_Border *b, Eevent *e) E_CFG_INT(cfg_focus_mode, "settings", "/focus/mode", 0); E_CONFIG_INT_GET(cfg_focus_mode, focus_mode); -/* e_pointer_grab(b->win.main, CurrentTime);*/ +/* ecore_pointer_grab(b->win.main, CurrentTime);*/ border_mouse_x = mouse_x; border_mouse_y = mouse_y; if (border_mouse_buttons) return; border_mouse_buttons = mouse_buttons; if (!current_ev) return; - x = ((Ev_Mouse_Down *)(e->event))->x; - y = ((Ev_Mouse_Down *)(e->event))->y; - bt = ((Ev_Mouse_Down *)(e->event))->button; + x = ((Ecore_Event_Mouse_Down *)(e->event))->x; + y = ((Ecore_Event_Mouse_Down *)(e->event))->y; + bt = ((Ecore_Event_Mouse_Down *)(e->event))->button; { Evas_List l; @@ -986,18 +986,18 @@ e_cb_border_mouse_down(E_Border *b, Eevent *e) g = l->data; /* find a grab that triggered this */ - if (((((Ev_Mouse_Down *)(e->event))->button == g->button) || + if (((((Ecore_Event_Mouse_Down *)(e->event))->button == g->button) || (g->button == 0)) && ((g->any_mod) || - (((Ev_Mouse_Down *)(e->event))->mods == g->mods))) + (((Ecore_Event_Mouse_Down *)(e->event))->mods == g->mods))) { if (g->remove_after) { if (focus_mode == 2) - e_focus_to_window(b->win.client); + ecore_focus_to_window(b->win.client); printf("ungrab %s\n", b->client.title); - e_button_ungrab(b->win.main, g->button, g->mods, g->any_mod); - e_window_button_grab_auto_replay_set(b->win.main, 0); + ecore_button_ungrab(b->win.main, g->button, g->mods, g->any_mod); + ecore_window_button_grab_auto_replay_set(b->win.main, 0); /* e_pointer_ungrab(((Ev_Mouse_Up *)(e->event))->time);*/ free(g); b->grabs = evas_list_remove(b->grabs, g); @@ -1008,14 +1008,14 @@ e_cb_border_mouse_down(E_Border *b, Eevent *e) } { E_Action_Type act; - Ev_Key_Modifiers mods; + Ecore_Event_Key_Modifiers mods; - mods = ((Ev_Mouse_Down *)(current_ev->event))->mods; + mods = ((Ecore_Event_Mouse_Down *)(current_ev->event))->mods; act = ACT_MOUSE_CLICK; - if (((Ev_Mouse_Down *)(current_ev->event))->double_click) + if (((Ecore_Event_Mouse_Down *)(current_ev->event))->double_click) act = ACT_MOUSE_DOUBLE; - else if (((Ev_Mouse_Down *)(current_ev->event))->triple_click) + else if (((Ecore_Event_Mouse_Down *)(current_ev->event))->triple_click) act = ACT_MOUSE_TRIPLE; e_action_stop(class, act, bt, NULL, mods, b, NULL, @@ -1024,30 +1024,30 @@ e_cb_border_mouse_down(E_Border *b, Eevent *e) x, y, border_mouse_x, border_mouse_y); } /* - * e_pointer_ungrab(((Ev_Mouse_Up *)(e->event))->time); - * e_pointer_replay(((Ev_Mouse_Up *)(e->event))->time); + * ecore_pointer_ungrab(((Ecore_Event_Mouse_Up *)(e->event))->time); + * ecore_pointer_replay(((Ecore_Event_Mouse_Up *)(e->event))->time); */ } static void -e_cb_border_mouse_up(E_Border *b, Eevent *e) +e_cb_border_mouse_up(E_Border *b, Ecore_Event *e) { int x, y, bt; char *class = "Window_Grab"; - e_pointer_ungrab(CurrentTime); + ecore_pointer_ungrab(CurrentTime); border_mouse_x = mouse_x; border_mouse_y = mouse_y; border_mouse_buttons = mouse_buttons; if (!current_ev) return; - x = ((Ev_Mouse_Up *)(e->event))->x; - y = ((Ev_Mouse_Up *)(e->event))->y; - bt = ((Ev_Mouse_Up *)(e->event))->button; + x = ((Ecore_Event_Mouse_Up *)(e->event))->x; + y = ((Ecore_Event_Mouse_Up *)(e->event))->y; + bt = ((Ecore_Event_Mouse_Up *)(e->event))->button; { E_Action_Type act; - Ev_Key_Modifiers mods; + Ecore_Event_Key_Modifiers mods; - mods = ((Ev_Mouse_Up *)(current_ev->event))->mods; + mods = ((Ecore_Event_Mouse_Up *)(current_ev->event))->mods; act = ACT_MOUSE_UP; e_action_stop(class, act, bt, NULL, mods, b, NULL, x, y, border_mouse_x, border_mouse_y); @@ -1057,7 +1057,7 @@ e_cb_border_mouse_up(E_Border *b, Eevent *e) } static void -e_cb_border_mouse_move(E_Border *b, Eevent *e) +e_cb_border_mouse_move(E_Border *b, Ecore_Event *e) { int dx, dy; int x, y; @@ -1068,9 +1068,9 @@ e_cb_border_mouse_move(E_Border *b, Eevent *e) border_mouse_x = mouse_x; border_mouse_y = mouse_y; if (!current_ev) return; - x = ((Ev_Mouse_Move *)(e->event))->x; - y = ((Ev_Mouse_Move *)(e->event))->y; - e_action_cont(class, ACT_MOUSE_MOVE, 0, NULL, EV_KEY_MODIFIER_NONE, + x = ((Ecore_Event_Mouse_Move *)(e->event))->x; + y = ((Ecore_Event_Mouse_Move *)(e->event))->y; + e_action_cont(class, ACT_MOUSE_MOVE, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE, b, NULL, x, y, border_mouse_x, border_mouse_y, dx, dy); } @@ -1090,7 +1090,7 @@ e_cb_border_visibility(E_Border *b) static void e_border_poll(int val, void *data) { - e_add_event_timer("e_border_poll()", 1.00, e_border_poll, val + 1, NULL); + ecore_add_event_timer("e_border_poll()", 1.00, e_border_poll, val + 1, NULL); return; UN(data); } @@ -1141,14 +1141,14 @@ e_border_reshape(E_Border *b) (!b->shape_changed)) return; - if (!shape_win) shape_win = e_window_override_new(0, 0, 0, 1, 1); + if (!shape_win) shape_win = ecore_window_override_new(0, 0, 0, 1, 1); pl = pr = pt = pb = 0; if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb); b->shape_changed = 0; if ((!b->current.shaped_client) && (!b->current.has_shape)) { - e_window_set_shape_mask(b->win.main, 0); + ecore_window_set_shape_mask(b->win.main, 0); return; } @@ -1165,20 +1165,20 @@ e_border_reshape(E_Border *b) rects[3].x = 0; rects[3].y = b->current.h - pb; rects[3].width = b->current.w; rects[3].height = pb; - e_window_resize(shape_win, b->current.w, b->current.h); - e_window_set_shape_window(shape_win, b->win.client, pl, pt - b->current.shaded); - e_window_clip_shape_by_rectangle(shape_win, pl, pt, + ecore_window_resize(shape_win, b->current.w, b->current.h); + ecore_window_set_shape_window(shape_win, b->win.client, pl, pt - b->current.shaded); + ecore_window_clip_shape_by_rectangle(shape_win, pl, pt, b->current.w - pl - pr, b->current.h - pt - pb); - e_window_add_shape_rectangles(shape_win, rects, 4); - e_window_set_shape_window(b->win.main, shape_win, 0, 0); + ecore_window_add_shape_rectangles(shape_win, rects, 4); + ecore_window_set_shape_window(b->win.main, shape_win, 0, 0); return; } if ((!b->current.shaped_client) && (b->current.has_shape)) { - e_window_resize(shape_win, b->current.w, b->current.h); - e_window_set_shape_rectangle(shape_win, pl, pt - b->current.shaded, + ecore_window_resize(shape_win, b->current.w, b->current.h); + ecore_window_set_shape_rectangle(shape_win, pl, pt - b->current.shaded, b->current.w - pl - pr, b->current.h - pt - pb); /* FIXME: later when i actually generate shape masks for borders */ @@ -1193,16 +1193,16 @@ e_border_reshape(E_Border *b) rects[2].width = pr; rects[2].height = b->current.h - pt - pb; rects[3].x = 0; rects[3].y = b->current.h - pb; rects[3].width = b->current.w; rects[3].height = pb; - e_window_add_shape_rectangles(shape_win, rects, 4); + ecore_window_add_shape_rectangles(shape_win, rects, 4); } - e_window_set_shape_window(b->win.main, shape_win, 0, 0); + ecore_window_set_shape_window(b->win.main, shape_win, 0, 0); return; } if ((b->current.shaped_client) && (b->current.has_shape)) { - e_window_resize(shape_win, b->current.w, b->current.h); - e_window_set_shape_window(shape_win, b->win.client, pl, pt - b->current.shaded); - e_window_clip_shape_by_rectangle(shape_win, pl, pt, + ecore_window_resize(shape_win, b->current.w, b->current.h); + ecore_window_set_shape_window(shape_win, b->win.client, pl, pt - b->current.shaded); + ecore_window_clip_shape_by_rectangle(shape_win, pl, pt, b->current.w - pl - pr, b->current.h - pt - pb); /* FIXME: later when i actually generate shape masks for borders */ @@ -1217,10 +1217,10 @@ e_border_reshape(E_Border *b) rects[2].width = pr; rects[2].height = b->current.h - pt - pb; rects[3].x = 0; rects[3].y = b->current.h - pb; rects[3].width = b->current.w; rects[3].height = pb; - e_window_add_shape_rectangles(shape_win, rects, 4); + ecore_window_add_shape_rectangles(shape_win, rects, 4); } - e_window_set_shape_window(b->win.main, shape_win, 0, 0); + ecore_window_set_shape_window(b->win.main, shape_win, 0, 0); return; } } @@ -1235,20 +1235,20 @@ e_border_adopt(Window win, int use_client_pos) /* create the struct */ b = e_border_new(); /* set the right event on the client */ - e_window_set_events(win, + ecore_window_set_events(win, XEV_VISIBILITY | ResizeRedirectMask | XEV_CONFIGURE | XEV_FOCUS | XEV_PROPERTY | XEV_COLORMAP); - e_window_select_shape_events(win); + ecore_window_select_shape_events(win); /* parent of the client window listens for these */ - e_window_set_events(b->win.container, XEV_CHILD_CHANGE | XEV_CHILD_REDIRECT); + ecore_window_set_events(b->win.container, XEV_CHILD_CHANGE | XEV_CHILD_REDIRECT); /* add to save set & border of 0 */ e_icccm_adopt(win); - bw = e_window_get_border_width(win); - e_window_set_border_width(win, 0); + bw = ecore_window_get_border_width(win); + ecore_window_set_border_width(win, 0); b->win.client = win; b->current.requested.visible = 1; /* get hints */ @@ -1257,7 +1257,7 @@ e_border_adopt(Window win, int use_client_pos) { int x, y, w, h; - e_window_get_geometry(win, &x, &y, &w, &h); + ecore_window_get_geometry(win, &x, &y, &w, &h); b->current.requested.x = x; b->current.requested.y = y; b->current.requested.w = w; @@ -1280,13 +1280,13 @@ e_border_adopt(Window win, int use_client_pos) { int x, y; - e_window_get_geometry(win, &x, &y, NULL, NULL); + ecore_window_get_geometry(win, &x, &y, NULL, NULL); b->current.requested.x = x; b->current.requested.y = y; b->changed = 1; } /* reparent the window finally */ - e_window_reparent(win, b->win.container, 0, 0); + ecore_window_reparent(win, b->win.container, 0, 0); e_match_set_props(b); e_icccm_set_desk_area(win, b->client.area.x, b->client.area.y); e_icccm_set_desk(win, b->client.desk); @@ -1382,7 +1382,7 @@ e_border_adopt(Window win, int use_client_pos) b->current.requested.h = b->current.h; b->current.requested.w = b->current.w; e_border_raise(b); - e_window_show(win); + ecore_window_show(win); return b; } @@ -1422,18 +1422,18 @@ e_border_new(void) desk = e_desktops_get(0); e_desktops_add_border(desk, b); - b->win.main = e_window_override_new(desk->win.container, 0, 0, 1, 1); - b->win.input = e_window_input_new(b->win.main, 0, 0, 1, 1); - b->win.container = e_window_override_new(b->win.main, 0, 0, 1, 1); + b->win.main = ecore_window_override_new(desk->win.container, 0, 0, 1, 1); + b->win.input = ecore_window_input_new(b->win.main, 0, 0, 1, 1); + b->win.container = ecore_window_override_new(b->win.main, 0, 0, 1, 1); e_cursors_display_in_window(b->win.container, "Application"); - e_window_set_events_propagate(b->win.input, 1); - e_window_set_events(b->win.input, XEV_MOUSE_MOVE | XEV_BUTTON); - e_window_set_events(b->win.main, XEV_IN_OUT); - e_window_set_events(b->win.container, XEV_IN_OUT); - e_window_show(b->win.input); - e_window_show(b->win.container); + ecore_window_set_events_propagate(b->win.input, 1); + ecore_window_set_events(b->win.input, XEV_MOUSE_MOVE | XEV_BUTTON); + ecore_window_set_events(b->win.main, XEV_IN_OUT); + ecore_window_set_events(b->win.container, XEV_IN_OUT); + ecore_window_show(b->win.input); + ecore_window_show(b->win.container); - b->evas.l = evas_new_all(e_display_get(), + b->evas.l = evas_new_all(ecore_display_get(), b->win.main, 0, 0, 1, 1, RENDER_METHOD_ALPHA_SOFTWARE, @@ -1442,7 +1442,7 @@ e_border_new(void) image_cache, font_dir); b->win.l = evas_get_window(b->evas.l); - b->evas.r = evas_new_all(e_display_get(), + b->evas.r = evas_new_all(ecore_display_get(), b->win.main, 0, 0, 1, 1, RENDER_METHOD_ALPHA_SOFTWARE, @@ -1451,7 +1451,7 @@ e_border_new(void) image_cache, font_dir); b->win.r = evas_get_window(b->evas.r); - b->evas.t = evas_new_all(e_display_get(), + b->evas.t = evas_new_all(ecore_display_get(), b->win.main, 0, 0, 1, 1, RENDER_METHOD_ALPHA_SOFTWARE, @@ -1460,7 +1460,7 @@ e_border_new(void) image_cache, font_dir); b->win.t = evas_get_window(b->evas.t); - b->evas.b = evas_new_all(e_display_get(), + b->evas.b = evas_new_all(ecore_display_get(), b->win.main, 0, 0, 1, 1, RENDER_METHOD_ALPHA_SOFTWARE, @@ -1514,13 +1514,13 @@ e_border_new(void) evas_set_clip(b->evas.l, b->obj.title.t, b->obj.title_clip.t); evas_set_clip(b->evas.l, b->obj.title.b, b->obj.title_clip.b); - e_window_raise(b->win.input); - e_window_raise(b->win.container); + ecore_window_raise(b->win.input); + ecore_window_raise(b->win.container); /* - e_window_raise(b->win.l); - e_window_raise(b->win.r); - e_window_raise(b->win.t); - e_window_raise(b->win.b); + ecore_window_raise(b->win.l); + ecore_window_raise(b->win.r); + ecore_window_raise(b->win.t); + ecore_window_raise(b->win.b); */ evases = evas_list_append(evases, b->evas.l); @@ -1528,15 +1528,15 @@ e_border_new(void) evases = evas_list_append(evases, b->evas.t); evases = evas_list_append(evases, b->evas.b); - e_window_set_events(b->win.l, XEV_EXPOSE); - e_window_set_events(b->win.r, XEV_EXPOSE); - e_window_set_events(b->win.t, XEV_EXPOSE); - e_window_set_events(b->win.b, XEV_EXPOSE); + ecore_window_set_events(b->win.l, XEV_EXPOSE); + ecore_window_set_events(b->win.r, XEV_EXPOSE); + ecore_window_set_events(b->win.t, XEV_EXPOSE); + ecore_window_set_events(b->win.b, XEV_EXPOSE); - e_window_show(b->win.l); - e_window_show(b->win.r); - e_window_show(b->win.t); - e_window_show(b->win.b); + ecore_window_show(b->win.l); + ecore_window_show(b->win.r); + ecore_window_show(b->win.t); + ecore_window_show(b->win.b); e_border_attach_mouse_grabs(b); @@ -1563,9 +1563,9 @@ e_border_free(E_Border *b) evas_free(b->evas.r); evas_free(b->evas.t); evas_free(b->evas.b); - e_window_destroy(b->win.container); - e_window_destroy(b->win.input); - e_window_destroy(b->win.main); + ecore_window_destroy(b->win.container); + ecore_window_destroy(b->win.input); + ecore_window_destroy(b->win.main); borders = evas_list_remove(borders, b); IF_FREE(b->client.title); @@ -1602,7 +1602,7 @@ e_border_remove_mouse_grabs(E_Border *b) g = l->data; printf("nooo grabs\n"); - e_button_ungrab(b->win.main, g->button, g->mods, g->any_mod); + ecore_button_ungrab(b->win.main, g->button, g->mods, g->any_mod); FREE(g); } evas_list_free(b->grabs); @@ -1632,13 +1632,13 @@ e_border_attach_mouse_grabs(E_Border *b) g = NEW(E_Grab, 1); ZERO(g, E_Grab, 1); g->button = 0; - g->mods = EV_KEY_MODIFIER_NONE; + g->mods = ECORE_EVENT_KEY_MODIFIER_NONE; g->any_mod = 1; g->remove_after = 1; b->grabs = evas_list_append(b->grabs, g); printf("grab me baaaybe %s\n", b->client.title); - e_button_grab(b->win.main, 0, XEV_BUTTON_PRESS, EV_KEY_MODIFIER_NONE, 1); - e_window_button_grab_auto_replay_set(b->win.main, 1); + ecore_button_grab(b->win.main, 0, XEV_BUTTON_PRESS, ECORE_EVENT_KEY_MODIFIER_NONE, 1); + ecore_window_button_grab_auto_replay_set(b->win.main, 1); } } @@ -1657,17 +1657,17 @@ e_border_attach_mouse_grabs(E_Border *b) for (i = 0; i < num; i++) { int button, any_mod, mod; - Ev_Key_Modifiers mods; + Ecore_Event_Key_Modifiers mods; button = -1; - mods = EV_KEY_MODIFIER_NONE; + mods = ECORE_EVENT_KEY_MODIFIER_NONE; any_mod = 0; sprintf(buf, "/grabs/%i/button", i); if (!e_db_int_get(db, buf, &button)) continue; sprintf(buf, "/grabs/%i/modifiers", i); if (!e_db_int_get(db, buf, &mod)) continue; if (mod == -1) any_mod = 1; - mods = (Ev_Key_Modifiers)mod; + mods = (Ecore_Event_Key_Modifiers)mod; if (button >= 0) { @@ -1680,7 +1680,7 @@ e_border_attach_mouse_grabs(E_Border *b) g->any_mod = any_mod; g->remove_after = 0; b->grabs = evas_list_append(b->grabs, g); - e_button_grab(b->win.main, button, XEV_BUTTON_PRESS, mods, 0); + ecore_button_grab(b->win.main, button, XEV_BUTTON_PRESS, mods, 0); } } e_db_close(db); @@ -1972,7 +1972,7 @@ e_border_update(E_Border *b) shape_changed = 1; if (b->bits.new) { - e_window_gravity_set(b->win.container, StaticGravity); + ecore_window_gravity_set(b->win.container, StaticGravity); border_changed = 1; } if ((border_changed) && (b->current.has_shape)) @@ -1987,7 +1987,7 @@ e_border_update(E_Border *b) e_border_apply_border(b); if (!border_changed) { - e_window_gravity_set(b->win.container, StaticGravity); + ecore_window_gravity_set(b->win.container, StaticGravity); border_changed = 1; size_changed = 1; } @@ -1996,7 +1996,7 @@ e_border_update(E_Border *b) { int pl, pr, pt, pb; - e_window_move(b->win.main, b->current.x, b->current.y); + ecore_window_move(b->win.main, b->current.x, b->current.y); pl = pr = pt = pb = 0; if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb); e_icccm_move_resize(b->win.client, @@ -2020,17 +2020,17 @@ e_border_update(E_Border *b) smaller = 1; pl = pr = pt = pb = 0; if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb); - e_window_move_resize(b->win.input, + ecore_window_move_resize(b->win.input, 0, 0, b->current.w, b->current.h); if (smaller) { if (b->current.shaded == b->client.h) { - e_window_move_resize(b->win.client, + ecore_window_move_resize(b->win.client, 0, - b->current.shaded, b->client.w, b->client.h); - e_window_move_resize(b->win.container, + ecore_window_move_resize(b->win.container, b->current.w + 1, b->current.h + 1, 320, @@ -2038,123 +2038,123 @@ e_border_update(E_Border *b) } else { - e_window_move_resize(b->win.client, + ecore_window_move_resize(b->win.client, 0, - b->current.shaded, b->client.w, b->client.h); - e_window_move_resize(b->win.container, + ecore_window_move_resize(b->win.container, pl, pt, b->current.w - pl - pr, b->current.h - pt - pb); } - e_window_move_resize(b->win.main, + ecore_window_move_resize(b->win.main, b->current.x, b->current.y, b->current.w, b->current.h); x = 0, y = pt, w = pl, h = (b->current.h - pt - pb); - if ((w <1) || (h < 1)) e_window_hide(b->win.l); + if ((w <1) || (h < 1)) ecore_window_hide(b->win.l); else { - e_window_show(b->win.l); - e_window_move_resize(b->win.l, x, y, w, h); + ecore_window_show(b->win.l); + ecore_window_move_resize(b->win.l, x, y, w, h); evas_set_output_size(b->evas.l, w, h); evas_set_output_viewport(b->evas.l, x, y, w, h); } x = 0, y = 0, w = b->current.w, h = pt; - if ((w <1) || (h < 1)) e_window_hide(b->win.t); + if ((w <1) || (h < 1)) ecore_window_hide(b->win.t); else { - e_window_show(b->win.t); - e_window_move_resize(b->win.t, x, y, w, h); + ecore_window_show(b->win.t); + ecore_window_move_resize(b->win.t, x, y, w, h); evas_set_output_size(b->evas.t, w, h); evas_set_output_viewport(b->evas.t, x, y, w, h); } x = b->current.w - pr, y = pt, w = pr, h = (b->current.h - pt - pb); - if ((w <1) || (h < 1)) e_window_hide(b->win.r); + if ((w <1) || (h < 1)) ecore_window_hide(b->win.r); else { - e_window_show(b->win.r); - e_window_move_resize(b->win.r, x, y, w, h); + ecore_window_show(b->win.r); + ecore_window_move_resize(b->win.r, x, y, w, h); evas_set_output_size(b->evas.r, w, h); evas_set_output_viewport(b->evas.r, x, y, w, h); } x = 0, y = b->current.h - pb, w = b->current.w, h = pb; - if ((w <1) || (h < 1)) e_window_hide(b->win.b); + if ((w <1) || (h < 1)) ecore_window_hide(b->win.b); else { - e_window_show(b->win.b); - e_window_move_resize(b->win.b, x, y, w, h); + ecore_window_show(b->win.b); + ecore_window_move_resize(b->win.b, x, y, w, h); evas_set_output_size(b->evas.b, w, h); evas_set_output_viewport(b->evas.b, x, y, w, h); } } else { - e_window_move_resize(b->win.main, + ecore_window_move_resize(b->win.main, b->current.x, b->current.y, b->current.w, b->current.h); x = 0, y = pt, w = pl, h = (b->current.h - pt - pb); - if ((w <1) || (h < 1)) e_window_hide(b->win.l); + if ((w <1) || (h < 1)) ecore_window_hide(b->win.l); else { - e_window_show(b->win.l); - e_window_move_resize(b->win.l, x, y, w, h); + ecore_window_show(b->win.l); + ecore_window_move_resize(b->win.l, x, y, w, h); evas_set_output_size(b->evas.l, w, h); evas_set_output_viewport(b->evas.l, x, y, w, h); } x = 0, y = 0, w = b->current.w, h = pt; - if ((w <1) || (h < 1)) e_window_hide(b->win.t); + if ((w <1) || (h < 1)) ecore_window_hide(b->win.t); else { - e_window_show(b->win.t); - e_window_move_resize(b->win.t, x, y, w, h); + ecore_window_show(b->win.t); + ecore_window_move_resize(b->win.t, x, y, w, h); evas_set_output_size(b->evas.t, w, h); evas_set_output_viewport(b->evas.t, x, y, w, h); } x = b->current.w - pr, y = pt, w = pr, h = (b->current.h - pt - pb); - if ((w <1) || (h < 1)) e_window_hide(b->win.r); + if ((w <1) || (h < 1)) ecore_window_hide(b->win.r); else { - e_window_show(b->win.r); - e_window_move_resize(b->win.r, x, y, w, h); + ecore_window_show(b->win.r); + ecore_window_move_resize(b->win.r, x, y, w, h); evas_set_output_size(b->evas.r, w, h); evas_set_output_viewport(b->evas.r, x, y, w, h); } x = 0, y = b->current.h - pb, w = b->current.w, h = pb; - if ((w <1) || (h < 1)) e_window_hide(b->win.b); + if ((w <1) || (h < 1)) ecore_window_hide(b->win.b); else { - e_window_show(b->win.b); - e_window_move_resize(b->win.b, x, y, w, h); + ecore_window_show(b->win.b); + ecore_window_move_resize(b->win.b, x, y, w, h); evas_set_output_size(b->evas.b, w, h); evas_set_output_viewport(b->evas.b, x, y, w, h); } if (b->current.shaded == b->client.h) { - e_window_move_resize(b->win.container, + ecore_window_move_resize(b->win.container, b->current.w + 1, b->current.h + 1, 320, 320); - e_window_move_resize(b->win.client, + ecore_window_move_resize(b->win.client, 0, - b->current.shaded, b->client.w, b->client.h); } else { - e_window_move_resize(b->win.container, + ecore_window_move_resize(b->win.container, pl, pt, b->current.w - pl - pr, b->current.h - pt - pb); - e_window_move_resize(b->win.client, + ecore_window_move_resize(b->win.client, 0, - b->current.shaded, b->client.w, b->client.h); @@ -2208,14 +2208,14 @@ e_border_update(E_Border *b) if (visibility_changed) { if (b->current.visible) - e_window_show(b->win.main); + ecore_window_show(b->win.main); else - e_window_hide(b->win.main); + ecore_window_hide(b->win.main); e_cb_border_visibility(b); } if (border_changed) - e_window_gravity_set(b->win.container, NorthWestGravity); + ecore_window_gravity_set(b->win.container, NorthWestGravity); b->bits.new = 0; b->previous = b->current; b->changed = 0; @@ -2257,7 +2257,7 @@ e_border_raise(E_Border *b) { b->desk->windows = evas_list_append(b->desk->windows, b); b->desk->changed = 1; - e_window_raise(b->win.main); + ecore_window_raise(b->win.main); return; } for (l = b->desk->windows; l; l = l->next) @@ -2268,7 +2268,7 @@ e_border_raise(E_Border *b) b->desk->windows = evas_list_remove(b->desk->windows, b); b->desk->windows = evas_list_prepend_relative(b->desk->windows, b, rel); b->desk->changed = 1; - e_window_stack_below(b->win.main, rel->win.main); + ecore_window_stack_below(b->win.main, rel->win.main); return; } if ((!l->next) && (l->data != b)) @@ -2276,7 +2276,7 @@ e_border_raise(E_Border *b) b->desk->windows = evas_list_remove(b->desk->windows, b); b->desk->windows = evas_list_append(b->desk->windows, b); b->desk->changed = 1; - e_window_raise(b->win.main); + ecore_window_raise(b->win.main); return; } } @@ -2292,7 +2292,7 @@ e_border_lower(E_Border *b) { b->desk->windows = evas_list_append(b->desk->windows, b); b->desk->changed = 1; - e_window_raise(b->win.main); + ecore_window_raise(b->win.main); return; } for (l = b->desk->windows; l; l = l->next) @@ -2304,7 +2304,7 @@ e_border_lower(E_Border *b) b->desk->windows = evas_list_remove(b->desk->windows, b); b->desk->windows = evas_list_prepend_relative(b->desk->windows, b, rel); b->desk->changed = 1; - e_window_stack_below(b->win.main, rel->win.main); + ecore_window_stack_below(b->win.main, rel->win.main); return; } } @@ -2317,7 +2317,7 @@ e_border_raise_above(E_Border *b, E_Border *above) { b->desk->windows = evas_list_append(b->desk->windows, b); b->desk->changed = 1; - e_window_raise(b->win.main); + ecore_window_raise(b->win.main); return; } if (!evas_list_find(b->desk->windows, above)) return; @@ -2325,7 +2325,7 @@ e_border_raise_above(E_Border *b, E_Border *above) b->desk->windows = evas_list_remove(b->desk->windows, b); b->desk->windows = evas_list_append_relative(b->desk->windows, b, above); b->desk->changed = 1; - e_window_stack_above(b->win.main, above->win.main); + ecore_window_stack_above(b->win.main, above->win.main); } void @@ -2342,7 +2342,7 @@ e_border_lower_below(E_Border *b, E_Border *below) b->desk->windows = evas_list_remove(b->desk->windows, b); b->desk->windows = evas_list_prepend_relative(b->desk->windows, b, below); b->desk->changed = 1; - e_window_stack_below(b->win.main, below->win.main); + ecore_window_stack_below(b->win.main, below->win.main); } void @@ -2353,30 +2353,30 @@ e_border_init(void) E_CONFIG_FLOAT_GET(cfg_raise_delay, raise_delay); - e_event_filter_handler_add(EV_MOUSE_DOWN, e_mouse_down); - e_event_filter_handler_add(EV_MOUSE_UP, e_mouse_up); - e_event_filter_handler_add(EV_MOUSE_MOVE, e_mouse_move); - e_event_filter_handler_add(EV_MOUSE_IN, e_mouse_in); - e_event_filter_handler_add(EV_MOUSE_OUT, e_mouse_out); - e_event_filter_handler_add(EV_WINDOW_EXPOSE, e_window_expose); - e_event_filter_handler_add(EV_WINDOW_MAP_REQUEST, e_map_request); - e_event_filter_handler_add(EV_WINDOW_CONFIGURE_REQUEST, e_configure_request); - e_event_filter_handler_add(EV_WINDOW_PROPERTY, e_property); - e_event_filter_handler_add(EV_WINDOW_UNMAP, e_unmap); - e_event_filter_handler_add(EV_WINDOW_DESTROY, e_destroy); - e_event_filter_handler_add(EV_WINDOW_CIRCULATE_REQUEST, e_circulate_request); - e_event_filter_handler_add(EV_WINDOW_REPARENT, e_reparent); - e_event_filter_handler_add(EV_WINDOW_SHAPE, e_shape); - e_event_filter_handler_add(EV_WINDOW_FOCUS_IN, e_focus_in); - e_event_filter_handler_add(EV_WINDOW_FOCUS_OUT, e_focus_out); - e_event_filter_handler_add(EV_MESSAGE, e_client_message); - e_event_filter_handler_add(EV_COLORMAP, e_colormap); - e_event_filter_idle_handler_add(e_idle, NULL); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN, e_mouse_down); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_UP, e_mouse_up); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE, e_mouse_move); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_IN, e_mouse_in); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT, e_mouse_out); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE, ecore_window_expose); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_MAP_REQUEST, e_map_request); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_CONFIGURE_REQUEST, e_configure_request); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_PROPERTY, e_property); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_UNMAP, e_unmap); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_DESTROY, e_destroy); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_CIRCULATE_REQUEST, e_circulate_request); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_REPARENT, e_reparent); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_SHAPE, e_shape); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_FOCUS_IN, ecore_focus_in); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_FOCUS_OUT, ecore_focus_out); + ecore_event_filter_handler_add(ECORE_EVENT_MESSAGE, e_client_message); + ecore_event_filter_handler_add(ECORE_EVENT_COLORMAP, e_colormap); + ecore_event_filter_idle_handler_add(ecore_idle, NULL); delayed_window_raise = NEW(E_Delayed_Action, 1); - E_DELAYED_ACT_INIT(delayed_window_raise, EV_WINDOW_FOCUS_IN, raise_delay, e_border_raise_delayed); + E_DELAYED_ACT_INIT(delayed_window_raise, ECORE_EVENT_WINDOW_FOCUS_IN, raise_delay, e_border_raise_delayed); - e_add_event_timer("e_border_poll()", 1.00, e_border_poll, 0, NULL); + ecore_add_event_timer("e_border_poll()", 1.00, e_border_poll, 0, NULL); } void @@ -2385,12 +2385,12 @@ e_border_adopt_children(Window win) Window *wins; int i, num; - wins = e_window_get_children(win, &num); + wins = ecore_window_get_children(win, &num); if (wins) { for (i = 0; i < num; i++) { - if (e_window_is_manageable(wins[i])) + if (ecore_window_is_manageable(wins[i])) { E_Border *b; @@ -2474,7 +2474,7 @@ e_border_viewable(E_Border *b) void e_border_send_pointer(E_Border *b) { - XWarpPointer(e_display_get(), None, b->win.main, 0, 0, 0, 0, b->current.w / 2, b->current.h / 2); + XWarpPointer(ecore_display_get(), None, b->win.main, 0, 0, 0, 0, b->current.w / 2, b->current.h / 2); } void @@ -2548,11 +2548,11 @@ e_border_set_gravity(E_Border *b, int gravity) if (!b) return; - e_window_gravity_set(b->win.container, gravity); - e_window_gravity_set(b->win.input, gravity); - e_window_gravity_set(b->win.l, gravity); - e_window_gravity_set(b->win.r, gravity); - e_window_gravity_set(b->win.t, gravity); - e_window_gravity_set(b->win.b, gravity); + ecore_window_gravity_set(b->win.container, gravity); + ecore_window_gravity_set(b->win.input, gravity); + ecore_window_gravity_set(b->win.l, gravity); + ecore_window_gravity_set(b->win.r, gravity); + ecore_window_gravity_set(b->win.t, gravity); + ecore_window_gravity_set(b->win.b, gravity); } diff --git a/src/border.h b/src/border.h index 9d035cabb..16aaf2e41 100644 --- a/src/border.h +++ b/src/border.h @@ -14,7 +14,7 @@ typedef struct _E_Border E_Border; struct _E_Grab { int button; - Ev_Key_Modifiers mods; + Ecore_Event_Key_Modifiers mods; int any_mod; int remove_after; int allow; diff --git a/src/config.h b/src/config.h index caa1003e0..5ef3873ce 100644 --- a/src/config.h +++ b/src/config.h @@ -39,7 +39,7 @@ static E_Config_File _var = {_src, 0.0} #define E_CONFIG_CHECK_VALIDITY(_var, _src) \ { \ double __time; \ -__time = e_get_time(); \ +__time = ecore_get_time(); \ if (_var.last_fetch < (__time - 5.0)) { \ _var.last_fetch = __time; #define E_CONFIG_CHECK_VALIDITY_END \ @@ -85,7 +85,7 @@ static E_Config_Element _var = { _src, _key, 0.0, E_CFG_DATAT_T, \ #define E_CFG_VALIDITY_CHECK(_var) \ { \ double __time; \ -__time = e_get_time(); \ +__time = ecore_get_time(); \ if (_var.last_fetch < (__time - 5.0)) { \ int __cfg_ok = 0; \ _var.last_fetch = __time; diff --git a/src/cursors.c b/src/cursors.c index 87c413590..9b5dc8d37 100644 --- a/src/cursors.c +++ b/src/cursors.c @@ -68,7 +68,7 @@ e_cursors_find(char *type) { cursors = evas_list_remove(cursors, c); IF_FREE(c->type); - e_cursor_free(c->cursor); + ecore_cursor_free(c->cursor); FREE(c); return NULL; } @@ -117,8 +117,8 @@ e_cursors_display_in_window(Window win, char *type) imlib_context_set_image(im); w = imlib_image_get_width(); h = imlib_image_get_height(); - pmap = e_pixmap_new(0, w, h, 1); - mask = e_pixmap_new(0, w, h, 1); + pmap = ecore_pixmap_new(0, w, h, 1); + mask = ecore_pixmap_new(0, w, h, 1); data = imlib_image_get_data_for_reading_only(); /* figure out fg & bg */ @@ -166,14 +166,14 @@ e_cursors_display_in_window(Window win, char *type) /* use XImages & XShm */ /* get some gc's set up */ - gcb = e_gc_new(pmap); - gcf = e_gc_new(pmap); - e_gc_set_fg(gcb, 0); - e_gc_set_fg(gcf, 1); + gcb = ecore_gc_new(pmap); + gcf = ecore_gc_new(pmap); + ecore_gc_set_fg(gcb, 0); + ecore_gc_set_fg(gcf, 1); /* fill out cursor pixmap with 0's (bg) */ - e_fill_rectangle(pmap, gcb, 0, 0, w, h); - e_fill_rectangle(mask, gcb, 0, 0, w, h); + ecore_fill_rectangle(pmap, gcb, 0, 0, w, h); + ecore_fill_rectangle(mask, gcb, 0, 0, w, h); if (!data) goto done2; for (y = 0; y < h; y++) { @@ -190,16 +190,16 @@ e_cursors_display_in_window(Window win, char *type) if (a > 127) { - e_draw_point(mask, gcf, x, y); + ecore_draw_point(mask, gcf, x, y); if ((r == fr) && (g == fg) && (b == fb)) - e_draw_point(pmap, gcf, x, y); + ecore_draw_point(pmap, gcf, x, y); } } } done2: /* clean up */ - e_gc_free(gcb); - e_gc_free(gcf); + ecore_gc_free(gcb); + ecore_gc_free(gcf); imlib_image_put_back_data(data); imlib_free_image(); @@ -212,14 +212,14 @@ e_cursors_display_in_window(Window win, char *type) } if (c) { - c->cursor = e_cursor_new(pmap, mask, hx, hy, fr, fg, fb, br, bg, bb); - e_pixmap_free(pmap); - e_pixmap_free(mask); + c->cursor = ecore_cursor_new(pmap, mask, hx, hy, fr, fg, fb, br, bg, bb); + ecore_pixmap_free(pmap); + ecore_pixmap_free(mask); cursors = evas_list_append(cursors, c); } } if (c) - e_cursor_set(win, c->cursor); + ecore_cursor_set(win, c->cursor); else { if (!strcmp(type, "Default")) return; @@ -239,6 +239,6 @@ e_cursors_display(char *type) void e_cursors_init(void) { - e_event_filter_idle_handler_add(e_cursors_idle, NULL); + ecore_event_filter_idle_handler_add(e_cursors_idle, NULL); e_cursors_set("Default"); } diff --git a/src/delayed.c b/src/delayed.c index 62af6b9e7..afb311a92 100644 --- a/src/delayed.c +++ b/src/delayed.c @@ -8,7 +8,7 @@ e_delayed_action_start(void *obs, void *obj) E_Delayed_Action *eda = obs; snprintf(event_name, 1024, "_e_delayed_action_notify(%d)", eda->e_event); - e_add_event_timer(event_name, eda->delay, eda->delay_func, 0, obj); + ecore_add_event_timer(event_name, eda->delay, eda->delay_func, 0, obj); } void @@ -17,7 +17,7 @@ e_delayed_action_cancel(void *obs) E_Delayed_Action *eda = obs; char event_name[1024]; snprintf(event_name, 1024, "_e_delayed_action_notify(%d)", eda->e_event); - e_del_event_timer(event_name); + ecore_del_event_timer(event_name); } void diff --git a/src/desktops.c b/src/desktops.c index a34609a2d..b58de2041 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -11,10 +11,10 @@ static Evas_List desktops = NULL; static Window e_base_win = 0; static int screen_w, screen_h; -static void e_idle(void *data); +static void ecore_idle(void *data); static void -e_idle(void *data) +ecore_idle(void *data) { e_db_flush(); return; @@ -26,12 +26,12 @@ e_desktops_init(void) { E_Desktop *desk; - e_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h); - e_base_win = e_window_override_new(0, 0, 0, screen_w, screen_h); - e_window_show(e_base_win); + ecore_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h); + e_base_win = ecore_window_override_new(0, 0, 0, screen_w, screen_h); + ecore_window_show(e_base_win); desk = e_desktops_new(); e_desktops_show(desk); - e_event_filter_idle_handler_add(e_idle, NULL); + ecore_event_filter_idle_handler_add(ecore_idle, NULL); e_icccm_advertise_e_compat(); e_icccm_advertise_mwm_compat(); @@ -101,13 +101,13 @@ e_desktops_scroll(E_Desktop *desk, int dx, int dy) b = l->data; /* if sticky */ if ((b->client.sticky) && (!b->mode.move)) - e_window_gravity_set(b->win.main, StaticGravity); + ecore_window_gravity_set(b->win.main, StaticGravity); else - e_window_gravity_set(b->win.main, grav); + ecore_window_gravity_set(b->win.main, grav); } grav_stick = StaticGravity; /* scroll */ - e_window_move_resize(desk->win.container, + ecore_window_move_resize(desk->win.container, xd, yd, screen_w + wd, screen_h + hd); /* reset */ @@ -118,18 +118,18 @@ e_desktops_scroll(E_Desktop *desk, int dx, int dy) b = l->data; /* if sticky */ if (b->client.sticky) - e_window_gravity_set(b->win.main, StaticGravity); + ecore_window_gravity_set(b->win.main, StaticGravity); else - e_window_gravity_set(b->win.main, grav_stick); -/* e_window_gravity_set(b->win.main, grav_stick);*/ + ecore_window_gravity_set(b->win.main, grav_stick); +/* ecore_window_gravity_set(b->win.main, grav_stick);*/ } - e_window_move_resize(desk->win.container, 0, 0, screen_w, screen_h); + ecore_window_move_resize(desk->win.container, 0, 0, screen_w, screen_h); for (l = desk->windows; l; l = l->next) { E_Border *b; b = l->data; - e_window_gravity_reset(b->win.main); + ecore_window_gravity_reset(b->win.main); if ((!b->client.sticky) && (!b->mode.move)) { b->current.requested.x += dx; @@ -157,12 +157,12 @@ e_desktops_free(E_Desktop *desk) OBJ_UNREF(b); OBJ_IF_FREE(b) { - e_window_reparent(b->win.client, 0, 0, 0); + ecore_window_reparent(b->win.client, 0, 0, 0); e_icccm_release(b->win.client); OBJ_FREE(b); } } - e_window_destroy(desk->win.main); + ecore_window_destroy(desk->win.main); IF_FREE(desk->name); IF_FREE(desk->dir); FREE(desk); @@ -194,13 +194,13 @@ e_desktops_init_file_display(E_Desktop *desk) } e_view_realize(v); - e_window_hint_set_borderless(v->win.base); - e_window_hint_set_sticky(v->win.base, 1); - e_window_hint_set_layer(v->win.base, 1); - e_window_set_title(v->win.base, "Desktop"); - e_window_set_name_class(v->win.base, "FileView", "Desktop"); - e_window_set_min_size(v->win.base, desk->real.w, desk->real.h); - e_window_set_max_size(v->win.base, desk->real.w, desk->real.h); + ecore_window_hint_set_borderless(v->win.base); + ecore_window_hint_set_sticky(v->win.base, 1); + ecore_window_hint_set_layer(v->win.base, 1); + ecore_window_set_title(v->win.base, "Desktop"); + ecore_window_set_name_class(v->win.base, "FileView", "Desktop"); + ecore_window_set_min_size(v->win.base, desk->real.w, desk->real.h); + ecore_window_set_max_size(v->win.base, desk->real.w, desk->real.h); b = e_border_adopt(v->win.base, 1); b->client.sticky = 1; b->client.fixed = 1; @@ -219,11 +219,11 @@ e_desktops_new(void) OBJ_INIT(desk, e_desktops_free); - desk->win.main = e_window_override_new(e_base_win, 0, 0, screen_w, screen_h); - desk->win.container = e_window_override_new(desk->win.main, 0, 0, screen_w, screen_h); - e_window_lower(desk->win.container); + desk->win.main = ecore_window_override_new(e_base_win, 0, 0, screen_w, screen_h); + desk->win.container = ecore_window_override_new(desk->win.main, 0, 0, screen_w, screen_h); + ecore_window_lower(desk->win.container); - e_window_show(desk->win.container); + ecore_window_show(desk->win.container); desk->x = 0; desk->y = 0; @@ -265,13 +265,13 @@ e_desktops_delete(E_Desktop *d) void e_desktops_show(E_Desktop *d) { - e_window_show(d->win.main); + ecore_window_show(d->win.main); } void e_desktops_hide(E_Desktop *d) { - e_window_hide(d->win.main); + ecore_window_hide(d->win.main); } int diff --git a/src/e.h b/src/e.h index 8eb494bb3..6ba40e1bc 100644 --- a/src/e.h +++ b/src/e.h @@ -57,11 +57,11 @@ E_Prof __p, *__pp; \ Evas_List __pl; \ __p.func = _prof_func; \ __p.total = 0.0; \ -__p.t1 = e_get_time(); \ +__p.t1 = ecore_get_time(); \ __p.t2 = 0.0; #define E_PROF_STOP \ -__p.t2 = e_get_time(); \ +__p.t2 = ecore_get_time(); \ for (__pl = __e_profiles; __pl; __pl = __pl->next) \ { \ __pp = __pl->data; \ @@ -100,7 +100,7 @@ printf("%3.3f : %s()\n", __p->total, __p->func); \ /* Observer macros */ #define OBS_PROPERTIES \ Evas_List watched; \ -Eevent_Type e_event; \ +Ecore_Event_Type e_event; \ void (*e_obs_notify)(void *_e_obs, void *_e_obj); \ void (*e_obs_free)(void *_e_obs); #define OBS_INIT(_e_obs, _e_event, _e_obs_notify, _e_obs_free) \ @@ -125,7 +125,7 @@ void (*e_obs_free)(void *_e_obs); Evas_List obs; \ obs = _e_obj->observers; \ while (obs) { \ - if (((E_Observer *)obs->data)->e_event == EV_MAX || \ + if (((E_Observer *)obs->data)->e_event == ECORE_EVENT_MAX || \ ((E_Observer *)obs->data)->e_event == _e_event) \ ((E_Observer *)obs->data)->e_obs_notify(obs->data, _e_obj); \ obs = obs->next; \ diff --git a/src/entry.c b/src/entry.c index e1749110d..0d0371d76 100644 --- a/src/entry.c +++ b/src/entry.c @@ -4,8 +4,8 @@ static Evas_List entries; -static void e_clear_selection(Eevent * ev); -static void e_paste_request(Eevent * ev); +static void e_clear_selection(Ecore_Event * ev); +static void e_paste_request(Ecore_Event * ev); static void e_entry_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); static void e_entry_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); @@ -15,9 +15,9 @@ static void e_entry_unrealize(E_Entry *entry); static void e_entry_configure(E_Entry *entry); static void -e_clear_selection(Eevent * ev) +e_clear_selection(Ecore_Event * ev) { - Ev_Clear_Selection *e; + Ecore_Event_Clear_Selection *e; Evas_List l; e = ev->event; @@ -28,7 +28,7 @@ e_clear_selection(Eevent * ev) entry = l->data; if (entry->selection_win == e->win) { - e_window_destroy(entry->selection_win); + ecore_window_destroy(entry->selection_win); entry->selection_win = 0; entry->select.start = -1; entry->select.length = 0; @@ -38,9 +38,9 @@ e_clear_selection(Eevent * ev) } static void -e_paste_request(Eevent * ev) +e_paste_request(Ecore_Event * ev) { - Ev_Paste_Request *e; + Ecore_Event_Paste_Request *e; Evas_List l; e = ev->event; @@ -69,8 +69,8 @@ e_entry_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) entry = _data; if ((_b == 2) && (!entry->mouse_down)) { - if (entry->paste_win) e_window_destroy(entry->paste_win); - entry->paste_win = e_selection_request(); + if (entry->paste_win) ecore_window_destroy(entry->paste_win); + entry->paste_win = ecore_selection_request(); } else if (!entry->mouse_down) { @@ -185,8 +185,8 @@ e_entry_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) str2 = e_entry_get_selection(entry); if (str2) { - if (entry->selection_win) e_window_destroy(entry->selection_win); - entry->selection_win = e_selection_set(str2); + if (entry->selection_win) ecore_window_destroy(entry->selection_win); + entry->selection_win = ecore_selection_set(str2); free(str2); } } @@ -359,8 +359,8 @@ e_entry_configure(E_Entry *entry) void e_entry_init(void) { - e_event_filter_handler_add(EV_PASTE_REQUEST, e_paste_request); - e_event_filter_handler_add(EV_CLEAR_SELECTION, e_clear_selection); + ecore_event_filter_handler_add(ECORE_EVENT_PASTE_REQUEST, e_paste_request); + ecore_event_filter_handler_add(ECORE_EVENT_CLEAR_SELECTION, e_clear_selection); } void @@ -387,7 +387,7 @@ e_entry_new(void) } void -e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e) +e_entry_handlecore_keypress(E_Entry *entry, Ecore_Event_Key_Down *e) { if (!entry->focused) return; if (!strcmp(e->key, "Up")) @@ -428,8 +428,8 @@ e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e) } else if (!strcmp(e->key, "Insert")) { - if (entry->paste_win) e_window_destroy(entry->paste_win); - entry->paste_win = e_selection_request(); + if (entry->paste_win) ecore_window_destroy(entry->paste_win); + entry->paste_win = ecore_selection_request(); } else if (!strcmp(e->key, "Home")) { @@ -457,7 +457,7 @@ e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e) { char *type; - type = e_key_press_translate_into_typeable(e); + type = ecore_keypress_translate_into_typeable(e); if (type) { printf("%0x\n", type[0]); diff --git a/src/entry.h b/src/entry.h index c33d12189..1f612d7b4 100644 --- a/src/entry.h +++ b/src/entry.h @@ -42,7 +42,7 @@ struct _E_Entry void e_entry_init(void); void e_entry_free(E_Entry *entry); E_Entry *e_entry_new(void); -void e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e); +void e_entry_handlecore_keypress(E_Entry *entry, Ecore_Event_Key_Down *e); void e_entry_set_evas(E_Entry *entry, Evas evas); void e_entry_show(E_Entry *entry); void e_entry_hide(E_Entry *entry); diff --git a/src/exec.c b/src/exec.c index 392c011ca..260989203 100644 --- a/src/exec.c +++ b/src/exec.c @@ -20,7 +20,7 @@ e_exec_restart(void) printf("e_exec_restart()\n"); /* unset events on root */ - e_window_set_events(0, XEV_NONE); + ecore_window_set_events(0, XEV_NONE); /* destroy all desktops */ num = e_desktops_get_num(); for (i = 0; i < num; i++) @@ -31,7 +31,7 @@ e_exec_restart(void) e_desktops_delete(desk); } /* ensure it's all done */ - e_sync(); + ecore_sync(); /* rerun myself */ exe[0] = 0; for (i = 0; i < e_argc; i++) @@ -105,6 +105,7 @@ e_exec_in_dir_with_env(char *exe, char *dir, int *launch_id_ret, char **env, cha strlen(preload_paths) + 1 + strlen(preload) + 1); sprintf(exe2, "%s %s %s", preload_paths, preload, exe); + execl("/bin/sh", "/bin/sh", "-c", exe2, NULL); exit(0); return 0; diff --git a/src/fs.c b/src/fs.c index 8f09b3fe3..79aee3158 100644 --- a/src/fs.c +++ b/src/fs.c @@ -6,7 +6,7 @@ static Evas_List fs_handlers = NULL; static Evas_List fs_restart_handlers = NULL; static pid_t efsd_pid = 0; -static void e_fs_child_handle(Eevent *ev); +static void e_fs_child_handle(Ecore_Event *ev); static void _e_fs_fd_handle(int fd); static void _e_fs_restarter(int val, void *data); static void e_fs_idle(void *data); @@ -19,7 +19,7 @@ e_fs_flush_timeout(int val, void *data) if (efsd_commands_pending(ec) > 0) { if (efsd_flush(ec) > 0) - e_add_event_timer("e_fs_flush_timeout()", + ecore_add_event_timer("e_fs_flush_timeout()", 0.00, e_fs_flush_timeout, 0, NULL); } UN(data); @@ -34,9 +34,9 @@ e_fs_idle(void *data) } static void -e_fs_child_handle(Eevent *ev) +e_fs_child_handle(Ecore_Event *ev) { - Ev_Child *e; + Ecore_Event_Child *e; e = ev->event; printf("pid went splat! (%i)\n", e->pid); @@ -55,7 +55,7 @@ _e_fs_fd_handle(int fd) { double start, current; - start = e_get_time(); + start = ecore_get_time(); while ((ec) && efsd_events_pending(ec)) { EfsdEvent ev; @@ -76,7 +76,7 @@ _e_fs_fd_handle(int fd) else { efsd_close(ec); - e_del_event_fd(fd); + ecore_del_event_fd(fd); ec = NULL; _e_fs_restarter(0, NULL); /* FIXME: need to queue a popup dialog here saying */ @@ -85,7 +85,7 @@ _e_fs_fd_handle(int fd) } /* spent more thna 1/20th of a second here.. get out */ - current = e_get_time(); + current = ecore_get_time(); if ((current - start) > 0.05) { printf("fs... too much time spent..\n"); @@ -113,7 +113,7 @@ _e_fs_restarter(int val, void *data) { Evas_List l; - e_add_event_fd(efsd_get_connection_fd(ec), _e_fs_fd_handle); + ecore_add_event_fd(efsd_get_connection_fd(ec), _e_fs_fd_handle); for (l = fs_restart_handlers; l; l = l->next) { E_FS_Restarter *rs; @@ -128,7 +128,7 @@ _e_fs_restarter(int val, void *data) gap = (double)val / 10; if (gap > 10.0) gap = 10.0; - e_add_event_timer("e_fs_restarter", gap, _e_fs_restarter, val + 1, NULL); + ecore_add_event_timer("e_fs_restarter", gap, _e_fs_restarter, val + 1, NULL); } UN(data); } @@ -167,8 +167,8 @@ e_fs_add_event_handler(void (*func) (EfsdEvent *ev)) void e_fs_init(void) { - e_event_filter_handler_add(EV_CHILD, e_fs_child_handle); - e_event_filter_idle_handler_add(e_fs_idle, NULL); + ecore_event_filter_handler_add(ECORE_EVENT_CHILD, e_fs_child_handle); + ecore_event_filter_idle_handler_add(e_fs_idle, NULL); _e_fs_restarter(0, NULL); } diff --git a/src/guides.c b/src/guides.c index 7eba31174..d7b53396d 100644 --- a/src/guides.c +++ b/src/guides.c @@ -69,16 +69,16 @@ e_guides_update(void) { if (!guides.win.display) { - guides.win.display = e_window_override_new(0, 0, 0, 1, 1); - guides.win.l = e_window_override_new(0, 0, 0, 1, 1); - guides.win.r = e_window_override_new(0, 0, 0, 1, 1); - guides.win.t = e_window_override_new(0, 0, 0, 1, 1); - guides.win.b = e_window_override_new(0, 0, 0, 1, 1); - e_window_save_under(guides.win.display); - e_window_save_under(guides.win.l); - e_window_save_under(guides.win.r); - e_window_save_under(guides.win.t); - e_window_save_under(guides.win.b); + guides.win.display = ecore_window_override_new(0, 0, 0, 1, 1); + guides.win.l = ecore_window_override_new(0, 0, 0, 1, 1); + guides.win.r = ecore_window_override_new(0, 0, 0, 1, 1); + guides.win.t = ecore_window_override_new(0, 0, 0, 1, 1); + guides.win.b = ecore_window_override_new(0, 0, 0, 1, 1); + ecore_window_save_under(guides.win.display); + ecore_window_save_under(guides.win.l); + ecore_window_save_under(guides.win.r); + ecore_window_save_under(guides.win.t); + ecore_window_save_under(guides.win.b); redraw = 1; } if (!guides.disp.evas) @@ -104,11 +104,11 @@ e_guides_update(void) { if (guides.win.display) { - e_window_destroy(guides.win.display); - e_window_destroy(guides.win.l); - e_window_destroy(guides.win.r); - e_window_destroy(guides.win.t); - e_window_destroy(guides.win.b); + ecore_window_destroy(guides.win.display); + ecore_window_destroy(guides.win.l); + ecore_window_destroy(guides.win.r); + ecore_window_destroy(guides.win.t); + ecore_window_destroy(guides.win.b); guides.win.display = 0; guides.win.l = 0; guides.win.r = 0; @@ -212,7 +212,7 @@ e_guides_update(void) } if (guides.current.display.loc == E_GUIDES_DISPLAY_LOCATION_SCREEN_MIDDLE) { - e_window_get_geometry(0, NULL, NULL, &sw, &sh); + ecore_window_get_geometry(0, NULL, NULL, &sw, &sh); dx = (int)(((double)sw - (double)dw) * guides.current.display.align.x); dy = (int)(((double)sh - (double)dh) * guides.current.display.align.y); } @@ -242,8 +242,8 @@ e_guides_update(void) { Pixmap pmap, mask; - pmap = e_pixmap_new(guides.win.display, dw, dh, 0); - mask = e_pixmap_new(guides.win.display, dw, dh, 1); + pmap = ecore_pixmap_new(guides.win.display, dw, dh, 0); + mask = ecore_pixmap_new(guides.win.display, dw, dh, 1); imlib_context_set_image(guides.disp.image); @@ -255,14 +255,14 @@ e_guides_update(void) imlib_context_set_color_modifier(NULL); imlib_render_image_on_drawable(0, 0); - e_window_set_background_pixmap(guides.win.display, pmap); - e_window_set_shape_mask(guides.win.display, mask); - e_window_clear(guides.win.display); - e_pixmap_free(pmap); - e_pixmap_free(mask); + ecore_window_set_background_pixmap(guides.win.display, pmap); + ecore_window_set_shape_mask(guides.win.display, mask); + ecore_window_clear(guides.win.display); + ecore_pixmap_free(pmap); + ecore_pixmap_free(mask); } - e_window_move(guides.win.display, dx, dy); - e_window_resize(guides.win.display, dw, dh); + ecore_window_move(guides.win.display, dx, dy); + ecore_window_resize(guides.win.display, dw, dh); if (guides.current.mode == E_GUIDES_BOX) { @@ -296,23 +296,23 @@ e_guides_update(void) imlib_image_draw_line(0, 0, 0, h - 1, 0); imlib_image_draw_line(2, 0, 2, h - 1, 0); - pmap = e_pixmap_new(guides.win.l, w, h, 0); - mask = e_pixmap_new(guides.win.l, w, h, 1); + pmap = ecore_pixmap_new(guides.win.l, w, h, 0); + mask = ecore_pixmap_new(guides.win.l, w, h, 1); imlib_context_set_drawable(pmap); imlib_context_set_mask(mask); imlib_render_image_on_drawable(0, 0); imlib_free_image(); - e_window_move(guides.win.l, x, y); - e_window_resize(guides.win.l, w, h); - e_window_set_background_pixmap(guides.win.l, pmap); - e_window_set_shape_mask(guides.win.l, mask); - e_window_clear(guides.win.l); - e_pixmap_free(pmap); - e_pixmap_free(mask); + ecore_window_move(guides.win.l, x, y); + ecore_window_resize(guides.win.l, w, h); + ecore_window_set_background_pixmap(guides.win.l, pmap); + ecore_window_set_shape_mask(guides.win.l, mask); + ecore_window_clear(guides.win.l); + ecore_pixmap_free(pmap); + ecore_pixmap_free(mask); } else { - e_window_resize(guides.win.l, 0, 0); + ecore_window_resize(guides.win.l, 0, 0); } x = guides.current.x + guides.current.w - 3; @@ -332,23 +332,23 @@ e_guides_update(void) imlib_image_draw_line(0, 0, 0, h - 1, 0); imlib_image_draw_line(2, 0, 2, h - 1, 0); - pmap = e_pixmap_new(guides.win.r, w, h, 0); - mask = e_pixmap_new(guides.win.r, w, h, 1); + pmap = ecore_pixmap_new(guides.win.r, w, h, 0); + mask = ecore_pixmap_new(guides.win.r, w, h, 1); imlib_context_set_drawable(pmap); imlib_context_set_mask(mask); imlib_render_image_on_drawable(0, 0); imlib_free_image(); - e_window_move(guides.win.r, x, y); - e_window_resize(guides.win.r, w, h); - e_window_set_background_pixmap(guides.win.r, pmap); - e_window_set_shape_mask(guides.win.r, mask); - e_window_clear(guides.win.r); - e_pixmap_free(pmap); - e_pixmap_free(mask); + ecore_window_move(guides.win.r, x, y); + ecore_window_resize(guides.win.r, w, h); + ecore_window_set_background_pixmap(guides.win.r, pmap); + ecore_window_set_shape_mask(guides.win.r, mask); + ecore_window_clear(guides.win.r); + ecore_pixmap_free(pmap); + ecore_pixmap_free(mask); } else { - e_window_resize(guides.win.r, 0, 0); + ecore_window_resize(guides.win.r, 0, 0); } x = guides.current.x; @@ -372,23 +372,23 @@ e_guides_update(void) imlib_image_draw_line(1, 2, 1, 2, 0); imlib_image_draw_line(w - 2, 2, w - 2, 2, 0); - pmap = e_pixmap_new(guides.win.t, w, h, 0); - mask = e_pixmap_new(guides.win.t, w, h, 1); + pmap = ecore_pixmap_new(guides.win.t, w, h, 0); + mask = ecore_pixmap_new(guides.win.t, w, h, 1); imlib_context_set_drawable(pmap); imlib_context_set_mask(mask); imlib_render_image_on_drawable(0, 0); imlib_free_image(); - e_window_move(guides.win.t, x, y); - e_window_resize(guides.win.t, w, h); - e_window_set_background_pixmap(guides.win.t, pmap); - e_window_set_shape_mask(guides.win.t, mask); - e_window_clear(guides.win.t); - e_pixmap_free(pmap); - e_pixmap_free(mask); + ecore_window_move(guides.win.t, x, y); + ecore_window_resize(guides.win.t, w, h); + ecore_window_set_background_pixmap(guides.win.t, pmap); + ecore_window_set_shape_mask(guides.win.t, mask); + ecore_window_clear(guides.win.t); + ecore_pixmap_free(pmap); + ecore_pixmap_free(mask); } else { - e_window_resize(guides.win.t, 0, 0); + ecore_window_resize(guides.win.t, 0, 0); } x = guides.current.x; @@ -412,23 +412,23 @@ e_guides_update(void) imlib_image_draw_line(1, 0, 1, 0, 0); imlib_image_draw_line(w - 2, 0, w - 2, 0, 0); - pmap = e_pixmap_new(guides.win.b, w, h, 0); - mask = e_pixmap_new(guides.win.b, w, h, 1); + pmap = ecore_pixmap_new(guides.win.b, w, h, 0); + mask = ecore_pixmap_new(guides.win.b, w, h, 1); imlib_context_set_drawable(pmap); imlib_context_set_mask(mask); imlib_render_image_on_drawable(0, 0); imlib_free_image(); - e_window_move(guides.win.b, x, y); - e_window_resize(guides.win.b, w, h); - e_window_set_background_pixmap(guides.win.b, pmap); - e_window_set_shape_mask(guides.win.b, mask); - e_window_clear(guides.win.b); - e_pixmap_free(pmap); - e_pixmap_free(mask); + ecore_window_move(guides.win.b, x, y); + ecore_window_resize(guides.win.b, w, h); + ecore_window_set_background_pixmap(guides.win.b, pmap); + ecore_window_set_shape_mask(guides.win.b, mask); + ecore_window_clear(guides.win.b); + ecore_pixmap_free(pmap); + ecore_pixmap_free(mask); } else { - e_window_resize(guides.win.b, 0, 0); + ecore_window_resize(guides.win.b, 0, 0); } } } @@ -439,38 +439,38 @@ e_guides_update(void) { if (guides.current.mode != E_GUIDES_OPAQUE) { - e_window_raise(guides.win.l); - e_window_show(guides.win.l); - e_window_raise(guides.win.r); - e_window_show(guides.win.r); - e_window_raise(guides.win.t); - e_window_show(guides.win.t); - e_window_raise(guides.win.b); - e_window_show(guides.win.b); + ecore_window_raise(guides.win.l); + ecore_window_show(guides.win.l); + ecore_window_raise(guides.win.r); + ecore_window_show(guides.win.r); + ecore_window_raise(guides.win.t); + ecore_window_show(guides.win.t); + ecore_window_raise(guides.win.b); + ecore_window_show(guides.win.b); } - e_window_raise(guides.win.display); - e_window_show(guides.win.display); + ecore_window_raise(guides.win.display); + ecore_window_show(guides.win.display); } } if (guides.current.mode != guides.prev.mode) { if (guides.current.mode == E_GUIDES_BOX) { - e_window_raise(guides.win.l); - e_window_show(guides.win.l); - e_window_raise(guides.win.r); - e_window_show(guides.win.r); - e_window_raise(guides.win.t); - e_window_show(guides.win.t); - e_window_raise(guides.win.b); - e_window_show(guides.win.b); + ecore_window_raise(guides.win.l); + ecore_window_show(guides.win.l); + ecore_window_raise(guides.win.r); + ecore_window_show(guides.win.r); + ecore_window_raise(guides.win.t); + ecore_window_show(guides.win.t); + ecore_window_raise(guides.win.b); + ecore_window_show(guides.win.b); } else if (guides.prev.mode == E_GUIDES_OPAQUE) { - e_window_hide(guides.win.l); - e_window_hide(guides.win.r); - e_window_hide(guides.win.t); - e_window_hide(guides.win.b); + ecore_window_hide(guides.win.l); + ecore_window_hide(guides.win.r); + ecore_window_hide(guides.win.t); + ecore_window_hide(guides.win.b); } } guides.prev = guides.current; @@ -592,5 +592,5 @@ void e_guides_init(void) guides.disp.icon = 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); } diff --git a/src/icccm.c b/src/icccm.c index 8b3021a66..2160594b4 100644 --- a/src/icccm.c +++ b/src/icccm.c @@ -48,7 +48,7 @@ MWMHints; void 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 @@ -60,10 +60,10 @@ e_icccm_delete(Window win) int size; int del_win = 0; - E_ATOM(a_wm_delete_window, "WM_DELETE_WINDOW"); - E_ATOM(a_wm_protocols, "WM_PROTOCOLS"); + ECORE_ATOM(a_wm_delete_window, "WM_DELETE_WINDOW"); + 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) { int i, num; @@ -81,11 +81,11 @@ e_icccm_delete(Window win) data[0] = a_wm_delete_window; 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 { - 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; unsigned int data[2]; - E_ATOM(a_wm_state, "WM_STATE"); + ECORE_ATOM(a_wm_state, "WM_STATE"); data[0] = NormalState; 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 @@ -107,10 +107,10 @@ e_icccm_state_iconified(Window win) static Atom a_wm_state = 0; unsigned int data[2]; - E_ATOM(a_wm_state, "WM_STATE"); + ECORE_ATOM(a_wm_state, "WM_STATE"); data[0] = IconicState; 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 @@ -119,22 +119,22 @@ e_icccm_state_withdrawn(Window win) static Atom a_wm_state = 0; unsigned int data[2]; - E_ATOM(a_wm_state, "WM_STATE"); + ECORE_ATOM(a_wm_state, "WM_STATE"); data[0] = WithdrawnState; 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 e_icccm_adopt(Window win) { - e_window_add_to_save_set(win); + ecore_window_add_to_save_set(win); } void e_icccm_release(Window win) { - e_window_del_from_save_set(win); + ecore_window_del_from_save_set(win); } void @@ -143,7 +143,7 @@ e_icccm_get_pos_info(Window win, E_Border *b) XSizeHints hint; 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))) { @@ -155,7 +155,7 @@ e_icccm_get_pos_info(Window win, E_Border *b) if (hint.flags & PWinGravity) b->client.pos.gravity = hint.win_gravity; 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.y = y; } @@ -186,7 +186,7 @@ e_icccm_get_size_info(Window win, E_Border *b) step_h = 1; base_w = 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) { @@ -247,9 +247,9 @@ e_icccm_get_mwm_hints(Window win, E_Border *b) MWMHints *mwmhints; 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) { int num; @@ -287,9 +287,9 @@ e_icccm_get_layer(Window win, E_Border *b) int *props; 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) { int num; @@ -305,7 +305,7 @@ e_icccm_get_title(Window win, E_Border *b) { char *title; - title = e_window_get_title(win); + title = ecore_window_get_title(win); if (b->client.title) { @@ -326,7 +326,7 @@ e_icccm_get_class(Window win, E_Border *b) IF_FREE(b->client.class); b->client.name = 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.class) e_strdup(b->client.class, "Unknown"); } @@ -334,7 +334,7 @@ e_icccm_get_class(Window win, E_Border *b) void 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.group)); } @@ -344,7 +344,7 @@ e_icccm_get_machine(Window win, E_Border *b) { IF_FREE(b->client.machine); b->client.machine = NULL; - b->client.machine = e_window_get_machine(win); + b->client.machine = ecore_window_get_machine(win); } void @@ -352,7 +352,7 @@ e_icccm_get_command(Window win, E_Border *b) { IF_FREE(b->client.command); b->client.command = NULL; - b->client.command = e_window_get_command(win); + b->client.command = ecore_window_get_command(win); } void @@ -360,7 +360,7 @@ e_icccm_get_icon_name(Window win, E_Border *b) { IF_FREE(b->client.icon_name); 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 @@ -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; 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[1] = r; props[2] = t; 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 @@ -388,10 +388,10 @@ e_icccm_set_desk_area(Window win, int ax, int ay) static Atom a_win_area = 0; int props[2]; - E_ATOM(a_win_area, "_WIN_AREA"); + ECORE_ATOM(a_win_area, "_WIN_AREA"); props[0] = ax; 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 @@ -400,10 +400,10 @@ e_icccm_set_desk_area_size(Window win, int ax, int ay) static Atom a_win_area_count = 0; 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[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 @@ -412,9 +412,9 @@ e_icccm_set_desk(Window win, int d) static Atom a_win_workspace = 0; int props[2]; - E_ATOM(a_win_workspace, "_WIN_WORKSPACE"); + ECORE_ATOM(a_win_workspace, "_WIN_WORKSPACE"); 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 @@ -424,8 +424,8 @@ e_icccm_is_shaped(Window win) int shaped = 1; XRectangle *rect; - e_window_get_geometry(win, NULL, NULL, &w, &h); - rect = e_window_get_shape_rectangles(win, &num); + ecore_window_get_geometry(win, NULL, NULL, &w, &h); + rect = ecore_window_get_shape_rectangles(win, &num); if (!rect) return 1; if ((num == 1) && (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_state = 0; - E_ATOM(a_wm_normal_hints, "WM_NORMAL_HINTS"); - E_ATOM(a_motif_wm_hints, "_MOTIF_WM_HINTS"); - E_ATOM(a_wm_name, "WM_NAME"); - E_ATOM(a_wm_class, "WM_CLASS"); - E_ATOM(a_wm_hints, "WM_HINTS"); - E_ATOM(a_wm_client_machine, "WM_CLIENT_MACHINE"); - E_ATOM(a_wm_command, "WM_COMMAND"); - E_ATOM(a_wm_icon_name, "WM_ICON_NAME"); - E_ATOM(a_wm_state, "WM_STATE"); + ECORE_ATOM(a_wm_normal_hints, "WM_NORMAL_HINTS"); + ECORE_ATOM(a_motif_wm_hints, "_MOTIF_WM_HINTS"); + ECORE_ATOM(a_wm_name, "WM_NAME"); + ECORE_ATOM(a_wm_class, "WM_CLASS"); + ECORE_ATOM(a_wm_hints, "WM_HINTS"); + ECORE_ATOM(a_wm_client_machine, "WM_CLIENT_MACHINE"); + ECORE_ATOM(a_wm_command, "WM_COMMAND"); + ECORE_ATOM(a_wm_icon_name, "WM_ICON_NAME"); + ECORE_ATOM(a_wm_state, "WM_STATE"); 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); @@ -470,7 +470,7 @@ e_icccm_handle_property_change(Atom a, E_Border *b) } void -e_icccm_handle_client_message(Ev_Message *e) +e_icccm_handle_client_message(Ecore_Event_Message *e) { return; UN(e); @@ -487,10 +487,10 @@ e_icccm_advertise_mwm_compat(void) static Atom a_motif_wm_info = 0; 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] = e_window_root(); - e_window_property_set(0, a_motif_wm_info, a_motif_wm_info, 32, props, 2); + props[0] = ecore_window_root(); + ecore_window_property_set(0, a_motif_wm_info, a_motif_wm_info, 32, props, 2); } void @@ -504,21 +504,21 @@ e_icccm_advertise_gnome_compat(void) int props[32]; Window win; - E_ATOM(a_win_protocols, "_WIN_PROTOCOLS"); - E_ATOM(a_win_layer, "_WIN_LAYER"); + ECORE_ATOM(a_win_protocols, "_WIN_PROTOCOLS"); + ECORE_ATOM(a_win_layer, "_WIN_LAYER"); 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"); - e_window_property_set(0, a_win_wm_name, XA_STRING, 8, "Enlightenment", strlen("Enlightenment")); - E_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_ATOM(a_win_wm_name, "_WIN_WM_NAME"); + ecore_window_property_set(0, a_win_wm_name, XA_STRING, 8, "Enlightenment", strlen("Enlightenment")); + ECORE_ATOM(a_win_wm_version, "_WIN_WM_VERSION"); + 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"); - win = e_window_override_new(0, 0, 0, 7, 7); + ECORE_ATOM(a_win_supporting_wm_check, "_WIN_SUPPORTING_WM_CHECK"); + win = ecore_window_override_new(0, 0, 0, 7, 7); props[0] = win; - e_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(win, 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 diff --git a/src/icccm.h b/src/icccm.h index ce68350ce..26c2a975d 100644 --- a/src/icccm.h +++ b/src/icccm.h @@ -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); int e_icccm_is_shaped(Window win); 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_mwm_compat(void); void e_icccm_advertise_gnome_compat(void); diff --git a/src/iconbar.c b/src/iconbar.c index ea183357f..178348cf3 100644 --- a/src/iconbar.c +++ b/src/iconbar.c @@ -1,588 +1,567 @@ #include "iconbar.h" -static void e_idle(void *); - static Evas_List iconbars; E_Iconbar * -e_ib_new(E_View *v) +e_iconbar_new(E_View *v) { - /* vertical lines (left, center, right) and title */ -// Evas_Object ovl, ovc, ovr, ot; + /* vertical lines (left, center, right) and title */ + /* Evas_Object ovl, ovc, ovr, ot; */ + + E_Iconbar *ib; + + ib = NEW(E_Iconbar, 1); + ZERO(ib, E_Iconbar, 1); + OBJ_INIT(ib, e_iconbar_free); + + printf("in ib_new()\n"); + + ib->v = v; + ib->e = v->evas; + /* ib->name = strdup(v->dir); */ + + /* e_iconbar_draw(ib); */ + iconbars = evas_list_append(iconbars, ib); + + if(e_iconbar_config(ib) == 0) + return NULL; - E_Iconbar *ib; - - ib = NEW(E_Iconbar, 1); - ZERO(ib, E_Iconbar, 1); - OBJ_INIT(ib, e_ib_free); - - printf("in ib_new()\n"); - - ib->v = v; - ib->e = v->evas; -// ib->name = strdup(v->dir); - - //e_ib_draw(ib); - iconbars = evas_list_append(iconbars, ib); - - if(e_ib_config(ib) == 0) return NULL; - return ib; + return ib; } void -e_ib_realize(E_Iconbar *ib) +e_iconbar_realize(E_Iconbar *ib) { - printf("in e_ib_realize()\n"); - + printf("in e_iconbar_realize()\n"); + + if(ib->geom.conf.left < 0) + ib->geom.left = ib->geom.conf.left + ib->v->size.w; + if(ib->geom.conf.top < 0) + ib->geom.top = ib->geom.conf.top + ib->v->size.h; + if(ib->geom.conf.w == 0) + ib->geom.w = ib->v->size.w; + if(ib->geom.conf.h == 0) + ib->geom.h = ib->v->size.h; + + printf("w: %i, h: %i\nt: %i, l: %i\n", ib->geom.w, ib->geom.h, ib->geom.top, ib->geom.left); + + + /* horizontal */ + if (ib->geom.horizontal) + { + ib->obj.scroll = evas_add_rectangle(ib->e); + ib->obj.line_l = evas_add_image_from_file(ib->e, ib->image.hline); + ib->obj.line_c = evas_add_image_from_file(ib->e, ib->image.hline); + ib->obj.line_r = evas_add_image_from_file(ib->e, ib->image.hline); + ib->obj.title = evas_add_image_from_file(ib->e, ib->image.title); + ib->obj.clip = evas_add_rectangle(ib->e); + + evas_get_image_size(ib->e, ib->obj.title, &ib->geom.title_w, &ib->geom.title_h); + evas_get_image_size(ib->e, ib->obj.line_l, &ib->geom.line_w, &ib->geom.line_h); + + evas_set_layer(ib->e, ib->obj.scroll, 400); + + evas_resize(ib->e, ib->obj.scroll, ib->geom.w, ib->geom.scroll_w); + evas_resize(ib->e, ib->obj.line_l, ib->geom.w, ib->geom.line_h); + evas_resize(ib->e, ib->obj.line_c, ib->geom.w, ib->geom.line_h); + evas_resize(ib->e, ib->obj.line_r, ib->geom.w, ib->geom.line_h); + evas_resize(ib->e, ib->obj.clip, ib->geom.w, ib->geom.h); + + evas_set_image_fill(ib->e, ib->obj.line_l, 0, 0, ib->geom.line_w, ib->geom.line_h); + evas_set_image_fill(ib->e, ib->obj.line_c, 0, 0, ib->geom.line_w, ib->geom.line_h); + evas_set_image_fill(ib->e, ib->obj.line_r, 0, 0, ib->geom.line_w, ib->geom.line_h); + + evas_move(ib->e, ib->obj.scroll, ib->geom.left, ib->geom.top + ib->geom.h - ib->geom.scroll_w); + evas_move(ib->e, ib->obj.line_l, ib->geom.left, ib->geom.top); + evas_move(ib->e, ib->obj.line_c, ib->geom.left, ib->geom.top + ib->geom.h - ib->geom.scroll_w); + evas_move(ib->e, ib->obj.line_r, ib->geom.left, ib->geom.top + ib->geom.h); + evas_move(ib->e, ib->obj.title, ib->geom.left - ib->geom.title_w - 5, ib->geom.top + (ib->geom.h - ib->geom.title_h) / 2); + evas_move(ib->e, ib->obj.clip, ib->geom.left, ib->geom.top); + + evas_set_color(ib->e, ib->obj.scroll, 129, 129, 129, 0); + evas_set_color(ib->e, ib->obj.clip, 255, 255, 255, 255); + } + + /* vertical */ + if (!ib->geom.horizontal) + { + ib->obj.scroll = evas_add_rectangle(ib->e); + ib->obj.line_l = evas_add_image_from_file(ib->e, ib->image.vline); + ib->obj.line_c = evas_add_image_from_file(ib->e, ib->image.vline); + ib->obj.line_r = evas_add_image_from_file(ib->e, ib->image.vline); + ib->obj.title = evas_add_image_from_file(ib->e, ib->image.title); + ib->obj.clip = evas_add_rectangle(ib->e); + + evas_get_image_size(ib->e, ib->obj.title, &ib->geom.title_w, &ib->geom.title_h); + evas_get_image_size(ib->e, ib->obj.line_l, &ib->geom.line_w, &ib->geom.line_h); + + evas_set_layer(ib->e, ib->obj.scroll, 400); + + evas_resize(ib->e, ib->obj.scroll, ib->geom.scroll_w, ib->geom.h); + evas_resize(ib->e, ib->obj.line_l, ib->geom.line_w, ib->geom.h); + evas_resize(ib->e, ib->obj.line_c, ib->geom.line_w, ib->geom.h); + evas_resize(ib->e, ib->obj.line_r, ib->geom.line_w, ib->geom.h); + evas_resize(ib->e, ib->obj.clip, ib->geom.w, ib->geom.h); + + evas_set_image_fill(ib->e, ib->obj.line_l, 0, 0, ib->geom.line_w, ib->geom.line_h); + evas_set_image_fill(ib->e, ib->obj.line_c, 0, 0, ib->geom.line_w, ib->geom.line_h); + evas_set_image_fill(ib->e, ib->obj.line_r, 0, 0, ib->geom.line_w, ib->geom.line_h); + + evas_move(ib->e, ib->obj.scroll, ib->geom.left + ib->geom.w - ib->geom.scroll_w, ib->geom.top); + evas_move(ib->e, ib->obj.line_l, ib->geom.left, ib->geom.top); + evas_move(ib->e, ib->obj.line_c, ib->geom.left + ib->geom.w - ib->geom.scroll_w, ib->geom.top); + evas_move(ib->e, ib->obj.line_r, ib->geom.left + ib->geom.w, ib->geom.top); + evas_move(ib->e, ib->obj.title, ib->geom.left + ((ib->geom.w - ib->geom.title_w - ib->geom.scroll_w) / 2 ), ib->geom.top - ib->geom.title_h - 5); + evas_move(ib->e, ib->obj.clip, ib->geom.left, ib->geom.top); + + evas_set_color(ib->e, ib->obj.scroll, 129, 129, 129, 0); + evas_set_color(ib->e, ib->obj.clip, 255, 255, 255, 255); + } + + + /* Clip icons */ + { + Evas_List l; + for (l = ib->icons; l; l = l->next) + { + E_Iconbar_Icon *i; + i = l->data; + evas_set_clip(ib->e, i->image, ib->obj.clip); + } + } + + /* show the iconbar */ + evas_show(ib->e, ib->obj.scroll); + evas_show(ib->e, ib->obj.line_l); + evas_show(ib->e, ib->obj.line_c); + evas_show(ib->e, ib->obj.line_r); + evas_show(ib->e, ib->obj.title); + evas_show(ib->e, ib->obj.clip); + + evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_MOVE, s_mouse_move, ib); + evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_IN, s_mouse_in, ib); + evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_OUT, s_mouse_out, ib); + + e_iconbar_fix_icons(ib); - if(ib->geom.conf.left < 0) - ib->geom.left = ib->geom.conf.left + ib->v->size.w; - if(ib->geom.conf.top < 0) - ib->geom.top = ib->geom.conf.top + ib->v->size.h; - if(ib->geom.conf.w == 0) - ib->geom.w = ib->v->size.w; - if(ib->geom.conf.h == 0) - ib->geom.h = ib->v->size.h; - - printf("w: %i, h: %i\nt: %i, l: %i\n", ib->geom.w, ib->geom.h, ib->geom.top, ib->geom.left); - - - /* horizontal */ - if (ib->geom.horizontal) - { - ib->obj.scroll = evas_add_rectangle(ib->e); - ib->obj.line_l = evas_add_image_from_file(ib->e, ib->image.hline); - ib->obj.line_c = evas_add_image_from_file(ib->e, ib->image.hline); - ib->obj.line_r = evas_add_image_from_file(ib->e, ib->image.hline); - ib->obj.title = evas_add_image_from_file(ib->e, ib->image.title); - ib->obj.clip = evas_add_rectangle(ib->e); - - evas_get_image_size(ib->e, ib->obj.title, &ib->geom.title_w, &ib->geom.title_h); - evas_get_image_size(ib->e, ib->obj.line_l, &ib->geom.line_w, &ib->geom.line_h); - - evas_set_layer(ib->e, ib->obj.scroll, 400); - - evas_resize(ib->e, ib->obj.scroll, ib->geom.w, ib->geom.scroll_w); - evas_resize(ib->e, ib->obj.line_l, ib->geom.w, ib->geom.line_h); - evas_resize(ib->e, ib->obj.line_c, ib->geom.w, ib->geom.line_h); - evas_resize(ib->e, ib->obj.line_r, ib->geom.w, ib->geom.line_h); - evas_resize(ib->e, ib->obj.clip, ib->geom.w, ib->geom.h); - - - evas_set_image_fill(ib->e, ib->obj.line_l, 0, 0, ib->geom.line_w, ib->geom.line_h); - evas_set_image_fill(ib->e, ib->obj.line_c, 0, 0, ib->geom.line_w, ib->geom.line_h); - evas_set_image_fill(ib->e, ib->obj.line_r, 0, 0, ib->geom.line_w, ib->geom.line_h); - - - evas_move(ib->e, ib->obj.scroll, ib->geom.left, ib->geom.top + ib->geom.h - ib->geom.scroll_w); - evas_move(ib->e, ib->obj.line_l, ib->geom.left, ib->geom.top); - evas_move(ib->e, ib->obj.line_c, ib->geom.left, ib->geom.top + ib->geom.h - ib->geom.scroll_w); - evas_move(ib->e, ib->obj.line_r, ib->geom.left, ib->geom.top + ib->geom.h); - evas_move(ib->e, ib->obj.title, ib->geom.left - ib->geom.title_w - 5, ib->geom.top + (ib->geom.h - ib->geom.title_h) / 2); - evas_move(ib->e, ib->obj.clip, ib->geom.left, ib->geom.top); - - evas_set_color(ib->e, ib->obj.scroll, 129, 129, 129, 0); - evas_set_color(ib->e, ib->obj.clip, 255, 255, 255, 255); - } - - /* vertical */ - if (!ib->geom.horizontal) - { - ib->obj.scroll = evas_add_rectangle(ib->e); - ib->obj.line_l = evas_add_image_from_file(ib->e, ib->image.vline); - ib->obj.line_c = evas_add_image_from_file(ib->e, ib->image.vline); - ib->obj.line_r = evas_add_image_from_file(ib->e, ib->image.vline); - ib->obj.title = evas_add_image_from_file(ib->e, ib->image.title); - ib->obj.clip = evas_add_rectangle(ib->e); - - evas_get_image_size(ib->e, ib->obj.title, &ib->geom.title_w, &ib->geom.title_h); - evas_get_image_size(ib->e, ib->obj.line_l, &ib->geom.line_w, &ib->geom.line_h); - - evas_set_layer(ib->e, ib->obj.scroll, 400); - - evas_resize(ib->e, ib->obj.scroll, ib->geom.scroll_w, ib->geom.h); - evas_resize(ib->e, ib->obj.line_l, ib->geom.line_w, ib->geom.h); - evas_resize(ib->e, ib->obj.line_c, ib->geom.line_w, ib->geom.h); - evas_resize(ib->e, ib->obj.line_r, ib->geom.line_w, ib->geom.h); - evas_resize(ib->e, ib->obj.clip, ib->geom.w, ib->geom.h); - - - evas_set_image_fill(ib->e, ib->obj.line_l, 0, 0, ib->geom.line_w, ib->geom.line_h); - evas_set_image_fill(ib->e, ib->obj.line_c, 0, 0, ib->geom.line_w, ib->geom.line_h); - evas_set_image_fill(ib->e, ib->obj.line_r, 0, 0, ib->geom.line_w, ib->geom.line_h); - - - evas_move(ib->e, ib->obj.scroll, ib->geom.left + ib->geom.w - ib->geom.scroll_w, ib->geom.top); - evas_move(ib->e, ib->obj.line_l, ib->geom.left, ib->geom.top); - evas_move(ib->e, ib->obj.line_c, ib->geom.left + ib->geom.w - ib->geom.scroll_w, ib->geom.top); - evas_move(ib->e, ib->obj.line_r, ib->geom.left + ib->geom.w, ib->geom.top); - evas_move(ib->e, ib->obj.title, ib->geom.left + ((ib->geom.w - ib->geom.title_w - ib->geom.scroll_w) / 2 ), ib->geom.top - ib->geom.title_h - 5); - evas_move(ib->e, ib->obj.clip, ib->geom.left, ib->geom.top); - - evas_set_color(ib->e, ib->obj.scroll, 129, 129, 129, 0); - evas_set_color(ib->e, ib->obj.clip, 255, 255, 255, 255); - } - - - /* Clip icons */ - { - Evas_List l; - for (l = ib->icons; l; l = l->next) - { - E_IB_Icon *i; - i = l->data; - evas_set_clip(ib->e, i->image, ib->obj.clip); - } - } - - /* show the iconbar */ - evas_show(ib->e, ib->obj.scroll); - evas_show(ib->e, ib->obj.line_l); - evas_show(ib->e, ib->obj.line_c); - evas_show(ib->e, ib->obj.line_r); - evas_show(ib->e, ib->obj.title); - evas_show(ib->e, ib->obj.clip); - - evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_MOVE, s_mouse_move, ib); - evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_IN, s_mouse_in, ib); - evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_OUT, s_mouse_out, ib); - - e_ib_fix_icons(ib); - - - printf("realized!\n"); + printf("realized!\n"); } -E_IB_Icon * -e_ib_new_icon(E_Iconbar *ib, char *image, char *exec) +E_Iconbar_Icon * +e_iconbar_new_icon(E_Iconbar *ib, char *image, char *exec) { - E_IB_Icon *i; - -// printf("before addimage\n"); - i = NEW(E_IB_Icon, 1); - i->image = evas_add_image_from_file(ib->e, image); - i->exec = strdup(exec); - evas_get_image_size(ib->e, i->image, &(i->w), &(i->h)); - - if (ib->geom.horizontal) - { - i->x = 0; - i->y = (ib->geom.h - i->h - ib->geom.scroll_w) / 2 + ib->geom.top; - } - - else - { - i->x = (ib->geom.w - i->w - ib->geom.scroll_w) / 2 + ib->geom.left; - i->y = 0; - } - - printf("x: %f, y: %f\n", i->x, i->y); - evas_callback_add(ib->e, i->image, CALLBACK_MOUSE_IN, i_mouse_in, NULL); - evas_callback_add(ib->e, i->image, CALLBACK_MOUSE_OUT, i_mouse_out, NULL); - evas_callback_add(ib->e, i->image, CALLBACK_MOUSE_DOWN, i_mouse_down, i->exec); - - evas_set_color(ib->e, i->image, 255, 255, 255, 128); - evas_set_layer(ib->e, i->image, 400); - //evas_set_clip(ib->e, i->image, ib->obj.clip); - //printf("before ib->icons set\n"); - ib->icons = evas_list_append(ib->icons, i); - //printf("after set\n"); - - return i; + E_Iconbar_Icon *i; + + i = NEW(E_Iconbar_Icon, 1); + i->image = evas_add_image_from_file(ib->e, image); + i->exec = strdup(exec); + evas_get_image_size(ib->e, i->image, &(i->w), &(i->h)); + + if (ib->geom.horizontal) + { + i->x = 0; + i->y = (ib->geom.h - i->h - ib->geom.scroll_w) / 2 + ib->geom.top; + } + else + { + i->x = (ib->geom.w - i->w - ib->geom.scroll_w) / 2 + ib->geom.left; + i->y = 0; + } + + printf("x: %f, y: %f\n", i->x, i->y); + evas_callback_add(ib->e, i->image, CALLBACK_MOUSE_IN, i_mouse_in, NULL); + evas_callback_add(ib->e, i->image, CALLBACK_MOUSE_OUT, i_mouse_out, NULL); + evas_callback_add(ib->e, i->image, CALLBACK_MOUSE_DOWN, i_mouse_down, i->exec); + + evas_set_color(ib->e, i->image, 255, 255, 255, 128); + evas_set_layer(ib->e, i->image, 400); + /* evas_set_clip(ib->e, i->image, ib->obj.clip); */ + /* printf("before ib->icons set\n"); */ + ib->icons = evas_list_append(ib->icons, i); + /* printf("after set\n"); */ + + return i; } int -e_ib_config(E_Iconbar *ib) +e_iconbar_config(E_Iconbar *ib) { - E_DB_File *db; - char buf[4096], *userdir; - -// userdir = e_config_user_dir(); -// sprintf(buf, "%sbehavior/iconbar.db", userdir); - sprintf(buf, "%s/.e_iconbar.db", ib->v->dir); - ib->db = strdup(buf); - db = e_db_open_read(ib->db); - - if(!db) - { -/*// ib->no_show = 1; - - db = e_db_open(ib->db); - e_db_int_set(db, "/ib/num", 0); - e_db_int_set(db, "/ib/geom/w", 75); - e_db_int_set(db, "/ib/geom/h", 620); - e_db_int_set(db, "/ib/geom/top", 165); - e_db_int_set(db, "/ib/geom/left", -150); - e_db_int_set(db, "/ib/geom/scroll_w", 16); - e_db_int_set(db, "/ib/geom/horizontal", 0); - e_db_int_set(db, "/ib/scroll_when_less", 0); - e_db_str_set(db, "/ib/image/title", "/usr/local/share/enlightenment/data/ib_title.png"); - e_db_str_set(db, "/ib/image/vline", "/usr/local/share/enlightenment/data/vline.png"); - e_db_str_set(db, "/ib/image/hline", "/usr/local/share/enlightenment/data/hline.png"); -*/ - return 0; - } - - e_db_int_get(db, "/ib/geom/w", &(ib->geom.conf.w) ); - e_db_int_get(db, "/ib/geom/h", &(ib->geom.conf.h)); - e_db_int_get(db, "/ib/geom/top", &(ib->geom.conf.top)); - e_db_int_get(db, "/ib/geom/left", &(ib->geom.conf.left)); - e_db_int_get(db, "/ib/geom/scroll_w", &(ib->geom.scroll_w)); - e_db_int_get(db, "/ib/geom/horizontal", &(ib->geom.horizontal)); - e_db_int_get(db, "/ib/scroll_when_less", &(ib->scroll_when_less)); - ib->image.title = e_db_str_get(db, "/ib/image/title"); - ib->image.vline = e_db_str_get(db, "/ib/image/vline"); - ib->image.hline = e_db_str_get(db, "/ib/image/hline"); - - ib->start = 0.0; - ib->icons = NULL; - - - ib->geom.left = ib->geom.conf.left; - ib->geom.top = ib->geom.conf.top; - ib->geom.w = ib->geom.conf.w; - ib->geom.h = ib->geom.conf.h; - - /* - { - double w, h; - evas_get_viewport(ib->e, NULL, NULL, &w, &h); - - if(ib->geom.conf.left < 0) - ib->geom.left = ib->geom.conf.left + w; - else - ib->geom.left = ib->geom.conf.left; - if(ib->geom.conf.top < 0) - ib->geom.top = ib->geom.conf.top + h; - else - ib->geom.top = ib->geom.conf.top; - } - - */ - printf("w: %i, h: %i\nt: %i, l: %i\n", ib->geom.w, ib->geom.h, ib->geom.top, ib->geom.left); - - - { - int i, num; - - if (e_db_int_get(db, "/ib/num", &num)) - { - printf("making %i icons...\n", num); + E_DB_File *db; + char buf[4096], *userdir; + + /* userdir = e_config_user_dir(); */ + /* sprintf(buf, "%sbehavior/iconbar.db", userdir); */ + sprintf(buf, "%s/.e_iconbar.db", ib->v->dir); + ib->db = strdup(buf); + db = e_db_open_read(ib->db); + + if (!db) + { + /* ib->no_show = 1; - for ( i = 0; i < num; i++) - { - char *icon, *exec, buf[4096]; - - sprintf(buf, "/ib/%i/icon", i); - //printf("reading #%i's icon...\n", i); - icon = e_db_str_get(db, buf); - //printf("icon: %s, reading #%i's exec...\n", icon, i); - sprintf(buf, "/ib/%i/exec", i); - exec = e_db_str_get(db, buf); - printf("exec: %s... creating icon\n", exec, i); - - //printf("creating icon, %s, %s\n", icon, exec); - e_ib_new_icon(ib, icon, exec); - printf("created...\n", i); - } - } - } - //printf("created icon.\n"); + db = e_db_open(ib->db); + e_db_int_set(db, "/ib/num", 0); + e_db_int_set(db, "/ib/geom/w", 75); + e_db_int_set(db, "/ib/geom/h", 620); + e_db_int_set(db, "/ib/geom/top", 165); + e_db_int_set(db, "/ib/geom/left", -150); + e_db_int_set(db, "/ib/geom/scroll_w", 16); + e_db_int_set(db, "/ib/geom/horizontal", 0); + e_db_int_set(db, "/ib/scroll_when_less", 0); + e_db_str_set(db, "/ib/image/title", "/usr/local/share/enlightenment/data/ib_title.png"); + e_db_str_set(db, "/ib/image/vline", "/usr/local/share/enlightenment/data/vline.png"); + e_db_str_set(db, "/ib/image/hline", "/usr/local/share/enlightenment/data/hline.png"); + */ + return 0; + } + + e_db_int_get(db, "/ib/geom/w", &(ib->geom.conf.w) ); + e_db_int_get(db, "/ib/geom/h", &(ib->geom.conf.h)); + e_db_int_get(db, "/ib/geom/top", &(ib->geom.conf.top)); + e_db_int_get(db, "/ib/geom/left", &(ib->geom.conf.left)); + e_db_int_get(db, "/ib/geom/scroll_w", &(ib->geom.scroll_w)); + e_db_int_get(db, "/ib/geom/horizontal", &(ib->geom.horizontal)); + e_db_int_get(db, "/ib/scroll_when_less", &(ib->scroll_when_less)); + ib->image.title = e_db_str_get(db, "/ib/image/title"); + ib->image.vline = e_db_str_get(db, "/ib/image/vline"); + ib->image.hline = e_db_str_get(db, "/ib/image/hline"); + + ib->start = 0.0; + ib->icons = NULL; + + ib->geom.left = ib->geom.conf.left; + ib->geom.top = ib->geom.conf.top; + ib->geom.w = ib->geom.conf.w; + ib->geom.h = ib->geom.conf.h; + + /* + { + double w, h; + evas_get_viewport(ib->e, NULL, NULL, &w, &h); + + if(ib->geom.conf.left < 0) + ib->geom.left = ib->geom.conf.left + w; + else + ib->geom.left = ib->geom.conf.left; + if(ib->geom.conf.top < 0) + ib->geom.top = ib->geom.conf.top + h; + else + ib->geom.top = ib->geom.conf.top; + } + */ + printf("w: %i, h: %i\nt: %i, l: %i\n", ib->geom.w, ib->geom.h, ib->geom.top, ib->geom.left); + + + { + int i, num; + + if (e_db_int_get(db, "/ib/num", &num)) + { + printf("making %i icons...\n", num); - e_db_close(db); - - return 1; - + for ( i = 0; i < num; i++) + { + char *icon, *exec, buf[4096]; + + sprintf(buf, "/ib/%i/icon", i); + /* printf("reading #%i's icon...\n", i); */ + icon = e_db_str_get(db, buf); + /* printf("icon: %s, reading #%i's exec...\n", icon, i); */ + sprintf(buf, "/ib/%i/exec", i); + exec = e_db_str_get(db, buf); + printf("exec: %s... creating icon\n", exec); + + /* printf("creating icon, %s, %s\n", icon, exec); */ + e_iconbar_new_icon(ib, icon, exec); + printf("created...\n"); + } + } + } + /* printf("created icon.\n"); */ + + e_db_close(db); + + return 1; } void -e_ib_fix_icons(E_Iconbar *ib) +e_iconbar_fix_icons(E_Iconbar *ib) { - Evas_List l; - double cur, spacer; - - spacer = 20.0; - - if (!ib->geom.horizontal) + Evas_List l; + double cur, spacer; + + spacer = 20.0; + + if (!ib->geom.horizontal) + { + cur = ib->geom.top + ib->start + spacer; + for (l = ib->icons; l; l = l->next) { - cur = ib->geom.top + ib->start + spacer; - for (l = ib->icons; l; l = l->next) - { - E_IB_Icon *i; - - i = l->data; - i->y = cur; - i->x = (ib->geom.w - i->w - ib->geom.scroll_w) / 2 + ib->geom.left; - cur = cur + i->h + spacer; - - evas_move(ib->e, i->image, i->x, i->y); - evas_show(ib->e, i->image); - } - - ib->length = cur - ib->start - ib->geom.top; + E_Iconbar_Icon *i; + + i = l->data; + i->y = cur; + i->x = (ib->geom.w - i->w - ib->geom.scroll_w) / 2 + ib->geom.left; + cur = cur + i->h + spacer; + + evas_move(ib->e, i->image, i->x, i->y); + evas_show(ib->e, i->image); } - - else + + ib->length = cur - ib->start - ib->geom.top; + } + else + { + cur = ib->geom.left + ib->start + spacer; + for (l = ib->icons; l; l = l->next) { - cur = ib->geom.left + ib->start + spacer; - for (l = ib->icons; l; l = l->next) - { - E_IB_Icon *i; - - i = l->data; - i->x = cur; - i->y = (ib->geom.h - i->h - ib->geom.scroll_w) / 2 + ib->geom.top; - cur = cur + i->w + spacer; - - evas_move(ib->e, i->image, i->x, i->y); - evas_show(ib->e, i->image); - } - - ib->length = cur - ib->start - ib->geom.left; + E_Iconbar_Icon *i; + + i = l->data; + i->x = cur; + i->y = (ib->geom.h - i->h - ib->geom.scroll_w) / 2 + ib->geom.top; + cur = cur + i->w + spacer; + + evas_move(ib->e, i->image, i->x, i->y); + evas_show(ib->e, i->image); } + + ib->length = cur - ib->start - ib->geom.left; + } } void -e_ib_scroll(int val, void *data) +e_iconbar_scroll(int val, void *data) { - E_Iconbar *ib; - double vis_length; - - //printf("before scroll data to ib set\n"); - ib = data; - //printf("after data set\n"); - //printf("start: %f, speed: %f\n", ib->start, ib->speed); - ib->start = ib->start - ib->speed; - if (ib->geom.horizontal) vis_length = ib->geom.w; - else vis_length = ib->geom.h; - - if (ib->length > vis_length) - { - if (ib->start > 0) - ib->start = 0; - else if (ib->start < vis_length - ib->length) - ib->start = vis_length - ib->length; - } - - else if (ib->scroll_when_less) - { -/* icons scroll even if they don't fill the bar */ - if (ib->start < 0) - ib->start = 0; - else if (ib->start > vis_length - ib->length) - ib->start = vis_length - ib->length; - - } - - else - { - ib->start = 0; - } - //printf("before fix\n"); - e_ib_fix_icons(ib); - //printf("after fix\n"); - - if (ib->scrolling) - { - //printf("before timer\n"); - e_add_event_timer("e_ib_scroll()", 0.01, e_ib_scroll, 1, ib); - //printf("after timer\n"); - } - + E_Iconbar *ib; + double vis_length; + + /* printf("before scroll data to ib set\n"); */ + ib = data; + /* printf("after data set\n"); */ + /* printf("start: %f, speed: %f\n", ib->start, ib->speed); */ + ib->start = ib->start - ib->speed; + if (ib->geom.horizontal) vis_length = ib->geom.w; + else vis_length = ib->geom.h; + + if (ib->length > vis_length) + { + if (ib->start > 0) + ib->start = 0; + else if (ib->start < vis_length - ib->length) + ib->start = vis_length - ib->length; + } + else if (ib->scroll_when_less) + { + /* icons scroll even if they don't fill the bar */ + if (ib->start < 0) + ib->start = 0; + else if (ib->start > vis_length - ib->length) + ib->start = vis_length - ib->length; + + } + else + { + ib->start = 0; + } + /* printf("before fix\n"); */ + e_iconbar_fix_icons(ib); + /* printf("after fix\n"); */ + + if (ib->scrolling) + { + /* printf("before timer\n"); */ + ecore_add_event_timer("e_iconbar_scroll()", 0.01, e_iconbar_scroll, 1, ib); + /* printf("after timer\n"); */ + } } void i_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { - evas_set_color(_e, _o, 255, 255, 255, 255); + evas_set_color(_e, _o, 255, 255, 255, 255); } void i_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { - evas_set_color(_e, _o, 255, 255, 255, 128); + evas_set_color(_e, _o, 255, 255, 255, 128); } void i_mouse_down(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { - char *file = _data; - e_exec_run(file); + char *file = _data; + e_exec_run(file); } void s_mouse_move(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { - E_Iconbar *ib; - - double center; - int top_speed; - double r; - - //printf("set ib in s_mouse_move\n"); + E_Iconbar *ib; + + double center; + int top_speed; + double r; + + /* printf("set ib in s_mouse_move\n"); */ - ib = _data; - - top_speed = 5; - - if (ib->geom.horizontal) - { - center = ib->geom.left + (.5 * ib->geom.w); - r = (_x - center) / (.5 * ib->geom.w); - } - - else - { - center = ib->geom.top + (.5 * ib->geom.h); - r = (_y - center) / (.5 * ib->geom.h); - } - - ib->speed = r * (double)top_speed; - - e_ib_scroll(1, ib); + ib = _data; + + top_speed = 5; + + if (ib->geom.horizontal) + { + center = ib->geom.left + (.5 * ib->geom.w); + r = (_x - center) / (.5 * ib->geom.w); + } + else + { + center = ib->geom.top + (.5 * ib->geom.h); + r = (_y - center) / (.5 * ib->geom.h); + } + + ib->speed = r * (double)top_speed; + + e_iconbar_scroll(1, ib); } void s_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { - E_Iconbar *ib; - ib = _data; - //printf("setting scrolling\n"); - ib->scrolling = 1; - //printf("set scrolling\n"); + E_Iconbar *ib; + ib = _data; + /* printf("setting scrolling\n"); */ + ib->scrolling = 1; + /* printf("set scrolling\n"); */ } void s_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { - E_Iconbar *ib; - ib = _data; - ib->scrolling = 0; + E_Iconbar *ib; + ib = _data; + ib->scrolling = 0; } void -e_ib_free(E_Iconbar *ib) +e_iconbar_free(E_Iconbar *ib) { - - Evas_List l; - - printf("in e_ib_clean_up()\n"); - - iconbars = evas_list_remove(iconbars, ib); - - for (l = ib->icons; l; l = l->next) - { - E_IB_Icon *i; - i = l->data; - FREE(i); - } - FREE(ib->icons); - FREE(ib); - e_db_runtime_flush(); - - printf("e_ib_clean_up() run successfully\n"); - - + + Evas_List l; + + printf("in e_iconbar_clean_up()\n"); + + iconbars = evas_list_remove(iconbars, ib); + + for (l = ib->icons; l; l = l->next) + { + E_Iconbar_Icon *i; + i = l->data; + FREE(i); + } + FREE(ib->icons); + FREE(ib); + e_db_runtime_flush(); + + printf("e_iconbar_clean_up() run successfully\n"); } - - static void -e_ib_idle(void *data) +e_iconbar_idle(void *data) { - Evas_List l; - - for (l = iconbars; l; l = l->next) - { - E_Iconbar *ib; - - ib = l->data; - e_ib_update(ib); - //e_ib_redraw(ib); - } + Evas_List l; + + for (l = iconbars; l; l = l->next) + { + E_Iconbar *ib; + + ib = l->data; + e_iconbar_update(ib); + /* e_iconbar_redraw(ib); */ + } } void -e_ib_update(E_Iconbar *ib) +e_iconbar_update(E_Iconbar *ib) { - if (ib->v->changed) - { - e_ib_redraw(ib); - } + if (ib->v->changed) + { + e_iconbar_redraw(ib); + } } void -e_ib_redraw(E_Iconbar *ib) +e_iconbar_redraw(E_Iconbar *ib) { - if(ib->geom.conf.left < 0) - ib->geom.left = ib->geom.conf.left + ib->v->size.w; - if(ib->geom.conf.top < 0) - ib->geom.top = ib->geom.conf.top + ib->v->size.h; - if(ib->geom.conf.w == 0) - ib->geom.w = ib->v->size.w; - if(ib->geom.conf.h == 0) - ib->geom.h = ib->v->size.h; - - - - /* horizontal */ - if (ib->geom.horizontal) - { - evas_move(ib->e, ib->obj.scroll, ib->geom.left, ib->geom.top + ib->geom.h - ib->geom.scroll_w); - evas_move(ib->e, ib->obj.line_l, ib->geom.left, ib->geom.top); - evas_move(ib->e, ib->obj.line_c, ib->geom.left, ib->geom.top + ib->geom.h - ib->geom.scroll_w); - evas_move(ib->e, ib->obj.line_r, ib->geom.left, ib->geom.top + ib->geom.h); - evas_move(ib->e, ib->obj.title, ib->geom.left - ib->geom.title_w - 5, ib->geom.top + (ib->geom.h - ib->geom.title_h) / 2); - evas_move(ib->e, ib->obj.clip, ib->geom.left, ib->geom.top); - } - - /* vertical */ - if (!ib->geom.horizontal) - { - evas_move(ib->e, ib->obj.scroll, ib->geom.left + ib->geom.w - ib->geom.scroll_w, ib->geom.top); - evas_move(ib->e, ib->obj.line_l, ib->geom.left, ib->geom.top); - evas_move(ib->e, ib->obj.line_c, ib->geom.left + ib->geom.w - ib->geom.scroll_w, ib->geom.top); - evas_move(ib->e, ib->obj.line_r, ib->geom.left + ib->geom.w, ib->geom.top); - evas_move(ib->e, ib->obj.title, ib->geom.left + ((ib->geom.w - ib->geom.title_w - ib->geom.scroll_w) / 2 ), ib->geom.top - ib->geom.title_h - 5); - evas_move(ib->e, ib->obj.clip, ib->geom.left, ib->geom.top); - } - - - /* Clip icons */ - { - Evas_List l; - for (l = ib->icons; l; l = l->next) - { - E_IB_Icon *i; - i = l->data; - evas_set_clip(ib->e, i->image, ib->obj.clip); - } - } - - /* show the iconbar */ - evas_show(ib->e, ib->obj.scroll); - evas_show(ib->e, ib->obj.line_l); - evas_show(ib->e, ib->obj.line_c); - evas_show(ib->e, ib->obj.line_r); - evas_show(ib->e, ib->obj.title); - evas_show(ib->e, ib->obj.clip); - - evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_MOVE, s_mouse_move, ib); - evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_IN, s_mouse_in, ib); - evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_OUT, s_mouse_out, ib); - - e_ib_fix_icons(ib); + if(ib->geom.conf.left < 0) + ib->geom.left = ib->geom.conf.left + ib->v->size.w; + if(ib->geom.conf.top < 0) + ib->geom.top = ib->geom.conf.top + ib->v->size.h; + if(ib->geom.conf.w == 0) + ib->geom.w = ib->v->size.w; + if(ib->geom.conf.h == 0) + ib->geom.h = ib->v->size.h; + + + /* horizontal */ + if (ib->geom.horizontal) + { + evas_move(ib->e, ib->obj.scroll, ib->geom.left, ib->geom.top + ib->geom.h - ib->geom.scroll_w); + evas_move(ib->e, ib->obj.line_l, ib->geom.left, ib->geom.top); + evas_move(ib->e, ib->obj.line_c, ib->geom.left, ib->geom.top + ib->geom.h - ib->geom.scroll_w); + evas_move(ib->e, ib->obj.line_r, ib->geom.left, ib->geom.top + ib->geom.h); + evas_move(ib->e, ib->obj.title, ib->geom.left - ib->geom.title_w - 5, ib->geom.top + (ib->geom.h - ib->geom.title_h) / 2); + evas_move(ib->e, ib->obj.clip, ib->geom.left, ib->geom.top); + } + + /* vertical */ + if (!ib->geom.horizontal) + { + evas_move(ib->e, ib->obj.scroll, ib->geom.left + ib->geom.w - ib->geom.scroll_w, ib->geom.top); + evas_move(ib->e, ib->obj.line_l, ib->geom.left, ib->geom.top); + evas_move(ib->e, ib->obj.line_c, ib->geom.left + ib->geom.w - ib->geom.scroll_w, ib->geom.top); + evas_move(ib->e, ib->obj.line_r, ib->geom.left + ib->geom.w, ib->geom.top); + evas_move(ib->e, ib->obj.title, ib->geom.left + ((ib->geom.w - ib->geom.title_w - ib->geom.scroll_w) / 2 ), ib->geom.top - ib->geom.title_h - 5); + evas_move(ib->e, ib->obj.clip, ib->geom.left, ib->geom.top); + } + + + /* Clip icons */ + { + Evas_List l; + for (l = ib->icons; l; l = l->next) + { + E_Iconbar_Icon *i; + i = l->data; + evas_set_clip(ib->e, i->image, ib->obj.clip); + } + } + + /* show the iconbar */ + evas_show(ib->e, ib->obj.scroll); + evas_show(ib->e, ib->obj.line_l); + evas_show(ib->e, ib->obj.line_c); + evas_show(ib->e, ib->obj.line_r); + evas_show(ib->e, ib->obj.title); + evas_show(ib->e, ib->obj.clip); + + evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_MOVE, s_mouse_move, ib); + evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_IN, s_mouse_in, ib); + evas_callback_add(ib->e, ib->obj.scroll, CALLBACK_MOUSE_OUT, s_mouse_out, ib); + + e_iconbar_fix_icons(ib); } void e_iconbar_init() { - e_event_filter_idle_handler_add(e_ib_idle, NULL); + ecore_event_filter_idle_handler_add(e_iconbar_idle, NULL); } diff --git a/src/iconbar.h b/src/iconbar.h index 49053c3ab..f5482d3d0 100644 --- a/src/iconbar.h +++ b/src/iconbar.h @@ -8,9 +8,8 @@ #define SCROLL_W 16 #define SCREEN_W 1280 -// structs -typedef struct _ib_icon E_IB_Icon; +typedef struct _iconbar_icon E_Iconbar_Icon; #ifndef E_ICONBAR_TYPEDEF #define E_ICONBAR_TYPEDEF @@ -23,88 +22,82 @@ typedef struct _E_View E_View; #endif -struct _ib_icon +struct _iconbar_icon { - OBJ_PROPERTIES; - - Evas_Object image; - char *exec; - int w, h; - double x, y; - - int selected; + OBJ_PROPERTIES; + + Evas_Object image; + char *exec; + int w, h; + double x, y; + + int selected; }; struct _E_Iconbar { - OBJ_PROPERTIES; - - char *name; - E_View *v; - Evas e; - Evas_List icons; - char *db; -// E_DB_File *db; - - struct { - Evas_Object clip; - Evas_Object scroll; - Evas_Object line_l; - Evas_Object line_c; - Evas_Object line_r; - Evas_Object title; - } obj; - - struct { - char *title; - char *vline; - char *hline; - } image; - - - double start, speed, length; - - int scrolling, scroll_when_less; - - struct { - int w; - int h; - int top; - int left; - int scroll_w; - int title_w, title_h, line_w, line_h; - - int horizontal; // 1 - horiz, 0 - vert - - struct { - int top; - int left; - int h; - int w; - } conf; - } geom; - - + OBJ_PROPERTIES; + + char *name; + E_View *v; + Evas e; + Evas_List icons; + char *db; + + struct { + Evas_Object clip; + Evas_Object scroll; + Evas_Object line_l; + Evas_Object line_c; + Evas_Object line_r; + Evas_Object title; + } obj; + + struct { + char *title; + char *vline; + char *hline; + } image; + + + double start, speed, length; + + int scrolling, scroll_when_less; + + struct { + int w; + int h; + int top; + int left; + int scroll_w; + int title_w, title_h, line_w, line_h; + + int horizontal; /* 1 - horiz, 0 - vert */ + + struct { + int top; + int left; + int h; + int w; + } conf; + } geom; }; -// functions -//static void e_idle(void *); -E_Iconbar *e_ib_new(E_View *); -int e_ib_config(E_Iconbar *); -void e_ib_realize(E_Iconbar *); -void e_ib_redraw(E_Iconbar *); -E_IB_Icon *e_ib_new_icon(E_Iconbar *, char *, char *); -void e_ib_fix_icons(E_Iconbar *); -void e_ib_create_icons_from_db(E_Iconbar *); -void e_ib_free(E_Iconbar *); -void e_ib_update(E_Iconbar *); -//void ib_set_scroll_when_less(int); +void e_iconbar_init(void); +E_Iconbar *e_iconbar_new(E_View *); +int e_iconbar_config(E_Iconbar *); +void e_iconbar_realize(E_Iconbar *); +void e_iconbar_redraw(E_Iconbar *); +E_Iconbar_Icon *e_iconbar_new_icon(E_Iconbar *, char *, char *); +void e_iconbar_fix_icons(E_Iconbar *); +void e_iconbar_create_icons_from_db(E_Iconbar *); +void e_iconbar_free(E_Iconbar *); +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_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 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_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); diff --git a/src/keys.c b/src/keys.c index 2c42d8781..e3bf8884a 100644 --- a/src/keys.c +++ b/src/keys.c @@ -1,16 +1,16 @@ #include "keys.h" #include "actions.h" -static void e_key_down(Eevent * ev); -static void e_key_up(Eevent * ev); +static void ecore_key_down(Ecore_Event * ev); +static void ecore_key_up(Ecore_Event * ev); 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; - 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, NULL, NULL, 0, 0, 0, 0); @@ -20,12 +20,12 @@ e_key_down(Eevent * ev) } 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; - 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, NULL, NULL, 0, 0, 0, 0); @@ -35,23 +35,23 @@ e_key_up(Eevent * ev) } void -e_keys_init(void) +ecore_keys_init(void) { /* 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); - e_event_filter_handler_add(EV_KEY_DOWN, e_key_down); - e_event_filter_handler_add(EV_KEY_UP, e_key_up); + ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, ecore_key_down); + ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP, ecore_key_up); } 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 -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); } diff --git a/src/keys.h b/src/keys.h index f96bf7c47..2597c8d84 100644 --- a/src/keys.h +++ b/src/keys.h @@ -3,8 +3,8 @@ #include "e.h" -void e_keys_init(void); -void e_keys_grab(char *key, Ev_Key_Modifiers mods, int anymod); -void e_keys_ungrab(char *key, Ev_Key_Modifiers mods, int anymod); +void ecore_keys_init(void); +void ecore_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod); +void ecore_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod); #endif diff --git a/src/main.c b/src/main.c index 769bf4985..0bd4cb13d 100644 --- a/src/main.c +++ b/src/main.c @@ -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) { @@ -49,10 +50,10 @@ void setup(void); void setup(void) { - e_grab(); - e_sync(); + ecore_grab(); + ecore_sync(); e_border_adopt_children(0); - e_ungrab(); + ecore_ungrab(); } 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, "Exiting Enlightenment. Error.\n"); exit(-1); } - e_ev_signal_init(); - e_event_filter_init(); - e_ev_x_init(); + ecore_event_signal_init(); + ecore_event_filter_init(); + ecore_event_x_init(); /* become a wm */ - e_grab(); - e_sync(); - e_set_error_handler(wm_running_error); - e_window_set_events(0, XEV_CHILD_REDIRECT | XEV_PROPERTY | XEV_COLORMAP); - e_sync(); - e_reset_error_handler(); - e_ungrab(); + ecore_grab(); + ecore_sync(); + ecore_set_error_handler(wm_running_error); + ecore_window_set_events(0, XEV_CHILD_REDIRECT | XEV_PROPERTY | XEV_COLORMAP); + ecore_sync(); + ecore_reset_error_handler(); + ecore_ungrab(); e_fs_init(); e_desktops_init(); @@ -124,7 +125,7 @@ main(int argc, char **argv) e_menu_init(); e_view_init(); e_entry_init(); - e_keys_init(); + ecore_keys_init(); e_guides_init(); e_place_init(); e_cursors_init(); @@ -138,7 +139,7 @@ main(int argc, char **argv) setup(); - e_event_loop(); + ecore_event_loop(); #ifdef USE_FERITE e_ferite_deinit(); diff --git a/src/match.c b/src/match.c index dd75956b5..8a35e266a 100644 --- a/src/match.c +++ b/src/match.c @@ -23,7 +23,7 @@ e_match_set_props(E_Border *b) /* if we have a match specifying a size */ b->current.requested.w = match_w; 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 */ b->client.desk = match_desk; e_border_raise(b); diff --git a/src/menu.c b/src/menu.c index 301d01481..f97210ce4 100644 --- a/src/menu.c +++ b/src/menu.c @@ -8,16 +8,16 @@ static int screen_w, screen_h; static int mouse_x, mouse_y; static int keyboard_nav = 0; -static void e_idle(void *data); -static void e_wheel(Eevent * ev); -static void e_key_down(Eevent * ev); -static void e_key_up(Eevent * ev); -static void e_mouse_down(Eevent * ev); -static void e_mouse_up(Eevent * ev); -static void e_mouse_move(Eevent * ev); -static void e_mouse_in(Eevent * ev); -static void e_mouse_out(Eevent * ev); -static void e_window_expose(Eevent * ev); +static void ecore_idle(void *data); +static void e_wheel(Ecore_Event * ev); +static void ecore_key_down(Ecore_Event * ev); +static void ecore_key_up(Ecore_Event * ev); +static void e_mouse_down(Ecore_Event * ev); +static void e_mouse_up(Ecore_Event * ev); +static void e_mouse_move(Ecore_Event * ev); +static void e_mouse_in(Ecore_Event * ev); +static void e_mouse_out(Ecore_Event * ev); +static void ecore_window_expose(Ecore_Event * ev); static void 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_scroll_speed, scroll_speed); - t = e_get_time(); + t = ecore_get_time(); if (val != 0) scroll_speed = (int)(((t - last_time) / 0.02) * (double)scroll_speed); last_time = t; @@ -119,13 +119,13 @@ e_scroller_timer(int val, void *data) } } 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; UN(data); } static void -e_idle(void *data) +ecore_idle(void *data) { Evas_List l; @@ -171,9 +171,9 @@ e_idle(void *data) } static void -e_wheel(Eevent * ev) +e_wheel(Ecore_Event * ev) { - Ev_Wheel *e; + Ecore_Event_Wheel *e; e = ev->event; if (e->win == menu_event_win) @@ -182,9 +182,9 @@ e_wheel(Eevent * ev) } static void -e_key_down(Eevent * ev) +ecore_key_down(Ecore_Event * ev) { - Ev_Key_Down *e; + Ecore_Event_Key_Down *e; int ok; e = ev->event; @@ -276,9 +276,9 @@ e_key_down(Eevent * ev) } 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; { @@ -287,9 +287,9 @@ e_key_up(Eevent * ev) /* handling mouse down events */ 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; { @@ -298,9 +298,9 @@ e_mouse_down(Eevent * ev) /* handling mouse up events */ 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; keyboard_nav = 0; @@ -340,9 +340,9 @@ e_mouse_up(Eevent * ev) /* handling mouse move events */ 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; keyboard_nav = 0; @@ -384,9 +384,9 @@ e_mouse_move(Eevent * ev) /* handling mouse enter events */ 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; keyboard_nav = 0; @@ -397,9 +397,9 @@ e_mouse_in(Eevent * ev) /* handling mouse leave events */ 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; keyboard_nav = 0; @@ -425,9 +425,9 @@ e_mouse_out(Eevent * ev) /* handling expose events */ 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; { @@ -667,17 +667,17 @@ e_menu_select(int dx, int dy) void e_menu_init(void) { - e_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h); - e_event_filter_handler_add(EV_MOUSE_DOWN, e_mouse_down); - e_event_filter_handler_add(EV_MOUSE_UP, e_mouse_up); - e_event_filter_handler_add(EV_MOUSE_MOVE, e_mouse_move); - e_event_filter_handler_add(EV_MOUSE_IN, e_mouse_in); - e_event_filter_handler_add(EV_MOUSE_OUT, e_mouse_out); - e_event_filter_handler_add(EV_WINDOW_EXPOSE, e_window_expose); - e_event_filter_handler_add(EV_KEY_DOWN, e_key_down); - e_event_filter_handler_add(EV_KEY_UP, e_key_up); - e_event_filter_handler_add(EV_MOUSE_WHEEL, e_wheel); - e_event_filter_idle_handler_add(e_idle, NULL); + ecore_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN, e_mouse_down); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_UP, e_mouse_up); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE, e_mouse_move); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_IN, e_mouse_in); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT, e_mouse_out); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE, ecore_window_expose); + ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, ecore_key_down); + ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP, ecore_key_up); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_WHEEL, e_wheel); + ecore_event_filter_idle_handler_add(ecore_idle, NULL); } void @@ -686,14 +686,14 @@ e_menu_event_win_show(void) /* create it */ if (!menu_event_win) { - menu_event_win = e_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); - e_window_show(menu_event_win); - e_keyboard_grab(menu_event_win); - e_grab_mouse(menu_event_win, 1, 0); + menu_event_win = ecore_window_input_new(0, 0, 0, screen_w, screen_h); + ecore_window_set_events(menu_event_win, XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY); + ecore_window_show(menu_event_win); + ecore_keyboard_grab(menu_event_win); + ecore_grab_mouse(menu_event_win, 1, 0); } /* raise it */ - if (menu_event_win) e_window_raise(menu_event_win); + if (menu_event_win) ecore_window_raise(menu_event_win); } void @@ -702,8 +702,8 @@ e_menu_event_win_hide(void) /* destroy it */ if (menu_event_win) { - e_keyboard_ungrab(); - e_window_destroy(menu_event_win); + ecore_keyboard_ungrab(); + ecore_window_destroy(menu_event_win); menu_event_win = 0; } } @@ -885,7 +885,7 @@ e_menu_free(E_Menu *m) evas_list_free(m->entries); IF_FREE(m->bg_file); evas_free(m->evas); - e_window_destroy(m->win.main); + ecore_window_destroy(m->win.main); menus = evas_list_remove(menus, m); open_menus = evas_list_remove(open_menus, m); free(m); @@ -907,8 +907,8 @@ e_menu_new(void) OBJ_INIT(m, e_menu_free); - m->win.main = e_window_override_new(0, 0, 0, 1, 1); - m->evas = evas_new_all(e_display_get(), + m->win.main = ecore_window_override_new(0, 0, 0, 1, 1); + m->evas = evas_new_all(ecore_display_get(), m->win.main, 0, 0, 1, 1, RENDER_METHOD_ALPHA_SOFTWARE, @@ -933,9 +933,9 @@ e_menu_new(void) evas_event_move(m->evas, -999999999, -99999999); 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); - e_window_set_events(m->win.main, XEV_IN_OUT | XEV_KEY); - e_window_show(m->win.evas); + ecore_window_set_events(m->win.evas, XEV_EXPOSE | XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY); + ecore_window_set_events(m->win.main, XEV_IN_OUT | XEV_KEY); + ecore_window_show(m->win.evas); e_menu_set_background(m); @@ -1361,21 +1361,21 @@ e_menu_update_base(E_Menu *m) 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); } 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); } 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) { - 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_viewport(m->evas, 0, 0, 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) { - e_window_raise(m->win.main); + ecore_window_raise(m->win.main); e_menu_event_win_show(); - e_window_show(m->win.main); + ecore_window_show(m->win.main); if (!open_menus) keyboard_nav = 0; open_menus = evas_list_append(open_menus, m); } @@ -1438,7 +1438,7 @@ e_menu_update_hides(E_Menu *m) m->selected = NULL; } 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(); } } diff --git a/src/menubuild.c b/src/menubuild.c index 36e70d68d..09b9a56b4 100644 --- a/src/menubuild.c +++ b/src/menubuild.c @@ -96,7 +96,7 @@ e_build_menu_db_poll(int val, void *data) mod = e_file_modified_time(bm->file); 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; } bm->mod_time = mod; @@ -105,7 +105,7 @@ e_build_menu_db_poll(int val, void *data) e_build_menu_db_build(bm); 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; UN(val); } @@ -120,7 +120,7 @@ e_build_menu_gnome_apps_poll(int val, void *data) mod = e_file_modified_time(bm->file); 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; } 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); 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; UN(val); } @@ -399,7 +399,7 @@ e_build_menu_gnome_apps_build(E_Build_Menu *bm) void 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); IF_FREE(bm->file); build_menus = evas_list_remove(build_menus, bm); diff --git a/src/place.c b/src/place.c index 37a730f2f..681e596be 100644 --- a/src/place.c +++ b/src/place.c @@ -3,45 +3,45 @@ #include "actions.h" #include "guides.h" -static void e_mouse_down(Eevent * ev); -static void e_mouse_up(Eevent * ev); -static void e_mouse_move(Eevent * ev); +static void e_mouse_down(Ecore_Event * ev); +static void e_mouse_up(Ecore_Event * ev); +static void e_mouse_move(Ecore_Event * ev); static int prx, pry; static Window win_place = 0; 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; if (!win_place) return; } 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; if (!win_place) return; e_action_stop("Window_Place", ACT_MOUSE_UP, 1, NULL, - EV_KEY_MODIFIER_NONE, NULL, NULL, e->x, e->y, e->rx, e->ry); - e_window_destroy(win_place); + ECORE_EVENT_KEY_MODIFIER_NONE, NULL, NULL, e->x, e->y, e->rx, e->ry); + ecore_window_destroy(win_place); win_place = 0; return; } 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; if (!win_place) return; 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); prx = e->rx; pry = e->ry; @@ -61,10 +61,10 @@ e_place_manual(E_Border *b, E_Desktop *desk, int *x, int *y) if (!win_place) { - win_place = e_window_input_new(0, 0, 0, desk->real.w, desk->real.h); - e_window_set_events(win_place, XEV_MOUSE_MOVE | XEV_BUTTON); - e_window_raise(win_place); - e_window_show(win_place); + win_place = ecore_window_input_new(0, 0, 0, desk->real.w, desk->real.h); + ecore_window_set_events(win_place, XEV_MOUSE_MOVE | XEV_BUTTON); + ecore_window_raise(win_place); + ecore_window_show(win_place); } else { @@ -72,14 +72,14 @@ e_place_manual(E_Border *b, E_Desktop *desk, int *x, int *y) } /* get mouse coords */ - e_pointer_xy(desk->win.main, &mx, &my); + ecore_pointer_xy(desk->win.main, &mx, &my); rx = mx; ry = my; prx = rx; pry = ry; /* grab mouse to desktop */ - e_pointer_ungrab(CurrentTime); - e_pointer_grab(win_place, CurrentTime); + ecore_pointer_ungrab(CurrentTime); + ecore_pointer_grab(win_place, CurrentTime); *x = mx - (w / 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 */ e_action_stop_by_type("Window_Place"); 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; return 1; @@ -486,7 +486,7 @@ e_place_border(E_Border *b, E_Desktop *desk, int *x, int *y, E_Placement_Mode mo void e_place_init(void) { - e_event_filter_handler_add(EV_MOUSE_DOWN, e_mouse_down); - e_event_filter_handler_add(EV_MOUSE_UP, e_mouse_up); - e_event_filter_handler_add(EV_MOUSE_MOVE, e_mouse_move); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN, e_mouse_down); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_UP, e_mouse_up); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE, e_mouse_move); } diff --git a/src/util.c b/src/util.c index 35d96a214..c1d60be85 100644 --- a/src/util.c +++ b/src/util.c @@ -91,7 +91,7 @@ e_file_real(char *file) } char * -e_file_get_file(char *file) +e_filecore_get_file(char *file) { char *p; char *f; @@ -107,7 +107,7 @@ e_file_get_file(char *file) } char * -e_file_get_dir(char *file) +e_filecore_get_dir(char *file) { char *p; char *f; diff --git a/src/view.c b/src/view.c index 84dfe4bee..db14248f6 100644 --- a/src/view.c +++ b/src/view.c @@ -12,10 +12,10 @@ #include "util.h" 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 Ev_Key_Modifiers range_select_mod = EV_KEY_MODIFIER_CTRL; +static Ecore_Event_Key_Modifiers mulit_select_mod = ECORE_EVENT_KEY_MODIFIER_SHIFT; +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_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_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_idle(void *data); -static void e_wheel(Eevent * ev); -static void e_key_down(Eevent * ev); -static void e_key_up(Eevent * ev); -static void e_mouse_down(Eevent * ev); -static void e_mouse_up(Eevent * ev); -static void e_mouse_move(Eevent * ev); -static void e_mouse_in(Eevent * ev); -static void e_mouse_out(Eevent * ev); -static void e_window_expose(Eevent * ev); -static void e_configure(Eevent * ev); -static void e_property(Eevent * ev); -static void e_unmap(Eevent * ev); -static void e_visibility(Eevent * ev); -static void e_focus_in(Eevent * ev); -static void e_focus_out(Eevent * ev); -static void e_delete(Eevent * ev); +static void ecore_idle(void *data); +static void e_wheel(Ecore_Event * ev); +static void ecore_key_down(Ecore_Event * ev); +static void ecore_key_up(Ecore_Event * ev); +static void e_mouse_down(Ecore_Event * ev); +static void e_mouse_up(Ecore_Event * ev); +static void e_mouse_move(Ecore_Event * ev); +static void e_mouse_in(Ecore_Event * ev); +static void e_mouse_out(Ecore_Event * ev); +static void ecore_window_expose(Ecore_Event * ev); +static void e_configure(Ecore_Event * ev); +static void e_property(Ecore_Event * ev); +static void e_unmap(Ecore_Event * ev); +static void e_visibility(Ecore_Event * ev); +static void ecore_focus_in(Ecore_Event * ev); +static void ecore_focus_out(Ecore_Event * ev); +static void e_delete(Ecore_Event * ev); static void e_view_handle_fs(EfsdEvent *ev); static void e_view_handle_fs_restart(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 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; 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); } if( _b == 2 && ev->double_click ) - e_event_loop_quit(); + ecore_event_loop_quit(); UN(_e); 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 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; 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 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; if (!current_ev) return; @@ -626,9 +626,9 @@ e_view_icon_exec(E_Icon *ic) printf("new dir >%s<\n", buf); v->dir = strdup(buf); e_view_realize(v); - e_window_set_title(v->win.base, ic->file); - e_window_set_name_class(v->win.base, "FileView", "E"); - e_window_set_min_size(v->win.base, 8, 8); + ecore_window_set_title(v->win.base, ic->file); + ecore_window_set_name_class(v->win.base, "FileView", "E"); + ecore_window_set_min_size(v->win.base, 8, 8); } 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 *ic; - Eevent *ev; - Ev_Mouse_Down *e; + Ecore_Event *ev; + Ecore_Event_Mouse_Down *e; ev = e_view_get_current_event(); 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 *ic; - Eevent *ev; - Ev_Mouse_Up *e; + Ecore_Event *ev; + Ecore_Event_Mouse_Up *e; ev = e_view_get_current_event(); 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.just_selected = 0; 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; 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 *ic; - Eevent *ev; - Ev_Mouse_Move *e; + Ecore_Event *ev; + Ecore_Event_Mouse_Move *e; ev = e_view_get_current_event(); 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; 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; if ((ww < 1) || (wh < 1)) return; - ic->view->drag.win = e_window_override_new(0, wx, wy, ww, wh); - pmap = e_pixmap_new(ic->view->drag.win, ww, wh, 0); - mask = e_pixmap_new(ic->view->drag.win, ww, wh, 1); + ic->view->drag.win = ecore_window_override_new(0, wx, wy, ww, wh); + pmap = ecore_pixmap_new(ic->view->drag.win, ww, wh, 0); + mask = ecore_pixmap_new(ic->view->drag.win, ww, wh, 1); { 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_free_image(); } - e_window_set_background_pixmap(ic->view->drag.win, pmap); - e_window_set_shape_mask(ic->view->drag.win, mask); - e_window_ignore(ic->view->drag.win); - e_window_raise(ic->view->drag.win); - e_window_show(ic->view->drag.win); - e_pixmap_free(pmap); - e_pixmap_free(mask); + ecore_window_set_background_pixmap(ic->view->drag.win, pmap); + ecore_window_set_shape_mask(ic->view->drag.win, mask); + ecore_window_ignore(ic->view->drag.win); + ecore_window_raise(ic->view->drag.win); + ecore_window_show(ic->view->drag.win); + ecore_pixmap_free(pmap); + ecore_pixmap_free(mask); 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 -e_idle(void *data) +ecore_idle(void *data) { Evas_List l; @@ -1159,7 +1159,7 @@ e_view_geometry_record(E_View *v) { 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); efsd_set_metadata_int(e_fs_get_connection(), "/view/x", v->dir, @@ -1192,7 +1192,7 @@ e_view_queue_geometry_record(E_View *v) char name[PATH_MAX]; 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 @@ -1201,14 +1201,14 @@ e_view_queue_icon_xy_record(E_View *v) char name[PATH_MAX]; 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 -e_configure(Eevent * ev) +e_configure(Ecore_Event * ev) { - Ev_Window_Configure *e; + Ecore_Event_Window_Configure *e; Evas_List l; e = ev->event; @@ -1238,17 +1238,17 @@ e_configure(Eevent * ev) printf("... a new size!\n"); v->size.w = e->w; v->size.h = e->h; - if (v->pmap) e_pixmap_free(v->pmap); + if (v->pmap) ecore_pixmap_free(v->pmap); 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) { - v->pmap = e_pixmap_new(v->win.main, v->size.w, v->size.h, 0); - evas_set_output(v->evas, e_display_get(), v->pmap, + v->pmap = ecore_pixmap_new(v->win.main, v->size.w, v->size.h, 0); + evas_set_output(v->evas, ecore_display_get(), v->pmap, evas_get_visual(v->evas), evas_get_colormap(v->evas)); - e_window_set_background_pixmap(v->win.main, v->pmap); - e_window_clear(v->win.main); + ecore_window_set_background_pixmap(v->win.main, v->pmap); + ecore_window_clear(v->win.main); } if (v->bg) { @@ -1270,9 +1270,9 @@ e_configure(Eevent * ev) } static void -e_property(Eevent * ev) +e_property(Ecore_Event * ev) { - Ev_Window_Configure *e; + Ecore_Event_Window_Configure *e; Evas_List l; e = ev->event; @@ -1288,9 +1288,9 @@ e_property(Eevent * ev) } static void -e_unmap(Eevent * ev) +e_unmap(Ecore_Event * ev) { - Ev_Window_Unmap *e; + Ecore_Event_Window_Unmap *e; Evas_List l; e = ev->event; @@ -1306,9 +1306,9 @@ e_unmap(Eevent * ev) } static void -e_visibility(Eevent * ev) +e_visibility(Ecore_Event * ev) { - Ev_Window_Unmap *e; + Ecore_Event_Window_Unmap *e; Evas_List l; e = ev->event; @@ -1324,9 +1324,9 @@ e_visibility(Eevent * ev) } 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; e = ev->event; @@ -1342,9 +1342,9 @@ e_focus_in(Eevent * ev) } 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; e = ev->event; @@ -1360,9 +1360,9 @@ e_focus_out(Eevent * ev) } static void -e_delete(Eevent * ev) +e_delete(Ecore_Event * ev) { - Ev_Window_Delete *e; + Ecore_Event_Window_Delete *e; Evas_List l; e = ev->event; @@ -1380,9 +1380,9 @@ e_delete(Eevent * ev) } static void -e_wheel(Eevent * ev) +e_wheel(Ecore_Event * ev) { - Ev_Wheel *e; + Ecore_Event_Wheel *e; Evas_List l; e = ev->event; @@ -1398,9 +1398,9 @@ e_wheel(Eevent * ev) } 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; e = ev->event; @@ -1435,7 +1435,7 @@ e_key_down(Eevent * ev) { char *type; - type = e_key_press_translate_into_typeable(e); + type = ecore_keypress_translate_into_typeable(e); if (type) { } @@ -1446,9 +1446,9 @@ e_key_down(Eevent * ev) } 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; e = ev->event; @@ -1462,9 +1462,9 @@ e_key_up(Eevent * ev) } 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; e = ev->event; @@ -1485,9 +1485,9 @@ e_mouse_down(Eevent * ev) } 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; e = ev->event; @@ -1508,9 +1508,9 @@ e_mouse_up(Eevent * ev) } 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; e = ev->event; @@ -1531,9 +1531,9 @@ e_mouse_move(Eevent * ev) } 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; e = ev->event; @@ -1557,9 +1557,9 @@ e_mouse_in(Eevent * ev) } 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; e = ev->event; @@ -1580,9 +1580,9 @@ e_mouse_out(Eevent * ev) } 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; e = ev->event; @@ -1653,7 +1653,7 @@ e_view_handle_fs_restart(void *data) v->is_listing = 1; } -Eevent * +Ecore_Event * e_view_get_current_event(void) { return current_ev; @@ -1946,7 +1946,7 @@ e_view_queue_resort(E_View *v) if (v->have_resort_queued) return; v->have_resort_queued = 1; 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 @@ -2186,20 +2186,20 @@ e_view_free(E_View *v) sprintf(name, "resort_timer.%s", v->dir); - e_del_event_timer(name); + ecore_del_event_timer(name); 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); - e_del_event_timer(name); + ecore_del_event_timer(name); views = evas_list_remove(views, v); efsd_stop_monitor(e_fs_get_connection(), v->dir, TRUE); if (v->restarter) e_fs_del_restart_handler(v->restarter); 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); } @@ -2252,7 +2252,7 @@ _member.r = _r; _member.g = _g; _member.b = _b; _member.a = _a; v->spacing.icon.s = 7; v->spacing.icon.g = 7; v->spacing.icon.b = 7; -// v->iconbar = e_ib_new(v); +// v->iconbar = e_iconbar_new(v); views = evas_list_append(views, v); return v; @@ -2311,12 +2311,12 @@ e_view_realize(E_View *v) char *font_dir; 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->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"); - v->evas = evas_new_all(e_display_get(), + v->evas = evas_new_all(ecore_display_get(), v->win.base, 0, 0, v->size.w, v->size.h, v->options.render_method, @@ -2327,19 +2327,19 @@ e_view_realize(E_View *v) v->win.main = evas_get_window(v->evas); e_cursors_display_in_window(v->win.main, "View"); 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_PROPERTY | XEV_FOCUS); - e_window_set_events(v->win.main, + ecore_window_set_events(v->win.main, XEV_EXPOSE | XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY); if (v->options.back_pixmap) { - v->pmap = e_pixmap_new(v->win.main, v->size.w, v->size.h, 0); - evas_set_output(v->evas, e_display_get(), v->pmap, + v->pmap = ecore_pixmap_new(v->win.main, v->size.w, v->size.h, 0); + evas_set_output(v->evas, ecore_display_get(), v->pmap, evas_get_visual(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) { @@ -2380,7 +2380,7 @@ e_view_realize(E_View *v) 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; @@ -2391,9 +2391,9 @@ e_view_realize(E_View *v) 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; } @@ -2413,7 +2413,7 @@ e_view_update(E_View *v) } 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; } } @@ -2433,7 +2433,7 @@ e_view_update(E_View *v) int 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); } @@ -2628,10 +2628,10 @@ e_view_handle_fs(EfsdEvent *ev) if (efsd_metadata_get_int(ev, &(v->location.x))) { - e_window_move(v->win.base, + ecore_window_move(v->win.base, v->location.x, v->location.y); - e_window_set_xy_hints(v->win.base, + ecore_window_set_xy_hints(v->win.base, v->location.x, v->location.y); } @@ -2649,10 +2649,10 @@ e_view_handle_fs(EfsdEvent *ev) if (efsd_metadata_get_int(ev, &(v->location.y))) { - e_window_move(v->win.base, + ecore_window_move(v->win.base, v->location.x, v->location.y); - e_window_set_xy_hints(v->win.base, + ecore_window_set_xy_hints(v->win.base, v->location.x, v->location.y); } @@ -2670,7 +2670,7 @@ e_view_handle_fs(EfsdEvent *ev) if (efsd_metadata_get_int(ev, &(v->size.w))) { - e_window_resize(v->win.base, + ecore_window_resize(v->win.base, v->size.w, v->size.h); v->size.force = 1; @@ -2689,7 +2689,7 @@ e_view_handle_fs(EfsdEvent *ev) if (efsd_metadata_get_int(ev, &(v->size.h))) { - e_window_resize(v->win.base, + ecore_window_resize(v->win.base, v->size.w, v->size.h); v->size.force = 1; @@ -2762,22 +2762,22 @@ e_view_handle_fs(EfsdEvent *ev) void e_view_init(void) { - e_event_filter_handler_add(EV_MOUSE_DOWN, e_mouse_down); - e_event_filter_handler_add(EV_MOUSE_UP, e_mouse_up); - e_event_filter_handler_add(EV_MOUSE_MOVE, e_mouse_move); - e_event_filter_handler_add(EV_MOUSE_IN, e_mouse_in); - e_event_filter_handler_add(EV_MOUSE_OUT, e_mouse_out); - e_event_filter_handler_add(EV_WINDOW_EXPOSE, e_window_expose); - e_event_filter_handler_add(EV_KEY_DOWN, e_key_down); - e_event_filter_handler_add(EV_KEY_UP, e_key_up); - e_event_filter_handler_add(EV_MOUSE_WHEEL, e_wheel); - e_event_filter_handler_add(EV_WINDOW_CONFIGURE, e_configure); - e_event_filter_handler_add(EV_WINDOW_PROPERTY, e_property); - e_event_filter_handler_add(EV_WINDOW_UNMAP, e_unmap); - e_event_filter_handler_add(EV_WINDOW_VISIBILITY, e_visibility); - e_event_filter_handler_add(EV_WINDOW_FOCUS_IN, e_focus_in); - e_event_filter_handler_add(EV_WINDOW_FOCUS_OUT, e_focus_out); - e_event_filter_handler_add(EV_WINDOW_DELETE, e_delete); - e_event_filter_idle_handler_add(e_idle, NULL); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN, e_mouse_down); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_UP, e_mouse_up); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE, e_mouse_move); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_IN, e_mouse_in); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT, e_mouse_out); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE, ecore_window_expose); + ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, ecore_key_down); + ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP, ecore_key_up); + ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_WHEEL, e_wheel); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_CONFIGURE, e_configure); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_PROPERTY, e_property); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_UNMAP, e_unmap); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_VISIBILITY, e_visibility); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_FOCUS_IN, ecore_focus_in); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_FOCUS_OUT, ecore_focus_out); + ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_DELETE, e_delete); + ecore_event_filter_idle_handler_add(ecore_idle, NULL); e_fs_add_event_handler(e_view_handle_fs); } diff --git a/src/view.h b/src/view.h index add2fa633..4aa2b3718 100644 --- a/src/view.h +++ b/src/view.h @@ -207,7 +207,7 @@ struct _E_Icon void e_view_selection_update(E_View *v); void e_view_deselect_all(void); 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); 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);