vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove some commented out code that is deprecated in favor of e_focus.c 

code.
Indent.


SVN revision: 15603
This commit is contained in:
sebastid 2005-07-01 08:26:06 +00:00 committed by sebastid
parent b49dde8e5d
commit 4dbd82ea61
1 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/bin/e_border.c
View File

@ -3064,26 +3064,10 @@ _e_border_cb_mouse_in(void *data, int type, void *event)
details[ev->detail]); details[ev->detail]);
} }
#endif #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 (grabbed) return 1;
if (ev->event_win == bd->win) 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_focus_event_mouse_in(bd);
// e_border_focus_set(bd, 1, 1);
// e_border_raise(bd);
} }
if (ev->win != bd->event_win) return 1; if (ev->win != bd->event_win) return 1;
bd->mouse.current.mx = ev->root.x; bd->mouse.current.mx = ev->root.x;
@ -3132,39 +3116,31 @@ _e_border_cb_mouse_out(void *data, int type, void *event)
details[ev->detail]); details[ev->detail]);
} }
#endif #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 (grabbed) return 1;
if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) && if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
(ev->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR)) (ev->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR))
{
if (bd->cur_mouse_action)
{ {
if (bd->cur_mouse_action) if (bd->cur_mouse_action->func.end_mouse)
{ bd->cur_mouse_action->func.end_mouse(E_OBJECT(bd), "", ev);
if (bd->cur_mouse_action->func.end_mouse) else if (bd->cur_mouse_action->func.end)
bd->cur_mouse_action->func.end_mouse(E_OBJECT(bd), "", ev); bd->cur_mouse_action->func.end(E_OBJECT(bd), "");
else if (bd->cur_mouse_action->func.end) e_object_unref(E_OBJECT(bd->cur_mouse_action));
bd->cur_mouse_action->func.end(E_OBJECT(bd), ""); bd->cur_mouse_action = NULL;
e_object_unref(E_OBJECT(bd->cur_mouse_action));
bd->cur_mouse_action = NULL;
}
} }
}
if (ev->event_win == bd->win) if (ev->event_win == bd->win)
{ {
if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) && if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
(ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR)) (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR))
return 1; 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) if (ev->mode == ECORE_X_EVENT_MODE_GRAB)
return 1; return 1;
if ((ev->mode == ECORE_X_EVENT_MODE_NORMAL) && if ((ev->mode == ECORE_X_EVENT_MODE_NORMAL) &&
(ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR)) (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR))
return 1; return 1;
e_focus_event_mouse_out(bd); e_focus_event_mouse_out(bd);
//e_border_focus_set(bd, 0, 1);
} }
if (ev->win != bd->event_win) return 1; if (ev->win != bd->event_win) return 1;
bd->mouse.current.mx = ev->root.x; bd->mouse.current.mx = ev->root.x;