scale window icons down to max 64x64 (keeping aspect ratio), also ena…

…ble png icons in client by default now as png is used by the scaling code.

git-svn-id: https://xpra.org/svn/Xpra/trunk@184 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/client.py

@@ -580,6 +580,7 @@ def send_hello(self, hash=None):
         capabilities_request["modifiers"] = modifiers
         root_w, root_h = gtk.gdk.get_default_root_window().get_size()
         capabilities_request["desktop_size"] = [root_w, root_h]
+        capabilities_request["png_window_icons"] = True
         self.send(["hello", capabilities_request])
 
     def send_jpeg_quality(self):

src/xpra/server.py

@@ -596,6 +596,17 @@ def _make_metadata(self, window, propname):
                 log("found new window icon: %sx%s, sending as png=%s" % (w,h,self.png_window_icons))
                 if self.png_window_icons:
                     img = Image.frombuffer("RGBA", (w,h), surf.get_data(), "raw", "RGBA", 0, 1)
+                    MAX_SIZE = 64
+                    if w>MAX_SIZE or h>MAX_SIZE:
+                        #scale icon down
+                        if w>=h:
+                            h = int(h*MAX_SIZE/w)
+                            w = MAX_SIZE
+                        else:
+                            w = int(w*MAX_SIZE/h)
+                            h = MAX_SIZE
+                        log("scaling window icon down to %sx%s" % (w,h))
+                        img = img.resize((w,h), Image.ANTIALIAS)
                     output = StringIO.StringIO()
                     img.save(output, 'PNG')
                     raw_data = output.getvalue()