diff options
| author | Thomas Holder <thomas@thomas-holder.de> | 2019-08-15 22:20:16 +0000 |
|---|---|---|
| committer | Thomas Holder <thomas@thomas-holder.de> | 2019-08-16 21:27:35 +0000 |
| commit | e9ded04d15ee12fec8c023f2dba95135fceac154 (patch) | |
| tree | 778601d0c462b94c73d275eaa419ac5fbb599d1c /src/include | |
| parent | Fix a bug in fillet/chamfer LPE pointed in mailing list by Miguel Lopez. Fill... (diff) | |
| download | inkscape-e9ded04d15ee12fec8c023f2dba95135fceac154.tar.gz inkscape-e9ded04d15ee12fec8c023f2dba95135fceac154.zip | |
fix #385 inbox#765 macOS accelerators
- re-fix Cmd-Q confirmation dialog (#383) without the numbers typing regression (#385)
- re-fix Alt modifiers (inbox#765)
- fix Cmd-A select all text (inbox#765)
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/macros.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/include/macros.h b/src/include/macros.h index 21ddaff9e..ff049ddf1 100644 --- a/src/include/macros.h +++ b/src/include/macros.h @@ -20,14 +20,25 @@ #define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m))) +// "primary" modifier: Ctrl on Linux/Windows and Cmd on macOS. +// note: Could query this at runtime with +// `gdk_keymap_get_modifier_mask(..., GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR)` +#ifdef GDK_WINDOWING_QUARTZ +#define INK_GDK_PRIMARY_MASK GDK_MOD2_MASK +#else +#define INK_GDK_PRIMARY_MASK GDK_CONTROL_MASK +#endif + +// all modifiers used by Inkscape +#define INK_GDK_MODIFIER_MASK (GDK_SHIFT_MASK | INK_GDK_PRIMARY_MASK | GDK_MOD1_MASK) // keyboard modifiers in an event #define MOD__SHIFT(event) ((event)->key.state & GDK_SHIFT_MASK) -#define MOD__CTRL(event) ((event)->key.state & GDK_CONTROL_MASK) +#define MOD__CTRL(event) ((event)->key.state & INK_GDK_PRIMARY_MASK) #define MOD__ALT(event) ((event)->key.state & GDK_MOD1_MASK) -#define MOD__SHIFT_ONLY(event) (((event)->key.state & GDK_SHIFT_MASK) && !((event)->key.state & GDK_CONTROL_MASK) && !((event)->key.state & GDK_MOD1_MASK)) -#define MOD__CTRL_ONLY(event) (!((event)->key.state & GDK_SHIFT_MASK) && ((event)->key.state & GDK_CONTROL_MASK) && !((event)->key.state & GDK_MOD1_MASK)) -#define MOD__ALT_ONLY(event) (!((event)->key.state & GDK_SHIFT_MASK) && !((event)->key.state & GDK_CONTROL_MASK) && ((event)->key.state & GDK_MOD1_MASK)) +#define MOD__SHIFT_ONLY(event) (((event)->key.state & INK_GDK_MODIFIER_MASK) == GDK_SHIFT_MASK) +#define MOD__CTRL_ONLY(event) (((event)->key.state & INK_GDK_MODIFIER_MASK) == INK_GDK_PRIMARY_MASK) +#define MOD__ALT_ONLY(event) (((event)->key.state & INK_GDK_MODIFIER_MASK) == GDK_MOD1_MASK) #endif // SEEN_MACROS_H |