#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>
static gboolean restart = FALSE;
static gchar *restart_path = NULL;
static Cursor cursors[OB_NUM_CURSORS];
-static KeyCode keys[OB_NUM_KEYS];
+static KeyCode *keys[OB_NUM_KEYS];
static gint exitcode = 0;
static guint remote_control = 0;
static gboolean being_replaced = FALSE;
keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space);
{
- 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);
/* 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"));
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 */
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;
event_shutdown(reconfigure);
config_shutdown();
actions_shutdown(reconfigure);
+
+ /* Free the key codes for built in keys */
+ g_free(keys[OB_KEY_RETURN]);
+ g_free(keys[OB_KEY_ESCAPE]);
+ g_free(keys[OB_KEY_LEFT]);
+ g_free(keys[OB_KEY_RIGHT]);
+ g_free(keys[OB_KEY_UP]);
+ g_free(keys[OB_KEY_DOWN]);
+ g_free(keys[OB_KEY_TAB]);
+ g_free(keys[OB_KEY_SPACE]);
} while (reconfigure);
}
return cursors[cursor];
}
-KeyCode ob_keycode(ObKey key)
+gboolean ob_keycode_match(KeyCode code, ObKey key)
{
+ KeyCode *k;
+
g_assert(key < OB_NUM_KEYS);
- return keys[key];
+ for (k = keys[key]; *k; ++k)
+ if (*k == code) return TRUE;
+ return FALSE;
}
ObState ob_state(void)