refactor-final: TK-EXEC as independen Prozess connect via cmd_client()

_LibreLightDesk.py

@@ -123,6 +123,15 @@ class Modes():
             return self.set(mode,value)
         elif mode in self.modes:
             return self.modes[mode]
+    def list(self,_filter="all"): # actvie
+        _modes = []
+        for m in self.modes:
+            v = self.val(m)
+            if _filter == "active" and v:
+                _modes.append(m)
+            if _filter == "all": 
+                _modes.append(m)
+        return _modes
     def info(self):
         for m in self.modes:
             print("modes",m,self.val(m))

lib/jsbc.py

@@ -137,10 +137,15 @@ def JSCB(x,sock=None):
                             if not OK:
                                 print("MIDI?",val)
                                 if val >= 0: #Press/Release
-                                    MAIN.master.exec_go(exec_nr-1,xfade=None,val=val)
+                                    if "MOUSE" in msg and msg["MOUSE"] == "RIGHT":
+                                        MAIN.master.exec_go(exec_nr-1,xfade=0,val=val)
+                                    else:
+                                        MAIN.master.exec_go(exec_nr-1,xfade=None,val=val)
                                     OK = 1
                                     #EXEC_REFRESH = 1
 
+                            msg["MODES"]=MAIN.modes.list("active")
+
                     except Exception as e:
                         print("EXEC ERR:",e)
                         raise e

tkgui/EXEC.py

@@ -7,48 +7,56 @@ import tkinter as tk
 import traceback
 import _thread as thread
 
+
 import dialog
 DIALOG = dialog.Dialog()
 
 gui=None
 GLOBAL_old_btn_nr = -1
-def Dcb(exec_nr):
+def Dcb(exec_nr): #DAILOG CONFIG CALLBACK
     def _Dcb(*args):
-        global GLOBAL_old_btn_nr 
         print("Dcb:",args)
         msg=json.dumps([{"event":"EXEC-CFG","EXEC":exec_nr,"VALUE":255,"DATA":args[0]}]).encode("utf-8")
         cprint("SEND DIALOG.cb",msg,color="green")
         cmd_client.send(msg)
-        if 1:#REFRESH:
-            btn_nr = exec_nr
-            time.sleep(0.8)
-            print()
-            print("CFG CB REFRESH !?",btn_nr)
-            nr = btn_nr-1
-            b = gui.elem_exec[nr]
-
-            gui._refresh_exec_single(nr,b) #,METAS):
-            time.sleep(0.2)
-            nr2= GLOBAL_old_btn_nr
-            if nr2 >= 0 and nr2 != nr:
-                gui._refresh_exec_single(nr2,b) #,METAS):
-                print("CFG CB2 REFRESH ",nr,nr2)
-            if 1:
-                GLOBAL_old_btn_nr = nr
+        def _X_refresh():
+            global GLOBAL_old_btn_nr 
+            if 1:#REFRESH:
+                btn_nr = exec_nr
+                time.sleep(0.8)
+                print()
+                print("CFG CB REFRESH !?",btn_nr)
+                nr = btn_nr-1
+                b = gui.elem_exec[nr]
+
+                gui._refresh_exec_single(nr,b) #,METAS):
+                time.sleep(0.2)
+                nr2= GLOBAL_old_btn_nr
+                if nr2 >= 0 and nr2 != nr:
+                    gui._refresh_exec_single(nr2,b) #,METAS):
+                    print("CFG CB2 REFRESH ",nr,nr2)
+                if 1:
+                    GLOBAL_old_btn_nr = nr
+        thread.start_new_thread(_X_refresh,())
     return _Dcb
 
 DIALOG._cb = Dcb(-3)
 #d = dialog.Dialog()
 #d.ask_exec_config(str(nr+1),button=button,label=label,cfg=cfg)
 
-CAPTION = "TK-EXEC"
-title = CAPTION
 
 import __main__ as MAIN
 
 _file_path = "/opt/LibreLight/Xdesk/"
 sys.path.insert(0,"/opt/LibreLight/Xdesk/")
 
+import tool.git as git
+#CAPTION += git.get_all()
+
+CAPTION = "TK-EXEC"
+title = CAPTION
+title += git.get_all()
+
 INIT_OK = 1
 IS_GUI = 0
 from lib.cprint import cprint
@@ -57,6 +65,7 @@ import tkgui.draw as draw
 import lib.libtk as libtk
 import lib.zchat as chat
 
+
 import tool.movewin as movewin
 #movewin.check_is_started(CAPTION,_file_path)
 movewin.check_is_started("EXEC","/opt/LibreLight/Xdesk/tkgui/EXEC.py")
@@ -278,12 +287,30 @@ class Gui(): # DUMMY
             if k in modes.modes:
                 REFRESH = 1
 
-        msg=json.dumps([{"event": "EXEC","EXEC":btn_nr+1,"VAL":v,"NR-KEY":btn_nr}]).encode("utf-8")
+        print(" ",[arg,args])
+        edata={}
+        if "event" in args:
+            edata =  serialize_event(args["event"])
+        print(" ",edata)
+        num = -1
+        MOUSE = ""
+        out={"event": "EXEC","EXEC":btn_nr+1,"VAL":v,"NR-KEY":btn_nr}
+        if "num" in edata:
+            num = edata["num"]
+            if num == 1:
+                out["MOUSE"]="LEFT"
+            if num == 3:
+                out["MOUSE"]="RIGHT"
+
+        msg=json.dumps([out]).encode("utf-8")
+
         if not _global_key_lock:
             cmd_client.send(msg)
         cprint("SEND GUI.EXEC_GO",msg,color="green")
 
-        if 1:#REFRESH:
+
+        def _X_refresh():
+            #if 1:#REFRESH:
             time.sleep(0.2)
             print()
             print("REC REFRESH !?",PREFIX)
@@ -299,6 +326,7 @@ class Gui(): # DUMMY
             #self._refresh_exec()
             if v:
                 self.old_btn_nr = nr
+        thread.start_new_thread(_X_refresh,())
 
 gui  = Gui()
  
@@ -370,7 +398,7 @@ except Exception as e:
 xframe = libtk.ScrollFrame(root,width=820,height=400,bd=1,bg="black",head=None,foot=None)
 draw.draw_exec(gui,xframe,EXEC)
 #xframe.pack()
-root.title("TK-EXEC")
+root.title(title)#"TK-EXEC")
 
 def serialize_event(event):
     data = {}
@@ -439,6 +467,7 @@ def tk_event(event,data={}):
                 cprint("SEND tk_event",msg,color="green")
                 cmd_client.send(msg)
                 if MOD in ["RESTART"]:
+                    time.sleep(2)
                     exit()
                 ok = 1
 

tksdl/fix.py

@@ -19,6 +19,7 @@ SHIFT_FINE = 0
 sys.path.insert(0,"/opt/LibreLight/Xdesk/")
 import tool.movewin as movewin
 import tool.git as git
+#CAPTION += git.get_all()
 
 
 win_title =CAPTION.strip().split()[-1]