vim: src/term.c comparison

comparison src/term.c @ 13780:5cf4a504bcc0 v8.0.1762

patch 8.0.1762: terminal debug logging is a bit complicated commit https://github.com/vim/vim/commit/b255b90503a986931904c23dafb5b6d4e512a17e Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 24 21:40:10 2018 +0200 patch 8.0.1762: terminal debug logging is a bit complicated Problem: Terminal debug logging is a bit complicated. Solution: Make log_tr() use variable arguments (Ozaki Kiichi, closes https://github.com/vim/vim/issues/2730)

author	Christian Brabandt <cb@256bit.org>
date	Tue, 24 Apr 2018 21:45:08 +0200
parents	9de2b25932eb
children	d0d8125ba692

comparison

equal deleted inserted replaced

-:dae7df489b22
+:5cf4a504bcc0
 # ifdef FEAT_TERMRESPONSE
 /* Change this to "if 1" to debug what happens with termresponse. */
 #  if 0
 #   define DEBUG_TERMRESPONSE
-static void log_tr(char *msg);
+static void log_tr(const char *fmt, ...);
-#   define LOG_TR(msg) log_tr(msg)
+#   define LOG_TR(msg) log_tr msg
 #  else
-#   define LOG_TR(msg)
+#   define LOG_TR(msg) do { /**/ } while (0)
 #  endif
 #  define STATUS_GET	1	/* send request when switching to RAW mode */
 #  define STATUS_SENT	2	/* did send request, waiting for response */
 #  define STATUS_GOT	3	/* received response */
 	set_keep_msg_from_hist();
 	set_color_count(val);
 	init_highlight(TRUE, FALSE);
 # ifdef DEBUG_TERMRESPONSE
 	{
-	    char buf[100];
+	    int r = redraw_asap(CLEAR);
-	    int  r = redraw_asap(CLEAR);
+	    log_tr("Received t_Co, redraw_asap(): %d", r);
-	    sprintf(buf, "Received t_Co, redraw_asap(): %d", r);
+	}
-	    log_tr(buf);
+#else
-	}
-# else
 	redraw_asap(CLEAR);
-# endif
+#endif
 }
 }
 #endif
 #ifdef HAVE_TGETENT
 ttest(TRUE);	/* make sure we have a valid set of terminal codes */
 full_screen = TRUE;		/* we can use termcap codes from now on */
 set_term_defaults();	/* use current values as defaults */
 #ifdef FEAT_TERMRESPONSE
-LOG_TR("setting crv_status to STATUS_GET");
+LOG_TR(("setting crv_status to STATUS_GET"));
 crv_status = STATUS_GET;	/* Get terminal version later */
 #endif
 /*
 * Initialize the terminal with the appropriate termcap codes.
 if (crv_status == STATUS_GET
 	    && can_get_termresponse()
 	    && starting == 0
 	    && *T_CRV != NUL)
 {
-	LOG_TR("Sending CRV request");
+	LOG_TR(("Sending CRV request"));
 	out_str(T_CRV);
 	crv_status = STATUS_SENT;
 	/* check for the characters now, otherwise they might be eaten by
 	 * get_keystroke() */
 	out_flush();
 	    && *T_U7 != NUL
 	    && !option_was_set((char_u *)"ambiwidth"))
 {
 	 char_u	buf[16];
-	 LOG_TR("Sending U7 request");
+	 LOG_TR(("Sending U7 request"));
 	 /* Do this in the second row.  In the first row the returned sequence
 	  * may be CSI 1;2R, which is the same as <S-F3>. */
 	 term_windgoto(1, 0);
 	 buf[mb_char2bytes(0x25bd, buf)] = 0;
 	 out_str(buf);
 # ifdef FEAT_TERMINAL
 	/* Only request foreground if t_RF is set. */
 	if (rfg_status == STATUS_GET && *T_RFG != NUL)
 	{
-	    LOG_TR("Sending FG request");
+	    LOG_TR(("Sending FG request"));
 	    out_str(T_RFG);
 	    rfg_status = STATUS_SENT;
 	    didit = TRUE;
 	}
 # endif
 	/* Only request background if t_RB is set. */
 	if (rbg_status == STATUS_GET && *T_RBG != NUL)
 	{
-	    LOG_TR("Sending BG request");
+	    LOG_TR(("Sending BG request"));
 	    out_str(T_RBG);
 	    rbg_status = STATUS_SENT;
 	    didit = TRUE;
 	}
 }
 }
 # ifdef DEBUG_TERMRESPONSE
 static void
-log_tr(char *msg)
+log_tr(const char *fmt, ...)
 {
 static FILE *fd_tr = NULL;
 static proftime_T start;
 proftime_T now;
+va_list ap;
 if (fd_tr == NULL)
 {
 	fd_tr = fopen("termresponse.log", "w");
 	profile_start(&start);
 }
 now = start;
 profile_end(&now);
-fprintf(fd_tr, "%s: %s %s\n",
+fprintf(fd_tr, "%s: %s ", profile_msg(&now),
-	    profile_msg(&now),
+					must_redraw == NOT_VALID ? "NV"
-	    must_redraw == NOT_VALID ? "NV"
+					: must_redraw == CLEAR ? "CL" : "  ");
-					 : must_redraw == CLEAR ? "CL" : "  ",
+va_start(ap, fmt);
-	    msg);
+vfprintf(fd_tr, fmt, ap);
+va_end(ap);
+fputc('\n', fd_tr);
+fflush(fd_tr);
 }
 # endif
 #endif
 /*
 	    }
 	}
 	need_gather = TRUE;		/* need to fill termleader[] */
 }
 detected_8bit = TRUE;
-LOG_TR("Switching to 8 bit");
+LOG_TR(("Switching to 8 bit"));
 }
 #endif
 #ifdef CHECK_DOUBLE_CLICK
 static linenr_T orig_topline = 0;
 			row_char = tp[i - 1];
 #endif
 		    }
 		if (i == len)
 		{
-		    LOG_TR("Not enough characters for CRV");
+		    LOG_TR(("Not enough characters for CRV"));
 		    return -1;
 		}
 		if (extra > 0)
 		    col = atoi((char *)tp + extra);
 		{
 		    if (row_char == '2' && col >= 2)
 		    {
 			char *aw = NULL;
-			LOG_TR("Received U7 status");
+			LOG_TR(("Received U7 status: %s", tp));
 			u7_status = STATUS_GOT;
 			did_cursorhold = TRUE;
 			if (col == 2)
 			    aw = "single";
 			else if (col == 3)
 			     * messages. */
 			    set_option_value((char_u *)"ambw", 0L,
 					     (char_u *)aw, 0);
 # ifdef DEBUG_TERMRESPONSE
 			    {
-				char buf[100];
+				int r = redraw_asap(CLEAR);
-				int  r = redraw_asap(CLEAR);
+				log_tr("set 'ambiwidth', redraw_asap(): %d", r);
-				sprintf(buf,
-					"set 'ambiwidth', redraw_asap(): %d",
-					r);
-				log_tr(buf);
 			    }
 # else
 			    redraw_asap(CLEAR);
 # endif
 			}
 		/* eat it when at least one digit and ending in 'c' */
 		if (*T_CRV != NUL && i > 2 + (tp[0] != CSI) && tp[i] == 'c')
 		{
 		    int version = col;
-		    LOG_TR("Received CRV response");
+		    LOG_TR(("Received CRV response: %s", tp));
 		    crv_status = STATUS_GOT;
 		    did_cursorhold = TRUE;
 		    /* If this code starts with CSI, you can bet that the
 		     * terminal uses 8-bit codes. */
 # endif
 			/* if xterm version >= 141 try to get termcap codes */
 			if (version >= 141)
 			{
-			    LOG_TR("Enable checking for XT codes");
+			    LOG_TR(("Enable checking for XT codes"));
 			    check_for_codes = TRUE;
 			    need_gather = TRUE;
 			    req_codes_from_term();
 			}
 				&& version >= 279
 				&& !is_not_xterm
 				&& *T_CSH != NUL
 				&& *T_CRS != NUL)
 			{
-			    LOG_TR("Sending cursor style request");
+			    LOG_TR(("Sending cursor style request"));
 			    out_str(T_CRS);
 			    rcs_status = STATUS_SENT;
 			    need_flush = TRUE;
 			}
 			 * echoes the characters to the screen. */
 			if (rbm_status == STATUS_GET
 				&& !is_not_xterm
 				&& *T_CRC != NUL)
 			{
-			    LOG_TR("Sending cursor blink mode request");
+			    LOG_TR(("Sending cursor blink mode request"));
 			    out_str(T_CRC);
 			    rbm_status = STATUS_SENT;
 			    need_flush = TRUE;
 			}
 			&& tp[i - 1] == '$'
 			&& tp[i] == 'y')
 		{
 		    initial_cursor_blink = (tp[j + 4] == '1');
 		    rbm_status = STATUS_GOT;
-		    LOG_TR("Received cursor blinking mode response");
+		    LOG_TR(("Received cursor blinking mode response: %s", tp));
 		    key_name[0] = (int)KS_EXTRA;
 		    key_name[1] = (int)KE_IGNORE;
 		    slen = i + 1;
 # ifdef FEAT_EVAL
 		    set_vim_var_string(VV_TERMBLINKRESP, tp, slen);
 				winpos_status = STATUS_GOT;
 			}
 		    }
 		    if (i == len)
 		    {
-			LOG_TR("not enough characters for winpos");
+			LOG_TR(("not enough characters for winpos"));
 			return -1;
 		    }
 		}
 	    }
 			    if (is_bg)
 			    {
 				char *newval = (3 * '6' < tp[j+7] + tp[j+12]
 						+ tp[j+17]) ? "light" : "dark";
-				LOG_TR("Received RBG response");
+				LOG_TR(("Received RBG response: %s", tp));
 				rbg_status = STATUS_GOT;
 #ifdef FEAT_TERMINAL
 				bg_r = rval;
 				bg_g = gval;
 				bg_b = bval;
 				}
 			    }
 #ifdef FEAT_TERMINAL
 			    else
 			    {
-				LOG_TR("Received RFG response");
+				LOG_TR(("Received RFG response: %s", tp));
 				rfg_status = STATUS_GOT;
 				fg_r = rval;
 				fg_g = gval;
 				fg_b = bval;
 			    }
 # endif
 			break;
 		    }
 		if (i == len)
 		{
-		    LOG_TR("not enough characters for RB");
+		    LOG_TR(("not enough characters for RB"));
 		    return -1;
 		}
 	    }
 	    /* Check for key code response from xterm:
 			    /* The blink flag is actually inverted, compared to
 			     * the value set with T_SH. */
 			    initial_cursor_shape_blink =
 						   (number & 1) ? FALSE : TRUE;
 			    rcs_status = STATUS_GOT;
-			    LOG_TR("Received cursor shape response");
+			    LOG_TR(("Received cursor shape response: %s", tp));
 			    key_name[0] = (int)KS_EXTRA;
 			    key_name[1] = (int)KE_IGNORE;
 			    slen = i + 1;
 # ifdef FEAT_EVAL
 		if (i == len)
 		{
 		    /* These codes arrive many together, each code can be
 		     * truncated at any point. */
-		    LOG_TR("not enough characters for XT");
+		    LOG_TR(("not enough characters for XT"));
 		    return -1;
 		}
 	    }
 	}
 #endif
 	}
 	return retval == 0 ? (len + extra + offset) : retval;
 }
 #ifdef FEAT_TERMRESPONSE
-LOG_TR("normal character");
+LOG_TR(("normal character"));
 #endif
 return 0;			    /* no match found */
 }
 /* Send up to 10 more requests out than we received.  Avoid sending too
 * many, there can be a buffer overflow somewhere. */
 while (xt_index_out < xt_index_in + 10 && key_names[xt_index_out] != NULL)
 {
-# ifdef DEBUG_TERMRESPONSE
+	char *key_name = key_names[xt_index_out];
-	char dbuf[100];
+	LOG_TR(("Requesting XT %d: %s", xt_index_out, key_name));
-	sprintf(dbuf, "Requesting XT %d: %s",
+	sprintf(buf, "\033P+q%02x%02x\033\\", key_name[0], key_name[1]);
-				       xt_index_out, key_names[xt_index_out]);
-	log_tr(dbuf);
-# endif
-	sprintf(buf, "\033P+q%02x%02x\033\\",
-		      key_names[xt_index_out][0], key_names[xt_index_out][1]);
 	out_str_nf((char_u *)buf);
 	++xt_index_out;
 }
 /* Send the codes out right away. */
 	    {
 		xt_index_in = i;
 		break;
 	    }
 	}
-# ifdef DEBUG_TERMRESPONSE
-	{
+	LOG_TR(("Received XT %d: %s", xt_index_in, (char *)name));
-	    char buf[100];
-	    sprintf(buf, "Received XT %d: %s", xt_index_in, (char *)name);
-	    log_tr(buf);
-	}
-# endif
 	if (key_names[i] != NULL)
 	{
 	    for (i = 8; (c = hexhex2nr(code + i)) >= 0; i += 2)
 		str[j++] = c;
 	    str[j] = NUL;

Mercurial > vim

comparison src/term.c @ 13780:5cf4a504bcc0 v8.0.1762