X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/47e4e7359053574f16061e9d692394fc9f2f3b74..2ac3322ef9bc032ad942753a56696764aa0b0f74:/unix/unix.h diff --git a/unix/unix.h b/unix/unix.h index d9a57fb0..54cf39f2 100644 --- a/unix/unix.h +++ b/unix/unix.h @@ -15,6 +15,9 @@ struct FontSpec { typedef void *Context; /* FIXME: probably needs changing */ +typedef int OSSocket; +#define OSSOCKET_DEFINED /* stop network.h using its default */ + extern Backend pty_backend; /* @@ -42,14 +45,17 @@ extern Backend pty_backend; /* Simple wraparound timer function */ unsigned long getticks(void); /* based on gettimeofday(2) */ #define GETTICKCOUNT getticks -#define TICKSPERSEC 1000000 /* gettimeofday returns microseconds */ -#define CURSORBLINK 450000 /* no standard way to set this */ +#define TICKSPERSEC 1000 /* we choose to use milliseconds */ +#define CURSORBLINK 450 /* no standard way to set this */ +/* getticks() works using gettimeofday(), so it's vulnerable to system clock + * changes causing chaos. Therefore, we provide a compensation mechanism. */ +#define TIMING_SYNC +#define TIMING_SYNC_ANOW +extern long tickcount_offset; #define WCHAR wchar_t #define BYTE unsigned char -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 */ @@ -59,13 +65,22 @@ long get_windowid(void *frontend); void *get_window(void *frontend); /* void * to avoid depending on gtk.h */ /* Things pterm.c needs from gtkdlg.c */ +int do_config_box(const char *title, Config *cfg, + int midsession, int protcfginfo); void fatal_message_box(void *window, char *msg); -void about_box(void); +void about_box(void *window); +void *eventlogstuff_new(void); +void showeventlog(void *estuff, void *parentwin); +void logevent_dlg(void *estuff, const char *string); +int reallyclose(void *frontend); /* Things pterm.c needs from {ptermm,uxputty}.c */ char *make_default_wintitle(char *hostname); int process_nonoption_arg(char *arg, Config *cfg); +/* pterm.c needs this special function in xkeysym.c */ +int keysym_to_unicode(int keysym); + /* Things uxstore.c needs from pterm.c */ char *x_get_default(const char *key); @@ -88,6 +103,9 @@ void uxsel_input_remove(int id); struct controlbox; void unix_setup_config_box(struct controlbox *b, int midsession); +/* gtkcfg.c */ +void gtk_setup_config_box(struct controlbox *b, int midsession, void *window); + /* * 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 @@ -102,19 +120,29 @@ void unix_setup_config_box(struct controlbox *b, int midsession); #define strnicmp strncasecmp #define stricmp strcasecmp -/* BSD-semantics version of signal() */ +/* BSD-semantics version of signal(), and another helpful function */ void (*putty_signal(int sig, void (*func)(int)))(int); +void block_signal(int sig, int block_it); /* * Exports from unicode.c. */ struct unicode_data; -int init_ucs(struct unicode_data *ucsdata, - char *line_codepage, int font_charset); +int init_ucs(struct unicode_data *ucsdata, char *line_codepage, + int utf8_override, int font_charset, int vtmode); /* * Spare function exported directly from uxnet.c. */ -int sk_getxdmdata(void *sock, unsigned long *ip, int *port); +void *sk_getxdmdata(void *sock, int *lenp); + +/* + * General helpful Unix stuff: more helpful version of the FD_SET + * macro, which also handles maxfd. + */ +#define FD_SET_MAX(fd, max, set) do { \ + FD_SET(fd, &set); \ + if (max < fd + 1) max = fd + 1; \ +} while (0) #endif