From cf40ff879161d33f3879c855d0c787d3a335b342 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 1 Sep 2003 17:01:21 +0000
Subject: move rc3 to rc.xml

---
 Makefile.am    |   2 +-
 data/rc.xml    | 333 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 data/rc3       | 333 ---------------------------------------------------------
 parser/parse.c |   4 +-
 4 files changed, 336 insertions(+), 336 deletions(-)
 create mode 100644 data/rc.xml
 delete mode 100644 data/rc3

diff --git a/Makefile.am b/Makefile.am
index 96f3cb19..1465e50f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -258,7 +258,7 @@ dist_thebear_theme_DATA = \
 ## data ##
 
 dist_rc_DATA = \
-	data/rc3 \
+	data/rc.xml \
 	data/menu
 
 dist_desktopfiles_DATA = \
diff --git a/data/rc.xml b/data/rc.xml
new file mode 100644
index 00000000..af348774
--- /dev/null
+++ b/data/rc.xml
@@ -0,0 +1,333 @@
+<?xml version="1.0"?>
+
+<!-- Do not edit this file, it will be overwritten on install. Copy the file
+     to $HOME/.openbox/ instead. -->
+
+<openbox_config>
+
+<resistance>
+  <strength>10</strength>
+  <screen_edge_strength>10</screen_edge_strength>
+</resistance>
+
+<placement>
+  <remember>yes</remember>
+</placement>
+
+<focus>
+  <focusNew>yes</focusNew>
+  <followMouse>no</followMouse>
+  <focusLast>yes</focusLast>
+  <focusLastOnDesktop>yes</focusLastOnDesktop>
+</focus>
+
+<theme>
+  <theme>thebear</theme>
+  <titlelayout>NLIMC</titlelayout>
+</theme>
+
+<desktops>
+  <number>4</number>
+  <names>
+    <name>one</name>
+    <name>two</name>
+    <name>three</name>
+    <name>four</name>
+  </names>
+</desktops>
+
+<resize>
+  <drawContents>yes</drawContents>
+</resize>
+
+<dock>
+  <position>topleft</position>
+  <stacking>top</stacking>
+  <direction>vertical</direction>
+  <floatingX>0</floatingX>
+  <floatingY>0</floatingY>
+  <autoHide>no</autoHide>
+  <hideTimeout>300</hideTimeout>
+</dock>
+
+<keyboard>
+  <chainQuitKey>C-g</chainQuitKey>
+
+  <keybind key="A-F10">
+    <action name="MaximizeFull"></action>
+  </keybind>
+  <keybind key="A-F5">
+    <action name="UnmaximizeFull"></action>
+  </keybind>
+  <keybind key="A-F12">
+    <action name="ToggleShade"></action>
+  </keybind>
+  <keybind key="C-A-Left">
+    <action name="DesktopLeft"></action>
+  </keybind>
+  <keybind key="C-A-Right">
+    <action name="DesktopRight"></action>
+  </keybind>
+  <keybind key="C-A-Up">
+    <action name="DesktopUp"></action>
+  </keybind>
+  <keybind key="C-A-Down">
+    <action name="DesktopDown"></action>
+  </keybind>
+  <keybind key="S-A-Left">
+    <action name="SendToDesktopLeft"></action>
+  </keybind>
+  <keybind key="S-A-Right">
+    <action name="SendToDesktopRight"></action>
+  </keybind>
+  <keybind key="S-A-Up">
+    <action name="SendToDesktopUp"></action>
+  </keybind>
+  <keybind key="S-A-Down">
+    <action name="SendToDesktopDown"></action>
+  </keybind>
+  <keybind key="C-A-d">
+    <action name="ToggleShowDesktop"></action>
+  </keybind>
+  <keybind key="A-F4">
+    <action name="Close"></action>
+  </keybind>
+  <keybind key="A-Tab">
+    <action name="NextWindow"></action>
+  </keybind>
+  <keybind key="A-S-Tab">
+    <action name="PreviousWindow"></action>
+  </keybind>
+  <keybind key="A-F7">
+    <action name="KeyboardMove"></action>
+  </keybind>
+  <keybind key="A-F8">
+    <action name="KeyboardResize"></action>
+  </keybind>
+  <keybind key="A-F9">
+    <action name="Iconify"></action>
+  </keybind>
+</keyboard>
+
+<mouse>
+  <dragThreshold>3</dragThreshold>
+  <doubleClickTime>200</doubleClickTime>
+
+  <context name="frame">
+    <mousebind button="A-Left" action="drag">
+      <action name="move"/>
+    </mousebind>
+    <mousebind button="A-Left" action="click">
+      <action name="raise"/>
+    </mousebind>
+    <mousebind button="A-Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="A-Middle" action="drag">
+      <action name="resize"/>
+    </mousebind> 
+    <mousebind button="A-Middle" action="click">
+      <action name="lower"/>
+    </mousebind>
+    <mousebind button="A-Right" action="press">
+      <action name="showmenu"><menu>client-menu</menu></action>
+    </mousebind>
+    <mousebind button="A-Up" action="click">
+      <action name="desktopnext"/>
+    </mousebind>
+    <mousebind button="A-Down" action="click">
+      <action name="desktopprevious"/>
+    </mousebind>
+    <mousebind button="C-A-Up" action="click">
+      <action name="sendtodesktopnext"/>
+    </mousebind>
+    <mousebind button="C-A-Down" action="click">
+      <action name="sendtodesktopprevious"/>
+    </mousebind>
+  </context>
+  <context name="titlebar">
+    <mousebind button="Left" action="drag">
+      <action name="move"/>
+    </mousebind>
+    <mousebind button="Left" action="click">
+      <action name="raise"/>
+    </mousebind>
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Left" action="doubleclick">
+      <action name="toggleshade"/>
+    </mousebind>
+    <mousebind button="Middle" action="press">
+      <action name="lower"/>
+    </mousebind>
+    <mousebind button="Up" action="click">
+      <action name="shade"/>
+    </mousebind>
+    <mousebind button="Down" action="click">
+      <action name="unshade"/>
+    </mousebind>
+    <mousebind button="Right" action="press">
+      <action name="showmenu"><menu>client-menu</menu></action>
+    </mousebind>
+  </context>
+  <context name="handle">
+    <mousebind button="Left" action="drag">
+      <action name="move"/>
+    </mousebind>
+    <mousebind button="Left" action="click">
+      <action name="raise"/>
+    </mousebind>
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Middle" action="press">
+      <action name="lower"/>
+    </mousebind>
+  </context>
+  <context name="blcorner">
+    <mousebind button="Left" action="drag">
+      <action name="resize"/>
+    </mousebind>
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+  </context>
+  <context name="brcorner">
+    <mousebind button="Left" action="drag">
+      <action name="resize"/>
+    </mousebind>
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+  </context>
+  <context name="tlcorner">
+    <mousebind button="Left" action="drag">
+      <action name="resize"/>
+    </mousebind>
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+  </context>
+  <context name="trcorner">
+    <mousebind button="Left" action="drag">
+      <action name="resize"/>
+    </mousebind>
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+  </context>
+  <context name="client">
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+      <action name="raise"/>
+    </mousebind>
+    <mousebind button="Middle" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Right" action="press">
+      <action name="focus"/>
+    </mousebind>
+  </context>
+  <context name="icon">
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Right" action="press">
+      <action name="showmenu"><menu>client-menu</menu></action>
+    </mousebind>
+    <mousebind button="Left" action="click">
+      <action name="showmenu"><menu>client-menu</menu></action>
+    </mousebind>
+    <mousebind button="Left" action="doubleclick">
+      <action name="close"/>
+    </mousebind>
+  </context>
+  <context name="alldesktops">
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Left" action="click">
+      <action name="toggleomnipresent"/>
+    </mousebind>
+  </context>
+  <context name="shade">
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Left" action="click">
+      <action name="toggleshade"/>
+    </mousebind>
+  </context>
+  <context name="iconify">
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Left" action="click">
+      <action name="iconify"/>
+    </mousebind>
+  </context>
+  <context name="maximize">
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Middle" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Right" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Left" action="click">
+      <action name="togglemaximizefull"/>
+    </mousebind>
+    <mousebind button="Middle" action="click">
+      <action name="togglemaximizevert"/>
+    </mousebind>
+    <mousebind button="Right" action="click">
+      <action name="togglemaximizehorz"/>
+    </mousebind>
+  </context>
+  <context name="close">
+    <mousebind button="Left" action="press">
+      <action name="focus"/>
+    </mousebind>
+    <mousebind button="Left" action="click">
+      <action name="close"/>
+    </mousebind>
+  </context>
+  <context name="desktop">
+    <mousebind button="Up" action="click">
+      <action name="desktopnext"></action>
+    </mousebind>
+    <mousebind button="Down" action="click">
+      <action name="desktopprevious"></action>
+    </mousebind>
+    <mousebind button="A-Up" action="click">
+      <action name="desktopnext"/>
+    </mousebind>
+    <mousebind button="A-Down" action="click">
+      <action name="desktopprevious"/>
+    </mousebind>
+    <mousebind button="Middle" action="press">
+      <action name="showmenu"><menu>client-list-menu</menu></action>
+    </mousebind> 
+    <mousebind button="Right" action="press">
+      <action name="showmenu">
+        <menu>root-menu</menu>
+      </action>
+    </mousebind>
+  </context>
+</mouse>
+
+<menu>
+  <!-- You can specify more than one menu file in here and they are all loaded,
+       just don't make menu ids clash or, well, it'll be kind of pointless -->
+
+  <!-- debian menu file -->
+  <file>/etc/X11/openbox/openbox-menu</file>
+
+  <!-- default menu file (or custom one in $HOME/.openbox/) -->
+  <file>menu</file>
+</menu>
+
+</openbox_config>
diff --git a/data/rc3 b/data/rc3
deleted file mode 100644
index af348774..00000000
--- a/data/rc3
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Do not edit this file, it will be overwritten on install. Copy the file
-     to $HOME/.openbox/ instead. -->
-
-<openbox_config>
-
-<resistance>
-  <strength>10</strength>
-  <screen_edge_strength>10</screen_edge_strength>
-</resistance>
-
-<placement>
-  <remember>yes</remember>
-</placement>
-
-<focus>
-  <focusNew>yes</focusNew>
-  <followMouse>no</followMouse>
-  <focusLast>yes</focusLast>
-  <focusLastOnDesktop>yes</focusLastOnDesktop>
-</focus>
-
-<theme>
-  <theme>thebear</theme>
-  <titlelayout>NLIMC</titlelayout>
-</theme>
-
-<desktops>
-  <number>4</number>
-  <names>
-    <name>one</name>
-    <name>two</name>
-    <name>three</name>
-    <name>four</name>
-  </names>
-</desktops>
-
-<resize>
-  <drawContents>yes</drawContents>
-</resize>
-
-<dock>
-  <position>topleft</position>
-  <stacking>top</stacking>
-  <direction>vertical</direction>
-  <floatingX>0</floatingX>
-  <floatingY>0</floatingY>
-  <autoHide>no</autoHide>
-  <hideTimeout>300</hideTimeout>
-</dock>
-
-<keyboard>
-  <chainQuitKey>C-g</chainQuitKey>
-
-  <keybind key="A-F10">
-    <action name="MaximizeFull"></action>
-  </keybind>
-  <keybind key="A-F5">
-    <action name="UnmaximizeFull"></action>
-  </keybind>
-  <keybind key="A-F12">
-    <action name="ToggleShade"></action>
-  </keybind>
-  <keybind key="C-A-Left">
-    <action name="DesktopLeft"></action>
-  </keybind>
-  <keybind key="C-A-Right">
-    <action name="DesktopRight"></action>
-  </keybind>
-  <keybind key="C-A-Up">
-    <action name="DesktopUp"></action>
-  </keybind>
-  <keybind key="C-A-Down">
-    <action name="DesktopDown"></action>
-  </keybind>
-  <keybind key="S-A-Left">
-    <action name="SendToDesktopLeft"></action>
-  </keybind>
-  <keybind key="S-A-Right">
-    <action name="SendToDesktopRight"></action>
-  </keybind>
-  <keybind key="S-A-Up">
-    <action name="SendToDesktopUp"></action>
-  </keybind>
-  <keybind key="S-A-Down">
-    <action name="SendToDesktopDown"></action>
-  </keybind>
-  <keybind key="C-A-d">
-    <action name="ToggleShowDesktop"></action>
-  </keybind>
-  <keybind key="A-F4">
-    <action name="Close"></action>
-  </keybind>
-  <keybind key="A-Tab">
-    <action name="NextWindow"></action>
-  </keybind>
-  <keybind key="A-S-Tab">
-    <action name="PreviousWindow"></action>
-  </keybind>
-  <keybind key="A-F7">
-    <action name="KeyboardMove"></action>
-  </keybind>
-  <keybind key="A-F8">
-    <action name="KeyboardResize"></action>
-  </keybind>
-  <keybind key="A-F9">
-    <action name="Iconify"></action>
-  </keybind>
-</keyboard>
-
-<mouse>
-  <dragThreshold>3</dragThreshold>
-  <doubleClickTime>200</doubleClickTime>
-
-  <context name="frame">
-    <mousebind button="A-Left" action="drag">
-      <action name="move"/>
-    </mousebind>
-    <mousebind button="A-Left" action="click">
-      <action name="raise"/>
-    </mousebind>
-    <mousebind button="A-Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="A-Middle" action="drag">
-      <action name="resize"/>
-    </mousebind> 
-    <mousebind button="A-Middle" action="click">
-      <action name="lower"/>
-    </mousebind>
-    <mousebind button="A-Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
-    </mousebind>
-    <mousebind button="A-Up" action="click">
-      <action name="desktopnext"/>
-    </mousebind>
-    <mousebind button="A-Down" action="click">
-      <action name="desktopprevious"/>
-    </mousebind>
-    <mousebind button="C-A-Up" action="click">
-      <action name="sendtodesktopnext"/>
-    </mousebind>
-    <mousebind button="C-A-Down" action="click">
-      <action name="sendtodesktopprevious"/>
-    </mousebind>
-  </context>
-  <context name="titlebar">
-    <mousebind button="Left" action="drag">
-      <action name="move"/>
-    </mousebind>
-    <mousebind button="Left" action="click">
-      <action name="raise"/>
-    </mousebind>
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Left" action="doubleclick">
-      <action name="toggleshade"/>
-    </mousebind>
-    <mousebind button="Middle" action="press">
-      <action name="lower"/>
-    </mousebind>
-    <mousebind button="Up" action="click">
-      <action name="shade"/>
-    </mousebind>
-    <mousebind button="Down" action="click">
-      <action name="unshade"/>
-    </mousebind>
-    <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
-    </mousebind>
-  </context>
-  <context name="handle">
-    <mousebind button="Left" action="drag">
-      <action name="move"/>
-    </mousebind>
-    <mousebind button="Left" action="click">
-      <action name="raise"/>
-    </mousebind>
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Middle" action="press">
-      <action name="lower"/>
-    </mousebind>
-  </context>
-  <context name="blcorner">
-    <mousebind button="Left" action="drag">
-      <action name="resize"/>
-    </mousebind>
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-  </context>
-  <context name="brcorner">
-    <mousebind button="Left" action="drag">
-      <action name="resize"/>
-    </mousebind>
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-  </context>
-  <context name="tlcorner">
-    <mousebind button="Left" action="drag">
-      <action name="resize"/>
-    </mousebind>
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-  </context>
-  <context name="trcorner">
-    <mousebind button="Left" action="drag">
-      <action name="resize"/>
-    </mousebind>
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-  </context>
-  <context name="client">
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-      <action name="raise"/>
-    </mousebind>
-    <mousebind button="Middle" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Right" action="press">
-      <action name="focus"/>
-    </mousebind>
-  </context>
-  <context name="icon">
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
-    </mousebind>
-    <mousebind button="Left" action="click">
-      <action name="showmenu"><menu>client-menu</menu></action>
-    </mousebind>
-    <mousebind button="Left" action="doubleclick">
-      <action name="close"/>
-    </mousebind>
-  </context>
-  <context name="alldesktops">
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Left" action="click">
-      <action name="toggleomnipresent"/>
-    </mousebind>
-  </context>
-  <context name="shade">
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Left" action="click">
-      <action name="toggleshade"/>
-    </mousebind>
-  </context>
-  <context name="iconify">
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Left" action="click">
-      <action name="iconify"/>
-    </mousebind>
-  </context>
-  <context name="maximize">
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Middle" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Right" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Left" action="click">
-      <action name="togglemaximizefull"/>
-    </mousebind>
-    <mousebind button="Middle" action="click">
-      <action name="togglemaximizevert"/>
-    </mousebind>
-    <mousebind button="Right" action="click">
-      <action name="togglemaximizehorz"/>
-    </mousebind>
-  </context>
-  <context name="close">
-    <mousebind button="Left" action="press">
-      <action name="focus"/>
-    </mousebind>
-    <mousebind button="Left" action="click">
-      <action name="close"/>
-    </mousebind>
-  </context>
-  <context name="desktop">
-    <mousebind button="Up" action="click">
-      <action name="desktopnext"></action>
-    </mousebind>
-    <mousebind button="Down" action="click">
-      <action name="desktopprevious"></action>
-    </mousebind>
-    <mousebind button="A-Up" action="click">
-      <action name="desktopnext"/>
-    </mousebind>
-    <mousebind button="A-Down" action="click">
-      <action name="desktopprevious"/>
-    </mousebind>
-    <mousebind button="Middle" action="press">
-      <action name="showmenu"><menu>client-list-menu</menu></action>
-    </mousebind> 
-    <mousebind button="Right" action="press">
-      <action name="showmenu">
-        <menu>root-menu</menu>
-      </action>
-    </mousebind>
-  </context>
-</mouse>
-
-<menu>
-  <!-- You can specify more than one menu file in here and they are all loaded,
-       just don't make menu ids clash or, well, it'll be kind of pointless -->
-
-  <!-- debian menu file -->
-  <file>/etc/X11/openbox/openbox-menu</file>
-
-  <!-- default menu file (or custom one in $HOME/.openbox/) -->
-  <file>menu</file>
-</menu>
-
-</openbox_config>
diff --git a/parser/parse.c b/parser/parse.c
index 8ae2ec93..75bc3a3d 100644
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -55,12 +55,12 @@ gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root)
     char *path;
     gboolean r = FALSE;
 
-    path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
+    path = g_build_filename(g_get_home_dir(), ".openbox", "rc.xml", NULL);
     if (parse_load(path, "openbox_config", doc, root)) {
         r = TRUE;
     } else {
         g_free(path);
-        path = g_build_filename(RCDIR, "rc3", NULL);
+        path = g_build_filename(RCDIR, "rc.xml", NULL);
         if (parse_load(path, "openbox_config", doc, root)) {
             r = TRUE;
         }
-- 
cgit v1.2.3