--- compiz-fusion-plugins-main-0.7.4.orig/debian/changelog +++ compiz-fusion-plugins-main-0.7.4/debian/changelog @@ -0,0 +1,355 @@ +compiz-fusion-plugins-main (0.7.4-0ubuntu4) hardy; urgency=low + + * debian/patches/05_from_git_fix_ring_crash.patch: + - fix crash in ring switcher (LP: #217592), from git + commit bb3427df3854f8338ba4bcb8d9e62bcd2c27cdb2 + * debian/patches/06_from_git_fix_hang_in_animation.patch: + - fix hang in animation plugin (LP: #218726), from git + commit b9239c36365c57eec7961a8f24aaa0faa3a0f784 + + -- Michael Vogt Mon, 21 Apr 2008 11:04:48 +0200 + +compiz-fusion-plugins-main (0.7.4-0ubuntu3) hardy; urgency=low + + * debian/patches/04_expo_active_from_git.diff: + - fix expo mode (from git) + + -- Michael Vogt Thu, 10 Apr 2008 10:34:24 +0200 + +compiz-fusion-plugins-main (0.7.4-0ubuntu2) hardy; urgency=low + + [ Andrew Starr-Bochicchio ] + * debian/patches/01-animation-defaults.patch + - Drop type=Utility so Firefox location bar does not use window open + and close animations. Thanks to Sylvain Pasche. (LP: #212542) + + -- Michael Vogt Wed, 09 Apr 2008 20:44:43 +0200 + +compiz-fusion-plugins-main (0.7.4-0ubuntu1) hardy; urgency=low + + * new upstream release: + + Expo has a new transformation mode: "Curve" + + Bug fixes in several plugins + + -- Michael Vogt Sat, 05 Apr 2008 12:45:14 +0200 + +compiz-fusion-plugins-main (0.7.2+git20080403-0ubuntu1) hardy; urgency=low + + * new git snapshot + * debian/control: + - build depend on latest bcop and compiz-dev + * debian/patches/02_fix_edges.patch: + - updated + * debian/patches/10_from_git_8d38454.diff: + - removed, applied upstream + + -- Michael Vogt Thu, 03 Apr 2008 10:23:00 +0200 + +compiz-fusion-plugins-main (0.7.2-0ubuntu1) hardy; urgency=low + + * new upstream release + - adds missing color filters + - bugfixes + - simplify build-depends + * debian/patches/10_from_git_8d38454.diff: + - fix in wall from git + + -- Michael Vogt Fri, 07 Mar 2008 15:38:55 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080304-0ubuntu1) hardy; urgency=low + + * new git snapshot: + - fix missing colorfilters (LP: #197545) + - do not jump accross workspaces when a window requests the focus + - Remove debug artifact + * debian/control: + - build against the latest compiz + + -- Michael Vogt Tue, 04 Mar 2008 19:25:35 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080228-0ubuntu1) hardy; urgency=low + + * build against latest compiz abi + * new git snapshot: + - bugfixes + - new session plugin that fixes session managment (LP: #192849) + + -- Michael Vogt Mon, 18 Feb 2008 10:26:26 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080214-0ubuntu4) unstable; urgency=low + + * debian/patches/02-fix-edges.patch: + - make the 1px border dynamic again + + -- Michael Vogt Wed, 20 Feb 2008 15:26:53 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080214-0ubuntu3) hardy; urgency=low + + * debian/patches/01_fixes_from_git.patch: + - include crash fixes from git for workarounds and animation + + -- Michael Vogt Tue, 19 Feb 2008 11:04:01 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080214-0ubuntu2) hardy; urgency=low + + * add missing gconf2 build-dependency + + -- Michael Vogt Thu, 14 Feb 2008 19:12:52 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080214-0ubuntu1) hardy; urgency=low + + * new git snapshot + * enable schema generation and use gnome cdbs class + + -- Michael Vogt Tue, 05 Feb 2008 15:31:06 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080205-0ubuntu1) hardy; urgency=low + + * new git snapshot, fixes for dark decorations in animation + + -- Michael Vogt Tue, 05 Feb 2008 09:59:32 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080125-0ubuntu1) hardy; urgency=low + + * new git snapshot, fixes freezes in the animation plugin + (thanks to Erkin Bahceci) + + -- Michael Vogt Fri, 25 Jan 2008 15:41:18 +0000 + +compiz-fusion-plugins-main (0.6.99+git20080121-0ubuntu1) hardy; urgency=low + + * new git snapshot + + -- Michael Vogt Mon, 21 Jan 2008 12:28:22 +0100 + +compiz-fusion-plugins-main (0.6.99+git20080116-0ubuntu1) hardy; urgency=low + + * new git snapshot: + - mostly fixes + + -- Michael Vogt Wed, 16 Jan 2008 10:00:55 +0100 + +compiz-fusion-plugins-main (0.6.99+git20071224-0ubuntu1) hardy; urgency=low + + * new git snapshot: + - fixes freeze in animation plugin when switching windows (LP: #175744) + + -- Michael Vogt Mon, 24 Dec 2007 10:55:15 +0100 + +compiz-fusion-plugins-main (0.6.99+git20071211-0ubuntu1) hardy; urgency=low + + * new git snapshot: + - i18n updates + - cleanup/crash fixes + + -- Michael Vogt Thu, 13 Dec 2007 16:58:52 +0100 + +compiz-fusion-plugins-main (0.6.99+git20071127-0ubuntu1) hardy; urgency=low + + * new git HEAD snapshot + * debian/patches/02_fix_edges.patch: + - updated to current code but disable for now, it causes + crashes + * debian/patches/03_default_options: + - disable hotcorner for scale + + -- Michael Vogt Wed, 05 Dec 2007 22:46:01 +0100 + +compiz-fusion-plugins-main (0.6.0+git20071027-0ubuntu1) hardy; urgency=low + + * new snapshot of the 0.6 branch + * debian/patches/04_wall_animation_fix.diff: + - dropped, part of the upstream source now + + -- Michael Vogt Mon, 29 Oct 2007 12:35:14 -0400 + +compiz-fusion-plugins-main (0.5.2+git20070928-0ubuntu2) gutsy; urgency=low + + * debian/patches/01-animation-defaults.patch: + - set default fade animation to 150ms (LP: #146753) + + -- Michael Vogt Tue, 02 Oct 2007 15:58:57 +0200 + +compiz-fusion-plugins-main (0.5.2+git20070928-0ubuntu1) gutsy; urgency=low + + * new 0.6 branch snapshot: + - translation updates + - Fix in-window calculations in scaleaddon + - enable legacy fullscreen support by default (LP: #102807) + + -- Michael Vogt Fri, 28 Sep 2007 15:42:04 +0200 + +compiz-fusion-plugins-main (0.5.2+git20070917-0ubuntu3) gutsy; urgency=low + + * debian/patches/04_wall_animation_fix.diff: + - make the animation smoother and quicker for workspace switching, + (from upstream git, LP: #141525) + + -- Michael Vogt Fri, 21 Sep 2007 22:13:42 +0200 + +compiz-fusion-plugins-main (0.5.2+git20070917-0ubuntu2) gutsy; urgency=low + + * debian/patches/01-animation-defaults.patch: + - use fade animation for dialog boxes, gecko menus, openoffice.org, + and more (LP: #139576) + + -- Travis Watkins Wed, 19 Sep 2007 19:31:01 +0100 + +compiz-fusion-plugins-main (0.5.2+git20070917-0ubuntu1) gutsy; urgency=low + + * new git snapshot based on the 0.6 snapshot + * should fix ctrl-alt-l keybinding + * build against latest compiz version + * debian/patches/01-animation-defaults.patch: + - use "fade" as focus animation + - use "zoom" as minimize animation + + -- Michael Vogt Mon, 17 Sep 2007 14:49:48 +0100 + +compiz-fusion-plugins-main (0.5.2+git20070912-0ubuntu1) gutsy; urgency=low + + * new 0.6 branch snapshot + * fix firefox menu detection workaround + + -- Michael Vogt Wed, 12 Sep 2007 17:59:44 +0200 + +compiz-fusion-plugins-main (0.5.2+git20070906-0ubuntu1) gutsy; urgency=low + + * new git snapshot + + -- Michael Vogt Thu, 06 Sep 2007 18:15:36 +0200 + +compiz-fusion-plugins-main (0.5.2+git20070829-0ubuntu1) gutsy; urgency=low + + * updated to latest 0.6 git branch, this fixes the missing color + filters in the "Color filter" plugin + * update build-depends to build against latest compiz-dev + + -- Michael Vogt Tue, 28 Aug 2007 15:27:05 +0200 + +compiz-fusion-plugins-main (0.5.2-0ubuntu2) gutsy; urgency=low + + * debian/patches/02_fix_edges.patch: + - make the 1px border dynamic (thanks to onestone) (LP: #103306) + + -- Michael Vogt Thu, 16 Aug 2007 18:53:29 +0200 + +compiz-fusion-plugins-main (0.5.2-0ubuntu1) gutsy; urgency=low + + * upated to version 0.5.2, fixes ctrl-alt-right key issue + (thanks to sabdfl for reporting) + + -- Michael Vogt Wed, 15 Aug 2007 22:19:53 +0200 + +compiz-fusion-plugins-main (0.0.0+git20070810-0ubuntu1) gutsy; urgency=low + + * new git snapshot + * b-d on latest compiz-bcop + * debian/patches/01-animation-defaults.patch: + - updated animation default to match compiz spec + + -- Michael Vogt Fri, 10 Aug 2007 17:31:06 +0200 + +compiz-fusion-plugins-main (0.0.0+git20070725-0ubuntu1) gutsy; urgency=low + + * new git snapshot + * b-d against latest compiz-dev + * debian/patches/01-animation-defaults.patch: + - updated + + -- Michael Vogt Wed, 25 Jul 2007 12:43:20 +0200 + +compiz-fusion-plugins-main (0.0.0+git20070711-0ubuntu2) gutsy; urgency=low + + * bump build-depends against latest compiz + + -- Michael Vogt Wed, 11 Jul 2007 16:52:19 +0100 + +compiz-fusion-plugins-main (0.0.0+git20070711-0ubuntu1) gutsy; urgency=low + + * new git snapshot + * updated debian/patches/01-animation-defaults.patch + + -- Michael Vogt Wed, 11 Jul 2007 14:35:52 +0100 + +compiz-fusion-plugins-main (0.0.0+git20070703-0ubuntu3) gutsy; urgency=low + + * Rebuild against new compiz-dev + + -- Scott James Remnant Fri, 06 Jul 2007 18:22:36 +0100 + +compiz-fusion-plugins-main (0.0.0+git20070703-0ubuntu2) gutsy; urgency=low + + * tighten build-depends on compiz-bcop + + -- Michael Vogt Tue, 03 Jul 2007 20:04:17 +0200 + +compiz-fusion-plugins-main (0.0.0+git20070703-0ubuntu1) gutsy; urgency=low + + * new git snapshot + + -- Michael Vogt Tue, 03 Jul 2007 15:53:57 +0200 + +compiz-fusion-plugins-main (0.0.0+git20070626-0ubuntu2) gutsy; urgency=low + + * Add Conflicts/Replaces for compiz-extra (Fixes LP: #121135) + + -- Travis Watkins Sat, 30 Jun 2007 22:56:36 -0500 + +compiz-fusion-plugins-main (0.0.0+git20070626-0ubuntu1) gutsy; urgency=low + + * new git snapshot (fixes lockup in the expo plugin) + + -- Michael Vogt Tue, 26 Jun 2007 21:35:41 +0200 + +compiz-fusion-plugins-main (0.0.0+git20070625-0ubuntu1) gutsy; urgency=low + + * new git snapshot (fixes animation plugin breakage) + + -- Michael Vogt Mon, 25 Jun 2007 14:53:30 +0200 + +compiz-fusion-plugins-main (0.0.0+git20070622-0ubuntu2) gutsy; urgency=low + + * debian/patches/01-animation-defaults.patch: + - setup animation defaults as specified in the spec + + -- Travis Watkins Sat, 23 Jun 2007 04:32:25 -0500 + +compiz-fusion-plugins-main (0.0.0+git20070622-0ubuntu1) gutsy; urgency=low + + * added XS-Vcs-Bzr header + * renamed package to compiz-fusion-plugins-main to match upstream + name change and adds appropriate conflicts/replace + + -- Michael Vogt Fri, 22 Jun 2007 07:31:54 +0200 + +compcomm-plugins-main (0.0.0+git20070612-0ubuntu1) gutsy; urgency=low + + * new git snapshot + * fix FTBFS by adding libxslt1-dev, xsltproc, libglu1-mesa-dev + + -- Michael Vogt Tue, 12 Jun 2007 22:01:28 +0200 + +compcomm-plugins-main (0.0.0+git20070608-0ubuntu2) gutsy; urgency=low + + * debian/control: + - d-depend on libdecoration0-dev + - improved the description + * debian/patches/99_autoreconf.patch: + - remove autom4te.cache/ cache + + -- Michael Vogt Fri, 08 Jun 2007 18:34:34 +0200 + +compcomm-plugins-main (0.0.0+git20070608-0ubuntu1) gutsy; urgency=low + + [Travis Watkins] + * Initial release + + [Michael Vogt] + * debian/patches/01_fix_cleanup.patch: + - add "ring_options.h" to libring_la_SOURCES to fix distclean issue + * debian/patches/99_autoreconf.patch: + - run "autoreconf" + + -- Travis Watkins Fri, 08 Jun 2007 08:27:02 -0500 + --- compiz-fusion-plugins-main-0.7.4.orig/debian/compat +++ compiz-fusion-plugins-main-0.7.4/debian/compat @@ -0,0 +1 @@ +5 --- compiz-fusion-plugins-main-0.7.4.orig/debian/control +++ compiz-fusion-plugins-main-0.7.4/debian/control @@ -0,0 +1,19 @@ +Source: compiz-fusion-plugins-main +Section: x11 +Priority: extra +Maintainer: Travis Watkins +Build-Depends: cdbs, debhelper (>= 5), pkg-config, compiz-dev (>= 1:0.7.2+git20080403), librsvg2-dev, libcairo2-dev, libsm-dev, intltool, libdbus-1-dev, libjpeg62-dev, compiz-bcop (>= 0.7.3), libdecoration0-dev (>= 0.7.2), xsltproc, libxslt1-dev, libglu1-mesa-dev, gconf2 +Standards-Version: 3.7.3 +XS-Vcs-Bzr: http://bazaar.launchpad.net/~compiz/compcomm-plugins-main/ubuntu + +Package: compiz-fusion-plugins-main +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, compiz-core +Replaces: compiz-compcomm-plugins-main (<< 0.0.0+git20070622-0ubuntu1), compiz-extra (<< 0.3.6.1-0ubuntu2) +Conflicts: compiz-compcomm-plugins-main (<< 0.0.0+git20070622-0ubuntu1), compiz-extra (<< 0.3.6.1-0ubuntu2) +Description: Collection of plugins from OpenCompositing for Compiz + The OpenCompositing Project brings 3D desktop visual effects that improve + usability of the X Window System and provide increased productivity. + . + This package contains plugins and themes contributed by the community + giving a rich desktop experience. --- compiz-fusion-plugins-main-0.7.4.orig/debian/copyright +++ compiz-fusion-plugins-main-0.7.4/debian/copyright @@ -0,0 +1,207 @@ +This package was debianized by Travis Watkins on +Fri, 08 Jun 2007 08:27:02 -0500. + +It was downloaded from: +git://anongit.opencompositing.org/fusion/plugins-main + +Copyright: + + * Animation plugin for compiz/beryl + * + * animation.c + * + * Copyright : (C) 2006 Erkin Bahceci + * E-mail : erkinbah@gmail.com + * + * Based on Wobbly and Minimize plugins by + * : David Reveman + * E-mail : davidr@novell.com> + * + * Particle system added by : (C) 2006 Dennis Kasprzyk + * E-mail : onestone@beryl-project.org + * + * Beam-Up added by : Florencio Guimaraes + * E-mail : florencio@nexcorp.com.br + * + * Hexagon tessellator added by : Mike Slegeir + * E-mail : mikeslegeir@mail.utexas.edu> + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * Compiz expo plugin + * + * expo.c + * + * Copyright (c) 2006 Robert Carr + * + * Authors: + * Robert Carr + * Dennis Kasprzyk + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * beryl-plugins::jpeg.c - adds JPEG image support to beryl. + * Copyright: (C) 2006 Nicholas Thomas + * Danny Baumann (JPEG writing, option stuff) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * Beryl Opacify + * + * Copyright (c) 2006 Kristian Lyngstøl + * Ported to Compiz and BCOP usage by Danny Baumann + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + +Copyright : resizeinfo.c + + * Copyright (c) 2007 Robert Carr + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * Compiz ring switcher plugin + * + * ring.c + * + * Copyright : (C) 2007 by Danny Baumann + * E-mail : maniac@opencompositing.org + * + * Based on scale.c and switcher.c: + * Copyright : (C) 2007 David Reveman + * E-mail : davidr@novell.com + * + * Rounded corner drawing taken from wall.c: + * Copyright : (C) 2007 Robert Carr + * E-mail : racarr@beryl-project.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * Beryl Snap Plugin + * Author : Guillaume "iXce" Seguin + * Email : ixce@beryl-project.org + * + * Ported by : Patrick "marex" Niklaus + * Email : marex@beryl-project.org + * + * Copyright (C) 2007 Guillaume Seguin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * text.c - adds text image support to beryl. + * Copyright: (C) 2006 Patrick Niklaus + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * Compiz thumbnail plugin + * + * thumbnail.c + * + * Copyright : (C) 2007 by Dennis Kasprzyk + * E-mail : onestone@beryl-project.org + * + * Based on thumbnail.c: + * Copyright : (C) 2007 Stjepan Glavina + * E-mail : stjepang@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * winrules plugin for compiz + * + * Copyright (C) 2007 Bellegarde Cedric (gnumdk (at) gmail.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + +Copyright : neg.c put.c + + * Copyright (c) 2006 Darryll Truchan + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + +The Debian packaging is (C) 2007, Travis Watkins and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- compiz-fusion-plugins-main-0.7.4.orig/debian/patches/01-animation-defaults.patch +++ compiz-fusion-plugins-main-0.7.4/debian/patches/01-animation-defaults.patch @@ -0,0 +1,70 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/metadata/animation.xml.in ubuntu.new/metadata/animation.xml.in +--- ubuntu/metadata/animation.xml.in 2007-11-27 18:51:41.000000000 +0100 ++++ ubuntu.new/metadata/animation.xml.in 2008-02-29 20:31:08.000000000 +0100 +@@ -28,7 +28,7 @@ + 0 + 21 + +- 21 ++ 12 + 9 + 9 + +@@ -138,8 +138,8 @@ + <_long>The windows that will be animated. + match + +- (type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver) +- (type=Menu | PopupMenu | DropdownMenu) ++ ((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 | Dialog | ModalDialog | Normal) + (type=Tooltip | Notification | Utility) + + +@@ -282,7 +282,7 @@ + 0 + 21 + +- 21 ++ 11 + 9 + 9 + +@@ -392,8 +392,8 @@ + <_long>The windows that will be animated. + match + +- (type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver) +- (type=Menu | PopupMenu | DropdownMenu) ++ ((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 | Dialog | ModalDialog | Normal) + (type=Tooltip | Notification | Utility) + + +@@ -536,7 +536,7 @@ + 0 + 19 + +- 15 ++ 19 + + + 0 +@@ -856,7 +856,7 @@ + 0 + 3 + +- 0 ++ 2 + + + 0 +@@ -882,7 +882,7 @@ + 50 + 4000 + +- 300 ++ 150 + + + +