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

remove E_Client->comp

This commit is contained in:
Mike Blumenkrantz 2015-03-13 15:41:21 -04:00
parent 96b13f2620
commit 091142b032
18 changed files with 221 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_actions.c
View File

@ -1085,7 +1085,7 @@ ACT_FN_GO(window_push, )
desk_current = e_desk_current_get(ec->zone);
E_CLIENT_FOREACH(ec->comp, cur)
E_CLIENT_FOREACH(e_comp, cur)
{
if (((cur->desk == desk_current) || (cur->sticky)) && (ec != cur) && (!cur->iconic))
{

124
src/bin/e_client.c
View File

@ -196,7 +196,7 @@ _e_client_desk_window_profile_wait_desk_delfn(void *data, void *obj)
if (!ec->e.state.profile.use) return;
new_desk = e_comp_desk_window_profile_get(ec->comp, desk->window_profile);
new_desk = e_comp_desk_window_profile_get(e_comp, desk->window_profile);
if (new_desk)
e_client_desk_set(ec, new_desk);
else
@ -204,7 +204,7 @@ _e_client_desk_window_profile_wait_desk_delfn(void *data, void *obj)
for (i = 0; i < ec->e.state.profile.num; i++)
{
p = ec->e.state.profile.available_list[i];
new_desk = e_comp_desk_window_profile_get(ec->comp, p);
new_desk = e_comp_desk_window_profile_get(e_comp, p);
if (new_desk)
{
e_client_desk_set(ec, new_desk);
@ -224,7 +224,7 @@ _e_client_pointer_warp_to_center_timer(void *data EINA_UNUSED)
int x, y;
double spd;
ecore_evas_pointer_xy_get(warp_client->comp->ee, &x, &y);
ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
/* move hasn't happened yet */
if ((x == warp_x[1]) && (y == warp_y[1]))
return EINA_TRUE;
@ -247,7 +247,7 @@ _e_client_pointer_warp_to_center_timer(void *data EINA_UNUSED)
warp_to = 0;
goto cleanup;
}
ecore_evas_pointer_warp(warp_client->comp->ee, warp_x[0], warp_y[0]);
ecore_evas_pointer_warp(e_comp->ee, warp_x[0], warp_y[0]);
return ECORE_CALLBACK_RENEW;
}
cleanup:
@ -439,10 +439,10 @@ _e_client_free(E_Client *ec)
{
ec->desk->fullscreen_clients = eina_list_remove(ec->desk->fullscreen_clients, ec);
if (!ec->desk->fullscreen_clients)
e_comp_render_queue(ec->comp);
e_comp_render_queue(e_comp);
}
if (ec->new_client)
ec->comp->new_clients--;
e_comp->new_clients--;
if (ec->e.state.profile.use)
{
e_client_desk_window_profile_wait_desk_set(ec, NULL);
@ -558,7 +558,7 @@ _e_client_del(E_Client *ec)
ec->cur_mouse_action->func.end(E_OBJECT(ec), "");
}
if (action_client == ec) _e_client_action_finish();
e_pointer_type_pop(ec->comp->pointer, ec, NULL);
e_pointer_type_pop(e_comp->pointer, ec, NULL);
if (warp_client == ec)
{
@ -618,7 +618,7 @@ _e_client_del(E_Client *ec)
child->leader = NULL;
eina_hash_del_by_key(clients_hash, &ec->pixmap);
ec->comp->clients = eina_list_remove(ec->comp->clients, ec);
e_comp->clients = eina_list_remove(e_comp->clients, ec);
e_comp_object_render_update_del(ec->frame);
if (e_pixmap_free(ec->pixmap))
e_pixmap_client_set(ec->pixmap, NULL);
@ -686,15 +686,15 @@ _e_client_cb_ping_poller(void *data)
///////////////////////////////////////////
static int
_e_client_action_input_win_new(E_Client *ec)
_e_client_action_input_win_new(void)
{
if (comp_grabbed)
{
CRI("DOUBLE COMP GRAB! ACK!!!!");
return 1;
}
comp_grabbed = e_comp_grab_input(ec->comp, 1, 1);
if (!comp_grabbed) _e_client_action_input_win_del(ec->comp);
comp_grabbed = e_comp_grab_input(e_comp, 1, 1);
if (!comp_grabbed) _e_client_action_input_win_del(e_comp);
return comp_grabbed;
}
@ -749,14 +749,14 @@ _e_client_move_begin(E_Client *ec)
return 0;
}
*/
if (!_e_client_action_input_win_new(ec)) return 0;
if (!_e_client_action_input_win_new()) return 0;
ec->moving = 1;
ecmove = ec;
_e_client_hook_call(E_CLIENT_HOOK_MOVE_BEGIN, ec);
if (!ec->moving)
{
if (ecmove == ec) ecmove = NULL;
_e_client_action_input_win_del(ec->comp);
_e_client_action_input_win_del(e_comp);
return 0;
}
if (!ec->lock_user_stacking)
@ -775,7 +775,7 @@ _e_client_move_end(E_Client *ec)
//e_grabinput_release(e_client_util_pwin_get(ec), e_client_util_pwin_get(ec));
//client_grabbed = 0;
//}
_e_client_action_input_win_del(ec->comp);
_e_client_action_input_win_del(e_comp);
e_pointer_mode_pop(ec, E_POINTER_MOVE);
ec->moving = 0;
_e_client_hook_call(E_CLIENT_HOOK_MOVE_END, ec);
@ -954,7 +954,7 @@ _e_client_resize_handle(E_Client *ec)
y += (th - h);
skiplist = eina_list_append(skiplist, ec);
e_resist_client_position(ec->comp, skiplist,
e_resist_client_position(e_comp, skiplist,
ec->x, ec->y, ec->w, ec->h,
x, y, w, h,
&new_x, &new_y, &new_w, &new_h);
@ -986,7 +986,7 @@ _e_client_resize_handle(E_Client *ec)
static int
_e_client_resize_end(E_Client *ec)
{
_e_client_action_input_win_del(ec->comp);
_e_client_action_input_win_del(e_comp);
e_pointer_mode_pop(ec, ec->resize_mode);
ec->resize_mode = E_POINTER_RESIZE_NONE;
@ -1108,7 +1108,7 @@ _e_client_under_pointer_helper(E_Desk *desk, E_Client *exclude, int x, int y)
{
E_Client *ec = NULL, *cec;
E_CLIENT_REVERSE_FOREACH(desk->zone->comp, cec)
E_CLIENT_REVERSE_FOREACH(e_comp, cec)
{
/* If a border was specified which should be excluded from the list
* (because it will be closed shortly for example), skip */
@ -1138,7 +1138,7 @@ _e_client_zones_layout_calc(E_Client *ec, int *zx, int *zy, int *zw, int *zh)
w = ec->zone->w;
h = ec->zone->h;
if (eina_list_count(ec->comp->zones) == 1)
if (eina_list_count(e_comp->zones) == 1)
{
if (zx) *zx = x;
if (zy) *zy = y;
@ -1147,16 +1147,16 @@ _e_client_zones_layout_calc(E_Client *ec, int *zx, int *zy, int *zw, int *zh)
return;
}
zone_left = e_comp_zone_xy_get(ec->comp, (x - w + 5), y);
zone_right = e_comp_zone_xy_get(ec->comp, (x + w + 5), y);
zone_above = e_comp_zone_xy_get(ec->comp, x, (y - h + 5));
zone_below = e_comp_zone_xy_get(ec->comp, x, (y + h + 5));
zone_left = e_comp_zone_xy_get(e_comp, (x - w + 5), y);
zone_right = e_comp_zone_xy_get(e_comp, (x + w + 5), y);
zone_above = e_comp_zone_xy_get(e_comp, x, (y - h + 5));
zone_below = e_comp_zone_xy_get(e_comp, x, (y + h + 5));
if (!(zone_above) && (y))
zone_above = e_comp_zone_xy_get(ec->comp, x, (h - 5));
zone_above = e_comp_zone_xy_get(e_comp, x, (h - 5));
if (!(zone_left) && (x))
zone_left = e_comp_zone_xy_get(ec->comp, (x - 5), y);
zone_left = e_comp_zone_xy_get(e_comp, (x - 5), y);
if (zone_right)
w = zone_right->x + zone_right->w;
@ -1323,7 +1323,7 @@ _e_client_zone_update(E_Client *ec)
ec->zone->x, ec->zone->y, ec->zone->w, ec->zone->h))
return;
/* find a new zone */
EINA_LIST_FOREACH(ec->comp->zones, l, zone)
EINA_LIST_FOREACH(e_comp->zones, l, zone)
{
if (E_INTERSECTS(ec->x, ec->y, ec->w, ec->h,
zone->x, zone->y, zone->w, zone->h))
@ -1352,7 +1352,7 @@ _e_client_cb_evas_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN
E_FREE_FUNC(ec->cur_mouse_action, e_object_unref);
}
if (action_client == ec) _e_client_action_finish();
e_pointer_type_pop(ec->comp->pointer, ec, NULL);
e_pointer_type_pop(e_comp->pointer, ec, NULL);
if (!ec->hidden)
{
@ -1721,7 +1721,7 @@ _e_client_eval(E_Client *ec)
{
if (ec->parent)
{
if (ec->parent->zone != e_zone_current_get(ec->parent->comp))
if (ec->parent->zone != e_zone_current_get(e_comp))
{
e_client_zone_set(ec, ec->parent->zone);
e_zone_useful_geometry_get(ec->zone, &zx, &zy, &zw, &zh);
@ -1867,14 +1867,14 @@ _e_client_eval(E_Client *ec)
x = MAX(ec->x, 0);
y = MAX(ec->y, 0);
if ((!ec->re_manage) && ((ec->x != x) || (ec->y != y)))
zone = e_comp_zone_xy_get(ec->comp, x, y);
zone = e_comp_zone_xy_get(e_comp, x, y);
if (!zone)
{
zone = e_comp_zone_xy_get(ec->comp, ec->x + (ec->w / 2), ec->y + (ec->h / 2));
zone = e_comp_zone_xy_get(e_comp, ec->x + (ec->w / 2), ec->y + (ec->h / 2));
if (zone)
{
E_Zone *z2 = e_comp_zone_xy_get(ec->comp, ec->x, ec->y);
E_Zone *z2 = e_comp_zone_xy_get(e_comp, ec->x, ec->y);
if (z2 && (z2 != zone))
{
@ -1882,7 +1882,7 @@ _e_client_eval(E_Client *ec)
E_Zone *zf = z2;
Eina_List *l;
EINA_LIST_FOREACH(ec->comp->zones, l, z2)
EINA_LIST_FOREACH(e_comp->zones, l, z2)
{
int w, h;
@ -1905,13 +1905,13 @@ _e_client_eval(E_Client *ec)
}
}
if (!zone)
zone = e_comp_zone_xy_get(ec->comp, ec->x, ec->y);
zone = e_comp_zone_xy_get(e_comp, ec->x, ec->y);
if (!zone)
zone = e_comp_zone_xy_get(ec->comp, ec->x + ec->w - 1, ec->y);
zone = e_comp_zone_xy_get(e_comp, ec->x + ec->w - 1, ec->y);
if (!zone)
zone = e_comp_zone_xy_get(ec->comp, ec->x + ec->w - 1, ec->y + ec->h - 1);
zone = e_comp_zone_xy_get(e_comp, ec->x + ec->w - 1, ec->y + ec->h - 1);
if (!zone)
zone = e_comp_zone_xy_get(ec->comp, ec->x, ec->y + ec->h - 1);
zone = e_comp_zone_xy_get(e_comp, ec->x, ec->y + ec->h - 1);
if ((zone) && (zone != ec->zone))
e_client_zone_set(ec, zone);
}
@ -1996,7 +1996,7 @@ _e_client_eval(E_Client *ec)
{
int x, y;
ecore_evas_pointer_xy_get(ec->comp->ee, &x, &y);
ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
if ((!ec->placed) && (!ec->re_manage) &&
(e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL) &&
(!((ec->icccm.transient_for != 0) ||
@ -2151,7 +2151,7 @@ _e_client_eval(E_Client *ec)
}
ec->new_client = 0;
ec->comp->new_clients--;
e_comp->new_clients--;
ec->changed = ec->changes.pos || ec->changes.size ||
ec->changes.stack || ec->changes.prop || ec->changes.border ||
ec->changes.reset_gravity || ec->changes.shading || ec->changes.shaded ||
@ -2321,8 +2321,8 @@ e_client_idler_before(void)
}
if ((!ec->new_client) && (!e_client_util_ignored_get(ec)) &&
(!E_INSIDE(ec->x, ec->y, 0, 0, ec->comp->man->w - 5, ec->comp->man->h - 5)) &&
(!E_INSIDE(ec->x, ec->y, 0 - ec->w + 5, 0 - ec->h + 5, ec->comp->man->w - 5, ec->comp->man->h - 5))
(!E_INSIDE(ec->x, ec->y, 0, 0, e_comp->man->w - 5, e_comp->man->h - 5)) &&
(!E_INSIDE(ec->x, ec->y, 0 - ec->w + 5, 0 - ec->h + 5, e_comp->man->w - 5, e_comp->man->h - 5))
)
{
if (e_config->screen_limits != E_CLIENT_OFFSCREEN_LIMIT_ALLOW_FULL)
@ -2426,7 +2426,7 @@ e_client_new(E_Comp *c EINA_UNUSED, E_Pixmap *cp, int first_map, int internal)
ec->w = 1;
ec->h = 1;
ec->internal = internal;
ec->comp = e_comp;
e_comp = e_comp;
ec->pixmap = cp;
e_pixmap_client_set(cp, ec);
@ -2449,7 +2449,7 @@ e_client_new(E_Comp *c EINA_UNUSED, E_Pixmap *cp, int first_map, int internal)
}
ec->offer_resistance = 1;
ec->new_client = 1;
ec->comp->new_clients++;
e_comp->new_clients++;
if (!_e_client_hook_call(E_CLIENT_HOOK_NEW_CLIENT, ec))
{
@ -2876,7 +2876,7 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output)
e_comp_object_frame_xy_adjust(ec->frame, x, y, &new_x, &new_y);
skiplist = eina_list_append(skiplist, ec);
e_resist_client_position(ec->comp, skiplist,
e_resist_client_position(e_comp, skiplist,
ec->x, ec->y, ec->w, ec->h,
x, y, ec->w, ec->h,
&new_x, &new_y, &new_w, &new_h);
@ -2922,7 +2922,7 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output)
e_object_ref(E_OBJECT(ec));
e_comp_object_frame_icon_geometry_get(ec->frame, &x, &y, &w, &h);
client_drag = e_drag_new(ec->zone->comp,
client_drag = e_drag_new(e_comp,
output->x, output->y,
drag_types, 1, ec, -1,
NULL,
@ -3138,8 +3138,8 @@ e_client_above_get(const E_Client *ec)
/* go up the layers until we find one */
for (x = e_comp_canvas_layer_map(ec->layer) + 1; x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); x++)
{
if (!ec->comp->layers[x].clients) continue;
EINA_INLIST_FOREACH(ec->comp->layers[x].clients, ec2)
if (!e_comp->layers[x].clients) continue;
EINA_INLIST_FOREACH(e_comp->layers[x].clients, ec2)
if (!e_object_is_del(E_OBJECT(ec2)))
return ec2;
}
@ -3172,8 +3172,8 @@ e_client_below_get(const E_Client *ec)
/* go down the layers until we find one */
for (x = e_comp_canvas_layer_map(ec->layer) - 1; x >= e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x--)
{
if (!ec->comp->layers[x].clients) continue;
EINA_INLIST_REVERSE_FOREACH(ec->comp->layers[x].clients, ec2)
if (!e_comp->layers[x].clients) continue;
EINA_INLIST_REVERSE_FOREACH(e_comp->layers[x].clients, ec2)
if (!e_object_is_del(E_OBJECT(ec2)))
return ec2;
}
@ -3309,7 +3309,7 @@ e_client_refocus(void)
EINA_LIST_FOREACH(e_client_focus_stack_get(), l, ec)
if (ec->desk && ec->desk->visible && (!ec->iconic))
{
if (ec->comp->input_key_grabs || ec->comp->input_mouse_grabs) break;
if (e_comp->input_key_grabs || e_comp->input_mouse_grabs) break;
evas_object_focus_set(ec->frame, 1);
break;
}
@ -3424,7 +3424,7 @@ e_client_focused_set(E_Client *ec)
/* if there unfocus client is fullscreen and visible */
if ((!e_config->allow_above_fullscreen) &&
(ec_unfocus->fullscreen) && (!ec_unfocus->iconic) && (!ec_unfocus->hidden) &&
(ec_unfocus->zone == e_zone_current_get(ec_unfocus->comp)) &&
(ec_unfocus->zone == e_zone_current_get(e_comp)) &&
((ec_unfocus->desk == e_desk_current_get(ec_unfocus->zone)) || (ec_unfocus->sticky)))
{
Eina_Bool have_vis_child = EINA_FALSE;
@ -3463,7 +3463,7 @@ e_client_focused_set(E_Client *ec)
if (!focus_track_frozen)
e_client_focus_latest_set(ec);
e_hints_active_window_set(ec->comp->man, ec);
e_hints_active_window_set(e_comp->man, ec);
_e_client_event_simple(ec, E_EVENT_CLIENT_FOCUS_IN);
}
@ -3499,7 +3499,7 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
if ((e_config->focus_policy != E_FOCUS_CLICK) && (!ec->new_client) &&
(!e_config->disable_all_pointer_warps) &&
(!e_util_strcmp(ec->icccm.name, "VCLSalFrame")))
ecore_evas_pointer_warp(ec->comp->ee,
ecore_evas_pointer_warp(e_comp->ee,
ec->x + (ec->w / 2), ec->y + (ec->h / 2));
evas_object_focus_set(ec->frame, 1);
}
@ -3840,10 +3840,10 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
ec->fullscreen = 1;
#ifndef HAVE_WAYLAND_ONLY
if ((eina_list_count(ec->comp->zones) > 1) ||
if ((eina_list_count(e_comp->zones) > 1) ||
(policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
#else
if ((eina_list_count(ec->comp->zones) > 1) ||
if ((eina_list_count(e_comp->zones) > 1) ||
(policy == E_FULLSCREEN_RESIZE))
#endif
{
@ -3902,7 +3902,7 @@ e_client_unfullscreen(E_Client *ec)
e_remember_update(ec);
if (!ec->desk->fullscreen_clients)
e_comp_render_queue(ec->comp);
e_comp_render_queue(e_comp);
}
///////////////////////////////////////
@ -4308,7 +4308,7 @@ e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key)
{
int x, y;
evas_pointer_canvas_xy_get(ec->comp->evas, &x, &y);
evas_pointer_canvas_xy_get(e_comp->evas, &x, &y);
e_int_client_menu_show(ec, x, y, key, 0);
}
}
@ -4510,13 +4510,13 @@ e_client_resize_begin(E_Client *ec)
if ((ec->shaded) || (ec->shading) ||
(ec->fullscreen) || (ec->lock_user_size))
goto error;
if (!_e_client_action_input_win_new(ec)) goto error;
if (!_e_client_action_input_win_new()) goto error;
ecresize = ec;
_e_client_hook_call(E_CLIENT_HOOK_RESIZE_BEGIN, ec);
if (!e_client_util_resizing_get(ec))
{
if (ecresize == ec) ecresize = NULL;
_e_client_action_input_win_del(ec->comp);
_e_client_action_input_win_del(e_comp);
return EINA_FALSE;
}
if (!ec->lock_user_stacking)
@ -4751,7 +4751,7 @@ e_client_under_pointer_get(E_Desk *desk, E_Client *exclude)
if (exclude->zone)
desk = e_desk_current_get(exclude->zone);
else
desk = e_desk_current_get(e_zone_current_get(exclude->comp));
desk = e_desk_current_get(e_zone_current_get(e_comp));
}
}
@ -4766,7 +4766,7 @@ e_client_pointer_warp_to_center_now(E_Client *ec)
if (e_config->disable_all_pointer_warps) return 0;
if (warp_client == ec)
{
ecore_evas_pointer_warp(ec->comp->ee, warp_to_x, warp_to_y);
ecore_evas_pointer_warp(e_comp->ee, warp_to_x, warp_to_y);
warp_to = 0;
_e_client_pointer_warp_to_center_timer(NULL);
}
@ -4788,7 +4788,7 @@ e_client_pointer_warp_to_center(E_Client *ec)
if (e_config->disable_all_pointer_warps) return 0;
/* Only warp the pointer if it is not already in the area of
* the given border */
ecore_evas_pointer_xy_get(ec->comp->ee, &x, &y);
ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
if ((x >= ec->x) && (x <= (ec->x + ec->w)) &&
(y >= ec->y) && (y <= (ec->y + ec->h)))
{
@ -4819,7 +4819,7 @@ e_client_pointer_warp_to_center(E_Client *ec)
warp_to = 1;
warp_client = ec;
ecore_evas_pointer_xy_get(warp_client->comp->ee, &warp_x[0], &warp_y[0]);
ecore_evas_pointer_xy_get(e_comp->ee, &warp_x[0], &warp_y[0]);
if (warp_timer) ecore_timer_del(warp_timer);
warp_timer = ecore_timer_add(0.01, _e_client_pointer_warp_to_center_timer, ec);
return 1;
@ -4852,7 +4852,7 @@ e_client_redirected_set(E_Client *ec, Eina_Bool set)
EAPI Eina_Bool
e_client_is_stacking(const E_Client *ec)
{
return ec->comp->layers[e_comp_canvas_layer_map(ec->layer)].obj == ec->frame;
return e_comp->layers[e_comp_canvas_layer_map(ec->layer)].obj == ec->frame;
}
////////////////////////////////////////////

1
src/bin/e_client.h
View File

@ -222,7 +222,6 @@ struct E_Client
EINA_INLIST;
E_Pixmap *pixmap;
E_Comp *comp;
int depth;
int x, y, w, h; //frame+client geom
struct {

8
src/bin/e_comp.c
View File

@ -308,7 +308,7 @@ _e_comp_client_update(E_Client *ec)
e_pixmap_size_get(ec->pixmap, &pw, &ph);
if (e_pixmap_dirty_get(ec->pixmap) && (!ec->comp->nocomp))
if (e_pixmap_dirty_get(ec->pixmap) && (!e_comp->nocomp))
{
int w, h;
@ -328,7 +328,7 @@ _e_comp_client_update(E_Client *ec)
e_comp_object_render_update_add(ec->frame);
}
}
if ((!ec->comp->saver) && e_pixmap_size_get(ec->pixmap, &pw, &ph))
if ((!e_comp->saver) && e_pixmap_size_get(ec->pixmap, &pw, &ph))
{
//INF("PX DIRTY: PX(%dx%d) CLI(%dx%d)", pw, ph, ec->client.w, ec->client.h);
e_pixmap_image_refresh(ec->pixmap);
@ -635,7 +635,7 @@ _e_comp_shapes_update_comp_client_shape_comp_helper(E_Client *ec, Eina_Tiler *tb
{
x = rect->x, y = rect->y, w = rect->w, h = rect->h;
x += ec->client.x, y += ec->client.y;
E_RECTS_CLIP_TO_RECT(x, y, w, h, ec->comp->man->x, ec->comp->man->y, ec->comp->man->w, ec->comp->man->h);
E_RECTS_CLIP_TO_RECT(x, y, w, h, e_comp->man->x, e_comp->man->y, e_comp->man->w, e_comp->man->h);
if ((w < 1) || (h < 1)) continue;
//#ifdef SHAPE_DEBUG not sure we can shape check these?
//r = E_NEW(Eina_Rectangle, 1);
@ -1626,7 +1626,7 @@ e_comp_client_redirect_toggle(E_Client *ec)
ec->unredirected_single = !ec->unredirected_single;
e_client_redirected_set(ec, !ec->redirected);
ec->no_shape_cut = !ec->redirected;
e_comp_shape_queue(ec->comp);
e_comp_shape_queue(e_comp);
}
EAPI Eina_Bool

8
src/bin/e_comp.h
View File

@ -154,6 +154,8 @@ typedef enum
E_COMP_ENGINE_GL = 2
} E_Comp_Engine;
extern EAPI E_Comp *e_comp;
EINTERN Eina_Bool e_comp_init(void);
EAPI E_Comp *e_comp_new(void);
EAPI int e_comp_internal_save(void);
@ -198,13 +200,11 @@ e_comp_util_client_is_fullscreen(const E_Client *ec)
if ((!ec->visible) || (ec->input_only))
return EINA_FALSE;
return ((ec->client.x == 0) && (ec->client.y == 0) &&
((ec->client.w) >= ec->comp->man->w) &&
((ec->client.h) >= ec->comp->man->h) &&
((ec->client.w) >= e_comp->man->w) &&
((ec->client.h) >= e_comp->man->h) &&
(!ec->argb) && (!ec->shaped)
);
}
extern EAPI E_Comp *e_comp;
#endif
#endif

4
src/bin/e_comp_object.c
View File

@ -2472,7 +2472,7 @@ e_comp_object_client_add(E_Client *ec)
EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
if (ec->frame) return NULL;
_e_comp_smart_init();
o = evas_object_smart_add(ec->comp->evas, _e_comp_smart);
o = evas_object_smart_add(e_comp->evas, _e_comp_smart);
cw = evas_object_smart_data_get(o);
evas_object_data_set(o, "E_Client", ec);
cw->ec = ec;
@ -3199,7 +3199,7 @@ e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set)
if (set)
{
/* native requires gl enabled, texture from pixmap enabled, and a non-shaped client */
set = (cw->ec->comp->gl && e_comp_config_get()->texture_from_pixmap && (!cw->ec->shaped));
set = (e_comp->gl && e_comp_config_get()->texture_from_pixmap && (!cw->ec->shaped));
if (set)
set = e_pixmap_native_surface_init(cw->ec->pixmap, &ns);
}

84
src/bin/e_comp_wl.c
View File

@ -166,11 +166,11 @@ _e_comp_wl_evas_cb_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
if (!ec->comp_data->surface) return;
if (!eina_list_count(ec->comp->wl_comp_data->ptr.resources)) return;
if (!eina_list_count(e_comp->wl_comp_data->ptr.resources)) return;
wc = wl_resource_get_client(ec->comp_data->surface);
serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
EINA_LIST_FOREACH(ec->comp->wl_comp_data->ptr.resources, l, res)
serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
EINA_LIST_FOREACH(e_comp->wl_comp_data->ptr.resources, l, res)
{
if (!e_comp_wl_input_pointer_check(res)) continue;
if (wl_resource_get_client(res) != wc) continue;
@ -203,11 +203,11 @@ _e_comp_wl_evas_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob
if (!ec->comp_data->surface) return;
if (!eina_list_count(ec->comp->wl_comp_data->ptr.resources)) return;
if (!eina_list_count(e_comp->wl_comp_data->ptr.resources)) return;
wc = wl_resource_get_client(ec->comp_data->surface);
serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
EINA_LIST_FOREACH(ec->comp->wl_comp_data->ptr.resources, l, res)
serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
EINA_LIST_FOREACH(e_comp->wl_comp_data->ptr.resources, l, res)
{
if (!e_comp_wl_input_pointer_check(res)) continue;
if (wl_resource_get_client(res) != wc) continue;
@ -230,21 +230,21 @@ _e_comp_wl_evas_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o
if (e_object_is_del(E_OBJECT(ec))) return;
if (e_client_util_ignored_get(ec)) return;
ec->comp->wl_comp_data->ptr.x =
e_comp->wl_comp_data->ptr.x =
wl_fixed_from_int(ev->cur.canvas.x - ec->client.x);
ec->comp->wl_comp_data->ptr.y =
e_comp->wl_comp_data->ptr.y =
wl_fixed_from_int(ev->cur.canvas.y - ec->client.y);
if (!ec->comp_data->surface) return;
wc = wl_resource_get_client(ec->comp_data->surface);
EINA_LIST_FOREACH(ec->comp->wl_comp_data->ptr.resources, l, res)
EINA_LIST_FOREACH(e_comp->wl_comp_data->ptr.resources, l, res)
{
if (!e_comp_wl_input_pointer_check(res)) continue;
if (wl_resource_get_client(res) != wc) continue;
wl_pointer_send_motion(res, ev->timestamp,
ec->comp->wl_comp_data->ptr.x,
ec->comp->wl_comp_data->ptr.y);
e_comp->wl_comp_data->ptr.x,
e_comp->wl_comp_data->ptr.y);
}
}
@ -276,17 +276,17 @@ _e_comp_wl_evas_handle_mouse_button(E_Client *ec, uint32_t timestamp, uint32_t b
break;
}
ec->comp->wl_comp_data->ptr.button = btn;
e_comp->wl_comp_data->ptr.button = btn;
if (!ec->comp_data->surface) return EINA_FALSE;
if (!eina_list_count(ec->comp->wl_comp_data->ptr.resources))
if (!eina_list_count(e_comp->wl_comp_data->ptr.resources))
return EINA_TRUE;
wc = wl_resource_get_client(ec->comp_data->surface);
serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
EINA_LIST_FOREACH(ec->comp->wl_comp_data->ptr.resources, l, res)
EINA_LIST_FOREACH(e_comp->wl_comp_data->ptr.resources, l, res)
{
if (wl_resource_get_client(res) != wc) continue;
if (!e_comp_wl_input_pointer_check(res)) continue;
@ -344,7 +344,7 @@ _e_comp_wl_evas_cb_mouse_wheel(void *data, Evas *evas EINA_UNUSED, Evas_Object *
if (!ec->comp_data->surface) return;
wc = wl_resource_get_client(ec->comp_data->surface);
EINA_LIST_FOREACH(ec->comp->wl_comp_data->ptr.resources, l, res)
EINA_LIST_FOREACH(e_comp->wl_comp_data->ptr.resources, l, res)
{
if (!e_comp_wl_input_pointer_check(res)) continue;
if (wl_resource_get_client(res) != wc) continue;
@ -431,7 +431,7 @@ _e_comp_wl_client_focus(E_Client *ec)
ec->comp_data->focus_update = 1;
if (!ec->comp_data->surface) return;
if (!eina_list_count(ec->comp->wl_comp_data->kbd.resources)) return;
if (!eina_list_count(e_comp->wl_comp_data->kbd.resources)) return;
/* send keyboard_enter to all keyboard resources */
wc = wl_resource_get_client(ec->comp_data->surface);
@ -485,7 +485,7 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob
if (!(ec = data)) return;
cdata = ec->comp->wl_comp_data;
cdata = e_comp->wl_comp_data;
/* update keyboard modifier state */
wl_array_for_each(k, &cdata->kbd.keys)
@ -570,12 +570,12 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj EINA_UNUSED, void *event
y -= ay;
}
ec->comp_data->shell.configure_send(ec->comp_data->shell.surface,
ec->comp->wl_comp_data->resize.edges,
e_comp->wl_comp_data->resize.edges,
x, y);
}
else
ec->comp_data->shell.configure_send(ec->comp_data->shell.surface,
ec->comp->wl_comp_data->resize.edges,
e_comp->wl_comp_data->resize.edges,
ec->client.w, ec->client.h);
}
@ -604,7 +604,7 @@ _e_comp_wl_evas_cb_delete_request(void *data, Evas_Object *obj EINA_UNUSED, void
e_object_del(E_OBJECT(ec));
_e_comp_wl_focus_check(ec->comp);
_e_comp_wl_focus_check(e_comp);
/* TODO: Delete request send ??
* NB: No such animal wrt wayland */
@ -629,7 +629,7 @@ _e_comp_wl_evas_cb_kill_request(void *data, Evas_Object *obj EINA_UNUSED, void *
if (ec->visible) evas_object_hide(ec->frame);
if (!ec->internal) e_object_del(E_OBJECT(ec));
_e_comp_wl_focus_check(ec->comp);
_e_comp_wl_focus_check(e_comp);
}
static void
@ -1105,7 +1105,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
if (!ec->comp_data->mapped) goto unmapped;
/* put state damages into surface */
if ((!ec->comp->nocomp) && (ec->frame))
if ((!e_comp->nocomp) && (ec->frame))
{
EINA_LIST_FREE(state->damages, dmg)
{
@ -2123,7 +2123,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
E_FREE(ec->comp_data);
_e_comp_wl_focus_check(ec->comp);
_e_comp_wl_focus_check(e_comp);
}
static void
@ -2137,7 +2137,7 @@ _e_comp_wl_client_cb_post_new(void *data EINA_UNUSED, E_Client *ec)
if (ec->need_shape_export)
{
// ec->shape_changed = EINA_TRUE;
e_comp_shape_queue(ec->comp);
e_comp_shape_queue(e_comp);
ec->need_shape_export = EINA_FALSE;
}
}
@ -2243,10 +2243,10 @@ _e_comp_wl_client_cb_focus_set(void *data EINA_UNUSED, E_Client *ec)
else if (!ec->icccm.take_focus)
e_grabinput_focus(e_client_util_win_get(ec), E_FOCUS_METHOD_PASSIVE);
if (ec->comp->wl_comp_data->kbd.focus != ec->comp_data->surface)
if (e_comp->wl_comp_data->kbd.focus != ec->comp_data->surface)
{
ec->comp->wl_comp_data->kbd.focus = ec->comp_data->surface;
e_comp_wl_data_device_keyboard_focus_set(ec->comp->wl_comp_data);
e_comp->wl_comp_data->kbd.focus = ec->comp_data->surface;
e_comp_wl_data_device_keyboard_focus_set(e_comp->wl_comp_data);
}
}
@ -2263,10 +2263,10 @@ _e_comp_wl_client_cb_focus_unset(void *data EINA_UNUSED, E_Client *ec)
0, 0, 0);
}
_e_comp_wl_focus_check(ec->comp);
_e_comp_wl_focus_check(e_comp);
if (ec->comp->wl_comp_data->kbd.focus == ec->comp_data->surface)
ec->comp->wl_comp_data->kbd.focus = NULL;
if (e_comp->wl_comp_data->kbd.focus == ec->comp_data->surface)
e_comp->wl_comp_data->kbd.focus = NULL;
}
static void
@ -2277,31 +2277,31 @@ _e_comp_wl_client_cb_resize_begin(void *data EINA_UNUSED, E_Client *ec)
switch (ec->resize_mode)
{
case E_POINTER_RESIZE_T: // 1
ec->comp->wl_comp_data->resize.edges = 1;
e_comp->wl_comp_data->resize.edges = 1;
break;
case E_POINTER_RESIZE_B: // 2
ec->comp->wl_comp_data->resize.edges = 2;
e_comp->wl_comp_data->resize.edges = 2;
break;
case E_POINTER_RESIZE_L: // 4
ec->comp->wl_comp_data->resize.edges = 4;
e_comp->wl_comp_data->resize.edges = 4;
break;
case E_POINTER_RESIZE_R: // 8
ec->comp->wl_comp_data->resize.edges = 8;
e_comp->wl_comp_data->resize.edges = 8;
break;
case E_POINTER_RESIZE_TL: // 5
ec->comp->wl_comp_data->resize.edges = 5;
e_comp->wl_comp_data->resize.edges = 5;
break;
case E_POINTER_RESIZE_TR: // 9
ec->comp->wl_comp_data->resize.edges = 9;
e_comp->wl_comp_data->resize.edges = 9;
break;
case E_POINTER_RESIZE_BL: // 6
ec->comp->wl_comp_data->resize.edges = 6;
e_comp->wl_comp_data->resize.edges = 6;
break;
case E_POINTER_RESIZE_BR: // 10
ec->comp->wl_comp_data->resize.edges = 10;
e_comp->wl_comp_data->resize.edges = 10;
break;
default:
ec->comp->wl_comp_data->resize.edges = 0;
e_comp->wl_comp_data->resize.edges = 0;
break;
}
}
@ -2312,8 +2312,8 @@ _e_comp_wl_client_cb_resize_end(void *data EINA_UNUSED, E_Client *ec)
if (e_object_is_del(E_OBJECT(ec))) return;
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
ec->comp->wl_comp_data->resize.edges = 0;
ec->comp->wl_comp_data->resize.resource = NULL;
e_comp->wl_comp_data->resize.edges = 0;
e_comp->wl_comp_data->resize.resource = NULL;
if (ec->pending_resize)
{

102
src/bin/e_comp_x.c
View File

@ -651,7 +651,7 @@ _e_comp_x_client_stack(E_Client *ec)
/* just layer stack */
if (!win)
{
win = ec->comp->layers[e_comp_canvas_layer_map(ec->layer)].win;
win = e_comp->layers[e_comp_canvas_layer_map(ec->layer)].win;
mode = ECORE_X_WINDOW_STACK_BELOW;
}
ecore_x_window_configure(_e_comp_x_client_window_get(ec),
@ -659,7 +659,7 @@ _e_comp_x_client_stack(E_Client *ec)
ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
0, 0, 0, 0, 0, win, mode);
_e_comp_x_post_client_idler_add(ec);
ec->comp->x_comp_data->restack = 1;
e_comp->x_comp_data->restack = 1;
EINA_LIST_FOREACH(ec->e.state.video_child, l, ec2)
evas_object_stack_below(ec2->frame, ec->frame);
}
@ -940,13 +940,11 @@ _e_comp_x_evas_stack_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void
}
static void
_e_comp_x_evas_unfullscreen_zoom_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
_e_comp_x_evas_unfullscreen_zoom_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Client *ec = data;
if ((screen_size.width != -1) && (screen_size.height != -1))
{
ecore_x_randr_screen_primary_output_size_set(ec->comp->man->root,
ecore_x_randr_screen_primary_output_size_set(e_comp->man->root,
screen_size_index);
screen_size.width = -1;
screen_size.height = -1;
@ -960,11 +958,11 @@ _e_comp_x_evas_fullscreen_zoom_cb(void *data, Evas_Object *obj EINA_UNUSED, void
Ecore_X_Randr_Screen_Size_MM *sizes;
int num_sizes, i, best_size_index = 0;
ecore_x_randr_screen_primary_output_current_size_get(ec->comp->man->root,
ecore_x_randr_screen_primary_output_current_size_get(e_comp->man->root,
&screen_size.width,
&screen_size.height,
NULL, NULL, NULL);
sizes = ecore_x_randr_screen_primary_output_sizes_get(ec->comp->man->root,
sizes = ecore_x_randr_screen_primary_output_sizes_get(e_comp->man->root,
&num_sizes);
if (sizes)
{
@ -989,7 +987,7 @@ _e_comp_x_evas_fullscreen_zoom_cb(void *data, Evas_Object *obj EINA_UNUSED, void
((best_size.width != screen_size.width) ||
(best_size.height != screen_size.height)))
{
if (ecore_x_randr_screen_primary_output_size_set(ec->comp->man->root,
if (ecore_x_randr_screen_primary_output_size_set(e_comp->man->root,
best_size_index))
screen_size_index = best_size_index;
evas_object_geometry_set(ec->frame, 0, 0, best_size.width, best_size.height);
@ -1187,7 +1185,7 @@ _e_comp_x_show_helper(E_Client *ec)
_e_comp_x_post_client_idler_add(ec);
ec->post_move = 1;
ec->post_resize = 1;
ec->comp->x_comp_data->restack = 1;
e_comp->x_comp_data->restack = 1;
}
}
}
@ -1296,7 +1294,7 @@ _e_comp_x_hide(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Windo
}
}
if (hid)
_e_comp_x_focus_check(ec->comp);
_e_comp_x_focus_check(e_comp);
return ECORE_CALLBACK_PASS_ON;
}
@ -1468,7 +1466,7 @@ _e_comp_x_configure_request(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore
ec->saved.x = x;
ec->saved.y = y;
zone = e_comp_zone_xy_get(ec->comp, x, y);
zone = e_comp_zone_xy_get(e_comp, x, y);
if (zone && (zone->x || zone->y))
{
ec->saved.x -= zone->x;
@ -1478,13 +1476,13 @@ _e_comp_x_configure_request(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore
else
{
/* client is completely outside the screen, policy does not allow */
if (((!E_INTERSECTS(x, y, ec->w, ec->h, ec->comp->man->x, ec->comp->man->y, ec->comp->man->w - 5, ec->comp->man->h - 5)) &&
if (((!E_INTERSECTS(x, y, ec->w, ec->h, e_comp->man->x, e_comp->man->y, e_comp->man->w - 5, e_comp->man->h - 5)) &&
(e_config->screen_limits != E_CLIENT_OFFSCREEN_LIMIT_ALLOW_FULL)) ||
/* client is partly outside the zone, policy does not allow */
(((!E_INSIDE(x, y, ec->comp->man->x, ec->comp->man->y, ec->comp->man->w - 5, ec->comp->man->h - 5)) &&
(!E_INSIDE(x + ec->w, y, ec->comp->man->x, ec->comp->man->y, ec->comp->man->w - 5, ec->comp->man->h - 5)) &&
(!E_INSIDE(x, y + ec->h, ec->comp->man->x, ec->comp->man->y, ec->comp->man->w - 5, ec->comp->man->h - 5)) &&
(!E_INSIDE(x + ec->w, y + ec->h, ec->comp->man->x, ec->comp->man->y, ec->comp->man->w - 5, ec->comp->man->h - 5))) &&
(((!E_INSIDE(x, y, e_comp->man->x, e_comp->man->y, e_comp->man->w - 5, e_comp->man->h - 5)) &&
(!E_INSIDE(x + ec->w, y, e_comp->man->x, e_comp->man->y, e_comp->man->w - 5, e_comp->man->h - 5)) &&
(!E_INSIDE(x, y + ec->h, e_comp->man->x, e_comp->man->y, e_comp->man->w - 5, e_comp->man->h - 5)) &&
(!E_INSIDE(x + ec->w, y + ec->h, e_comp->man->x, e_comp->man->y, e_comp->man->w - 5, e_comp->man->h - 5))) &&
(e_config->screen_limits == E_CLIENT_OFFSCREEN_LIMIT_ALLOW_NONE))
)
e_comp_object_util_center(ec->frame);
@ -1860,7 +1858,7 @@ _e_comp_x_message(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Cl
{
if (e_util_strcmp(p, ec->desk->window_profile))
{
E_Desk *desk = e_comp_desk_window_profile_get(ec->comp, p);
E_Desk *desk = e_comp_desk_window_profile_get(e_comp, p);
if (desk) e_client_desk_set(ec, desk);
}
}
@ -1885,7 +1883,7 @@ _e_comp_x_message(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Cl
break;
default:
if (e_client_action_get() || ec->comp->nocomp)
if (e_client_action_get() || e_comp->nocomp)
{
/* be helpful and ignore activates during window actions, but still set urgent */
e_client_urgent_set(ec, 1);
@ -1942,8 +1940,8 @@ _e_comp_x_message(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Cl
x = ev->data.l[1];
y = ev->data.l[2];
e_int_client_menu_show(ec,
e_comp_canvas_x_root_adjust(ec->comp, x),
e_comp_canvas_y_root_adjust(ec->comp, y),
e_comp_canvas_x_root_adjust(e_comp, x),
e_comp_canvas_y_root_adjust(e_comp, y),
0, 0);
}
else if (ev->message_type == ATM_NETWM_PERFORM_BUTTON_ACTION)
@ -2028,7 +2026,7 @@ _e_comp_x_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_M
ec = _e_comp_x_client_find_by_window(ev->win);
if (!ec) return ECORE_CALLBACK_RENEW;
if (ec->comp_data->deleted) return ECORE_CALLBACK_RENEW;
e_client_mouse_in(ec, e_comp_canvas_x_root_adjust(ec->comp, ev->root.x), e_comp_canvas_x_root_adjust(ec->comp, ev->root.y));
e_client_mouse_in(ec, e_comp_canvas_x_root_adjust(e_comp, ev->root.x), e_comp_canvas_x_root_adjust(e_comp, ev->root.y));
return ECORE_CALLBACK_RENEW;
}
@ -2048,7 +2046,7 @@ _e_comp_x_mouse_out(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_
ec = _e_comp_x_client_find_by_window(ev->win);
if (!ec) return ECORE_CALLBACK_RENEW;
if (ec->comp_data->deleted) return ECORE_CALLBACK_RENEW;
e_client_mouse_out(ec, e_comp_canvas_x_root_adjust(ec->comp, ev->root.x), e_comp_canvas_x_root_adjust(ec->comp, ev->root.y));
e_client_mouse_out(ec, e_comp_canvas_x_root_adjust(e_comp, ev->root.x), e_comp_canvas_x_root_adjust(e_comp, ev->root.y));
return ECORE_CALLBACK_RENEW;
}
@ -2282,7 +2280,7 @@ _e_comp_x_sync_alarm(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event
evas_object_resize(ec->internal_elm_win, ec->client.w, ec->client.h);
}
ecore_x_pointer_xy_get(ec->comp->man->root,
ecore_x_pointer_xy_get(e_comp->man->root,
&ec->mouse.current.mx,
&ec->mouse.current.my);
@ -2544,7 +2542,7 @@ _e_comp_x_damage(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Dam
}
//WRN("DAMAGE %p: %dx%d", ec, ev->area.width, ev->area.height);
if (ec->comp->nocomp)
if (e_comp->nocomp)
e_pixmap_dirty(ec->pixmap);
/* discard unwanted xy position of first damage
* to avoid wrong composition for override redirect window */
@ -2595,10 +2593,10 @@ static void
_e_comp_x_hook_client_eval_end(void *d EINA_UNUSED, E_Client *ec)
{
E_COMP_X_PIXMAP_CHECK;
if (ec->comp->x_comp_data->restack && (!ec->comp->new_clients))
if (e_comp->x_comp_data->restack && (!e_comp->new_clients))
{
e_hints_client_stacking_set();
ec->comp->x_comp_data->restack = 0;
e_comp->x_comp_data->restack = 0;
}
}
@ -2635,7 +2633,7 @@ _e_comp_x_client_shape_rects_check(E_Client *ec, Ecore_X_Rectangle *rects, int n
ec->shape_rects = (Eina_Rectangle*)rects;
ec->shape_rects_num = num;
ec->shape_changed = 1;
e_comp_shape_queue(ec->comp);
e_comp_shape_queue(e_comp);
}
else
free(rects);
@ -2704,10 +2702,10 @@ _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec)
h = MAX(ec->client.h, 1);
/* match ec parent argbness */
if (ec->argb)
pwin = ecore_x_window_manager_argb_new(ec->comp->man->root, ec->client.x, ec->client.y, w, h);
pwin = ecore_x_window_manager_argb_new(e_comp->man->root, ec->client.x, ec->client.y, w, h);
else
{
pwin = ecore_x_window_override_new(ec->comp->man->root, ec->client.x, ec->client.y, w, h);
pwin = ecore_x_window_override_new(e_comp->man->root, ec->client.x, ec->client.y, w, h);
ecore_x_window_shape_events_select(pwin, !ec->internal); //let's just agree never to do this with our own windows...
}
@ -3222,7 +3220,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
ec->y = zy + zh - ec->h;
// <--
if (e_comp_zone_xy_get(ec->comp, ec->x, ec->y))
if (e_comp_zone_xy_get(e_comp, ec->x, ec->y))
{
if (!E_INSIDE(ec->x, ec->y, ec->zone->x, ec->zone->y, ec->zone->w, ec->zone->h))
{
@ -3230,11 +3228,11 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
ec->y = E_CLAMP(ec->y, ec->zone->y, ec->zone->y + ec->zone->h);
}
/* some application failing to correctly center a window */
if (eina_list_count(ec->comp->zones) > 1)
if (eina_list_count(e_comp->zones) > 1)
{
if (abs((ec->comp->man->w / 2) - ec->x - (ec->w / 2)) < 3)
if (abs((e_comp->man->w / 2) - ec->x - (ec->w / 2)) < 3)
ec->x = ((ec->zone->x + ec->zone->w) / 2) - (ec->w / 2);
if (abs((ec->comp->man->h / 2) - ec->y - (ec->h / 2)) < 3)
if (abs((e_comp->man->h / 2) - ec->y - (ec->h / 2)) < 3)
ec->y = ((ec->zone->y + ec->zone->h) / 2) - (ec->h / 2);
}
ec->changes.pos = 1;
@ -3715,7 +3713,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
if (changed || (pshaped != ec->shaped_input))
{
ec->need_shape_merge = 1;
e_comp_shape_queue(ec->comp);
e_comp_shape_queue(e_comp);
}
}
if (ec->changes.prop || ec->mwm.fetch.hints)
@ -3899,7 +3897,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
E_Zone *zone;
E_Desk *desk;
zone = e_comp_zone_number_get(ec->comp, inst->screen);
zone = e_comp_zone_number_get(e_comp, inst->screen);
if (zone) e_client_zone_set(ec, zone);
desk = e_desk_at_xy_get(ec->zone, inst->desk_x,
inst->desk_y);
@ -3930,7 +3928,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
ecl = ec->leader;
if (!ecl)
{
E_Client *child = e_client_bottom_get(ec->comp);
E_Client *child = e_client_bottom_get(e_comp);
do
{
@ -3978,7 +3976,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
}
else
{
desk = e_comp_desk_window_profile_get(ec->comp, p);
desk = e_comp_desk_window_profile_get(e_comp, p);
if (desk)
{
e_client_desk_set(ec, desk);
@ -4006,7 +4004,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
for (i = 0; i < ec->e.state.profile.num; i++)
{
p2 = ec->e.state.profile.available_list[i];
desk = e_comp_desk_window_profile_get(ec->comp, p2);
desk = e_comp_desk_window_profile_get(e_comp, p2);
if (desk)
{
e_client_desk_set(ec, desk);
@ -4086,7 +4084,7 @@ static void
_e_comp_x_hook_client_focus_unset(void *d EINA_UNUSED, E_Client *ec)
{
E_COMP_X_PIXMAP_CHECK;
_e_comp_x_focus_check(ec->comp);
_e_comp_x_focus_check(e_comp);
}
static void
@ -4095,7 +4093,7 @@ _e_comp_x_hook_client_focus_set(void *d EINA_UNUSED, E_Client *ec)
focus_time = ecore_x_current_time_get();
if ((e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_X))
{
e_grabinput_focus(ec->comp->ee_win, E_FOCUS_METHOD_PASSIVE);
e_grabinput_focus(e_comp->ee_win, E_FOCUS_METHOD_PASSIVE);
return;
}
@ -4123,11 +4121,11 @@ _e_comp_x_hook_client_redirect(void *d EINA_UNUSED, E_Client *ec)
ecore_x_composite_redirect_window(_e_comp_x_client_window_get(ec), ECORE_X_COMPOSITE_UPDATE_MANUAL);
ec->comp_data->unredirected_single = 0;
}
else if (ec->comp->nocomp)
else if (e_comp->nocomp)
{
/* first window */
e_comp_x_nocomp_end(ec->comp);
ecore_x_window_reparent(_e_comp_x_client_window_get(ec), ec->comp->man->root, ec->client.x, ec->client.y);
e_comp_x_nocomp_end(e_comp);
ecore_x_window_reparent(_e_comp_x_client_window_get(ec), e_comp->man->root, ec->client.x, ec->client.y);
_e_comp_x_client_stack(ec);
}
if (!ec->comp_data->damage)
@ -4150,13 +4148,13 @@ _e_comp_x_hook_client_unredirect(void *d EINA_UNUSED, E_Client *ec)
if (ec->unredirected_single && (!ec->comp_data->unredirected_single))
{
ecore_x_composite_unredirect_window(_e_comp_x_client_window_get(ec), ECORE_X_COMPOSITE_UPDATE_MANUAL);
ecore_x_window_reparent(_e_comp_x_client_window_get(ec), ec->comp->win, ec->client.x, ec->client.y);
ecore_x_window_reparent(_e_comp_x_client_window_get(ec), e_comp->win, ec->client.x, ec->client.y);
ecore_x_window_raise(_e_comp_x_client_window_get(ec));
ec->comp_data->unredirected_single = 1;
}
if (!ec->comp->nocomp) return; //wait for it...
ecore_x_composite_unredirect_subwindows(ec->comp->man->root, ECORE_X_COMPOSITE_UPDATE_MANUAL);
ecore_x_window_hide(ec->comp->win);
if (!e_comp->nocomp) return; //wait for it...
ecore_x_composite_unredirect_subwindows(e_comp->man->root, ECORE_X_COMPOSITE_UPDATE_MANUAL);
ecore_x_window_hide(e_comp->win);
}
static void
@ -4179,7 +4177,7 @@ _e_comp_x_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
{
if (stopping)
{
ecore_x_window_reparent(win, ec->comp->man->root,
ecore_x_window_reparent(win, e_comp->man->root,
ec->client.x, ec->client.y);
ecore_x_window_configure(win,
ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
@ -4190,7 +4188,7 @@ _e_comp_x_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
else
/* put the window back where we found it to prevent annoying dancing windows */
ecore_x_window_reparent(win, ec->comp->man->root,
ecore_x_window_reparent(win, e_comp->man->root,
ec->comp_data->initial_attributes.x,
ec->comp_data->initial_attributes.y);
if (!ec->internal)
@ -4232,7 +4230,7 @@ _e_comp_x_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
if (post_clients)
post_clients = eina_list_remove(post_clients, ec);
_e_comp_x_focus_check(ec->comp);
_e_comp_x_focus_check(e_comp);
}
static void
@ -5152,7 +5150,7 @@ _e_comp_x_setup(E_Comp *c, Ecore_X_Window root, int w, int h)
ec->lock_client_stacking = 1;
ec->internal = 1;
ec->visible = 1;
ec->comp->layers[i].obj = ec->frame;
e_comp->layers[i].obj = ec->frame;
evas_object_layer_set(ec->frame, e_comp_canvas_layer_map_to(i));
evas_object_pass_events_set(ec->frame, 1);
evas_object_show(ec->frame);

12
src/bin/e_int_client_menu.c
View File

@ -138,7 +138,7 @@ e_int_client_menu_create(E_Client *ec)
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
if ((!ec->sticky) && ((eina_list_count(ec->comp->zones) > 1) || (ec->zone->desk_x_count > 1) || (ec->zone->desk_y_count > 1)))
if ((!ec->sticky) && ((eina_list_count(e_comp->zones) > 1) || (ec->zone->desk_x_count > 1) || (ec->zone->desk_y_count > 1)))
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Move to"));
@ -218,7 +218,7 @@ e_int_client_menu_create(E_Client *ec)
subm = e_menu_new();
e_menu_item_submenu_set(mi, subm);
e_object_unref(E_OBJECT(subm));
e_object_data_set(E_OBJECT(subm), ec->comp);
e_object_data_set(E_OBJECT(subm), e_comp);
if (e_pixmap_type_get(ec->pixmap) == E_PIXMAP_TYPE_X)
{
mi = e_menu_item_new(subm);
@ -968,13 +968,13 @@ _e_client_menu_cb_align_setup(E_Client *ec, Evas_Object_Event_Cb cb)
n.urgency = E_NOTIFICATION_NOTIFY_URGENCY_NORMAL;
e_notification_client_send(&n, NULL, NULL);
o = evas_object_rectangle_add(ec->comp->evas);
evas_object_resize(o, ec->comp->man->w, ec->comp->man->h);
o = evas_object_rectangle_add(e_comp->evas);
evas_object_resize(o, e_comp->man->w, e_comp->man->h);
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_layer_set(o, E_LAYER_POPUP);
evas_object_show(o);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, cb, ec);
e_comp_shape_queue(ec->comp);
e_comp_shape_queue(e_comp);
}
static Evas_Object *
@ -1202,7 +1202,7 @@ _e_client_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
e_menu_item_submenu_set(mi, subm);
e_object_unref(E_OBJECT(subm));
EINA_LIST_FOREACH(ec->comp->zones, l, zone)
EINA_LIST_FOREACH(e_comp->zones, l, zone)
{
if (zones > 1)
{

4
src/bin/e_maximize.c
View File

@ -43,7 +43,7 @@ e_maximize_client_dock_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2)
cy2 = ec->zone->y + ec->zone->h;
if (y2) cy2 = *y2;
E_CLIENT_FOREACH(ec->comp, ec2)
E_CLIENT_FOREACH(e_comp, ec2)
{
enum
{
@ -152,7 +152,7 @@ e_maximize_client_client_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2,
E_Maximize_Rect *r;
E_Client *ec2;
E_CLIENT_FOREACH(ec->comp, ec2)
E_CLIENT_FOREACH(e_comp, ec2)
{
if ((ec2->zone != ec->zone) || (ec == ec2) || (ec2->desk != ec->desk && !ec2->sticky) || (ec2->iconic))
continue;

2
src/bin/e_utils.h
View File

@ -80,7 +80,7 @@ e_util_pointer_center(const E_Client *ec)
if (ec->zone)
x = ec->zone->x, y = ec->zone->y;
if ((e_config->focus_policy != E_FOCUS_CLICK) && (!e_config->disable_all_pointer_warps))
ecore_evas_pointer_warp(ec->comp->ee,
ecore_evas_pointer_warp(e_comp->ee,
x + ec->x + (ec->w / 2),
y + ec->y + (ec->h / 2));
}

2
src/modules/contact/e_policy.c
View File

@ -237,7 +237,7 @@ _cb_hook_layout(E_Comp *comp)
else
{
#warning X ONLY! SPANK! SPANK! SPANK!!!
if (ec->comp_data->illume.conformant.conformant)
if (e_comp_data->illume.conformant.conformant)
{
if (kbd_on != want_kbd)
{

4
src/modules/everything/evry.c
View File

@ -188,7 +188,7 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params, Eina_Bool popup)
if (ec)
{
#ifndef HAVE_WAYLAND_ONLY
if (ec->comp->comp_type == E_PIXMAP_TYPE_X)
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
ecore_x_netwm_window_type_set(elm_win_window_id_get(win->ewin),
ECORE_X_WINDOW_TYPE_UTILITY);
#endif
@ -1929,7 +1929,7 @@ _evry_cb_key_down(void *data, int type __UNUSED__, void *event)
ec = e_win_client_get(ewin);
elm_win_borderless_set(ewin, 0);
#ifndef HAVE_WAYLAND_ONLY
if (ec->comp->comp_type == E_PIXMAP_TYPE_X)
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
ecore_x_netwm_window_type_set(elm_win_window_id_get(ewin),
ECORE_X_WINDOW_TYPE_DIALOG);
#endif

6
src/modules/illume2/policies/illume/policy.c
View File

@ -129,7 +129,7 @@ _policy_border_hide_above(E_Client *ec)
if (!ec) return;
E_CLIENT_REVERSE_FOREACH(ec->comp, b)
E_CLIENT_REVERSE_FOREACH(e_comp, b)
{
if (e_client_util_ignored_get(b)) continue;
if (b->layer <= ec->layer) break;
@ -157,7 +157,7 @@ _policy_border_hide_below(E_Client *ec)
if (!ec) return;
E_CLIENT_FOREACH(ec->comp, b)
E_CLIENT_FOREACH(e_comp, b)
{
if (e_client_util_ignored_get(b)) continue;
/* break if it's the same client */
@ -209,7 +209,7 @@ _policy_border_show_below(E_Client *ec)
}
}
E_CLIENT_FOREACH(ec->comp, b)
E_CLIENT_FOREACH(e_comp, b)
{
if (e_client_util_ignored_get(b)) continue;
/* break if it's the same border */

4
src/modules/illume2/policies/tablet/policy.c
View File

@ -117,7 +117,7 @@ _policy_border_hide_below(E_Client *ec)
if (!ec) return;
/* Find the windows below this one */
E_CLIENT_FOREACH(ec->comp, b)
E_CLIENT_FOREACH(e_comp, b)
{
if (e_client_util_ignored_get(b)) continue;
if (b->layer < E_LAYER_CLIENT_BELOW) continue;
@ -172,7 +172,7 @@ _policy_border_show_below(E_Client *ec)
}
/* Find the windows below this one */
E_CLIENT_FOREACH(ec->comp, b)
E_CLIENT_FOREACH(e_comp, b)
{
if (e_client_util_ignored_get(b)) continue;
if (b->layer < E_LAYER_CLIENT_BELOW) continue;

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

@ -1159,7 +1159,7 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U
evas_object_geometry_get(pw->o_mirror, &x, &y, &w, &h);
evas_object_hide(pw->o_mirror);
drag = e_drag_new(pw->client->comp,
drag = e_drag_new(e_comp,
x, y, drag_types, 2, pw->desk->pager, -1,
_pager_window_cb_drag_convert,
_pager_window_cb_drag_finished);

4
src/modules/winlist/e_winlist.c
View File

@ -825,7 +825,7 @@ _e_winlist_client_add(E_Client *ec, E_Zone *zone, E_Desk *desk)
if (!ww) return EINA_FALSE;
ww->client = ec;
_wins = eina_list_append(_wins, ww);
o = edje_object_add(ec->comp->evas);
o = edje_object_add(e_comp->evas);
E_FILL(o);
e_comp_object_util_del_list_append(_winlist, o);
ww->bg_object = o;
@ -835,7 +835,7 @@ _e_winlist_client_add(E_Client *ec, E_Zone *zone, E_Desk *desk)
evas_object_show(o);
if (edje_object_part_exists(ww->bg_object, "e.swallow.icon"))
{
o = e_client_icon_add(ec, ec->comp->evas);
o = e_client_icon_add(ec, e_comp->evas);
ww->icon_object = o;
e_comp_object_util_del_list_append(_winlist, o);
edje_object_part_swallow(ww->bg_object, "e.swallow.icon", o);

72
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -104,21 +104,21 @@ _e_shell_surface_destroy(struct wl_resource *resource)
{
if (e_object_is_del(E_OBJECT(ec))) return;
if (ec->comp_data)
if (e_comp_data)
{
if (ec->comp_data->mapped)
if (e_comp_data->mapped)
{
if ((ec->comp_data->shell.surface) &&
(ec->comp_data->shell.unmap))
ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
if ((e_comp_data->shell.surface) &&
(e_comp_data->shell.unmap))
e_comp_data->shell.unmap(e_comp_data->shell.surface);
}
if (ec->parent)
{
ec->parent->transients =
eina_list_remove(ec->parent->transients, ec);
}
/* wl_resource_destroy(ec->comp_data->shell.surface); */
ec->comp_data->shell.surface = NULL;
/* wl_resource_destroy(e_comp_data->shell.surface); */
e_comp_data->shell.surface = NULL;
}
}
}
@ -277,7 +277,7 @@ _e_shell_surface_cb_toplevel_set(struct wl_client *client EINA_UNUSED, struct wl
if (!ec->internal)
ec->border.changed = ec->changes.border = !ec->borderless;
ec->netwm.type = E_WINDOW_TYPE_NORMAL;
ec->comp_data->set_win_type = EINA_TRUE;
e_comp_data->set_win_type = EINA_TRUE;
if ((!ec->lock_user_maximize) && (ec->maximized))
e_client_unmaximize(ec, E_MAXIMIZE_BOTH);
if ((!ec->lock_user_fullscreen) && (ec->fullscreen))
@ -331,10 +331,10 @@ _e_shell_surface_cb_popup_set(struct wl_client *client EINA_UNUSED, struct wl_re
return;
}
if (ec->comp_data)
if (e_comp_data)
{
ec->comp_data->popup.x = x;
ec->comp_data->popup.y = y;
e_comp_data->popup.x = x;
e_comp_data->popup.y = y;
}
if (!ec->internal)
@ -344,7 +344,7 @@ _e_shell_surface_cb_popup_set(struct wl_client *client EINA_UNUSED, struct wl_re
ec->border.changed = ec->changes.border = !ec->borderless;
ec->changes.icon = !!ec->icccm.class;
ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU;
ec->comp_data->set_win_type = EINA_TRUE;
e_comp_data->set_win_type = EINA_TRUE;
ec->layer = E_LAYER_CLIENT_POPUP;
/* set this client as a transient for parent */
@ -467,10 +467,10 @@ _e_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_Coor
(ec->netwm.type == E_WINDOW_TYPE_POPUP_MENU) ||
(ec->netwm.type == E_WINDOW_TYPE_DROPDOWN_MENU))
{
x = E_CLAMP(ec->parent->client.x + ec->comp_data->popup.x,
x = E_CLAMP(ec->parent->client.x + e_comp_data->popup.x,
ec->parent->client.x,
ec->parent->client.x + ec->parent->client.w - ec->client.w);
y = E_CLAMP(ec->parent->client.y + ec->comp_data->popup.y,
y = E_CLAMP(ec->parent->client.y + e_comp_data->popup.y,
ec->parent->client.y,
ec->parent->client.y + ec->parent->client.h - ec->client.h);
}
@ -494,8 +494,8 @@ _e_shell_surface_ping(struct wl_resource *resource)
return;
}
serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
wl_shell_surface_send_ping(ec->comp_data->shell.surface, serial);
serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
wl_shell_surface_send_ping(e_comp_data->shell.surface, serial);
}
static void
@ -513,12 +513,12 @@ _e_shell_surface_map(struct wl_resource *resource)
}
/* map this surface if needed */
if ((!ec->comp_data->mapped) && (e_pixmap_usable_get(ec->pixmap)))
if ((!e_comp_data->mapped) && (e_pixmap_usable_get(ec->pixmap)))
{
ec->visible = EINA_TRUE;
evas_object_geometry_set(ec->frame, ec->x, ec->y, ec->w, ec->h);
evas_object_show(ec->frame);
ec->comp_data->mapped = EINA_TRUE;
e_comp_data->mapped = EINA_TRUE;
}
}
@ -536,11 +536,11 @@ _e_shell_surface_unmap(struct wl_resource *resource)
return;
}
if (ec->comp_data->mapped)
if (e_comp_data->mapped)
{
ec->visible = EINA_FALSE;
evas_object_hide(ec->frame);
ec->comp_data->mapped = EINA_FALSE;
e_comp_data->mapped = EINA_FALSE;
}
}
@ -578,7 +578,7 @@ _e_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resource *reso
ec->netwm.ping = EINA_TRUE;
/* get the client data */
if (!(cdata = ec->comp_data))
if (!(cdata = e_comp_data))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -660,7 +660,7 @@ _e_xdg_shell_surface_configure_send(struct wl_resource *resource, uint32_t edges
if (ec->netwm.type != E_WINDOW_TYPE_POPUP_MENU)
{
serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
xdg_surface_send_configure(resource, width, height, &states, serial);
}
wl_array_release(&states);
@ -881,7 +881,7 @@ _e_xdg_shell_surface_cb_window_geometry_set(struct wl_client *client EINA_UNUSED
"No Client For Shell Surface");
return;
}
EINA_RECTANGLE_SET(&ec->comp_data->shell.window, x, y, w, h);
EINA_RECTANGLE_SET(&e_comp_data->shell.window, x, y, w, h);
//DBG("XDG_SHELL: Window Geom Set: %d \t%d %d, %d %d", wl_resource_get_id(resource), x, y, w, h);
}
@ -1028,8 +1028,8 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_
(ec->netwm.type == E_WINDOW_TYPE_POPUP_MENU) ||
(ec->netwm.type == E_WINDOW_TYPE_DROPDOWN_MENU))
{
x = ec->parent->client.x + ec->comp_data->popup.x;
y = ec->parent->client.y + ec->comp_data->popup.y;
x = ec->parent->client.x + e_comp_data->popup.x;
y = ec->parent->client.y + e_comp_data->popup.y;
}
}
@ -1056,10 +1056,10 @@ _e_xdg_shell_surface_ping(struct wl_resource *resource)
return;
}
if (ec->comp->wl_comp_data->shell_interface.xdg_shell)
if (e_comp->wl_comp_data->shell_interface.xdg_shell)
{
serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
xdg_shell_send_ping(ec->comp->wl_comp_data->shell_interface.xdg_shell, serial);
serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
xdg_shell_send_ping(e_comp->wl_comp_data->shell_interface.xdg_shell, serial);
}
}
@ -1079,12 +1079,12 @@ _e_xdg_shell_surface_map(struct wl_resource *resource)
return;
}
if ((!ec->comp_data->mapped) && (e_pixmap_usable_get(ec->pixmap)))
if ((!e_comp_data->mapped) && (e_pixmap_usable_get(ec->pixmap)))
{
/* map this surface if needed */
ec->visible = EINA_TRUE;
evas_object_show(ec->frame);
ec->comp_data->mapped = EINA_TRUE;
e_comp_data->mapped = EINA_TRUE;
/* FIXME: sometimes popup surfaces Do Not raise above their
* respective parents... */
@ -1109,11 +1109,11 @@ _e_xdg_shell_surface_unmap(struct wl_resource *resource)
return;
}
if (ec->comp_data->mapped)
if (e_comp_data->mapped)
{
ec->visible = EINA_FALSE;
evas_object_hide(ec->frame);
ec->comp_data->mapped = EINA_FALSE;
e_comp_data->mapped = EINA_FALSE;
}
}
@ -1154,7 +1154,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
ec->netwm.ping = EINA_TRUE;
/* get the client data */
if (!(cdata = ec->comp_data))
if (!(cdata = e_comp_data))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1199,7 +1199,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
if ((!ec->internal) || (!ec->borderless))
ec->border.changed = ec->changes.border = !ec->borderless;
ec->netwm.type = E_WINDOW_TYPE_NORMAL;
ec->comp_data->set_win_type = EINA_TRUE;
e_comp_data->set_win_type = EINA_TRUE;
}
static void
@ -1251,7 +1251,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
}
/* get the client data */
if (!(cdata = ec->comp_data))
if (!(cdata = e_comp_data))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1304,7 +1304,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
ec->border.changed = ec->changes.border = !ec->borderless;
ec->changes.icon = !!ec->icccm.class;
ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU;
ec->comp_data->set_win_type = EINA_TRUE;
e_comp_data->set_win_type = EINA_TRUE;
evas_object_layer_set(ec->frame, E_LAYER_CLIENT_POPUP);
e_client_focus_stack_set(eina_list_remove(e_client_focus_stack_get(), ec));