diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/autostart/openbox-autostart.in | 4 | ||||
| -rw-r--r-- | data/rc.xml | 9 | ||||
| -rw-r--r-- | data/rc.xsd | 18 |
3 files changed, 24 insertions, 7 deletions
diff --git a/data/autostart/openbox-autostart.in b/data/autostart/openbox-autostart.in index 3b2f5ec5..063c635f 100755 --- a/data/autostart/openbox-autostart.in +++ b/data/autostart/openbox-autostart.in @@ -11,7 +11,7 @@ elif which xsetroot >/dev/null; then fi test -z $BG || $BG -solid "#303030" -GLOBALAUTOSTART="@configdir@/autostart" +GLOBALAUTOSTART="@rcdir@/autostart" AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart" # Run the global openbox autostart script @@ -31,4 +31,4 @@ fi # Run the XDG autostart stuff. These are found in /etc/xdg/autostart and # in $HOME/.config/autostart. This requires PyXDG to be installed. # See openbox-xdg-autostart --help for more details. -@libexecdir@/openbox-xdg-autostart OPENBOX +@libexecdir@/openbox-xdg-autostart "$@" diff --git a/data/rc.xml b/data/rc.xml index 21b0c87f..7598a72c 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -3,7 +3,8 @@ <!-- Do not edit this file, it will be overwritten on install. Copy the file to $HOME/.config/openbox/ instead. --> -<openbox_config xmlns="http://openbox.org/3.4/rc"> +<openbox_config xmlns="http://openbox.org/3.4/rc" + xmlns:xi="http://www.w3.org/2001/XInclude"> <resistance> <strength>10</strength> @@ -35,10 +36,10 @@ <center>yes</center> <!-- whether to place windows in the center of the free area found or the top left corner --> - <monitor>Active</monitor> + <monitor>Primary</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 --> + the active window is, 'Primary' - only on the primary monitor --> <primaryMonitor>1</primaryMonitor> <!-- The monitor where Openbox should place popup dialogs such as the focus cycling popup, or the desktop switch popup. It can be an index @@ -310,7 +311,7 @@ </keyboard> <mouse> - <dragThreshold>8</dragThreshold> + <dragThreshold>1</dragThreshold> <!-- number of pixels the mouse must move before a drag begins --> <doubleClickTime>200</doubleClickTime> <!-- in milliseconds (1000 = 1 second) --> diff --git a/data/rc.xsd b/data/rc.xsd index 3a1d654a..ad96994a 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -72,6 +72,7 @@ <xsd:element minOccurs="0" name="policy" type="ob:placementpolicy"/> <xsd:element minOccurs="0" name="center" type="ob:bool"/> <xsd:element minOccurs="0" name="monitor" type="ob:placementmonitor"/> + <xsd:element minOccurs="0" name="monitor" type="ob:primarymonitor"/> </xsd:sequence> </xsd:complexType> <xsd:complexType name="margins"> @@ -170,7 +171,7 @@ <xsd:element minOccurs="0" name="edge" type="xsd:string"/> <xsd:element minOccurs="0" name="wrap" type="ob:bool"/> <xsd:element minOccurs="0" name="follow" type="ob:bool"/> - <xsd:element minOccurs="0" name="dialog" type="ob:bool"/> + <xsd:element minOccurs="0" name="dialog" type="ob:dialogtype"/> <xsd:element minOccurs="0" name="panels" type="ob:bool"/> <xsd:element minOccurs="0" name="here" type="ob:bool"/> <xsd:element minOccurs="0" name="linear" type="ob:bool"/> @@ -517,6 +518,14 @@ <xsd:enumeration value="Any"/> <xsd:enumeration value="Mouse"/> <xsd:enumeration value="Active"/> + <xsd:enumeration value="Primary"/> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="primarymonitor"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="Mouse"/> + <xsd:enumeration value="Active"/> + <xsd:enumeration value="[0-9][0-9][0-9][0-9][0-9]"/> </xsd:restriction> </xsd:simpleType> <xsd:simpleType name="popupposition"> @@ -532,4 +541,11 @@ <xsd:enumeration value="Nonpixel"/> </xsd:restriction> </xsd:simpleType> + <xsd:simpleType name="dialogtype"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="None"/> + <xsd:enumeration value="Icons"/> + <xsd:enumeration value="List"/> + </xsd:restriction> + </xsd:simpleType> </xsd:schema> |