Mercurial > vim

diff src/libvterm/src/vterm_internal.h @ 20518:a4652d7ec99f v8.2.0813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0813: libvterm code is slightly different from upstream Commit: https://github.com/vim/vim/commit/591cec8366e87a172495c362477cbf5de8d399f0 Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 22 22:06:06 2020 +0200 patch 8.2.0813: libvterm code is slightly different from upstream Problem: libvterm code is slightly different from upstream. Solution: Use upstream text to avoid future merge problems. Mainly comment style changes.
author Bram Moolenaar <Bram@vim.org>
date Fri, 22 May 2020 22:15:04 +0200
parents 03826c672315
children f93337ae0612
line wrap: on
line diff
--- a/src/libvterm/src/vterm_internal.h
+++ b/src/libvterm/src/vterm_internal.h
@@ -55,7 +55,7 @@ struct VTermPen
   unsigned int reverse:1;
   unsigned int conceal:1;
   unsigned int strike:1;
-  unsigned int font:4; // To store 0-9
+  unsigned int font:4; /* To store 0-9 */
 };
 
 struct VTermState
@@ -71,20 +71,20 @@ struct VTermState
   int rows;
   int cols;
 
-  // Current cursor position
+  /* Current cursor position */
   VTermPos pos;
 
-  int at_phantom; // True if we're on the "81st" phantom column to defer a wraparound
+  int at_phantom; /* True if we're on the "81st" phantom column to defer a wraparound */
 
   int scrollregion_top;
-  int scrollregion_bottom; // -1 means unbounded
+  int scrollregion_bottom; /* -1 means unbounded */
 #define SCROLLREGION_BOTTOM(state) ((state)->scrollregion_bottom > -1 ? (state)->scrollregion_bottom : (state)->rows)
   int scrollregion_left;
 #define SCROLLREGION_LEFT(state)  ((state)->mode.leftrightmargin ? (state)->scrollregion_left : 0)
-  int scrollregion_right; // -1 means unbounded
+  int scrollregion_right; /* -1 means unbounded */
 #define SCROLLREGION_RIGHT(state) ((state)->mode.leftrightmargin && (state)->scrollregion_right > -1 ? (state)->scrollregion_right : (state)->cols)
 
-  // Bitvector of tab stops
+  /* Bitvector of tab stops */
   unsigned char *tabstops;
 
   /* Primary and Altscreen; lineinfos[1] is lazily allocated as needed */
@@ -95,14 +95,14 @@ struct VTermState
 #define ROWWIDTH(state,row) ((state)->lineinfo[(row)].doublewidth ? ((state)->cols / 2) : (state)->cols)
 #define THISROWWIDTH(state) ROWWIDTH(state, (state)->pos.row)
 
-  // Mouse state
+  /* Mouse state */
   int mouse_col, mouse_row;
   int mouse_buttons;
   int mouse_flags;
 
   enum { MOUSE_X10, MOUSE_UTF8, MOUSE_SGR, MOUSE_RXVT } mouse_protocol;
 
-  // Last glyph output, for Unicode recombining purposes
+  /* Last glyph output, for Unicode recombining purposes */
   uint32_t *combine_chars;
   size_t combine_chars_size; // Number of ELEMENTS in the above
   int combine_width; // The width of the glyph above
@@ -139,7 +139,7 @@ struct VTermState
 
   unsigned int protected_cell : 1;
 
-  // Saved state under DEC mode 1048/1049
+  /* Saved state under DEC mode 1048/1049 */
   struct {
     VTermPos pos;
     struct VTermPen pen;
@@ -211,7 +211,7 @@ struct VTerm
     int string_initial;
   } parser;
 
-  // len == malloc()ed size; cur == number of valid bytes
+  /* len == malloc()ed size; cur == number of valid bytes */
 
   VTermOutputCallback *outfunc;
   void                *outdata;