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

ensure x11 focus grabs are applied on client init when needed

This commit is contained in:
Mike Blumenkrantz 2015-07-01 15:51:46 -04:00
parent 099861c55a
commit b0df36d595
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/bin/e_comp_x.c
View File

@ -117,13 +117,8 @@ _e_comp_x_print_win(Ecore_X_Window win)
}
static void
_e_comp_x_focus_setup(E_Client *ec)
_e_comp_x_focus_grab(E_Client *ec)
{
if (ec->comp_data->button_grabbed) return;
if ((!e_client_focus_policy_click(ec)) ||
(e_config->always_click_to_raise) ||
(e_config->always_click_to_focus)) return;
ecore_x_window_button_grab(e_client_util_win_get(ec), 1,
ECORE_X_EVENT_MASK_MOUSE_DOWN |
ECORE_X_EVENT_MASK_MOUSE_UP |
@ -139,6 +134,26 @@ _e_comp_x_focus_setup(E_Client *ec)
ec->comp_data->button_grabbed = 1;
}
static void
_e_comp_x_focus_init(E_Client *ec)
{
if (ec->comp_data->button_grabbed) return;
if (!((e_client_focus_policy_click(ec)) ||
(e_config->always_click_to_raise) ||
(e_config->always_click_to_focus))) return;
_e_comp_x_focus_grab(ec);
}
static void
_e_comp_x_focus_setup(E_Client *ec)
{
if (ec->comp_data->button_grabbed) return;
if ((!e_client_focus_policy_click(ec)) ||
(e_config->always_click_to_raise) ||
(e_config->always_click_to_focus)) return;
_e_comp_x_focus_grab(ec);
}
static void
_e_comp_x_focus_setdown(E_Client *ec)
@ -2789,14 +2804,9 @@ _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec)
ecore_x_window_show(pwin);
}
if (ec->focused)
_e_comp_x_focus_setdown(ec);
else
{
_e_comp_x_focus_setup(ec);
e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win);
e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win);
}
_e_comp_x_focus_init(ec);
e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win);
e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win);
_e_comp_x_client_evas_init(ec);
if (ec->netwm.ping && (!ec->ping_poller))
e_client_ping(ec);
@ -4813,6 +4823,7 @@ _e_comp_x_bindings_grab_cb(E_Comp *c)
EINA_LIST_FOREACH(c->clients, l, ec)
{
if (e_client_util_ignored_get(ec)) continue;
_e_comp_x_focus_init(ec);
if (ec->focused)
_e_comp_x_focus_setdown(ec);
else