X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a0e5ed33194a97d3feb78eb13917a0c8c66e4be8..4e6d40912e43afdde39744815e30dd425a4849d3:/unix/unix.h diff --git a/unix/unix.h b/unix/unix.h index fb312df2..c7f24709 100644 --- a/unix/unix.h +++ b/unix/unix.h @@ -1,6 +1,18 @@ #ifndef PUTTY_UNIX_H #define PUTTY_UNIX_H +#include /* for FILENAME_MAX */ +#include "charset.h" + +struct Filename { + char path[FILENAME_MAX]; +}; +#define f_open(filename, mode) ( fopen((filename).path, (mode)) ) + +struct FontSpec { + char name[256]; +}; + typedef void *Context; /* FIXME: probably needs changing */ extern Backend pty_backend; @@ -35,9 +47,10 @@ GLOBAL void *logctx; /* Things pty.c needs from pterm.c */ char *get_x_display(void *frontend); int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */ +long get_windowid(void *frontend); /* Things uxstore.c needs from pterm.c */ -char *x_get_default(char *key); +char *x_get_default(const char *key); /* Things uxstore.c provides to pterm.c */ void provide_xrm_string(char *string); @@ -47,7 +60,16 @@ int select_result(int fd, int event); int first_socket(int *state, int *rwx); int next_socket(int *state, int *rwx); -#define DEFAULT_CODEPAGE 0 /* FIXME: no idea how to do this */ +/* + * In the Unix Unicode layer, DEFAULT_CODEPAGE is a special value + * which causes mb_to_wc and wc_to_mb to call _libc_ rather than + * libcharset. That way, we can interface the various charsets + * supported by libcharset with the one supported by mbstowcs and + * wcstombs (which will be the character set in which stuff read + * from the command line or config files is assumed to be encoded). + */ +#define DEFAULT_CODEPAGE 0xFFFF +#define CP_UTF8 CS_UTF8 /* from libcharset */ #define strnicmp strncasecmp #define stricmp strcasecmp @@ -55,4 +77,16 @@ int next_socket(int *state, int *rwx); /* BSD-semantics version of signal() */ void (*putty_signal(int sig, void (*func)(int)))(int); +/* + * Exports from unicode.c. + */ +struct unicode_data; +int init_ucs(struct unicode_data *ucsdata, + char *line_codepage, int font_charset); + +/* + * Spare function exported directly from uxnet.c. + */ +int sk_getxdmdata(void *sock, unsigned long *ip, int *port); + #endif