summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@opencompositing.org>2007-08-20 16:57:56 +0200
committerDennis Kasprzyk <onestone@opencompositing.org>2007-08-20 16:57:56 +0200
commit138be155c81ec6009f8f452df0c4783dc87282e8 (patch)
treefbfad78fb53796c0440c5437efa94127022cc1f4
parentd496117b6f1d5c97607bd5cf9b9fff51266c79ec (diff)
downloadmswitch-138be155c81ec6009f8f452df0c4783dc87282e8.tar.gz
mswitch-138be155c81ec6009f8f452df0c4783dc87282e8.tar.bz2
New action system
-rw-r--r--mswitch.c6
-rw-r--r--mswitch.xml.in11
2 files changed, 10 insertions, 7 deletions
diff --git a/mswitch.c b/mswitch.c
index e60f86c..781e124 100644
--- a/mswitch.c
+++ b/mswitch.c
@@ -103,8 +103,10 @@ static Bool mswitchTerminate(CompDisplay *d, CompAction * action,
static Bool mswitchInitDisplay(CompPlugin *p,
CompDisplay *d)
{
- mswitchSetBeginInitiate(d, mswitchBegin);
- mswitchSetBeginTerminate(d, mswitchTerminate);
+ mswitchSetBeginKeyInitiate(d, mswitchBegin);
+ mswitchSetBeginKeyTerminate(d, mswitchTerminate);
+ mswitchSetBeginButtonInitiate(d, mswitchBegin);
+ mswitchSetBeginButtonTerminate(d, mswitchTerminate);
return TRUE;
}
diff --git a/mswitch.xml.in b/mswitch.xml.in
index 33598a2..2bb24d0 100644
--- a/mswitch.xml.in
+++ b/mswitch.xml.in
@@ -4,13 +4,14 @@
<_long>Switch viewport in response to mouse gesture</_long>
<category>Desktop</category>
<display>
- <option name="begin" type="action">
+ <option name="begin_key" type="key">
+ <_short>Begin Gesture</_short>
+ <_long> Begin Mouse Gesture </_long>
+ <default>&lt;Super&gt;s</default>
+ </option>
+ <option name="begin_button" type="button">
<_short>Begin Gesture</_short>
<_long> Begin Mouse Gesture </_long>
- <allowed key="true" button="true"/>
- <default>
- <key>&lt;Super&gt;s</key>
- </default>
</option>
</display>
</plugin>