Browse Source

cleanup xx_window_pos xx_window_geo

micha 3 months ago
parent
commit
039e0dc8b0
9 changed files with 136 additions and 129 deletions
  1. 98 97
      _LibreLightDesk.py
  2. 4 3
      lib/libtk.py
  3. 19 19
      lib/libwin.py
  4. 1 1
      lib/zchat.py
  5. 0 0
      test/test-mc-exec.py
  6. 0 0
      test/test.py
  7. 2 2
      tkgui/EXEC-BTN.py
  8. 3 3
      tkgui/EXEC-XWING.py
  9. 9 4
      tool/movewin.py

+ 98 - 97
_LibreLightDesk.py

@@ -834,7 +834,7 @@ def save_show_to_usb():
 
                 a=EXEC.backup_exec()
                 b=FIXTURES.backup_patch()
-                c=libwin.save_window_position() 
+                c=libwin.save_window_geo() 
                 d=movewin.store_all_sdl()
         except FileNotFoundError as e:
             cprint("EXC",e,color="red")
@@ -857,7 +857,7 @@ def save_show(fpath=None,new=0):
     if fpath:
         a=EXEC.backup_exec(save_as=fpath,new=new)
         b=FIXTURES.backup_patch(save_as=fpath,new=new)
-        c=libwin.save_window_position(save_as=fpath)
+        c=libwin.save_window_geo(save_as=fpath)
         d=movewin.store_all_sdl()
     else:
         print()
@@ -865,7 +865,7 @@ def save_show(fpath=None,new=0):
         cprint("SAVE SHOW ..",color="yellow")
         a=EXEC.backup_exec()
         b=FIXTURES.backup_patch()
-        c=libwin.save_window_position() 
+        c=libwin.save_window_geo() 
         d=movewin.store_all_sdl()
 
     if 1:
@@ -1083,14 +1083,15 @@ class MASTER():
         self.fx_3 = Elem_Container()
         self.fx_3.commands =[
                 "FX:ATTR","PAN","TILT","ATTR3","ATTR4","\n",
+                "TYPE:","SIN","COS"," "," ","\n",
                 "WIDTH:","25","25","25","25","\n",
-                "DIR:","1","1","1","1","\n",
-                "INVERT:","1","1","1","1","\n",
-                "SHUFFLE:","0","0","0","0","\n",
                 "SIZE:","255","255","255","255","\n",
                 "SPEED:","10","10","10","10","\n",
-                "START:","0","0","0","0","\n",
                 "OFFSET:","100","100","100","100","\n",
+                "START:","0","0","0","0","\n",
+                "SHUFFLE:","0","0","0","0","\n",
+                "DIR:","1","1","1","1","\n",
+                "INVERT:","1","1","1","1","\n",
                 " ","\n",
                 " ","PLAY","STOP","OFF","\n",
                 "  ","CIRCL","PAN","TILT","FLAY","\n",
@@ -1814,7 +1815,7 @@ class WindowManager():
                 if not c.args["resize"]:
                     resize = 0
             #if resize:
-            libwin.get_window_position(_filter=name,win=w) 
+            libwin.get_cur_window_geo(_filter=name,win=w) 
 
             if name in ["ENCODER"]:
                 global _ENCODER_WINDOW 
@@ -2005,10 +2006,10 @@ if __run_main:
     H1 = 550
     HTB = 23 # hight of the titlebar from window manager
 
-    pos_list = libwin.read_window_position()
-    #geo = libwin.split_window_position(pos_list,name)
+    geo_list = libwin.read_window_geo()
+    #geo = libwin.filter_window_geo(geo_list,name)
     #args = {"title":name,"master":0,"width":600,"height":113,"left":L1+5,"top":TOP+5+HTB*2+H1}
-    #geo = libwin.split_window_position(pos_list,name)
+    #geo = libwin.filter_window_geo(geo_list,name)
     #if geo:
     #   args.update(geo)
     
@@ -2063,7 +2064,7 @@ if __run_main:
     name="MAIN"
     args = {"title":"MAIN","master":1,"width":80,"height":H1,"left":L0,"top":TOP,"resize":1}
 
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
@@ -2089,7 +2090,7 @@ if __run_main:
     if 0:
         name="EXEC-BTN"
         args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-        geo = libwin.split_window_position(pos_list,name)
+        geo = libwin.filter_window_geo(geo_list,name)
         if geo:
             args.update(geo)
 
@@ -2100,7 +2101,7 @@ if __run_main:
 
         c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
         window_manager.new(None,name,wcb=c)
-        if libwin.split_window_show(pos_list,_filter=name):
+        if libwin.split_window_show(geo_list,_filter=name):
             window_manager.top(name)
 
 
@@ -2109,7 +2110,7 @@ if __run_main:
         #sys.exit()
     # =======================================================================
     name="SDL-MIDI"
-    def sdl_config():
+    def sdl_starter():
         cmd="nohup /usr/bin/python3 /opt/LibreLight/Xdesk/tksdl/midi.py > /dev/null 2>&1 &"
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tksdl/midi.py " #&"
         print(cmd)
@@ -2121,22 +2122,22 @@ if __run_main:
         return [None,None,None]
     #class window_create_sdl_buffer():
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="SDL-VPU"
-    def sdl_config():
+    def sdl_starter():
         cmd="python3 /opt/LibreLight/Xdesk/vpu/watchdog_vpu.py -single"
         print(cmd)
 
@@ -2145,22 +2146,22 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="SDL-OSZI"
-    def sdl_config():
+    def sdl_starter():
         cmd="python3 /opt/LibreLight/ASP/monitor/oszi_grid.py" 
         print(cmd)
 
@@ -2169,22 +2170,22 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="SDL-DMX"
-    def sdl_config():
+    def sdl_starter():
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tksdl/dmx.py " #&"
         print(cmd)
 
@@ -2193,22 +2194,22 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="R-FIX-LIST"
-    def sdl_config():
+    def sdl_starter():
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tkray/fix.py " #&"
         print(cmd)
 
@@ -2217,22 +2218,22 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="RAY-DMX"
-    def sdl_config():
+    def sdl_starter():
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tkray/dmx.py " #&"
         print(cmd)
 
@@ -2241,22 +2242,22 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="EXEC-BTN" #"TK-EXEC"
-    def sdl_config():
+    def sdl_starter():
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tkgui/EXEC-BTN.py " #&"
         print(cmd)
 
@@ -2265,23 +2266,23 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     # =======================================================================
     name="TK-Ping" #"TK-EXEC"
-    def sdl_config():
+    def sdl_starter():
         cmd="nohup /usr/bin/python3 /opt/LibreLight/Xdesk/tool/TK-Ping.py > /dev/null 2>&1 " #&"
         print(cmd)
 
@@ -2290,22 +2291,22 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
     # =======================================================================
     # =======================================================================
     name="Nodescanner" #"TK-EXEC"
-    def sdl_config():
+    def sdl_starter():
         cmd="nohup /usr/bin/python3 /opt/LibreLight/Xdesk/tool/TK-Nodescanner.py > /dev/null 2>&1 " #&"
         print(cmd)
 
@@ -2314,23 +2315,23 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     # =======================================================================
     name="XWING" #"TK-EXEC"
-    def sdl_config():
+    def sdl_starter():
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tkgui/EXEC-XWING.py " #&"
         print(cmd)
 
@@ -2339,22 +2340,22 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="SDL-STAGE"
-    def sdl_config():
+    def sdl_starter():
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk//3d/stage_3d.py " #&"
         print(cmd)
 
@@ -2363,23 +2364,23 @@ if __run_main:
         thread.start_new_thread(xyz123,(cmd,))
         return [None,None,None]
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="SDL-Shader"
-    def sdl_config():
+    def sdl_starter():
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk//3d/demo_shaders.py " #&"
         print(cmd)
         #os.popen(cmd)
@@ -2390,22 +2391,22 @@ if __run_main:
         return [None,None,None]
     #class window_create_sdl_buffer():
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="FIX-LIST"
-    def sdl_config():
+    def sdl_starter():
         cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tksdl/fix.py " #&"
         print(cmd)
         #os.popen(cmd)
@@ -2416,24 +2417,24 @@ if __run_main:
         return [None,None,None]
     #class window_create_sdl_buffer():
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
     data = []
-    cls = sdl_config #: None #GUI_CONF
+    cls = sdl_starter #: None #GUI_CONF
     cb_ok = None
 
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="CONFIG"
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
@@ -2443,14 +2444,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="DIMMER"
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
@@ -2460,14 +2461,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="FIXTURES"
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
@@ -2477,14 +2478,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="FIXTURE-EDITOR"
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
@@ -2504,7 +2505,7 @@ if __run_main:
     # =======================================================================
     name="MASTER-WING"
     args = {"title":name,"master":0,"width":75,"height":405,"left":L0,"top":TOP+H1-220,"resize":0}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
 
@@ -2517,14 +2518,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="EXEC-WING"
     args = {"title":name,"master":0,"width":600,"height":415,"left":L1,"top":TOP+H1+HTB*2,"H1":H1,"W1":W1}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     data=[]
@@ -2536,14 +2537,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="ENCODER"
     args = {"title":name,"master":0,"width":620,"height":113,"left":L0+710,"top":TOP+H1+15+HTB*2}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     cls = draw_enc #(master,w.tk)#Xroot)
@@ -2552,7 +2553,7 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
@@ -2560,7 +2561,7 @@ if __run_main:
     args = {"title":name +" SHOW:"+master.base.show_name,
                 "master":0,"width":445,"height":42,"left":L1+10+W1,"top":TOP,"resize":10}
     args["title"]  = "SETUP SHOW:"+master.base.show_name
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     try:
         geo["width"] = args["width"]
         geo["height"] = args["height"]
@@ -2575,14 +2576,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name = "COMMAND"
     args = {"title":name,"master":0,"width":415,"height":130,"left":L1+10+W1,"top":TOP+81,"resize":10}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     cls = draw_command #(master,w.tk)
@@ -2591,13 +2592,13 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name = "LIVE"
     args = {"title":name,"master":0,"width":415,"height":42,"left":L1+10+W1,"top":TOP+235,"resize":10}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     cls = draw_live #(master,w.tk)
@@ -2606,13 +2607,13 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name = "CLOCK"
     args = {"title":name,"master":0,"width":335,"height":102,"left":L1+10+W1+80,"top":TOP+H1+HTB+160,"resize":0}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     cclock = X_CLOCK()
@@ -2622,13 +2623,13 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="FX"
     args = {"title":name,"master":0,"width":415,"height":297+30,"left":L1+10+W1,"top":TOP+302,"resize":1}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     cls = draw_fx #(master,w.tk)
@@ -2637,14 +2638,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="FX3"
     args = {"title":name,"master":0,"width":364,"height":418+30,"left":L1+10+W1,"top":TOP+302,"resize":1}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     cls = draw_fx_3 #(master,w.tk)
@@ -2653,14 +2654,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="PATCH"
     args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP,"foot":1,"head":1}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     cls = GUI_PATCH
@@ -2668,14 +2669,14 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c) #,obj)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 
     # =======================================================================
     name="COLORPICKER"
     args = {"title":name,"master":0,"width":600,"height":113,"left":L1+5,"top":TOP+5+HTB*2+H1}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     cls = draw_colorpicker #(master,w.tk,FIXTURES,master)
@@ -2684,13 +2685,13 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
     # =======================================================================
     name="TABLE"
     args = {"title":name,"master":0,"width":600,"height":113,"left":L1+5,"top":TOP+5+HTB*2+H1}
-    geo = libwin.split_window_position(pos_list,name)
+    geo = libwin.filter_window_geo(geo_list,name)
     if geo:
         args.update(geo)
     #cls = draw_colorpicker #(master,w.tk,FIXTURES,master)
@@ -2700,7 +2701,7 @@ if __run_main:
 
     c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
     window_manager.new(None,name,wcb=c)
-    if libwin.split_window_show(pos_list,_filter=name):
+    if libwin.split_window_show(geo_list,_filter=name):
         window_manager.top(name)
 
 

+ 4 - 3
lib/libtk.py

@@ -21,8 +21,8 @@ import tkgui.dialog  as dialoglib
 dialog = dialoglib.Dialog()
 
 
-for i in dir(MAIN):
-    print(i)
+#for i in dir(MAIN):
+#    print(i)
 
 #_config = MAIN._load_config()
 _config = libconfig._load_config()
@@ -609,7 +609,8 @@ class WindowContainer():
 
         #self._event_clear = MAIN.tk_event(fix=0,elem=None,attr="CLEAR",data=self,mode="ROOT").cb
         self.tk.geometry(geo)
-        print(" INIT.OK?",self.callback,self.args)
+        # print(" INIT.OK?",self.callback)
+        print(" INIT.OK?",self.args)
         self.show()
 
     def update_idle_task(self):

+ 19 - 19
lib/libwin.py

@@ -9,9 +9,9 @@ import __main__ as MAIN
 
 window_list_buffer = {}
 
-def save_window_position(save_as=""):
+def save_window_geo(save_as=""):
     global window_list_buffer
-    #cprint("save_window_position as=",[save_as])
+    #cprint("save_window_geo as=",[save_as])
     error = 0
 
     if save_as:
@@ -21,7 +21,7 @@ def save_window_position(save_as=""):
         fname = showlib.current_show_name() 
         fpath = showlib.SHOW_DIR + fname
     if not os.path.isdir(fpath):
-        cprint("  -0 save_window_position no dir:",fpath,color="red")
+        cprint("  -0 save_window_geo no dir:",fpath,color="red")
         error += 1
 
     fpath +=  "/gui.txt"
@@ -87,39 +87,39 @@ def save_window_position(save_as=""):
         error += 1
 
     if not error:
-        cprint("  save_window_position",fpath,"OK",color="green")
+        cprint("  save_window_geo",fpath,"OK",color="green")
 
         return 1
-    cprint("  save_window_position",fpath,"FAIL",color="red")
+    cprint("  save_window_geo",fpath,"FAIL",color="red")
 
 
-def save_window_position_loop(): # like autosave
+def save_window_geo_loop(): # like autosave
     def loop():
         time.sleep(20)
         try:
             while 1:
-                save_window_position()
+                save_window_geo()
                 time.sleep(60)
         except Exception as e:
             cprint("save_loop",e)
     thread.start_new_thread(loop,())
 
-def get_window_position(_filter="",win=None):
+def get_cur_window_geo(_filter="",win=None):
     global window_list_buffer
     show = None
     k = _filter
     geo = ""
 
-    #cprint("get_window_position",[_filter])
+    #cprint("get_cur_window_geo",[_filter])
     if _filter in window_list_buffer:
         show,k,geo  = window_list_buffer[_filter]
-        cprint("   get_window_position",[show,k,geo],color="yellow")
+        cprint("   get_cur_window_geo",[show,k,geo],color="yellow")
         if win:
             win.tk.geometry(geo)
     return show,k,geo
 
 
-def read_window_position():
+def read_window_geo():
     try:
         fname = showlib.current_show_path() + "/gui.txt"
 
@@ -145,7 +145,7 @@ def read_window_position():
 
         return out
     except Exception as e:
-        cprint("- load_window_position 145 Exception:",e,color="red")
+        cprint("- load_window_geo 145 Exception:",e,color="red")
         return 
     return []
 
@@ -158,7 +158,7 @@ def split_window_show(lines,_filter=""):
     except Exception as e:
         cprint("- split_window_show 315 Exception:",e,color="red")
 
-def split_window_position(lines,_filter=""):
+def filter_window_geo(lines,_filter=""):
     try:
         for show,name,geo in lines:
             #print( "wwWww "*10,[show,name,geo] )
@@ -176,17 +176,17 @@ def split_window_position(lines,_filter=""):
                     args["top"]    = int(geo[3])
                     return args
     except Exception as e:
-        cprint("- split_window_position 341 Exception:",e,color="red")
+        cprint("- filter_window_geo 341 Exception:",e,color="red")
 
 
 
-def load_window_position(_filter=""):
+def load_window_geo(_filter=""):
     #print()
     global window_list_buffer
     #cprint()
-    cprint("  load_window_position",[_filter])
+    cprint("  load_window_geo",[_filter])
     try:
-        lines = read_window_position()
+        lines = read_window_geo()
 
         data = {}
         for show,name,geo in lines:
@@ -210,8 +210,8 @@ def load_window_position(_filter=""):
             try:
                 win.tk.geometry(w)
             except Exception as e:
-                cprint("- load_window_position 544 Exception:",e,color="red")
+                cprint("- load_window_geo 544 Exception:",e,color="red")
 
     except Exception as e:
-        cprint("- load_window_position 335 Exception:",e,color="red")
+        cprint("- load_window_geo 335 Exception:",e,color="red")
         return 

+ 1 - 1
lib/zchat.py

@@ -282,7 +282,7 @@ class Client():
             print("-------")
             time.sleep(1)
             self.connect()
-        print("connected !")
+        print("zchat connected !")
 
     def _recv(self):
         sock = self.xs

+ 0 - 0
test-mc-exec.py → test/test-mc-exec.py


+ 0 - 0
test.py → test/test.py


+ 2 - 2
tkgui/EXEC-BTN.py

@@ -450,8 +450,8 @@ gui  = Gui()
 
 import lib.libwin as libwin
 name="EXEC"
-pos_list = libwin.read_window_position()
-geo = libwin.split_window_position(pos_list,name)
+pos_list = libwin.read_window_geo()
+geo = libwin.filter_window_geo(pos_list,name)
 args = {"title":name,"master":0,"width":600,"height":113,"left":30+5,"top":30+5+400*2+10}
 if geo:
    args.update(geo)

+ 3 - 3
tkgui/EXEC-XWING.py

@@ -343,8 +343,8 @@ except:
 
 import lib.libwin as libwin
 name="EXEC"
-pos_list = libwin.read_window_position()
-geo = libwin.split_window_position(pos_list,name)
+geo_list = libwin.read_window_geo()
+geo = libwin.filter_window_geo(geo_list,name)
 args = {"title":name,"master":0,"width":600,"height":113,"left":30+5,"top":30+5+400*2+10}
 if geo:
    args.update(geo)
@@ -394,7 +394,7 @@ root.title(title) #"TK-EXEC")
 
 
 #args = {"title":name,"master":0,"width":600,"height":415,"left":L1,"top":TOP+H1+HTB*2,"H1":H1,"W1":W1}
-geo = libwin.split_window_position(pos_list,name)
+geo = libwin.filter_window_geo(geo_list,name)
 if geo:
     args.update(geo)
 data=[]

+ 9 - 4
tool/movewin.py

@@ -184,7 +184,7 @@ def _start_sub(cmd,name,mute=0):
     #BrokenPipeError: [Errno 32] Broken pipe
 
 def start_sub(cmd,name="<PROCESS>",mute=0):
-    cprint("  start_sub",cmd,name,"mute-stdout:",mute,color="green")
+    cprint("     start_sub",cmd,name,"mute-stdout:",mute,color="green")
     thread.start_new_thread(_start_sub,(cmd,name,mute)) # SERVER
 
 def startup_all_sdl():
@@ -220,7 +220,7 @@ def startup_all_sdl():
 
     print()
     for line in xlines2:
-        print("    line >> ",[line])
+        #print("    line >> ",[line])
         try:
             line = json.loads(line)
         except json.decoder.JSONDecodeError as e:
@@ -307,9 +307,12 @@ def store_all_sdl():
 
     for i in pop[::-1]:
         try:
-            in_lines.pop(i)
+            if len(in_lines) > i:
+                in_lines.pop(i)
+            else:
+                print("     index",i,"not in",len(in_lines))
         except Exception as e:
-            cprint("  ERR:",e,color="red") 
+            cprint("  ERR:",e,i,color="red") 
             error += 0   
     temp = {}
     for i in in_lines:
@@ -320,12 +323,14 @@ def store_all_sdl():
     f=open(fname,"w")
     f.write("#"+json.dumps(["on","title","w","h","x","y"])+"\n")
     for line in lines:
+        print("   --",line)
         f.write(json.dumps(line)+"\n")
 
     f.write("\n")
     f.write("#-- history \n")
     for k,line in temp.items(): #in_lines:
         #print("+++>",line)
+        print("   --",line)
         f.write(line+"\n")
     f.write("\n")
     f.close()