nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removing focusLast again..

Browse source
This commit is contained in:
Dana Jansens 2003-09-28 08:45:43 +00:00
parent f9c659c12c
commit fa962c1604
5 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/rc.xml.in
View file

@ -15,7 +15,6 @@
<focus> <focus>
<focusNew>yes</focusNew> <focusNew>yes</focusNew>
<focusLast>yes</focusLast>
<followMouse>no</followMouse> <followMouse>no</followMouse>
<focusDelay>0</focusDelay> <focusDelay>0</focusDelay>
<raiseOnFocus>no</raiseOnFocus> <raiseOnFocus>no</raiseOnFocus>

1
data/rc.xsd
View file

@ -70,7 +70,6 @@
</xs:annotation> </xs:annotation>
<xs:sequence> <xs:sequence>
<xs:element name="focusNew" type="ob:yesorno"/> <xs:element name="focusNew" type="ob:yesorno"/>
<xs:element name="focusLast" type="ob:yesorno"/>
<xs:element name="followMouse" type="ob:yesorno"/> <xs:element name="followMouse" type="ob:yesorno"/>
<xs:element name="focusDelay" type="xs:integer"/> <xs:element name="focusDelay" type="xs:integer"/>
<xs:element name="raiseOnFocus" type="ob:yesorno"/> <xs:element name="raiseOnFocus" type="ob:yesorno"/>

4
openbox/config.c
View file

@ -26,7 +26,6 @@
gboolean config_focus_new; gboolean config_focus_new;
gboolean config_focus_follow; gboolean config_focus_follow;
gboolean config_focus_last;
guint config_focus_delay; guint config_focus_delay;
guint config_focus_raise; 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); config_focus_new = parse_bool(doc, n);
if ((n = parse_find_node("followMouse", node))) if ((n = parse_find_node("followMouse", node)))
config_focus_follow = parse_bool(doc, n); 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))) if ((n = parse_find_node("focusDelay", node)))
config_focus_delay = parse_int(doc, n) * 1000; config_focus_delay = parse_int(doc, n) * 1000;
if ((n = parse_find_node("raiseOnFocus", node))) if ((n = parse_find_node("raiseOnFocus", node)))
@ -476,7 +473,6 @@ void config_startup(ObParseInst *i)
{ {
config_focus_new = TRUE; config_focus_new = TRUE;
config_focus_follow = FALSE; config_focus_follow = FALSE;
config_focus_last = TRUE;
config_focus_delay = 0; config_focus_delay = 0;
config_focus_raise = FALSE; config_focus_raise = FALSE;

3
openbox/config.h
View file

@ -30,9 +30,6 @@ struct _ObParseInst;
extern gboolean config_focus_new; extern gboolean config_focus_new;
/*! Focus windows when the mouse enters them */ /*! Focus windows when the mouse enters them */
extern gboolean config_focus_follow; 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 */ /*! Timeout for focusing windows on focus follows mouse, in microseconds */
extern guint config_focus_delay; extern guint config_focus_delay;
/*! If windows should automatically be raised when they are focused in /*! If windows should automatically be raised when they are focused in

4
openbox/focus.c
View file

@ -183,7 +183,7 @@ void focus_fallback(ObFocusFallbackType type)
if (old->transient_for) { if (old->transient_for) {
gboolean trans = FALSE; gboolean trans = FALSE;
if (config_focus_last || !config_focus_follow) if (!config_focus_follow)
trans = TRUE; trans = TRUE;
else { else {
ObClient *c; 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()) if (focus_under_pointer())
return; return;