gboolean config_focus_new;
gboolean config_focus_follow;
guint config_focus_delay;
-guint config_focus_raise;
+gboolean config_focus_raise;
+gboolean config_focus_last;
ObPlacePolicy config_place_policy;
gint config_desktops_num;
GSList *config_desktops_names;
+gint config_screen_firstdesk;
-gboolean config_redraw_resize;
+gboolean config_resize_redraw;
ObStackingLayer config_dock_layer;
gboolean config_dock_floating;
gint config_mouse_threshold;
gint config_mouse_dclicktime;
+gboolean config_menu_warppointer;
+gboolean config_menu_xorstyle;
+gboolean config_menu_hilightfirst;
+guint config_menu_hide_delay;
+
GSList *config_menu_files;
gint config_resist_win;
}
static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- void *d)
+ gpointer d)
{
keyboard_unbind_all();
*/
static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- void *d)
+ gpointer d)
{
xmlNodePtr n, nbut, nact;
gchar *buttonstr;
}
static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- void *d)
+ gpointer d)
{
xmlNodePtr n;
config_focus_delay = parse_int(doc, n) * 1000;
if ((n = parse_find_node("raiseOnFocus", node)))
config_focus_raise = parse_bool(doc, n);
+ if ((n = parse_find_node("focusLast", node)))
+ config_focus_last = parse_bool(doc, n);
}
static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- void *d)
+ gpointer d)
{
xmlNodePtr n;
}
static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- void *d)
+ gpointer d)
{
xmlNodePtr n;
}
static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- void *d)
+ gpointer d)
{
xmlNodePtr n;
node = node->children;
if ((n = parse_find_node("number", node))) {
- guint d = parse_int(doc, n);
+ gint d = parse_int(doc, n);
if (d > 0)
config_desktops_num = d;
}
+ if ((n = parse_find_node("firstdesk", node))) {
+ gint d = parse_int(doc, n);
+ if (d > 0)
+ config_screen_firstdesk = d;
+ }
if ((n = parse_find_node("names", node))) {
GSList *it;
xmlNodePtr nname;
}
static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- void *d)
+ gpointer d)
{
xmlNodePtr n;
node = node->children;
if ((n = parse_find_node("drawContents", node)))
- config_redraw_resize = parse_bool(doc, n);
+ config_resize_redraw = parse_bool(doc, n);
}
-static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ gpointer d)
{
xmlNodePtr n;
}
}
-static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ gpointer d)
{
for (node = node->children; node; node = node->next) {
if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) {
parse_expand_tilde(c));
g_free(c);
}
+ if ((n = parse_find_node("warpPointer", node)))
+ config_menu_warppointer = parse_bool(doc, n);
+ if ((n = parse_find_node("xorStyle", node)))
+ config_menu_xorstyle = parse_bool(doc, n);
+ if ((n = parse_find_node("hilightFirst", node)))
+ config_menu_hilightfirst = parse_bool(doc, n);
+ if ((n = parse_find_node("hideDelay", node)))
+ config_menu_hide_delay = parse_int(doc, n);
}
}
static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- void *d)
+ gpointer d)
{
xmlNodePtr n;
config_focus_follow = FALSE;
config_focus_delay = 0;
config_focus_raise = FALSE;
+ config_focus_last = FALSE;
parse_register(i, "focus", parse_focus, NULL);
parse_register(i, "theme", parse_theme, NULL);
config_desktops_num = 4;
+ config_screen_firstdesk = 1;
config_desktops_names = NULL;
parse_register(i, "desktops", parse_desktops, NULL);
- config_redraw_resize = TRUE;
+ config_resize_redraw = TRUE;
parse_register(i, "resize", parse_resize, NULL);
parse_register(i, "resistance", parse_resistance, NULL);
+ config_menu_warppointer = TRUE;
+ config_menu_xorstyle = TRUE;
+ config_menu_hilightfirst = TRUE;
+ config_menu_hide_delay = 250;
config_menu_files = NULL;
parse_register(i, "menu", parse_menu, NULL);