removing focusLast again..
Dana Jansens danakj@orodu.net
5 files changed,
2 insertions(+),
11 deletions(-)
M
data/rc.xml.in
→
data/rc.xml.in
@@ -15,7 +15,6 @@ </resistance>
<focus> <focusNew>yes</focusNew> - <focusLast>yes</focusLast> <followMouse>no</followMouse> <focusDelay>0</focusDelay> <raiseOnFocus>no</raiseOnFocus>
M
data/rc.xsd
→
data/rc.xsd
@@ -70,7 +70,6 @@ <xs:documentation>defines aspects of window focus</xs:documentation>
</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"/>
M
openbox/config.c
→
openbox/config.c
@@ -26,7 +26,6 @@ #include "openbox.h"
gboolean config_focus_new; gboolean config_focus_follow; -gboolean config_focus_last; guint config_focus_delay; guint config_focus_raise;@@ -202,8 +201,6 @@ if ((n = parse_find_node("focusNew", 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;
M
openbox/config.h
→
openbox/config.h
@@ -30,9 +30,6 @@ /*! Should new windows be focused */
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
M
openbox/focus.c
→
openbox/focus.c
@@ -183,7 +183,7 @@ if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
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 @@ }
} } - if (!config_focus_last && config_focus_follow) + if (config_focus_follow) if (focus_under_pointer()) return;