summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-28 08:45:43 +0000
committerDana Jansens <danakj@orodu.net>2003-09-28 08:45:43 +0000
commitfa962c1604bac1b5a6c3656b71c3145436f2392b (patch)
treee001890128d524eb590fbc98a051d03fab313d31 /openbox
parentf9c659c12c7f387133b76a89e38dd48bba1b8172 (diff)
removing focusLast again..
Diffstat (limited to 'openbox')
-rw-r--r--openbox/config.c4
-rw-r--r--openbox/config.h3
-rw-r--r--openbox/focus.c4
3 files changed, 2 insertions, 9 deletions
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;