Ticket #2988: add commented-out debugging logging mechanism. - Denys Vlasenko <vda.linux@googlemail.com> - 2012-10-22 1749.patch

lib/tty/key.c

@@ -1811 +1811 @@
 }
 
 /* --------------------------------------------------------------------------------------------- */
+#if 0
+# define key_debug 1
+static void keylog (const char *fmt, ...)
+{
+    static int logfd = -1;
+
+    if (logfd < 0) {
+        logfd = open ("/tmp/mc_key.log", O_CREAT | O_WRONLY | O_APPEND, 0666);
+        if (logfd < 0)
+            return;
+    }
+
+    va_list ap;
+    va_start (ap, fmt);
+    char *p = NULL;
+    vasprintf (&p, fmt, ap);
+    va_end (ap);
+
+    if (p)
+    {
+        write (logfd, p, strlen(p));
+        free (p);
+    }
+}
+#else
+# define key_debug 0
+# define keylog(...) ((void)0)
+#endif
 
 int
 get_key_code (int no_delay)
@@ -1820 +1848 @@
     static struct timeval esctime = { -1, -1 };
     static int lastnodelay = -1;
 
+    keylog ("entered %s(no_delay:%d)\n", __func__, no_delay);
+
     if (no_delay != lastnodelay)
     {
         this = NULL;
@@ -1832 +1862 @@
         int m;
 
         m = parse_extended_mouse_coordinates ();
+        keylog (" pending_keys!=NULL. m=%d\n", m);
         if (m == 1)
         {
             pending_keys = seq_append = NULL;
             this = NULL;
+            keylog ("return MCKEY_EXTENDED_MOUSE\n");
             return MCKEY_EXTENDED_MOUSE;
         }
         if (m == -1)
         {
             int d = *pending_keys++;
+            keylog (" d=*pending_keys++=%d\n", d);
           check_pend:
             if (*pending_keys == 0)
             {
@@ -1850 +1883 @@
             else if (d == ESC_CHAR)
             {
                 d = ALT (*pending_keys++);
+                keylog (" d=ALT(*pending_keys++)=ALT(%d)=%d\n", pending_keys[-1], d);
                 goto check_pend;
             }
             if ((d > 127 && d < 256) && use_8th_bit_as_meta)
+            {
                 d = ALT (d & 0x7f);
+                keylog (" d=ALT(d & 0x7f)=ALT(%d)=%d\n", d & 0x7f, d);
+            }
             this = NULL;
+            keylog ("return correct_key_code(%d)\n", d);
             return correct_key_code (d);
         }
         /* else if (m == 0), just let it continue */
@@ -1865 +1903 @@
         tty_nodelay (TRUE);
 
     c = tty_lowlevel_getch ();
+    keylog (" c=tty_lowlevel_getch()=%d\n", c);
 #if (defined(USE_NCURSES) || defined(USE_NCURSESW)) && defined(KEY_RESIZE)
     if (c == KEY_RESIZE)
         goto nodelay_try_again;
@@ -1941 +1980 @@
                 pending_keys = seq_append = NULL;
                 code = this->code;
                 this = NULL;
+                keylog ("2 return correct_key_code(%d)\n", code);
                 return correct_key_code (code);
             }
             /* No match yet, but it may be a prefix for a valid seq */
 
             if (!push_char (c))
             {
+                keylog (" push_char(%d) failure (no more space)\n", c);
                 pending_keys = seq_buffer;
                 goto pend_send;
             }
+            keylog (" push_char(%d) ok\n", c);
             parent = this;
             this = this->child;
             if (parent->action == MCKEY_ESCAPE && old_esc_mode)
@@ -1967 +2009 @@
                 }
                 esctime.tv_sec = -1;
                 c = xgetch_second ();
+                keylog (" c=xgetch_second()=%d\n", c);
                 if (c == -1)
                 {
                     pending_keys = seq_append = NULL;
                     this = NULL;
+                    keylog ("return ESC_CHAR\n");
                     return ESC_CHAR;
                 }
                 continue;
@@ -1978 +2022 @@
             if (no_delay)
                 goto nodelay_try_again;
             c = tty_lowlevel_getch ();
+            keylog (" 2 c=tty_lowlevel_getch()=%d\n", c);
             continue;
         }
 
@@ -2000 +2045 @@
 
             pending_keys = seq_append = NULL;
             this = NULL;
+            keylog ("3 return correct_key_code(%d)\n", c);
             return correct_key_code (c);
         }
 
         /* Unknown sequence. Maybe a prefix of a longer one. Save it. */
+        keylog (" push_char(%d)\n", c);
         push_char (c);
+        if (key_debug)
+        {
+            int i = 0;
+            do
+                keylog ("  seq_buffer[%d]:%d\n", i, seq_buffer[i]);
+            while (seq_buffer[i++]);
+        }
         pending_keys = seq_buffer;
         goto pend_send;
 
     } /* while (this != NULL) */
 
     this = NULL;
+    keylog ("4 return correct_key_code(%d)\n", c);
     return correct_key_code (c);
 }