use ECORE_EVENT_MODIFIER

SVN revision: 39538

src/bin/e_bindings.c

@@ -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);
    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_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
-   if (ev->modifiers & ECORE_X_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_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
 	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;
    Eina_List *l;
 
-   if (ev->modifiers & ECORE_X_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
-   if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
-   if (ev->modifiers & ECORE_X_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_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
 	if ((bind->edge == ev->edge) &&

src/bin/e_border.c

@@ -2697,9 +2697,9 @@ _e_border_action_restore_orig(E_Border *bd)
 static int
 _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;
-   else if (modifier & ECORE_X_MODIFIER_ALT)
+   else if (modifier & ECORE_EVENT_MODIFIER_ALT)
      {
 	value /= 2;
 	if (value)

src/bin/e_desklock.c

@@ -432,7 +432,7 @@ _e_desklock_cb_key_down(void *data, int type, void *event)
      _e_desklock_backspace();
    else if (!strcmp(ev->key, "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();
    else
      {

src/modules/exebuf/e_exebuf.c

@@ -1323,15 +1323,15 @@ _e_exebuf_cb_key_down(void *data, int type, void *event)
      _e_exebuf_complete();
    else if (!strcmp(ev->key, "Tab"))
      _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();
    else if (!strcmp(ev->key, "Return"))
      _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();
    else if (!strcmp(ev->key, "KP_Enter"))
      _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();
    else if (!strcmp(ev->key, "Escape"))
      e_exebuf_hide();