forked from enlightenment/enlightenment
Remove some commented out code that is deprecated in favor of e_focus.c
code. Indent. SVN revision: 15603
This commit is contained in:
parent
b49dde8e5d
commit
4dbd82ea61
|
@ -3064,26 +3064,10 @@ _e_border_cb_mouse_in(void *data, int type, void *event)
|
|||
details[ev->detail]);
|
||||
}
|
||||
#endif
|
||||
/*
|
||||
if ((ev->mode == ECORE_X_EVENT_MODE_GRAB) &&
|
||||
(ev->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL) &&
|
||||
(ev->win == bd->event_win) &&
|
||||
(ev->event_win == bd->win))
|
||||
return 1;
|
||||
else if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
|
||||
(ev->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL) &&
|
||||
(ev->win == bd->event_win) &&
|
||||
(ev->event_win == bd->win))
|
||||
return 1;
|
||||
*/
|
||||
if (grabbed) return 1;
|
||||
if (ev->event_win == bd->win)
|
||||
{
|
||||
/* FIXME: this would normally put focus on the client on pointer */
|
||||
/* focus - but click to focus it wouldnt */
|
||||
e_focus_event_mouse_in(bd);
|
||||
// e_border_focus_set(bd, 1, 1);
|
||||
// e_border_raise(bd);
|
||||
}
|
||||
if (ev->win != bd->event_win) return 1;
|
||||
bd->mouse.current.mx = ev->root.x;
|
||||
|
@ -3132,8 +3116,6 @@ _e_border_cb_mouse_out(void *data, int type, void *event)
|
|||
details[ev->detail]);
|
||||
}
|
||||
#endif
|
||||
/* FIXME: this would normally take focus away in pointer focus mode */
|
||||
// if (ev->mode == ECORE_X_EVENT_MODE_UNGRAB) return 1;
|
||||
if (grabbed) return 1;
|
||||
if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
|
||||
(ev->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR))
|
||||
|
@ -3153,18 +3135,12 @@ _e_border_cb_mouse_out(void *data, int type, void *event)
|
|||
if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
|
||||
(ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR))
|
||||
return 1;
|
||||
/* this is the out for pointer focus
|
||||
if ((ev->mode == ECORE_X_EVENT_MODE_NORMAL) &&
|
||||
(ev->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL))
|
||||
return 1;
|
||||
*/
|
||||
if (ev->mode == ECORE_X_EVENT_MODE_GRAB)
|
||||
return 1;
|
||||
if ((ev->mode == ECORE_X_EVENT_MODE_NORMAL) &&
|
||||
(ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR))
|
||||
return 1;
|
||||
e_focus_event_mouse_out(bd);
|
||||
//e_border_focus_set(bd, 0, 1);
|
||||
}
|
||||
if (ev->win != bd->event_win) return 1;
|
||||
bd->mouse.current.mx = ev->root.x;
|
||||
|
|
Loading…
Reference in New Issue