forked from enlightenment/enlightenment
parent
27379cbd44
commit
cfa8aace26
|
@ -140,9 +140,9 @@ e_action_find(char *action, E_Action_Type act, int button, char *key, Ecore_Even
|
||||||
if ((a->key) && (strlen(a->key) > 0))
|
if ((a->key) && (strlen(a->key) > 0))
|
||||||
{
|
{
|
||||||
if (a->modifiers == -1)
|
if (a->modifiers == -1)
|
||||||
ecore_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
|
e_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
|
||||||
else
|
else
|
||||||
ecore_keys_grab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
|
e_keys_grab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
|
||||||
a->grabbed = 1;
|
a->grabbed = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -210,9 +210,9 @@ e_action_free(E_Action *a)
|
||||||
if ((a->key) && (strlen(a->key) > 0) && (a->grabbed))
|
if ((a->key) && (strlen(a->key) > 0) && (a->grabbed))
|
||||||
{
|
{
|
||||||
if (a->modifiers == -1)
|
if (a->modifiers == -1)
|
||||||
ecore_keys_ungrab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
|
e_keys_ungrab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
|
||||||
else
|
else
|
||||||
ecore_keys_ungrab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
|
e_keys_ungrab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
|
||||||
}
|
}
|
||||||
IF_FREE(a->name);
|
IF_FREE(a->name);
|
||||||
IF_FREE(a->action);
|
IF_FREE(a->action);
|
||||||
|
|
18
src/keys.c
18
src/keys.c
|
@ -1,11 +1,11 @@
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
#include "actions.h"
|
#include "actions.h"
|
||||||
|
|
||||||
static void ecore_key_down(Ecore_Event * ev);
|
static void e_key_down(Ecore_Event * ev);
|
||||||
static void ecore_key_up(Ecore_Event * ev);
|
static void e_key_up(Ecore_Event * ev);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
ecore_key_down(Ecore_Event * ev)
|
e_key_down(Ecore_Event * ev)
|
||||||
{
|
{
|
||||||
Ecore_Event_Key_Down *e;
|
Ecore_Event_Key_Down *e;
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ ecore_key_down(Ecore_Event * ev)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
ecore_key_up(Ecore_Event * ev)
|
e_key_up(Ecore_Event * ev)
|
||||||
{
|
{
|
||||||
Ecore_Event_Key_Up *e;
|
Ecore_Event_Key_Up *e;
|
||||||
|
|
||||||
|
@ -35,23 +35,23 @@ ecore_key_up(Ecore_Event * ev)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ecore_keys_init(void)
|
e_keys_init(void)
|
||||||
{
|
{
|
||||||
/* load up our actions .... once to get some grabbed keys */
|
/* load up our actions .... once to get some grabbed keys */
|
||||||
e_action_start("", ACT_KEY_DOWN, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE,
|
e_action_start("", ACT_KEY_DOWN, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE,
|
||||||
NULL, NULL, 0, 0, 0, 0);
|
NULL, NULL, 0, 0, 0, 0);
|
||||||
ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, ecore_key_down);
|
ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN, e_key_down);
|
||||||
ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP, ecore_key_up);
|
ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP, e_key_up);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ecore_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
|
e_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
|
||||||
{
|
{
|
||||||
ecore_key_grab(key, mods, anymod, 0);
|
ecore_key_grab(key, mods, anymod, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ecore_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
|
e_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
|
||||||
{
|
{
|
||||||
ecore_key_ungrab(key, mods, anymod);
|
ecore_key_ungrab(key, mods, anymod);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
|
|
||||||
void ecore_keys_init(void);
|
void e_keys_init(void);
|
||||||
void ecore_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
|
void e_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
|
||||||
void ecore_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
|
void e_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -125,7 +125,7 @@ main(int argc, char **argv)
|
||||||
e_menu_init();
|
e_menu_init();
|
||||||
e_view_init();
|
e_view_init();
|
||||||
e_entry_init();
|
e_entry_init();
|
||||||
ecore_keys_init();
|
e_keys_init();
|
||||||
e_guides_init();
|
e_guides_init();
|
||||||
e_place_init();
|
e_place_init();
|
||||||
e_cursors_init();
|
e_cursors_init();
|
||||||
|
|
Loading…
Reference in New Issue