More progress on importing when X isn't running.

Author: BurntSushi

xpybutil/keybind.py

@@ -486,6 +486,7 @@ def __regrab(changes):
             __keybinds[new] = __keybinds[old]
             del __keybinds[old]
 
-update_keyboard_mapping(None)
-event.connect('MappingNotify', None, update_keyboard_mapping)
+if conn is not None:
+    update_keyboard_mapping(None)
+    event.connect('MappingNotify', None, update_keyboard_mapping)
 

xpybutil/util.py

@@ -159,6 +159,9 @@ def build_atom_cache(atoms):
     """
     global __atom_cache, __atom_nm_cache
 
+    if conn is None:
+        return
+
     for atom in atoms:
         __atom_cache[atom] = __get_atom_cookie(atom, only_if_exists=False)
     for atom in __atom_cache:

xpybutil/xinerama.py

@@ -12,7 +12,9 @@
 
 from xpybutil import conn
 
-ext = conn(xcb.xinerama.key)
+ext = None
+if conn is not None:
+    ext = conn(xcb.xinerama.key)
 
 def get_monitors():
     '''