diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-14 16:19:21 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-14 16:19:21 +0400 |
| commit | 77e3b1b7095b3376dbddd22cbca4827b797767c0 (patch) | |
| tree | 1e5cbc68a42c7e1b08acf36d94bc4b158d6117a0 /src/termhooks.h | |
| parent | e558436b778c0199caaff0ce40b9a279bacf640e (diff) | |
* termhooks.h (FRAME_MUST_WRITE_SPACES, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK)
(FRAME_SCROLL_REGION_COST, FRAME_MEMORY_BELOW_FRAME):
Adjust to match the change described below.
(struct terminal): Move must_write_spaces, line_ins_del_ok,
char_ins_del_ok, scroll_region_ok, scroll_region_cost and
memory_below_frame members to...
* termchar.h (struct tty_display_info): ...here because they're
relevant only on TTYs. Prefer unsigned bitfield where appropriate.
* term.c (init_tty):
* nsterm.m (ns_create_terminal):
* w32term.c (w32_create_terminal):
* xterm.c (x_create_terminal): Adjust users.
* dispnew.c (line_hash_code, line_draw_cost): Pass frame arg
to filter out non-TTY frames. Adjust comment.
(scrolling): Adjust user. Prefer eassert for debugging check.
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 2c819ad58e..52f30b4bf9 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -402,21 +402,6 @@ struct terminal the function `set-keyboard-coding-system'. */ struct coding_system *keyboard_coding; - /* Terminal characteristics. */ - /* XXX Are these really used on non-termcap displays? */ - - int must_write_spaces; /* Nonzero means spaces in the text must - actually be output; can't just skip over - some columns to leave them blank. */ - int line_ins_del_ok; /* Terminal can insert and delete lines. */ - int char_ins_del_ok; /* Terminal can insert and delete chars. */ - int scroll_region_ok; /* Terminal supports setting the scroll - window. */ - int scroll_region_cost; /* Cost of setting the scroll window, - measured in characters. */ - int memory_below_frame; /* Terminal remembers lines scrolled - off bottom. */ - /* Window-based redisplay interface for this device (0 for tty devices). */ struct redisplay_interface *rif; @@ -617,12 +602,12 @@ tset_selection_alist (struct terminal *t, Lisp_Object val) /* Chain of all terminal devices currently in use. */ extern struct terminal *terminal_list; -#define FRAME_MUST_WRITE_SPACES(f) ((f)->terminal->must_write_spaces) -#define FRAME_LINE_INS_DEL_OK(f) ((f)->terminal->line_ins_del_ok) -#define FRAME_CHAR_INS_DEL_OK(f) ((f)->terminal->char_ins_del_ok) -#define FRAME_SCROLL_REGION_OK(f) ((f)->terminal->scroll_region_ok) -#define FRAME_SCROLL_REGION_COST(f) ((f)->terminal->scroll_region_cost) -#define FRAME_MEMORY_BELOW_FRAME(f) ((f)->terminal->memory_below_frame) +#define FRAME_MUST_WRITE_SPACES(f) (FRAME_TTY (f)->must_write_spaces) +#define FRAME_LINE_INS_DEL_OK(f) (FRAME_TTY (f)->line_ins_del_ok) +#define FRAME_CHAR_INS_DEL_OK(f) (FRAME_TTY (f)->char_ins_del_ok) +#define FRAME_SCROLL_REGION_OK(f) (FRAME_TTY (f)->scroll_region_ok) +#define FRAME_SCROLL_REGION_COST(f) (FRAME_TTY (f)->scroll_region_cost) +#define FRAME_MEMORY_BELOW_FRAME(f) (FRAME_TTY (f)->memory_below_frame) #define FRAME_TERMINAL_CODING(f) ((f)->terminal->terminal_coding) #define FRAME_KEYBOARD_CODING(f) ((f)->terminal->keyboard_coding) |