From 1432da87244e94c3775df0d9ad6efb45963a60a9 Mon Sep 17 00:00:00 2001 From: Denis Zheleztsov Date: Thu, 23 Jul 2015 11:19:16 +0300 Subject: [PATCH] Small fixes --- azot.spec | 28 ++++++++++++++-------------- azot/X.py | 11 +++++++---- azot/action.py | 1 + 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/azot.spec b/azot.spec index 175444d..e3e8534 100644 --- a/azot.spec +++ b/azot.spec @@ -23,7 +23,7 @@ rm -rf $RPM_BUILD_ROOT rm -f *.pyc rm -f azot/*.pyc -mkdir -p $RPM_BUILD_ROOT/usr/lib/python2.7/dist-packages/azot/ +mkdir -p $RPM_BUILD_ROOT/usr/lib/python2.7/site-packages/azot/ mkdir -p $RPM_BUILD_ROOT/usr/share/doc/azot/ mkdir -p $RPM_BUILD_ROOT/usr/bin/ @@ -31,7 +31,7 @@ cp README.md $RPM_BUILD_ROOT/usr/share/doc/azot cp LICENSE $RPM_BUILD_ROOT/usr/share/doc/azot cp config.sample.json $RPM_BUILD_ROOT/usr/share/doc/azot cp azot.py $RPM_BUILD_ROOT/usr/bin/ -cp azot/* $RPM_BUILD_ROOT/usr/lib/python2.7/dist-packages/azot/ +cp azot/* $RPM_BUILD_ROOT/usr/lib/python2.7/site-packages/azot/ %{_fixperms} $RPM_BUILD_ROOT/* @@ -40,18 +40,18 @@ rm -rf $RPM_BUILD_ROOT %files /usr/bin/azot.py -/usr/lib/python2.7/dist-packages/azot/X.py -/usr/lib/python2.7/dist-packages/azot/X.pyc -/usr/lib/python2.7/dist-packages/azot/X.pyo -/usr/lib/python2.7/dist-packages/azot/__init__.py -/usr/lib/python2.7/dist-packages/azot/__init__.pyc -/usr/lib/python2.7/dist-packages/azot/__init__.pyo -/usr/lib/python2.7/dist-packages/azot/action.py -/usr/lib/python2.7/dist-packages/azot/action.pyc -/usr/lib/python2.7/dist-packages/azot/action.pyo -/usr/lib/python2.7/dist-packages/azot/config.py -/usr/lib/python2.7/dist-packages/azot/config.pyc -/usr/lib/python2.7/dist-packages/azot/config.pyo +/usr/lib/python2.7/site-packages/azot/X.py +/usr/lib/python2.7/site-packages/azot/X.pyc +/usr/lib/python2.7/site-packages/azot/X.pyo +/usr/lib/python2.7/site-packages/azot/__init__.py +/usr/lib/python2.7/site-packages/azot/__init__.pyc +/usr/lib/python2.7/site-packages/azot/__init__.pyo +/usr/lib/python2.7/site-packages/azot/action.py +/usr/lib/python2.7/site-packages/azot/action.pyc +/usr/lib/python2.7/site-packages/azot/action.pyo +/usr/lib/python2.7/site-packages/azot/config.py +/usr/lib/python2.7/site-packages/azot/config.pyc +/usr/lib/python2.7/site-packages/azot/config.pyo %defattr(-,root,root,-) %doc LICENSE README.md config.sample.json diff --git a/azot/X.py b/azot/X.py index c3c89d4..f5646c6 100644 --- a/azot/X.py +++ b/azot/X.py @@ -2,10 +2,13 @@ from Xlib import display # Get screen resolution def get_geometry(): - width = display.Display().screen().width_in_pixels - height = display.Display().screen().height_in_pixels - - return {"x": width, "y": height} + try: + width = display.Display().screen().width_in_pixels + height = display.Display().screen().height_in_pixels + + return {"x": width, "y": height} + except: + get_geometry() # Get mouse cursor position diff --git a/azot/action.py b/azot/action.py index bf9fe36..cd45a6a 100644 --- a/azot/action.py +++ b/azot/action.py @@ -43,6 +43,7 @@ def do(): msg = type_exec(action) notify(msg) sleep(1) + sleep(0.3) # Detect type and execute