diff --git a/src/bin/entice_exif.c b/src/bin/entice_exif.c index 2e46d72..8e07231 100644 --- a/src/bin/entice_exif.c +++ b/src/bin/entice_exif.c @@ -94,15 +94,7 @@ _entice_exif_key_down_cb(void *win, ev = (Evas_Event_Key_Down *)event_info; - ctrl = evas_key_modifier_is_set(ev->modifiers, "Control"); - alt = evas_key_modifier_is_set(ev->modifiers, "Alt"); - shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); - winm = evas_key_modifier_is_set(ev->modifiers, "Super"); - meta = - evas_key_modifier_is_set(ev->modifiers, "Meta") || - evas_key_modifier_is_set(ev->modifiers, "AltGr") || - evas_key_modifier_is_set(ev->modifiers, "ISO_Level3_Shift"); - hyper = evas_key_modifier_is_set(ev->modifiers, "Hyper"); + ENTICE_MODIFIERS_GET(ev->modifiers); entice = evas_object_data_get(win, "entice"); diff --git a/src/bin/entice_key.c b/src/bin/entice_key.c index 7240282..4ade5d6 100644 --- a/src/bin/entice_key.c +++ b/src/bin/entice_key.c @@ -28,6 +28,7 @@ #include +#include "entice_private.h" #include "entice_config.h" #include "entice_image.h" #include "entice_settings.h" @@ -48,15 +49,7 @@ void entice_key_handle(Evas_Object *win, Evas_Event_Key_Down *ev) Entice *entice; Eina_Bool ctrl, alt, shift, winm, meta, hyper; /* modifiers */ - ctrl = evas_key_modifier_is_set(ev->modifiers, "Control"); - alt = evas_key_modifier_is_set(ev->modifiers, "Alt"); - shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); - winm = evas_key_modifier_is_set(ev->modifiers, "Super"); - meta = - evas_key_modifier_is_set(ev->modifiers, "Meta") || - evas_key_modifier_is_set(ev->modifiers, "AltGr") || - evas_key_modifier_is_set(ev->modifiers, "ISO_Level3_Shift"); - hyper = evas_key_modifier_is_set(ev->modifiers, "Hyper"); + ENTICE_MODIFIERS_GET(ev->modifiers); entice = evas_object_data_get(win, "entice"); diff --git a/src/bin/entice_private.h b/src/bin/entice_private.h index f3274a0..412fe2f 100644 --- a/src/bin/entice_private.h +++ b/src/bin/entice_private.h @@ -67,4 +67,20 @@ extern int entice_app_log_dom_global; #endif #define CRIT(...) EINA_LOG_DOM_CRIT(entice_app_log_dom_global, __VA_ARGS__) +/* Modifiers */ +#define ENTICE_MODIFIERS_GET(mod) \ + do \ + { \ + ctrl = evas_key_modifier_is_set(mod, "Control"); \ + alt = evas_key_modifier_is_set(mod, "Alt"); \ + shift = evas_key_modifier_is_set(mod, "Shift"); \ + winm = evas_key_modifier_is_set(mod, "Super"); \ + meta = \ + evas_key_modifier_is_set(mod, "Meta") || \ + evas_key_modifier_is_set(mod, "AltGr") || \ + evas_key_modifier_is_set(mod, "ISO_Level3_Shift"); \ + hyper = evas_key_modifier_is_set(mod, "Hyper"); \ + } \ + while (0) + #endif /* ENTICE_PRIVATE_H */ diff --git a/src/bin/entice_settings.c b/src/bin/entice_settings.c index 08f7fbf..ceb9ea5 100644 --- a/src/bin/entice_settings.c +++ b/src/bin/entice_settings.c @@ -211,15 +211,7 @@ _entice_settings_key_down_cb(void *win, ev = (Evas_Event_Key_Down *)event_info; - ctrl = evas_key_modifier_is_set(ev->modifiers, "Control"); - alt = evas_key_modifier_is_set(ev->modifiers, "Alt"); - shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); - winm = evas_key_modifier_is_set(ev->modifiers, "Super"); - meta = - evas_key_modifier_is_set(ev->modifiers, "Meta") || - evas_key_modifier_is_set(ev->modifiers, "AltGr") || - evas_key_modifier_is_set(ev->modifiers, "ISO_Level3_Shift"); - hyper = evas_key_modifier_is_set(ev->modifiers, "Hyper"); + ENTICE_MODIFIERS_GET(ev->modifiers); entice = evas_object_data_get(win, "entice"); diff --git a/src/bin/entice_win.c b/src/bin/entice_win.c index 699698b..3ec90ed 100644 --- a/src/bin/entice_win.c +++ b/src/bin/entice_win.c @@ -187,15 +187,7 @@ _cb_mouse_wheel(void *win, ev = (Evas_Event_Mouse_Wheel *)event; - ctrl = evas_key_modifier_is_set(ev->modifiers, "Control"); - alt = evas_key_modifier_is_set(ev->modifiers, "Alt"); - shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); - winm = evas_key_modifier_is_set(ev->modifiers, "Super"); - meta = - evas_key_modifier_is_set(ev->modifiers, "Meta") || - evas_key_modifier_is_set(ev->modifiers, "AltGr") || - evas_key_modifier_is_set(ev->modifiers, "ISO_Level3_Shift"); - hyper = evas_key_modifier_is_set(ev->modifiers, "Hyper"); + ENTICE_MODIFIERS_GET(ev->modifiers); entice = evas_object_data_get(win, "entice");