diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pixmaps/cursor-dropper-s.xpm | 22 | ||||
| -rw-r--r-- | src/pixmaps/cursor-dropping-f.xpm | 39 | ||||
| -rw-r--r-- | src/pixmaps/cursor-dropping-s.xpm | 39 | ||||
| -rw-r--r-- | src/shortcuts.cpp | 6 |
4 files changed, 95 insertions, 11 deletions
diff --git a/src/pixmaps/cursor-dropper-s.xpm b/src/pixmaps/cursor-dropper-s.xpm index 975895963..8c1654ef1 100644 --- a/src/pixmaps/cursor-dropper-s.xpm +++ b/src/pixmaps/cursor-dropper-s.xpm @@ -2,20 +2,20 @@ static const char * cursor_dropper_s_xpm[] = { "32 32 3 1 5 5", " c None", -"@ c Fill", +"@ s Fill", ". c #FFFFFF", "+ c #000000", " ... ............", -" .+. .@@@.@@.@@@.", -" .+. .@........@.", -" .+. .@. .@.", -".... .... ... ...", -".+++ +++. .@. .@.", -".... .... .@. .@.", -" .+. ... ...", -" .+. .... .@. .@.", -" .+. .+++. .@........@.", -" ... .+..+. .@@@.@@.@@@.", +" .+. .@@@@@@@@@@.", +" .+. .@@@@@@@@@@.", +" .+. .@@. .@@.", +".... .... .@@. .@@.", +".+++ +++. .@@. .@@.", +".... .... .@@. .@@.", +" .+. .@@. .@@.", +" .+. .... .@@. .@@.", +" .+. .+++. .@@@@@@@@@@.", +" ... .+..+. .@@@@@@@@@@.", " .++..+. ............", " .++..+. ", " .++..+. ", diff --git a/src/pixmaps/cursor-dropping-f.xpm b/src/pixmaps/cursor-dropping-f.xpm new file mode 100644 index 000000000..8490ba795 --- /dev/null +++ b/src/pixmaps/cursor-dropping-f.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static const char * cursor_dropping_f_xpm[] = { +"32 32 4 1 5 5", +" c None", +". c #FFFFFF", +"+ c #000000", +"@ s Fill", +" ... ............", +" .+. .++++++++++.", +" .+. .+@@@@@@@@+.", +" .+. .+@@@@@@@@+.", +".... .... .+@@@@@@@@+.", +".+++ +++. .+@@@@@@@@+.", +".... .... .+@@@@@@@@+.", +" .+. ... .+@@@@@@@@+.", +" .+. .+++. .+@@@@@@@@+.", +" .+. .+..++. .+@@@@@@@@+.", +" ... .+.++++. .++++++++++.", +" ..+.+++++. ............", +" .++.++++++. ", +" .++.++++++. ", +" .++++++.. ", +" .+.++++. ", +" .+..++++. ", +" .+..++.+. ", +" .+..++. . ", +" .+++++. ", +" .+++++. ", +" .+++++. ", +" .++++. ", +" .+++. ", +" .... ", +" .+. ", +" .+++. ", +".++..+. ", +".+++.+. ", +".+++++. ", +" .+++. ", +" ... "}; diff --git a/src/pixmaps/cursor-dropping-s.xpm b/src/pixmaps/cursor-dropping-s.xpm new file mode 100644 index 000000000..0ecac8a68 --- /dev/null +++ b/src/pixmaps/cursor-dropping-s.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static const char * cursor_dropping_s_xpm[] = { +"32 32 4 1 5 5", +" c None", +". c #FFFFFF", +"+ c #000000", +"@ s Stroke", +" ... ............", +" .+. .@@@@@@@@@@.", +" .+. .@@@@@@@@@@.", +" .+. .@@......@@.", +".... .... .@@. .@@.", +".+++ +++. .@@. .@@.", +".... .... .@@. .@@.", +" .+. ... .@@. .@@.", +" .+. .+++. .@@......@@.", +" .+. .+..++. .@@@@@@@@@@.", +" ... .+.++++. .@@@@@@@@@@.", +" ..+.+++++. ............", +" .++.++++++. ", +" .++.++++++. ", +" .++++++.. ", +" .+.++++. ", +" .+..++++. ", +" .+..++.+. ", +" .+..++. . ", +" .+++++. ", +" .+++++. ", +" .+++++. ", +" .++++. ", +" .+++. ", +" .... ", +" .+. ", +" .+++. ", +".++..+. ", +".+++.+. ", +".+++++. ", +" .+++. ", +" ... "}; diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index 0cb0285f8..8a8d36d5a 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -625,6 +625,12 @@ static void read_shortcuts_file(char const *filename, bool const is_user_set) { modifiers |= SP_SHORTCUT_HYPER_MASK; } else if (!strcmp(mod, "Meta")) { modifiers |= SP_SHORTCUT_META_MASK; + } else if (!strcmp(mod, "Primary")) { +#ifdef __APPLE__ + modifiers |= SP_SHORTCUT_META_MASK; +#else + modifiers |= SP_SHORTCUT_CONTROL_MASK; +#endif } else { g_warning("Unknown modifier %s for %s", mod, verb_name); } |