break out _focusable() function to make the test if a window can be focused reusable...

[chaz/openbox] / scripts / focus.py

diff --git a/scripts/focus.py b/scripts/focus.py
index d2cb1385668471cd0089719e5639e50b6db7c83e..f1097aa51426c69f952c080123d7b02bcf09c1e0 100644 (file)
--- a/scripts/focus.py
+++ b/scripts/focus.py
@@ -5,11 +5,18 @@
 ###########################################################################
 ###         Options that affect the behavior of the focus module.       ###
 ###                                                                     ###
-# raise the window also when it is focused                              ###
+# cycle_raise - raise the window also when it is focused                ###
 cycle_raise = 1                                                         ###
-# raise as you cycle in stacked mode                                    ###
+# avoid_skip_taskbar - Don't focus windows which have requested to not  ###
+###                    be displayed in taskbars. You will still be able ###
+###                    to focus the windows, but not through cycling,   ###
+###                    and they won't be focused as a fallback if       ###
+###                    'fallback' is enabled.                           ###
+avoid_skip_taskbar = 1                                                  ###
+# stacked_cycle_raise - raise as you cycle in stacked mode              ###
 stacked_cycle_raise = 0                                                 ###
-# show a pop-up list of windows while cycling                           ###
+# stacked_cycle_popup_list - show a pop-up list of windows while        ###
+###                          cycling                                    ###
 stacked_cycle_popup_list = 1                                            ###
 # send focus somewhere when nothing is left with the focus, if possible ###
 fallback = 0                                                            ###
@@ -40,6 +47,13 @@ _clients = []
 # maintaint he current focused window
 _doing_stacked = 0
 
+def _focusable(client, desktop):
+    if not (avoid_skip_taskbar and client.skipTaskbar()) and \
+       (client.desktop() == desktop or client.desktop() == 0xffffffff) and \
+       client.normal() and (client.canFocus() or client.focusNotify()):
+        return 1
+    return 0
+
 def _new_win(data):
     global _clients
     global _doing_stacked
@@ -90,8 +104,7 @@ def _focused(data):
         desktop = ob.openbox.screen(_cyc_screen).desktop()
         for w in _clients:
             client = ob.openbox.findClient(w)
-            if client and (client.desktop() == desktop and \
-                           client.normal() and client.focus()):
+            if client and _focusable(client, desktop) and client.focus():
                 break
         if _doing_stacked:
             _cyc_w = 0
@@ -121,8 +134,8 @@ def _do_stacked_cycle(data, forward):
     desktop = ob.openbox.screen(data.screen).desktop()
     for w in clients:
         client = ob.openbox.findClient(w)
-        if client and (client.desktop() == desktop and \
-                       client.normal() and client.focus()):
+                   
+        if client and _focusable(client, desktop) and client.focus():
             if stacked_cycle_raise:
                 ob.openbox.screen(data.screen).raiseWindow(client)
             return
@@ -136,7 +149,8 @@ def _focus_stacked_ungrab(data):
         # have all the modifiers this started with been released?
         if not _cyc_mask & data.state:
             _destroy_popup_list()
-            ob.kungrab() # ungrab ourself
+            ob.kungrab()
+            ob.mungrab()
             _doing_stacked = 0;
             if cycle_raise:
                 client = ob.openbox.findClient(_cyc_w)
@@ -175,6 +189,7 @@ def _destroy_popup_list():
         _list_widget = 0
     
 def _create_popup_list(data):
+    global avoid_skip_taskbar
     global _list_widget, _list_labels, _list_windows, _clients
 
     if _list_widget:
@@ -191,22 +206,21 @@ def _create_popup_list(data):
     font = style.labelFont()
     height = font.height()
     longest = 0
+    desktop = ob.openbox.screen(data.screen).desktop()
     for c in _clients:
         client = ob.openbox.findClient(c)
-        desktop = ob.openbox.screen(data.screen).desktop()
-        if client and (client.desktop() == desktop and \
-                       client.normal()):
+        if client and _focusable(client, desktop):
             t = client.title()
             if len(t) > 50: # limit the length of titles
                 t = t[:24] + "..." + t[-24:]
             titles.append(t)
             _list_windows.append(c)
-            l = font.measureString(t) + 10 # add margin
+            l = font.measureString(t)
             if l > longest: longest = l
     if len(titles) > 1:
         for t in titles:
             w = otk.FocusLabel(_list_widget)
-            w.resize(longest, height)
+            w.fitSize(longest, height)
             w.setText(t)
             w.unfocus()
             _list_labels.append(w)
@@ -244,6 +258,10 @@ def focus_next_stacked(data, forward=1):
             _create_popup_list(data)
 
         ob.kgrab(data.screen, _focus_stacked_ungrab)
+        # the pointer grab causes pointer events during the keyboard grab to
+        # go away, which means we don't get enter notifies when the popup
+        # disappears, screwing up the focus
+        ob.mgrab(data.screen)
         focus_next_stacked(data, forward) # start with the first press
 
 def focus_prev_stacked(data):
@@ -253,6 +271,8 @@ def focus_prev_stacked(data):
 def focus_next(data, num=1, forward=1):
     """Focus the next (or previous, with forward=0) window in a linear
        order."""
+    global avoid_skip_taskbar
+
     screen = ob.openbox.screen(data.screen)
     count = screen.clientCount()
 
@@ -277,12 +297,10 @@ def focus_next(data, num=1, forward=1):
             else: target = count - 1
 
     t = target
-    curdesk = screen.desktop()
+    desktop = screen.desktop()
     while 1:
         client = screen.client(t)
-        if client.normal() and \
-               (client.desktop() == curdesk or client.desktop() == 0xffffffff)\
-               and client.focus():
+        if client and _focusable(client, desktop) and client.focus():
             if cycle_raise:
                 screen.raiseWindow(client)
             return