summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-02-04 00:45:27 +0000
committerDana Jansens <danakj@orodu.net>2003-02-04 00:45:27 +0000
commit4ddb8181c2e4d6a4f4108c501a838d1101f2f7a5 (patch)
tree5db065b8c0b9385088ba3fecefc80dd6f08deda3
parent1da8531a7b4eea22592b6d0760352d2a34e9b6b0 (diff)
make this focus shit not buggy again..
-rw-r--r--scripts/focus.py4
-rw-r--r--src/openbox.cc6
2 files changed, 7 insertions, 3 deletions
diff --git a/scripts/focus.py b/scripts/focus.py
index e766f134..4ac22183 100644
--- a/scripts/focus.py
+++ b/scripts/focus.py
@@ -102,7 +102,7 @@ def _focused(data):
else: # if we are cycling, then update our pointer
_cyc_w = data.client.window()
_hilite_popup_list(data)
- elif fallback:
+ elif fallback:
# pass around focus
desktop = ob.openbox.screen(_cyc_screen).desktop()
for w in _clients:
@@ -158,7 +158,7 @@ def _focus_stacked_ungrab(data):
client = ob.openbox.findClient(_cyc_w)
if client:
data.client = client
- _focused(data) # resort the list as appropriate
+ #_focused(data) # resort the list as appropriate
if cycle_raise:
ob.openbox.screen(data.screen).raiseWindow(client)
diff --git a/src/openbox.cc b/src/openbox.cc
index 50146e27..29f9ea94 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -360,7 +360,11 @@ Client *Openbox::findClient(Window window)
void Openbox::setFocusedClient(Client *c)
{
- if (c == _focused_client) return;
+ // sometimes this is called with the already-focused window, this is
+ // important for the python scripts to work (eg, c = 0 twice, or for the
+ // cycling list, it relies on this behavior. don't just return if its already
+ // set as focused
+
assert(_focused_screen);
// uninstall the old colormap