X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Frc.xml;h=ff5830dc4dcb0bbc766be7877b8003f4aeae00a1;hb=f8eae5e26cf2f84a9d6c20e0100bcbf761d54b34;hp=4e9b02a5d50ee5b5b6fb908550a9f1c8699565fc;hpb=03931180fcf26ba556403f13a06bdfa603f7bcb5;p=chaz%2Fopenbox

diff --git a/data/rc.xml b/data/rc.xml
index 4e9b02a5..ff5830dc 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -3,7 +3,7 @@
 <!-- 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/4.0/rc">
+<openbox_config xmlns="http://openbox.org/3.4/rc">
 
 <resistance>
   <strength>10</strength>
@@ -32,6 +32,9 @@
 <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 -->
 </placement>
 
 <theme>
@@ -123,6 +126,17 @@
   <!-- 'Center' or 'Top' -->
 </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 +161,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 +215,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 +250,7 @@
         <enabled>true</enabled>
         <name>Konqueror</name>
       </startupnotify>
-      <execute>kfmclient openProfile filemanagement</execute>
+      <command>kfmclient openProfile filemanagement</command>
     </action>
   </keybind>
 </keyboard>
@@ -229,6 +260,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),
+       0 disables warping -->
 
   <context name="Frame">
     <mousebind button="A-Left" action="Press">
@@ -258,22 +293,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>
 
@@ -282,14 +317,11 @@
       <action name="Focus"/>
       <action name="Raise"/>
     </mousebind>
-    <mousebind button="Left" action="Click">
-      <action name="Unshade"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Move"/>
     </mousebind>
     <mousebind button="Left" action="DoubleClick">
-      <action name="ToggleMaximizeFull"/>
+      <action name="ToggleMaximize"/>
     </mousebind>
 
     <mousebind button="Middle" action="Press">
@@ -302,9 +334,11 @@
       <action name="Shade"/>
       <action name="FocusToBottom"/>
       <action name="Unfocus"/>
+      <action name="Lower"/>
     </mousebind>
     <mousebind button="Down" action="Click">
       <action name="Unshade"/>
+      <action name="Raise"/>
     </mousebind>
 
     <mousebind button="Right" action="Press">
@@ -373,7 +407,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"/>
+      <action name="Resize"><edge>bottomleft</edge></action>
     </mousebind>
   </context>
 
@@ -383,7 +417,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"/>
+      <action name="Resize"><edge>bottomright</edge></action>
     </mousebind>
   </context>
 
@@ -394,7 +428,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"/>
+      <action name="Resize"><edge>topleft</edge></action>
     </mousebind>
   </context>
 
@@ -405,7 +439,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"/>
+      <action name="Resize"><edge>topright</edge></action>
     </mousebind>
   </context>
 
@@ -486,13 +520,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>
 
@@ -509,23 +543,23 @@
 
   <context name="Desktop">
     <mousebind button="Up" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
     <mousebind button="Down" action="Press">
-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
 
     <mousebind button="A-Up" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
     <mousebind button="A-Down" action="Press">
-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
     <mousebind button="C-A-Up" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
     <mousebind button="C-A-Down" action="Press">
-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
 
     <mousebind button="Left" action="Press">
@@ -546,16 +580,16 @@
 
   <context name="MoveResize">
     <mousebind button="Up" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
     <mousebind button="Down" action="Press">
-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
     <mousebind button="A-Up" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>
     </mousebind>
     <mousebind button="A-Down" action="Press">
-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>
     </mousebind>
   </context>
 </mouse>
@@ -605,9 +639,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