[add_cflow] s/csi/seq/g

src/lib/automaton.c

@@ -278,7 +278,7 @@ link_numeric(automaton* a, esctrie* e, unsigned follow){
 }
 
 // add a cflow path to the automaton
-int inputctx_add_cflow(automaton* a, const char* csi, triefunc fxn){
+int inputctx_add_cflow(automaton* a, const char* seq, triefunc fxn){
   if(a->escapes == 0){
     if((a->escapes = create_esctrie_node(a, 0)) == 0){
       return -1;
@@ -287,7 +287,7 @@ int inputctx_add_cflow(automaton* a, const char* csi, triefunc fxn){
   esctrie* eptr = esctrie_from_idx(a, a->escapes);
   bool inescape = false;
   unsigned char c;
-  while( (c = *csi++) ){
+  while( (c = *seq++) ){
     if(c == '\\'){
       if(inescape){
         logerror("illegal escape: \\\n");
@@ -297,11 +297,11 @@ int inputctx_add_cflow(automaton* a, const char* csi, triefunc fxn){
     }else if(inescape){
       if(c == 'N'){
         // a numeric must be followed by some terminator
-        if(!*csi){
+        if(!*seq){
           logerror("illegal numeric terminator\n");
           return -1;
         }
-        c = *csi++;
+        c = *seq++;
         eptr = link_numeric(a, eptr, c);
         if(eptr == NULL){
           return -1;
@@ -313,11 +313,11 @@ int inputctx_add_cflow(automaton* a, const char* csi, triefunc fxn){
         return 0;
       }else if(c == 'D'){ // drain (kleene closure)
         // a kleene must be followed by some terminator
-        if(!*csi){
+        if(!*seq){
           logerror("illegal kleene terminator\n");
           return -1;
         }
-        c = *csi++;
+        c = *seq++;
         eptr = link_kleene(a, eptr, c);
         if(eptr == NULL){
           return -1;

src/lib/in.c

@@ -160,18 +160,18 @@ prep_special_keys(inputctx* ictx){
     { .tinfo = "kf22",  .key = NCKEY_F22, },
     { .tinfo = "kf23",  .key = NCKEY_F23, },
     { .tinfo = "kf24",  .key = NCKEY_F24, },
-    { .tinfo = "kf25",  .key = NCKEY_F25, },
-    { .tinfo = "kf26",  .key = NCKEY_F26, },
-    { .tinfo = "kf27",  .key = NCKEY_F27, },
-    { .tinfo = "kf28",  .key = NCKEY_F28, },
-    { .tinfo = "kf29",  .key = NCKEY_F29, },
-    { .tinfo = "kf30",  .key = NCKEY_F30, },
-    { .tinfo = "kf31",  .key = NCKEY_F31, },
-    { .tinfo = "kf32",  .key = NCKEY_F32, },
-    { .tinfo = "kf33",  .key = NCKEY_F33, },
-    { .tinfo = "kf34",  .key = NCKEY_F34, },
-    { .tinfo = "kf35",  .key = NCKEY_F35, },
-    { .tinfo = "kf36",  .key = NCKEY_F36, },
+    { .tinfo = "kf25",  .key = NCKEY_F01, .ctrl = 1, },
+    { .tinfo = "kf26",  .key = NCKEY_F02, .ctrl = 1, },
+    { .tinfo = "kf27",  .key = NCKEY_F03, .ctrl = 1, },
+    { .tinfo = "kf28",  .key = NCKEY_F04, .ctrl = 1, },
+    { .tinfo = "kf29",  .key = NCKEY_F05, .ctrl = 1, },
+    { .tinfo = "kf30",  .key = NCKEY_F06, .ctrl = 1, },
+    { .tinfo = "kf31",  .key = NCKEY_F07, .ctrl = 1, },
+    { .tinfo = "kf32",  .key = NCKEY_F08, .ctrl = 1, },
+    { .tinfo = "kf33",  .key = NCKEY_F09, .ctrl = 1, },
+    { .tinfo = "kf34",  .key = NCKEY_F10, .ctrl = 1, },
+    { .tinfo = "kf35",  .key = NCKEY_F11, .ctrl = 1, },
+    { .tinfo = "kf36",  .key = NCKEY_F12, .ctrl = 1, },
     { .tinfo = "kf37",  .key = NCKEY_F37, },
     { .tinfo = "kf38",  .key = NCKEY_F38, },
     { .tinfo = "kf39",  .key = NCKEY_F39, },