vtorri
/
entice
1
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

factorize code which retrieves modifiers

This commit is contained in:
Vincent Torri 2021-07-12 13:03:52 +02:00
parent 8fe0fc8736
commit 98b501bbb4
5 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/entice_exif.c
View File

@ -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");

11
src/bin/entice_key.c
View File

@ -28,6 +28,7 @@
#include <Elementary.h>
#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");

16
src/bin/entice_private.h
View File

@ -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 */

10
src/bin/entice_settings.c
View File

@ -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");

10
src/bin/entice_win.c
View File

@ -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");