Merge branch 'compiz++' of git+ssh://smspillaz@git.compiz-fusion.org/git/fusion/plugins/mousepoll into compiz++

Conflicts:

	src/mousepoll.cpp

7 files changed, 21 insertions, 574 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 306fc37..abc6a57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,5 @@
-include (CompizFusion)
+find_package (Compiz REQUIRED)
 
-compiz_fusion_plugin (mousepoll)
+include (CompizPlugin)
+
+compiz_plugin (mousepoll)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 3c2a903..0000000
--- a/Makefile
+++ /dev/null
@@ -1,509 +0,0 @@
-##
-#
-# Compiz plugin Makefile
-#
-# Copyright : (C) 2007 by Dennis Kasprzyk
-# E-mail    : onestone@deltatauchi.de
-#
-#
-# 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.
-#
-##
-
-# plugin.info file contents
-# 
-# PLUGIN = foo
-# PKG_DEP = pango
-# LDFLAGS_ADD = -lGLU
-# CFLAGS_ADD = -I/usr/include/foo
-# CHK_HEADERS = compiz-cube.h
-#
-
-#load config file
-
-ECHO	  = `which echo`
-
-# default color settings
-color := $(shell if [ $$TERM = "dumb" ]; then $(ECHO) "no"; else $(ECHO) "yes"; fi)
-
-ifeq ($(shell if [ -f plugin.info ]; then $(ECHO) -n "found"; fi ),found)
-include plugin.info
-else
-$(error $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\033[1;31m[ERROR]\033[0m \"plugin.info\" file not found"; \
-	else \
-		$(ECHO) "[ERROR] \"plugin.info\" file not found"; \
-	fi;))
-endif
-
-ifneq ($(shell if pkg-config --exists compiz; then $(ECHO) -n "found"; fi ),found)
-$(error $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[1;31m[ERROR]\033[0m Compiz not installed"; \
-	else \
-		$(ECHO) -n "[ERROR] Compiz not installed"; \
-	fi))
-endif
-
-
-ifneq ($(shell if [ -n "$(PKG_DEP)" ]; then if pkg-config --exists $(PKG_DEP); then $(ECHO) -n "found"; fi; \
-       else $(ECHO) -n "found"; fi ),found)
-$(error $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[1;31m[ERROR]\033[0m "; \
-	else \
-		$(ECHO) -n "[ERROR] "; \
-	fi; \
-	pkg-config --print-errors --short-errors --errors-to-stdout $(PKG_DEP); ))
-endif
-
-
-ifeq ($(BUILD_GLOBAL),true)
-	PREFIX = $(shell pkg-config --variable=prefix compiz)
-	CLIBDIR = $(shell pkg-config --variable=libdir compiz)
-	CINCDIR = $(shell pkg-config --variable=includedir compiz)
-	PKGDIR = $(CLIBDIR)/pkgconfig
-	DESTDIR = $(shell pkg-config --variable=libdir compiz)/compiz
-	XMLDIR = $(shell pkg-config --variable=prefix compiz)/share/compiz
-	IMAGEDIR = $(shell pkg-config --variable=prefix compiz)/share/compiz
-	DATADIR = $(shell pkg-config --variable=prefix compiz)/share/compiz
-else
-	DESTDIR = $(HOME)/.compiz/plugins
-	XMLDIR = $(HOME)/.compiz/metadata
-	IMAGEDIR = $(HOME)/.compiz/images
-	DATADIR = $(HOME)/.compiz/data
-endif
-
-BUILDDIR = build
-
-CC        = gcc
-CPP       = g++
-LIBTOOL   = libtool
-INSTALL   = install
-
-BCOP      = `pkg-config --variable=bin bcop`
-
-CFLAGS    = -g -Wall -Wpointer-arith -fno-strict-aliasing `pkg-config --cflags $(PKG_DEP) compiz ` $(CFLAGS_ADD)
-LDFLAGS   = `pkg-config --libs $(PKG_DEP) compiz ` $(LDFLAGS_ADD)
-
-DEFINES   = -DIMAGEDIR=\"$(IMAGEDIR)\" -DDATADIR=\"$(DATADIR)\"
-
-POFILEDIR = $(shell if [ -n "$(PODIR)" ]; then $(ECHO) $(PODIR); else $(ECHO) ./po;fi )
-
-COMPIZ_HEADERS = compiz.h core/core.h
-COMPIZ_INC = $(shell pkg-config --variable=includedir compiz)/compiz/
-
-is-bcop-target  := $(shell if [ -e $(PLUGIN).xml.in ]; then cat $(PLUGIN).xml.in | grep "useBcop=\"true\""; \
-		     else if [ -e $(PLUGIN).xml ]; then cat $(PLUGIN).xml | grep "useBcop=\"true\""; fi; fi)
-
-trans-target    := $(shell if [ -e $(PLUGIN).xml.in -o -e $(PLUGIN).xml ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml;fi )
-
-bcop-target     := $(shell if [ -n "$(is-bcop-target)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml; fi )
-bcop-target-hdr := $(shell if [ -n "$(is-bcop-target)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN)_options.h; fi )
-
-gen-schemas     := $(shell if [ \( -e $(PLUGIN).xml.in -o -e $(PLUGIN).xml \) -a -n "`pkg-config --variable=xsltdir compiz-gconf`" ]; then $(ECHO) true; fi )
-schema-target   := $(shell if [ -n "$(gen-schemas)" ]; then $(ECHO) $(BUILDDIR)/$(PLUGIN).xml; fi )
-schema-output   := $(shell if [ -n "$(gen-schemas)" ]; then $(ECHO) $(BUILDDIR)/compiz-$(PLUGIN).schema; fi )
-
-ifeq ($(BUILD_GLOBAL),true)
-    pkg-target         := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" ]; then $(ECHO) "$(BUILDDIR)/compiz-$(PLUGIN).pc"; fi )
-    hdr-install-target := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" -a -e $(PLUGIN).h ]; then $(ECHO) "$(PLUGIN).h"; fi )
-    hdr-install-dir := $(shell if [ -e compiz-$(PLUGIN).pc.in -a -n "$(PREFIX)" -a -d "$(PREFIX)" -a -e $(PLUGIN).h ]; then $(ECHO) "$(PLUGIN)"; fi )
-endif
-
-# find all the object files
-
-c-objs     := $(patsubst %.cpp,%.lo,$(shell find -name '*.cpp' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///'))
-c-objs     += $(patsubst %.cxx,%.lo,$(shell find -name '*.cxx' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///'))
-
-h-files    := $(shell find -name '*.h' 2> /dev/null | grep -v "$(BUILDDIR)/" | sed -e 's/^.\///')
-h-files    += $(bcop-target-hdr)
-h-files    += $(foreach file,$(COMPIZ_HEADERS) $(CHK_HEADERS),$(shell $(ECHO) -n "$(COMPIZ_INC)$(file)"))
-
-all-c-objs := $(addprefix $(BUILDDIR)/,$(c-objs)) 
-
-# additional files
-
-data-files  := $(shell find data/  -name '*' -type f 2> /dev/null | sed -e 's/data\///')
-image-files := $(shell find images/ -name '*' -type f 2> /dev/null | sed -e 's/images\///')
-
-# system include path parameter, -isystem doesn't work on old gcc's
-inc-path-param = $(shell if [ -z "`gcc --version | head -n 1 | grep ' 3'`" ]; then $(ECHO) "-isystem"; else $(ECHO) "-I"; fi)
-
-# Tests
-ifeq ($(shell if [ -n "$(is-bcop-target)" -a -z "$(BCOP)" ]; then $(ECHO) -n "error"; fi ),error)
-$(error $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[1;31m[ERROR]\033[0m BCOP not installed but is needed to build plugin"; \
-	else \
-		$(ECHO) -n "[ERROR] BCOP not installed but is needed to build plugin"; \
-	fi))
-endif
-
-ifeq ($(shell if [ "x$(BUILD_GLOBAL)" != "xtrue" -a -e compiz-$(PLUGIN).pc.in ]; then $(ECHO) -n "warn"; fi ),warn)
-$(warning $(shell if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[1;31m[WARNING]\033[0m This plugin might be needed by other plugins. Install it with \"BUILD_GLOBAL=true sudo make install\" "; \
-	else \
-		$(ECHO) -n "[WARNING]  This plugin might be needed by other plugins. Install it with \"BUILD_GLOBAL=true sudo make install\""; \
-	fi))
-endif
-
-#
-# Do it.
-#
-
-.PHONY: $(BUILDDIR) build-dir trans-target bcop-build pkg-creation schema-creation c-build-objs c-link-plugin
-
-all: $(BUILDDIR) build-dir trans-target bcop-build pkg-creation schema-creation c-build-objs c-link-plugin
-
-trans-build: $(trans-target)
-
-bcop-build:   $(bcop-target-hdr) $(bcop-target-src)
-
-schema-creation: $(schema-output)
-
-c-build-objs: $(all-c-objs)
-
-c-link-plugin: $(BUILDDIR)/lib$(PLUGIN).la
-
-pkg-creation: $(pkg-target)
-
-#
-# Create build directory
-#
-
-$(BUILDDIR) :
-	@mkdir -p $(BUILDDIR)
-
-$(DESTDIR) :
-	@mkdir -p $(DESTDIR)
-
-#
-# fallback if xml.in doesn't exists
-#
-$(BUILDDIR)/%.xml: %.xml
-	@cp $< $@
-
-#
-# Translating
-#
-$(BUILDDIR)/%.xml: %.xml.in
-	@if [ -d $(POFILEDIR) ]; then \
-		if [ '$(color)' != 'no' ]; then \
-			$(ECHO) -e -n "\033[0;1;5mtranslate \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-		else \
-			$(ECHO) "translate $<  ->  $@"; \
-		fi; \
-		intltool-merge -x -u $(POFILEDIR) $< $@ > /dev/null; \
-		if [ '$(color)' != 'no' ]; then \
-			$(ECHO) -e "\r\033[0mtranslate : \033[34m$< -> $@\033[0m"; \
-		fi; \
-	else \
-		if [ '$(color)' != 'no' ]; then \
-			$(ECHO) -e -n "\033[0;1;5mconvert   \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-		else \
-			$(ECHO) "convert   $<  ->  $@"; \
-		fi; \
-		cat $< | sed -e 's;<_;<;g' -e 's;</_;</;g' > $@; \
-		if [ '$(color)' != 'no' ]; then \
-			$(ECHO) -e "\r\033[0mconvert   : \033[34m$< -> $@\033[0m"; \
-		fi; \
-	fi
-
-#
-# BCOP'ing
-
-$(BUILDDIR)/%_options.h: $(BUILDDIR)/%.xml
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mbcop'ing  \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "bcop'ing  $<  ->  $@"; \
-	fi
-	@$(BCOP) --header=$@ $<
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mbcop'ing  : \033[34m$< -> $@\033[0m"; \
-	fi
-
-$(BUILDDIR)/%_options.c: $(BUILDDIR)/%.xml
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mbcop'ing  \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "bcop'ing  $<  ->  $@"; \
-	fi
-	@$(BCOP) --source=$@ $< 
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mbcop'ing  : \033[34m$< -> $@\033[0m"; \
-	fi
-
-#
-# Schema generation
-
-$(BUILDDIR)/compiz-%.schema: $(BUILDDIR)/%.xml
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mschema'ing\033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "schema'ing  $<  ->  $@"; \
-	fi
-	@xsltproc `pkg-config --variable=xsltdir compiz-gconf`/schemas.xslt $< > $@
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mschema    : \033[34m$< -> $@\033[0m"; \
-	fi
-
-#
-# pkg config file generation
-
-$(BUILDDIR)/compiz-%.pc: compiz-%.pc.in
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mpkgconfig \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "pkgconfig   $<  ->  $@"; \
-	fi
-	@COMPIZREQUIRES=`cat $(PKGDIR)/compiz.pc | grep Requires | sed -e 's;Requires: ;;g'`; \
-    COMPIZCFLAGS=`cat $(PKGDIR)/compiz.pc | grep Cflags | sed -e 's;Cflags: ;;g'`; \
-    sed -e 's;@prefix@;$(PREFIX);g' -e 's;\@libdir@;$(CLIBDIR);g' \
-        -e 's;@includedir@;$(CINCDIR);g' -e 's;\@VERSION@;0.0.1;g' \
-        -e "s;@COMPIZ_REQUIRES@;$$COMPIZREQUIRES;g" \
-        -e "s;@COMPIZ_CFLAGS@;$$COMPIZCFLAGS;g" $< > $@;
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mpkgconfig : \033[34m$< -> $@\033[0m"; \
-	fi
-
-#
-# Compiling
-#
-
-$(BUILDDIR)/%.lo: %.cpp $(h-files)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "compiling $< -> $@"; \
-	fi
-	@$(LIBTOOL) --quiet --mode=compile $(CPP) $(CFLAGS) $(DEFINES) -I$(BUILDDIR) -c -o $@ $<
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
-	fi
-
-$(BUILDDIR)/%.lo: %.cxx $(h-files)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5mcompiling \033[0m: \033[0;32m$< \033[0m-> \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "compiling $< -> $@"; \
-	fi
-	@$(LIBTOOL) --mode=compile $(CPP) $(CFLAGS) $(DEFINES) -I$(BUILDDIR) -c -o $@ $<
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mcompiling : \033[34m$< -> $@\033[0m"; \
-	fi
-
-#
-# Linking
-#
-
-cxx-rpath-prefix := -Wl,-rpath,
-
-$(BUILDDIR)/lib$(PLUGIN).la: $(all-c-objs)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mlinking   \033[0m: \033[0;31m$@\033[0m"; \
-	else \
-		$(ECHO) "linking   : $@"; \
-	fi
-	@$(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(DESTDIR) -o $@ $(all-c-objs) -R `pkg-config --variable=libdir compiz`/compiz
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mlinking   : \033[34m$@\033[0m"; \
-	fi
-
-
-clean:
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e -n "\033[0;1;5mremoving  \033[0m: \033[0;31m./$(BUILDDIR)\033[0m"; \
-	else \
-		$(ECHO) "removing  : ./$(BUILDDIR)"; \
-	fi
-	@rm -rf $(BUILDDIR)
-	@if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0mremoving  : \033[34m./$(BUILDDIR)\033[0m"; \
-	fi
-	
-
-install: $(DESTDIR) all
-	@if [ '$(color)' != 'no' ]; then \
-	    $(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
-	else \
-	    $(ECHO) "install   : $(DESTDIR)/lib$(PLUGIN).so"; \
-	fi
-	@mkdir -p $(DESTDIR)
-	@$(INSTALL) $(BUILDDIR)/.libs/lib$(PLUGIN).so $(DESTDIR)/lib$(PLUGIN).so
-	@if [ '$(color)' != 'no' ]; then \
-	    $(ECHO) -e "\r\033[0minstall   : \033[34m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
-	fi
-	@if [ -e $(BUILDDIR)/$(PLUGIN).xml ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
-	    else \
-		$(ECHO) "install   : $(XMLDIR)/$(PLUGIN).xml"; \
-	    fi; \
-	    mkdir -p $(XMLDIR); \
-	    $(INSTALL)  $(BUILDDIR)/$(PLUGIN).xml $(XMLDIR)/$(PLUGIN).xml; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0minstall   : \033[34m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(hdr-install-target)" ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target)\033[0m"; \
-	    else \
-		$(ECHO) "install   : $(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target)"; \
-	    fi; \
-	    mkdir -p -m 655 $(CINCDIR)/compiz/$(hdr-install-dir);\
-	    $(INSTALL) --mode=u=rw,go=r,a-s $(hdr-install-target) $(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target); \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0minstall   : \033[34m$(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target)\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(pkg-target)" ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
-	    else \
-		$(ECHO) "install   : $(PKGDIR)/compiz-$(PLUGIN).pc"; \
-	    fi; \
-	    $(INSTALL) --mode=u=rw,go=r,a-s $(pkg-target) $(PKGDIR)/compiz-$(PLUGIN).pc; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0minstall   : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(schema-output)" -a -e "$(schema-output)" ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(schema-output)\033[0m"; \
-	    else \
-		$(ECHO) "install   : $(schema-output)"; \
-	    fi; \
-	    if [ "x$(USER)" = "xroot" ]; then \
-		GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-		gconftool-2 --makefile-install-rule $(schema-output) > /dev/null; \
-	    else \
-		gconftool-2 --install-schema-file=$(schema-output) > /dev/null; \
-	    fi; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0minstall   : \033[34m$(schema-output)\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(data-files)" ]; then \
-	    mkdir -p $(DATADIR); \
-	    for FILE in $(data-files); do \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(DATADIR)/$$FILE\033[0m"; \
-		else \
-		    $(ECHO) "install   : $(DATADIR)/$$FILE"; \
-		fi; \
-	    	FILEDIR="$(DATADIR)/`dirname "$$FILE"`"; \
-		mkdir -p "$$FILEDIR"; \
-		$(INSTALL) --mode=u=rw,go=r,a-s data/$$FILE $(DATADIR)/$$FILE; \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -e "\r\033[0minstall   : \033[34m$(DATADIR)/$$FILE\033[0m"; \
-		fi; \
-	    done \
-	fi
-	@if [ -n "$(image-files)" ]; then \
-	    mkdir -p $(IMAGEDIR); \
-	    for FILE in $(image-files); do \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -n -e "\033[0;1;5minstall   \033[0m: \033[0;31m$(IMAGEDIR)/$$FILE\033[0m"; \
-		else \
-		    $(ECHO) "install   : $(IMAGEDIR)/$$FILE"; \
-		fi; \
-	    	FILEDIR="$(IMAGEDIR)/`dirname "$$FILE"`"; \
-		mkdir -p "$$FILEDIR"; \
-		$(INSTALL) --mode=u=rw,go=r,a-s images/$$FILE $(IMAGEDIR)/$$FILE; \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -e "\r\033[0minstall   : \033[34m$(IMAGEDIR)/$$FILE\033[0m"; \
-		fi; \
-	    done \
-	fi
-
-uninstall:	
-	@if [ -e $(DESTDIR)/lib$(PLUGIN).so ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(DESTDIR)/lib$(PLUGIN).so"; \
-	    fi; \
-	    rm -f $(DESTDIR)/lib$(PLUGIN).so; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
-	    fi; \
-	fi
-	@if [ -e $(XMLDIR)/$(PLUGIN).xml ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(XMLDIR)/$(PLUGIN).xml"; \
-	    fi; \
-	    rm -f $(XMLDIR)/$(PLUGIN).xml; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(XMLDIR)/$(PLUGIN).xml\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(hdr-install-target)" -a -e $(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target) ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target)\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target)"; \
-	    fi; \
-	    rm -rf $(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target); \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(CINCDIR)/compiz/$(hdr-install-dir)/$(hdr-install-target))\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(pkg-target)" -a -e $(PKGDIR)/compiz-$(PLUGIN).pc ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(PKGDIR)/compiz-$(PLUGIN).pc"; \
-	    fi; \
-	    rm -f $(PKGDIR)/compiz-$(PLUGIN).pc; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(PKGDIR)/compiz-$(PLUGIN).pc\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(schema-output)" -a -e "$(schema-output)" -a 'x$(USER)' = 'xroot' ]; then \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(schema-output)\033[0m"; \
-	    else \
-		$(ECHO) "uninstall : $(schema-output)"; \
-	    fi; \
-	    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-	    gconftool-2 --makefile-uninstall-rule $(schema-output) > /dev/null; \
-	    if [ '$(color)' != 'no' ]; then \
-		$(ECHO) -e "\r\033[0muninstall : \033[34m$(schema-output)\033[0m"; \
-	    fi; \
-	fi
-	@if [ -n "$(data-files)" ]; then \
-	    for FILE in $(data-files); do \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(DATADIR)/$$FILE\033[0m"; \
-		else \
-		    $(ECHO) "uninstall : $(DATADIR)/$$FILE"; \
-		fi; \
-		rm -f $(DATADIR)/$$FILE; \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -e "\r\033[0muninstall : \033[34m$(DATADIR)/$$FILE\033[0m"; \
-		fi; \
-	    done \
-	fi
-	@if [ -n "$(image-files)" ]; then \
-	    for FILE in $(image-files); do \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(IMAGEDIR)/$$FILE\033[0m"; \
-		else \
-		    $(ECHO) "uninstall : $(IMAGEDIR)/$$FILE"; \
-		fi; \
-		rm -f $(IMAGEDIR)/$$FILE; \
-		if [ '$(color)' != 'no' ]; then \
-		    $(ECHO) -e "\r\033[0muninstall : \033[34m$(IMAGEDIR)/$$FILE\033[0m"; \
-		fi; \
-	    done \
-	fi
diff --git a/mousepoll.h b/include/mousepoll/mousepoll.h
index e0469fd..e0469fd 100644
--- a/mousepoll.h
+++ b/include/mousepoll/mousepoll.h
diff --git a/mousepoll.xml.in b/mousepoll.xml.in
index 4eec26e..3cbc50b 100644
--- a/mousepoll.xml.in
+++ b/mousepoll.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <compiz>
-    <plugin name="mousepoll">
+    <plugin name="mousepoll" useBcop="true">
 	<_short>Mouse position polling</_short>
 	<_long>Updates the mouse pointer position from the xserver</_long>
 	<category>Utility</category>
diff --git a/plugin.info b/plugin.info
deleted file mode 100644
index d23fcce..0000000
--- a/plugin.info
+++ /dev/null
@@ -1 +0,0 @@
-PLUGIN = mousepoll
diff --git a/mousepoll.cpp b/src/mousepoll.cpp
index 62de988..5fcd215 100644
--- a/mousepoll.cpp
+++ b/src/mousepoll.cpp
@@ -22,7 +22,7 @@
 
 #include "private.h"
 
-COMPIZ_PLUGIN_20081216 (mousepoll, MousepollPluginVTable);
+COMPIZ_PLUGIN_20090315 (mousepoll, MousepollPluginVTable);
 
 bool
 MousepollScreen::getMousePosition ()
@@ -215,61 +215,22 @@ MousePoller::~MousePoller ()
     if (mActive)
 	stop ();
 }
-static const CompMetadata::OptionInfo mousepollOptionInfo[] = {
-    { "mouse_poll_interval", "int", "<min>1</min><max>500</max>", 0, 0 }
-};
 
-CompOption::Vector &
-MousepollScreen::getOptions ()
-{
-    return opt;
-}
-
-bool
-MousepollScreen::setOption (const char        *name,
-			    CompOption::Value &value)
+void
+MousepollScreen::updateTimer ()
 {
-    CompOption   *o;
-    unsigned int index;
-
-    o = CompOption::findOption (opt, name, &index);
-    if (!o)
-	return false;
-
-    switch (index) {
-    case MP_OPTION_MOUSE_POLL_INTERVAL:
-	if (o->set (value))
-	{
-	    int timeout = o->value ().i ();
-	    timer.setTimes (timeout, (float) timeout * 1.5);
-
-	    return true;
-	}
-	break;
-    default:
-	return CompOption::setOption (*o, value);
-    }
+    float timeout = optionGetMousePollInterval ();
+    timer.setTimes (timeout, timeout * 1.5);
 
-    return false;
 }
 
 MousepollScreen::MousepollScreen (CompScreen *screen) :
-    PrivateHandler <MousepollScreen, CompScreen, COMPIZ_MOUSEPOLL_ABI> (screen),
-    opt (MP_OPTION_NUM),
-    empty (true)
+    PluginClassHandler <MousepollScreen, CompScreen, COMPIZ_MOUSEPOLL_ABI> (screen)
 {
-    int timeout;
-
-    if (!mousepollVTable->getMetadata ()->initOptions (mousepollOptionInfo,
-						       MP_OPTION_NUM, opt))
-    {
-	setFailed ();
-	return;
-    }
-
-    timeout = opt[MP_OPTION_MOUSE_POLL_INTERVAL].value ().i ();
+    updateTimer ();
     timer.setCallback (boost::bind (&MousepollScreen::updatePosition, this));
-    timer.setTimes (timeout, (float) timeout * 1.5);
+
+    optionSetMousePollIntervalNotify (boost::bind (&MousepollScreen::updateTimer, this));
 }
 
 bool
@@ -278,9 +239,6 @@ MousepollPluginVTable::init ()
     if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
 	return false;
 
-    getMetadata ()->addFromOptionInfo (mousepollOptionInfo, MP_OPTION_NUM);
-    getMetadata ()->addFromFile (name ());
-
     CompPrivate p;
     p.uval = COMPIZ_MOUSEPOLL_ABI;
     screen->storeValue ("mousepoll_ABI", p);
diff --git a/private.h b/src/private.h
index 34662cf..b9b4301 100644
--- a/private.h
+++ b/src/private.h
@@ -21,10 +21,12 @@
  */
 
 #include <core/core.h>
-#include <core/privatehandler.h>
+#include <core/pluginclasshandler.h>
 #include <core/timer.h>
 
-#include "mousepoll.h"
+#include <mousepoll/mousepoll.h>
+
+#include "mousepoll_options.h"
 
 typedef enum _MousepollOptions
 {
@@ -36,12 +38,11 @@ typedef enum _MousepollOptions
 #define MP_OPTION_NUM 1
 
 class MousepollScreen :
-    public PrivateHandler <MousepollScreen, CompScreen, COMPIZ_MOUSEPOLL_ABI>
+    public PluginClassHandler <MousepollScreen, CompScreen, COMPIZ_MOUSEPOLL_ABI>,
+    public MousepollOptions
 {
     public:
 
-	CompOption::Vector opt;
-
 	MousepollScreen (CompScreen *screen);
 
 	std::list<MousePoller *> pollers;
@@ -61,8 +62,7 @@ class MousepollScreen :
 	void
 	removeTimer (MousePoller *poller);
 
-	CompOption::Vector & getOptions ();
-	bool setOption (const char *name, CompOption::Value &value);
+	void updateTimer ();
 };
 
 #define MOUSEPOLL_SCREEN(s)						\
@@ -77,8 +77,5 @@ class MousepollPluginVTable :
 
 	bool init ();
 	void fini ();
-
-	PLUGIN_OPTION_HELPER (MousepollScreen);
-
 };