diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-07 02:06:42 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-07 02:06:42 -0500 |
| commit | 5f04ca85ef6a2ebc2d66842e261a676691e9b4de (patch) | |
| tree | 5d28851a47a36a7130426644573f0fe1b1a6b5e8 /data | |
| parent | 4435c3a438f092252f563d5fd97dffd440a164db (diff) | |
| parent | 307befd333dd89a990e541c37c8c3717e125dcdf (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
Diffstat (limited to 'data')
| -rw-r--r-- | data/rc.xml | 13 | ||||
| -rw-r--r-- | data/rc.xsd | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/data/rc.xml b/data/rc.xml index 86e0d9d6..ef3d9bdc 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -632,9 +632,17 @@ <!-- default menu file (or custom one in $HOME/.config/openbox/) --> <file>menu.xml</file> <hideDelay>200</hideDelay> + <!-- if a press-release lasts longer than this setting (in milliseconds), the + menu is hidden again --> <middle>no</middle> + <!-- center submenus vertically about the parent entry --> <submenuShowDelay>100</submenuShowDelay> + <!-- this one is easy, time to delay before showing a submenu after hovering + over the parent entry --> <applicationIcons>yes</applicationIcons> + <!-- controls if icons appear in the client-list-(combined-)menu --> + <manageDesktops>yes</manageDesktops> + <!-- show the manage desktops section in the client-list-(combined-)menu --> </menu> <applications> @@ -666,9 +674,12 @@ <shade>no</shade> # make the window shaded when it appears, or not - <position> + <position force="no"> # the position is only used if both an x and y coordinate are provided # (and not set to 'default') + # when force is "yes", then the window will be placed here even if it + # says you want it placed elsewhere. this is to override buggy + # applications who refuse to behave <x>center</x> # a number like 50, or 'center' to center on screen. use a negative number # to start from the right (or bottom for <y>), ie -50 is 50 pixels from the diff --git a/data/rc.xsd b/data/rc.xsd index bc8a8fe6..47eeed12 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -168,12 +168,14 @@ <xsd:element minOccurs="0" name="middle" type="ob:bool"/> <xsd:element minOccurs="0" name="submenuShowDelay" type="xsd:integer"/> <xsd:element minOccurs="0" name="applicationIcons" type="ob:bool"/> + <xsd:element minOccurs="0" name="manageDesktops" type="ob:bool"/> </xsd:complexType> <xsd:complexType name="window_position"> <xsd:element name="x" type="ob:center_or_int"/> <xsd:element name="y" type="ob:center_or_int"/> <xsd:element name="monitor" type="ob:mouse_or_int"/> <xsd:element minOccurs="0" name="head" type="xsd:string"/> + <xsd:attribute name="force" type="ob:bool"/> </xsd:complexType> <xsd:complexType name="application"> <xsd:element minOccurs="0" name="decor" type="xsd:bool"/> |