Compiz

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

  1. mate-rationalisation
  2. Merge into 0.9.12
Proposed by Martin Wimpress 
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 3959
Merged at revision: 3963
Proposed branch: lp:~ubuntu-mate-dev/compiz/mate-rationalisation
Merge into: lp:compiz/0.9.12
Diff against target: 358 lines (+120/-183)
1 file modified
debian/mate.ini (+120/-183)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/compiz/mate-rationalisation
Reviewer Review Type Date Requested Status
Stephen M. Webb Approve
Ubuntu Sponsors Pending
Review via email: mp+264603@code.launchpad.net

Commit message

align MATE profile more closely with Marco

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1[addhelper]
2s0_ononinit = true
3s0_brightness = 96
4s0_saturation = 72
5
6[animation]
7s0_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);
8s0_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);
9s0_unminimize_effects = animation:Glide 2;
10
11[commands]
12s0_command20 = /usr/bin/mate-system-monitor -p
13
1[core]14[core]
2s0_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;15s0_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;
3s0_audible_bell = false
4s0_do_serialize = true
5s0_autoraise = false16s0_autoraise = false
6s0_autoraise_delay = 50017s0_autoraise_delay = 500
18s0_focus_prevention_level = 0
19s0_minimize_window_key = <Alt>F9
20s0_maximize_window_key = <Alt>F10
21s0_unmaximize_or_minimize_window_key = Disabled
7s0_show_desktop_key = <Control><Alt>d22s0_show_desktop_key = <Control><Alt>d
8s0_toggle_window_maximized_key = <Alt>F1023s0_toggle_window_maximized_key = <Alt>F5
9s0_toggle_window_shaded_key = Disabled
10s0_hsize = 424s0_hsize = 4
1125
26[crashhandler]
27s0_directory = /var/crash
28s0_start_wm = true
29s0_wm_cmd = /usr/bin/marco --replace
30
12[cube]31[cube]
13s0_top_color = #34422eff32s0_top_color = #34422eff
14s0_bottom_color = #34422eff33s0_bottom_color = #34422eff
@@ -17,7 +36,59 @@
17s0_skydome_gradient_start_color = #34422eff36s0_skydome_gradient_start_color = #34422eff
18s0_skydome_gradient_end_color = #87a752ff37s0_skydome_gradient_end_color = #87a752ff
19s0_active_opacity = 72.00000038s0_active_opacity = 72.000000
20s0_transparent_manual_only = true39
40[cubeaddon]
41s0_reflection = false
42s0_ground_color1 = #4b5044cc
43s0_ground_color2 = #34363100
44s0_deformation = 0
45s0_unfold_deformation = false
46s0_top_images = /usr/share/backgrounds/ubuntu-mate-common/ubuntu-mate-desktop-circle_of_mates_dark.png;
47s0_bottom_images = /usr/share/backgrounds/ubuntu-mate-common/ubuntu-mate-desktop-circle_of_mates_dark.png;
48
49[decor]
50s0_active_shadow_radius = 13.000000
51s0_active_shadow_opacity = 0.900000
52s0_active_shadow_color = #1b1b1bc0
53s0_active_shadow_x_offset = 0
54s0_active_shadow_y_offset = 0
55s0_inactive_shadow_radius = 13.000000
56s0_inactive_shadow_opacity = 0.900000
57s0_inactive_shadow_color = #1a1a1aff
58s0_inactive_shadow_x_offset = 0
59s0_inactive_shadow_y_offset = 0
60s0_mipmap = true
61
62[expo]
63s0_expo_key = <Super>a
64s0_selected_color = #34422eff
65s0_reflection = true
66s0_ground_color1 = #343631cc
67s0_ground_color2 = #4b504400
68
69[ezoom]
70s0_zoom_in_button = <Super>Button4
71s0_zoom_out_button = <Super>Button5
72s0_zoom_box_button = <Super>Button2
73s0_zoom_box_outline_color = #4b50449f
74s0_zoom_box_fill_color = #2f2f2f4f
75
76[firepaint]
77s0_fire_color = #87a752ff
78
79[freewins]
80s0_snap_threshold = 50
81s0_circle_color = #54befb80
82s0_line_color = #1800ffff
83s0_cross_line_color = #1800ffff
84
85[gnomecompat]
86s0_main_menu_key = Disabled
87s0_run_key = Disabled
88s0_command_screenshot = mate-screenshot
89s0_command_window_screenshot = mate-screenshot -w
90s0_command_terminal = mate-terminal
91s0_run_command_terminal_key = <Control><Alt>t
2192
22[grid]93[grid]
23s0_put_maximize_key = Disabled94s0_put_maximize_key = Disabled
@@ -30,16 +101,9 @@
30s0_bottom_right_corner_action = 3101s0_bottom_right_corner_action = 3
31s0_outline_color = #87a7529f102s0_outline_color = #87a7529f
32s0_fill_color = #74fb001b103s0_fill_color = #74fb001b
33s0_snapback_windows = true104
34105[mag]
35[move]106s0_zoom_factor = 2.500000
36s0_initiate_button = <Alt>Button1
37s0_opacity = 96
38
39[animation]
40s0_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);
41s0_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);
42s0_unminimize_effects = animation:Glide 2;
43107
44[matecompat]108[matecompat]
45s0_command_screenshot = mate-screenshot109s0_command_screenshot = mate-screenshot
@@ -47,142 +111,16 @@
47s0_command_terminal = mate-terminal111s0_command_terminal = mate-terminal
48s0_run_command_terminal_key = <Control><Alt>t112s0_run_command_terminal_key = <Control><Alt>t
49113
50[gnomecompat]
51s0_main_menu_key = Disabled
52s0_run_key = Disabled
53s0_command_screenshot = mate-screenshot
54s0_command_window_screenshot = mate-screenshot -w
55s0_command_terminal = mate-terminal
56s0_run_command_terminal_key = <Control><Alt>t
57
58[snap]
59s0_resistance_distance = 8
60s0_attraction_distance = 4
61
62[place]
63s0_mode = 2
64
65[wall]
66s0_thumb_highlight_gradient_shadow_color = #dfdfdfff
67s0_arrow_base_color = #e6e6e6d9
68s0_arrow_shadow_color = #dcdcdcd9
69s0_up_key = <Super>Prior
70s0_down_key = <Super>Next
71s0_up_window_key = <Shift><Super>Prior
72s0_down_window_key = <Shift><Super>Next
73
74[resize]114[resize]
75s0_initiate_button = <Alt>Button2
76s0_border_color = #6164659f115s0_border_color = #6164659f
77s0_fill_color = #87a75240116s0_fill_color = #87a75240
78117
79[commands]
80s0_command20 = /usr/bin/mate-system-monitor -p
81
82[expo]
83s0_expo_key = <Shift><Super>s
84s0_mipmaps = true
85s0_selected_color = #34422eff
86s0_reflection = true
87s0_ground_color1 = #343631cc
88s0_ground_color2 = #4b504400
89
90[ezoom]
91s0_zoom_in_button = <Super>Button4
92s0_zoom_out_button = <Super>Button5
93s0_zoom_box_button = <Super>Button2
94s0_zoom_box_outline_color = #4b50449f
95s0_zoom_box_fill_color = #2f2f2f4f
96
97[decor]
98s0_active_shadow_radius = 13.000000
99s0_active_shadow_opacity = 0.900000
100s0_active_shadow_color = #1b1b1bc0
101s0_active_shadow_x_offset = 0
102s0_active_shadow_y_offset = 0
103s0_inactive_shadow_radius = 13.000000
104s0_inactive_shadow_opacity = 0.900000
105s0_inactive_shadow_color = #1a1a1aff
106s0_inactive_shadow_x_offset = 0
107s0_inactive_shadow_y_offset = 0
108s0_mipmap = true
109
110[opengl]
111s0_texture_compression = true
112
113[vpswitch]
114s0_switch_to_1_key = <Super>Home
115
116[staticswitcher]
117s0_next_key = <Alt>Tab
118s0_prev_key = <Shift><Alt>Tab
119s0_next_all_key = <Control><Alt>Tab
120s0_prev_all_key = <Shift><Control><Alt>Tab
121s0_speed = 1.000000
122s0_timestep = 0.500000
123s0_popup_delay = 0.050000
124s0_mipmap = true
125s0_focus_on_switch = true
126s0_highlight_mode = 1
127
128[shift]
129s0_initiate_key = Disabled
130s0_next_key = Disabled
131s0_prev_key = Disabled
132s0_next_all_key = Disabled
133s0_prev_all_key = Disabled
134s0_ground_color1 = #343631cc
135s0_ground_color2 = #4b504400
136s0_mipmaps = true
137
138[switcher]
139s0_next_key = Disabled
140s0_prev_key = Disabled
141s0_next_all_key = Disabled
142s0_prev_all_key = Disabled
143
144[screenshot]
145s0_selection_outline_color = #2f2f4f9f
146s0_selection_fill_color = #2f2f4f4f
147
148[resizeinfo]118[resizeinfo]
149s0_gradient_1 = #cccce6cc119s0_gradient_1 = #cccce6cc
150s0_gradient_2 = #f3f3f3cc120s0_gradient_2 = #f3f3f3cc
151s0_gradient_3 = #d9d9d9cc121s0_gradient_3 = #d9d9d9cc
152s0_outline_color = #e6e6e6ff122s0_outline_color = #e6e6e6ff
153123
154[wobbly]
155s0_friction = 2.500000
156s0_spring_k = 5.000000
157
158[crashhandler]
159s0_enabled = true
160s0_directory = /var/crash
161s0_start_wm = true
162s0_wm_cmd = /usr/bin/marco --replace
163
164[staticswitcher]
165s0_next_key = Disabled
166s0_prev_key = Disabled
167s0_next_all_key = Disabled
168s0_prev_all_key = Disabled
169
170[td]
171s0_manual_only = false
172
173[thumbnail]
174s0_fade_speed = 0.200000
175s0_border = 4
176s0_thumb_color = #343631cc
177s0_mipmap = true
178s0_current_viewport = false
179s0_title_enabled = false
180s0_font_bold = false
181s0_font_background_color = #4b50447f
182
183[firepaint]
184s0_fire_color = #87a752ff
185
186[rotate]124[rotate]
187s0_edge_flip_window = false125s0_edge_flip_window = false
188s0_edge_flip_dnd = false126s0_edge_flip_dnd = false
@@ -190,18 +128,19 @@
190s0_rotate_to_1_key = <Super>Home128s0_rotate_to_1_key = <Super>Home
191s0_rotate_to_1_window_key = <Shift><Super>Home129s0_rotate_to_1_window_key = <Shift><Super>Home
192130
193[mag]131[scale]
194s0_zoom_factor = 2.500000132s0_window_match = (Toolbar | Utility | Dialog | Normal | Unknown) & !(class=Tilda)
195133
196[put]134[screenshot]
197s0_put_left_key = Disabled135s0_selection_outline_color = #2f2f4f9f
198s0_put_right_key = Disabled136s0_selection_fill_color = #2f2f4f4f
199s0_put_top_key = Disabled137
200s0_put_bottom_key = Disabled138[shift]
201s0_put_topleft_key = Disabled139s0_ground_color1 = #343631cc
202s0_put_topright_key = Disabled140s0_ground_color2 = #4b504400
203s0_put_bottomleft_key = Disabled141
204s0_put_bottomright_key = Disabled142[showdesktop]
143s0_window_match = (type=toolbar | type=utility | type=dialog | type=normal) & !(class=Tilda)
205144
206[showmouse]145[showmouse]
207s0_rotation_speed = 0.350000146s0_rotation_speed = 0.350000
@@ -209,32 +148,30 @@
209s0_num_particles = 384148s0_num_particles = 384
210s0_color = #87a752ff149s0_color = #87a752ff
211150
212[cubeaddon]151[switcher]
213s0_reflection = false152s0_zoom = 0.000000
214s0_ground_color1 = #4b5044cc153s0_icon = false
215s0_ground_color2 = #34363100154s0_icon_only = true
216s0_deformation = 0155
217s0_unfold_deformation = false156[td]
218s0_top_images = /usr/share/backgrounds/ubuntu-mate-common/ubuntu-mate-desktop-circle_of_mates_dark.png;157s0_manual_only = false
219s0_bottom_images = /usr/share/backgrounds/ubuntu-mate-common/ubuntu-mate-desktop-circle_of_mates_dark.png;158
220159[thumbnail]
221[freewins]160s0_fade_speed = 0.200000
222s0_snap_threshold = 50161s0_border = 4
223s0_circle_color = #54befb80162s0_thumb_color = #343631cc
224s0_line_color = #1800ffff163s0_mipmap = true
225s0_cross_line_color = #1800ffff164s0_current_viewport = false
226165s0_title_enabled = false
227[addhelper]166s0_font_bold = false
228s0_ononinit = true167s0_font_background_color = #4b50447f
229s0_brightness = 96168
230s0_saturation = 72169[vpswitch]
231170s0_switch_to_1_key = <Super>Home
232[scale]171
233s0_window_match = (Toolbar | Utility | Dialog | Normal | Unknown) & !(class=Tilda)172[wall]
234s0_initiate_key = <Control><Alt>Up173s0_preview_scale = 256
235s0_initiate_all_key = <Super>a174s0_thumb_highlight_gradient_shadow_color = #dfdfdfff
236s0_initiate_output_key = <Super>w175s0_arrow_base_color = #e6e6e6d9
237176s0_arrow_shadow_color = #dcdcdcd9
238[showdesktop]177
239s0_direction = 5
240s0_window_match = (type=toolbar | type=utility | type=dialog | type=normal) & !(class=Tilda)

Subscribers

People subscribed via source and target branches