Merge lp:~ubuntu-mate-dev/compiz/mate-consistent-keybindings into lp:compiz/0.9.12

[Martin Wimpress ]

Default MATE keybindings to be consistent with other MATE WMs.

This merge proposal makes the key bindings for MATE broadly consistent between Marco and Compiz. Where possible, all key bindings are now aligned with the document below:

  * https://help.ubuntu.com/community/KeyboardShortcuts

[Stephen M. Webb (bregma)]

No problems.

review: Approve

=== modified file 'debian/mate.ini'
--- debian/mate.ini	2015-02-27 23:11:40 +0000
+++ debian/mate.ini	2015-05-05 13:22:44 +0000
@@ -1,13 +1,10 @@
 [core]
-s0_active_plugins = core;composite;opengl;compiztoolbox;crashhandler;imgjpeg;copytex;decor;showdesktop;put;text;cube;mousepoll;grid;imgpng;move;matecompat;scale;snap;place;resize;commands;regex;shift;thumbnail;rotate;showmouse;workarounds;cubeaddon;animation;expo;ezoom;addhelper;
+s0_active_plugins = core;crashhandler;composite;opengl;decor;addhelper;put;place;regex;imgpng;copytex;grid;snap;resize;showdesktop;mousepoll;text;compiztoolbox;matecompat;imgjpeg;commands;animation;cube;move;neg;rotate;scale;shift;thumbnail;cubeaddon;workarounds;showmouse;expo;ezoom;session;
 s0_audible_bell = false
 s0_do_serialize = true
 s0_autoraise = false
 s0_autoraise_delay = 500
-s0_minimize_window_key = <Super>h
-s0_maximize_window_key = <Super>Up
-s0_unmaximize_or_minimize_window_key = <Super>Down
-s0_window_menu_button = <Super>Button3
+s0_show_desktop_key = <Control><Alt>d
 s0_toggle_window_maximized_key = <Alt>F10
 s0_toggle_window_shaded_key = Disabled
 s0_hsize = 4
@@ -23,6 +20,8 @@
 s0_transparent_manual_only = true
 
 [grid]
+s0_put_maximize_key = Disabled
+s0_put_restore_key = Disabled
 s0_top_left_corner_action = 7
 s0_top_edge_action = 8
 s0_top_right_corner_action = 9
@@ -31,23 +30,26 @@
 s0_bottom_right_corner_action = 3
 s0_outline_color = #87a7529f
 s0_fill_color = #74fb001b
+s0_snapback_windows = true
 
 [move]
-s0_initiate_button = <Super>Button1
+s0_initiate_button = <Alt>Button1
 s0_opacity = 96
 
 [animation]
+s0_open_matches = ((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver);((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\.exe$));(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd);
+s0_close_matches = ((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver) & !(name=gnome-screenshot);((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\.exe$));(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd);
 s0_unminimize_effects = animation:Glide 2;
 
 [matecompat]
-s0_main_menu_key = <Super>s
 s0_command_screenshot = mate-screenshot
 s0_command_window_screenshot = mate-screenshot -w
 s0_command_terminal = mate-terminal
 s0_run_command_terminal_key = <Control><Alt>t
 
 [gnomecompat]
-s0_main_menu_key = <Super>s
+s0_main_menu_key = Disabled
+s0_run_key = Disabled
 s0_command_screenshot = mate-screenshot
 s0_command_window_screenshot = mate-screenshot -w
 s0_command_terminal = mate-terminal
@@ -70,7 +72,7 @@
 s0_down_window_key = <Shift><Super>Next
 
 [resize]
-s0_initiate_button = <Super>Button2
+s0_initiate_button = <Alt>Button2
 s0_border_color = #6164659f
 s0_fill_color = #87a75240
 
@@ -78,7 +80,6 @@
 s0_command20 = /usr/bin/mate-system-monitor -p
 
 [expo]
-s0_expo_key = <Control><Alt>Up
 s0_mipmaps = true
 s0_selected_color = #34422eff
 s0_reflection = true
@@ -86,8 +87,8 @@
 s0_ground_color2 = #4b504400
 
 [ezoom]
-s0_zoom_in_key = <Super>m
-s0_zoom_out_key = <Super>n
+s0_zoom_in_button = <Super>Button4
+s0_zoom_out_button = <Super>Button5
 s0_zoom_box_outline_color = #4b50449f
 s0_zoom_box_fill_color = #2f2f2f4f
 
@@ -141,7 +142,7 @@
 
 [crashhandler]
 s0_enabled = true
-s0_directory = /tmp
+s0_directory = /var/crash
 s0_start_wm = true
 s0_wm_cmd = /usr/bin/marco --replace
 
@@ -191,7 +192,7 @@
 s0_rotation_speed = 0.350000
 s0_radius = 70
 s0_num_particles = 384
-s0_color = #ffdf3fff
+s0_color = #87a752ff
 
 [cubeaddon]
 s0_reflection = false
@@ -211,4 +212,11 @@
 [addhelper]
 s0_ononinit = true
 s0_brightness = 96
-s0_saturation = 72
\ No newline at end of file
+s0_saturation = 72
+
+[scale]
+s0_window_match = (Toolbar | Utility | Dialog | Normal | Unknown) & !(class=Tilda)
+
+[showdesktop]
+s0_direction = 5
+s0_window_match = (type=toolbar | type=utility | type=dialog | type=normal) & !(class=Tilda)