From 3e50235e5b25e46485d7613c55c4076d2f06a732 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 24 Apr 2015 14:10:25 -0400 Subject: [PATCH] fix comp fake layer init for wl compositors fix T2363 --- src/bin/e_comp.c | 2 ++ src/bin/e_comp_canvas.c | 3 --- src/bin/e_focus.c | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 5efd3adea..32a4953d6 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1069,6 +1069,8 @@ e_comp_init(void) //#endif if (!e_comp) return EINA_FALSE; out: + if (e_comp->comp_type == E_PIXMAP_TYPE_WL) + e_comp_canvas_fake_layers_init(); e_comp->elm = elm_win_fake_add(e_comp->ee); elm_win_fullscreen_set(e_comp->elm, 1); evas_object_show(e_comp->elm); diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c index f23440ee2..365ccff2b 100644 --- a/src/bin/e_comp_canvas.c +++ b/src/bin/e_comp_canvas.c @@ -234,9 +234,6 @@ e_comp_canvas_init(int w, int h) E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_cb_screensaver_on, NULL); E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF, _e_comp_cb_screensaver_off, NULL); - if (e_comp->comp_type == E_PIXMAP_TYPE_WL) - e_comp_canvas_fake_layers_init(); - return EINA_TRUE; } diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c index 171d1adfb..984de51b8 100644 --- a/src/bin/e_focus.c +++ b/src/bin/e_focus.c @@ -9,6 +9,7 @@ static Eina_Bool _e_focus_raise_timer(void *data); EAPI void e_focus_event_mouse_in(E_Client *ec) { + if ((e_config->focus_policy == E_FOCUS_MOUSE) || (e_config->focus_policy == E_FOCUS_SLOPPY)) {