fixed clock widget

i3/status/i3status/change_i3pystatus.py

@@ -14,7 +14,7 @@ import traceback
 ###############################################################################
 # Tools
 ###############################################################################
-g_i3bar_size = 18
+g_i3bar_size = 20
 
 
 def exec(s):
@@ -34,14 +34,8 @@ def check_pid(pid):
 
 def get_current_screen_size(x, y):
     screen = Gtk.Window().get_screen()
-    mn_number = screen.get_monitor_at_point(x, y) + 1
-    width, height = 0, 0
-    for mn_curr in range(mn_number):
-        mn = screen.get_monitor_geometry(mn_curr)
-        width += mn.width
-        height += mn.height
-    return width, height
-
+    mn_number = screen.get_monitor_at_point(x, y)
+    return screen.get_monitor_geometry(mn_number)
 
 ###############################################################################
 # Command end point
@@ -72,20 +66,17 @@ def change_clock():
 
         x, y = s._pos_x, s._pos_y
         width_calendar, height_calendar = 300, 210  # fixed values...
-        width, height = get_current_screen_size(x, y)
+        rect = get_current_screen_size(x, y)
 
-        if (x > width - width_calendar):
-            x = width - width_calendar
+        x = rect.width + rect.x - width_calendar
         if (y < g_i3bar_size):
-            y = g_i3bar_size
-        if (y > height - height_calendar):
-            y = height - height_calendar - g_i3bar_size
+            y = rect.y + g_i3bar_size
+        else:
+            y = rect.height + rect.y - height_calendar - g_i3bar_size
 
         s._pid = exec("calendar-window --size=%d-%d --position=%d-%d "
                 "--onLostFocus=%s" % (width_calendar, height_calendar,
                     x, y, "quit" if quit else "ignore"))
-        #s._pid = exec("yad --no-buttons --geometry=+%d+%d --class "
-        #              "\"i3bar-gui\" --calendar" % (x, y))
     def display_calendar_quit(s):
         display_calendar(True, s)
     def display_calendar_ignore(s):