Commit 4e1e8266 authored by Jehan's avatar Jehan

consistent naming convention in buffers

parent 63e55431
This diff is collapsed.
......@@ -709,7 +709,7 @@ rxvt_init_vars(rxvt_t *r)
# ifdef USE_XIM
SET_NULL(h->Input_Context);
# endif
/* SET_NULL(h->v_bufstr); */
/* SET_NULL(h->inbuf_start); */
SET_NULL(h->buffer);
# ifdef TRANSPARENT
......@@ -2914,14 +2914,14 @@ rxvt_init_vts( rxvt_t *r, int page, int profile )
#endif
/* Initialize input buffer */
PVTS(r, page)->cmdbuf_ptr = PVTS(r, page)->cmdbuf_endp
= PVTS(r, page)->cmdbuf_base;
PVTS(r, page)->outbuf_start = PVTS(r, page)->outbuf_end
= PVTS(r, page)->outbuf_base;
/* Initialize write out buffer */
SET_NULL(PVTS(r, page)->v_buffer);
SET_NULL(PVTS(r, page)->v_bufstr);
SET_NULL(PVTS(r, page)->v_bufptr);
SET_NULL(PVTS(r, page)->v_bufend);
SET_NULL(PVTS(r, page)->inbuf_base);
SET_NULL(PVTS(r, page)->inbuf_start);
SET_NULL(PVTS(r, page)->inbuf_end);
PVTS(r, page)->inbuf_room = 0;
/* Set screen structure initialization flag */
PVTS(r, page)->init_screen = 0;
......
......@@ -1680,9 +1680,9 @@ struct rxvt_hidden {
char* locale;
#if 0
unsigned char* v_buffer;
unsigned char* v_bufstr;
unsigned char* v_bufptr;
unsigned char* inbuf_base;
unsigned char* inbuf_start;
unsigned char* inbuf_end;
unsigned char* v_bufend;
#endif
......@@ -1690,8 +1690,8 @@ struct rxvt_hidden {
const char* rs[NUM_RESOURCES];
#if 0 /* command input buffering */
unsigned char* cmdbuf_ptr, *cmdbuf_endp;
unsigned char cmdbuf_base[BUFSIZ];
unsigned char* outbuf_start, *outbuf_end;
unsigned char outbuf_base[BUFSIZ];
unsigned char kbuf[KBUFSZ];
#endif
......
......@@ -743,20 +743,20 @@ typedef struct {
* Data we want to write into cmd_fd is buffered in here, before being
* written by rxvt_tt_write(). [Child's input buffer]
*/
unsigned char *v_buffer, /* pointer to physical buffer */
*v_bufstr, /* beginning of area to write */
*v_bufptr, /* end of area to write */
*v_bufend; /* end of physical buffer */
unsigned char *inbuf_base, /* pointer to physical buffer */
*inbuf_start, /* beginning of area to write */
*inbuf_end; /* end of area to write */
int inbuf_room; /* Remaining room at the end of the buffer */
/*
* Data read from cmd_fd is buffered in here [Child's output buffer]
*/
unsigned char *cmdbuf_escstart, /* Start of an escape sequence */
*cmdbuf_escfail, /* Position where processing of an
unsigned char *outbuf_escstart, /* Start of an escape sequence */
*outbuf_escfail, /* Position where processing of an
escape sequence last failed */
*cmdbuf_ptr, /* current char */
*cmdbuf_endp; /* End of read child's output */
unsigned char cmdbuf_base[BUFSIZ];
*outbuf_start, /* current char */
*outbuf_end; /* End of read child's output */
unsigned char outbuf_base[BUFSIZ];
} term_t;
#define TAB_MON_OFF 0 /* tab monitoring off */
......
......@@ -1489,10 +1489,10 @@ rxvt_remove_page (rxvt_t* r, short page)
assert (PVTS(r, page)->cmd_fd >= 0);
close (PVTS(r, page)->cmd_fd);
if (PVTS(r, page)->v_buffer)
if (PVTS(r, page)->inbuf_base)
{
rxvt_free (PVTS(r, page)->v_buffer);
PVTS(r, page)->v_buffer = NULL;
rxvt_free (PVTS(r, page)->inbuf_base);
PVTS(r, page)->inbuf_base = NULL;
}
/* free screen structure */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment