e_gadcon_locked_set(gadcon, 1);
e_menu_post_deactivate_callback_set(m, menu_post_deactivate, gadcon);
- ecore_evas_pointer_xy_get(e_comp_get(gadcon)->ee, &x, &y);
- zone = e_comp_zone_xy_get(e_comp_get(gadcon), x, y);
+ ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
+ zone = e_comp_zone_xy_get(e_comp, x, y);
e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
}
_backlight_gadget_update(inst);
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
- evas = e_comp_get(inst->popup)->evas;
+ evas = e_comp->evas;
inst->o_table = e_widget_table_add(e_win_evas_win_get(evas), 0);
inst->warning = e_gadcon_popup_new(inst->gcc, 0);
if (!inst->warning) return;
- e = e_comp_get(inst->warning)->evas;
+ e = e_comp->evas;
popup_bg = edje_object_add(e);
inst->popup_battery = edje_object_add(e);
_time_eval(inst);
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
- evas = e_comp_get(inst->popup)->evas;
+ evas = e_comp->evas;
inst->o_table = elm_table_add(inst->popup->comp_object);
Evas_Object *o, *of, *ol, *ob;
E_Zone *zone;
- zone = e_zone_current_get(e_comp_get(NULL));
+ zone = e_zone_current_get(e_comp);
o = e_widget_list_add(evas, 0, 0);
cfdata->comp = NULL;
cfdata->client = NULL;
if (!cfd->data)
- cfdata->comp = e_comp_get(NULL);
+ cfdata->comp = e_comp;
else
cfdata->client = cfd->data;
E_Radio_Group *rg;
char path[PATH_MAX];
- z = e_zone_current_get(e_comp_get(NULL));
+ z = e_zone_current_get(e_comp);
e_dialog_resizable_set(cfd->dia, 1);
ot = e_widget_table_add(e_win_evas_win_get(evas), 0);
Eina_List *l;
char *t;
- zone = e_zone_current_get(e_comp_get(NULL));
+ zone = e_zone_current_get(e_comp);
o = e_widget_table_add(e_win_evas_win_get(evas), 0);
e_dialog_resizable_set(cfd->dia, 1);
- zone = e_zone_current_get(e_comp_get(NULL));
+ zone = e_zone_current_get(e_comp);
o = e_widget_list_add(evas, 0, 1);
rg = e_widget_radio_group_new(&(cfdata->fmdir));
e_dialog_resizable_set(cfd->dia, 1);
- zone = e_zone_current_get(e_comp_get(NULL));
+ zone = e_zone_current_get(e_comp);
o = e_widget_list_add(evas, 0, 1);
rg = e_widget_radio_group_new(&(cfdata->fmdir));
E_Zone *z;
E_Desk *d;
- if (!(z = e_zone_current_get(e_comp_get(NULL)))) return 0;
+ if (!(z = e_zone_current_get(e_comp))) return 0;
if (!(d = e_desk_current_get(z))) return 0;
if (cfdata->use_theme_bg)
{
return;
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
- evas = e_comp_get(inst->gcc)->evas;
+ evas = e_comp->evas;
list = e_widget_list_add(evas, 0, 0);
inst->ui.popup.list = e_widget_ilist_add(evas, 24, 24, NULL);
static Evas_Object *
_input_obj(Edgeset *es, int x, int y, int w, int h)
{
- E_Comp *c = e_comp_get(es->zone);
+ E_Comp *c = e_comp;
Evas_Object *o = evas_object_rectangle_add(c->evas);
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_move(o, x, y);
else if (obj->type == E_ZONE_TYPE)
zone = e_zone_current_get(((E_Zone *)obj)->comp);
else
- zone = e_zone_current_get(e_comp_get(NULL));
+ zone = e_zone_current_get(e_comp);
}
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
if (zone)
IBar_Icon *ic;
ic = data;
- e_desktop_edit(e_comp_get(ic->ibar->inst->gcc), ic->app);
+ e_desktop_edit(e_comp, ic->app);
}
static void
if (ec->netwm.state.skip_taskbar) return EINA_FALSE;
o = ic->menu->o_bg;
- it = edje_object_add(e_comp_get(ec)->evas);
+ it = edje_object_add(e_comp->evas);
e_comp_object_util_del_list_append(ic->menu->comp_object, it);
e_theme_edje_object_set(it, "base/theme/modules/ibar",
"e/modules/ibar/menu/item");
ic->menu = e_gadcon_popup_new(ic->ibar->inst->gcc, 1);
e_object_data_set(E_OBJECT(ic->menu), ic);
E_OBJECT_DEL_SET(ic->menu, _ibar_cb_icon_menu_del);
- e = e_comp_get(ic->menu)->evas;
+ e = e_comp->evas;
o = edje_object_add(e);
e_theme_edje_object_set(o, "base/theme/modules/ibar",
"e/modules/ibar/menu");
if (_ibar_focus_win) return;
man = e_manager_current_get();
if (!man) return;
- _ibar_focus_win = e_comp_get(man)->ee_win;
+ _ibar_focus_win = e_comp->ee_win;
if (!e_grabinput_get(0, 0, _ibar_focus_win))
{
_ibar_focus_win = 0;
ec = iwin->win->client;
/* reset mouse pointer */
- e_pointer_type_pop(e_comp_get(ec)->pointer, ec, "move");
+ e_pointer_type_pop(e_comp->pointer, ec, "move");
/* tell edj we are done moving */
edje_object_signal_emit(iwin->o_base, "e,action,move,stop", "e");
iwin->drag.start = 0;
/* change mouse pointer to indicate we are dragging */
- e_pointer_type_push(e_comp_get(iwin->win)->pointer,
+ e_pointer_type_push(e_comp->pointer,
iwin->win->client, "move");
/* tell edj we are going to start moving */
if (ki->zoomkey.popup) return;
- o = _theme_obj_new(e_comp_get(ki->win)->evas, ki->themedir,
+ o = _theme_obj_new(e_comp->evas, ki->themedir,
"e/modules/kbd/zoom/default");
ki->zoomkey.base_obj = o;
- o = e_layout_add(e_comp_get(ki->win)->evas);
+ o = e_layout_add(e_comp->evas);
e_layout_virtual_size_set(o, 100, 100);
edje_object_part_swallow(ki->zoomkey.base_obj, "e.swallow.content", o);
evas_object_show(o);
e_layout_virtual_size_get(ki->layout_obj, &vw, &vh);
- o = e_layout_add(e_comp_get(ki->win)->evas);
+ o = e_layout_add(e_comp->evas);
e_layout_virtual_size_set(o, vw, vh);
e_layout_pack(ki->zoomkey.layout_obj, o);
e_layout_child_move(o, 0, 0);
int selected;
ky = l->data;
- o = _theme_obj_new(e_comp_get(ki->win)->evas, ki->themedir,
+ o = _theme_obj_new(e_comp->evas, ki->themedir,
"e/modules/kbd/zoomkey/default");
label = "";
icon = NULL;
edje_object_part_text_set(o, "e.text.label", label);
- o2 = e_icon_add(e_comp_get(ki->win)->evas);
+ o2 = e_icon_add(e_comp->evas);
e_icon_fill_inside_set(o2, 1);
// e_icon_scale_up_set(o2, 0);
edje_object_part_swallow(o, "e.swallow.content", o2);
if (ki->dictlist.popup) return;
- o = _theme_obj_new(e_comp_get(ki->win)->evas, ki->themedir,
+ o = _theme_obj_new(e_comp->evas, ki->themedir,
"e/modules/kbd/match/default");
ki->dictlist.base_obj = o;
- o = e_widget_ilist_add(e_comp_get(ki->win)->evas,
+ o = e_widget_ilist_add(e_comp->evas,
(32 * e_scale), (32 * e_scale), NULL);
e_widget_ilist_selector_set(o, 1);
e_widget_ilist_freeze(o);
if (!e_kbd_buf_string_matches_get(ki->kbuf)) return;
if (ki->matchlist.popup) return;
- o = _theme_obj_new(e_comp_get(ki->win)->evas, ki->themedir,
+ o = _theme_obj_new(e_comp->evas, ki->themedir,
"e/modules/kbd/match/default");
ki->matchlist.base_obj = o;
- o = e_widget_ilist_add(e_comp_get(ki->win)->evas,
+ o = e_widget_ilist_add(e_comp->evas,
(32 * e_scale), (32 * e_scale), NULL);
e_widget_ilist_selector_set(o, 1);
ki->matchlist.ilist_obj = o;
Evas *e;
if (ev->buttons != 1) return ECORE_CALLBACK_DONE;
- e = e_comp_get(lp->zone)->evas;
+ e = e_comp->evas;
evas_event_feed_mouse_move(e,
e_comp_canvas_x_root_adjust(lp->zone->comp, ev->root.x),
e_comp_canvas_y_root_adjust(lp->zone->comp, ev->root.y),
static Evas_Object *
_mixer_popup_add_slider(E_Mixer_Instance *inst, int value, void (*cb)(void *data, Evas_Object *obj, void *event_info))
{
- Evas_Object *slider = e_slider_add(e_comp_get(inst->popup)->evas);
+ Evas_Object *slider = e_slider_add(e_comp->evas);
evas_object_show(slider);
e_slider_orientation_set(slider, 0);
e_slider_value_set(slider, value);
colspan = 2;
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
- evas = e_comp_get(inst->gcc)->evas;
+ evas = e_comp->evas;
inst->ui.table = e_widget_table_add(e_win_evas_win_get(evas), 0);
ctxt->last_act_time = ecore_loop_time_get();
- if (ctxt->default_instance->conf->keybindings_popup && (!e_comp_get(NULL)->nocomp))
+ if (ctxt->default_instance->conf->keybindings_popup && (!e_comp->nocomp))
_mixer_popup_timer_new(ctxt->default_instance);
_mixer_volume_change(ctxt->default_instance, up, EINA_TRUE);
}
ctxt->last_act_time = ecore_loop_time_get();
- if (ctxt->default_instance->conf->keybindings_popup && (!e_comp_get(NULL)->nocomp))
+ if (ctxt->default_instance->conf->keybindings_popup && (!e_comp->nocomp))
_mixer_popup_timer_new(ctxt->default_instance);
_mixer_toggle_mute(ctxt->default_instance, EINA_TRUE);
}
Evas_Object *o;
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
- o = edje_object_add(e_comp_get(inst->gcc)->evas);
+ o = edje_object_add(e_comp->evas);
e_theme_edje_object_set(o, "base/theme/modules/music-control",
"e/modules/music-control/popup");
edje_object_signal_callback_add(o, "btn,clicked", "*", _btn_clicked, inst);
switch (notification_cfg->dual_screen)
{
case POPUP_DISPLAY_POLICY_FIRST:
- comp = e_comp_get(NULL);
+ comp = e_comp;
zone = eina_list_data_get(comp->zones);
break;
case POPUP_DISPLAY_POLICY_CURRENT:
EINA_SAFETY_ON_NULL_RETURN_VAL(popup, NULL);
popup->notif = n;
popup->id = id;
- popup->e = e_comp_get(zone)->evas;
+ popup->e = e_comp->evas;
/* Setup the theme */
snprintf(buf, sizeof(buf), "%s/e-module-notification.edj",
if (popup->pending) return;
popups_displayed--;
free(popup);
- e_comp_shape_queue(e_comp_get(NULL));
+ e_comp_shape_queue(e_comp);
}
static void
unsigned num_updates = 0;
const char *emblem_name;
Efreet_Desktop *desktop;
- Evas *evas = e_comp_get(inst->popup)->evas;
+ Evas *evas = e_comp->evas;
Evas_Object *icon, *end;
char buf[PATH_MAX];
Evas *evas;
inst->popup = e_gadcon_popup_new(inst->gcc, EINA_FALSE);
- evas = e_comp_get(inst->popup)->evas;
+ evas = e_comp->evas;
table = e_widget_table_add(e_win_evas_win_get(evas), 0);
E_Zone *zone;
Eina_List *l;
- comp = e_comp_get(NULL);
+ comp = e_comp;
base = e_widget_list_add(evas, 0, 0);
conf->use_softkey = 1;
conf->softkey_size = 42;
- comp = e_comp_get(NULL);
+ comp = e_comp;
zone = e_zone_current_get(comp);
desk = e_desk_current_get(zone);
_pol_conf_desk_add(conf, desk);
desk = e_desk_current_get(zone);
launcher = e_mod_pol_client_launcher_get(zone);
- E_CLIENT_REVERSE_FOREACH(e_comp_get(desk), ec)
+ E_CLIENT_REVERSE_FOREACH(e_comp, ec)
{
if (e_client_util_ignored_get(ec)) continue;
if (!e_client_util_desk_visible(ec, desk)) continue;
Evas_Object *obj, *comp_obj;
char path[PATH_MAX], group[PATH_MAX];
- obj = edje_object_add(e_comp_get(NULL)->evas);
+ obj = edje_object_add(e_comp->evas);
snprintf(group, sizeof(group), "e/modules/policy-mobile/softkey/%s", name);
snprintf(path, sizeof(path), "%s/e-module-policy-mobile.edj",
}
else
{
- xwin = e_comp_get(ec)->ee_win;
+ xwin = e_comp->ee_win;
x = ec->x, y = ec->y, sw = ec->w, sh = ec->h;
w = sw;
h = sh;
return 0;
}
- if (!e_comp_grab_input(e_comp_get(zone), 1, 1)) return 0;
- evas = e_comp_get(zone)->evas;
+ if (!e_comp_grab_input(e_comp, 1, 1)) return 0;
+ evas = e_comp->evas;
evas_event_freeze(evas);
o = edje_object_add(evas);
if (!inst)
return NULL;
inst->evas = gc->evas;
- inst->comp = e_comp_get(NULL);
+ inst->comp = e_comp;
if (!inst->comp)
{
E_FREE(inst);
E_Zone *zone;
Eina_List *l;
- comp = e_comp_get(NULL);
+ comp = e_comp;
o = e_widget_list_add(evas, 0, 0);
{
E_Client *ec;
- E_CLIENT_FOREACH(e_comp_get(NULL), ec)
+ E_CLIENT_FOREACH(e_comp, ec)
{
_client_apply_settings(ec, NULL);
}
/* Add all the existing windows. */
E_Client *ec;
- E_CLIENT_FOREACH(e_comp_get(NULL), ec)
+ E_CLIENT_FOREACH(e_comp, ec)
{
_add_client(ec);
}
/* If this is not NULL, the rest isn't either. */
if (!o)
{
- _G.split_popup.obj = o = edje_object_add(e_comp_get(NULL)->evas);
+ _G.split_popup.obj = o = edje_object_add(e_comp->evas);
if (!e_theme_edje_object_set(o, "base/theme/modules/tiling",
"modules/tiling/main"))
edje_object_file_set(o, _G.edj_path, "modules/tiling/main");
{
E_Client *ec;
- E_CLIENT_FOREACH(e_comp_get(NULL), ec)
+ E_CLIENT_FOREACH(e_comp, ec)
{
_add_client(ec);
}
if (_winlist) return 0;
#ifndef HAVE_WAYLAND_ONLY
- if (e_comp_get(zone)->comp_type == E_PIXMAP_TYPE_X)
+ if (e_comp->comp_type == E_PIXMAP_TYPE_X)
{
_input_window = ecore_x_window_input_new(zone->comp->man->root, 0, 0, 1, 1);
ecore_x_window_show(_input_window);
}
}
#endif
- if (e_comp_get(zone)->comp_type != E_PIXMAP_TYPE_X)
+ if (e_comp->comp_type != E_PIXMAP_TYPE_X)
{
- if (!e_comp_grab_input(e_comp_get(zone), 1, 1))
+ if (!e_comp_grab_input(e_comp, 1, 1))
return 0;
}
}
else
#endif
- e_comp_ungrab_input(e_comp_get(NULL), 1, 1);
+ e_comp_ungrab_input(e_comp, 1, 1);
if (ec)
{
if (ec->shaded)