forked from enlightenment/efl
ecore - clean up code.
fix indentation and use Eina_Bool instead of char.
This commit is contained in:
parent
a565fd391b
commit
f111c8da6d
|
@ -105,7 +105,7 @@ _ecore_evas_show(Ecore_Evas *ee)
|
||||||
|
|
||||||
if (bdata->image) return;
|
if (bdata->image) return;
|
||||||
if (ee->prop.focused) return;
|
if (ee->prop.focused) return;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
}
|
}
|
||||||
|
@ -407,7 +407,7 @@ _ecore_evas_buffer_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
|
|
||||||
ee = data;
|
ee = data;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
}
|
}
|
||||||
|
@ -418,7 +418,7 @@ _ecore_evas_buffer_cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *ob
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
|
|
||||||
ee = data;
|
ee = data;
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
}
|
}
|
||||||
|
@ -646,7 +646,7 @@ ecore_evas_buffer_allocfunc_new(int w, int h,
|
||||||
ee->prop.max.w = 0;
|
ee->prop.max.w = 0;
|
||||||
ee->prop.max.h = 0;
|
ee->prop.max.h = 0;
|
||||||
ee->prop.layer = 0;
|
ee->prop.layer = 0;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
ee->prop.borderless = 1;
|
ee->prop.borderless = 1;
|
||||||
ee->prop.override = 1;
|
ee->prop.override = 1;
|
||||||
ee->prop.maximized = 1;
|
ee->prop.maximized = 1;
|
||||||
|
@ -774,7 +774,7 @@ ecore_evas_object_image_new(Ecore_Evas *ee_target)
|
||||||
ee->prop.max.w = 0;
|
ee->prop.max.w = 0;
|
||||||
ee->prop.max.h = 0;
|
ee->prop.max.h = 0;
|
||||||
ee->prop.layer = 0;
|
ee->prop.layer = 0;
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
ee->prop.borderless = 1;
|
ee->prop.borderless = 1;
|
||||||
ee->prop.override = 1;
|
ee->prop.override = 1;
|
||||||
ee->prop.maximized = 0;
|
ee->prop.maximized = 0;
|
||||||
|
|
|
@ -456,11 +456,11 @@ _ecore_evas_ews_layer_set(Ecore_Evas *ee, int layer)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ecore_evas_ews_focus_set(Ecore_Evas *ee, int val)
|
_ecore_evas_ews_focus_set(Ecore_Evas *ee, Eina_Bool on)
|
||||||
{
|
{
|
||||||
evas_object_focus_set(ee->engine.ews.image, val);
|
evas_object_focus_set(ee->engine.ews.image, on);
|
||||||
ee->prop.focused = val;
|
ee->prop.focused = on;
|
||||||
if (val)
|
if (on)
|
||||||
{
|
{
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
|
@ -475,10 +475,10 @@ _ecore_evas_ews_focus_set(Ecore_Evas *ee, int val)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ecore_evas_ews_iconified_set(Ecore_Evas *ee, int val)
|
_ecore_evas_ews_iconified_set(Ecore_Evas *ee, Eina_Bool on)
|
||||||
{
|
{
|
||||||
if (ee->prop.iconified == val) return;
|
if (ee->prop.iconified == on) return;
|
||||||
ee->prop.iconified = val;
|
ee->prop.iconified = on;
|
||||||
_ecore_evas_ews_event(ee, ECORE_EVAS_EWS_EVENT_ICONIFIED_CHANGE);
|
_ecore_evas_ews_event(ee, ECORE_EVAS_EWS_EVENT_ICONIFIED_CHANGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,8 +81,8 @@ struct _Ecore_Evas_Engine_Func
|
||||||
void (*fn_size_step_set) (Ecore_Evas *ee, int w, int h);
|
void (*fn_size_step_set) (Ecore_Evas *ee, int w, int h);
|
||||||
void (*fn_object_cursor_set) (Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
|
void (*fn_object_cursor_set) (Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
|
||||||
void (*fn_layer_set) (Ecore_Evas *ee, int layer);
|
void (*fn_layer_set) (Ecore_Evas *ee, int layer);
|
||||||
void (*fn_focus_set) (Ecore_Evas *ee, int on);
|
void (*fn_focus_set) (Ecore_Evas *ee, Eina_Bool on);
|
||||||
void (*fn_iconified_set) (Ecore_Evas *ee, int on);
|
void (*fn_iconified_set) (Ecore_Evas *ee, Eina_Bool on);
|
||||||
void (*fn_borderless_set) (Ecore_Evas *ee, int on);
|
void (*fn_borderless_set) (Ecore_Evas *ee, int on);
|
||||||
void (*fn_override_set) (Ecore_Evas *ee, int on);
|
void (*fn_override_set) (Ecore_Evas *ee, int on);
|
||||||
void (*fn_maximized_set) (Ecore_Evas *ee, int on);
|
void (*fn_maximized_set) (Ecore_Evas *ee, int on);
|
||||||
|
@ -189,8 +189,9 @@ struct _Ecore_Evas
|
||||||
Ecore_Evas *group_ee;
|
Ecore_Evas *group_ee;
|
||||||
Ecore_Window group_ee_win;
|
Ecore_Window group_ee_win;
|
||||||
double aspect;
|
double aspect;
|
||||||
char focused : 1;
|
Eina_Bool focused : 1;
|
||||||
char iconified : 1;
|
Eina_Bool iconified : 1;
|
||||||
|
//FIXME: keep going change to Eina_Bool
|
||||||
char borderless : 1;
|
char borderless : 1;
|
||||||
char override : 1;
|
char override : 1;
|
||||||
char maximized : 1;
|
char maximized : 1;
|
||||||
|
|
|
@ -110,7 +110,7 @@ _ecore_evas_cocoa_event_got_focus(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
ee = _ecore_evas_cocoa_match();
|
ee = _ecore_evas_cocoa_match();
|
||||||
|
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
|
|
||||||
|
@ -128,7 +128,7 @@ _ecore_evas_cocoa_event_lost_focus(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
|
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
|
@ -70,8 +70,8 @@ static Ecore_Evas_Engine_Func _ecore_evas_drm_engine_func =
|
||||||
NULL, //void (*fn_size_step_set) (Ecore_Evas *ee, int w, int h);
|
NULL, //void (*fn_size_step_set) (Ecore_Evas *ee, int w, int h);
|
||||||
NULL, //void (*fn_object_cursor_set) (Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
|
NULL, //void (*fn_object_cursor_set) (Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
|
||||||
NULL, //void (*fn_layer_set) (Ecore_Evas *ee, int layer);
|
NULL, //void (*fn_layer_set) (Ecore_Evas *ee, int layer);
|
||||||
NULL, //void (*fn_focus_set) (Ecore_Evas *ee, int on);
|
NULL, //void (*fn_focus_set) (Ecore_Evas *ee, Eina_Bool on);
|
||||||
NULL, //void (*fn_iconified_set) (Ecore_Evas *ee, int on);
|
NULL, //void (*fn_iconified_set) (Ecore_Evas *ee, Eina_Bool on);
|
||||||
NULL, //void (*fn_borderless_set) (Ecore_Evas *ee, int on);
|
NULL, //void (*fn_borderless_set) (Ecore_Evas *ee, int on);
|
||||||
NULL, //void (*fn_override_set) (Ecore_Evas *ee, int on);
|
NULL, //void (*fn_override_set) (Ecore_Evas *ee, int on);
|
||||||
NULL, //void (*fn_maximized_set) (Ecore_Evas *ee, int on);
|
NULL, //void (*fn_maximized_set) (Ecore_Evas *ee, int on);
|
||||||
|
|
|
@ -726,7 +726,7 @@ _ecore_evas_extn_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj E
|
||||||
Ecore_Evas_Engine_Buffer_Data *bdata = ee->engine.data;
|
Ecore_Evas_Engine_Buffer_Data *bdata = ee->engine.data;
|
||||||
Extn *extn;
|
Extn *extn;
|
||||||
|
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
extn = bdata->data;
|
extn = bdata->data;
|
||||||
if (!extn) return;
|
if (!extn) return;
|
||||||
if (!extn->ipc.server) return;
|
if (!extn->ipc.server) return;
|
||||||
|
@ -740,7 +740,7 @@ _ecore_evas_extn_cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
|
||||||
Ecore_Evas_Engine_Buffer_Data *bdata = ee->engine.data;
|
Ecore_Evas_Engine_Buffer_Data *bdata = ee->engine.data;
|
||||||
Extn *extn;
|
Extn *extn;
|
||||||
|
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
extn = bdata->data;
|
extn = bdata->data;
|
||||||
if (!extn) return;
|
if (!extn) return;
|
||||||
if (!extn->ipc.server) return;
|
if (!extn->ipc.server) return;
|
||||||
|
@ -1157,7 +1157,7 @@ ecore_evas_extn_plug_new_internal(Ecore_Evas *ee_target)
|
||||||
ee->prop.max.w = 0;
|
ee->prop.max.w = 0;
|
||||||
ee->prop.max.h = 0;
|
ee->prop.max.h = 0;
|
||||||
ee->prop.layer = 0;
|
ee->prop.layer = 0;
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
ee->prop.borderless = 1;
|
ee->prop.borderless = 1;
|
||||||
ee->prop.override = 1;
|
ee->prop.override = 1;
|
||||||
ee->prop.maximized = 0;
|
ee->prop.maximized = 0;
|
||||||
|
@ -1601,7 +1601,7 @@ _ipc_client_data(void *data, int type EINA_UNUSED, void *event)
|
||||||
case OP_FOCUS:
|
case OP_FOCUS:
|
||||||
if (!ee->prop.focused)
|
if (!ee->prop.focused)
|
||||||
{
|
{
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
}
|
}
|
||||||
|
@ -1609,7 +1609,7 @@ _ipc_client_data(void *data, int type EINA_UNUSED, void *event)
|
||||||
case OP_UNFOCUS:
|
case OP_UNFOCUS:
|
||||||
if (ee->prop.focused)
|
if (ee->prop.focused)
|
||||||
{
|
{
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
}
|
}
|
||||||
|
@ -2041,7 +2041,7 @@ ecore_evas_extn_socket_new_internal(int w, int h)
|
||||||
ee->prop.max.w = 0;
|
ee->prop.max.w = 0;
|
||||||
ee->prop.max.h = 0;
|
ee->prop.max.h = 0;
|
||||||
ee->prop.layer = 0;
|
ee->prop.layer = 0;
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
ee->prop.borderless = 1;
|
ee->prop.borderless = 1;
|
||||||
ee->prop.override = 1;
|
ee->prop.override = 1;
|
||||||
ee->prop.maximized = 0;
|
ee->prop.maximized = 0;
|
||||||
|
|
|
@ -389,7 +389,7 @@ static void
|
||||||
_ecore_evas_show(Ecore_Evas *ee)
|
_ecore_evas_show(Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
if (ee->prop.focused) return;
|
if (ee->prop.focused) return;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
}
|
}
|
||||||
|
@ -399,7 +399,7 @@ _ecore_evas_hide(Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
if (ee->prop.focused)
|
if (ee->prop.focused)
|
||||||
{
|
{
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
}
|
}
|
||||||
|
@ -612,7 +612,7 @@ ecore_evas_fb_new_internal(const char *disp_name, int rotation, int w, int h)
|
||||||
ee->prop.max.w = 0;
|
ee->prop.max.w = 0;
|
||||||
ee->prop.max.h = 0;
|
ee->prop.max.h = 0;
|
||||||
ee->prop.layer = 0;
|
ee->prop.layer = 0;
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
ee->prop.borderless = 1;
|
ee->prop.borderless = 1;
|
||||||
ee->prop.override = 1;
|
ee->prop.override = 1;
|
||||||
ee->prop.maximized = 1;
|
ee->prop.maximized = 1;
|
||||||
|
|
|
@ -45,7 +45,7 @@ _ecore_evas_psl1ght_event_got_focus(void *data EINA_UNUSED, int type EINA_UNUSED
|
||||||
|
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
||||||
/* pass on event */
|
/* pass on event */
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ _ecore_evas_psl1ght_event_lost_focus(void *data EINA_UNUSED, int type EINA_UNUSE
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
||||||
/* pass on event */
|
/* pass on event */
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
@ -290,7 +290,7 @@ static void
|
||||||
_ecore_evas_show(Ecore_Evas *ee)
|
_ecore_evas_show(Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
if (ee->prop.focused) return;
|
if (ee->prop.focused) return;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
}
|
}
|
||||||
|
@ -438,7 +438,7 @@ ecore_evas_psl1ght_new_internal(const char *name, int w, int h)
|
||||||
ee->prop.max.w = 0;
|
ee->prop.max.w = 0;
|
||||||
ee->prop.max.h = 0;
|
ee->prop.max.h = 0;
|
||||||
ee->prop.layer = 0;
|
ee->prop.layer = 0;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
ee->prop.borderless = 1;
|
ee->prop.borderless = 1;
|
||||||
ee->prop.override = 1;
|
ee->prop.override = 1;
|
||||||
ee->prop.maximized = 1;
|
ee->prop.maximized = 1;
|
||||||
|
|
|
@ -60,7 +60,7 @@ _ecore_evas_sdl_event_got_focus(void *data EINA_UNUSED, int type EINA_UNUSED, vo
|
||||||
|
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
||||||
/* pass on event */
|
/* pass on event */
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
@ -75,7 +75,7 @@ _ecore_evas_sdl_event_lost_focus(void *data EINA_UNUSED, int type EINA_UNUSED, v
|
||||||
|
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
||||||
/* pass on event */
|
/* pass on event */
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
@ -340,7 +340,7 @@ static void
|
||||||
_ecore_evas_show(Ecore_Evas *ee)
|
_ecore_evas_show(Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
if (ee->prop.focused) return;
|
if (ee->prop.focused) return;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_event_feed_mouse_in(ee->evas, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL);
|
evas_event_feed_mouse_in(ee->evas, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -479,7 +479,7 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
|
||||||
ee->prop.max.w = 0;
|
ee->prop.max.w = 0;
|
||||||
ee->prop.max.h = 0;
|
ee->prop.max.h = 0;
|
||||||
ee->prop.layer = 0;
|
ee->prop.layer = 0;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
ee->prop.borderless = 1;
|
ee->prop.borderless = 1;
|
||||||
ee->prop.override = 1;
|
ee->prop.override = 1;
|
||||||
ee->prop.maximized = 1;
|
ee->prop.maximized = 1;
|
||||||
|
|
|
@ -155,7 +155,7 @@ _ecore_evas_wl_common_cb_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
|
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
|
||||||
if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
if (ee->prop.focused) return ECORE_CALLBACK_PASS_ON;
|
if (ee->prop.focused) return ECORE_CALLBACK_PASS_ON;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
@ -175,7 +175,7 @@ _ecore_evas_wl_common_cb_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
if (!ee->prop.focused) return ECORE_CALLBACK_PASS_ON;
|
if (!ee->prop.focused) return ECORE_CALLBACK_PASS_ON;
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
@ -1229,13 +1229,13 @@ _ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
_ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, int iconify)
|
_ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on)
|
||||||
{
|
{
|
||||||
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
||||||
|
|
||||||
if (!ee) return;
|
if (!ee) return;
|
||||||
if (ee->prop.iconified == iconify) return;
|
if (ee->prop.iconified == on) return;
|
||||||
ee->prop.iconified = iconify;
|
ee->prop.iconified = on;
|
||||||
/* FIXME: Implement this in Wayland someshow */
|
/* FIXME: Implement this in Wayland someshow */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ void _ecore_evas_wl_common_size_step_set(Ecore_Evas *ee, int w, int h);
|
||||||
void _ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double aspect);
|
void _ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double aspect);
|
||||||
void _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
|
void _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
|
||||||
void _ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer);
|
void _ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer);
|
||||||
void _ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, int iconify);
|
void _ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on);
|
||||||
void _ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, int max);
|
void _ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, int max);
|
||||||
void _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, int full);
|
void _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, int full);
|
||||||
void _ecore_evas_wl_common_ignore_events_set(Ecore_Evas *ee, int ignore);
|
void _ecore_evas_wl_common_ignore_events_set(Ecore_Evas *ee, int ignore);
|
||||||
|
|
|
@ -212,7 +212,7 @@ _ecore_evas_win32_event_window_focus_in(void *data EINA_UNUSED, int type EINA_UN
|
||||||
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
|
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
|
||||||
if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
@ -230,7 +230,7 @@ _ecore_evas_win32_event_window_focus_out(void *data EINA_UNUSED, int type EINA_U
|
||||||
if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
@ -845,13 +845,13 @@ _ecore_evas_win32_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int ho
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ecore_evas_win32_focus_set(Ecore_Evas *ee, int on EINA_UNUSED)
|
_ecore_evas_win32_focus_set(Ecore_Evas *ee, Eina_Bool on EINA_UNUSED)
|
||||||
{
|
{
|
||||||
ecore_win32_window_focus((struct _Ecore_Win32_Window *)ee->prop.window);
|
ecore_win32_window_focus((struct _Ecore_Win32_Window *)ee->prop.window);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ecore_evas_win32_iconified_set(Ecore_Evas *ee, int on)
|
_ecore_evas_win32_iconified_set(Ecore_Evas *ee, Eina_Bool on)
|
||||||
{
|
{
|
||||||
/* if (((ee->prop.borderless) && (on)) || */
|
/* if (((ee->prop.borderless) && (on)) || */
|
||||||
/* ((!ee->prop.borderless) && (!on))) return; */
|
/* ((!ee->prop.borderless) && (!on))) return; */
|
||||||
|
|
|
@ -89,7 +89,7 @@ struct _Ecore_Evas_Engine_Data_X11 {
|
||||||
unsigned char done : 1; // need to send change done event to the WM
|
unsigned char done : 1; // need to send change done event to the WM
|
||||||
} profile;
|
} profile;
|
||||||
Ecore_X_Window win_shaped_input;
|
Ecore_X_Window win_shaped_input;
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
unsigned int front, back; // front and back pixmaps (double-buffer)
|
unsigned int front, back; // front and back pixmaps (double-buffer)
|
||||||
Evas_Coord w, h; // store pixmap size (saves X roundtrips)
|
Evas_Coord w, h; // store pixmap size (saves X roundtrips)
|
||||||
|
@ -121,8 +121,8 @@ _ecore_evas_x_hints_update(Ecore_Evas *ee)
|
||||||
ecore_x_icccm_hints_set
|
ecore_x_icccm_hints_set
|
||||||
(ee->prop.window,
|
(ee->prop.window,
|
||||||
!ee->prop.focus_skip /* accepts_focus */,
|
!ee->prop.focus_skip /* accepts_focus */,
|
||||||
ee->prop.iconified ? ECORE_X_WINDOW_STATE_HINT_ICONIC :
|
ee->prop.iconified ? ECORE_X_WINDOW_STATE_HINT_ICONIC :
|
||||||
ee->prop.withdrawn ? ECORE_X_WINDOW_STATE_HINT_WITHDRAWN :
|
ee->prop.withdrawn ? ECORE_X_WINDOW_STATE_HINT_WITHDRAWN :
|
||||||
ECORE_X_WINDOW_STATE_HINT_NORMAL /* initial_state */,
|
ECORE_X_WINDOW_STATE_HINT_NORMAL /* initial_state */,
|
||||||
0 /* icon_pixmap */,
|
0 /* icon_pixmap */,
|
||||||
0 /* icon_mask */,
|
0 /* icon_mask */,
|
||||||
|
@ -341,7 +341,7 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y,
|
||||||
(evas_version->micro >= 99))
|
(evas_version->micro >= 99))
|
||||||
einfo->swap_mode = opt[op];
|
einfo->swap_mode = opt[op];
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -880,14 +880,14 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED, int type EINA_UNUSED
|
||||||
{
|
{
|
||||||
state_change = 1;
|
state_change = 1;
|
||||||
ee->prop.withdrawn = 1;
|
ee->prop.withdrawn = 1;
|
||||||
ee->prop.iconified = 0;
|
ee->prop.iconified = EINA_FALSE;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ECORE_X_WINDOW_STATE_HINT_ICONIC:
|
case ECORE_X_WINDOW_STATE_HINT_ICONIC:
|
||||||
if ((!ee->prop.iconified) || (ee->prop.withdrawn))
|
if ((!ee->prop.iconified) || (ee->prop.withdrawn))
|
||||||
{
|
{
|
||||||
state_change = 1;
|
state_change = 1;
|
||||||
ee->prop.iconified = 1;
|
ee->prop.iconified = EINA_TRUE;
|
||||||
ee->prop.withdrawn = 0;
|
ee->prop.withdrawn = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -895,7 +895,7 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED, int type EINA_UNUSED
|
||||||
if ((ee->prop.iconified) || (ee->prop.withdrawn))
|
if ((ee->prop.iconified) || (ee->prop.withdrawn))
|
||||||
{
|
{
|
||||||
state_change = 1;
|
state_change = 1;
|
||||||
ee->prop.iconified = 0;
|
ee->prop.iconified = EINA_FALSE;
|
||||||
ee->prop.withdrawn = 0;
|
ee->prop.withdrawn = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -948,7 +948,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
{
|
{
|
||||||
ee = ecore_event_window_match(e->data.l[0]);
|
ee = ecore_event_window_match(e->data.l[0]);
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
||||||
edata = ee->engine.data;
|
edata = ee->engine.data;
|
||||||
if (e->data.l[0] != (long)ee->prop.window)
|
if (e->data.l[0] != (long)ee->prop.window)
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
if (!edata->sync_began)
|
if (!edata->sync_began)
|
||||||
|
@ -963,7 +963,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
{
|
{
|
||||||
ee = ecore_event_window_match(e->data.l[0]);
|
ee = ecore_event_window_match(e->data.l[0]);
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
||||||
edata = ee->engine.data;
|
edata = ee->engine.data;
|
||||||
if (e->data.l[0] != (long)ee->prop.window)
|
if (e->data.l[0] != (long)ee->prop.window)
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
edata->sync_began = 0;
|
edata->sync_began = 0;
|
||||||
|
@ -973,7 +973,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
{
|
{
|
||||||
ee = ecore_event_window_match(e->data.l[0]);
|
ee = ecore_event_window_match(e->data.l[0]);
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
||||||
edata = ee->engine.data;
|
edata = ee->engine.data;
|
||||||
if (e->data.l[0] != (long)ee->prop.window)
|
if (e->data.l[0] != (long)ee->prop.window)
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
edata->sync_began = 0;
|
edata->sync_began = 0;
|
||||||
|
@ -984,7 +984,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
{
|
{
|
||||||
ee = ecore_event_window_match(e->win);
|
ee = ecore_event_window_match(e->win);
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
||||||
edata = ee->engine.data;
|
edata = ee->engine.data;
|
||||||
edata->netwm_sync_val_lo = (unsigned int)e->data.l[2];
|
edata->netwm_sync_val_lo = (unsigned int)e->data.l[2];
|
||||||
edata->netwm_sync_val_hi = (int)e->data.l[3];
|
edata->netwm_sync_val_hi = (int)e->data.l[3];
|
||||||
edata->netwm_sync_set = 1;
|
edata->netwm_sync_set = 1;
|
||||||
|
@ -993,7 +993,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
{
|
{
|
||||||
ee = ecore_event_window_match(e->win);
|
ee = ecore_event_window_match(e->win);
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
||||||
edata = ee->engine.data;
|
edata = ee->engine.data;
|
||||||
if (ee->profile_supported)
|
if (ee->profile_supported)
|
||||||
{
|
{
|
||||||
char *p = ecore_x_atom_name_get(e->data.l[1]);
|
char *p = ecore_x_atom_name_get(e->data.l[1]);
|
||||||
|
@ -1014,10 +1014,10 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (e->message_type == ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL)
|
else if (e->message_type == ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL)
|
||||||
{
|
{
|
||||||
///TODO after access structure determined
|
///TODO after access structure determined
|
||||||
// if (ee->func.fn_msg_handle)
|
// if (ee->func.fn_msg_handle)
|
||||||
// ee->func.fn_msg_handle(ee, msg_domain, msg_id, data, size);
|
// ee->func.fn_msg_handle(ee, msg_domain, msg_id, data, size);
|
||||||
}
|
}
|
||||||
else if (e->message_type == ECORE_X_ATOM_E_DEICONIFY_APPROVE)
|
else if (e->message_type == ECORE_X_ATOM_E_DEICONIFY_APPROVE)
|
||||||
{
|
{
|
||||||
|
@ -1033,7 +1033,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
|
ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
|
||||||
e->win, 1,
|
e->win, 1,
|
||||||
0, 0, 0);
|
0, 0, 0);
|
||||||
}
|
}
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1232,7 +1232,7 @@ _ecore_evas_x_event_window_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED
|
||||||
if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
//xx// filtering with these doesnt help
|
//xx// filtering with these doesnt help
|
||||||
//xx// if (e->mode == ECORE_X_EVENT_MODE_UNGRAB) return ECORE_CALLBACK_PASS_ON;
|
//xx// if (e->mode == ECORE_X_EVENT_MODE_UNGRAB) return ECORE_CALLBACK_PASS_ON;
|
||||||
ee->prop.focused = 1;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
@ -1254,7 +1254,7 @@ _ecore_evas_x_event_window_focus_out(void *data EINA_UNUSED, int type EINA_UNUSE
|
||||||
// if (ee->prop.fullscreen)
|
// if (ee->prop.fullscreen)
|
||||||
// ecore_x_window_focus(ee->prop.window);
|
// ecore_x_window_focus(ee->prop.window);
|
||||||
evas_focus_out(ee->evas);
|
evas_focus_out(ee->evas);
|
||||||
ee->prop.focused = 0;
|
ee->prop.focused = EINA_FALSE;
|
||||||
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
@ -2800,13 +2800,13 @@ _ecore_evas_x_layer_set(Ecore_Evas *ee, int layer)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ecore_evas_x_focus_set(Ecore_Evas *ee, int on EINA_UNUSED)
|
_ecore_evas_x_focus_set(Ecore_Evas *ee, Eina_Bool on EINA_UNUSED)
|
||||||
{
|
{
|
||||||
ecore_x_window_focus(ee->prop.window);
|
ecore_x_window_focus(ee->prop.window);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ecore_evas_x_iconified_set(Ecore_Evas *ee, int on)
|
_ecore_evas_x_iconified_set(Ecore_Evas *ee, Eina_Bool on)
|
||||||
{
|
{
|
||||||
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
|
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue