diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-10 21:17:40 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-10 21:17:40 -0400 |
| commit | cbae07d5e07f53472fa972cd31418a4fe851ac31 (patch) | |
| tree | 1d10110dc3408b650aba2e8f311f7e36f4074933 /src/termhooks.h | |
| parent | 819e2da92a18d7af03ccd9cf0a2e5b940eb7b54f (diff) | |
* src/keyboard.c: Move keyboard decoding to read_key_sequence.
(decode_keyboard_code): Remove.
(tty_read_avail_input): Don't try to decode input.
(read_decoded_char): New function.
(read_key_sequence): Use it.
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 7385298d3d..252dbabb6f 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -382,7 +382,7 @@ struct terminal struct image_cache *image_cache; #endif /* HAVE_WINDOW_SYSTEM */ - /* Device-type dependent data shared amongst all frames on this terminal. */ + /* Device-type dependent data shared amongst all frames on this terminal. */ union display_info { struct tty_display_info *tty; /* termchar.h */ @@ -403,22 +403,22 @@ struct terminal the function `set-keyboard-coding-system'. */ struct coding_system *keyboard_coding; - /* Terminal characteristics. */ - /* XXX Are these really used on non-termcap displays? */ + /* 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 fast_clear_end_of_line; /* Nonzero means terminal has a `ce' string */ + int fast_clear_end_of_line; /* Nonzero means terminal has a `ce' string. */ - int line_ins_del_ok; /* Terminal can insert and delete lines */ - int char_ins_del_ok; /* Terminal can insert and delete chars */ + 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 */ + window. */ int scroll_region_cost; /* Cost of setting the scroll window, - measured in characters. */ + measured in characters. */ int memory_below_frame; /* Terminal remembers lines scrolled - off bottom */ + off bottom. */ /* Window-based redisplay interface for this device (0 for tty devices). */ @@ -617,7 +617,7 @@ tset_selection_alist (struct terminal *t, Lisp_Object val) t->Vselection_alist = val; } -/* Chain of all terminal devices currently in use. */ +/* Chain of all terminal devices currently in use. */ extern struct terminal *terminal_list; #define FRAME_MUST_WRITE_SPACES(f) ((f)->terminal->must_write_spaces) @@ -638,14 +638,16 @@ extern struct terminal *terminal_list; #define FRAME_TERMINAL(f) ((f)->terminal) -/* Return true if the terminal device is not suspended. */ -#define TERMINAL_ACTIVE_P(d) (((d)->type != output_termcap && (d)->type !=output_msdos_raw) || (d)->display_info.tty->input) +/* Return true if the terminal device is not suspended. */ +#define TERMINAL_ACTIVE_P(d) \ + (((d)->type != output_termcap && (d)->type != output_msdos_raw) \ + || (d)->display_info.tty->input) extern struct terminal *get_terminal (Lisp_Object terminal, int); extern struct terminal *create_terminal (void); extern void delete_terminal (struct terminal *); -/* The initial terminal device, created by initial_term_init. */ +/* The initial terminal device, created by initial_term_init. */ extern struct terminal *initial_terminal; extern unsigned char *encode_terminal_code (struct glyph *, int, |