Automated merge with ssh://hg@tsukasa.net.au/bg_scripts/

[bg-scripts] / lib / WallChanger.py

diff --git a/lib/WallChanger.py b/lib/WallChanger.py
index fbedb0ee1a7b87a8d193e44a72e9231d86559a75..d9f80dd8702d7cf58606511ec2fea99754786516 100644 (file)
--- a/lib/WallChanger.py
+++ b/lib/WallChanger.py
@@ -2,6 +2,7 @@
 
 import commands, sys, os, os.path, subprocess, time
 from GregDebug import debug, setDebugLevel, DEBUG_LEVEL_DEBUG, DEBUG_LEVEL_LOW, DEBUG_LEVEL_MEDIUM, DEBUG_LEVEL_HIGH, DEBUG_INCREMENT
+import FileLists
 
 import python24_adapter # NB: Must be imported before collections
 import collections
@@ -11,8 +12,6 @@ desktop image."""
 
 __all__ = ('RandomBG')
 
-KDE_CONFIG = os.path.expanduser('~/.kde/share/config/kdesktoprc')
-
 def RandomBG(*args, **kwargs):
        """Desktop Changer factory"""
 
@@ -39,6 +38,13 @@ def RandomBG(*args, **kwargs):
                else:
                        ret = __KDEChanger(*args, **kwargs)
 
+       debug("Testing for Gnome", DEBUG_LEVEL_LOW)
+       if commands.getstatusoutput("xwininfo -name 'gnome-session'")[0] == 0:
+               if ret is not None:
+                       ret.nextChanger = __GnomeChanger(*args, **kwargs)
+               else:
+                       ret = __GnomeChanger(*args, **kwargs)
+
        debug("Testing for WMaker", DEBUG_LEVEL_LOW)
        if commands.getstatusoutput("xlsclients | grep -qi wmaker")[0] == 0:
                if ret is not None:
@@ -75,8 +81,11 @@ class __BaseChanger(object):
                return self.changeTo(file) and self.callChained(file)
        
        def cycleReload(self):
-               file = self.filelist.getCurrentImage()
-               return self.changeTo(file) and self.callChained(file)
+               try:
+                       file = self.filelist.getCurrentImage()
+                       return self.changeTo(file) and self.callChained(file)
+               except FileLists.FileListNotImplemented:
+                       return self.cycleNext()
 
 
 class __WMakerChanger(__BaseChanger):
@@ -163,57 +172,27 @@ class __OSXChanger(__BaseChanger):
                debug(cmd, DEBUG_LEVEL_DEBUG)
                return not commands.getstatusoutput(cmd)[0]
 
+class __GnomeChanger(__BaseChanger):
+       def changeTo(self, file):
+               cmd = ['gconftool-2', '--type', 'string', '--set', '/desktop/gnome/background/picture_filename', file]
+               debug(cmd, DEBUG_LEVEL_DEBUG)
+               return subprocess.Popen(cmd, stdout=sys.stdout, stderr=sys.stderr, stdin=None).wait()
+
 class __KDEChanger(__BaseChanger):
-       def _parseKDEConfig(self, filename = KDE_CONFIG):
-               fd = open(filename, 'r')
-               result = collection.defaultdict(dict)
-               section = None
-               for line in fd:
-                       line = line.strip()
-                       if not line or line.startswith('#'):
-                               continue
-
-                       if line.startswith('[') and line.endswith(']'):
-                               section = line[1:-1]
-                               result[section] = {}
-                               continue
-                       elif not section:
-                               raise Exception('Invalid kdesktoprc file')
-
-                       unpack = line.split('=', 1)
-                       if len(unpack) == 2:
-                               key, val = unpack
-                       else:
-                               key, val = unpack[0], None
-                       result[section][key] = val
-                       
-               fd.close()
-               return result
-
-       def _writeKDEConfig(self, config, filename = KDE_CONFIG):
-               fd = open(filename, 'w')
-               for section, values in config.items():
-                       print >>fd, '[%s]' % section
-                       for k, v in values.items():
-                               if v != None:
-                                       print >>fd, '%s=%s' % (k,v)
-                               else:
-                                       print >>fd, k
-                       print >>fd
-               fd.close()
-       
        def changeTo(self, file):
-               kdeconfig = self._parseKDEConfig()
-               #kdeconfig['Background Common']['DrawBackgroundPerScreen_0']='true'
-               for section in ('Desktop0', 'Desktop0Screen0'):
-                       kdeconfig[section]['Wallpaper'] = file
-                       kdeconfig[section]['UseSHM'] = 'true'
-                       kdeconfig[section]['WallpaperMode'] = 'ScaleAndCrop'
-                       # Ensure that random mode is disabled...
-                       if 'MultiWallpaperMode' in kdeconfig[section]:
-                               del kdeconfig[section]['MultiWallpaperMode']
-
-               self._writeKDEConfig(kdeconfig)
-
-               return not subprocess.Popen(['dcop', 'kdesktop', 'KBackgroundIface', 'configure'], 
-                          stdout=sys.stdout, stderr=sys.stderr, stdin=open('/dev/null', 'r')).wait()
+               cmds = []
+               for group in ('Desktop0', 'Desktop0Screen0'):
+                       base = ['kwriteconfig', '--file', 'kdesktoprc', '--group', group, '--key']
+                       cmds.append(base + ['Wallpaper', file])
+                       cmds.append(base + ['UseSHM', '--type', 'bool', 'true'])
+                       cmds.append(base + ['WallpaperMode', 'ScaleAndCrop'])
+                       cmds.append(base + ['MultiWallpaperMode', 'NoMulti'])
+
+               cmds.append(['dcop', 'kdesktop', 'KBackgroundIface', 'configure'])
+               for cmd in cmds:
+                       debug(cmd, DEBUG_LEVEL_DEBUG)
+                       if subprocess.Popen(cmd, stdout=sys.stdout, stderr=sys.stderr, stdin=None).wait() != 0:
+                               return 1 # Fail
+
+               return 0 # Success
+