X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=data%2Frc.xml;h=86e0d9d691967bfca2fbeb30f4d34e6e8dcd401c;hb=0dc7eca4cdfff6425e19a0bace0f9ae8834d04e8;hp=a5e9bd117ee2c53ce3e32cbad1cf937eca583ac1;hpb=3a08c1854fd2122ff6bb8de967e5d038a39491af;p=chaz%2Fopenbox

diff --git a/data/rc.xml b/data/rc.xml
index a5e9bd11..86e0d9d6 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -32,13 +32,20 @@
 <placement>
   <policy>Smart</policy>
   <!-- 'Smart' or 'UnderMouse' -->
+  <center>yes</center>
+  <!-- whether to place windows in the center of the free area found or
+       the top left corner -->
+  <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
@@ -113,6 +120,9 @@
     <name>desktop 2</name>
     -->
   </names>
+  <popupTime>875</popupTime>
+  <!-- The number of milliseconds to show the popup for when switching
+       desktops.  Set this to 0 to disable the popup. -->
 </desktops>
 
 <resize>
@@ -120,9 +130,30 @@
   <popupShow>Nonpixel</popupShow>
   <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
   <popupPosition>Center</popupPosition>
-  <!-- 'Center' or 'Top' -->
+  <!-- 'Center', 'Top', or 'Fixed' -->
+  <popupFixedPosition>
+    <!-- these are used if popupPosition is set to 'Fixed' -->
+
+    <x>10</x>
+    <!-- positive number for distance from left edge, negative number for
+         distance from right edge, or 'Center' -->
+    <y>10</y>
+    <!-- positive number for distance from top edge, negative number for
+         distance from bottom edge, or 'Center' -->
+  </popupFixedPosition>
 </resize>
 
+<!-- You can reserve a portion of your screen where windows will not cover when
+     they are maximized, or when they are initially placed.
+     Many programs reserve space automatically, but you can use this in other
+     cases. -->
+<margins>
+  <top>0</top>
+  <bottom>0</bottom>
+  <left>0</left>
+  <right>0</right>
+</margins>
+
 <dock>
   <position>TopLeft</position>
   <!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
@@ -147,40 +178,40 @@
 
   <!-- Keybindings for desktop switching -->
   <keybind key="C-A-Left">
-    <action name="DesktopLeft"><wrap>no</wrap></action>
+    <action name="GoToDesktop"><to>left</to><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Right">
-    <action name="DesktopRight"><wrap>no</wrap></action>
+    <action name="GoToDesktop"><to>right</to><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Up">
-    <action name="DesktopUp"><wrap>no</wrap></action>
+    <action name="GoToDesktop"><to>up</to><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Down">
-    <action name="DesktopDown"><wrap>no</wrap></action>
+    <action name="GoToDesktop"><to>down</to><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Left">
-    <action name="SendToDesktopLeft"><wrap>no</wrap></action>
+    <action name="SendToDesktop"><to>left</to><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Right">
-    <action name="SendToDesktopRight"><wrap>no</wrap></action>
+    <action name="SendToDesktop"><to>right</to><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Up">
-    <action name="SendToDesktopUp"><wrap>no</wrap></action>
+    <action name="SendToDesktop"><to>up</to><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Down">
-    <action name="SendToDesktopDown"><wrap>no</wrap></action>
+    <action name="SendToDesktop"><to>down</to><wrap>no</wrap></action>
   </keybind>
   <keybind key="W-F1">
-    <action name="Desktop"><desktop>1</desktop></action>
+    <action name="GoToDesktop"><to>1</to></action>
   </keybind>
   <keybind key="W-F2">
-    <action name="Desktop"><desktop>2</desktop></action>
+    <action name="GoToDesktop"><to>2</to></action>
   </keybind>
   <keybind key="W-F3">
-    <action name="Desktop"><desktop>3</desktop></action>
+    <action name="GoToDesktop"><to>3</to></action>
   </keybind>
   <keybind key="W-F4">
-    <action name="Desktop"><desktop>4</desktop></action>
+    <action name="GoToDesktop"><to>4</to></action>
   </keybind>
   <keybind key="W-d">
     <action name="ToggleShowDesktop"/>
@@ -201,14 +232,31 @@
 
   <!-- Keybindings for window switching -->
   <keybind key="A-Tab">
-    <action name="NextWindow"/>
+    <action name="NextWindow">
+      <finalactions>
+        <action name="Focus"/>
+        <action name="Raise"/>
+        <action name="Unshade"/>
+      </finalactions>
+    </action>
   </keybind>
   <keybind key="A-S-Tab">
-    <action name="PreviousWindow"/>
+    <action name="PreviousWindow">
+      <finalactions>
+        <action name="Focus"/>
+        <action name="Raise"/>
+        <action name="Unshade"/>
+      </finalactions>
+    </action>
   </keybind>
   <keybind key="C-A-Tab">
     <action name="NextWindow">
       <panels>yes</panels><desktop>yes</desktop>
+      <finalactions>
+        <action name="Focus"/>
+        <action name="Raise"/>
+        <action name="Unshade"/>
+      </finalactions>
     </action>
   </keybind>
 
@@ -219,7 +267,7 @@
         <enabled>true</enabled>
         <name>Konqueror</name>
       </startupnotify>
-      <execute>kfmclient openProfile filemanagement</execute>
+      <command>kfmclient openProfile filemanagement</command>
     </action>
   </keybind>
 </keyboard>
@@ -229,6 +277,10 @@
   <!-- number of pixels the mouse must move before a drag begins -->
   <doubleClickTime>200</doubleClickTime>
   <!-- in milliseconds (1000 = 1 second) -->
+  <screenEdgeWarpTime>400</screenEdgeWarpTime>
+  <!-- Time before changing desktops when the pointer touches the edge of the
+       screen while moving a window, in milliseconds (1000 = 1 second).
+       Set this to 0 to disable warping -->
 
   <context name="Frame">
     <mousebind button="A-Left" action="Press">
@@ -258,22 +310,22 @@
     </mousebind>
 
     <mousebind button="A-Up" action="Click">
-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
     <mousebind button="A-Down" action="Click">
-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
     <mousebind button="C-A-Up" action="Click">
-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
     <mousebind button="C-A-Down" action="Click">
-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
     <mousebind button="A-S-Up" action="Click">
-      <action name="SendToDesktopPrevious"/>
+      <action name="SendToDesktop"><to>previous</to></action>
     </mousebind>
     <mousebind button="A-S-Down" action="Click">
-      <action name="SendToDesktopNext"/>
+      <action name="SendToDesktop"><to>next</to></action>
     </mousebind>
   </context>
 
@@ -286,7 +338,7 @@
       <action name="Move"/>
     </mousebind>
     <mousebind button="Left" action="DoubleClick">
-      <action name="ToggleMaximizeFull"/>
+      <action name="ToggleMaximize"/>
     </mousebind>
 
     <mousebind button="Middle" action="Press">
@@ -296,14 +348,24 @@
     </mousebind>
 
     <mousebind button="Up" action="Click">
-      <action name="Shade"/>
-      <action name="FocusToBottom"/>
-      <action name="Unfocus"/>
-      <action name="Lower"/>
+      <action name="if">
+        <shaded>no</shaded>
+        <then>
+          <action name="Shade"/>
+          <action name="FocusToBottom"/>
+          <action name="Unfocus"/>
+          <action name="Lower"/>
+        </then>
+      </action>
     </mousebind>
     <mousebind button="Down" action="Click">
-      <action name="Unshade"/>
-      <action name="Raise"/>
+      <action name="if">
+        <shaded>yes</shaded>
+        <then>
+          <action name="Unshade"/>
+          <action name="Raise"/>
+        </then>
+      </action>
     </mousebind>
 
     <mousebind button="Right" action="Press">
@@ -372,7 +434,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"/>
+      <action name="Resize"><edge>bottomleft</edge></action>
     </mousebind>
   </context>
 
@@ -382,7 +444,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"/>
+      <action name="Resize"><edge>bottomright</edge></action>
     </mousebind>
   </context>
 
@@ -393,7 +455,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"/>
+      <action name="Resize"><edge>topleft</edge></action>
     </mousebind>
   </context>
 
@@ -404,7 +466,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"/>
+      <action name="Resize"><edge>topright</edge></action>
     </mousebind>
   </context>
 
@@ -485,13 +547,13 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Click">
-      <action name="ToggleMaximizeFull"/>
+      <action name="ToggleMaximize"/>
     </mousebind>
     <mousebind button="Middle" action="Click">
-      <action name="ToggleMaximizeVert"/>
+      <action name="ToggleMaximize"><direction>vertical</direction></action>
     </mousebind>
     <mousebind button="Right" action="Click">
-      <action name="ToggleMaximizeHorz"/>
+      <action name="ToggleMaximize"><direction>horizontal</direction></action>
     </mousebind>
   </context>
 
@@ -507,30 +569,34 @@
   </context>
 
   <context name="Desktop">
-    <mousebind button="Up" action="Press">
-      <action name="DesktopPrevious"/>
+    <mousebind button="Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
-    <mousebind button="Down" action="Press">
-      <action name="DesktopNext"/>
+    <mousebind button="Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
 
-    <mousebind button="A-Up" action="Press">
-      <action name="DesktopPrevious"/>
+    <mousebind button="A-Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
-    <mousebind button="A-Down" action="Press">
-      <action name="DesktopNext"/>
+    <mousebind button="A-Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
-    <mousebind button="C-A-Up" action="Press">
-      <action name="DesktopPrevious"/>
+    <mousebind button="C-A-Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
-    <mousebind button="C-A-Down" action="Press">
-      <action name="DesktopNext"/>
+    <mousebind button="C-A-Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
 
     <mousebind button="Left" action="Press">
       <action name="Focus"/>
       <action name="Raise"/>
     </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
   </context>
 
   <context name="Root">
@@ -544,17 +610,17 @@
   </context>
 
   <context name="MoveResize">
-    <mousebind button="Up" action="Press">
-      <action name="DesktopPrevious"/>
+    <mousebind button="Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
-    <mousebind button="Down" action="Press">
-      <action name="DesktopNext"/>
+    <mousebind button="Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
-    <mousebind button="A-Up" action="Press">
-      <action name="DesktopPrevious"/>
+    <mousebind button="A-Up" action="Click">
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
-    <mousebind button="A-Down" action="Press">
-      <action name="DesktopNext"/>
+    <mousebind button="A-Down" action="Click">
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
   </context>
 </mouse>
@@ -604,9 +670,10 @@
       # the position is only used if both an x and y coordinate are provided
       # (and not set to 'default')
       <x>center</x>
-      # a number like 50, or 'center' to center on screen
+      # 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
+      # right edge (or bottom).
       <y>200</y>
-      # a number like 50, or 'center' to center on screen
       <monitor>1</monitor>
       # specifies the monitor in a xinerama setup.
       # 1 is the first head, or 'mouse' for wherever the mouse is