X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=7eaff1ae3bc22dda8fa539ad73d824c563bbe0cb;hb=261d3193c5258126fda8234a3305180066f0f939;hp=2095060323c1fd153d6981f6a229432d6c9a1273;hpb=9d42df6ab4099c9365d3631ea86348a8f21752a0;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 20950603..7eaff1ae 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -10,6 +10,7 @@ gboolean config_focus_new;
 gboolean config_focus_follow;
 gboolean config_focus_last;
 gboolean config_focus_last_on_desktop;
+guint    config_focus_delay;
 
 char *config_theme;
 
@@ -40,8 +41,6 @@ GSList *config_menu_files;
 gint config_resist_win;
 gint config_resist_edge;
 
-GSList *config_urgent_actions;
-
 /*
 
 <keybind key="C-x">
@@ -207,6 +206,8 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_last = parse_bool(doc, n);
     if ((n = parse_find_node("focusLastOnDesktop", node)))
         config_focus_last_on_desktop = parse_bool(doc, n);
+    if ((n = parse_find_node("focusDelay", node)))
+        config_focus_delay = parse_int(doc, n);
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -216,7 +217,7 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
     node = node->xmlChildrenNode;
 
-    if ((n = parse_find_node("theme", node))) {
+    if ((n = parse_find_node("name", node))) {
         gchar *c;
 
         g_free(config_theme);
@@ -354,39 +355,13 @@ static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_resist_edge = parse_int(doc, n);
 }
 
-static void parse_urgent(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                         void *d)
-{
-    ObAction *action;
-    xmlNodePtr nact;
-
-    nact = parse_find_node("action", node->xmlChildrenNode);
-    while (nact) {
-        if ((action = action_parse(i, doc, nact))) {
-            /* validate that its okay for an urgent binding */
-            if (action->func == action_moveresize &&
-                action->data.moveresize.corner !=
-                prop_atoms.net_wm_moveresize_move_keyboard &&
-                action->data.moveresize.corner !=
-                prop_atoms.net_wm_moveresize_size_keyboard) {
-                action_free(action);
-                action = NULL;
-            }
-
-            if (action)
-                config_urgent_actions = g_slist_append(config_urgent_actions,
-                                                       action);
-        }
-        nact = parse_find_node("action", nact->next);
-    }
-}
-
 void config_startup(ObParseInst *i)
 {
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
     config_focus_last = TRUE;
     config_focus_last_on_desktop = TRUE;
+    config_focus_delay = 0;
 
     parse_register(i, "focus", parse_focus, NULL);
 
@@ -427,15 +402,13 @@ void config_startup(ObParseInst *i)
     parse_register(i, "mouse", parse_mouse, NULL);
 
     config_resist_win = 10;
-    config_resist_edge = 10;
+    config_resist_edge = 20;
 
     parse_register(i, "resistance", parse_resistance, NULL);
 
     config_menu_files = NULL;
 
     parse_register(i, "menu", parse_menu, NULL);
-
-    parse_register(i, "urgent", parse_urgent, NULL);
 }
 
 void config_shutdown()