use new "envbool" utility function for getting boolean values from th…

…e environment

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

src/xpra/child_reaper.py

@@ -12,17 +12,17 @@
 import os, sys
 import signal
 
-from xpra.util import envint
+from xpra.util import envint, envbool
 from xpra.log import Logger
 log = Logger("server", "util")
 
 
 # use process polling with python versions older than 2.7 and 3.0, (because SIGCHLD support is broken)
 # or when the user requests it with the env var:
 BUGGY_PYTHON = sys.version_info<(2, 7) or sys.version_info[:2]==(3, 0)
-USE_PROCESS_POLLING = os.name!="posix" or os.environ.get("XPRA_USE_PROCESS_POLLING")=="1" or BUGGY_PYTHON
+USE_PROCESS_POLLING = os.name!="posix" or envbool("XPRA_USE_PROCESS_POLLING") or BUGGY_PYTHON
 POLL_DELAY = envint("XPRA_POLL_DELAY", 2)
-POLL_WARNING = envint("XPRA_POLL_WARNING", 1)
+POLL_WARNING = envbool("XPRA_POLL_WARNING", True)
 
 
 singleton = None

src/xpra/client/client_base.py

@@ -29,7 +29,7 @@
 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_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.util import flatten_dict, typedict, updict, xor, repr_ellipsized, nonl, envbool, disconnect_is_an_error, dump_all_frames
 from xpra.net.file_transfer import FileTransferHandler
 
 from xpra.exit_codes import (EXIT_OK, EXIT_CONNECTION_LOST, EXIT_TIMEOUT,
@@ -45,9 +45,9 @@
 
 
 EXTRA_TIMEOUT = 10
-ALLOW_UNENCRYPTED_PASSWORDS = os.environ.get("XPRA_ALLOW_UNENCRYPTED_PASSWORDS", "0")=="1"
-DETECT_LEAKS = os.environ.get("XPRA_DETECT_LEAKS", "0")=="1"
-DELETE_PRINTER_FILE = os.environ.get("XPRA_DELETE_PRINTER_FILE", "1")=="1"
+ALLOW_UNENCRYPTED_PASSWORDS = envbool("XPRA_ALLOW_UNENCRYPTED_PASSWORDS", False)
+DETECT_LEAKS = envbool("XPRA_DETECT_LEAKS", False)
+DELETE_PRINTER_FILE = envbool("XPRA_DELETE_PRINTER_FILE", True)
 
 
 class XpraClientBase(FileTransferHandler):

src/xpra/client/client_widget_base.py

@@ -1,17 +1,17 @@
 # This file is part of Xpra.
 # Copyright (C) 2011 Serviware (Arthur Huillet, <ahuillet@serviware.com>)
-# Copyright (C) 2010-2015 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2010-2016 Antoine Martin <antoine@devloop.org.uk>
 # Copyright (C) 2008, 2010 Nathaniel Smith <njs@pobox.com>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-import os
 
 from xpra.log import Logger
 log = Logger("window")
 
 #pretend to draw the windows, but don't actually do anything
-USE_FAKE_BACKING = os.environ.get("XPRA_USE_FAKE_BACKING", "0")=="1"
+from xpra.util import envbool
+USE_FAKE_BACKING = envbool("XPRA_USE_FAKE_BACKING", False)
 
 
 class ClientWidgetBase(object):

src/xpra/client/client_window_base.py

@@ -10,7 +10,7 @@
 
 from xpra.client.client_widget_base import ClientWidgetBase
 from xpra.os_util import bytestostr
-from xpra.util import typedict, WORKSPACE_UNSET, WORKSPACE_NAMES
+from xpra.util import typedict, envbool, WORKSPACE_UNSET, WORKSPACE_NAMES
 from xpra.log import Logger
 log = Logger("window")
 plog = Logger("paint")
@@ -22,7 +22,7 @@
 
 
 REPAINT_ALL = os.environ.get("XPRA_REPAINT_ALL", "")
-SIMULATE_MOUSE_DOWN = os.environ.get("XPRA_SIMULATE_MOUSE_DOWN", "1")=="1"
+SIMULATE_MOUSE_DOWN = envbool("XPRA_SIMULATE_MOUSE_DOWN", True)
 PROPERTIES_DEBUG = [x.strip() for x in os.environ.get("XPRA_WINDOW_PROPERTIES_DEBUG", "").split(",")]
 
 

src/xpra/client/gl/gl_check.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 # This file is part of Xpra.
 # Copyright (C) 2012 Serviware (Arthur Huillet, <ahuillet@serviware.com>)
-# Copyright (C) 2012-2014 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2012-2016 Antoine Martin <antoine@devloop.org.uk>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-import sys, os
+import sys
 import logging
+from xpra.util import envbool
 from xpra.log import Logger, CaptureHandler
 log = Logger("opengl")
 
@@ -42,12 +43,12 @@
 
 #alpha requires gtk3 or *nix only for gtk2:
 DEFAULT_ALPHA = sys.version>'3' or (not sys.platform.startswith("win") and not sys.platform.startswith("darwin"))
-GL_ALPHA_SUPPORTED = os.environ.get("XPRA_ALPHA", DEFAULT_ALPHA) in (True, "1")
+GL_ALPHA_SUPPORTED = envbool("XPRA_ALPHA", DEFAULT_ALPHA)
 #not working with gtk3 yet?
 CAN_DOUBLE_BUFFER = True
 #needed on win32?:
 DEFAULT_DOUBLE_BUFFERED = sys.platform.startswith("win") and CAN_DOUBLE_BUFFER
-DOUBLE_BUFFERED = os.environ.get("XPRA_OPENGL_DOUBLE_BUFFERED", str(int(DEFAULT_DOUBLE_BUFFERED)))=="1"
+DOUBLE_BUFFERED = envbool("XPRA_OPENGL_DOUBLE_BUFFERED", DEFAULT_DOUBLE_BUFFERED)
 
 
 def get_visual_name(visual):

src/xpra/client/gl/gl_window_backing_base.py

@@ -7,15 +7,15 @@
 import os
 import time, math
 
-from xpra.util import envint
+from xpra.util import envint, envbool
 from xpra.log import Logger
 log = Logger("opengl", "paint")
 fpslog = Logger("opengl", "fps")
 
-OPENGL_DEBUG = envint("XPRA_OPENGL_DEBUG")
-OPENGL_PAINT_BOX = envint("XPRA_OPENGL_PAINT_BOX")
-SCROLL_ENCODING = envint("XPRA_SCROLL_ENCODING", 1)
-PAINT_FLUSH = envint("XPRA_PAINT_FLUSH", 1)
+OPENGL_DEBUG = envbool("XPRA_OPENGL_DEBUG", False)
+OPENGL_PAINT_BOX = envint("XPRA_OPENGL_PAINT_BOX", 0)
+SCROLL_ENCODING = envbool("XPRA_SCROLL_ENCODING", True)
+PAINT_FLUSH = envbool("XPRA_PAINT_FLUSH", True)
 
 from xpra.gtk_common.gtk_util import color_parse, is_realized
 
@@ -158,7 +158,7 @@ def py_gl_debug_callback(source, error_type, error_id, severity, length, message
     import OpenGL_accelerate            #@UnresolvedImport
 except:
     OpenGL_accelerate = None
-zerocopy_upload = bool(OpenGL_accelerate) and os.environ.get("XPRA_ZEROCOPY_OPENGL_UPLOAD", "1")=="1" and is_pyopengl_memoryview_safe(OpenGL_version.__version__, OpenGL_accelerate.__version__)
+zerocopy_upload = bool(OpenGL_accelerate) and envbool("XPRA_ZEROCOPY_OPENGL_UPLOAD", True) and is_pyopengl_memoryview_safe(OpenGL_version.__version__, OpenGL_accelerate.__version__)
 try:
     memoryview_type = memoryview
 except:

src/xpra/client/gobject_client_base.py

@@ -12,12 +12,12 @@
 log = Logger("gobject", "client")
 
 import sys
-from xpra.util import nonl, sorted_nicely, print_nested_dict, envint, DONE
+from xpra.util import nonl, sorted_nicely, print_nested_dict, envbool, DONE
 from xpra.os_util import bytestostr
 from xpra.client.client_base import XpraClientBase, EXTRA_TIMEOUT
 from xpra.exit_codes import (EXIT_OK, EXIT_TIMEOUT, EXIT_UNSUPPORTED, EXIT_REMOTE_ERROR, EXIT_FILE_TOO_BIG)
 
-FLATTEN_INFO = envint("XPRA_FLATTEN_INFO", 1)
+FLATTEN_INFO = envbool("XPRA_FLATTEN_INFO", True)
 
 
 class GObjectXpraClient(XpraClientBase, gobject.GObject):

src/xpra/client/gtk2/client_window.py

@@ -1,15 +1,15 @@
 # This file is part of Xpra.
 # Copyright (C) 2011 Serviware (Arthur Huillet, <ahuillet@serviware.com>)
-# Copyright (C) 2010-2014 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2010-2016 Antoine Martin <antoine@devloop.org.uk>
 # Copyright (C) 2008, 2010 Nathaniel Smith <njs@pobox.com>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-import os
+from xpra.util import envbool
 from xpra.client.gtk2.gtk2_window_base import GTK2WindowBase
 
 
-USE_CAIRO = os.environ.get("XPRA_USE_CAIRO_BACKING", "0")=="1"
+USE_CAIRO = envbool("XPRA_USE_CAIRO_BACKING", False)
 if USE_CAIRO:
     from xpra.client.gtk2.cairo_backing import CairoBacking
     BACKING_CLASS = CairoBacking

src/xpra/client/gtk2/pixmap_backing.py

@@ -14,11 +14,11 @@
 from xpra.client.gtk2.window_backing import GTK2WindowBacking
 from xpra.client.window_backing_base import fire_paint_callbacks
 from xpra.os_util import memoryview_to_bytes
-from xpra.util import csv
+from xpra.util import csv, envbool
 
 
 PIXMAP_RGB_MODES = ["RGB", "RGBX", "RGBA"]
-INDIRECT_BGR = os.environ.get("XPRA_PIXMAP_INDIRECT_BGR", "0")=="1"
+INDIRECT_BGR = envbool("XPRA_PIXMAP_INDIRECT_BGR", False)
 if INDIRECT_BGR:
     PIXMAP_RGB_MODES += ["BGRX", "BGRA", "BGR"]
 

src/xpra/client/gtk2/window_backing.py

@@ -1,20 +1,20 @@
 # This file is part of Xpra.
 # Copyright (C) 2008 Nathaniel Smith <njs@pobox.com>
-# Copyright (C) 2012-2015 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2012-2016 Antoine Martin <antoine@devloop.org.uk>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
 from gtk import gdk
-import os
 
 from xpra.log import Logger
 log = Logger("paint")
 
+from xpra.util import envbool
 from xpra.client.gtk_base.gtk_window_backing_base import GTKWindowBacking
 from xpra.client.window_backing_base import fire_paint_callbacks
 from xpra.codecs.loader import has_codec
 
-USE_PIL = os.environ.get("XPRA_USE_PIL", "1")=="1"
+USE_PIL = envbool("XPRA_USE_PIL", True)
 
 
 """

src/xpra/client/gtk_base/gtk_client_base.py

@@ -25,7 +25,7 @@
 
 from xpra.gtk_common.quit import (gtk_main_quit_really,
                            gtk_main_quit_on_fatal_exceptions_enable)
-from xpra.util import updict, pver, iround, flatten_dict, DEFAULT_METADATA_SUPPORTED
+from xpra.util import updict, pver, iround, flatten_dict, envbool, DEFAULT_METADATA_SUPPORTED
 from xpra.os_util import bytestostr
 from xpra.gtk_common.cursor_names import cursor_types
 from xpra.gtk_common.gtk_util import get_gtk_version_info, scaled_image, get_default_cursor, \
@@ -43,7 +43,7 @@
 missing_cursor_names = set()
 
 METADATA_SUPPORTED = os.environ.get("XPRA_METADATA_SUPPORTED")
-USE_LOCAL_CURSORS = os.environ.get("XPRA_USE_LOCAL_CURSORS", "1")=="1"
+USE_LOCAL_CURSORS = envbool("XPRA_USE_LOCAL_CURSORS", True)
 
 
 class GTKXpraClient(UIXpraClient, GObjectXpraClient):

src/xpra/client/gtk_base/gtk_client_window_base.py

@@ -26,7 +26,8 @@
 
 
 from xpra.os_util import memoryview_to_bytes, bytestostr
-from xpra.util import (AdHocStruct, typedict, envint, WORKSPACE_UNSET, WORKSPACE_ALL, WORKSPACE_NAMES, MOVERESIZE_DIRECTION_STRING, SOURCE_INDICATION_STRING, 
+from xpra.util import (AdHocStruct, typedict, envint, envbool,
+                       WORKSPACE_UNSET, WORKSPACE_ALL, WORKSPACE_NAMES, MOVERESIZE_DIRECTION_STRING, SOURCE_INDICATION_STRING, 
                        MOVERESIZE_CANCEL,
                        MOVERESIZE_SIZE_TOPLEFT, MOVERESIZE_SIZE_TOP, MOVERESIZE_SIZE_TOPRIGHT,
                        MOVERESIZE_SIZE_RIGHT,
@@ -48,7 +49,7 @@
 
 CAN_SET_WORKSPACE = False
 HAS_X11_BINDINGS = False
-if os.name=="posix" and os.environ.get("XPRA_SET_WORKSPACE", "1")!="0":
+if os.name=="posix" and envbool("XPRA_SET_WORKSPACE", True):
     try:
         from xpra.x11.gtk_x11.prop import prop_get, prop_set
         from xpra.x11.bindings.window_bindings import constants, X11WindowBindings, SHAPE_KIND  #@UnresolvedImport
@@ -75,11 +76,11 @@
 
 
 BREAK_MOVERESIZE = os.environ.get("XPRA_BREAK_MOVERESIZE", "Escape").split(",")
-MOVERESIZE_X11 = envint("XPRA_MOVERESIZE_X11", os.name=="posix")
+MOVERESIZE_X11 = envbool("XPRA_MOVERESIZE_X11", os.name=="posix")
 
-SAVE_WINDOW_ICONS = envint("XPRA_SAVE_WINDOW_ICONS")
+SAVE_WINDOW_ICONS = envbool("XPRA_SAVE_WINDOW_ICONS", False)
 UNDECORATED_TRANSIENT_IS_OR = envint("XPRA_UNDECORATED_TRANSIENT_IS_OR", 1)
-LAZY_SHAPE = envint("XPRA_LAZY_SHAPE", 1)
+LAZY_SHAPE = envbool("XPRA_LAZY_SHAPE", True)
 
 #window types we map to POPUP rather than TOPLEVEL
 POPUP_TYPE_HINTS = set((

src/xpra/client/gtk_base/gtk_tray_menu_base.py

@@ -1,16 +1,15 @@
 # coding=utf8
 # This file is part of Xpra.
-# Copyright (C) 2011-2014 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2011-2016 Antoine Martin <antoine@devloop.org.uk>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
 import sys
-import os
 from xpra.gtk_common.gobject_compat import import_gtk, import_glib
 gtk = import_gtk()
 glib = import_glib()
 
-from xpra.util import CLIENT_EXIT, iround
+from xpra.util import CLIENT_EXIT, iround, envbool
 from xpra.os_util import bytestostr
 from xpra.gtk_common.gtk_util import ensure_item_selected, menuitem, popup_menu_workaround, CheckMenuItem
 from xpra.client.client_base import EXIT_OK
@@ -30,10 +29,10 @@
 
 HIDE_DISABLED_MENU_ENTRIES = sys.platform.startswith("darwin")
 
-SHOW_UPLOAD = os.environ.get("XPRA_SHOW_UPLOAD_MENU", "1")=="1"
-STARTSTOP_SOUND_MENU = os.environ.get("XPRA_SHOW_SOUND_MENU", "1")=="1"
-WEBCAM_MENU = os.environ.get("XPRA_SHOW_WEBCAM_MENU", "1")=="1"
-RUNCOMMAND_MENU = os.environ.get("XPRA_SHOW_RUNCOMMAND_MENU", "1")=="1"
+SHOW_UPLOAD = envbool("XPRA_SHOW_UPLOAD_MENU", True)
+STARTSTOP_SOUND_MENU = envbool("XPRA_SHOW_SOUND_MENU", True)
+WEBCAM_MENU = envbool("XPRA_SHOW_WEBCAM_MENU", True)
+RUNCOMMAND_MENU = envbool("XPRA_SHOW_RUNCOMMAND_MENU", True)
 
 LOSSLESS = "Lossless"
 QUALITY_OPTIONS_COMMON = {

src/xpra/client/gtk_base/gtk_window_backing_base.py

@@ -1,17 +1,17 @@
 # This file is part of Xpra.
 # Copyright (C) 2008 Nathaniel Smith <njs@pobox.com>
-# Copyright (C) 2012-2015 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2012-2016 Antoine Martin <antoine@devloop.org.uk>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-import os
 import sys
 
 #pygtk3 vs pygtk2 (sigh)
 from xpra.gtk_common.gobject_compat import import_glib, import_cairo, is_gtk3
 glib = import_glib()
 cairo   = import_cairo()
 
+from xpra.util import envbool
 from xpra.client.window_backing_base import WindowBackingBase
 from xpra.log import Logger
 log = Logger("paint")
@@ -20,7 +20,7 @@
 # - on MS Windows: not supported
 # - on OSX: only with gtk3
 DEFAULT_HAS_ALPHA = not sys.platform.startswith("win") and (not sys.platform.startswith("darwin") or is_gtk3())
-GTK_ALPHA_SUPPORTED = os.environ.get("XPRA_ALPHA", DEFAULT_HAS_ALPHA) in (True, "1")
+GTK_ALPHA_SUPPORTED = envbool("XPRA_ALPHA", DEFAULT_HAS_ALPHA)
 
 
 """

src/xpra/client/gtk_base/statusicon_tray.py

@@ -1,13 +1,14 @@
 # This file is part of Xpra.
 # Copyright (C) 2010 Nathaniel Smith <njs@pobox.com>
-# Copyright (C) 2011-2014 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2011-2016 Antoine Martin <antoine@devloop.org.uk>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
 # A tray implemented using gtk.StatusIcon
 
 import os
 import sys
+from xpra.util import envbool
 from xpra.gtk_common.gobject_compat import import_gtk, import_gdk, is_gtk3
 gtk = import_gtk()
 gdk = import_gdk()
@@ -21,8 +22,8 @@
     ORIENTATION[gtk.ORIENTATION_HORIZONTAL] = "HORIZONTAL"
     ORIENTATION[gtk.ORIENTATION_VERTICAL]   = "VERTICAL"
 
-GUESS_GEOMETRY = str(int(sys.platform.startswith("win") or sys.platform.startswith("darwin")))
-GUESS_GEOMETRY = os.environ.get("XPRA_GUESS_ICON_GEOMETRY", GUESS_GEOMETRY)=="1"
+GUESS_GEOMETRY = sys.platform.startswith("win") or sys.platform.startswith("darwin")
+GUESS_GEOMETRY = envbool("XPRA_GUESS_ICON_GEOMETRY", GUESS_GEOMETRY)
 log("tray GUESS_GEOMETRY=%s", GUESS_GEOMETRY)
 
 

src/xpra/client/ui_client_base.py

@@ -59,7 +59,7 @@
 from xpra.child_reaper import reaper_cleanup
 from xpra.make_thread import make_thread
 from xpra.os_util import BytesIOClass, Queue, platform_name, get_machine_id, get_user_uuid, bytestostr
-from xpra.util import nonl, std, iround, envint, AtomicInteger, log_screen_sizes, typedict, updict, csv, engs, CLIENT_EXIT
+from xpra.util import nonl, std, iround, envint, envbool, AtomicInteger, log_screen_sizes, typedict, updict, csv, engs, CLIENT_EXIT
 from xpra.version_util import get_version_info_full, get_platform_info
 try:
     from xpra.clipboard.clipboard_base import ALL_CLIPBOARDS
@@ -77,16 +77,16 @@ def add_legacy_names(codecs):
 PING_TIMEOUT = envint("XPRA_PING_TIMEOUT", 60)
 UNGRAB_KEY = os.environ.get("XPRA_UNGRAB_KEY", "Escape")
 
-MONITOR_CHANGE_REINIT = os.environ.get("XPRA_MONITOR_CHANGE_REINIT")
+MONITOR_CHANGE_REINIT = envint("XPRA_MONITOR_CHANGE_REINIT")
 
 AV_SYNC_DELTA = envint("XPRA_AV_SYNC_DELTA")
-MOUSE_ECHO = envint("XPRA_MOUSE_ECHO")
+MOUSE_ECHO = envbool("XPRA_MOUSE_ECHO")
 
 PAINT_FAULT_RATE = envint("XPRA_PAINT_FAULT_INJECTION_RATE")
-PAINT_FAULT_TELL = envint("XPRA_PAINT_FAULT_INJECTION_TELL", 1)
+PAINT_FAULT_TELL = envbool("XPRA_PAINT_FAULT_INJECTION_TELL", True)
 
-B_FRAMES = envint("XPRA_B_FRAMES", 1)
-PAINT_FLUSH = envint("XPRA_PAINT_FLUSH", 1)
+B_FRAMES = envbool("XPRA_B_FRAMES", True)
+PAINT_FLUSH = envbool("XPRA_PAINT_FLUSH", True)
 
 #LOG_INFO_RESPONSE = ("^window.*position", "^window.*size$")
 LOG_INFO_RESPONSE = os.environ.get("XPRA_LOG_INFO_RESPONSE", "")
@@ -103,7 +103,7 @@ def add_legacy_names(codecs):
 
 RPC_TIMEOUT = envint("XPRA_RPC_TIMEOUT", 5000)
 
-WEBCAM_ALLOW_VIRTUAL = envint("XPRA_WEBCAM_ALLOW_VIRTUAL")
+WEBCAM_ALLOW_VIRTUAL = envbool("XPRA_WEBCAM_ALLOW_VIRTUAL", False)
 WEBCAM_TARGET_FPS = max(1, min(50, envint("XPRA_WEBCAM_FPS", 20)))
 
 WM_CLASS_CLOSEEXIT = os.environ.get("XPRA_WM_CLASS_CLOSEEXIT", "Xephyr").split(",")