Reorganise setup_fonts_ucs so that in case of error it does nothing

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

diff --git a/unix/unix.h b/unix/unix.h
index faf5600..91d0642 100644 (file)
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -13,13 +13,14 @@
 #include "charset.h"
 
 struct Filename {
-    char path[FILENAME_MAX];
+    char *path;
 };
-FILE *f_open(struct Filename, char const *, int);
+FILE *f_open(const struct Filename *, char const *, int);
 
 struct FontSpec {
-    char name[256];
+    char *name;    /* may be "" to indicate no selected font at all */
 };
+struct FontSpec *fontspec_new(const char *name);
 
 typedef void *Context;                 /* FIXME: probably needs changing */
 
@@ -59,11 +60,6 @@ unsigned long getticks(void);               /* based on gettimeofday(2) */
 #define GETTICKCOUNT getticks
 #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
@@ -97,6 +93,10 @@ void *eventlogstuff_new(void);
 void showeventlog(void *estuff, void *parentwin);
 void logevent_dlg(void *estuff, const char *string);
 int reallyclose(void *frontend);
+#ifdef MAY_REFER_TO_GTK_IN_HEADERS
+int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...);
+int string_width(char *text);
+#endif
 
 /* Things pterm.c needs from {ptermm,uxputty}.c */
 char *make_default_wintitle(char *hostname);
@@ -170,6 +170,13 @@ int init_ucs(struct unicode_data *ucsdata, char *line_codepage,
 void *sk_getxdmdata(void *sock, int *lenp);
 
 /*
+ * Function provided by front ends, and called by uxnet.c to indicate
+ * that net_pending_errors() would like to be called back when the
+ * front end has a spare moment and isn't deep in any other recursion.
+ */
+void frontend_net_error_pending(void);
+
+/*
  * General helpful Unix stuff: more helpful version of the FD_SET
  * macro, which also handles maxfd.
  */