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 | |
| 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')
| -rw-r--r-- | data/gnome-wm-properties/openbox.desktop | 3 | ||||
| -rw-r--r-- | data/rc.xml | 9 | ||||
| -rw-r--r-- | data/rc.xsd | 9 |
3 files changed, 16 insertions, 5 deletions
diff --git a/data/gnome-wm-properties/openbox.desktop b/data/gnome-wm-properties/openbox.desktop index eee0dd60..23e690e3 100644 --- a/data/gnome-wm-properties/openbox.desktop +++ b/data/gnome-wm-properties/openbox.desktop @@ -7,3 +7,6 @@ X-GNOME-WMName=Openbox # our config tool ConfigExec=obconf + +[Window Manager] +SessionManaged=true diff --git a/data/rc.xml b/data/rc.xml index 567ca28b..86e0d9d6 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -35,16 +35,17 @@ <center>yes</center> <!-- whether to place windows in the center of the free area found or the top left corner --> - <active>no</active> - <!-- force new windows ont the active monitor on a multi-head system, unless - they are part of an application already on another monitor --> + <monitor>Any</monitor> + <!-- with Smart placement on a multi-monitor system, try to place new windows + on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where + the active window is --> </placement> <theme> <name>Clearlooks</name> <titleLayout>NLIMC</titleLayout> <!-- - avaible characters are NDSLIMC, each can occur at most once. + available characters are NDSLIMC, each can occur at most once. N: window icon L: window label (AKA title). I: iconify 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"/> |