New timing infrastructure. There's a new function schedule_timer()

[u/mdw/putty] / unix / unix.h

diff --git a/unix/unix.h b/unix/unix.h
index c7f2470..90c6ec2 100644 (file)
--- 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;
 
 /*
@@ -24,6 +27,12 @@ extern Backend pty_backend;
 #define MULTICLICK_ONLY_EVENT 0
 
 /*
+ * Under GTK, there is no context help available.
+ */
+#define HELPCTX(x) P(NULL)
+#define FILTER_KEY_FILES NULL          /* FIXME */
+
+/*
  * Under X, selection data must not be NUL-terminated.
  */
 #define SELECTION_NUL_TERMINATED 0
@@ -36,29 +45,57 @@ 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 */
 
 #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 */
 long get_windowid(void *frontend);
 
+/* Things gtkdlg.c needs from pterm.c */
+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);
+void fatal_message_box(void *window, char *msg);
+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);
 
 /* Things uxstore.c provides to pterm.c */
 void provide_xrm_string(char *string);
 
-/* Things uxnet.c provides to the front end */
+/* The interface used by uxsel.c */
+void uxsel_init(void);
+typedef int (*uxsel_callback_fn)(int fd, int event);
+void uxsel_set(int fd, int rwx, uxsel_callback_fn callback);
+void uxsel_del(int fd);
 int select_result(int fd, int event);
-int first_socket(int *state, int *rwx);
-int next_socket(int *state, int *rwx);
+int first_fd(int *state, int *rwx);
+int next_fd(int *state, int *rwx);
+/* The following are expected to be provided _to_ uxsel.c by the frontend */
+int uxsel_input_add(int fd, int rwx);  /* returns an id */
+void uxsel_input_remove(int id);
+
+/* uxcfg.c */
+struct controlbox;
+void unix_setup_config_box(struct controlbox *b, int midsession, void *window);
 
 /*
  * In the Unix Unicode layer, DEFAULT_CODEPAGE is a special value
@@ -81,12 +118,21 @@ 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);
+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);
 
+/*
+ * 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