enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

use ECORE_EVENT_MODIFIER 

SVN revision: 39538
This commit is contained in:
Hannes Janetzek 2009-03-17 21:55:33 +00:00
parent 43fbd47070
commit 4598a292ed
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_bindings.c
View File

@ -493,10 +493,10 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
current = e_desk_at_xy_get(ev->zone, ev->zone->desk_x_current, ev->zone->desk_y_current); current = e_desk_at_xy_get(ev->zone, ev->zone->desk_x_current, ev->zone->desk_y_current);
if (current->fullscreen_borders && (!e_config->fullscreen_flip)) return NULL; if (current->fullscreen_borders && (!e_config->fullscreen_flip)) return NULL;
if (ev->modifiers & ECORE_X_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT; if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL; if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
if (ev->modifiers & ECORE_X_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT; if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
if (ev->modifiers & ECORE_X_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN; if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
EINA_LIST_FOREACH(edge_bindings, l, bind) EINA_LIST_FOREACH(edge_bindings, l, bind)
{ {
if (((bind->edge == ev->edge)) && if (((bind->edge == ev->edge)) &&
@ -537,10 +537,10 @@ e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_
E_Action *act = NULL; E_Action *act = NULL;
Eina_List *l; Eina_List *l;
if (ev->modifiers & ECORE_X_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT; if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL; if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
if (ev->modifiers & ECORE_X_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT; if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
if (ev->modifiers & ECORE_X_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN; if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
EINA_LIST_FOREACH(edge_bindings, l, bind) EINA_LIST_FOREACH(edge_bindings, l, bind)
{ {
if ((bind->edge == ev->edge) && if ((bind->edge == ev->edge) &&

4
src/bin/e_border.c
View File

@ -2697,9 +2697,9 @@ _e_border_action_restore_orig(E_Border *bd)
static int static int
_e_border_key_down_modifier_apply(int modifier, int value) _e_border_key_down_modifier_apply(int modifier, int value)
{ {
if (modifier & ECORE_X_MODIFIER_CTRL) if (modifier & ECORE_EVENT_MODIFIER_CTRL)
return value * 2; return value * 2;
else if (modifier & ECORE_X_MODIFIER_ALT) else if (modifier & ECORE_EVENT_MODIFIER_ALT)
{ {
value /= 2; value /= 2;
if (value) if (value)

2
src/bin/e_desklock.c
View File

@ -432,7 +432,7 @@ _e_desklock_cb_key_down(void *data, int type, void *event)
_e_desklock_backspace(); _e_desklock_backspace();
else if (!strcmp(ev->key, "Delete")) else if (!strcmp(ev->key, "Delete"))
_e_desklock_delete(); _e_desklock_delete();
else if (!strcmp(ev->key, "u") && (ev->modifiers & ECORE_X_MODIFIER_CTRL)) else if (!strcmp(ev->key, "u") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL))
_e_desklock_null(); _e_desklock_null();
else else
{ {

6
src/modules/exebuf/e_exebuf.c
View File

@ -1323,15 +1323,15 @@ _e_exebuf_cb_key_down(void *data, int type, void *event)
_e_exebuf_complete(); _e_exebuf_complete();
else if (!strcmp(ev->key, "Tab")) else if (!strcmp(ev->key, "Tab"))
_e_exebuf_complete(); _e_exebuf_complete();
else if (!strcmp(ev->key, "Return") && (ev->modifiers & ECORE_X_MODIFIER_CTRL)) else if (!strcmp(ev->key, "Return") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL))
_e_exebuf_exec_term(); _e_exebuf_exec_term();
else if (!strcmp(ev->key, "Return")) else if (!strcmp(ev->key, "Return"))
_e_exebuf_exec(); _e_exebuf_exec();
else if (!strcmp(ev->key, "KP_Enter") && (ev->modifiers & ECORE_X_MODIFIER_CTRL)) else if (!strcmp(ev->key, "KP_Enter") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL))
_e_exebuf_exec_term(); _e_exebuf_exec_term();
else if (!strcmp(ev->key, "KP_Enter")) else if (!strcmp(ev->key, "KP_Enter"))
_e_exebuf_exec(); _e_exebuf_exec();
else if (!strcmp(ev->key, "u") && (ev->modifiers & ECORE_X_MODIFIER_CTRL)) else if (!strcmp(ev->key, "u") && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL))
_e_exebuf_clear(); _e_exebuf_clear();
else if (!strcmp(ev->key, "Escape")) else if (!strcmp(ev->key, "Escape"))
e_exebuf_hide(); e_exebuf_hide();