diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:36:06 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:51:38 -0500 |
| commit | 20b8fcfa33feeade5946bc7f3046705da5d164fe (patch) | |
| tree | 5199d13a9f18aa90ce51244c3c3eb6685d7673ab /data/rc.xsd | |
| parent | dc94a241c30484611688a8bfb5515577f017529e (diff) | |
| parent | d11ac82062d729be5d63c9c40c5c2bb312a8b8f1 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/config.c
openbox/event.c
openbox/extensions.c
openbox/focus_cycle_indicator.c
openbox/focus_cycle_popup.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
openbox/stacking.c
openbox/startupnotify.c
Diffstat (limited to 'data/rc.xsd')
| -rw-r--r-- | data/rc.xsd | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/data/rc.xsd b/data/rc.xsd index 0544cfd4..bc8a8fe6 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -54,7 +54,7 @@ </xsd:annotation> <xsd:element name="policy" type="ob:placementpolicy"/> <xsd:element name="center" type="ob:bool"/> - <xsd:element name="active" type="ob:bool"/> + <xsd:element name="monitor" type="ob:placementmonitor"/> </xsd:complexType> <xsd:complexType name="margins"> <xsd:annotation> @@ -402,6 +402,13 @@ <xsd:enumeration value="UnderMouse"/> </xsd:restriction> </xsd:simpleType> + <xsd:simpleType name="placementmonitor"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="Any"/> + <xsd:enumeration value="Mouse"/> + <xsd:enumeration value="Active"/> + </xsd:restriction> + </xsd:simpleType> <xsd:simpleType name="popupposition"> <xsd:restriction base="xsd:string"> <xsd:enumeration value="Top"/> |