X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/33988e416bd971003f213d2bd04fc95104642ef8..0d513b43eb63d88ff9b1262dedda26b330d2505e:/zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 8cba4d9..69365e8 100644
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -12,32 +12,29 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program (gpl.txt); if not, write to the Free Software
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import subprocess
 from dsl import RelativeScreenPosition, ScreenSetup, res2user
 
-def userChoose (title, choices, returns):
+def userChoose (title, choices, returns, fallback):
 	assert len(choices) == len(returns)
 	p = subprocess.Popen(["zenity", "--list", "--text="+title, "--column="]+choices, stdout=subprocess.PIPE)
-	switch = zip (choices,returns)
-	for line in p.stdout:
-		return switch.get(line, None)
+	switch = dict (zip (choices,returns))
+	for line in p.stdout: # FIXME use p.communicate()[0] instead to get entire stdout and ensure the process terminates. also check p.returncode.
+		return switch.get(line.strip(), 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])
+	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", map(res2user,internalResolutions), internalResolutions)
-	if intres == None:
-		return None
-	extres = userChoose ("external display resolution", map(res2user,externalResolutions), externalResolutions)
-	if extres == None:
-		return None
-	extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True])
+		intres = userChoose ("internal display resolution", map(res2user,internalResolutions), internalResolutions, internalResolutions[0])
+	extres = userChoose ("external display resolution", 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)