removing focusLast again..

5 files changed, 2 insertions, 11 deletions

diff --git a/data/rc.xml.in b/data/rc.xml.in
index e107ac04..0141abb2 100644
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -15,7 +15,6 @@
 
 <focus>
   <focusNew>yes</focusNew>
-  <focusLast>yes</focusLast>
   <followMouse>no</followMouse>
   <focusDelay>0</focusDelay>
   <raiseOnFocus>no</raiseOnFocus>
diff --git a/data/rc.xsd b/data/rc.xsd
index 40f37f18..56fe2993 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -70,7 +70,6 @@
         </xs:annotation>
         <xs:sequence>
             <xs:element name="focusNew" type="ob:yesorno"/>
-            <xs:element name="focusLast" type="ob:yesorno"/>
             <xs:element name="followMouse" type="ob:yesorno"/>
             <xs:element name="focusDelay" type="xs:integer"/>
             <xs:element name="raiseOnFocus" type="ob:yesorno"/>
diff --git a/openbox/config.c b/openbox/config.c
index 16b0be4d..aebf433f 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -26,7 +26,6 @@
 
 gboolean config_focus_new;
 gboolean config_focus_follow;
-gboolean config_focus_last;
 guint    config_focus_delay;
 guint    config_focus_raise;
 
@@ -202,8 +201,6 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_new = parse_bool(doc, n);
     if ((n = parse_find_node("followMouse", node)))
         config_focus_follow = parse_bool(doc, n);
-    if ((n = parse_find_node("focusLast", node)))
-        config_focus_last = parse_bool(doc, n);
     if ((n = parse_find_node("focusDelay", node)))
         config_focus_delay = parse_int(doc, n) * 1000;
     if ((n = parse_find_node("raiseOnFocus", node)))
@@ -476,7 +473,6 @@ void config_startup(ObParseInst *i)
 {
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
-    config_focus_last = TRUE;
     config_focus_delay = 0;
     config_focus_raise = FALSE;
 
diff --git a/openbox/config.h b/openbox/config.h
index 0c14b376..465bff45 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -30,9 +30,6 @@ struct _ObParseInst;
 extern gboolean config_focus_new;
 /*! Focus windows when the mouse enters them */
 extern gboolean config_focus_follow;
-/*! Should focus stay under the mouse when there is nothing focused or go to
- the last used window */
-extern gboolean config_focus_last;
 /*! Timeout for focusing windows on focus follows mouse, in microseconds */
 extern guint    config_focus_delay;
 /*! If windows should automatically be raised when they are focused in
diff --git a/openbox/focus.c b/openbox/focus.c
index 3376d50a..873ba035 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -183,7 +183,7 @@ void focus_fallback(ObFocusFallbackType type)
         if (old->transient_for) {
             gboolean trans = FALSE;
 
-            if (config_focus_last || !config_focus_follow)
+            if (!config_focus_follow)
                 trans = TRUE;
             else {
                 ObClient *c;
@@ -215,7 +215,7 @@ void focus_fallback(ObFocusFallbackType type)
         }
     }
 
-    if (!config_focus_last && config_focus_follow)
+    if (config_focus_follow)
         if (focus_under_pointer())
             return;