enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e_client functions no longer require E_Comp param

This commit is contained in:
Mike Blumenkrantz 2015-03-13 16:48:29 -04:00
parent d00127c2f5
commit 1736d1ecb9
16 changed files with 61 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/bin/e_client.c
View File

@ -372,11 +372,11 @@ _e_client_event_zone_set_free(void *d EINA_UNUSED, E_Event_Client_Zone_Set *ev)
////////////////////////////////////////////////
static int
_e_client_action_input_win_del(E_Comp *c)
_e_client_action_input_win_del(void)
{
if (!comp_grabbed) return 0;
e_comp_ungrab_input(c, 1, 1);
e_comp_ungrab_input(1, 1);
comp_grabbed = 0;
return 1;
}
@ -385,7 +385,7 @@ static void
_e_client_action_finish(void)
{
if (comp_grabbed)
_e_client_action_input_win_del(e_comp);
_e_client_action_input_win_del();
E_FREE_FUNC(action_timer, ecore_timer_del);
E_FREE_FUNC(action_handler_key, ecore_event_handler_del);
@ -693,8 +693,8 @@ _e_client_action_input_win_new(void)
CRI("DOUBLE COMP GRAB! ACK!!!!");
return 1;
}
comp_grabbed = e_comp_grab_input(e_comp, 1, 1);
if (!comp_grabbed) _e_client_action_input_win_del(e_comp);
comp_grabbed = e_comp_grab_input(1, 1);
if (!comp_grabbed) _e_client_action_input_win_del();
return comp_grabbed;
}
@ -756,7 +756,7 @@ _e_client_move_begin(E_Client *ec)
if (!ec->moving)
{
if (ecmove == ec) ecmove = NULL;
_e_client_action_input_win_del(e_comp);
_e_client_action_input_win_del();
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(e_comp);
_e_client_action_input_win_del();
e_pointer_mode_pop(ec, E_POINTER_MOVE);
ec->moving = 0;
_e_client_hook_call(E_CLIENT_HOOK_MOVE_END, ec);
@ -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(e_comp);
_e_client_action_input_win_del();
e_pointer_mode_pop(ec, ec->resize_mode);
ec->resize_mode = E_POINTER_RESIZE_NONE;
@ -2408,7 +2408,7 @@ e_client_shutdown(void)
}
EAPI E_Client *
e_client_new(E_Comp *c EINA_UNUSED, E_Pixmap *cp, int first_map, int internal)
e_client_new(E_Pixmap *cp, int first_map, int internal)
{
E_Client *ec;
@ -3180,18 +3180,16 @@ e_client_below_get(const E_Client *ec)
}
EAPI E_Client *
e_client_bottom_get(const E_Comp *c)
e_client_bottom_get(void)
{
unsigned int x;
EINA_SAFETY_ON_NULL_RETURN_VAL(c, NULL);
for (x = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); x++)
{
E_Client *ec2;
if (!c->layers[x].clients) continue;
EINA_INLIST_FOREACH(c->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;
}
@ -3199,18 +3197,16 @@ e_client_bottom_get(const E_Comp *c)
}
EAPI E_Client *
e_client_top_get(const E_Comp *c)
e_client_top_get(void)
{
unsigned int x;
EINA_SAFETY_ON_NULL_RETURN_VAL(c, NULL);
for (x = e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); x >= e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x--)
{
E_Client *ec2;
if (!c->layers[x].clients) continue;
EINA_INLIST_REVERSE_FOREACH(c->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;
}
@ -3218,10 +3214,9 @@ e_client_top_get(const E_Comp *c)
}
EAPI unsigned int
e_clients_count(E_Comp *c)
e_clients_count(void)
{
if (!c) return eina_hash_population(clients_hash);
return eina_list_count(c->clients);
return eina_list_count(e_comp->clients);
}
@ -4515,7 +4510,7 @@ e_client_resize_begin(E_Client *ec)
if (!e_client_util_resizing_get(ec))
{
if (ecresize == ec) ecresize = NULL;
_e_client_action_input_win_del(e_comp);
_e_client_action_input_win_del();
return EINA_FALSE;
}
if (!ec->lock_user_stacking)

12
src/bin/e_client.h
View File

@ -713,10 +713,10 @@ struct E_Client
#endif
#define E_CLIENT_FOREACH(EC) \
for (EC = e_client_bottom_get(e_comp); EC; EC = e_client_above_get(EC))
for (EC = e_client_bottom_get(); EC; EC = e_client_above_get(EC))
#define E_CLIENT_REVERSE_FOREACH(EC) \
for (EC = e_client_top_get(e_comp); EC; EC = e_client_below_get(EC))
for (EC = e_client_top_get(); EC; EC = e_client_below_get(EC))
EAPI extern int E_EVENT_CLIENT_ADD;
@ -740,7 +740,7 @@ EAPI extern int E_EVENT_CLIENT_UNFULLSCREEN;
EINTERN void e_client_idler_before(void);
EINTERN Eina_Bool e_client_init(void);
EINTERN void e_client_shutdown(void);
EAPI E_Client *e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int internal);
EAPI E_Client *e_client_new(E_Pixmap *cp, int first_map, int internal);
EAPI void e_client_desk_set(E_Client *ec, E_Desk *desk);
EAPI Eina_Bool e_client_comp_grabbed_get(void);
EAPI E_Client *e_client_action_get(void);
@ -758,9 +758,9 @@ EAPI void e_client_zone_set(E_Client *ec, E_Zone *zone);
EAPI void e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h);
EAPI E_Client *e_client_above_get(const E_Client *ec);
EAPI E_Client *e_client_below_get(const E_Client *ec);
EAPI E_Client *e_client_bottom_get(const E_Comp *c);
EAPI E_Client *e_client_top_get(const E_Comp *c);
EAPI unsigned int e_clients_count(E_Comp *c);
EAPI E_Client *e_client_bottom_get(void);
EAPI E_Client *e_client_top_get(void);
EAPI unsigned int e_clients_count(void);
EAPI void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb);
EAPI E_Client_Hook *e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data);
EAPI void e_client_hook_del(E_Client_Hook *ch);

10
src/bin/e_comp.c
View File

@ -254,7 +254,7 @@ _e_comp_cb_nocomp_begin(E_Comp *c)
DBG("JOB2...");
e_comp_render_queue();
e_comp_shape_queue_block(c, 1);
e_comp_shape_queue_block(1);
ecore_event_add(E_EVENT_COMPOSITOR_DISABLE, NULL, NULL, NULL);
}
@ -278,7 +278,7 @@ _e_comp_cb_nocomp_end(E_Comp *c)
e_comp_x_nocomp_end(c);
#endif
e_comp_render_queue();
e_comp_shape_queue_block(c, 0);
e_comp_shape_queue_block(0);
ecore_event_add(E_EVENT_COMPOSITOR_ENABLE, NULL, NULL, NULL);
}
@ -485,7 +485,7 @@ nocomp:
if (c->nocomp && c->nocomp_ec)
{
E_Client *nec = NULL;
for (ec = e_client_top_get(c), nec = e_client_below_get(ec);
for (ec = e_client_top_get(), nec = e_client_below_get(ec);
(ec && nec) && (ec != nec); ec = nec, nec = e_client_below_get(ec))
{
if (ec == c->nocomp_ec) break;
@ -713,7 +713,7 @@ _e_comp_shapes_update_job(E_Comp *c)
/* background */
eina_tiler_rect_add(tb, &(Eina_Rectangle){0, 0, c->man->w, c->man->h});
ec = e_client_bottom_get(c);
ec = e_client_bottom_get();
if (ec) o = ec->frame;
for (; o; o = evas_object_above_get(o))
{
@ -1384,7 +1384,7 @@ e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y)
}
EAPI void
e_comp_util_wins_print()
e_comp_util_wins_print(void)
{
Evas_Object *o;

6
src/bin/e_comp_object.c
View File

@ -1130,7 +1130,7 @@ _e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack, E_Comp_Obj
{
E_Client *ec;
ec = e_client_top_get(e_comp);
ec = e_client_top_get();
if (ec)
o = ec->frame;
//else //wat
@ -3641,7 +3641,7 @@ _e_comp_object_autoclose_cleanup(Eina_Bool already_del)
{
if (e_comp->autoclose.obj)
{
e_comp_ungrab_input(e_comp, 0, 1);
e_comp_ungrab_input(0, 1);
if (e_comp->autoclose.del_cb)
e_comp->autoclose.del_cb(e_comp->autoclose.data, e_comp->autoclose.obj);
else if (!already_del)
@ -3691,7 +3691,7 @@ _e_comp_object_autoclose_setup(Evas_Object *obj)
evas_object_name_set(e_comp->autoclose.rect, "e_comp->autoclose.rect");
evas_object_color_set(e_comp->autoclose.rect, 0, 0, 0, 0);
evas_object_event_callback_add(e_comp->autoclose.rect, EVAS_CALLBACK_MOUSE_UP, _e_comp_object_autoclose_mouse_up_cb, e_comp);
e_comp_grab_input(e_comp, 0, 1);
e_comp_grab_input(0, 1);
}
evas_object_layer_set(e_comp->autoclose.rect, evas_object_layer_get(obj) - 1);
e_comp_shape_queue();

2
src/bin/e_comp_wl.c
View File

@ -1971,7 +1971,7 @@ _e_comp_wl_subcompositor_cb_subsurface_get(struct wl_client *client EINA_UNUSED,
if (!(ec = e_pixmap_client_get(ep)))
{
if (!(ec = e_client_new(NULL, ep, 0, 0)))
if (!(ec = e_client_new(ep, 0, 0)))
{
wl_resource_post_no_memory(resource);
return;

2
src/bin/e_comp_wl_input.c
View File

@ -60,7 +60,7 @@ _e_comp_wl_input_pointer_cb_cursor_set(struct wl_client *client, struct wl_resou
{
Eina_List *l;
ec = e_client_new(NULL, e_pixmap_new(E_PIXMAP_TYPE_WL, sid), 1, 0);
ec = e_client_new(e_pixmap_new(E_PIXMAP_TYPE_WL, sid), 1, 0);
ec->lock_focus_out = ec->layer_block = ec->visible = ec->override = 1;
ec->new_client = 0;
ec->icccm.title = eina_stringshare_add("noshadow");

18
src/bin/e_comp_x.c
View File

@ -665,7 +665,7 @@ _e_comp_x_client_stack(E_Client *ec)
}
static E_Client *
_e_comp_x_client_new(E_Comp *c, Ecore_X_Window win, Eina_Bool first)
_e_comp_x_client_new(Ecore_X_Window win, Eina_Bool first)
{
E_Pixmap *cp;
E_Client *ec;
@ -673,7 +673,7 @@ _e_comp_x_client_new(E_Comp *c, Ecore_X_Window win, Eina_Bool first)
cp = e_pixmap_new(E_PIXMAP_TYPE_X, win);
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL);
ec = e_client_new(c, cp, first, 0);
ec = e_client_new(cp, first, 0);
return ec;
}
@ -1116,7 +1116,7 @@ _e_comp_x_show_request(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Eve
return ECORE_CALLBACK_RENEW;
}
if (!ec)
ec = _e_comp_x_client_new(c, ev->win, 0);
ec = _e_comp_x_client_new(ev->win, 0);
if (!ec)
{
ecore_x_window_show(ev->win);
@ -1200,7 +1200,7 @@ _e_comp_x_show_retry(void *data)
{
E_Client *ec;
ec = _e_comp_x_client_new(c, (Ecore_X_Window)(uintptr_t)win, 0);
ec = _e_comp_x_client_new((Ecore_X_Window)(uintptr_t)win, 0);
if (ec) _e_comp_x_show_helper(ec);
}
@ -1225,7 +1225,7 @@ _e_comp_x_show(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Windo
if ((c->win == ev->win) || (c->ee_win == ev->win) ||
(c->man->root == ev->win) || (c->cm_selection == ev->win)) return ECORE_CALLBACK_RENEW;
/* some window which we haven't made a client for yet but need to */
ec = _e_comp_x_client_new(c, ev->win, 0);
ec = _e_comp_x_client_new(ev->win, 0);
if (!ec)
{
if (c->x_comp_data->retry_timer)
@ -3928,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(e_comp);
E_Client *child = e_client_bottom_get();
do
{
@ -4852,7 +4852,7 @@ _e_comp_x_manage_windows(E_Comp *c)
}
{
ec = _e_comp_x_client_new(c, windows[i], 1);
ec = _e_comp_x_client_new(windows[i], 1);
if (ec)
{
if (desk) e_client_desk_set(ec, desk);
@ -4864,7 +4864,7 @@ _e_comp_x_manage_windows(E_Comp *c)
{
/* We have not seen this window, and X tells us it
* should be seen */
ec = _e_comp_x_client_new(c, windows[i], 1);
ec = _e_comp_x_client_new(windows[i], 1);
}
if (ec && (!ec->comp_data->initial_attributes.visible))
E_FREE_FUNC(ec, e_object_del);
@ -5145,7 +5145,7 @@ _e_comp_x_setup(E_Comp *c, Ecore_X_Window root, int w, int h)
if (i >= e_comp_canvas_layer_map(E_LAYER_CLIENT_ABOVE))
ecore_x_window_raise(c->layers[i].win);
ec = _e_comp_x_client_new(c, c->layers[i].win, 0);
ec = _e_comp_x_client_new(c->layers[i].win, 0);
evas_object_name_set(ec->frame, "layer_obj");
ec->lock_client_stacking = 1;
ec->internal = 1;

4
src/bin/e_dnd.c
View File

@ -863,7 +863,7 @@ _e_drag_update(Ecore_X_Window root, int x, int y, Ecore_X_Atom action)
// double t1 = ecore_time_get(); ////
if (_drag_current && !_xdnd)
win = e_comp_top_window_at_xy_get(e_comp, x, y);
win = e_comp_top_window_at_xy_get(x, y);
else
win = root;
@ -987,7 +987,7 @@ _e_drag_end(int x, int y)
int dropped = 0;
if (!_drag_current) return;
win = e_comp_top_window_at_xy_get(e_comp, x, y);
win = e_comp_top_window_at_xy_get(x, y);
zone = e_comp_zone_xy_get(x, y);
/* Pass -1, -1, so that it is possible to drop at the edge. */
if (zone) e_zone_flip_coords_handle(zone, -1, -1);

4
src/bin/e_fm.c
View File

@ -10361,7 +10361,7 @@ _e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic)
evas_event_feed_mouse_out(evas_object_evas_get(ic->obj), ecore_x_current_time_get(), NULL);
#endif
if (e_comp->evas == e)
e_comp_grab_input(e_comp, 0, 1);
e_comp_grab_input(0, 1);
ic->keygrab = (e_comp->evas == e);
edje_object_part_swallow(ic->obj, "e.swallow.entry", ic->entry_widget);
evas_object_show(ic->entry_widget);
@ -10390,7 +10390,7 @@ _e_fm2_icon_entry_widget_del(E_Fm2_Icon *ic)
if (ic->keygrab)
{
if (evas_object_evas_get(ic->obj) == e_comp->evas)
e_comp_ungrab_input(e_comp, 0, 1);
e_comp_ungrab_input(0, 1);
}
ic->keygrab = 0;
_e_fm2_icon_select(ic);

4
src/bin/e_hints.c
View File

@ -314,7 +314,7 @@ e_hints_client_list_set(void)
E_Client *ec;
const Eina_List *ll;
clients = calloc(e_clients_count(man->comp), sizeof(Ecore_X_Window));
clients = calloc(e_clients_count(), sizeof(Ecore_X_Window));
EINA_LIST_FOREACH(man->comp->clients, ll, ec)
{
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_X) continue;
@ -339,7 +339,7 @@ e_hints_client_stacking_set(void)
//#define CLIENT_STACK_DEBUG
/* Get client count */
c = e_clients_count(e_comp);
c = e_clients_count();
if (c)
{
E_Client *ec;

4
src/bin/e_menu.c
View File

@ -1195,7 +1195,7 @@ e_menu_idler_before(void)
{
if (_e_menu_win)
{
e_comp_ungrab_input(e_comp, 1, 1);
e_comp_ungrab_input(1, 1);
_e_menu_win = 0;
}
}
@ -1887,7 +1887,7 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
if (!_e_menu_win)
{
_e_menu_win = zone->comp->ee_win;
if (!e_comp_grab_input(zone->comp, 1, 1))
if (!e_comp_grab_input(1, 1))
{
_e_menu_win = 0;
return;

2
src/bin/e_win.c
View File

@ -104,7 +104,7 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
cp = e_pixmap_new(type, win);
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_TRUE);
ctx->client = e_client_new(e_comp, cp, 0, 1);
ctx->client = e_client_new(cp, 0, 1);
EINA_SAFETY_ON_NULL_RETURN_VAL(ctx->client, EINA_TRUE);
}
ctx->client->placed = ctx->placed | ctx->centered;

4
src/modules/syscon/e_syscon.c
View File

@ -80,7 +80,7 @@ e_syscon_show(E_Zone *zone, const char *defact)
return 0;
}
if (!e_comp_grab_input(e_comp, 1, 1)) return 0;
if (!e_comp_grab_input(1, 1)) return 0;
evas = e_comp->evas;
evas_event_freeze(evas);
@ -292,7 +292,7 @@ e_syscon_hide(void)
E_FREE_FUNC(deftimer, ecore_timer_del);
eina_stringshare_replace(&do_defact, NULL);
E_FREE_LIST(handlers, ecore_event_handler_del);
e_comp_ungrab_input(e_comp, 1, 1);
e_comp_ungrab_input(1, 1);
evas_object_hide(popup);
E_FREE_FUNC(popup, evas_object_del);
o_selected_flow = o_selected = o_flow_extra = o_flow_main = o_flow_secondary = NULL;

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

@ -118,7 +118,7 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
#endif
if (e_comp->comp_type != E_PIXMAP_TYPE_X)
{
if (!e_comp_grab_input(e_comp, 1, 1))
if (!e_comp_grab_input(1, 1))
return 0;
}
@ -274,7 +274,7 @@ e_winlist_hide(void)
}
else
#endif
e_comp_ungrab_input(e_comp, 1, 1);
e_comp_ungrab_input(1, 1);
if (ec)
{
if (ec->shaded)

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

@ -568,7 +568,7 @@ _e_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resource *reso
if (ec && (!ec->internal))
e_pixmap_ref(ec->pixmap);
else if ((!ec) && (!(ec = e_client_new(NULL, ep, 0, 0))))
else if ((!ec) && (!(ec = e_client_new(ep, 0, 0))))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1143,7 +1143,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
if (ec && (!ec->internal))
e_pixmap_ref(ec->pixmap);
else if ((!ec) && (!(ec = e_client_new(NULL, ep, 0, 0))))
else if ((!ec) && (!(ec = e_client_new(ep, 0, 0))))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@ -1242,7 +1242,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
if (ec && (!ec->internal))
e_pixmap_ref(ec->pixmap);
else if ((!ec) && (!(ec = e_client_new(NULL, ep, 0, 0))))
else if ((!ec) && (!(ec = e_client_new(ep, 0, 0))))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,

4
src/modules/wl_drm/e_mod_main.c
View File

@ -32,7 +32,7 @@ _e_mod_drm_cb_activate(void *data, int type EINA_UNUSED, void *event)
e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h);
}
e_comp_render_queue();
e_comp_shape_queue_block(c, 0);
e_comp_shape_queue_block(0);
ecore_event_add(E_EVENT_COMPOSITOR_ENABLE, NULL, NULL, NULL);
}
else
@ -46,7 +46,7 @@ _e_mod_drm_cb_activate(void *data, int type EINA_UNUSED, void *event)
evas_render_dump(c->evas);
e_comp_render_queue();
e_comp_shape_queue_block(c, 1);
e_comp_shape_queue_block(1);
ecore_event_add(E_EVENT_COMPOSITOR_DISABLE, NULL, NULL, NULL);
}