Changes in tags/v0.17.x/src/xpra/client [12925:28380] in xpra

Location:

tags/v0.17.x/src/xpra/client

Files:

• client_base.py (modified) (3 diffs)
• client_window_base.py (modified) (1 diff)
• gl/gl_window_backing_base.py (modified) (2 diffs)
• gtk_base/client_launcher.py (modified) (2 diffs)
• gtk_base/gtk_client_window_base.py (modified) (1 diff)
• gtk_base/gtk_tray_menu_base.py (modified) (4 diffs)
• ui_client_base.py (modified) (5 diffs)

tags/v0.17.x/src/xpra/client/client_base.py

@@ -29 +29 @@
 from xpra.version_util import version_compat_check, get_version_info, local_version
 from xpra.platform.info import get_name
-from xpra.os_util import get_hex_uuid, get_machine_id, get_user_uuid, load_binary_file, SIGNAMES, strtobytes, bytestostr
+from xpra.os_util import get_machine_id, get_user_uuid, load_binary_file, SIGNAMES, strtobytes, bytestostr
 from xpra.util import flatten_dict, typedict, updict, xor, repr_ellipsized, nonl, disconnect_is_an_error, dump_all_frames
 from xpra.net.file_transfer import FileTransferHandler
@@ -537 +537 @@
         #they also tell us which digest to use:
         digest = packet[3]
-        client_salt = get_hex_uuid()+get_hex_uuid()
+        client_salt = get_salt(len(salt))
         #TODO: use some key stretching algorigthm? (meh)
         try:
@@ -554 +554 @@
                 warn_server_and_exit(EXIT_ENCRYPTION, "server requested digest %s, cowardly refusing to use it without encryption" % digest, "invalid digest")
                 return
-            challenge_response = xor(password, salt)
+            salt = salt[:len(password)]
+            challenge_response = strtobytes(xor(password, salt))
         else:
             warn_server_and_exit(EXIT_PASSWORD_REQUIRED, "server requested an unsupported digest: %s" % digest, "invalid digest")

tags/v0.17.x/src/xpra/client/client_window_base.py

@@ -195 +195 @@
                         return value
                     title = re.sub("@[\w\-]*@", metadata_replace, title)
-                    if sys.version<'3':
-                        utf8_title = title.encode("utf-8")
-                    else:
-                        utf8_title = title
+                if sys.version<'3':
+                    utf8_title = title.encode("utf-8")
+                else:
+                    utf8_title = title
             except Exception as e:
                 log.error("error parsing window title: %s", e)

tags/v0.17.x/src/xpra/client/gl/gl_window_backing_base.py

@@ -207 +207 @@
         self.paint_screen = False
         self.paint_spinner = False
-        self.draw_needs_refresh = False
         self.offscreen_fbo = None
         self.pending_fbo_paint = []
@@ -214 +213 @@
 
         GTKWindowBacking.__init__(self, wid, window_alpha)
+        self.draw_needs_refresh = False
         self.init_gl_config(window_alpha)
         self.init_backing()

tags/v0.17.x/src/xpra/client/gtk_base/client_launcher.py

@@ -819 +819 @@
                     app.__osx_open_file = False
                     def do_open_file(filename):
-                        app.__osx_open_file = True
                         app.update_options_from_file(filename)
                         #the compressors and packet encoders cannot be changed from the UI
@@ -826 +825 @@
                         app.update_gui_from_config()
                         if app.config.autoconnect:
+                            app.__osx_open_file = True
                             glib.idle_add(app.do_connect)
                     def open_file(_, filename):

tags/v0.17.x/src/xpra/client/gtk_base/gtk_client_window_base.py

@@ -893 +893 @@
         if self._client.server_window_frame_extents and "frame" not in state:
             wfs = self.get_window_frame_size()
-            if wfs:
+            if wfs and len(wfs)==4:
                 state["frame"] = self._client.crect(*wfs)
                 self._current_frame_extents = wfs

tags/v0.17.x/src/xpra/client/gtk_base/gtk_tray_menu_base.py

@@ -567 +567 @@
     def make_keyboardsyncmenuitem(self):
         def set_keyboard_sync_tooltip():
-            if not self.client.keyboard_helper:
+            kh = self.client.keyboard_helper
+            if not kh:
                 self.keyboard_sync_menuitem.set_tooltip_text("Keyboard support is not loaded")
-            elif self.client.keyboard_helper.keyboard_sync:
+            elif kh.keyboard_sync:
                 self.keyboard_sync_menuitem.set_tooltip_text("Disable keyboard synchronization (prevents spurious key repeats on high latency connections)")
             else:
@@ -581 +582 @@
         set_sensitive(self.keyboard_sync_menuitem, False)
         def set_keyboard_sync_menuitem(*args):
-            log("set_keyboard_sync_menuitem%s enabled=%s", args, self.client.keyboard_helper.keyboard_sync)
-            self.keyboard_sync_menuitem.set_active(self.client.keyboard_helper.keyboard_sync)
-            set_sensitive(self.keyboard_sync_menuitem, True)
+            kh = self.client.keyboard_helper
+            set_sensitive(self.keyboard_sync_menuitem, bool(kh))
+            if kh:
+                log("set_keyboard_sync_menuitem%s enabled=%s", args, kh.keyboard_sync)
+            self.keyboard_sync_menuitem.set_active(bool(kh) and bool(kh.keyboard_sync))
             set_keyboard_sync_tooltip()
         self.client.after_handshake(set_keyboard_sync_menuitem)
@@ -892 +895 @@
             c.connect("toggled", activate_cb, menu)
             return c
+        webcam = self.menuitem("Webcam", "webcam.png", "Forward webcam pictures to the server", None)
+        if not self.client.webcam_forwarding:
+            webcam.set_tooltip_text("Webcam forwarding is disabled")
+            set_sensitive(webcam, False)
+            return webcam
+            return c
         def start_webcam(*args):
             webcamlog("start_webcam%s", args)
@@ -903 +912 @@
         menu.append(off)
 
-        webcam = self.menuitem("Webcam", "webcam.png", "Forward webcam pictures to the server", None)
         webcam.set_submenu(menu)
         def webcam_changed(*args):

tags/v0.17.x/src/xpra/client/ui_client_base.py

@@ -1003 +1003 @@
 
     def scaleset(self, xscale=1, yscale=1):
-        self.scale_change(xscale/self.xscale, yscale/self.yscale)
+        scalinglog("scaleset(%s, %s) current scaling: %s, %s", xscale, yscale, self.xscale, self.yscale)
+        self.scale_change(float(xscale)/self.xscale, float(yscale)/self.yscale)
 
     def scale_change(self, xchange=1, ychange=1):
+        scalinglog("scale_change(%s, %s)", xchange, ychange)
         if self.server_is_shadow and self.shadow_fullscreen:
             scalinglog("scale_change(%s, %s) ignored, fullscreen shadow mode is active", xchange, ychange)
@@ -1275 +1277 @@
                 log("window_close_event(%i) metadata=%s", wid, metadata)
                 class_instance = metadata.get("class-instance")
-                title = metadata.get("title")
-                log("window_close_event(%i) title=%s, class-instance(%s)=%s", wid, title, class_instance)
-                if title in TITLE_CLOSEEXIT:
+                title = metadata.get("title", "")
+                log("window_close_event(%i) title=%s, class-instance=%s", wid, title, class_instance)
+                matching_title_close = [x for x in TITLE_CLOSEEXIT if x and title.startswith(x)]
+                if matching_title_close:
                     log.info("window-close event on %s window, disconnecting", title)
                     self.quit(0)
                     return True
-                if class_instance and class_instance[0] in WM_CLASS_CLOSEEXIT:
+                if class_instance and class_instance[1] in WM_CLASS_CLOSEEXIT:
                     log.info("window-close event on %s window, disconnecting", class_instance[0])
                     self.quit(0)
@@ -1742 +1745 @@
         #the server will have a handle on the mmap file by now, safe to delete:
         self.clean_mmap()
-        server_auto_refresh_delay = c.intget("auto_refresh_delay", 0)/1000.0
-        if server_auto_refresh_delay==0 and self.auto_refresh_delay>0:
-            log.warn("Warning: server does not support auto-refresh!")
+        if self.windows_enabled:
+            server_auto_refresh_delay = c.intget("auto_refresh_delay", 0)/1000.0
+            if server_auto_refresh_delay==0 and self.auto_refresh_delay>0:
+                log.warn("Warning: server does not support auto-refresh!")
         self.server_encodings = c.strlistget("encodings")
         self.server_core_encodings = c.strlistget("encodings.core", self.server_encodings)
@@ -1786 +1790 @@
             proxy_version = c.strget("proxy.build.version", proxy_version)
             proxy_distro = c.strget("linux_distribution")
-            msg = "via: %s proxy version %s" % (platform_name(proxy_platform, proxy_distro or proxy_release), std(proxy_version))
+            msg = "via: %s proxy version %s" % (platform_name(proxy_platform, proxy_distro or proxy_release), std(proxy_version or "unknown"))
             if proxy_hostname:
                 msg += " on '%s'" % std(proxy_hostname)
@@ -1891 +1895 @@
         c = self.server_capabilities
         if self.client_supports_remote_logging and c.boolget("remote-logging"):
+            #check for debug:
+            from xpra.log import is_debug_enabled
+            for x in ("network", "crypto"):
+                if is_debug_enabled(x):
+                    log.warn("Warning: cannot enable remote logging as '%s' debug logging is enabled", x)
+                    return
             log.info("enabled remote logging")
             if not self.log_both: