putty.h (putty-0.75) | : | putty.h (putty-0.76) | ||
---|---|---|---|---|
skipping to change at line 1302 | skipping to change at line 1302 | |||
void (*set_zorder)(TermWin *, bool top); | void (*set_zorder)(TermWin *, bool top); | |||
/* Set the colour palette that the TermWin will use to display | /* Set the colour palette that the TermWin will use to display | |||
* text. One call to this function sets 'ncolours' consecutive | * text. One call to this function sets 'ncolours' consecutive | |||
* colours in the OSC 4 sequence, starting at 'start'. */ | * colours in the OSC 4 sequence, starting at 'start'. */ | |||
void (*palette_set)(TermWin *, unsigned start, unsigned ncolours, | void (*palette_set)(TermWin *, unsigned start, unsigned ncolours, | |||
const rgb *colours); | const rgb *colours); | |||
/* Query the front end for any OS-local overrides to the default | /* Query the front end for any OS-local overrides to the default | |||
* colours stored in Conf. The front end should set any it cares | * colours stored in Conf. The front end should set any it cares | |||
* about by calling term_palette_override. */ | * about by calling term_palette_override. | |||
void (*palette_get_overrides)(TermWin *); | * | |||
* The Terminal object is passed in as a parameter, because this | ||||
* can be called as a callback from term_init(). So the TermWin | ||||
* itself won't yet have been told where to find its Terminal | ||||
* object, because that doesn't happen until term_init | ||||
* returns. */ | ||||
void (*palette_get_overrides)(TermWin *, Terminal *); | ||||
}; | }; | |||
static inline bool win_setup_draw_ctx(TermWin *win) | static inline bool win_setup_draw_ctx(TermWin *win) | |||
{ return win->vt->setup_draw_ctx(win); } | { return win->vt->setup_draw_ctx(win); } | |||
static inline void win_draw_text( | static inline void win_draw_text( | |||
TermWin *win, int x, int y, wchar_t *text, int len, | TermWin *win, int x, int y, wchar_t *text, int len, | |||
unsigned long attrs, int line_attrs, truecolour tc) | unsigned long attrs, int line_attrs, truecolour tc) | |||
{ win->vt->draw_text(win, x, y, text, len, attrs, line_attrs, tc); } | { win->vt->draw_text(win, x, y, text, len, attrs, line_attrs, tc); } | |||
static inline void win_draw_cursor( | static inline void win_draw_cursor( | |||
TermWin *win, int x, int y, wchar_t *text, int len, | TermWin *win, int x, int y, wchar_t *text, int len, | |||
skipping to change at line 1357 | skipping to change at line 1363 | |||
{ win->vt->set_minimised(win, minimised); } | { win->vt->set_minimised(win, minimised); } | |||
static inline void win_set_maximised(TermWin *win, bool maximised) | static inline void win_set_maximised(TermWin *win, bool maximised) | |||
{ win->vt->set_maximised(win, maximised); } | { win->vt->set_maximised(win, maximised); } | |||
static inline void win_move(TermWin *win, int x, int y) | static inline void win_move(TermWin *win, int x, int y) | |||
{ win->vt->move(win, x, y); } | { win->vt->move(win, x, y); } | |||
static inline void win_set_zorder(TermWin *win, bool top) | static inline void win_set_zorder(TermWin *win, bool top) | |||
{ win->vt->set_zorder(win, top); } | { win->vt->set_zorder(win, top); } | |||
static inline void win_palette_set( | static inline void win_palette_set( | |||
TermWin *win, unsigned start, unsigned ncolours, const rgb *colours) | TermWin *win, unsigned start, unsigned ncolours, const rgb *colours) | |||
{ win->vt->palette_set(win, start, ncolours, colours); } | { win->vt->palette_set(win, start, ncolours, colours); } | |||
static inline void win_palette_get_overrides(TermWin *win) | static inline void win_palette_get_overrides(TermWin *win, Terminal *term) | |||
{ win->vt->palette_get_overrides(win); } | { win->vt->palette_get_overrides(win, term); } | |||
/* | /* | |||
* Global functions not specific to a connection instance. | * Global functions not specific to a connection instance. | |||
*/ | */ | |||
void nonfatal(const char *, ...) PRINTF_LIKE(1, 2); | void nonfatal(const char *, ...) PRINTF_LIKE(1, 2); | |||
NORETURN void modalfatalbox(const char *, ...) PRINTF_LIKE(1, 2); | NORETURN void modalfatalbox(const char *, ...) PRINTF_LIKE(1, 2); | |||
NORETURN void cleanup_exit(int); | NORETURN void cleanup_exit(int); | |||
/* | /* | |||
* Exports from conf.c, and a big enum (via parametric macro) of | * Exports from conf.c, and a big enum (via parametric macro) of | |||
skipping to change at line 1425 | skipping to change at line 1431 | |||
* We used to also support \ | * We used to also support \ | |||
* 1 = SSH-1 with fallback to SSH-2 \ | * 1 = SSH-1 with fallback to SSH-2 \ | |||
* 2 = SSH-2 with fallback to SSH-1 \ | * 2 = SSH-2 with fallback to SSH-1 \ | |||
* and we continue to use 0/3 in storage formats rather than the more \ | * and we continue to use 0/3 in storage formats rather than the more \ | |||
* obvious 1/2 to avoid surprises if someone saves a session and later \ | * obvious 1/2 to avoid surprises if someone saves a session and later \ | |||
* downgrades PuTTY. So it's easier to use these numbers internally too. \ | * downgrades PuTTY. So it's easier to use these numbers internally too. \ | |||
*/ \ | */ \ | |||
X(INT, NONE, sshprot) \ | X(INT, NONE, sshprot) \ | |||
X(BOOL, NONE, ssh2_des_cbc) /* "des-cbc" unrecommended SSH-2 cipher */ \ | X(BOOL, NONE, ssh2_des_cbc) /* "des-cbc" unrecommended SSH-2 cipher */ \ | |||
X(BOOL, NONE, ssh_no_userauth) /* bypass "ssh-userauth" (SSH-2 only) */ \ | X(BOOL, NONE, ssh_no_userauth) /* bypass "ssh-userauth" (SSH-2 only) */ \ | |||
X(BOOL, NONE, ssh_no_trivial_userauth) /* disable trivial types of auth */ \ | ||||
X(BOOL, NONE, ssh_show_banner) /* show USERAUTH_BANNERs (SSH-2 only) */ \ | X(BOOL, NONE, ssh_show_banner) /* show USERAUTH_BANNERs (SSH-2 only) */ \ | |||
X(BOOL, NONE, try_tis_auth) \ | X(BOOL, NONE, try_tis_auth) \ | |||
X(BOOL, NONE, try_ki_auth) \ | X(BOOL, NONE, try_ki_auth) \ | |||
X(BOOL, NONE, try_gssapi_auth) /* attempt gssapi auth via ssh userauth */ \ | X(BOOL, NONE, try_gssapi_auth) /* attempt gssapi auth via ssh userauth */ \ | |||
X(BOOL, NONE, try_gssapi_kex) /* attempt gssapi auth via ssh kex */ \ | X(BOOL, NONE, try_gssapi_kex) /* attempt gssapi auth via ssh kex */ \ | |||
X(BOOL, NONE, gssapifwd) /* forward tgt via gss */ \ | X(BOOL, NONE, gssapifwd) /* forward tgt via gss */ \ | |||
X(INT, NONE, gssapirekey) /* KEXGSS refresh interval (mins) */ \ | X(INT, NONE, gssapirekey) /* KEXGSS refresh interval (mins) */ \ | |||
X(INT, INT, ssh_gsslist) /* preference order for local GSS libs */ \ | X(INT, INT, ssh_gsslist) /* preference order for local GSS libs */ \ | |||
X(FILENAME, NONE, ssh_gss_custom) \ | X(FILENAME, NONE, ssh_gss_custom) \ | |||
X(BOOL, NONE, ssh_subsys) /* run a subsystem rather than a command */ \ | X(BOOL, NONE, ssh_subsys) /* run a subsystem rather than a command */ \ | |||
skipping to change at line 1787 | skipping to change at line 1794 | |||
void term_provide_logctx(Terminal *term, LogContext *logctx); | void term_provide_logctx(Terminal *term, LogContext *logctx); | |||
void term_set_focus(Terminal *term, bool has_focus); | void term_set_focus(Terminal *term, bool has_focus); | |||
char *term_get_ttymode(Terminal *term, const char *mode); | char *term_get_ttymode(Terminal *term, const char *mode); | |||
int term_get_userpass_input(Terminal *term, prompts_t *p, bufchain *input); | int term_get_userpass_input(Terminal *term, prompts_t *p, bufchain *input); | |||
void term_set_trust_status(Terminal *term, bool trusted); | void term_set_trust_status(Terminal *term, bool trusted); | |||
void term_keyinput(Terminal *, int codepage, const void *buf, int len); | void term_keyinput(Terminal *, int codepage, const void *buf, int len); | |||
void term_keyinputw(Terminal *, const wchar_t * widebuf, int len); | void term_keyinputw(Terminal *, const wchar_t * widebuf, int len); | |||
void term_get_cursor_position(Terminal *term, int *x, int *y); | void term_get_cursor_position(Terminal *term, int *x, int *y); | |||
void term_setup_window_titles(Terminal *term, const char *title_hostname); | void term_setup_window_titles(Terminal *term, const char *title_hostname); | |||
void term_notify_minimised(Terminal *term, bool minimised); | void term_notify_minimised(Terminal *term, bool minimised); | |||
void term_notify_palette_overrides_changed(Terminal *term); | void term_notify_palette_changed(Terminal *term); | |||
void term_notify_window_pos(Terminal *term, int x, int y); | void term_notify_window_pos(Terminal *term, int x, int y); | |||
void term_notify_window_size_pixels(Terminal *term, int x, int y); | void term_notify_window_size_pixels(Terminal *term, int x, int y); | |||
void term_palette_override(Terminal *term, unsigned osc4_index, rgb rgb); | void term_palette_override(Terminal *term, unsigned osc4_index, rgb rgb); | |||
typedef enum SmallKeypadKey { | typedef enum SmallKeypadKey { | |||
SKK_HOME, SKK_END, SKK_INSERT, SKK_DELETE, SKK_PGUP, SKK_PGDN, | SKK_HOME, SKK_END, SKK_INSERT, SKK_DELETE, SKK_PGUP, SKK_PGDN, | |||
} SmallKeypadKey; | } SmallKeypadKey; | |||
int format_arrow_key(char *buf, Terminal *term, int xkey, bool ctrl); | int format_arrow_key(char *buf, Terminal *term, int xkey, bool ctrl); | |||
int format_function_key(char *buf, Terminal *term, int key_number, | int format_function_key(char *buf, Terminal *term, int key_number, | |||
bool shift, bool ctrl); | bool shift, bool ctrl); | |||
End of changes. 4 change blocks. | ||||
5 lines changed or deleted | 12 lines changed or added |