فهرست منبع

add: F1-F12 and NUM-KEY 1-10 and rcls-key REC,LABEL

micha 11 ماه پیش
والد
کامیت
b6cf065eda
2فایلهای تغییر یافته به همراه66 افزوده شده و 5 حذف شده
  1. 24 5
      lib/jsbc.py
  2. 42 0
      tksdl/fix.py

+ 24 - 5
lib/jsbc.py

@@ -50,7 +50,25 @@ def JSCB(x,sock=None):
                     #cb.cb(event)
                 if "CLEAR" == msg["event"]:
                     MAIN.FIXTURES.clear()
-                if "EXEC" == msg["event"]:
+                    MAIN.modes.val("REC",0)
+                    #MAIN.master.xcb("CLEAR",1)
+                elif "REC" == msg["event"]:
+                    MAIN.modes.val("REC",1)
+                elif "EDIT" == msg["event"]:
+                    MAIN.modes.val("EDIT",1)
+                elif "BLIND" == msg["event"]:
+                    MAIN.modes.val("BLIND",1)
+                elif "FLASH" == msg["event"]:
+                    MAIN.modes.val("FLASH",1)
+                elif "CFG-BTN" == msg["event"]:
+                    MAIN.modes.val("CFG-BTN",1)
+                elif "LABEL" == msg["event"]:
+                    MAIN.modes.val("LABEL",1)
+                elif "REC" == msg["event"]:
+                    MAIN.modes.val("REC",1)
+                elif "REC-FX" == msg["event"]:
+                    MAIN.modes.val("REC-FX",1)
+                elif "EXEC" == msg["event"]:
                     print("  EXEC EXEC")
                     val = -1
                     exec_nr = -1
@@ -74,14 +92,15 @@ def JSCB(x,sock=None):
                         print("EXEC ERR:",e)
             
     except Exception as e:
-        cprint("exception JSCB:",e)
-        cprint("- i:",i)
-        cprint("- msg:",msgs)
+        cprint("exception JSCB:",e,color="red")
+        cprint("- i:",i,color="red")
+        cprint("- msg:",msgs,color="red")
         cprint(traceback.format_exc(),color="red")
         if sock:
             msg = ["Notice: Exception on JSCB-SERVER: ",str(e)]
             msg = json.dumps(msg)
             msg = bytes(msg,"utf8")
-            chat._send(sock,msg)
+            cprint(msg,color="red")
+            #chat._send(sock,msg)
 
     #time.sleep(1/60)

+ 42 - 0
tksdl/fix.py

@@ -677,6 +677,7 @@ while 1:
         resize_changed = 0
         for event in pygame.event.get(): 
             if "scancode" in event.dict:
+                print(event.dict,event.type)
                 if event.scancode == 50:
                     if event.type == 2: # press
                         pg.display.set_caption(CAPTION+ " SHIFT/FINE")
@@ -699,6 +700,47 @@ while 1:
                     print("ESC",msg)
                     cmd_client.send(msg)
 
+                keycode = {27:"REC",39:"SELECT",46:"LABEL",54:"CFG-BTN",56:"BLIND",41:"FLASH",26:"EDIT"}
+                print( event.scancode in keycode,event.scancode)
+                if event.scancode in keycode: # r
+                    if event.type == 2: # press
+                            
+                        msg=json.dumps([{"event":keycode[event.scancode]}]).encode("utf-8")
+                        print("SPCIAL-KEY",msg)
+                        cmd_client.send(msg)
+                if event.scancode in range(10,20+1):
+                    if event.type in [2,3]: # press
+                        v = 1-event.type+2
+                        if v:
+                            v=255
+                        else:
+                            v=0
+                        btn_nr = event.scancode-9
+                        btn_nr_raw = btn_nr
+                        btn_nr += 161-1
+                        msg=json.dumps([{"event":"EXEC","EXEC":btn_nr,"VAL":v,"NR-KEY":btn_nr_raw}]).encode("utf-8")
+                        print("SPCIAL-KEY",msg)
+                        cmd_client.send(msg)
+                if event.scancode in range(67,76+1) or  event.scancode in [95,96]:
+                    if event.type in [2,3]: # press
+                        v = 1-event.type+2
+                        if v:
+                            v=255
+                        else:
+                            v=0
+                        btn_nr = event.scancode
+                        if btn_nr == 95:
+                            btn_nr = 11
+                        elif btn_nr == 96:
+                            btn_nr = 12
+                        else:
+                            btn_nr = event.scancode-66
+                        btn_nr_raw = btn_nr
+                        btn_nr += 81-1
+                        msg=json.dumps([{"event":"EXEC","EXEC":btn_nr,"VAL":v,"F-KEY":btn_nr_raw}]).encode("utf-8")
+                        print("SPCIAL-KEY",msg)
+                        cmd_client.send(msg)
+
             if event.type == pygame.QUIT:
                 movewin.store_all_sdl()
                 pygame.quit()