1 files changed, 42 insertions, 0 deletions
diff --git a/src/nvim/mark_defs.h b/src/nvim/mark_defs.h
index 994ad30633..16d85a6e51 100644
--- a/src/nvim/mark_defs.h
+++ b/src/nvim/mark_defs.h
@@ -10,6 +10,33 @@
  * (a normal mark is a lnum/col pair, the same as a file position)
  */
 
+/// Flags for outcomes when moving to a mark.
+typedef enum {
+  kMarkMoveSuccess = 1,  ///< Successful move.
+  kMarkMoveFailed = 2,  ///< Failed to move.
+  kMarkSwitchedBuf = 4,  ///< Switched curbuf.
+  kMarkChangedCol = 8,   ///< Changed the cursor col.
+  kMarkChangedLine = 16,  ///< Changed the cursor line.
+  kMarkChangedCursor = 32,  ///< Changed the cursor.
+  kMarkChangedView = 64,  ///< Changed the view.
+} MarkMoveRes;
+
+/// Flags to configure the movement to a mark.
+typedef enum {
+  kMarkBeginLine = 1,  ///< Move cursor to the beginning of the line.
+  kMarkContext = 2,  ///< Leave context mark when moving the cursor.
+  KMarkNoContext = 4,  ///< Don't leave a context mark.
+  kMarkSetView = 8,  ///< Set the mark view after moving
+  kMarkJumpList = 16,  ///< Special case, don't leave context mark when switching buffer
+} MarkMove;
+
+/// Options when getting a mark
+typedef enum {
+  kMarkBufLocal,  ///< Only return marks that belong to the buffer.
+  kMarkAll,  ///< Return all types of marks.
+  kMarkAllNoResolve,  ///< Return all types of marks but don't resolve fnum (global marks).
+} MarkGet;
+
 /// Number of possible numbered global marks
 #define EXTRA_MARKS     ('9' - '0' + 1)
 
@@ -25,24 +52,39 @@
 /// but they are not saved in ShaDa files.
 #define NLOCALMARKS     (NMARKS + 3)
 
+/// Max value of local mark
+#define NMARK_LOCAL_MAX 126  // Index of '~'
+
 /// Maximum number of marks in jump list
 #define JUMPLISTSIZE    100
 
 /// Maximum number of tags in tag stack
 #define TAGSTACKSIZE    20
 
+/// Represents view in which the mark was created
+typedef struct fmarkv {
+  linenr_T topline_offset;  ///< Amount of lines from the mark lnum to the top of the window.
+} fmarkv_T;
+
+#define INIT_FMARKV { 0 }
+
 /// Structure defining single local mark
 typedef struct filemark {
   pos_T mark;           ///< Cursor position.
   int fnum;             ///< File number.
   Timestamp timestamp;  ///< Time when this mark was last set.
+  fmarkv_T view;  ///< View the mark was created on
   dict_T *additional_data;  ///< Additional data from ShaDa file.
 } fmark_T;
 
+#define INIT_FMARK { { 0, 0, 0 }, 0, 0, INIT_FMARKV, NULL }
+
 /// Structure defining extended mark (mark with file name attached)
 typedef struct xfilemark {
   fmark_T fmark;       ///< Actual mark.
   char *fname;  ///< File name, used when fnum == 0.
 } xfmark_T;
 
+#define INIT_XFMARK { INIT_FMARK, NULL }
+
 #endif // NVIM_MARK_DEFS_H