X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/aaa0b27561726d84cc7c3fcfd16302c87dc628d7..4dd0918b62956f292f8448c32d8c61fbbeacfeb4:/zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 75011f8..e926b3a 100644
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -18,22 +18,35 @@
 from dsl import RelativeScreenPosition, ScreenSetup, res2user, processOutputIt
 
 def userChoose (title, choices, returns, fallback):
-	assert len(choices) == len(returns)
-	args = ["zenity", "--list", "--text="+title, "--column="]+choices
-	switch = dict (list(zip (choices,returns)))
-	for line in processOutputIt(*args):
-		return switch.get(line.strip(), fallback)
-	return fallback
+    assert len(choices) == len(returns)
+    args = ["zenity", "--list", "--text="+title, "--column="]+choices
+    switch = dict (list(zip (choices,returns)))
+    try:
+        for line in processOutputIt(*args):
+            return switch.get(line.strip(), fallback)
+    except Exception:
+        # on user cancel, the return code of zenity is nonzero
+        return fallback
+    return fallback
 
 def run (internalResolutions, externalResolutions):
-	relpos = userChoose ("Position of external screen", ["Left of internal screen", "Right of internal screen", "Use external screen only"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT, RelativeScreenPosition.EXTERNAL_ONLY], None)
-	if relpos == None:
-		return None
-	intres = internalResolutions[0]
-	if relpos != RelativeScreenPosition.EXTERNAL_ONLY:
-		intres = userChoose ("internal display resolution", list(map(res2user,internalResolutions)), internalResolutions, internalResolutions[0])
-	extres = userChoose ("external display resolution", list(map(res2user,externalResolutions)), externalResolutions, externalResolutions[0])
-	extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True], None)
-	if extprim == None:
-		return None
-	return ScreenSetup(relpos,intres,extres,extprim)
+    relpos = userChoose ("Position of external screen", ["Left of internal screen", "Right of internal screen", "Use external screen only"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT, RelativeScreenPosition.EXTERNAL_ONLY], None)
+    if relpos == None:
+        return None
+    intres = internalResolutions[0]
+    extres = externalResolutions[0]
+    extprim = None
+    if relpos != RelativeScreenPosition.EXTERNAL_ONLY:
+        intres = userChoose ("internal display resolution", list(map(res2user,internalResolutions)), internalResolutions, None)
+        if intres == None:
+            return None
+    else:
+        extprim = True
+    extres = userChoose ("external display resolution", list(map(res2user,externalResolutions)), externalResolutions, None)
+    if extres == None:
+        return None
+    if extprim == None:
+        extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True], None)
+    if extprim == None:
+        return None
+    return ScreenSetup(relpos,intres,extres,extprim)