Move some keybindings, re-enable monitor switch, rotate.

Author: mtwebster

data/org.cinnamon.muffin.gschema.xml.in

@@ -192,22 +192,6 @@
   </schema>
   <schema id="org.cinnamon.muffin.keybindings" path="/org/cinnamon/muffin/keybindings/">
 
-    <key name="push-tile-left" type="as">
-      <default><![CDATA[['<Super>Left']]]></default>
-    </key>
-
-    <key name="push-tile-right" type="as">
-      <default><![CDATA[['<Super>Right']]]></default>
-    </key>
-
-    <key name="push-tile-up" type="as">
-      <default><![CDATA[['<Super>Up']]]></default>
-    </key>
-
-    <key name="push-tile-down" type="as">
-      <default><![CDATA[['<Super>Down']]]></default>
-    </key>
-
     <key name="tab-popup-select" type="as">
       <default>[]</default>
       <summary>Select window from tab popup</summary>
@@ -217,16 +201,5 @@
       <default>[]</default>
       <summary>Cancel tab popup</summary>
     </key>
-
-    <key name="switch-monitor" type="as">
-      <default><![CDATA[['<Super>p','XF86Display']]]></default>
-      <summary>Switch monitor configurations</summary>
-    </key>
-
-    <key name="rotate-monitor" type="as">
-      <default><![CDATA[['XF86RotateWindows']]]></default>
-      <summary>Rotates the built-in monitor configuration</summary>
-    </key>
-
   </schema>
 </schemalist>

src/core/keybindings.c

@@ -4158,19 +4158,19 @@ init_builtin_key_bindings (MetaDisplay *display)
                           META_KEYBINDING_ACTION_TOGGLE_RECORDING,
                           NULL, 0);
 
-  // add_builtin_keybinding (display,
-  //                         "switch-monitor",
-  //                         mutter_keybindings,
-  //                         META_KEY_BINDING_NONE,
-  //                         META_KEYBINDING_ACTION_SWITCH_MONITOR,
-  //                         handle_switch_monitor, 0);
+  add_builtin_keybinding (display,
+                          "switch-monitor",
+                          common_keybindings,
+                          META_KEY_BINDING_NONE,
+                          META_KEYBINDING_ACTION_SWITCH_MONITOR,
+                          handle_switch_monitor, 0);
 
-  // add_builtin_keybinding (display,
-  //                         "rotate-monitor",
-  //                         mutter_keybindings,
-  //                         META_KEY_BINDING_NONE,
-  //                         META_KEYBINDING_ACTION_ROTATE_MONITOR,
-  //                         handle_rotate_monitor, 0);
+  add_builtin_keybinding (display,
+                          "rotate-monitor",
+                          common_keybindings,
+                          META_KEY_BINDING_NONE,
+                          META_KEYBINDING_ACTION_ROTATE_MONITOR,
+                          handle_rotate_monitor, 0);
 
 #ifdef HAVE_NATIVE_BACKEND
   MetaBackend *backend = meta_get_backend ();
@@ -4301,31 +4301,31 @@ init_builtin_key_bindings (MetaDisplay *display)
 
   add_builtin_keybinding (display,
                           "push-tile-left",
-                          mutter_keybindings,
+                          common_keybindings,
                           META_KEY_BINDING_PER_WINDOW |
                           META_KEY_BINDING_IGNORE_AUTOREPEAT,
                           META_KEYBINDING_ACTION_PUSH_TILE_LEFT,
                           handle_tile_action, META_TILE_LEFT);
 
   add_builtin_keybinding (display,
                           "push-tile-right",
-                          mutter_keybindings,
+                          common_keybindings,
                           META_KEY_BINDING_PER_WINDOW |
                           META_KEY_BINDING_IGNORE_AUTOREPEAT,
                           META_KEYBINDING_ACTION_PUSH_TILE_RIGHT,
                           handle_tile_action, META_TILE_RIGHT);
 
   add_builtin_keybinding (display,
                           "push-tile-up",
-                          mutter_keybindings,
+                          common_keybindings,
                           META_KEY_BINDING_PER_WINDOW |
                           META_KEY_BINDING_IGNORE_AUTOREPEAT,
                           META_KEYBINDING_ACTION_PUSH_TILE_UP,
                           handle_tile_action, META_TILE_TOP);
 
   add_builtin_keybinding (display,
                           "push-tile-down",
-                          mutter_keybindings,
+                          common_keybindings,
                           META_KEY_BINDING_PER_WINDOW |
                           META_KEY_BINDING_IGNORE_AUTOREPEAT,
                           META_KEYBINDING_ACTION_PUSH_TILE_DOWN,
@@ -4595,6 +4595,8 @@ init_builtin_key_bindings (MetaDisplay *display)
                           META_KEYBINDING_ACTION_MAXIMIZE_HORIZONTALLY,
                           handle_maximize_horizontally, 0);
 
+  /* Handled already by toggle_above */
+
   // add_builtin_keybinding (display,
   //                         "always-on-top",
   //                         common_keybindings,