include the desktop name if cycling on all desktops is enabled

[chaz/openbox] / scripts / historyplacement.py

diff --git a/scripts/historyplacement.py b/scripts/historyplacement.py
index 8386e581043d1d8cd2ef49b4e4561ea69cec2766..63f19f0406168f44e69aa3cbd65e4ecd0c44619b 100644 (file)
--- a/scripts/historyplacement.py
+++ b/scripts/historyplacement.py
@@ -6,24 +6,41 @@
 import windowplacement # fallback routines
 
 ##############################################################################
-### Options for the historyplacement module (Options in the                ###
-### windowplacement module also apply!):                                   ###
-###                                                                        ###
-# fallback - The window placement algorithm that will be used when history ###
-###          placement does not have a place for the window.               ###
-fallback = windowplacement.random                                          ###
-# confirm_callback - set this to a function to have the function called    ###
-###                  before attempting to place a window via history. If   ###
-###                  the function returns 'true' then an attempt will be   ###
-###                  made to place the window. If it returns 'false', the  ###
-###                  fallback method will be directly applied instead.     ###
-confirm_callback = 0                                                       ###
-###                                                                        ###
-# filename - The name of the file where history data will be stored. The   ###
-###          number of the screen is appended onto this filename.          ###
-filename = 'historydb'                                                     ###
-###                                                                        ###
+###       Options for the historyplacement module (Options in the          ###
+###                windowplacement module also apply!)                     ###
 ##############################################################################
+IGNORE_REQUESTED_POSITIONS = 0
+"""When non-zero, the placement algorithm will attempt to place windows even
+   when they request a position (like XMMS). Note this only applies to normal
+   windows, not to special cases like desktops and docks."""
+DONT_DUPLICATE = 1
+"""When non-zero, if 2 copies of the same match in history are to be placed
+   before one of them is closed (so it would be placed over-top of the last
+   one), this will cause the second window to not be placed via history, and
+   the FALLBACK will be used instead."""
+FALLBACK = windowplacement.random
+"""The window placement algorithm that will be used when history placement
+   does not have a place for the window."""
+CONFIRM_CALLBACK = 0
+"""Set this to a function to have the function called before attempting to
+   place a window via history. If the function returns a non-zero, then an
+   attempt will be made to place the window. If it returns zero, the
+   FALLBACK method will be directly applied instead."""
+FILENAME = 'historydb'
+"""The name of the file where history data will be stored. The number of
+   the screen is appended onto this filename."""
+##############################################################################
+
+def place(data):
+    """Place a window usingthe history placement algorithm."""
+    _place(data)
+
+###########################################################################
+###########################################################################
+
+###########################################################################
+###      Internal stuff, should not be accessed outside the module.     ###
+###########################################################################
 
 import otk
 import ob
@@ -39,6 +56,7 @@ class _state:
         self.role = role
         self.x = x
         self.y = y
+        self.placed = 0
     def __eq__(self, other):
         if self.appname == other.appname and \
            self.appclass == other.appclass and \
@@ -48,9 +66,9 @@ class _state:
 
 def _load(data):
     global _data
-    file = open(os.environ['HOME']+'/.openbox/'+filename+"."+str(data.screen),
-                'r')
-    if file:
+    try:
+        file = open(os.environ['HOME'] + '/.openbox/' + FILENAME+"." +
+                    str(data.screen), 'r')
         # read data
         for line in file.readlines():
             line = line[:-1] # drop the '\n'
@@ -63,15 +81,14 @@ def _load(data):
                     _data.append([])
                 _data[data.screen].append(state)
                 
-            except ValueError:
-                pass
-            except IndexError:
-                pass
+            except ValueError: pass
+            except IndexError: pass
         file.close()
+    except IOError: pass
 
 def _save(data):
     global _data
-    file = open(os.environ['HOME']+'/.openbox/'+filename+"."+str(data.screen),
+    file = open(os.environ['HOME']+'/.openbox/'+FILENAME+"."+str(data.screen),
                 'w')
     if file:
         while len(_data)-1 < data.screen:
@@ -101,14 +118,14 @@ def _find(screen, state):
             _data.append([])
         return _find(screen, state) # try again
 
-def place(data):
+def _place(data):
     global _data
     if data.client:
-        if not windowplacement.ignore_requested_positions:
+        if not (IGNORE_REQUESTED_POSITIONS and data.client.normal()):
             if data.client.positionRequested(): return
         state = _create_state(data)
         try:
-            if not confirm_callback or confirm_callback(data):
+            if not CONFIRM_CALLBACK or CONFIRM_CALLBACK(data):
                 print "looking for : " + state.appname +  " : " + \
                       state.appclass + " : " + state.role
 
@@ -117,13 +134,17 @@ def place(data):
                     coords = _data[data.screen][i]
                     print "Found in history ("+str(coords.x)+","+\
                           str(coords.y)+")"
-                    data.client.move(coords.x, coords.y)
-                    return
+                    if not (DONT_DUPLICATE and coords.placed):
+                        data.client.move(coords.x, coords.y)
+                        coords.placed = 1
+                        return
+                    else:
+                        print "Already placed another window there"
                 else:
                     print "No match in history"
         except TypeError:
             pass
-    if fallback: fallback(data)
+    if FALLBACK: FALLBACK(data)
 
 def _save_window(data):
     global _data