Merge lp:~3v1n0/compiz/apply-debian-patches-upstream into lp:compiz/0.9.12
- apply-debian-patches-upstream
- Merge into 0.9.12
Status: | Superseded |
---|---|
Proposed branch: | lp:~3v1n0/compiz/apply-debian-patches-upstream |
Merge into: | lp:compiz/0.9.12 |
Prerequisite: | lp:~3v1n0/compiz/resize-selective-grab |
Diff against target: |
2515 lines (+231/-1474) 29 files modified
compizconfig/ccsm/ccm/Constants.py.in (+6/-0) compizconfig/ccsm/ccm/Settings.py (+2/-10) compizconfig/ccsm/ccm/Widgets.py (+41/-1) compizconfig/ccsm/ccsm (+9/-1) compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml (+6/-0) debian/patches/100_workaround_virtualbox_hang.patch (+0/-175) debian/patches/ccsm_add_first_run_warning.patch (+0/-105) debian/patches/ccsm_disable_unity_checkbox.patch (+0/-20) debian/patches/ccsm_remove_redundant_sliders.patch (+0/-38) debian/patches/series (+0/-7) debian/patches/ubuntu-config.patch (+0/-886) debian/patches/ubuntu_super_p.patch (+0/-30) debian/patches/unity_support_test.patch (+0/-90) metadata/core.xml.in (+6/-6) plugins/animation/animation.xml.in (+20/-20) plugins/commands/commands.xml.in (+2/-1) plugins/decor/decor.xml.in (+4/-4) plugins/expo/expo.xml.in (+10/-10) plugins/ezoom/ezoom.xml.in (+4/-4) plugins/fade/fade.xml.in (+2/-1) plugins/gnomecompat/gnomecompat.xml.in (+1/-0) plugins/grid/grid.xml.in (+2/-2) plugins/resize/resize.xml.in (+8/-8) plugins/scale/scale.xml.in (+9/-11) plugins/staticswitcher/staticswitcher.xml.in (+8/-9) plugins/vpswitch/vpswitch.xml.in (+0/-2) plugins/wall/wall.xml.in (+32/-32) src/plugin.cpp (+58/-0) tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~3v1n0/compiz/apply-debian-patches-upstream |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Azzarone | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+274035@code.launchpad.net |
This proposal has been superseded by a proposal from 2015-10-15.
Commit message
debian/patches: remove them all, and apply them upstream
Also remove the 100_workaround_
as it's not needed anymore
Description of the change
PS Jenkins bot (ps-jenkins) wrote : | # |
Andrea Azzarone (azzar1) wrote : | # |
LGTM. Seems like 100_workaround_
- 3981. By Marco Trevisan (Treviño)
-
Apply ubuntu-config.patch by default
In theory we should have used profiles settings for this, providing a proper unity.ini
But right now there's no reason for that effort.
In case someone wants to change settings, profiles will fix this. - 3982. By Marco Trevisan (Treviño)
-
Apply debian/
patches/ ccsm_remove_ redundant_ sliders. patch - 3983. By Marco Trevisan (Treviño)
-
Apply debian/
patches/ ccsm_add_ first_run_ warning. patch - 3984. By Marco Trevisan (Treviño)
-
Apply patch debian/
patches/ ccsm_disable_ unity_checkbox. patch Added a fix to use XDG_CURRENT_DESKTOP
- 3985. By Marco Trevisan (Treviño)
-
Apply debian/
patches/ unity_support_ test.patch - 3986. By Marco Trevisan (Treviño)
-
Apply debian/
patches/ 100_workaround_ virtualbox_ hang.patch - 3987. By Marco Trevisan (Treviño)
-
debian/patches: remove them all, we now apply them uptream
- 3988. By Marco Trevisan (Treviño)
-
Remove virtualbox workaround patch
This shouldn't be needed anymore as it was a temporary fix for LP:1127866
- 3989. By Marco Trevisan (Treviño)
-
Remove debug code
- 3990. By Marco Trevisan (Treviño)
-
debian/rules: remove quilt usage
- 3991. By Marco Trevisan (Treviño)
-
debian/changelog: Syncing changelog with proposed
Unmerged revisions
Preview Diff
1 | === modified file 'compizconfig/ccsm/ccm/Constants.py.in' | |||
2 | --- compizconfig/ccsm/ccm/Constants.py.in 2011-02-12 17:45:47 +0000 | |||
3 | +++ compizconfig/ccsm/ccm/Constants.py.in 2015-10-15 15:29:59 +0000 | |||
4 | @@ -23,6 +23,7 @@ | |||
5 | 23 | import pygtk | 23 | import pygtk |
6 | 24 | import gtk | 24 | import gtk |
7 | 25 | import gtk.gdk | 25 | import gtk.gdk |
8 | 26 | import os | ||
9 | 26 | 27 | ||
10 | 27 | # Current Screen | 28 | # Current Screen |
11 | 28 | # | 29 | # |
12 | @@ -66,6 +67,11 @@ | |||
13 | 66 | DataDir = "@prefix@/share" | 67 | DataDir = "@prefix@/share" |
14 | 67 | IconDir = DataDir+"/ccsm/icons" | 68 | IconDir = DataDir+"/ccsm/icons" |
15 | 68 | PixmapDir = DataDir+"/ccsm/images" | 69 | PixmapDir = DataDir+"/ccsm/images" |
16 | 70 | ConfigHome = os.getenv("XDG_CONFIG_HOME") | ||
17 | 71 | if not ConfigHome: | ||
18 | 72 | ConfigHome = os.path.join(os.getenv("HOME"), ".config") | ||
19 | 73 | ConfDir = os.path.join(ConfigHome, "compiz-1/compizconfig/") | ||
20 | 74 | ConfFile = os.path.join(ConfDir, "firstrun") | ||
21 | 69 | 75 | ||
22 | 70 | # Version | 76 | # Version |
23 | 71 | # | 77 | # |
24 | 72 | 78 | ||
25 | === modified file 'compizconfig/ccsm/ccm/Settings.py' | |||
26 | --- compizconfig/ccsm/ccm/Settings.py 2014-04-11 15:37:49 +0000 | |||
27 | +++ compizconfig/ccsm/ccm/Settings.py 2015-10-15 15:29:59 +0000 | |||
28 | @@ -442,16 +442,10 @@ | |||
29 | 442 | self.Adj = gtk.Adjustment(0, info[0], info[1], inc, inc*10) | 442 | self.Adj = gtk.Adjustment(0, info[0], info[1], inc, inc*10) |
30 | 443 | self.Spin = gtk.SpinButton(self.Adj) | 443 | self.Spin = gtk.SpinButton(self.Adj) |
31 | 444 | self.Spin.set_value(self.Get()) | 444 | self.Spin.set_value(self.Get()) |
32 | 445 | |||
33 | 446 | self.Scale = gtk.HScale(self.Adj) | ||
34 | 447 | |||
35 | 448 | self.Scale.set_update_policy(gtk.UPDATE_DISCONTINUOUS) | ||
36 | 449 | self.Scale.connect("value-changed", self.Changed) | ||
37 | 450 | self.Spin.connect("value-changed", self.Changed) | 445 | self.Spin.connect("value-changed", self.Changed) |
39 | 451 | self.Widget = self.Scale | 446 | self.Widget = self.Spin |
40 | 452 | 447 | ||
43 | 453 | self.Box.pack_start(self.Scale, True, True) | 448 | self.Box.pack_end(self.Spin, False, False) |
42 | 454 | self.Box.pack_start(self.Spin, False, False) | ||
44 | 455 | 449 | ||
45 | 456 | def _Read(self): | 450 | def _Read(self): |
46 | 457 | self.Adj.set_value(self.Get()) | 451 | self.Adj.set_value(self.Get()) |
47 | @@ -465,7 +459,6 @@ | |||
48 | 465 | self.Inc = 1 | 459 | self.Inc = 1 |
49 | 466 | NumberSetting._Init(self) | 460 | NumberSetting._Init(self) |
50 | 467 | self.Spin.set_digits(0) | 461 | self.Spin.set_digits(0) |
51 | 468 | self.Scale.set_digits(0) | ||
52 | 469 | 462 | ||
53 | 470 | class FloatSetting(NumberSetting): | 463 | class FloatSetting(NumberSetting): |
54 | 471 | 464 | ||
55 | @@ -475,7 +468,6 @@ | |||
56 | 475 | self.Inc = None | 468 | self.Inc = None |
57 | 476 | NumberSetting._Init(self) | 469 | NumberSetting._Init(self) |
58 | 477 | self.Spin.set_digits(4) | 470 | self.Spin.set_digits(4) |
59 | 478 | self.Scale.set_digits(4) | ||
60 | 479 | 471 | ||
61 | 480 | 472 | ||
62 | 481 | class ColorSetting(StockSetting): | 473 | class ColorSetting(StockSetting): |
63 | 482 | 474 | ||
64 | === modified file 'compizconfig/ccsm/ccm/Widgets.py' | |||
65 | --- compizconfig/ccsm/ccm/Widgets.py 2013-12-02 17:37:06 +0000 | |||
66 | +++ compizconfig/ccsm/ccm/Widgets.py 2015-10-15 15:29:59 +0000 | |||
67 | @@ -1371,6 +1371,42 @@ | |||
68 | 1371 | self.set_transient_for (parent) | 1371 | self.set_transient_for (parent) |
69 | 1372 | self.connect_after ("response", lambda *args: self.destroy ()) | 1372 | self.connect_after ("response", lambda *args: self.destroy ()) |
70 | 1373 | 1373 | ||
71 | 1374 | # First run dialog providing a user warning. | ||
72 | 1375 | # | ||
73 | 1376 | class FirstRun (gtk.MessageDialog): | ||
74 | 1377 | '''First run dialog providing a user warning.''' | ||
75 | 1378 | |||
76 | 1379 | def __init__(self, parent): | ||
77 | 1380 | gtk.MessageDialog.__init__ (self, parent, | ||
78 | 1381 | gtk.DIALOG_DESTROY_WITH_PARENT, | ||
79 | 1382 | gtk.MESSAGE_WARNING, | ||
80 | 1383 | gtk.BUTTONS_OK) | ||
81 | 1384 | self.set_position (gtk.WIN_POS_CENTER) | ||
82 | 1385 | title = _("CCSM is an advanced tool. Use with caution.") | ||
83 | 1386 | self.set_markup("<b>%s</b>" % title) | ||
84 | 1387 | message = _("This tool allows you to deeply configure Compiz's settings. Some options may be incompatible with each other. Unless used with care, it is possible to be left with an unusable desktop.") | ||
85 | 1388 | self.format_secondary_markup(message) | ||
86 | 1389 | check_button = gtk.CheckButton(label=_("Show this warning next time?")) | ||
87 | 1390 | check_button.set_active(True) | ||
88 | 1391 | self.vbox.pack_start(check_button, True, True, 2) | ||
89 | 1392 | check_button.show() | ||
90 | 1393 | check_button.connect("toggled", self.callback, "check button 1") | ||
91 | 1394 | self.set_transient_for(parent) | ||
92 | 1395 | self.set_modal(True) | ||
93 | 1396 | self.show_all() | ||
94 | 1397 | self.connect("response", lambda *args: self.destroy ()) | ||
95 | 1398 | |||
96 | 1399 | def callback(self, widget, data=None): | ||
97 | 1400 | if widget.get_active() == True: | ||
98 | 1401 | if os.path.isfile(ConfFile): | ||
99 | 1402 | os.remove(ConfFile) | ||
100 | 1403 | else: | ||
101 | 1404 | if not os.path.exists(ConfDir): | ||
102 | 1405 | os.mkdir(ConfDir) | ||
103 | 1406 | if os.path.isdir(ConfDir): | ||
104 | 1407 | f = open(ConfFile, "w") | ||
105 | 1408 | f.close() | ||
106 | 1409 | |||
107 | 1374 | # Plugin Button | 1410 | # Plugin Button |
108 | 1375 | # | 1411 | # |
109 | 1376 | class PluginButton (gtk.HBox): | 1412 | class PluginButton (gtk.HBox): |
110 | @@ -1401,7 +1437,11 @@ | |||
111 | 1401 | button.set_tooltip_text (plugin.LongDesc) | 1437 | button.set_tooltip_text (plugin.LongDesc) |
112 | 1402 | button.add (box) | 1438 | button.add (box) |
113 | 1403 | 1439 | ||
115 | 1404 | if plugin.Name != 'core': | 1440 | blacklist_plugins = ['core'] |
116 | 1441 | if os.getenv('XDG_CURRENT_DESKTOP') == 'Unity': | ||
117 | 1442 | blacklist_plugins.append('unityshell') | ||
118 | 1443 | |||
119 | 1444 | if plugin.Name not in blacklist_plugins: | ||
120 | 1405 | enable = gtk.CheckButton () | 1445 | enable = gtk.CheckButton () |
121 | 1406 | enable.set_tooltip_text(_("Enable %s") % plugin.ShortDesc) | 1446 | enable.set_tooltip_text(_("Enable %s") % plugin.ShortDesc) |
122 | 1407 | enable.set_active (plugin.Enabled) | 1447 | enable.set_active (plugin.Enabled) |
123 | 1408 | 1448 | ||
124 | === modified file 'compizconfig/ccsm/ccsm' | |||
125 | --- compizconfig/ccsm/ccsm 2012-05-16 17:44:14 +0000 | |||
126 | +++ compizconfig/ccsm/ccsm 2015-10-15 15:29:59 +0000 | |||
127 | @@ -31,6 +31,7 @@ | |||
128 | 31 | pygtk.require('2.0') | 31 | pygtk.require('2.0') |
129 | 32 | import gtk | 32 | import gtk |
130 | 33 | import sys | 33 | import sys |
131 | 34 | import os | ||
132 | 34 | 35 | ||
133 | 35 | def try_register_dbus (): | 36 | def try_register_dbus (): |
134 | 36 | '''Return instance of dbus control object on success, None on failure''' | 37 | '''Return instance of dbus control object on success, None on failure''' |
135 | @@ -92,7 +93,7 @@ | |||
136 | 92 | import compizconfig | 93 | import compizconfig |
137 | 93 | import ccm | 94 | import ccm |
138 | 94 | from ccm.Utils import GlobalUpdater | 95 | from ccm.Utils import GlobalUpdater |
140 | 95 | from ccm.Constants import Version | 96 | from ccm.Constants import Version, ConfFile |
141 | 96 | 97 | ||
142 | 97 | plugin = None | 98 | plugin = None |
143 | 98 | category = None | 99 | category = None |
144 | @@ -124,4 +125,11 @@ | |||
145 | 124 | idle = ccm.IdleSettingsParser(context, mainWin) | 125 | idle = ccm.IdleSettingsParser(context, mainWin) |
146 | 125 | mainWin.show_all() | 126 | mainWin.show_all() |
147 | 126 | 127 | ||
148 | 128 | # Check if we should show the first run warning dialog. | ||
149 | 129 | if os.path.isfile(ConfFile): | ||
150 | 130 | pass | ||
151 | 131 | else: | ||
152 | 132 | warning = ccm.FirstRun(mainWin) | ||
153 | 133 | warning.show_all() | ||
154 | 134 | |||
155 | 127 | gtk.main() | 135 | gtk.main() |
156 | 128 | 136 | ||
157 | === modified file 'compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml' | |||
158 | --- compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2014-03-04 20:00:28 +0000 | |||
159 | +++ compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2015-10-15 15:29:59 +0000 | |||
160 | @@ -10,6 +10,9 @@ | |||
161 | 10 | <key type="s" name="command-screenshot"> | 10 | <key type="s" name="command-screenshot"> |
162 | 11 | <default>"gnome-screenshot"</default> | 11 | <default>"gnome-screenshot"</default> |
163 | 12 | </key> | 12 | </key> |
164 | 13 | <key type="as" name="run-command-21"> | ||
165 | 14 | <default>["<Control><Alt>Delete"]</default> | ||
166 | 15 | </key> | ||
167 | 13 | <key type="as" name="run-command-12"> | 16 | <key type="as" name="run-command-12"> |
168 | 14 | <default>["Disabled"]</default> | 17 | <default>["Disabled"]</default> |
169 | 15 | </key> | 18 | </key> |
170 | @@ -46,6 +49,9 @@ | |||
171 | 46 | <key type="as" name="run-command-1"> | 49 | <key type="as" name="run-command-1"> |
172 | 47 | <default>["Disabled"]</default> | 50 | <default>["Disabled"]</default> |
173 | 48 | </key> | 51 | </key> |
174 | 52 | <key type="s" name="command-21"> | ||
175 | 53 | <default>"/usr/bin/gnome-system-monitor -p"</default> | ||
176 | 54 | </key> | ||
177 | 49 | <key type="s" name="command-12"> | 55 | <key type="s" name="command-12"> |
178 | 50 | <default>""</default> | 56 | <default>""</default> |
179 | 51 | </key> | 57 | </key> |
180 | 52 | 58 | ||
181 | === removed directory 'debian/patches' | |||
182 | === removed file 'debian/patches/100_workaround_virtualbox_hang.patch' | |||
183 | --- debian/patches/100_workaround_virtualbox_hang.patch 2014-12-09 14:47:14 +0000 | |||
184 | +++ debian/patches/100_workaround_virtualbox_hang.patch 1970-01-01 00:00:00 +0000 | |||
185 | @@ -1,175 +0,0 @@ | |||
186 | 1 | Index: compiz/plugins/opengl/include/opengl/opengl.h | ||
187 | 2 | =================================================================== | ||
188 | 3 | --- compiz.orig/plugins/opengl/include/opengl/opengl.h 2014-03-03 15:29:29.898235681 +0100 | ||
189 | 4 | +++ compiz/plugins/opengl/include/opengl/opengl.h 2014-03-03 15:29:29.894235669 +0100 | ||
190 | 5 | @@ -590,6 +590,17 @@ | ||
191 | 6 | |||
192 | 7 | extern GLScreenPaintAttrib defaultScreenPaintAttrib; | ||
193 | 8 | |||
194 | 9 | +namespace compiz | ||
195 | 10 | +{ | ||
196 | 11 | +namespace opengl | ||
197 | 12 | +{ | ||
198 | 13 | +namespace internal | ||
199 | 14 | +{ | ||
200 | 15 | +class DriverWorkaroundQuery; | ||
201 | 16 | +} | ||
202 | 17 | +} | ||
203 | 18 | +} | ||
204 | 19 | + | ||
205 | 20 | class GLScreen; | ||
206 | 21 | class GLFramebufferObject; | ||
207 | 22 | class GLScreenInterface; | ||
208 | 23 | @@ -787,6 +798,13 @@ | ||
209 | 24 | |||
210 | 25 | bool glInitContext (XVisualInfo *); | ||
211 | 26 | |||
212 | 27 | + /** | ||
213 | 28 | + * This is only meant to be used internally, here to avoid unnecessarily | ||
214 | 29 | + * breaking the API and ABI. Fetch any driver workarounds in place | ||
215 | 30 | + */ | ||
216 | 31 | + const compiz::opengl::internal::DriverWorkaroundQuery & | ||
217 | 32 | + fetchDriverWorkarounds (); | ||
218 | 33 | + | ||
219 | 34 | WRAPABLE_HND (0, GLScreenInterface, bool, glPaintOutput, | ||
220 | 35 | const GLScreenPaintAttrib &, const GLMatrix &, | ||
221 | 36 | const CompRegion &, CompOutput *, unsigned int); | ||
222 | 37 | Index: compiz/plugins/opengl/src/privates.h | ||
223 | 38 | =================================================================== | ||
224 | 39 | --- compiz.orig/plugins/opengl/src/privates.h 2014-03-03 15:29:29.898235681 +0100 | ||
225 | 40 | +++ compiz/plugins/opengl/src/privates.h 2014-03-03 15:29:29.894235669 +0100 | ||
226 | 41 | @@ -47,6 +47,24 @@ | ||
227 | 42 | |||
228 | 43 | extern CompOutput *targetOutput; | ||
229 | 44 | |||
230 | 45 | +namespace compiz | ||
231 | 46 | +{ | ||
232 | 47 | +namespace opengl | ||
233 | 48 | +{ | ||
234 | 49 | +namespace internal | ||
235 | 50 | +{ | ||
236 | 51 | +class DriverWorkaroundQuery | ||
237 | 52 | +{ | ||
238 | 53 | + public: | ||
239 | 54 | + | ||
240 | 55 | + virtual ~DriverWorkaroundQuery () {}; | ||
241 | 56 | + | ||
242 | 57 | + virtual bool unsafeForExternalBinds () const = 0; | ||
243 | 58 | +}; | ||
244 | 59 | +} | ||
245 | 60 | +} | ||
246 | 61 | +} | ||
247 | 62 | + | ||
248 | 63 | class GLDoubleBuffer : | ||
249 | 64 | public compiz::opengl::DoubleBuffer | ||
250 | 65 | { | ||
251 | 66 | @@ -141,6 +159,7 @@ | ||
252 | 67 | public ScreenInterface, | ||
253 | 68 | public CompositeScreenInterface, | ||
254 | 69 | public compiz::composite::PaintHandler, | ||
255 | 70 | + public compiz::opengl::internal::DriverWorkaroundQuery, | ||
256 | 71 | public OpenglOptions | ||
257 | 72 | { | ||
258 | 73 | public: | ||
259 | 74 | @@ -232,6 +251,7 @@ | ||
260 | 75 | std::vector<GLTexture::BindPixmapProc> bindPixmap; | ||
261 | 76 | bool hasCompositing; | ||
262 | 77 | bool commonFrontbuffer; | ||
263 | 78 | + bool sharedMemoryTFP; | ||
264 | 79 | bool incorrectRefreshRate; // hack for NVIDIA specifying an incorrect | ||
265 | 80 | // refresh rate, causing us to miss vblanks | ||
266 | 81 | |||
267 | 82 | @@ -266,6 +266,10 @@ | ||
268 | 83 | std::vector<XToGLSync*>::size_type currentSyncNum; | ||
269 | 84 | XToGLSync *currentSync; | ||
270 | 85 | std::vector<XToGLSync*>::size_type warmupSyncs; | ||
271 | 86 | + | ||
272 | 87 | + private: | ||
273 | 88 | + | ||
274 | 89 | + bool unsafeForExternalBinds () const; | ||
275 | 90 | }; | ||
276 | 91 | |||
277 | 92 | class PrivateGLWindow : | ||
278 | 93 | Index: compiz/plugins/opengl/src/screen.cpp | ||
279 | 94 | =================================================================== | ||
280 | 95 | --- compiz.orig/plugins/opengl/src/screen.cpp 2014-03-03 15:29:29.898235681 +0100 | ||
281 | 96 | +++ compiz/plugins/opengl/src/screen.cpp 2014-03-03 15:29:29.894235669 +0100 | ||
282 | 97 | @@ -67,6 +67,7 @@ | ||
283 | 98 | |||
284 | 99 | |||
285 | 100 | using namespace compiz::opengl; | ||
286 | 101 | +namespace cglint = compiz::opengl::internal; | ||
287 | 102 | |||
288 | 103 | namespace GL { | ||
289 | 104 | #ifdef USE_GLES | ||
290 | 105 | @@ -537,6 +538,18 @@ | ||
291 | 106 | }; | ||
292 | 107 | |||
293 | 108 | bool | ||
294 | 109 | +PrivateGLScreen::unsafeForExternalBinds () const | ||
295 | 110 | +{ | ||
296 | 111 | + return sharedMemoryTFP; | ||
297 | 112 | +} | ||
298 | 113 | + | ||
299 | 114 | +const cglint::DriverWorkaroundQuery & | ||
300 | 115 | +GLScreen::fetchDriverWorkarounds () | ||
301 | 116 | +{ | ||
302 | 117 | + return *priv; | ||
303 | 118 | +} | ||
304 | 119 | + | ||
305 | 120 | +bool | ||
306 | 121 | GLScreen::glInitContext (XVisualInfo *visinfo) | ||
307 | 122 | { | ||
308 | 123 | #ifndef USE_GLES | ||
309 | 124 | @@ -855,6 +868,7 @@ | ||
310 | 125 | |||
311 | 126 | priv->commonFrontbuffer = true; | ||
312 | 127 | priv->incorrectRefreshRate = false; | ||
313 | 128 | + priv->sharedMemoryTFP = false; | ||
314 | 129 | if (glRenderer != NULL && strstr (glRenderer, "on llvmpipe")) | ||
315 | 130 | { | ||
316 | 131 | /* | ||
317 | 132 | @@ -875,6 +889,18 @@ | ||
318 | 133 | priv->incorrectRefreshRate = true; | ||
319 | 134 | } | ||
320 | 135 | |||
321 | 136 | + if (glVendor != NULL && strstr (glVendor, "Humper")) | ||
322 | 137 | + { | ||
323 | 138 | + /* | ||
324 | 139 | + * VirtualBox uses XShm/XCopyArea in order to implement | ||
325 | 140 | + * texture_from_pixmap. Because of this, they require | ||
326 | 141 | + * a second X connection to track damage events and | ||
327 | 142 | + * changes to the pixmap, and this is incompatible with | ||
328 | 143 | + * taking a server grab on when querying and binding | ||
329 | 144 | + * externally managed pixmaps */ | ||
330 | 145 | + priv->sharedMemoryTFP = true; | ||
331 | 146 | + } | ||
332 | 147 | + | ||
333 | 148 | if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two")) | ||
334 | 149 | GL::textureNonPowerOfTwo = true; | ||
335 | 150 | GL::textureNonPowerOfTwoMipmap = GL::textureNonPowerOfTwo; | ||
336 | 151 | Index: compiz/plugins/opengl/src/texture.cpp | ||
337 | 152 | =================================================================== | ||
338 | 153 | --- compiz.orig/plugins/opengl/src/texture.cpp 2014-03-03 15:29:29.898235681 +0100 | ||
339 | 154 | +++ compiz/plugins/opengl/src/texture.cpp 2014-03-03 15:31:45.974666737 +0100 | ||
340 | 155 | @@ -41,6 +41,7 @@ | ||
341 | 156 | #include "glx-tfp-bind.h" | ||
342 | 157 | |||
343 | 158 | namespace cgl = compiz::opengl; | ||
344 | 159 | +namespace cglint = compiz::opengl::internal; | ||
345 | 160 | |||
346 | 161 | #ifdef USE_GLES | ||
347 | 162 | std::map<Damage, EglTexture*> boundPixmapTex; | ||
348 | 163 | @@ -646,6 +647,12 @@ | ||
349 | 164 | int depth, | ||
350 | 165 | cgl::PixmapSource source) | ||
351 | 166 | { | ||
352 | 167 | + GLScreen *gs = GLScreen::get (screen); | ||
353 | 168 | + const cglint::DriverWorkaroundQuery &query (gs->fetchDriverWorkarounds ()); | ||
354 | 169 | + | ||
355 | 170 | + if (query.unsafeForExternalBinds () && source == cgl::ExternallyManaged) | ||
356 | 171 | + return GLTexture::List (); | ||
357 | 172 | + | ||
358 | 173 | GLTexture::List rv (1); | ||
359 | 174 | TfpTexture *tex = NULL; | ||
360 | 175 | unsigned int target = 0; | ||
361 | 176 | 0 | ||
362 | === removed file 'debian/patches/ccsm_add_first_run_warning.patch' | |||
363 | --- debian/patches/ccsm_add_first_run_warning.patch 2012-06-19 11:22:48 +0000 | |||
364 | +++ debian/patches/ccsm_add_first_run_warning.patch 1970-01-01 00:00:00 +0000 | |||
365 | @@ -1,105 +0,0 @@ | |||
366 | 1 | Description: Add a first run dialog providing a user warning. | ||
367 | 2 | Author: Andrew Starr-Bochicchio <a.starr.b@gmail.com> | ||
368 | 3 | |||
369 | 4 | === modified file 'ccm/Widgets.py' | ||
370 | 5 | diff -Nur -x '*.orig' -x '*~' a/compizconfig/ccsm/ccm/Constants.py.in b/compizconfig/ccsm/ccm/Constants.py.in | ||
371 | 6 | --- a/compizconfig/ccsm/ccm/Constants.py.in 2012-02-01 13:30:19.131478000 -0500 | ||
372 | 7 | +++ b/compizconfig/ccsm/ccm/Constants.py.in 2012-02-13 18:26:19.699626332 -0500 | ||
373 | 8 | @@ -23,6 +23,7 @@ | ||
374 | 9 | import pygtk | ||
375 | 10 | import gtk | ||
376 | 11 | import gtk.gdk | ||
377 | 12 | +import os | ||
378 | 13 | |||
379 | 14 | # Current Screen | ||
380 | 15 | # | ||
381 | 16 | @@ -66,6 +67,11 @@ | ||
382 | 17 | DataDir = "@prefix@/share" | ||
383 | 18 | IconDir = DataDir+"/ccsm/icons" | ||
384 | 19 | PixmapDir = DataDir+"/ccsm/images" | ||
385 | 20 | +ConfigHome = os.getenv("XDG_CONFIG_HOME") | ||
386 | 21 | +if not ConfigHome: | ||
387 | 22 | + ConfigHome = os.path.join(os.getenv("HOME"), ".config") | ||
388 | 23 | +ConfDir = os.path.join(ConfigHome, "compiz-1/compizconfig/") | ||
389 | 24 | +ConfFile = os.path.join(ConfDir, "firstrun") | ||
390 | 25 | |||
391 | 26 | # Version | ||
392 | 27 | # | ||
393 | 28 | diff -Nur -x '*.orig' -x '*~' a/compizconfig/ccsm/ccm/Widgets.py b/compizconfig/ccsm/ccm/Widgets.py | ||
394 | 29 | --- a/compizconfig/ccsm/ccm/Widgets.py 2012-02-02 22:43:52.623481000 -0500 | ||
395 | 30 | +++ b/compizconfig/ccsm/ccm/Widgets.py 2012-02-13 18:25:55.659409730 -0500 | ||
396 | 31 | @@ -1371,6 +1371,42 @@ | ||
397 | 32 | self.set_transient_for (parent) | ||
398 | 33 | self.connect_after ("response", lambda *args: self.destroy ()) | ||
399 | 34 | |||
400 | 35 | +# First run dialog providing a user warning. | ||
401 | 36 | +# | ||
402 | 37 | +class FirstRun (gtk.MessageDialog): | ||
403 | 38 | + '''First run dialog providing a user warning.''' | ||
404 | 39 | + | ||
405 | 40 | + def __init__(self, parent): | ||
406 | 41 | + gtk.MessageDialog.__init__ (self, parent, | ||
407 | 42 | + gtk.DIALOG_DESTROY_WITH_PARENT, | ||
408 | 43 | + gtk.MESSAGE_WARNING, | ||
409 | 44 | + gtk.BUTTONS_OK) | ||
410 | 45 | + self.set_position (gtk.WIN_POS_CENTER) | ||
411 | 46 | + title = _("CCSM is an advanced tool. Use with caution.") | ||
412 | 47 | + self.set_markup("<b>%s</b>" % title) | ||
413 | 48 | + message = _("This tool allows you to deeply configure Compiz's settings. Some options may be incompatible with each other. Unless used with care, it is possible to be left with an unusable desktop.") | ||
414 | 49 | + self.format_secondary_markup(message) | ||
415 | 50 | + check_button = gtk.CheckButton(label=_("Show this warning next time?")) | ||
416 | 51 | + check_button.set_active(True) | ||
417 | 52 | + self.vbox.pack_start(check_button, True, True, 2) | ||
418 | 53 | + check_button.show() | ||
419 | 54 | + check_button.connect("toggled", self.callback, "check button 1") | ||
420 | 55 | + self.set_transient_for(parent) | ||
421 | 56 | + self.set_modal(True) | ||
422 | 57 | + self.show_all() | ||
423 | 58 | + self.connect("response", lambda *args: self.destroy ()) | ||
424 | 59 | + | ||
425 | 60 | + def callback(self, widget, data=None): | ||
426 | 61 | + if widget.get_active() == True: | ||
427 | 62 | + if os.path.isfile(ConfFile): | ||
428 | 63 | + os.remove(ConfFile) | ||
429 | 64 | + else: | ||
430 | 65 | + if not os.path.exists(ConfDir): | ||
431 | 66 | + os.mkdir(ConfDir) | ||
432 | 67 | + if os.path.isdir(ConfDir): | ||
433 | 68 | + f = open(ConfFile, "w") | ||
434 | 69 | + f.close() | ||
435 | 70 | + | ||
436 | 71 | # Plugin Button | ||
437 | 72 | # | ||
438 | 73 | class PluginButton (gtk.HBox): | ||
439 | 74 | diff -Nur -x '*.orig' -x '*~' a/compizconfig/ccsm/ccsm b/compizconfig/ccsm/ccsm | ||
440 | 75 | --- a/compizconfig/ccsm/ccsm 2012-02-02 16:42:01.161305000 -0500 | ||
441 | 76 | +++ b/compizconfig/ccsm/ccsm 2012-02-13 18:25:55.663409766 -0500 | ||
442 | 77 | @@ -31,6 +31,7 @@ | ||
443 | 78 | pygtk.require('2.0') | ||
444 | 79 | import gtk | ||
445 | 80 | import sys | ||
446 | 81 | +import os | ||
447 | 82 | |||
448 | 83 | def try_register_dbus (): | ||
449 | 84 | '''Return instance of dbus control object on success, None on failure''' | ||
450 | 85 | @@ -92,7 +93,7 @@ | ||
451 | 86 | import compizconfig | ||
452 | 87 | import ccm | ||
453 | 88 | from ccm.Utils import GlobalUpdater | ||
454 | 89 | -from ccm.Constants import Version | ||
455 | 90 | +from ccm.Constants import Version, ConfFile | ||
456 | 91 | |||
457 | 92 | plugin = None | ||
458 | 93 | category = None | ||
459 | 94 | @@ -124,4 +125,11 @@ | ||
460 | 95 | idle = ccm.IdleSettingsParser(context, mainWin) | ||
461 | 96 | mainWin.show_all() | ||
462 | 97 | |||
463 | 98 | +# Check if we should show the first run warning dialog. | ||
464 | 99 | +if os.path.isfile(ConfFile): | ||
465 | 100 | + pass | ||
466 | 101 | +else: | ||
467 | 102 | + warning = ccm.FirstRun(mainWin) | ||
468 | 103 | + warning.show_all() | ||
469 | 104 | + | ||
470 | 105 | gtk.main() | ||
471 | 106 | 0 | ||
472 | === removed file 'debian/patches/ccsm_disable_unity_checkbox.patch' | |||
473 | --- debian/patches/ccsm_disable_unity_checkbox.patch 2012-06-19 11:22:48 +0000 | |||
474 | +++ debian/patches/ccsm_disable_unity_checkbox.patch 1970-01-01 00:00:00 +0000 | |||
475 | @@ -1,20 +0,0 @@ | |||
476 | 1 | Description: If in a Unity session, don't allow the user to disable Unity from main view. | ||
477 | 2 | Author: Andrew Starr-Bochicchio <a.starr.b@gmail.com> | ||
478 | 3 | |||
479 | 4 | === modified file 'ccm/Widgets.py' | ||
480 | 5 | diff -Nur -x '*.orig' -x '*~' a/compizconfig/ccsm/ccm/Widgets.py b/compiconfig/ccsm/ccm/Widgets.py | ||
481 | 6 | --- a/compizconfig/ccsm/ccm/Widgets.py 2012-02-02 19:05:53.690931000 -0500 | ||
482 | 7 | +++ b/compizconfig/ccsm/ccm/Widgets.py 2012-02-13 18:42:47.612544975 -0500 | ||
483 | 8 | @@ -1401,7 +1401,11 @@ | ||
484 | 9 | button.set_tooltip_text (plugin.LongDesc) | ||
485 | 10 | button.add (box) | ||
486 | 11 | |||
487 | 12 | - if plugin.Name != 'core': | ||
488 | 13 | + blacklist_plugins = ['core'] | ||
489 | 14 | + if os.getenv('DESKTOP_SESSION') == 'ubuntu': | ||
490 | 15 | + blacklist_plugins.append('unityshell') | ||
491 | 16 | + | ||
492 | 17 | + if plugin.Name not in blacklist_plugins: | ||
493 | 18 | enable = gtk.CheckButton () | ||
494 | 19 | enable.set_tooltip_text(_("Enable %s") % plugin.ShortDesc) | ||
495 | 20 | enable.set_active (plugin.Enabled) | ||
496 | 21 | 0 | ||
497 | === removed file 'debian/patches/ccsm_remove_redundant_sliders.patch' | |||
498 | --- debian/patches/ccsm_remove_redundant_sliders.patch 2014-04-11 15:37:49 +0000 | |||
499 | +++ debian/patches/ccsm_remove_redundant_sliders.patch 1970-01-01 00:00:00 +0000 | |||
500 | @@ -1,38 +0,0 @@ | |||
501 | 1 | === modified file 'ccm/Settings.py' | ||
502 | 2 | --- a/compizconfig/ccsm/ccm/Settings.py 2014-04-11 11:28:28.731117694 -0400 | ||
503 | 3 | +++ b/compizconfig/ccsm/ccm/Settings.py 2014-04-11 11:29:59.443116911 -0400 | ||
504 | 4 | @@ -442,16 +442,10 @@ | ||
505 | 5 | self.Adj = gtk.Adjustment(0, info[0], info[1], inc, inc*10) | ||
506 | 6 | self.Spin = gtk.SpinButton(self.Adj) | ||
507 | 7 | self.Spin.set_value(self.Get()) | ||
508 | 8 | - | ||
509 | 9 | - self.Scale = gtk.HScale(self.Adj) | ||
510 | 10 | - | ||
511 | 11 | - self.Scale.set_update_policy(gtk.UPDATE_DISCONTINUOUS) | ||
512 | 12 | - self.Scale.connect("value-changed", self.Changed) | ||
513 | 13 | self.Spin.connect("value-changed", self.Changed) | ||
514 | 14 | - self.Widget = self.Scale | ||
515 | 15 | + self.Widget = self.Spin | ||
516 | 16 | |||
517 | 17 | - self.Box.pack_start(self.Scale, True, True) | ||
518 | 18 | - self.Box.pack_start(self.Spin, False, False) | ||
519 | 19 | + self.Box.pack_end(self.Spin, False, False) | ||
520 | 20 | |||
521 | 21 | def _Read(self): | ||
522 | 22 | self.Adj.set_value(self.Get()) | ||
523 | 23 | @@ -465,7 +459,6 @@ | ||
524 | 24 | self.Inc = 1 | ||
525 | 25 | NumberSetting._Init(self) | ||
526 | 26 | self.Spin.set_digits(0) | ||
527 | 27 | - self.Scale.set_digits(0) | ||
528 | 28 | |||
529 | 29 | class FloatSetting(NumberSetting): | ||
530 | 30 | |||
531 | 31 | @@ -475,7 +468,6 @@ | ||
532 | 32 | self.Inc = None | ||
533 | 33 | NumberSetting._Init(self) | ||
534 | 34 | self.Spin.set_digits(4) | ||
535 | 35 | - self.Scale.set_digits(4) | ||
536 | 36 | |||
537 | 37 | |||
538 | 38 | class ColorSetting(StockSetting): | ||
539 | 39 | 0 | ||
540 | === removed file 'debian/patches/series' | |||
541 | --- debian/patches/series 2015-04-23 20:07:35 +0000 | |||
542 | +++ debian/patches/series 1970-01-01 00:00:00 +0000 | |||
543 | @@ -1,7 +0,0 @@ | |||
544 | 1 | ubuntu_super_p.patch | ||
545 | 2 | ubuntu-config.patch | ||
546 | 3 | ccsm_remove_redundant_sliders.patch | ||
547 | 4 | ccsm_add_first_run_warning.patch | ||
548 | 5 | ccsm_disable_unity_checkbox.patch | ||
549 | 6 | unity_support_test.patch | ||
550 | 7 | 100_workaround_virtualbox_hang.patch | ||
551 | 8 | 0 | ||
552 | === removed file 'debian/patches/ubuntu-config.patch' | |||
553 | --- debian/patches/ubuntu-config.patch 2015-04-06 18:44:31 +0000 | |||
554 | +++ debian/patches/ubuntu-config.patch 1970-01-01 00:00:00 +0000 | |||
555 | @@ -1,886 +0,0 @@ | |||
556 | 1 | === modified file 'metadata/core.xml.in' | ||
557 | 2 | Index: scale-xy-offsets/metadata/core.xml.in | ||
558 | 3 | =================================================================== | ||
559 | 4 | --- scale-xy-offsets.orig/metadata/core.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
560 | 5 | +++ scale-xy-offsets/metadata/core.xml.in 2014-02-17 21:25:57.408121419 +0100 | ||
561 | 6 | @@ -139,7 +139,7 @@ | ||
562 | 7 | <option name="focus_prevention_match" type="match"> | ||
563 | 8 | <_short>Focus Prevention Windows</_short> | ||
564 | 9 | <_long>Focus prevention windows</_long> | ||
565 | 10 | - <default>any</default> | ||
566 | 11 | + <default>!(class=Polkit-gnome-authentication-agent-1)</default> | ||
567 | 12 | </option> | ||
568 | 13 | </group> | ||
569 | 14 | <group> | ||
570 | 15 | @@ -174,7 +174,7 @@ | ||
571 | 16 | <option name="minimize_window_key" type="key"> | ||
572 | 17 | <_short>Minimize Window</_short> | ||
573 | 18 | <_long>Minimize active window</_long> | ||
574 | 19 | - <default><Alt>F9</default> | ||
575 | 20 | + <default><Control><Alt>KP_0</default> | ||
576 | 21 | </option> | ||
577 | 22 | <option name="minimize_window_button" type="button"> | ||
578 | 23 | <_short>Minimize Window</_short> | ||
579 | 24 | @@ -183,16 +183,16 @@ | ||
580 | 25 | <option name="maximize_window_key" type="key"> | ||
581 | 26 | <_short>Maximize Window</_short> | ||
582 | 27 | <_long>Maximize active window</_long> | ||
583 | 28 | - <default><Alt>F10</default> | ||
584 | 29 | + <default><Control><Super>Up</default> | ||
585 | 30 | </option> | ||
586 | 31 | <option name="unmaximize_window_key" type="key"> | ||
587 | 32 | <_short>Unmaximize Window</_short> | ||
588 | 33 | <_long>Unmaximize active window</_long> | ||
589 | 34 | - <default><Alt>F5</default> | ||
590 | 35 | </option> | ||
591 | 36 | <option name="unmaximize_or_minimize_window_key" type="key"> | ||
592 | 37 | <_short>Unmaximize or Minimize Window</_short> | ||
593 | 38 | <_long>Unmaximize or minimize active window</_long> | ||
594 | 39 | + <default><Control><Super>Down</default> | ||
595 | 40 | </option> | ||
596 | 41 | <option name="maximize_window_horizontally_key" type="key"> | ||
597 | 42 | <_short>Maximize Window Horizontally</_short> | ||
598 | 43 | @@ -215,7 +215,6 @@ | ||
599 | 44 | <option name="show_desktop_key" type="key"> | ||
600 | 45 | <_short>Show Desktop</_short> | ||
601 | 46 | <_long>Hide all windows and focus desktop</_long> | ||
602 | 47 | - <default><Control><Alt>d</default> | ||
603 | 48 | </option> | ||
604 | 49 | <option name="show_desktop_edge" type="edge"> | ||
605 | 50 | <_short>Show Desktop</_short> | ||
606 | 51 | @@ -225,6 +224,7 @@ | ||
607 | 52 | <option name="toggle_window_maximized_key" type="key"> | ||
608 | 53 | <_short>Toggle Window Maximized</_short> | ||
609 | 54 | <_long>Toggle active window maximized</_long> | ||
610 | 55 | + <default><Control><Alt>KP_5</default> | ||
611 | 56 | </option> | ||
612 | 57 | <option name="toggle_window_maximized_button" type="button"> | ||
613 | 58 | <_short>Toggle Window Maximized</_short> | ||
614 | 59 | @@ -249,7 +249,7 @@ | ||
615 | 60 | <option name="hsize" type="int"> | ||
616 | 61 | <_short>Horizontal Virtual Size</_short> | ||
617 | 62 | <_long>Screen size multiplier for horizontal virtual size</_long> | ||
618 | 63 | - <default>4</default> | ||
619 | 64 | + <default>1</default> | ||
620 | 65 | <min>1</min> | ||
621 | 66 | <max>32</max> | ||
622 | 67 | </option> | ||
623 | 68 | Index: scale-xy-offsets/plugins/animation/animation.xml.in | ||
624 | 69 | =================================================================== | ||
625 | 70 | --- scale-xy-offsets.orig/plugins/animation/animation.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
626 | 71 | +++ scale-xy-offsets/plugins/animation/animation.xml.in 2014-02-17 21:25:57.408121419 +0100 | ||
627 | 72 | @@ -36,7 +36,7 @@ | ||
628 | 73 | <extensible/> | ||
629 | 74 | <sort start="2"/> | ||
630 | 75 | <default> | ||
631 | 76 | - <value>animation:Zoom</value> | ||
632 | 77 | + <value>animation:Glide 2</value> | ||
633 | 78 | <value>animation:Fade</value> | ||
634 | 79 | <value>animation:Fade</value> | ||
635 | 80 | </default> | ||
636 | 81 | @@ -48,9 +48,9 @@ | ||
637 | 82 | <min>50</min> | ||
638 | 83 | <max>4000</max> | ||
639 | 84 | <default> | ||
640 | 85 | - <value>200</value> | ||
641 | 86 | - <value>150</value> | ||
642 | 87 | - <value>150</value> | ||
643 | 88 | + <value>120</value> | ||
644 | 89 | + <value>80</value> | ||
645 | 90 | + <value>80</value> | ||
646 | 91 | </default> | ||
647 | 92 | </option> | ||
648 | 93 | <option name="open_matches" type="list"> | ||
649 | 94 | @@ -58,8 +58,8 @@ | ||
650 | 95 | <_long>The windows that will be animated.</_long> | ||
651 | 96 | <type>match</type> | ||
652 | 97 | <default> | ||
653 | 98 | - <value>(type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)</value> | ||
654 | 99 | - <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value> | ||
655 | 100 | + <value>((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)</value> | ||
656 | 101 | + <value>((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))</value> | ||
657 | 102 | <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value> | ||
658 | 103 | </default> | ||
659 | 104 | </option> | ||
660 | 105 | @@ -102,7 +102,7 @@ | ||
661 | 106 | <extensible/> | ||
662 | 107 | <sort start="2"/> | ||
663 | 108 | <default> | ||
664 | 109 | - <value>animation:Zoom</value> | ||
665 | 110 | + <value>animation:Glide 2</value> | ||
666 | 111 | <value>animation:Fade</value> | ||
667 | 112 | <value>animation:Fade</value> | ||
668 | 113 | </default> | ||
669 | 114 | @@ -114,9 +114,9 @@ | ||
670 | 115 | <min>50</min> | ||
671 | 116 | <max>4000</max> | ||
672 | 117 | <default> | ||
673 | 118 | - <value>200</value> | ||
674 | 119 | - <value>150</value> | ||
675 | 120 | - <value>150</value> | ||
676 | 121 | + <value>120</value> | ||
677 | 122 | + <value>80</value> | ||
678 | 123 | + <value>50</value> | ||
679 | 124 | </default> | ||
680 | 125 | </option> | ||
681 | 126 | <option name="close_matches" type="list"> | ||
682 | 127 | @@ -124,8 +124,8 @@ | ||
683 | 128 | <_long>The windows that will be animated.</_long> | ||
684 | 129 | <type>match</type> | ||
685 | 130 | <default> | ||
686 | 131 | - <value>(type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)</value> | ||
687 | 132 | - <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value> | ||
688 | 133 | + <value>((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)</value> | ||
689 | 134 | + <value>((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))</value> | ||
690 | 135 | <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value> | ||
691 | 136 | </default> | ||
692 | 137 | </option> | ||
693 | 138 | @@ -168,7 +168,7 @@ | ||
694 | 139 | <extensible/> | ||
695 | 140 | <sort start="2"/> | ||
696 | 141 | <default> | ||
697 | 142 | - <value>animation:Magic Lamp</value> | ||
698 | 143 | + <value>animation:Zoom</value> | ||
699 | 144 | </default> | ||
700 | 145 | </option> | ||
701 | 146 | <option name="minimize_durations" type="list"> | ||
702 | 147 | @@ -178,7 +178,7 @@ | ||
703 | 148 | <min>50</min> | ||
704 | 149 | <max>4000</max> | ||
705 | 150 | <default> | ||
706 | 151 | - <value>300</value> | ||
707 | 152 | + <value>220</value> | ||
708 | 153 | </default> | ||
709 | 154 | </option> | ||
710 | 155 | <option name="minimize_matches" type="list"> | ||
711 | 156 | @@ -341,7 +341,7 @@ | ||
712 | 157 | <extensible/> | ||
713 | 158 | <sort start="1"/> | ||
714 | 159 | <default> | ||
715 | 160 | - <value>animation:None</value> | ||
716 | 161 | + <value>animation:Fade</value> | ||
717 | 162 | </default> | ||
718 | 163 | </option> | ||
719 | 164 | <option name="focus_durations" type="list"> | ||
720 | 165 | @@ -351,7 +351,7 @@ | ||
721 | 166 | <min>50</min> | ||
722 | 167 | <max>4000</max> | ||
723 | 168 | <default> | ||
724 | 169 | - <value>300</value> | ||
725 | 170 | + <value>150</value> | ||
726 | 171 | </default> | ||
727 | 172 | </option> | ||
728 | 173 | <option name="focus_matches" type="list"> | ||
729 | 174 | @@ -385,7 +385,7 @@ | ||
730 | 175 | <option name="time_step" type="int"> | ||
731 | 176 | <_short>Animation Time Step</_short> | ||
732 | 177 | <_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.</_long> | ||
733 | 178 | - <default>10</default> | ||
734 | 179 | + <default>16</default> | ||
735 | 180 | <min>1</min> | ||
736 | 181 | <max>400</max> | ||
737 | 182 | </option> | ||
738 | 183 | @@ -473,7 +473,7 @@ | ||
739 | 184 | <option name="glide2_away_position" type="float"> | ||
740 | 185 | <_short>Away Position</_short> | ||
741 | 186 | <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long> | ||
742 | 187 | - <default>-0.4</default> | ||
743 | 188 | + <default>-0.1</default> | ||
744 | 189 | <min>-2</min> | ||
745 | 190 | <max>1</max> | ||
746 | 191 | <precision>0.05</precision> | ||
747 | 192 | @@ -481,7 +481,7 @@ | ||
748 | 193 | <option name="glide2_away_angle" type="float"> | ||
749 | 194 | <_short>Away Angle</_short> | ||
750 | 195 | <_long>Angle of window at the end of the animation.</_long> | ||
751 | 196 | - <default>-45</default> | ||
752 | 197 | + <default>0</default> | ||
753 | 198 | <min>-540</min> | ||
754 | 199 | <max>540</max> | ||
755 | 200 | <precision>5</precision> | ||
756 | 201 | @@ -686,7 +686,7 @@ | ||
757 | 202 | <option name="zoom_springiness" type="float"> | ||
758 | 203 | <_short>Springiness</_short> | ||
759 | 204 | <_long>How spring-like the Zoom animation should be.</_long> | ||
760 | 205 | - <default>0.0</default> | ||
761 | 206 | + <default>0.08</default> | ||
762 | 207 | <min>0</min> | ||
763 | 208 | <max>1</max> | ||
764 | 209 | <precision>0.01</precision> | ||
765 | 210 | Index: scale-xy-offsets/plugins/decor/decor.xml.in | ||
766 | 211 | =================================================================== | ||
767 | 212 | --- scale-xy-offsets.orig/plugins/decor/decor.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
768 | 213 | +++ scale-xy-offsets/plugins/decor/decor.xml.in 2014-02-17 21:25:57.412121402 +0100 | ||
769 | 214 | @@ -31,7 +31,7 @@ | ||
770 | 215 | <option name="active_shadow_opacity" type="float"> | ||
771 | 216 | <_short>Shadow Opacity</_short> | ||
772 | 217 | <_long>Drop shadow opacity</_long> | ||
773 | 218 | - <default>0.5</default> | ||
774 | 219 | + <default>0.8</default> | ||
775 | 220 | <min>0.01</min> | ||
776 | 221 | <max>6.0</max> | ||
777 | 222 | <precision>0.01</precision> | ||
778 | 223 | @@ -66,7 +66,7 @@ | ||
779 | 224 | <option name="inactive_shadow_radius" type="float"> | ||
780 | 225 | <_short>Shadow Radius</_short> | ||
781 | 226 | <_long>Drop shadow radius</_long> | ||
782 | 227 | - <default>8.0</default> | ||
783 | 228 | + <default>5.0</default> | ||
784 | 229 | <min>0.1</min> | ||
785 | 230 | <max>13.0</max> | ||
786 | 231 | <precision>0.1</precision> | ||
787 | 232 | @@ -74,7 +74,7 @@ | ||
788 | 233 | <option name="inactive_shadow_opacity" type="float"> | ||
789 | 234 | <_short>Shadow Opacity</_short> | ||
790 | 235 | <_long>Drop shadow opacity</_long> | ||
791 | 236 | - <default>0.5</default> | ||
792 | 237 | + <default>0.4</default> | ||
793 | 238 | <min>0.01</min> | ||
794 | 239 | <max>6.0</max> | ||
795 | 240 | <precision>0.01</precision> | ||
796 | 241 | @@ -101,7 +101,7 @@ | ||
797 | 242 | <option name="command" type="string"> | ||
798 | 243 | <_short>Command</_short> | ||
799 | 244 | <_long>Decorator command line that is executed if no decorator is already running.</_long> | ||
800 | 245 | - <default>exec \"${COMPIZ_BIN_PATH}compiz-decorator\"</default> | ||
801 | 246 | + <default>/usr/bin/gtk-window-decorator</default> | ||
802 | 247 | </option> | ||
803 | 248 | <option name="mipmap" type="bool"> | ||
804 | 249 | <_short>Mipmap</_short> | ||
805 | 250 | Index: scale-xy-offsets/plugins/fade/fade.xml.in | ||
806 | 251 | =================================================================== | ||
807 | 252 | --- scale-xy-offsets.orig/plugins/fade/fade.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
808 | 253 | +++ scale-xy-offsets/plugins/fade/fade.xml.in 2014-02-17 21:25:57.412121402 +0100 | ||
809 | 254 | @@ -10,6 +10,7 @@ | ||
810 | 255 | </requirement> | ||
811 | 256 | <relation type="after"> | ||
812 | 257 | <plugin>decor</plugin> | ||
813 | 258 | + <plugin>staticswitcher</plugin> | ||
814 | 259 | </relation> | ||
815 | 260 | <relation type="before"> | ||
816 | 261 | <plugin>cube</plugin> | ||
817 | 262 | @@ -50,7 +51,7 @@ | ||
818 | 263 | <option name="window_match" type="match"> | ||
819 | 264 | <_short>Fade windows</_short> | ||
820 | 265 | <_long>Windows that should be fading</_long> | ||
821 | 266 | - <default>any</default> | ||
822 | 267 | + <default>any & !(title=notify-osd)</default> | ||
823 | 268 | </option> | ||
824 | 269 | <option name="visual_bell" type="bell"> | ||
825 | 270 | <_short>Visual Bell</_short> | ||
826 | 271 | Index: scale-xy-offsets/plugins/gnomecompat/gnomecompat.xml.in | ||
827 | 272 | =================================================================== | ||
828 | 273 | --- scale-xy-offsets.orig/plugins/gnomecompat/gnomecompat.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
829 | 274 | +++ scale-xy-offsets/plugins/gnomecompat/gnomecompat.xml.in 2014-02-17 21:25:57.412121402 +0100 | ||
830 | 275 | @@ -53,6 +53,7 @@ | ||
831 | 276 | <option name="run_command_terminal_key" type="key"> | ||
832 | 277 | <_short>Open a terminal</_short> | ||
833 | 278 | <_long>Open a terminal</_long> | ||
834 | 279 | + <default><Control><Alt>T</default> | ||
835 | 280 | </option> | ||
836 | 281 | </group> | ||
837 | 282 | </options> | ||
838 | 283 | Index: scale-xy-offsets/plugins/resize/resize.xml.in | ||
839 | 284 | =================================================================== | ||
840 | 285 | --- scale-xy-offsets.orig/plugins/resize/resize.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
841 | 286 | +++ scale-xy-offsets/plugins/resize/resize.xml.in 2014-02-17 21:25:57.412121402 +0100 | ||
842 | 287 | @@ -56,15 +56,15 @@ | ||
843 | 288 | <option name="maximize_vertically" type="bool"> | ||
844 | 289 | <short>Maximize Vertically if screen edge hit</short> | ||
845 | 290 | <long>Maximizes the window vertically if the top or bottom screen edge is hit while resizing</long> | ||
846 | 291 | - <default>false</default> | ||
847 | 292 | + <default>true</default> | ||
848 | 293 | </option> | ||
849 | 294 | <option name="border_color" type="color"> | ||
850 | 295 | <_short>Border Color</_short> | ||
851 | 296 | <_long>Border color used for outline and rectangle resize modes</_long> | ||
852 | 297 | <default> | ||
853 | 298 | - <red>0x2f2f</red> | ||
854 | 299 | - <green>0x2f2f</green> | ||
855 | 300 | - <blue>0x4f4f</blue> | ||
856 | 301 | + <red>0xfbfb</red> | ||
857 | 302 | + <green>0x8b8b</green> | ||
858 | 303 | + <blue>0x0</blue> | ||
859 | 304 | <alpha>0x9f9f</alpha> | ||
860 | 305 | </default> | ||
861 | 306 | </option> | ||
862 | 307 | @@ -72,10 +72,10 @@ | ||
863 | 308 | <_short>Fill Color</_short> | ||
864 | 309 | <_long>Fill color used for rectangle resize mode</_long> | ||
865 | 310 | <default> | ||
866 | 311 | - <red>0x2f2f</red> | ||
867 | 312 | - <green>0x2f2f</green> | ||
868 | 313 | - <blue>0x4f4f</blue> | ||
869 | 314 | - <alpha>0x4f4f</alpha> | ||
870 | 315 | + <red>0xfbfb</red> | ||
871 | 316 | + <green>0x8b8b</green> | ||
872 | 317 | + <blue>0x0</blue> | ||
873 | 318 | + <alpha>0x1919</alpha> | ||
874 | 319 | </default> | ||
875 | 320 | </option> | ||
876 | 321 | <subgroup> | ||
877 | 322 | Index: scale-xy-offsets/plugins/scale/scale.xml.in | ||
878 | 323 | =================================================================== | ||
879 | 324 | --- scale-xy-offsets.orig/plugins/scale/scale.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
880 | 325 | +++ scale-xy-offsets/plugins/scale/scale.xml.in 2014-02-17 21:31:47.058611881 +0100 | ||
881 | 326 | @@ -19,7 +19,7 @@ | ||
882 | 327 | <option name="spacing" type="int"> | ||
883 | 328 | <_short>Spacing</_short> | ||
884 | 329 | <_long>Space between windows</_long> | ||
885 | 330 | - <default>10</default> | ||
886 | 331 | + <default>20</default> | ||
887 | 332 | <min>0</min> | ||
888 | 333 | <max>250</max> | ||
889 | 334 | </option> | ||
890 | 335 | @@ -36,7 +36,7 @@ | ||
891 | 336 | <option name="speed" type="float"> | ||
892 | 337 | <_short>Speed</_short> | ||
893 | 338 | <_long>Scale speed</_long> | ||
894 | 339 | - <default>1.5</default> | ||
895 | 340 | + <default>5.0</default> | ||
896 | 341 | <min>0.1</min> | ||
897 | 342 | <max>50</max> | ||
898 | 343 | <precision>0.1</precision> | ||
899 | 344 | @@ -44,7 +44,7 @@ | ||
900 | 345 | <option name="timestep" type="float"> | ||
901 | 346 | <_short>Timestep</_short> | ||
902 | 347 | <_long>Scale timestep</_long> | ||
903 | 348 | - <default>1.2</default> | ||
904 | 349 | + <default>0.1</default> | ||
905 | 350 | <min>0.1</min> | ||
906 | 351 | <max>50</max> | ||
907 | 352 | <precision>0.1</precision> | ||
908 | 353 | @@ -57,7 +57,7 @@ | ||
909 | 354 | <option name="opacity" type="int"> | ||
910 | 355 | <_short>Opacity</_short> | ||
911 | 356 | <_long>Amount of opacity in percent</_long> | ||
912 | 357 | - <default>75</default> | ||
913 | 358 | + <default>100</default> | ||
914 | 359 | <min>0</min> | ||
915 | 360 | <max>100</max> | ||
916 | 361 | </option> | ||
917 | 362 | @@ -66,7 +66,7 @@ | ||
918 | 363 | <_long>Overlay an icon on windows once they are scaled</_long> | ||
919 | 364 | <min>0</min> | ||
920 | 365 | <max>2</max> | ||
921 | 366 | - <default>1</default> | ||
922 | 367 | + <default>0</default> | ||
923 | 368 | <desc> | ||
924 | 369 | <value>0</value> | ||
925 | 370 | <_name>None</_name> | ||
926 | 371 | @@ -107,7 +107,7 @@ | ||
927 | 372 | <_long>Selects where windows are scaled if multiple output devices are used.</_long> | ||
928 | 373 | <min>0</min> | ||
929 | 374 | <max>1</max> | ||
930 | 375 | - <default>0</default> | ||
931 | 376 | + <default>1</default> | ||
932 | 377 | <desc> | ||
933 | 378 | <value>0</value> | ||
934 | 379 | <_name>On current output device</_name> | ||
935 | 380 | @@ -123,7 +123,7 @@ | ||
936 | 381 | <option name="key_bindings_toggle" type="bool"> | ||
937 | 382 | <_short>Key Bindings Toggle Scale Mode</_short> | ||
938 | 383 | <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long> | ||
939 | 384 | - <default>false</default> | ||
940 | 385 | + <default>true</default> | ||
941 | 386 | </option> | ||
942 | 387 | <option name="button_bindings_toggle" type="bool"> | ||
943 | 388 | <_short>Button Bindings Toggle Scale Mode</_short> | ||
944 | 389 | @@ -133,15 +133,12 @@ | ||
945 | 390 | <option name="initiate_edge" type="edge"> | ||
946 | 391 | <_short>Initiate Window Picker</_short> | ||
947 | 392 | <_long>Layout and start transforming windows</_long> | ||
948 | 393 | - <default> | ||
949 | 394 | - <edge name="TopRight"/> | ||
950 | 395 | - </default> | ||
951 | 396 | <allowed edgednd="true"/> | ||
952 | 397 | </option> | ||
953 | 398 | <option name="initiate_key" type="key"> | ||
954 | 399 | <_short>Initiate Window Picker</_short> | ||
955 | 400 | <_long>Layout and start transforming windows</_long> | ||
956 | 401 | - <default><Shift><Alt>Up</default> | ||
957 | 402 | + <default><Super>w</default> | ||
958 | 403 | </option> | ||
959 | 404 | <option name="initiate_button" type="button"> | ||
960 | 405 | <_short>Initiate Window Picker</_short> | ||
961 | 406 | @@ -161,6 +158,7 @@ | ||
962 | 407 | <option name="initiate_all_key" type="key"> | ||
963 | 408 | <_short>Initiate Window Picker For All Windows</_short> | ||
964 | 409 | <_long>Layout and start transforming all windows</_long> | ||
965 | 410 | + <default><Super><Shift>w</default> | ||
966 | 411 | </option> | ||
967 | 412 | <option name="initiate_group_edge" type="edge"> | ||
968 | 413 | <_short>Initiate Window Picker For Window Group</_short> | ||
969 | 414 | Index: compiz/plugins/staticswitcher/staticswitcher.xml.in | ||
970 | 415 | =================================================================== | ||
971 | 416 | --- compiz.orig/plugins/staticswitcher/staticswitcher.xml.in 2014-03-04 19:11:33.195668835 +0100 | ||
972 | 417 | +++ compiz/plugins/staticswitcher/staticswitcher.xml.in 2014-03-04 19:11:33.187668855 +0100 | ||
973 | 418 | @@ -11,7 +11,6 @@ | ||
974 | 419 | <relation type="after"> | ||
975 | 420 | <plugin>composite</plugin> | ||
976 | 421 | <plugin>opengl</plugin> | ||
977 | 422 | - <plugin>fade</plugin> | ||
978 | 423 | <plugin>compiztoolbox</plugin> | ||
979 | 424 | <plugin>decor</plugin> | ||
980 | 425 | </relation> | ||
981 | 426 | @@ -140,12 +139,12 @@ | ||
982 | 427 | <option name="auto_change_vp" type="bool"> | ||
983 | 428 | <_short>Auto Change Viewport</_short> | ||
984 | 429 | <_long>Change to the viewport of the selected window while switching</_long> | ||
985 | 430 | - <default>false</default> | ||
986 | 431 | + <default>true</default> | ||
987 | 432 | </option> | ||
988 | 433 | <option name="popup_delay" type="float"> | ||
989 | 434 | <_short>Popup Window Delay</_short> | ||
990 | 435 | <_long>Time (in s) the popup window should be delayed before appearing</_long> | ||
991 | 436 | - <default>0.0</default> | ||
992 | 437 | + <default>0.2</default> | ||
993 | 438 | <min>0.0</min> | ||
994 | 439 | <max>2.0</max> | ||
995 | 440 | <precision>0.05</precision> | ||
996 | 441 | @@ -153,7 +152,7 @@ | ||
997 | 442 | <option name="mouse_select" type="bool"> | ||
998 | 443 | <_short>Allow Mouse Selection</_short> | ||
999 | 444 | <_long>Allow selection of windows from the switcher window with the mouse</_long> | ||
1000 | 445 | - <default>false</default> | ||
1001 | 446 | + <default>true</default> | ||
1002 | 447 | </option> | ||
1003 | 448 | </group> | ||
1004 | 449 | <group> | ||
1005 | 450 | @@ -161,14 +160,14 @@ | ||
1006 | 451 | <option name="saturation" type="int"> | ||
1007 | 452 | <_short>Saturation</_short> | ||
1008 | 453 | <_long>Amount of saturation in percent</_long> | ||
1009 | 454 | - <default>50</default> | ||
1010 | 455 | + <default>100</default> | ||
1011 | 456 | <min>0</min> | ||
1012 | 457 | <max>100</max> | ||
1013 | 458 | </option> | ||
1014 | 459 | <option name="brightness" type="int"> | ||
1015 | 460 | <_short>Brightness</_short> | ||
1016 | 461 | <_long>Amount of brightness in percent</_long> | ||
1017 | 462 | - <default>50</default> | ||
1018 | 463 | + <default>100</default> | ||
1019 | 464 | <min>0</min> | ||
1020 | 465 | <max>100</max> | ||
1021 | 466 | </option> | ||
1022 | 467 | @@ -192,7 +191,7 @@ | ||
1023 | 468 | <option name="mipmap" type="bool"> | ||
1024 | 469 | <_short>Mipmap</_short> | ||
1025 | 470 | <_long>Generate mipmaps when possible for higher quality scaling</_long> | ||
1026 | 471 | - <default>true</default> | ||
1027 | 472 | + <default>false</default> | ||
1028 | 473 | </option> | ||
1029 | 474 | <option name="row_align" type="int"> | ||
1030 | 475 | <_short>Row Alignment</_short> | ||
1031 | 476 | @@ -221,7 +220,7 @@ | ||
1032 | 477 | <option name="bring_to_front" type="bool"> | ||
1033 | 478 | <_short>Bring To Front</_short> | ||
1034 | 479 | <_long>Bring selected window to front</_long> | ||
1035 | 480 | - <default>true</default> | ||
1036 | 481 | + <default>false</default> | ||
1037 | 482 | </option> | ||
1038 | 483 | <_short>Selected Window Highlight</_short> | ||
1039 | 484 | <option name="highlight_mode" type="int"> | ||
1040 | 485 | @@ -229,7 +228,7 @@ | ||
1041 | 486 | <_long>Mode for highlighting the currently selected window</_long> | ||
1042 | 487 | <min>0</min> | ||
1043 | 488 | <max>2</max> | ||
1044 | 489 | - <default>1</default> | ||
1045 | 490 | + <default>0</default> | ||
1046 | 491 | <desc> | ||
1047 | 492 | <value>0</value> | ||
1048 | 493 | <_name>None</_name> | ||
1049 | 494 | Index: scale-xy-offsets/plugins/vpswitch/vpswitch.xml.in | ||
1050 | 495 | =================================================================== | ||
1051 | 496 | --- scale-xy-offsets.orig/plugins/vpswitch/vpswitch.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
1052 | 497 | +++ scale-xy-offsets/plugins/vpswitch/vpswitch.xml.in 2014-02-17 21:25:57.412121402 +0100 | ||
1053 | 498 | @@ -95,13 +95,11 @@ | ||
1054 | 499 | <option name="next_button" type="button"> | ||
1055 | 500 | <_short>Move Next</_short> | ||
1056 | 501 | <_long>Move to the next viewport</_long> | ||
1057 | 502 | - <default>Button5</default> | ||
1058 | 503 | <internal/> | ||
1059 | 504 | </option> | ||
1060 | 505 | <option name="prev_button" type="button"> | ||
1061 | 506 | <_short>Move Prev</_short> | ||
1062 | 507 | <_long>Move to the previous viewport</_long> | ||
1063 | 508 | - <default>Button4</default> | ||
1064 | 509 | <internal/> | ||
1065 | 510 | </option> | ||
1066 | 511 | <option name="initiate_button" type="button"> | ||
1067 | 512 | Index: scale-xy-offsets/plugins/wall/wall.xml.in | ||
1068 | 513 | =================================================================== | ||
1069 | 514 | --- scale-xy-offsets.orig/plugins/wall/wall.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
1070 | 515 | +++ scale-xy-offsets/plugins/wall/wall.xml.in 2014-02-17 21:25:57.416121383 +0100 | ||
1071 | 516 | @@ -30,12 +30,12 @@ | ||
1072 | 517 | <option name="miniscreen" type="bool"> | ||
1073 | 518 | <_short>Show Live Viewport Previews</_short> | ||
1074 | 519 | <_long>Show live viewport previews in switcher window</_long> | ||
1075 | 520 | - <default>false</default> | ||
1076 | 521 | + <default>true</default> | ||
1077 | 522 | </option> | ||
1078 | 523 | <option name="preview_timeout" type="float"> | ||
1079 | 524 | <_short>Switch Target Preview Visibility Time</_short> | ||
1080 | 525 | <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long> | ||
1081 | 526 | - <default>0.4</default> | ||
1082 | 527 | + <default>0.2</default> | ||
1083 | 528 | <min>0.0</min> | ||
1084 | 529 | <max>2.0</max> | ||
1085 | 530 | <precision>0.05</precision> | ||
1086 | 531 | @@ -43,7 +43,7 @@ | ||
1087 | 532 | <option name="preview_scale" type="int"> | ||
1088 | 533 | <_short>Preview Scale</_short> | ||
1089 | 534 | <_long>Size of the preview in %</_long> | ||
1090 | 535 | - <default>100</default> | ||
1091 | 536 | + <default>130</default> | ||
1092 | 537 | <min>0</min> | ||
1093 | 538 | <max>400</max> | ||
1094 | 539 | </option> | ||
1095 | 540 | @@ -57,7 +57,7 @@ | ||
1096 | 541 | <option name="border_width" type="int"> | ||
1097 | 542 | <_short>Border Width</_short> | ||
1098 | 543 | <_long>Width of the border between the previews</_long> | ||
1099 | 544 | - <default>10</default> | ||
1100 | 545 | + <default>7</default> | ||
1101 | 546 | <min>0</min> | ||
1102 | 547 | <max>30</max> | ||
1103 | 548 | </option> | ||
1104 | 549 | @@ -65,10 +65,10 @@ | ||
1105 | 550 | <_short>Outline Color</_short> | ||
1106 | 551 | <_long>Outline color of the switcher window.</_long> | ||
1107 | 552 | <default> | ||
1108 | 553 | - <red>0x3333</red> | ||
1109 | 554 | - <green>0x3333</green> | ||
1110 | 555 | - <blue>0x3333</blue> | ||
1111 | 556 | - <alpha>0xd998</alpha> | ||
1112 | 557 | + <red>0xffff</red> | ||
1113 | 558 | + <green>0xffff</green> | ||
1114 | 559 | + <blue>0xffff</blue> | ||
1115 | 560 | + <alpha>0x3232</alpha> | ||
1116 | 561 | </default> | ||
1117 | 562 | </option> | ||
1118 | 563 | <subgroup> | ||
1119 | 564 | @@ -78,30 +78,30 @@ | ||
1120 | 565 | <_short>Base Color</_short> | ||
1121 | 566 | <_long>First color for the background gradient of the switcher window.</_long> | ||
1122 | 567 | <default> | ||
1123 | 568 | - <red>0xcccc</red> | ||
1124 | 569 | - <green>0xcccc</green> | ||
1125 | 570 | - <blue>0xe665</blue> | ||
1126 | 571 | - <alpha>0xd998</alpha> | ||
1127 | 572 | + <red>0x0000</red> | ||
1128 | 573 | + <green>0x0000</green> | ||
1129 | 574 | + <blue>0x0000</blue> | ||
1130 | 575 | + <alpha>0x6464</alpha> | ||
1131 | 576 | </default> | ||
1132 | 577 | </option> | ||
1133 | 578 | <option name="background_gradient_highlight_color" type="color"> | ||
1134 | 579 | <_short>Highlight Color</_short> | ||
1135 | 580 | <_long>Second color for the background gradient of the switcher window.</_long> | ||
1136 | 581 | <default> | ||
1137 | 582 | - <red>0xf332</red> | ||
1138 | 583 | - <green>0xf332</green> | ||
1139 | 584 | - <blue>0xffff</blue> | ||
1140 | 585 | - <alpha>0xd998</alpha> | ||
1141 | 586 | + <red>0x0000</red> | ||
1142 | 587 | + <green>0x0000</green> | ||
1143 | 588 | + <blue>0x0000</blue> | ||
1144 | 589 | + <alpha>0x6464</alpha> | ||
1145 | 590 | </default> | ||
1146 | 591 | </option> | ||
1147 | 592 | <option name="background_gradient_shadow_color" type="color"> | ||
1148 | 593 | <_short>Shadow Color</_short> | ||
1149 | 594 | <_long>Third color for the background gradient of the switcher window.</_long> | ||
1150 | 595 | <default> | ||
1151 | 596 | - <red>0xf332</red> | ||
1152 | 597 | - <green>0xf332</green> | ||
1153 | 598 | - <blue>0xffff</blue> | ||
1154 | 599 | - <alpha>0xd998</alpha> | ||
1155 | 600 | + <red>0x0000</red> | ||
1156 | 601 | + <green>0x0000</green> | ||
1157 | 602 | + <blue>0x0000</blue> | ||
1158 | 603 | + <alpha>0x6464</alpha> | ||
1159 | 604 | </default> | ||
1160 | 605 | </option> | ||
1161 | 606 | </subgroup> | ||
1162 | 607 | @@ -112,20 +112,20 @@ | ||
1163 | 608 | <_short>Base Color</_short> | ||
1164 | 609 | <_long>First color for the thumb gradient of the switcher window.</_long> | ||
1165 | 610 | <default> | ||
1166 | 611 | - <red>0x3333</red> | ||
1167 | 612 | - <green>0x3333</green> | ||
1168 | 613 | - <blue>0x3333</blue> | ||
1169 | 614 | - <alpha>0x5999</alpha> | ||
1170 | 615 | + <red>0x5555</red> | ||
1171 | 616 | + <green>0x5555</green> | ||
1172 | 617 | + <blue>0x5555</blue> | ||
1173 | 618 | + <alpha>0x3232</alpha> | ||
1174 | 619 | </default> | ||
1175 | 620 | </option> | ||
1176 | 621 | <option name="thumb_gradient_highlight_color" type="color"> | ||
1177 | 622 | <_short>Highlight Color</_short> | ||
1178 | 623 | <_long>Second color for the thumb gradient of the switcher window.</_long> | ||
1179 | 624 | <default> | ||
1180 | 625 | - <red>0x3fff</red> | ||
1181 | 626 | - <green>0x3fff</green> | ||
1182 | 627 | - <blue>0x3fff</blue> | ||
1183 | 628 | - <alpha>0x3fff</alpha> | ||
1184 | 629 | + <red>0x5555</red> | ||
1185 | 630 | + <green>0x5555</green> | ||
1186 | 631 | + <blue>0x5555</blue> | ||
1187 | 632 | + <alpha>0x3232</alpha> | ||
1188 | 633 | </default> | ||
1189 | 634 | </option> | ||
1190 | 635 | </subgroup> | ||
1191 | 636 | @@ -139,7 +139,7 @@ | ||
1192 | 637 | <red>0xffff</red> | ||
1193 | 638 | <green>0xffff</green> | ||
1194 | 639 | <blue>0xffff</blue> | ||
1195 | 640 | - <alpha>0xf332</alpha> | ||
1196 | 641 | + <alpha>0xffff</alpha> | ||
1197 | 642 | </default> | ||
1198 | 643 | </option> | ||
1199 | 644 | <option name="thumb_highlight_gradient_shadow_color" type="color"> | ||
1200 | 645 | @@ -149,7 +149,7 @@ | ||
1201 | 646 | <red>0xdfff</red> | ||
1202 | 647 | <green>0xdfff</green> | ||
1203 | 648 | <blue>0xdfff</blue> | ||
1204 | 649 | - <alpha>0xa665</alpha> | ||
1205 | 650 | + <alpha>0xffff</alpha> | ||
1206 | 651 | </default> | ||
1207 | 652 | </option> | ||
1208 | 653 | </subgroup> | ||
1209 | 654 | @@ -201,7 +201,7 @@ | ||
1210 | 655 | <option name="auto_switch_vp_and_window" type="bool"> | ||
1211 | 656 | <_short>Auto Switch Vp And Window</_short> | ||
1212 | 657 | <_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport</_long> | ||
1213 | 658 | - <default>true</default> | ||
1214 | 659 | + <default>false</default> | ||
1215 | 660 | </option> | ||
1216 | 661 | </group> | ||
1217 | 662 | <group> | ||
1218 | 663 | @@ -356,7 +356,7 @@ | ||
1219 | 664 | <option name="edgeflip_move" type="bool"> | ||
1220 | 665 | <_short>Edge Flip Move</_short> | ||
1221 | 666 | <_long>Flip viewport when moving a window to a screen edge</_long> | ||
1222 | 667 | - <default>true</default> | ||
1223 | 668 | + <default>false</default> | ||
1224 | 669 | </option> | ||
1225 | 670 | <option name="edgeflip_dnd" type="bool"> | ||
1226 | 671 | <_short>Edge Flip DnD</_short> | ||
1227 | 672 | Index: scale-xy-offsets/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp | ||
1228 | 673 | =================================================================== | ||
1229 | 674 | --- scale-xy-offsets.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2014-02-17 21:25:57.420121366 +0100 | ||
1230 | 675 | +++ scale-xy-offsets/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2014-02-17 21:25:57.416121383 +0100 | ||
1231 | 676 | @@ -46,7 +46,7 @@ | ||
1232 | 677 | |||
1233 | 678 | namespace | ||
1234 | 679 | { | ||
1235 | 680 | -unsigned int DEFAULT_VIEWPORT_WIDTH = 4; | ||
1236 | 681 | +unsigned int DEFAULT_VIEWPORT_WIDTH = 1; | ||
1237 | 682 | unsigned int DEFAULT_VIEWPORT_HEIGHT = 1; | ||
1238 | 683 | |||
1239 | 684 | bool Advance (Display *d, bool r) | ||
1240 | 685 | Index: scale-xy-offsets/plugins/grid/grid.xml.in | ||
1241 | 686 | =================================================================== | ||
1242 | 687 | --- scale-xy-offsets.orig/plugins/grid/grid.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
1243 | 688 | +++ scale-xy-offsets/plugins/grid/grid.xml.in 2014-02-17 21:25:57.416121383 +0100 | ||
1244 | 689 | @@ -68,12 +68,12 @@ | ||
1245 | 690 | <option name="put_maximize_key" type="key"> | ||
1246 | 691 | <_short>Maximize Key</_short> | ||
1247 | 692 | <_long>Maximize window.</_long> | ||
1248 | 693 | - <default><Control><Alt>KP_0</default> | ||
1249 | 694 | + <default><Control><Super>Up</default> | ||
1250 | 695 | </option> | ||
1251 | 696 | <option name="put_restore_key" type="key"> | ||
1252 | 697 | <_short>Restore</_short> | ||
1253 | 698 | <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long> | ||
1254 | 699 | - <default><Alt>F5</default> | ||
1255 | 700 | + <default><Control><Super>Down</default> | ||
1256 | 701 | </option> | ||
1257 | 702 | <option name="left_maximize" type="key"> | ||
1258 | 703 | <_short>Left Maximize</_short> | ||
1259 | 704 | Index: scale-xy-offsets/plugins/ezoom/ezoom.xml.in | ||
1260 | 705 | =================================================================== | ||
1261 | 706 | --- scale-xy-offsets.orig/plugins/ezoom/ezoom.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
1262 | 707 | +++ scale-xy-offsets/plugins/ezoom/ezoom.xml.in 2014-02-17 21:25:57.416121383 +0100 | ||
1263 | 708 | @@ -30,7 +30,7 @@ | ||
1264 | 709 | <option type="button" name="zoom_in_button"> | ||
1265 | 710 | <_short>Zoom In Button</_short> | ||
1266 | 711 | <_long>Mouse button shortcut to invoke zooming in.</_long> | ||
1267 | 712 | - <default><Super>Button4</default> | ||
1268 | 713 | + <default></default> | ||
1269 | 714 | </option> | ||
1270 | 715 | <option type="key" name="zoom_in_key"> | ||
1271 | 716 | <_short>Zoom In Key</_short> | ||
1272 | 717 | @@ -39,7 +39,7 @@ | ||
1273 | 718 | <option type="button" name="zoom_out_button"> | ||
1274 | 719 | <_short>Zoom Out Button</_short> | ||
1275 | 720 | <_long>Mouse button shortcut to invoke zooming out.</_long> | ||
1276 | 721 | - <default><Super>Button5</default> | ||
1277 | 722 | + <default></default> | ||
1278 | 723 | </option> | ||
1279 | 724 | <option type="key" name="zoom_out_key"> | ||
1280 | 725 | <_short>Zoom Out Key</_short> | ||
1281 | 726 | @@ -48,7 +48,7 @@ | ||
1282 | 727 | <option type="button" name="zoom_box_button"> | ||
1283 | 728 | <_short>Invoke Zoom Box Button</_short> | ||
1284 | 729 | <_long>Define a rectangle area and zoom into it.</_long> | ||
1285 | 730 | - <default><Super>Button2</default> | ||
1286 | 731 | + <default></default> | ||
1287 | 732 | </option> | ||
1288 | 733 | <option name="zoom_box_outline_color" type="color"> | ||
1289 | 734 | <_short>Zoom Box Outline Color</_short> | ||
1290 | 735 | @@ -162,7 +162,7 @@ | ||
1291 | 736 | <option type="key" name="fit_to_window_key"> | ||
1292 | 737 | <_short>Fit zoomed area to window</_short> | ||
1293 | 738 | <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long> | ||
1294 | 739 | - <default><Super>r</default> | ||
1295 | 740 | + <default></default> | ||
1296 | 741 | </option> | ||
1297 | 742 | </subgroup> | ||
1298 | 743 | </group> | ||
1299 | 744 | Index: scale-xy-offsets/plugins/expo/expo.xml.in | ||
1300 | 745 | =================================================================== | ||
1301 | 746 | --- scale-xy-offsets.orig/plugins/expo/expo.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
1302 | 747 | +++ scale-xy-offsets/plugins/expo/expo.xml.in 2014-02-17 21:25:57.416121383 +0100 | ||
1303 | 748 | @@ -17,6 +17,7 @@ | ||
1304 | 749 | <plugin>wobbly</plugin> | ||
1305 | 750 | <plugin>animation</plugin> | ||
1306 | 751 | <plugin>wallpaper</plugin> | ||
1307 | 752 | + <plugin>imgpng</plugin> | ||
1308 | 753 | </relation> | ||
1309 | 754 | </deps> | ||
1310 | 755 | <options> | ||
1311 | 756 | @@ -25,7 +26,7 @@ | ||
1312 | 757 | <option name="expo_key" type="key"> | ||
1313 | 758 | <_short>Expo Key</_short> | ||
1314 | 759 | <_long>Initiate or terminate Expo mode with this keyboard shortcut.</_long> | ||
1315 | 760 | - <default><Super>e</default> | ||
1316 | 761 | + <default><Super>s</default> | ||
1317 | 762 | </option> | ||
1318 | 763 | <option name="expo_button" type="button"> | ||
1319 | 764 | <_short>Expo Button</_short> | ||
1320 | 765 | @@ -36,7 +37,6 @@ | ||
1321 | 766 | <_short>Expo Corner/Edge</_short> | ||
1322 | 767 | <_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).</_long> | ||
1323 | 768 | <default> | ||
1324 | 769 | - <edge name="TopLeft"/> | ||
1325 | 770 | </default> | ||
1326 | 771 | </option> | ||
1327 | 772 | <option name="double_click_time" type="int"> | ||
1328 | 773 | @@ -80,7 +80,7 @@ | ||
1329 | 774 | <option name="zoom_time" type="float"> | ||
1330 | 775 | <_short>Animation Duration</_short> | ||
1331 | 776 | <_long>Duration of the selected animation (in seconds).</_long> | ||
1332 | 777 | - <default>0.5</default> | ||
1333 | 778 | + <default>0.3</default> | ||
1334 | 779 | <min>0.1</min> | ||
1335 | 780 | <max>5.0</max> | ||
1336 | 781 | <precision>0.1</precision> | ||
1337 | 782 | @@ -142,12 +142,12 @@ | ||
1338 | 783 | <option name="x_offset" type="int"> | ||
1339 | 784 | <_short>X Offset</_short> | ||
1340 | 785 | <_long>Horizontal offset (in pixels).</_long> | ||
1341 | 786 | - <default>0</default> | ||
1342 | 787 | + <default>64</default> | ||
1343 | 788 | </option> | ||
1344 | 789 | <option name="y_offset" type="int"> | ||
1345 | 790 | <_short>Y Offset</_short> | ||
1346 | 791 | <_long>Vertical offset (in pixels).</_long> | ||
1347 | 792 | - <default>0</default> | ||
1348 | 793 | + <default>24</default> | ||
1349 | 794 | </option> | ||
1350 | 795 | <option name="distance" type="float"> | ||
1351 | 796 | <_short>Camera Distance</_short> | ||
1352 | 797 | @@ -160,7 +160,7 @@ | ||
1353 | 798 | <option name="vp_distance" type="float"> | ||
1354 | 799 | <_short>Viewport Distance</_short> | ||
1355 | 800 | <_long>The distance between viewports in Expo mode.</_long> | ||
1356 | 801 | - <default>0.10</default> | ||
1357 | 802 | + <default>0.2</default> | ||
1358 | 803 | <min>0.0</min> | ||
1359 | 804 | <max>1.0</max> | ||
1360 | 805 | <precision>0.01</precision> | ||
1361 | 806 | @@ -188,7 +188,7 @@ | ||
1362 | 807 | <_long>How the Expo wall should be displayed, if multiple output devices are used.</_long> | ||
1363 | 808 | <min>0</min> | ||
1364 | 809 | <max>1</max> | ||
1365 | 810 | - <default>0</default> | ||
1366 | 811 | + <default>1</default> | ||
1367 | 812 | <desc> | ||
1368 | 813 | <value>0</value> | ||
1369 | 814 | <_name>One big wall</_name> | ||
1370 | 815 | @@ -203,7 +203,7 @@ | ||
1371 | 816 | <option name="vp_brightness" type="float"> | ||
1372 | 817 | <_short>Brightness</_short> | ||
1373 | 818 | <_long>The brightness of unfocused viewports (in percent).</_long> | ||
1374 | 819 | - <default>75.0</default> | ||
1375 | 820 | + <default>40.0</default> | ||
1376 | 821 | <min>0.0</min> | ||
1377 | 822 | <max>100.0</max> | ||
1378 | 823 | <precision>0.1</precision> | ||
1379 | 824 | @@ -223,7 +223,7 @@ | ||
1380 | 825 | <red>0xfbfb</red> | ||
1381 | 826 | <green>0x8b8b</green> | ||
1382 | 827 | <blue>0x0</blue> | ||
1383 | 828 | - <alpha>0x0</alpha> | ||
1384 | 829 | + <alpha>0xffff</alpha> | ||
1385 | 830 | </default> | ||
1386 | 831 | </option> | ||
1387 | 832 | </subgroup> | ||
1388 | 833 | @@ -232,7 +232,7 @@ | ||
1389 | 834 | <option name="reflection" type="bool"> | ||
1390 | 835 | <_short>Reflection</_short> | ||
1391 | 836 | <_long>Render a realtime reflection of the viewports on the ground.</_long> | ||
1392 | 837 | - <default>true</default> | ||
1393 | 838 | + <default>false</default> | ||
1394 | 839 | </option> | ||
1395 | 840 | <option name="ground_color1" type="color"> | ||
1396 | 841 | <_short>Ground Color (near)</_short> | ||
1397 | 842 | Index: scale-xy-offsets/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml | ||
1398 | 843 | =================================================================== | ||
1399 | 844 | --- scale-xy-offsets.orig/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2014-02-17 21:25:57.420121366 +0100 | ||
1400 | 845 | +++ scale-xy-offsets/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2014-02-17 21:25:57.416121383 +0100 | ||
1401 | 846 | @@ -10,6 +10,9 @@ | ||
1402 | 847 | <key type="s" name="command-screenshot"> | ||
1403 | 848 | <default>"gnome-screenshot"</default> | ||
1404 | 849 | </key> | ||
1405 | 850 | + <key type="as" name="run-command-21"> | ||
1406 | 851 | + <default>["<Control><Alt>Delete"]</default> | ||
1407 | 852 | + </key> | ||
1408 | 853 | <key type="as" name="run-command-12"> | ||
1409 | 854 | <default>["Disabled"]</default> | ||
1410 | 855 | </key> | ||
1411 | 856 | @@ -46,6 +49,9 @@ | ||
1412 | 857 | <key type="as" name="run-command-1"> | ||
1413 | 858 | <default>["Disabled"]</default> | ||
1414 | 859 | </key> | ||
1415 | 860 | + <key type="s" name="command-21"> | ||
1416 | 861 | + <default>"/usr/bin/gnome-system-monitor -p"</default> | ||
1417 | 862 | + </key> | ||
1418 | 863 | <key type="s" name="command-12"> | ||
1419 | 864 | <default>""</default> | ||
1420 | 865 | </key> | ||
1421 | 866 | Index: scale-xy-offsets/plugins/commands/commands.xml.in | ||
1422 | 867 | =================================================================== | ||
1423 | 868 | --- scale-xy-offsets.orig/plugins/commands/commands.xml.in 2014-02-17 21:25:57.420121366 +0100 | ||
1424 | 869 | +++ scale-xy-offsets/plugins/commands/commands.xml.in 2014-02-17 21:25:57.416121383 +0100 | ||
1425 | 870 | @@ -117,7 +117,7 @@ | ||
1426 | 871 | <option name="command20" type="string"> | ||
1427 | 872 | <_short>Command line 20</_short> | ||
1428 | 873 | <_long>Command line to be executed in shell when run_command20 is invoked</_long> | ||
1429 | 874 | - <default></default> | ||
1430 | 875 | + <default>/usr/bin/gnome-system-monitor -p</default> | ||
1431 | 876 | </option> | ||
1432 | 877 | </group> | ||
1433 | 878 | <group> | ||
1434 | 879 | @@ -205,6 +205,7 @@ | ||
1435 | 880 | <option name="run_command20_key" type="key"> | ||
1436 | 881 | <_short>Run command 20</_short> | ||
1437 | 882 | <_long>A keybinding that when invoked, will run the shell command identified by command20</_long> | ||
1438 | 883 | + <default><Control><Alt>Delete</default> | ||
1439 | 884 | </option> | ||
1440 | 885 | </group> | ||
1441 | 886 | <group> | ||
1442 | 887 | 0 | ||
1443 | === removed file 'debian/patches/ubuntu_super_p.patch' | |||
1444 | --- debian/patches/ubuntu_super_p.patch 2013-11-22 15:11:24 +0000 | |||
1445 | +++ debian/patches/ubuntu_super_p.patch 1970-01-01 00:00:00 +0000 | |||
1446 | @@ -1,30 +0,0 @@ | |||
1447 | 1 | --- a/src/screen.cpp | ||
1448 | 2 | +++ b/src/screen.cpp | ||
1449 | 3 | @@ -3253,12 +3253,22 @@ | ||
1450 | 4 | * This is so that we can detect taps on individual modifier | ||
1451 | 5 | * keys, and know to cancel the tap if <modifier>+k is pressed. | ||
1452 | 6 | */ | ||
1453 | 7 | - if (!(currentState & CompAction::StateIgnoreTap)) | ||
1454 | 8 | + int minCode, maxCode; | ||
1455 | 9 | + XDisplayKeycodes (screen->dpy(), &minCode, &maxCode); | ||
1456 | 10 | + | ||
1457 | 11 | + if ((currentState & CompAction::StateIgnoreTap)) | ||
1458 | 12 | + { | ||
1459 | 13 | + KeySym sym_p = XStringToKeysym("p"); | ||
1460 | 14 | + KeyCode code_p = XKeysymToKeycode(screen->dpy(), sym_p); | ||
1461 | 15 | + | ||
1462 | 16 | + for (k = minCode; k <= maxCode; k++) | ||
1463 | 17 | + if (k != code_p) | ||
1464 | 18 | + grabUngrabOneKey (modifiers | ignore, k, grab); | ||
1465 | 19 | + } | ||
1466 | 20 | + else | ||
1467 | 21 | { | ||
1468 | 22 | - int minCode, maxCode; | ||
1469 | 23 | - XDisplayKeycodes (screen->dpy(), &minCode, &maxCode); | ||
1470 | 24 | - for (k = minCode; k <= maxCode; k++) | ||
1471 | 25 | - grabUngrabOneKey (modifiers | modifierForKeycode | ignore, k, grab); | ||
1472 | 26 | + for (k = minCode; k <= maxCode; k++) | ||
1473 | 27 | + grabUngrabOneKey (modifiers | modifierForKeycode | ignore, k, grab); | ||
1474 | 28 | } | ||
1475 | 29 | } | ||
1476 | 30 | |||
1477 | 31 | 0 | ||
1478 | === removed file 'debian/patches/unity_support_test.patch' | |||
1479 | --- debian/patches/unity_support_test.patch 2012-10-09 13:05:32 +0000 | |||
1480 | +++ debian/patches/unity_support_test.patch 1970-01-01 00:00:00 +0000 | |||
1481 | @@ -1,90 +0,0 @@ | |||
1482 | 1 | # Description: force llvmpipe in the unity profile if we are in the grey zone, | ||
1483 | 2 | # meaning: the card and drivers have opengl support, however, | ||
1484 | 3 | # it doesn't met unity requirements (opengl < 1.4, no vertex | ||
1485 | 4 | # shaders support…). | ||
1486 | 5 | # Forwarded: not-needed | ||
1487 | 6 | # Bug: https://launchpad.net/bugs/1039155 | ||
1488 | 7 | # Author: Daniel van Vugt <daniel.van.vugt@canonical.com> | ||
1489 | 8 | === modified file 'src/plugin.cpp' | ||
1490 | 9 | --- old/src/plugin.cpp 2012-07-30 10:15:41 +0000 | ||
1491 | 10 | +++ new/src/plugin.cpp 2012-10-09 10:52:12 +0000 | ||
1492 | 11 | @@ -116,6 +116,60 @@ | ||
1493 | 12 | } | ||
1494 | 13 | |||
1495 | 14 | static bool | ||
1496 | 15 | +setOpenGLPluginEnvironment () | ||
1497 | 16 | +{ | ||
1498 | 17 | + /* | ||
1499 | 18 | + * Check if the hardware is adequate for Unity and if not, use LLVMpipe. | ||
1500 | 19 | + * Unfortunately the design of Mesa requires that this be done before | ||
1501 | 20 | + * libGL is loaded, which means before the opengl plugin is loaded. | ||
1502 | 21 | + */ | ||
1503 | 22 | + bool toggledLLVM = false; | ||
1504 | 23 | + | ||
1505 | 24 | + if (!getenv ("LIBGL_ALWAYS_SOFTWARE")) | ||
1506 | 25 | + { | ||
1507 | 26 | + const char *profile = getenv ("COMPIZ_CONFIG_PROFILE"); | ||
1508 | 27 | + if (profile && !strcmp (profile, "ubuntu")) | ||
1509 | 28 | + { | ||
1510 | 29 | + int result = system ("/usr/lib/nux/unity_support_test"); | ||
1511 | 30 | + int status = WEXITSTATUS (result); | ||
1512 | 31 | + compLogMessage ("core", CompLogLevelInfo, | ||
1513 | 32 | + "Unity is %s", | ||
1514 | 33 | + status == 0 ? "fully supported by your hardware." : | ||
1515 | 34 | + status == 127 ? "undetectable" : | ||
1516 | 35 | + "not supported by your hardware. " | ||
1517 | 36 | + "Enabling software rendering instead (slow)."); | ||
1518 | 37 | + if (status > 0 && status < 127) | ||
1519 | 38 | + { | ||
1520 | 39 | + setenv ("LIBGL_ALWAYS_SOFTWARE", "1", 1); | ||
1521 | 40 | + toggledLLVM = true; | ||
1522 | 41 | + } | ||
1523 | 42 | + } | ||
1524 | 43 | + } | ||
1525 | 44 | + | ||
1526 | 45 | + return toggledLLVM; | ||
1527 | 46 | +} | ||
1528 | 47 | + | ||
1529 | 48 | +static void | ||
1530 | 49 | +unsetUnityshellPluginEnvironment () | ||
1531 | 50 | +{ | ||
1532 | 51 | + unsetenv ("LIBGL_ALWAYS_SOFTWARE"); | ||
1533 | 52 | +} | ||
1534 | 53 | + | ||
1535 | 54 | +static void | ||
1536 | 55 | +setPluginEnvironment (const char *name) | ||
1537 | 56 | +{ | ||
1538 | 57 | + if (!strcmp (name, "opengl")) | ||
1539 | 58 | + setOpenGLPluginEnvironment (); | ||
1540 | 59 | +} | ||
1541 | 60 | + | ||
1542 | 61 | +static void | ||
1543 | 62 | +unsetPluginEnvironment (const char *name) | ||
1544 | 63 | +{ | ||
1545 | 64 | + if (!strcmp (name, "unityshell")) | ||
1546 | 65 | + unsetUnityshellPluginEnvironment (); | ||
1547 | 66 | +} | ||
1548 | 67 | + | ||
1549 | 68 | +static bool | ||
1550 | 69 | dlloaderLoadPlugin (CompPlugin *p, | ||
1551 | 70 | const char *path, | ||
1552 | 71 | const char *name) | ||
1553 | 72 | @@ -127,6 +181,8 @@ | ||
1554 | 73 | if (cloaderLoadPlugin (p, path, name)) | ||
1555 | 74 | return true; | ||
1556 | 75 | |||
1557 | 76 | + setPluginEnvironment (name); | ||
1558 | 77 | + | ||
1559 | 78 | if (path) | ||
1560 | 79 | { | ||
1561 | 80 | file = path; | ||
1562 | 81 | @@ -197,6 +253,8 @@ | ||
1563 | 82 | if (!loaded && dlhand) | ||
1564 | 83 | dlclose (dlhand); | ||
1565 | 84 | |||
1566 | 85 | + unsetPluginEnvironment (name); | ||
1567 | 86 | + | ||
1568 | 87 | return loaded; | ||
1569 | 88 | } | ||
1570 | 89 | |||
1571 | 90 | |||
1572 | 91 | 0 | ||
1573 | === modified file 'metadata/core.xml.in' | |||
1574 | --- metadata/core.xml.in 2015-03-18 21:06:14 +0000 | |||
1575 | +++ metadata/core.xml.in 2015-10-15 15:29:59 +0000 | |||
1576 | @@ -144,7 +144,7 @@ | |||
1577 | 144 | <option name="focus_prevention_match" type="match"> | 144 | <option name="focus_prevention_match" type="match"> |
1578 | 145 | <_short>Focus Prevention Windows</_short> | 145 | <_short>Focus Prevention Windows</_short> |
1579 | 146 | <_long>Focus prevention windows</_long> | 146 | <_long>Focus prevention windows</_long> |
1581 | 147 | <default>any</default> | 147 | <default>!(class=Polkit-gnome-authentication-agent-1)</default> |
1582 | 148 | </option> | 148 | </option> |
1583 | 149 | </group> | 149 | </group> |
1584 | 150 | <group> | 150 | <group> |
1585 | @@ -179,7 +179,7 @@ | |||
1586 | 179 | <option name="minimize_window_key" type="key"> | 179 | <option name="minimize_window_key" type="key"> |
1587 | 180 | <_short>Minimize Window</_short> | 180 | <_short>Minimize Window</_short> |
1588 | 181 | <_long>Minimize active window</_long> | 181 | <_long>Minimize active window</_long> |
1590 | 182 | <default><Alt>F9</default> | 182 | <default><Control><Alt>KP_0</default> |
1591 | 183 | </option> | 183 | </option> |
1592 | 184 | <option name="minimize_window_button" type="button"> | 184 | <option name="minimize_window_button" type="button"> |
1593 | 185 | <_short>Minimize Window</_short> | 185 | <_short>Minimize Window</_short> |
1594 | @@ -188,16 +188,16 @@ | |||
1595 | 188 | <option name="maximize_window_key" type="key"> | 188 | <option name="maximize_window_key" type="key"> |
1596 | 189 | <_short>Maximize Window</_short> | 189 | <_short>Maximize Window</_short> |
1597 | 190 | <_long>Maximize active window</_long> | 190 | <_long>Maximize active window</_long> |
1599 | 191 | <default><Alt>F10</default> | 191 | <default><Control><Super>Up</default> |
1600 | 192 | </option> | 192 | </option> |
1601 | 193 | <option name="unmaximize_window_key" type="key"> | 193 | <option name="unmaximize_window_key" type="key"> |
1602 | 194 | <_short>Unmaximize Window</_short> | 194 | <_short>Unmaximize Window</_short> |
1603 | 195 | <_long>Unmaximize active window</_long> | 195 | <_long>Unmaximize active window</_long> |
1604 | 196 | <default><Alt>F5</default> | ||
1605 | 197 | </option> | 196 | </option> |
1606 | 198 | <option name="unmaximize_or_minimize_window_key" type="key"> | 197 | <option name="unmaximize_or_minimize_window_key" type="key"> |
1607 | 199 | <_short>Unmaximize or Minimize Window</_short> | 198 | <_short>Unmaximize or Minimize Window</_short> |
1608 | 200 | <_long>Unmaximize or minimize active window</_long> | 199 | <_long>Unmaximize or minimize active window</_long> |
1609 | 200 | <default><Control><Super>Down</default> | ||
1610 | 201 | </option> | 201 | </option> |
1611 | 202 | <option name="maximize_window_horizontally_key" type="key"> | 202 | <option name="maximize_window_horizontally_key" type="key"> |
1612 | 203 | <_short>Maximize Window Horizontally</_short> | 203 | <_short>Maximize Window Horizontally</_short> |
1613 | @@ -220,7 +220,6 @@ | |||
1614 | 220 | <option name="show_desktop_key" type="key"> | 220 | <option name="show_desktop_key" type="key"> |
1615 | 221 | <_short>Show Desktop</_short> | 221 | <_short>Show Desktop</_short> |
1616 | 222 | <_long>Hide all windows and focus desktop</_long> | 222 | <_long>Hide all windows and focus desktop</_long> |
1617 | 223 | <default><Control><Alt>d</default> | ||
1618 | 224 | </option> | 223 | </option> |
1619 | 225 | <option name="show_desktop_edge" type="edge"> | 224 | <option name="show_desktop_edge" type="edge"> |
1620 | 226 | <_short>Show Desktop</_short> | 225 | <_short>Show Desktop</_short> |
1621 | @@ -230,6 +229,7 @@ | |||
1622 | 230 | <option name="toggle_window_maximized_key" type="key"> | 229 | <option name="toggle_window_maximized_key" type="key"> |
1623 | 231 | <_short>Toggle Window Maximized</_short> | 230 | <_short>Toggle Window Maximized</_short> |
1624 | 232 | <_long>Toggle active window maximized</_long> | 231 | <_long>Toggle active window maximized</_long> |
1625 | 232 | <default><Control><Alt>KP_5</default> | ||
1626 | 233 | </option> | 233 | </option> |
1627 | 234 | <option name="toggle_window_maximized_button" type="button"> | 234 | <option name="toggle_window_maximized_button" type="button"> |
1628 | 235 | <_short>Toggle Window Maximized</_short> | 235 | <_short>Toggle Window Maximized</_short> |
1629 | @@ -254,7 +254,7 @@ | |||
1630 | 254 | <option name="hsize" type="int"> | 254 | <option name="hsize" type="int"> |
1631 | 255 | <_short>Horizontal Virtual Size</_short> | 255 | <_short>Horizontal Virtual Size</_short> |
1632 | 256 | <_long>Screen size multiplier for horizontal virtual size</_long> | 256 | <_long>Screen size multiplier for horizontal virtual size</_long> |
1634 | 257 | <default>4</default> | 257 | <default>1</default> |
1635 | 258 | <min>1</min> | 258 | <min>1</min> |
1636 | 259 | <max>32</max> | 259 | <max>32</max> |
1637 | 260 | </option> | 260 | </option> |
1638 | 261 | 261 | ||
1639 | === modified file 'plugins/animation/animation.xml.in' | |||
1640 | --- plugins/animation/animation.xml.in 2012-10-15 10:31:51 +0000 | |||
1641 | +++ plugins/animation/animation.xml.in 2015-10-15 15:29:59 +0000 | |||
1642 | @@ -36,7 +36,7 @@ | |||
1643 | 36 | <extensible/> | 36 | <extensible/> |
1644 | 37 | <sort start="2"/> | 37 | <sort start="2"/> |
1645 | 38 | <default> | 38 | <default> |
1647 | 39 | <value>animation:Zoom</value> | 39 | <value>animation:Glide 2</value> |
1648 | 40 | <value>animation:Fade</value> | 40 | <value>animation:Fade</value> |
1649 | 41 | <value>animation:Fade</value> | 41 | <value>animation:Fade</value> |
1650 | 42 | </default> | 42 | </default> |
1651 | @@ -48,9 +48,9 @@ | |||
1652 | 48 | <min>50</min> | 48 | <min>50</min> |
1653 | 49 | <max>4000</max> | 49 | <max>4000</max> |
1654 | 50 | <default> | 50 | <default> |
1658 | 51 | <value>200</value> | 51 | <value>120</value> |
1659 | 52 | <value>150</value> | 52 | <value>80</value> |
1660 | 53 | <value>150</value> | 53 | <value>80</value> |
1661 | 54 | </default> | 54 | </default> |
1662 | 55 | </option> | 55 | </option> |
1663 | 56 | <option name="open_matches" type="list"> | 56 | <option name="open_matches" type="list"> |
1664 | @@ -58,8 +58,8 @@ | |||
1665 | 58 | <_long>The windows that will be animated.</_long> | 58 | <_long>The windows that will be animated.</_long> |
1666 | 59 | <type>match</type> | 59 | <type>match</type> |
1667 | 60 | <default> | 60 | <default> |
1670 | 61 | <value>(type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)</value> | 61 | <value>((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)</value> |
1671 | 62 | <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value> | 62 | <value>((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))</value> |
1672 | 63 | <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value> | 63 | <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value> |
1673 | 64 | </default> | 64 | </default> |
1674 | 65 | </option> | 65 | </option> |
1675 | @@ -102,7 +102,7 @@ | |||
1676 | 102 | <extensible/> | 102 | <extensible/> |
1677 | 103 | <sort start="2"/> | 103 | <sort start="2"/> |
1678 | 104 | <default> | 104 | <default> |
1680 | 105 | <value>animation:Zoom</value> | 105 | <value>animation:Glide 2</value> |
1681 | 106 | <value>animation:Fade</value> | 106 | <value>animation:Fade</value> |
1682 | 107 | <value>animation:Fade</value> | 107 | <value>animation:Fade</value> |
1683 | 108 | </default> | 108 | </default> |
1684 | @@ -114,9 +114,9 @@ | |||
1685 | 114 | <min>50</min> | 114 | <min>50</min> |
1686 | 115 | <max>4000</max> | 115 | <max>4000</max> |
1687 | 116 | <default> | 116 | <default> |
1691 | 117 | <value>200</value> | 117 | <value>120</value> |
1692 | 118 | <value>150</value> | 118 | <value>80</value> |
1693 | 119 | <value>150</value> | 119 | <value>50</value> |
1694 | 120 | </default> | 120 | </default> |
1695 | 121 | </option> | 121 | </option> |
1696 | 122 | <option name="close_matches" type="list"> | 122 | <option name="close_matches" type="list"> |
1697 | @@ -124,8 +124,8 @@ | |||
1698 | 124 | <_long>The windows that will be animated.</_long> | 124 | <_long>The windows that will be animated.</_long> |
1699 | 125 | <type>match</type> | 125 | <type>match</type> |
1700 | 126 | <default> | 126 | <default> |
1703 | 127 | <value>(type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)</value> | 127 | <value>((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)</value> |
1704 | 128 | <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value> | 128 | <value>((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))</value> |
1705 | 129 | <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value> | 129 | <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value> |
1706 | 130 | </default> | 130 | </default> |
1707 | 131 | </option> | 131 | </option> |
1708 | @@ -168,7 +168,7 @@ | |||
1709 | 168 | <extensible/> | 168 | <extensible/> |
1710 | 169 | <sort start="2"/> | 169 | <sort start="2"/> |
1711 | 170 | <default> | 170 | <default> |
1713 | 171 | <value>animation:Magic Lamp</value> | 171 | <value>animation:Zoom</value> |
1714 | 172 | </default> | 172 | </default> |
1715 | 173 | </option> | 173 | </option> |
1716 | 174 | <option name="minimize_durations" type="list"> | 174 | <option name="minimize_durations" type="list"> |
1717 | @@ -178,7 +178,7 @@ | |||
1718 | 178 | <min>50</min> | 178 | <min>50</min> |
1719 | 179 | <max>4000</max> | 179 | <max>4000</max> |
1720 | 180 | <default> | 180 | <default> |
1722 | 181 | <value>300</value> | 181 | <value>220</value> |
1723 | 182 | </default> | 182 | </default> |
1724 | 183 | </option> | 183 | </option> |
1725 | 184 | <option name="minimize_matches" type="list"> | 184 | <option name="minimize_matches" type="list"> |
1726 | @@ -341,7 +341,7 @@ | |||
1727 | 341 | <extensible/> | 341 | <extensible/> |
1728 | 342 | <sort start="1"/> | 342 | <sort start="1"/> |
1729 | 343 | <default> | 343 | <default> |
1731 | 344 | <value>animation:None</value> | 344 | <value>animation:Fade</value> |
1732 | 345 | </default> | 345 | </default> |
1733 | 346 | </option> | 346 | </option> |
1734 | 347 | <option name="focus_durations" type="list"> | 347 | <option name="focus_durations" type="list"> |
1735 | @@ -351,7 +351,7 @@ | |||
1736 | 351 | <min>50</min> | 351 | <min>50</min> |
1737 | 352 | <max>4000</max> | 352 | <max>4000</max> |
1738 | 353 | <default> | 353 | <default> |
1740 | 354 | <value>300</value> | 354 | <value>150</value> |
1741 | 355 | </default> | 355 | </default> |
1742 | 356 | </option> | 356 | </option> |
1743 | 357 | <option name="focus_matches" type="list"> | 357 | <option name="focus_matches" type="list"> |
1744 | @@ -385,7 +385,7 @@ | |||
1745 | 385 | <option name="time_step" type="int"> | 385 | <option name="time_step" type="int"> |
1746 | 386 | <_short>Animation Time Step</_short> | 386 | <_short>Animation Time Step</_short> |
1747 | 387 | <_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.</_long> | 387 | <_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.</_long> |
1749 | 388 | <default>10</default> | 388 | <default>16</default> |
1750 | 389 | <min>1</min> | 389 | <min>1</min> |
1751 | 390 | <max>400</max> | 390 | <max>400</max> |
1752 | 391 | </option> | 391 | </option> |
1753 | @@ -473,7 +473,7 @@ | |||
1754 | 473 | <option name="glide2_away_position" type="float"> | 473 | <option name="glide2_away_position" type="float"> |
1755 | 474 | <_short>Away Position</_short> | 474 | <_short>Away Position</_short> |
1756 | 475 | <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long> | 475 | <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long> |
1758 | 476 | <default>-0.4</default> | 476 | <default>-0.1</default> |
1759 | 477 | <min>-2</min> | 477 | <min>-2</min> |
1760 | 478 | <max>1</max> | 478 | <max>1</max> |
1761 | 479 | <precision>0.05</precision> | 479 | <precision>0.05</precision> |
1762 | @@ -481,7 +481,7 @@ | |||
1763 | 481 | <option name="glide2_away_angle" type="float"> | 481 | <option name="glide2_away_angle" type="float"> |
1764 | 482 | <_short>Away Angle</_short> | 482 | <_short>Away Angle</_short> |
1765 | 483 | <_long>Angle of window at the end of the animation.</_long> | 483 | <_long>Angle of window at the end of the animation.</_long> |
1767 | 484 | <default>-45</default> | 484 | <default>0</default> |
1768 | 485 | <min>-540</min> | 485 | <min>-540</min> |
1769 | 486 | <max>540</max> | 486 | <max>540</max> |
1770 | 487 | <precision>5</precision> | 487 | <precision>5</precision> |
1771 | @@ -686,7 +686,7 @@ | |||
1772 | 686 | <option name="zoom_springiness" type="float"> | 686 | <option name="zoom_springiness" type="float"> |
1773 | 687 | <_short>Springiness</_short> | 687 | <_short>Springiness</_short> |
1774 | 688 | <_long>How spring-like the Zoom animation should be.</_long> | 688 | <_long>How spring-like the Zoom animation should be.</_long> |
1776 | 689 | <default>0.0</default> | 689 | <default>0.08</default> |
1777 | 690 | <min>0</min> | 690 | <min>0</min> |
1778 | 691 | <max>1</max> | 691 | <max>1</max> |
1779 | 692 | <precision>0.01</precision> | 692 | <precision>0.01</precision> |
1780 | 693 | 693 | ||
1781 | === modified file 'plugins/commands/commands.xml.in' | |||
1782 | --- plugins/commands/commands.xml.in 2012-10-15 10:31:51 +0000 | |||
1783 | +++ plugins/commands/commands.xml.in 2015-10-15 15:29:59 +0000 | |||
1784 | @@ -117,7 +117,7 @@ | |||
1785 | 117 | <option name="command20" type="string"> | 117 | <option name="command20" type="string"> |
1786 | 118 | <_short>Command line 20</_short> | 118 | <_short>Command line 20</_short> |
1787 | 119 | <_long>Command line to be executed in shell when run_command20 is invoked</_long> | 119 | <_long>Command line to be executed in shell when run_command20 is invoked</_long> |
1789 | 120 | <default></default> | 120 | <default>/usr/bin/gnome-system-monitor -p</default> |
1790 | 121 | </option> | 121 | </option> |
1791 | 122 | </group> | 122 | </group> |
1792 | 123 | <group> | 123 | <group> |
1793 | @@ -205,6 +205,7 @@ | |||
1794 | 205 | <option name="run_command20_key" type="key"> | 205 | <option name="run_command20_key" type="key"> |
1795 | 206 | <_short>Run command 20</_short> | 206 | <_short>Run command 20</_short> |
1796 | 207 | <_long>A keybinding that when invoked, will run the shell command identified by command20</_long> | 207 | <_long>A keybinding that when invoked, will run the shell command identified by command20</_long> |
1797 | 208 | <default><Control><Alt>Delete</default> | ||
1798 | 208 | </option> | 209 | </option> |
1799 | 209 | </group> | 210 | </group> |
1800 | 210 | <group> | 211 | <group> |
1801 | 211 | 212 | ||
1802 | === modified file 'plugins/decor/decor.xml.in' | |||
1803 | --- plugins/decor/decor.xml.in 2012-10-15 10:31:51 +0000 | |||
1804 | +++ plugins/decor/decor.xml.in 2015-10-15 15:29:59 +0000 | |||
1805 | @@ -31,7 +31,7 @@ | |||
1806 | 31 | <option name="active_shadow_opacity" type="float"> | 31 | <option name="active_shadow_opacity" type="float"> |
1807 | 32 | <_short>Shadow Opacity</_short> | 32 | <_short>Shadow Opacity</_short> |
1808 | 33 | <_long>Drop shadow opacity</_long> | 33 | <_long>Drop shadow opacity</_long> |
1810 | 34 | <default>0.5</default> | 34 | <default>0.8</default> |
1811 | 35 | <min>0.01</min> | 35 | <min>0.01</min> |
1812 | 36 | <max>6.0</max> | 36 | <max>6.0</max> |
1813 | 37 | <precision>0.01</precision> | 37 | <precision>0.01</precision> |
1814 | @@ -66,7 +66,7 @@ | |||
1815 | 66 | <option name="inactive_shadow_radius" type="float"> | 66 | <option name="inactive_shadow_radius" type="float"> |
1816 | 67 | <_short>Shadow Radius</_short> | 67 | <_short>Shadow Radius</_short> |
1817 | 68 | <_long>Drop shadow radius</_long> | 68 | <_long>Drop shadow radius</_long> |
1819 | 69 | <default>8.0</default> | 69 | <default>5.0</default> |
1820 | 70 | <min>0.1</min> | 70 | <min>0.1</min> |
1821 | 71 | <max>13.0</max> | 71 | <max>13.0</max> |
1822 | 72 | <precision>0.1</precision> | 72 | <precision>0.1</precision> |
1823 | @@ -74,7 +74,7 @@ | |||
1824 | 74 | <option name="inactive_shadow_opacity" type="float"> | 74 | <option name="inactive_shadow_opacity" type="float"> |
1825 | 75 | <_short>Shadow Opacity</_short> | 75 | <_short>Shadow Opacity</_short> |
1826 | 76 | <_long>Drop shadow opacity</_long> | 76 | <_long>Drop shadow opacity</_long> |
1828 | 77 | <default>0.5</default> | 77 | <default>0.4</default> |
1829 | 78 | <min>0.01</min> | 78 | <min>0.01</min> |
1830 | 79 | <max>6.0</max> | 79 | <max>6.0</max> |
1831 | 80 | <precision>0.01</precision> | 80 | <precision>0.01</precision> |
1832 | @@ -101,7 +101,7 @@ | |||
1833 | 101 | <option name="command" type="string"> | 101 | <option name="command" type="string"> |
1834 | 102 | <_short>Command</_short> | 102 | <_short>Command</_short> |
1835 | 103 | <_long>Decorator command line that is executed if no decorator is already running.</_long> | 103 | <_long>Decorator command line that is executed if no decorator is already running.</_long> |
1837 | 104 | <default>exec \"${COMPIZ_BIN_PATH}compiz-decorator\"</default> | 104 | <default>/usr/bin/gtk-window-decorator</default> |
1838 | 105 | </option> | 105 | </option> |
1839 | 106 | <option name="mipmap" type="bool"> | 106 | <option name="mipmap" type="bool"> |
1840 | 107 | <_short>Mipmap</_short> | 107 | <_short>Mipmap</_short> |
1841 | 108 | 108 | ||
1842 | === modified file 'plugins/expo/expo.xml.in' | |||
1843 | --- plugins/expo/expo.xml.in 2013-06-26 08:19:21 +0000 | |||
1844 | +++ plugins/expo/expo.xml.in 2015-10-15 15:29:59 +0000 | |||
1845 | @@ -17,6 +17,7 @@ | |||
1846 | 17 | <plugin>wobbly</plugin> | 17 | <plugin>wobbly</plugin> |
1847 | 18 | <plugin>animation</plugin> | 18 | <plugin>animation</plugin> |
1848 | 19 | <plugin>wallpaper</plugin> | 19 | <plugin>wallpaper</plugin> |
1849 | 20 | <plugin>imgpng</plugin> | ||
1850 | 20 | </relation> | 21 | </relation> |
1851 | 21 | </deps> | 22 | </deps> |
1852 | 22 | <options> | 23 | <options> |
1853 | @@ -25,7 +26,7 @@ | |||
1854 | 25 | <option name="expo_key" type="key"> | 26 | <option name="expo_key" type="key"> |
1855 | 26 | <_short>Expo Key</_short> | 27 | <_short>Expo Key</_short> |
1856 | 27 | <_long>Initiate or terminate Expo mode with this keyboard shortcut.</_long> | 28 | <_long>Initiate or terminate Expo mode with this keyboard shortcut.</_long> |
1858 | 28 | <default><Super>e</default> | 29 | <default><Super>s</default> |
1859 | 29 | </option> | 30 | </option> |
1860 | 30 | <option name="expo_button" type="button"> | 31 | <option name="expo_button" type="button"> |
1861 | 31 | <_short>Expo Button</_short> | 32 | <_short>Expo Button</_short> |
1862 | @@ -36,7 +37,6 @@ | |||
1863 | 36 | <_short>Expo Corner/Edge</_short> | 37 | <_short>Expo Corner/Edge</_short> |
1864 | 37 | <_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).</_long> | 38 | <_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).</_long> |
1865 | 38 | <default> | 39 | <default> |
1866 | 39 | <edge name="TopLeft"/> | ||
1867 | 40 | </default> | 40 | </default> |
1868 | 41 | </option> | 41 | </option> |
1869 | 42 | <option name="double_click_time" type="int"> | 42 | <option name="double_click_time" type="int"> |
1870 | @@ -80,7 +80,7 @@ | |||
1871 | 80 | <option name="zoom_time" type="float"> | 80 | <option name="zoom_time" type="float"> |
1872 | 81 | <_short>Animation Duration</_short> | 81 | <_short>Animation Duration</_short> |
1873 | 82 | <_long>Duration of the selected animation (in seconds).</_long> | 82 | <_long>Duration of the selected animation (in seconds).</_long> |
1875 | 83 | <default>0.5</default> | 83 | <default>0.3</default> |
1876 | 84 | <min>0.1</min> | 84 | <min>0.1</min> |
1877 | 85 | <max>5.0</max> | 85 | <max>5.0</max> |
1878 | 86 | <precision>0.1</precision> | 86 | <precision>0.1</precision> |
1879 | @@ -142,12 +142,12 @@ | |||
1880 | 142 | <option name="x_offset" type="int"> | 142 | <option name="x_offset" type="int"> |
1881 | 143 | <_short>X Offset</_short> | 143 | <_short>X Offset</_short> |
1882 | 144 | <_long>Horizontal offset (in pixels).</_long> | 144 | <_long>Horizontal offset (in pixels).</_long> |
1884 | 145 | <default>0</default> | 145 | <default>64</default> |
1885 | 146 | </option> | 146 | </option> |
1886 | 147 | <option name="y_offset" type="int"> | 147 | <option name="y_offset" type="int"> |
1887 | 148 | <_short>Y Offset</_short> | 148 | <_short>Y Offset</_short> |
1888 | 149 | <_long>Vertical offset (in pixels).</_long> | 149 | <_long>Vertical offset (in pixels).</_long> |
1890 | 150 | <default>0</default> | 150 | <default>24</default> |
1891 | 151 | </option> | 151 | </option> |
1892 | 152 | <option name="distance" type="float"> | 152 | <option name="distance" type="float"> |
1893 | 153 | <_short>Camera Distance</_short> | 153 | <_short>Camera Distance</_short> |
1894 | @@ -160,7 +160,7 @@ | |||
1895 | 160 | <option name="vp_distance" type="float"> | 160 | <option name="vp_distance" type="float"> |
1896 | 161 | <_short>Viewport Distance</_short> | 161 | <_short>Viewport Distance</_short> |
1897 | 162 | <_long>The distance between viewports in Expo mode.</_long> | 162 | <_long>The distance between viewports in Expo mode.</_long> |
1899 | 163 | <default>0.10</default> | 163 | <default>0.2</default> |
1900 | 164 | <min>0.0</min> | 164 | <min>0.0</min> |
1901 | 165 | <max>1.0</max> | 165 | <max>1.0</max> |
1902 | 166 | <precision>0.01</precision> | 166 | <precision>0.01</precision> |
1903 | @@ -188,7 +188,7 @@ | |||
1904 | 188 | <_long>How the Expo wall should be displayed, if multiple output devices are used.</_long> | 188 | <_long>How the Expo wall should be displayed, if multiple output devices are used.</_long> |
1905 | 189 | <min>0</min> | 189 | <min>0</min> |
1906 | 190 | <max>1</max> | 190 | <max>1</max> |
1908 | 191 | <default>0</default> | 191 | <default>1</default> |
1909 | 192 | <desc> | 192 | <desc> |
1910 | 193 | <value>0</value> | 193 | <value>0</value> |
1911 | 194 | <_name>One big wall</_name> | 194 | <_name>One big wall</_name> |
1912 | @@ -203,7 +203,7 @@ | |||
1913 | 203 | <option name="vp_brightness" type="float"> | 203 | <option name="vp_brightness" type="float"> |
1914 | 204 | <_short>Brightness</_short> | 204 | <_short>Brightness</_short> |
1915 | 205 | <_long>The brightness of unfocused viewports (in percent).</_long> | 205 | <_long>The brightness of unfocused viewports (in percent).</_long> |
1917 | 206 | <default>75.0</default> | 206 | <default>40.0</default> |
1918 | 207 | <min>0.0</min> | 207 | <min>0.0</min> |
1919 | 208 | <max>100.0</max> | 208 | <max>100.0</max> |
1920 | 209 | <precision>0.1</precision> | 209 | <precision>0.1</precision> |
1921 | @@ -223,7 +223,7 @@ | |||
1922 | 223 | <red>0xfbfb</red> | 223 | <red>0xfbfb</red> |
1923 | 224 | <green>0x8b8b</green> | 224 | <green>0x8b8b</green> |
1924 | 225 | <blue>0x0</blue> | 225 | <blue>0x0</blue> |
1926 | 226 | <alpha>0x0</alpha> | 226 | <alpha>0xffff</alpha> |
1927 | 227 | </default> | 227 | </default> |
1928 | 228 | </option> | 228 | </option> |
1929 | 229 | </subgroup> | 229 | </subgroup> |
1930 | @@ -232,7 +232,7 @@ | |||
1931 | 232 | <option name="reflection" type="bool"> | 232 | <option name="reflection" type="bool"> |
1932 | 233 | <_short>Reflection</_short> | 233 | <_short>Reflection</_short> |
1933 | 234 | <_long>Render a realtime reflection of the viewports on the ground.</_long> | 234 | <_long>Render a realtime reflection of the viewports on the ground.</_long> |
1935 | 235 | <default>true</default> | 235 | <default>false</default> |
1936 | 236 | </option> | 236 | </option> |
1937 | 237 | <option name="ground_color1" type="color"> | 237 | <option name="ground_color1" type="color"> |
1938 | 238 | <_short>Ground Color (near)</_short> | 238 | <_short>Ground Color (near)</_short> |
1939 | 239 | 239 | ||
1940 | === modified file 'plugins/ezoom/ezoom.xml.in' | |||
1941 | --- plugins/ezoom/ezoom.xml.in 2013-07-21 22:08:20 +0000 | |||
1942 | +++ plugins/ezoom/ezoom.xml.in 2015-10-15 15:29:59 +0000 | |||
1943 | @@ -30,7 +30,7 @@ | |||
1944 | 30 | <option type="button" name="zoom_in_button"> | 30 | <option type="button" name="zoom_in_button"> |
1945 | 31 | <_short>Zoom In Button</_short> | 31 | <_short>Zoom In Button</_short> |
1946 | 32 | <_long>Mouse button shortcut to invoke zooming in.</_long> | 32 | <_long>Mouse button shortcut to invoke zooming in.</_long> |
1948 | 33 | <default><Super>Button4</default> | 33 | <default></default> |
1949 | 34 | </option> | 34 | </option> |
1950 | 35 | <option type="key" name="zoom_in_key"> | 35 | <option type="key" name="zoom_in_key"> |
1951 | 36 | <_short>Zoom In Key</_short> | 36 | <_short>Zoom In Key</_short> |
1952 | @@ -39,7 +39,7 @@ | |||
1953 | 39 | <option type="button" name="zoom_out_button"> | 39 | <option type="button" name="zoom_out_button"> |
1954 | 40 | <_short>Zoom Out Button</_short> | 40 | <_short>Zoom Out Button</_short> |
1955 | 41 | <_long>Mouse button shortcut to invoke zooming out.</_long> | 41 | <_long>Mouse button shortcut to invoke zooming out.</_long> |
1957 | 42 | <default><Super>Button5</default> | 42 | <default></default> |
1958 | 43 | </option> | 43 | </option> |
1959 | 44 | <option type="key" name="zoom_out_key"> | 44 | <option type="key" name="zoom_out_key"> |
1960 | 45 | <_short>Zoom Out Key</_short> | 45 | <_short>Zoom Out Key</_short> |
1961 | @@ -48,7 +48,7 @@ | |||
1962 | 48 | <option type="button" name="zoom_box_button"> | 48 | <option type="button" name="zoom_box_button"> |
1963 | 49 | <_short>Invoke Zoom Box Button</_short> | 49 | <_short>Invoke Zoom Box Button</_short> |
1964 | 50 | <_long>Define a rectangle area and zoom into it.</_long> | 50 | <_long>Define a rectangle area and zoom into it.</_long> |
1966 | 51 | <default><Super>Button2</default> | 51 | <default></default> |
1967 | 52 | </option> | 52 | </option> |
1968 | 53 | <option name="zoom_box_outline_color" type="color"> | 53 | <option name="zoom_box_outline_color" type="color"> |
1969 | 54 | <_short>Zoom Box Outline Color</_short> | 54 | <_short>Zoom Box Outline Color</_short> |
1970 | @@ -162,7 +162,7 @@ | |||
1971 | 162 | <option type="key" name="fit_to_window_key"> | 162 | <option type="key" name="fit_to_window_key"> |
1972 | 163 | <_short>Fit zoomed area to window</_short> | 163 | <_short>Fit zoomed area to window</_short> |
1973 | 164 | <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long> | 164 | <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long> |
1975 | 165 | <default><Super>r</default> | 165 | <default></default> |
1976 | 166 | </option> | 166 | </option> |
1977 | 167 | </subgroup> | 167 | </subgroup> |
1978 | 168 | </group> | 168 | </group> |
1979 | 169 | 169 | ||
1980 | === modified file 'plugins/fade/fade.xml.in' | |||
1981 | --- plugins/fade/fade.xml.in 2012-10-15 10:31:51 +0000 | |||
1982 | +++ plugins/fade/fade.xml.in 2015-10-15 15:29:59 +0000 | |||
1983 | @@ -10,6 +10,7 @@ | |||
1984 | 10 | </requirement> | 10 | </requirement> |
1985 | 11 | <relation type="after"> | 11 | <relation type="after"> |
1986 | 12 | <plugin>decor</plugin> | 12 | <plugin>decor</plugin> |
1987 | 13 | <plugin>staticswitcher</plugin> | ||
1988 | 13 | </relation> | 14 | </relation> |
1989 | 14 | <relation type="before"> | 15 | <relation type="before"> |
1990 | 15 | <plugin>cube</plugin> | 16 | <plugin>cube</plugin> |
1991 | @@ -50,7 +51,7 @@ | |||
1992 | 50 | <option name="window_match" type="match"> | 51 | <option name="window_match" type="match"> |
1993 | 51 | <_short>Fade windows</_short> | 52 | <_short>Fade windows</_short> |
1994 | 52 | <_long>Windows that should be fading</_long> | 53 | <_long>Windows that should be fading</_long> |
1996 | 53 | <default>any</default> | 54 | <default>any & !(title=notify-osd)</default> |
1997 | 54 | </option> | 55 | </option> |
1998 | 55 | <option name="visual_bell" type="bell"> | 56 | <option name="visual_bell" type="bell"> |
1999 | 56 | <_short>Visual Bell</_short> | 57 | <_short>Visual Bell</_short> |
2000 | 57 | 58 | ||
2001 | === modified file 'plugins/gnomecompat/gnomecompat.xml.in' | |||
2002 | --- plugins/gnomecompat/gnomecompat.xml.in 2014-03-11 13:46:30 +0000 | |||
2003 | +++ plugins/gnomecompat/gnomecompat.xml.in 2015-10-15 15:29:59 +0000 | |||
2004 | @@ -54,6 +54,7 @@ | |||
2005 | 54 | <option name="run_command_terminal_key" type="key"> | 54 | <option name="run_command_terminal_key" type="key"> |
2006 | 55 | <_short>Open a terminal</_short> | 55 | <_short>Open a terminal</_short> |
2007 | 56 | <_long>Open a terminal</_long> | 56 | <_long>Open a terminal</_long> |
2008 | 57 | <default><Control><Alt>T</default> | ||
2009 | 57 | </option> | 58 | </option> |
2010 | 58 | </group> | 59 | </group> |
2011 | 59 | </options> | 60 | </options> |
2012 | 60 | 61 | ||
2013 | === modified file 'plugins/grid/grid.xml.in' | |||
2014 | --- plugins/grid/grid.xml.in 2013-12-04 19:21:12 +0000 | |||
2015 | +++ plugins/grid/grid.xml.in 2015-10-15 15:29:59 +0000 | |||
2016 | @@ -68,12 +68,12 @@ | |||
2017 | 68 | <option name="put_maximize_key" type="key"> | 68 | <option name="put_maximize_key" type="key"> |
2018 | 69 | <_short>Maximize Key</_short> | 69 | <_short>Maximize Key</_short> |
2019 | 70 | <_long>Maximize window.</_long> | 70 | <_long>Maximize window.</_long> |
2021 | 71 | <default><Control><Alt>KP_0</default> | 71 | <default><Control><Super>Up</default> |
2022 | 72 | </option> | 72 | </option> |
2023 | 73 | <option name="put_restore_key" type="key"> | 73 | <option name="put_restore_key" type="key"> |
2024 | 74 | <_short>Restore</_short> | 74 | <_short>Restore</_short> |
2025 | 75 | <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long> | 75 | <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long> |
2027 | 76 | <default><Alt>F5</default> | 76 | <default><Control><Super>Down</default> |
2028 | 77 | </option> | 77 | </option> |
2029 | 78 | <option name="left_maximize" type="key"> | 78 | <option name="left_maximize" type="key"> |
2030 | 79 | <_short>Left Maximize</_short> | 79 | <_short>Left Maximize</_short> |
2031 | 80 | 80 | ||
2032 | === modified file 'plugins/resize/resize.xml.in' | |||
2033 | --- plugins/resize/resize.xml.in 2012-10-15 10:31:51 +0000 | |||
2034 | +++ plugins/resize/resize.xml.in 2015-10-15 15:29:59 +0000 | |||
2035 | @@ -56,15 +56,15 @@ | |||
2036 | 56 | <option name="maximize_vertically" type="bool"> | 56 | <option name="maximize_vertically" type="bool"> |
2037 | 57 | <short>Maximize Vertically if screen edge hit</short> | 57 | <short>Maximize Vertically if screen edge hit</short> |
2038 | 58 | <long>Maximizes the window vertically if the top or bottom screen edge is hit while resizing</long> | 58 | <long>Maximizes the window vertically if the top or bottom screen edge is hit while resizing</long> |
2040 | 59 | <default>false</default> | 59 | <default>true</default> |
2041 | 60 | </option> | 60 | </option> |
2042 | 61 | <option name="border_color" type="color"> | 61 | <option name="border_color" type="color"> |
2043 | 62 | <_short>Border Color</_short> | 62 | <_short>Border Color</_short> |
2044 | 63 | <_long>Border color used for outline and rectangle resize modes</_long> | 63 | <_long>Border color used for outline and rectangle resize modes</_long> |
2045 | 64 | <default> | 64 | <default> |
2049 | 65 | <red>0x2f2f</red> | 65 | <red>0xfbfb</red> |
2050 | 66 | <green>0x2f2f</green> | 66 | <green>0x8b8b</green> |
2051 | 67 | <blue>0x4f4f</blue> | 67 | <blue>0x0</blue> |
2052 | 68 | <alpha>0x9f9f</alpha> | 68 | <alpha>0x9f9f</alpha> |
2053 | 69 | </default> | 69 | </default> |
2054 | 70 | </option> | 70 | </option> |
2055 | @@ -72,10 +72,10 @@ | |||
2056 | 72 | <_short>Fill Color</_short> | 72 | <_short>Fill Color</_short> |
2057 | 73 | <_long>Fill color used for rectangle resize mode</_long> | 73 | <_long>Fill color used for rectangle resize mode</_long> |
2058 | 74 | <default> | 74 | <default> |
2063 | 75 | <red>0x2f2f</red> | 75 | <red>0xfbfb</red> |
2064 | 76 | <green>0x2f2f</green> | 76 | <green>0x8b8b</green> |
2065 | 77 | <blue>0x4f4f</blue> | 77 | <blue>0x0</blue> |
2066 | 78 | <alpha>0x4f4f</alpha> | 78 | <alpha>0x1919</alpha> |
2067 | 79 | </default> | 79 | </default> |
2068 | 80 | </option> | 80 | </option> |
2069 | 81 | <subgroup> | 81 | <subgroup> |
2070 | 82 | 82 | ||
2071 | === modified file 'plugins/scale/scale.xml.in' | |||
2072 | --- plugins/scale/scale.xml.in 2014-04-17 14:39:37 +0000 | |||
2073 | +++ plugins/scale/scale.xml.in 2015-10-15 15:29:59 +0000 | |||
2074 | @@ -21,7 +21,7 @@ | |||
2075 | 21 | <option name="spacing" type="int"> | 21 | <option name="spacing" type="int"> |
2076 | 22 | <_short>Spacing</_short> | 22 | <_short>Spacing</_short> |
2077 | 23 | <_long>Space between windows</_long> | 23 | <_long>Space between windows</_long> |
2079 | 24 | <default>10</default> | 24 | <default>20</default> |
2080 | 25 | <min>0</min> | 25 | <min>0</min> |
2081 | 26 | <max>250</max> | 26 | <max>250</max> |
2082 | 27 | </option> | 27 | </option> |
2083 | @@ -40,7 +40,7 @@ | |||
2084 | 40 | <option name="speed" type="float"> | 40 | <option name="speed" type="float"> |
2085 | 41 | <_short>Speed</_short> | 41 | <_short>Speed</_short> |
2086 | 42 | <_long>Scale speed</_long> | 42 | <_long>Scale speed</_long> |
2088 | 43 | <default>1.5</default> | 43 | <default>5.0</default> |
2089 | 44 | <min>0.1</min> | 44 | <min>0.1</min> |
2090 | 45 | <max>50</max> | 45 | <max>50</max> |
2091 | 46 | <precision>0.1</precision> | 46 | <precision>0.1</precision> |
2092 | @@ -48,7 +48,7 @@ | |||
2093 | 48 | <option name="timestep" type="float"> | 48 | <option name="timestep" type="float"> |
2094 | 49 | <_short>Timestep</_short> | 49 | <_short>Timestep</_short> |
2095 | 50 | <_long>Scale timestep</_long> | 50 | <_long>Scale timestep</_long> |
2097 | 51 | <default>1.2</default> | 51 | <default>0.1</default> |
2098 | 52 | <min>0.1</min> | 52 | <min>0.1</min> |
2099 | 53 | <max>50</max> | 53 | <max>50</max> |
2100 | 54 | <precision>0.1</precision> | 54 | <precision>0.1</precision> |
2101 | @@ -61,7 +61,7 @@ | |||
2102 | 61 | <option name="opacity" type="int"> | 61 | <option name="opacity" type="int"> |
2103 | 62 | <_short>Opacity</_short> | 62 | <_short>Opacity</_short> |
2104 | 63 | <_long>Amount of opacity in percent</_long> | 63 | <_long>Amount of opacity in percent</_long> |
2106 | 64 | <default>75</default> | 64 | <default>100</default> |
2107 | 65 | <min>0</min> | 65 | <min>0</min> |
2108 | 66 | <max>100</max> | 66 | <max>100</max> |
2109 | 67 | </option> | 67 | </option> |
2110 | @@ -70,7 +70,7 @@ | |||
2111 | 70 | <_long>Overlay an icon on windows once they are scaled</_long> | 70 | <_long>Overlay an icon on windows once they are scaled</_long> |
2112 | 71 | <min>0</min> | 71 | <min>0</min> |
2113 | 72 | <max>2</max> | 72 | <max>2</max> |
2115 | 73 | <default>1</default> | 73 | <default>0</default> |
2116 | 74 | <desc> | 74 | <desc> |
2117 | 75 | <value>0</value> | 75 | <value>0</value> |
2118 | 76 | <_name>None</_name> | 76 | <_name>None</_name> |
2119 | @@ -123,7 +123,7 @@ | |||
2120 | 123 | <_long>Selects where windows are scaled if multiple output devices are used.</_long> | 123 | <_long>Selects where windows are scaled if multiple output devices are used.</_long> |
2121 | 124 | <min>0</min> | 124 | <min>0</min> |
2122 | 125 | <max>1</max> | 125 | <max>1</max> |
2124 | 126 | <default>0</default> | 126 | <default>1</default> |
2125 | 127 | <desc> | 127 | <desc> |
2126 | 128 | <value>0</value> | 128 | <value>0</value> |
2127 | 129 | <_name>On current output device</_name> | 129 | <_name>On current output device</_name> |
2128 | @@ -139,7 +139,7 @@ | |||
2129 | 139 | <option name="key_bindings_toggle" type="bool"> | 139 | <option name="key_bindings_toggle" type="bool"> |
2130 | 140 | <_short>Key Bindings Toggle Scale Mode</_short> | 140 | <_short>Key Bindings Toggle Scale Mode</_short> |
2131 | 141 | <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long> | 141 | <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long> |
2133 | 142 | <default>false</default> | 142 | <default>true</default> |
2134 | 143 | </option> | 143 | </option> |
2135 | 144 | <option name="button_bindings_toggle" type="bool"> | 144 | <option name="button_bindings_toggle" type="bool"> |
2136 | 145 | <_short>Button Bindings Toggle Scale Mode</_short> | 145 | <_short>Button Bindings Toggle Scale Mode</_short> |
2137 | @@ -149,15 +149,12 @@ | |||
2138 | 149 | <option name="initiate_edge" type="edge"> | 149 | <option name="initiate_edge" type="edge"> |
2139 | 150 | <_short>Initiate Window Picker</_short> | 150 | <_short>Initiate Window Picker</_short> |
2140 | 151 | <_long>Layout and start transforming windows</_long> | 151 | <_long>Layout and start transforming windows</_long> |
2141 | 152 | <default> | ||
2142 | 153 | <edge name="TopRight"/> | ||
2143 | 154 | </default> | ||
2144 | 155 | <allowed edgednd="true"/> | 152 | <allowed edgednd="true"/> |
2145 | 156 | </option> | 153 | </option> |
2146 | 157 | <option name="initiate_key" type="key"> | 154 | <option name="initiate_key" type="key"> |
2147 | 158 | <_short>Initiate Window Picker</_short> | 155 | <_short>Initiate Window Picker</_short> |
2148 | 159 | <_long>Layout and start transforming windows</_long> | 156 | <_long>Layout and start transforming windows</_long> |
2150 | 160 | <default><Shift><Alt>Up</default> | 157 | <default><Super>w</default> |
2151 | 161 | </option> | 158 | </option> |
2152 | 162 | <option name="initiate_button" type="button"> | 159 | <option name="initiate_button" type="button"> |
2153 | 163 | <_short>Initiate Window Picker</_short> | 160 | <_short>Initiate Window Picker</_short> |
2154 | @@ -175,6 +172,7 @@ | |||
2155 | 175 | <option name="initiate_all_key" type="key"> | 172 | <option name="initiate_all_key" type="key"> |
2156 | 176 | <_short>Initiate Window Picker For All Windows</_short> | 173 | <_short>Initiate Window Picker For All Windows</_short> |
2157 | 177 | <_long>Layout and start transforming all windows</_long> | 174 | <_long>Layout and start transforming all windows</_long> |
2158 | 175 | <default><Super><Shift>w</default> | ||
2159 | 178 | </option> | 176 | </option> |
2160 | 179 | <option name="initiate_group_edge" type="edge"> | 177 | <option name="initiate_group_edge" type="edge"> |
2161 | 180 | <_short>Initiate Window Picker For Window Group</_short> | 178 | <_short>Initiate Window Picker For Window Group</_short> |
2162 | 181 | 179 | ||
2163 | === modified file 'plugins/staticswitcher/staticswitcher.xml.in' | |||
2164 | --- plugins/staticswitcher/staticswitcher.xml.in 2015-08-22 21:46:01 +0000 | |||
2165 | +++ plugins/staticswitcher/staticswitcher.xml.in 2015-10-15 15:29:59 +0000 | |||
2166 | @@ -11,7 +11,6 @@ | |||
2167 | 11 | <relation type="after"> | 11 | <relation type="after"> |
2168 | 12 | <plugin>composite</plugin> | 12 | <plugin>composite</plugin> |
2169 | 13 | <plugin>opengl</plugin> | 13 | <plugin>opengl</plugin> |
2170 | 14 | <plugin>fade</plugin> | ||
2171 | 15 | <plugin>compiztoolbox</plugin> | 14 | <plugin>compiztoolbox</plugin> |
2172 | 16 | <plugin>decor</plugin> | 15 | <plugin>decor</plugin> |
2173 | 17 | </relation> | 16 | </relation> |
2174 | @@ -140,12 +139,12 @@ | |||
2175 | 140 | <option name="auto_change_vp" type="bool"> | 139 | <option name="auto_change_vp" type="bool"> |
2176 | 141 | <_short>Auto Change Viewport</_short> | 140 | <_short>Auto Change Viewport</_short> |
2177 | 142 | <_long>Change to the viewport of the selected window while switching</_long> | 141 | <_long>Change to the viewport of the selected window while switching</_long> |
2179 | 143 | <default>false</default> | 142 | <default>true</default> |
2180 | 144 | </option> | 143 | </option> |
2181 | 145 | <option name="popup_delay" type="float"> | 144 | <option name="popup_delay" type="float"> |
2182 | 146 | <_short>Popup Window Delay</_short> | 145 | <_short>Popup Window Delay</_short> |
2183 | 147 | <_long>Time (in s) the popup window should be delayed before appearing</_long> | 146 | <_long>Time (in s) the popup window should be delayed before appearing</_long> |
2185 | 148 | <default>0.0</default> | 147 | <default>0.2</default> |
2186 | 149 | <min>0.0</min> | 148 | <min>0.0</min> |
2187 | 150 | <max>2.0</max> | 149 | <max>2.0</max> |
2188 | 151 | <precision>0.05</precision> | 150 | <precision>0.05</precision> |
2189 | @@ -153,7 +152,7 @@ | |||
2190 | 153 | <option name="mouse_select" type="bool"> | 152 | <option name="mouse_select" type="bool"> |
2191 | 154 | <_short>Allow Mouse Selection</_short> | 153 | <_short>Allow Mouse Selection</_short> |
2192 | 155 | <_long>Allow selection of windows from the switcher window with the mouse</_long> | 154 | <_long>Allow selection of windows from the switcher window with the mouse</_long> |
2194 | 156 | <default>false</default> | 155 | <default>true</default> |
2195 | 157 | </option> | 156 | </option> |
2196 | 158 | </group> | 157 | </group> |
2197 | 159 | <group> | 158 | <group> |
2198 | @@ -161,14 +160,14 @@ | |||
2199 | 161 | <option name="saturation" type="int"> | 160 | <option name="saturation" type="int"> |
2200 | 162 | <_short>Saturation</_short> | 161 | <_short>Saturation</_short> |
2201 | 163 | <_long>Amount of saturation in percent</_long> | 162 | <_long>Amount of saturation in percent</_long> |
2203 | 164 | <default>50</default> | 163 | <default>100</default> |
2204 | 165 | <min>0</min> | 164 | <min>0</min> |
2205 | 166 | <max>100</max> | 165 | <max>100</max> |
2206 | 167 | </option> | 166 | </option> |
2207 | 168 | <option name="brightness" type="int"> | 167 | <option name="brightness" type="int"> |
2208 | 169 | <_short>Brightness</_short> | 168 | <_short>Brightness</_short> |
2209 | 170 | <_long>Amount of brightness in percent</_long> | 169 | <_long>Amount of brightness in percent</_long> |
2211 | 171 | <default>50</default> | 170 | <default>100</default> |
2212 | 172 | <min>0</min> | 171 | <min>0</min> |
2213 | 173 | <max>100</max> | 172 | <max>100</max> |
2214 | 174 | </option> | 173 | </option> |
2215 | @@ -192,7 +191,7 @@ | |||
2216 | 192 | <option name="mipmap" type="bool"> | 191 | <option name="mipmap" type="bool"> |
2217 | 193 | <_short>Mipmap</_short> | 192 | <_short>Mipmap</_short> |
2218 | 194 | <_long>Generate mipmaps when possible for higher quality scaling</_long> | 193 | <_long>Generate mipmaps when possible for higher quality scaling</_long> |
2220 | 195 | <default>true</default> | 194 | <default>false</default> |
2221 | 196 | </option> | 195 | </option> |
2222 | 197 | <option name="row_align" type="int"> | 196 | <option name="row_align" type="int"> |
2223 | 198 | <_short>Row Alignment</_short> | 197 | <_short>Row Alignment</_short> |
2224 | @@ -221,7 +220,7 @@ | |||
2225 | 221 | <option name="bring_to_front" type="bool"> | 220 | <option name="bring_to_front" type="bool"> |
2226 | 222 | <_short>Bring To Front</_short> | 221 | <_short>Bring To Front</_short> |
2227 | 223 | <_long>Bring selected window to front</_long> | 222 | <_long>Bring selected window to front</_long> |
2229 | 224 | <default>true</default> | 223 | <default>false</default> |
2230 | 225 | </option> | 224 | </option> |
2231 | 226 | <_short>Selected Window Highlight</_short> | 225 | <_short>Selected Window Highlight</_short> |
2232 | 227 | <option name="highlight_mode" type="int"> | 226 | <option name="highlight_mode" type="int"> |
2233 | @@ -229,7 +228,7 @@ | |||
2234 | 229 | <_long>Mode for highlighting the currently selected window</_long> | 228 | <_long>Mode for highlighting the currently selected window</_long> |
2235 | 230 | <min>0</min> | 229 | <min>0</min> |
2236 | 231 | <max>2</max> | 230 | <max>2</max> |
2238 | 232 | <default>1</default> | 231 | <default>0</default> |
2239 | 233 | <desc> | 232 | <desc> |
2240 | 234 | <value>0</value> | 233 | <value>0</value> |
2241 | 235 | <_name>None</_name> | 234 | <_name>None</_name> |
2242 | 236 | 235 | ||
2243 | === modified file 'plugins/vpswitch/vpswitch.xml.in' | |||
2244 | --- plugins/vpswitch/vpswitch.xml.in 2012-10-15 10:31:51 +0000 | |||
2245 | +++ plugins/vpswitch/vpswitch.xml.in 2015-10-15 15:29:59 +0000 | |||
2246 | @@ -95,13 +95,11 @@ | |||
2247 | 95 | <option name="next_button" type="button"> | 95 | <option name="next_button" type="button"> |
2248 | 96 | <_short>Move Next</_short> | 96 | <_short>Move Next</_short> |
2249 | 97 | <_long>Move to the next viewport</_long> | 97 | <_long>Move to the next viewport</_long> |
2250 | 98 | <default>Button5</default> | ||
2251 | 99 | <internal/> | 98 | <internal/> |
2252 | 100 | </option> | 99 | </option> |
2253 | 101 | <option name="prev_button" type="button"> | 100 | <option name="prev_button" type="button"> |
2254 | 102 | <_short>Move Prev</_short> | 101 | <_short>Move Prev</_short> |
2255 | 103 | <_long>Move to the previous viewport</_long> | 102 | <_long>Move to the previous viewport</_long> |
2256 | 104 | <default>Button4</default> | ||
2257 | 105 | <internal/> | 103 | <internal/> |
2258 | 106 | </option> | 104 | </option> |
2259 | 107 | <option name="initiate_button" type="button"> | 105 | <option name="initiate_button" type="button"> |
2260 | 108 | 106 | ||
2261 | === modified file 'plugins/wall/wall.xml.in' | |||
2262 | --- plugins/wall/wall.xml.in 2013-08-28 12:18:22 +0000 | |||
2263 | +++ plugins/wall/wall.xml.in 2015-10-15 15:29:59 +0000 | |||
2264 | @@ -30,12 +30,12 @@ | |||
2265 | 30 | <option name="miniscreen" type="bool"> | 30 | <option name="miniscreen" type="bool"> |
2266 | 31 | <_short>Show Live Viewport Previews</_short> | 31 | <_short>Show Live Viewport Previews</_short> |
2267 | 32 | <_long>Show live viewport previews in switcher window</_long> | 32 | <_long>Show live viewport previews in switcher window</_long> |
2269 | 33 | <default>false</default> | 33 | <default>true</default> |
2270 | 34 | </option> | 34 | </option> |
2271 | 35 | <option name="preview_timeout" type="float"> | 35 | <option name="preview_timeout" type="float"> |
2272 | 36 | <_short>Switch Target Preview Visibility Time</_short> | 36 | <_short>Switch Target Preview Visibility Time</_short> |
2273 | 37 | <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long> | 37 | <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long> |
2275 | 38 | <default>0.4</default> | 38 | <default>0.2</default> |
2276 | 39 | <min>0.0</min> | 39 | <min>0.0</min> |
2277 | 40 | <max>2.0</max> | 40 | <max>2.0</max> |
2278 | 41 | <precision>0.05</precision> | 41 | <precision>0.05</precision> |
2279 | @@ -43,7 +43,7 @@ | |||
2280 | 43 | <option name="preview_scale" type="int"> | 43 | <option name="preview_scale" type="int"> |
2281 | 44 | <_short>Preview Scale</_short> | 44 | <_short>Preview Scale</_short> |
2282 | 45 | <_long>Size of the preview in %</_long> | 45 | <_long>Size of the preview in %</_long> |
2284 | 46 | <default>100</default> | 46 | <default>130</default> |
2285 | 47 | <min>0</min> | 47 | <min>0</min> |
2286 | 48 | <max>400</max> | 48 | <max>400</max> |
2287 | 49 | </option> | 49 | </option> |
2288 | @@ -57,7 +57,7 @@ | |||
2289 | 57 | <option name="border_width" type="int"> | 57 | <option name="border_width" type="int"> |
2290 | 58 | <_short>Border Width</_short> | 58 | <_short>Border Width</_short> |
2291 | 59 | <_long>Width of the border between the previews</_long> | 59 | <_long>Width of the border between the previews</_long> |
2293 | 60 | <default>10</default> | 60 | <default>7</default> |
2294 | 61 | <min>0</min> | 61 | <min>0</min> |
2295 | 62 | <max>30</max> | 62 | <max>30</max> |
2296 | 63 | </option> | 63 | </option> |
2297 | @@ -65,10 +65,10 @@ | |||
2298 | 65 | <_short>Outline Color</_short> | 65 | <_short>Outline Color</_short> |
2299 | 66 | <_long>Outline color of the switcher window.</_long> | 66 | <_long>Outline color of the switcher window.</_long> |
2300 | 67 | <default> | 67 | <default> |
2305 | 68 | <red>0x3333</red> | 68 | <red>0xffff</red> |
2306 | 69 | <green>0x3333</green> | 69 | <green>0xffff</green> |
2307 | 70 | <blue>0x3333</blue> | 70 | <blue>0xffff</blue> |
2308 | 71 | <alpha>0xd998</alpha> | 71 | <alpha>0x3232</alpha> |
2309 | 72 | </default> | 72 | </default> |
2310 | 73 | </option> | 73 | </option> |
2311 | 74 | <subgroup> | 74 | <subgroup> |
2312 | @@ -78,30 +78,30 @@ | |||
2313 | 78 | <_short>Base Color</_short> | 78 | <_short>Base Color</_short> |
2314 | 79 | <_long>First color for the background gradient of the switcher window.</_long> | 79 | <_long>First color for the background gradient of the switcher window.</_long> |
2315 | 80 | <default> | 80 | <default> |
2320 | 81 | <red>0xcccc</red> | 81 | <red>0x0000</red> |
2321 | 82 | <green>0xcccc</green> | 82 | <green>0x0000</green> |
2322 | 83 | <blue>0xe665</blue> | 83 | <blue>0x0000</blue> |
2323 | 84 | <alpha>0xd998</alpha> | 84 | <alpha>0x6464</alpha> |
2324 | 85 | </default> | 85 | </default> |
2325 | 86 | </option> | 86 | </option> |
2326 | 87 | <option name="background_gradient_highlight_color" type="color"> | 87 | <option name="background_gradient_highlight_color" type="color"> |
2327 | 88 | <_short>Highlight Color</_short> | 88 | <_short>Highlight Color</_short> |
2328 | 89 | <_long>Second color for the background gradient of the switcher window.</_long> | 89 | <_long>Second color for the background gradient of the switcher window.</_long> |
2329 | 90 | <default> | 90 | <default> |
2334 | 91 | <red>0xf332</red> | 91 | <red>0x0000</red> |
2335 | 92 | <green>0xf332</green> | 92 | <green>0x0000</green> |
2336 | 93 | <blue>0xffff</blue> | 93 | <blue>0x0000</blue> |
2337 | 94 | <alpha>0xd998</alpha> | 94 | <alpha>0x6464</alpha> |
2338 | 95 | </default> | 95 | </default> |
2339 | 96 | </option> | 96 | </option> |
2340 | 97 | <option name="background_gradient_shadow_color" type="color"> | 97 | <option name="background_gradient_shadow_color" type="color"> |
2341 | 98 | <_short>Shadow Color</_short> | 98 | <_short>Shadow Color</_short> |
2342 | 99 | <_long>Third color for the background gradient of the switcher window.</_long> | 99 | <_long>Third color for the background gradient of the switcher window.</_long> |
2343 | 100 | <default> | 100 | <default> |
2348 | 101 | <red>0xf332</red> | 101 | <red>0x0000</red> |
2349 | 102 | <green>0xf332</green> | 102 | <green>0x0000</green> |
2350 | 103 | <blue>0xffff</blue> | 103 | <blue>0x0000</blue> |
2351 | 104 | <alpha>0xd998</alpha> | 104 | <alpha>0x6464</alpha> |
2352 | 105 | </default> | 105 | </default> |
2353 | 106 | </option> | 106 | </option> |
2354 | 107 | </subgroup> | 107 | </subgroup> |
2355 | @@ -112,20 +112,20 @@ | |||
2356 | 112 | <_short>Base Color</_short> | 112 | <_short>Base Color</_short> |
2357 | 113 | <_long>First color for the thumb gradient of the switcher window.</_long> | 113 | <_long>First color for the thumb gradient of the switcher window.</_long> |
2358 | 114 | <default> | 114 | <default> |
2363 | 115 | <red>0x3333</red> | 115 | <red>0x5555</red> |
2364 | 116 | <green>0x3333</green> | 116 | <green>0x5555</green> |
2365 | 117 | <blue>0x3333</blue> | 117 | <blue>0x5555</blue> |
2366 | 118 | <alpha>0x5999</alpha> | 118 | <alpha>0x3232</alpha> |
2367 | 119 | </default> | 119 | </default> |
2368 | 120 | </option> | 120 | </option> |
2369 | 121 | <option name="thumb_gradient_highlight_color" type="color"> | 121 | <option name="thumb_gradient_highlight_color" type="color"> |
2370 | 122 | <_short>Highlight Color</_short> | 122 | <_short>Highlight Color</_short> |
2371 | 123 | <_long>Second color for the thumb gradient of the switcher window.</_long> | 123 | <_long>Second color for the thumb gradient of the switcher window.</_long> |
2372 | 124 | <default> | 124 | <default> |
2377 | 125 | <red>0x3fff</red> | 125 | <red>0x5555</red> |
2378 | 126 | <green>0x3fff</green> | 126 | <green>0x5555</green> |
2379 | 127 | <blue>0x3fff</blue> | 127 | <blue>0x5555</blue> |
2380 | 128 | <alpha>0x3fff</alpha> | 128 | <alpha>0x3232</alpha> |
2381 | 129 | </default> | 129 | </default> |
2382 | 130 | </option> | 130 | </option> |
2383 | 131 | </subgroup> | 131 | </subgroup> |
2384 | @@ -139,7 +139,7 @@ | |||
2385 | 139 | <red>0xffff</red> | 139 | <red>0xffff</red> |
2386 | 140 | <green>0xffff</green> | 140 | <green>0xffff</green> |
2387 | 141 | <blue>0xffff</blue> | 141 | <blue>0xffff</blue> |
2389 | 142 | <alpha>0xf332</alpha> | 142 | <alpha>0xffff</alpha> |
2390 | 143 | </default> | 143 | </default> |
2391 | 144 | </option> | 144 | </option> |
2392 | 145 | <option name="thumb_highlight_gradient_shadow_color" type="color"> | 145 | <option name="thumb_highlight_gradient_shadow_color" type="color"> |
2393 | @@ -149,7 +149,7 @@ | |||
2394 | 149 | <red>0xdfff</red> | 149 | <red>0xdfff</red> |
2395 | 150 | <green>0xdfff</green> | 150 | <green>0xdfff</green> |
2396 | 151 | <blue>0xdfff</blue> | 151 | <blue>0xdfff</blue> |
2398 | 152 | <alpha>0xa665</alpha> | 152 | <alpha>0xffff</alpha> |
2399 | 153 | </default> | 153 | </default> |
2400 | 154 | </option> | 154 | </option> |
2401 | 155 | </subgroup> | 155 | </subgroup> |
2402 | @@ -201,7 +201,7 @@ | |||
2403 | 201 | <option name="auto_switch_vp_and_window" type="bool"> | 201 | <option name="auto_switch_vp_and_window" type="bool"> |
2404 | 202 | <_short>Auto Switch Vp And Window</_short> | 202 | <_short>Auto Switch Vp And Window</_short> |
2405 | 203 | <_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport</_long> | 203 | <_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport</_long> |
2407 | 204 | <default>true</default> | 204 | <default>false</default> |
2408 | 205 | </option> | 205 | </option> |
2409 | 206 | </group> | 206 | </group> |
2410 | 207 | <group> | 207 | <group> |
2411 | @@ -356,7 +356,7 @@ | |||
2412 | 356 | <option name="edgeflip_move" type="bool"> | 356 | <option name="edgeflip_move" type="bool"> |
2413 | 357 | <_short>Edge Flip Move</_short> | 357 | <_short>Edge Flip Move</_short> |
2414 | 358 | <_long>Flip viewport when moving a window to a screen edge</_long> | 358 | <_long>Flip viewport when moving a window to a screen edge</_long> |
2416 | 359 | <default>true</default> | 359 | <default>false</default> |
2417 | 360 | </option> | 360 | </option> |
2418 | 361 | <option name="edgeflip_dnd" type="bool"> | 361 | <option name="edgeflip_dnd" type="bool"> |
2419 | 362 | <_short>Edge Flip DnD</_short> | 362 | <_short>Edge Flip DnD</_short> |
2420 | 363 | 363 | ||
2421 | === modified file 'src/plugin.cpp' | |||
2422 | --- src/plugin.cpp 2015-01-13 19:22:25 +0000 | |||
2423 | +++ src/plugin.cpp 2015-10-15 15:29:59 +0000 | |||
2424 | @@ -132,6 +132,60 @@ | |||
2425 | 132 | } | 132 | } |
2426 | 133 | 133 | ||
2427 | 134 | static bool | 134 | static bool |
2428 | 135 | setOpenGLPluginEnvironment () | ||
2429 | 136 | { | ||
2430 | 137 | /* | ||
2431 | 138 | * Check if the hardware is adequate for Unity and if not, use LLVMpipe. | ||
2432 | 139 | * Unfortunately the design of Mesa requires that this be done before | ||
2433 | 140 | * libGL is loaded, which means before the opengl plugin is loaded. | ||
2434 | 141 | */ | ||
2435 | 142 | bool toggledLLVM = false; | ||
2436 | 143 | |||
2437 | 144 | if (!getenv ("LIBGL_ALWAYS_SOFTWARE")) | ||
2438 | 145 | { | ||
2439 | 146 | const char *profile = getenv ("COMPIZ_CONFIG_PROFILE"); | ||
2440 | 147 | if (profile && strcmp (profile, "ubuntu") == 0) | ||
2441 | 148 | { | ||
2442 | 149 | int result = system ("/usr/lib/nux/unity_support_test"); | ||
2443 | 150 | int status = WEXITSTATUS (result); | ||
2444 | 151 | compLogMessage ("core", CompLogLevelInfo, | ||
2445 | 152 | "Unity is %s", | ||
2446 | 153 | status == 0 ? "fully supported by your hardware." : | ||
2447 | 154 | status == 127 ? "undetectable" : | ||
2448 | 155 | "not supported by your hardware. " | ||
2449 | 156 | "Enabling software rendering instead (slow)."); | ||
2450 | 157 | if (status > 0 && status < 127) | ||
2451 | 158 | { | ||
2452 | 159 | setenv ("LIBGL_ALWAYS_SOFTWARE", "1", 1); | ||
2453 | 160 | toggledLLVM = true; | ||
2454 | 161 | } | ||
2455 | 162 | } | ||
2456 | 163 | } | ||
2457 | 164 | |||
2458 | 165 | return toggledLLVM; | ||
2459 | 166 | } | ||
2460 | 167 | |||
2461 | 168 | static void | ||
2462 | 169 | unsetUnityshellPluginEnvironment () | ||
2463 | 170 | { | ||
2464 | 171 | unsetenv ("LIBGL_ALWAYS_SOFTWARE"); | ||
2465 | 172 | } | ||
2466 | 173 | |||
2467 | 174 | static void | ||
2468 | 175 | setPluginEnvironment (const char *name) | ||
2469 | 176 | { | ||
2470 | 177 | if (strcmp (name, "opengl") == 0) | ||
2471 | 178 | setOpenGLPluginEnvironment (); | ||
2472 | 179 | } | ||
2473 | 180 | |||
2474 | 181 | static void | ||
2475 | 182 | unsetPluginEnvironment (const char *name) | ||
2476 | 183 | { | ||
2477 | 184 | if (strcmp (name, "unityshell") == 0) | ||
2478 | 185 | unsetUnityshellPluginEnvironment (); | ||
2479 | 186 | } | ||
2480 | 187 | |||
2481 | 188 | static bool | ||
2482 | 135 | dlloaderLoadPlugin (CompPlugin *p, | 189 | dlloaderLoadPlugin (CompPlugin *p, |
2483 | 136 | const char *path, | 190 | const char *path, |
2484 | 137 | const char *name) | 191 | const char *name) |
2485 | @@ -143,6 +197,8 @@ | |||
2486 | 143 | if (cloaderLoadPlugin (p, path, name)) | 197 | if (cloaderLoadPlugin (p, path, name)) |
2487 | 144 | return true; | 198 | return true; |
2488 | 145 | 199 | ||
2489 | 200 | setPluginEnvironment (name); | ||
2490 | 201 | |||
2491 | 146 | if (path) | 202 | if (path) |
2492 | 147 | { | 203 | { |
2493 | 148 | file = path; | 204 | file = path; |
2494 | @@ -213,6 +269,8 @@ | |||
2495 | 213 | if (!loaded && dlhand) | 269 | if (!loaded && dlhand) |
2496 | 214 | dlclose (dlhand); | 270 | dlclose (dlhand); |
2497 | 215 | 271 | ||
2498 | 272 | unsetPluginEnvironment (name); | ||
2499 | 273 | |||
2500 | 216 | return loaded; | 274 | return loaded; |
2501 | 217 | } | 275 | } |
2502 | 218 | 276 | ||
2503 | 219 | 277 | ||
2504 | === modified file 'tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp' | |||
2505 | --- tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-02-14 05:57:39 +0000 | |||
2506 | +++ tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2015-10-15 15:29:59 +0000 | |||
2507 | @@ -46,7 +46,7 @@ | |||
2508 | 46 | 46 | ||
2509 | 47 | namespace | 47 | namespace |
2510 | 48 | { | 48 | { |
2512 | 49 | unsigned int DEFAULT_VIEWPORT_WIDTH = 4; | 49 | unsigned int DEFAULT_VIEWPORT_WIDTH = 1; |
2513 | 50 | unsigned int DEFAULT_VIEWPORT_HEIGHT = 1; | 50 | unsigned int DEFAULT_VIEWPORT_HEIGHT = 1; |
2514 | 51 | 51 | ||
2515 | 52 | bool Advance (Display *d, bool r) | 52 | bool Advance (Display *d, bool r) |
PASSED: Continuous integration, rev:3946 jenkins. qa.ubuntu. com/job/ compiz- ci/100/ jenkins. qa.ubuntu. com/job/ compiz- wily-amd64- ci/45 jenkins. qa.ubuntu. com/job/ compiz- wily-armhf- ci/45 jenkins. qa.ubuntu. com/job/ compiz- wily-i386- ci/45
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/compiz- ci/100/ rebuild
http://