Merge branch 'backport' into work

[chaz/openbox] / data / rc.xml

diff --git a/data/rc.xml b/data/rc.xml
index dc73fb53401271d5f26a0cd0b495b3a9bc27bcb9..e5eb9178a8bd0789fbbada31e1cf502be2a0f6ee 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -98,7 +98,16 @@
     <slant>normal</slant>
     <!-- 'italic' or 'normal' -->
   </font>
-  <font place="OnScreenDisplay">
+  <font place="ActiveOnScreenDisplay">
+    <name>sans</name>
+    <size>9</size>
+    <!-- font size in points -->
+    <weight>bold</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="InactiveOnScreenDisplay">
     <name>sans</name>
     <size>9</size>
     <!-- font size in points -->
@@ -678,10 +687,10 @@
   # this is an example with comments through out. use these to make your
   # own rules, but without the comments of course.
 
-  <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)..
+  <application name="the window's _OB_NAME property (see obxprop)"
+              class="the window's _OB_CLASS property (see obxprop)"
+               role="the window's _OB_ROLE property (see obxprop)"
+               type="the window's _NET_WM_WINDOW_TYPE (see obxprob)..
                       (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