don't raise the window when reverting from Escape

[chaz/openbox] / scripts / historyplacement.py

diff --git a/scripts/historyplacement.py b/scripts/historyplacement.py
index 8f44030aeb6a95cc693a84da1d970763b8dc9f48..237fcb714833b39587e00076e4589d83ea28cf56 100644 (file)
--- a/scripts/historyplacement.py
+++ b/scripts/historyplacement.py
@@ -6,12 +6,28 @@
 import windowplacement # fallback routines
 
 ##############################################################################
-### Options for the historyplacement module:                               ###
+### Options for the historyplacement module (Options in the                ###
+### windowplacement module also apply!):                                   ###
+###                                                                        ###
+# ignore_requested_positions - When true, 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.                                      ###
+ignore_requested_positions = 0                                             ###
 ###                                                                        ###
 # 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'                                                     ###
@@ -40,16 +56,14 @@ class _state:
         return 0
 
 def _load(data):
+    global _data
     file = open(os.environ['HOME']+'/.openbox/'+filename+"."+str(data.screen),
                 'r')
     if file:
-        print "loading: "
         # read data
         for line in file.readlines():
             line = line[:-1] # drop the '\n'
             try:
-                print string.split(line, '\0')
-                print line.count('\0')
                 s = string.split(line, '\0')
                 state = _state(s[0], s[1], s[2],
                                string.atoi(s[3]), string.atoi(s[4]))
@@ -58,22 +72,17 @@ def _load(data):
                     _data.append([])
                 _data[data.screen].append(state)
                 
-                print "  "+s[0]+" "+s[1]+" "+s[2]
-                print "     " + str(s[3]) + "," + str(s[4])
             except ValueError:
-                print "ValueError"
                 pass
             except IndexError:
-                print "IndexError"
                 pass
-        print "DONE loading."
         file.close()
 
 def _save(data):
+    global _data
     file = open(os.environ['HOME']+'/.openbox/'+filename+"."+str(data.screen),
                 'w')
     if file:
-        print "saving: "
         while len(_data)-1 < data.screen:
             _data.append([])
         for i in _data[data.screen]:
@@ -82,49 +91,61 @@ def _save(data):
                        i.role + '\0' +
                        str(i.x) + '\0' +
                        str(i.y) + '\n')
-            print "  "+i.appname+" "+i.appclass+" "+i.role
-            print "     " + str(i.x) + "," + str(i.y)
-        print "DONE saving."
         file.close()
 
+def _create_state(data):
+    global _data
+    area = data.client.area()
+    return _state(data.client.appName(), data.client.appClass(),
+                  data.client.role(), area.x(), area.y())
+
+def _find(screen, state):
+    global _data
+    try:
+        return _data[screen].index(state)
+    except ValueError:
+        return -1
+    except IndexError:
+        while len(_data)-1 < screen:
+            _data.append([])
+        return _find(screen, state) # try again
+
 def place(data):
-    print "placing"
+    global _data
     if data.client:
-        state = _state(data.client.appName(), data.client.appClass(),
-                       data.client.role(), 0, 0)
-        while len(_data)-1 < data.screen:
-            _data.append([])
-        print "looking for :"
-        print "  " + state.appname
-        print "  " + state.appclass
-        print "  " + state.role
+        if not (ignore_requested_positions and data.client.normal()):
+            if data.client.positionRequested(): return
+        state = _create_state(data)
         try:
-            i = _data[data.screen].index(state)
-            print "got it"
-            coords = _data[data.screen][i]
-            print "Found in history ("+str(coords.x)+","+str(coords.y)+")"
-            data.client.move(coords.x, coords.y)
-        except ValueError:
-            print "No match in history"
-            fallback(data)
+            if not confirm_callback or confirm_callback(data):
+                print "looking for : " + state.appname +  " : " + \
+                      state.appclass + " : " + state.role
+
+                i = _find(data.screen, state)
+                if i >= 0:
+                    coords = _data[data.screen][i]
+                    print "Found in history ("+str(coords.x)+","+\
+                          str(coords.y)+")"
+                    data.client.move(coords.x, coords.y)
+                    return
+                else:
+                    print "No match in history"
+        except TypeError:
+            pass
+    if fallback: fallback(data)
 
 def _save_window(data):
-    print "saving"
+    global _data
     if data.client:
-        area = data.client.area()
-        state = _state(data.client.appName(), data.client.appClass(),
-                       data.client.role(), area.x(), area.y())
-        while len(_data)-1 < data.screen:
-            _data.append([])
-        print "looking for :"
-        print "  " + state.appname
-        print "  " + state.appclass
-        print "  " + state.role
-        try:
-            i = _data[data.screen].index(state)
+        state = _create_state(data)
+        print "looking for : " + state.appname +  " : " + state.appclass + \
+              " : " + state.role
+
+        i = _find(data.screen, state)
+        if i >= 0:
             print "replacing"
             _data[data.screen][i] = state # replace it
-        except ValueError:
+        else:
             print "appending"
             _data[data.screen].append(state)