]> code.delx.au - bg-scripts/blobdiff - wallchanger.py
Proper Gnome3 support
[bg-scripts] / wallchanger.py
index b5cf6a14ef8e37e8675df27bb3657aea036d1222..8230f4805fddbfbdbfb7d650603bb96ebe9ca02e 100755 (executable)
@@ -22,6 +22,9 @@ def set_image(filename):
                if not changer.set_image(filename):
                        logging.warning("Failed to set background: wallchanger.set_image(%s), changer=%s", filename, changer)
 
+def check_cmd(cmd):
+       return commands.getstatusoutput(cmd)[0] == 0
+
 def init(*args, **kwargs):
        """Desktop Changer factory"""
 
@@ -30,7 +33,7 @@ def init(*args, **kwargs):
                return
 
        logging.debug("Testing for OSX (NonX11)")
-       if commands.getstatusoutput("ps ax -o command -c|grep -q WindowServer")[0] == 0:
+       if check_cmd("ps ax -o command -c|grep -q WindowServer"):
                changers.append(OSXChanger(*args, **kwargs))
 
        if 'DISPLAY' not in os.environ or os.environ['DISPLAY'].startswith('/tmp/launch'):
@@ -39,24 +42,23 @@ def init(*args, **kwargs):
        else:
                if os.uname()[0] == 'Darwin':
                        # Try to detect if the X11 server is running on OSX
-                       if commands.getstatusoutput("ps ax -o command|grep -q '^/.*X11 .* %s'" % os.environ['DISPLAY'])[0] != 0:
+                       if check_cmd("ps ax -o command|grep -q '^/.*X11 .* %s'" % os.environ['DISPLAY']):
                                # X11 is not running for this display
                                return
 
        logging.debug("Testing for KDE")
-       if commands.getstatusoutput("xwininfo -name 'KDE Desktop'")[0] == 0:
+       if check_cmd("xwininfo -name 'KDE Desktop'"):
                changers.append(KDEChanger(*args, **kwargs))
 
-       logging.debug("Testing for Unity")
-       if commands.getstatusoutput("xlsclients | grep -qi unity")[0] == 0:
-               changers.append(UnityChanger(*args, **kwargs))
-
        logging.debug("Testing for Gnome")
-       if commands.getstatusoutput("xwininfo -name 'gnome-settings-daemon'")[0] == 0:
-               changers.append(GnomeChanger(*args, **kwargs))
+       if check_cmd("xwininfo -name 'gnome-settings-daemon'"):
+               if check_cmd("gsettings get org.gnome.desktop.background picture-uri"):
+                       changers.append(Gnome3Changer(*args, **kwargs))
+               else:
+                       changers.append(Gnome2Changer(*args, **kwargs))
 
        logging.debug("Testing for WMaker")
-       if commands.getstatusoutput("xlsclients | grep -qi wmaker")[0] == 0:
+       if check_cmd("xlsclients | grep -qi wmaker"):
                changers.append(WMakerChanger(*args, **kwargs))
        
        if len(changers) == 0:
@@ -119,17 +121,17 @@ class WMakerChanger(BaseChanger):
                        for dirname in dirnames:
                                os.unlink(os.path.join(fullpath, dirname))
 
-       def convert_image_format(self, file):
+       def convert_image_format(self, filename):
                """Convert the image to a png, and store it in a local place"""
                self.remove_old_image_cache()
                output_name = os.path.join(self._ConvertedWallpaperLocation, '%s.png' % time.time())
-               cmd = ["convert", '-resize', '1280', '-gravity', 'Center', '-crop', '1280x800+0+0', file, output_name]
+               cmd = ["convert", '-resize', '1280', '-gravity', 'Center', '-crop', '1280x800+0+0', filename, output_name]
                logging.debug("""Convert command: '"%s"'""", '" "'.join(cmd))
                return output_name, self._exec_cmd(cmd)
 
-       def set_image(self, file):
+       def set_image(self, filename):
                if self.convert:
-                       file, convert_status = self.convert_image_format(file)
+                       filename, convert_status = self.convert_image_format(filename)
                        if convert_status:
                                logging.debug('Convert failed')
                cmd = ["wmsetbg", 
@@ -142,7 +144,7 @@ class WMakerChanger(BaseChanger):
                        ]
                if self.permanent:
                        cmd += ["-u"] # update the wmaker database
-               cmd += [file]
+               cmd += [filename]
                logging.debug('''WMaker bgset command: "'%s'"''', "' '".join(cmd))
                return not self._exec_cmd(cmd)
 
@@ -164,17 +166,17 @@ class OSXChanger(BaseChanger):
                        for dirname in dirnames:
                                os.unlink(os.path.join(fullpath, dirname))
 
-       def convert_image_format(self, file):
+       def convert_image_format(self, filename):
                """Convert the image to a png, and store it in a local place"""
                self.remove_old_image_cache()
                output_name = os.path.join(self._ConvertedWallpaperLocation, '%s.png' % time.time())
                try:
-                       return super(OSXChanger, self).convert_image_format(file, format='PNG', extension='.png')
+                       return super(OSXChanger, self).convert_image_format(filename, format='PNG', extension='.png')
                except ImportError:
                        logging.debug('Could not load PIL, going to try just copying the image')
                        import shutil
-                       output_name = os.path.join(self._ConvertedWallpaperLocation, os.path.basename(file))
-                       shutil.copyfile(file, output_name)
+                       output_name = os.path.join(self._ConvertedWallpaperLocation, os.path.basename(filename))
+                       shutil.copyfile(filename, output_name)
                        return output_name, True
 
        def fix_desktop_plist(self):
@@ -246,27 +248,27 @@ class WIN32Changer(BaseChanger):
                )
                return True
 
-class GnomeChanger(BaseChanger):
+class Gnome2Changer(BaseChanger):
        name = "Gnome"
-       def set_image(self, file):
-               cmd = ['gconftool-2', '--type', 'string', '--set', '/desktop/gnome/background/picture_filename', file]
+       def set_image(self, filename):
+               cmd = ['gconftool-2', '--type', 'string', '--set', '/desktop/gnome/background/picture_filename', filename]
                logging.debug(cmd)
                return not self._exec_cmd(cmd)
 
-class UnityChanger(BaseChanger):
-       name = "Unity"
-       def set_image(self, file):
-               cmd = ['gsettings', 'set', 'org.gnome.desktop.background', 'picture-uri', 'file://'+file]
+class Gnome3Changer(BaseChanger):
+       name = "Gnome3"
+       def set_image(self, filename):
+               cmd = ['gsettings', 'set', 'org.gnome.desktop.background', 'picture-uri', 'file://'+filename]
                logging.debug(cmd)
                return not self._exec_cmd(cmd)
 
 class KDEChanger(BaseChanger):
        name = "KDE"
-       def set_image(self, file):
+       def set_image(self, filename):
                cmds = []
                for group in ('Desktop0', 'Desktop0Screen0'):
                        base = ['kwriteconfig', '--file', 'kdesktoprc', '--group', group, '--key']
-                       cmds.append(base + ['Wallpaper', file])
+                       cmds.append(base + ['Wallpaper', filename])
                        cmds.append(base + ['UseSHM', '--type', 'bool', 'true'])
                        cmds.append(base + ['WallpaperMode', 'ScaleAndCrop'])
                        cmds.append(base + ['MultiWallpaperMode', 'NoMulti'])