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

safe grab/ungrab 

SVN revision: 14868
This commit is contained in:
Carsten Haitzler 2005-05-20 09:22:10 +00:00
parent 4acd48f5af
commit 0ef7b7e31e
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
legacy/ecore/src/lib/ecore_x/ecore_x.c
View File

@ -1384,7 +1384,7 @@ ecore_x_window_button_ungrab(Ecore_X_Window win, int button,
unsigned int b; unsigned int b;
unsigned int m; unsigned int m;
unsigned int locks[8]; unsigned int locks[8];
int i, shuffle = 0; int i, shuffle = 0, found = 0;
b = button; b = button;
if (b == 0) b = AnyButton; if (b == 0) b = AnyButton;
@ -1400,14 +1400,21 @@ ecore_x_window_button_ungrab(Ecore_X_Window win, int button,
locks[7] = ECORE_X_LOCK_CAPS | ECORE_X_LOCK_NUM | ECORE_X_LOCK_SCROLL; locks[7] = ECORE_X_LOCK_CAPS | ECORE_X_LOCK_NUM | ECORE_X_LOCK_SCROLL;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
XUngrabButton(_ecore_x_disp, b, m | locks[i], win); XUngrabButton(_ecore_x_disp, b, m | locks[i], win);
for (i = 0; i < _ecore_window_grabs_num - 1; i++) if (_ecore_window_grabs_num > 0)
{ {
if (_ecore_window_grabs[i] == win) shuffle = 1; for (i = 0; i < (_ecore_window_grabs_num - 1); i++)
if (shuffle) _ecore_window_grabs[i] = _ecore_window_grabs[i + 1]; {
if (shuffle) _ecore_window_grabs[i] = _ecore_window_grabs[i + 1];
if ((!shuffle) && (_ecore_window_grabs[i] == win))
shuffle = 1;
}
if (shuffle)
{
_ecore_window_grabs_num--;
_ecore_window_grabs = realloc(_ecore_window_grabs,
_ecore_window_grabs_num * sizeof(Window));
}
} }
_ecore_window_grabs_num--;
_ecore_window_grabs = realloc(_ecore_window_grabs,
_ecore_window_grabs_num * sizeof(Window));
} }
int _ecore_key_grabs_num = 0; int _ecore_key_grabs_num = 0;
@ -1484,14 +1491,21 @@ ecore_x_window_key_ungrab(Ecore_X_Window win, char *key,
locks[7] = ECORE_X_LOCK_CAPS | ECORE_X_LOCK_NUM | ECORE_X_LOCK_SCROLL; locks[7] = ECORE_X_LOCK_CAPS | ECORE_X_LOCK_NUM | ECORE_X_LOCK_SCROLL;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
XUngrabKey(_ecore_x_disp, keycode, m | locks[i], win); XUngrabKey(_ecore_x_disp, keycode, m | locks[i], win);
for (i = 0; i < _ecore_key_grabs_num - 1; i++) if (_ecore_key_grabs_num > 0)
{ {
if (_ecore_key_grabs[i] == win) shuffle = 1; for (i = 0; i < (_ecore_key_grabs_num - 1); i++)
if (shuffle) _ecore_key_grabs[i] = _ecore_key_grabs[i + 1]; {
if (shuffle) _ecore_key_grabs[i] = _ecore_key_grabs[i + 1];
if ((!shuffle) && (_ecore_key_grabs[i] == win))
shuffle = 1;
}
if (shuffle)
{
_ecore_key_grabs_num--;
_ecore_key_grabs = realloc(_ecore_key_grabs,
_ecore_key_grabs_num * sizeof(Window));
}
} }
_ecore_key_grabs_num--;
_ecore_key_grabs = realloc(_ecore_key_grabs,
_ecore_key_grabs_num * sizeof(Window));
} }
/** /**

6
legacy/ecore/src/lib/ecore_x/ecore_x_events.c
View File

@ -315,9 +315,9 @@ _ecore_x_event_handle_button_press(XEvent *xevent)
int replay = 0; int replay = 0;
if (_ecore_window_grab_replay_func) if (_ecore_window_grab_replay_func)
replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data, replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
ECORE_X_EVENT_MOUSE_WHEEL, ECORE_X_EVENT_MOUSE_WHEEL,
e); e);
if (replay) if (replay)
XAllowEvents(xevent->xbutton.display, XAllowEvents(xevent->xbutton.display,
ReplayPointer, ReplayPointer,