From 72f835c00565835a536531cd81dc6d9a607b615a Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Fri, 30 Jun 2017 15:47:51 +0200
Subject: Use Meta for shortcuts on Mac OS

---
 share/keys/default.xml | 368 +++++++++++++++++++++++++------------------------
 src/shortcuts.cpp      |   6 +
 2 files changed, 191 insertions(+), 183 deletions(-)

diff --git a/share/keys/default.xml b/share/keys/default.xml
index 134251752..9a072d9da 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -11,7 +11,9 @@ source locally, you can view that file at:
   http://git.gnome.org/browse/gtk+/plain/gdk/gdkkeysyms.h
 
 - The "modifiers" attribute contains a comma-separated list of modifiers, which can be
-one or more of: "Ctrl", "Shift", "Alt".
+one or more of: "Ctrl", "Shift", "Alt", "Meta", "Super", "Hyper", or "Primary".
+
+"Primary" means Meta on Apple and Primary everywhere else, it's recommended over the use of Ctrl.
 
 - The "action" attribute contains the name of the action. The complete list of actions
 (called "verbs") is in the file src/verbs.cpp in Inkscape source; there you can see
@@ -41,42 +43,42 @@ override) the bindings in the main default.xml.
 
 <!-- File -->
 
-  <bind key="n" modifiers="Ctrl" action="FileNew" display="true" />
-  <bind key="N" modifiers="Ctrl" action="FileNew" />
+  <bind key="n" modifiers="Primary" action="FileNew" display="true" />
+  <bind key="N" modifiers="Primary" action="FileNew" />
 
-  <bind key="n" modifiers="Ctrl,Alt" action="FileTemplates" display="true" />
-  <bind key="N" modifiers="Ctrl,Alt" action="FileTemplates" />
+  <bind key="n" modifiers="Primary,Alt" action="FileTemplates" display="true" />
+  <bind key="N" modifiers="Primary,Alt" action="FileTemplates" />
 
-  <bind key="o" modifiers="Ctrl" action="FileOpen" display="true" />
-  <bind key="O" modifiers="Ctrl" action="FileOpen" />
+  <bind key="o" modifiers="Primary" action="FileOpen" display="true" />
+  <bind key="O" modifiers="Primary" action="FileOpen" />
 
   <bind action="FileRevert" />
 
-  <bind key="s" modifiers="Ctrl" action="FileSave" display="true" />
-  <bind key="S" modifiers="Ctrl" action="FileSave" />
+  <bind key="s" modifiers="Primary" action="FileSave" display="true" />
+  <bind key="S" modifiers="Primary" action="FileSave" />
 
-  <bind key="s" modifiers="Ctrl,Shift" action="FileSaveAs" display="true" />
-  <bind key="S" modifiers="Ctrl,Shift" action="FileSaveAs" />
+  <bind key="s" modifiers="Primary,Shift" action="FileSaveAs" display="true" />
+  <bind key="S" modifiers="Primary,Shift" action="FileSaveAs" />
 
-  <bind key="s" modifiers="Ctrl,Shift,Alt" action="FileSaveACopy" display="true" />
-  <bind key="S" modifiers="Ctrl,Shift,Alt" action="FileSaveACopy" />
+  <bind key="s" modifiers="Primary,Shift,Alt" action="FileSaveACopy" display="true" />
+  <bind key="S" modifiers="Primary,Shift,Alt" action="FileSaveACopy" />
 
-  <bind key="p" modifiers="Ctrl" action="FilePrint" display="true" />
-  <bind key="P" modifiers="Ctrl" action="FilePrint" />
+  <bind key="p" modifiers="Primary" action="FilePrint" display="true" />
+  <bind key="P" modifiers="Primary" action="FilePrint" />
 
-  <bind key="i" modifiers="Ctrl" action="FileImport" display="true" />
-  <bind key="I" modifiers="Ctrl" action="FileImport" />
+  <bind key="i" modifiers="Primary" action="FileImport" display="true" />
+  <bind key="I" modifiers="Primary" action="FileImport" />
 
-  <bind key="e" modifiers="Ctrl,Shift" action="DialogExport" display="true" />
-  <bind key="E" modifiers="Ctrl,Shift" action="DialogExport" />
+  <bind key="e" modifiers="Primary,Shift" action="DialogExport" display="true" />
+  <bind key="E" modifiers="Primary,Shift" action="DialogExport" />
 
   <bind action="FileVacuum" />
 
-  <bind key="w" modifiers="Ctrl" action="FileClose" display="true" />
-  <bind key="W" modifiers="Ctrl" action="FileClose" />
+  <bind key="w" modifiers="Primary" action="FileClose" display="true" />
+  <bind key="W" modifiers="Primary" action="FileClose" />
 
-  <bind key="q" modifiers="Ctrl" action="FileQuit" display="true" />
-  <bind key="Q" modifiers="Ctrl" action="FileQuit" />
+  <bind key="q" modifiers="Primary" action="FileQuit" display="true" />
+  <bind key="Q" modifiers="Primary" action="FileQuit" />
 
 <!-- Tools -->
 
@@ -152,7 +154,7 @@ override) the bindings in the main default.xml.
 
   <bind action="PenPrefs" />
 
-  <bind key="F6" modifiers="Ctrl" action="ToolCalligraphic" display="true" />
+  <bind key="F6" modifiers="Primary" action="ToolCalligraphic" display="true" />
   <bind key="c" action="ToolCalligraphic" />
   <bind key="C" action="ToolCalligraphic" />
 
@@ -174,13 +176,13 @@ override) the bindings in the main default.xml.
 
   <bind action="TextPrefs" />
 
-  <bind key="F1" modifiers="Ctrl" action="ToolGradient" display="true" />
+  <bind key="F1" modifiers="Primary" action="ToolGradient" display="true" />
   <bind key="g" action="ToolGradient" />
   <bind key="G" action="ToolGradient" />
 
   <bind action="GradientPrefs" />
 
-  <bind key="F2" modifiers="Ctrl" action="ToolConnector" display="true" />
+  <bind key="F2" modifiers="Primary" action="ToolConnector" display="true" />
   <bind key="o" action="ToolConnector" />
   <bind key="O" action="ToolConnector" />
 
@@ -232,8 +234,8 @@ override) the bindings in the main default.xml.
   <bind key="6" modifiers="Shift" action="ZoomPageWidth" />
   <bind key="KP_6" action="ZoomPageWidth" />
 
-  <bind key="e" modifiers="Ctrl" action="ZoomPageWidth" />
-  <bind key="E" modifiers="Ctrl" action="ZoomPageWidth" />
+  <bind key="e" modifiers="Primary" action="ZoomPageWidth" />
+  <bind key="E" modifiers="Primary" action="ZoomPageWidth" />
 
   <bind key="grave" modifiers="Shift" action="ZoomNext" display="true" /> <!-- ` -->
   <bind key="asciitilde" modifiers="Shift" action="ZoomNext" /> <!-- ~ -->
@@ -245,12 +247,12 @@ override) the bindings in the main default.xml.
 
   <bind key="F11" action="FullScreen" display="true" /> 
   <bind key="F11" action="FocusToggle" modifiers="Shift" display="true" /> 
-  <bind key="F11" action="FullScreenFocus" modifiers="Ctrl" display="true" /> 
+  <bind key="F11" action="FullScreenFocus" modifiers="Primary" display="true" /> 
 
-  <bind key="Tab" modifiers="Ctrl" action="NextWindow" display="true" />
-  <bind key="ISO_Left_Tab" modifiers="Ctrl" action="NextWindow" />
-  <bind key="Tab" modifiers="Ctrl,Shift" action="PrevWindow" display="true" />
-  <bind key="ISO_Left_Tab" modifiers="Ctrl,Shift" action="PrevWindow" />
+  <bind key="Tab" modifiers="Primary" action="NextWindow" display="true" />
+  <bind key="ISO_Left_Tab" modifiers="Primary" action="NextWindow" />
+  <bind key="Tab" modifiers="Primary,Shift" action="PrevWindow" display="true" />
+  <bind key="ISO_Left_Tab" modifiers="Primary,Shift" action="PrevWindow" />
 
   <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
   <bind key="numbersign" action="ToggleGrid" display="true" />
@@ -266,11 +268,11 @@ override) the bindings in the main default.xml.
   <bind action="ToggleToolToolbar" />
   <bind action="ToggleToolbox" />
 
-  <bind key="r" modifiers="Ctrl" action="ToggleRulers" display="true" />
-  <bind key="R" modifiers="Ctrl" action="ToggleRulers" />
+  <bind key="r" modifiers="Primary" action="ToggleRulers" display="true" />
+  <bind key="R" modifiers="Primary" action="ToggleRulers" />
 
-  <bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true" />
-  <bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
+  <bind key="b" modifiers="Primary" action="ToggleScrollbars" display="true" />
+  <bind key="B" modifiers="Primary" action="ToggleScrollbars" />
 
   <bind key="p" modifiers="Shift,Alt" action="TogglePalette" display="true" />
   <bind key="P" modifiers="Shift,Alt" action="TogglePalette" />
@@ -281,8 +283,8 @@ override) the bindings in the main default.xml.
   <bind action="ViewNewPreview" />
   <bind action="ViewIconPreview" />
 
-  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
-  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
+  <bind key="KP_5" modifiers="Primary" action="ViewModeToggle" display="true" />
+  <bind key="KP_Begin" modifiers="Primary" action="ViewModeToggle" />
 
   <bind action="ViewModeNormal" />
   <bind action="ViewModeNoFilters" />
@@ -295,35 +297,35 @@ override) the bindings in the main default.xml.
 
 <!-- Edit -->
   
-  <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
-  <bind key="Z" modifiers="Ctrl" action="EditUndo" />
-  <!--Do not put in Ctrl,Shift+Y, already used-->
+  <bind key="z" modifiers="Primary" action="EditUndo" display="true" />
+  <bind key="Z" modifiers="Primary" action="EditUndo" />
+  <!--Do not put in Primary,Shift+Y, already used-->
 
-  <bind key="z" modifiers="Ctrl,Shift" action="EditRedo" display="true" />
-  <bind key="Z" modifiers="Ctrl,Shift" action="EditRedo" />
-  <bind key="y" modifiers="Ctrl" action="EditRedo" />
-  <bind key="Y" modifiers="Ctrl" action="EditRedo" />
+  <bind key="z" modifiers="Primary,Shift" action="EditRedo" display="true" />
+  <bind key="Z" modifiers="Primary,Shift" action="EditRedo" />
+  <bind key="y" modifiers="Primary" action="EditRedo" />
+  <bind key="Y" modifiers="Primary" action="EditRedo" />
 
-  <bind key="h" modifiers="Ctrl,Shift" action="DialogUndoHistory" display="true" />
-  <bind key="H" modifiers="Ctrl,Shift" action="DialogUndoHistory" />
+  <bind key="h" modifiers="Primary,Shift" action="DialogUndoHistory" display="true" />
+  <bind key="H" modifiers="Primary,Shift" action="DialogUndoHistory" />
 
-  <bind key="x" modifiers="Ctrl" action="EditCut" display="true" />
-  <bind key="X" modifiers="Ctrl" action="EditCut" />
+  <bind key="x" modifiers="Primary" action="EditCut" display="true" />
+  <bind key="X" modifiers="Primary" action="EditCut" />
   <bind key="Delete" modifiers="Shift" action="EditCut"/>
   
-  <bind key="c" modifiers="Ctrl" action="EditCopy" display="true" />
-  <bind key="C" modifiers="Ctrl" action="EditCopy" />
-  <bind key="Insert" modifiers="Ctrl" action="EditCopy"/>
+  <bind key="c" modifiers="Primary" action="EditCopy" display="true" />
+  <bind key="C" modifiers="Primary" action="EditCopy" />
+  <bind key="Insert" modifiers="Primary" action="EditCopy"/>
 
-  <bind key="v" modifiers="Ctrl" action="EditPaste" display="true" />
-  <bind key="V" modifiers="Ctrl" action="EditPaste" />
+  <bind key="v" modifiers="Primary" action="EditPaste" display="true" />
+  <bind key="V" modifiers="Primary" action="EditPaste" />
   <bind key="Insert" modifiers="Shift" action="EditPaste"/>
 
-  <bind key="v" modifiers="Ctrl,Shift" action="EditPasteStyle" display="true" />
-  <bind key="V" modifiers="Ctrl,Shift" action="EditPasteStyle" />
+  <bind key="v" modifiers="Primary,Shift" action="EditPasteStyle" display="true" />
+  <bind key="V" modifiers="Primary,Shift" action="EditPasteStyle" />
 
-  <bind key="v" modifiers="Ctrl,Alt" action="EditPasteInPlace" display="true" />
-  <bind key="V" modifiers="Ctrl,Alt" action="EditPasteInPlace" />
+  <bind key="v" modifiers="Primary,Alt" action="EditPasteInPlace" display="true" />
+  <bind key="V" modifiers="Primary,Alt" action="EditPasteInPlace" />
 
   <bind action="EditPasteSize" />
   <bind action="EditPasteWidth" />
@@ -336,8 +338,8 @@ override) the bindings in the main default.xml.
   <bind key="KP_Delete" action="EditDelete" />
   <bind key="BackSpace" action="EditDelete" />
 
-  <bind key="d" modifiers="Ctrl" action="EditDuplicate" display="true" />
-  <bind key="D" modifiers="Ctrl" action="EditDuplicate" />
+  <bind key="d" modifiers="Primary" action="EditDuplicate" display="true" />
+  <bind key="D" modifiers="Primary" action="EditDuplicate" />
 
   <bind key="d" modifiers="Alt" action="EditClone" display="true" />
   <bind key="D" modifiers="Alt" action="EditClone" />
@@ -352,13 +354,13 @@ override) the bindings in the main default.xml.
 
   <bind action="EditCloneOriginalPathLPE" />
 
-  <bind key="a" modifiers="Ctrl" action="EditSelectAll" display="true" />
-  <bind key="A" modifiers="Ctrl" action="EditSelectAll" />
+  <bind key="a" modifiers="Primary" action="EditSelectAll" display="true" />
+  <bind key="A" modifiers="Primary" action="EditSelectAll" />
 
   <bind action="EditClearAll" />
 
-  <bind key="a" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" display="true" />
-  <bind key="A" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" />
+  <bind key="a" modifiers="Primary,Alt" action="EditSelectAllInAllLayers" display="true" />
+  <bind key="A" modifiers="Primary,Alt" action="EditSelectAllInAllLayers" />
 
   <bind action="EditSelectSameFillStroke" />  
   <bind action="EditSelectSameFillColor" />  
@@ -385,8 +387,8 @@ override) the bindings in the main default.xml.
 
   <bind action="EditSwapFillStroke" display="true" />
 
-  <bind key="r" modifiers="Ctrl,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
-  <bind key="R" modifiers="Ctrl,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
+  <bind key="r" modifiers="Primary,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
+  <bind key="R" modifiers="Primary,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
 
   <!-- Objects/selection -->
 
@@ -414,8 +416,8 @@ override) the bindings in the main default.xml.
   <bind key="comma" modifiers="Alt" action="SelectionShrinkScreen" />
   <bind key="less" modifiers="Alt" action="SelectionShrinkScreen" />
   
-  <bind key="comma" modifiers="Ctrl" action="SelectionShrinkHalve" />
-  <bind key="less" modifiers="Ctrl" action="SelectionShrinkHalve" />
+  <bind key="comma" modifiers="Primary" action="SelectionShrinkHalve" />
+  <bind key="less" modifiers="Primary" action="SelectionShrinkHalve" />
   
   <bind key="period" action="SelectionGrow" display="true" />
   <bind key="greater" action="SelectionGrow" />
@@ -423,18 +425,18 @@ override) the bindings in the main default.xml.
   <bind key="period" modifiers="Alt" action="SelectionGrowScreen" />
   <bind key="greater" modifiers="Alt" action="SelectionGrowScreen" />
   
-  <bind key="period" modifiers="Ctrl" action="SelectionGrowDouble" />
-  <bind key="greater" modifiers="Ctrl" action="SelectionGrowDouble" />
+  <bind key="period" modifiers="Primary" action="SelectionGrowDouble" />
+  <bind key="greater" modifiers="Primary" action="SelectionGrowDouble" />
 
-  <bind key="g" modifiers="Ctrl" action="SelectionGroup" display="true" />
-  <bind key="G" modifiers="Ctrl" action="SelectionGroup" />
-  <bind key="u" modifiers="Ctrl,Shift" action="SelectionGroup" />
-  <bind key="U" modifiers="Ctrl,Shift" action="SelectionGroup" />
+  <bind key="g" modifiers="Primary" action="SelectionGroup" display="true" />
+  <bind key="G" modifiers="Primary" action="SelectionGroup" />
+  <bind key="u" modifiers="Primary,Shift" action="SelectionGroup" />
+  <bind key="U" modifiers="Primary,Shift" action="SelectionGroup" />
 
-  <bind key="g" modifiers="Ctrl,Shift" action="SelectionUnGroup" display="true" />
-  <bind key="G" modifiers="Ctrl,Shift" action="SelectionUnGroup" />
-  <bind key="u" modifiers="Ctrl" action="SelectionUnGroup" />
-  <bind key="U" modifiers="Ctrl" action="SelectionUnGroup" />
+  <bind key="g" modifiers="Primary,Shift" action="SelectionUnGroup" display="true" />
+  <bind key="G" modifiers="Primary,Shift" action="SelectionUnGroup" />
+  <bind key="u" modifiers="Primary" action="SelectionUnGroup" />
+  <bind key="U" modifiers="Primary" action="SelectionUnGroup" />
 
   <bind key="b" modifiers="Alt" action="SelectionCreateBitmap" display="true" />
   <bind key="B" modifiers="Alt" action="SelectionCreateBitmap" />
@@ -471,46 +473,46 @@ override) the bindings in the main default.xml.
 
 <!-- Path -->
 
-  <bind key="c" modifiers="Ctrl,Shift" action="ObjectToPath" display="true" />
-  <bind key="C" modifiers="Ctrl,Shift" action="ObjectToPath" />
+  <bind key="c" modifiers="Primary,Shift" action="ObjectToPath" display="true" />
+  <bind key="C" modifiers="Primary,Shift" action="ObjectToPath" />
 
-  <bind key="c" modifiers="Ctrl,Alt" action="StrokeToPath" display="true" />
-  <bind key="C" modifiers="Ctrl,Alt" action="StrokeToPath" />
+  <bind key="c" modifiers="Primary,Alt" action="StrokeToPath" display="true" />
+  <bind key="C" modifiers="Primary,Alt" action="StrokeToPath" />
 
-  <bind key="k" modifiers="Ctrl" action="SelectionCombine" display="true" />
-  <bind key="K" modifiers="Ctrl" action="SelectionCombine" />
+  <bind key="k" modifiers="Primary" action="SelectionCombine" display="true" />
+  <bind key="K" modifiers="Primary" action="SelectionCombine" />
 
-  <bind key="k" modifiers="Ctrl,Shift" action="SelectionBreakApart" display="true" />
-  <bind key="K" modifiers="Ctrl,Shift" action="SelectionBreakApart" />
+  <bind key="k" modifiers="Primary,Shift" action="SelectionBreakApart" display="true" />
+  <bind key="K" modifiers="Primary,Shift" action="SelectionBreakApart" />
 
-  <bind key="plus" modifiers="Ctrl" action="SelectionUnion" display="true" />
-  <bind key="KP_Add" modifiers="Ctrl" action="SelectionUnion" />
-  <bind key="plus" modifiers="Ctrl,Shift" action="SelectionUnion" />
+  <bind key="plus" modifiers="Primary" action="SelectionUnion" display="true" />
+  <bind key="KP_Add" modifiers="Primary" action="SelectionUnion" />
+  <bind key="plus" modifiers="Primary,Shift" action="SelectionUnion" />
 
-  <bind key="asterisk" modifiers="Ctrl" action="SelectionIntersect" display="true" />
-  <bind key="KP_Multiply" modifiers="Ctrl" action="SelectionIntersect" />
-  <bind key="asterisk" modifiers="Ctrl,Shift" action="SelectionIntersect" />
+  <bind key="asterisk" modifiers="Primary" action="SelectionIntersect" display="true" />
+  <bind key="KP_Multiply" modifiers="Primary" action="SelectionIntersect" />
+  <bind key="asterisk" modifiers="Primary,Shift" action="SelectionIntersect" />
 
-  <bind key="minus" modifiers="Ctrl" action="SelectionDiff" display="true" />
-  <bind key="underscore" modifiers="Ctrl" action="SelectionDiff" />
-  <bind key="underscore" modifiers="Ctrl,Shift" action="SelectionDiff" />
-  <bind key="KP_Subtract" modifiers="Ctrl" action="SelectionDiff" />
-  <bind key="minus" modifiers="Ctrl,Shift" action="SelectionDiff" />
+  <bind key="minus" modifiers="Primary" action="SelectionDiff" display="true" />
+  <bind key="underscore" modifiers="Primary" action="SelectionDiff" />
+  <bind key="underscore" modifiers="Primary,Shift" action="SelectionDiff" />
+  <bind key="KP_Subtract" modifiers="Primary" action="SelectionDiff" />
+  <bind key="minus" modifiers="Primary,Shift" action="SelectionDiff" />
 
-  <bind key="asciicircum" modifiers="Ctrl" action="SelectionSymDiff" display="true" /> <!-- ^ -->
-  <bind key="asciicircum" modifiers="Ctrl,Shift" action="SelectionSymDiff" />
+  <bind key="asciicircum" modifiers="Primary" action="SelectionSymDiff" display="true" /> <!-- ^ -->
+  <bind key="asciicircum" modifiers="Primary,Shift" action="SelectionSymDiff" />
 
-  <bind key="slash" modifiers="Ctrl,Alt" action="SelectionCutPath" display="true" />
-  <bind key="slash" modifiers="Ctrl,Alt,Shift" action="SelectionCutPath" />
+  <bind key="slash" modifiers="Primary,Alt" action="SelectionCutPath" display="true" />
+  <bind key="slash" modifiers="Primary,Alt,Shift" action="SelectionCutPath" />
 
-  <bind key="slash" modifiers="Ctrl" action="SelectionDivide" display="true" />
-  <bind key="KP_Divide" modifiers="Ctrl" action="SelectionDivide" />
-  <bind key="slash" modifiers="Ctrl,Shift" action="SelectionDivide" />
+  <bind key="slash" modifiers="Primary" action="SelectionDivide" display="true" />
+  <bind key="KP_Divide" modifiers="Primary" action="SelectionDivide" />
+  <bind key="slash" modifiers="Primary,Shift" action="SelectionDivide" />
 
-  <bind key="parenright" modifiers="Ctrl" action="SelectionOffset" display="true" />
-  <bind key="parenright" modifiers="Ctrl,Shift" action="SelectionOffset" />
-  <bind key="0" modifiers="Ctrl,Shift" action="SelectionOffset" />
-  <bind key="0" modifiers="Ctrl" action="SelectionOffset" />
+  <bind key="parenright" modifiers="Primary" action="SelectionOffset" display="true" />
+  <bind key="parenright" modifiers="Primary,Shift" action="SelectionOffset" />
+  <bind key="0" modifiers="Primary,Shift" action="SelectionOffset" />
+  <bind key="0" modifiers="Primary" action="SelectionOffset" />
   
   <bind key="parenright" modifiers="Alt" action="SelectionOffsetScreen" display="true" />
   <bind key="0" modifiers="Alt" action="SelectionOffsetScreen" />
@@ -518,10 +520,10 @@ override) the bindings in the main default.xml.
   <bind key="parenright" modifiers="Alt,Shift" action="SelectionOffsetScreen10" display="true" />
   <bind key="0" modifiers="Alt,Shift" action="SelectionOffsetScreen10" />
 
-  <bind key="parenleft" modifiers="Ctrl" action="SelectionInset" display="true" />
-  <bind key="parenleft" modifiers="Ctrl,Shift" action="SelectionInset" />
-  <bind key="9" modifiers="Ctrl,Shift" action="SelectionInset" />
-  <bind key="9" modifiers="Ctrl" action="SelectionInset" />
+  <bind key="parenleft" modifiers="Primary" action="SelectionInset" display="true" />
+  <bind key="parenleft" modifiers="Primary,Shift" action="SelectionInset" />
+  <bind key="9" modifiers="Primary,Shift" action="SelectionInset" />
+  <bind key="9" modifiers="Primary" action="SelectionInset" />
 
   <bind key="parenleft" modifiers="Alt" action="SelectionInsetScreen" display="true" />
   <bind key="9" modifiers="Alt" action="SelectionInsetScreen" />
@@ -529,14 +531,14 @@ override) the bindings in the main default.xml.
   <bind key="parenleft" modifiers="Alt,Shift" action="SelectionInsetScreen10" display="true" />
   <bind key="9" modifiers="Alt,Shift" action="SelectionInsetScreen10" />
 
-  <bind key="j" modifiers="Ctrl" action="SelectionDynOffset" display="true" />
-  <bind key="J" modifiers="Ctrl" action="SelectionDynOffset" />
+  <bind key="j" modifiers="Primary" action="SelectionDynOffset" display="true" />
+  <bind key="J" modifiers="Primary" action="SelectionDynOffset" />
 
-  <bind key="j" modifiers="Ctrl,Alt" action="SelectionLinkedOffset" display="true" />
-  <bind key="J" modifiers="Ctrl,Alt" action="SelectionLinkedOffset" />
+  <bind key="j" modifiers="Primary,Alt" action="SelectionLinkedOffset" display="true" />
+  <bind key="J" modifiers="Primary,Alt" action="SelectionLinkedOffset" />
 
-  <bind key="l" modifiers="Ctrl" action="SelectionSimplify" display="true" />
-  <bind key="L" modifiers="Ctrl" action="SelectionSimplify" />
+  <bind key="l" modifiers="Primary" action="SelectionSimplify" display="true" />
+  <bind key="L" modifiers="Primary" action="SelectionSimplify" />
 
   <bind action="SelectionReverse" />
 
@@ -554,32 +556,32 @@ override) the bindings in the main default.xml.
   <bind action="ObjectFlowtextToText" />
   <bind action="SelectionTextRemoveKerns" />
 
-  <bind key="k" modifiers="Ctrl,Alt" action="DialogSpellcheck" display="true" />
-  <bind key="K" modifiers="Ctrl,Alt" action="DialogSpellcheck" />
+  <bind key="k" modifiers="Primary,Alt" action="DialogSpellcheck" display="true" />
+  <bind key="K" modifiers="Primary,Alt" action="DialogSpellcheck" />
 
 <!-- Layers -->
 
-  <bind key="N" modifiers="Ctrl,Shift" action="LayerNew" display="true" />
-  <bind key="n" modifiers="Ctrl,Shift" action="LayerNew" />
+  <bind key="N" modifiers="Primary,Shift" action="LayerNew" display="true" />
+  <bind key="n" modifiers="Primary,Shift" action="LayerNew" />
 
   <bind action="LayerRename" />
-  <bind key="Page_Up" modifiers="Ctrl" action="LayerNext" display="true" />
-  <bind key="KP_Page_Up" modifiers="Ctrl" action="LayerNext" />
-  <bind key="Page_Down" modifiers="Ctrl" action="LayerPrev" display="true" />
-  <bind key="KP_Page_Down" modifiers="Ctrl" action="LayerPrev" />
+  <bind key="Page_Up" modifiers="Primary" action="LayerNext" display="true" />
+  <bind key="KP_Page_Up" modifiers="Primary" action="LayerNext" />
+  <bind key="Page_Down" modifiers="Primary" action="LayerPrev" display="true" />
+  <bind key="KP_Page_Down" modifiers="Primary" action="LayerPrev" />
   <bind action="LayerDelete" />
 
-  <bind key="Page_Up" modifiers="Ctrl,Shift" action="LayerRaise" display="true" />
-  <bind key="KP_Page_Up" modifiers="Ctrl,Shift" action="LayerRaise" />
+  <bind key="Page_Up" modifiers="Primary,Shift" action="LayerRaise" display="true" />
+  <bind key="KP_Page_Up" modifiers="Primary,Shift" action="LayerRaise" />
 
-  <bind key="Page_Down" modifiers="Ctrl,Shift" action="LayerLower" display="true" />
-  <bind key="KP_Page_Down" modifiers="Ctrl,Shift" action="LayerLower" />
+  <bind key="Page_Down" modifiers="Primary,Shift" action="LayerLower" display="true" />
+  <bind key="KP_Page_Down" modifiers="Primary,Shift" action="LayerLower" />
 
-  <bind key="Home" modifiers="Ctrl,Shift" action="LayerToTop" display="true" />
-  <bind key="KP_Home" modifiers="Ctrl,Shift" action="LayerToTop" />
+  <bind key="Home" modifiers="Primary,Shift" action="LayerToTop" display="true" />
+  <bind key="KP_Home" modifiers="Primary,Shift" action="LayerToTop" />
 
-  <bind key="End" modifiers="Ctrl,Shift" action="LayerToBottom" display="true" />
-  <bind key="KP_End" modifiers="Ctrl,Shift" action="LayerToBottom" />
+  <bind key="End" modifiers="Primary,Shift" action="LayerToBottom" display="true" />
+  <bind key="KP_End" modifiers="Primary,Shift" action="LayerToBottom" />
 
   <bind key="Page_Up" modifiers="Shift" action="LayerMoveToNext" display="true" />
   <bind key="KP_Page_Up" modifiers="Shift" action="LayerMoveToNext" />
@@ -589,8 +591,8 @@ override) the bindings in the main default.xml.
 
   <bind action="LayerMoveTo" />  
 
-  <bind key="l" modifiers="Ctrl,Shift" action="DialogLayers" display="true" />
-  <bind key="L" modifiers="Ctrl,Shift" action="DialogLayers" />  
+  <bind key="l" modifiers="Primary,Shift" action="DialogLayers" display="true" />
+  <bind key="L" modifiers="Primary,Shift" action="DialogLayers" />  
 
   <bind action="LayerDuplicate" />  
   <bind action="LayerDelete" />  
@@ -608,46 +610,46 @@ override) the bindings in the main default.xml.
 
 <!-- Dialogs -->
 
-  <bind key="x" modifiers="Ctrl,Shift" action="DialogXMLEditor" display="true" />
-  <bind key="X" modifiers="Ctrl,Shift" action="DialogXMLEditor" />
+  <bind key="x" modifiers="Primary,Shift" action="DialogXMLEditor" display="true" />
+  <bind key="X" modifiers="Primary,Shift" action="DialogXMLEditor" />
 
-  <bind key="d" modifiers="Ctrl,Shift" action="DialogDocumentProperties" display="true" />
-  <bind key="D" modifiers="Ctrl,Shift" action="DialogDocumentProperties" />
+  <bind key="d" modifiers="Primary,Shift" action="DialogDocumentProperties" display="true" />
+  <bind key="D" modifiers="Primary,Shift" action="DialogDocumentProperties" />
 
-  <bind key="a" modifiers="Ctrl,Shift" action="DialogAlignDistribute" display="true" />
-  <bind key="A" modifiers="Ctrl,Shift" action="DialogAlignDistribute" />
+  <bind key="a" modifiers="Primary,Shift" action="DialogAlignDistribute" display="true" />
+  <bind key="A" modifiers="Primary,Shift" action="DialogAlignDistribute" />
 
-  <bind key="t" modifiers="Ctrl,Shift" action="DialogText" display="true" />
-  <bind key="T" modifiers="Ctrl,Shift" action="DialogText" />
+  <bind key="t" modifiers="Primary,Shift" action="DialogText" display="true" />
+  <bind key="T" modifiers="Primary,Shift" action="DialogText" />
 
-  <bind key="p" modifiers="Ctrl,Shift" action="DialogPreferences" display="true" />
-  <bind key="P" modifiers="Ctrl,Shift" action="DialogPreferences" />
+  <bind key="p" modifiers="Primary,Shift" action="DialogPreferences" display="true" />
+  <bind key="P" modifiers="Primary,Shift" action="DialogPreferences" />
 
-  <bind key="f" modifiers="Ctrl,Shift" action="DialogFillStroke" display="true" />
-  <bind key="F" modifiers="Ctrl,Shift" action="DialogFillStroke" />
+  <bind key="f" modifiers="Primary,Shift" action="DialogFillStroke" display="true" />
+  <bind key="F" modifiers="Primary,Shift" action="DialogFillStroke" />
 
-  <bind key="f" modifiers="Ctrl" action="DialogFind" display="true" />
-  <bind key="F" modifiers="Ctrl" action="DialogFind" />
+  <bind key="f" modifiers="Primary" action="DialogFind" display="true" />
+  <bind key="F" modifiers="Primary" action="DialogFind" />
 
-  <bind key="m" modifiers="Ctrl,Shift" action="DialogTransform" display="true" />
-  <bind key="M" modifiers="Ctrl,Shift" action="DialogTransform" />
+  <bind key="m" modifiers="Primary,Shift" action="DialogTransform" display="true" />
+  <bind key="M" modifiers="Primary,Shift" action="DialogTransform" />
 
-  <bind key="o" modifiers="Ctrl,Shift" action="DialogObjectProperties" display="true" />
-  <bind key="O" modifiers="Ctrl,Shift" action="DialogObjectProperties" />
+  <bind key="o" modifiers="Primary,Shift" action="DialogObjectProperties" display="true" />
+  <bind key="O" modifiers="Primary,Shift" action="DialogObjectProperties" />
 
   <bind action="DialogObjectAttributes" />
 
-  <bind key="w" modifiers="Ctrl,Shift" action="DialogSwatches" display="true" />
-  <bind key="W" modifiers="Ctrl,Shift" action="DialogSwatches" />
+  <bind key="w" modifiers="Primary,Shift" action="DialogSwatches" display="true" />
+  <bind key="W" modifiers="Primary,Shift" action="DialogSwatches" />
 
-  <bind key="y" modifiers="Ctrl,Shift" action="DialogSymbols" display="true" />
-  <bind key="Y" modifiers="Ctrl,Shift" action="DialogSymbols" />
+  <bind key="y" modifiers="Primary,Shift" action="DialogSymbols" display="true" />
+  <bind key="Y" modifiers="Primary,Shift" action="DialogSymbols" />
 
-  <bind key="ampersand" modifiers="Ctrl,Shift" action="DialogLivePathEffect" />
-  <bind key="7" modifiers="Ctrl,Shift" action="DialogLivePathEffect" display="true" />
+  <bind key="ampersand" modifiers="Primary,Shift" action="DialogLivePathEffect" />
+  <bind key="7" modifiers="Primary,Shift" action="DialogLivePathEffect" display="true" />
 
-  <bind key="ampersand" modifiers="Ctrl" action="PasteLivePathEffect" />
-  <bind key="7" modifiers="Ctrl" action="PasteLivePathEffect" display="true" />
+  <bind key="ampersand" modifiers="Primary" action="PasteLivePathEffect" />
+  <bind key="7" modifiers="Primary" action="PasteLivePathEffect" display="true" />
 
   <bind action="RemoveLivePathEffect" />
 
@@ -659,26 +661,26 @@ override) the bindings in the main default.xml.
 
   <bind key="F12" action="DialogsToggle" display="true" />
 
-  <bind key="h" modifiers="Ctrl,Alt" action="AlignHorizontalCenter" display="true" />
-  <bind key="H" modifiers="Ctrl,Alt" action="AlignHorizontalCenter" />
+  <bind key="h" modifiers="Primary,Alt" action="AlignHorizontalCenter" display="true" />
+  <bind key="H" modifiers="Primary,Alt" action="AlignHorizontalCenter" />
 
-  <bind key="t" modifiers="Ctrl,Alt" action="AlignVerticalCenter" display="true" />
-  <bind key="T" modifiers="Ctrl,Alt" action="AlignVerticalCenter" />
+  <bind key="t" modifiers="Primary,Alt" action="AlignVerticalCenter" display="true" />
+  <bind key="T" modifiers="Primary,Alt" action="AlignVerticalCenter" />
 
-  <bind key="KP_2" modifiers="Ctrl,Alt" action="AlignVerticalBottom" display="true" />
-  <bind key="KP_2" modifiers="Ctrl,Alt" action="AlignVerticalBottom" />
+  <bind key="KP_2" modifiers="Primary,Alt" action="AlignVerticalBottom" display="true" />
+  <bind key="KP_2" modifiers="Primary,Alt" action="AlignVerticalBottom" />
 
-  <bind key="KP_4" modifiers="Ctrl,Alt" action="AlignHorizontalLeft" display="true" />
-  <bind key="KP_4" modifiers="Ctrl,Alt" action="AlignHorizontalLeft" />
+  <bind key="KP_4" modifiers="Primary,Alt" action="AlignHorizontalLeft" display="true" />
+  <bind key="KP_4" modifiers="Primary,Alt" action="AlignHorizontalLeft" />
 
-  <bind key="KP_5" modifiers="Ctrl,Alt" action="AlignVerticalHorizontalCenter" display="true" />
-  <bind key="KP_5" modifiers="Ctrl,Alt" action="AlignVerticalHorizontalCenter" />
+  <bind key="KP_5" modifiers="Primary,Alt" action="AlignVerticalHorizontalCenter" display="true" />
+  <bind key="KP_5" modifiers="Primary,Alt" action="AlignVerticalHorizontalCenter" />
 
-  <bind key="KP_6" modifiers="Ctrl,Alt" action="AlignHorizontalRight" display="true" />
-  <bind key="KP_6" modifiers="Ctrl,Alt" action="AlignHorizontalRight" />
+  <bind key="KP_6" modifiers="Primary,Alt" action="AlignHorizontalRight" display="true" />
+  <bind key="KP_6" modifiers="Primary,Alt" action="AlignHorizontalRight" />
 
-  <bind key="KP_8" modifiers="Ctrl,Alt" action="AlignVerticalTop" display="true" />
-  <bind key="KP_8" modifiers="Ctrl,Alt" action="AlignVerticalTop" />
+  <bind key="KP_8" modifiers="Primary,Alt" action="AlignVerticalTop" display="true" />
+  <bind key="KP_8" modifiers="Primary,Alt" action="AlignVerticalTop" />
 
 <!-- Help -->
 
@@ -699,15 +701,15 @@ override) the bindings in the main default.xml.
   effect id from the .inx file, for example "org.ekips.filter.addnodes" for the Add
   Nodes effect. -->
 
-  <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
-  <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
+  <bind key="g" modifiers="Primary,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
+  <bind key="G" modifiers="Primary,Alt" action="org.inkscape.typography.newglyphlayer"/>
 
 <!-- 
-  <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
-  <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
+  <bind key="h" modifiers="Primary,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
+  <bind key="H" modifiers="Primary,Alt" action="org.inkscape.typography.previousglyphlayer"/>
  -->
  
-  <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
-  <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
+  <bind key="j" modifiers="Primary,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
+  <bind key="J" modifiers="Primary,Alt" action="org.inkscape.typography.nextglyphlayer"/>
 
 </keys>
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);
                 }
-- 
cgit v1.2.3