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

[Martin Wimpress ]

align MATE profile more closely with Marco

This merge proposal updates the Compiz profile for MATE. The MATE profile is now more closely aligned to Unity and uses far fewer Compiz plug-ins to achieve consistenty between Marco and Compiz. Deviations from the Compiz defaults have been kept to a minimum.

The changes fix application switching for MATE, make Compiz a little more responsive and (in my testing) Compiz is now more stable when used in conjunction with MATE.

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'debian/mate.ini'
--- debian/mate.ini	2015-06-25 09:26:00 +0000
+++ debian/mate.ini	2015-07-13 15:59:20 +0000
@@ -1,14 +1,33 @@
+[addhelper]
+s0_ononinit = true
+s0_brightness = 96
+s0_saturation = 72
+
+[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;
+
+[commands]
+s0_command20 = /usr/bin/mate-system-monitor -p
+
 [core]
-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;staticswitcher;thumbnail;cubeaddon;workarounds;showmouse;expo;ezoom;session;
-s0_audible_bell = false
-s0_do_serialize = true
+s0_active_plugins = core;composite;crashhandler;opengl;compiztoolbox;copytex;decor;grid;imgpng;matecompat;mousepoll;move;neg;place;regex;resize;session;showmouse;snap;thumbnail;vpswitch;wall;animation;commands;expo;ezoom;fade;scale;switcher;workarounds;
 s0_autoraise = false
 s0_autoraise_delay = 500
+s0_focus_prevention_level = 0
+s0_minimize_window_key = <Alt>F9
+s0_maximize_window_key = <Alt>F10
+s0_unmaximize_or_minimize_window_key = Disabled
 s0_show_desktop_key = <Control><Alt>d
-s0_toggle_window_maximized_key = <Alt>F10
-s0_toggle_window_shaded_key = Disabled
+s0_toggle_window_maximized_key = <Alt>F5
 s0_hsize = 4
 
+[crashhandler]
+s0_directory = /var/crash
+s0_start_wm = true
+s0_wm_cmd = /usr/bin/marco --replace
+
 [cube]
 s0_top_color = #34422eff
 s0_bottom_color = #34422eff
@@ -17,7 +36,59 @@
 s0_skydome_gradient_start_color = #34422eff
 s0_skydome_gradient_end_color = #87a752ff
 s0_active_opacity = 72.000000
-s0_transparent_manual_only = true
+
+[cubeaddon]
+s0_reflection = false
+s0_ground_color1 = #4b5044cc
+s0_ground_color2 = #34363100
+s0_deformation = 0
+s0_unfold_deformation = false
+s0_top_images = /usr/share/backgrounds/ubuntu-mate-common/ubuntu-mate-desktop-circle_of_mates_dark.png;
+s0_bottom_images = /usr/share/backgrounds/ubuntu-mate-common/ubuntu-mate-desktop-circle_of_mates_dark.png;
+
+[decor]
+s0_active_shadow_radius = 13.000000
+s0_active_shadow_opacity = 0.900000
+s0_active_shadow_color = #1b1b1bc0
+s0_active_shadow_x_offset = 0
+s0_active_shadow_y_offset = 0
+s0_inactive_shadow_radius = 13.000000
+s0_inactive_shadow_opacity = 0.900000
+s0_inactive_shadow_color = #1a1a1aff
+s0_inactive_shadow_x_offset = 0
+s0_inactive_shadow_y_offset = 0
+s0_mipmap = true
+
+[expo]
+s0_expo_key = <Super>a
+s0_selected_color = #34422eff
+s0_reflection = true
+s0_ground_color1 = #343631cc
+s0_ground_color2 = #4b504400
+
+[ezoom]
+s0_zoom_in_button = <Super>Button4
+s0_zoom_out_button = <Super>Button5
+s0_zoom_box_button = <Super>Button2
+s0_zoom_box_outline_color = #4b50449f
+s0_zoom_box_fill_color = #2f2f2f4f
+
+[firepaint]
+s0_fire_color = #87a752ff
+
+[freewins]
+s0_snap_threshold = 50
+s0_circle_color = #54befb80
+s0_line_color = #1800ffff
+s0_cross_line_color = #1800ffff
+
+[gnomecompat]
+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
+s0_run_command_terminal_key = <Control><Alt>t
 
 [grid]
 s0_put_maximize_key = Disabled
@@ -30,16 +101,9 @@
 s0_bottom_right_corner_action = 3
 s0_outline_color = #87a7529f
 s0_fill_color = #74fb001b
-s0_snapback_windows = true
-
-[move]
-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;
+
+[mag]
+s0_zoom_factor = 2.500000
 
 [matecompat]
 s0_command_screenshot = mate-screenshot
@@ -47,142 +111,16 @@
 s0_command_terminal = mate-terminal
 s0_run_command_terminal_key = <Control><Alt>t
 
-[gnomecompat]
-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
-s0_run_command_terminal_key = <Control><Alt>t
-
-[snap]
-s0_resistance_distance = 8
-s0_attraction_distance = 4
-
-[place]
-s0_mode = 2
-
-[wall]
-s0_thumb_highlight_gradient_shadow_color = #dfdfdfff
-s0_arrow_base_color = #e6e6e6d9
-s0_arrow_shadow_color = #dcdcdcd9
-s0_up_key = <Super>Prior
-s0_down_key = <Super>Next
-s0_up_window_key = <Shift><Super>Prior
-s0_down_window_key = <Shift><Super>Next
-
 [resize]
-s0_initiate_button = <Alt>Button2
 s0_border_color = #6164659f
 s0_fill_color = #87a75240
 
-[commands]
-s0_command20 = /usr/bin/mate-system-monitor -p
-
-[expo]
-s0_expo_key = <Shift><Super>s
-s0_mipmaps = true
-s0_selected_color = #34422eff
-s0_reflection = true
-s0_ground_color1 = #343631cc
-s0_ground_color2 = #4b504400
-
-[ezoom]
-s0_zoom_in_button = <Super>Button4
-s0_zoom_out_button = <Super>Button5
-s0_zoom_box_button = <Super>Button2
-s0_zoom_box_outline_color = #4b50449f
-s0_zoom_box_fill_color = #2f2f2f4f
-
-[decor]
-s0_active_shadow_radius = 13.000000
-s0_active_shadow_opacity = 0.900000
-s0_active_shadow_color = #1b1b1bc0
-s0_active_shadow_x_offset = 0
-s0_active_shadow_y_offset = 0
-s0_inactive_shadow_radius = 13.000000
-s0_inactive_shadow_opacity = 0.900000
-s0_inactive_shadow_color = #1a1a1aff
-s0_inactive_shadow_x_offset = 0
-s0_inactive_shadow_y_offset = 0
-s0_mipmap = true
-
-[opengl]
-s0_texture_compression = true
-
-[vpswitch]
-s0_switch_to_1_key = <Super>Home
-
-[staticswitcher]
-s0_next_key = <Alt>Tab
-s0_prev_key = <Shift><Alt>Tab
-s0_next_all_key = <Control><Alt>Tab
-s0_prev_all_key = <Shift><Control><Alt>Tab
-s0_speed = 1.000000
-s0_timestep = 0.500000
-s0_popup_delay = 0.050000
-s0_mipmap = true
-s0_focus_on_switch = true
-s0_highlight_mode = 1
-
-[shift]
-s0_initiate_key = Disabled
-s0_next_key = Disabled
-s0_prev_key = Disabled
-s0_next_all_key = Disabled
-s0_prev_all_key = Disabled
-s0_ground_color1 = #343631cc
-s0_ground_color2 = #4b504400
-s0_mipmaps = true
-
-[switcher]
-s0_next_key = Disabled
-s0_prev_key = Disabled
-s0_next_all_key = Disabled
-s0_prev_all_key = Disabled
-
-[screenshot]
-s0_selection_outline_color = #2f2f4f9f
-s0_selection_fill_color = #2f2f4f4f
-
 [resizeinfo]
 s0_gradient_1 = #cccce6cc
 s0_gradient_2 = #f3f3f3cc
 s0_gradient_3 = #d9d9d9cc
 s0_outline_color = #e6e6e6ff
 
-[wobbly]
-s0_friction = 2.500000
-s0_spring_k = 5.000000
-
-[crashhandler]
-s0_enabled = true
-s0_directory = /var/crash
-s0_start_wm = true
-s0_wm_cmd = /usr/bin/marco --replace
-
-[staticswitcher]
-s0_next_key = Disabled
-s0_prev_key = Disabled
-s0_next_all_key = Disabled
-s0_prev_all_key = Disabled
-
-[td]
-s0_manual_only = false
-
-[thumbnail]
-s0_fade_speed = 0.200000
-s0_border = 4
-s0_thumb_color = #343631cc
-s0_mipmap = true
-s0_current_viewport = false
-s0_title_enabled = false
-s0_font_bold = false
-s0_font_background_color = #4b50447f
-
-[firepaint]
-s0_fire_color = #87a752ff
-
 [rotate]
 s0_edge_flip_window = false
 s0_edge_flip_dnd = false
@@ -190,18 +128,19 @@
 s0_rotate_to_1_key = <Super>Home
 s0_rotate_to_1_window_key = <Shift><Super>Home
 
-[mag]
-s0_zoom_factor = 2.500000
-
-[put]
-s0_put_left_key = Disabled
-s0_put_right_key = Disabled
-s0_put_top_key = Disabled
-s0_put_bottom_key = Disabled
-s0_put_topleft_key = Disabled
-s0_put_topright_key = Disabled
-s0_put_bottomleft_key = Disabled
-s0_put_bottomright_key = Disabled
+[scale]
+s0_window_match = (Toolbar | Utility | Dialog | Normal | Unknown) & !(class=Tilda)
+
+[screenshot]
+s0_selection_outline_color = #2f2f4f9f
+s0_selection_fill_color = #2f2f4f4f
+
+[shift]
+s0_ground_color1 = #343631cc
+s0_ground_color2 = #4b504400
+
+[showdesktop]
+s0_window_match = (type=toolbar | type=utility | type=dialog | type=normal) & !(class=Tilda)
 
 [showmouse]
 s0_rotation_speed = 0.350000
@@ -209,32 +148,30 @@
 s0_num_particles = 384
 s0_color = #87a752ff
 
-[cubeaddon]
-s0_reflection = false
-s0_ground_color1 = #4b5044cc
-s0_ground_color2 = #34363100
-s0_deformation = 0
-s0_unfold_deformation = false
-s0_top_images = /usr/share/backgrounds/ubuntu-mate-common/ubuntu-mate-desktop-circle_of_mates_dark.png;
-s0_bottom_images = /usr/share/backgrounds/ubuntu-mate-common/ubuntu-mate-desktop-circle_of_mates_dark.png;
-
-[freewins]
-s0_snap_threshold = 50
-s0_circle_color = #54befb80
-s0_line_color = #1800ffff
-s0_cross_line_color = #1800ffff
-
-[addhelper]
-s0_ononinit = true
-s0_brightness = 96
-s0_saturation = 72
-
-[scale]
-s0_window_match = (Toolbar | Utility | Dialog | Normal | Unknown) & !(class=Tilda)
-s0_initiate_key = <Control><Alt>Up
-s0_initiate_all_key = <Super>a
-s0_initiate_output_key = <Super>w
-
-[showdesktop]
-s0_direction = 5
-s0_window_match = (type=toolbar | type=utility | type=dialog | type=normal) & !(class=Tilda)
+[switcher]
+s0_zoom = 0.000000
+s0_icon = false
+s0_icon_only = true
+
+[td]
+s0_manual_only = false
+
+[thumbnail]
+s0_fade_speed = 0.200000
+s0_border = 4
+s0_thumb_color = #343631cc
+s0_mipmap = true
+s0_current_viewport = false
+s0_title_enabled = false
+s0_font_bold = false
+s0_font_background_color = #4b50447f
+
+[vpswitch]
+s0_switch_to_1_key = <Super>Home
+
+[wall]
+s0_preview_scale = 256
+s0_thumb_highlight_gradient_shadow_color = #dfdfdfff
+s0_arrow_base_color = #e6e6e6d9
+s0_arrow_shadow_color = #dcdcdcd9
+