summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-08-06 00:57:45 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-08-06 00:57:45 +0800
commit8ebf031b11bdeabb89da44c28d6dc3d0cc140572 (patch)
treef2f76e48baf52b078236bc4371dec8f85dd8686d
parentf954b3b48d1747e18e75903f3aacbd5ba0fb1f41 (diff)
parentfea686f7e1d5e1ab46aa0463b78424f1e4aa0fbf (diff)
downloaddrunken-8ebf031b11bdeabb89da44c28d6dc3d0cc140572.tar.gz
drunken-8ebf031b11bdeabb89da44c28d6dc3d0cc140572.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/users/smspillaz/drunken
-rw-r--r--drunken.xml.in13
-rw-r--r--src/drunken.cpp3
-rw-r--r--src/drunken.h4
3 files changed, 17 insertions, 3 deletions
diff --git a/drunken.xml.in b/drunken.xml.in
index 7e4cfe6..e85bb21 100644
--- a/drunken.xml.in
+++ b/drunken.xml.in
@@ -1,7 +1,18 @@
+<?xml version="1.0"?>
<compiz>
<plugin name="drunken" useBcop="true">
<_short>Drunk</_short>
<_long>In case you are too poor to experience the real thing</_long>
+ <deps>
+ <relation type="after">
+ <plugin>composite</plugin>
+ <plugin>opengl</plugin>
+ </relation>
+ <requirement>
+ <plugin>composite</plugin>
+ <plugin>opengl</plugin>
+ </requirement>
+ </deps>
<options>
<option name="factor" type="float">
<_short>Factor</_short>
@@ -12,7 +23,7 @@
</option>
<option name="initiate_key" type="key">
<_short>Initiate</_short>
- <_long>Take a shot every time you press this</_long>
+ <_long>Toggle drunken.</_long>
<default>&lt;Super&gt;y</default>
</option>
</options>
diff --git a/src/drunken.cpp b/src/drunken.cpp
index faa05ed..5831e30 100644
--- a/src/drunken.cpp
+++ b/src/drunken.cpp
@@ -106,6 +106,7 @@ DrunkenScreen::toggle ()
DrunkenScreen::DrunkenScreen (CompScreen *screen) :
PluginClassHandler <DrunkenScreen, CompScreen> (screen),
+ screen (screen),
cScreen (CompositeScreen::get (screen)),
gScreen (GLScreen::get (screen)),
mEnabled (false)
@@ -137,4 +138,4 @@ DrunkenPluginVTable::init ()
return false;
return true;
-} \ No newline at end of file
+}
diff --git a/src/drunken.h b/src/drunken.h
index a3f8a5a..b0c15b0 100644
--- a/src/drunken.h
+++ b/src/drunken.h
@@ -8,6 +8,7 @@
class DrunkenScreen :
public PluginClassHandler <DrunkenScreen, CompScreen>,
+ public ScreenInterface,
public CompositeScreenInterface,
public GLScreenInterface,
public DrunkenOptions
@@ -16,6 +17,7 @@ class DrunkenScreen :
DrunkenScreen (CompScreen *);
+ CompScreen *screen;
CompositeScreen *cScreen;
GLScreen *gScreen;
@@ -75,4 +77,4 @@ class DrunkenPluginVTable :
public:
bool init ();
-}; \ No newline at end of file
+};