reorganize

update depends, license strings
delete unused patches

4 files changed, 167 insertions, 497 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63c1290163f5..0e6cc35e49f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
 pkgbase = compiz
 	pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM
 	pkgver = 0.9.14.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://launchpad.net/compiz
 	arch = i686
 	arch = x86_64
-	license = GPL
-	license = LGPL
+	license = GPL-2.0-or-later
+	license = LGPL-2.1-or-later
 	license = MIT
 	makedepends = boost
 	makedepends = cmake
 	makedepends = cython
 	makedepends = intltool
+	makedepends = python-setuptools
 	depends = boost-libs
 	depends = fuse2
 	depends = glibmm
 	depends = glu
+	depends = libnotify
 	depends = libwnck3
 	depends = libxslt
 	depends = metacity
@@ -24,13 +26,13 @@ pkgbase = compiz
 	depends = python-gobject
 	depends = xorg-server
 	optdepends = xorg-xprop: grab various window properties for use in window matching rules
-	provides = ccsm=0.9.14.2
-	provides = compiz-bcop=0.9.14.2
-	provides = compiz-core=0.9.14.2
-	provides = compiz-plugins-extra=0.9.14.2
-	provides = compiz-plugins-main=0.9.14.2
-	provides = compizconfig-python=0.9.14.2
-	provides = libcompizconfig=0.9.14.2
+	provides = ccsm=0.9.14
+	provides = compiz-bcop=0.9.14
+	provides = compiz-core=0.9.14
+	provides = compiz-plugins-extra=0.9.14
+	provides = compiz-plugins-main=0.9.14
+	provides = compizconfig-python=0.9.14
+	provides = libcompizconfig=0.9.14
 	conflicts = ccsm
 	conflicts = compiz-bcop
 	conflicts = compiz-core
@@ -41,7 +43,7 @@ pkgbase = compiz
 	conflicts = compizconfig-python
 	conflicts = libcompizconfig
 	conflicts = simple-ccsm
-	source = https://launchpad.net/compiz/0.9.14/0.9.14.2/+download/compiz-0.9.14.2.tar.xz
+	source = compiz-0.9.14.2.tar.xz::https://launchpad.net/compiz/0.9.14/0.9.14.2/+download/compiz-0.9.14.2.tar.xz
 	source = focus-prevention-disable.patch
 	source = gtk-extents.patch
 	source = reverse-unity-config.patch
diff --git a/PKGBUILD b/PKGBUILD
index 81c631d340eb..16087a85c17b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,75 +6,132 @@
 # Contributor: Iven Hsu <ivenvd AT gmail>
 # Contributor: Nathan Hulse <nat.hulse@gmail.com>
 
-pkgname=compiz
+## options
+: ${_build_git:=false}
+
+[[ "${_build_git::1}" == "t" ]] && _pkgtype+="-git"
+
+## basic info
+_pkgname='compiz'
+pkgname="$_pkgname${_pkgtype:-}"
 pkgver=0.9.14.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM"
-arch=('i686' 'x86_64')
 url="https://launchpad.net/compiz"
-license=('GPL' 'LGPL' 'MIT')
-depends=(
-  'boost-libs'
-  'fuse2'
-  'glibmm'
-  'glu'
-  'libwnck3'
-  'libxslt'
-  'metacity'
-  'protobuf'
-  'python-cairo'
-  'python-gobject'
-  'xorg-server'
-)
-makedepends=(
-  'boost'
-  'cmake'
-  'cython'
-  'intltool'
-)
-optdepends=(
-  'xorg-xprop: grab various window properties for use in window matching rules'
-)
-conflicts=(
-  'ccsm'
-  'compiz-bcop'
-  'compiz-core'
-  'compiz-fusion-plugins-experimental'
-  'compiz-fusion-plugins-extra'
-  'compiz-fusion-plugins-main'
-  'compiz-gtk'
-  'compizconfig-python'
-  'libcompizconfig'
-  'simple-ccsm'
-)
-provides=(
-  "ccsm=$pkgver"
-  "compiz-bcop=$pkgver"
-  "compiz-core=$pkgver"
-  "compiz-plugins-extra=$pkgver"
-  "compiz-plugins-main=$pkgver"
-  "compizconfig-python=$pkgver"
-  "libcompizconfig=$pkgver"
-)
-source=(
-  "https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz"
-  "focus-prevention-disable.patch"
-  "gtk-extents.patch"
-  "reverse-unity-config.patch"
-  "screenshot-launch-fix.patch"
-  "no-compile-gschemas.patch"
-)
-sha256sums=(
-  'cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c'
-  'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
-  '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
-  '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
-  '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
-  '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a'
+arch=('i686' 'x86_64')
+license=(
+  'GPL-2.0-or-later'
+  'LGPL-2.1-or-later'
+  'MIT'
 )
 
+# main package
+_main_package() {
+  depends=(
+    'boost-libs'
+    'fuse2'
+    'glibmm'
+    'glu'
+    'libnotify'
+    'libwnck3'
+    'libxslt'
+    'metacity'
+    'protobuf'
+    'python-cairo'
+    'python-gobject'
+    'xorg-server'
+  )
+  makedepends=(
+    'boost'
+    'cmake'
+    'cython'
+    'intltool'
+    'python-setuptools'
+  )
+  optdepends=(
+    'xorg-xprop: grab various window properties for use in window matching rules'
+  )
+
+  conflicts=(
+    'ccsm'
+    'compiz-bcop'
+    'compiz-core'
+    'compiz-fusion-plugins-experimental'
+    'compiz-fusion-plugins-extra'
+    'compiz-fusion-plugins-main'
+    'compiz-gtk'
+    'compizconfig-python'
+    'libcompizconfig'
+    'simple-ccsm'
+  )
+  provides=(
+    "ccsm=${pkgver:0:6}"
+    "compiz-bcop=${pkgver:0:6}"
+    "compiz-core=${pkgver:0:6}"
+    "compiz-plugins-extra=${pkgver:0:6}"
+    "compiz-plugins-main=${pkgver:0:6}"
+    "compizconfig-python=${pkgver:0:6}"
+    "libcompizconfig=${pkgver:0:6}"
+  )
+
+  if [ "${_build_git::1}" != "t" ] ; then
+    _main_stable
+  else
+    _main_git
+  fi
+
+  source+=(
+    "focus-prevention-disable.patch"
+    "gtk-extents.patch"
+    "reverse-unity-config.patch"
+    "screenshot-launch-fix.patch"
+    "no-compile-gschemas.patch"
+  )
+  sha256sums+=(
+    'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
+    '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
+    '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
+    '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
+    '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a'
+  )
+}
+
+# stable package
+_main_stable() {
+  _pkgsrc="$_pkgname-${pkgver%%.r*}"
+  _pkgext="tar.xz"
+  source+=(
+    "$_pkgsrc.$_pkgext"::"https://launchpad.net/$_pkgname/${pkgver:0:6}/${pkgver%%.r*}/+download/$_pkgsrc.$_pkgext"
+  )
+  sha256sums+=(
+    'cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c'
+  )
+
+  pkgver() {
+    echo "${pkgver%%.r*}"
+  }
+}
+
+# git package
+_main_git() {
+  makedepends+=('git')
+
+  conflicts+=('compiz')
+  provides+=("compiz=${pkgver:0:6}")
+
+  _pkgsrc="$_pkgname"
+  source+=("$_pkgsrc"::"git+https://git.launchpad.net/compiz")
+  sha256sums+=('SKIP')
+
+  pkgver() {
+    cd "$_pkgsrc"
+    git describe --long --tags --abbrev=8 --exclude='*[a-zA-Z][a-zA-Z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+  }
+}
+
+# common functions
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$_pkgsrc"
 
   # Reverse Unity specific configuration patches
   patch -p1 -i "$srcdir/reverse-unity-config.patch"
@@ -90,56 +147,57 @@ prepare() {
 
   # Don't try to compile gschemas during make install
   patch -p1 -i "$srcdir/no-compile-gschemas.patch"
-
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p build
-  cd build
-
-  cmake .. \
-    -DCMAKE_CXX_STANDARD=17 \
-    -DCMAKE_BUILD_TYPE="Release" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR="/usr/lib" \
-    -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On \
-    -DCOMPIZ_BUILD_WITH_RPATH=Off \
-    -DCOMPIZ_PACKAGING_ENABLED=On \
-    -DBUILD_GTK=On \
-    -DBUILD_METACITY=On \
-    -DBUILD_KDE4=Off \
-    -DCOMPIZ_BUILD_TESTING=Off \
-    -DCOMPIZ_WERROR=Off \
+  local _cmake_options=(
+    -B build
+    -S "$_pkgsrc"
+
+    -DCMAKE_CXX_STANDARD=17
+    -DCMAKE_BUILD_TYPE="Release"
+    -DCMAKE_INSTALL_PREFIX="/usr"
+    -DCMAKE_INSTALL_LIBDIR="/usr/lib"
+    -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=ON
+    -DCOMPIZ_BUILD_WITH_RPATH=OFF
+    -DCOMPIZ_PACKAGING_ENABLED=ON
+    -DBUILD_GTK=ON
+    -DBUILD_METACITY=ON
+    -DBUILD_KDE4=OFF
     -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,regex,animation,wall,ccp"
 
-    make
+    -DCOMPIZ_BUILD_TESTING=OFF
+    -DCOMPIZ_WERROR=OFF
+    -Wno-dev
+  )
+
+  cmake "${_cmake_options[@]}"
+  cmake --build build
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  cd build
-
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
   # findcompiz_install needs COMPIZ_DESTDIR and install needs DESTDIR
   # make findcompiz_install
   CMAKE_DIR=$(cmake --system-information | grep '^CMAKE_ROOT' | awk -F\" '{print $2}')
-  install -Dm644 ../cmake/FindCompiz.cmake \
+  install -Dm644 "$_pkgsrc/cmake/FindCompiz.cmake" \
     -t "${pkgdir}${CMAKE_DIR}/Modules/"
 
-  # Add documentation
-  install -Dm644 ../{AUTHORS,NEWS,README} \
-    -t "$pkgdir/usr/share/doc/compiz/"
+  # documentation
+  #install -Dm644 "$_pkgsrc"/{AUTHORS,NEWS,README} \
+  #  -t "$pkgdir/usr/share/doc/compiz/"
 
-  # Add the gsettings schema files
-  if ls generated/glib-2.0/schemas/ | grep -qm1 .gschema.xml; then
-    install -Dm644 generated/glib-2.0/schemas/*.gschema.xml \
+  # gsettings schema files
+  if ls build/generated/glib-2.0/schemas/ | grep -qm1 .gschema.xml; then
+    install -Dm644 build/generated/glib-2.0/schemas/*.gschema.xml \
       -t "$pkgdir/usr/share/glib-2.0/schemas/"
   fi
 
-  # Install licenses
-  install -Dm644 "$srcdir/$pkgname-$pkgver"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} \
+  # licenses
+  install -Dm644 "$_pkgsrc"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} \
     -t "$pkgdir/usr/share/licenses/$pkgname"
 }
+
+# execute
+_main_package
diff --git a/gcc10_common_fix.patch b/gcc10_common_fix.patch
deleted file mode 100644
index be3a0b4c39d4..000000000000
--- a/gcc10_common_fix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From c7b74aa53e9d64da5175f9b86ec7f68e53d1398e Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Tue, 28 Jul 2020 12:17:30 +0200
-Subject: Fix two build failures due to new gcc-10 warnings, such as
- uninitialized variables and duplicated definitions:
-
-e.g. of failure:
-/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-settings-xproperty-storage.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
-/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
-/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme-cairo.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
-/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme-metacity.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
-collect2: error: ld returned 1 exit status
----
- debian/changelog                            | 14 ++++++++++++++
- gtk/window-decorator/gtk-window-decorator.h |  2 +-
- plugins/expo/src/expo.cpp                   |  2 +-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-#diff --git a/debian/changelog b/debian/changelog
-#index 97b93dd..b21831d 100644
-#--- a/debian/changelog
-#+++ b/debian/changelog
-#@@ -1,3 +1,17 @@
-#+compiz (1:0.9.14.1+20.10.20200526-0ubuntu3) groovy; urgency=medium
-#+
-#+  * Initialize 3 arrays to zero to silence a new gcc-10 warning
-#+  * Move window_type_frames to extern in the header file, fixing a build
-#+    failure with gcc-10
-#+
-#+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 28 Jul 2020 11:39:45 +0200
-#+
-#+compiz (1:0.9.14.1+20.10.20200526-0ubuntu2) groovy; urgency=medium
-#+
-#+  * Rebuild against new libprotobuf23.
-#+
-#+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 26 Jul 2020 10:13:56 +0200
-#+
-# compiz (1:0.9.14.1+20.10.20200526-0ubuntu1) groovy; urgency=medium
-# 
-#   [ Daniel Kondor ]
-diff --git a/gtk/window-decorator/gtk-window-decorator.h b/gtk/window-decorator/gtk-window-decorator.h
-index 6bf5d31..da7f905 100644
---- a/gtk/window-decorator/gtk-window-decorator.h
-+++ b/gtk/window-decorator/gtk-window-decorator.h
-@@ -266,7 +266,7 @@ typedef struct _default_frame_references
- } default_frame_references_t;
- 
- extern default_frame_references_t default_frames[WINDOW_TYPE_FRAMES_NUM * 2];
--const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
-+extern const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
- 
- extern char *program_name;
- 
-diff --git a/plugins/expo/src/expo.cpp b/plugins/expo/src/expo.cpp
-index 86c1618..802071b 100644
---- a/plugins/expo/src/expo.cpp
-+++ b/plugins/expo/src/expo.cpp
-@@ -708,7 +708,7 @@ ExpoScreen::invertTransformedVertex (const GLScreenPaintAttrib &attrib,
- 				     int                       vertex[2])
- {
-     GLMatrix sTransform (transform);
--    float    p1[3], p2[3], v[3];
-+    float    p1[3] = { 0 } , p2[3] = { 0 }, v[3] = { 0 };
-     GLint    viewport[4];
- 
-     gScreen->glApplyTransform (attrib, output, &sTransform);
--- 
-cgit v1.1
-
diff --git a/remove-unused-or-broken-buttons.patch b/remove-unused-or-broken-buttons.patch
deleted file mode 100644
index e6ca5e934825..000000000000
--- a/remove-unused-or-broken-buttons.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff --git a/gtk/window-decorator/decorator.c b/gtk/window-decorator/decorator.c
-index a119795..3c56880 100644
---- a/gtk/window-decorator/decorator.c
-+++ b/gtk/window-decorator/decorator.c
-@@ -216,13 +216,7 @@ update_event_windows (WnckWindow *win)
- 	    WNCK_WINDOW_ACTION_CLOSE,
- 	    WNCK_WINDOW_ACTION_MAXIMIZE,
- 	    WNCK_WINDOW_ACTION_MINIMIZE,
--	    0,
--	    WNCK_WINDOW_ACTION_SHADE,
--	    WNCK_WINDOW_ACTION_ABOVE,
--	    WNCK_WINDOW_ACTION_STICK,
--	    WNCK_WINDOW_ACTION_UNSHADE,
--	    WNCK_WINDOW_ACTION_ABOVE,
--	    WNCK_WINDOW_ACTION_UNSTICK
-+	    0
- 	};
- 
- 	/* Pixmap mode - if a box was set and we no longer need it unmap its window */
-@@ -1061,7 +1055,7 @@ populate_frame_actions (decor_t *d)
-         return frame_actions;
- 
-     WnckWindowActions win_actions = wnck_window_get_actions (d->win);
--    const unsigned int n_action_bits = 16;
-+    const unsigned int n_action_bits = 10;
-     unsigned int i;
-     struct typestrings {
-         unsigned int decor_flag;
-@@ -1077,13 +1071,7 @@ populate_frame_actions (decor_t *d)
-         { DECOR_WINDOW_ACTION_MAXIMIZE_VERT, WNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY },
-         { DECOR_WINDOW_ACTION_UNMAXIMIZE_HORZ, WNCK_WINDOW_ACTION_UNMAXIMIZE_HORIZONTALLY },
-         { DECOR_WINDOW_ACTION_UNMAXIMIZE_VERT, WNCK_WINDOW_ACTION_UNMAXIMIZE_VERTICALLY },
--        { DECOR_WINDOW_ACTION_SHADE, WNCK_WINDOW_ACTION_SHADE },
--        { DECOR_WINDOW_ACTION_UNSHADE, WNCK_WINDOW_ACTION_UNSHADE },
--        { DECOR_WINDOW_ACTION_STICK, WNCK_WINDOW_ACTION_STICK },
--        { DECOR_WINDOW_ACTION_UNSTICK, WNCK_WINDOW_ACTION_UNSTICK },
--        { DECOR_WINDOW_ACTION_FULLSCREEN, WNCK_WINDOW_ACTION_FULLSCREEN },
--        { DECOR_WINDOW_ACTION_ABOVE, WNCK_WINDOW_ACTION_ABOVE },
--        { DECOR_WINDOW_ACTION_BELOW, WNCK_WINDOW_ACTION_BELOW },
-+        { DECOR_WINDOW_ACTION_FULLSCREEN, WNCK_WINDOW_ACTION_FULLSCREEN }
-     };
- 
-     for (i = 0; i < n_action_bits; ++i)
-diff --git a/gtk/window-decorator/events.c b/gtk/window-decorator/events.c
-index 5752176..be7d545 100644
---- a/gtk/window-decorator/events.c
-+++ b/gtk/window-decorator/events.c
-@@ -276,140 +276,6 @@ menu_button_event (WnckWindow *win,
-     }
- }
- 
--void
--shade_button_event (WnckWindow *win,
--		    decor_event *gtkwd_event,
--		    decor_event_type gtkwd_type)
--{
--    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
--    guint   state = d->button_states[BUTTON_SHADE];
--
--    common_button_event (win, gtkwd_event, gtkwd_type,
--			 BUTTON_SHADE, 1, _("Shade"));
--
--    switch (gtkwd_type) {
--    case GButtonRelease:
--	if (gtkwd_event->button == 1)
--	{
--	    if (state == BUTTON_EVENT_ACTION_STATE)
--		wnck_window_shade (win);
--	}
--	break;
--    default:
--	break;
--    }
--}
--
--void
--above_button_event (WnckWindow *win,
--		    decor_event *gtkwd_event,
--		    decor_event_type gtkwd_type)
--{
--    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
--    guint   state = d->button_states[BUTTON_ABOVE];
--
--    common_button_event (win, gtkwd_event, gtkwd_type,
--			 BUTTON_ABOVE, 1, _("Make Above"));
--
--    switch (gtkwd_type) {
--    case GButtonRelease:
--	if (gtkwd_event->button == 1)
--	    if (state == BUTTON_EVENT_ACTION_STATE)
--		wnck_window_make_above (win);
--	break;
--    default:
--	break;
--    }
--}
--
--void
--stick_button_event (WnckWindow *win,
--		    decor_event *gtkwd_event,
--		    decor_event_type gtkwd_type)
--{
--    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
--    guint   state = d->button_states[BUTTON_STICK];
--
--    common_button_event (win, gtkwd_event, gtkwd_type,
--			 BUTTON_STICK, 1, _("Stick"));
--
--    switch (gtkwd_type) {
--    case GButtonRelease:
--	if (gtkwd_event->button == 1)
--	    if (state == BUTTON_EVENT_ACTION_STATE)
--		wnck_window_stick (win);
--	break;
--    default:
--	break;
--    }
--}
--
--void
--unshade_button_event (WnckWindow *win,
--		      decor_event *gtkwd_event,
--		      decor_event_type gtkwd_type)
--{
--    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
--    guint   state = d->button_states[BUTTON_UNSHADE];
--
--    common_button_event (win, gtkwd_event, gtkwd_type,
--			 BUTTON_UNSHADE, 1, _("Unshade"));
--
--    switch (gtkwd_type) {
--    case GButtonRelease:
--	if (gtkwd_event->button == 1)
--	    if (state == BUTTON_EVENT_ACTION_STATE)
--		wnck_window_unshade (win);
--	break;
--    default:
--	break;
--    }
--}
--
--void
--unabove_button_event (WnckWindow *win,
--		      decor_event *gtkwd_event,
--		      decor_event_type gtkwd_type)
--{
--    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
--    guint   state = d->button_states[BUTTON_UNABOVE];
--
--    common_button_event (win, gtkwd_event, gtkwd_type,
--			 BUTTON_UNABOVE, 1, _("Unmake Above"));
--
--    switch (gtkwd_type) {
--    case GButtonRelease:
--	if (gtkwd_event->button == 1)
--	    if (state == BUTTON_EVENT_ACTION_STATE)
--		wnck_window_unmake_above (win);
--	break;
--    default:
--	break;
--    }
--}
--
--void
--unstick_button_event (WnckWindow *win,
--		      decor_event *gtkwd_event,
--		      decor_event_type gtkwd_type)
--{
--    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
--    guint   state = d->button_states[BUTTON_UNSTICK];
--
--    common_button_event (win, gtkwd_event, gtkwd_type,
--			 BUTTON_UNSTICK, 1, _("Unstick"));
--
--    switch (gtkwd_type) {
--    case GButtonRelease:
--	if (gtkwd_event->button == 1)
--	    if (state == BUTTON_EVENT_ACTION_STATE)
--		wnck_window_unstick (win);
--	break;
--    default:
--	break;
--    }
--}
--
- static void
- handle_title_button_event (WnckWindow   *win,
- 			   int          action,
-diff --git a/gtk/window-decorator/gtk-window-decorator.h b/gtk/window-decorator/gtk-window-decorator.h
-index b7d579b..6bf5d31 100644
---- a/gtk/window-decorator/gtk-window-decorator.h
-+++ b/gtk/window-decorator/gtk-window-decorator.h
-@@ -130,13 +130,7 @@ extern struct _cursor cursor[3][3];
- #define BUTTON_MAX     1
- #define BUTTON_MIN     2
- #define BUTTON_MENU    3
--#define BUTTON_SHADE   4
--#define BUTTON_ABOVE   5
--#define BUTTON_STICK   6
--#define BUTTON_UNSHADE 7
--#define BUTTON_UNABOVE 8
--#define BUTTON_UNSTICK 9
--#define BUTTON_NUM     10
-+#define BUTTON_NUM     4
- 
- struct _pos {
-     int x, y, w, h;
-@@ -540,35 +534,6 @@ menu_button_event (WnckWindow *win,
- 		   decor_event_type gtkwd_type);
- 
- void
--shade_button_event (WnckWindow *win,
--		    decor_event *gtkwd_event,
--		    decor_event_type gtkwd_type);
--
--void
--above_button_event (WnckWindow *win,
--		    decor_event *gtkwd_event,
--		    decor_event_type gtkwd_type);
--
--void
--stick_button_event (WnckWindow *win,
--		    decor_event *gtkwd_event,
--		    decor_event_type gtkwd_type);
--void
--unshade_button_event (WnckWindow *win,
--		      decor_event *gtkwd_event,
--		      decor_event_type gtkwd_type);
--
--void
--unabove_button_event (WnckWindow *win,
--		      decor_event *gtkwd_event,
--		      decor_event_type gtkwd_type);
--
--void
--unstick_button_event (WnckWindow *win,
--		      decor_event *gtkwd_event,
--		      decor_event_type gtkwd_type);
--
--void
- title_event (WnckWindow       *win,
- 	     decor_event      *gtkwd_event,
- 	     decor_event_type gtkwd_type);
-diff --git a/gtk/window-decorator/gwd-theme-cairo.c b/gtk/window-decorator/gwd-theme-cairo.c
-index e6da481..85f4202 100644
---- a/gtk/window-decorator/gwd-theme-cairo.c
-+++ b/gtk/window-decorator/gwd-theme-cairo.c
-@@ -495,12 +495,6 @@ button_present (decor_t *decor,
-             break;
- 
-         case BUTTON_MENU:
--        case BUTTON_SHADE:
--        case BUTTON_ABOVE:
--        case BUTTON_STICK:
--        case BUTTON_UNSHADE:
--        case BUTTON_UNABOVE:
--        case BUTTON_UNSTICK:
-             break;
- 
-         default:
-diff --git a/gtk/window-decorator/gwd-theme-metacity.c b/gtk/window-decorator/gwd-theme-metacity.c
-index 4ec5277..a0bc39c 100644
---- a/gtk/window-decorator/gwd-theme-metacity.c
-+++ b/gtk/window-decorator/gwd-theme-metacity.c
-@@ -95,18 +95,6 @@ meta_button_state_for_button_type (decor_t        *decor,
-             return meta_button_state (decor->button_states[BUTTON_MIN]);
-         case META_BUTTON_TYPE_MENU:
-             return meta_button_state (decor->button_states[BUTTON_MENU]);
--        case META_BUTTON_TYPE_SHADE:
--            return meta_button_state (decor->button_states[BUTTON_SHADE]);
--        case META_BUTTON_TYPE_ABOVE:
--            return meta_button_state (decor->button_states[BUTTON_ABOVE]);
--        case META_BUTTON_TYPE_STICK:
--            return meta_button_state (decor->button_states[BUTTON_STICK]);
--        case META_BUTTON_TYPE_UNSHADE:
--            return meta_button_state (decor->button_states[BUTTON_UNSHADE]);
--        case META_BUTTON_TYPE_UNABOVE:
--            return meta_button_state (decor->button_states[BUTTON_UNABOVE]);
--        case META_BUTTON_TYPE_UNSTICK:
--            return meta_button_state (decor->button_states[BUTTON_UNSTICK]);
-         default:
-             break;
-     }
-@@ -553,18 +541,6 @@ button_type_to_meta_button_type (gint button_type)
-             return META_BUTTON_TYPE_MAXIMIZE;
-         case BUTTON_CLOSE:
-             return META_BUTTON_TYPE_CLOSE;
--        case BUTTON_SHADE:
--            return META_BUTTON_TYPE_SHADE;
--        case BUTTON_ABOVE:
--            return META_BUTTON_TYPE_ABOVE;
--        case BUTTON_STICK:
--            return META_BUTTON_TYPE_STICK;
--        case BUTTON_UNSHADE:
--            return META_BUTTON_TYPE_UNSHADE;
--        case BUTTON_UNABOVE:
--            return META_BUTTON_TYPE_UNABOVE;
--        case BUTTON_UNSTICK:
--            return META_BUTTON_TYPE_UNSTICK;
-         default:
-             break;
-     }
-diff --git a/gtk/window-decorator/wnck.c b/gtk/window-decorator/wnck.c
-index cc43f65..4ac1483 100644
---- a/gtk/window-decorator/wnck.c
-+++ b/gtk/window-decorator/wnck.c
-@@ -667,13 +667,7 @@ window_opened (WnckScreen *screen,
- 	close_button_event,
- 	max_button_event,
- 	min_button_event,
--	menu_button_event,
--	shade_button_event,
--	above_button_event,
--	stick_button_event,
--	unshade_button_event,
--	unabove_button_event,
--	unstick_button_event
-+	menu_button_event
-     };
- 
-     d = calloc (1, sizeof (decor_t));