Merge branch 'backport' into work

[chaz/openbox] / data / rc.xml

diff --git a/data/rc.xml b/data/rc.xml
index ef3d9bdc9f3efe8979b6a92ed6c7ba9764c9a64d..1bd7ecc21ec7233b6624c76174ad3b02e7fcb43e 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -35,10 +35,16 @@
   <center>yes</center>
   <!-- whether to place windows in the center of the free area found or
        the top left corner -->
-  <monitor>Any</monitor>
+  <monitor>Active</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 -->
+  <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
+       from 1, specifying a particular monitor.  Or it can be one of the
+       following: 'Mouse' - where the mouse is, or
+                  'Active' - where the active window is -->
 </placement>
 
 <theme>
@@ -650,9 +656,11 @@
   # this is an example with comments through out. use these to make your
   # own rules, but without the comments of course.
 
-  <application name="first element of window's WM_CLASS property (see xprop)"
-              class="second element of window's WM_CLASS property (see xprop)"
-               role="the window's WM_WINDOW_ROLE property (see xprop)">
+  <application name="the window's _OB_NAME property (see obprop)"
+              class="the window's _OB_CLASS property (see obprop)"
+               role="the window's _OB_ROLE property (see obprop)"
+               type="the window's _NET_WM_WINDOW_TYPE (see obprob)..
+                      (if unspecified, then it is 'dialog' for child windows)">
   # the name or the class can be set, or both. this is used to match
   # windows when they appear. role can optionally be set as well, to
   # further restrict your matches.
@@ -661,6 +669,9 @@
   # used by a shell. you can use * to match any characters and ? to match
   # any single character.
 
+  # the type is one of: normal, dialog, splash, utility, menu, toolbar, dock,
+  #    or desktop
+
   # when multiple rules match a window, they will all be applied, in the
   # order that they appear in this list