forked from enlightenment/efl
ecore-evas-wayland: Fix issue of using wrong structure for mouse
events, and bring back function to listen for window configure events Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
f485b451ce
commit
2b19919c90
|
@ -102,7 +102,7 @@ static Eina_Bool
|
||||||
_ecore_evas_wl_common_cb_mouse_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
_ecore_evas_wl_common_cb_mouse_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
||||||
{
|
{
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
Ecore_Wl_Event_Mouse_Out *ev;
|
Ecore_Event_Mouse_IO *ev;
|
||||||
|
|
||||||
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
||||||
|
|
||||||
|
@ -127,14 +127,14 @@ static Eina_Bool
|
||||||
_ecore_evas_wl_common_cb_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
_ecore_evas_wl_common_cb_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
||||||
{
|
{
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
Ecore_Wl_Event_Focus_In *ev;
|
Ecore_Wl2_Event_Focus_In *ev;
|
||||||
|
|
||||||
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
||||||
|
|
||||||
ev = event;
|
ev = event;
|
||||||
ee = ecore_event_window_match(ev->win);
|
ee = ecore_event_window_match(ev->window);
|
||||||
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->window != 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 = EINA_TRUE;
|
ee->prop.focused = EINA_TRUE;
|
||||||
evas_focus_in(ee->evas);
|
evas_focus_in(ee->evas);
|
||||||
|
@ -146,14 +146,14 @@ static Eina_Bool
|
||||||
_ecore_evas_wl_common_cb_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
_ecore_evas_wl_common_cb_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
||||||
{
|
{
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
Ecore_Wl_Event_Focus_In *ev;
|
Ecore_Wl2_Event_Focus_Out *ev;
|
||||||
|
|
||||||
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
||||||
|
|
||||||
ev = event;
|
ev = event;
|
||||||
ee = ecore_event_window_match(ev->win);
|
ee = ecore_event_window_match(ev->window);
|
||||||
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->window != 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 = EINA_FALSE;
|
ee->prop.focused = EINA_FALSE;
|
||||||
|
@ -219,6 +219,69 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Eina_Bool
|
||||||
|
_ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
||||||
|
{
|
||||||
|
Ecore_Evas *ee;
|
||||||
|
Ecore_Evas_Engine_Wl_Data *wdata;
|
||||||
|
Ecore_Wl2_Event_Window_Configure *ev;
|
||||||
|
int nw = 0, nh = 0;
|
||||||
|
int fw = 0, fh = 0;
|
||||||
|
Eina_Bool prev_max, prev_full;
|
||||||
|
|
||||||
|
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
||||||
|
|
||||||
|
ev = event;
|
||||||
|
ee = ecore_event_window_match(ev->win);
|
||||||
|
if (!ee) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
|
wdata = ee->engine.data;
|
||||||
|
if (!wdata) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
|
prev_max = ee->prop.maximized;
|
||||||
|
prev_full = ee->prop.fullscreen;
|
||||||
|
ee->prop.maximized = ecore_wl2_window_maximized_get(wdata->win);
|
||||||
|
ee->prop.fullscreen = ecore_wl2_window_fullscreen_get(wdata->win);
|
||||||
|
|
||||||
|
nw = ev->w;
|
||||||
|
nh = ev->h;
|
||||||
|
if (nw < 1) nw = 1;
|
||||||
|
if (nh < 1) nh = 1;
|
||||||
|
|
||||||
|
if (ee->prop.fullscreen)
|
||||||
|
{
|
||||||
|
if ((nw <= 1) || (nh <= 1))
|
||||||
|
evas_output_size_get(ee->evas, &nw, &nh);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (prev_full != ee->prop.fullscreen)
|
||||||
|
_ecore_evas_wl_common_border_update(ee);
|
||||||
|
|
||||||
|
if (ee->prop.fullscreen)
|
||||||
|
{
|
||||||
|
_ecore_evas_wl_common_move(ee, ev->x, ev->y);
|
||||||
|
_ecore_evas_wl_common_resize(ee, nw, nh);
|
||||||
|
|
||||||
|
if (prev_full != ee->prop.fullscreen)
|
||||||
|
_ecore_evas_wl_common_state_update(ee);
|
||||||
|
|
||||||
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((ee->x != ev->x) || (ee->y != ev->y))
|
||||||
|
_ecore_evas_wl_common_move(ee, ev->x, ev->y);
|
||||||
|
|
||||||
|
if ((ee->req.w != nw) || (ee->req.h != nh))
|
||||||
|
_ecore_evas_wl_common_resize(ee, nw, nh);
|
||||||
|
|
||||||
|
if ((prev_max != ee->prop.maximized) ||
|
||||||
|
(prev_full != ee->prop.fullscreen))
|
||||||
|
_ecore_evas_wl_common_state_update(ee);
|
||||||
|
|
||||||
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_rotation_do(Ecore_Evas *ee, int rotation, int resize)
|
_rotation_do(Ecore_Evas *ee, int rotation, int resize)
|
||||||
{
|
{
|
||||||
|
@ -1574,7 +1637,7 @@ _ecore_evas_wl_interface_new(void)
|
||||||
iface->move = _ecore_evas_wayland_move;
|
iface->move = _ecore_evas_wayland_move;
|
||||||
/* iface->pointer_set = _ecore_evas_wayland_pointer_set; */
|
/* iface->pointer_set = _ecore_evas_wayland_pointer_set; */
|
||||||
iface->type_set = _ecore_evas_wayland_type_set;
|
iface->type_set = _ecore_evas_wayland_type_set;
|
||||||
iface->window_get = _ecore_evas_wayland_window_get;
|
iface->window_get2 = _ecore_evas_wayland_window_get;
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
|
#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
|
||||||
iface->pre_post_swap_callback_set =
|
iface->pre_post_swap_callback_set =
|
||||||
|
|
Loading…
Reference in New Issue