forked from enlightenment/enlightenment
update contact module for api changes + remove E_Comp usage
This commit is contained in:
parent
2617f2a352
commit
aefab90d52
|
@ -104,8 +104,7 @@ _handler_call(E_Edges_Event event, int d, double v)
|
||||||
static Evas_Object *
|
static Evas_Object *
|
||||||
_input_obj(Edgeset *es, int x, int y, int w, int h)
|
_input_obj(Edgeset *es, int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
E_Comp *c = e_comp;
|
Evas_Object *o = evas_object_rectangle_add(e_comp->evas);
|
||||||
Evas_Object *o = evas_object_rectangle_add(c->evas);
|
|
||||||
evas_object_color_set(o, 0, 0, 0, 0);
|
evas_object_color_set(o, 0, 0, 0, 0);
|
||||||
evas_object_move(o, x, y);
|
evas_object_move(o, x, y);
|
||||||
evas_object_resize(o, w, h);
|
evas_object_resize(o, w, h);
|
||||||
|
|
|
@ -8,7 +8,7 @@ static Eina_Bool _cb_event_focus_in(void *data __UNUSED__, int type __UNUSED__,
|
||||||
static Eina_Bool _cb_event_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
|
static Eina_Bool _cb_event_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
|
||||||
static void _cb_hook_post_fetch(void *data __UNUSED__, E_Client *ec);
|
static void _cb_hook_post_fetch(void *data __UNUSED__, E_Client *ec);
|
||||||
static void _cb_hook_post_assign(void *data __UNUSED__, E_Client *ec);
|
static void _cb_hook_post_assign(void *data __UNUSED__, E_Client *ec);
|
||||||
static void _cb_hook_layout(E_Comp *comp);
|
static void _cb_hook_layout(void);
|
||||||
|
|
||||||
static Eina_List *hooks = NULL;
|
static Eina_List *hooks = NULL;
|
||||||
static Eina_List *handlers = NULL;
|
static Eina_List *handlers = NULL;
|
||||||
|
@ -166,7 +166,7 @@ _cb_hook_post_assign(void *data __UNUSED__, E_Client *ec)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_cb_hook_layout(E_Comp *comp)
|
_cb_hook_layout(void)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
E_Client *ec, *kbd = NULL;;
|
E_Client *ec, *kbd = NULL;;
|
||||||
|
@ -174,7 +174,7 @@ _cb_hook_layout(E_Comp *comp)
|
||||||
Eina_Bool have_focused = EINA_FALSE;
|
Eina_Bool have_focused = EINA_FALSE;
|
||||||
int kx = 0, ky = 0, kw = 0, kh = 0;
|
int kx = 0, ky = 0, kw = 0, kh = 0;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(comp->clients, l, ec)
|
EINA_LIST_FOREACH(e_comp->clients, l, ec)
|
||||||
{
|
{
|
||||||
if (e_client_util_ignored_get(ec)) continue;
|
if (e_client_util_ignored_get(ec)) continue;
|
||||||
if (ec->focused) have_focused = EINA_TRUE;
|
if (ec->focused) have_focused = EINA_TRUE;
|
||||||
|
@ -195,7 +195,7 @@ _cb_hook_layout(E_Comp *comp)
|
||||||
kx = kbd->zone->x;
|
kx = kbd->zone->x;
|
||||||
ky = kbd->zone->y + kbd->zone->h - kh;
|
ky = kbd->zone->y + kbd->zone->h - kh;
|
||||||
}
|
}
|
||||||
EINA_LIST_FOREACH(comp->clients, l, ec)
|
EINA_LIST_FOREACH(e_comp->clients, l, ec)
|
||||||
{
|
{
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
|
|
||||||
|
@ -237,7 +237,7 @@ _cb_hook_layout(E_Comp *comp)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#warning X ONLY! SPANK! SPANK! SPANK!!!
|
#warning X ONLY! SPANK! SPANK! SPANK!!!
|
||||||
if (e_comp_data->illume.conformant.conformant)
|
if (ec->comp_data->illume.conformant.conformant)
|
||||||
{
|
{
|
||||||
if (kbd_on != want_kbd)
|
if (kbd_on != want_kbd)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue