Use -zoom auto; this only works in xli, so stop using xsetbg.

[xsetbg.git] / xsetbg.py

diff --git a/xsetbg.py b/xsetbg.py
index 93791a4ef38830d5e0e4dacc1be9b0c49cc057b6..efebc85caed082ab31f164909f20fb43a979bcfa 100755 (executable)
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -1,8 +1,9 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
 """Set a random background image (XWin)
 
-Select a random image from $HOME/lib/xsetbg/images subdirectories
-and set it as the desktop wallpaper (display it in the root window).
+Select a random image from a (list of) directory(s)
+and set it as the desktop wallpaper (display it in the root window)
+using xli or xsetbg programs.
 
 """
 
@@ -11,7 +12,7 @@ __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
 
 __author__ = "Oleg BroytMann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2000-2006 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2009 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
@@ -28,25 +29,6 @@ def error(error_str, error_code=1):
    sys.exit(error_code)
 
 
-xwininfo = os.popen("xwininfo -root", 'r')
-xwininfo_lines = xwininfo.read()
-rc = xwininfo.close()
-if rc:
-   error("calling xwininfo", rc)
-
-screen_width = None
-screen_height = None
-for line in xwininfo_lines.split('\n'):
-   line = line.strip()
-   if line.startswith("Width: "):
-      screen_width = int(line[len("Width: "):])
-   elif line.startswith("Height: "):
-      screen_height = int(line[len("Height: "):])
-
-if not screen_width or not screen_height:
-   error("parsing xwininfo output")
-
-
 from ConfigParser import SafeConfigParser
 
 xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg")
@@ -107,6 +89,12 @@ os.umask(0066) # octal; -rw-------; make the global persistent dictionary
 global_db_name = "xsetbg.db"
 
 
+# DB keys
+timestamp_key = "timestamp"
+filename_key = "filename"
+old_filename_key = "old_filename"
+
+
 import random
 import anydbm, shelve
 from time import time
@@ -123,13 +111,21 @@ except anydbm.error, msg:
       os.remove(global_db_name)
       global_db = shelve.open(global_db_name, flag='c')
 
-global_db.close() # Close DB in parent process
+# Remove old filenames
+old_time = time() - min_delay
 
+to_delete = [timestamp_key]
+for key in global_db.keys():
+   if key.startswith('/') and global_db[key] < old_time:
+      to_delete.append(key)
 
-# DB keys
-timestamp_key = "timestamp"
-filename_key = "filename"
-old_filename_key = "old_filename"
+for key in to_delete:
+   try:
+      del global_db[key]
+   except KeyError:
+      pass
+
+global_db.close() # Close DB in the parent process
 
 
 images = []
@@ -143,13 +139,6 @@ if not images:
    error("No images found. Abort.")
 
 
-try:
-   from PIL import Image
-   use_PIL = True
-except ImportError:
-   use_PIL = False
-
-
 def run():
    if len(sys.argv) not in (1, 2):
       usage()
@@ -203,23 +192,11 @@ def run():
             break
       global_db[image_name] = current_time
 
-      border = random.choice(borders)
-      root, ext = os.path.splitext(image_name)
-
       # Save filename
       if global_db.has_key(filename_key):
          global_db[old_filename_key] = global_db[filename_key]
       global_db[filename_key] = image_name
 
-      placement_options = []
-      if use_PIL:
-         image = Image.open(image_name, 'r')
-         im_w, im_h = image.size
-         del image
-         if (im_w > screen_width) or (im_h > screen_height):
-            zoom = min(screen_width*100//im_w, screen_height*100//im_h)
-            if zoom > 0: placement_options = ["-zoom", str(zoom)]
-
    finally:
       # Unlock and close the lock file
       flock(lock_file , LOCK_UN)
@@ -227,21 +204,12 @@ def run():
       # Flush and close the global persistent dictionary
       if global_db: global_db.close()
 
+   program_options = ["xli", "xli", "-onroot", "-quiet"] + \
+      ["-center", "-border", random.choice(borders), "-zoom", "auto",
+         image_name]
 
-   if ext.lower() in (".bmp", ".png"):
-      # xsetbg does not recognize BMP files.
-      # PNG files have gamma settings, and xli can adapt it to the display gamma;
-      # xloadimage/xview/xsetbg display them with wrong gamma.
-      program_options = ["xli", "xli", "-onroot", "-quiet"] + placement_options + \
-         ["-center", "-border", border, image_name]
-      os.execlp(*program_options)
-      error("cannot execute xli!")
-   else:
-      # ...but xli failed to load many image types, use xsetbg for them
-      program_options = ["xsetbg", "xsetbg"] + placement_options + \
-         ["-center", "-border", border, image_name]
-      os.execlp(*program_options)
-      error("cannot execute xsetbg!")
+   os.execlp(*program_options)
+   error("cannot execute xli!")
 
 
 if __name__ == "__main__":