diff -Nur original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
--- original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2018-08-06 18:15:54.363059834 +0100
+++ modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2018-08-06 18:16:43.161981494 +0100
@@ -10,9 +10,6 @@
"gnome-screenshot"
-
- ["<Control><Alt>Delete"]
-
["Disabled"]
@@ -49,9 +46,6 @@
["Disabled"]
-
- "/usr/bin/gnome-system-monitor -p"
-
""
diff -Nur original/metadata/core.xml.in modified/metadata/core.xml.in
--- original/metadata/core.xml.in 2018-08-06 18:15:54.383049834 +0100
+++ modified/metadata/core.xml.in 2018-08-06 18:16:43.165313161 +0100
@@ -144,7 +144,7 @@
<_short>Focus Prevention Windows
<_long>Focus prevention windows
- !(class=Polkit-gnome-authentication-agent-1)
+ any
@@ -179,7 +179,7 @@
<_short>Minimize Window
<_long>Minimize active window
- <Control><Alt>KP_0
+ <Alt>F9
<_short>Minimize Window
@@ -188,16 +188,16 @@
<_short>Maximize Window
<_long>Maximize active window
- <Control><Super>Up
+ <Alt>F10
<_short>Unmaximize Window
<_long>Unmaximize active window
+ <Alt>F5
<_short>Unmaximize or Minimize Window
<_long>Unmaximize or minimize active window
- <Control><Super>Down
<_short>Maximize Window Horizontally
@@ -220,6 +220,7 @@
<_short>Show Desktop
<_long>Hide all windows and focus desktop
+ <Control><Alt>d
<_short>Show Desktop
@@ -229,7 +230,6 @@
<_short>Toggle Window Maximized
<_long>Toggle active window maximized
- <Control><Alt>KP_5
<_short>Toggle Window Maximized
@@ -254,7 +254,7 @@
<_short>Horizontal Virtual Size
<_long>Screen size multiplier for horizontal virtual size
- 1
+ 4
1
32
diff -Nur original/plugins/animation/animation.xml.in modified/plugins/animation/animation.xml.in
--- original/plugins/animation/animation.xml.in 2018-08-06 18:15:54.403039834 +0100
+++ modified/plugins/animation/animation.xml.in 2018-08-06 18:16:43.171976494 +0100
@@ -36,7 +36,7 @@
- animation:Glide 2
+ animation:Zoom
animation:Fade
animation:Fade
@@ -48,9 +48,9 @@
50
4000
- 120
- 80
- 80
+ 200
+ 150
+ 150
@@ -58,8 +58,8 @@
<_long>The windows that will be animated.
match
- ((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver)
- ((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))
+ (type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)
+ (type=Menu | PopupMenu | DropdownMenu | Combo)
(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)
@@ -102,7 +102,7 @@
- animation:Glide 2
+ animation:Zoom
animation:Fade
animation:Fade
@@ -114,9 +114,9 @@
50
4000
- 120
- 80
- 50
+ 200
+ 150
+ 150
@@ -124,8 +124,8 @@
<_long>The windows that will be animated.
match
- ((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver) & !(name=gnome-screenshot)
- ((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))
+ (type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)
+ (type=Menu | PopupMenu | DropdownMenu | Combo)
(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)
@@ -168,7 +168,7 @@
- animation:Zoom
+ animation:Magic Lamp
@@ -178,7 +178,7 @@
50
4000
- 220
+ 300
@@ -341,7 +341,7 @@
- animation:Fade
+ animation:None
@@ -351,7 +351,7 @@
50
4000
- 150
+ 300
@@ -385,7 +385,7 @@
<_short>Animation Time Step
<_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.
- 16
+ 10
1
400
@@ -473,7 +473,7 @@
<_short>Away Position
<_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).
- -0.1
+ -0.4
-2
1
0.05
@@ -481,7 +481,7 @@
<_short>Away Angle
<_long>Angle of window at the end of the animation.
- 0
+ -45
-540
540
5
@@ -686,7 +686,7 @@
<_short>Springiness
<_long>How spring-like the Zoom animation should be.
- 0.08
+ 0.0
0
1
0.01
diff -Nur original/plugins/commands/commands.xml.in modified/plugins/commands/commands.xml.in
--- original/plugins/commands/commands.xml.in 2018-08-06 18:15:54.413034833 +0100
+++ modified/plugins/commands/commands.xml.in 2018-08-06 18:16:43.175308160 +0100
@@ -117,7 +117,7 @@
<_short>Command line 20
<_long>Command line to be executed in shell when run_command20 is invoked
- /usr/bin/gnome-system-monitor -p
+
@@ -205,7 +205,6 @@
<_short>Run command 20
<_long>A keybinding that when invoked, will run the shell command identified by command20
- <Control><Alt>Delete
diff -Nur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.in
--- original/plugins/decor/decor.xml.in 2018-08-06 18:15:54.453014834 +0100
+++ modified/plugins/decor/decor.xml.in 2018-08-06 18:21:54.379628141 +0100
@@ -31,7 +31,7 @@
<_short>Shadow Opacity
<_long>Drop shadow opacity
- 0.8
+ 0.5
0.01
6.0
0.01
@@ -66,7 +66,7 @@
<_short>Shadow Radius
<_long>Drop shadow radius
- 5.0
+ 8.0
0.1
13.0
0.1
@@ -74,7 +74,7 @@
<_short>Shadow Opacity
<_long>Drop shadow opacity
- 0.4
+ 0.5
0.01
6.0
0.01
@@ -101,7 +101,7 @@
<_short>Command
<_long>Decorator command line that is executed if no decorator is already running.
- gtk-window-decorator
+ exec \"${COMPIZ_BIN_PATH}compiz-decorator\"
<_short>Mipmap
diff -Nur original/plugins/expo/expo.xml.in modified/plugins/expo/expo.xml.in
--- original/plugins/expo/expo.xml.in 2018-08-06 18:15:54.453014834 +0100
+++ modified/plugins/expo/expo.xml.in 2018-08-06 18:16:43.178639827 +0100
@@ -17,7 +17,6 @@
wobbly
animation
wallpaper
- imgpng
@@ -26,7 +25,7 @@
<_short>Expo Key
<_long>Initiate or terminate Expo mode with this keyboard shortcut.
- <Super>s
+ <Super>e
<_short>Expo Button
@@ -37,6 +36,7 @@
<_short>Expo Corner/Edge
<_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).
+
@@ -80,7 +80,7 @@
<_short>Animation Duration
<_long>Duration of the selected animation (in seconds).
- 0.3
+ 0.5
0.1
5.0
0.1
@@ -146,12 +146,12 @@
<_short>X Offset
<_long>Horizontal offset (in pixels).
- 64
+ 0
<_short>Y Offset
<_long>Vertical offset (in pixels).
- 24
+ 0
<_short>Y Bottom Offset
@@ -170,7 +170,7 @@
<_short>Viewport Distance
<_long>The distance between viewports in Expo mode.
- 0.2
+ 0.10
0.0
1.0
0.01
@@ -198,7 +198,7 @@
<_long>How the Expo wall should be displayed, if multiple output devices are used.
0
1
- 1
+ 0
0
<_name>One big wall
@@ -213,7 +213,7 @@
<_short>Brightness
<_long>The brightness of unfocused viewports (in percent).
- 40.0
+ 75.0
0.0
100.0
0.1
@@ -233,7 +233,7 @@
0xfbfb
0x8b8b
0x0
- 0xffff
+ 0x0
@@ -242,7 +242,7 @@
<_short>Reflection
<_long>Render a realtime reflection of the viewports on the ground.
- false
+ true
<_short>Ground Color (near)
diff -Nur original/plugins/ezoom/ezoom.xml.in modified/plugins/ezoom/ezoom.xml.in
--- original/plugins/ezoom/ezoom.xml.in 2018-08-06 18:15:54.453014834 +0100
+++ modified/plugins/ezoom/ezoom.xml.in 2018-08-06 18:16:43.191966494 +0100
@@ -30,7 +30,7 @@
<_short>Zoom In Button
<_long>Mouse button shortcut to invoke zooming in.
-
+ <Super>Button4
<_short>Zoom In Key
@@ -39,7 +39,7 @@
<_short>Zoom Out Button
<_long>Mouse button shortcut to invoke zooming out.
-
+ <Super>Button5
<_short>Zoom Out Key
@@ -48,7 +48,7 @@
<_short>Invoke Zoom Box Button
<_long>Define a rectangle area and zoom into it.
-
+ <Super>Button2
<_short>Zoom Box Outline Color
@@ -346,7 +346,7 @@
<_short>Fit zoomed area to window
<_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.
-
+ <Super>r
diff -Nur original/plugins/fade/fade.xml.in modified/plugins/fade/fade.xml.in
--- original/plugins/fade/fade.xml.in 2018-08-06 18:15:54.453014834 +0100
+++ modified/plugins/fade/fade.xml.in 2018-08-06 18:16:43.191966494 +0100
@@ -10,7 +10,6 @@
decor
- staticswitcher
cube
@@ -51,7 +50,7 @@
<_short>Fade windows
<_long>Windows that should be fading
- any & !(title=notify-osd)
+ any
<_short>Visual Bell
diff -Nur original/plugins/gnomecompat/gnomecompat.xml.in modified/plugins/gnomecompat/gnomecompat.xml.in
--- original/plugins/gnomecompat/gnomecompat.xml.in 2018-08-06 18:15:54.463009833 +0100
+++ modified/plugins/gnomecompat/gnomecompat.xml.in 2018-08-06 18:16:43.195298161 +0100
@@ -57,7 +57,6 @@
<_short>Open a terminal
<_long>Open a terminal
- <Control><Alt>T
diff -Nur original/plugins/grid/grid.xml.in modified/plugins/grid/grid.xml.in
--- original/plugins/grid/grid.xml.in 2018-08-06 18:15:54.463009833 +0100
+++ modified/plugins/grid/grid.xml.in 2018-08-06 18:16:43.198629827 +0100
@@ -68,12 +68,12 @@
<_short>Maximize Key
<_long>Maximize window.
- <Control><Super>Up
+ <Control><Alt>KP_0
<_short>Restore
<_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.
- <Control><Super>Down
+ <Alt>F5
<_short>Left Maximize
diff -Nur original/plugins/resize/resize.xml.in modified/plugins/resize/resize.xml.in
--- original/plugins/resize/resize.xml.in 2018-08-06 18:15:54.522979833 +0100
+++ modified/plugins/resize/resize.xml.in 2018-08-06 18:16:43.201961494 +0100
@@ -56,7 +56,7 @@
Maximize Vertically if screen edge hit
Maximizes the window vertically if the top or bottom screen edge is hit while resizing
- true
+ false
<_short>Use a double-border in 'Rectangle' and 'Outline' modes
@@ -72,9 +72,9 @@
<_short>Border Color
<_long>Border color used for outline and rectangle resize modes
- 0xfbfb
- 0x8b8b
- 0x0
+ 0x2f2f
+ 0x2f2f
+ 0x4f4f
0x9f9f
@@ -82,10 +82,10 @@
<_short>Fill Color
<_long>Fill color used for rectangle resize mode
- 0xfbfb
- 0x8b8b
- 0x0
- 0x1919
+ 0x2f2f
+ 0x2f2f
+ 0x4f4f
+ 0x4f4f
diff -Nur original/plugins/scale/scale.xml.in modified/plugins/scale/scale.xml.in
--- original/plugins/scale/scale.xml.in 2018-08-06 18:15:54.522979833 +0100
+++ modified/plugins/scale/scale.xml.in 2018-08-06 18:16:43.201961494 +0100
@@ -21,7 +21,7 @@
<_short>Spacing
<_long>Space between windows
- 20
+ 10
0
250
@@ -46,7 +46,7 @@
<_short>Speed
<_long>Scale speed
- 5.0
+ 1.5
0.1
50
0.1
@@ -54,7 +54,7 @@
<_short>Timestep
<_long>Scale timestep
- 0.1
+ 1.2
0.1
50
0.1
@@ -67,7 +67,7 @@
<_short>Opacity
<_long>Amount of opacity in percent
- 100
+ 75
0
100
@@ -76,7 +76,7 @@
<_long>Overlay an icon on windows once they are scaled
0
2
- 0
+ 1
0
<_name>None
@@ -129,7 +129,7 @@
<_long>Selects where windows are scaled if multiple output devices are used.
0
1
- 1
+ 0
0
<_name>On current output device
@@ -150,7 +150,7 @@
<_short>Key Bindings Toggle Scale Mode
<_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.
- true
+ false
<_short>Button Bindings Toggle Scale Mode
@@ -160,12 +160,15 @@
<_short>Initiate Window Picker
<_long>Layout and start transforming windows
+
+
+
<_short>Initiate Window Picker
<_long>Layout and start transforming windows
- <Super>w
+ <Shift><Alt>Up
<_short>Initiate Window Picker
@@ -183,7 +186,6 @@
<_short>Initiate Window Picker For All Windows
<_long>Layout and start transforming all windows
- <Super><Shift>w
<_short>Initiate Window Picker For Window Group
diff -Nur original/plugins/staticswitcher/staticswitcher.xml.in modified/plugins/staticswitcher/staticswitcher.xml.in
--- original/plugins/staticswitcher/staticswitcher.xml.in 2018-08-06 18:15:54.542969833 +0100
+++ modified/plugins/staticswitcher/staticswitcher.xml.in 2018-08-06 18:16:43.205293160 +0100
@@ -11,6 +11,7 @@
composite
opengl
+ fade
compiztoolbox
decor
@@ -139,12 +140,12 @@
<_short>Auto Change Viewport
<_long>Change to the viewport of the selected window while switching
- true
+ false
<_short>Popup Window Delay
<_long>Time (in s) the popup window should be delayed before appearing
- 0.2
+ 0.0
0.0
2.0
0.05
@@ -152,7 +153,7 @@
<_short>Allow Mouse Selection
<_long>Allow selection of windows from the switcher window with the mouse
- true
+ false
@@ -160,14 +161,14 @@
<_short>Saturation
<_long>Amount of saturation in percent
- 100
+ 50
0
100
<_short>Brightness
<_long>Amount of brightness in percent
- 100
+ 50
0
100
@@ -191,7 +192,7 @@
<_short>Mipmap
<_long>Generate mipmaps when possible for higher quality scaling
- false
+ true
<_short>Row Alignment
@@ -220,7 +221,7 @@
<_short>Bring To Front
<_long>Bring selected window to front
- false
+ true
<_short>Selected Window Highlight
@@ -228,7 +229,7 @@
<_long>Mode for highlighting the currently selected window
0
2
- 0
+ 1
0
<_name>None
diff -Nur original/plugins/vpswitch/vpswitch.xml.in modified/plugins/vpswitch/vpswitch.xml.in
--- original/plugins/vpswitch/vpswitch.xml.in 2018-08-06 18:15:54.552964834 +0100
+++ modified/plugins/vpswitch/vpswitch.xml.in 2018-08-06 18:16:43.208624827 +0100
@@ -95,11 +95,13 @@
<_short>Move Next
<_long>Move to the next viewport
+ Button5
<_short>Move Prev
<_long>Move to the previous viewport
+ Button4
diff -Nur original/plugins/wall/wall.xml.in modified/plugins/wall/wall.xml.in
--- original/plugins/wall/wall.xml.in 2018-08-06 18:15:54.552964834 +0100
+++ modified/plugins/wall/wall.xml.in 2018-08-06 18:16:43.211956494 +0100
@@ -30,12 +30,12 @@
<_short>Show Live Viewport Previews
<_long>Show live viewport previews in switcher window
- true
+ false
<_short>Switch Target Preview Visibility Time
<_long>Duration (in s) the switch target preview should remain visible after switching ends.
- 0.2
+ 0.4
0.0
2.0
0.05
@@ -43,7 +43,7 @@
<_short>Preview Scale
<_long>Size of the preview in %
- 130
+ 100
0
400
@@ -57,7 +57,7 @@
<_short>Border Width
<_long>Width of the border between the previews
- 7
+ 10
0
30
@@ -65,10 +65,10 @@
<_short>Outline Color
<_long>Outline color of the switcher window.
- 0xffff
- 0xffff
- 0xffff
- 0x3232
+ 0x3333
+ 0x3333
+ 0x3333
+ 0xd998
@@ -78,30 +78,30 @@
<_short>Base Color
<_long>First color for the background gradient of the switcher window.
- 0x0000
- 0x0000
- 0x0000
- 0x6464
+ 0xcccc
+ 0xcccc
+ 0xe665
+ 0xd998
<_short>Highlight Color
<_long>Second color for the background gradient of the switcher window.
- 0x0000
- 0x0000
- 0x0000
- 0x6464
+ 0xf332
+ 0xf332
+ 0xffff
+ 0xd998
<_short>Shadow Color
<_long>Third color for the background gradient of the switcher window.
- 0x0000
- 0x0000
- 0x0000
- 0x6464
+ 0xf332
+ 0xf332
+ 0xffff
+ 0xd998
@@ -112,20 +112,20 @@
<_short>Base Color
<_long>First color for the thumb gradient of the switcher window.
- 0x5555
- 0x5555
- 0x5555
- 0x3232
+ 0x3333
+ 0x3333
+ 0x3333
+ 0x5999
<_short>Highlight Color
<_long>Second color for the thumb gradient of the switcher window.
- 0x5555
- 0x5555
- 0x5555
- 0x3232
+ 0x3fff
+ 0x3fff
+ 0x3fff
+ 0x3fff
@@ -139,7 +139,7 @@
0xffff
0xffff
0xffff
- 0xffff
+ 0xf332
@@ -149,7 +149,7 @@
0xdfff
0xdfff
0xdfff
- 0xffff
+ 0xa665
@@ -201,7 +201,7 @@
<_short>Auto Switch Vp And Window
<_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport
- false
+ true
@@ -356,7 +356,7 @@
<_short>Edge Flip Move
<_long>Flip viewport when moving a window to a screen edge
- false
+ true
<_short>Edge Flip DnD
diff -Nur original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
--- original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2018-08-06 18:15:54.632924833 +0100
+++ modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2018-08-06 18:16:43.211956494 +0100
@@ -46,7 +46,7 @@
namespace
{
-unsigned int DEFAULT_VIEWPORT_WIDTH = 1;
+unsigned int DEFAULT_VIEWPORT_WIDTH = 4;
unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
bool Advance (Display *d, bool r)