fix session problem

Signed-off-by: Nikhil Dhandre <nik.digitronik@live.com>

Author: digitronik

setup.py

@@ -20,16 +20,16 @@
         "Programming Language :: Python :: 3 :: Only",
     ],
     description="Geometry of a rectangular screen region",
-    entry_points={"console_scripts": ["xrectsel= xrectsel.console:cli"]},
+    setup_requires=["setuptools_scm"],
     install_requires=["python-xlib"],
     long_description=readme,
     long_description_content_type="text/markdown",
+    entry_points={"console_scripts": ["xrectsel= xrectsel.console:cli"]},
     include_package_data=True,
-    setup_requires=["setuptools_scm"],
     python_requires=">=3.4",
     keywords="xrectsel, python-xrectsel",
     name="python-xrectsel",
-    packages=find_packages(include=["python-xrectsel"]),
+    packages=find_packages(include=["xrectsel"]),
     url="https://github.com/digitronik/python-xrectsel",
     version="1.0",
     license="GPLv3",

xrectsel/__init__.py

@@ -1,10 +1,13 @@
-#!/usr/bin/env python
-
 import sys
 from Xlib import X, display, Xcursorfont
 
 
 def coordinates(start_point, end_point):
+    """
+    :param start_point: Start co-ordinates of rectangle
+    :param end_point: End co-ordinates of rectangle
+    :return: dict of start co-ordinates, end co-ordinates, width, height of rectangle.
+    """
     X = dict(x=0, y=0)
     Y = dict(x=0, y=0)
 
@@ -18,11 +21,21 @@ def coordinates(start_point, end_point):
 
 
 class XRectSel(object):
-    def __init__(self, _display=None, screen=None):
+    """
+    Base class for python-xrectsel
+
+    TODO: Enhancement like colors, pixels customization.
+    """
+
+    def __init__(self, _display=None):
+        """
+        :param _display: custom display else it will take default
+        """
         self.display = _display if _display else display.Display()
-        self.screen = screen if screen else self.display.screen()
+        self.screen = self.display.screen()
         self.window = self.screen.root
 
+        # Grab mouse pointer
         self.window.grab_pointer(
             1,
             X.PointerMotionMask | X.ButtonReleaseMask | X.ButtonPressMask,
@@ -33,6 +46,7 @@ def __init__(self, _display=None, screen=None):
             X.CurrentTime,
         )
 
+        # Grab keyboard
         self.window.grab_keyboard(1, X.GrabModeAsync, X.GrabModeAsync, X.CurrentTime)
 
         self.gc = self.window.create_gc(
@@ -61,13 +75,17 @@ def _cursor(self):
             font, Xcursorfont.crosshair, Xcursorfont.crosshair + 1, (65535, 65535, 65535), (0, 0, 0)
         )
 
-    def draw_rectangle(self, start_point, end_point):
-        coords = coordinates(start_point, end_point)
+    def draw_rectangle(self, coords):
         self.window.rectangle(
             self.gc, coords["start"]["x"], coords["start"]["y"], coords["width"], coords["height"]
         )
 
     def select(self):
+        """
+        Draw rectangle with mouse events
+
+        :return: dict of start co-ordinates, end co-ordinates, width, height of rectangle.
+        """
         start_point = {}
         end_point = {}
         tmp_point = {}
@@ -98,18 +116,25 @@ def select(self):
                     continue
 
                 if tmp_point:
-                    self.draw_rectangle(start_point, tmp_point)
+                    coords = coordinates(start_point, tmp_point)
+                    self.draw_rectangle(coords)
                     tmp_point = None
 
                 tmp_point = dict(x=event.root_x, y=event.root_y)
-                self.draw_rectangle(start_point, tmp_point)
+                coords = coordinates(start_point, tmp_point)
+                self.draw_rectangle(coords)
 
             # Mouse button release
             elif event.type == X.ButtonRelease:
                 if tmp_point:
-                    self.draw_rectangle(start_point, tmp_point)
-
+                    coords = coordinates(start_point, tmp_point)
+                    self.draw_rectangle(coords)
                 end_point = dict(x=event.root_x, y=event.root_y)
 
         self.display.flush()
-        return start_point, end_point
+        self.display.close()
+        return coordinates(start_point, end_point)
+
+
+if __name__ == "__main__":
+    print(XRectSel().select())

xrectsel/console.py

@@ -1,10 +1,9 @@
-from xrectsel import XRectSel, coordinates
+from xrectsel import XRectSel
 
 
 def cli():
     xrect = XRectSel()
-    start, end = xrect.select()
-    geormetry = coordinates(start, end)
+    geormetry = xrect.select()
 
     if geormetry["width"] <= 1 or geormetry["height"] <= 1:
         pass