forked from enlightenment/enlightenment
Remove redundant inits, ICCCM focus send should only be done if wm property is set
SVN revision: 12649
This commit is contained in:
parent
c1415b0ea8
commit
b4804a4025
|
@ -385,8 +385,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
|
||||||
if (bd->client.icccm.take_focus)
|
if (bd->client.icccm.take_focus)
|
||||||
{
|
{
|
||||||
printf("take focus!\n");
|
printf("take focus!\n");
|
||||||
/*
|
ecore_x_icccm_take_focus_send(bd->client.win, ECORE_X_CURRENT_TIME);
|
||||||
ecore_x_icccm_take_focus_send(bd->client.win, ECORE_X_CURRENT_TIME);*/
|
|
||||||
e_hints_active_window_set(bd->client.win);
|
e_hints_active_window_set(bd->client.win);
|
||||||
ecore_x_window_focus(bd->client.win);
|
ecore_x_window_focus(bd->client.win);
|
||||||
}
|
}
|
||||||
|
@ -394,12 +393,14 @@ e_border_focus_set(E_Border *bd, int focus, int set)
|
||||||
{
|
{
|
||||||
printf("set focus\n");
|
printf("set focus\n");
|
||||||
ecore_x_window_focus(bd->client.win);
|
ecore_x_window_focus(bd->client.win);
|
||||||
|
e_hints_active_window_set(bd->client.win);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf("remove focus\n");
|
printf("remove focus\n");
|
||||||
ecore_x_window_focus(bd->container->manager->win);
|
ecore_x_window_focus(bd->container->manager->win);
|
||||||
|
e_hints_active_window_set(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((bd->focused) && (focused != bd))
|
if ((bd->focused) && (focused != bd))
|
||||||
|
|
|
@ -16,9 +16,6 @@ e_hints_init(void)
|
||||||
|
|
||||||
win = ecore_x_window_new(0, -200, -200, 5, 5);
|
win = ecore_x_window_new(0, -200, -200, 5, 5);
|
||||||
|
|
||||||
ecore_x_icccm_init();
|
|
||||||
ecore_x_netwm_init();
|
|
||||||
|
|
||||||
if (roots)
|
if (roots)
|
||||||
{
|
{
|
||||||
if (num > 0)
|
if (num > 0)
|
||||||
|
@ -138,7 +135,6 @@ e_hints_client_stacking_set(void)
|
||||||
void
|
void
|
||||||
e_hints_active_window_set(Ecore_X_Window win)
|
e_hints_active_window_set(Ecore_X_Window win)
|
||||||
{
|
{
|
||||||
ecore_x_icccm_take_focus_send(win, ECORE_X_CURRENT_TIME);
|
|
||||||
ecore_x_netwm_client_active_set(root, win);
|
ecore_x_netwm_client_active_set(root, win);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue