forked from enlightenment/efl
parent
4efff6222e
commit
32b7ff4314
|
@ -1415,16 +1415,22 @@ void
|
||||||
ecore_x_window_key_grab(Ecore_X_Window win, char *key,
|
ecore_x_window_key_grab(Ecore_X_Window win, char *key,
|
||||||
int mod, int any_mod)
|
int mod, int any_mod)
|
||||||
{
|
{
|
||||||
KeyCode keycode;
|
KeyCode keycode = 0;
|
||||||
KeySym keysym;
|
KeySym keysym;
|
||||||
unsigned int m;
|
unsigned int m;
|
||||||
unsigned int locks[8];
|
unsigned int locks[8];
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
keysym = XStringToKeysym(key);
|
if (!strncmp(key, "Keycode-", 8))
|
||||||
if (keysym == NoSymbol) return;
|
keycode = atoi(key + 8);
|
||||||
keycode = XKeysymToKeycode(_ecore_x_disp, XStringToKeysym(key));
|
else
|
||||||
|
{
|
||||||
|
keysym = XStringToKeysym(key);
|
||||||
|
if (keysym == NoSymbol) return;
|
||||||
|
keycode = XKeysymToKeycode(_ecore_x_disp, XStringToKeysym(key));
|
||||||
|
}
|
||||||
if (keycode == 0) return;
|
if (keycode == 0) return;
|
||||||
|
|
||||||
m = mod;
|
m = mod;
|
||||||
if (any_mod) m = AnyModifier;
|
if (any_mod) m = AnyModifier;
|
||||||
locks[0] = 0;
|
locks[0] = 0;
|
||||||
|
@ -1448,16 +1454,22 @@ void
|
||||||
ecore_x_window_key_ungrab(Ecore_X_Window win, char *key,
|
ecore_x_window_key_ungrab(Ecore_X_Window win, char *key,
|
||||||
int mod, int any_mod)
|
int mod, int any_mod)
|
||||||
{
|
{
|
||||||
KeyCode keycode;
|
KeyCode keycode = 0;
|
||||||
KeySym keysym;
|
KeySym keysym;
|
||||||
unsigned int m;
|
unsigned int m;
|
||||||
unsigned int locks[8];
|
unsigned int locks[8];
|
||||||
int i, shuffle = 0;
|
int i, shuffle = 0;
|
||||||
|
|
||||||
keysym = XStringToKeysym(key);
|
if (!strncmp(key, "Keycode-", 8))
|
||||||
if (keysym == NoSymbol) return;
|
keycode = atoi(key + 8);
|
||||||
keycode = XKeysymToKeycode(_ecore_x_disp, XStringToKeysym(key));
|
else
|
||||||
|
{
|
||||||
|
keysym = XStringToKeysym(key);
|
||||||
|
if (keysym == NoSymbol) return;
|
||||||
|
keycode = XKeysymToKeycode(_ecore_x_disp, XStringToKeysym(key));
|
||||||
|
}
|
||||||
if (keycode == 0) return;
|
if (keycode == 0) return;
|
||||||
|
|
||||||
m = mod;
|
m = mod;
|
||||||
if (any_mod) m = AnyModifier;
|
if (any_mod) m = AnyModifier;
|
||||||
locks[0] = 0;
|
locks[0] = 0;
|
||||||
|
|
Loading…
Reference in New Issue