Merge branch 'backport' into work

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 800e6a210d3141a2fffd4eba1dc7b9816a167a0f..698890814bd8a2d1e219c6bff7855e35e048b22b 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -43,12 +43,12 @@
 #include "ping.h"
 #include "prompt.h"
 #include "gettext.h"
-#include "render/render.h"
-#include "render/theme.h"
+#include "obrender/render.h"
+#include "obrender/theme.h"
 #include "obt/display.h"
 #include "obt/prop.h"
 #include "obt/keyboard.h"
-#include "obt/parse.h"
+#include "obt/xml.h"
 
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
@@ -224,13 +224,15 @@ gint main(gint argc, gchar **argv)
             keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down);
             keys[OB_KEY_TAB] = obt_keyboard_keysym_to_keycode(XK_Tab);
             keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space);
+            keys[OB_KEY_HOME] = obt_keyboard_keysym_to_keycode(XK_Home);
+            keys[OB_KEY_END] = obt_keyboard_keysym_to_keycode(XK_End);
 
             {
-                ObtParseInst *i;
+                ObtXmlInst *i;
 
                 /* startup the parsing so everything can register sections
                    of the rc */
-                i = obt_parse_instance_new();
+                i = obt_xml_instance_new();
 
                 /* register all the available actions */
                 actions_startup(reconfigure);
@@ -239,12 +241,12 @@ gint main(gint argc, gchar **argv)
 
                 /* parse/load user options */
                 if ((config_file &&
-                     obt_parse_load_file(i, config_file, "openbox_config")) ||
-                    obt_parse_load_config_file(i, "openbox", "rc.xml",
-                                               "openbox_config"))
+                     obt_xml_load_file(i, config_file, "openbox_config")) ||
+                    obt_xml_load_config_file(i, "openbox", "rc.xml",
+                                             "openbox_config"))
                 {
-                    obt_parse_tree_from_root(i);
-                    obt_parse_close(i);
+                    obt_xml_tree_from_root(i);
+                    obt_xml_close(i);
                 }
                 else {
                     g_message(_("Unable to find a valid config file, using some simple defaults"));
@@ -263,7 +265,7 @@ gint main(gint argc, gchar **argv)
                     OBT_PROP_ERASE(obt_root(ob_screen), OB_CONFIG_FILE);
 
                 /* we're done with parsing now, kill it */
-                obt_parse_instance_unref(i);
+                obt_xml_instance_unref(i);
             }
 
             /* load the theme specified in the rc file */
@@ -274,7 +276,8 @@ gint main(gint argc, gchar **argv)
                                         config_font_inactivewindow,
                                         config_font_menutitle,
                                         config_font_menuitem,
-                                        config_font_osd)))
+                                        config_font_activeosd,
+                                        config_font_inactiveosd)))
                 {
                     RrThemeFree(ob_rr_theme);
                     ob_rr_theme = theme;
@@ -410,6 +413,8 @@ gint main(gint argc, gchar **argv)
             g_free(keys[OB_KEY_DOWN]);
             g_free(keys[OB_KEY_TAB]);
             g_free(keys[OB_KEY_SPACE]);
+            g_free(keys[OB_KEY_HOME]);
+            g_free(keys[OB_KEY_END]);
         } while (reconfigure);
     }