/* Header file for the buffer manipulation primitives.
- Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999, 2000, 2001
+ Copyright (C) 1985, 86, 93, 94, 95, 97, 1998, 1999, 2000, 01, 2003
Free Software Foundation, Inc.
This file is part of GNU Emacs.
/* These macros come in pairs, one for the char position
and one for the byte position. */
-/* Position of beginning of buffer. */
+/* Position of beginning of buffer. */
#define BEG (1)
#define BEG_BYTE (1)
-/* Position of beginning of accessible range of buffer. */
+/* Position of beginning of accessible range of buffer. */
#define BEGV (current_buffer->begv)
#define BEGV_BYTE (current_buffer->begv_byte)
/* Position of point in buffer. The "+ 0" makes this
- not an l-value, so you can't assign to it. Use SET_PT instead. */
+ not an l-value, so you can't assign to it. Use SET_PT instead. */
#define PT (current_buffer->pt + 0)
#define PT_BYTE (current_buffer->pt_byte + 0)
-/* Position of gap in buffer. */
+/* Position of gap in buffer. */
#define GPT (current_buffer->text->gpt)
#define GPT_BYTE (current_buffer->text->gpt_byte)
-/* Position of end of accessible range of buffer. */
+/* Position of end of accessible range of buffer. */
#define ZV (current_buffer->zv)
#define ZV_BYTE (current_buffer->zv_byte)
-/* Position of end of buffer. */
+/* Position of end of buffer. */
#define Z (current_buffer->text->z)
#define Z_BYTE (current_buffer->text->z_byte)
/* Macros for the addresses of places in the buffer. */
-/* Address of beginning of buffer. */
+/* Address of beginning of buffer. */
#define BEG_ADDR (current_buffer->text->beg)
-/* Address of beginning of accessible range of buffer. */
+/* Address of beginning of accessible range of buffer. */
#define BEGV_ADDR (BYTE_POS_ADDR (current_buffer->begv_byte))
-/* Address of point in buffer. */
+/* Address of point in buffer. */
#define PT_ADDR (BYTE_POS_ADDR (current_buffer->pt_byte))
-/* Address of beginning of gap in buffer. */
-#define GPT_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte - 1)
+/* Address of beginning of gap in buffer. */
+#define GPT_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte - BEG_BYTE)
/* Address of end of gap in buffer. */
-#define GAP_END_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte + current_buffer->text->gap_size - 1)
+#define GAP_END_ADDR (current_buffer->text->beg + current_buffer->text->gpt_byte + current_buffer->text->gap_size - BEG_BYTE)
-/* Address of end of accessible range of buffer. */
+/* Address of end of accessible range of buffer. */
#define ZV_ADDR (BYTE_POS_ADDR (current_buffer->zv_byte))
-/* Address of end of buffer. */
-#define Z_ADDR (current_buffer->text->beg + current_buffer->text->gap_size + current_buffer->text->z_byte - 1)
+/* Address of end of buffer. */
+#define Z_ADDR (current_buffer->text->beg + current_buffer->text->gap_size + current_buffer->text->z_byte - BEG_BYTE)
/* Size of gap. */
#define GAP_SIZE (current_buffer->text->gap_size)
/* Similar macros to operate on a specified buffer.
Note that many of these evaluate the buffer argument more than once. */
-/* Position of beginning of buffer. */
-#define BUF_BEG(buf) (1)
-#define BUF_BEG_BYTE(buf) (1)
+/* Position of beginning of buffer. */
+#define BUF_BEG(buf) (BEG)
+#define BUF_BEG_BYTE(buf) (BEG_BYTE)
-/* Position of beginning of accessible range of buffer. */
+/* Position of beginning of accessible range of buffer. */
#define BUF_BEGV(buf) ((buf)->begv)
#define BUF_BEGV_BYTE(buf) ((buf)->begv_byte)
-/* Position of point in buffer. */
+/* Position of point in buffer. */
#define BUF_PT(buf) ((buf)->pt)
#define BUF_PT_BYTE(buf) ((buf)->pt_byte)
-/* Position of gap in buffer. */
+/* Position of gap in buffer. */
#define BUF_GPT(buf) ((buf)->text->gpt)
#define BUF_GPT_BYTE(buf) ((buf)->text->gpt_byte)
-/* Position of end of accessible range of buffer. */
+/* Position of end of accessible range of buffer. */
#define BUF_ZV(buf) ((buf)->zv)
#define BUF_ZV_BYTE(buf) ((buf)->zv_byte)
-/* Position of end of buffer. */
+/* Position of end of buffer. */
#define BUF_Z(buf) ((buf)->text->z)
#define BUF_Z_BYTE(buf) ((buf)->text->z_byte)
#define BUF_BEG_ADDR(buf) ((buf)->text->beg)
/* Address of beginning of gap of buffer. */
-#define BUF_GPT_ADDR(buf) ((buf)->text->beg + (buf)->text->gpt_byte - 1)
+#define BUF_GPT_ADDR(buf) ((buf)->text->beg + (buf)->text->gpt_byte - BEG_BYTE)
/* Address of end of buffer. */
-#define BUF_Z_ADDR(buf) ((buf)->text->beg + (buf)->text->gap_size + (buf)->text->z_byte - 1)
+#define BUF_Z_ADDR(buf) ((buf)->text->beg + (buf)->text->gap_size + (buf)->text->z_byte - BEG_BYTE)
/* Address of end of gap in buffer. */
-#define BUF_GAP_END_ADDR(buf) ((buf)->text->beg + (buf)->text->gpt_byte + (buf)->text->gap_size - 1)
+#define BUF_GAP_END_ADDR(buf) ((buf)->text->beg + (buf)->text->gpt_byte + (buf)->text->gap_size - BEG_BYTE)
/* Size of gap. */
#define BUF_GAP_SIZE(buf) ((buf)->text->gap_size)
} \
} \
while (0)
-
+
\f
-/* Macros to set PT in the current buffer, or another buffer.. */
+/* Macros to set PT in the current buffer, or another buffer. */
#define SET_PT(position) (set_point (current_buffer, (position)))
#define TEMP_SET_PT(position) (temp_set_point (current_buffer, (position)))
/* Return the address of byte position N in current buffer. */
#define BYTE_POS_ADDR(n) \
- (((n) >= GPT_BYTE ? GAP_SIZE : 0) + (n) + BEG_ADDR - 1)
+ (((n) >= GPT_BYTE ? GAP_SIZE : 0) + (n) + BEG_ADDR - BEG_BYTE)
/* Return the address of char position N. */
#define CHAR_POS_ADDR(n) \
(((n) >= GPT ? GAP_SIZE : 0) \
+ buf_charpos_to_bytepos (current_buffer, n) \
- + BEG_ADDR - 1)
+ + BEG_ADDR - BEG_BYTE)
/* Convert a character position to a byte position. */
#define PTR_BYTE_POS(ptr) \
((ptr) - (current_buffer)->text->beg \
- - (ptr - (current_buffer)->text->beg < (unsigned) GPT_BYTE ? 0 : GAP_SIZE) \
- + 1)
+ - (ptr - (current_buffer)->text->beg <= (unsigned) (GPT_BYTE - BEG_BYTE) ? 0 : GAP_SIZE) \
+ + BEG_BYTE)
/* Return character at position POS. */
#define FETCH_MULTIBYTE_CHAR(pos) \
(_fetch_multibyte_char_p = (((pos) >= GPT_BYTE ? GAP_SIZE : 0) \
- + (pos) + BEG_ADDR - 1), \
+ + (pos) + BEG_ADDR - BEG_BYTE), \
_fetch_multibyte_char_len \
= ((pos) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE) - (pos), \
STRING_CHAR (_fetch_multibyte_char_p, _fetch_multibyte_char_len))
or converting between byte positions and addresses,
in a specified buffer. */
-/* Return the address of character at byte position POS in buffer BUF.
+/* Return the address of character at byte position POS in buffer BUF.
Note that both arguments can be computed more than once. */
#define BUF_BYTE_ADDRESS(buf, pos) \
-((buf)->text->beg + (pos) - 1 \
+((buf)->text->beg + (pos) - BEG_BYTE \
+ ((pos) >= (buf)->text->gpt_byte ? (buf)->text->gap_size : 0))
-/* Return the address of character at char position POS in buffer BUF.
+/* Return the address of character at char position POS in buffer BUF.
Note that both arguments can be computed more than once. */
#define BUF_CHAR_ADDRESS(buf, pos) \
-((buf)->text->beg + buf_charpos_to_bytepos ((buf), (pos)) - 1 \
+((buf)->text->beg + buf_charpos_to_bytepos ((buf), (pos)) - BEG_BYTE \
+ ((pos) >= (buf)->text->gpt ? (buf)->text->gap_size : 0))
/* Convert PTR, the address of a char in buffer BUF,
#define BUF_PTR_BYTE_POS(buf, ptr) \
((ptr) - (buf)->text->beg \
- - (ptr - (buf)->text->beg < (unsigned) BUF_GPT_BYTE ((buf)) \
+ - (ptr - (buf)->text->beg <= (unsigned) (BUF_GPT_BYTE ((buf)) - BEG_BYTE)\
? 0 : BUF_GAP_SIZE ((buf))) \
- + 1)
+ + BEG_BYTE)
/* Return the character at byte position POS in buffer BUF. */
#define BUF_FETCH_MULTIBYTE_CHAR(buf, pos) \
(_fetch_multibyte_char_p \
= (((pos) >= BUF_GPT_BYTE (buf) ? BUF_GAP_SIZE (buf) : 0) \
- + (pos) + BUF_BEG_ADDR (buf) - 1), \
+ + (pos) + BUF_BEG_ADDR (buf) - BEG_BYTE), \
_fetch_multibyte_char_len \
= (((pos) >= BUF_GPT_BYTE (buf) ? BUF_ZV_BYTE (buf) : BUF_GPT_BYTE (buf)) \
- (pos)), \
e.g. happen when malloc is called. So, don't pass a pointer
into a buffer's text to functions that malloc. */
unsigned char *beg;
-
+
int gpt; /* Char pos of gap in buffer. */
int z; /* Char pos of end of buffer. */
int gpt_byte; /* Byte pos of gap in buffer. */
This is actually a single marker ---
successive elements in its marker `chain'
are the other markers referring to this buffer. */
- Lisp_Object markers;
+ struct Lisp_Marker *markers;
};
/* This is the structure that the buffer Lisp object points to. */
this means the variable is always local in all buffers. */
#define MAX_PER_BUFFER_VARS 50
char local_flags[MAX_PER_BUFFER_VARS];
-
+
/* Set to the modtime of the visited file when read or written.
-1 means visited file was nonexistent.
0 means visited file modtime unknown; in no case complain
displaying this buffer. */
unsigned prevent_redisplay_optimizations_p : 1;
- /* Changes in the buffer are recorded here for undo.
- t means don't record anything.
- This information belongs to the base buffer of an indirect buffer,
- But we can't store it in the struct buffer_text
- because local variables have to be right in the struct buffer.
- So we copy it around in set_buffer_internal.
- This comes before `name' because it is marked in a special way. */
- Lisp_Object undo_list;
-
- /* Everything from here down must be a Lisp_Object */
+ /* Everything from here down must be a Lisp_Object. */
/* The name of this buffer. */
Lisp_Object name;
Lisp_Object mode_name;
/* Mode line element that controls format of mode line. */
Lisp_Object mode_line_format;
-
+
+ /* Changes in the buffer are recorded here for undo.
+ t means don't record anything.
+ This information belongs to the base buffer of an indirect buffer,
+ But we can't store it in the struct buffer_text
+ because local variables have to be right in the struct buffer.
+ So we copy it around in set_buffer_internal.
+ This comes before `name' because it is marked in a special way. */
+ Lisp_Object undo_list;
+
/* Analogous to mode_line_format for the line displayed at the top
of windows. Nil means don't display that line. */
Lisp_Object header_line_format;
/* This buffer's category table. */
Lisp_Object category_table;
- /* Values of several buffer-local variables */
+ /* Values of several buffer-local variables. */
/* tab-width is buffer-local so that redisplay can find it
- in buffers that are not current */
+ in buffers that are not current. */
Lisp_Object case_fold_search;
Lisp_Object tab_width;
Lisp_Object fill_column;
saving. */
Lisp_Object buffer_file_coding_system;
- /* List of symbols naming the file format used for visited file. */
+ /* List of symbols naming the file format used for visited file. */
Lisp_Object file_format;
/* True if the newline position cache and width run cache are
/* Incremented each time the buffer is displayed in a window. */
Lisp_Object display_count;
-
+
/* Widths of left and right marginal areas for windows displaying
this buffer. */
- Lisp_Object left_margin_width, right_margin_width;
+ Lisp_Object left_margin_cols, right_margin_cols;
+
+ /* Widths of left and right fringe areas for windows displaying
+ this buffer. */
+ Lisp_Object left_fringe_width, right_fringe_width;
+
+ /* Non-nil means fringes are drawn outside display margins;
+ othersize draw them between margin areas and text. */
+ Lisp_Object fringes_outside_margins;
+
+ /* Width and type of scroll bar areas for windows displaying
+ this buffer. */
+ Lisp_Object scroll_bar_width, vertical_scroll_bar_type;
/* Non-nil means indicate lines not displaying text (in a style
like vi). */
that point ends up this number of lines from the top of the
window. Nil means that scrolling method isn't used. */
Lisp_Object scroll_up_aggressively;
-
+
/* If scrolling the display because point is above the top of a
window showing this buffer, try to choose a window start so
that point ends up this number of lines from the bottom of the